@erudit-js/prose 4.0.0 → 4.1.0

package/dist/elements/problem/components/expanders/DefaultPlusSections.vue

@@ -1,38 +1,36 @@
-<script lang="ts" setup>
-import { watchEffect } from 'vue';
-import {
-  isProseElement,
-  type AnySchema,
-  type ProseElement,
-} from '@jsprose/core';
-
-import { problemSectionSchema } from '../../problemContent.js';
-import { useArrayContainsAnchor } from '../../../../app/composables/anchor.js';
-import ProblemExpander from '../ProblemExpander.vue';
-import ProblemExpanderSection from '../ProblemExpanderSection.vue';
-import Render from '../../../../app/shared/Render.vue';
-
-const { value } = defineProps<{ value: ProseElement<AnySchema> }>();
-
-const defaultBlocks = value.children!.filter(
-  (element) => !isProseElement(element, problemSectionSchema),
-);
-
-const sections = value.children!.filter((element) =>
-  isProseElement(element, problemSectionSchema),
-) as ProseElement<typeof problemSectionSchema>[];
-</script>
-
-<template>
-  <ProblemExpander>
-    <div v-if="defaultBlocks.length" class="py-(--proseAsideWidth)">
-      <Render v-for="child of defaultBlocks" :element="child" />
-    </div>
-    <ProblemExpanderSection
-      v-if="sections.length"
-      v-for="section of sections"
-      :title="section.data"
-      :element="section"
-    />
-  </ProblemExpander>
-</template>
+<script lang="ts" setup>
+import {
+  isProseElement,
+  type AnySchema,
+  type ProseElement,
+} from '@jsprose/core';
+
+import { problemSectionSchema } from '../../problemContent.js';
+import ProblemExpander from '../ProblemExpander.vue';
+import ProblemExpanderSection from '../ProblemExpanderSection.vue';
+import Render from '../../../../app/shared/Render.vue';
+
+const { value } = defineProps<{ value: ProseElement<AnySchema> }>();
+
+const defaultBlocks = value.children!.filter(
+  (element) => !isProseElement(element, problemSectionSchema),
+);
+
+const sections = value.children!.filter((element) =>
+  isProseElement(element, problemSectionSchema),
+) as ProseElement<typeof problemSectionSchema>[];
+</script>
+
+<template>
+  <ProblemExpander>
+    <div v-if="defaultBlocks.length" class="py-(--proseAsideWidth)">
+      <Render v-for="child of defaultBlocks" :element="child" />
+    </div>
+    <ProblemExpanderSection
+      v-if="sections.length"
+      v-for="section of sections"
+      :title="section.data"
+      :element="section"
+    />
+  </ProblemExpander>
+</template>

package/dist/elements/problem/components/expanders/Hint.vue

@@ -1,26 +1,26 @@
-<script lang="ts" setup>
-import type { ProseElement } from '@jsprose/core';
-
-import type { problemHintSchema } from '../../problemContent.js';
-import { useProblemPhrase } from '../../composables/phrase.js';
-import ProblemExpander from '../ProblemExpander.vue';
-import Render from '../../../../app/shared/Render.vue';
-import ProblemExpanderSection from '../ProblemExpanderSection.vue';
-
-defineProps<{ value: ProseElement<typeof problemHintSchema>[] }>();
-const phrase = await useProblemPhrase();
-</script>
-
-<template>
-  <ProblemExpander>
-    <div v-if="value.length === 1" class="py-(--proseAsideWidth)">
-      <Render v-for="child of value[0]!.children" :element="child" />
-    </div>
-    <ProblemExpanderSection
-      v-else
-      v-for="(hint, i) of value"
-      :title="phrase.action_hint + ' ' + (i + 1)"
-      :element="hint"
-    />
-  </ProblemExpander>
-</template>
+<script lang="ts" setup>
+import type { ProseElement } from '@jsprose/core';
+
+import type { problemHintSchema } from '../../problemContent.js';
+import { useProblemPhrase } from '../../composables/phrase.js';
+import ProblemExpander from '../ProblemExpander.vue';
+import Render from '../../../../app/shared/Render.vue';
+import ProblemExpanderSection from '../ProblemExpanderSection.vue';
+
+defineProps<{ value: ProseElement<typeof problemHintSchema>[] }>();
+const phrase = await useProblemPhrase();
+</script>
+
+<template>
+  <ProblemExpander>
+    <div v-if="value.length === 1" class="py-(--proseAsideWidth)">
+      <Render v-for="child of value[0]!.children" :element="child" />
+    </div>
+    <ProblemExpanderSection
+      v-else
+      v-for="(hint, i) of value"
+      :title="phrase.action_hint + ' ' + (i + 1)"
+      :element="hint"
+    />
+  </ProblemExpander>
+</template>

