@media-quest/builder 0.0.24 → 0.0.25

package/src/variable/{mq-variable.ts → b-variable.ts}

@@ -1,6 +1,5 @@
-export interface MqVariable {
+export interface BVariable {
   readonly kind: "numeric-variable" | "numeric-range-variable" | "string-variable";
-
   label: string;
   varId: string;
   description?: string;
@@ -28,6 +27,7 @@ export interface MqVariable {
   pageId?: string;
   eventSource?: string;
   pagePrefix?: string;
+  questionPrefix?: string;
   modulePrefix?: string;
   moduleID?: string;
   pageNumber?: number;
@@ -47,11 +47,11 @@ export interface MqVariable {
 }
 
 const MISSING = 999;
-export const MqVariable = {
+export const BVariable = {
   MISSING,
 } as const;
 
-export interface PageVariable extends MqVariable {
+export interface PageVariable extends BVariable {
   readonly pageId: string;
   readonly pagePrefix: string;
   readonly pagePosition: number;
@@ -59,7 +59,7 @@ export interface PageVariable extends MqVariable {
   readonly origin: "question" | "form-field";
 }
 
-export interface PredefinedVariable extends MqVariable {
+export interface PredefinedVariable extends BVariable {
   readonly origin: "predefined";
   readonly modulePrefix: string;
   readonly moduleID: string;

package/src/variable/mq-variable.spec.ts

@@ -1,6 +1,7 @@
-import { MqVariable } from "./mq-variable";
-import { SumScoreVariable, SumScore } from "./sum-score";
-const createVariable = (value: number): MqVariable => {
+import { BVariable } from "./b-variable";
+import { SumScore } from "./sum-score";
+import { SumScoreVariableDto } from "./sum-score-variable";
+const createVariable = (value: number): BVariable => {
   return {
     varId: "v" + value,
     label: "label for v" + value,
@@ -10,8 +11,8 @@ const createVariable = (value: number): MqVariable => {
   };
 };
 
-const createSumScore = (basedOn: Array<{ variable: MqVariable; weight?: number }>) => {
-  const sumVar1: SumScoreVariable = {
+const createSumScore = (basedOn: Array<{ variable: BVariable; weight?: number }>) => {
+  const sumVar1: SumScoreVariableDto = {
     kind: "numeric-variable",
     initialValue: 0,
     min: 0,

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

@@ -0,0 +1,50 @@
+import { BVariable } from "./b-variable";
+import { BuilderObjectId } from "../BuilderObject";
+// import { PageID } from "@media-quest/engine";
+// import { BuilderObject, BuilderObjectId } from "../BuilderObject";
+//
+// export class SumScoreVariable {}
+export interface SumScoreVariableDto extends BVariable {
+  readonly origin: "sum-score";
+  useAvg?: boolean;
+  /**
+   * All variables that the sum-score should be based on.
+   */
+  basedOn: Array<{ varId: string; weight?: number }>;
+}
+export interface SumScoreEntry {
+  sumScoreId: BuilderObjectId.SumScoreVariableId;
+  // pageId: PageID;
+}
+// export class SumScoreVariable extends BuilderObject<
+//   "builder-sum-score-variable",
+//   SumScoreVariableDto
+// > {
+//   readonly useAvg = false;
+//   readonly basedOn: Array<{ varId: string; weight?: number }>;
+//   readonly id: BuilderObjectId.SumScoreVariableId;
+//   label = ""
+//   description = ""
+//   toJson(): SumScoreVariableDto {
+//     const basedOn = [...this.basedOn]
+//     const varId = this.id
+//     const label = this.label;
+//
+//     return {
+//           origin: "sum-score",
+//       varId,
+//       label,
+//           useAvg: this.useAvg,
+//           basedOn,
+//         };
+//   }
+//   clone(): SumScoreVariableDto {
+//     throw new Error("Method not implemented.");
+//   }
+//   readonly objectType = "builder-sum-score-variable";
+//   constructor(dto: SumScoreVariableDto) {
+//     super(dto);
+//     this.useAvg = dto.useAvg;
+//     this.basedOn = dto.basedOn;
+//   }
+// }

package/src/variable/sum-score.ts

@@ -1,13 +1,5 @@
-import { MqVariable } from "./mq-variable";
-
-export interface SumScoreVariable extends MqVariable {
-  readonly origin: "sum-score";
-  useAvg?: boolean;
-  /**
-   * All variables that the sum-score should be based on.
-   */
-  basedOn: Array<{ varId: string; weight?: number }>;
-}
+import { BVariable } from "./b-variable";
+import { SumScoreVariableDto } from "./sum-score-variable";
 
 /**
  *
@@ -37,8 +29,8 @@ export interface SumScore {
 }
 
 const calculate = (
-  sumScoreVariable: SumScoreVariable,
-  allVariables: Array<Pick<MqVariable, "varId" | "numericValue" | "kind" | "label">>,
+  sumScoreVariable: SumScoreVariableDto,
+  allVariables: Array<Pick<BVariable, "varId" | "numericValue" | "kind" | "label">>,
 ): SumScore => {
   const legalValues: Array<number> = [...ALLOWED_VALUES];
 
@@ -66,7 +58,7 @@ const calculate = (
       };
       return result;
     }
-    const value = maybeVariable.numericValue ?? MqVariable.MISSING;
+    const value = maybeVariable.numericValue ?? BVariable.MISSING;
     const varLabel = maybeVariable.label;
     const weight = scv.weight ?? 1;
     const varId = maybeVariable.varId;
@@ -119,7 +111,7 @@ const calculate = (
 
   return result;
 };
-const createVariable = (varId: string): SumScoreVariable => {
+const createVariable = (varId: string): SumScoreVariableDto => {
   return {
     origin: "sum-score",
     kind: "numeric-variable",