feat: figure parsing in reoff

TrialAndErrorOrg · Feb 16, 2022 · fe2b9f8 · fe2b9f8
1 parent e4662b5
commit fe2b9f8
Show file tree

Hide file tree

Showing 35 changed files with 1,390 additions and 1,065,753 deletions.
diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/__snapshots__/body.spec.ts.snap b/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/__snapshots__/body.spec.ts.snap
diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/citation.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/citation.ts
@@ -33,7 +33,7 @@ export function citation(j: J, citation: T, parent: Parent) {
         j.partialCitation = ''
         console.log('Success!')
       }
-      console.log(json)
+      // console.log(json)
       console.log(j.partialCitation)
       throw new Error(
         'Corrupt citation! This might be because the text is too long.'

diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/drawing.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/drawing.ts
@@ -0,0 +1,20 @@
+import { all } from '../all'
+import { J, Node, Root } from '../types'
+import { x } from 'xastscript'
+import { Article, Front, Body, Back, Fig } from 'jjast'
+import { Drawing } from 'ooxast'
+import { select } from 'xast-util-select'
+
+export function drawing(j: J, node: Drawing): Fig {
+  const blip = select('a\\:blip', node)
+  if (!blip) return x('fig') as Fig
+  const ref = blip?.attributes?.['r:embed']
+  if (!ref) return x('fig') as Fig
+
+  return x('fig', [
+    x('inline-figure'),
+    x('caption'),
+    x('label'),
+    x('graphic', { 'xlink:href': j.relations[ref] }, []),
+  ]) as Fig
+}
diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/index.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/index.ts
@@ -11,6 +11,7 @@ import { footnote } from './footnote'
 import { document } from './document'
 import { r } from './r'
 import { tr } from './tr'
+import { drawing } from './drawing'
 
 export const handlers = {
   p,
@@ -29,6 +30,7 @@ export const handlers = {
   xml: ignore,
   instruction: ignore,
   doctype: ignore,
+  drawing,
 }
 
 function ignore() {}
diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/r.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/handlers/r.ts
@@ -15,6 +15,9 @@ export function r(j: J, node: R) {
       { type: 'text', value: `[${node?.children?.[1]?.attributes?.['w:id']}]` }
     )
   }
+  if (node?.children?.[1]?.name === 'w:drawing') {
+    return all(j, node)
+  }
 
   if (node?.children?.[1]?.name === 'w:instrText') {
     j.deleteNextRun = false

diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/ooxast-util-to-jast.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/ooxast-util-to-jast.ts
@@ -38,6 +38,7 @@ export function toJast(
     quotes: ['"'],
     topSection: 0,
     columnSeparator: false,
+    //relations: {},
   }
 ) {
   // const byId: { [s: string]: Element } = {}
@@ -108,6 +109,7 @@ export function toJast(
       parseCitation: options.parseCitation || parseCitation,
       partialCitation: '',
       deleteNextRun: false,
+      relations: options.relations || {},
     } as Context
   )
 
@@ -138,7 +140,7 @@ export function toJast(
 
   // visit(mdast, 'text', ontext)
 
-  //console.log(citations)
+  //// // // console.log(citations)
   const back = select('back', jast)
   if (!back) return jast
 

diff --git a/libs/ooxast/ooxast-util-to-jast/src/lib/types.ts b/libs/ooxast/ooxast-util-to-jast/src/lib/types.ts
@@ -43,6 +43,8 @@ export interface Options {
   }
   parseCitation?: (citation: any) => any
   collectCitation?: (citation: any) => any
+
+  relations?: { [key: string]: string }
 }
 
 export type Handle = (
@@ -78,6 +80,7 @@ export interface Context {
   collectCitation: (citation: any) => any
   partialCitation: string
   deleteNextRun: boolean
+  relations: { [key: string]: string }
 }
 
 export type JWithProps = (

diff --git a/libs/ooxast/ooxast/src/lib/ooxml/drawingml/wordprocessingDrawing.ts b/libs/ooxast/ooxast/src/lib/ooxml/drawingml/wordprocessingDrawing.ts
@@ -115,9 +115,13 @@ export interface PosH extends UnistNode {
   children: RequiredMap<PosHMap>[]
 }
 
+export interface SpecificLiteral<val extends string = string> {
+  type: 'text'
+  value: val
+}
 export interface PosHMap {
-  align: AlignHVal
-  posOffset: string
+  align: SpecificLiteral<AlignHVal>
+  posOffset: SpecificLiteral<string>
 }
 
 export interface PosV extends UnistNode {
@@ -130,8 +134,8 @@ export interface PosV extends UnistNode {
 }
 
 export interface PosVMap {
-  align: AlignVVal
-  posOffset: string
+  align: SpecificLiteral<AlignVVal>
+  posOffset: SpecificLiteral<string>
 }
 
 export interface TextboxInfo extends UnistNode {