@media-quest/builder 0.0.38 → 0.0.40

package/src/{theme → ARKIV}/button-bar/text-utils.spec.ts

@@ -1,105 +1,105 @@
-import { ButtonBarState, ButtonTextState, buttonTextUtils } from "./button-text-utils";
-
-const lineCount2 = 2;
-describe("Button-text-utils", () => {
-  test("ButtonTextState works", () => {
-    const b1 = new ButtonTextState("vet ikke");
-
-    expect(b1.canSplit).toBe(true);
-    expect(b1.splitDiff).toBe(4);
-    expect(b1.width).toBe(8);
-    expect(b1.isSplit).toBe(false);
-    b1.tryToSplit();
-    expect(b1.width).toBe(4);
-    expect(b1.isSplit).toBe(true);
-    b1.unSplit();
-    expect(b1.width).toBe(8);
-    expect(b1.isSplit).toBe(false);
-
-    const b2 = new ButtonTextState("ja");
-    expect(b2.splitDiff).toBe(0);
-    expect(b2.canSplit).toBe(false);
-    expect(b2.width).toBe(2);
-    expect(b2.isSplit).toBe(false);
-    b2.tryToSplit();
-    expect(b2.width).toBe(2);
-    expect(b2.isSplit).toBe(true);
-    const b3 = new ButtonTextState("Mer enn 30 minutter");
-    expect(b3.canSplit).toBe(true);
-    expect(b3.splitDiff).toBe(9);
-    expect(b3.width).toBe(19);
-    expect(b3.isSplit).toBe(false);
-    b3.tryToSplit();
-    expect(b3.width).toBe(10);
-    expect(b3.isSplit).toBe(true);
-    b3.unSplit();
-    expect(b3.getState().width).toBe(19);
-  });
-
-  test("ButtonBarState workss", () => {
-    const bar = new ButtonBarState(["ja", "nei", "vet ikke"], { oneLineMax: 10, twoLineMax: 10 });
-    expect(bar.getWidth()).toBe(13);
-    expect(bar.isFitting()).toBe(false);
-    expect(bar.isOneLine()).toBe(true);
-    expect(bar.canCompress()).toBe(true);
-    expect(bar.compressOneButton()).toBe(true);
-  });
-
-  test("Max word length works", () => {
-    const a = buttonTextUtils.maxWordLength("ja");
-    expect(buttonTextUtils.maxWordLength("ja")).toBe(2);
-    expect(buttonTextUtils.maxWordLength("Ganske fin i dag")).toBe(6);
-    expect(buttonTextUtils.maxWordLength("rått")).toBe(4);
-  });
-
-  test("All splitts work. ", () => {
-    const a = buttonTextUtils.allSplits("del da");
-    expect(a.length).toBe(2);
-  });
-
-  test("Can split a string into two lines at the middle", () => {
-    const text = "del da for helvete";
-    const a = buttonTextUtils.splitInTwo(text);
-    expect(a.first).toBe("del da for");
-    const b = buttonTextUtils.splitInTwo("Mer enn 10 minutter");
-    expect(b.longest).toBe(10);
-    const c = buttonTextUtils.splitInTwo("litt vanskelig og");
-    expect(c.first).toBe("litt");
-    expect(c.last).toBe("vanskelig og");
-  });
-
-  test("Will check if a text can fit within bounds.", () => {
-    const text = "dette blir en altfor lang text. Faen.";
-    const a = buttonTextUtils.checkLength(text);
-    expect(a.max).toBe(text.length);
-    expect(a.min).toBe(20);
-  });
-
-  test("Fit all will detect if buttons dont fit on a single line.", () => {
-    const buttons = ["ja", "nei", "vet ikke"];
-    const r1 = buttonTextUtils.fitAll(buttons, {
-      oneLine: { min: 5, max: 12 },
-      twoLine: { min: 10, max: 20 },
-    });
-
-    expect(r1.isSingleLine).toEqual(false);
-    expect(r1.requiredSpace).toEqual(buttons.join("").length);
-    expect(r1.twoLineCount).toEqual(1);
-    const r2 = buttonTextUtils.fitAll(buttons, {
-      oneLine: { min: 5, max: 13 },
-      twoLine: { min: 10, max: 20 },
-    });
-    expect(r2.isSingleLine).toEqual(true);
-    expect(r2.twoLineCount).toEqual(0);
-  });
-  test("Will calculate required space, when break", () => {
-    const buttons = ["ja", "nei", "vet ikke"];
-    const r1 = buttonTextUtils.fitAll(buttons, {
-      oneLine: { min: 5, max: 10 },
-      twoLine: { min: 5, max: 10 },
-    });
-    // expect(r1.isSingleLine).toEqual(false);
-    // expect(r1.requiredSpace).toEqual("ja".length + "nei".length + "ikke".length);
-    // expect(r1.twoLineCount).toEqual(1);
-  });
-});
+import { ButtonBarState, ButtonTextState, buttonTextUtils } from "./button-text-utils";
+
+const lineCount2 = 2;
+describe("Button-text-utils", () => {
+  test("ButtonTextState works", () => {
+    const b1 = new ButtonTextState("vet ikke");
+
+    expect(b1.canSplit).toBe(true);
+    expect(b1.splitDiff).toBe(4);
+    expect(b1.width).toBe(8);
+    expect(b1.isSplit).toBe(false);
+    b1.tryToSplit();
+    expect(b1.width).toBe(4);
+    expect(b1.isSplit).toBe(true);
+    b1.unSplit();
+    expect(b1.width).toBe(8);
+    expect(b1.isSplit).toBe(false);
+
+    const b2 = new ButtonTextState("ja");
+    expect(b2.splitDiff).toBe(0);
+    expect(b2.canSplit).toBe(false);
+    expect(b2.width).toBe(2);
+    expect(b2.isSplit).toBe(false);
+    b2.tryToSplit();
+    expect(b2.width).toBe(2);
+    expect(b2.isSplit).toBe(true);
+    const b3 = new ButtonTextState("Mer enn 30 minutter");
+    expect(b3.canSplit).toBe(true);
+    expect(b3.splitDiff).toBe(9);
+    expect(b3.width).toBe(19);
+    expect(b3.isSplit).toBe(false);
+    b3.tryToSplit();
+    expect(b3.width).toBe(10);
+    expect(b3.isSplit).toBe(true);
+    b3.unSplit();
+    expect(b3.getState().width).toBe(19);
+  });
+
+  test("ButtonBarState workss", () => {
+    const bar = new ButtonBarState(["ja", "nei", "vet ikke"], { oneLineMax: 10, twoLineMax: 10 });
+    expect(bar.getWidth()).toBe(13);
+    expect(bar.isFitting()).toBe(false);
+    expect(bar.isOneLine()).toBe(true);
+    expect(bar.canCompress()).toBe(true);
+    expect(bar.compressOneButton()).toBe(true);
+  });
+
+  test("Max word length works", () => {
+    const a = buttonTextUtils.maxWordLength("ja");
+    expect(buttonTextUtils.maxWordLength("ja")).toBe(2);
+    expect(buttonTextUtils.maxWordLength("Ganske fin i dag")).toBe(6);
+    expect(buttonTextUtils.maxWordLength("rått")).toBe(4);
+  });
+
+  test("All splitts work. ", () => {
+    const a = buttonTextUtils.allSplits("del da");
+    expect(a.length).toBe(2);
+  });
+
+  test("Can split a string into two lines at the middle", () => {
+    const text = "del da for helvete";
+    const a = buttonTextUtils.splitInTwo(text);
+    expect(a.first).toBe("del da for");
+    const b = buttonTextUtils.splitInTwo("Mer enn 10 minutter");
+    expect(b.longest).toBe(10);
+    const c = buttonTextUtils.splitInTwo("litt vanskelig og");
+    expect(c.first).toBe("litt");
+    expect(c.last).toBe("vanskelig og");
+  });
+
+  test("Will check if a text can fit within bounds.", () => {
+    const text = "dette blir en altfor lang text. Faen.";
+    const a = buttonTextUtils.checkLength(text);
+    expect(a.max).toBe(text.length);
+    expect(a.min).toBe(20);
+  });
+
+  test("Fit all will detect if buttons dont fit on a single line.", () => {
+    const buttons = ["ja", "nei", "vet ikke"];
+    const r1 = buttonTextUtils.fitAll(buttons, {
+      oneLine: { min: 5, max: 12 },
+      twoLine: { min: 10, max: 20 },
+    });
+
+    expect(r1.isSingleLine).toEqual(false);
+    expect(r1.requiredSpace).toEqual(buttons.join("").length);
+    expect(r1.twoLineCount).toEqual(1);
+    const r2 = buttonTextUtils.fitAll(buttons, {
+      oneLine: { min: 5, max: 13 },
+      twoLine: { min: 10, max: 20 },
+    });
+    expect(r2.isSingleLine).toEqual(true);
+    expect(r2.twoLineCount).toEqual(0);
+  });
+  test("Will calculate required space, when break", () => {
+    const buttons = ["ja", "nei", "vet ikke"];
+    const r1 = buttonTextUtils.fitAll(buttons, {
+      oneLine: { min: 5, max: 10 },
+      twoLine: { min: 5, max: 10 },
+    });
+    // expect(r1.isSingleLine).toEqual(false);
+    // expect(r1.requiredSpace).toEqual("ja".length + "nei".length + "ikke".length);
+    // expect(r1.twoLineCount).toEqual(1);
+  });
+});

