@media-quest/builder 0.0.6 → 0.0.8

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/IDefaultTheme.ts

@@ -122,11 +122,11 @@ export const DefaultTheme: IDefaultTheme = {
       text: {
         css: {
           w: 80,
-          y: 27,
+          y: 65,
           x: 10,
           textAlign: "center",
           textColor: "black",
-          fontSize: { _unit: "px", value: 30 },
+          fontSize: { _unit: "px", value: 40 },
         },
         cssDisabled: {},
         cssEnabled: {},

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: [
         {
@@ -148,11 +147,12 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
       const nextBtnElement: DElementDto = this.compileButton(id, nextButton, {
         kind: "next-button",
       });
+      const textStyle = mainMedia ? DefaultTheme.mainText.withMedia.text.css : DefaultTheme.mainText.noMedia.text.css;
       const element: DElementDto = {
         text: infoText,
         _tag: "p",
         id: generateElementId(),
-        style: DefaultTheme.mainText.withMedia.text.css,
+        style: textStyle,
       };
       elements.push(element);
       elements.push(nextBtnElement);
@@ -161,6 +161,7 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
       const mainImageElement = this.compileImage(mainMedia);
       elements.push(mainImageElement);
     }
+
     if (mainMedia && mainMedia.kind === "main-video") {
       const videoOutput = this.compileVideo(mainMedia);
       mainVideo = videoOutput.videoDto;
@@ -343,7 +344,9 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
     // console.log(page);
     const q = page.defaultQuestion;
     const text = page.mainText.text;
-
+    const questionStyle = page.mainMedia
+      ? DefaultTheme.mainText.withMedia.text.css
+      : DefaultTheme.mainText.noMedia.text.css;
     const question: DTextDto = {
       _tag: "p",
       text,
@@ -351,7 +354,7 @@ export class DefaultThemeCompiler extends AbstractThemeCompiler<IDefaultTheme> {
       id: U.randomString(30),
       onClick: [],
       onStateChange: [],
-      style: DefaultTheme.mainText.withMedia.text.css,
+      style: questionStyle,
     };
     const buttons = q.options.map((o) => {
       const btns = this.compileButton(pageId, o, {