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

package/dist/elements/diagram/Diagram.vue

@@ -9,16 +9,16 @@ import {
   useId,
   useTemplateRef,
 } from 'vue';
-import type { ProseElement } from '@jsprose/core';
+import type { ToProseElement } from 'tsprose';
 
-import type { diagramSchema } from './core.js';
+import type { DiagramSchema } from './core.js';
 import { usePhotoSwipe } from '../../app/shared/photoswipe/composable.js';
 import { useProseContext } from '../../app/composables/context.js';
 import Caption from '../caption/Caption.vue';
 import Block from '../../app/shared/block/Block.vue';
 
 const { element } = defineProps<{
-  element: ProseElement<typeof diagramSchema>;
+  element: ToProseElement<DiagramSchema>;
 }>();
 
 let isWebkit = ref<boolean>();
@@ -282,7 +282,7 @@ async function renderDiagram() {
   [data-prose-accent] & {
     --arrowColor: color-mix(
       in hsl,
-      var(--accentText) 45%,
+      var(--accentText) 70%,
       var(--accentBackground)
     );
 
@@ -310,12 +310,12 @@ async function renderDiagram() {
     :global(.node) ellipse {
       fill: color-mix(
         in hsl,
-        var(--accentText) 30%,
+        var(--accentText) 25%,
         var(--accentBackground)
       ) !important;
       stroke: color-mix(
         in hsl,
-        var(--accentText) 45%,
+        var(--accentText) 80%,
         var(--accentBackground)
       ) !important;
     }
@@ -333,7 +333,11 @@ async function renderDiagram() {
     polygon,
     circle,
     ellipse {
-      fill: color-mix(in hsl, var(--color-brand) 75%, transparent) !important;
+      fill: color-mix(
+        in hsl,
+        var(--color-brand) 50%,
+        var(--color-text-dimmed)
+      ) !important;
       stroke: transparent !important;
     }
 
@@ -343,10 +347,9 @@ async function renderDiagram() {
       polygon,
       circle,
       ellipse {
-        fill: color-mix(
-          in hsl,
-          var(--accentText) 70%,
-          var(--accentBackground)
+        fill: light-dark(
+          color-mix(in hsl, var(--accentText) 90%, var(--color-bg-root)),
+          color-mix(in hsl, var(--accentText) 65%, var(--color-bg-root))
         ) !important;
         stroke: transparent !important;
       }

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

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

package/dist/elements/diagram/app.js

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

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

@@ -1,187 +1,24 @@
-import { type TagChildren } from '@jsprose/core';
-export declare const diagramSchema: {
-    name: "diagram";
-    type: "block";
+import { type Schema, type TextSchema } from 'tsprose';
+import { type CaptionSchema } from '../caption/core.js';
+export interface DiagramSchema extends Schema {
+    name: 'diagram';
+    type: 'block';
     linkable: true;
     Data: undefined;
     Storage: undefined;
-    Children: [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }] | [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }, {
-        name: "caption";
-        type: "inliner";
-        linkable: false;
-        Data: import("../caption/core.js").CaptionData | undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").InlinerSchema[];
-    }];
-};
-export declare const Diagram: import("@jsprose/core").Tag<"Diagram", {
-    name: "diagram";
-    type: "block";
-    linkable: true;
-    Data: undefined;
-    Storage: undefined;
-    Children: [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }] | [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }, {
-        name: "caption";
-        type: "inliner";
-        linkable: false;
-        Data: import("../caption/core.js").CaptionData | undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").InlinerSchema[];
-    }];
-}, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const diagramRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "diagram";
-    type: "block";
-    linkable: true;
-    Data: undefined;
-    Storage: undefined;
-    Children: [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }] | [{
-        name: "text";
-        type: "inliner";
-        linkable: false;
-        Data: string;
-        Storage: undefined;
-        Children: undefined;
-    }, {
-        name: "caption";
-        type: "inliner";
-        linkable: false;
-        Data: import("../caption/core.js").CaptionData | undefined;
-        Storage: undefined;
-        Children: import("@jsprose/core").InlinerSchema[];
-    }];
-}, {
-    Diagram: import("@jsprose/core").Tag<"Diagram", {
-        name: "diagram";
-        type: "block";
-        linkable: true;
-        Data: undefined;
-        Storage: undefined;
-        Children: [{
-            name: "text";
-            type: "inliner";
-            linkable: false;
-            Data: string;
-            Storage: undefined;
-            Children: undefined;
-        }] | [{
-            name: "text";
-            type: "inliner";
-            linkable: false;
-            Data: string;
-            Storage: undefined;
-            Children: undefined;
-        }, {
-            name: "caption";
-            type: "inliner";
-            linkable: false;
-            Data: import("../caption/core.js").CaptionData | undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").InlinerSchema[];
-        }];
-    }, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-}, undefined>;
+    Children: [TextSchema] | [TextSchema, CaptionSchema];
+}
+export declare const diagramSchema: DiagramSchema;
+export declare const Diagram: import("../../tag.js").ToEruditTag<DiagramSchema, "Diagram", unknown>;
 declare const _default: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "diagram";
