@threadlabs/looma 0.38.0 → 0.39.0

package/EXPRESSIVE-MARKDOWN.md

@@ -25,6 +25,8 @@ const markdown = stringify(ast);
 const restoredEditorJson = expressmarkToEditorDocument(parse(markdown));
 ```
 
+Editor Markdown import and export explicitly select Expressmark’s `compatible` syntax (CommonMark/GFM with expressive extensions), preserving the existing interchange format as Expressmark’s defaults evolve. Pass `syntax` in conversion options when selecting another supported reading; content outside the editor schema still raises a conversion error.
+
 The editor continues to save Tiptap JSON. Expressive Markdown is an interchange
 format; it does not replace your saved document, history or application metadata.
 See the [proposal and syntax](https://nextwebwg.org/expressive-markdown/) and

package/README.md

@@ -67,7 +67,7 @@ The package includes the documentation generator and theme customizer used by Lo
 Install the optional documentation tools, then initialize your project:
 
 ```sh
-pnpm add -D markupress @nextwebwg/htmlkit@1.0.0-alpha.69 vite
+pnpm add -D markupress @threadlabs/markupkit@0.2.0 vite
 pnpm exec looma-docs init
 pnpm exec looma-docs dev
 ```

package/docs/README.md

@@ -12,12 +12,12 @@ In a project with a `package.json`, install Looma and its documentation tools:
 
 ```sh
 pnpm add @threadlabs/looma @nextwebwg/html-next@1.0.0-alpha.69
-pnpm add -D markupress@^0.9.1 @nextwebwg/htmlkit@1.0.0-alpha.69 vite
+pnpm add -D 'markupress@>=0.10.0 <1' '@threadlabs/markupkit@>=0.2.0 <1' vite
 pnpm exec looma-docs init --title "The Fellowship"
 pnpm exec looma-docs dev
 ```
 
-Use the tool versions accepted by Looma's optional peer dependencies. Markupress 0.9 supplies the current documentation theme, including one appearance button that cycles Automatic, Light and Dark. Regular component imports do not load the documentation server. Vue and Tiptap remain optional; install them when your own authored documentation mounts the Vue editor.
+Use the tool versions accepted by Looma's optional peer dependencies. Markupress 0.10 and later compatible 0.x releases supply the current documentation theme, including one appearance button that cycles Automatic, Light and Dark. Regular component imports do not load the documentation server. Vue and Tiptap remain optional; install them when your own authored documentation mounts the Vue editor.
 
 Initialization creates three project-owned files:
 
@@ -44,7 +44,7 @@ pnpm exec looma-docs build
 pnpm exec looma-docs preview
 ```
 
-`build` produces a static HTMLKit site in the configured output directory. `preview` serves that output without a repository writer. All commands accept `--root`; `dev` and `preview` also accept `--port`.
+`build` produces a static MarkupKit site in the configured output directory. `preview` serves that output without a repository writer. All commands accept `--root`; `dev` and `preview` also accept `--port`.
 
 ## Name your local design system
 

package/docs/catalog.json

