feat(examples): corrected import examples to use ES imports and IO deserialize

Author: z3dev

packages/examples/import/AMFImport/Rook.amf

@@ -7,17 +7,48 @@
  * @authors Simon Clark
  * @licence MIT License
  */
+import fs from 'fs'
+import path from 'path'
+import { fileURLToPath } from 'url'
 
-const { translate, scale, rotateZ } = require('@jscad/modeling').transforms
-const { union } = require('@jscad/modeling').booleans
+import { translate, scale, rotateZ } from '@jscad/modeling'
+import { union } from '@jscad/modeling'
 
-// Load the STL files using require
-const sculpture = require('./3d_sculpture-VernonBussler.stl')
-const frog = require('./frog-OwenCollins.stl')
+import { deserialize } from '@jscad/io'
 
-const main = () => union(
-  translate([0, 0, 13], rotateZ(-Math.PI / 3, scale([0.25, 0.25, 0.25], frog))),
-  translate([-5, 6, 0], sculpture)
-)
+/*
+ * Load the STL mesh from the given file.
+ *
+ * NOTE: This function is required in V3 as imports of non-standard file types are not possible
+ */
+const loadStl = (filepath) => {
+  const mimeType = 'model/stl'
+
+  let fullpath = filepath
+  if (!path.isAbsolute(fullpath)) {
+    // Get the directory name of the current module
+    const filename = fileURLToPath(import.meta.url)
+    const dirname = path.dirname(filename)
+
+    fullpath = path.join(dirname, filepath)
+  }
+
+  const results = fs.readFileSync(fullpath)
+  const content = results.buffer
+    ? results.buffer.slice(results.byteOffset, results.byteOffset + results.length)
+    : results
+
+  return deserialize({output: 'geometry'}, mimeType, content)
+}
+
+// Load the STL files
+const sculpture = loadStl('./3d_sculpture-VernonBussler.stl')
+const frog = loadStl('./frog-OwenCollins.stl')
+
+export const main = () => {
+  return union(
+    translate([0, 0, 13], rotateZ(-Math.PI / 3, scale([0.25, 0.25, 0.25], frog))),
+    translate([-5, 6, 0], sculpture)
+  )
+}
 
-module.exports = { main }

packages/examples/import/AMFImport/index.js

@@ -9,5 +9,6 @@
   ],
   "author": "Simon Clark",
   "license": "MIT",
-  "dependencies": {}
+  "dependencies": {},
+  "type": "module"
 }

packages/examples/import/AMFImport/package.json

@@ -7,18 +7,47 @@
  * @authors Simon Clark
  * @licence MIT License
  */
+import fs from 'fs'
+import path from 'path'
+import { fileURLToPath } from 'url'
 
-const { translate } = require('@jscad/modeling').transforms
-const { extrudeLinear } = require('@jscad/modeling').extrusions
-const { polygon } = require('@jscad/modeling').primitives
+import { translate } from '@jscad/modeling'
+import { extrudeLinear } from '@jscad/modeling'
+import { polygon } from '@jscad/modeling'
 
-// Load the SVG files using require
-const panda = require('./babypanda2.svg')
+import { deserialize } from '@jscad/io'
 
-const main = () => {
-  // SVG shapes are imported as an array of paths. We want to convert those to polygons to extrude.
-  const poly = panda.map((shape) => polygon({ points: shape.points }))
-  return translate([-40, 50, 0], extrudeLinear({ height: 2 }, poly))
+/*
+ * Load the SVG outlines from the given file.
+ *
+ * NOTE: This function is required in V3 as imports of non-standard file types are not possible
+ */
+const loadSvg = (filepath) => {
+  const mimeType = 'image/svg+xml'
+
+  let fullpath = filepath
+  if (!path.isAbsolute(fullpath)) {
+    // Get the directory name of the current module
+    const filename = fileURLToPath(import.meta.url)
+    const dirname = path.dirname(filename)
+
+    fullpath = path.join(dirname, filepath)
+  }
+
+  const results = fs.readFileSync(fullpath)
+  const content = results.buffer
+    ? results.buffer.slice(results.byteOffset, results.byteOffset + results.length)
+    : results
+
+  return deserialize({output: 'geometry'}, mimeType, content)
 }
 
-module.exports = { main }
+// Load the SVG files
+const panda = loadSvg('./babypanda2.svg')
+
+export const main = () => {
+  // SVG shapes are imported as an array of paths. So, convert the paths to polygons.
+  const poly = panda.map((path) => polygon({ points: path.points }))
+
+  return translate([-40, 50, 0], extrudeLinear({ height: 2 }, poly))
+}

packages/examples/import/STLImport/index.js

@@ -1,11 +1,13 @@
 {
   "name": "svg-import",
-  "version": "0.0.1",
-  "description": "Demonstrating SVG import. Drag the SVGImport folder onto the JSCAD instance.",
+  "version": "3.0.1",
+  "description": "Demonstrating SVG import",
   "main": "index.js",
+  "type": "module",
   "keywords": [
     "jscad",
-    "cad"
+    "cad",
+    "svg"
   ],
   "author": "Simon Clark",
   "license": "MIT",

packages/examples/import/STLImport/package.json

@@ -4,6 +4,7 @@
   "description": "Example Files for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
+  "type": "module",
   "scripts": {},
   "private": true,
   "contributors": [
@@ -31,5 +32,10 @@
     "type": "opencollective",
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
+  },
+  "devDependencies": {
+    "@jscad/cli": "workspace:3.0.3-alpha.0",
+    "@jscad/modeling": "workspace:3.0.3-alpha.0",
+    "@jscad/io": "workspace:3.0.3-alpha.0"
   }
 }