rastack 0.0.16 → 0.0.20

package/src/entity-generation/update-method.ts

@@ -1,38 +1,38 @@
-import { capitaliseFirstLetter } from "../schema/capitalise-first-letter";
-
-export function generateUpdateAPIMethod(
-  url: string,
-  method: string,
-  operationId: string,
-  requestBody: string | undefined,
-  responseBody: string | undefined,
-  listQueryCacheKey?: string,
-  itemQueryCacheKey?: string,
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const paramNames = `I${operationIdUpper}Params`;
-
-  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
-  urlStructure = `(params) => \`${urlStructure}\``;
-
-  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
-  const importStatements = new Set<string>();
-  importStatements.add(paramNames ?? "");
-  importStatements.add(requestBody ?? "");
-  importStatements.add(responseBody ?? "");
-
-  const cacheKeyLines = [
-    listQueryCacheKey ? `\n    listQueryCacheKey: ${listQueryCacheKey},` : "",
-    itemQueryCacheKey ? `\n    itemQueryCacheKey: ${itemQueryCacheKey},` : "",
-  ].join("");
-
-  return [
-    `
-export function use${methodUpper}${operationIdUpper}() {
-  return useUpdateQuery<${paramNames}, ${requestBody}, ${responseBody}>({
-    ${method}Url: ${urlStructure},${cacheKeyLines}
-  });
-}`,
-    importStatements,
-  ];
-}
+import { capitaliseFirstLetter } from "../schema/capitalise-first-letter";
+
+export function generateUpdateAPIMethod(
+  url: string,
+  method: string,
+  operationId: string,
+  requestBody: string | undefined,
+  responseBody: string | undefined,
+  listQueryCacheKey?: string,
+  itemQueryCacheKey?: string,
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const paramNames = `I${operationIdUpper}Params`;
+
+  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
+  urlStructure = `(params) => \`${urlStructure}\``;
+
+  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
+  const importStatements = new Set<string>();
+  importStatements.add(paramNames ?? "");
+  importStatements.add(requestBody ?? "");
+  importStatements.add(responseBody ?? "");
+
+  const cacheKeyLines = [
+    listQueryCacheKey ? `\n    listQueryCacheKey: ${listQueryCacheKey},` : "",
+    itemQueryCacheKey ? `\n    itemQueryCacheKey: ${itemQueryCacheKey},` : "",
+  ].join("");
+
+  return [
+    `
+export function use${methodUpper}${operationIdUpper}() {
+  return useUpdateQuery<${paramNames}, ${requestBody}, ${responseBody}>({
+    ${method}Url: ${urlStructure},${cacheKeyLines}
+  });
+}`,
+    importStatements,
+  ];
+}

package/src/index.ts

