fluidcad 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluidcad",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Parametric CAD modeling library using javascript",
   "author": "Marwan Aouida <contact@marwan.dev>",
   "homepage": "https://fluidcad.io",
@@ -36,7 +36,8 @@
     "./core": "./lib/dist/core/index.js",
     "./filters": "./lib/dist/filters/index.js",
     "./constraints": "./lib/dist/features/2d/constraints/geometry-qualifier.js",
-    "./server": "./server/dist/index.js"
+    "./server": "./server/dist/index.js",
+    "./math": "./lib/dist/math/index.js"
   },
   "scripts": {
     "clean": "rm -rf lib/dist server/dist ui/dist lib/tsconfig.tsbuildinfo server/tsconfig.tsbuildinfo",

package/server/dist/fluidcad-server.js

@@ -1,6 +1,7 @@
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { ViteManager } from "./vite-manager.js";
+import { normalizePath } from "./normalize-path.js";
 export class FluidCadServer {
     viteManager = new ViteManager();
     sceneManager;
@@ -9,7 +10,7 @@ export class FluidCadServer {
     currentFileName = '';
     async init(workspacePath) {
         await this.viteManager.init(workspacePath);
-        const initFilePath = join(workspacePath, 'init.js');
+        const initFilePath = normalizePath(join(workspacePath, 'init.js'));
         if (existsSync(initFilePath)) {
             const { default: _sceneManager } = await this.viteManager.loadModule(initFilePath);
             this.sceneManager = await _sceneManager;
@@ -19,7 +20,7 @@ export class FluidCadServer {
         if (!this.sceneManager) {
             return null;
         }
-        const normalizedFileName = filePath.replace('virtual:live-render:', '');
+        const normalizedFileName = normalizePath(filePath.replace('virtual:live-render:', ''));
         this.currentFileName = normalizedFileName;
         if (!ignoreCache) {
             const fromCache = this.renderingCache.get(normalizedFileName);

package/server/dist/index.js

@@ -8,8 +8,9 @@ import { createPropertiesRouter } from "./routes/properties.js";
 import { createActionsRouter } from "./routes/actions.js";
 import { createExportRouter } from "./routes/export.js";
 import { createScreenshotRouter } from "./routes/screenshot.js";
+import { normalizePath } from "./normalize-path.js";
 const PORT = parseInt(process.env.FLUIDCAD_SERVER_PORT || '3100', 10);
-const WORKSPACE_PATH = process.env.FLUIDCAD_WORKSPACE_PATH || '';
+const WORKSPACE_PATH = normalizePath(process.env.FLUIDCAD_WORKSPACE_PATH || '');
 const UI_DIST = path.resolve(import.meta.dirname, '../../ui/dist');
 // ---------------------------------------------------------------------------
 // IPC helpers — communication with extension host process

package/server/dist/normalize-path.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Normalize a file path to use forward slashes.
+ * No-op on Unix. On Windows, converts backslashes to forward slashes
+ * to match Vite's internal module graph keying.
+ */
+export declare function normalizePath(p: string): string;

package/server/dist/normalize-path.js

@@ -0,0 +1,8 @@
+/**
+ * Normalize a file path to use forward slashes.
+ * No-op on Unix. On Windows, converts backslashes to forward slashes
+ * to match Vite's internal module graph keying.
+ */
+export function normalizePath(p) {
+    return p.replace(/\\/g, '/');
+}

package/server/dist/vite-manager.js

@@ -1,5 +1,6 @@
 import { createServer } from 'vite';
 import { dirname, resolve, isAbsolute } from 'path';
+import { normalizePath } from "./normalize-path.js";
 const BLOCKED_NODE_MODULES = new Set([
     'fs',
     'child_process',
@@ -42,7 +43,7 @@ export class ViteManager {
     rootPath = '';
     buffers = new Map();
     async init(rootPath) {
-        this.rootPath = rootPath;
+        this.rootPath = normalizePath(rootPath);
         const that = this;
         this.server = await createServer({
             root: rootPath,
@@ -66,7 +67,7 @@ export class ViteManager {
                         // Resolve relative imports from virtual modules against the real file path
                         if (importer && importer.startsWith('virtual:live-render:') && !isAbsolute(id)) {
                             const realImporter = importer.replace('virtual:live-render:', '');
-                            return resolve(dirname(realImporter), id);
+                            return normalizePath(resolve(dirname(realImporter), id));
                         }
                     },
                     transform(code, id) {

package/lib/dist/core/2d/wire.d.ts

@@ -1,11 +0,0 @@
-import { PlaneLike } from "../../math/plane.js";
-import { IExtrudableGeometry, IGeometry, ISceneObject } from "../interfaces.js";
-interface WireFunction {
-    /**
-     * Groups geometry segments into a closed wire for extrusion.
-     * @param args - The geometry segments to group, optionally ending with a target plane
-     */
-    (...args: (IGeometry | PlaneLike | ISceneObject)[]): IExtrudableGeometry;
-}
-declare const _default: WireFunction;
-export default _default;

package/lib/dist/core/2d/wire.js

@@ -1,29 +0,0 @@
-import { GeometrySceneObject } from "../../features/2d/geometry.js";
-import { WireObject } from "../../features/2d/wire.js";
-import { registerBuilder } from "../../index.js";
-import { isPlaneLike } from "../../math/plane.js";
-import { SceneObject } from "../../common/scene-object.js";
-import { resolvePlane } from "../../helpers/resolve.js";
-function build(context) {
-    return function wire() {
-        let planeObj = null;
-        let argCount = arguments.length;
-        // Check if last argument is a plane
-        if (argCount > 0) {
-            const lastArg = arguments[argCount - 1];
-            if (isPlaneLike(lastArg) || (lastArg instanceof SceneObject && !(lastArg instanceof GeometrySceneObject))) {
-                planeObj = resolvePlane(lastArg, context);
-                argCount--;
-            }
-        }
-        // Collect target objects from arguments
-        let targetObjects = [];
-        for (let i = 0; i < argCount; i++) {
-            targetObjects.push(arguments[i]);
-        }
-        const path = new WireObject(targetObjects.length > 0 ? targetObjects : null, planeObj);
-        context.addSceneObject(path);
-        return path;
-    };
-}
-export default registerBuilder(build);

package/lib/dist/features/2d/wire.d.ts

@@ -1,12 +0,0 @@
-import { GeometrySceneObject } from "./geometry.js";
-import { PlaneObjectBase } from "../plane-renderable-base.js";
-import { ExtrudableGeometryBase } from "./extrudable-base.js";
-export declare class WireObject extends ExtrudableGeometryBase {
-    private geometries;
-    constructor(geometries: GeometrySceneObject[] | null, targetPlane?: PlaneObjectBase);
-    build(): void;
-    compareTo(other: WireObject): boolean;
-    getType(): string;
-    getUniqueType(): string;
-    serialize(): {};
-}

package/lib/dist/features/2d/wire.js

@@ -1,76 +0,0 @@
-import { Edge } from "../../common/edge.js";
-import { WireOps } from "../../oc/wire-ops.js";
-import { ExtrudableGeometryBase } from "./extrudable-base.js";
-import { Wire } from "../../common/wire.js";
-export class WireObject extends ExtrudableGeometryBase {
-    geometries;
-    constructor(geometries, targetPlane = null) {
-        super(targetPlane);
-        this.geometries = geometries;
-    }
-    build() {
-        const sources = this.geometries ?? this.sketch.getPreviousSiblings(this);
-        const allEdges = [];
-        for (const obj of sources) {
-            const shapes = obj.getShapes();
-            for (const shape of shapes) {
-                if (shape instanceof Edge) {
-                    allEdges.push(shape);
-                    obj.removeShape(shape, this);
-                }
-                else if (shape instanceof Wire) {
-                    const edges = shape.getEdges();
-                    allEdges.push(...edges);
-                    obj.removeShape(shape, this);
-                }
-            }
-        }
-        const groups = WireOps.groupConnectedEdges(allEdges);
-        for (const group of groups) {
-            const wire = WireOps.makeWireFromEdges(group);
-            this.addShape(wire);
-        }
-        if (this.targetPlane) {
-            this.targetPlane.removeShapes(this);
-        }
-    }
-    compareTo(other) {
-        if (!(other instanceof WireObject)) {
-            return false;
-        }
-        if (!super.compareTo(other)) {
-            return false;
-        }
-        if (this.targetPlane?.constructor !== other.targetPlane?.constructor) {
-            return false;
-        }
-        if (this.targetPlane && other.targetPlane && !this.targetPlane.compareTo(other.targetPlane)) {
-            return false;
-        }
-        const thisGeometries = this.geometries || [];
-        const otherGeometries = other.geometries || [];
-        if (thisGeometries.length !== otherGeometries.length) {
-            return false;
-        }
-        for (let i = 0; i < thisGeometries.length; i++) {
-            const thisGeo = thisGeometries[i];
-            const otherGeo = otherGeometries[i];
-            if (thisGeo.getUniqueType() !== otherGeo.getUniqueType()) {
-                return false;
-            }
-            if (!thisGeo.compareTo(otherGeo)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    getType() {
-        return 'wire';
-    }
-    getUniqueType() {
-        return 'wire';
-    }
-    serialize() {
-        return {};
-    }
-}