rm dynamic loading

Author: RubenHalman

.gitignore

@@ -19,4 +19,5 @@ out
 # generated reports
 reports
 coverage
-.nyc_output
+.nyc_output
+.github/.secrets

src/index.ts

@@ -3,7 +3,7 @@ import type { IRulesConfig } from "./main/interfaces/IRulesConfig";
 
 import { Compiler } from "./main/libs/Compiler";
 import { fix } from "./main/libs/FixFlows";
-import { getBetaRules, getRules } from "./main/libs/GetRuleDefinitions";
+import { getRules } from "./main/libs/GetRuleDefinitions";
 import { parse } from "./main/libs/ParseFlows";
 import { scan } from "./main/libs/ScanFlows";
 import { AdvancedRule } from "./main/models/AdvancedRule";
@@ -30,7 +30,6 @@ export {
   FlowResource,
   FlowType,
   FlowVariable,
-  getBetaRules,
   getRules,
   parse,
   ParsedFlow,

src/main/libs/DynamicRule.ts

@@ -1,12 +1,13 @@
 import { IRuleDefinition } from "../interfaces/IRuleDefinition";
 import { AdvancedRule } from "../models/AdvancedRule";
-import { BetaRuleStore, DefaultRuleStore } from "../store/DefaultRuleStore";
+import { DefaultRuleStore } from "../store/DefaultRuleStore";
 
 export class DynamicRule<T extends AdvancedRule | IRuleDefinition> {
   constructor(className: string) {
-    if (!DefaultRuleStore.hasOwnProperty(className) && BetaRuleStore.hasOwnProperty(className)) {
-      return new BetaRuleStore[className]() as T;
+    if (!DefaultRuleStore.hasOwnProperty(className)) {
+      throw new Error(`Class type of \'${className}\' is not in the store`);
     }
     return new DefaultRuleStore[className]() as T;
   }
 }
+

src/main/libs/GetRuleDefinitions.ts

@@ -1,15 +1,13 @@
 import { IRuleDefinition } from "../interfaces/IRuleDefinition";
-import { BetaRuleStore, DefaultRuleStore } from "../store/DefaultRuleStore";
+import { DefaultRuleStore } from "../store/DefaultRuleStore";
 import { DynamicRule } from "./DynamicRule";
-import { RuleLoader } from "./RuleLoader";
 
 export function GetRuleDefinitions(ruleConfig?: Map<string, unknown>): IRuleDefinition[] {
   const selectedRules: IRuleDefinition[] = [];
   if (ruleConfig && ruleConfig instanceof Map) {
     for (const ruleName of ruleConfig.keys()) {
       let severity = "error";
       try {
-        const configuredPath = ruleConfig.get(ruleName)?.["path"];
         const configuredSeverity = ruleConfig.get(ruleName)?.["severity"];
         if (
           configuredSeverity &&
@@ -19,19 +17,12 @@ export function GetRuleDefinitions(ruleConfig?: Map<string, unknown>): IRuleDefi
         ) {
           severity = configuredSeverity;
         }
-        if (configuredPath) {
-          const customRule = RuleLoader.loadCustomRule(ruleName, configuredPath) as IRuleDefinition;
-          if (configuredSeverity) {
-            customRule.severity = severity;
-          }
-          selectedRules.push(customRule);
-        } else {
-          const matchedRule = new DynamicRule(ruleName) as IRuleDefinition;
-          if (configuredSeverity) {
-            matchedRule.severity = severity;
-          }
-          selectedRules.push(matchedRule);
+        const matchedRule = new DynamicRule(ruleName) as IRuleDefinition;
+        if (configuredSeverity) {
+          matchedRule.severity = severity;
         }
+        selectedRules.push(matchedRule);
+
       } catch (error) {
         console.log(error.message);
       }
@@ -55,10 +46,3 @@ export function getRules(ruleNames?: string[]): IRuleDefinition[] {
   }
 }
 
-export function getBetaRules(): IRuleDefinition[] {
-  return getBetaDefinition();
-}
-
-function getBetaDefinition(): IRuleDefinition[] {
-  return Object.values(BetaRuleStore).map((rule) => new rule() as IRuleDefinition);
-}