macroforge 0.1.30 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macroforge",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "TypeScript macro expansion engine powered by Rust and SWC",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,17 +10,20 @@
       "require": "./index.js",
       "default": "./index.js"
     },
-    "./result": {
-      "types": "./result.d.ts",
-      "import": "./result.mjs",
-      "require": "./result.js",
-      "default": "./result.mjs"
+    "./utils": {
+      "types": "./js/utils/index.d.ts",
+      "import": "./js/utils/index.mjs",
+      "default": "./js/utils/index.mjs"
     },
     "./serde": {
-      "types": "./serde.d.ts",
-      "import": "./serde.mjs",
-      "require": "./serde.js",
-      "default": "./serde.mjs"
+      "types": "./js/serde/index.d.ts",
+      "import": "./js/serde/index.mjs",
+      "default": "./js/serde/index.mjs"
+    },
+    "./traits": {
+      "types": "./js/traits/index.d.ts",
+      "import": "./js/traits/index.mjs",
+      "default": "./js/traits/index.mjs"
     }
   },
   "repository": {
@@ -55,29 +58,30 @@
   "files": [
     "index.d.ts",
     "index.js",
-    "result.js",
-    "result.mjs",
-    "result.d.ts",
-    "serde.js",
-    "serde.mjs",
-    "serde.d.ts"
+    "js"
   ],
   "dependencies": {
-    "@rydshift/mirror": "^0.1.2"
+    "@rydshift/mirror": "^0.1.3"
   },
   "engines": {
     "node": ">= 18"
   },
   "optionalDependencies": {
-    "@macroforge/bin-darwin-x64": "0.1.30",
-    "@macroforge/bin-darwin-arm64": "0.1.30",
-    "@macroforge/bin-linux-x64-gnu": "0.1.30",
-    "@macroforge/bin-linux-arm64-gnu": "0.1.30",
-    "@macroforge/bin-win32-x64-msvc": "0.1.30",
-    "@macroforge/bin-win32-arm64-msvc": "0.1.30"
+    "@macroforge/bin-darwin-x64": "0.1.31",
+    "@macroforge/bin-darwin-arm64": "0.1.31",
+    "@macroforge/bin-linux-x64-gnu": "0.1.31",
+    "@macroforge/bin-linux-arm64-gnu": "0.1.31",
+    "@macroforge/bin-win32-x64-msvc": "0.1.31",
+    "@macroforge/bin-win32-arm64-msvc": "0.1.31"
   },
   "scripts": {
-    "build": "bun x napi build --platform --release",
+    "build:serde": "bun build js/serde/index.ts --outfile js/serde/index.mjs && bun x tsc js/serde/index.ts --declaration --emitDeclarationOnly --outDir js/serde --lib ES2024 --skipLibCheck",
+    "build:utils": "bun build js/utils/index.ts --outfile js/utils/index.mjs --external @rydshift/mirror && bun x tsc js/utils/index.ts --declaration --emitDeclarationOnly --outDir js/utils --lib ES2024 --module ESNext --moduleResolution bundler --skipLibCheck",
+    "build:traits": "bun build js/traits/index.ts --outfile js/traits/index.mjs && bun x tsc js/traits/index.ts --declaration --emitDeclarationOnly --outDir js/traits --lib ES2024 --skipLibCheck",
+    "build:js": "npm run build:serde && npm run build:utils && npm run build:traits",
+    "build": "npm install && npm run build:js && bun x napi build --platform --release",
+    "clean": "rm -f macroforge.*.node pkg/*.node node_modules",
+    "cleanbuild": "npm run clean && npm run build",
     "artifacts": "napi artifacts --npm-dir npm"
   }
 }

package/result.d.ts

@@ -1,2 +0,0 @@
-// Re-export Result from @rydshift/mirror for use in generated code
-export { Result } from "@rydshift/mirror";

package/result.js

@@ -1,7 +0,0 @@
-// Re-export Result from @rydshift/mirror for use in generated code
-// Using CommonJS for compatibility with the rest of the package
-const mirror = require("@rydshift/mirror");
-const Result = mirror.Result;
-
-module.exports = { Result };
-module.exports.Result = Result;

package/result.mjs

@@ -1,2 +0,0 @@
-// Re-export Result from @rydshift/mirror for use in generated code (ESM)
-export { Result } from "@rydshift/mirror";

package/serde.d.ts

