@interchained/portal-cli 0.1.3 → 0.1.4

package/dist/utils/contract.d.ts

@@ -1,14 +1,14 @@
 /**
- * Load app.contract.ts from a Portal project.
- * Uses a simple regex-based extraction since we can't dynamically import TS at runtime.
- * For full evaluation, we'd use jiti/tsx — but for MVP we parse the exported object.
+ * Load app.contract from a Portal project.
+ *
+ * Supported formats (checked in order):
+ *   1. app.contract.json          — plain JSON, zero parsing ambiguity
+ *   2. app.contract.ts / .js      — static TS/JS, several export patterns handled
+ *
+ * The contract file is intentionally kept as static data (no runtime logic).
+ * We extract it with a regex rather than executing arbitrary code.
  */
 import { type AppContract } from "@interchained/portal-contract";
 export declare function findContractPath(root: string): Promise<string | null>;
-/**
- * Load a contract from a Portal project.
- * Attempts to read and evaluate the contract file.
- * Falls back to a safe empty contract if not found.
- */
 export declare function loadContract(root?: string): Promise<AppContract>;
 //# sourceMappingURL=contract.d.ts.map

package/dist/utils/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/utils/contract.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,+BAA+B,CAAC;AASnF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS3E;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,IAAI,SAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAuB7E"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/utils/contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAWnF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAM3E;AAED,wBAAsB,YAAY,CAAC,IAAI,SAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAmC7E"}

package/dist/utils/contract.js

@@ -1,14 +1,21 @@
 /**
- * Load app.contract.ts from a Portal project.
- * Uses a simple regex-based extraction since we can't dynamically import TS at runtime.
- * For full evaluation, we'd use jiti/tsx — but for MVP we parse the exported object.
+ * Load app.contract from a Portal project.
+ *
+ * Supported formats (checked in order):
+ *   1. app.contract.json          — plain JSON, zero parsing ambiguity
+ *   2. app.contract.ts / .js      — static TS/JS, several export patterns handled
+ *
+ * The contract file is intentionally kept as static data (no runtime logic).
+ * We extract it with a regex rather than executing arbitrary code.
  */
 import { readFile, access } from "node:fs/promises";
 import { join } from "node:path";
 import { validateContract } from "@interchained/portal-contract";
 const CANDIDATE_PATHS = [
+    "app.contract.json",
     "app.contract.ts",
     "app.contract.js",
+    "portal.contract.json",
     "portal.contract.ts",
     "portal.contract.js",
 ];
@@ -19,35 +26,50 @@ export async function findContractPath(root) {
             await access(full);
             return full;
         }
-        catch { /* continue */ }
+        catch { /* next */ }
     }
     return null;
 }
-/**
- * Load a contract from a Portal project.
- * Attempts to read and evaluate the contract file.
- * Falls back to a safe empty contract if not found.
- */
 export async function loadContract(root = process.cwd()) {
     const contractPath = await findContractPath(root);
-    if (!contractPath) {
+    if (!contractPath)
         return { name: "Portal App", goals: [] };
-    }
     try {
         const src = await readFile(contractPath, "utf-8");
-        // Extract the object passed to defineApp() using a simple heuristic.
-        // This is intentionally dumb — the contract file should be static data, not logic.
-        const match = src.match(/defineApp\(\s*(\{[\s\S]*?\})\s*\)/);
-        if (!match) {
-            return { name: "Portal App", goals: [] };
+        // ── JSON file ─────────────────────────────────────────────────────────────
+        if (contractPath.endsWith(".json")) {
+            return validateContract(JSON.parse(src));
         }
-        // Safe eval via Function constructor (no side effects in contract files)
-        const fn = new Function(`return (${match[1]})`);
-        const raw = fn();
-        return validateContract(raw);
+        // ── TS/JS patterns ────────────────────────────────────────────────────────
+        // We try several common shapes, in order of specificity.
+        // 1. defineApp({ ... })
+        const defineMatch = src.match(/defineApp\s*\(\s*(\{[\s\S]*?\})\s*\)/);
+        if (defineMatch)
+            return evalObject(defineMatch[1]);
+        // 2. export default { ... }   (inline object literal)
+        const exportDefaultInline = src.match(/export\s+default\s+(\{[\s\S]*\})\s*;?\s*$/);
+        if (exportDefaultInline)
+            return evalObject(exportDefaultInline[1]);
+        // 3. const <name>: AppContract = { ... }
+        const constTyped = src.match(/const\s+\w+\s*:\s*AppContract\s*=\s*(\{[\s\S]*?\});\s*$/m);
+        if (constTyped)
+            return evalObject(constTyped[1]);
+        // 4. const <name> = { ... }   (no type annotation)
+        const constPlain = src.match(/const\s+\w+\s*=\s*(\{[\s\S]*?\});\s*$/m);
+        if (constPlain)
+            return evalObject(constPlain[1]);
+        return { name: "Portal App", goals: [] };
     }
     catch {
         return { name: "Portal App", goals: [] };
     }
 }
+function evalObject(src) {
+    // Strip TypeScript casts and `as const` before evaluating
+    const cleaned = src
+        .replace(/\s+as\s+\w[\w.]*(\[\])?/g, "")
+        .replace(/\s+satisfies\s+\w[\w.]*/g, "");
+    const fn = new Function(`return (${cleaned})`);
+    return validateContract(fn());
+}
 //# sourceMappingURL=contract.js.map

package/dist/utils/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../src/utils/contract.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAW,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAoB,MAAM,+BAA+B,CAAC;AAEnF,MAAM,eAAe,GAAG;IACtB,iBAAiB;IACjB,iBAAiB;IACjB,oBAAoB;IACpB,oBAAoB;CACrB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE;IACrD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAElD,qEAAqE;QACrE,mFAAmF;QACnF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC3C,CAAC;QAED,yEAAyE;QACzE,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,EAAE,EAAa,CAAC;QAC5B,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,CAAC;AACH,CAAC"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../src/utils/contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAoB,MAAM,+BAA+B,CAAC;AAEnF,MAAM,eAAe,GAAG;IACtB,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,sBAAsB;IACtB,oBAAoB;IACpB,oBAAoB;CACrB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC;YAAC,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE;IACrD,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAE5D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAElD,6EAA6E;QAC7E,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,6EAA6E;QAC7E,yDAAyD;QAEzD,wBAAwB;QACxB,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACtE,IAAI,WAAW;YAAE,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnD,sDAAsD;QACtD,MAAM,mBAAmB,GAAG,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACnF,IAAI,mBAAmB;YAAE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnE,yCAAyC;QACzC,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QACzF,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,mDAAmD;QACnD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvE,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,0DAA0D;IAC1D,MAAM,OAAO,GAAG,GAAG;SAChB,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC;SACvC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,WAAW,OAAO,GAAG,CAAC,CAAC;IAC/C,OAAO,gBAAgB,CAAC,EAAE,EAAa,CAAC,CAAC;AAC3C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchained/portal-cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Portal CLI — dev, build, audit, improve, generate, guard",
   "license": "GPL-3.0-or-later",
   "author": "Interchained <dev@interchained.org>",