@erudit-js/prose 4.1.1 → 4.2.0

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

@@ -1,4 +1,5 @@
-import { type NoTagChildren, type TagChildren } from '@jsprose/core';
+import type { XOR } from 'ts-xor';
+import { type OptionalChildren, type Schema } from 'tsprose';
 export interface ProblemCheckInfo {
     label?: string;
     hint?: string;
@@ -7,113 +8,59 @@ export interface ProblemCheckInfo {
 export type ProblemCheckData = ProblemCheckInfo & {
     serializedValidator: any;
 };
-export type ProblemCheckSchema = {
+export interface ProblemCheckSchema extends Schema {
     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;
-}, ({
+}
+export declare const problemCheckSchema: ProblemCheckSchema;
+export declare const ProblemCheck: import("../../tag.js").ToEruditTag<ProblemCheckSchema, "ProblemCheck", {
     label?: string;
     hint?: string;
     placeholder?: string;
-} & (OneOf<{
+} & (XOR<{
     yes: true;
+}, {
     no: true;
-    answer: ProblemCheckValue;
+}, {
+    boolean: boolean;
+}, {
+    answer: ProblemCheckValue | 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;
-    }, ({
+    script: string;
+}> & OptionalChildren)>;
+export declare const problemCheckCoreElement: {
+    readonly schema: ProblemCheckSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<ProblemCheckSchema, "ProblemCheck", {
         label?: string;
         hint?: string;
         placeholder?: string;
-    } & (OneOf<{
+    } & (XOR<{
         yes: true;
+    }, {
         no: true;
-        answer: ProblemCheckValue;
+    }, {
+        boolean: boolean;
+    }, {
+        answer: ProblemCheckValue | 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>;
+        script: string;
+    }> & OptionalChildren)>];
 };
 export interface ProblemCheckValidatorBoolean {
     type: 'boolean';
@@ -123,7 +70,7 @@ export type ProblemCheckValue = undefined | number | string | RegExp;
 export type ProblemCheckValueDefined = Exclude<ProblemCheckValue, undefined>;
 export interface ProblemCheckValidatorValue {
     type: 'value';
-    answer: ProblemCheckValue;
+    answer: ProblemCheckValue | ProblemCheckValue[];
 }
 export interface ProblemCheckValidatorArray {
     type: 'array';
@@ -142,7 +89,11 @@ export declare function toSerializableValidator(validator: ProblemCheckValidator
         readonly type: "regexp";
         readonly source: string;
         readonly flags: string;
-    } | undefined;
+    } | (string | number | {
+        readonly type: "regexp";
+        readonly source: string;
+        readonly flags: string;
+    } | undefined)[] | undefined;
     ordered?: undefined;
     separator?: undefined;
     answers?: undefined;
@@ -163,4 +114,3 @@ export declare function toSerializableValidator(validator: ProblemCheckValidator
 };
 export declare function fromSerializableValidator(serializedValidator: any): ProblemCheckValidator;
 export declare function checkProblemAnswer(answer: string, yesRegexp: RegExp, noRegexp: RegExp, validator: ProblemCheckValidator): boolean;
-export {};

package/dist/elements/problem/problemCheck.js

@@ -1,11 +1,12 @@
-import { defineRegistryItem, defineSchema, ensureTagChildren, ProseError } from "@jsprose/core";
+import { defineSchema, ensureTagChildren } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
+import { defineProseCoreElement } from "../../coreElement.js";
+import { EruditProseError } from "../../error.js";
 export const problemCheckSchema = defineSchema({
 	name: "problemCheck",
 	type: "block",
 	linkable: false
-})();
+});
 export const ProblemCheck = defineEruditTag({
 	tagName: "ProblemCheck",
 	schema: problemCheckSchema
@@ -39,6 +40,11 @@ export const ProblemCheck = defineEruditTag({
 			type: "boolean",
 			answer: false
 		};
+	} else if ("boolean" in props) {
+		validator = {
+			type: "boolean",
+			answer: !!props.boolean
+		};
 	} else if ("answer" in props) {
 		validator = {
 			type: "value",
@@ -73,11 +79,10 @@ export const ProblemCheck = defineEruditTag({
 		serializedValidator: toSerializableValidator(validator)
 	};
 });
-export const problemCheckRegistryItem = defineRegistryItem({
+export const problemCheckCoreElement = defineProseCoreElement({
 	schema: problemCheckSchema,
 	tags: [ProblemCheck]
 });
-export const problemCheckCoreElement = defineEruditProseCoreElement({ registryItem: problemCheckRegistryItem });
 export function toSerializableValidator(validator) {
 	if (validator.type === "boolean") {
 		return validator;
@@ -95,7 +100,7 @@ export function toSerializableValidator(validator) {
 	if (validator.type === "value") {
 		return {
 			type: "value",
-			answer: toSerializableValue(validator.answer)
+			answer: Array.isArray(validator.answer) ? validator.answer.map(toSerializableValue) : toSerializableValue(validator.answer)
 		};
 	}
 	if (validator.type === "array") {
@@ -129,7 +134,7 @@ export function fromSerializableValidator(serializedValidator) {
 	if (serializedValidator.type === "value") {
 		return {
 			type: "value",
-			answer: fromSerializableValue(serializedValidator.answer)
+			answer: Array.isArray(serializedValidator.answer) ? serializedValidator.answer.map(fromSerializableValue) : fromSerializableValue(serializedValidator.answer)
 		};
 	}
 	if (serializedValidator.type === "array") {
@@ -164,13 +169,14 @@ export function checkProblemAnswer(answer, yesRegexp, noRegexp, validator) {
 		return answer === String(expected);
 	};
 	const checkAnswer = (expect, answer) => {
-		if (expect === undefined) {
+		if (expect === undefined || expect === null) {
 			return answer.trim() === "";
 		}
 		return checkDefinedAnswer(expect, answer);
 	};
 	if (validator.type === "value") {
-		return checkAnswer(validator.answer, answer);
+		const anyOf = Array.isArray(validator.answer) ? validator.answer : [validator.answer];
+		return anyOf.some((expect) => checkAnswer(expect, answer));
 	}
 	if (validator.type === "array") {
 		const separatorRegexp = new RegExp(`\\s*${validator.separator.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\s*`, "g");
@@ -199,5 +205,5 @@ export function checkProblemAnswer(answer, yesRegexp, noRegexp, validator) {
 		}
 		return true;
 	}
-	throw new ProseError(`"checkProblemAnswer" not implemented for type "${validator.type}"!`);
+	throw new EruditProseError(`"checkProblemAnswer" not implemented for type "${validator.type}"!`);
 }