@erudit-js/prose 4.1.1 → 4.2.0

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

@@ -1,311 +1,75 @@
-declare const _default: [{
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemDescription";
-        type: "block";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
-    }, {
-        ProblemDescription: import("@jsprose/core").Tag<"ProblemDescription", {
-            name: "problemDescription";
-            type: "block";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, import("@jsprose/core").TagChildren>;
-    }, undefined>;
+declare const _default: readonly [{
+    readonly schema: import("./problem.js").ProblemSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problem.js").ProblemSchema, "Problem", {
+        title: string;
+        level: import("./shared.js").ProblemLevel;
+        attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
+    } & {
+        pretty?: true | undefined;
+        applied?: true | undefined;
+        method?: true | undefined;
+        inter?: true | undefined;
+    } & (({
+        script?: undefined;
+    } & import("tsprose").RequiredChildren) | ({
+        script: import("./problemScript.js").ProblemScriptInstance;
+    } & import("tsprose").NoChildren))>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemHint";
-        type: "block";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
-    }, {
-        ProblemHint: import("@jsprose/core").Tag<"ProblemHint", {
-            name: "problemHint";
-            type: "block";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, import("@jsprose/core").TagChildren>;
-    }, undefined>;
+    readonly schema: import("./problems.js").SubProblemSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problems.js").SubProblemSchema, "SubProblem", {
+        label?: string;
+    } & ({
+        children: {};
+        script?: undefined;
+    } | {
+        script: import("./problemScript.js").ProblemScriptInstance;
+        children?: undefined;
+    })>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemAnswer";
-        type: "block";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
-    }, {
-        ProblemAnswer: import("@jsprose/core").Tag<"ProblemAnswer", {
-            name: "problemAnswer";
-            type: "block";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, import("@jsprose/core").TagChildren>;
-    }, undefined>;
+    readonly schema: import("./problems.js").ProblemsSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problems.js").ProblemsSchema, "Problems", import("./shared.js").ProblemInfoProps>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemSolution";
-        type: "block";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
-    }, {
-        ProblemSolution: import("@jsprose/core").Tag<"ProblemSolution", {
-            name: "problemSolution";
-            type: "block";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, import("@jsprose/core").TagChildren>;
-    }, undefined>;
+    readonly schema: import("./problemContent.js").ProblemDescriptionSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").ProblemDescriptionSchema, "ProblemDescription", unknown>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemNote";
-        type: "block";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
+    readonly schema: import("./problemCheck.js").ProblemCheckSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemCheck.js").ProblemCheckSchema, "ProblemCheck", {
+        label?: string;
+        hint?: string;
+        placeholder?: string;
+    } & (import("ts-xor").XOR<{
+        yes: true;
     }, {
-        ProblemNote: import("@jsprose/core").Tag<"ProblemNote", {
-            name: "problemNote";
-            type: "block";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, import("@jsprose/core").TagChildren>;
-    }, undefined>;
-}, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemCheck";
-        type: "block";
-        linkable: false;
-        Data: import("./problemCheck.js").ProblemCheckData;
-        Storage: undefined;
-        Children: import("./problemCheck.js").ProblemCheckSchema[] | undefined;
+        no: true;
     }, {
-        ProblemCheck: import("@jsprose/core").Tag<"ProblemCheck", {
-            name: "problemCheck";
-            type: "block";
-            linkable: false;
-            Data: import("./problemCheck.js").ProblemCheckData;
-            Storage: undefined;
-            Children: import("./problemCheck.js").ProblemCheckSchema[] | undefined;
-        }, ({
-            label?: string;
-            hint?: string;
-            placeholder?: string;
-        } & (((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;
-        }, "answer"> & {
-            yes?: undefined;
-            no?: 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;
-        }, "yes"> & {
-            answer?: undefined;
-            no?: 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;
-        }, "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;
-            yes?: undefined;
-            no?: 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;
-        }, "script"> & {
-            answer?: undefined;
-            yes?: undefined;
-            no?: undefined;
-            answers?: undefined;
-        })) & (import("@jsprose/core").TagChildren | import("@jsprose/core").NoTagChildren))) & {}>;
-    }, undefined>;
-}, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problemSection";
-        type: "block";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: import("@jsprose/core").AnySchema[];
+        boolean: boolean;
     }, {
-        ProblemSection: import("@jsprose/core").Tag<"ProblemSection", {
-            name: "problemSection";
-            type: "block";
-            linkable: false;
-            Data: string;
-            Storage: undefined;
-            Children: import("@jsprose/core").AnySchema[];
-        }, {
-            title: string;
-        } & import("@jsprose/core").TagChildren>;
-    }, undefined>;
-}, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problem";
-        type: "block";
-        linkable: true;
-        Data: import("./problem.js").ProblemData;
-        Storage: import("./storage.js").ProblemScriptStorage;
-        Children: import("./problemContent.js").ProblemContentChild[];
+        answer: import("./problemCheck.js").ProblemCheckValue | import("./problemCheck.js").ProblemCheckValue[];
     }, {
-        Problem: import("@jsprose/core").Tag<"Problem", {
-            name: "problem";
-            type: "block";
-            linkable: true;
-            Data: import("./problem.js").ProblemData;
-            Storage: import("./storage.js").ProblemScriptStorage;
-            Children: import("./problemContent.js").ProblemContentChild[];
-        }, ({
-            title: string;
-            level: import("./shared.js").ProblemLevel;
-            attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
-        } & {
-            pretty?: true | undefined;
-            applied?: true | undefined;
-            method?: true | undefined;
-            inter?: true | undefined;
-        } & ({
-            children: {};
-            script?: undefined;
-        } | {
-            script: import("./problemScript.js").ProblemScriptInstance;
-            children?: undefined;
-        })) & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
-}, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "subProblem";
-        type: "block";
-        linkable: false;
-        Data: import("./problems.js").SubProblemData;
-        Storage: import("./storage.js").ProblemScriptStorage;
-        Children: import("./problemContent.js").ProblemContentChild[];
+        answers: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[] | {
+            ordered?: boolean;
+            separator?: string;
+            values: (import("./problemCheck.js").ProblemCheckValueDefined | import("./problemCheck.js").ProblemCheckValueDefined[])[];
+        };
     }, {
-        SubProblem: import("@jsprose/core").Tag<"SubProblem", {
-            name: "subProblem";
-            type: "block";
-            linkable: false;
-            Data: import("./problems.js").SubProblemData;
-            Storage: import("./storage.js").ProblemScriptStorage;
-            Children: import("./problemContent.js").ProblemContentChild[];
-        }, ({
-            label?: string;
-        } & {
-            children: {};
-            script?: undefined;
-        }) | ({
-            label?: string;
-        } & {
-            script: import("./problemScript.js").ProblemScriptInstance;
-            children?: undefined;
-        })>;
-    }, undefined>;
+        script: string;
+    }> & import("tsprose").OptionalChildren)>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problems";
-        type: "block";
-        linkable: true;
-        Data: import("./shared.js").ProblemInfo;
-        Storage: undefined;
-        Children: (import("@jsprose/core").BlockSchema | {
-            name: "subProblem";
-            type: "block";
-            linkable: false;
-            Data: import("./problems.js").SubProblemData;
-            Storage: import("./storage.js").ProblemScriptStorage;
-            Children: import("./problemContent.js").ProblemContentChild[];
-        })[];
-    }, {
-        Problems: import("@jsprose/core").Tag<"Problems", {
-            name: "problems";
-            type: "block";
-            linkable: true;
-            Data: import("./shared.js").ProblemInfo;
-            Storage: undefined;
-            Children: (import("@jsprose/core").BlockSchema | {
-                name: "subProblem";
-                type: "block";
-                linkable: false;
-                Data: import("./problems.js").SubProblemData;
-                Storage: import("./storage.js").ProblemScriptStorage;
-                Children: import("./problemContent.js").ProblemContentChild[];
-            })[];
-        }, {
-            title: string;
-            level: import("./shared.js").ProblemLevel;
-            attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
-        } & {
-            pretty?: true | undefined;
-            applied?: true | undefined;
-            method?: true | undefined;
-            inter?: true | undefined;
-        } & import("@jsprose/core").TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
+    readonly schema: import("./problemContent.js").ProblemHintSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").ProblemHintSchema, "ProblemHint", unknown>];
+}, {
+    readonly schema: import("./problemContent.js").ProblemSectionSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").ProblemSectionSchema, "ProblemSection", {
+        title: string;
+    }>];
+}, {
+    readonly schema: import("./problemContent.js").SectionContainerSchema<"solution">;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").SectionContainerSchema<"solution">, "ProblemSolution", unknown>];
+}, {
+    readonly schema: import("./problemContent.js").SectionContainerSchema<"answer">;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").SectionContainerSchema<"answer">, "ProblemAnswer", unknown>];
+}, {
+    readonly schema: import("./problemContent.js").SectionContainerSchema<"note">;
+    readonly tags: [import("../../tag.js").ToEruditTag<import("./problemContent.js").SectionContainerSchema<"note">, "ProblemNote", unknown>];
 }];
 export default _default;

