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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/x3d-deserializer",
-  "version": "3.0.2-alpha.0",
+  "version": "3.0.4-alpha.0",
   "description": "X3D Deserializer for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org/",
@@ -32,20 +32,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@jscad/array-utils": "3.0.1-alpha.0",
-    "@jscad/io-utils": "3.0.2-alpha.0",
-    "@jscad/modeling": "3.0.2-alpha.0",
+    "@jscad/array-utils": "3.0.2-alpha.0",
+    "@jscad/io-utils": "3.0.4-alpha.0",
+    "@jscad/modeling": "3.0.4-alpha.0",
     "saxes": "^6.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^23.0.4",
-    "@rollup/plugin-node-resolve": "^15.0.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-commonjs": "^23.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.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,9 +1,12 @@
-import banner from 'rollup-plugin-banner'
+import * as fs from 'fs'
+
 import commonjs from '@rollup/plugin-commonjs'
 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',
 
@@ -11,18 +14,19 @@ export default {
     {
       file: 'dist/jscad-x3d-deserializer.min.js',
       format: 'umd',
-      name: 'jscadX3dDeserializer'
+      name: 'jscadX3dDeserializer',
+      banner: `/*! ${name} V${version} (${license}) */`
     },
     {
       file: 'dist/jscad-x3d-deserializer.es.js',
-      format: 'es'
+      format: 'es',
+      banner: `/*! ${name} V${version} (${license}) */`
     }
   ],
 
   plugins: [
     commonjs(),
     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/index.js

@@ -10,7 +10,7 @@
  * @see {@link https://github.com/jscad/OpenJSCAD.org/blob/master/packages/io/x3d-deserializer/README.md|README} for supported conversion of X3D entities.
  * @module io/x3d-deserializer
  * @example
- * const { deserializer, extension } = require('@jscad/x3d-deserializer')
+ * import { deserializer, mimeType } from '@jscad/x3d-deserializer'
  */
 import { ensureString } from '@jscad/io-utils'
 
@@ -30,7 +30,6 @@ const version = '[VI]{version}[/VI]' // version is injected by rollup
  * @param {Boolean} [options.addMetadata=true] - toggle injection of metadata at the start of the script
  * @param {String} input - X3D source data (XML)
  * @returns {(Array|String)} either an array of objects (geometry) or a string (script)
- * @alias module:io/x3d-deserializer.deserialize
  */
 const deserialize = (options, input) => {
   const defaults = {

package/src/translateShape.js

@@ -54,7 +54,7 @@ const createObjects${object.id} = (options) => {
   ${polysAsStrings.join(',\n  ')}
 ]
 `
-            primitive = 'geom3.fromPoints(polygons)'
+            primitive = 'geom3.fromVertices(polygons)'
           }
         }
       }

package/tests/translate.test.js

@@ -46,7 +46,7 @@ test('deserialize X3D 3D components to JSCAD script', (t) => {
   t.is(countOf('createObjects', observed), 20)
   t.is(countOf('cylinder', observed), 2)
   t.is(countOf('sphere', observed), 1)
-  t.is(countOf('geom3.fromPoints', observed), 1)
+  t.is(countOf('geom3.fromVertices', observed), 1)
   t.is(countOf('transform', observed), 10)
 })