@media-quest/builder 0.0.9 → 0.0.11

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

@@ -1,70 +1,73 @@
 import { ExcludeByPageAction, ExcludeByTagAction } from "./RuleAction";
 
 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;
+  }
 }

package/src/rulebuilder/page-action-manager.ts

@@ -1,6 +1,7 @@
 import type { RuleInput } from "./RuleInput";
 import { ExcludeByPageIdSelectItem } from "./multi-select-item";
 import { ExcludeByPageAction } from "./RuleAction";
+import { PageID } from "@media-quest/engine";
 
 export class PageActionManager {
   private readonly _initialSelection: Set<string>;
@@ -17,7 +18,7 @@ export class PageActionManager {
     });
   }
 
-  getCurrentSelection(): ReadonlyArray<string> {
+  getCurrentSelection(): ReadonlyArray<PageID> {
     const selected = this.selectItems.filter((item) => item.isSelected).map((itm) => itm.data.pageId);
     return selected;
   }

package/src/prefix.ts

@@ -1,107 +0,0 @@
-export type SchemaPrefixValue = string & { __SCHEMA_PREFIX__: true };
-export type PagePrefixValue = string & { __PAGE_PREFIX__: true };
-// export type QuestionPrefixValue = string & { __QUESTION_PREFIX__: true };
-export type VarID = `${SchemaPrefixValue}_${PagePrefixValue}`;
-export const VarID = {
-  create: (schemaPrefix: SchemaPrefixValue, pagePrefix: PagePrefixValue): VarID => {
-    const varId = schemaPrefix + "_" + pagePrefix;
-    return varId as VarID;
-  },
-};
-const createRandomPrefix = <const P extends string>(length: number): P => {
-  const letters = "abcdefghijklmnopqrstuvyz";
-  const all = letters + letters.toUpperCase();
-  let result = "";
-  for (let i = 0; i < length; i++) {
-    const char = all.charAt(Math.floor(Math.random() * all.length));
-    result += char;
-  }
-  return result as P;
-};
-export class SchemaPrefix {
-  public static readonly MIN_LENGTH = 1;
-  private static randomLen = 5;
-  public static readonly MAX_LENGTH = 16;
-  public static fromValue = (value: SchemaPrefixValue): SchemaPrefix => {
-    return new SchemaPrefix(value);
-  };
-
-  public static fromValueOrThrow = (value: string): SchemaPrefix => {
-    if (!SchemaPrefix.isValid(value)) throw new Error("Invalid prefix");
-    return new SchemaPrefix(value);
-  };
-  public static fromString = (value: string): SchemaPrefix | false => {
-    if (!SchemaPrefix.isValid(value)) return false;
-    return new SchemaPrefix(value);
-  };
-  public static castOrCreateRandom = (value: string): SchemaPrefix => {
-    const v = SchemaPrefix.isValid(value) ? value : createRandomPrefix<SchemaPrefixValue>(SchemaPrefix.randomLen);
-    return new SchemaPrefix(v);
-  };
-
-  public static isValid = (prefix: string | 999): prefix is SchemaPrefixValue => {
-    if (typeof prefix !== "string") return false;
-    if (prefix.length < SchemaPrefix.MIN_LENGTH) return false;
-    if (prefix.length > SchemaPrefix.MAX_LENGTH) return false;
-    return true;
-  };
-
-  get value(): SchemaPrefixValue {
-    return this._value;
-  }
-
-  set value(value: string) {
-    if (!SchemaPrefix.isValid(value)) {
-      console.log("INVALID PREFIX", value);
-    } else {
-      this._value = value;
-    }
-  }
-  private constructor(private _value: SchemaPrefixValue) {}
-}
-export class PagePrefix {
-  public static readonly MIN_LENGTH = 1;
-  private static randomLen = 5;
-  public static readonly MAX_LENGTH = 16;
-  public static fromValue = (value: PagePrefixValue): PagePrefix => {
-    return new PagePrefix(value);
-  };
-
-  public static create = (): PagePrefix => {
-    const v = createRandomPrefix<PagePrefixValue>(PagePrefix.randomLen);
-    return new PagePrefix(v);
-  };
-  public static fromString = (value: string): PagePrefix | false => {
-    if (!PagePrefix.isValid(value)) return false;
-    return new PagePrefix(value);
-  };
-
-  public static fromStringOrThrow = (value: string): PagePrefixValue => {
-    if (!PagePrefix.isValid(value)) throw new Error("Invalid prefix");
-    return value;
-  };
-  public static castOrCreateRandom = (value: string): PagePrefix => {
-    const v = PagePrefix.isValid(value) ? value : createRandomPrefix<PagePrefixValue>(PagePrefix.randomLen);
-    return new PagePrefix(v);
-  };
-
-  public static isValid = (prefix: string | 999): prefix is PagePrefixValue => {
-    if (typeof prefix !== "string") return false;
-    if (prefix.length < SchemaPrefix.MIN_LENGTH) return false;
-    if (prefix.length > SchemaPrefix.MAX_LENGTH) return false;
-    return true;
-  };
-
-  get value(): PagePrefixValue {
-    return this._value;
-  }
-
-  set value(value: string) {
-    if (!PagePrefix.isValid(value)) {
-      console.log("INVALID PREFIX", value);
-    } else {
-      this._value = value;
-    }
-  }
-  private constructor(private _value: PagePrefixValue) {}
-}