@linkiez/dxf-renew 7.1.0 → 7.2.0

package/src/handlers/entity/trace.ts

@@ -0,0 +1,72 @@
+import type { DXFTuple } from '../../types/dxf'
+
+import type { Point3D } from '../../types'
+import common from './common'
+
+interface TraceEntity {
+  type: string
+  corners: Point3D[]
+  thickness?: number
+}
+
+export const TYPE = 'TRACE'
+
+export const process = (tuples: DXFTuple[]): TraceEntity => {
+  return tuples.reduce(
+    (entity, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+      switch (type) {
+        case 10:
+          entity.corners[0].x = value as number
+          break
+        case 20:
+          entity.corners[0].y = value as number
+          break
+        case 30:
+          entity.corners[0].z = value as number
+          break
+        case 11:
+          entity.corners[1].x = value as number
+          break
+        case 21:
+          entity.corners[1].y = value as number
+          break
+        case 31:
+          entity.corners[1].z = value as number
+          break
+        case 12:
+          entity.corners[2].x = value as number
+          break
+        case 22:
+          entity.corners[2].y = value as number
+          break
+        case 32:
+          entity.corners[2].z = value as number
+          break
+        case 13:
+          entity.corners[3].x = value as number
+          break
+        case 23:
+          entity.corners[3].y = value as number
+          break
+        case 33:
+          entity.corners[3].z = value as number
+          break
+        case 39:
+          entity.thickness = value as number
+          break
+        default:
+          Object.assign(entity, common(type, value))
+          break
+      }
+      return entity
+    },
+    {
+      type: TYPE,
+      corners: [{} as Point3D, {} as Point3D, {} as Point3D, {} as Point3D],
+    } as TraceEntity,
+  )
+}
+
+export default { TYPE, process }

package/src/handlers/entity/wipeout.ts

@@ -0,0 +1,114 @@
+import type { DXFTuple, PartialPoint3D } from '../../types'
+
+import common from './common'
+
+export const TYPE = 'WIPEOUT'
+
+interface WipeoutEntity {
+  type: typeof TYPE
+
+  insertionPoint: PartialPoint3D
+  uVector: PartialPoint3D
+  vVector: PartialPoint3D
+
+  clipBoundaryType?: 1 | 2
+  clipBoundaryVertices?: Array<{ x: number; y: number }>
+
+  displayProperties?: number
+  clippingState?: 0 | 1
+  classVersion?: number
+  imageSizePixels?: { u: number; v: number }
+
+  [key: string]: unknown
+}
+
+export const process = (tuples: DXFTuple[]): WipeoutEntity => {
+  let pendingBoundaryX: number | null = null
+
+  return tuples.reduce(
+    (entity, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+
+      switch (type) {
+        case 90:
+          entity.classVersion = value as number
+          break
+
+        case 10:
+          entity.insertionPoint.x = value as number
+          break
+        case 20:
+          entity.insertionPoint.y = value as number
+          break
+        case 30:
+          entity.insertionPoint.z = value as number
+          break
+
+        case 11:
+          entity.uVector.x = value as number
+          break
+        case 21:
+          entity.uVector.y = value as number
+          break
+        case 31:
+          entity.uVector.z = value as number
+          break
+
+        case 12:
+          entity.vVector.x = value as number
+          break
+        case 22:
+          entity.vVector.y = value as number
+          break
+        case 32:
+          entity.vVector.z = value as number
+          break
+
+        case 13:
+          entity.imageSizePixels ??= { u: 0, v: 0 }
+          entity.imageSizePixels.u = value as number
+          break
+        case 23:
+          entity.imageSizePixels ??= { u: 0, v: 0 }
+          entity.imageSizePixels.v = value as number
+          break
+
+        case 70:
+          entity.displayProperties = value as number
+          break
+        case 280:
+          entity.clippingState = value as 0 | 1
+          break
+
+        case 71:
+          entity.clipBoundaryType = value as 1 | 2
+          break
+
+        case 14:
+          pendingBoundaryX = value as number
+          break
+        case 24:
+          if (pendingBoundaryX !== null) {
+            entity.clipBoundaryVertices ??= []
+            entity.clipBoundaryVertices.push({ x: pendingBoundaryX, y: value as number })
+            pendingBoundaryX = null
+          }
+          break
+
+        default:
+          Object.assign(entity, common(type, value))
+          break
+      }
+      return entity
+    },
+    {
+      type: TYPE,
+      insertionPoint: {},
+      uVector: {},
+      vVector: {},
+    } as WipeoutEntity,
+  )
+}
+
+export default { TYPE, process }

