@jscad/dxf-deserializer 3.0.2-alpha.0 → 3.0.4-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/dxf-deserializer",
-  "version": "3.0.2-alpha.0",
+  "version": "3.0.4-alpha.0",
   "description": "DXF Deserializer for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -33,17 +33,16 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jscad/io-utils": "3.0.2-alpha.0",
-    "@jscad/modeling": "3.0.2-alpha.0"
+    "@jscad/io-utils": "3.0.4-alpha.0",
+    "@jscad/modeling": "3.0.4-alpha.0"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-terser": "^0.4.3",
-    "ava": "^4.3.3",
-    "c8": "^8.0.0",
-    "rollup": "^2.79.1",
-    "rollup-plugin-banner": "^0.2.1",
-    "rollup-plugin-version-injector": "^1.3.3"
+    "@rollup/plugin-node-resolve": "^15.2.0",
+    "@rollup/plugin-terser": "^0.4.0",
+    "ava": "^6.3.0",
+    "c8": "^10.1.0",
+    "rollup": "^4.52.0",
+    "rollup-plugin-version-injector": "^1.3.0"
   },
-  "gitHead": "ac80d1a7cb0a8efb21aff9193d4a8bccb6e31f1c"
+  "gitHead": "1de52a2b7b6bd31134fd0b72a2842f31ecf8f237"
 }

package/rollup.config.js

@@ -1,8 +1,11 @@
-import banner from 'rollup-plugin-banner'
+import * as fs from 'fs'
+
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import versionInjector from 'rollup-plugin-version-injector'
 import terser from '@rollup/plugin-terser'
 
+const {name, version, license} = JSON.parse(fs.readFileSync('package.json'))
+
 export default {
   input: 'src/index.js',
 
@@ -10,17 +13,18 @@ export default {
     {
       file: 'dist/jscad-dxf-deserializer.min.js',
       format: 'umd',
-      name: 'jscadDxfDeserializer'
+      name: 'jscadDxfDeserializer',
+      banner: `/*! ${name} V${version} (${license}) */`
     },
     {
       file: 'dist/jscad-dxf-deserializer.es.js',
-      format: 'es'
+      format: 'es',
+      banner: `/*! ${name} V${version} (${license}) */`
     }
   ],
 
   plugins: [
     nodeResolve(),
-    banner('<%= pkg.description %>\n@module <%= pkg.name %>\n@version <%= pkg.version %>\n@license <%= pkg.license %>'),
     versionInjector({ injectInComments: { fileRegexp: /\.(html)$/ }, logLevel: 'warn' }),
     terser({ compress: { module: true }, mangle: false, format: { comments: 'some' } })
   ]

package/src/DxfReader.js

@@ -6,7 +6,7 @@ const STATES = [
   'error'
 ]
 
-/**
+/*
  * Class DxfReader
  * A class to hold state while reading DXF formatted data.
  * @param {Object} [options] - options for parsing
@@ -177,7 +177,7 @@ const parse = (reader, data) => {
   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
@@ -200,7 +200,7 @@ const parseLine = (reader, line) => {
   }
 }
 
-/**
+/*
  * 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
@@ -216,7 +216,7 @@ const setDxfGroup = (reader, line) => {
   }
 }
 
-/**
+/*
  * 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

package/src/index.js

@@ -18,7 +18,7 @@ const version = '[VI]{version}[/VI]' // version is injected by rollup
  * Deserializer of DXF data to JSCAD geometries.
  * @module io/dxf-deserializer
  * @example
- * const { deserialize, extension } = require('@jscad/dxf-deserializer')
+ * import { deserialize, mimeType } from '@jscad/dxf-deserializer'
  */
 
 const handleError = (reader, error) => {
@@ -571,6 +571,7 @@ const translate = (src, options) => {
 
 /**
  * Deserialize the given DXF source into either a script or an array of geometry
+ *
  * @param {Object} options - options used during deserializing, REQUIRED
  * @param {string} [options.filename='dxf'] - filename of original DXF data stream
  * @param {String} [options.version] - version added to the script metadata, default is package version
@@ -578,8 +579,7 @@ const translate = (src, options) => {
  * @param {boolean} [options.strict=true] - obey strict DXF specifications
  * @param {array} [options.colorindex=[]] - list of colors (256) for use during rendering
  * @param {string} src - DXF data stream
- * @return {string|[objects]} a string (script) or array of objects (geometry)
- * @alias module:io/dxf-deserializer.deserialize
+ * @returns {(Array|String)} either an array of objects (geometry) or a string (script)
  */
 const deserialize = (options, src) => {
   const defaults = {
@@ -596,7 +596,7 @@ const deserialize = (options, src) => {
   }
   options = Object.assign({}, defaults, options)
 
-  src = ensureString(src);
+  src = ensureString(src)
   return options.output === 'script' ? translate(src, options) : instantiate(src, options)
 }
 

package/tests/test-2d-entities.js

@@ -110,11 +110,11 @@ test('ASCII DXF 2D Donuts from Autocad 2017 to Object Conversion', (t) => {
   t.is(objs.length, 23)
   // NOTE: the extra ojbects are from the page layout
   t.true(path2.isA(objs[20]))
-  t.is(path2.toPoints(objs[20]).length, 18) // line
+  t.is(path2.toPoints(objs[20]).length, 16) // line
   t.true(path2.isA(objs[21]))
-  t.is(path2.toPoints(objs[21]).length, 18) // line
+  t.is(path2.toPoints(objs[21]).length, 16) // line
   t.true(path2.isA(objs[22]))
-  t.is(path2.toPoints(objs[22]).length, 18) // arc
+  t.is(path2.toPoints(objs[22]).length, 16) // arc
 })
 
 test('ASCII DXF 2D Ellipses from Autocad 2017 to Object Conversion', (t) => {