@inshapardaz/likhari-converters 0.1.18-dev.156 → 0.1.18-dev.158

package/dist/html/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/html/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiCjD,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvD;AAsWD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAMvF"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/html/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiCjD,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvD;AAiVD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAMvF"}

package/dist/html/parse.js

@@ -251,43 +251,28 @@ function convertLayout(container) {
     const templateColumns = container.style.gridTemplateColumns || `repeat(${Math.max(items.length, 2)}, 1fr)`;
     return elementBase('layout-container', items.length > 0 ? items : [elementBase('layout-item', [paragraph()])], { templateColumns });
 }
-const POETRY_LAYOUTS = new Set(['single', 'two-column', 'alternating']);
+const POETRY_LAYOUTS = new Set(['single', 'two-column']);
 const POETRY_ALIGNS = new Set(['justify', 'left', 'right', 'start']);
-function convertPoetryCouplet(el) {
-    const centered = el.getAttribute('data-likhari-poetry-couplet-centered') === 'true';
-    const children = flowBlocks(el);
-    return elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered });
-}
 function convertPoetry(el) {
     const rawLayout = el.getAttribute('data-likhari-poetry-layout') ?? 'single';
     const layout = POETRY_LAYOUTS.has(rawLayout) ? rawLayout : 'single';
     const rawAlign = el.getAttribute('data-likhari-poetry-align') ?? 'justify';
     const align = POETRY_ALIGNS.has(rawAlign) ? rawAlign : 'justify';
-    // Couplets may mix wrapper types within one block — a two-column layout
-    // row (data-likhari-layout-container) and a centered single couplet
-    // (data-likhari-poetry-couplet) can sit side by side — grab all of them,
-    // not just the first, or every couplet past the first silently disappears.
-    const couplets = Array.from(el.children)
-        .map((c) => {
-        if (c.hasAttribute('data-likhari-layout-container'))
-            return convertLayout(c);
-        if (c.hasAttribute('data-likhari-poetry-couplet'))
-            return convertPoetryCouplet(c);
-        return null;
-    })
-        .filter((n) => n !== null);
-    if (couplets.length > 0)
-        return elementBase('poetry-block', couplets, { layout, align });
-    // Fallback: legacy markup with no explicit couplet wrappers at all.
     if (layout === 'two-column') {
-        return elementBase('poetry-block', [
-            elementBase('layout-container', [elementBase('layout-item', [paragraph()]), elementBase('layout-item', [paragraph()])], {
-                templateColumns: 'repeat(2, 1fr)',
-            }),
-        ], { layout, align });
+        // One LayoutContainerNode row per couplet — grab all of them, not just
+        // the first, or every couplet past the first silently disappears.
+        const containerEls = Array.from(el.children).filter((c) => c.hasAttribute('data-likhari-layout-container'));
+        const containers = containerEls.length > 0
+            ? containerEls.map((c) => convertLayout(c))
+            : [
+                elementBase('layout-container', [elementBase('layout-item', [paragraph()]), elementBase('layout-item', [paragraph()])], {
+                    templateColumns: 'repeat(2, 1fr)',
+                }),
+            ];
+        return elementBase('poetry-couplet', containers, { layout, align });
     }
     const children = flowBlocks(el);
-    return elementBase('poetry-block', [elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered: false })], { layout, align });
+    return elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { layout, align });
 }
 function convertFootnoteList(el) {
     const items = [];

package/dist/html/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/html/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAEkG,KAAK,KAAK,EAClH,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AA8ID,wBAAgB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAiDtE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI1F"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/html/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAEkG,KAAK,KAAK,EAClH,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAuID,wBAAgB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CA+CtE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI1F"}

package/dist/html/serialize.js

