@jscad/dxf-deserializer 2.3.27 → 3.0.1-alpha.0

package/tests/test-3d-translation.js

@@ -1,8 +1,8 @@
-const test = require('ava')
+import test from 'ava'
 
-const countOf = require('../../test/helpers/countOf')
+import { countOf } from '../../test/helpers/countOf.js'
 
-const { deserialize } = require('../index')
+import { deserialize } from '../src/index.js'
 
 //
 // Test suite for DXF deserialization (import)
@@ -216,10 +216,10 @@ SEQEND
 0
 ENDSEC`
   const src3 = deserialize({ filename: 'dxf3-test', output: 'script' }, dxf3)
-  t.is(countOf('main', src3), 2)
+  t.is(countOf('main', src3), 1)
   t.is(countOf('createPolygon', src3), 11)
   t.is(countOf('geom3.create', src3), 1)
-  t.is(countOf('color', src3), 6)
+  t.is(countOf('colorize', src3), 1)
 
   // DXF 3D POLYLINE with faces, translates to script with 3D geometry
 })
@@ -293,7 +293,7 @@ ENTITIES
 ENDSEC`
   // expect a script which calls createPolygon for each 3DFACE, and creates a new 3D geometry
   const src1 = deserialize({ filename: 'dxf1-test', output: 'script' }, dxf1)
-  t.is(countOf('main', src1), 2)
+  t.is(countOf('main', src1), 1)
   t.is(countOf('createPolygon', src1), 3)
   t.is(countOf('geom3.create', src1), 1)
 })

package/tests/test-DxfReader.js

@@ -1,10 +1,11 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const dxf = require('../DxfReader')
+import test from 'ava'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import { reader } from '../src/DxfReader.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 //
 // Test suite for DXF reader
@@ -14,7 +15,7 @@ test('DXF Reader', (t) => {
   t.deepEqual(true, fs.existsSync(dxfPath))
 
   const src = fs.readFileSync(dxfPath, 'UTF8')
-  const reader = dxf.reader(src)
+  const dxfreader = reader(src)
 
-  t.is(typeof reader, 'object')
+  t.is(typeof dxfreader, 'object')
 })

package/tests/test-dxf-versions.js

@@ -1,12 +1,13 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const { geometries } = require('@jscad/modeling')
+import test from 'ava'
 
-const { deserialize } = require('../index')
+import { path2 } from '@jscad/modeling'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import { deserialize } from '../src/index.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 //
 // Test suite for DXF deserialization (import)
