@media-quest/builder 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@media-quest/builder",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Builder library for Media-quest schemas",
   "main": "dist/public-api.js",
   "module": "dist/public-api.mjs",
@@ -13,6 +13,6 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@media-quest/engine": "0.0.9"
+    "@media-quest/engine": "0.0.10"
   }
 }

package/src/Builder-schema.ts

@@ -213,15 +213,18 @@ export class BuilderSchema {
       const pageVariables = page.getQuestionVariables(this._prefix, index);
       qVars.push(...pageVariables);
       const mainText = page.mainText.text;
+      const pagePrefix = page.prefix;
       const jumpAction: JumpToPageAction = {
         kind: "jump-to-page",
         pageId: page.id,
+        pagePrefix,
         pageNumber: index,
         mainText: page.mainText.text,
       };
       const excludePageAction: ExcludeByPageAction = {
         kind: "exclude-by-pageId",
         pageId: page.id,
+        pagePrefix,
         pageNumber: index,
         mainText,
       };

package/src/rulebuilder/RuleAction.ts

@@ -1,8 +1,10 @@
 import { PageID } from "@media-quest/engine";
+import { PagePrefixValue } from "../prefix";
 
 export interface ExcludeByPageAction {
   readonly kind: "exclude-by-pageId";
   readonly pageId: PageID;
+  readonly pagePrefix: PagePrefixValue;
   readonly mainText: string;
   readonly pageNumber: number;
 }
@@ -10,6 +12,7 @@ export interface ExcludeByPageAction {
 export interface JumpToPageAction {
   readonly kind: "jump-to-page";
   readonly pageId: PageID;
+  readonly pagePrefix: PagePrefixValue;
   readonly mainText: string;
   readonly pageNumber: number;
 }

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

@@ -7,9 +7,13 @@ 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";
+import { PagePrefix, VarID, SchemaPrefix, PagePrefixValue } from "../prefix";
 
-const id = () => PageID.create();
+const idPxx = () => {
+  const id = PageID.create();
+  const prefix = PagePrefix.fromStringOrThrow("pxx");
+  return { id, prefix: prefix };
+};
 export namespace RuleBuilderTestUtils {
   export const createOptions = () => [
     BuilderOption.create(0, "Nei"),
@@ -29,18 +33,22 @@ export namespace RuleBuilderTestUtils {
   };
 
   export const excludeByPageIdAction = (pageId: PageID, pageNumber: number) => {
+    const pagePrefix = PagePrefix.castOrCreateRandom("").value;
     const action: ExcludeByPageAction = {
       kind: "exclude-by-pageId",
       mainText: "",
       pageId,
+      pagePrefix,
       pageNumber,
     };
     return action;
   };
   export const jumpToPageAction = (pageId: PageID, pageNumber: number) => {
+    const pagePrefix = PagePrefix.castOrCreateRandom("").value;
     const action: JumpToPageAction = {
       kind: "jump-to-page",
       mainText: "TEXT: " + pageId,
+      pagePrefix,
       pageId,
       pageNumber,
     };
@@ -150,7 +158,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -160,7 +169,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -170,7 +180,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -180,7 +191,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -190,7 +202,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -199,7 +212,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -209,7 +223,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -219,7 +234,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -229,7 +245,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },
@@ -239,7 +256,8 @@ export namespace RuleBuilderTestUtils {
     ExcludeByPageIdSelectItem.create(
       {
         kind: "exclude-by-pageId",
-        pageId: id(),
+        pageId: idPxx().id,
+        pagePrefix: idPxx().prefix,
         pageNumber: 5,
         mainText: "Har du noen gang vært deprimeri?? ",
       },

package/src/rulebuilder/SingleSelectItem.ts

@@ -122,11 +122,11 @@ export class JumpToPageSelectItem extends SingleSelectItem<JumpToPageAction> {
   }
 
   protected getSearchString(): string {
-    return this.data.pageId + this.data.mainText;
+    return this.data.pagePrefix + this.data.mainText;
   }
 
   protected getSelectLabel(): string {
-    return this.data.pageId + " (" + this.data.pageNumber + ")";
+    return this.data.pagePrefix + " (" + this.data.pageNumber + ")";
   }
 
   protected getTooltip(): string {

package/src/rulebuilder/multi-select-item.ts

@@ -1,70 +1,78 @@
 import { ExcludeByPageAction, ExcludeByTagAction } from "./RuleAction";
 
+interface IMultiSelectItem<T> {
+  isSelected: boolean;
+  readonly tooltip: string;
+  readonly searchString: string;
+}
 export abstract class MultiSelectItem<T> {
-    private readonly _isSelectedInitially: boolean;
-    private readonly _selectLabel;
-    private readonly _toolTip;
-    private readonly _searchString;
-    public isSelected: boolean;
-    get selectLabel(): string {
-        return this._selectLabel;
-    }
-    get tooltip() {
-        return this._toolTip;
-    }
+  private readonly _isSelectedInitially: boolean;
+  private readonly _selectLabel;
+  private readonly _toolTip;
+  private readonly _searchString;
+  public isSelected: boolean;
+  get selectLabel(): string {
+    return this._selectLabel;
+  }
+  get tooltip() {
+    return this._toolTip;
+  }
 
-    get searchString() {
-        return this._searchString;
-    }
-    protected constructor(readonly data: T, isSelected: boolean) {
-        this._isSelectedInitially = isSelected;
-        this.isSelected = isSelected;
-        this._searchString = this.getSearchString();
-        this._toolTip = this.getTooltip();
-        this._selectLabel = this.getSelectLabel();
-    }
-    protected abstract getSelectLabel(): string;
-    protected abstract getTooltip(): string;
-    protected abstract getSearchString(): string;
+  get searchString() {
+    return this._searchString;
+  }
+  protected constructor(
+    readonly data: T,
+    isSelected: boolean,
+  ) {
+    this._isSelectedInitially = isSelected;
+    this.isSelected = isSelected;
+    this._searchString = this.getSearchString();
+    this._toolTip = this.getTooltip();
+    this._selectLabel = this.getSelectLabel();
+  }
+  protected abstract getSelectLabel(): string;
+  protected abstract getTooltip(): string;
+  protected abstract getSearchString(): string;
 }
 
 export class ExcludeByTagSelectItem extends MultiSelectItem<ExcludeByTagAction> {
-    public static readonly create = (tagData: ExcludeByTagAction, isSelected: boolean) => {
-        return new ExcludeByTagSelectItem(tagData, isSelected);
-    };
-    protected constructor(data: ExcludeByTagAction, isSelected: boolean) {
-        super(data, isSelected);
-    }
-    protected getSearchString(): string {
-        return this.data.tag;
-    }
+  public static readonly create = (tagData: ExcludeByTagAction, isSelected: boolean) => {
+    return new ExcludeByTagSelectItem(tagData, isSelected);
+  };
+  protected constructor(data: ExcludeByTagAction, isSelected: boolean) {
+    super(data, isSelected);
+  }
+  protected getSearchString(): string {
+    return this.data.tag;
+  }
 
-    protected getSelectLabel(): string {
-        return this.data.tag + " (" + this.data.pageCount + ")";
-    }
+  protected getSelectLabel(): string {
+    return this.data.tag + " (" + this.data.pageCount + ")";
+  }
 
-    protected getTooltip(): string {
-        return this.data.tag + "  (used in " + this.data.pageCount + " pages)";
-    }
+  protected getTooltip(): string {
+    return this.data.tag + "  (used in " + this.data.pageCount + " pages)";
+  }
 }
 
 export class ExcludeByPageIdSelectItem extends MultiSelectItem<ExcludeByPageAction> {
-    public static create = (ruleActionPage: ExcludeByPageAction, isSelected: boolean) => {
-        return new ExcludeByPageIdSelectItem(ruleActionPage, isSelected);
-    };
+  public static create = (ruleActionPage: ExcludeByPageAction, isSelected: boolean) => {
+    return new ExcludeByPageIdSelectItem(ruleActionPage, isSelected);
+  };
 
-    protected constructor(data: ExcludeByPageAction, isSelected: boolean) {
-        super(data, isSelected);
-    }
-    protected getSearchString(): string {
-        return this.data.pageId + this.data.mainText;
-    }
+  protected constructor(data: ExcludeByPageAction, isSelected: boolean) {
+    super(data, isSelected);
+  }
+  protected getSearchString(): string {
+    return this.data.pagePrefix + this.data.mainText;
+  }
 
-    protected getSelectLabel(): string {
-        return this.data.pageId + " (" + this.data.pageNumber + ")";
-    }
+  protected getSelectLabel(): string {
+    return this.data.pagePrefix + " (" + this.data.pageNumber + ")";
+  }
 
-    protected getTooltip(): string {
-        return this.data.mainText;
-    }
+  protected getTooltip(): string {
+    return this.data.mainText;
+  }
 }