@media-quest/builder 0.0.26 → 0.0.28

package/src/code-book/codebook.ts

@@ -1,72 +1,81 @@
-import { BuilderPageDto } from "../Builder-page";
-import { BuilderSchemaDto } from "../Builder-schema";
-import { CodeBookQuestionVariable, CodebookPredefinedVariable } from "./codebook-variable";
-
-export interface Codebook {
-  readonly predefinedVariables: ReadonlyArray<CodebookPredefinedVariable>;
-  readonly pageVariables: ReadonlyArray<CodeBookQuestionVariable>;
-}
-
-const fromPage = (
-  page: BuilderPageDto,
-  pagePosition: number,
-  modulePrefix: string,
-): CodeBookQuestionVariable[] => {
-  const variables: CodeBookQuestionVariable[] = [];
-
-  if (page._type !== "question") {
-    // TODO Implement form field variables
-    return [];
-  }
-
-  const options: CodeBookQuestionVariable["options"] = page.defaultQuestion.options.map((o) => {
-    return { value: o.value, label: o.label };
-  });
-
-  const variable: CodeBookQuestionVariable = {
-    kind: "codebook-question-variable",
-    label: page.mainText.text,
-    pageId: page.id,
-    pagePrefix: page.prefix,
-    options,
-    modulePrefix,
-    pagePosition,
-    questionPrefix: "",
-    varId: modulePrefix + "_" + page.prefix,
-  };
-
-  variables.push(variable);
-
-  return variables;
-};
-
-/**
- * Converts a list of pages into a list of question-variables
- * @param pages
- * @param modulePrefix
- */
-const getPageVariablesFromPages = (
-  pages: BuilderPageDto[],
-  modulePrefix: string,
-): CodeBookQuestionVariable[] => {
-  const variables: CodeBookQuestionVariable[] = [];
-  pages.forEach((page, index) => {
-    const pageVariables = fromPage(page, index, modulePrefix);
-    variables.push(...pageVariables);
-  });
-  return variables;
-};
-
-const fromSchema = (schema: BuilderSchemaDto): Codebook => {
-  const modulePrefix = schema.prefix;
-  const pageVariables = getPageVariablesFromPages(schema.pages, modulePrefix);
-  const vs = schema.predefinedVariables;
-  const predefinedVariables: CodebookPredefinedVariable[] = vs ? [...vs] : [];
-  return { pageVariables, predefinedVariables };
-};
-
-export const _CodeBook = {
-  fromSchema,
-} as const;
-
-export const CodeBook = Object.freeze(_CodeBook);
+import { BuilderPageDto } from "../page/Builder-page";
+import { BuilderSchemaDto } from "../Builder-schema";
+import { CodeBookQuestionVariable, CodebookPredefinedVariable } from "./codebook-variable";
+import { SumScoreVariableDto } from "../sum-score/sum-score-variable";
+
+export interface Codebook {
+  readonly predefinedVariables: ReadonlyArray<CodebookPredefinedVariable>;
+  readonly pageVariables: ReadonlyArray<CodeBookQuestionVariable>;
+}
+
+const fromPage = (
+  page: BuilderPageDto,
+  sumScoreVariables: ReadonlyArray<SumScoreVariableDto>,
+  pagePosition: number,
+  modulePrefix: string,
+): CodeBookQuestionVariable[] => {
+  const variables: CodeBookQuestionVariable[] = [];
+
+  if (page._type !== "question") {
+    // TODO Implement form field variables
+    return [];
+  }
+
+  const options: CodeBookQuestionVariable["options"] = page.defaultQuestion.options.map((o) => {
+    return { value: o.value, label: o.label };
+  });
+
+  const varId = modulePrefix + "_" + page.prefix;
+
+  const includedInSumScores = page.includedInSumScores.filter((a) => true);
+
+  const variable: CodeBookQuestionVariable = {
+    kind: "codebook-question-variable",
+    label: page.mainText.text,
+    pageId: page.id,
+    pagePrefix: page.prefix,
+    options,
+    modulePrefix,
+    pagePosition,
+    varId,
+    includedInSumScores: [],
+  };
+
+  variables.push(variable);
+
+  return variables;
+};
+
+/**
+ * Converts a list of pages into a list of question-variables
+ * @param pages
+ * @param sumScoreVariables
+ * @param modulePrefix
+ */
+const getPageVariablesFromPages = (
+  pages: ReadonlyArray<BuilderPageDto>,
+  sumScoreVariables: ReadonlyArray<SumScoreVariableDto>,
+  modulePrefix: string,
+): CodeBookQuestionVariable[] => {
+  const variables: CodeBookQuestionVariable[] = [];
+  pages.forEach((page, index) => {
+    const pageVariables = fromPage(page, sumScoreVariables, index, modulePrefix);
+    variables.push(...pageVariables);
+  });
+  return variables;
+};
+
+const fromSchema = (schema: BuilderSchemaDto): Codebook => {
+  const modulePrefix = schema.prefix;
+  const sumScoreVariables = schema.sumScoreVariables ?? [];
+  const pageVariables = getPageVariablesFromPages(schema.pages, sumScoreVariables, modulePrefix);
+  const vs = schema.predefinedVariables;
+  const predefinedVariables: CodebookPredefinedVariable[] = vs ? [...vs] : [];
+  return { pageVariables, predefinedVariables };
+};
+
+export const _CodeBook = {
+  fromSchema,
+} as const;
+
+export const CodeBook = Object.freeze(_CodeBook);

