@media-quest/builder 0.0.22 → 0.0.23

package/src/Builder-page.ts

@@ -1,257 +1,257 @@
-import type { BuilderQuestionDto, BuilderQuestionType } from "./Builder-question";
-import { BuilderQuestion } from "./Builder-question";
-import { BuilderObject } from "./BuilderObject";
-import type { BuilderOptionDto } from "./Builder-option";
-import { BuilderOption } from "./Builder-option";
-import type { BuilderMainVideoDto } from "./BuilderMainVideoDto";
-import type { BuilderMainImageDto } from "./BuilderMainImageDto";
-import type { BuilderMainTextDto } from "./BuilderMainText";
-import { BuilderMainText } from "./BuilderMainText";
-import { BuilderVariableOption, QuestionVariable } from "./rulebuilder/RuleVariable";
-import { DUtil, PageID } from "@media-quest/engine";
-import { PagePrefix, PagePrefixValue } from "./primitives/page-prefix";
-import { VarID } from "./primitives/varID";
-import { SchemaPrefix } from "./primitives/schema-prefix";
-
-const U = DUtil;
-export type BuilderPageType = "info-page" | "question" | "multi-select" | "form";
-
-export interface BuilderPageDto {
-  readonly id: PageID;
-  readonly prefix: PagePrefixValue;
-  _type: BuilderPageType;
-  mainText: BuilderMainTextDto;
-  nextButton: BuilderOptionDto;
-  defaultQuestion: BuilderQuestionDto;
-  questions: Array<BuilderQuestionDto>;
-  mainMedia?: BuilderMainImageDto | BuilderMainVideoDto;
-  autoplaySequence: Array<string>;
-  tags: ReadonlyArray<string>;
-}
-
-export class BuilderPage extends BuilderObject<"builder-page", BuilderPageDto> {
-  readonly objectType: "builder-page" = "builder-page";
-  readonly id: PageID;
-  private _pageType: BuilderPageType;
-  private _prefix: PagePrefix;
-  private _questions: Array<BuilderQuestion> = [];
-  private readonly _tags: Set<string>;
-  private _backgroundColor = "#FFFFFF";
-  mainMedia: BuilderMainVideoDto | BuilderMainImageDto | false = false;
-  defaultQuestion: BuilderQuestion;
-  mainText: BuilderMainText;
-  nextButton = BuilderOption.create(-1, "Neste");
-
-  public static create(type: BuilderPageType, _prefix: PagePrefixValue) {
-    const id = PageID.create();
-    const mainTextDto: BuilderMainTextDto = {
-      text: "",
-      audioFile: false,
-      autoplay: false,
-      autoplayDelay: 0,
-    };
-    const nextButtonDto = BuilderOption.create(-1, "page-next-button-text").toJson();
-    const defaultQuestionDto = BuilderQuestion.create("select-one").toJson();
-
-    const dto: BuilderPageDto = {
-      _type: type,
-      autoplaySequence: [],
-      defaultQuestion: defaultQuestionDto,
-      id,
-      nextButton: nextButtonDto,
-      mainText: mainTextDto,
-      prefix: _prefix,
-      questions: [],
-      tags: [],
-    };
-
-    const page = new BuilderPage(dto);
-    return page;
-  }
-  public static fromJson(dto: BuilderPageDto): BuilderPage {
-    const page = new BuilderPage(dto);
-    return page;
-  }
-
-  private constructor(dto: BuilderPageDto) {
-    super(dto);
-    this.id = dto.id;
-    this._pageType = dto._type;
-    const prefixInstance = PagePrefix.castOrCreateRandom(dto.prefix);
-    this._prefix = prefixInstance;
-    this.mainText = BuilderMainText.fromJson(dto.mainText);
-    this.nextButton = BuilderOption.fromJson(dto.nextButton);
-    this.defaultQuestion = BuilderQuestion.fromJson(dto.defaultQuestion);
-    this._questions = dto.questions.map((q) => BuilderQuestion.fromJson(q));
-    const tagList: string[] = Array.isArray(dto.tags) ? dto.tags : [];
-    this._tags = new Set(tagList);
-    if (dto.mainMedia) {
-      this.mainMedia = dto.mainMedia;
-    }
-    this.updateRows();
-  }
-
-  insertQuestion(question: BuilderQuestion, atIndex: number): boolean {
-    const validIndexFn = U.isInRange(0, this._questions.length);
-    if (!validIndexFn(atIndex)) {
-      return false;
-    }
-    const hasQuestion = !!this._questions.find((q) => q.id === question.id);
-    if (hasQuestion) {
-      return false;
-    }
-    this._questions.splice(atIndex, 0, question);
-    return true;
-  }
-
-  addQuestion(type: BuilderQuestionType, atIndex = -1): BuilderQuestion {
-    const question = BuilderQuestion.create(type);
-    if (atIndex < this._questions.length && atIndex >= 0) {
-      this._questions.splice(atIndex, 0, question);
-    } else {
-      this._questions.push(question);
-    }
-    return question;
-  }
-
-  /**
-   * Move a question in questions-array
-   * @param question (reference)
-   * @param toIndex
-   */
-  moveQuestion(question: BuilderQuestion, toIndex: number): boolean {
-    const validToIndexFn = U.isInRange(0, this._questions.length);
-    if (!validToIndexFn(toIndex)) {
-      return false;
-    }
-    const currentIndex = this._questions.indexOf(question);
-    if (currentIndex < 0) {
-      return false;
-    }
-    this._questions.splice(currentIndex, 1);
-    this._questions.splice(toIndex, 0, question);
-    return true;
-  }
-
-  deleteQuestion(question: BuilderQuestion) {
-    this._questions = this._questions.filter((q) => q !== question);
-    // TODO EMIT DELETED QUESTION.
-    this.updateRows();
-  }
-  private updateRows() {
-    if (this._pageType === "question" || this._pageType === "info-page") {
-      this._questions = [];
-    }
-    if (this._pageType === "form" && this._questions.length === 0) {
-      this._questions = [];
-      this.addQuestion("text");
-    }
-    if (this._pageType === "multi-select" && this._questions.length === 0) {
-      this._questions = [];
-      this.addQuestion("text");
-    }
-  }
-
-  public addTag(tag: string) {
-    this._tags.add(tag);
-  }
-  public deleteTag(tag: string) {
-    this._tags.delete(tag);
-  }
-
-  set pageType(value: BuilderPageType) {
-    this._pageType = value;
-    // TODO Emit All questions that are deleted? Listen for removed variables??
-    this.updateRows();
-  }
-
-  getQuestionVariables(
-    modulePrefix: SchemaPrefix,
-    pageNumber: number,
-  ): ReadonlyArray<QuestionVariable> {
-    const variables: QuestionVariable[] = [];
-
-    if (this._pageType === "question") {
-      const pagePrefix = this.prefix;
-      const varId = VarID.create(modulePrefix.value, pagePrefix);
-      const label = this.mainText.text;
-      const op = this.defaultQuestion.options.map((o) => {
-        const label = o.label;
-        const value = o.value;
-        return new BuilderVariableOption(label, value);
-      });
-      const singleVar = new QuestionVariable(varId, label, op, pageNumber);
-      variables.push(singleVar);
-    }
-    return variables;
-  }
-
-  get tags(): ReadonlyArray<string> {
-    return [...this._tags];
-  }
-  get pageType() {
-    return this._pageType;
-  }
-
-  get prefix() {
-    return this._prefix.value;
-  }
-
-  set prefix(value: PagePrefixValue) {
-    this._prefix.value = value;
-  }
-
-  toJson(): BuilderPageDto {
-    const questions = this._questions.map((q) => q.toJson());
-    const mainText = this.mainText.toJson();
-    const nextButton = this.nextButton.toJson();
-    const mainMedia = this.mainMedia;
-    const dto: BuilderPageDto = {
-      _type: this.pageType,
-      mainText,
-      autoplaySequence: [],
-      nextButton,
-      id: this.id,
-      tags: [...this.tags],
-      prefix: this._prefix.value,
-      defaultQuestion: this.defaultQuestion.toJson(),
-      questions,
-    };
-    if (mainMedia) {
-      dto.mainMedia = mainMedia;
-    }
-    return dto;
-  }
-
-  clone(): BuilderPageDto {
-    const dto = this.toJson();
-    const defaultQuestionClone = this.defaultQuestion.clone();
-    const mainTextClone = JSON.parse(JSON.stringify(this.mainText));
-    // const pagesClone = this
-    const questionsClone = this.questions.map((q) => q.clone());
-    const newId = PageID.create();
-    const clone: BuilderPageDto = {
-      ...dto,
-      id: newId,
-      defaultQuestion: defaultQuestionClone,
-      mainText: mainTextClone,
-      questions: questionsClone,
-    };
-    // const cloneDto
-    return clone;
-  }
-
-  get backgroundColor() {
-    return this._backgroundColor;
-  }
-
-  set backgroundColor(color: string) {
-    if (typeof color === "string") {
-      this._backgroundColor = color;
-    }
-  }
-
-  get questions(): ReadonlyArray<BuilderQuestion> {
-    return this._questions;
-  }
-}
+import type { BuilderQuestionDto, BuilderQuestionType } from "./Builder-question";
+import { BuilderQuestion } from "./Builder-question";
+import { BuilderObject } from "./BuilderObject";
+import type { BuilderOptionDto } from "./Builder-option";
+import { BuilderOption } from "./Builder-option";
+import type { BuilderMainVideoDto } from "./BuilderMainVideoDto";
+import type { BuilderMainImageDto } from "./BuilderMainImageDto";
+import type { BuilderMainTextDto } from "./BuilderMainText";
+import { BuilderMainText } from "./BuilderMainText";
+import { BuilderVariableOption, QuestionVariable } from "./rulebuilder/RuleVariable";
+import { DUtil, PageID } from "@media-quest/engine";
+import { PagePrefix, PagePrefixValue } from "./primitives/page-prefix";
+import { VarID } from "./primitives/varID";
+import { SchemaPrefix } from "./primitives/schema-prefix";
+
+const U = DUtil;
+export type BuilderPageType = "info-page" | "question" | "multi-select" | "form";
+
+export interface BuilderPageDto {
+  readonly id: PageID;
+  readonly prefix: PagePrefixValue;
+  _type: BuilderPageType;
+  mainText: BuilderMainTextDto;
+  nextButton: BuilderOptionDto;
+  defaultQuestion: BuilderQuestionDto;
+  questions: Array<BuilderQuestionDto>;
+  mainMedia?: BuilderMainImageDto | BuilderMainVideoDto;
+  autoplaySequence: Array<string>;
+  tags: ReadonlyArray<string>;
+}
+
+export class BuilderPage extends BuilderObject<"builder-page", BuilderPageDto> {
+  readonly objectType: "builder-page" = "builder-page";
+  readonly id: PageID;
+  private _pageType: BuilderPageType;
+  private _prefix: PagePrefix;
+  private _questions: Array<BuilderQuestion> = [];
+  private readonly _tags: Set<string>;
+  private _backgroundColor = "#FFFFFF";
+  mainMedia: BuilderMainVideoDto | BuilderMainImageDto | false = false;
+  defaultQuestion: BuilderQuestion;
+  mainText: BuilderMainText;
+  nextButton = BuilderOption.create(-1, "Neste");
+
+  public static create(type: BuilderPageType, _prefix: PagePrefixValue) {
+    const id = PageID.create();
+    const mainTextDto: BuilderMainTextDto = {
+      text: "",
+      audioFile: false,
+      autoplay: false,
+      autoplayDelay: 0,
+    };
+    const nextButtonDto = BuilderOption.create(-1, "page-next-button-text").toJson();
+    const defaultQuestionDto = BuilderQuestion.create("select-one").toJson();
+
+    const dto: BuilderPageDto = {
+      _type: type,
+      autoplaySequence: [],
+      defaultQuestion: defaultQuestionDto,
+      id,
+      nextButton: nextButtonDto,
+      mainText: mainTextDto,
+      prefix: _prefix,
+      questions: [],
+      tags: [],
+    };
+
+    const page = new BuilderPage(dto);
+    return page;
+  }
+  public static fromJson(dto: BuilderPageDto): BuilderPage {
+    const page = new BuilderPage(dto);
+    return page;
+  }
+
+  private constructor(dto: BuilderPageDto) {
+    super(dto);
+    this.id = dto.id;
+    this._pageType = dto._type;
+    const prefixInstance = PagePrefix.castOrCreateRandom(dto.prefix);
+    this._prefix = prefixInstance;
+    this.mainText = BuilderMainText.fromJson(dto.mainText);
+    this.nextButton = BuilderOption.fromJson(dto.nextButton);
+    this.defaultQuestion = BuilderQuestion.fromJson(dto.defaultQuestion);
+    this._questions = dto.questions.map((q) => BuilderQuestion.fromJson(q));
+    const tagList: string[] = Array.isArray(dto.tags) ? dto.tags : [];
+    this._tags = new Set(tagList);
+    if (dto.mainMedia) {
+      this.mainMedia = dto.mainMedia;
+    }
+    this.updateRows();
+  }
+
+  insertQuestion(question: BuilderQuestion, atIndex: number): boolean {
+    const validIndexFn = U.isInRange(0, this._questions.length);
+    if (!validIndexFn(atIndex)) {
+      return false;
+    }
+    const hasQuestion = !!this._questions.find((q) => q.id === question.id);
+    if (hasQuestion) {
+      return false;
+    }
+    this._questions.splice(atIndex, 0, question);
+    return true;
+  }
+
+  addQuestion(type: BuilderQuestionType, atIndex = -1): BuilderQuestion {
+    const question = BuilderQuestion.create(type);
+    if (atIndex < this._questions.length && atIndex >= 0) {
+      this._questions.splice(atIndex, 0, question);
+    } else {
+      this._questions.push(question);
+    }
+    return question;
+  }
+
+  /**
+   * Move a question in questions-array
+   * @param question (reference)
+   * @param toIndex
+   */
+  moveQuestion(question: BuilderQuestion, toIndex: number): boolean {
+    const validToIndexFn = U.isInRange(0, this._questions.length);
+    if (!validToIndexFn(toIndex)) {
+      return false;
+    }
+    const currentIndex = this._questions.indexOf(question);
+    if (currentIndex < 0) {
+      return false;
+    }
+    this._questions.splice(currentIndex, 1);
+    this._questions.splice(toIndex, 0, question);
+    return true;
+  }
+
+  deleteQuestion(question: BuilderQuestion) {
+    this._questions = this._questions.filter((q) => q !== question);
+    // TODO EMIT DELETED QUESTION.
+    this.updateRows();
+  }
+  private updateRows() {
+    if (this._pageType === "question" || this._pageType === "info-page") {
+      this._questions = [];
+    }
+    if (this._pageType === "form" && this._questions.length === 0) {
+      this._questions = [];
+      this.addQuestion("text");
+    }
+    if (this._pageType === "multi-select" && this._questions.length === 0) {
+      this._questions = [];
+      this.addQuestion("text");
+    }
+  }
+
+  public addTag(tag: string) {
+    this._tags.add(tag);
+  }
+  public deleteTag(tag: string) {
+    this._tags.delete(tag);
+  }
+
+  set pageType(value: BuilderPageType) {
+    this._pageType = value;
+    // TODO Emit All questions that are deleted? Listen for removed variables??
+    this.updateRows();
+  }
+
+  getQuestionVariables(
+    modulePrefix: SchemaPrefix,
+    pageNumber: number,
+  ): ReadonlyArray<QuestionVariable> {
+    const variables: QuestionVariable[] = [];
+
+    if (this._pageType === "question") {
+      const pagePrefix = this.prefix;
+      const varId = VarID.create(modulePrefix.value, pagePrefix);
+      const label = this.mainText.text;
+      const op = this.defaultQuestion.options.map((o) => {
+        const label = o.label;
+        const value = o.value;
+        return new BuilderVariableOption(label, value);
+      });
+      const singleVar = new QuestionVariable(varId, label, op, pageNumber);
+      variables.push(singleVar);
+    }
+    return variables;
+  }
+
+  get tags(): ReadonlyArray<string> {
+    return [...this._tags];
+  }
+  get pageType() {
+    return this._pageType;
+  }
+
+  get prefix() {
+    return this._prefix.value;
+  }
+
+  set prefix(value: PagePrefixValue) {
+    this._prefix.value = value;
+  }
+
+  toJson(): BuilderPageDto {
+    const questions = this._questions.map((q) => q.toJson());
+    const mainText = this.mainText.toJson();
+    const nextButton = this.nextButton.toJson();
+    const mainMedia = this.mainMedia;
+    const dto: BuilderPageDto = {
+      _type: this.pageType,
+      mainText,
+      autoplaySequence: [],
+      nextButton,
+      id: this.id,
+      tags: [...this.tags],
+      prefix: this._prefix.value,
+      defaultQuestion: this.defaultQuestion.toJson(),
+      questions,
+    };
+    if (mainMedia) {
+      dto.mainMedia = mainMedia;
+    }
+    return dto;
+  }
+
+  clone(): BuilderPageDto {
+    const dto = this.toJson();
+    const defaultQuestionClone = this.defaultQuestion.clone();
+    const mainTextClone = JSON.parse(JSON.stringify(this.mainText));
+    // const pagesClone = this
+    const questionsClone = this.questions.map((q) => q.clone());
+    const newId = PageID.create();
+    const clone: BuilderPageDto = {
+      ...dto,
+      id: newId,
+      defaultQuestion: defaultQuestionClone,
+      mainText: mainTextClone,
+      questions: questionsClone,
+    };
+    // const cloneDto
+    return clone;
+  }
+
+  get backgroundColor() {
+    return this._backgroundColor;
+  }
+
+  set backgroundColor(color: string) {
+    if (typeof color === "string") {
+      this._backgroundColor = color;
+    }
+  }
+
+  get questions(): ReadonlyArray<BuilderQuestion> {
+    return this._questions;
+  }
+}