package/src/Builder-option.ts

@@ -1,62 +1,78 @@
-import { BuilderObject } from "./BuilderObject";
-import { AudioFile } from "./media-files";
-import { OptionID } from "./primitives/ID";
-
-export interface BuilderOptionDto {
-  readonly id: OptionID;
-  readonly value: number;
-  readonly label: string;
-  readonly labelAudio?: AudioFile;
-}
-
-export class BuilderOption extends BuilderObject<"builder-question-option", BuilderOptionDto> {
-  readonly objectType = "builder-question-option";
-  id: OptionID;
-  value: number;
-  label = "";
-  private _labelAudioFile: AudioFile | false = false;
-  get labelAudioFile() {
-    return this._labelAudioFile;
-  }
-  set labelAudioFile(audioFile: AudioFile | false) {
-    this._labelAudioFile = audioFile;
-  }
-
-  private constructor(dto: BuilderOptionDto) {
-    super(dto);
-    this.id = dto.id;
-    this.value = dto.value;
-    this.label = dto.label;
-    // this.theme = dto.theme;
-  }
-  public static create(value: number, label: string) {
-    const id = OptionID.create();
-    const dto: BuilderOptionDto = {
-      id,
-      value,
-      label,
-    };
-    const instance = new BuilderOption(dto);
-    return instance;
-  }
-
-  public static fromJson(dto: BuilderOptionDto) {
-    const instance = new BuilderOption(dto);
-    return instance;
-  }
-
-  toJson(): BuilderOptionDto {
-    const dto: BuilderOptionDto = {
-      id: this.id,
-      value: this.value,
-      label: this.label,
-    };
-    return dto;
-  }
-
-  clone(): BuilderOptionDto {
-    const dto = this.toJson();
-    const cloneDto: BuilderOptionDto = { ...dto, id: OptionID.create() };
-    return cloneDto;
-  }
-}
+import { BuilderObject } from "./BuilderObject";
+import { AudioFile } from "./media-files";
+import { OptionID } from "./primitives/ID";
+import { PStyle } from "@media-quest/engine";
+
+export interface BuilderOptionDto {
+  readonly id: OptionID;
+  readonly value: number;
+  readonly label: string;
+  readonly labelAudio?: AudioFile;
+  readonly cssOverride?: PStyle;
+}
+
+export class BuilderOption extends BuilderObject<"builder-question-option", BuilderOptionDto> {
+  readonly objectType = "builder-question-option";
+
+  id: OptionID;
+
+  value: number;
+
+  label = "";
+
+  cssOverride: PStyle = {}
+
+  private _labelAudioFile: AudioFile | false = false;
+
+  get labelAudioFile() {
+    return this._labelAudioFile;
+  }
+
+  set labelAudioFile(audioFile: AudioFile | false) {
+    this._labelAudioFile = audioFile;
+  }
+
+  private constructor(dto: BuilderOptionDto) {
+    super(dto);
+    this.id = dto.id;
+    this.value = dto.value;
+    this.label = dto.label;
+    if(dto.cssOverride) {
+      this.cssOverride = { ...dto.cssOverride };
+    }
+    // this.theme = dto.theme;
+  }
+  public static create(value: number, label: string, css: PStyle = {}) {
+    const id = OptionID.create();
+    const dto: BuilderOptionDto = {
+      id,
+      value,
+      label,
+      cssOverride: css
+    };
+    
+    const instance = new BuilderOption(dto);
+    return instance;
+  }
+
+  public static fromJson(dto: BuilderOptionDto) {
+    const instance = new BuilderOption(dto);
+    return instance;
+  }
+
+  toJson(): BuilderOptionDto {
+    const dto: BuilderOptionDto = {
+      id: this.id,
+      value: this.value,
+      label: this.label,
+      cssOverride: {...this.cssOverride}
+    };
+    return dto;
+  }
+
+  clone(): BuilderOptionDto {
+    const dto = this.toJson();
+    const cloneDto: BuilderOptionDto = { ...dto, id: OptionID.create() };
+    return cloneDto;
+  }
+}

