@media-quest/builder 0.0.38 → 0.0.40

package/src/sum-score/sum-score.ts

@@ -1,167 +1,166 @@
-import { SumScoreVariableDto } from "./sum-score-variable";
-import { SumScoreVariableID } from "../primitives/ID";
-import { SumScoreAnswer } from "./sum-score-answer";
-import { CodeBook } from "../code-book/codebook";
-
-import { BuilderSchemaDto } from "../Builder-schema-dto";
-
-/**
- *
- * A constant Array that contains all legal
- */
-const ALLOWED_VALUES = [0, 1, 2, 3, 4, 5, 6, 7, 8];
-const isAllowedValue = (num: number) => {
-  const notNegative = num >= 0;
-  const lessThanNine = num < 9;
-  return notNegative && lessThanNine;
-};
-
-type BasedOnEntry =
-  | { kind: "missing"; varId: string }
-  | { kind: "invalid-variable"; varId: string; message: string }
-  | { kind: "has-value"; varId: string; value: number; weight: number; varLabel: string };
-
-export interface SumScore {
-  readonly sumScoreVariableId: SumScoreVariableID;
-  readonly name: string;
-  readonly description: string;
-  sumScore: number;
-  avg: number; // Alle besvarte spørsmål som ikke er 9.
-  useAvg: boolean;
-  includedAnswerCount: number;
-  missingAnswerCount: number;
-  skippedBy9Count: number; // Antall vetikke / hopp over
-  basedOn: Array<{ varId: string; value: number; weight: number; varLabel: string }>;
-  errorMessages: string[];
-}
-
-const calculateAll = (
-  schemaDto: BuilderSchemaDto,
-  answers: Array<SumScoreAnswer>,
-): ReadonlyArray<SumScore> => {
-  const vs = schemaDto.sumScoreVariables ?? [];
-
-  const basedOnMap = new Map<SumScoreVariableID, Array<{ varId: string; weight: number }>>();
-  const codeBook = CodeBook.fromSchema(schemaDto);
-  // codeBook.pageVariables.find(v => v.pageId === )
-  const pages = schemaDto.pages;
-  // const a: Array<{pageId: PageID,  sumScoreVariableId: SumScoreVariableID, weight: number, varId: string}> = []
-
-  pages.forEach((page) => {
-    page.includedInSumScores.forEach((includedInScores) => {
-      const variableId = includedInScores.sumScoreVariableId;
-      const weight = includedInScores.weight;
-      const p = codeBook.pageVariables.find((v) => v.pageId === page.id);
-      if (p) {
-        const currentBasedOnArray = basedOnMap.get(variableId) ?? [];
-        currentBasedOnArray.push({ varId: p.varId, weight });
-        basedOnMap.set(variableId, currentBasedOnArray);
-      } else {
-        // TODO - Global event-bus for errors?
-        console.error("INVALID DATA in calculate all sum-scores.");
-        // throw Error("Invalid data...");
-      }
-    });
-  });
-  // const pages = Array.isArray(schemaDto.pages) ? schemaDto.pages : [];
-  const results: ReadonlyArray<SumScore> = vs.map((v) => {
-    const basedOn = basedOnMap.get(v.id) ?? [];
-    return calculate(v, basedOn, answers);
-  });
-
-  return results;
-};
-const calculate = (
-  sumScoreVariable: SumScoreVariableDto,
-  basedOnVariables: Array<{ varId: string; weight: number }>,
-  answers: Array<SumScoreAnswer>,
-): SumScore => {
-  const legalValues: Array<number> = [...ALLOWED_VALUES];
-  // CALCULATE THESE!!
-  let includedAnswerCount = 0;
-  let skippedBy9Count = 0;
-  let missingAnswerCount = 0;
-  let sumScore = 0;
-  const errorMessages: string[] = [];
-  const basedOn: SumScore["basedOn"] = [];
-  const useAvg = sumScoreVariable.useAvg;
-  const basedOnEntries: BasedOnEntry[] = basedOnVariables.map((scv) => {
-    const maybeAnswer = answers.find((v) => v.varId === scv.varId);
-    let result: BasedOnEntry = { kind: "missing", varId: scv.varId };
-    if (!maybeAnswer) {
-      return result;
-    }
-
-    const value = maybeAnswer.value;
-    const varLabel = maybeAnswer.varLabel;
-    const weight = scv.weight ?? 1;
-    const varId = maybeAnswer.varId;
-
-    result = {
-      kind: "has-value",
-      varId,
-      weight,
-      value,
-      varLabel,
-    };
-
-    return result;
-  });
-
-  basedOnEntries.forEach((entry) => {
-    if (entry.kind === "missing") {
-      missingAnswerCount++;
-    }
-    if (entry.kind === "has-value") {
-      const { varId, varLabel, weight, value } = { ...entry };
-      const isAllowed = isAllowedValue(value);
-      if (isAllowed) {
-        basedOn.push({ varId, weight, value, varLabel });
-        sumScore += entry.value * entry.weight;
-        includedAnswerCount++;
-      }
-      if (value === 9) {
-        skippedBy9Count++;
-        basedOn.push({ varId, weight, value, varLabel });
-      }
-    }
-    if (entry.kind === "invalid-variable") {
-      errorMessages.push(entry.message);
-    }
-  });
-
-  const avg = sumScore / includedAnswerCount;
-  const result: SumScore = {
-    sumScoreVariableId: sumScoreVariable.id,
-    name: sumScoreVariable.name,
-    description: sumScoreVariable.description,
-    avg,
-    useAvg,
-    includedAnswerCount,
-    skippedBy9Count,
-    sumScore,
-    basedOn,
-    missingAnswerCount,
-    errorMessages,
-  };
-  // Calculate avg
-
-  return result;
-};
-const createVariable = (): SumScoreVariableDto => {
-  const id = SumScoreVariableID.create();
-  return {
-    id,
-    name: "",
-    useAvg: true,
-    description: "",
-    // basedOn: [],
-  };
-};
-export const SumScore = {
-  ALLOWED_VALUES,
-  calculate,
-  calculateAll,
-  isAllowedValue,
-  createVariable,
-};
+import { SumScoreVariableDto } from "./sum-score-variable";
+import { SumScoreVariableID } from "../primitives/ID";
+import { SumScoreAnswer } from "./sum-score-answer";
+import { CodeBook } from "../code-book/codebook";
+import { BuilderSchemaDto } from "../Builder-schema";
+
+/**
+ *
+ * A constant Array that contains all legal
+ */
+const ALLOWED_VALUES = [0, 1, 2, 3, 4, 5, 6, 7, 8];
+const isAllowedValue = (num: number) => {
+  const notNegative = num >= 0;
+  const lessThanNine = num < 9;
+  return notNegative && lessThanNine;
+};
+
+type BasedOnEntry =
+  | { kind: "missing"; varId: string }
+  | { kind: "invalid-variable"; varId: string; message: string }
+  | { kind: "has-value"; varId: string; value: number; weight: number; varLabel: string };
+
+export interface SumScore {
+  readonly sumScoreVariableId: SumScoreVariableID;
+  readonly name: string;
+  readonly description: string;
+  sumScore: number;
+  avg: number; // Alle besvarte spørsmål som ikke er 9.
+  useAvg: boolean;
+  includedAnswerCount: number;
+  missingAnswerCount: number;
+  skippedBy9Count: number; // Antall vetikke / hopp over
+  basedOn: Array<{ varId: string; value: number; weight: number; varLabel: string }>;
+  errorMessages: string[];
+}
+
+const calculateAll = (
+  schemaDto: BuilderSchemaDto,
+  answers: Array<SumScoreAnswer>,
+): ReadonlyArray<SumScore> => {
+  const vs = schemaDto.sumScoreVariables ?? [];
+
+  const basedOnMap = new Map<SumScoreVariableID, Array<{ varId: string; weight: number }>>();
+  const codeBook = CodeBook.fromSchema(schemaDto);
+  // codeBook.pageVariables.find(v => v.pageId === )
+  const pages = schemaDto.pages;
+  // const a: Array<{pageId: PageID,  sumScoreVariableId: SumScoreVariableID, weight: number, varId: string}> = []
+
+  pages.forEach((page) => {
+    page.includedInSumScores.forEach((includedInScores) => {
+      const variableId = includedInScores.sumScoreVariableId;
+      const weight = includedInScores.weight;
+      const p = codeBook.pageVariables.find((v) => v.pageId === page.id);
+      if (p) {
+        const currentBasedOnArray = basedOnMap.get(variableId) ?? [];
+        currentBasedOnArray.push({ varId: p.varId, weight });
+        basedOnMap.set(variableId, currentBasedOnArray);
+      } else {
+        // TODO - Global event-bus for errors?
+        console.error("INVALID DATA in calculate all sum-scores.");
+        // throw Error("Invalid data...");
+      }
+    });
+  });
+  // const pages = Array.isArray(schemaDto.pages) ? schemaDto.pages : [];
+  const results: ReadonlyArray<SumScore> = vs.map((v) => {
+    const basedOn = basedOnMap.get(v.id) ?? [];
+    return calculate(v, basedOn, answers);
+  });
+
+  return results;
+};
+const calculate = (
+  sumScoreVariable: SumScoreVariableDto,
+  basedOnVariables: Array<{ varId: string; weight: number }>,
+  answers: Array<SumScoreAnswer>,
+): SumScore => {
+  const legalValues: Array<number> = [...ALLOWED_VALUES];
+  // CALCULATE THESE!!
+  let includedAnswerCount = 0;
+  let skippedBy9Count = 0;
+  let missingAnswerCount = 0;
+  let sumScore = 0;
+  const errorMessages: string[] = [];
+  const basedOn: SumScore["basedOn"] = [];
+  const useAvg = sumScoreVariable.useAvg;
+  const basedOnEntries: BasedOnEntry[] = basedOnVariables.map((scv) => {
+    const maybeAnswer = answers.find((v) => v.varId === scv.varId);
+    let result: BasedOnEntry = { kind: "missing", varId: scv.varId };
+    if (!maybeAnswer) {
+      return result;
+    }
+
+    const value = maybeAnswer.value;
+    const varLabel = maybeAnswer.varLabel;
+    const weight = scv.weight ?? 1;
+    const varId = maybeAnswer.varId;
+
+    result = {
+      kind: "has-value",
+      varId,
+      weight,
+      value,
+      varLabel,
+    };
+
+    return result;
+  });
+
+  basedOnEntries.forEach((entry) => {
+    if (entry.kind === "missing") {
+      missingAnswerCount++;
+    }
+    if (entry.kind === "has-value") {
+      const { varId, varLabel, weight, value } = { ...entry };
+      const isAllowed = isAllowedValue(value);
+      if (isAllowed) {
+        basedOn.push({ varId, weight, value, varLabel });
+        sumScore += entry.value * entry.weight;
+        includedAnswerCount++;
+      }
+      if (value === 9) {
+        skippedBy9Count++;
+        basedOn.push({ varId, weight, value, varLabel });
+      }
+    }
+    if (entry.kind === "invalid-variable") {
+      errorMessages.push(entry.message);
+    }
+  });
+
+  const avg = sumScore / includedAnswerCount;
+  const result: SumScore = {
+    sumScoreVariableId: sumScoreVariable.id,
+    name: sumScoreVariable.name,
+    description: sumScoreVariable.description,
+    avg,
+    useAvg,
+    includedAnswerCount,
+    skippedBy9Count,
+    sumScore,
+    basedOn,
+    missingAnswerCount,
+    errorMessages,
+  };
+  // Calculate avg
+
+  return result;
+};
+const createVariable = (): SumScoreVariableDto => {
+  const id = SumScoreVariableID.create();
+  return {
+    id,
+    name: "",
+    useAvg: true,
+    description: "",
+    // basedOn: [],
+  };
+};
+export const SumScore = {
+  ALLOWED_VALUES,
+  calculate,
+  calculateAll,
+  isAllowedValue,
+  createVariable,
+};

