feat: update to new unified version

TrialAndErrorOrg · Sep 29, 2023 · cff8543 · cff8543
1 parent 0adc650
commit cff8543
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/libs/reoff/docx-to-vfile/src/lib/__snapshots__/docx-to-vfile-unzipit.spec.ts.snap b/libs/reoff/docx-to-vfile/src/lib/__snapshots__/docx-to-vfile-unzipit.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`reoffDocxToVfile > should work 1`] = `
 VFile {
-  "cwd": "/Volumes/SSD/Projects/jote-monorepo",
+  "cwd": "/Users/thomas/Projects/jote-monorepo",
   "data": {
     "[Content_Types].xml": "<?xml version=\\"1.0\\" encoding=\\"UTF-8\\" standalone=\\"yes\\"?>
 <Types xmlns=\\"http://schemas.openxmlformats.org/package/2006/content-types\\"><Default Extension=\\"rels\\" ContentType=\\"application/vnd.openxmlformats-package.relationships+xml\\"/><Default Extension=\\"xml\\" ContentType=\\"application/xml\\"/><Override PartName=\\"/word/document.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\\"/><Override PartName=\\"/customXml/itemProps1.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.customXmlProperties+xml\\"/><Override PartName=\\"/word/styles.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\\"/><Override PartName=\\"/word/settings.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\\"/><Override PartName=\\"/word/webSettings.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml\\"/><Override PartName=\\"/word/fontTable.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\\"/><Override PartName=\\"/word/theme/theme1.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.theme+xml\\"/><Override PartName=\\"/docProps/core.xml\\" ContentType=\\"application/vnd.openxmlformats-package.core-properties+xml\\"/><Override PartName=\\"/docProps/app.xml\\" ContentType=\\"application/vnd.openxmlformats-officedocument.extended-properties+xml\\"/></Types>",

diff --git a/libs/reoff/reoff-parse/src/lib/reoff-parse.spec.ts b/libs/reoff/reoff-parse/src/lib/reoff-parse.spec.ts
@@ -13,10 +13,13 @@ describe('reoffParse', () => {
     fs.writeFileSync(new URL('../test/xml.xml', import.meta.url), String(file))
 
     const res = proc.parse(file)
+    console.log(res)
+    removePosition(res, { force: true })
+    console.log({ res })
 
     fs.writeFileSync(
       new URL('../test/ooxasttree.json', import.meta.url),
-      JSON.stringify(removePosition(res, true), null, 2),
+      JSON.stringify(res, null, 2),
     )
     expect(res).toBeDefined()
   })
@@ -31,6 +34,6 @@ describe('reoffParse', () => {
     expect(vfile.data.relations).toBeDefined()
     console.log(vfile.data.relations)
 
-    expect(vfile.data.relations.document).toBeDefined()
+    expect(vfile.data.relations?.document).toBeDefined()
   })
 })
diff --git a/libs/reoff/reoff-parse/src/lib/reoff-parse.ts b/libs/reoff/reoff-parse/src/lib/reoff-parse.ts
@@ -1,6 +1,6 @@
 import { fromXml } from 'xast-util-from-xml'
 
-import { ParserFunction } from 'unified'
+import { Parser } from 'unified'
 import { Root, Node as XastNode } from 'xast'
 import { filter } from 'unist-util-filter'
 import { VFile } from 'vfile'
@@ -61,7 +61,7 @@ export interface Settings {
 }
 
 export default function reoffParse(options: Settings = {}) {
-  const parser: ParserFunction<Root> = (doc, file) => {
+  const parser: Parser<Root> = (doc, file) => {
     // Assume options.
     const settings: Settings = this.data('settings')
 

diff --git a/libs/reoff/reoff-parse/src/test/ooxasttree.json b/libs/reoff/reoff-parse/src/test/ooxasttree.json
@@ -375990,4 +375990,4 @@
     }
   ],
   "source": "word/document.xml"
-}
+}
diff --git a/libs/reoff/reoff-parse/src/test/testrelations.json b/libs/reoff/reoff-parse/src/test/testrelations.json
@@ -932454,4 +932454,4 @@
     }
   },
   "source": "word/document.xml"
-}
+}
diff --git a/libs/reoff/reoff-parse/src/test/xml.xml b/libs/reoff/reoff-parse/src/test/xml.xml