@jscad/io 2.0.9 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/README.md +15 -13
  3. package/deserializers.js +2 -0
  4. package/formats.js +3 -3
  5. package/index.js +2 -0
  6. package/package.json +20 -18
  7. package/prepareOutput.js +2 -0
package/CHANGELOG.md CHANGED
@@ -3,6 +3,44 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.2.2](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/io@2.2.1...@jscad/io@2.2.2) (2021-12-26)
7
+
8
+ **Note:** Version bump only for package @jscad/io
9
+
10
+
11
+
12
+
13
+
14
+ ## [2.2.1](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/io@2.2.0...@jscad/io@2.2.1) (2021-12-11)
15
+
16
+ **Note:** Version bump only for package @jscad/io
17
+
18
+
19
+
20
+
21
+
22
+ # [2.2.0](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/io@2.1.0...@jscad/io@2.2.0) (2021-11-07)
23
+
24
+
25
+ ### Features
26
+
27
+ * **io:** new serializer for OBJ ([#942](https://github.com/jscad/OpenJSCAD.org/issues/942)) ([baaae18](https://github.com/jscad/OpenJSCAD.org/commit/baaae18ad55252ec71b074bd85dea7d137a22eb8))
28
+
29
+
30
+
31
+
32
+
33
+ # [2.1.0](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/io@2.0.9...@jscad/io@2.1.0) (2021-10-17)
34
+
35
+
36
+ ### Features
37
+
38
+ * **io:** added registration of x3d-deserializer ([57aee3f](https://github.com/jscad/OpenJSCAD.org/commit/57aee3fee0626e8dd13bd89ea4a6a5f3f108bd54))
39
+
40
+
41
+
42
+
43
+
6
44
  ## [2.0.9](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/io@2.0.8...@jscad/io@2.0.9) (2021-10-04)
7
45
 
8
46
  **Note:** Version bump only for package @jscad/io
package/README.md CHANGED
@@ -26,24 +26,26 @@ This package is a metapackage and includes all the input/output format handling
26
26
  ie: file data => JSCAD code or JSCAD geometry
27
27
 
28
28
  Following formats are supported as inputs
29
- - [AMF](../amf-deserializer)
30
- - [DXF](../dxf-deserializer)
31
- - [JSON](../json-deserializer)
32
- - [OBJ](../obj-deserializer)
33
- - [STL (binary, ASCII)](../stl-deserializer)
34
- - [SVG](../svg-deserializer)
29
+ - [AMF](../amf-deserializer)
30
+ - [DXF](../dxf-deserializer)
31
+ - [JSON](../json-deserializer)
32
+ - [OBJ](../obj-deserializer)
33
+ - [STL (binary, ASCII)](../stl-deserializer)
34
+ - [SVG](../svg-deserializer)
35
+ - [X3D](../x3d-deserializer)
35
36
 
36
37
  ### Outputs/ Serializers
37
38
 
38
39
  ie: geometry => blob
39
40
 
40
41
  Following formats are supported as outputs
41
- - [AMF](../amf-serializer)
42
- - [DXF](../dxf-serializer)
43
- - [JSON](../json-serializer)
44
- - [STL (binary, ASCII)](../stl-serializer)
45
- - [SVG](../svg-serializer)
46
- - [X3D](../x3d-serializer)
42
+ - [AMF](../amf-serializer)
43
+ - [DXF](../dxf-serializer)
44
+ - [JSON](../json-serializer)
45
+ - [OBJ](../obj-serializer)
46
+ - [STL (binary, ASCII)](../stl-serializer)
47
+ - [SVG](../svg-serializer)
48
+ - [X3D](../x3d-serializer)
47
49
 
48
50
  ## Table of Contents
49
51
 
@@ -60,7 +62,7 @@ npm install @jscad/io
60
62
 
61
63
  ## Usage
62
64
 
63
- - as Node module :
65
+ - As a Node module :
64
66
 
65
67
  ```
66
68
  const io = require('@jscad/io')
package/deserializers.js CHANGED
@@ -5,6 +5,7 @@ const objDeSerializer = require('@jscad/obj-deserializer')
5
5
  // const scadDeSerializer = require('@jscad/scad-deserializer') //FIXME: upgrade, fix before re-enabling
6
6
  const stlDeSerializer = require('@jscad/stl-deserializer')
7
7
  const svgDeSerializer = require('@jscad/svg-deserializer')
8
+ const x3dDeSerializer = require('@jscad/x3d-deserializer')
8
9
 
9
10
  const deserializers = {}
10
11
  deserializers[amfDeSerializer.extension] = amfDeSerializer.deserialize
@@ -13,5 +14,6 @@ deserializers[jsonDeSerializer.extension] = jsonDeSerializer.deserialize
13
14
  deserializers[objDeSerializer.extension] = objDeSerializer.deserialize
14
15
  deserializers[stlDeSerializer.extension] = stlDeSerializer.deserialize
15
16
  deserializers[svgDeSerializer.extension] = svgDeSerializer.deserialize
17
+ deserializers[x3dDeSerializer.extension] = x3dDeSerializer.deserialize
16
18
 
17
19
  module.exports = deserializers
package/formats.js CHANGED
@@ -77,11 +77,11 @@ const formats = {
77
77
  },
78
78
  obj: {
79
79
  displayName: 'OBJ',
80
- description: 'Wavefromt OBJ File Format',
80
+ description: 'Wavefront OBJ File',
81
81
  extension: 'obj',
82
82
  mimetype: 'text/plain',
83
83
  deserializable: true,
84
- convertGeom3: false,
84
+ convertGeom3: true,
85
85
  convertGeom2: false
86
86
  },
87
87
  svg: {
@@ -98,7 +98,7 @@ const formats = {
98
98
  description: 'X3D File Format',
99
99
  extension: 'x3d',
100
100
  mimetype: 'model/x3d+xml',
101
- deserializable: false,
101
+ deserializable: true,
102
102
  convertGeom3: true,
103
103
  convertGeom2: false
104
104
  }
package/index.js CHANGED
@@ -3,6 +3,7 @@ const { makeBlob, convertToBlob } = require('@jscad/io-utils')
3
3
  const amfSerializer = require('@jscad/amf-serializer')
4
4
  const dxfSerializer = require('@jscad/dxf-serializer')
5
5
  const jsonSerializer = require('@jscad/json-serializer')
6
+ const objSerializer = require('@jscad/obj-serializer')
6
7
  const stlSerializer = require('@jscad/stl-serializer')
7
8
  const svgSerializer = require('@jscad/svg-serializer')
8
9
  const x3dSerializer = require('@jscad/x3d-serializer')
@@ -19,6 +20,7 @@ module.exports = {
19
20
  amfSerializer,
20
21
  dxfSerializer,
21
22
  jsonSerializer,
23
+ objSerializer,
22
24
  stlSerializer,
23
25
  svgSerializer,
24
26
  x3dSerializer,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jscad/io",
3
- "version": "2.0.9",
3
+ "version": "2.2.2",
4
4
  "description": "Meta Package for JSCAD IO Packages",
5
5
  "repository": "https://github.com/jscad/OpenJSCAD.org",
6
6
  "main": "index.js",
@@ -12,7 +12,7 @@
12
12
  },
13
13
  {
14
14
  "name": "z3dev",
15
- "url": "http://www.z3d.jp"
15
+ "url": "https://github.com/z3dev"
16
16
  },
17
17
  {
18
18
  "name": "Mark 'kaosat-dev' Moissette",
@@ -29,21 +29,23 @@
29
29
  ],
30
30
  "license": "MIT",
31
31
  "dependencies": {
32
- "@jscad/amf-deserializer": "2.2.1",
33
- "@jscad/amf-serializer": "2.0.9",
34
- "@jscad/array-utils": "2.1.0",
35
- "@jscad/dxf-deserializer": "2.3.5",
36
- "@jscad/dxf-serializer": "2.0.9",
37
- "@jscad/io-utils": "2.0.8",
38
- "@jscad/json-deserializer": "2.0.9",
39
- "@jscad/json-serializer": "2.0.8",
40
- "@jscad/modeling": "2.5.3",
41
- "@jscad/obj-deserializer": "2.0.8",
42
- "@jscad/stl-deserializer": "2.1.5",
43
- "@jscad/stl-serializer": "2.0.9",
44
- "@jscad/svg-deserializer": "2.4.1",
45
- "@jscad/svg-serializer": "2.2.6",
46
- "@jscad/x3d-serializer": "2.2.7"
32
+ "@jscad/amf-deserializer": "2.2.5",
33
+ "@jscad/amf-serializer": "2.1.2",
34
+ "@jscad/array-utils": "2.1.1",
35
+ "@jscad/dxf-deserializer": "2.3.9",
36
+ "@jscad/dxf-serializer": "2.1.2",
37
+ "@jscad/io-utils": "2.0.12",
38
+ "@jscad/json-deserializer": "2.0.13",
39
+ "@jscad/json-serializer": "2.0.12",
40
+ "@jscad/modeling": "2.7.1",
41
+ "@jscad/obj-deserializer": "2.0.12",
42
+ "@jscad/obj-serializer": "2.1.2",
43
+ "@jscad/stl-deserializer": "2.1.9",
44
+ "@jscad/stl-serializer": "2.1.2",
45
+ "@jscad/svg-deserializer": "2.4.5",
46
+ "@jscad/svg-serializer": "2.2.10",
47
+ "@jscad/x3d-deserializer": "2.1.1",
48
+ "@jscad/x3d-serializer": "2.3.2"
47
49
  },
48
- "gitHead": "0bfbc72afe89ef8dc4f332acf55858831f173d6e"
50
+ "gitHead": "c8ac21281a7acf5a5575b940c18353c598ffa1a4"
49
51
  }
package/prepareOutput.js CHANGED
@@ -4,6 +4,7 @@ const { formats } = require('./formats')
4
4
  const amfSerializer = require('@jscad/amf-serializer')
5
5
  const dxfSerializer = require('@jscad/dxf-serializer')
6
6
  const jsonSerializer = require('@jscad/json-serializer')
7
+ const objSerializer = require('@jscad/obj-serializer')
7
8
  const stlSerializer = require('@jscad/stl-serializer')
8
9
  const svgSerializer = require('@jscad/svg-serializer')
9
10
  const x3dSerializer = require('@jscad/x3d-serializer')
@@ -30,6 +31,7 @@ const prepareOutput = (objects, params) => {
30
31
  }, // Geom3 to STL ASCII
31
32
  stlb: stlSerializer, // Geom3 to STL BINARY
32
33
  dxf: dxfSerializer, // Geom2 to DXF
34
+ obj: objSerializer,
33
35
  svg: svgSerializer, // Geom2 to SVG
34
36
  x3d: x3dSerializer, // Geom3 to X3D
35
37
  json: jsonSerializer, // Geom3 or Geom2 to JSON