adjusted node examples

Author: matas-bitbybit-dev

examples/node/basic/index.ts

@@ -1,12 +1,26 @@
-import initOpenCascade from "@bitbybit-dev/occt/bitbybit-dev-occt/node.js";
+import { createRequire } from "module";
+import initOpenCascade from "@bitbybit-dev/occt/bitbybit-dev-occt/index.js";
 import { OCCTWire } from "@bitbybit-dev/occt/lib/services/shapes/wire.js";
 import { OccHelper } from "@bitbybit-dev/occt/lib/occ-helper.js";
 import { VectorHelperService } from "@bitbybit-dev/occt/lib/api/vector-helper.service.js";
 import { ShapesHelperService } from "@bitbybit-dev/occt/lib/api/shapes-helper.service.js";
 
+const require = createRequire(import.meta.url);
+
 async function run() {
     console.log("initializing...");
-    const occ = await initOpenCascade();
+    
+    // For Node.js, we need to specify the path to the WASM file
+    const wasmPath = require.resolve("@bitbybit-dev/occt/bitbybit-dev-occt/bitbybit-dev-occt.5e93f201.wasm");
+    
+    const occ = await initOpenCascade({
+        locateFile: (path: string) => {
+            if (path.endsWith(".wasm")) {
+                return wasmPath;
+            }
+            return path;
+        }
+    });
 
     const vecHelper = new VectorHelperService();
     const shapesHelper = new ShapesHelperService();

examples/node/basic/package.json

@@ -15,13 +15,13 @@
         "node": ">=20.19.4"
     },
     "dependencies": {
-        "@bitbybit-dev/occt": "^1.0.0-rc.0"
+        "@bitbybit-dev/occt": "^1.0.0"
     },
     "devDependencies": {
         "extensionless": "1.9.9",
         "concurrently": "^7.6.0",
         "nodemon": "^2.0.20",
-        "typescript": "^4.9.4"
+        "typescript": "~5.8.0"
     },
     "extensionless": {
         "lookFor": [

examples/node/basic/tsconfig.json

@@ -1,14 +1,16 @@
 {
     "compilerOptions": {
-        "target": "es2016",
-        "module": "nodenext",
+        "target": "ES2022",
+        "module": "NodeNext",
+        "moduleResolution": "NodeNext",
         "outDir": "./dist",
         "esModuleInterop": true,
-        "forceConsistentCasingInFileNames": true,
         "strict": true,
-        "skipLibCheck": true
+        "skipLibCheck": true,
+        "declaration": false,
+        "sourceMap": true
     },
     "include": [
-        "./"
+        "./*.ts"
     ]
 }

examples/node/express-app/bitbybit.ts

@@ -1,64 +1,34 @@
-import { MathBitByBit, Logic, Lists, TextBitByBit, Vector, Point, Transforms, Color, GeometryHelper, Line, Polyline } from "@bitbybit-dev/base";
-import { JSONBitByBit, CSVBitByBit, Verb } from "@bitbybit-dev/core";
-import { Jscad } from "@bitbybit-dev/jscad";
-import { ManifoldService } from "@bitbybit-dev/manifold";
-import { OCCTService, OccHelper, VectorHelperService, ShapesHelperService } from "@bitbybit-dev/occt";
-import Module from "manifold-3d";
-import { JSONPath } from "jsonpath-plus";
-import initOpenCascade from "@bitbybit-dev/occt/bitbybit-dev-occt/node.js";
-import * as vrb from "verb-nurbs-web";
+import { createRequire } from "module";
+import { OCCTService } from "@bitbybit-dev/occt/lib/occ-service.js";
+import { OccHelper } from "@bitbybit-dev/occt/lib/occ-helper.js";
+import { VectorHelperService } from "@bitbybit-dev/occt/lib/api/vector-helper.service.js";
+import { ShapesHelperService } from "@bitbybit-dev/occt/lib/api/shapes-helper.service.js";
+import initOpenCascade from "@bitbybit-dev/occt/bitbybit-dev-occt/index.js";
+
+const require = createRequire(import.meta.url);
 
 export class BitByBitBase {
-    public math: MathBitByBit;
-    public logic: Logic;
-    public lists: Lists;
-    public json: JSONBitByBit;
-    public csv: CSVBitByBit;
-    public vector: Vector;
-    public point: Point;
-    public line: Line;
-    public transforms: Transforms;
-    public polyline: Polyline;
-    public verb: Verb;
-    public jscad: Jscad;
-    public manifold: ManifoldService;
-    public text: TextBitByBit;
-    public occt: OCCTService;
-    public color: Color;
+    public occt!: OCCTService;
 
     constructor() {
     }
 
     async init() {
-        const occ = await initOpenCascade();
-        const s = await import("@bitbybit-dev/jscad/jscad-generated.js");
-        const jscad = s.default();
-        this.jscad = new Jscad(jscad);
-        const wasm = await Module({
-            locateFile: () => {
-                return "./manifold-3-3-2.wasm";
-            },
+        // For Node.js, we need to specify the path to the WASM file
+        const wasmPath = require.resolve("@bitbybit-dev/occt/bitbybit-dev-occt/bitbybit-dev-occt.5e93f201.wasm");
+        
+        const occ = await initOpenCascade({
+            locateFile: (path: string) => {
+                if (path.endsWith(".wasm")) {
+                    return wasmPath;
+                }
+                return path;
+            }
         });
-        wasm.setup();
-        this.manifold = new ManifoldService(wasm);
-        const geometryHelper = new GeometryHelper();
-        this.math = new MathBitByBit();
-        this.lists = new Lists();
-        this.vector = new Vector(this.math, geometryHelper);
-        this.color = new Color(this.math);
-        this.transforms = new Transforms(this.vector, this.math);
-        this.point = new Point(geometryHelper, this.transforms, this.vector, this.lists);
-        const verb = { geom: vrb.geom, core: vrb.core };
-        this.verb = new Verb({ verb } as any, geometryHelper, this.math);
-        this.line = new Line(this.vector, this.point, geometryHelper);
-        this.polyline = new Polyline(this.vector, this.point, this.line, geometryHelper);
+
         const vecHelper = new VectorHelperService();
         const shapesHelper = new ShapesHelperService();
         const occHelper = new OccHelper(vecHelper, shapesHelper, occ);
         this.occt = new OCCTService(occ, occHelper);
-        this.logic = new Logic();
-        this.json = new JSONBitByBit({ jsonpath: JSONPath } as any);
-        this.csv = new CSVBitByBit();
-        this.text = new TextBitByBit(this.point);
     }
 }

examples/node/express-app/index.ts

@@ -1,6 +1,6 @@
 import express, { Express, Request, Response } from "express";
 import dotenv from "dotenv";
-import { BitByBitBase } from "./bitbybit";
+import { BitByBitBase } from "./bitbybit.js";
 
 const bitbybit = new BitByBitBase();