package/src/Builder-question.spec.ts

@@ -1,68 +1,68 @@
-import type { BuilderQuestionDto } from "./Builder-question";
-import { BuilderQuestion } from "./Builder-question";
-import type { BuilderObjectId } from "./BuilderObject";
-
-const question1: BuilderQuestionDto = {
-    id: "q1" as BuilderObjectId.QuestionID,
-    prefix: "q1",
-    text: "sadf",
-    options: [],
-    _type: "select-one",
-};
-
-const question2: BuilderQuestionDto = {
-    id: "q3" as BuilderObjectId.QuestionID,
-    prefix: "a",
-    text: "har du..",
-    _type: "select-one",
-    // options: []
-    options: [
-        {
-            id: "q3-opt1" as BuilderObjectId.QuestionOptionID,
-            value: 0,
-            label: "Nei",
-        },
-        {
-            id: "q3-opt2" as BuilderObjectId.QuestionOptionID,
-            value: 1,
-            label: "Ja",
-        },
-        {
-            id: "q3-opt3" as BuilderObjectId.QuestionOptionID,
-            value: 9,
-            label: "Vet ikke",
-        },
-    ],
-};
-
-describe("Builder Question", () => {
-    test("Can create question from json", () => {
-        const q1 = BuilderQuestion.fromJson(question1);
-        const q1AsJson = q1.toJson();
-        expect(question1).toStrictEqual(q1AsJson);
-        const q2Instance = BuilderQuestion.fromJson(question2);
-        const q2AsJson = q2Instance.toJson();
-        expect(question2).toStrictEqual(q2AsJson);
-    });
-    test("Can add options", () => {
-        const q1 = BuilderQuestion.fromJson(question1);
-        expect(q1.options.length).toBe(0);
-        q1.addOption("Ja", 1);
-        expect(q1.options.length).toBe(1);
-        const nei = q1.addOption("Nei", 0, 0);
-        expect(q1.options.length).toBe(2);
-        expect(q1.options[0]).toBe(nei);
-        const vetIkke = q1.addOption("Vet-ikke", 9);
-        expect(q1.options.length).toBe(3);
-        expect(q1.options[2]).toBe(vetIkke);
-    });
-    test("Can delete options", () => {
-        const q = BuilderQuestion.fromJson(question2);
-        expect(q.options.length).toBe(3);
-        const o1 = q.options[0];
-        const o2 = q.options[1];
-        const o3 = q.options[2];
-        const didDelete = q.deleteOption(o1);
-        expect(q.options.length).toBe(2);
-    });
-});
+import type { BuilderQuestionDto } from "./Builder-question";
+import { BuilderQuestion } from "./Builder-question";
+import type { BuilderObjectId } from "./BuilderObject";
+
+const question1: BuilderQuestionDto = {
+    id: "q1" as BuilderObjectId.QuestionID,
+    prefix: "q1",
+    text: "sadf",
+    options: [],
+    _type: "select-one",
+};
+
+const question2: BuilderQuestionDto = {
+    id: "q3" as BuilderObjectId.QuestionID,
+    prefix: "a",
+    text: "har du..",
+    _type: "select-one",
+    // options: []
+    options: [
+        {
+            id: "q3-opt1" as BuilderObjectId.QuestionOptionID,
+            value: 0,
+            label: "Nei",
+        },
+        {
+            id: "q3-opt2" as BuilderObjectId.QuestionOptionID,
+            value: 1,
+            label: "Ja",
+        },
+        {
+            id: "q3-opt3" as BuilderObjectId.QuestionOptionID,
+            value: 9,
+            label: "Vet ikke",
+        },
+    ],
+};
+
+describe("Builder Question", () => {
+    test("Can create question from json", () => {
+        const q1 = BuilderQuestion.fromJson(question1);
+        const q1AsJson = q1.toJson();
+        expect(question1).toStrictEqual(q1AsJson);
+        const q2Instance = BuilderQuestion.fromJson(question2);
+        const q2AsJson = q2Instance.toJson();
+        expect(question2).toStrictEqual(q2AsJson);
+    });
+    test("Can add options", () => {
+        const q1 = BuilderQuestion.fromJson(question1);
+        expect(q1.options.length).toBe(0);
+        q1.addOption("Ja", 1);
+        expect(q1.options.length).toBe(1);
+        const nei = q1.addOption("Nei", 0, 0);
+        expect(q1.options.length).toBe(2);
+        expect(q1.options[0]).toBe(nei);
+        const vetIkke = q1.addOption("Vet-ikke", 9);
+        expect(q1.options.length).toBe(3);
+        expect(q1.options[2]).toBe(vetIkke);
+    });
+    test("Can delete options", () => {
+        const q = BuilderQuestion.fromJson(question2);
+        expect(q.options.length).toBe(3);
+        const o1 = q.options[0];
+        const o2 = q.options[1];
+        const o3 = q.options[2];
+        const didDelete = q.deleteOption(o1);
+        expect(q.options.length).toBe(2);
+    });
+});