@@ -1,51 +0,0 @@
-/**
- * Serde runtime helpers for macroforge Serialize/Deserialize macros.
- */
-
-export interface SerializeContext {
-  /** Get the ID for an already-registered object, or undefined if not seen */
-  getId(obj: object): number | undefined;
-  /** Register an object and return its assigned ID */
-  register(obj: object): number;
-}
-
-export declare namespace SerializeContext {
-  function create(): SerializeContext;
-}
-
-export interface DeserializeContext {
-  /** Register an object with a known ID */
-  register(id: number, instance: any): void;
-  /** Get an object by ID, or return a PendingRef if not yet available */
-  getOrDefer(refId: number): any;
-  /** Assign a value to a property, deferring if it's a PendingRef */
-  assignOrDefer(target: any, prop: string | number, value: any): void;
-  /** Manually add a patch for later resolution */
-  addPatch(target: any, prop: string | number, refId: number): void;
-  /** Track an object for optional freezing */
-  trackForFreeze(obj: object): void;
-  /** Apply all deferred patches (call after deserialization is complete) */
-  applyPatches(): void;
-  /** Freeze all tracked objects (call after applyPatches if immutability is desired) */
-  freezeAll(): void;
-}
-
-export declare namespace DeserializeContext {
-  function create(): DeserializeContext;
-}
-
-/** Marker interface for forward references that need patching */
-export interface PendingRef {
-  readonly __pendingRef: true;
-  readonly id: number;
-}
-
-export declare namespace PendingRef {
-  function create(id: number): PendingRef;
-  function is(value: any): value is PendingRef;
-}
-
-export interface DeserializeOptions {
-  /** If true, freeze all deserialized objects after patching */
-  freeze?: boolean;
-}

package/serde.js

@@ -1,99 +0,0 @@
-"use strict";
-/**
- * Serde runtime helpers for macroforge Serialize/Deserialize macros.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PendingRef = exports.DeserializeContext = exports.SerializeContext = void 0;
-
-// ============================================================================
-// Serialization Context
-// ============================================================================
-
-var SerializeContext;
-(function (SerializeContext) {
-    function create() {
-        const ids = new WeakMap();
-        let nextId = 0;
-        return {
-            getId: (obj) => ids.get(obj),
-            register: (obj) => {
-                const id = nextId++;
-                ids.set(obj, id);
-                return id;
-            },
-        };
-    }
-    SerializeContext.create = create;
-})(SerializeContext || (exports.SerializeContext = SerializeContext = {}));
-
-// ============================================================================
-// Deserialization Context
-// ============================================================================
-
-var DeserializeContext;
-(function (DeserializeContext) {
-    function create() {
-        const registry = new Map();
-        const patches = [];
-        const toFreeze = [];
-        return {
-            register: (id, instance) => {
-                registry.set(id, instance);
-            },
-            getOrDefer: (refId) => {
-                if (registry.has(refId)) {
-                    return registry.get(refId);
-                }
-                return PendingRef.create(refId);
-            },
-            assignOrDefer: (target, prop, value) => {
-                if (PendingRef.is(value)) {
-                    target[prop] = null;
-                    patches.push({ target, prop, refId: value.id });
-                }
-                else {
-                    target[prop] = value;
-                }
-            },
-            addPatch: (target, prop, refId) => {
-                patches.push({ target, prop, refId });
-            },
-            trackForFreeze: (obj) => {
-                toFreeze.push(obj);
-            },
-            applyPatches: () => {
-                for (const { target, prop, refId } of patches) {
-                    if (!registry.has(refId)) {
-                        throw new Error(`Unresolved reference: __ref ${refId}`);
-                    }
-                    target[prop] = registry.get(refId);
-                }
-            },
-            freezeAll: () => {
-                for (const obj of toFreeze) {
-                    Object.freeze(obj);
-                }
-            },
-        };
-    }
-    DeserializeContext.create = create;
-})(DeserializeContext || (exports.DeserializeContext = DeserializeContext = {}));
-
-// ============================================================================
-// Pending Reference Marker
-// ============================================================================
-
-var PendingRef;
-(function (PendingRef) {
-    function create(id) {
-        return { __pendingRef: true, id };
-    }
-    PendingRef.create = create;
-    function is(value) {
-        return (value !== null &&
-            typeof value === "object" &&
-            value.__pendingRef === true &&
-            typeof value.id === "number");
-    }
-    PendingRef.is = is;
-})(PendingRef || (exports.PendingRef = PendingRef = {}));