package/src/tag/BuilderTag.ts

@@ -1,45 +1,45 @@
-import { BuilderObject } from "../BuilderObject";
-import { TagID } from "../primitives/ID";
-
-export interface BuilderTagDto {
-  readonly id: TagID;
-  readonly tag: string;
-  readonly description: string;
-}
-
-export class BuilderTag extends BuilderObject<"builder-tag", BuilderTagDto> {
-  readonly objectType: "builder-tag" = "builder-tag";
-  readonly id: TagID;
-  tagText = "";
-  tagDescription = "";
-  public static readonly MAX_LENGTH = 20;
-  public static readonly MIN_LENGTH = 1;
-
-  public static readonly create = (tag: string, description: string = "") => {
-    const id = TagID.create();
-    const dto: BuilderTagDto = {
-      id,
-      tag,
-      description,
-    };
-    return new BuilderTag(dto);
-  };
-  public static readonly fromDto = (dto: BuilderTagDto) => {
-    return new BuilderTag(dto);
-  };
-  protected constructor(dto: BuilderTagDto) {
-    const id = TagID.validateOrCreate(dto.id);
-    const withId = { ...dto, id };
-    super(withId);
-    this.id = id;
-    this.tagText = dto.tag ?? "";
-    this.tagDescription = dto.description ?? "";
-  }
-  clone(): BuilderTagDto {
-    return this.toJson();
-  }
-
-  toJson(): BuilderTagDto {
-    return { tag: this.tagText, description: this.tagDescription, id: this.id };
-  }
-}
+import { BuilderObject } from "../BuilderObject";
+import { TagID } from "../primitives/ID";
+
+export interface BuilderTagDto {
+  readonly id: TagID;
+  readonly tag: string;
+  readonly description: string;
+}
+
+export class BuilderTag extends BuilderObject<"builder-tag", BuilderTagDto> {
+  readonly objectType: "builder-tag" = "builder-tag";
+  readonly id: TagID;
+  tagText = "";
+  tagDescription = "";
+  public static readonly MAX_LENGTH = 20;
+  public static readonly MIN_LENGTH = 1;
+
+  public static readonly create = (tag: string, description: string = "") => {
+    const id = TagID.create();
+    const dto: BuilderTagDto = {
+      id,
+      tag,
+      description,
+    };
+    return new BuilderTag(dto);
+  };
+  public static readonly fromDto = (dto: BuilderTagDto) => {
+    return new BuilderTag(dto);
+  };
+  protected constructor(dto: BuilderTagDto) {
+    const id = TagID.validateOrCreate(dto.id);
+    const withId = { ...dto, id };
+    super(withId);
+    this.id = id;
+    this.tagText = dto.tag ?? "";
+    this.tagDescription = dto.description ?? "";
+  }
+  clone(): BuilderTagDto {
+    return this.toJson();
+  }
+
+  toJson(): BuilderTagDto {
+    return { tag: this.tagText, description: this.tagDescription, id: this.id };
+  }
+}