@@ -116,17 +116,11 @@ function layoutToHtml(node, ctx) {
     return `<div data-likhari-layout-container style="display: grid; grid-template-columns: ${escapeAttr(templateColumns)}">${columns}</div>`;
 }
 function poetryToHtml(node, ctx) {
-    const layout = node.layout === 'two-column' || node.layout === 'alternating' ? node.layout : 'single';
+    const layout = node.layout === 'two-column' ? 'two-column' : 'single';
     const align = typeof node.align === 'string' ? node.align : 'justify';
     const inner = (node.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
     return `<div data-likhari-poetry-layout="${layout}" data-likhari-poetry-align="${align}" style="text-align: ${escapeAttr(align)}">${inner}</div>`;
 }
-function poetryCoupletToHtml(node, ctx) {
-    const centered = node.centered === true;
-    const inner = (node.children ?? []).map((child) => nodeToHtml(child, ctx)).join('');
-    const centeredAttr = centered ? ' data-likhari-poetry-couplet-centered="true"' : '';
-    return `<div data-likhari-poetry-couplet${centeredAttr}>${inner}</div>`;
-}
 function imageToHtml(node, ctx) {
     const rawSrc = String(node.src ?? '');
     const src = ctx?.resolveImageUrl ? ctx.resolveImageUrl(rawSrc) : rawSrc;
@@ -179,10 +173,8 @@ export function nodeToHtml(node, ctx) {
             return footnoteReferenceToHtml(node);
         case 'footnote-list':
             return footnoteListToHtml(node, ctx);
-        case 'poetry-block':
-            return poetryToHtml(node, ctx);
         case 'poetry-couplet':
-            return poetryCoupletToHtml(node, ctx);
+            return poetryToHtml(node, ctx);
         default:
             // Unknown node (e.g. a future feature): keep its content, drop the wrapper.
             return inlineChildren(node, ctx);

package/dist/markdown/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/markdown/parse.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAkUjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAO3F"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/markdown/parse.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAwTjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAO3F"}

package/dist/markdown/parse.js

@@ -239,21 +239,10 @@ function blocks(nodes, extra = {}) {
                 }
                 else if (node.name === 'poetry') {
                     const attrs = node.attributes ?? {};
-                    const layout = attrs.layout === 'two-column' || attrs.layout === 'alternating' ? attrs.layout : 'single';
+                    const layout = attrs.layout === 'two-column' ? 'two-column' : 'single';
                     const align = ALIGNMENTS.has(attrs.align ?? '') ? attrs.align : 'justify';
-                    let children = blocks(node.children ?? []);
-                    // Legacy markup (no explicit couplet/column wrappers): treat the
-                    // flat content as a single couplet, same as the import fallback.
-                    const hasWrappers = children.some((c) => c.type === 'poetry-couplet' || c.type === 'layout-container');
-                    if (!hasWrappers) {
-                        children = [elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered: false })];
-                    }
-                    out.push(elementBase('poetry-block', children, { layout, align }));
-                }
-                else if (node.name === 'couplet') {
-                    const centered = (node.attributes ?? {}).centered === 'true';
                     const children = blocks(node.children ?? []);
-                    out.push(elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { centered }));
+                    out.push(elementBase('poetry-couplet', children.length > 0 ? children : [paragraph(), paragraph()], { layout, align }));
                 }
                 else {
                     // Unknown containers (including a stray "column" outside "columns")

package/dist/markdown/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/markdown/serialize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD,OAAO,EAAa,KAAK,KAAK,EAAe,MAAM,SAAS,CAAC;AAyC7D,2GAA2G;AAC3G,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAUjD;AAqHD,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,CAMhE;AA4ID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI9F"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/markdown/serialize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKjD,OAAO,EAAa,KAAK,KAAK,EAAe,MAAM,SAAS,CAAC;AAyC7D,2GAA2G;AAC3G,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAUjD;AAqHD,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,CAMhE;AAoID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAI9F"}

package/dist/markdown/serialize.js

@@ -247,16 +247,11 @@ function layoutToMd(node, ctx) {
     return directive('containerDirective', 'columns', { count: String(items.length) }, columns);
 }
 function poetryToMd(node, ctx) {
-    const layout = node.layout === 'two-column' || node.layout === 'alternating' ? node.layout : 'single';
+    const layout = node.layout === 'two-column' ? 'two-column' : 'single';
     const align = typeof node.align === 'string' ? node.align : 'justify';
     const inner = (node.children ?? []).flatMap((child) => blockToMd(child, ctx));
     return directive('containerDirective', 'poetry', { layout, align }, inner);
 }
-function poetryCoupletToMd(node, ctx) {
-    const inner = (node.children ?? []).flatMap((child) => blockToMd(child, ctx));
-    const attrs = node.centered === true ? { centered: 'true' } : {};
-    return directive('containerDirective', 'couplet', attrs, inner);
-}
 function tableToMd(node, ctx) {
     const rows = (node.children ?? []).map((row) => ({
         type: 'tableRow',
@@ -300,10 +295,8 @@ function blockToMd(node, ctx) {
             return [tableToMd(node, ctx)];
         case 'layout-container':
             return [layoutToMd(node, ctx)];
-        case 'poetry-block':
-            return [poetryToMd(node, ctx)];
         case 'poetry-couplet':
-            return [poetryCoupletToMd(node, ctx)];
+            return [poetryToMd(node, ctx)];
         case 'footnote-list':
             return (node.children ?? []).map((item) => ({
                 type: 'footnoteDefinition',

package/dist/plain-text/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plain-text/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgGhD,eAAO,MAAM,kBAAkB,EAAE,eAsDhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plain-text/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA4FhD,eAAO,MAAM,kBAAkB,EAAE,eAsDhC,CAAC"}

package/dist/plain-text/index.js

@@ -28,19 +28,15 @@ function nodeToText(node, order, listItemIndex = 0) {
         return `[${order.get(id) ?? '?'}]`;
     }
     // Linearized per the fidelity matrix ("Poetry layout variants ⚠️ linearized"):
-    // one misra per line, regardless of single/two-column/alternating layout
-    // and however many couplets the block holds, mixed wrapper types included
-    // (a two-column couplet is its own layout-container row; a single or
-    // centered couplet is its own poetry-couplet wrapper) — so each couplet
-    // contributes its two misra lines in turn rather than only the block's
-    // first couplet being read.
-    if (node.type === 'poetry-block' || node.type === 'poetry-couplet') {
+    // one misra per line, regardless of single/two-column layout and however
+    // many couplets the block holds — in two-column layout each couplet is
+    // its own layout-container row, so each contributes its two item lines
+    // in turn rather than only the block's first couplet being read.
+    if (node.type === 'poetry-couplet') {
         const children = withChildren.children ?? [];
         const lines = children.flatMap((child) => child.type === 'layout-container'
             ? (child.children ?? []).map((item) => nodeToText(item, order))
-            : child.type === 'poetry-couplet'
-                ? (child.children ?? []).map((item) => nodeToText(item, order))
-                : [nodeToText(child, order)]);
+            : [nodeToText(child, order)]);
         return lines.join('\n');
     }
     if (node.type === 'list' && withChildren.children) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inshapardaz/likhari-converters",
-  "version": "0.1.18-dev.156",
+  "version": "0.1.18-dev.158",
   "description": "Format transformers (Markdown/HTML/plain-text/Lexical JSON) against the canonical Lexical EditorState, isolated from UI.",
   "license": "MIT",
   "repository": {