package/dist/elements/problem/core.js

@@ -1,18 +1,16 @@
-import { defineEruditProseCoreElements } from "../../coreElement.js";
 import { problemCoreElement } from "./problem.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(
+export default [
+	problemCoreElement,
+	subProblemCoreElement,
+	problemsCoreElement,
 	problemDescriptionCoreElement,
-	problemHintCoreElement,
-	problemAnswer.coreElement,
-	problemSolution.coreElement,
-	problemNote.coreElement,
 	problemCheckCoreElement,
+	problemHintCoreElement,
 	problemSectionCoreElement,
-	//
-	problemCoreElement,
-	subProblemCoreElement,
-	problemsCoreElement
-);
+	problemSolution.coreElement,
+	problemAnswer.coreElement,
+	problemNote.coreElement
+];

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

@@ -0,0 +1 @@
+export declare const problemScriptHook: import("../../rawToProse/hook.js").RawToProseHook;

package/dist/elements/problem/hook.js

@@ -0,0 +1,14 @@
+import { isRawElement } from "tsprose";
+import { defineRawToProseHook } from "../../rawToProse/hook.js";
+import { problemSchema } from "./problem.js";
+import { subProblemSchema } from "./problems.js";
+export const problemScriptHook = defineRawToProseHook(({ result }) => {
+	return { step: ({ rawElement }) => {
+		if (isRawElement(rawElement, problemSchema) || isRawElement(rawElement, subProblemSchema)) {
+			const problemScriptSrc = rawElement.storageKey?.replace("problemScript:", "");
+			if (problemScriptSrc) {
+				result.problemScripts.add(problemScriptSrc);
+			}
+		}
+	} };
+});

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