-        type: "block";
-        linkable: true;
-        Data: undefined;
-        Storage: undefined;
-        Children: [{
-            name: "text";
-            type: "inliner";
-            linkable: false;
-            Data: string;
-            Storage: undefined;
-            Children: undefined;
-        }] | [{
-            name: "text";
-            type: "inliner";
-            linkable: false;
-            Data: string;
-            Storage: undefined;
-            Children: undefined;
-        }, {
-            name: "caption";
-            type: "inliner";
-            linkable: false;
-            Data: import("../caption/core.js").CaptionData | undefined;
-            Storage: undefined;
-            Children: import("@jsprose/core").InlinerSchema[];
-        }];
-    }, {
-        Diagram: import("@jsprose/core").Tag<"Diagram", {
-            name: "diagram";
-            type: "block";
-            linkable: true;
-            Data: undefined;
-            Storage: undefined;
-            Children: [{
-                name: "text";
-                type: "inliner";
-                linkable: false;
-                Data: string;
-                Storage: undefined;
-                Children: undefined;
-            }] | [{
-                name: "text";
-                type: "inliner";
-                linkable: false;
-                Data: string;
-                Storage: undefined;
-                Children: undefined;
-            }, {
-                name: "caption";
-                type: "inliner";
-                linkable: false;
-                Data: import("../caption/core.js").CaptionData | undefined;
-                Storage: undefined;
-                Children: import("@jsprose/core").InlinerSchema[];
-            }];
-        }, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
-    dependencies: {
-        photoswipe: {
+    readonly schema: DiagramSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<DiagramSchema, "Diagram", unknown>];
+    readonly dependencies: {
+        readonly photoswipe: {
             optimize: boolean;
             transpile: boolean;
         };
-        'photoswipe/lightbox': {
+        readonly 'photoswipe/lightbox': {
             optimize: boolean;
             transpile: boolean;
         };

package/dist/elements/diagram/core.js

@@ -1,13 +1,13 @@
-import { defineRegistryItem, defineSchema, ensureRawElement, ensureTagChildren, textSchema } from "@jsprose/core";
+import { defineSchema, ensureRawElement, ensureTagChildren, textSchema } from "tsprose";
 import { captionSchema } from "../caption/core.js";
 import { defineEruditTag } from "../../tag.js";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
 import { photoswipeDependency } from "../../shared/photoswipe.js";
+import { defineProseCoreElement } from "../../coreElement.js";
 export const diagramSchema = defineSchema({
 	name: "diagram",
 	type: "block",
 	linkable: true
-})();
+});
 export const Diagram = defineEruditTag({
 	tagName: "Diagram",
 	schema: diagramSchema
@@ -20,11 +20,8 @@ export const Diagram = defineEruditTag({
 		element.children = [children[0], children[1]];
 	}
 });
-export const diagramRegistryItem = defineRegistryItem({
+export default defineProseCoreElement({
 	schema: diagramSchema,
-	tags: [Diagram]
-});
-export default defineEruditProseCoreElement({
-	registryItem: diagramRegistryItem,
+	tags: [Diagram],
 	dependencies: { ...photoswipeDependency }
 });

package/dist/elements/emphasis/Emphasis.vue

@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { ProseElement } from '@jsprose/core';
+import type { ToProseElement } from 'tsprose';
 
-import type { emphasisSchema } from './core.js';
+import type { EmphasisSchema } from './core.js';
 import Render from '../../app/shared/Render.vue';
 
-defineProps<{ element: ProseElement<typeof emphasisSchema> }>();
+defineProps<{ element: ToProseElement<EmphasisSchema> }>();
 </script>
 
 <template>

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

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

package/dist/elements/emphasis/app.js

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

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

@@ -1,90 +1,27 @@
-import { type InlinerSchema, type TagChildren } from '@jsprose/core';
+import { type InlinerSchema } from 'tsprose';
 export type EmphasisData = {
     type: 'italic';
 } | {
     type: 'bold';
     accent?: boolean;
 };
-export declare const emphasisSchema: {
-    name: "emphasis";
-    type: "inliner";
+export interface EmphasisSchema extends InlinerSchema {
+    name: 'emphasis';
+    type: 'inliner';
     linkable: true;
     Data: EmphasisData;
     Storage: undefined;
     Children: InlinerSchema[];
-};
-export declare const B: import("@jsprose/core").Tag<"B", {
-    name: "emphasis";
-    type: "inliner";
-    linkable: true;
-    Data: EmphasisData;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, {
+}
+export declare const emphasisSchema: EmphasisSchema;
+export declare const B: import("../../tag.js").ToEruditTag<EmphasisSchema, "B", {
     accent?: boolean;
-} & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const I: import("@jsprose/core").Tag<"I", {
-    name: "emphasis";
-    type: "inliner";
-    linkable: true;
-    Data: EmphasisData;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const emphasisRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "emphasis";
-    type: "inliner";
-    linkable: true;
-    Data: EmphasisData;
-    Storage: undefined;
-    Children: InlinerSchema[];
-}, {
-    B: import("@jsprose/core").Tag<"B", {
-        name: "emphasis";
-        type: "inliner";
-        linkable: true;
-        Data: EmphasisData;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, {
-        accent?: boolean;
-    } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    I: import("@jsprose/core").Tag<"I", {
-        name: "emphasis";
-        type: "inliner";
-        linkable: true;
-        Data: EmphasisData;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-}, undefined>;
+}>;
+export declare const I: import("../../tag.js").ToEruditTag<EmphasisSchema, "I", unknown>;
 declare const _default: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "emphasis";
-        type: "inliner";
-        linkable: true;
-        Data: EmphasisData;
-        Storage: undefined;
-        Children: InlinerSchema[];
-    }, {
-        B: import("@jsprose/core").Tag<"B", {
-            name: "emphasis";
-            type: "inliner";
-            linkable: true;
-            Data: EmphasisData;
-            Storage: undefined;
-            Children: InlinerSchema[];
-        }, {
-            accent?: boolean;
-        } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-        I: import("@jsprose/core").Tag<"I", {
-            name: "emphasis";
-            type: "inliner";
-            linkable: true;
-            Data: EmphasisData;
-            Storage: undefined;
-            Children: InlinerSchema[];
-        }, TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
+    readonly schema: EmphasisSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<EmphasisSchema, "B", {
+        accent?: boolean;
+    }>, import("../../tag.js").ToEruditTag<EmphasisSchema, "I", unknown>];
 };
 export default _default;

package/dist/elements/emphasis/core.js

@@ -1,16 +1,16 @@
-import { defineRegistryItem, defineSchema, ensureTagInlinerChildren } from "@jsprose/core";
-import { defineEruditProseCoreElement } from "../../coreElement.js";
+import { defineSchema, ensureTagInlinerChildren } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
+import { defineProseCoreElement } from "../../coreElement.js";
 export const emphasisSchema = defineSchema({
 	name: "emphasis",
 	type: "inliner",
 	linkable: true
-})();
+});
 export const B = defineEruditTag({
 	tagName: "B",
 	schema: emphasisSchema
-})(({ element, tagName, props, children, registry }) => {
-	ensureTagInlinerChildren(tagName, children, registry);
+})(({ element, tagName, props, children }) => {
+	ensureTagInlinerChildren(tagName, children);
 	element.children = children;
 	element.data = { type: "bold" };
 	if (props.accent === true) {
@@ -20,13 +20,12 @@ export const B = defineEruditTag({
 export const I = defineEruditTag({
 	tagName: "I",
 	schema: emphasisSchema
-})(({ element, tagName, children, registry }) => {
-	ensureTagInlinerChildren(tagName, children, registry);
+})(({ element, tagName, children }) => {
+	ensureTagInlinerChildren(tagName, children);
 	element.children = children;
 	element.data = { type: "italic" };
 });
-export const emphasisRegistryItem = defineRegistryItem({
+export default defineProseCoreElement({
 	schema: emphasisSchema,
 	tags: [B, I]
 });
-export default defineEruditProseCoreElement({ registryItem: emphasisRegistryItem });

package/dist/elements/flex/Flex.vue

@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import type { ProseElement } from '@jsprose/core';
+import type { ToProseElement } from 'tsprose';
 
-import type { flexSchema } from './core.js';
+import type { FlexSchema } from './core.js';
 import Block from '../../app/shared/block/Block.vue';
 import Render from '../../app/shared/Render.vue';
 
-const { element } = defineProps<{ element: ProseElement<typeof flexSchema> }>();
+const { element } = defineProps<{ element: ToProseElement<FlexSchema> }>();
 
 const justify = (() => {
   return element?.data?.justifyContent ?? 'center';

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

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

package/dist/elements/flex/app.js

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

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

@@ -1,71 +1,29 @@
-import { type BlockSchema, type TagChildren } from '@jsprose/core';
+import { type BlockSchema, type Schema } from 'tsprose';
+export interface FlexSchema extends Schema {
+    name: 'flex';
+    type: 'block';
+    linkable: true;
+    Data: FlexData | undefined;
+    Storage: undefined;
+    Children: BlockSchema[];
+}
 export interface FlexData {
     gap?: string;
     justifyContent?: string;
     flexes?: string[];
 }
-export declare const flexSchema: {
-    name: "flex";
-    type: "block";
-    linkable: true;
-    Data: FlexData | undefined;
-    Storage: undefined;
-    Children: BlockSchema[];
-};
-export declare const Flex: import("@jsprose/core").Tag<"Flex", {
-    name: "flex";
-    type: "block";
-    linkable: true;
-    Data: FlexData | undefined;
-    Storage: undefined;
-    Children: BlockSchema[];
-}, {
+export declare const flexSchema: FlexSchema;
+export declare const Flex: import("../../tag.js").ToEruditTag<FlexSchema, "Flex", {
     gap?: string;
     justify?: string;
     flexes?: string[];
-} & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-export declare const flexRegistryItem: import("@jsprose/core").RegistryItem<{
-    name: "flex";
-    type: "block";
-    linkable: true;
-    Data: FlexData | undefined;
-    Storage: undefined;
-    Children: BlockSchema[];
-}, {
-    Flex: import("@jsprose/core").Tag<"Flex", {
-        name: "flex";
-        type: "block";
-        linkable: true;
-        Data: FlexData | undefined;
-        Storage: undefined;
-        Children: BlockSchema[];
-    }, {
+}>;
+declare const _default: {
+    readonly schema: FlexSchema;
+    readonly tags: [import("../../tag.js").ToEruditTag<FlexSchema, "Flex", {
         gap?: string;
         justify?: string;
         flexes?: string[];
-    } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-}, undefined>;
-declare const _default: {
-    registryItem: import("@jsprose/core").RegistryItem<{
-        name: "flex";
-        type: "block";
-        linkable: true;
-        Data: FlexData | undefined;
-        Storage: undefined;
-        Children: BlockSchema[];
-    }, {
-        Flex: import("@jsprose/core").Tag<"Flex", {
-            name: "flex";
-            type: "block";
-            linkable: true;
-            Data: FlexData | undefined;
-            Storage: undefined;
-            Children: BlockSchema[];
-        }, {
-            gap?: string;
-            justify?: string;
-            flexes?: string[];
-        } & TagChildren & import("../../toc.js").ObjPropToc & import("../../snippet.js").ObjPropSnippet>;
-    }, undefined>;
+    }>];
 };
 export default _default;