@erudit-js/prose 4.1.0 → 4.2.0-dev.1

package/dist/elements/callout/app.d.ts

@@ -1,9 +1,2 @@
-declare const _default: import("../../app/appElement.js").AppElement<{
-    name: "callout";
-    type: "block";
-    linkable: true;
-    Data: import("./core.js").CalloutData;
-    Storage: import("./core.js").CalloutStorage;
-    Children: import("@jsprose/core").BlockSchema[];
-}>;
+declare const _default: import("../../app/appElement.js").ProseAppElement<import("./core.js").CalloutSchema>;
 export default _default;

package/dist/elements/callout/app.js

@@ -1,6 +1,6 @@
-import { defineEruditProseAppElement } from "../../app/appElement.js";
+import { defineProseAppElement } from "../../app/appElement.js";
 import { calloutSchema } from "./core.js";
-export default defineEruditProseAppElement({
+export default defineProseAppElement({
 	schema: calloutSchema,
 	component: () => import("./Callout.vue"),
 	languages: {

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

@@ -1,4 +1,4 @@
-import { type BlockSchema, type TagChildren } from '@jsprose/core';
+import { type BlockSchema, type Schema } from 'tsprose';
 import type { Invert } from '../../shared/invert.js';
 export interface CalloutData {
     iconSrc: string;
@@ -8,73 +8,35 @@ export interface CalloutData {
 export interface CalloutStorage {
     resolvedIconSrc: string;
 }
-export declare const calloutSchema: {
-    name: "callout";
-    type: "block";
+export interface CalloutSchema extends Schema {
+    name: 'callout';
+    type: 'block';
     linkable: true;
     Data: CalloutData;
     Storage: CalloutStorage;
     Children: BlockSchema[];
-};
-export declare const Callout: import("@jsprose/core").Tag<"Callout", {
-    name: "callout";
-    type: "block";
-    linkable: true;
-    Data: CalloutData;
-    Storage: CalloutStorage;
-    Children: BlockSchema[];
-}, {
+}
+export declare const calloutSchema: CalloutSchema;
+export declare const Callout: import("../../tag.js").ToEruditTag<CalloutSchema, "Callout", {
     icon: string;
     invert?: Invert;
     title: string;
-} & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const calloutRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "callout";
-    type: "block";
-    linkable: true;
-    Data: CalloutData;
-    Storage: CalloutStorage;
-    Children: BlockSchema[];
-}, {
-    Callout: import("@jsprose/core").Tag<"Callout", {
-        name: "callout";
-        type: "block";
-        linkable: true;
-        Data: CalloutData;
-        Storage: CalloutStorage;
-        Children: BlockSchema[];
-    }, {
+}>;
+declare const _default: {
+    readonly schema: CalloutSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<CalloutSchema, "Callout", {
         icon: string;
         invert?: Invert;
         title: string;
-    } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-}, undefined>;
-declare const _default: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "callout";
-        type: "block";
-        linkable: true;
-        Data: CalloutData;
-        Storage: CalloutStorage;
-        Children: BlockSchema[];
-    }, {
-        Callout: import("@jsprose/core").Tag<"Callout", {
-            name: "callout";
-            type: "block";
-            linkable: true;
-            Data: CalloutData;
-            Storage: CalloutStorage;
-            Children: BlockSchema[];
-        }, {
-            icon: string;
-            invert?: Invert;
-            title: string;
-        } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
+    }>];
+    readonly rawToProseHook: ({ result }: {
+        task: import("../../index.js").EruditRawToProseTask;
+        result: import("../../index.js").EruditRawToProseResult;
+    }) => {
+        matchStep: ({ rawElement }: {
+            rawElement: import("../../rawElement.js").ToEruditRawElement<CalloutSchema>;
+            proseElement: import("tsprose").ProseElement;
+        }) => void;
+    };
 };
 export default _default;
-export declare const calloutIconSrcStep: ({ rawElement }: {
-    context: import("../../context.js").EruditProseContext;
-    rawElement: import("../../rawElement.js").EruditRawElement<import("@jsprose/core").AnySchema>;
-    proseElement: import("@jsprose/core").ProseElement<import("@jsprose/core").AnySchema>;
-}) => string | undefined;

package/dist/elements/callout/core.js

@@ -1,18 +1,23 @@
-import { defineRegistryItem, defineSchema, ensureTagBlockChildren, isRawElement } from "@jsprose/core";
+import { defineSchema, ensureTagBlockChildren } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
-import { defineResolveStep } from "../../resolveStep.js";
+import { defineProseCoreElement } from "../../coreElement.js";
+import { paragraphWrap } from "../../shared/paragraphWrap.js";
 export const calloutSchema = defineSchema({
 	name: "callout",
 	type: "block",
 	linkable: true
-})();
+});
 export const Callout = defineEruditTag({
 	tagName: "Callout",
 	schema: calloutSchema
-})(({ element, tagName, props, children, registry }) => {
-	ensureTagBlockChildren(tagName, children, registry);
-	element.children = children;
+})(({ element, tagName, props, children }) => {
+	const wrap = paragraphWrap(children);
+	if (wrap) {
+		element.children = wrap;
+	} else {
+		ensureTagBlockChildren(tagName, children);
+		element.children = children;
+	}
 	element.data = {
 		iconSrc: props.icon,
 		title: props.title
@@ -22,16 +27,12 @@ export const Callout = defineEruditTag({
 		element.data.iconInvert = props.invert;
 	}
 });
-export const calloutRegistryItem = defineRegistryItem({
+export default defineProseCoreElement({
 	schema: calloutSchema,
-	tags: [Callout]
-});
-export default defineEruditProseCoreElement({ registryItem: calloutRegistryItem });
-//
-// Resolve
-//
-export const calloutIconSrcStep = defineResolveStep(({ rawElement }) => {
-	if (isRawElement(rawElement, calloutSchema)) {
-		return rawElement.data.iconSrc;
+	tags: [Callout],
+	rawToProseHook: ({ result }) => {
+		return { matchStep: ({ rawElement }) => {
+			result.files.add(rawElement.data.iconSrc);
+		} };
 	}
 });

package/dist/elements/caption/Caption.vue

@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 import { onMounted, useTemplateRef } from 'vue';
-import { isProseElement, type ProseElement } from '@jsprose/core';
+import { isProseElement, type ToProseElement } from 'tsprose';
 
-import { captionSecondarySchema, type captionSchema } from './core.js';
+import { captionSecondarySchema, type CaptionSchema } from './core.js';
 import Render from '../../app/shared/Render.vue';
 
 const { caption } = defineProps<{
-  caption: ProseElement<typeof captionSchema>;
+  caption: ToProseElement<CaptionSchema>;
 }>();
 
 const emit = defineEmits(['captionMounted']);

package/dist/elements/caption/app.d.ts

@@ -1,9 +1,2 @@
-declare const _default: import("../../app/appElement.js").AppElement<{
-    name: "caption";
-    type: "inliner";
-    linkable: false;
-    Data: import("./core.js").CaptionData | undefined;
-    Storage: undefined;
-    Children: import("@jsprose/core").InlinerSchema[];
-}>;
+declare const _default: import("../../app/appElement.js").ProseAppElement<import("./core.js").CaptionSchema>;
 export default _default;

package/dist/elements/caption/app.js

@@ -1,6 +1,6 @@
-import { defineEruditProseAppElement } from "../../app/appElement.js";
+import { defineProseAppElement } from "../../app/appElement.js";
 import { captionSchema } from "./core.js";
-export default defineEruditProseAppElement({
+export default defineProseAppElement({
 	schema: captionSchema,
 	component: () => import("./Caption.vue")
 });

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

@@ -1,114 +1,36 @@
-import { type InlinerSchema, type TagChildren } from '@jsprose/core';
-export declare const captionSecondarySchema: {
-    name: "captionSecondary";
-    type: "inliner";
+import { type InlinerSchema, type Schema } from 'tsprose';
+export interface CaptionSecondarySchema extends Schema {
+    name: 'captionSecondary';
+    type: 'inliner';
     linkable: false;
     Data: undefined;
     Storage: undefined;
     Children: InlinerSchema[];
-};
-export declare const CaptionSecondary: import("@jsprose/core").Tag<"CaptionSecondary", {
-    name: "captionSecondary";
-    type: "inliner";
-    linkable: false;
-    Data: undefined;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, TagChildren>;
-export declare const captionSecondaryRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "captionSecondary";
-    type: "inliner";
+}
+export declare const captionSecondarySchema: CaptionSecondarySchema;
+export declare const CaptionSecondary: import("../../tag.js").ToEruditTag<CaptionSecondarySchema, "CaptionSecondary", unknown>;
+export interface CaptionSchema extends Schema {
+    name: 'caption';
+    type: 'inliner';
     linkable: false;
-    Data: undefined;
+    Data: CaptionData | undefined;
     Storage: undefined;
     Children: InlinerSchema[];
-}, {
-    CaptionSecondary: import("@jsprose/core").Tag<"CaptionSecondary", {
-        name: "captionSecondary";
-        type: "inliner";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, TagChildren>;
-}, undefined>;
+}
 export interface CaptionData {
     width?: string;
 }
-export declare const captionSchema: {
-    name: "caption";
-    type: "inliner";
-    linkable: false;
-    Data: CaptionData | undefined;
-    Storage: undefined;
-    Children: InlinerSchema[];
-};
-export declare const Caption: import("@jsprose/core").Tag<"Caption", {
-    name: "caption";
-    type: "inliner";
-    linkable: false;
-    Data: CaptionData | undefined;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, {
+export declare const captionSchema: CaptionSchema;
+export declare const Caption: import("../../tag.js").ToEruditTag<CaptionSchema, "Caption", {
     width?: string;
-} & TagChildren>;
-export declare const captionRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "caption";
-    type: "inliner";
-    linkable: false;
-    Data: CaptionData | undefined;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, {
-    Caption: import("@jsprose/core").Tag<"Caption", {
-        name: "caption";
-        type: "inliner";
-        linkable: false;
-        Data: CaptionData | undefined;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, {
-        width?: string;
-    } & TagChildren>;
-}, undefined>;
+}>;
 declare const _default: [{
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "caption";
-        type: "inliner";
-        linkable: false;
-        Data: CaptionData | undefined;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, {
-        Caption: import("@jsprose/core").Tag<"Caption", {
-            name: "caption";
-            type: "inliner";
-            linkable: false;
-            Data: CaptionData | undefined;
-            Storage: undefined;
-            Children: InlinerSchema[];
-        }, {
-            width?: string;
-        } & TagChildren>;
-    }, undefined>;
+    readonly schema: CaptionSecondarySchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<CaptionSecondarySchema, "CaptionSecondary", unknown>];
 }, {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "captionSecondary";
-        type: "inliner";
-        linkable: false;
-        Data: undefined;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, {
-        CaptionSecondary: import("@jsprose/core").Tag<"CaptionSecondary", {
-            name: "captionSecondary";
-            type: "inliner";
-            linkable: false;
-            Data: undefined;
-            Storage: undefined;
-            Children: InlinerSchema[];
-        }, TagChildren>;
-    }, undefined>;
+    readonly schema: CaptionSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<CaptionSchema, "Caption", {
+        width?: string;
+    }>];
 }];
 export default _default;

package/dist/elements/caption/core.js

@@ -1,41 +1,35 @@
-import { defineRegistryItem, defineSchema, ensureTagInlinerChildren, isRawElement, ProseError } from "@jsprose/core";
+import { defineSchema, ensureTagInlinerChildren, isRawElement } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
-import { defineEruditProseCoreElements } from "../../coreElement.js";
-//
-// Caption Secondary
-//
+import { EruditProseError } from "../../error.js";
+import { defineProseCoreElements } from "../../coreElement.js";
 export const captionSecondarySchema = defineSchema({
 	name: "captionSecondary",
 	type: "inliner",
 	linkable: false
-})();
+});
 export const CaptionSecondary = defineEruditTag({
 	tagName: "CaptionSecondary",
 	schema: captionSecondarySchema
-})(({ element, tagName, children, registry }) => {
-	ensureTagInlinerChildren(tagName, children, registry);
+})(({ element, tagName, children }) => {
+	ensureTagInlinerChildren(tagName, children);
 	element.children = children;
 });
-export const captionSecondaryRegistryItem = defineRegistryItem({
-	schema: captionSecondarySchema,
-	tags: [CaptionSecondary]
-});
 export const captionSchema = defineSchema({
 	name: "caption",
 	type: "inliner",
 	linkable: false
-})();
+});
 export const Caption = defineEruditTag({
 	tagName: "Caption",
 	schema: captionSchema
-})(({ tagName, element, props, children, registry }) => {
-	ensureTagInlinerChildren(tagName, children, registry);
+})(({ tagName, element, props, children }) => {
+	ensureTagInlinerChildren(tagName, children);
 	let containsNonSecondary = false;
 	let containsSecondary = false;
 	for (const child of children) {
 		if (isRawElement(child, captionSecondarySchema)) {
 			if (containsSecondary) {
-				throw new ProseError(`Duplicate <${CaptionSecondary.tagName}> detected!`);
+				throw new EruditProseError(`Duplicate <${CaptionSecondary.tagName}> detected!`);
 			}
 			containsSecondary = true;
 		} else {
@@ -43,7 +37,7 @@ export const Caption = defineEruditTag({
 		}
 	}
 	if (containsSecondary && !containsNonSecondary) {
-		throw new ProseError(`Cannot have a <${CaptionSecondary.tagName}> without a main caption content!`);
+		throw new EruditProseError(`Cannot have a <${CaptionSecondary.tagName}> without a main caption content!`);
 	}
 	element.children = children;
 	if (props.width) {
@@ -51,11 +45,13 @@ export const Caption = defineEruditTag({
 		element.data.width = props.width;
 	}
 });
-export const captionRegistryItem = defineRegistryItem({
+//
+// Core Elements
+//
+export default defineProseCoreElements({
+	schema: captionSecondarySchema,
+	tags: [CaptionSecondary]
+}, {
 	schema: captionSchema,
 	tags: [Caption]
 });
-//
-// Erudit Core Elements
-//
-export default defineEruditProseCoreElements({ registryItem: captionRegistryItem }, { registryItem: captionSecondaryRegistryItem });

package/dist/elements/details/Details.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import type { ProseElement } from '@jsprose/core';
+import type { ToProseElement } from 'tsprose';
 
-import type { detailsSchema } from './core.js';
+import type { DetailsSchema } from './core.js';
 import { useFormatText } from '../../app/composables/formatText.js';
 import { useProseContext } from '../../app/composables/context.js';
 import {
@@ -14,7 +14,7 @@ import Block from '../../app/shared/block/Block.vue';
 import Render from '../../app/shared/Render.vue';
 
 const { element } = defineProps<{
-  element: ProseElement<typeof detailsSchema>;
+  element: ToProseElement<DetailsSchema>;
 }>();
 
 const { EruditIcon } = useProseContext();

package/dist/elements/details/app.d.ts

@@ -1,9 +1,2 @@
-declare const _default: import("../../app/appElement.js").AppElement<{
-    name: "details";
-    type: "block";
-    linkable: true;
-    Data: import("./core.js").DetailsData;
-    Storage: undefined;
-    Children: import("@jsprose/core").AnySchema[];
-}>;
+declare const _default: import("../../app/appElement.js").ProseAppElement<import("./core.js").DetailsSchema>;
 export default _default;

package/dist/elements/details/app.js

@@ -1,6 +1,6 @@
-import { defineEruditProseAppElement } from "../../app/appElement.js";
+import { defineProseAppElement } from "../../app/appElement.js";
 import { detailsSchema } from "./core.js";
-export default defineEruditProseAppElement({
+export default defineProseAppElement({
 	schema: detailsSchema,
 	component: () => import("./Details.vue"),
 	languages: {

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

@@ -1,68 +1,25 @@
-import { type AnySchema, type Tag, type TagChildren, type Unique } from '@jsprose/core';
-import { type NoSnippet, type NoToc } from '../../tag.js';
+import { type BlockSchema, type Schema } from 'tsprose';
+import type { NoToc } from '../../toc.js';
+import type { NoSnippet } from '../../snippet.js';
+export interface DetailsSchema extends Schema {
+    name: 'details';
+    type: 'block';
+    linkable: 'always';
+    Data: DetailsData;
+    Storage: undefined;
+    Children: BlockSchema[];
+}
 export interface DetailsData {
     title?: string;
 }
-export declare const detailsSchema: {
-    name: "details";
-    type: "block";
-    linkable: true;
-    Data: DetailsData;
-    Storage: undefined;
-    Children: AnySchema[];
-};
-export declare const detailsTagName = "Details";
-export declare const Details: Tag<"Details", {
-    name: "details";
-    type: "block";
-    linkable: true;
-    Data: DetailsData;
-    Storage: undefined;
-    Children: AnySchema[];
-}, {
+export declare const detailsSchema: DetailsSchema;
+export declare const Details: import("../../tag.js").ToEruditTag<DetailsSchema, "Details", {
     title?: string;
-    $: Unique<Tag<typeof detailsTagName, typeof detailsSchema, any>>;
-} & TagChildren & NoToc & NoSnippet>;
-export declare const detailsRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "details";
-    type: "block";
-    linkable: true;
-    Data: DetailsData;
-    Storage: undefined;
-    Children: AnySchema[];
-}, {
-    Details: Tag<"Details", {
-        name: "details";
-        type: "block";
-        linkable: true;
-        Data: DetailsData;
-        Storage: undefined;
-        Children: AnySchema[];
-    }, {
-        title?: string;
-        $: Unique<Tag<typeof detailsTagName, typeof detailsSchema, any>>;
-    } & TagChildren & NoToc & NoSnippet>;
-}, undefined>;
+} & NoToc & NoSnippet>;
 declare const _default: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "details";
-        type: "block";
-        linkable: true;
-        Data: DetailsData;
-        Storage: undefined;
-        Children: AnySchema[];
-    }, {
-        Details: Tag<"Details", {
-            name: "details";
-            type: "block";
-            linkable: true;
-            Data: DetailsData;
-            Storage: undefined;
-            Children: AnySchema[];
-        }, {
-            title?: string;
-            $: Unique<Tag<typeof detailsTagName, typeof detailsSchema, any>>;
-        } & TagChildren & NoToc & NoSnippet>;
-    }, undefined>;
+    readonly schema: DetailsSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<DetailsSchema, "Details", {
+        title?: string;
+    } & NoToc & NoSnippet>];
 };
 export default _default;

package/dist/elements/details/core.js

@@ -1,21 +1,27 @@
-import { defineRegistryItem, defineSchema, ensureTagChildren, ProseError } from "@jsprose/core";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
+import { defineSchema, ensureTagBlockChildren } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
+import { EruditProseError } from "../../error.js";
+import { paragraphWrap } from "../../shared/paragraphWrap.js";
+import { defineProseCoreElement } from "../../coreElement.js";
 export const detailsSchema = defineSchema({
 	name: "details",
 	type: "block",
-	linkable: true
-})();
-export const detailsTagName = "Details";
+	linkable: "always"
+});
 export const Details = defineEruditTag({
-	tagName: detailsTagName,
+	tagName: "Details",
 	schema: detailsSchema
 })(({ element, tagName, children, props }) => {
 	if (!element.uniqueName) {
-		throw new ProseError(`<${tagName}> must be connected to unique!`);
+		throw new EruditProseError(`<${tagName}> must be connected to unique!`);
+	}
+	const wrap = paragraphWrap(children);
+	if (wrap) {
+		element.children = wrap;
+	} else {
+		ensureTagBlockChildren(tagName, children);
+		element.children = children;
 	}
-	ensureTagChildren(tagName, children);
-	element.children = children;
 	const title = props.title?.trim();
 	if (title) {
 		element.data = { title };
@@ -23,8 +29,7 @@ export const Details = defineEruditTag({
 		element.title = title;
 	}
 });
-export const detailsRegistryItem = defineRegistryItem({
+export default defineProseCoreElement({
 	schema: detailsSchema,
 	tags: [Details]
 });
-export default defineEruditProseCoreElement({ registryItem: detailsRegistryItem });