package/src/tag/Tag-Collection.ts

@@ -1,53 +1,53 @@
-import { BuilderTag, BuilderTagDto } from "./BuilderTag";
-
-export class TagCollection implements Iterable<BuilderTag> {
-  private readonly _tags = new Set<BuilderTag>();
-  public static readonly create = () => {
-    return new TagCollection([]);
-  };
-
-  [Symbol.iterator]() {
-    const list = [...this._tags];
-    return list[Symbol.iterator]();
-  }
-
-  private constructor(initialTags: ReadonlyArray<BuilderTag>) {
-    initialTags.forEach((tag) => {
-      this._tags.add(tag);
-    });
-  }
-
-  init(tags: ReadonlyArray<BuilderTagDto>) {
-    const dtoList: ReadonlyArray<BuilderTagDto> = Array.isArray(tags) ? tags : [];
-    const all = dtoList.map(BuilderTag.fromDto);
-    all.forEach((tag) => {
-      this._tags.add(tag);
-    });
-  }
-
-  add(tag: BuilderTag) {
-    this._tags.add(tag);
-  }
-
-  /**
-   * Delete this tag from collection;
-   * @param tag
-   */
-  delete(tag: BuilderTag) {
-    this._tags.delete(tag);
-  }
-
-  toJson(): ReadonlyArray<BuilderTagDto> {
-    const list = [...this._tags];
-    const dtoList = list.map((t) => t.toJson());
-    return dtoList;
-  }
-
-  deleteAll(tags: Iterable<BuilderTag>) {
-    const l = tags[Symbol.iterator]();
-    const asList = [...tags];
-    asList.forEach((t) => {
-      this.delete(t);
-    });
-  }
-}
+import { BuilderTag, BuilderTagDto } from "./BuilderTag";
+
+export class TagCollection implements Iterable<BuilderTag> {
+  private readonly _tags = new Set<BuilderTag>();
+  public static readonly create = () => {
+    return new TagCollection([]);
+  };
+
+  [Symbol.iterator]() {
+    const list = [...this._tags];
+    return list[Symbol.iterator]();
+  }
+
+  private constructor(initialTags: ReadonlyArray<BuilderTag>) {
+    initialTags.forEach((tag) => {
+      this._tags.add(tag);
+    });
+  }
+
+  init(tags: ReadonlyArray<BuilderTagDto>) {
+    const dtoList: ReadonlyArray<BuilderTagDto> = Array.isArray(tags) ? tags : [];
+    const all = dtoList.map(BuilderTag.fromDto);
+    all.forEach((tag) => {
+      this._tags.add(tag);
+    });
+  }
+
+  add(tag: BuilderTag) {
+    this._tags.add(tag);
+  }
+
+  /**
+   * Delete this tag from collection;
+   * @param tag
+   */
+  delete(tag: BuilderTag) {
+    this._tags.delete(tag);
+  }
+
+  toJson(): ReadonlyArray<BuilderTagDto> {
+    const list = [...this._tags];
+    const dtoList = list.map((t) => t.toJson());
+    return dtoList;
+  }
+
+  deleteAll(tags: Iterable<BuilderTag>) {
+    const l = tags[Symbol.iterator]();
+    const asList = [...tags];
+    asList.forEach((t) => {
+      this.delete(t);
+    });
+  }
+}