@@ -458,7 +458,7 @@
   ],
   "schemaVersion": 1,
   "package": "@threadlabs/looma",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "groups": [
     {
       "id": "layout",

package/docs/cli.mjs

@@ -6,7 +6,7 @@ try {
   const { values, positionals } = parseArgs({ allowPositionals: true, options: { root: { type: 'string' }, port: { type: 'string' }, title: { type: 'string' }, help: { type: 'boolean', short: 'h' } } });
   const [command = 'help'] = positionals;
   if (values.help || command === 'help') {
-    console.log('looma-docs init | dev | build | preview\n\n  --root <project>  Project directory\n  --port <number>   Local server port (default 3000)\n  --title <name>    Documentation title for init\n\nInstall the optional documentation peers: markupress, @nextwebwg/htmlkit and vite.');
+    console.log('looma-docs init | dev | build | preview\n\n  --root <project>  Project directory\n  --port <number>   Local server port (default 3000)\n  --title <name>    Documentation title for init\n\nInstall the optional documentation peers: markupress, @threadlabs/markupkit and vite.');
   } else {
     const options = { ...(values.root ? { root: values.root } : {}), ...(values.title ? { title: values.title } : {}) };
     if (values.port) { const port = Number(values.port); if (!Number.isInteger(port) || port < 0 || port > 65535) throw new Error('Port must be an integer from 0 to 65535.'); options.port = port; }

package/docs/commands.mjs

@@ -47,11 +47,11 @@ export async function buildProjectDocumentation({ root = process.cwd(), config,
 }
 export async function previewProjectDocumentation({ root = process.cwd(), config, port = 3000 } = {}) {
   if (!config) ({ root, config } = await readConfiguration(root));
-  const { previewApplication } = await tool('@nextwebwg/htmlkit', root);
+  const { previewApplication } = await tool('@threadlabs/markupkit', root);
   return previewApplication({ root, outDir: config.outDir ?? '.looma/site', base: config.base ?? '/', host: '127.0.0.1', port });
 }
 
-/** HTMLKit serves the build; this local-only gateway adds the constrained repository writer. */
+/** MarkupKit serves the build; this local-only gateway adds the constrained repository writer. */
 export async function devProjectDocumentation({ root = process.cwd(), config, catalog, port = 3000, onError = console.error } = {}) {
   const configured = Boolean(config);
   if (!config) ({ root, config } = await readConfiguration(root));

package/docs/index.d.ts

@@ -39,9 +39,9 @@ export function discoverComponents(input: DiscoveryRoot & { root: string }): Pro
 export function mergeCatalogs(catalogs: DocumentationCatalog[], options?: { categories?: Record<string, string> }): DocumentationCatalog;
 export function prepareDocumentation(input: DocumentationInput & { root: string }): Promise<DocumentationSite>;
 export function buildDocumentation(input?: DocumentationInput): Promise<DocumentationBuild>;
-/** Optional HTMLKit integration; server tooling peers are loaded only when invoked. */
-export function documentationOptions(site: DocumentationSite): Promise<import('@nextwebwg/htmlkit').ApplicationOptions>;
-export function documentationPlugin(site: DocumentationSite): import('@nextwebwg/htmlkit').HtmlKitPlugin;
+/** Optional MarkupKit integration; server tooling peers are loaded only when invoked. */
+export function documentationOptions(site: DocumentationSite): Promise<import('@threadlabs/markupkit').ApplicationOptions>;
+export function documentationPlugin(site: DocumentationSite): import('@threadlabs/markupkit').MarkupKitPlugin;
 export function initializeDocumentation(input?: { root?: string; title?: string }): Promise<{ config: DocumentationConfiguration; files: string[]; applicationImport: string }>;
 export function readConfiguration(root?: string): Promise<{ root: string; config: DocumentationConfiguration }>;
 export function buildProjectDocumentation(input?: DocumentationInput): Promise<DocumentationBuild>;

package/docs/local-server.mjs

@@ -17,7 +17,7 @@ async function body(request) {
 /** Local capabilities stay in the parent editor; opaque example frames receive only theme CSS. */
 export async function serveLocalDocumentation({ upstream, store, base = '/', port = 0, onSaved = async () => {} }) {
   const target = new URL(upstream);
-  if (target.protocol !== 'http:' || target.hostname !== '127.0.0.1') throw new Error('The documentation upstream must be a loopback HTMLKit server.');
+  if (target.protocol !== 'http:' || target.hostname !== '127.0.0.1') throw new Error('The documentation upstream must be a loopback MarkupKit server.');
   const capability = randomBytes(32).toString('hex');
   let origin;
   const json = (response, status, data) => {

package/docs/site.mjs

@@ -13,7 +13,7 @@ import { cacheDirectory, rejectSymlink, withBuildLock } from './workspace.mjs';
 const own = name => fileURLToPath(new URL(name, import.meta.url));
 /** Resolve import-only optional tooling peers in the consumer's ESM package scope. */
 export async function tool(name, root) {
-  if (!['markupress', '@nextwebwg/htmlkit', 'vite'].includes(name)) throw new Error(`Unknown documentation tool ${name}.`);
+  if (!['markupress', '@threadlabs/markupkit', 'vite'].includes(name)) throw new Error(`Unknown documentation tool ${name}.`);
   const directory = await cacheDirectory(root, 'tooling');
   const file = path.join(directory, name.replaceAll('/', '-').replace('@', '') + '.mjs');
   await rejectSymlink(file);
@@ -89,7 +89,7 @@ export async function prepareDocumentation({ root, config = {}, catalog }) {
   for (const file of ['customizer.js', 'theme.mjs', 'theme-session.mjs', 'value-editors.mjs', 'palette.mjs', 'fonts.mjs']) await cp(own(file), path.join(generated, file));
   const write = async (file, source) => { await mkdir(path.dirname(file), { recursive: true }); await writeFile(file, source); };
   const examples = [];
-  // HTMLKit route groups retain their labels/order in navigation without changing public URLs.
+  // MarkupKit route groups retain their labels/order in navigation without changing public URLs.
   const groupDirectories = new Map(combined.groups.map((group, index) => [group.id,
     `${String(index + 1).padStart(2, '0')}.(${group.label.replace(/[\\/()]/g, '-')})`]));
   const generatedReferences = new Set();
@@ -114,7 +114,7 @@ export async function prepareDocumentation({ root, config = {}, catalog }) {
       const setup = path.join(previews, key + '.js');
       const behavior = example.behavior;
       await write(setup, `import { connect as connectPreview } from '../preview.js';\n${behavior ? `import setupExample from ${JSON.stringify(behavior)};\n` : ''}export function connect(host) { const stopPreview = connectPreview(host); ${behavior ? 'const stopExample = setupExample(host.element);' : ''} return () => { ${behavior ? 'stopExample?.();' : ''} stopPreview(); }; }\n`);
-      await write(file, ` ${links}\n<template component="looma-preview-${key}" module="./${key}.js"><defs><meta name="hk:navigation" content="hidden"><title>${escapeHtml(example.title)}</title></defs><div data-preview="${escapeHtml(example.id)}"${component.group === 'layout' ? ' data-preview-layout' : ''}>${example.markup}${anchors}</div></template>\n`);
+      await write(file, ` ${links}\n<template component="looma-preview-${key}" module="./${key}.js"><defs><meta name="mk:navigation" content="hidden"><title>${escapeHtml(example.title)}</title></defs><div data-preview="${escapeHtml(example.id)}"${component.group === 'layout' ? ' data-preview-layout' : ''}>${example.markup}${anchors}</div></template>\n`);
       examples.push({ ...example, file, component: component.id, path: base + previewPath(example).slice(1) });
     }
   }
@@ -155,7 +155,7 @@ export async function prepareDocumentation({ root, config = {}, catalog }) {
   return { root, config, base, catalog: combined, examples, generated, content, previews, redirects };
 }
 
-/** Bundle validated theme restoration into HTMLKit's before-paint head hook. */
+/** Bundle validated theme restoration into MarkupKit's before-paint head hook. */
 async function themeBootstrap(site) {
   const { build } = await tool('vite', site.root);
   const entry = path.join(site.generated, 'theme-bootstrap.mjs');
@@ -210,11 +210,11 @@ async function portableThemeStyles(site) {
   return styles;
 }
 
-/** Build through HTMLKit, then make opaque preview scripts portable to static hosts without CORS. */
+/** Build through MarkupKit, then make opaque preview scripts portable to static hosts without CORS. */
 export async function buildDocumentation({ root = process.cwd(), config = {}, catalog } = {}) {
   return withBuildLock(root, async () => {
     const site = await prepareDocumentation({ root, config, catalog });
-    const { buildApplication } = await tool('@nextwebwg/htmlkit', site.root);
+    const { buildApplication } = await tool('@threadlabs/markupkit', site.root);
     const built = await buildApplication(await documentationOptions(site));
     return { ...built, site };
   });

package/editor/expressmark.js

@@ -109,7 +109,7 @@ function safeBackground(value, path) {
 			value: "color",
 			attributes: { style }
 		}]
-	})), (node) => typeof node.attributes?.style === "string")?.attributes?.style;
+	}), { syntax: "compatible" }), (node) => typeof node.attributes?.style === "string")?.attributes?.style;
 	if (typeof accepted !== "string" || accepted.replace(/\s/g, "").replace(/;$/, "") !== style.replace(/\s/g, "")) fail(path, "unsafe or unsupported table background");
 }
 function safeNavigation(value, image, path) {
@@ -129,7 +129,7 @@ function safeNavigation(value, image, path) {
 				value: "link"
 			}]
 		}]
