oasis-editor 0.0.2 → 0.0.4

package/dist/core/model/types/primitives.d.ts

@@ -34,6 +34,10 @@ export interface EditorParagraphListStyle {
      * tab stop (or a space / nothing). Undefined is treated as "tab".
      */
     suffix?: "tab" | "space" | "nothing";
+    /** Literal bullet character from `w:lvlText` (bullet lists only). */
+    bulletGlyph?: string;
+    /** Font family used to render the bullet glyph (e.g. "Symbol", "Wingdings"). */
+    bulletFont?: string;
 }
 /**
  * Image crop, mapped from DrawingML `a:srcRect`. Values are fractions of the

package/dist/export/docx/docxTypes.d.ts

@@ -1,17 +1,22 @@
 import { EditorBlockNode, EditorImageCrop, EditorImageFillMode, EditorImageFloatingLayout, EditorParagraphListStyle, EditorWrapPolygonPoint } from '../../../../core/model.js';
 import { BookmarkEventsByParagraph } from '../../bookmarksXml.js';
 
+export interface NumberingDefinition {
+    kind: EditorParagraphListStyle["kind"];
+    level: number;
+    abstractNumId: number;
+    numId: number;
+    format?: NonNullable<EditorParagraphListStyle["format"]>;
+    startAt?: number;
+    bulletGlyph?: string;
+    bulletFont?: string;
+}
 export interface DocContext {
     numberingInfo: Map<string, {
         numId: number;
         level: number;
     }>;
-    definitions: Array<{
-        kind: EditorParagraphListStyle["kind"];
-        level: number;
-        abstractNumId: number;
-        numId: number;
-    }>;
+    definitions: NumberingDefinition[];
     images: Array<{
         rId: string;
         target: string;
@@ -65,12 +70,7 @@ export interface NumberingContext {
         numId: number;
         level: number;
     }>;
-    definitions: Array<{
-        kind: EditorParagraphListStyle["kind"];
-        level: number;
-        abstractNumId: number;
-        numId: number;
-    }>;
+    definitions: NumberingDefinition[];
 }
 export interface ExportBuildState {
     nextImageId: number;

package/dist/import/docx/numbering.d.ts

@@ -11,8 +11,25 @@ export interface NumberingMaps {
     }>;
     /** Suffix (`w:suff`) per level, keyed by "abstractNumId:ilvl". */
     abstractSuffixes: Map<string, EditorParagraphListStyle["suffix"]>;
+    /** numFmt mapped to editor format, keyed by "abstractNumId:ilvl". */
+    abstractFormats: Map<string, NonNullable<EditorParagraphListStyle["format"]>>;
+    /** Starting number from `w:start`, keyed by "abstractNumId:ilvl". OOXML default is 1. */
+    abstractStarts: Map<string, number>;
+    /** Literal bullet glyph from `w:lvlText`, keyed by "abstractNumId:ilvl". */
+    abstractBulletGlyphs: Map<string, string>;
+    /** Font name from `w:lvl/w:rPr/w:rFonts`, keyed by "abstractNumId:ilvl". */
+    abstractBulletFonts: Map<string, string>;
+    /** `w:startOverride` values from `w:num/w:lvlOverride`, keyed by "numId:ilvl". */
+    numStartOverrides: Map<string, number>;
     /** numId → abstractNumId */
     numToAbstractId: Map<string, string>;
+    /**
+     * Tracks which "numId:ilvl" pairs have been seen during paragraph parsing.
+     * The first paragraph for each pair carries the level's `startAt` value;
+     * subsequent paragraphs in the same list instance do not, so the counter
+     * continues from the previous ordinal instead of resetting.
+     */
+    seenInstances: Set<string>;
 }
 export declare function parseNumbering(numberingXml: string | null): NumberingMaps;
 export declare function parseParagraphList(paragraphProperties: XmlElement | null, numberingMaps: NumberingMaps): {

package/dist/{index-DuS88s1l.js → index-C-nGWNHh.js}

@@ -2270,7 +2270,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-DEnDLTaw.js").then((m) => {
+    import("./OasisEditorApp-DD-ts2_v.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -14226,7 +14226,8 @@ function getListOrdinals(document2) {
       continue;
     }
     const level = list.level ?? 0;
-    const next = (counters.get(level) ?? 0) + 1;
+    const prev = counters.get(level);
+    const next = prev !== void 0 ? prev + 1 : list.startAt ?? 1;
     counters.set(level, next);
     result.set(paragraph.id, next);
   }
