feat: update

src/core/OXML.ts

@@ -24,19 +24,15 @@ export interface OXMLChildDefinition {
 export interface OXMLDefinition {
   tag?: string
   namespace?: string
-  attributes?: Record<string, OXMLAttributeDefinition>
-  properties?: Record<string, OXMLPropertyDefinition>
-  children?: OXMLChildDefinition[]
+  attributes: Record<string, OXMLAttributeDefinition>
+  properties: Record<string, OXMLPropertyDefinition>
+  children: OXMLChildDefinition[]
 }
 
 export function defineElement(tag: string) {
   return (constructor: any) => {
     const proto = constructor.prototype
-    let definition = OXML.protoToDefinition.get(proto)
-    if (!definition) {
-      definition = {} as OXMLDefinition
-      OXML.protoToDefinition.set(proto, definition)
-    }
+    const definition = OXML.makeDefinition(proto)
     const tagArr = tag.split(':')
     definition.tag = tag
     definition.namespace = tagArr.length > 1 ? tagArr[0] : undefined
@@ -55,12 +51,7 @@ export function defineAttribute(
   defaultValue?: any,
 ) {
   return function (proto: any, name: any) {
-    let definition = OXML.protoToDefinition.get(proto)
-    if (!definition) {
-      definition = {} as OXMLDefinition
-      OXML.protoToDefinition.set(proto, definition)
-    }
-    definition.attributes ??= {}
+    const definition = OXML.makeDefinition(proto)
     definition.attributes[attrName] = { name, alias: attrName, type, defaultValue }
     Object.defineProperty(proto, name, {
       get() {
@@ -72,31 +63,26 @@ export function defineAttribute(
   }
 }
 
-export function defineProperty(propName: string) {
+export function defineProperty(aliasName?: string) {
   return function (proto: any, name: any) {
-    let definition = OXML.protoToDefinition.get(proto)
-    if (!definition) {
-      definition = {} as OXMLDefinition
-      OXML.protoToDefinition.set(proto, definition)
+    const alias = aliasName ?? name
+    const definition = OXML.makeDefinition(proto)
+    definition.properties[alias] = { name, alias }
+    if (name !== alias) {
+      Object.defineProperty(proto, name, {
+        get() {
+          return (this as OXML).offsetGet(alias)
+        },
+        configurable: true,
+        enumerable: true,
+      })
     }
-    definition.properties ??= {}
-    definition.properties[propName] = { name, alias: propName }
-    Object.defineProperty(proto, name, {
-      get() {
-        return (this as OXML).offsetGet(propName)
-      },
-    })
   }
 }
 
 export function defineChild(tag: string, defaultValue?: any, isArray = false) {
   return function (proto: any, name: any) {
-    let definition = OXML.protoToDefinition.get(proto)
-    if (!definition) {
-      definition = {} as OXMLDefinition
-      OXML.protoToDefinition.set(proto, definition)
-    }
-    definition.children ??= []
+    const definition = OXML.makeDefinition(proto)
     definition.children.push({ tag, defaultValue, isArray })
     Object.defineProperty(proto, name, {
       get() {
@@ -126,13 +112,28 @@ export class OXML {
     return this.tagToConstructor.get(tag)
   }
 
+  static makeDefinition(proto: any): OXMLDefinition {
+    let definition = OXML.protoToDefinition.get(proto)
+    if (!definition) {
+      definition = {
+        attributes: {},
+        properties: {
+          tag: { name: 'tag', alias: 'tag' },
+        },
+        children: [],
+      } as unknown as OXMLDefinition
+      OXML.protoToDefinition.set(proto, definition)
+    }
+    return definition
+  }
+
   static getDefinition(proto: any): OXMLDefinition | undefined {
     let definition: OXMLDefinition | undefined
     let cur = proto
     while (cur) {
       const _definition = this.protoToDefinition.get(cur)
       if (_definition) {
-        definition = deepMerge(definition ?? {}, _definition)
+        definition = deepMerge(definition ?? {}, _definition) as any
       }
       cur = Object.getPrototypeOf(cur)
     }
@@ -196,19 +197,28 @@ export class OXML {
         case 'boolean':
           return !!value
         case 'degree':
+        case 'ST_Angle':
           return Number(value) / 60000
         case 'fontSize':
           return Number(value) / 100
         case 'number':
+        case 'SByteValue':
           return Number(value)
         case 'string':
+        case 'HexBinaryValue':
+        case 'StringValue':
           return String(value)
         case 'emu':
+        case 'ST_Coordinate32':
+        case 'ST_AdjCoordinate':
           return (Number(value) / 914400) * OXML.DPI
         case 'dxa':
           return (Number(value) / 1440) * OXML.DPI
         case 'percentage':
+        case 'ST_TextSpacingPercentOrPercentString':
           return Number(value) / 1000
+        case 'ST_TextSpacingPoint':
+          return Number(value) / 100
         case 'rate':
           return Number(value) / 100000
         case 'lineHeight':
@@ -335,19 +345,6 @@ export class OXML {
         }
       })
     }
-    definition?.children?.forEach((child) => {
-      child.tag
-    })
-    return {
-      ...properties,
-    }
-    // return {
-    //   ...this.getAttributes(),
-    //   ...Object.fromEntries(this.getChildren().map((child) => {
-    //     const tag = child.tag ?? child.element.tagName
-    //     const tagArr = tag.split(':')
-    //     return [tagArr[tagArr.length - 1], child.toJSON()]
-    //   })),
-    // }
+    return properties
   }
 }

src/openxml/drawing/BlipFill.ts

@@ -12,8 +12,8 @@ export class BlipFill extends OXML {
   @defineAttribute('rotWithShape', 'boolean') declare rotWithShape?: boolean
   @defineAttribute('dpi', 'number') declare dpi?: number
 
-  @defineChild('a:blip') declare blip: Blip
-  @defineChild('a:srcRect') declare srcRect: SourceRectangle
-  @defineChild('a:stretch') declare stretch: Stretch
-  @defineChild('a:tile') declare tile: Tile
+  @defineChild('a:blip') declare blip?: Blip
+  @defineChild('a:srcRect') declare srcRect?: SourceRectangle
+  @defineChild('a:stretch') declare stretch?: Stretch
+  @defineChild('a:tile') declare tile?: Tile
 }

src/openxml/drawing/BodyProperties.ts

@@ -1,20 +1,34 @@
-import type { TextWrappingValues } from './TextWrappingValues'
+import type {
+  TextAnchoringTypeValues,
+  TextHorizontalOverflowValues,
+  TextVerticalOverflowValues,
+  TextVerticalValues,
+  TextWrappingValues,
+} from './_types'
 import { defineAttribute, defineElement, OXML } from '../../core'
-import { TextAnchoringTypeValues } from './TextAnchoringTypeValues'
 
 /**
  * @link https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.bodyproperties
  */
 @defineElement('a:bodyPr')
 export class BodyProperties extends OXML {
-  @defineAttribute('anchor', TextAnchoringTypeValues) declare anchor?: TextAnchoringTypeValues
+  @defineAttribute('anchor') declare anchor?: TextAnchoringTypeValues
   @defineAttribute('anchorCtr', 'boolean') declare anchorCtr?: boolean
+  @defineAttribute('bIns', 'ST_Coordinate32') declare bIns?: number
+  @defineAttribute('numCol', 'ST_TextColumnCount') declare numCol?: number
+  @defineAttribute('spcCol', 'ST_PositiveCoordinate32') declare spcCol?: number
+  @defineAttribute('compatLnSpc', 'boolean') declare compatLnSpc?: boolean
+  @defineAttribute('forceAA', 'boolean') declare forceAA?: boolean
+  @defineAttribute('fromWordArt', 'boolean') declare fromWordArt?: boolean
+  @defineAttribute('horzOverflow') declare horzOverflow?: TextHorizontalOverflowValues
+  @defineAttribute('lIns', 'ST_Coordinate32') declare lIns?: number
+  @defineAttribute('rIns', 'ST_Coordinate32') declare rIns?: number
+  @defineAttribute('rtlCol', 'boolean') declare rtlCol?: boolean
+  @defineAttribute('rot', 'ST_Angle') declare rot?: number
+  @defineAttribute('tIns', 'ST_Coordinate32') declare tIns?: number
+  @defineAttribute('upright', 'boolean') declare upright?: boolean
   @defineAttribute('spcFirstLastPara', 'boolean') declare spcFirstLastPara?: boolean
-  @defineAttribute('lIns', 'emu') declare lIns?: number
-  @defineAttribute('tIns', 'emu') declare tIns?: number
-  @defineAttribute('rIns', 'emu') declare rIns?: number
-  @defineAttribute('bIns', 'emu') declare bIns?: number
-  @defineAttribute('rot', 'degree') declare rot?: number
+  @defineAttribute('vert') declare vert?: TextVerticalValues
+  @defineAttribute('vertOverflow') declare vertOverflow?: TextVerticalOverflowValues
   @defineAttribute('wrap') declare wrap?: TextWrappingValues
-  @defineAttribute('upright', 'boolean') declare upright?: boolean
 }

src/openxml/drawing/Break.ts

@@ -0,0 +1,9 @@
+import { defineElement, OXML } from '../../core'
+
+/**
+ * @link https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.break
+ */
+@defineElement('a:br')
+export class Break extends OXML {
+  //
+}

src/openxml/drawing/ComplexScriptFont.ts

@@ -0,0 +1,10 @@
+import { defineElement } from '../../core'
+import { _Font } from './_Font'
+
+/**
+ * https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.complexscriptfont
+ */
+@defineElement('a:cs')
+export class ComplexScriptFont extends _Font {
+  //
+}

src/openxml/drawing/EastAsianFont.ts

@@ -0,0 +1,10 @@
+import { defineElement } from '../../core'
+import { _Font } from './_Font'
+
+/**
+ * https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.eastasianfont
+ */
+@defineElement('a:ea')
+export class EastAsianFont extends _Font {
+  //
+}

src/openxml/drawing/EndParagraphRunProperties.ts

@@ -0,0 +1,9 @@
+import { defineElement, OXML } from '../../core'
+
+/**
+ * @link https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.endparagraphrunproperties
+ */
+@defineElement('a:endParaRPr')
+export class EndParagraphRunProperties extends OXML {
+  // TODO
+}

src/openxml/drawing/Field.ts

@@ -0,0 +1,10 @@
+import { defineAttribute, defineElement, OXML } from '../../core'
+
+/**
+ * @link https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.field
+ */
+@defineElement('a:fld')
+export class Field extends OXML {
+  @defineAttribute('id') declare id?: string
+  @defineAttribute('type') declare type?: string
+}

src/openxml/drawing/LatinFont.ts

@@ -0,0 +1,10 @@
+import { defineElement } from '../../core'
+import { _Font } from './_Font'
+
+/**
+ * https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.latinfont
+ */
+@defineElement('a:latin')
+export class LatinFont extends _Font {
+  //
+}

src/openxml/drawing/LineSpacing.ts

@@ -0,0 +1,12 @@
+import type { SpacingPercent } from './SpacingPercent'
+import type { SpacingPoints } from './SpacingPoints'
+import { defineChild, defineElement, OXML } from '../../core'
+
+/**
+ * https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.linespacing
+ */
+@defineElement('a:lnSpc')
+export class LineSpacing extends OXML {
+  @defineChild('a:spcPct') declare spcPct?: SpacingPercent
+  @defineChild('a:spcPts') declare spcPts?: SpacingPoints
+}

src/openxml/drawing/Paragraph.ts

@@ -1,22 +1,51 @@
-import type { TextAlignmentTypeValues } from './TextAlignmentTypeValues'
+import type { Break } from './Break'
+import type { EndParagraphRunProperties } from './EndParagraphRunProperties'
+import type { Field } from './Field'
+import type { ParagraphProperties } from './ParagraphProperties'
+import type { Run } from './Run'
 import { defineChild, defineElement, defineProperty, OXML } from '../../core'
-import { ParagraphProperties } from './ParagraphProperties'
-import { Run } from './Run'
 
 /**
  * https://learn.microsoft.com/dotnet/api/documentformat.openxml.drawing.paragraph
  */
 @defineElement('a:p')
 export class Paragraph extends OXML {
-  @defineChild('p:pPr', ParagraphProperties) declare pPr: ParagraphProperties
-  @defineChild('p:r', Run) declare rList: Run[]
+  @defineChild('a:fld') declare fld?: Field
+  @defineChild('a:pPr') declare pPr: ParagraphProperties
 
-  @defineProperty('pPr.marL', 0) declare marginLeft: number
-  @defineProperty('pPr.marR', 0) declare marginRight: number
-  @defineProperty('pPr.indent', 0) declare textIndent: number
+  @defineProperty() style = new _ParagraphStyle(this)
   @defineProperty('pPr.lvl') declare level?: number
   @defineProperty('pPr.fontAlgn') declare fontAlign?: string
+  @defineProperty('_children') declare children?: (Break | Run | EndParagraphRunProperties)[]
 
-  get textAlign(): TextAlignmentTypeValues | undefined { return this.pPr.algn }
-  get rightToLeft(): string | undefined { return this.pPr.rtl }
+  get _children(): (Break | Run | EndParagraphRunProperties)[] {
+    return Array.from(this.element.children).map((element) => {
+      switch (element.tagName) {
+        case 'a:fld':
+        case 'a:pPr':
+          return undefined
+        case 'a:br':
+        case 'a:r':
+        case 'a:endParaRPr':
+        default:
+          return OXML.make(element)
+      }
+    }).filter(Boolean) as any
+  }
+}
+
+export class _ParagraphStyle extends OXML {
+  @defineProperty('_parent.pPr.marL') declare marginLeft?: number
+  @defineProperty('_parent.pPr.marR') declare marginRight?: number
+  @defineProperty('_parent.pPr.indent') declare textIndent: number
+  @defineProperty('_parent.pPr.lnSpc.spcPct.val') declare lineHeight?: number
+
+  get textAlign() { return this._parent.pPr.algn }
+  get rightToLeft(): string | undefined { return this._parent.pPr.rtl }
+
+  constructor(
+    protected _parent: Paragraph,
+  ) {
+    super()
+  }
 }