@react-scad/core 0.1.19 → 0.1.20

package/dist/log.d.ts

@@ -11,5 +11,6 @@ export declare const log: {
     progress(msg: string): void;
     complete(ms: number): void;
     outputPath(path: string): void;
+    fileSize(bytes: number): void;
     stop(): void;
 };

package/dist/log.js

@@ -16,6 +16,11 @@ const PAD = "  ";
 function line(msg) {
     console.log(msg);
 }
+function formatSize(bytes) {
+    if (bytes >= 1024)
+        return `${(bytes / 1024).toFixed(2)} kB`;
+    return `${bytes} B`;
+}
 export const log = {
     banner() {
         line(`${PAD}${c.cyan("◆")} ${c.bold(TOOL_NAME)} ${c.dim(VERSION)}  ${c.dim("-")} ${c.dim("Ctrl+C to exit")}`);
@@ -24,11 +29,15 @@ export const log = {
         line(`${PAD}${c.dim("○")} ${c.dim(msg)}`);
     },
     complete(ms) {
-        line(`${PAD}${c.green("✓")} ${c.dim("Built")} ${c.dim(`in ${ms}ms`)}`);
+        const sec = (ms / 1000).toFixed(2);
+        line(`${PAD}${c.green("✓")} ${c.green("Done")} ${c.dim(`in ${sec}s`)}`);
     },
     outputPath(path) {
         line(`${PAD}${c.dim("→")} ${c.cyan(path)}`);
     },
+    fileSize(bytes) {
+        line(`${PAD}${c.dim("+")} ${c.dim(formatSize(bytes))}`);
+    },
     stop() {
         line(`${PAD}${c.dim("Stopped.")}`);
     },

package/dist/primitives/circle.js

@@ -1,11 +1,12 @@
 import * as React from "react";
+import { formatScadExpr } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const Circle = (props) => React.createElement(Primitive, { ...props, type: "circle" });
 Circle.displayName = "Circle";
 export function serialize(node, _indent, _ctx) {
     const rVal = node.r ?? 1;
     const dVal = node.d;
-    let args = dVal != null ? `d = ${String(dVal)}` : `r = ${String(rVal)}`;
+    let args = dVal != null ? `d = ${formatScadExpr(dVal)}` : `r = ${formatScadExpr(rVal)}`;
     if (node.$fn != null)
         args += `, $fn = ${node.$fn}`;
     return `circle(${args});`;

package/dist/primitives/cube.js

@@ -1,11 +1,11 @@
 import * as React from "react";
-import { formatVec3 } from "../utils.js";
+import { formatScadExpr, formatVec3 } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const Cube = (props) => React.createElement(Primitive, { ...props, type: "cube" });
 Cube.displayName = "Cube";
 export function serialize(node, _indent, _ctx) {
     const s = typeof node.size === "number"
-        ? String(node.size)
+        ? formatScadExpr(node.size)
         : typeof node.size === "string"
             ? node.size
             : formatVec3(node.size);

package/dist/primitives/cylinder.js

@@ -1,9 +1,10 @@
 import * as React from "react";
+import { formatScadExpr } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const Cylinder = (props) => React.createElement(Primitive, { ...props, type: "cylinder" });
 Cylinder.displayName = "Cylinder";
 export function serialize(node, _indent, _ctx) {
-    let args = `h = ${String(node.h)}, r1 = ${String(node.r1)}, r2 = ${String(node.r2)}`;
+    let args = `h = ${formatScadExpr(node.h)}, r1 = ${formatScadExpr(node.r1)}, r2 = ${formatScadExpr(node.r2)}`;
     if (node.$fn != null)
         args += `, $fn = ${node.$fn}`;
     return `cylinder(${args});`;

package/dist/primitives/linear-extrude.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { formatVec2 } from "../utils.js";
+import { formatScadExpr, formatVec2 } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const LinearExtrude = (props) => React.createElement(Primitive, { ...props, type: "linear_extrude" });
 LinearExtrude.displayName = "LinearExtrude";
@@ -7,15 +7,15 @@ function formatScale(scale) {
     if (scale == null)
         return undefined;
     if (typeof scale === "number" || typeof scale === "string")
-        return String(scale);
+        return formatScadExpr(scale);
     return formatVec2(scale);
 }
 export function serialize(node, indent, ctx) {
-    const parts = [`height = ${String(node.height)}`];
+    const parts = [`height = ${formatScadExpr(node.height)}`];
     if (node.center === true)
         parts.push("center = true");
     if (node.twist != null)
-        parts.push(`twist = ${String(node.twist)}`);
+        parts.push(`twist = ${formatScadExpr(node.twist)}`);
     const scaleStr = formatScale(node.scale);
     if (scaleStr != null)
         parts.push(`scale = ${scaleStr}`);

package/dist/primitives/rotate-extrude.js

@@ -1,11 +1,12 @@
 import * as React from "react";
+import { formatScadExpr } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const RotateExtrude = (props) => React.createElement(Primitive, { ...props, type: "rotate_extrude" });
 RotateExtrude.displayName = "RotateExtrude";
 export function serialize(node, indent, ctx) {
     const parts = [];
     if (node.angle != null)
-        parts.push(`angle = ${String(node.angle)}`);
+        parts.push(`angle = ${formatScadExpr(node.angle)}`);
     if (node.convexity != null)
         parts.push(`convexity = ${node.convexity}`);
     if (node.$fn != null)

package/dist/primitives/sphere.js

@@ -1,11 +1,12 @@
 import * as React from "react";
+import { formatScadExpr } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const Sphere = (props) => React.createElement(Primitive, { ...props, type: "sphere" });
 Sphere.displayName = "Sphere";
 export function serialize(node, _indent, _ctx) {
     const rVal = node.r ?? 1;
     const dVal = node.d;
-    let args = dVal != null ? `d = ${String(dVal)}` : `r = ${String(rVal)}`;
+    let args = dVal != null ? `d = ${formatScadExpr(dVal)}` : `r = ${formatScadExpr(rVal)}`;
     if (node.$fn != null)
         args += `, $fn = ${node.$fn}`;
     return `sphere(${args});`;

package/dist/primitives/square.js

@@ -1,11 +1,11 @@
 import * as React from "react";
-import { formatVec2 } from "../utils.js";
+import { formatScadExpr, formatVec2 } from "../utils.js";
 import { Primitive } from "./primitive.js";
 export const Square = (props) => React.createElement(Primitive, { ...props, type: "square" });
 Square.displayName = "Square";
 export function serialize(node, _indent, _ctx) {
     const s = typeof node.size === "number"
-        ? String(node.size)
+        ? formatScadExpr(node.size)
         : typeof node.size === "string"
             ? node.size
             : formatVec2(node.size);

package/dist/runtime/root.js

@@ -27,6 +27,7 @@ export function createRoot(path) {
             log.complete(Date.now() - start);
             if (path) {
                 log.outputPath(resolve(path));
+                log.fileSize(Buffer.byteLength(toScad(container), "utf8"));
             }
         },
         toScad() {

package/dist/serialize/index.js

@@ -76,6 +76,8 @@ export function toScad(container) {
     const ctx = {
         serializeNode: (n, i) => serializeNode(n, i, ctx),
     };
-    const body = container.children.map((n) => serializeNode(n, "", ctx)).join("\n\n");
+    const body = container.children
+        .map((n) => serializeNode(n, "", ctx))
+        .join("\n\n");
     return body ? `${CREDIT}\n\n${body}` : CREDIT;
 }

package/dist/utils.d.ts

@@ -1,4 +1,6 @@
-import type { Vec2, Vec3 } from "./types.js";
+import type { ScadExpr, Vec2, Vec3 } from "./types.js";
+export declare function formatNumber(n: number): string;
+export declare function formatScadExpr(x: ScadExpr): string;
 export declare function formatVec2(v: Vec2): string;
 export declare function formatVec3(v: Vec3): string;
 export declare function formatPoints2D(points: [number, number][]): string;

package/dist/utils.js

@@ -1,19 +1,28 @@
+export function formatNumber(n) {
+    if (Number.isInteger(n))
+        return String(n);
+    const s = n.toFixed(6);
+    return s.replace(/\.?0+$/, "");
+}
+export function formatScadExpr(x) {
+    return typeof x === "number" ? formatNumber(x) : x;
+}
 export function formatVec2(v) {
     if (typeof v === "number" || typeof v === "string")
-        return String(v);
-    return `[${String(v[0])}, ${String(v[1])}]`;
+        return formatScadExpr(v);
+    return `[${formatScadExpr(v[0])}, ${formatScadExpr(v[1])}]`;
 }
 export function formatVec3(v) {
     if (typeof v === "number" || typeof v === "string")
-        return String(v);
-    return `[${String(v[0])}, ${String(v[1])}, ${String(v[2])}]`;
+        return formatScadExpr(v);
+    return `[${formatScadExpr(v[0])}, ${formatScadExpr(v[1])}, ${formatScadExpr(v[2])}]`;
 }
 export function formatPoints2D(points) {
-    return `[${points.map((p) => `[${p[0]}, ${p[1]}]`).join(", ")}]`;
+    return `[${points.map((p) => `[${formatNumber(p[0])}, ${formatNumber(p[1])}]`).join(", ")}]`;
 }
 export function formatPoints3D(points) {
-    return `[${points.map((p) => `[${p[0]}, ${p[1]}, ${p[2]}]`).join(", ")}]`;
+    return `[${points.map((p) => `[${formatNumber(p[0])}, ${formatNumber(p[1])}, ${formatNumber(p[2])}]`).join(", ")}]`;
 }
 export function formatFaces(faces) {
-    return `[${faces.map((f) => `[${f.join(", ")}]`).join(", ")}]`;
+    return `[${faces.map((f) => `[${f.map(formatNumber).join(", ")}]`).join(", ")}]`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-scad/core",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Render JSX to OpenSCAD models using the React reconciler",
   "keywords": [
     "react",