@shadow-garden/bapbong-model 0.9.0 → 0.11.0

package/dist/index.cjs

@@ -102,12 +102,15 @@ function pastedImageAttrs(el) {
     src,
     alt: e.getAttribute("alt") ?? "",
     width: dim(e.getAttribute("width")),
-    height: dim(e.getAttribute("height"))
+    height: dim(e.getAttribute("height")),
+    crop: dataJson(el, "data-crop"),
+    outline: dataJson(el, "data-outline")
   };
 }
 function pastedLinkAttrs(el) {
-  const href = (el.getAttribute("href") ?? "").trim();
-  return /^(https?:|mailto:|#)/i.test(href) ? { href } : false;
+  const e = el;
+  const href = (e.getAttribute("href") ?? "").trim();
+  return /^(https?:|mailto:|#)/i.test(href) ? { href, targetFrame: e.getAttribute("data-target-frame") } : false;
 }
 function pastedCellAttrs(el) {
   const e = el;
@@ -124,6 +127,7 @@ function pastedCellAttrs(el) {
     background: bg ? bg[1].trim() : null,
     vAlign: e.getAttribute("data-valign"),
     borders: dataJson(el, "data-borders"),
+    diagonals: dataJson(el, "data-diagonals"),
     padding: dataJson(el, "data-padding"),
     carry: dataJson(el, "data-carry")
   };
@@ -182,7 +186,9 @@ var schema = new import_prosemirror_model.Schema({
         // w:tabs — [{ pos, val: 'left'|'right'|'center'|'decimal', leader? }]
         // in px from the paragraph's content left edge, or null. Importer-set.
         tabs: { default: null },
-        // w:spacing — { before?, after?, line?, lineRule? }, or null.
+        // w:spacing — { before?, after?, line?, lineRule?, beforeAuto?,
+        // afterAuto? }, or null. The two *Auto flags record that Word computes
+        // the gap itself; before/after hold what it works out to here.
         spacing: { default: null },
         // w:bookmarkStart names anchored in this paragraph (["_Toc89595219"]),
         // or null. Link hrefs of the form "#name" resolve against these —
@@ -195,6 +201,11 @@ var schema = new import_prosemirror_model.Schema({
         field: { default: null },
         // w:pageBreakBefore — start this paragraph on a new page.
         pageBreakBefore: { default: false },
+        // w:contextualSpacing — "ignore spacing above and below when using
+        // identical styles". Present ⇒ the flag is on; the two booleans say
+        // which side actually borders a paragraph of the SAME style, which is
+        // resolved at import (only there is both sides of a boundary visible).
+        contextualSpacing: { default: null },
         // w:keepNext — stay on the same page as the next block's first line.
         keepNext: { default: false },
         // w:keepLines — never split this paragraph across pages.
@@ -205,6 +216,10 @@ var schema = new import_prosemirror_model.Schema({
         // w:pBdr — { top?, bottom?, left?, right? } of BorderSide, or null.
         // Importer-set; painted as a box around the paragraph's lines.
         borders: { default: null },
+        // w:shd at the paragraph layer, resolved to a fill "#RRGGBB" (or
+        // null). Painted behind the paragraph's lines, in the same box the
+        // borders use.
+        shading: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
         // customer's save never drops them. { pPr?: string, markRPr?: string }
@@ -230,6 +245,8 @@ var schema = new import_prosemirror_model.Schema({
         if (attrs.styleId) dom["data-style"] = attrs.styleId;
         if (node.attrs["borders"])
           dom["data-borders"] = JSON.stringify(node.attrs["borders"]);
+        if (node.attrs["shading"])
+          dom["data-shading"] = String(node.attrs["shading"]);
         if (node.attrs["carry"])
           dom["data-carry"] = JSON.stringify(node.attrs["carry"]);
         return [tag, dom, 0];
@@ -271,7 +288,13 @@ var schema = new import_prosemirror_model.Schema({
         textbox: { default: null },
         // Clockwise rotation in degrees around the box center (a:xfrm@rot).
         // Paint-only: the layout box stays axis-aligned.
-        rotation: { default: 0 }
+        rotation: { default: 0 },
+        // a:srcRect — { l, t, r, b } ratios of the BITMAP, inward from each
+        // edge, or null for the whole image. Negative values outset. The box
+        // keeps its size; the selected region scales to fill it.
+        crop: { default: null },
+        // a:ln on pic:spPr — Word's picture border, as a BorderSide, or null.
+        outline: { default: null }
       },
       parseDOM: [{ tag: "img[src]", getAttrs: pastedImageAttrs }],
       toDOM(node) {
@@ -282,6 +305,8 @@ var schema = new import_prosemirror_model.Schema({
         };
         if (a["width"] != null) attrs["width"] = String(a["width"]);
         if (a["height"] != null) attrs["height"] = String(a["height"]);
+        if (a["crop"]) attrs["data-crop"] = JSON.stringify(a["crop"]);
+        if (a["outline"]) attrs["data-outline"] = JSON.stringify(a["outline"]);
         return ["img", attrs];
       }
     },
@@ -395,6 +420,8 @@ var schema = new import_prosemirror_model.Schema({
         // w:vAlign — 'center' | 'bottom' (top default)
         borders: { default: null },
         // w:tcBorders per-side visibility override
+        // w:tcBorders/w:tl2br + w:br2tl — rules across the cell's corners
+        diagonals: { default: null },
         padding: { default: null },
         // w:tcMar per-side margin override (px)
         // Carry-through fidelity: unmodelled w:tcPr children ({ tcPr: string
@@ -419,6 +446,8 @@ var schema = new import_prosemirror_model.Schema({
           attrs["data-valign"] = String(node.attrs["vAlign"]);
         if (node.attrs["borders"])
           attrs["data-borders"] = JSON.stringify(node.attrs["borders"]);
+        if (node.attrs["diagonals"])
+          attrs["data-diagonals"] = JSON.stringify(node.attrs["diagonals"]);
         if (node.attrs["padding"])
           attrs["data-padding"] = JSON.stringify(node.attrs["padding"]);
         if (node.attrs["carry"])
@@ -537,6 +566,29 @@ var schema = new import_prosemirror_model.Schema({
         0
       ]
     },
+    // w:kern — the smallest font size (HALF-POINTS) that gets pair kerning.
+    // A threshold, not a switch: whether it bites depends on the run's own
+    // size, so the declared number is what the model keeps and the layout
+    // compares. No DOM representation — CSS font-kerning cannot express a
+    // size threshold, so an external paste simply has no opinion.
+    kern: {
+      attrs: { halfPoints: {} },
+      parseDOM: [
+        {
+          tag: "span[data-kern]",
+          getAttrs: (el) => {
+            const raw = el.getAttribute("data-kern");
+            const n = Number(raw);
+            return Number.isFinite(n) ? { halfPoints: n } : false;
+          }
+        }
+      ],
+      toDOM: (mark) => [
+        "span",
+        { "data-kern": String(mark.attrs["halfPoints"]) },
+        0
+      ]
+    },
     // w:w — horizontal glyph scale as a PERCENT (100 = normal). Squeezes the
     // glyphs and their advances; independent of letterSpacing, which rides on
     // top at its absolute value.
@@ -617,7 +669,11 @@ var schema = new import_prosemirror_model.Schema({
     },
     // w:hyperlink — external URL or "#anchor"
     link: {
-      attrs: { href: {} },
+      // w:hyperlink @w:tgtFrame — the frame the link was meant to open in
+      // ("_blank", "_top", or a frame name), from the HTML-frames era. There
+      // is no frame here to obey it and nothing acts on it; it is modelled so
+      // that saving the file gives the attribute back instead of dropping it.
+      attrs: { href: {}, targetFrame: { default: null } },
       inclusive: false,
       parseDOM: [{ tag: "a[href]", getAttrs: pastedLinkAttrs }],
       toDOM(mark) {
@@ -626,7 +682,8 @@ var schema = new import_prosemirror_model.Schema({
           {
             href: mark.attrs["href"],
             rel: "noopener",
-            target: "_blank"
+            target: "_blank",
+            ...mark.attrs["targetFrame"] ? { "data-target-frame": String(mark.attrs["targetFrame"]) } : {}
           },
           0
         ];

package/dist/index.js

@@ -70,12 +70,15 @@ function pastedImageAttrs(el) {
     src,
     alt: e.getAttribute("alt") ?? "",
     width: dim(e.getAttribute("width")),
-    height: dim(e.getAttribute("height"))
+    height: dim(e.getAttribute("height")),
+    crop: dataJson(el, "data-crop"),
+    outline: dataJson(el, "data-outline")
   };
 }
 function pastedLinkAttrs(el) {
-  const href = (el.getAttribute("href") ?? "").trim();
-  return /^(https?:|mailto:|#)/i.test(href) ? { href } : false;
+  const e = el;
+  const href = (e.getAttribute("href") ?? "").trim();
+  return /^(https?:|mailto:|#)/i.test(href) ? { href, targetFrame: e.getAttribute("data-target-frame") } : false;
 }
 function pastedCellAttrs(el) {
   const e = el;
@@ -92,6 +95,7 @@ function pastedCellAttrs(el) {
     background: bg ? bg[1].trim() : null,
     vAlign: e.getAttribute("data-valign"),
     borders: dataJson(el, "data-borders"),
+    diagonals: dataJson(el, "data-diagonals"),
     padding: dataJson(el, "data-padding"),
     carry: dataJson(el, "data-carry")
   };
@@ -150,7 +154,9 @@ var schema = new Schema({
         // w:tabs — [{ pos, val: 'left'|'right'|'center'|'decimal', leader? }]
         // in px from the paragraph's content left edge, or null. Importer-set.
         tabs: { default: null },
-        // w:spacing — { before?, after?, line?, lineRule? }, or null.
+        // w:spacing — { before?, after?, line?, lineRule?, beforeAuto?,
+        // afterAuto? }, or null. The two *Auto flags record that Word computes
+        // the gap itself; before/after hold what it works out to here.
         spacing: { default: null },
         // w:bookmarkStart names anchored in this paragraph (["_Toc89595219"]),
         // or null. Link hrefs of the form "#name" resolve against these —
@@ -163,6 +169,11 @@ var schema = new Schema({
         field: { default: null },
         // w:pageBreakBefore — start this paragraph on a new page.
         pageBreakBefore: { default: false },
+        // w:contextualSpacing — "ignore spacing above and below when using
+        // identical styles". Present ⇒ the flag is on; the two booleans say
+        // which side actually borders a paragraph of the SAME style, which is
+        // resolved at import (only there is both sides of a boundary visible).
+        contextualSpacing: { default: null },
         // w:keepNext — stay on the same page as the next block's first line.
         keepNext: { default: false },
         // w:keepLines — never split this paragraph across pages.
@@ -173,6 +184,10 @@ var schema = new Schema({
         // w:pBdr — { top?, bottom?, left?, right? } of BorderSide, or null.
         // Importer-set; painted as a box around the paragraph's lines.
         borders: { default: null },
+        // w:shd at the paragraph layer, resolved to a fill "#RRGGBB" (or
+        // null). Painted behind the paragraph's lines, in the same box the
+        // borders use.
+        shading: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
         // customer's save never drops them. { pPr?: string, markRPr?: string }
@@ -198,6 +213,8 @@ var schema = new Schema({
         if (attrs.styleId) dom["data-style"] = attrs.styleId;
         if (node.attrs["borders"])
           dom["data-borders"] = JSON.stringify(node.attrs["borders"]);
+        if (node.attrs["shading"])
+          dom["data-shading"] = String(node.attrs["shading"]);
         if (node.attrs["carry"])
           dom["data-carry"] = JSON.stringify(node.attrs["carry"]);
         return [tag, dom, 0];
@@ -239,7 +256,13 @@ var schema = new Schema({
         textbox: { default: null },
         // Clockwise rotation in degrees around the box center (a:xfrm@rot).
         // Paint-only: the layout box stays axis-aligned.
-        rotation: { default: 0 }
+        rotation: { default: 0 },
+        // a:srcRect — { l, t, r, b } ratios of the BITMAP, inward from each
+        // edge, or null for the whole image. Negative values outset. The box
+        // keeps its size; the selected region scales to fill it.
+        crop: { default: null },
+        // a:ln on pic:spPr — Word's picture border, as a BorderSide, or null.
+        outline: { default: null }
       },
       parseDOM: [{ tag: "img[src]", getAttrs: pastedImageAttrs }],
       toDOM(node) {
@@ -250,6 +273,8 @@ var schema = new Schema({
         };
         if (a["width"] != null) attrs["width"] = String(a["width"]);
         if (a["height"] != null) attrs["height"] = String(a["height"]);
+        if (a["crop"]) attrs["data-crop"] = JSON.stringify(a["crop"]);
+        if (a["outline"]) attrs["data-outline"] = JSON.stringify(a["outline"]);
         return ["img", attrs];
       }
     },
@@ -363,6 +388,8 @@ var schema = new Schema({
         // w:vAlign — 'center' | 'bottom' (top default)
         borders: { default: null },
         // w:tcBorders per-side visibility override
+        // w:tcBorders/w:tl2br + w:br2tl — rules across the cell's corners
+        diagonals: { default: null },
         padding: { default: null },
         // w:tcMar per-side margin override (px)
         // Carry-through fidelity: unmodelled w:tcPr children ({ tcPr: string
@@ -387,6 +414,8 @@ var schema = new Schema({
           attrs["data-valign"] = String(node.attrs["vAlign"]);
         if (node.attrs["borders"])
           attrs["data-borders"] = JSON.stringify(node.attrs["borders"]);
+        if (node.attrs["diagonals"])
+          attrs["data-diagonals"] = JSON.stringify(node.attrs["diagonals"]);
         if (node.attrs["padding"])
           attrs["data-padding"] = JSON.stringify(node.attrs["padding"]);
         if (node.attrs["carry"])
@@ -505,6 +534,29 @@ var schema = new Schema({
         0
       ]
     },
+    // w:kern — the smallest font size (HALF-POINTS) that gets pair kerning.
+    // A threshold, not a switch: whether it bites depends on the run's own
+    // size, so the declared number is what the model keeps and the layout
+    // compares. No DOM representation — CSS font-kerning cannot express a
+    // size threshold, so an external paste simply has no opinion.
+    kern: {
+      attrs: { halfPoints: {} },
+      parseDOM: [
+        {
+          tag: "span[data-kern]",
+          getAttrs: (el) => {
+            const raw = el.getAttribute("data-kern");
+            const n = Number(raw);
+            return Number.isFinite(n) ? { halfPoints: n } : false;
+          }
+        }
+      ],
+      toDOM: (mark) => [
+        "span",
+        { "data-kern": String(mark.attrs["halfPoints"]) },
+        0
+      ]
+    },
     // w:w — horizontal glyph scale as a PERCENT (100 = normal). Squeezes the
     // glyphs and their advances; independent of letterSpacing, which rides on
     // top at its absolute value.
@@ -585,7 +637,11 @@ var schema = new Schema({
     },
     // w:hyperlink — external URL or "#anchor"
     link: {
-      attrs: { href: {} },
+      // w:hyperlink @w:tgtFrame — the frame the link was meant to open in
+      // ("_blank", "_top", or a frame name), from the HTML-frames era. There
+      // is no frame here to obey it and nothing acts on it; it is modelled so
+      // that saving the file gives the attribute back instead of dropping it.
+      attrs: { href: {}, targetFrame: { default: null } },
       inclusive: false,
       parseDOM: [{ tag: "a[href]", getAttrs: pastedLinkAttrs }],
       toDOM(mark) {
@@ -594,7 +650,8 @@ var schema = new Schema({
           {
             href: mark.attrs["href"],
             rel: "noopener",
-            target: "_blank"
+            target: "_blank",
+            ...mark.attrs["targetFrame"] ? { "data-target-frame": String(mark.attrs["targetFrame"]) } : {}
           },
           0
         ];

package/dist/lib/model.d.ts

@@ -8,7 +8,7 @@ import { Schema } from 'prosemirror-model';
  * extend THIS schema so the importer, layout engine, and (canvas) painter all
  * agree on one document model.
  */
-export declare const schema: Schema<"paragraph" | "doc" | "text" | "hard_break" | "image" | "page_field" | "table" | "table_row" | "table_cell", "strong" | "em" | "underline" | "strike" | "dstrike" | "smallCaps" | "textColor" | "fontSize" | "vertAlign" | "letterSpacing" | "charScale" | "position" | "highlight" | "fontFamily" | "link" | "footnote" | "carryRPr">;
+export declare const schema: Schema<"paragraph" | "doc" | "text" | "hard_break" | "image" | "page_field" | "table" | "table_row" | "table_cell", "strong" | "em" | "underline" | "strike" | "dstrike" | "smallCaps" | "textColor" | "fontSize" | "vertAlign" | "letterSpacing" | "kern" | "charScale" | "position" | "highlight" | "fontFamily" | "link" | "footnote" | "carryRPr">;
 /** Concrete schema type, handy for typing Node/Mark across packages. */
 export type BapbongSchema = typeof schema;
 /**
@@ -35,6 +35,12 @@ export interface Spacing {
     after?: number;
     line?: number;
     lineRule?: 'auto' | 'exact' | 'atLeast';
+    /** w:beforeAutospacing / w:afterAutospacing — "determine the spacing
+     *  automatically, matching an HTML document". `before`/`after` then hold the
+     *  amount the importer resolved for this paragraph's position (0 where Word
+     *  suppresses it), and these flags are what the exporter writes back. */
+    beforeAuto?: boolean;
+    afterAuto?: boolean;
 }
 export interface ParagraphAttrs {
     list: ListInfo | null;

package/dist/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAkF3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,+UA0jBjB,CAAC;AAEH,wEAAwE;AACxE,MAAM,MAAM,aAAa,GAAG,OAAO,MAAM,CAAC;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,aAAa,yDA0CxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD,qDAAqD;AACrD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D;+EAC+E;AAC/E,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,2EAA2E;AAC3E,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAAC;CACvC;AA0BD;;;4EAG4E;AAC5E,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAwF3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,wVAinBjB,CAAC;AAEH,wEAAwE;AACxE,MAAM,MAAM,aAAa,GAAG,OAAO,MAAM,CAAC;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,aAAa,yDA0CxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD,qDAAqD;AACrD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D;+EAC+E;AAC/E,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,2EAA2E;AAC3E,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACxC;;;6EAGyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAAC;CACvC;AA0BD;;;4EAG4E;AAC5E,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadow-garden/bapbong-model",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "bapbong — ProseMirror document model / schema",
   "license": "MIT",
   "repository": {