@kerebron/extension-odt 0.0.8 → 0.0.10

package/esm/extension-odt/src/OdtParser.d.ts

@@ -17,7 +17,7 @@ interface Style {
 export declare class OdtParser {
     private readonly schema;
     constructor(schema: Schema);
-    parse(files: any): Node | null;
+    parse(files: any): Node;
 }
 export {};
 //# sourceMappingURL=OdtParser.d.ts.map

package/esm/extension-odt/src/OdtParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/OdtParser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAGL,IAAI,EAEJ,MAAM,EACP,MAAM,mBAAmB,CAAC;AAE3B,UAAU,UAAU;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,EAAE,CAAC;IAE9C,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC;IAEpC,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IAEhD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAErB,QAAQ,CAAC,EAAE,CACT,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,KAAK,KACT,KAAK,GAAG,IAAI,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAaD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AA4UD,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAI3C,KAAK,CAAC,KAAK,EAAE,GAAG;CAkBjB"}
+{"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/OdtParser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAGL,IAAI,EAEJ,MAAM,EACP,MAAM,mBAAmB,CAAC;AAE3B,UAAU,UAAU;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,EAAE,CAAC;IAE9C,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC;IAEpC,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IAEhD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAErB,QAAQ,CAAC,EAAE,CACT,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,KAAK,KACT,KAAK,GAAG,IAAI,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAaD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AA6UD,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAI3C,KAAK,CAAC,KAAK,EAAE,GAAG;CAuBjB"}

package/esm/extension-odt/src/OdtParser.js

@@ -62,12 +62,8 @@ class OdtParseState {
             writable: true,
             value: void 0
         });
-        this.stack = [{
-                type: schema.topNodeType,
-                attrs: null,
-                content: [],
-                marks: Mark.none,
-            }];
+        this.stack = [];
+        this.openNode(schema.topNodeType, null);
     }
     top() {
         return this.stack[this.stack.length - 1];
@@ -86,7 +82,7 @@ class OdtParseState {
         // if (last && (merged = maybeMerge(last, node))) {
         //   nodes[nodes.length - 1] = merged;
         // } else
-        // console.log('addtext', node);
+        // console.log('addtext', top.type.name, "'" + text + "'");
         nodes.push(node);
     }
     // Adds the given mark to the set of active marks.
@@ -110,6 +106,7 @@ class OdtParseState {
     }
     // Wrap subsequent content in a node of the given type.
     openNode(type, attrs) {
+        // console.log('openNode', type.name, attrs);
         this.stack.push({
             type: type,
             attrs: attrs,
@@ -164,7 +161,6 @@ class OdtParseState {
             this.closeMark(markType);
         }
         else if (spec.text) {
-            // console.log('aaaaaaaaaaaaaaaaaaaa', element);
             this.addText(spec.text(element));
         }
         else {
@@ -188,7 +184,7 @@ function iterateChildren(nodes, callback) {
             value = child;
         }
         else {
-            const keys = Object.keys(child);
+            const keys = Object.keys(child).filter(key => key !== 'annotation');
             key = keys[0];
             value = child[key];
         }
@@ -261,12 +257,13 @@ const tokens = {
             href: tok['@href'],
             // title: tok.attrGet('title') || null,
         }),
-        children: (odtElement) => odtElement['span'],
+        children: (odtElement) => odtElement['span'].map(item => ({ 'span': item }))
     },
     '$value': {
         children: (odtElement) => iterateEnum(odtElement),
     },
     '$text': {
+        // TODO: fix trimming: https://github.com/tafia/quick-xml/issues/285
         text: (odtElement) => String(odtElement || ''),
     },
     's': {
@@ -279,6 +276,7 @@ const tokens = {
         text: (odtElement) => '\t',
     },
     'table-of-content': {
+        block: 'paragraph',
         children: (odtElement) => odtElement['index-body']['p'] || [],
     },
     'frame': {
@@ -287,6 +285,9 @@ const tokens = {
     'rect': {
         ignore: true,
     },
+    'bookmark': {
+        ignore: true,
+    },
     'annotation': {
         ignore: true,
     },
@@ -310,6 +311,9 @@ export class OdtParser {
         do {
             doc = state.closeNode();
         } while (state.stack.length);
+        if (!doc) {
+            throw new Error('Incorrect stack handling');
+        }
         return doc || null; //this.schema.topNodeType.createAndFill()!;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/extension-odt",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "license": "MIT",
   "module": "./esm/extension-odt/src/ExtensionOdt.js",
   "exports": {