@shadow-garden/bapbong-model 0.12.0 → 0.13.0

package/dist/index.cjs

@@ -71,6 +71,73 @@ function fieldAt(doc, pos) {
 
 // packages/model/src/lib/model.ts
 var import_prosemirror_model = require("prosemirror-model");
+
+// packages/contracts/dist/index.js
+var FIELD_SET = {
+  family: true,
+  sizePt: true,
+  bold: true,
+  italic: true,
+  letterSpacing: true,
+  scaleX: true,
+  kerning: true
+};
+var FIELDS = Object.keys(FIELD_SET);
+var SUB_DIGIT = "\u2080\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089";
+var SUP_DIGIT = "\u2070\xB9\xB2\xB3\u2074\u2075\u2076\u2077\u2078\u2079";
+var digitsVia = (s, alphabet) => /^[0-9]+$/.test(s) ? [...s].map((d) => alphabet[Number(d)]).join("") : null;
+function astToLinear(row) {
+  const count = (s) => [...s].length;
+  const paren = (s) => count(s) <= 1 || s.startsWith("(") && s.endsWith(")") ? s : `(${s})`;
+  const sub = (s) => digitsVia(s, SUB_DIGIT) ?? (count(s) > 1 ? `_(${s})` : `_${s}`);
+  const sup = (s) => digitsVia(s, SUP_DIGIT) ?? (count(s) > 1 ? `^(${s})` : `^${s}`);
+  const one = (n) => {
+    switch (n.t) {
+      case "chr":
+        return n.ch;
+      case "frac":
+        return `${paren(astToLinear(n.num))}/${paren(astToLinear(n.den))}`;
+      case "rad": {
+        const deg = astToLinear(n.deg);
+        return `${deg ? sup(deg) : ""}\u221A(${astToLinear(n.body)})`;
+      }
+      case "scr": {
+        const lo = astToLinear(n.sub);
+        const hi = astToLinear(n.sup);
+        return astToLinear(n.base) + (lo ? sub(lo) : "") + (hi ? sup(hi) : "");
+      }
+      case "fence":
+        return n.l + astToLinear(n.body) + n.r;
+      case "big": {
+        const lo = astToLinear(n.lo);
+        const hi = astToLinear(n.hi);
+        return n.op + (lo ? sub(lo) : "") + (hi ? sup(hi) : "") + paren(astToLinear(n.body));
+      }
+    }
+  };
+  return row.map(one).join("");
+}
+function isEqRow(v) {
+  if (!Array.isArray(v)) return false;
+  return v.every((n) => {
+    if (typeof n !== "object" || n === null) return false;
+    const t = n.t;
+    if (t === "chr") return typeof n.ch === "string";
+    if (t === "frac")
+      return isEqRow(n.num) && isEqRow(n.den);
+    if (t === "rad")
+      return isEqRow(n.deg) && isEqRow(n.body);
+    if (t === "scr")
+      return isEqRow(n.base) && isEqRow(n.sub) && isEqRow(n.sup);
+    if (t === "fence")
+      return typeof n.l === "string" && typeof n.r === "string" && isEqRow(n.body);
+    if (t === "big")
+      return typeof n.op === "string" && isEqRow(n.lo) && isEqRow(n.hi) && isEqRow(n.body);
+    return false;
+  });
+}
+
+// packages/model/src/lib/model.ts
 function dataJson(el, name) {
   const raw = el.getAttribute(name);
   if (!raw) return null;
@@ -292,6 +359,42 @@ var schema = new import_prosemirror_model.Schema({
       parseDOM: [{ tag: "br.column-break" }],
       toDOM: () => ["br", { class: "column-break" }]
     },
+    // An equation with 2D structure — the AST (EqNode[], contracts) rides
+    // `ast`. An inline ATOM: the layout engine typesets it into a vector box
+    // sized by `sizePt`; editing goes through the equation plugin's slot
+    // editor, never the hidden text editor. toDOM carries the linear
+    // spelling as text, so the a11y mirror and copy read the math.
+    equation: {
+      inline: true,
+      group: "inline",
+      atom: true,
+      attrs: { ast: {}, sizePt: { default: 12 } },
+      parseDOM: [
+        {
+          tag: "span[data-eq]",
+          getAttrs: (el) => {
+            const ast = dataJson(el, "data-eq");
+            if (!isEqRow(ast)) return false;
+            const size = Number(el.getAttribute("data-eq-size"));
+            return {
+              ast,
+              sizePt: Number.isFinite(size) && size > 0 ? size : 12
+            };
+          }
+        }
+      ],
+      toDOM(node) {
+        const ast = node.attrs["ast"];
+        return [
+          "span",
+          {
+            "data-eq": JSON.stringify(ast),
+            "data-eq-size": String(node.attrs["sizePt"])
+          },
+          astToLinear(isEqRow(ast) ? ast : [])
+        ];
+      }
+    },
     // Inline image. `src` is typically a data URL (the importer inlines the
     // embedded media); width/height are CSS pixels, null if unspecified.
     image: {
@@ -315,6 +418,22 @@ var schema = new import_prosemirror_model.Schema({
         // { kind: 'rect'|'line', stroke?, strokeWidth?, fill?, flipV? } — src
         // is then '' and the box paints as vector. Null for real bitmaps.
         shape: { default: null },
+        // Replayed metafile (VectorImageSpec) — how MathType/OLE equation
+        // previews (vector WMF) paint. `src` keeps the original metafile
+        // data URL for export; the painter draws the ops instead. Null for
+        // bitmaps and preset shapes.
+        vector: { default: null },
+        // The equation's LINEAR text recovered from the metafile's embedded
+        // MTEF (MathType semantics) — what "Convert to editable equation"
+        // replaces the picture with. Null when the picture carries none.
+        equation: { default: null },
+        // The same equation as an AST (EqNode[]) — what conversion turns
+        // into a real 2D equation node. Null when undecodable.
+        equationAst: { default: null },
+        // w:position on the run holding a legacy object — baseline shift in
+        // px, positive UP (same convention as InlineRun.raise). MathType
+        // lowers every equation so its baseline meets the text line's.
+        raise: { default: 0 },
         // Textbox (wps:txbx) content riding a shape: { paragraphs: <paragraph
         // node JSON>[], inset?: {l,t,r,b} px }. The layout engine flows the
         // paragraphs inside the shape's box (paint-only, not editable v1).
@@ -679,6 +798,15 @@ var schema = new import_prosemirror_model.Schema({
         0
       ]
     },
+    // m:oMath — the run belongs to an equation. Linear v1: the letterforms
+    // live in the TEXT as Unicode math alphanumerics (𝑥, 𝒫, ℝ — see
+    // math.ts), so the mark is semantic, not visual: it scopes math
+    // autocorrect, keeps the region addressable for the coming in-place
+    // editor, and tells the exporter to wrap these runs back into m:oMath.
+    math: {
+      parseDOM: [{ tag: "span[data-math]" }],
+      toDOM: () => ["span", { "data-math": "1" }, 0]
+    },
     // w:highlight / w:shd w:fill — run background color ("#RRGGBB")
     highlight: {
       attrs: { color: {} },

package/dist/index.js

@@ -39,6 +39,73 @@ function fieldAt(doc, pos) {
 
 // packages/model/src/lib/model.ts
 import { Schema } from "prosemirror-model";
+
+// packages/contracts/dist/index.js
+var FIELD_SET = {
+  family: true,
+  sizePt: true,
+  bold: true,
+  italic: true,
+  letterSpacing: true,
+  scaleX: true,
+  kerning: true
+};
+var FIELDS = Object.keys(FIELD_SET);
+var SUB_DIGIT = "\u2080\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089";
+var SUP_DIGIT = "\u2070\xB9\xB2\xB3\u2074\u2075\u2076\u2077\u2078\u2079";
+var digitsVia = (s, alphabet) => /^[0-9]+$/.test(s) ? [...s].map((d) => alphabet[Number(d)]).join("") : null;
+function astToLinear(row) {
+  const count = (s) => [...s].length;
+  const paren = (s) => count(s) <= 1 || s.startsWith("(") && s.endsWith(")") ? s : `(${s})`;
+  const sub = (s) => digitsVia(s, SUB_DIGIT) ?? (count(s) > 1 ? `_(${s})` : `_${s}`);
+  const sup = (s) => digitsVia(s, SUP_DIGIT) ?? (count(s) > 1 ? `^(${s})` : `^${s}`);
+  const one = (n) => {
+    switch (n.t) {
+      case "chr":
+        return n.ch;
+      case "frac":
+        return `${paren(astToLinear(n.num))}/${paren(astToLinear(n.den))}`;
+      case "rad": {
+        const deg = astToLinear(n.deg);
+        return `${deg ? sup(deg) : ""}\u221A(${astToLinear(n.body)})`;
+      }
+      case "scr": {
+        const lo = astToLinear(n.sub);
+        const hi = astToLinear(n.sup);
+        return astToLinear(n.base) + (lo ? sub(lo) : "") + (hi ? sup(hi) : "");
+      }
+      case "fence":
+        return n.l + astToLinear(n.body) + n.r;
+      case "big": {
+        const lo = astToLinear(n.lo);
+        const hi = astToLinear(n.hi);
+        return n.op + (lo ? sub(lo) : "") + (hi ? sup(hi) : "") + paren(astToLinear(n.body));
+      }
+    }
+  };
+  return row.map(one).join("");
+}
+function isEqRow(v) {
+  if (!Array.isArray(v)) return false;
+  return v.every((n) => {
+    if (typeof n !== "object" || n === null) return false;
+    const t = n.t;
+    if (t === "chr") return typeof n.ch === "string";
+    if (t === "frac")
+      return isEqRow(n.num) && isEqRow(n.den);
+    if (t === "rad")
+      return isEqRow(n.deg) && isEqRow(n.body);
+    if (t === "scr")
+      return isEqRow(n.base) && isEqRow(n.sub) && isEqRow(n.sup);
+    if (t === "fence")
+      return typeof n.l === "string" && typeof n.r === "string" && isEqRow(n.body);
+    if (t === "big")
+      return typeof n.op === "string" && isEqRow(n.lo) && isEqRow(n.hi) && isEqRow(n.body);
+    return false;
+  });
+}
+
+// packages/model/src/lib/model.ts
 function dataJson(el, name) {
   const raw = el.getAttribute(name);
   if (!raw) return null;
@@ -260,6 +327,42 @@ var schema = new Schema({
       parseDOM: [{ tag: "br.column-break" }],
       toDOM: () => ["br", { class: "column-break" }]
     },
+    // An equation with 2D structure — the AST (EqNode[], contracts) rides
+    // `ast`. An inline ATOM: the layout engine typesets it into a vector box
+    // sized by `sizePt`; editing goes through the equation plugin's slot
+    // editor, never the hidden text editor. toDOM carries the linear
+    // spelling as text, so the a11y mirror and copy read the math.
+    equation: {
+      inline: true,
+      group: "inline",
+      atom: true,
+      attrs: { ast: {}, sizePt: { default: 12 } },
+      parseDOM: [
+        {
+          tag: "span[data-eq]",
+          getAttrs: (el) => {
+            const ast = dataJson(el, "data-eq");
+            if (!isEqRow(ast)) return false;
+            const size = Number(el.getAttribute("data-eq-size"));
+            return {
+              ast,
+              sizePt: Number.isFinite(size) && size > 0 ? size : 12
+            };
+          }
+        }
+      ],
+      toDOM(node) {
+        const ast = node.attrs["ast"];
+        return [
+          "span",
+          {
+            "data-eq": JSON.stringify(ast),
+            "data-eq-size": String(node.attrs["sizePt"])
+          },
+          astToLinear(isEqRow(ast) ? ast : [])
+        ];
+      }
+    },
     // Inline image. `src` is typically a data URL (the importer inlines the
     // embedded media); width/height are CSS pixels, null if unspecified.
     image: {
@@ -283,6 +386,22 @@ var schema = new Schema({
         // { kind: 'rect'|'line', stroke?, strokeWidth?, fill?, flipV? } — src
         // is then '' and the box paints as vector. Null for real bitmaps.
         shape: { default: null },
+        // Replayed metafile (VectorImageSpec) — how MathType/OLE equation
+        // previews (vector WMF) paint. `src` keeps the original metafile
+        // data URL for export; the painter draws the ops instead. Null for
+        // bitmaps and preset shapes.
+        vector: { default: null },
+        // The equation's LINEAR text recovered from the metafile's embedded
+        // MTEF (MathType semantics) — what "Convert to editable equation"
+        // replaces the picture with. Null when the picture carries none.
+        equation: { default: null },
+        // The same equation as an AST (EqNode[]) — what conversion turns
+        // into a real 2D equation node. Null when undecodable.
+        equationAst: { default: null },
+        // w:position on the run holding a legacy object — baseline shift in
+        // px, positive UP (same convention as InlineRun.raise). MathType
+        // lowers every equation so its baseline meets the text line's.
+        raise: { default: 0 },
         // Textbox (wps:txbx) content riding a shape: { paragraphs: <paragraph
         // node JSON>[], inset?: {l,t,r,b} px }. The layout engine flows the
         // paragraphs inside the shape's box (paint-only, not editable v1).
@@ -647,6 +766,15 @@ var schema = new Schema({
         0
       ]
     },
+    // m:oMath — the run belongs to an equation. Linear v1: the letterforms
+    // live in the TEXT as Unicode math alphanumerics (𝑥, 𝒫, ℝ — see
+    // math.ts), so the mark is semantic, not visual: it scopes math
+    // autocorrect, keeps the region addressable for the coming in-place
+    // editor, and tells the exporter to wrap these runs back into m:oMath.
+    math: {
+      parseDOM: [{ tag: "span[data-math]" }],
+      toDOM: () => ["span", { "data-math": "1" }, 0]
+    },
     // w:highlight / w:shd w:fill — run background color ("#RRGGBB")
     highlight: {
       attrs: { color: {} },

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" | "column_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">;
+export declare const schema: Schema<"paragraph" | "text" | "table" | "doc" | "hard_break" | "column_break" | "equation" | "image" | "page_field" | "table_row" | "table_cell", "letterSpacing" | "link" | "strike" | "underline" | "strong" | "em" | "dstrike" | "smallCaps" | "textColor" | "fontSize" | "vertAlign" | "kern" | "charScale" | "position" | "math" | "highlight" | "fontFamily" | "footnote" | "carryRPr">;
 /** Concrete schema type, handy for typing Node/Mark across packages. */
 export type BapbongSchema = typeof schema;
 /**
@@ -17,7 +17,7 @@ export type BapbongSchema = typeof schema;
  * (@user). Comment bodies are stored as this schema's JSON on the comment
  * thread, kept separate from the document schema.
  */
-export declare const commentSchema: Schema<"paragraph" | "doc" | "text" | "mention", never>;
+export declare const commentSchema: Schema<"paragraph" | "text" | "doc" | "mention", never>;
 export type CommentSchema = typeof commentSchema;
 /** Paragraph horizontal alignment (mirrors w:jc). */
 export type Align = 'left' | 'center' | 'right' | 'justify';

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;AA0F3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,yWAwqBjB,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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA2F3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,+XAsuBjB,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.12.0",
+  "version": "0.13.0",
   "description": "bapbong — ProseMirror document model / schema",
   "license": "MIT",
   "repository": {
@@ -54,6 +54,7 @@
     }
   },
   "dependencies": {
-    "prosemirror-model": "^1.25.7"
+    "prosemirror-model": "^1.25.7",
+    "@shadow-garden/bapbong-contracts": "^0.14.0"
   }
 }