@@ -14286,6 +14287,31 @@ function toRoman(value) {
   }
   return out;
 }
+const PUA_BULLET_MAP = {
+  61623: "•",
+  // Symbol: filled circle bullet
+  61548: "·",
+  // Wingdings: medium bullet
+  61607: "▪",
+  // Wingdings 2: black small square
+  61656: "➢",
+  // Wingdings: arrowhead
+  61559: "✓",
+  // Wingdings: check mark
+  61692: "✓",
+  // Wingdings: check mark (alt)
+  61671: "⚡",
+  // Wingdings: lightning
+  61472: " "
+  // Symbol/Wingdings: space
+};
+function normalizeBulletGlyph(glyph) {
+  const code2 = glyph.codePointAt(0);
+  if (code2 !== void 0 && code2 >= 57344 && code2 <= 63743) {
+    return PUA_BULLET_MAP[code2] ?? "•";
+  }
+  return glyph;
+}
 const BULLET_GLYPHS = ["•", "○", "▪", "•", "○", "▪"];
 const ORDERED_DEFAULT_FORMATS = [
   "decimal",
@@ -14299,6 +14325,8 @@ function resolveListPrefix(paragraph, document2) {
   if (!paragraph.list) return "";
   const level = paragraph.list.level ?? 0;
   if (paragraph.list.kind === "bullet") {
+    const raw = paragraph.list.bulletGlyph;
+    if (raw) return normalizeBulletGlyph(raw);
     return BULLET_GLYPHS[level % BULLET_GLYPHS.length] ?? "•";
   }
   const ordinal = getListOrdinals(document2).get(paragraph.id) ?? paragraph.list.startAt ?? 1;
@@ -29256,35 +29284,46 @@ function parseSettings(xml) {
   }
   return settings;
 }
+const FORMAT_MAP = {
+  decimal: "decimal",
+  lowerLetter: "lowerLetter",
+  upperLetter: "upperLetter",
+  lowerRoman: "lowerRoman",
+  upperRoman: "upperRoman",
+  bullet: "bullet"
+};
 function parseNumbering(numberingXml) {
   const abstractKinds = /* @__PURE__ */ new Map();
   const numKinds = /* @__PURE__ */ new Map();
   const abstractIndents = /* @__PURE__ */ new Map();
   const abstractSuffixes = /* @__PURE__ */ new Map();
+  const abstractFormats = /* @__PURE__ */ new Map();
+  const abstractStarts = /* @__PURE__ */ new Map();
+  const abstractBulletGlyphs = /* @__PURE__ */ new Map();
+  const abstractBulletFonts = /* @__PURE__ */ new Map();
+  const numStartOverrides = /* @__PURE__ */ new Map();
   const numToAbstractId = /* @__PURE__ */ new Map();
-  if (!numberingXml) {
-    return {
-      abstractKinds,
-      numKinds,
-      abstractIndents,
-      abstractSuffixes,
-      numToAbstractId
-    };
-  }
+  const seenInstances = /* @__PURE__ */ new Set();
+  const emptyResult = () => ({
+    abstractKinds,
+    numKinds,
+    abstractIndents,
+    abstractSuffixes,
+    abstractFormats,
+    abstractStarts,
+    abstractBulletGlyphs,
+    abstractBulletFonts,
+    numStartOverrides,
+    numToAbstractId,
+    seenInstances
+  });
+  if (!numberingXml) return emptyResult();
   const document2 = new DOMParser$1().parseFromString(
     numberingXml,
     "application/xml"
   );
   const numbering = document2.documentElement;
-  if (!numbering) {
-    return {
-      abstractKinds,
-      numKinds,
-      abstractIndents,
-      abstractSuffixes,
-      numToAbstractId
-    };
-  }
+  if (!numbering) return emptyResult();
   const abstractNums = numbering.getElementsByTagNameNS(WORD_NS, "abstractNum");
   for (let index = 0; index < abstractNums.length; index += 1) {
     const abstractNum = abstractNums[index];
@@ -29292,11 +29331,12 @@ function parseNumbering(numberingXml) {
     if (!abstractId) continue;
     for (const level of getChildrenByTagNameNS(abstractNum, WORD_NS, "lvl")) {
       const ilvl = getAttributeValue(level, "ilvl") ?? "0";
+      const levelKey = `${abstractId}:${ilvl}`;
       const numFmt = getFirstChildByTagNameNS(level, WORD_NS, "numFmt");
       const format = getAttributeValue(numFmt, "val");
       if (format) {
         abstractKinds.set(
-          `${abstractId}:${ilvl}`,
+          levelKey,
           format === "bullet" ? "bullet" : "ordered"
         );
         if (ilvl === "0") {
@@ -29305,14 +29345,33 @@ function parseNumbering(numberingXml) {
             format === "bullet" ? "bullet" : "ordered"
           );
         }
+        const editorFormat = FORMAT_MAP[format];
+        if (editorFormat) abstractFormats.set(levelKey, editorFormat);
       }
       const suffRaw = getAttributeValue(
         getFirstChildByTagNameNS(level, WORD_NS, "suff"),
         "val"
       );
       if (suffRaw === "space" || suffRaw === "nothing" || suffRaw === "tab") {
-        abstractSuffixes.set(`${abstractId}:${ilvl}`, suffRaw);
+        abstractSuffixes.set(levelKey, suffRaw);
       }
+      const startRaw = getAttributeValue(
+        getFirstChildByTagNameNS(level, WORD_NS, "start"),
+        "val"
+      );
+      if (startRaw != null) {
+        const n = parseInt(startRaw, 10);
+        if (!isNaN(n)) abstractStarts.set(levelKey, n);
+      }
+      if (format === "bullet") {
+        const lvlTextEl = getFirstChildByTagNameNS(level, WORD_NS, "lvlText");
+        const glyph = getAttributeValue(lvlTextEl, "val");
+        if (glyph) abstractBulletGlyphs.set(levelKey, glyph);
+      }
+      const rPr = getFirstChildByTagNameNS(level, WORD_NS, "rPr");
+      const rFonts = getFirstChildByTagNameNS(rPr, WORD_NS, "rFonts");
+      const fontName = getAttributeValue(rFonts, "ascii") ?? getAttributeValue(rFonts, "hAnsi");
+      if (fontName) abstractBulletFonts.set(levelKey, fontName);
       const pPr = getFirstChildByTagNameNS(level, WORD_NS, "pPr");
       const ind = getFirstChildByTagNameNS(pPr, WORD_NS, "ind");
       if (ind) {
@@ -29321,7 +29380,7 @@ function parseNumbering(numberingXml) {
         const left = leftRaw != null ? twipsToPx(leftRaw, 0) : void 0;
         const hanging = hangingRaw != null ? twipsToPx(hangingRaw, 0) : void 0;
         if (left !== void 0 || hanging !== void 0) {
-          abstractIndents.set(`${abstractId}:${ilvl}`, { left, hanging });
+          abstractIndents.set(levelKey, { left, hanging });
         }
       }
     }
@@ -29341,13 +29400,33 @@ function parseNumbering(numberingXml) {
     }
     numToAbstractId.set(numId, abstractNumId);
     numKinds.set(numId, abstractKinds.get(abstractNumId) ?? "ordered");
+    for (const override of getChildrenByTagNameNS(num, WORD_NS, "lvlOverride")) {
+      const overrideIlvl = getAttributeValue(override, "ilvl");
+      if (!overrideIlvl) continue;
+      const startOverrideEl = getFirstChildByTagNameNS(
+        override,
+        WORD_NS,
+        "startOverride"
+      );
+      const startOverrideRaw = getAttributeValue(startOverrideEl, "val");
+      if (startOverrideRaw != null) {
+        const n = parseInt(startOverrideRaw, 10);
+        if (!isNaN(n)) numStartOverrides.set(`${numId}:${overrideIlvl}`, n);
+      }
+    }
   }
   return {
     abstractKinds,
     numKinds,
     abstractIndents,
     abstractSuffixes,
-    numToAbstractId
+    abstractFormats,
+    abstractStarts,
+    abstractBulletGlyphs,
+    abstractBulletFonts,
+    numStartOverrides,
+    numToAbstractId,
+    seenInstances
   };
 }
 function parseParagraphList(paragraphProperties, numberingMaps) {
@@ -29371,13 +29450,31 @@ function parseParagraphList(paragraphProperties, numberingMaps) {
   ) ?? "0";
   const level = Number(ilvlValue);
   const abstractId = numberingMaps.numToAbstractId.get(numId);
-  const indent = abstractId ? numberingMaps.abstractIndents.get(`${abstractId}:${ilvlValue}`) : void 0;
-  const suffix = (abstractId ? numberingMaps.abstractSuffixes.get(`${abstractId}:${ilvlValue}`) : void 0) ?? "tab";
+  const levelKey = abstractId ? `${abstractId}:${ilvlValue}` : void 0;
+  const indent = levelKey ? numberingMaps.abstractIndents.get(levelKey) : void 0;
+  const suffix = (levelKey ? numberingMaps.abstractSuffixes.get(levelKey) : void 0) ?? "tab";
+  const format = levelKey ? numberingMaps.abstractFormats.get(levelKey) : void 0;
+  const bulletGlyph = levelKey ? numberingMaps.abstractBulletGlyphs.get(levelKey) : void 0;
+  const bulletFont = levelKey ? numberingMaps.abstractBulletFonts.get(levelKey) : void 0;
+  const instanceKey = `${numId}:${ilvlValue}`;
+  const isFirstInInstance = !numberingMaps.seenInstances.has(instanceKey);
+  numberingMaps.seenInstances.add(instanceKey);
+  let startAt;
+  if (isFirstInInstance) {
+    const override = numberingMaps.numStartOverrides.get(instanceKey);
+    const abstractStart = levelKey ? numberingMaps.abstractStarts.get(levelKey) : void 0;
+    const effectiveStart = override ?? abstractStart ?? 1;
+    if (effectiveStart !== 1) startAt = effectiveStart;
+  }
   return {
     list: {
       kind: numberingMaps.numKinds.get(numId) ?? "ordered",
       level: Number.isFinite(level) ? level : 0,
-      suffix
+      suffix,
+      ...format !== void 0 && { format },
+      ...startAt !== void 0 && { startAt },
+      ...bulletGlyph !== void 0 && { bulletGlyph },
+      ...bulletFont !== void 0 && { bulletFont }
     },
     indent
   };
@@ -33005,7 +33102,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-R5rI6JIO.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-CVDgFleW.js", import.meta.url).href,
         import.meta.url
       ),
       {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { aM, bB, bC, bD, bE, bF, b1, bG, aN, aI, bH, bI, bJ, aL, bK, aG, bL, bM, bN, bO, bP, bx, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ, b6, b_, bw, b$, bD as bD2, bI as bI2, bK as bK2, bS as bS2, bU as bU2, bZ as bZ2, aK, aE, c0, c1, c2, aH, c3, c4, aJ } from "./index-DuS88s1l.js";
+import { aM, bB, bC, bD, bE, bF, b1, bG, aN, aI, bH, bI, bJ, aL, bK, aG, bL, bM, bN, bO, bP, bx, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ, b6, b_, bw, b$, bD as bD2, bI as bI2, bK as bK2, bS as bS2, bU as bU2, bZ as bZ2, aK, aE, c0, c1, c2, aH, c3, c4, aJ } from "./index-C-nGWNHh.js";
 export {
   aM as BalloonShell,
   bB as Button,