@@ -21,8 +22,8 @@ test('ASCII DXF R13 to Object Conversion', (t) => {
   t.true(Array.isArray(objs))
   t.is(objs.length, 16)
 
-  t.true(geometries.path2.isA(objs[0]))
-  t.true(geometries.path2.isA(objs[15]))
+  t.true(path2.isA(objs[0]))
+  t.true(path2.isA(objs[15]))
 })
 
 test('ASCII DXF R14 to Object Conversion', (t) => {
@@ -46,7 +47,7 @@ test('ASCII DXF ANSI to Object Conversion', (t) => {
   t.true(Array.isArray(objs))
   t.is(objs.length, 1)
 
-  t.true(geometries.path2.isA(objs[0]))
+  t.true(path2.isA(objs[0]))
 })
 
 test('ASCII DXF ISO to Object Conversion', (t) => {
@@ -59,6 +60,6 @@ test('ASCII DXF ISO to Object Conversion', (t) => {
   t.true(Array.isArray(objs))
   t.is(objs.length, 14)
 
-  t.true(geometries.path2.isA(objs[0]))
-  t.true(geometries.path2.isA(objs[13]))
+  t.true(path2.isA(objs[0]))
+  t.true(path2.isA(objs[13]))
 })

package/tests/test-dxf.js

@@ -1,10 +1,11 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const { deserialize } = require('../index')
+import test from 'ava'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import { deserialize } from '../src/index.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 //
 // Test suite for DXF deserialization (import)

package/DxfReader.js

@@ -1,250 +0,0 @@
-/*
-## License
-
-Copyright (c) 2017 Z3 Development https://github.com/z3dev
-
-All code released under MIT license
-
-Thanks to @issacs for the sax js library, and inspiration for this reader
-
-*/
-
-// DXF reader to emit groups of interest to handlers
-
-;(function (dxf) { // wrapper for non-node envs
-  dxf.reader = function (options) { return new DxfReader(options) }
-
-  dxf.STATES = [
-    'start',
-    'end',
-    'error'
-  ]
-
-  /**
-   * Class DxfReader
-   * A class to hold state while reading DXF formatted data.
-   * @param {Object} [options] - options for parsing
-   * @param {Boolean} [options.track=true] - track position for error reporting
-   * @param {Boolean} [options.strict=false] - obey strict DXF specifications
-   * @constructor
-   *
-   * @example
-   * const dxfPath = path.resolve(__dirname, 'circle10.dxf')
-   * let src = fs.readFileSync(dxfPath, 'UTF8')
-   * let reader = dxf.reader({track: true})
-   * // setup state handling
-   * reader.on('error',handleError)
-   * reader.on('start',handleStart)
-   * reader.on('end'  ,handleEnd)
-   * // setup handling for groups of interest, skip the rest
-   * reader.absorb(0,handleEntity)
-   * // start the reader
-   * reader.write(src).close()
-   */
-  function DxfReader (options) {
-    const reader = this
-    reader.options = options || {}
-
-    reader.trackPosition = (reader.options.track !== false)
-    if (reader.trackPosition) {
-      reader.line = reader.column = reader.c = 0
-    }
-  }
-
-  DxfReader.prototype = {
-  // set a handler for the given state
-  // see dxf.STATES above
-    on: function (state, callback) {
-    // verify the state
-    // set the callback
-      const reader = this
-      reader['on' + state] = callback
-    },
-
-    // set a handler for the given group and value
-    absorb: function (group, callback) {
-      if (this.absorbers === undefined) {
-        this.absorbers = new Map()
-      }
-      this.absorbers.set(group, callback)
-    },
-
-    // write the given data into the reader, initiating parsing
-    write: function (data) {
-      const reader = this
-      parse(reader, data)
-      return reader
-    },
-
-    // close and clear all state
-    close: function () {
-      const reader = this
-      reader.isclosed = true
-      return reader
-    }
-  }
-
-  //
-  // emit the start of processing to the onstart handler if any
-  //
-  const emitstart = (reader) => emitstate(reader, 'onstart', reader.data)
-
-  //
-  // emit the group (code and value) to asorbers
-  //
-  const emitgroup = (reader, group, value) => {
-    // console.log(group+": "+value)
-    // emit this group to all listeners
-    if (reader.absorbers !== undefined) {
-      const absorber = reader.absorbers.get(group)
-      if (absorber !== undefined) {
-        absorber(reader, group, value)
-      }
-    }
-  }
-
-  //
-  // wrap and emit the given error to the onerror handler if any
-  //
-  const emiterror = (reader, er) => {
-    // closeText(reader)
-    if (reader.trackPosition) {
-      er += `
-Line: ${reader.line}
-Column: ${reader.column}
-Char: ${reader.c}`
-    }
-    er = new Error(er)
-    reader.error = er
-    return emitstate(reader, 'onerror', er)
-  }
-
-  //
-  // emit the end of processing to the onend handler if any
-  //
-  const emitend = (reader) => emitstate(reader, 'onend', reader.data)
-
-  const emitstate = (reader, state, data) => {
-    const onhandler = state.toString()
-    reader[onhandler] && reader[onhandler](reader, data)
-    return reader
-  }
-
-  //
-  // parse the given data in the context of the given reader
-  //
-  const parse = (reader, data) => {
-  // check reader state
-    if (reader.error) {
-      throw reader.error // throw the last error
-    }
-    if (reader.isclosed) {
-      return emiterror(reader, 'Cannot write after close')
-    }
-
-    emitstart(reader)
-
-    if (data === null) {
-      return emitend(reader)
-    }
-
-    // initial state to initiate parsing
-    reader.group = null
-    reader.value = null
-    reader.error = null
-
-    reader.position = 0
-    reader.line = 0
-    reader.column = 0
-
-    // use or convert the data to String
-    let i = 0
-    let c = ''
-    let l = ''
-    while (reader.error === null) {
-      c = charAt(data, i++)
-      if (!c) {
-        break
-      }
-      if (reader.trackPosition) {
-        reader.position++
-        if (c === '\n') {
-          reader.line++
-          reader.column = 0
-        } else {
-          reader.column++
-        }
-      }
-      // dxf files are parsed line by line
-      if (c === '\n') {
-        parseLine(reader, l)
-        l = ''
-      } else {
-        l += c
-      }
-    }
-    // emit state change
-    emitend(reader)
-    return reader
-  }
-
-  /** Parse the given line in the context of the given reader, emitting group value pairs
-   * @param reader {DxfReader} - context DxfReader to use
-   * @param line {String} - line to parse
-   */
-  const parseLine = (reader, line) => {
-    line = line.trim()
-    if (reader.group === null) {
-      setDxfGroup(reader, line)
-      reader.value = null
-    } else {
-      setDxfValue(reader, line)
-    }
-    // handle group and value pairs
-    if (reader.group !== null && reader.value !== null) {
-      // emit events for group and value pairs
-      emitgroup(reader, reader.group, reader.value)
-
-      reader.group = null
-      reader.value = null
-    }
-  }
-
-  /** Parse the given line in the context of the given reader, and update the group
-   * @param reader {DxfReader} - context DxfReader to use
-   * @param line {String} - line to parse
-   */
-  const setDxfGroup = (reader, line) => {
-  // groups are numeric
-    const code = parseInt(line)
-    if (isNaN(code)) {
-      emiterror(reader, 'Invalid group (int)')
-      reader.group = null
-    } else {
-      reader.group = code
-    }
-  }
-
-  /** Parse the given line in the context of the given reader, and update the (group) value
-   * @param reader {DxfReader} - context DxfReader to use
-   * @param line {String} - line to parse
-   */
-  const setDxfValue = (reader, line) => {
-    if (reader.options.strict) {
-      // TODO evaluate the value based on DXF specifications
-      reader.value = line
-    } else {
-      reader.value = line
-    }
-  }
-
-  //
-  // helper function to return expected values
-  //
-  const charAt = (data, i) => {
-    if (data && data.length > i) {
-      return data.charAt(i)
-    }
-    return ''
-  }
-})(typeof exports === 'undefined' ? this.dxf = {} : exports)