@jscad/x3d-deserializer 2.2.6 → 2.2.8

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.8](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/x3d-deserializer@2.2.7...@jscad/x3d-deserializer@2.2.8) (2024-10-06)
+
+**Note:** Version bump only for package @jscad/x3d-deserializer
+
+
+
+
+
+## [2.2.7](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/x3d-deserializer@2.2.6...@jscad/x3d-deserializer@2.2.7) (2024-06-02)
+
+
+### Bug Fixes
+
+* **x3d-deserializer:** correcting caching of x3d attributes in createX3DParser, allowing continuous parsing of X3D files ([7f44197](https://github.com/jscad/OpenJSCAD.org/commit/7f4419776e2b0d485a4b2621d9f12927d31a0bbc))
+
+
+
+
+
 ## [2.2.6](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/x3d-deserializer@2.2.5...@jscad/x3d-deserializer@2.2.6) (2024-02-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/x3d-deserializer",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "X3D Deserializer for JSCAD",
   "repository": "https://github.com/jscad/OpenJSCAD.org/",
   "main": "src/index.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@jscad/array-utils": "2.1.4",
-    "@jscad/modeling": "2.12.1",
+    "@jscad/modeling": "2.12.3",
     "saxes": "5.0.1"
   },
   "devDependencies": {
     "ava": "3.15.0",
     "nyc": "15.1.0"
   },
-  "gitHead": "e07bb27d61f638348c73cc1383dfb5339060a02a"
+  "gitHead": "4627312c2337120447a607ff3ac3da10056ce132"
 }

package/src/parse.js

@@ -45,21 +45,6 @@ const {
   x3dMaterial
 } = require('./objects')
 
-let x3dLast = null // last object found
-let x3dDefinition = x3dTypes.X3D // what kind of object beinging created
-
-// high level elements / definitions
-const x3dObjects = [] // list of objects
-const x3dDefs = new Map() // list of named objects
-
-const x3dMaterials = [] // list of materials
-const x3dTextures = [] // list of textures
-
-const x3dLength = { factor: 1.0, name: 'meters' }
-const x3dAngle = { factor: 1.0, name: 'radians' }
-
-let x3dObj = null // x3d in object form
-
 const nodeToObjectMap = {
   X3D: x3dX3D,
   UNIT: x3dUnit,
@@ -110,15 +95,31 @@ const getObjectId = () => ('0000' + objectId++).slice(-4)
 const createX3DParser = (src, pxPmm) => {
   // create a parser for the XML
   const parser = new saxes.SaxesParser()
+  const x3dDefs = new Map() // list of named objects
+  let x3dLast = null // last object found
+  let x3dDefinition = x3dTypes.X3D // what kind of object beinging created
+  let x3dObj = null // x3d in object form
+
+  // high level elements / definitions
+  const x3dObjects = [] // list of objects
+  const x3dMaterials = [] // list of materials
+  const x3dTextures = [] // list of textures
+
+  const x3dLength = { factor: 1.0, name: 'meters' }
+  const x3dAngle = { factor: 1.0, name: 'radians' }
 
   parser.on('error', (e) => {
-    console.log(`error: line ${e.line}, column ${e.column}, bad character [${e.c}]`)
+    console.log(
+      `error: line ${e.line}, column ${e.column}, bad character [${e.c}]`
+    )
   })
 
   parser.on('opentag', (node) => {
     // convert known XML tags to objects
     const elementname = node.name.toUpperCase()
-    let obj = nodeToObjectMap[elementname] ? nodeToObjectMap[elementname](node.attributes, { x3dObjects }) : null
+    let obj = nodeToObjectMap[elementname]
+      ? nodeToObjectMap[elementname](node.attributes, { x3dObjects })
+      : null
 
     if (obj) {
       obj.id = getObjectId()
@@ -129,17 +130,23 @@ const createX3DParser = (src, pxPmm) => {
         if (x3dDefs.has(objectname)) {
           const def = x3dDefs.get(objectname)
           if (def.definition !== obj.definition) {
-            console.log(`WARNING: using a definition "${objectname}" of a different type; ${obj.definition} vs ${def.definition}`)
+            console.log(
+              `WARNING: using a definition "${objectname}" of a different type; ${obj.definition} vs ${def.definition}`
+            )
           }
           obj = def
         } else {
-          console.log(`WARNING: definition "${objectname}" does not exist, using default for ${obj.definition}`)
+          console.log(
+            `WARNING: definition "${objectname}" does not exist, using default for ${obj.definition}`
+          )
         }
       } else {
         if (node.attributes.DEF) {
           const objectname = node.attributes.DEF
           if (x3dDefs.has(objectname)) {
-            console.log(`WARNING: redefintion of ${objectname} has been ignored`)
+            console.log(
+              `WARNING: redefintion of ${objectname} has been ignored`
+            )
           } else {
             x3dDefs.set(objectname, obj)
           }
@@ -331,12 +338,12 @@ const createX3DParser = (src, pxPmm) => {
 
   // start the parser
   parser.write(src).close()
-}
 
-const parse = (src, pxPmm) => {
-  createX3DParser(src, pxPmm)
-  // console.log(JSON.stringify(x3dObj))
-  return { x3dObj, x3dMaterials, x3dTextures }
+  return {
+    x3dObj,
+    x3dMaterials,
+    x3dTextures
+  }
 }
 
-module.exports = parse
+module.exports = createX3DParser