-	})), (child) => child.type === (image ? "image" : "link"))?.url !== value) fail(path, "unsafe or unsupported navigation URL");
+	}), { syntax: "compatible" }), (child) => child.type === (image ? "image" : "link"))?.url !== value) fail(path, "unsafe or unsupported navigation URL");
 }
 var MARKS = {
 	bold: "strong",
@@ -605,6 +605,7 @@ function editorDocumentToExpressmark(document, options = {}) {
 	return {
 		type: "document",
 		version: 1,
+		syntax: options.syntax ?? "compatible",
 		body: (document.content ?? []).map((node, index) => {
 			const child = toNode(node, `document.body[${index}]`, context);
 			return child.type === "image" ? {
@@ -1007,7 +1008,11 @@ function expressmarkToEditorDocument(document) {
 * @failure Unsupported editor data raises EditorMarkdownConversionError before any input is changed.
 */
 function editorDocumentToMarkdown(document, options = {}) {
-	return stringify(editorDocumentToExpressmark(document, options), options);
+	const conversion = {
+		syntax: "compatible",
+		...options
+	};
+	return stringify(editorDocumentToExpressmark(document, conversion), conversion);
 }
 /**
 * Serializes the current editor, including its current display cache and concrete TOC entries.
@@ -1024,7 +1029,10 @@ function editorToMarkdown(editor, options = {}) {
 * @failure Unsupported content or root metadata stops conversion instead of being silently flattened.
 */
 function markdownToEditorDocument(markdown, options = {}) {
-	return expressmarkToEditorDocument(parse(markdown, options));
+	return expressmarkToEditorDocument(parse(markdown, {
+		syntax: "compatible",
+		...options
+	}));
 }
 //#endregion
 export { EditorMarkdownConversionError, editorDocumentToExpressmark, editorDocumentToMarkdown, editorToMarkdown, expressmarkToEditorDocument, markdownToEditorDocument };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadlabs/looma",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "type": "module",
   "description": "Looma components as HTML, Vue, and plain DOM, with design tokens.",
   "license": "MIT",
@@ -119,7 +119,7 @@
     "lowlight": "^3.3.0",
     "markdown-it": "14.3.1",
     "lucide": "~0.554.0",
-    "expressmark": "0.1.6"
+    "expressmark": ">=0.2.0 <1"
   },
   "peerDependencies": {
     "@nextwebwg/html-next": "1.0.0-alpha.69",
@@ -127,9 +127,9 @@
     "@tiptap/pm": ">=2 <3",
     "@tiptap/vue-3": ">=2 <3",
     "vue": "^3.5.43",
-    "markupress": "^0.9.1",
-    "@nextwebwg/htmlkit": "1.0.0-alpha.69",
-    "vite": "^8.3.4"
+    "markupress": ">=0.10.0 <1",
+    "@threadlabs/markupkit": ">=0.2.0 <1",
+    "vite": ">=7.2.7 <9"
   },
   "peerDependenciesMeta": {
     "@tiptap/core": {
@@ -147,7 +147,7 @@
     "markupress": {
       "optional": true
     },
-    "@nextwebwg/htmlkit": {
+    "@threadlabs/markupkit": {
       "optional": true
     },
     "vite": {