Update

.eslintrc.json

@@ -0,0 +1,39 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": [
+        "plugin:react/recommended", "standard", "standard-react"
+    ],
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly",
+        "describe": "readonly",
+        "it": "readonly",
+        "before": "readonly",
+        "after": "readonly",
+        "beforeEach": "readonly",
+        "afterEach": "readonly"
+    },
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true
+        },
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "react", "babel"
+    ],
+    "parser": "babel-eslint",
+    "rules": {
+      "jest/valid-describe": 0
+    },
+    "settings": {
+      "react": {
+        "version": "detect"
+      }
+    }
+}

.gitignore

@@ -1,9 +1,10 @@
 node_modules/
-test/functional/output/*.output.svg
-test/functional/lib/
+lib/
+dist/
 test/resources/#*
 examples/example.es5.svg
 examples/example.es6.svg
 .DS_Store
 *~
 #*
+.idea

.npmignore

@@ -0,0 +1,2 @@
+babel.config.js
+test/

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "6"
-  - "7"
-before_install: npm install -g gulp-cli
+  - "8"
+  - "10"
 install: npm install
 sudo: false

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Benjamin Nortier
+Copyright (c) 2014-2018 Ben Nortier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -4,54 +4,112 @@
 
 DXF parser for node/browser.
 
-Uses several ES6 features in the source code (import, classes, let, const, arrows) but is packaged using babel so you can use it legacy JS environments.
+Uses several ES6 features in the source code (import, classes, let, const, arrows) but is packaged using babel so you can use it in legacy JS environments.
 
 Version 2.0 is a complete rewrite from the first attempt to write it in a SAX style, which wasn't really appropriate for a document with nested references (e.g inserts referencing blocks, nested inserts).
 
-Version 3.0 converted the codebase to use [standard JS](https://standardjs.com), ES6 imports, stop using Gulp, and updated & removed some dependencies.
+Version 3.0 converted the codebase to use [standard JS](https://standardjs.com), ES6 imports, stopped using Gulp, and updated & removed some dependencies.
+
+Version 4.x is in progress and the aim is to use native SVG elements where possible, e.g. `<circle />`, `<ellipse />` etc. 4.0 introduces the `<circle />` element.
 
 At this point in time, the important geometric entities are supported, but notably:
 
  * MTEXT
  * DIMENSION
  * STYLE
+ * HATCH
 
 and some others are **parsed**, but are **not supported for SVG rendering** (see section below on SVG rendering)
 
 ## Getting started
 
-There is an ES5 and ES6 example in the ```examples/``` directory that show how to use the library, but there are 3 basic steps:
+There is an ES5 and ES6 example in the ```examples/``` directory that show how to use the library. There are exposed functions for advanced users, but for the majority of users you can use the `Helper` object to get the data you're interested in (or convert to SVG):
+
+```
+const helper = new Helper(<DXF String>)
+
+// The 1-to-1 object representation of the DXF
+console.log('parsed:', helper.parsed)
 
-1. Parse the DXF contents using ```dxf.parseString(<contents>)```. This will return an object representation of the DXF contents.
-1. Denormalise the entities into an array using ```dxf.denormalize(<parsed>)```. After Step 1, the entities are still in the block hierarchy of the DXF file, denormalizing will create the *resulting* entities with the block transforms applied.
-1. (Optional) Create an SVG using ```dxf.toSVG(<parsed>)```. Please refer to the SVG section below regarding limitations.
+// Denormalised blocks inserted with transforms applied
+console.log('denormalised:', helper.denormalised)
+
+// Create an SVG
+console.log('svg:', helper.toSVG())
+
+// Create polylines (e.g. to render in WebGL)
+console.log('polylines:', helper.toPolylines())
+```
 
 ## Running the Examples
 
-Node ES5:
-`$ node examples/example.es5.js`
+Node ES5. Will write an SVG to `examples/example.es5.svg`:
+
+```
+$ node examples/example.es5.js
+```
 
-Node ES6:
-`$ babel-node examples/example.es6.js`
+Node ES6. Will write an SVG to `examples/example.es6.svg`:
 
-Browser:
-`$ open examples/dxf.html`
+```
+$ npx babel-node examples/example.es6.js
+```
+
+Browser. Compile to a browser bundle and open the example webpage:
+
+```
+$ npm run compile
+$ open examples/dxf.html
+```
 
 ## SVG
 
-The initial aim of this library was to support rendering of the main geometric components, not dimensions, text, hatches and styles. There is a mechanism for converting the parsed entities to SVG, but they are **all converted to polylines**, and if you look at the resulting SVG files when running the functional tests, you will see that all entities are rendered as paths.
+Geometric elements are supported, but dimensions, text, hatches and styles (except for line colors) are ***not***.
+
+Native SVG elements are used as far as possible for curved entities (`<circle />`, `<ellipse/>` etc.), ***except for the SPLINE entity***, which is interpolated.
 
 Here's an example you will find in the functional test output:
 
 ![svg example image](https://cloud.githubusercontent.com/assets/57994/17583566/e00f5d78-5fb1-11e6-9030-55686f980e6f.png)
 
+## Interpolation
+
+The library supports outputting DXFs as interpolated polylines for custom rendering (e.g. WebGL) or other applications, by using:
+
+
+```
+> helper.toPolylines()
+```
+
+
+## Command line
+
+There is a command-line utility (courtesy of [@Joge97](https://github.com/Joge97)) for converting DXF files to SVG:
+
+```
+$ npm i -g dxf
+$ dxf-to-svg
+
+  Usage: dxf-to-svg [options] <dxfFile> [svgFile]
+
+  Converts a dxf file to a svg file.
+
+  Options:
+
+    -V, --version  output the version number
+    -v --verbose   Verbose output
+    -h, --help     output usage information
+```
+
 ## Tests
 
 Running
 
 ```$ npm test```
 
-will execute the unit tests and functional tests, which generate SVGs for reference DXF files. You can view these SVGs (located in test/functional/output) in a browser or other SVG viewer to see what is supported.
+will execute the unit tests.
+
+```$ npm run test:functional``` will run the functional tests in a browser. Please open `toSVG.html` when the file listing loads in the browser (or open `http://localhost:8030/toSVG.html#/`).
 
 ### Contributors
 
@@ -61,3 +119,9 @@ will execute the unit tests and functional tests, which generate SVGs for refere
 - Ivan Baktsheev https://github.com/apla
 - Jeff Chen https://github.com/jeffontheground
 - Markko Paas https://github.com/markkopaas
+- Kim Lokøy https://github.com/klokoy
+- Erik Söhnel https://github.com/hoeck
+- Teja https://github.com/hungerpirat
+- Jakob Pallhuber https://github.com/Joge97
+- Eric Mansfield https://github.com/ericman314
+- Kristofer https://github.com/kriffe

RELEASE.md

@@ -0,0 +1,44 @@
+4.4.4
+- Fix typo in README
+
+4.3.0
+- #51 Fix bug when transforming empty bounding box
+
+4.2.4
+- #50 Fix knot piecewise beziers
+
+4.2.3
+- More accurate bounding boxes for arcs and ellipses (#48)
+
+4.2.2
+- Bump eslint-utils from 1.3.1 to 1.4.2
+- Add HATCH to unsupported SVG entities in README
+
+4.2.1
+- Use main lodash package due to security issue(s)
+
+4.2.0
+- README updates
+
+4.1.1
+- #issue42 support entities that have extrusionZ === -1 defined on the entity itself (as opposed to the transform).
+
+4.1.0
+- CIRCLE DXF entities now produce native <circle /> SVG elements.
+- ELLIPSE DXF entities now produce native <path d="A..."/> or <ellipse /> SVG elements.
+- ARC DXF entities now produce native <path d="A..."/> or <ellipse /> SVG elements.
+
+4.0.1
+- Browser example uses Helper
+
+4.0.0
+- Use ES6 string interpolation in SVG generation.
+- Use native SVG <circle /> elements for CIRCLE entities.
+- Use SVG <g/> elements with a transform attribute for native and interpolated entities.
+- Add a Helper object to simplify the workflow.
+- The SVG output uses a root transform to flip the Y coordinates.
+
+3.6.0
+- NPM audit fixes.
+- Remove support for Node v6 in Travis.
+- Node engine is now >= 8.9.0.

babel.config.js

@@ -0,0 +1,5 @@
+const presets = [
+  '@babel/env'
+]
+
+module.exports = { presets }