@media-quest/builder 0.0.38 → 0.0.40

package/dist/public-api.d.ts

@@ -1,4 +1,4 @@
-import { Condition, PageQueRules, SchemaDto, DStyle } from '@media-quest/engine';
+import { PStyle as PStyle$1, Condition, PageQueRules, SchemaDto, DStyle } from '@media-quest/engine';
 
 /**
  * Builder objects are complex objects that are embedded inside
@@ -17,33 +17,29 @@ declare abstract class BuilderObject<T extends BuilderObjectType, Dto extends {}
 interface AudioFile {
     readonly kind: "audio-file";
     readonly id: string;
-    downloadUrl: string;
+    readonly downloadUrl: string;
     readonly duration: number;
     readonly originalFileName: string;
     readonly name: string;
     readonly size: number;
-    readonly relativePath?: string;
 }
 interface VideoFile {
     readonly kind: "video-file";
     readonly id: string;
-    downloadUrl: string;
+    readonly downloadUrl: string;
     readonly duration: number;
     readonly name: string;
     readonly size: number;
     readonly type: string;
     readonly originalFileName: string;
-    readonly relativePath?: string;
 }
 interface ImageFile {
     readonly kind: "image-file";
     readonly id: string;
-    downloadUrl: string;
+    readonly downloadUrl: string;
     readonly name: string;
     readonly size: number;
     readonly type: string;
-    readonly originalFileName?: string;
-    readonly relativePath?: string;
 }
 
 type ID<B extends string> = string & {
@@ -93,17 +89,19 @@ interface BuilderOptionDto {
     readonly value: number;
     readonly label: string;
     readonly labelAudio?: AudioFile;
+    readonly cssOverride?: PStyle$1;
 }
 declare class BuilderOption extends BuilderObject<"builder-question-option", BuilderOptionDto> {
     readonly objectType = "builder-question-option";
     id: OptionID;
     value: number;
     label: string;
+    cssOverride: PStyle$1;
     private _labelAudioFile;
     get labelAudioFile(): AudioFile | false;
     set labelAudioFile(audioFile: AudioFile | false);
     private constructor();
-    static create(value: number, label: string): BuilderOption;
+    static create(value: number, label: string, css?: PStyle$1): BuilderOption;
     static fromJson(dto: BuilderOptionDto): BuilderOption;
     toJson(): BuilderOptionDto;
     clone(): BuilderOptionDto;
@@ -599,89 +597,6 @@ declare class BuilderTag extends BuilderObject<"builder-tag", BuilderTagDto> {
     toJson(): BuilderTagDto;
 }
 
-interface SumScoreVariableDto {
-    id: SumScoreVariableID;
-    name: string;
-    description: string;
-    useAvg: boolean;
-}
-declare class SumScoreVariable extends BuilderObject<"builder-sum-score-variable", SumScoreVariableDto> {
-    readonly objectType = "builder-sum-score-variable";
-    readonly id: SumScoreVariableID;
-    private _useAvg;
-    private _name;
-    private _description;
-    private _error;
-    private _usedIn;
-    get usedIn(): BuilderPage[];
-    static readonly create: (data: {
-        name: string;
-        description: string;
-        useAvg: boolean;
-    }) => SumScoreVariable;
-    get hasErrors(): boolean;
-    static fromDto: (dto: SumScoreVariableDto) => SumScoreVariable;
-    private constructor();
-    toJson(): SumScoreVariableDto;
-    clone(): SumScoreVariableDto;
-    get name(): string;
-    get description(): string;
-    get useAvg(): boolean;
-}
-
-/**
- * Interface representing a code book question sum-score.
- *
- * @interface
- */
-interface CodeBookQuestionVariable {
-    readonly kind: "codebook-question-variable";
-    readonly label: string;
-    readonly varId: string;
-    readonly pageId: PageID;
-    readonly pagePrefix: string;
-    readonly modulePrefix: string;
-    readonly pagePosition: number;
-    readonly options: ReadonlyArray<{
-        label: string;
-        value: number;
-    }>;
-    readonly includedInSumScores: ReadonlyArray<SumScoreVariableDto>;
-}
-interface CodebookPredefinedVariable {
-    readonly kind: "codebook-predefined-variable";
-    readonly modulePrefix: string;
-    readonly moduleID: string;
-    defaultValue: number;
-    options: Array<{
-        label: string;
-        value: number;
-    }>;
-}
-
-interface BuilderSchemaDto {
-    readonly id: SchemaID;
-    readonly prefix: SchemaPrefixValue;
-    readonly mainImage: ImageFile | false;
-    readonly backgroundColor: string;
-    readonly name: string;
-    readonly pages: ReadonlyArray<BuilderPageDto>;
-    readonly baseHeight: number;
-    readonly baseWidth: number;
-    readonly predefinedVariables?: Array<CodebookPredefinedVariable>;
-    readonly sumScoreVariables?: ReadonlyArray<SumScoreVariableDto>;
-    readonly rules: ReadonlyArray<BuilderRuleDto>;
-    readonly tags: ReadonlyArray<BuilderTagDto>;
-}
-declare const BuilderSchemaDto: {
-    blockAutoplayVideo: (dto: BuilderPageDto) => BuilderPageDto;
-    overrideAllMediaUrls: (schema: BuilderSchemaDto, options: {
-        videoFilesBaseUrl: string;
-        audioFilesBaseUrl: string;
-        imageFilesBaseUrl: string;
-    }) => BuilderSchemaDto;
-};
-
 interface ThemeCompiler<ThemeSchema> {
     currentTheme: ThemeSchema;
     allThemes: ThemeSchema[];
@@ -855,6 +770,66 @@ declare class DefaultThemeCompiler implements ThemeCompiler<IDefaultTheme> {
     private compileButton;
 }
 
+interface SumScoreVariableDto {
+    id: SumScoreVariableID;
+    name: string;
+    description: string;
+    useAvg: boolean;
+}
+declare class SumScoreVariable extends BuilderObject<"builder-sum-score-variable", SumScoreVariableDto> {
+    readonly objectType = "builder-sum-score-variable";
+    readonly id: SumScoreVariableID;
+    private _useAvg;
+    private _name;
+    private _description;
+    private _error;
+    private _usedIn;
+    get usedIn(): BuilderPage[];
+    static readonly create: (data: {
+        name: string;
+        description: string;
+        useAvg: boolean;
+    }) => SumScoreVariable;
+    get hasErrors(): boolean;
+    static fromDto: (dto: SumScoreVariableDto) => SumScoreVariable;
+    private constructor();
+    toJson(): SumScoreVariableDto;
+    clone(): SumScoreVariableDto;
+    get name(): string;
+    get description(): string;
+    get useAvg(): boolean;
+}
+
+/**
+ * Interface representing a code book question sum-score.
+ *
+ * @interface
+ */
+interface CodeBookQuestionVariable {
+    readonly kind: "codebook-question-variable";
+    readonly label: string;
+    readonly varId: string;
+    readonly pageId: PageID;
+    readonly pagePrefix: string;
+    readonly modulePrefix: string;
+    readonly pagePosition: number;
+    readonly options: ReadonlyArray<{
+        label: string;
+        value: number;
+    }>;
+    readonly includedInSumScores: ReadonlyArray<SumScoreVariableDto>;
+}
+interface CodebookPredefinedVariable {
+    readonly kind: "codebook-predefined-variable";
+    readonly modulePrefix: string;
+    readonly moduleID: string;
+    defaultValue: number;
+    options: Array<{
+        label: string;
+        value: number;
+    }>;
+}
+
 interface Codebook {
     readonly predefinedVariables: ReadonlyArray<CodebookPredefinedVariable>;
     readonly pageVariables: ReadonlyArray<CodeBookQuestionVariable>;
@@ -888,14 +863,22 @@ interface CompilerOutput {
 interface CompilerOption {
     blockAutoplayQuestion: boolean;
     blockAutoplayVideo: boolean;
-    mediaAssets: {
-        audioFilesBaseUrl: string;
-        videoFilesBaseUrl: string;
-        imageFilesBaseUrl: string;
-        fileNameStrategy: "id" | "newFileName" | "originalFileName" | "relativePath";
-    } | null;
 }
 
+interface BuilderSchemaDto {
+    readonly id: SchemaID;
+    readonly prefix: SchemaPrefixValue;
+    readonly mainImage: ImageFile | false;
+    readonly backgroundColor: string;
+    readonly name: string;
+    readonly pages: ReadonlyArray<BuilderPageDto>;
+    readonly baseHeight: number;
+    readonly baseWidth: number;
+    readonly predefinedVariables?: Array<CodebookPredefinedVariable>;
+    readonly sumScoreVariables?: ReadonlyArray<SumScoreVariableDto>;
+    readonly rules: ReadonlyArray<BuilderRuleDto>;
+    readonly tags: ReadonlyArray<BuilderTagDto>;
+}
 declare class BuilderSchema {
     readonly id: SchemaID;
     name: string;
@@ -1015,4 +998,4 @@ declare class TagCollection implements Iterable<BuilderTag> {
 
 declare const DefaultTheme: IDefaultTheme;
 
-export { type AudioFile, BuilderCondition, type BuilderConditionDto, BuilderConditionGroup, type BuilderConditionGroupDto, type BuilderMainImageDto, BuilderMainText, type BuilderMainTextDto, type BuilderMainVideoDto, BuilderOperator, BuilderOption, type BuilderOptionDto, BuilderPage, type BuilderPageDto, type BuilderPageType, BuilderQuestion, type BuilderQuestionDto, type BuilderQuestionType, BuilderRule, type BuilderRuleDto, BuilderSchema, BuilderSchemaDto, BuilderTag, type BuilderTagDto, BuilderText, type BuilderTextDto, CodeBook, type CodeBookQuestionVariable, type Codebook, type CodebookPredefinedVariable, type CompilerOption, type CompilerOutput, ConditionGroupType, DefaultTheme, type ExcludeByPageAction, ExcludeByPageIdSelectItem, type ExcludeByTagAction, ExcludeByTagSelectItem, type ID, type ImageFile, JumpToActionManager, type JumpToPageAction, JumpToPageSelectItem, MultiSelectItem, OperatorSelectItem, OptionID, PageActionManager, PageID, PagePrefix, type PagePrefixValue, QuestionID, RuleCustomVariable, RuleInput, RuleOptionSelectItem, RuleQuestionVariable, type RuleVariable, RuleVariableOption, RuleVariableSelectItem, SchemaConfig, SchemaID, SchemaPrefix, type SchemaPrefixValue, SingleSelectItem, SumScore, type SumScoreAnswer, SumScoreVariable, type SumScoreVariableDto, SumScoreVariableID, TagActionManager, TagCollection, TagID, TextID, VarID, type VideoFile, _CodeBook, createTypedIdSingleton };
+export { type AudioFile, BuilderCondition, type BuilderConditionDto, BuilderConditionGroup, type BuilderConditionGroupDto, type BuilderMainImageDto, BuilderMainText, type BuilderMainTextDto, type BuilderMainVideoDto, BuilderOperator, BuilderOption, type BuilderOptionDto, BuilderPage, type BuilderPageDto, type BuilderPageType, BuilderQuestion, type BuilderQuestionDto, type BuilderQuestionType, BuilderRule, type BuilderRuleDto, BuilderSchema, type BuilderSchemaDto, BuilderTag, type BuilderTagDto, BuilderText, type BuilderTextDto, CodeBook, type CodeBookQuestionVariable, type Codebook, type CodebookPredefinedVariable, type CompilerOption, type CompilerOutput, ConditionGroupType, DefaultTheme, type ExcludeByPageAction, ExcludeByPageIdSelectItem, type ExcludeByTagAction, ExcludeByTagSelectItem, type ID, type ImageFile, JumpToActionManager, type JumpToPageAction, JumpToPageSelectItem, MultiSelectItem, OperatorSelectItem, OptionID, PageActionManager, PageID, PagePrefix, type PagePrefixValue, QuestionID, RuleCustomVariable, RuleInput, RuleOptionSelectItem, RuleQuestionVariable, type RuleVariable, RuleVariableOption, RuleVariableSelectItem, SchemaConfig, SchemaID, SchemaPrefix, type SchemaPrefixValue, SingleSelectItem, SumScore, type SumScoreAnswer, SumScoreVariable, type SumScoreVariableDto, SumScoreVariableID, TagActionManager, TagCollection, TagID, TextID, VarID, type VideoFile, _CodeBook, createTypedIdSingleton };

package/dist/public-api.js

@@ -29,7 +29,6 @@ __export(public_api_exports, {
   BuilderQuestion: () => BuilderQuestion,
   BuilderRule: () => BuilderRule,
   BuilderSchema: () => BuilderSchema,
-  BuilderSchemaDto: () => BuilderSchemaDto,
   BuilderTag: () => BuilderTag,
   BuilderText: () => BuilderText,
   CodeBook: () => CodeBook,
@@ -150,6 +149,7 @@ var BuilderOption = class _BuilderOption extends BuilderObject {
   id;
   value;
   label = "";
+  cssOverride = {};
   _labelAudioFile = false;
   get labelAudioFile() {
     return this._labelAudioFile;
@@ -162,13 +162,17 @@ var BuilderOption = class _BuilderOption extends BuilderObject {
     this.id = dto.id;
     this.value = dto.value;
     this.label = dto.label;
+    if (dto.cssOverride) {
+      this.cssOverride = { ...dto.cssOverride };
+    }
   }
-  static create(value, label) {
+  static create(value, label, css = {}) {
     const id = OptionID.create();
     const dto = {
       id,
       value,
-      label
+      label,
+      cssOverride: css
     };
     const instance = new _BuilderOption(dto);
     return instance;
@@ -181,7 +185,8 @@ var BuilderOption = class _BuilderOption extends BuilderObject {
     const dto = {
       id: this.id,
       value: this.value,
-      label: this.label
+      label: this.label,
+      cssOverride: { ...this.cssOverride }
     };
     return dto;
   }
@@ -223,7 +228,7 @@ var BuilderQuestion = class _BuilderQuestion extends BuilderObject {
     this.options = dto.options.map((o) => BuilderOption.fromJson(o));
   }
   addOption(label, value, atIndex = -1) {
-    const option = BuilderOption.create(value, label);
+    const option = BuilderOption.create(value, label, {});
     if (atIndex >= 0 && atIndex < this.options.length) {
       this.options.splice(atIndex, 0, option);
     } else {
@@ -1419,14 +1424,11 @@ var BuilderOptionTheme;
   const BLUE = "#2F5597";
   const BTN_BORDER_WIDTH = 3;
   const BTN_BORDER_RADIUS = 10;
-  const BTN_HEIGHT = 130;
-  const BTN_WIDTH_LONG = { _unit: "percent", value: 19 };
-  const BTN_WIDTH_SHORT = { _unit: "percent", value: 15 };
   const BTN_BORDER_STYLE = "solid";
-  const FONT_WEIGHT = 500;
-  const FONT_SIZE = 36;
-  const BTN_PADDING_LEFT = 10;
-  const BTN_PADDING_TOP = 10;
+  const FONT_WEIGHT = 600;
+  const FONT_SIZE = 50;
+  const BTN_PADDING_LEFT = 40;
+  const BTN_PADDING_TOP = 40;
   const buttonBaseCss = () => ({
     css: {
       fontWeight: FONT_WEIGHT,
@@ -1438,8 +1440,6 @@ var BuilderOptionTheme;
       paddingRight: { _unit: "px", value: BTN_PADDING_LEFT },
       borderRadius: { _unit: "px", value: BTN_BORDER_RADIUS },
       borderWidth: { _unit: "px", value: BTN_BORDER_WIDTH },
-      width: BTN_WIDTH_LONG,
-      height: { _unit: "px", value: BTN_HEIGHT },
       borderStyle: BTN_BORDER_STYLE,
       // boxShadow: "3px 3px gray",
       position: "relative",
@@ -1474,8 +1474,7 @@ var BuilderOptionTheme;
             ...css,
             backgroundColor: WHITE,
             borderColor: LIGHT_BLUE,
-            textColor: BLUE,
-            width: BTN_WIDTH_SHORT
+            textColor: BLUE
           },
           cssDisabled,
           cssEnabled
@@ -1488,22 +1487,17 @@ var BuilderOptionTheme;
     return optionTheme;
   };
 })(BuilderOptionTheme || (BuilderOptionTheme = {}));
-var MAIN_TEXT_FONT_SIZE = { _unit: "px", value: 40 };
-var MAIN_TEXT_WIDTH = { _unit: "percent", value: 76 };
-var textHighTop = 30;
-var textLowTop = 72;
-var audioHighTop = 30;
-var audioLowTop = 72;
+var textHighTop = 25;
+var textLowTop = 55;
+var audioHighTop = 20;
+var audioLowTop = 55;
 var textBase = {
-  width: MAIN_TEXT_WIDTH,
-  // backgroundColor: "red",
+  width: 80,
   top: textHighTop,
-  left: 14,
-  lineHeight: 1.2,
-  textAlign: "left",
+  left: 10,
+  textAlign: "center",
   textColor: "black",
-  transform: "translate(0, -50%)",
-  fontSize: MAIN_TEXT_FONT_SIZE
+  fontSize: { _unit: "px", value: 40 }
 };
 var textHigh = { ...textBase, top: textHighTop };
 var textLow = { ...textHigh, top: textLowTop };
@@ -1514,7 +1508,6 @@ var audioBase = {
   top: audioHighTop,
   cursor: "pointer",
   opacity: 0.8,
-  transform: "translate(0, -50%)",
   visibility: "visible"
 };
 var audioHigh = { ...audioBase, top: audioHighTop };
@@ -1571,8 +1564,8 @@ var DefaultTheme = {
         bottom: 0,
         left: 0,
         // h: 10,
-        alignItems: "center"
-        // backgroundColor: "yellow",
+        alignItems: "center",
+        backgroundColor: "yellow"
       },
       whenSingle: { justifyContent: "space-evenly" },
       whenMany: { justifyContent: "space-evenly" }
@@ -1793,7 +1786,9 @@ var responseButtonBaseCss = () => ({
     fontWeight: 600,
     fontSize: { _unit: "px", value: 28 },
     lineHeight: 1.1,
+    // TODO Denne angir knappens max-bredde. Default bør være 25.
     maxWidth: 25,
+    minWidth: 12,
     // width: 20,
     // flex: "0 0 auto",
     paddingLeft: { _unit: "px", value: 10 },
@@ -2019,7 +2014,7 @@ var DefaultThemeCompiler = class {
   name = "Ispe default theme.";
   defaultTheme = DefaultTheme;
   theme2 = Theme2;
-  currentTheme = DefaultTheme;
+  currentTheme = Theme2;
   allThemes = [DefaultTheme, Theme2];
   TAG = "[ DEFAULT_THEME_COMPILER ]: ";
   setTheme(theme) {
@@ -2091,7 +2086,6 @@ var DefaultThemeCompiler = class {
     let initialVideoTaskList = [];
     const newPage = {
       background: "white",
-      pageNumber,
       elements,
       id,
       prefix,
@@ -2505,7 +2499,7 @@ var DefaultThemeCompiler = class {
     return buttonBar;
   }
   compileButton(buttonDto, options) {
-    const { id, value, label } = buttonDto;
+    const { id, value, label, cssOverride } = buttonDto;
     const t = this.currentTheme;
     const onclickAction = options.kind === "response-button" ? {
       kind: "submit-fact",
@@ -2517,10 +2511,13 @@ var DefaultThemeCompiler = class {
         referenceLabel: options.questionText
       }
     } : { kind: "next-page" };
-    const btnStyles = value === 9 ? t.buttonBar.responseButtons.dontKnow : t.buttonBar.responseButtons.normal;
+    let btnStyles = value === 9 ? t.buttonBar.responseButtons.dontKnow : t.buttonBar.responseButtons.normal;
     if (t.buttonBar.vibrateMs) {
       onclickAction.vibrateMs = t.buttonBar.vibrateMs;
     }
+    if (cssOverride) {
+      btnStyles.btn.css = { ...btnStyles.btn.css, ...cssOverride };
+    }
     const btn = {
       _tag: "button",
       innerText: label,
@@ -2953,54 +2950,6 @@ var BuilderPageCollection = class _BuilderPageCollection {
   }
 };
 
-// src/Builder-schema-dto.ts
-var blockAutoplayVideo = (dto) => {
-  if (dto.mainMedia && dto.mainMedia.kind === "main-video") {
-    dto.mainMedia.mode = "optional";
-  }
-  return dto;
-};
-var overrideVideoUrl = (dto, baseUrl) => {
-  const mainMedia = dto.mainMedia;
-  if (mainMedia && mainMedia.kind === "main-video") {
-    const url = [baseUrl, mainMedia.file.id].join("/");
-    const file = { ...mainMedia.file, downloadUrl: url };
-    dto.mainMedia = { ...mainMedia, file };
-  }
-  return dto;
-};
-var overrideImageUrl = (dto, baseUrl) => {
-  const mainMedia = dto.mainMedia;
-  if (mainMedia && mainMedia.kind === "main-image") {
-    const url = [baseUrl, mainMedia.file.id].join("/");
-    const file = { ...mainMedia.file, downloadUrl: url };
-    dto.mainMedia = { ...mainMedia, file };
-  }
-  return dto;
-};
-var overrideAudioUrl = (dto, baseUrl) => {
-  const newAudioFile = { ...dto };
-  const audioFile = newAudioFile.mainText.audioFile;
-  if (audioFile) {
-    const url = [baseUrl, audioFile.id].join("/");
-    dto.mainText.audioFile = { ...audioFile, downloadUrl: url };
-  }
-  return dto;
-};
-var overrideAllMediaUrls = (schema, options) => {
-  const pages = schema.pages.map((page) => {
-    page = overrideVideoUrl(page, options.videoFilesBaseUrl);
-    page = overrideImageUrl(page, options.imageFilesBaseUrl);
-    page = overrideAudioUrl(page, options.audioFilesBaseUrl);
-    return page;
-  });
-  return { ...schema, pages };
-};
-var BuilderSchemaDto = {
-  blockAutoplayVideo,
-  overrideAllMediaUrls
-};
-
 // src/Builder-schema.ts
 var BuilderSchema = class _BuilderSchema {
   constructor(id, name, prefix) {
@@ -3194,12 +3143,8 @@ var BuilderSchema = class _BuilderSchema {
   addTag(builderTag) {
     this._tagCollection.add(builderTag);
   }
-  compile(options = {
-    blockAutoplayQuestion: false,
-    blockAutoplayVideo: false,
-    mediaAssets: null
-  }) {
-    let builderSchema = _BuilderSchema.fromJson(this.toJson());
+  compile(options = { blockAutoplayQuestion: false, blockAutoplayVideo: false }) {
+    const builderSchema = _BuilderSchema.fromJson(this.toJson());
     builderSchema._pageCollection.pages.forEach((p) => {
       if (options.blockAutoplayQuestion) {
         p.mainText.autoplay = false;
@@ -3210,16 +3155,7 @@ var BuilderSchema = class _BuilderSchema {
         }
       }
     });
-    let moduleDto = builderSchema.toJson();
-    console.log(options.mediaAssets);
-    if (options.mediaAssets) {
-      const { videoFilesBaseUrl, audioFilesBaseUrl, imageFilesBaseUrl } = options.mediaAssets;
-      moduleDto = BuilderSchemaDto.overrideAllMediaUrls(moduleDto, {
-        videoFilesBaseUrl,
-        audioFilesBaseUrl,
-        imageFilesBaseUrl
-      });
-    }
+    const moduleDto = builderSchema.toJson();
     const codebook = CodeBook.fromSchema(moduleDto);
     const schema = this.compiler.compile(moduleDto);
     const schemaConfig = SchemaConfig.fromSchema(moduleDto);
@@ -3406,7 +3342,6 @@ var SumScore = {
   BuilderQuestion,
   BuilderRule,
   BuilderSchema,
-  BuilderSchemaDto,
   BuilderTag,
   BuilderText,
   CodeBook,