package/src/Builder-question.ts

@@ -1,98 +1,98 @@
-import type { BuilderOptionDto } from "./Builder-option";
-import { BuilderOption } from "./Builder-option";
-import { BuilderObject } from "./BuilderObject";
-import { QuestionID } from "./primitives/ID";
-
-export type BuilderQuestionType =
-  | "select-one"
-  | "select-many"
-  | "text"
-  | "time"
-  | "textarea"
-  | "date"
-  | "numeric-range"
-  | "duration";
-
-export interface BuilderQuestionDto {
-  readonly id: QuestionID;
-  _type: BuilderQuestionType;
-  text: string;
-  options: ReadonlyArray<BuilderOptionDto>;
-  prefix: string;
-}
-
-export class BuilderQuestion extends BuilderObject<"builder-question", BuilderQuestionDto> {
-  readonly objectType = "builder-question";
-  id: QuestionID;
-  type: BuilderQuestionType;
-  questionText = "";
-  options: BuilderOption[] = [];
-  prefix = "";
-
-  static create = (type: BuilderQuestionType) => {
-    const id = QuestionID.create();
-
-    return new BuilderQuestion({
-      id,
-      _type: type,
-      text: "",
-      options: [],
-      prefix: "",
-    });
-  };
-
-  public static fromJson(dto: BuilderQuestionDto): BuilderQuestion {
-    const question = new BuilderQuestion(dto);
-    return question;
-  }
-
-  private constructor(dto: BuilderQuestionDto) {
-    super(dto);
-    this.id = QuestionID.validateOrCreate(dto.id);
-    this.type = dto._type;
-    this.questionText = dto.text;
-    this.prefix = dto.prefix;
-    this.options = dto.options.map((o) => BuilderOption.fromJson(o));
-  }
-
-  addOption(label: string, value: number, atIndex = -1) {
-    const option = BuilderOption.create(value, label);
-    if (atIndex >= 0 && atIndex < this.options.length) {
-      this.options.splice(atIndex, 0, option);
-    } else {
-      this.options.push(option);
-    }
-    return option;
-  }
-
-  deleteOption(option: BuilderOption): boolean {
-    const filtered = this.options.filter((o) => o.id !== option.id);
-    const didDelete = filtered.length === this.options.length - 1;
-    this.options = filtered;
-    return didDelete;
-  }
-
-  toJson() {
-    const optionsJson = this.options.map((o) => o.toJson());
-    const dto: BuilderQuestionDto = {
-      id: this.id,
-      prefix: this.prefix,
-      _type: this.type,
-      text: this.questionText,
-      options: optionsJson,
-    };
-    return dto;
-  }
-
-  clone(): BuilderQuestionDto {
-    const cloneId = QuestionID.create();
-    const dto = this.toJson();
-    const optionsClone = this.options.map((o) => o.clone());
-    const clonedDto: BuilderQuestionDto = {
-      ...dto,
-      id: cloneId,
-      options: optionsClone,
-    };
-    return clonedDto;
-  }
-}
+import type { BuilderOptionDto } from "./Builder-option";
+import { BuilderOption } from "./Builder-option";
+import { BuilderObject } from "./BuilderObject";
+import { QuestionID } from "./primitives/ID";
+
+export type BuilderQuestionType =
+  | "select-one"
+  | "select-many"
+  | "text"
+  | "time"
+  | "textarea"
+  | "date"
+  | "numeric-range"
+  | "duration";
+
+export interface BuilderQuestionDto {
+  readonly id: QuestionID;
+  _type: BuilderQuestionType;
+  text: string;
+  options: ReadonlyArray<BuilderOptionDto>;
+  prefix: string;
+}
+
+export class BuilderQuestion extends BuilderObject<"builder-question", BuilderQuestionDto> {
+  readonly objectType = "builder-question";
+  id: QuestionID;
+  type: BuilderQuestionType;
+  questionText = "";
+  options: BuilderOption[] = [];
+  prefix = "";
+
+  static create = (type: BuilderQuestionType) => {
+    const id = QuestionID.create();
+
+    return new BuilderQuestion({
+      id,
+      _type: type,
+      text: "",
+      options: [],
+      prefix: "",
+    });
+  };
+
+  public static fromJson(dto: BuilderQuestionDto): BuilderQuestion {
+    const question = new BuilderQuestion(dto);
+    return question;
+  }
+
+  private constructor(dto: BuilderQuestionDto) {
+    super(dto);
+    this.id = QuestionID.validateOrCreate(dto.id);
+    this.type = dto._type;
+    this.questionText = dto.text;
+    this.prefix = dto.prefix;
+    this.options = dto.options.map((o) => BuilderOption.fromJson(o));
+  }
+
+  addOption(label: string, value: number, atIndex = -1) {
+    const option = BuilderOption.create(value, label, {});
+    if (atIndex >= 0 && atIndex < this.options.length) {
+      this.options.splice(atIndex, 0, option);
+    } else {
+      this.options.push(option);
+    }
+    return option;
+  }
+
+  deleteOption(option: BuilderOption): boolean {
+    const filtered = this.options.filter((o) => o.id !== option.id);
+    const didDelete = filtered.length === this.options.length - 1;
+    this.options = filtered;
+    return didDelete;
+  }
+
+  toJson() {
+    const optionsJson = this.options.map((o) => o.toJson());
+    const dto: BuilderQuestionDto = {
+      id: this.id,
+      prefix: this.prefix,
+      _type: this.type,
+      text: this.questionText,
+      options: optionsJson,
+    };
+    return dto;
+  }
+
+  clone(): BuilderQuestionDto {
+    const cloneId = QuestionID.create();
+    const dto = this.toJson();
+    const optionsClone = this.options.map((o) => o.clone());
+    const clonedDto: BuilderQuestionDto = {
+      ...dto,
+      id: cloneId,
+      options: optionsClone,
+    };
+    return clonedDto;
+  }
+}