package/dist/elements/problem/core.d.ts

@@ -93,68 +93,95 @@ declare const _default: [{
         name: "problemCheck";
         type: "block";
         linkable: false;
-        Data: import("./problemContent.js").ProblemCheckData;
+        Data: import("./problemCheck.js").ProblemCheckData;
         Storage: undefined;
-        Children: import("@jsprose/core").BlockSchema[];
+        Children: import("./problemCheck.js").ProblemCheckSchema[] | undefined;
     }, {
         ProblemCheck: import("@jsprose/core").Tag<"ProblemCheck", {
             name: "problemCheck";
             type: "block";
             linkable: false;
-            Data: import("./problemContent.js").ProblemCheckData;
+            Data: import("./problemCheck.js").ProblemCheckData;
             Storage: undefined;
-            Children: import("@jsprose/core").BlockSchema[];
+            Children: import("./problemCheck.js").ProblemCheckSchema[] | undefined;
         }, ({
             label?: string;
             hint?: string;
             placeholder?: string;
         } & (((Pick<{
-            answer: string | number | RegExp | undefined;
-            answers: (string | number | RegExp | undefined)[];
-            set: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[] | {
-                separator: string;
-                values: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[];
+            yes: true;
+            no: true;
+            answer: import("./problemCheck.js").ProblemCheckValue;
+            answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
             };
             script: string;
         }, "answer"> & {
-            set?: undefined;
+            yes?: undefined;
+            no?: undefined;
             answers?: undefined;
             script?: undefined;
         }) | (Pick<{
-            answer: string | number | RegExp | undefined;
-            answers: (string | number | RegExp | undefined)[];
-            set: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[] | {
-                separator: string;
-                values: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[];
+            yes: true;
+            no: true;
+            answer: import("./problemCheck.js").ProblemCheckValue;
+            answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
             };
             script: string;
-        }, "set"> & {
+        }, "yes"> & {
             answer?: undefined;
+            no?: undefined;
             answers?: undefined;
             script?: undefined;
         }) | (Pick<{
-            answer: string | number | RegExp | undefined;
-            answers: (string | number | RegExp | undefined)[];
-            set: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[] | {
-                separator: string;
-                values: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[];
+            yes: true;
+            no: true;
+            answer: import("./problemCheck.js").ProblemCheckValue;
+            answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
+            };
+            script: string;
+        }, "no"> & {
+            answer?: undefined;
+            yes?: undefined;
+            answers?: undefined;
+            script?: undefined;
+        }) | (Pick<{
+            yes: true;
+            no: true;
+            answer: import("./problemCheck.js").ProblemCheckValue;
+            answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
             };
             script: string;
         }, "answers"> & {
             answer?: undefined;
-            set?: undefined;
+            yes?: undefined;
+            no?: undefined;
             script?: undefined;
         }) | (Pick<{
-            answer: string | number | RegExp | undefined;
-            answers: (string | number | RegExp | undefined)[];
-            set: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[] | {
-                separator: string;
-                values: ((string | number | RegExp | undefined) | (string | number | RegExp | undefined)[])[];
+            yes: true;
+            no: true;
+            answer: import("./problemCheck.js").ProblemCheckValue;
+            answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
             };
             script: string;
         }, "script"> & {
             answer?: undefined;
-            set?: undefined;
+            yes?: undefined;
+            no?: undefined;
             answers?: undefined;
         })) & (import("@jsprose/core").TagChildren | import("@jsprose/core").NoTagChildren))) & {}>;
     }, undefined>;

