@media-quest/builder 0.0.7 → 0.0.9

package/src/rulebuilder/RuleBuilder-test-utils.ts

@@ -6,7 +6,10 @@ import type { BuilderConditionDto } from "./condition/Builder-condition";
 import type { BuilderOperator } from "./condition/Builder-operator";
 import type { ExcludeByPageAction, ExcludeByTagAction, JumpToPageAction } from "./RuleAction";
 import { ExcludeByPageIdSelectItem, ExcludeByTagSelectItem } from "./multi-select-item";
+import { PageID } from "@media-quest/engine";
+import { PagePrefix, VarID, SchemaPrefix } from "../prefix";
 
+const id = () => PageID.create();
 export namespace RuleBuilderTestUtils {
   export const createOptions = () => [
     BuilderOption.create(0, "Nei"),
@@ -25,7 +28,7 @@ export namespace RuleBuilderTestUtils {
     return action;
   };
 
-  export const excludeByPageIdAction = (pageId: string, pageNumber: number) => {
+  export const excludeByPageIdAction = (pageId: PageID, pageNumber: number) => {
     const action: ExcludeByPageAction = {
       kind: "exclude-by-pageId",
       mainText: "",
@@ -34,7 +37,7 @@ export namespace RuleBuilderTestUtils {
     };
     return action;
   };
-  export const jumpToPageAction = (pageId: string, pageNumber: number) => {
+  export const jumpToPageAction = (pageId: PageID, pageNumber: number) => {
     const action: JumpToPageAction = {
       kind: "jump-to-page",
       mainText: "TEXT: " + pageId,
@@ -59,22 +62,50 @@ export namespace RuleBuilderTestUtils {
     ] as const;
     return list;
   };
-  export const createRuleVariable = (id: string, pageNumber: number): QuestionVariable =>
-    new QuestionVariable(id, "Har du " + id + "?", createOptions(), pageNumber);
+  export const createRuleVariable = (varId: VarID, pageNumber: number): QuestionVariable =>
+    new QuestionVariable(varId, "Har du " + varId + "?", createOptions(), pageNumber);
 
   /**
    *
    */
-  export const createBuilderVariables_A_H = (): ReadonlyArray<QuestionVariable> => [
-    createRuleVariable("a", 3),
-    createRuleVariable("b", 4),
-    createRuleVariable("c", 5),
-    createRuleVariable("d", 6),
-    createRuleVariable("e", 7),
-    createRuleVariable("f", 8),
-    createRuleVariable("g", 9),
-    createRuleVariable("h", 10),
-  ];
+  export const createPagesAndVars_A_H = (schemaPrefix: SchemaPrefix) => {
+    const varId = (pagePrefix: string) => {
+      const pxx = PagePrefix.fromStringOrThrow(pagePrefix);
+      const qxx = VarID.create(schemaPrefix.value, pxx);
+      return qxx;
+    };
+    const pageAID = PageID.create();
+    const pageBID = PageID.create();
+    const pageCID = PageID.create();
+    const pageDID = PageID.create();
+    const pageEID = PageID.create();
+    const pageFID = PageID.create();
+    const pageGID = PageID.create();
+    const pageHID = PageID.create();
+    const a = createRuleVariable(varId("a"), 3);
+    const b = createRuleVariable(varId("b"), 4);
+    const c = createRuleVariable(varId("c"), 5);
+    const d = createRuleVariable(varId("d"), 6);
+    const e = createRuleVariable(varId("e"), 7);
+    const f = createRuleVariable(varId("f"), 8);
+    const g = createRuleVariable(varId("g"), 9);
+    const h = createRuleVariable(varId("h"), 10);
+    const list = [a, b, c, d, e, f, g, h];
+    const items = { a, b, c, d, e, f, g, h };
+    const pageIds = {
+      a: pageAID,
+      b: pageBID,
+      c: pageCID,
+      d: pageDID,
+      e: pageEID,
+      f: pageFID,
+      g: pageGID,
+
+      h: pageHID,
+    };
+    const pageIdList = [pageAID, pageBID, pageCID, pageDID, pageEID, pageFID, pageGID, pageHID];
+    return { list, items, pageIds, pageIdList };
+  };
 
   export const createConditionDto = (variable: BuilderVariable): BuilderConditionDto => {
     const operator: BuilderOperator = Math.random() > 0 ? "equal" : "notEqual";
@@ -97,12 +128,12 @@ export namespace RuleBuilderTestUtils {
     };
   };
 
-  export const createBuilderRuleDto = (): ReadonlyArray<BuilderRuleDto> => {
-    const variables = createBuilderVariables_A_H();
-    const condition0 = createConditionDto(variables[0]);
-    const condition1 = createConditionDto(variables[1]);
-    const condition3 = createConditionDto(variables[3]);
-    const condition5 = createConditionDto(variables[5]);
+  export const createBuilderRuleDto = (schemaPrefix: SchemaPrefix): ReadonlyArray<BuilderRuleDto> => {
+    const v = createPagesAndVars_A_H(schemaPrefix);
+    const condition0 = createConditionDto(v.items.a);
+    const condition1 = createConditionDto(v.items.b);
+    const condition3 = createConditionDto(v.items.c);
+    const condition5 = createConditionDto(v.items.e);
     const group = createConditionGroupDto([condition0, condition3]);
     // const action1: Exc
     const rule: BuilderRuleDto = {
@@ -119,7 +150,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_a",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -129,7 +160,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_b",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -139,7 +170,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_c",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -149,7 +180,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_d",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -159,7 +190,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_e",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -168,7 +199,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_f",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -178,7 +209,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_g",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -188,7 +219,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_h",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -198,7 +229,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_i",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -208,7 +239,7 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: "page_j",
+        pageId: id(),
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },

package/src/rulebuilder/RuleVariable.ts

@@ -1,3 +1,5 @@
+import { PagePrefix, VarID, SchemaPrefix } from "../prefix";
+
 const BuilderVariableType = {
   numericWithOptions: true,
   numeric: true,
@@ -23,7 +25,9 @@ export class QuestionVariable {
   readonly kind: "question-variable" = "question-variable";
   readonly dataType: BuilderVariableType = "numericWithOptions";
   constructor(
-    readonly varId: string,
+    // private schemaPrefix: SchemaPrefix,
+    // private pagePrefix: PagePrefix,
+    readonly varId: VarID,
     readonly label: string,
     readonly options: ReadonlyArray<BuilderVariableOption>,
     readonly pageNumber: number,
@@ -34,7 +38,7 @@ export class CustomVariable {
   readonly kind: "configuration-variable" = "configuration-variable";
   readonly dataType: BuilderVariableType = "numericWithOptions";
   constructor(
-    readonly varId: string,
+    readonly varId: VarID,
     readonly label: string,
     readonly options: ReadonlyArray<BuilderVariableOption>,
   ) {}

package/src/rulebuilder/condition/Builder-condition-group.ts

@@ -82,7 +82,7 @@ export class BuilderConditionGroup extends BuilderObject<"builder-condition-grou
     };
   }
 
-  toEngineConditionComplex(modulePrefix: string): Condition.Complex | false {
+  toEngineConditionComplex(): Condition.Complex | false {
     const comp: Condition.Complex = {
       kind: "complex-condition",
       all: [],
@@ -91,7 +91,7 @@ export class BuilderConditionGroup extends BuilderObject<"builder-condition-grou
     };
     const conditions: Condition.Simple[] = [];
     this.conditions.forEach((c) => {
-      const maybeSimple = c.toEngineCondition(modulePrefix);
+      const maybeSimple = c.toEngineCondition();
       if (maybeSimple) {
         conditions.push(maybeSimple);
       }

package/src/rulebuilder/condition/Builder-condition.spec.ts

@@ -2,6 +2,7 @@ import { BuilderCondition, type BuilderConditionDto } from "./Builder-condition"
 import { RuleBuilderTestUtils } from "../RuleBuilder-test-utils";
 import type { BuilderVariable, BuilderVariableOption } from "../RuleVariable";
 import { QuestionVariable } from "../RuleVariable";
+import { SchemaPrefix } from "../../prefix";
 
 let condition = BuilderCondition.create([]);
 
@@ -9,13 +10,15 @@ beforeEach(() => {
   condition = BuilderCondition.create([]);
 });
 
+const as = SchemaPrefix.fromValueOrThrow("as");
+
 describe("Builder Operator", () => {
   test("Can create", () => {
     expect(condition).toBeInstanceOf(BuilderCondition);
   });
   test("Can resolve dto from Variables in universe.", () => {
-    const vs = RuleBuilderTestUtils.createBuilderVariables_A_H();
-    const a = vs[0];
+    const vs = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = vs.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "a",
@@ -23,15 +26,15 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 1,
     };
-    const c = BuilderCondition.fromDto(dto, vs);
+    const c = BuilderCondition.fromDto(dto, vs.list);
     // c.setVariableList(vs);
     expect(c.operatorsSelectItems.length).toBe(2);
     expect(c.operator === "equal").toBe(true);
     expect(c.value).toBeTruthy();
   });
   test("Can not resolve value if invalid value", () => {
-    const vs = RuleBuilderTestUtils.createBuilderVariables_A_H();
-    const a = vs[0];
+    const vs = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = vs.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "a",
@@ -39,14 +42,14 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 8,
     };
-    const c = BuilderCondition.fromDto(dto, vs);
+    const c = BuilderCondition.fromDto(dto, vs.list);
     expect(c.operatorsSelectItems.length).toBe(2);
     expect(c.value).toBe(false);
     // expect(match).toBe(false);
   });
   test("Will nullify dto if not matchedFrom is called", () => {
-    const vs = RuleBuilderTestUtils.createBuilderVariables_A_H();
-    const a = vs[0];
+    const vs = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = vs.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "a",
@@ -63,8 +66,8 @@ describe("Builder Operator", () => {
     // expect(match).toBe(false);
   });
   test("Will not nullify if created with valid universe", () => {
-    const vs = RuleBuilderTestUtils.createBuilderVariables_A_H();
-    const a = vs[0];
+    const vs = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = vs.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "a",
@@ -72,7 +75,7 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 0,
     };
-    const c = BuilderCondition.fromDto(dto, vs);
+    const c = BuilderCondition.fromDto(dto, vs.list);
     expect(c.variable).toBeInstanceOf(QuestionVariable);
     expect(c.operator === "equal").toBe(true);
     const value = c.value as BuilderVariableOption;
@@ -81,8 +84,8 @@ describe("Builder Operator", () => {
     expect(c.variable).toBe(a);
   });
   test("Condition is valid, when in sync with universe.", () => {
-    const vs = RuleBuilderTestUtils.createBuilderVariables_A_H();
-    const a = vs[0];
+    const vs = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = vs.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
 
@@ -91,7 +94,7 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 0,
     };
-    const c = BuilderCondition.fromDto(dto, vs);
+    const c = BuilderCondition.fromDto(dto, vs.list);
     expect(c.variable).toBeInstanceOf(QuestionVariable);
     expect(c.operator === "equal").toBe(true);
     const value = c.value as BuilderVariableOption;
@@ -111,7 +114,7 @@ describe("Builder Operator", () => {
     expect(c.validate().isValid).toBe(false);
   });
   test("Condition is invalid, when variable dont exist in universe.", () => {
-    const universe = RuleBuilderTestUtils.createBuilderVariables_A_H();
+    const variables = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "invalid variable name in dto",
@@ -119,12 +122,12 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 9,
     };
-    const c = BuilderCondition.fromDto(dto, universe);
+    const c = BuilderCondition.fromDto(dto, variables.list);
     expect(c.variable).toBe(false);
     expect(c.validate().isValid).toBe(false);
   });
-  test("Condition is invalid if not all set, when variable dont exist in universe.", () => {
-    const universe = RuleBuilderTestUtils.createBuilderVariables_A_H();
+  test("Condition is invalid if not all set, when variable dont exist in variables.", () => {
+    const variables = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "invalid variable name in dto",
@@ -132,34 +135,39 @@ describe("Builder Operator", () => {
       operator: "equal",
       value: 9,
     };
-    const c = BuilderCondition.fromDto(dto, universe);
+    const c = BuilderCondition.fromDto(dto, variables.list);
     expect(c.variable).toBe(false);
     expect(c.validate().isValid).toBe(false);
   });
+
   test("Condition is invalid if operator is not set", () => {
-    const universe = RuleBuilderTestUtils.createBuilderVariables_A_H();
+    const variables = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    const a = variables.items.a;
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "invalid variable name in dto",
-      variableId: "a",
+      variableId: a.varId,
       operator: "",
       value: 1,
     };
-    const c = BuilderCondition.fromDto(dto, universe);
+    expect(a.varId).toBe("as_a");
+    const c = BuilderCondition.fromDto(dto, variables.list);
     expect(c.variable).toBeInstanceOf(QuestionVariable);
     expect(c.validate().isValid).toBe(false);
     expect(c.value).toBe(false);
   });
   test("Condition is invalid if value (from dto) is not found in variable", () => {
-    const universe = RuleBuilderTestUtils.createBuilderVariables_A_H();
+    const { list, items } = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+    expect(items.a.varId).toBe("as_a");
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "invalid variable name in dto",
-      variableId: "a",
+      variableId: items.a.varId,
       operator: "equal",
-      value: 7,
+      value: 42,
     };
-    const c = BuilderCondition.fromDto(dto, universe);
+    const c = BuilderCondition.fromDto(dto, list);
+    expect(c).toBeInstanceOf(BuilderCondition);
     expect(c.variable).toBeInstanceOf(QuestionVariable);
     expect(c.operator).toBe("equal");
     expect(c.operatorsSelectItems.length).toBe(BuilderCondition.NUMBER_OPERATORS.length);
@@ -167,15 +175,16 @@ describe("Builder Operator", () => {
     expect(c.validate().isValid).toBe(false);
   });
   test("toEngineConditionWorks", () => {
-    const universe = RuleBuilderTestUtils.createBuilderVariables_A_H();
+    const variables = RuleBuilderTestUtils.createPagesAndVars_A_H(as);
+
     const dto: BuilderConditionDto = {
       kind: "condition",
       name: "invalid variable name in dto",
-      variableId: "a",
+      variableId: variables.items.a.varId,
       operator: "equal",
       value: 7,
     };
-    const c = BuilderCondition.fromDto(dto, universe);
+    const c = BuilderCondition.fromDto(dto, variables.list);
     expect(c.variable).toBeInstanceOf(QuestionVariable);
     expect(c.operator).toBe("equal");
     expect(c.operatorsSelectItems.length).toBe(BuilderCondition.NUMBER_OPERATORS.length);

package/src/rulebuilder/condition/Builder-condition.ts

@@ -103,7 +103,7 @@ export class BuilderCondition extends BuilderObject<"builder-condition", Builder
     return { isValid: true };
   }
 
-  toEngineCondition(modulePrefix: string): Condition.Simple | false {
+  toEngineCondition(): Condition.Simple | false {
     const val = this.value;
     const op = this._operator;
     const v = this._variable;
@@ -115,7 +115,7 @@ export class BuilderCondition extends BuilderObject<"builder-condition", Builder
         kind: "numeric-condition",
         value: val.value,
         valueLabel: val.label,
-        referenceId: modulePrefix + "_" + v.varId,
+        referenceId: v.varId,
         referenceLabel: v.label,
         operator: "eq",
       };

package/src/theme/default-theme-compiler.ts

@@ -40,7 +40,7 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
     const ruleInput = builderSchema.getRuleInput();
     const pageQueRules: Rule<PageQueCommand, never>[] = [];
     source.rules.forEach((rule) => {
-      const engineRule = BuilderRule.fromDto(rule, ruleInput).toEngineRule(source.prefix);
+      const engineRule = BuilderRule.fromDto(rule, ruleInput).toEngineRule();
       if (!Rule.isEmpty(engineRule)) {
         pageQueRules.push(engineRule);
       } else {
@@ -56,7 +56,7 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
   compile(source: BuilderSchemaDto): SchemaDto {
     const pages = source.pages.map((p) => this.compilePage(p, source.prefix));
     const rules = this.compileRules(source);
-    console.log(pages.map((p) => p.tags));
+    // console.log(pages.map((p) => p.tags));
 
     const dto: SchemaDto = {
       backgroundColor: source.backgroundColor,
@@ -66,7 +66,6 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
       pageSequences: [],
       pages,
       predefinedFacts: [],
-      prefix: source.prefix,
       rules,
       stateFromEvent: [
         {