package/src/handlers/entity/xline.ts

@@ -0,0 +1,52 @@
+import type { DXFTuple, PartialPoint3D } from '../../types'
+
+import common from './common'
+
+export const TYPE = 'XLINE'
+
+interface XLineEntity {
+  type: typeof TYPE
+  basePoint: PartialPoint3D
+  direction: PartialPoint3D
+  [key: string]: unknown
+}
+
+export const process = (tuples: DXFTuple[]): XLineEntity => {
+  return tuples.reduce(
+    (entity, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+      switch (type) {
+        case 10:
+          entity.basePoint.x = value as number
+          break
+        case 20:
+          entity.basePoint.y = value as number
+          break
+        case 30:
+          entity.basePoint.z = value as number
+          break
+        case 11:
+          entity.direction.x = value as number
+          break
+        case 21:
+          entity.direction.y = value as number
+          break
+        case 31:
+          entity.direction.z = value as number
+          break
+        default:
+          Object.assign(entity, common(type, value))
+          break
+      }
+      return entity
+    },
+    {
+      type: TYPE,
+      basePoint: {},
+      direction: {},
+    } as XLineEntity,
+  )
+}
+
+export default { TYPE, process }

package/src/handlers/objects.ts

@@ -1,12 +1,14 @@
 import type {
-    DictionaryObject,
-    DXFTuple,
-    ImageDefObject,
-    ImageDefReactorObject,
-    LayoutInternal,
-    ParsedObjects,
-    UnderlayDefinitionObject,
-    XRecordObject,
+  DictionaryObject,
+  DimAssocObject,
+  DXFTuple,
+  FieldObject,
+  ImageDefObject,
+  ImageDefReactorObject,
+  LayoutInternal,
+  ParsedObjects,
+  UnderlayDefinitionObject,
+  XRecordObject,
 } from '../types'
 
 type ObjectGroup = DXFTuple[]
@@ -232,6 +234,48 @@ function parseImageDefReactorObject(group: ObjectGroup): ImageDefReactorObject |
   return reactor
 }
 