@@ -1,77 +1,77 @@
-#!/usr/bin/env node
-
-import path from "path";
-import fs from "fs";
-import { execSync } from "child_process";
-
-const args = process.argv.slice(2);
-const schemaOnly = args.includes("--schema-only");
-
-const currentDir = process.cwd(); // Get the current working directory
-const kodeDir = path.join(currentDir, ".kode");
-const configFile = path.join(kodeDir, "generate-rad-sdk.json");
-let config: any = {};
-
-// Create the .kode directory if it doesn't exist
-if (!fs.existsSync(kodeDir)) {
-  fs.mkdirSync(kodeDir);
-}
-
-// If the generate-schema-sdk-config.json file doesn't exist, create it with default values
-if (!fs.existsSync(configFile)) {
-  config = {
-    schemaUrl: "http://127.0.0.1:8000/api/schema/",
-  };
-  fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
-} else {
-  config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
-}
-
-const projectPath = currentDir;
-const schemaUrl = config.schemaUrl;
-
-// Execute the script commands and print the output
-const schemaFetchOutput = execSync(
-  `node ${__dirname}/schema-fetch.js ${schemaUrl} ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(schemaFetchOutput);
-
-const schemaConvertOutput = execSync(
-  `node ${__dirname}/schema-convert.js ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(schemaConvertOutput);
-
-process.chdir(`${projectPath}/packages/schema/schema/api-schema`);
-const schemaFullOutput = execSync(
-  `node ${__dirname}/schema-full.js ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(schemaFullOutput);
-
-process.chdir(__dirname);
-const schemaParamsOutput = execSync(
-  `node ${__dirname}/schema-params.js ${schemaUrl} ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(schemaParamsOutput);
-
-const schemaIndexOutput = execSync(
-  `node ${__dirname}/schema-index.js ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(schemaIndexOutput);
-
-if (!schemaOnly) {
-  // Generate entities if --schema-only flag is not provided
-  const schemaEntitiesOutput = execSync(
-    `node ${__dirname}/schema-entities.js ${schemaUrl} ${projectPath}/packages/entities/`,
-  ).toString();
-  console.log(schemaEntitiesOutput);
-}
-
-const prettierSchemaOutput = execSync(
-  `${projectPath}/node_modules/.bin/prettier --write --config .prettierrc ${projectPath}/packages/schema/schema/`,
-).toString();
-console.log(prettierSchemaOutput);
-
-const prettierEntitiesOutput = execSync(
-  `${projectPath}/node_modules/.bin/prettier --write --config .prettierrc ${projectPath}/packages/entities/`,
-).toString();
-console.log(prettierEntitiesOutput);
+#!/usr/bin/env node
+
+import path from "path";
+import fs from "fs";
+import { execSync } from "child_process";
+
+const args = process.argv.slice(2);
+const schemaOnly = args.includes("--schema-only");
+
+const currentDir = process.cwd(); // Get the current working directory
+const kodeDir = path.join(currentDir, ".kode");
+const configFile = path.join(kodeDir, "generate-rad-sdk.json");
+let config: any = {};
+
+// Create the .kode directory if it doesn't exist
+if (!fs.existsSync(kodeDir)) {
+  fs.mkdirSync(kodeDir);
+}
+
+// If the generate-schema-sdk-config.json file doesn't exist, create it with default values
+if (!fs.existsSync(configFile)) {
+  config = {
+    schemaUrl: "http://127.0.0.1:8000/api/schema/",
+  };
+  fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
+} else {
+  config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
+}
+
+const projectPath = currentDir;
+const schemaUrl = config.schemaUrl;
+
+// Execute the script commands and print the output
+const schemaFetchOutput = execSync(
+  `node ${__dirname}/schema-fetch.js ${schemaUrl} ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(schemaFetchOutput);
+
+const schemaConvertOutput = execSync(
+  `node ${__dirname}/schema-convert.js ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(schemaConvertOutput);
+
+process.chdir(`${projectPath}/packages/schema/schema/api-schema`);
+const schemaFullOutput = execSync(
+  `node ${__dirname}/schema-full.js ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(schemaFullOutput);
+
+process.chdir(__dirname);
+const schemaParamsOutput = execSync(
+  `node ${__dirname}/schema-params.js ${schemaUrl} ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(schemaParamsOutput);
+
+const schemaIndexOutput = execSync(
+  `node ${__dirname}/schema-index.js ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(schemaIndexOutput);
+
+if (!schemaOnly) {
+  // Generate entities if --schema-only flag is not provided
+  const schemaEntitiesOutput = execSync(
+    `node ${__dirname}/schema-entities.js ${schemaUrl} ${projectPath}/packages/entities/`,
+  ).toString();
+  console.log(schemaEntitiesOutput);
+}
+
+const prettierSchemaOutput = execSync(
+  `${projectPath}/node_modules/.bin/prettier --write --config .prettierrc ${projectPath}/packages/schema/schema/`,
+).toString();
+console.log(prettierSchemaOutput);
+
+const prettierEntitiesOutput = execSync(
+  `${projectPath}/node_modules/.bin/prettier --write --config .prettierrc ${projectPath}/packages/entities/`,
+).toString();
+console.log(prettierEntitiesOutput);

package/src/rad-compile.ts

@@ -1,88 +1,88 @@
-#!/usr/bin/env node
-
-/**
- * `rad compile | check | list | urls` — the TypeScript-first replacement for the
- * old Django `manage.py rastack` command.
- *
- *   rad compile [resourcesDir] [outDir]   defs → schema.rad.json + openapi.json
- *   rad check   [resourcesDir]            validate the resource graph (exit != 0 on error)
- *   rad list    [resourcesDir]            print every resource + its fields/relations
- *   rad urls    [resourcesDir]            print the generated /api/{app}/v1/{model}/ routes
- */
-
-import { analyzeResources, collisions, compile, urlsFor } from "./compile";
-
-const DEFAULT_RESOURCES = "resources";
-const DEFAULT_OUT = ".rad";
-
-function main(argv: string[]): void {
-  const [sub, ...rest] = argv;
-
-  switch (sub) {
-    case "compile": {
-      const resourcesDir = rest[0] || DEFAULT_RESOURCES;
-      const outDir = rest[1] || DEFAULT_OUT;
-      const result = compile(resourcesDir, outDir);
-      console.log(
-        `✓ compiled ${result.manifest.resources.length} resource(s) → ${result.files.join(", ")}`,
-      );
-      break;
-    }
-    case "check": {
-      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
-      const errors = collisions(resources);
-      if (errors.length) {
-        for (const e of errors) console.error(`  ✗ ${e}`);
-        console.error(`${errors.length} error(s) found.`);
-        process.exit(1);
-      }
-      console.log(`✓ ${resources.length} resource(s): no collisions.`);
-      break;
-    }
-    case "list": {
-      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
-      if (!resources.length) {
-        console.log("No resources found.");
-        break;
-      }
-      for (const r of resources) {
-        console.log(`${r.app}.${r.model}`);
-        for (const f of r.fields) {
-          const rel = f.relation ? ` → ${f.relation.app}.${f.relation.model}` : "";
-          console.log(`  ${f.name}: ${f.type}${rel}`);
-        }
-        if (r.sync) {
-          const flags = [
-            r.sync.mode,
-            r.sync.load === "lazy" ? "lazy" : "",
-            r.sync.clientIds ? "client-ids" : "",
-            r.sync.confirmed ? `confirmed: ${r.sync.confirmed.join(",")}` : "",
-          ]
-            .filter(Boolean)
-            .join(", ");
-          console.log(`  sync: ${flags}`);
-        }
-      }
-      break;
-    }
-    case "urls": {
-      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
-      for (const url of urlsFor(resources)) console.log(url);
-      break;
-    }
-    default:
-      console.error(
-        `Unknown compile subcommand: "${sub}"\n\n` +
-          `Usage:\n` +
-          `  rad compile [resourcesDir] [outDir]\n` +
-          `  rad check   [resourcesDir]\n` +
-          `  rad list    [resourcesDir]\n` +
-          `  rad urls    [resourcesDir]\n`,
-      );
-      process.exit(1);
-  }
-}
-
-if (require.main === module) {
-  main(process.argv.slice(2));
-}
+#!/usr/bin/env node
+
+/**
+ * `rad compile | check | list | urls` — the TypeScript-first replacement for the
+ * old Django `manage.py rastack` command.
+ *
+ *   rad compile [resourcesDir] [outDir]   defs → schema.rad.json + openapi.json
+ *   rad check   [resourcesDir]            validate the resource graph (exit != 0 on error)
+ *   rad list    [resourcesDir]            print every resource + its fields/relations
+ *   rad urls    [resourcesDir]            print the generated /api/{app}/v1/{model}/ routes
+ */
+
+import { analyzeResources, collisions, compile, urlsFor } from "./compile";
+
+const DEFAULT_RESOURCES = "resources";
+const DEFAULT_OUT = ".rad";
+
+function main(argv: string[]): void {
+  const [sub, ...rest] = argv;
+
+  switch (sub) {
+    case "compile": {
+      const resourcesDir = rest[0] || DEFAULT_RESOURCES;
+      const outDir = rest[1] || DEFAULT_OUT;
+      const result = compile(resourcesDir, outDir);
+      console.log(
+        `✓ compiled ${result.manifest.resources.length} resource(s) → ${result.files.join(", ")}`,
+      );
+      break;
+    }
+    case "check": {
+      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
+      const errors = collisions(resources);
+      if (errors.length) {
+        for (const e of errors) console.error(`  ✗ ${e}`);
+        console.error(`${errors.length} error(s) found.`);
+        process.exit(1);
+      }
+      console.log(`✓ ${resources.length} resource(s): no collisions.`);
+      break;
+    }
+    case "list": {
+      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
+      if (!resources.length) {
+        console.log("No resources found.");
+        break;
+      }
+      for (const r of resources) {
+        console.log(`${r.app}.${r.model}`);
+        for (const f of r.fields) {
+          const rel = f.relation ? ` → ${f.relation.app}.${f.relation.model}` : "";
+          console.log(`  ${f.name}: ${f.type}${rel}`);
+        }
+        if (r.sync) {
+          const flags = [
+            r.sync.mode,
+            r.sync.load === "lazy" ? "lazy" : "",
+            r.sync.clientIds ? "client-ids" : "",
+            r.sync.confirmed ? `confirmed: ${r.sync.confirmed.join(",")}` : "",
+          ]
+            .filter(Boolean)
+            .join(", ");
+          console.log(`  sync: ${flags}`);
+        }
+      }
+      break;
+    }
+    case "urls": {
+      const resources = analyzeResources(rest[0] || DEFAULT_RESOURCES);
+      for (const url of urlsFor(resources)) console.log(url);
+      break;
+    }
+    default:
+      console.error(
+        `Unknown compile subcommand: "${sub}"\n\n` +
+          `Usage:\n` +
+          `  rad compile [resourcesDir] [outDir]\n` +
+          `  rad check   [resourcesDir]\n` +
+          `  rad list    [resourcesDir]\n` +
+          `  rad urls    [resourcesDir]\n`,
+      );
+      process.exit(1);
+  }
+}
+
+if (require.main === module) {
+  main(process.argv.slice(2));
+}

package/src/rad-wasm-build.ts

@@ -1,102 +1,102 @@
-#!/usr/bin/env node
-
-/**
- * `rad wasm` — compile the Rust API to WebAssembly for in-browser local dev.
- *
- * Pipeline:
- *   1. cargo build -p rad-wasm --release --target wasm32-unknown-unknown
- *   2. wasm-bindgen --target web  → stack/wasm/rad_wasm.js + rad_wasm_bg.wasm
- *   3. wasm-opt -Oz (if available) to shrink the binary
- *
- * The generated bundle is what `<RAStackProvider mode="local">` loads. Prereqs:
- *   rustup target add wasm32-unknown-unknown
- *   cargo install wasm-bindgen-cli   (version must match the wasm-bindgen crate)
- */
-
-import { spawnSync } from "child_process";
-import fs from "fs";
-import path from "path";
-
-const repoRoot = path.resolve(__dirname, "..", "..");
-const rustDir = path.join(repoRoot, "rust");
-const outDir = path.join(repoRoot, "tools", "wasm");
-const wasmPath = path.join(
-  rustDir,
-  "target",
-  "wasm32-unknown-unknown",
-  "release",
-  "rad_wasm.wasm",
-);
-
-function run(cmd: string, args: string[], cwd = repoRoot): void {
-  // Local build tool: `cmd`/`args` are the fixed toolchain invocations below
-  // (cargo, wasm-bindgen, wasm-opt), not untrusted input — no injection surface.
-  // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process
-  const result = spawnSync(cmd, args, {
-    stdio: "inherit",
-    cwd,
-    env: process.env,
-  });
-  if (result.error) {
-    console.error(`\nCould not run \`${cmd}\`. Is it installed and on PATH?`);
-    if (cmd === "wasm-bindgen") {
-      console.error("  cargo install wasm-bindgen-cli");
-    }
-    process.exit(1);
-  }
-  if (result.status !== 0) {
-    process.exit(result.status ?? 1);
-  }
-}
-
-function has(cmd: string): boolean {
-  // Probes a fixed toolchain name (e.g. "wasm-opt") for availability; not
-  // untrusted input.
-  // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process
-  return spawnSync(cmd, ["--version"], { stdio: "ignore" }).status === 0;
-}
-
-console.log("→ cargo build -p rad-wasm --release (wasm32-unknown-unknown)");
-run(
-  "cargo",
-  [
-    "build",
-    "-p",
-    "rad-wasm",
-    "--release",
-    "--target",
-    "wasm32-unknown-unknown",
-  ],
-  rustDir,
-);
-
-console.log("→ wasm-bindgen → stack/wasm/");
-run("wasm-bindgen", [
-  "--target",
-  "web",
-  "--out-dir",
-  outDir,
-  "--out-name",
-  "rad_wasm",
-  wasmPath,
-]);
-
-// Mark the emitted bundle as ESM so Node and bundlers treat it correctly
-// without forcing the parent rastack package to be a module.
-fs.writeFileSync(
-  path.join(outDir, "package.json"),
-  JSON.stringify({ type: "module", sideEffects: false }, null, 2) + "\n",
-);
-
-if (has("wasm-opt")) {
-  console.log("→ wasm-opt -Oz");
-  const bg = path.join(outDir, "rad_wasm_bg.wasm");
-  run("wasm-opt", ["-Oz", "-o", bg, bg]);
-} else {
-  console.log("· wasm-opt not found — skipping size optimisation (optional)");
-}
-
-const size = fs.statSync(path.join(outDir, "rad_wasm_bg.wasm")).size;
-console.log(
-  `✓ wasm engine built: stack/wasm/ (${(size / 1024).toFixed(0)} KB)`,
-);
+#!/usr/bin/env node
+
+/**
+ * `rad wasm` — compile the Rust API to WebAssembly for in-browser local dev.
+ *
+ * Pipeline:
+ *   1. cargo build -p rad-wasm --release --target wasm32-unknown-unknown
+ *   2. wasm-bindgen --target web  → stack/wasm/rad_wasm.js + rad_wasm_bg.wasm
+ *   3. wasm-opt -Oz (if available) to shrink the binary
+ *
+ * The generated bundle is what `<RAStackProvider mode="local">` loads. Prereqs:
+ *   rustup target add wasm32-unknown-unknown
+ *   cargo install wasm-bindgen-cli   (version must match the wasm-bindgen crate)
+ */
+
+import { spawnSync } from "child_process";
+import fs from "fs";
+import path from "path";
+
+const repoRoot = path.resolve(__dirname, "..", "..");
+const rustDir = path.join(repoRoot, "rust");
+const outDir = path.join(repoRoot, "tools", "wasm");
+const wasmPath = path.join(
+  rustDir,
+  "target",
+  "wasm32-unknown-unknown",
+  "release",
+  "rad_wasm.wasm",
+);
+
+function run(cmd: string, args: string[], cwd = repoRoot): void {
+  // Local build tool: `cmd`/`args` are the fixed toolchain invocations below
+  // (cargo, wasm-bindgen, wasm-opt), not untrusted input — no injection surface.
+  // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process
+  const result = spawnSync(cmd, args, {
+    stdio: "inherit",
+    cwd,
+    env: process.env,
+  });
+  if (result.error) {
+    console.error(`\nCould not run \`${cmd}\`. Is it installed and on PATH?`);
+    if (cmd === "wasm-bindgen") {
+      console.error("  cargo install wasm-bindgen-cli");
+    }
+    process.exit(1);
+  }
+  if (result.status !== 0) {
+    process.exit(result.status ?? 1);
+  }
+}
+
+function has(cmd: string): boolean {
+  // Probes a fixed toolchain name (e.g. "wasm-opt") for availability; not
+  // untrusted input.
+  // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process
+  return spawnSync(cmd, ["--version"], { stdio: "ignore" }).status === 0;
+}
+
+console.log("→ cargo build -p rad-wasm --release (wasm32-unknown-unknown)");
+run(
+  "cargo",
+  [
+    "build",
+    "-p",
+    "rad-wasm",
+    "--release",
+    "--target",
+    "wasm32-unknown-unknown",
+  ],
+  rustDir,
+);
+
+console.log("→ wasm-bindgen → stack/wasm/");
+run("wasm-bindgen", [
+  "--target",
+  "web",
+  "--out-dir",
+  outDir,
+  "--out-name",
+  "rad_wasm",
+  wasmPath,
+]);
+
+// Mark the emitted bundle as ESM so Node and bundlers treat it correctly
+// without forcing the parent rastack package to be a module.
+fs.writeFileSync(
+  path.join(outDir, "package.json"),
+  JSON.stringify({ type: "module", sideEffects: false }, null, 2) + "\n",
+);
+
+if (has("wasm-opt")) {
+  console.log("→ wasm-opt -Oz");
+  const bg = path.join(outDir, "rad_wasm_bg.wasm");
+  run("wasm-opt", ["-Oz", "-o", bg, bg]);
+} else {
+  console.log("· wasm-opt not found — skipping size optimisation (optional)");
+}
+
+const size = fs.statSync(path.join(outDir, "rad_wasm_bg.wasm")).size;
+console.log(
+  `✓ wasm engine built: stack/wasm/ (${(size / 1024).toFixed(0)} KB)`,
+);