@@ -1,28 +1,22 @@
-import { type AnyUnique } from '@jsprose/core';
+import { type NoChildren, type RequiredChildren, type Schema, type Unique } from 'tsprose';
 import { type ProblemInfo } from './shared.js';
 import { type ProblemContentChild } from './problemContent.js';
 import { type ProblemScriptStorage } from './storage.js';
 import { type ProblemScriptInstance } from './problemScript.js';
-export interface ProblemData {
-    info: ProblemInfo;
-    scriptUniques?: Record<string, AnyUnique>;
-}
-export declare const problemSchema: {
-    name: "problem";
-    type: "block";
+export interface ProblemSchema extends Schema {
+    name: 'problem';
+    type: 'block';
     linkable: true;
     Data: ProblemData;
     Storage: ProblemScriptStorage;
     Children: ProblemContentChild[];
-};
-export declare const Problem: import("@jsprose/core").Tag<"Problem", {
-    name: "problem";
-    type: "block";
-    linkable: true;
-    Data: ProblemData;
-    Storage: ProblemScriptStorage;
-    Children: ProblemContentChild[];
-}, ({
+}
+export interface ProblemData {
+    info: ProblemInfo;
+    scriptUniques?: Record<string, Unique>;
+}
+export declare const problemSchema: ProblemSchema;
+export declare const Problem: import("../../tag.js").ToEruditTag<ProblemSchema, "Problem", {
     title: string;
     level: import("./shared.js").ProblemLevel;
     attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
@@ -31,29 +25,14 @@ export declare const Problem: import("@jsprose/core").Tag<"Problem", {
     applied?: true | undefined;
     method?: true | undefined;
     inter?: true | undefined;
-} & ({
-    children: {};
+} & (({
     script?: undefined;
-} | {
+} & RequiredChildren) | ({
     script: ProblemScriptInstance;
-    children?: undefined;
-})) & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const problemRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "problem";
-    type: "block";
-    linkable: true;
-    Data: ProblemData;
-    Storage: ProblemScriptStorage;
-    Children: ProblemContentChild[];
-}, {
-    Problem: import("@jsprose/core").Tag<"Problem", {
-        name: "problem";
-        type: "block";
-        linkable: true;
-        Data: ProblemData;
-        Storage: ProblemScriptStorage;
-        Children: ProblemContentChild[];
-    }, ({
+} & NoChildren))>;
+export declare const problemCoreElement: {
+    readonly schema: ProblemSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<ProblemSchema, "Problem", {
         title: string;
         level: import("./shared.js").ProblemLevel;
         attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
@@ -62,45 +41,9 @@ export declare const problemRegistryItem: import("@jsprose/core").RegistryItem<{
         applied?: true | undefined;
         method?: true | undefined;
         inter?: true | undefined;
-    } & ({
-        children: {};
+    } & (({
         script?: undefined;
-    } | {
+    } & RequiredChildren) | ({
         script: ProblemScriptInstance;
-        children?: undefined;
-    })) & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-}, undefined>;
-export declare const problemCoreElement: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "problem";
-        type: "block";
-        linkable: true;
-        Data: ProblemData;
-        Storage: ProblemScriptStorage;
-        Children: ProblemContentChild[];
-    }, {
-        Problem: import("@jsprose/core").Tag<"Problem", {
-            name: "problem";
-            type: "block";
-            linkable: true;
-            Data: ProblemData;
-            Storage: ProblemScriptStorage;
-            Children: ProblemContentChild[];
-        }, ({
-            title: string;
-            level: import("./shared.js").ProblemLevel;
-            attributes?: (import("./shared.js").ProblemAttribute | import("./shared.js").ProblemCustomAttribute)[];
-        } & {
-            pretty?: true | undefined;
-            applied?: true | undefined;
-            method?: true | undefined;
-            inter?: true | undefined;
-        } & ({
-            children: {};
-            script?: undefined;
-        } | {
-            script: ProblemScriptInstance;
-            children?: undefined;
-        })) & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
+    } & NoChildren))>];
 };