package/dist/elements/problem/core.js

@@ -1,6 +1,7 @@
 import { defineEruditProseCoreElements } from "../../coreElement.js";
 import { problemCoreElement } from "./problem.js";
-import { problemAnswer, problemCheckCoreElement, problemDescriptionCoreElement, problemHintCoreElement, problemNote, problemSectionCoreElement, problemSolution } from "./problemContent.js";
+import { problemCheckCoreElement } from "./problemCheck.js";
+import { problemAnswer, problemDescriptionCoreElement, problemHintCoreElement, problemNote, problemSectionCoreElement, problemSolution } from "./problemContent.js";
 import { problemsCoreElement, subProblemCoreElement } from "./problems.js";
 export default defineEruditProseCoreElements(
 	problemDescriptionCoreElement,

package/dist/elements/problem/languages/{en.d.ts → problem/en.d.ts}

@@ -1,3 +1,3 @@
-import type { ProblemPhrases } from '../phrases.js';
+import type { ProblemPhrases } from '../../phrases.js';
 declare const _default: ProblemPhrases;
 export default _default;

package/dist/elements/problem/languages/problem/en.js

@@ -0,0 +1,6 @@
+import { defineElementLanguage } from "../../../../app/language/element.js";
+import en from "../shared/en.js";
+export default defineElementLanguage({
+	...en,
+	element_name: "Problem"
+});

package/dist/elements/problem/languages/{ru.d.ts → problem/ru.d.ts}

@@ -1,3 +1,3 @@
-import type { ProblemPhrases } from '../phrases.js';
+import type { ProblemPhrases } from '../../phrases.js';
 declare const _default: ProblemPhrases;
 export default _default;

package/dist/elements/problem/languages/problem/ru.js

@@ -0,0 +1,6 @@
+import { defineElementLanguage } from "../../../../app/language/element.js";
+import ru from "../shared/ru.js";
+export default defineElementLanguage({
+	...ru,
+	element_name: "Задача"
+});

package/dist/elements/problem/languages/problems/en.d.ts

@@ -0,0 +1,3 @@
+import type { ProblemPhrases } from '../../phrases.js';
+declare const _default: ProblemPhrases;
+export default _default;

package/dist/elements/problem/languages/problems/en.js

@@ -0,0 +1,6 @@
+import { defineElementLanguage } from "../../../../app/language/element.js";
+import en from "../shared/en.js";
+export default defineElementLanguage({
+	...en,
+	element_name: "Problems"
+});

package/dist/elements/problem/languages/problems/ru.d.ts

@@ -0,0 +1,3 @@
+import type { ProblemPhrases } from '../../phrases.js';
+declare const _default: ProblemPhrases;
+export default _default;

package/dist/elements/problem/languages/problems/ru.js

@@ -0,0 +1,6 @@
+import { defineElementLanguage } from "../../../../app/language/element.js";
+import ru from "../shared/ru.js";
+export default defineElementLanguage({
+	...ru,
+	element_name: "Задачи"
+});

package/dist/elements/problem/languages/shared/en.d.ts

@@ -0,0 +1,3 @@
+import type { ProblemPhrases } from '../../phrases.js';
+declare const _default: ProblemPhrases;
+export default _default;

package/dist/elements/problem/languages/{en.js → shared/en.js}

@@ -1,6 +1,6 @@
-import { defineElementLanguage } from "../../../app/language/element.js";
+import { defineElementLanguage } from "../../../../app/language/element.js";
 export default defineElementLanguage({
-	element_name: "Problem",
+	element_name: "",
 	"level.example": "Example",
 	"level.easy": "Elementary",
 	"level.medium": "Intermediate",
@@ -20,5 +20,14 @@ export default defineElementLanguage({
 	action_note: "Note",
 	action_check: "Check",
 	action_generate: "Similar",
-	seed_explain: "The seed from which all random values in the problem are calculated. Same seeds = completely identical problems."
+	seed_explain: "The seed from which all random values in the problem are calculated. Same seeds = completely identical problems.",
+	yes_regexp: /^\s*(yes|y|true|1)\s*$/i,
+	no_regexp: /^\s*(no|n|false|0)\s*$/i,
+	boolean_check_hint: "Yes/No",
+	array_check_hint: (ordered, separator) => {
+		let hint = "";
+		hint += separator === "," ? "Comma separated." : `Separator "${separator}".`;
+		hint += ordered ? " Order matters." : " In any order.";
+		return hint;
+	}
 });

package/dist/elements/problem/languages/shared/ru.d.ts

@@ -0,0 +1,3 @@
+import type { ProblemPhrases } from '../../phrases.js';
+declare const _default: ProblemPhrases;
+export default _default;

package/dist/elements/problem/languages/{ru.js → shared/ru.js}

@@ -1,6 +1,6 @@
-import { defineElementLanguage } from "../../../app/language/element.js";
+import { defineElementLanguage } from "../../../../app/language/element.js";
 export default defineElementLanguage({
-	element_name: "Задача",
+	element_name: "",
 	"level.example": "Пример",
 	"level.easy": "Ликбез",
 	"level.medium": "Нормальный",
@@ -20,5 +20,14 @@ export default defineElementLanguage({
 	action_note: "Примечание",
 	action_check: "Проверить",
 	action_generate: "Аналог",
-	seed_explain: "Зерно, от которого высчитываются все случайные величины в задаче. Одинаковые зерна = полностью идентичные задачи."
+	seed_explain: "Зерно, от которого высчитываются все случайные величины в задаче. Одинаковые зерна = полностью идентичные задачи.",
+	yes_regexp: /^\s*(да|1)\s*$/i,
+	no_regexp: /^\s*(нет|0)\s*$/i,
+	boolean_check_hint: "Да/Нет",
+	array_check_hint: (ordered, separator) => {
+		let hint = "";
+		hint += separator === "," ? "Через запятую." : `Разделитель "${separator}".`;
+		hint += ordered ? " Порядок важен." : " В любом порядке.";
+		return hint;
+	}
 });

package/dist/elements/problem/phrases.d.ts

@@ -13,4 +13,8 @@ export type ProblemPhrases = ElementPhrases<{
     action_check: string;
     action_generate: string;
     seed_explain: string;
+    yes_regexp: RegExp;
+    no_regexp: RegExp;
+    boolean_check_hint: string;
+    array_check_hint: (ordered: boolean, separator: string) => string;
 }>;

package/dist/elements/problem/problemCheck.d.ts

@@ -0,0 +1,166 @@
+import { type NoTagChildren, type TagChildren } from '@jsprose/core';
+export interface ProblemCheckInfo {
+    label?: string;
+    hint?: string;
+    placeholder?: string;
+}
+export type ProblemCheckData = ProblemCheckInfo & {
+    serializedValidator: any;
+};
+export type ProblemCheckSchema = {
+    name: 'problemCheck';
+    type: 'block';
+    linkable: false;
+    Data: ProblemCheckData;
+    Storage: undefined;
+    Children: ProblemCheckSchema[] | undefined;
+};
+export declare const problemCheckSchema: {
+    name: "problemCheck";
+    type: "block";
+    linkable: false;
+    Data: ProblemCheckData;
+    Storage: undefined;
+    Children: ProblemCheckSchema[] | undefined;
+};
+type UndefinedOnly<T> = {
+    [K in keyof T]?: undefined;
+};
+type OneOf<T extends Record<string, any>> = {
+    [K in keyof T]: Pick<T, K> & UndefinedOnly<Omit<T, K>>;
+}[keyof T];
+export declare const ProblemCheck: import("@jsprose/core").Tag<"ProblemCheck", {
+    name: "problemCheck";
+    type: "block";
+    linkable: false;
+    Data: ProblemCheckData;
+    Storage: undefined;
+    Children: ProblemCheckSchema[] | undefined;
+}, ({
+    label?: string;
+    hint?: string;
+    placeholder?: string;
+} & (OneOf<{
+    yes: true;
+    no: true;
+    answer: ProblemCheckValue;
+    answers: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[] | {
+        ordered?: boolean;
+        separator?: string;
+        values: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[];
+    };
+    script: string;
+}> & (TagChildren | NoTagChildren))) & {}>;
+export declare const problemCheckRegistryItem: import("@jsprose/core").RegistryItem<{
+    name: "problemCheck";
+    type: "block";
+    linkable: false;
+    Data: ProblemCheckData;
+    Storage: undefined;
+    Children: ProblemCheckSchema[] | undefined;
+}, {
+    ProblemCheck: import("@jsprose/core").Tag<"ProblemCheck", {
+        name: "problemCheck";
+        type: "block";
+        linkable: false;
+        Data: ProblemCheckData;
+        Storage: undefined;
+        Children: ProblemCheckSchema[] | undefined;
+    }, ({
+        label?: string;
+        hint?: string;
+        placeholder?: string;
+    } & (OneOf<{
+        yes: true;
+        no: true;
+        answer: ProblemCheckValue;
+        answers: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[] | {
+            ordered?: boolean;
+            separator?: string;
+            values: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[];
+        };
+        script: string;
+    }> & (TagChildren | NoTagChildren))) & {}>;
+}, undefined>;
+export declare const problemCheckCoreElement: {
+    registryItem: import("@jsprose/core").RegistryItem<{
+        name: "problemCheck";
+        type: "block";
+        linkable: false;
+        Data: ProblemCheckData;
+        Storage: undefined;
+        Children: ProblemCheckSchema[] | undefined;
+    }, {
+        ProblemCheck: import("@jsprose/core").Tag<"ProblemCheck", {
+            name: "problemCheck";
+            type: "block";
+            linkable: false;
+            Data: ProblemCheckData;
+            Storage: undefined;
+            Children: ProblemCheckSchema[] | undefined;
+        }, ({
+            label?: string;
+            hint?: string;
+            placeholder?: string;
+        } & (OneOf<{
+            yes: true;
+            no: true;
+            answer: ProblemCheckValue;
+            answers: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[] | {
+                ordered?: boolean;
+                separator?: string;
+                values: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[];
+            };
+            script: string;
+        }> & (TagChildren | NoTagChildren))) & {}>;
+    }, undefined>;
+};
+export interface ProblemCheckValidatorBoolean {
+    type: 'boolean';
+    answer: boolean;
+}
+export type ProblemCheckValue = undefined | number | string | RegExp;
+export type ProblemCheckValueDefined = Exclude<ProblemCheckValue, undefined>;
+export interface ProblemCheckValidatorValue {
+    type: 'value';
+    answer: ProblemCheckValue;
+}
+export interface ProblemCheckValidatorArray {
+    type: 'array';
+    ordered: boolean;
+    separator: string;
+    answers: (ProblemCheckValueDefined | ProblemCheckValueDefined[])[];
+}
+export interface ProblemCheckValidatorScript {
+    type: 'script';
+    name: string;
+}
+export type ProblemCheckValidator = ProblemCheckValidatorBoolean | ProblemCheckValidatorValue | ProblemCheckValidatorArray | ProblemCheckValidatorScript;
+export declare function toSerializableValidator(validator: ProblemCheckValidator): ProblemCheckValidatorBoolean | ProblemCheckValidatorScript | {
+    type: string;
+    answer: string | number | {
+        readonly type: "regexp";
+        readonly source: string;
+        readonly flags: string;
+    } | undefined;
+    ordered?: undefined;
+    separator?: undefined;
+    answers?: undefined;
+} | {
+    type: string;
+    ordered: boolean;
+    separator: string;
+    answers: (string | number | {
+        readonly type: "regexp";
+        readonly source: string;
+        readonly flags: string;
+    } | (string | number | {
+        readonly type: "regexp";
+        readonly source: string;
+        readonly flags: string;
+    } | undefined)[] | undefined)[];
+    answer?: undefined;
+};
+export declare function fromSerializableValidator(serializedValidator: any): ProblemCheckValidator;
+export declare function checkProblemAnswer(answer: string, yesRegexp: RegExp, noRegexp: RegExp, validator: ProblemCheckValidator): boolean;
+export {};