package/src/page/Builder-page-collection.spec.ts

@@ -0,0 +1,219 @@
+import { BuilderTag, BuilderTagDto } from "../tag/BuilderTag";
+import { PagePrefix } from "../primitives/page-prefix";
+import { BuilderPageCollection } from "./Builder-page-collection";
+import { OptionID, PageID, QuestionID } from "../primitives/ID";
+import { BuilderPage, BuilderPageDto } from "./Builder-page";
+import { SumScoreVariable } from "../sum-score/sum-score-variable";
+import { SumScoreVariableCollection } from "../sum-score/sum-score-variable-collection";
+
+const tag1: BuilderTagDto = BuilderTag.create("tag1", "This tag is defined in schemaDto1").toJson();
+
+const tag2: BuilderTagDto = BuilderTag.create("tag2", "This tag is defined in schemaDto1").toJson();
+const tag3: BuilderTagDto = BuilderTag.create("tag3", "This tag is defined in schemaDto1").toJson();
+
+const sumScoreVariable1 = SumScoreVariable.create({
+  name: "ss1",
+  useAvg: true,
+  description: "ss1 description",
+});
+const sumScoreVariable2 = SumScoreVariable.create({
+  name: "ss2",
+  useAvg: true,
+  description: "ss2 description",
+});
+const sumScoreVariable3 = SumScoreVariable.create({
+  name: "ss3",
+  useAvg: true,
+  description: "ss3 description",
+});
+
+const pages: BuilderPageDto[] = [
+  {
+    id: PageID.validateOrCreate("a".repeat(24)),
+    _type: "info-page",
+    prefix: PagePrefix.fromStringOrThrow("p1"),
+    mainText: {
+      text: "hello from test",
+      autoplay: false,
+      autoplayDelay: 0,
+      audioFile: false,
+    },
+    includedInSumScores: [{ sumScoreVariableId: sumScoreVariable1.id, weight: 1 }],
+
+    nextButton: {
+      id: OptionID.create(),
+      label: "Neste",
+      value: -1,
+    },
+    defaultQuestion: {
+      id: QuestionID.create(),
+      prefix: "one-prefix",
+      _type: "select-one",
+      text: "q1-text",
+      options: [
+        {
+          id: "opt-nei" as OptionID,
+          value: 0,
+          label: "Nei",
+        },
+        {
+          id: "opt-ja" as OptionID,
+          value: 1,
+          label: "Ja",
+        },
+        {
+          id: "opt-vet-ikke" as OptionID,
+          value: 9,
+          label: "Vet ikke",
+        },
+      ],
+    },
+    tags: [
+      tag1.tag,
+      tag2.tag,
+      // { tag: 'can_read', description: 'The patient can read' },
+      // { tag: 'is grown up', description: 'Is grownUp.' }
+    ],
+    autoplaySequence: [],
+  },
+  {
+    id: PageID.dummy.b,
+    _type: "question",
+    prefix: PagePrefix.fromStringOrThrow("page2-prefix"),
+    tags: [tag3.tag],
+    includedInSumScores: [],
+    mainText: {
+      text: "hello from test",
+      autoplay: false,
+      autoplayDelay: 0,
+      audioFile: false,
+    },
+    nextButton: {
+      id: "next-button-id-page2" as OptionID,
+      label: "Neste",
+      value: -1,
+    },
+    defaultQuestion: {
+      id: QuestionID.validateOrCreate("default-question-id"),
+      prefix: "one-prefix",
+      _type: "select-one",
+      text: "q1",
+      options: [],
+    },
+    autoplaySequence: [],
+  },
+];
+
+let sumScoreVariableCollection = SumScoreVariableCollection.create([
+  sumScoreVariable1,
+  sumScoreVariable2,
+  sumScoreVariable3,
+]);
+let empty = BuilderPageCollection.create([]);
+beforeEach(() => {
+  sumScoreVariableCollection = SumScoreVariableCollection.create([
+    sumScoreVariable1,
+    sumScoreVariable2,
+    sumScoreVariable3,
+  ]);
+  empty = BuilderPageCollection.create([]);
+});
+
+describe("Builder page collection", () => {
+  test("Can add pages.", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("info-page");
+    expect(empty.size).toBe(2);
+  });
+
+  test("Can delete page by id,", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("question");
+    const p3 = empty.add("info-page");
+    expect(empty.size).toBe(3);
+    const result = empty.deleteById(p1.id);
+    expect(empty.size).toBe(2);
+    expect(result).toBe(true);
+    const result2 = empty.deleteById(p2.id);
+    expect(result2).toBe(true);
+    expect(empty.size).toBe(1);
+    expect(empty.pages[0]).toBe(p3);
+    const result3 = empty.deleteById(PageID.create());
+    expect(result3).toBe(false);
+  });
+
+  test("fromJson === toJson", () => {
+    const col = BuilderPageCollection.create(pages);
+    const json = col.toJson();
+    expect(pages).toStrictEqual(json);
+  });
+  //
+
+  test("Can add page at concrete index", () => {
+    const p1 = empty.add("question");
+    expect(p1.pageType).toBe("question");
+    const p2 = empty.add("info-page", 0);
+    expect(p2.pageType).toBe("info-page");
+
+    expect(empty.pages[0].id).toBe(p2.id);
+    empty.add("question");
+    empty.add("question");
+    const last = empty.add("question");
+    expect(empty.pages[empty.pages.length - 1]).toBe(last);
+    const p3 = empty.add("info-page", 4);
+    expect(empty.pages[4].id).toBe(p3.id);
+  });
+  //
+  test("Can move page up and down", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("question");
+    const p3 = empty.add("question");
+    const p4 = empty.add("info-page");
+    const last = empty.add("question");
+    empty.movePage(p2, 0);
+    expect(empty.pages[0]).toBe(p2);
+    expect(empty.pages[1]).toBe(p1);
+    expect(empty.movePage(p4, 4)).toBeTruthy();
+    expect(empty.movePage(p4, 5)).toBeFalsy();
+    expect(empty.movePage(p4, 10)).toBeFalsy();
+
+    expect(empty.pages[4].id).toBe(p4.id);
+    expect(empty.pages[3].id).toBe(last.id);
+  });
+  //
+  test("Can clone a page and insert at index", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("question");
+    const p3 = empty.add("question");
+    const mainTextContent = "Hello from test";
+    const p4 = empty.add("info-page");
+    p3.mainText.text = mainTextContent;
+    const p1Clone = BuilderPage.fromJson(p1.clone());
+    const beforSize = empty.size;
+    empty.insertPage(p1Clone, 2);
+    // const pages = s1.pages;
+    expect(beforSize + 1).toBe(empty.size);
+    expect(empty.pages[2]).toBe(p1Clone);
+  });
+
+  test("Will not insert a page that is already in array.", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("question");
+    const p3 = empty.add("question");
+    const beforeSize = empty.size;
+    const result = empty.insertPage(p1, 0);
+    const pages = empty.pages;
+    expect(beforeSize).toBe(empty.size);
+    expect(result).toBe(false);
+  });
+  test("Will always update the page-number on every page.", () => {
+    const p1 = empty.add("question");
+    const p2 = empty.add("question");
+    const p3 = empty.add("question");
+    const beforeSize = empty.size;
+    const result = empty.insertPage(p1, 0);
+    const pages = empty.pages;
+    expect(beforeSize).toBe(empty.size);
+    expect(result).toBe(false);
+  });
+});