+function parseDimAssocObject(group: ObjectGroup): DimAssocObject | undefined {
+  if (group[0]?.[1] !== 'DIMASSOC') return undefined
+
+  const tuples = group.slice(1)
+
+  const dimAssoc: DimAssocObject = {
+    type: 'DIMASSOC',
+    tuples,
+  }
+
+  for (const tuple of tuples) {
+    const type = tuple[0]
+    const value = tuple[1]
+
+    if (type === 5) dimAssoc.handle = value
+    if (type === 330) dimAssoc.ownerHandle = value
+  }
+
+  return dimAssoc
+}
+
+function parseFieldObject(group: ObjectGroup): FieldObject | undefined {
+  if (group[0]?.[1] !== 'FIELD') return undefined
+
+  const tuples = group.slice(1)
+
+  const field: FieldObject = {
+    type: 'FIELD',
+    tuples,
+  }
+
+  for (const tuple of tuples) {
+    const type = tuple[0]
+    const value = tuple[1]
+
+    if (type === 5) field.handle = value
+    if (type === 330) field.ownerHandle = value
+  }
+
+  return field
+}
+
 const UNDERLAY_DEFINITION_OBJECT_TYPES = new Set([
   'UNDERLAYDEFINITION',
   'PDFDEFINITION',
@@ -311,6 +355,16 @@ const OBJECT_GROUP_HANDLERS: Record<string, ObjectGroupHandler> = {
     const handle = def?.handle ? String(def.handle) : undefined
     if (def && handle) objects.underlayDefinitions![handle] = def
   },
+  DIMASSOC: (objects, group) => {
+    const dimAssoc = parseDimAssocObject(group)
+    const handle = dimAssoc?.handle ? String(dimAssoc.handle) : undefined
+    if (dimAssoc && handle) objects.dimAssocs![handle] = dimAssoc
+  },
+  FIELD: (objects, group) => {
+    const field = parseFieldObject(group)
+    const handle = field?.handle ? String(field.handle) : undefined
+    if (field && handle) objects.fields![handle] = field
+  },
 }
 
 export default function parseObjects(tuples: DXFTuple[]): ParsedObjects {
@@ -321,6 +375,8 @@ export default function parseObjects(tuples: DXFTuple[]): ParsedObjects {
     imageDefs: {},
     imageDefReactors: {},
     underlayDefinitions: {},
+    dimAssocs: {},
+    fields: {},
   }
 
   const groups = groupObjectsByZero(tuples)

package/src/handlers/tables.ts

@@ -1,4 +1,16 @@
-import type { DXFTuple, DimStyleInternal, LTypeElement, LTypeInternal, LayerInternal, StyleInternal, VPortInternal } from '../types'
+import type {
+  AppIdInternal,
+  BlockRecordInternal,
+  DXFTuple,
+  DimStyleInternal,
+  LTypeElement,
+  LTypeInternal,
+  LayerInternal,
+  StyleInternal,
+  UcsInternal,
+  VPortInternal,
+  ViewInternal,
+} from '../types'
 
 import logger from '../util/logger'
 
@@ -6,7 +18,7 @@ const ltypeHandler = (tuples: DXFTuple[]): LTypeInternal => {
   let element: LTypeElement | undefined
   let offset: { x: string | number; y: string | number } | undefined
   return tuples.reduce(
-    (layer, tuple) => {
+    (layer, tuple) => { // NOSONAR
       const type = tuple[0]
       const value = tuple[1]
       // https://documentation.help/AutoCAD-DXF/WS1a9193826455f5ff18cb41610ec0a2e719-7a4f.htm
@@ -172,7 +184,7 @@ const vPortHandler = (tuples: DXFTuple[]): VPortInternal => {
     (vport, tuple) => {
       const type = tuple[0]
       const value = tuple[1]
-      switch (type) {
+      switch (type) { // NOSONAR
         case 2:
           vport.name = value
           break
@@ -287,12 +299,100 @@ const vPortHandler = (tuples: DXFTuple[]): VPortInternal => {
   )
 }
 
+const appIdHandler = (tuples: DXFTuple[]): AppIdInternal => {
+  return tuples.reduce(
+    (appId, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+
+      switch (type) {
+        case 2:
+          appId.name = value
+          break
+        case 70:
+          appId.flags = value
+          break
+        default:
+      }
+
+      return appId
+    },
+    { type: 'APPID' } as AppIdInternal,
+  )
+}
+
+const blockRecordHandler = (tuples: DXFTuple[]): BlockRecordInternal => {
+  return tuples.reduce(
+    (blockRecord, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+
+      switch (type) {
+        case 2:
+          blockRecord.name = value
+          break
+        case 70:
+          blockRecord.flags = value
+          break
+        default:
+      }
+
+      return blockRecord
+    },
+    { type: 'BLOCK_RECORD' } as BlockRecordInternal,
+  )
+}
+
+const ucsHandler = (tuples: DXFTuple[]): UcsInternal => {
+  return tuples.reduce(
+    (ucs, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+
+      switch (type) {
+        case 2:
+          ucs.name = value
+          break
+        case 70:
+          ucs.flags = value
+          break
+        default:
+      }
+
+      return ucs
+    },
+    { type: 'UCS' } as UcsInternal,
+  )
+}
+
+const viewHandler = (tuples: DXFTuple[]): ViewInternal => {
+  return tuples.reduce(
+    (view, tuple) => {
+      const type = tuple[0]
+      const value = tuple[1]
+
+      switch (type) {
+        case 2:
+          view.name = value
+          break
+        case 70:
+          view.flags = value
+          break
+        default:
+      }
+
+      return view
+    },
+    { type: 'VIEW' } as ViewInternal,
+  )
+}
+
 const dimStyleHandler = (tuples: DXFTuple[]): DimStyleInternal => {
   return tuples.reduce(
     (dimStyle, tuple) => {
       const type = tuple[0]
       const value = tuple[1]
-      switch (type) {
+      switch (type) { // NOSONAR
         case 2:
           dimStyle.name = value
           break
@@ -508,7 +608,18 @@ const dimStyleHandler = (tuples: DXFTuple[]): DimStyleInternal => {
 const tableHandler = (
   tuples: DXFTuple[],
   tableType: string,
-  handler: (tuples: DXFTuple[]) => LTypeInternal | LayerInternal | StyleInternal | VPortInternal | DimStyleInternal,
+  handler: (
+    tuples: DXFTuple[],
+  ) =>
+    | LTypeInternal
+    | LayerInternal
+    | StyleInternal
+    | VPortInternal
+    | DimStyleInternal
+    | AppIdInternal
+    | BlockRecordInternal
+    | UcsInternal
+    | ViewInternal,
 ): Record<string, any> => {
   const tableRowsTuples: DXFTuple[][] = []
 
@@ -552,30 +663,32 @@ export default function parseTables(tuples: DXFTuple[]) {
     }
   }
 
-  let stylesTuples: DXFTuple[] = []
-  let layersTuples: DXFTuple[] = []
-  let vPortTuples: DXFTuple[] = []
-  let ltypeTuples: DXFTuple[] = []
-  let dimStyleTuples: DXFTuple[] = []
+  const groupsByName: Record<string, DXFTuple[]> = {}
   for (const group of tableGroups) {
-    if (group[0]?.[1] === 'STYLE') {
-      stylesTuples = group
-    } else if (group[0]?.[1] === 'LTYPE') {
-      ltypeTuples = group
-    } else if (group[0]?.[1] === 'LAYER') {
-      layersTuples = group
-    } else if (group[0]?.[1] === 'VPORT') {
-      vPortTuples = group
-    } else if (group[0]?.[1] === 'DIMSTYLE') {
-      dimStyleTuples = group
-    }
+    const name = String(group[0]?.[1] ?? '')
+    if (!name) continue
+    groupsByName[name] = group
   }
 
+  const stylesTuples = groupsByName.STYLE ?? []
+  const layersTuples = groupsByName.LAYER ?? []
+  const vPortTuples = groupsByName.VPORT ?? []
+  const ltypeTuples = groupsByName.LTYPE ?? []
+  const dimStyleTuples = groupsByName.DIMSTYLE ?? []
+  const appIdTuples = groupsByName.APPID ?? []
+  const blockRecordTuples = groupsByName.BLOCK_RECORD ?? []
+  const ucsTuples = groupsByName.UCS ?? []
+  const viewTuples = groupsByName.VIEW ?? []
+
   return {
     layers: tableHandler(layersTuples, 'LAYER', layerHandler),
     styles: tableHandler(stylesTuples, 'STYLE', styleHandler),
     vports: tableHandler(vPortTuples, 'VPORT', vPortHandler),
     ltypes: tableHandler(ltypeTuples, 'LTYPE', ltypeHandler),
     dimStyles: tableHandler(dimStyleTuples, 'DIMSTYLE', dimStyleHandler),
+    appids: tableHandler(appIdTuples, 'APPID', appIdHandler),
+    blockRecords: tableHandler(blockRecordTuples, 'BLOCK_RECORD', blockRecordHandler),
+    ucs: tableHandler(ucsTuples, 'UCS', ucsHandler),
+    views: tableHandler(viewTuples, 'VIEW', viewHandler),
   }
 }

package/src/index.ts

@@ -1,19 +1,10 @@
-import config from './config'
-import parseString from './parseString'
-import denormalise from './denormalise'
-import groupEntitiesByLayer from './groupEntitiesByLayer'
-import toPolylines from './toPolylines'
-import toSVG from './toSVG'
-import colors from './util/colors'
-import Helper from './Helper'
+export { default as config } from './config'
+export { default as denormalise } from './denormalise'
+export { default as groupEntitiesByLayer } from './groupEntitiesByLayer'
+export { default as Helper } from './Helper'
+export { default as parseString } from './parseString'
+export { default as toJson } from './toJson'
+export { default as toPolylines } from './toPolylines'
+export { default as toSVG } from './toSVG'
+export { default as colors } from './util/colors'
 
-export {
-  config,
-  parseString,
-  denormalise,
-  groupEntitiesByLayer,
-  toPolylines,
-  toSVG,
-  colors,
-  Helper,
-}

package/src/toJson.ts

@@ -0,0 +1,8 @@
+import type { ParsedDXF, ToJsonOptions } from './types'
+
+export default function toJson(parsed: ParsedDXF, options: ToJsonOptions = {}): string {
+  const shouldPrettyPrint = options.pretty === true
+  const indentation = shouldPrettyPrint ? (options.space ?? 2) : undefined
+
+  return JSON.stringify(parsed, null, indentation)
+}

package/src/toSVG.ts

@@ -20,6 +20,7 @@ import type {
   LeaderEntity,
   MTextEntity,
   ParsedDXF,
+  ShapeEntity,
   SplineEntity,
   TextEntity,
   ToleranceEntity,
@@ -402,6 +403,32 @@ const tolerance = (entity: ToleranceEntity): BoundsAndElement => {
   return transformBoundingBoxAndElement(bbox, element, entity.transforms ?? [])
 }
 
+/**
+ * Minimal <text /> fallback for SHAPE entities.
+ * Rendering SHX-based shapes is out of scope; we render the name as text.
+ */
+const shape = (entity: ShapeEntity): BoundsAndElement => {
+  const x = entity.insertionPoint?.x ?? 0
+  const y = entity.insertionPoint?.y ?? 0
+  const height = entity.size ?? 1
+  const rotation = entity.rotation ?? 0
+  const content = entity.name ?? ''
+
+  const textWidth = content.length * height * 0.6
+  const bbox0 = new Box2()
+    .expandByPoint({ x, y })
+    .expandByPoint({ x: x + textWidth, y: y + height })
+
+  const rotationDegrees = (rotation * 180) / Math.PI
+  const element0 = `<text x="${x}" y="${y}" font-size="${height}" transform="rotate(${-rotationDegrees} ${x} ${y}) scale(1,-1) translate(0 ${-2 * y})">${escapeXmlText(content)}</text>`
+
+  const { bbox, element } = addFlipXIfApplicable(entity, {
+    bbox: bbox0,
+    element: element0,
+  })
+  return transformBoundingBoxAndElement(bbox, element, entity.transforms ?? [])
+}
+
 /**
  * Create dimension visualization with DIMSTYLE support
  */
@@ -504,18 +531,30 @@ const entityToBoundsAndElement = (
       }
     }
     case 'LINE':
+    case 'RAY':
+    case 'XLINE':
     case 'POLYLINE': {
       return polyline(entity)
     }
+    case 'SOLID':
+    case 'TRACE': {
+      return polyline(entity)
+    }
     case 'LWPOLYLINE': {
       return lwpolyline(entity)
     }
+    case 'WIPEOUT': {
+      return polyline(entity)
+    }
     case 'LEADER': {
       return leader(entity as LeaderEntity)
     }
     case 'TOLERANCE': {
       return tolerance(entity as ToleranceEntity)
     }
+    case 'SHAPE': {
+      return shape(entity as ShapeEntity)
+    }
     default:
       logger.warn('entity type not supported in SVG rendering:', entity.type)
       return null
@@ -569,9 +608,12 @@ export default function toSVG(parsed: ParsedDXF, options: ToSVGOptions = {}): st
           acc.bbox.expandByPoint(bbox.min)
           acc.bbox.expandByPoint(bbox.max)
         }
-        acc.elements.push(
-          `<g stroke="${rgbToColorAttribute(rgb)}">${element}</g>`,
-        )
+        const color = rgbToColorAttribute(rgb)
+        if (entity.type === 'SOLID' || entity.type === 'TRACE') {
+          acc.elements.push(`<g fill="${color}" stroke="none">${element}</g>`)
+        } else {
+          acc.elements.push(`<g stroke="${color}">${element}</g>`)
+        }
       }
       return acc
     },