package/dist/elements/problem/problem.js

@@ -1,15 +1,16 @@
-import { defineRegistryItem, defineSchema, ProseError } from "@jsprose/core";
+import { defineSchema } from "tsprose";
 import { problemProps2Info } from "./shared.js";
 import { validateProblemContent } from "./problemContent.js";
 import { defineEruditTag } from "../../tag.js";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
 import { problemScriptStorageKey } from "./storage.js";
 import "./problemScript.js";
+import { EruditProseError } from "../../error.js";
+import { defineProseCoreElement } from "../../coreElement.js";
 export const problemSchema = defineSchema({
 	name: "problem",
 	type: "block",
 	linkable: true
-})();
+});
 export const Problem = defineEruditTag({
 	tagName: "Problem",
 	schema: problemSchema
@@ -18,7 +19,7 @@ export const Problem = defineEruditTag({
 	element.data = { info: problemInfo };
 	element.title = problemInfo.title;
 	if (children && props.script) {
-		throw new ProseError(`<${tagName}> cannot have both script and children in Problem element!`);
+		throw new EruditProseError(`<${tagName}> cannot have both script and children in Problem element!`);
 	}
 	if (props.script) {
 		element.data.scriptUniques = props.script.uniques;
@@ -29,8 +30,7 @@ export const Problem = defineEruditTag({
 		element.children = children;
 	}
 });
-export const problemRegistryItem = defineRegistryItem({
+export const problemCoreElement = defineProseCoreElement({
 	schema: problemSchema,
 	tags: [Problem]
 });
-export const problemCoreElement = defineEruditProseCoreElement({ registryItem: problemRegistryItem });