package/src/page/Builder-page-collection.ts

@@ -0,0 +1,129 @@
+import { DUtil } from "@media-quest/engine";
+import { BuilderPage, BuilderPageDto } from "./Builder-page";
+import { PageID, PagePrefix, SumScoreVariableID } from "../public-api";
+import { SumScoreVariableCollection } from "../sum-score/sum-score-variable-collection";
+import { SumScoreVariable } from "../sum-score/sum-score-variable";
+
+const U = DUtil;
+export type BuilderPageType = "info-page" | "question";
+
+export class BuilderPageCollection implements Iterable<BuilderPage> {
+  private _all: Array<BuilderPage> = [];
+
+  public static create(pages: BuilderPageDto[]) {
+    const page = new BuilderPageCollection(pages);
+    page._all = pages.map((p) => BuilderPage.fromJson(p));
+    return page;
+  }
+  private constructor(initialPages: BuilderPageDto[]) {}
+
+  /** @internal - used by Schema*/
+  _init(pages: BuilderPageDto[]) {
+    this._all = pages.map(BuilderPage.fromJson);
+  }
+
+  add(type: BuilderPageType, atIndex = -1): BuilderPage {
+    const pagePrefix = PagePrefix.create();
+    const newPage = BuilderPage.create(type, pagePrefix.value);
+    if (atIndex >= 0 && atIndex < this._all.length) {
+      this._all.splice(atIndex, 0, newPage);
+    } else {
+      this._all.push(newPage);
+    }
+    return newPage;
+  }
+
+  deleteById(id: PageID) {
+    const index = this._all.findIndex((p) => p.id === id);
+    if (index !== -1) {
+      this._all.splice(index, 1);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  private getPageById(pageId: PageID) {
+    const maybePage = this._all.find((p) => p.id === pageId);
+    return maybePage ?? false;
+  }
+  get size() {
+    return this._all.length;
+  }
+  get pages(): ReadonlyArray<BuilderPage> {
+    return [...this._all];
+  }
+  toJson(): ReadonlyArray<BuilderPageDto> {
+    return this._all.map((p) => p.toJson());
+  }
+
+  [Symbol.iterator]() {
+    const list = [...this._all];
+    return list[Symbol.iterator]();
+  }
+
+  movePage(page: BuilderPage, toIndex: number) {
+    const index = this._all.indexOf(page);
+    if (index < 0) {
+      return false;
+    }
+    const isValidIndex = U.isInRange(0, this._all.length - 1);
+    if (!isValidIndex(toIndex)) {
+      return false;
+    }
+    // console.log('Moving from :' + index + ' to: ' + toIndex);
+    this._all.splice(index, 1);
+    this._all.splice(toIndex, 0, page);
+    return true;
+  }
+
+  insertPage(page: BuilderPage, atIndex: number) {
+    const isValidIndex = U.isInRange(0, this._all.length - 1);
+    if (!isValidIndex(atIndex)) {
+      return false;
+    }
+    const exists = !!this._all.find((p) => p.id === page.id);
+    if (exists) {
+      return false;
+    }
+    this._all.splice(atIndex, 0, page);
+    return true;
+  }
+
+  addSumScoreVariable(sumScoreVariable: SumScoreVariable, pageId: PageID, weight: number) {
+    const maybePage = this.getPageById(pageId);
+    if (!maybePage) return false;
+    maybePage.sumScoreVariableSet(sumScoreVariable, weight);
+
+    // maybePage.addSumScoreVariable(maybeVariable, weight);
+    return true;
+  }
+
+  updateRelationShips(context: { sumScoreVariables: ReadonlyArray<SumScoreVariable> }) {
+    const { sumScoreVariables } = context;
+
+    // Update all relationships in pages.
+    this._all.forEach((p) => {
+      p.updateRelationShips(context.sumScoreVariables);
+    });
+
+    // Set the used in pages array on every variable.
+    sumScoreVariables.forEach((v) => {
+      const usedInPages = this._all.filter((p) => p._isIncludedInSumScore(v.id));
+      v._setUsedInPages(usedInPages);
+    });
+  }
+
+  sumScoreVariableDelete(sumScoreVariableID: SumScoreVariableID) {
+    this._all.forEach((p) => {
+      p.sumScoreVariableDelete(sumScoreVariableID);
+    });
+  }
+
+  sumScoreVariableDeleteFromPage(pageId: PageID, sumScoreVariableId: SumScoreVariableID) {
+    const maybePage = this.getPageById(pageId);
+    if (!maybePage) return false;
+    maybePage.sumScoreVariableDelete(sumScoreVariableId);
+    return true;
+  }
+}

package/src/{Builder-page.spec.ts → page/Builder-page.spec.ts}

@@ -1,11 +1,11 @@
 import { BuilderPage } from "./Builder-page";
 import type { BuilderPageDto } from "./Builder-page";
-import type { BuilderQuestionDto } from "./Builder-question";
-import { BuilderQuestion } from "./Builder-question";
+import type { BuilderQuestionDto } from "../Builder-question";
 import { DUtil } from "@media-quest/engine";
-import { PagePrefix } from "./primitives/page-prefix";
-import { SchemaPrefix } from "./primitives/schema-prefix";
-import { OptionID, PageID, QuestionID } from "./primitives/ID";
+import { PagePrefix } from "../primitives/page-prefix";
+import { SchemaPrefix } from "../primitives/schema-prefix";
+import { OptionID, PageID, QuestionID, SumScoreVariableID } from "../primitives/ID";
+import { SumScoreVariable } from "../sum-score/sum-score-variable";
 
 const U = DUtil;
 const deleteIdsFromPage = (page: BuilderPageDto) => {
@@ -24,6 +24,7 @@ const pxx = PagePrefix.fromStringOrThrow("pxx");
 const questionPageDto: BuilderPageDto = {
   _type: "question",
   autoplaySequence: [],
+  includedInSumScores: [],
   mainText: {
     text: "Velkommen til denne undersøkelsen.",
     audioFile: false,
@@ -66,7 +67,8 @@ const questionPageDto: BuilderPageDto = {
 };
 
 const multiQuestionPageDto: BuilderPageDto = {
-  _type: "multi-select",
+  _type: "question",
+  includedInSumScores: [],
   mainText: {
     text: "Velkommen til denne undersøkelsen.",
     audioFile: false,
@@ -159,4 +161,17 @@ describe("Builder Page", () => {
     // expect(page1.questions.length).toBe(3);
     // expect(m1).toBe(false);
   });
+  test("Can check if page is included in sum-score-variable", () => {
+    const prefix = PagePrefix.fromStringOrThrow("as1");
+    const page = BuilderPage.create("question", prefix);
+    const ss1 = SumScoreVariable.create({ name: "ss1", description: "ss1_desc", useAvg: true });
+    const ss2 = SumScoreVariable.create({ name: "ss1", description: "ss1_desc", useAvg: true });
+    const success1 = page.sumScoreVariableSet(ss1, 1);
+    const success2 = page.sumScoreVariableSet(ss2, 1);
+    expect(success1).toBe(true);
+    expect(success2).toBe(true);
+    expect(page._isIncludedInSumScore(ss1.id)).toBe(true);
+    expect(page._isIncludedInSumScore(ss2.id)).toBe(true);
+    expect(page._isIncludedInSumScore(SumScoreVariableID.dummy.a)).toBe(false);
+  });
 });