atmx-cli 0.39.0 → 0.41.0

package/dist/generators/sdk-generator.js

@@ -2,21 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSdk = generateSdk;
 const utils_1 = require("./utils");
-function generateSdk(multiIr) {
+function generateSdk(multiIr, isReact = false) {
     const lines = [
         `// GENERATED CODE – DO NOT EDIT.`,
         `import * as models from './models';\n`,
     ];
+    if (isReact) {
+        lines.push(`import { useAxiomQuery, useAxiomMutation } from 'atmx-react';`);
+        lines.push(`import type { AxiomQueryDef } from 'atmx-react';\n`);
+    }
     for (const [ns, ir] of Object.entries(multiIr)) {
         const pascalNs = (0, utils_1.pascalCase)(ns);
         lines.push(`export class ${pascalNs}Module {`);
-        // Support both old array format and new object map format
         const endpointsMap = ir.endpoints || {};
         const endpoints = Array.isArray(endpointsMap)
             ? endpointsMap
             : Object.values(endpointsMap);
         endpoints.forEach((ep) => {
-            lines.push(generateEndpointMethod(ep, ns, pascalNs));
+            lines.push(generateEndpointMethod(ep, ns, pascalNs, isReact));
         });
         lines.push(`}\n`);
     }
@@ -27,30 +30,67 @@ function generateSdk(multiIr) {
     lines.push(`}\nexport const sdk = new AxiomSdk();`);
     return lines.join("\n");
 }
-function generateEndpointMethod(ep, ns, pascalNs) {
-    // ✨ FIX: Ensure params is always an Array regardless of the IR structure
+function generateEndpointMethod(ep, ns, pascalNs, isReact) {
     const rawParams = ep.parameters || [];
     const params = Array.isArray(rawParams)
         ? rawParams
         : Object.values(rawParams);
-    if (params.length === 0) {
+    const argType = params.length > 0
+        ? `{ ${params.map((p) => `${(0, utils_1.camelCase)(p.name)}${p.isOptional ? "?" : ""}: ${prefixModels((0, utils_1.mapTypeToTs)(p.typeRef, pascalNs))}`).join(", ")} }`
+        : "void";
+    const isQuery = ep.method ? ep.method.toUpperCase() === "GET" : true;
+    const rawReturnType = (0, utils_1.mapTypeToTs)(ep.returnType, pascalNs);
+    const returnType = rawReturnType === "void" || rawReturnType === "any"
+        ? rawReturnType
+        : prefixModels(rawReturnType);
+    if (isReact) {
+        const bodyParam = params.find((p) => p.source === "body");
+        const payloadLogic = bodyParam
+            ? `const payload = (args as any)?.${(0, utils_1.camelCase)(bodyParam.name)};`
+            : `const payload = undefined;`;
+        const decLogic = generateLambda(ep.returnType, "fromJson", pascalNs);
+        const serLogic = bodyParam
+            ? generateLambda(bodyParam.typeRef, "toJson", pascalNs)
+            : `(p: any) => p`;
         return `
-  /** RPC String Generator for <AxQuery> or <AxMutate> */
-  ${(0, utils_1.camelCase)(ep.name)}(): string {
-    return \`${ns}.${ep.name}()\`;
+  get${(0, utils_1.pascalCase)(ep.name)}Def(args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}): AxiomQueryDef<${returnType}> {
+    ${payloadLogic}
+    return {
+      namespace: "${ns}",
+      name: "${ep.name}",
+      endpointId: ${ep.id},
+      method: "${ep.method ? ep.method.toUpperCase() : "GET"}",
+      path: "${ep.path}",
+      payload: payload,
+      args: args || {},
+      decoder: ${decLogic},
+      serializer: ${serLogic},
+      isStream: ${ep.isStream === true}
+    };
+  }
+
+  use${(0, utils_1.pascalCase)(ep.name)}${!isQuery ? "Mutation" : ""}(${isQuery ? `args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}, options?: { enabled?: boolean }` : ""}) {
+    ${isQuery
+            ? `return useAxiomQuery<${returnType}>(this.get${(0, utils_1.pascalCase)(ep.name)}Def(args), options);`
+            : `return useAxiomMutation<${returnType}, ${argType === "void" ? "void | Record<string,any>" : argType}>((args) => this.get${(0, utils_1.pascalCase)(ep.name)}Def(args));`}
   }\n`;
     }
-    const argType = `{ ${params
-        .map((p) => {
-        return `${(0, utils_1.camelCase)(p.name)}?: ${prefixModels((0, utils_1.mapTypeToTs)(p.typeRef, pascalNs))}`;
-    })
-        .join(", ")} }`;
-    return `
-  /** RPC String Generator for <AxQuery> or <AxMutate> */
-  ${(0, utils_1.camelCase)(ep.name)}(args?: ${argType}): string {
+    else {
+        return `
+  ${(0, utils_1.camelCase)(ep.name)}(args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}): string {
     const argsStr = args && Object.keys(args).length > 0 ? JSON.stringify(args) : '';
     return \`${ns}.${ep.name}(\${argsStr})\`;
   }\n`;
+    }
+}
+function generateLambda(typeRef, mode, ns) {
+    if (!typeRef || !typeRef.kind || typeRef.kind === "void")
+        return mode === "fromJson" ? `() => undefined` : `(p: any) => p`;
+    if (typeRef.kind === "list" && typeRef.value?.kind === "named")
+        return `(data: any[]) => data.map(models.Mappers.${(0, utils_1.camelCase)(ns)}.${(0, utils_1.pascalCase)(typeRef.value.value)}.${mode})`;
+    if (typeRef.kind === "named")
+        return `models.Mappers.${(0, utils_1.camelCase)(ns)}.${(0, utils_1.pascalCase)(typeRef.value)}.${mode}`;
+    return `(data: any) => data`;
 }
 function prefixModels(type) {
     const primitives = [

package/dist/index.js

@@ -42,13 +42,14 @@ const sdk_generator_1 = require("./generators/sdk-generator");
 const utils_1 = require("./generators/utils");
 const program = new commander_1.Command();
 program
-    .name('atmx')
-    .description('Generate TypeScript SDK from an ATMX Multi-Contract Config')
-    .version('0.2.0');
+    .name("atmx")
+    .description("Generate TypeScript SDK from an ATMX Multi-Contract Config")
+    .version("0.2.0");
 program
-    .command('generate')
-    .requiredOption('-c, --config <path>', 'Path to the atmx.config.json file')
-    .requiredOption('-o, --output <dir>', 'Output directory for generated files')
+    .command("generate")
+    .requiredOption("-c, --config <path>", "Path to the atmx.config.json file")
+    .requiredOption("-o, --output <dir>", "Output directory for generated files")
+    .option("-r, --react", "Generate React Hooks instead of Vanilla JS strings") // ✨ NEW
     .action(async (options) => {
     const configPath = path.resolve(options.config);
     const outputDir = path.resolve(options.output);
@@ -88,11 +89,12 @@ program
     }
     // Ensure output directory exists
     await fs.ensureDir(outputDir);
-    // 3. Pass the MultiIR Map to the generators (We will update these in Phase 3)
+    // 3. Pass the MultiIR Map to the generators
     const modelsContent = (0, model_generator_1.generateModels)(multiIr);
-    await fs.writeFile(path.join(outputDir, 'models.ts'), modelsContent);
-    const sdkContent = (0, sdk_generator_1.generateSdk)(multiIr);
-    await fs.writeFile(path.join(outputDir, 'sdk.ts'), sdkContent);
+    await fs.writeFile(path.join(outputDir, "models.ts"), modelsContent);
+    // ✨ NEW: Pass the react flag down
+    const sdkContent = (0, sdk_generator_1.generateSdk)(multiIr, options.react);
+    await fs.writeFile(path.join(outputDir, "sdk.ts"), sdkContent);
     console.log(`\n🎉 ATMX Multi-Contract SDK generated successfully in ${outputDir}`);
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmx-cli",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/generators/sdk-generator.ts

@@ -2,24 +2,31 @@
 import { AxiomEndpoint, MultiIR } from "../types";
 import { pascalCase, camelCase, mapTypeToTs } from "./utils";
 
-export function generateSdk(multiIr: MultiIR): string {
+export function generateSdk(
+  multiIr: MultiIR,
+  isReact: boolean = false,
+): string {
   const lines: string[] = [
     `// GENERATED CODE – DO NOT EDIT.`,
     `import * as models from './models';\n`,
   ];
 
+  if (isReact) {
+    lines.push(`import { useAxiomQuery, useAxiomMutation } from 'atmx-react';`);
+    lines.push(`import type { AxiomQueryDef } from 'atmx-react';\n`);
+  }
+
   for (const [ns, ir] of Object.entries(multiIr)) {
     const pascalNs = pascalCase(ns);
     lines.push(`export class ${pascalNs}Module {`);
 
-    // Support both old array format and new object map format
     const endpointsMap = ir.endpoints || {};
     const endpoints = Array.isArray(endpointsMap)
       ? endpointsMap
       : Object.values(endpointsMap);
 
     endpoints.forEach((ep: any) => {
-      lines.push(generateEndpointMethod(ep, ns, pascalNs));
+      lines.push(generateEndpointMethod(ep, ns, pascalNs, isReact));
     });
     lines.push(`}\n`);
   }
@@ -39,33 +46,80 @@ function generateEndpointMethod(
   ep: AxiomEndpoint,
   ns: string,
   pascalNs: string,
+  isReact: boolean,
 ): string {
-  // ✨ FIX: Ensure params is always an Array regardless of the IR structure
   const rawParams = ep.parameters || [];
   const params = Array.isArray(rawParams)
     ? rawParams
     : Object.values(rawParams);
 
-  if (params.length === 0) {
+  const argType =
+    params.length > 0
+      ? `{ ${params.map((p: any) => `${camelCase(p.name)}${p.isOptional ? "?" : ""}: ${prefixModels(mapTypeToTs(p.typeRef, pascalNs))}`).join(", ")} }`
+      : "void";
+
+  const isQuery = ep.method ? ep.method.toUpperCase() === "GET" : true;
+  const rawReturnType = mapTypeToTs(ep.returnType, pascalNs);
+  const returnType =
+    rawReturnType === "void" || rawReturnType === "any"
+      ? rawReturnType
+      : prefixModels(rawReturnType);
+
+  if (isReact) {
+    const bodyParam = params.find((p: any) => p.source === "body") as any;
+    const payloadLogic = bodyParam
+      ? `const payload = (args as any)?.${camelCase(bodyParam.name)};`
+      : `const payload = undefined;`;
+    const decLogic = generateLambda(ep.returnType, "fromJson", pascalNs);
+    const serLogic = bodyParam
+      ? generateLambda(bodyParam.typeRef, "toJson", pascalNs)
+      : `(p: any) => p`;
+
     return `
-  /** RPC String Generator for <AxQuery> or <AxMutate> */
-  ${camelCase(ep.name)}(): string {
-    return \`${ns}.${ep.name}()\`;
-  }\n`;
+  get${pascalCase(ep.name)}Def(args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}): AxiomQueryDef<${returnType}> {
+    ${payloadLogic}
+    return {
+      namespace: "${ns}",
+      name: "${ep.name}",
+      endpointId: ${ep.id},
+      method: "${ep.method ? ep.method.toUpperCase() : "GET"}",
+      path: "${ep.path}",
+      payload: payload,
+      args: args || {},
+      decoder: ${decLogic},
+      serializer: ${serLogic},
+      isStream: ${ep.isStream === true}
+    };
   }
 
-  const argType = `{ ${params
-    .map((p: any) => {
-      return `${camelCase(p.name)}?: ${prefixModels(mapTypeToTs(p.typeRef, pascalNs))}`;
-    })
-    .join(", ")} }`;
-
-  return `
-  /** RPC String Generator for <AxQuery> or <AxMutate> */
-  ${camelCase(ep.name)}(args?: ${argType}): string {
+  use${pascalCase(ep.name)}${!isQuery ? "Mutation" : ""}(${isQuery ? `args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}, options?: { enabled?: boolean }` : ""}) {
+    ${
+      isQuery
+        ? `return useAxiomQuery<${returnType}>(this.get${pascalCase(ep.name)}Def(args), options);`
+        : `return useAxiomMutation<${returnType}, ${argType === "void" ? "void | Record<string,any>" : argType}>((args) => this.get${pascalCase(ep.name)}Def(args));`
+    }
+  }\n`;
+  } else {
+    return `
+  ${camelCase(ep.name)}(args${params.length > 0 ? "?" : ""}: ${argType === "void" ? "any" : argType}): string {
     const argsStr = args && Object.keys(args).length > 0 ? JSON.stringify(args) : '';
     return \`${ns}.${ep.name}(\${argsStr})\`;
   }\n`;
+  }
+}
+
+function generateLambda(
+  typeRef: any,
+  mode: "fromJson" | "toJson",
+  ns: string,
+): string {
+  if (!typeRef || !typeRef.kind || typeRef.kind === "void")
+    return mode === "fromJson" ? `() => undefined` : `(p: any) => p`;
+  if (typeRef.kind === "list" && typeRef.value?.kind === "named")
+    return `(data: any[]) => data.map(models.Mappers.${camelCase(ns)}.${pascalCase(typeRef.value.value)}.${mode})`;
+  if (typeRef.kind === "named")
+    return `models.Mappers.${camelCase(ns)}.${pascalCase(typeRef.value)}.${mode}`;
+  return `(data: any) => data`;
 }
 
 function prefixModels(type: string): string {

package/src/index.ts

@@ -1,82 +1,94 @@
 #!/usr/bin/env node
-import { Command } from 'commander';
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import { AtmxMultiConfig, MultiIR } from './types';
-import { generateModels } from './generators/model-generator';
-import { generateSdk } from './generators/sdk-generator';
-import { normalizeIr } from './generators/utils';
+import { Command } from "commander";
+import * as fs from "fs-extra";
+import * as path from "path";
+import { AtmxMultiConfig, MultiIR } from "./types";
+import { generateModels } from "./generators/model-generator";
+import { generateSdk } from "./generators/sdk-generator";
+import { normalizeIr } from "./generators/utils";
 
 const program = new Command();
 
 program
-    .name('atmx')
-    .description('Generate TypeScript SDK from an ATMX Multi-Contract Config')
-    .version('0.2.0');
+  .name("atmx")
+  .description("Generate TypeScript SDK from an ATMX Multi-Contract Config")
+  .version("0.2.0");
 
 program
-    .command('generate')
-    .requiredOption('-c, --config <path>', 'Path to the atmx.config.json file')
-    .requiredOption('-o, --output <dir>', 'Output directory for generated files')
-    .action(async (options) => {
-        const configPath = path.resolve(options.config);
-        const outputDir = path.resolve(options.output);
-
-        if (!fs.existsSync(configPath)) {
-            console.error(`❌ Error: Config file not found at ${configPath}`);
-            process.exit(1);
-        }
-
-        // 1. Read the Config File
-        const rawConfig: AtmxMultiConfig = await fs.readJSON(configPath);
-
-        if (!rawConfig.contracts || Object.keys(rawConfig.contracts).length === 0) {
-            console.error("❌ Error: Invalid config file. Missing 'contracts' dictionary.");
-            process.exit(1);
-        }
-
-        const configDir = path.dirname(configPath);
-        const multiIr: MultiIR = {};
-
-        // 2. Loop through the contracts and parse the local .axiom files
-        for (const [namespace, contract] of Object.entries(rawConfig.contracts)) {
-            // Resolve the .axiom file path relative to where the config file is located
-            // (e.g., if config is in /public, and file is "./auth.axiom", it looks in /public/auth.axiom)
-            const axiomFilePath = path.resolve(configDir, contract.file);
-
-            if (!fs.existsSync(axiomFilePath)) {
-                console.warn(`⚠️ Warning: Contract file not found for namespace '${namespace}' at ${axiomFilePath}. Skipping...`);
-                continue;
-            }
-
-            const rawFile = await fs.readJSON(axiomFilePath);
-
-            if (!rawFile.ir) {
-                console.warn(`⚠️ Warning: Invalid .axiom file for namespace '${namespace}'. Missing 'ir' property. Skipping...`);
-                continue;
-            }
-
-            // Normalize the IR (snake_case -> camelCase) and store it by namespace
-            multiIr[namespace] = normalizeIr(rawFile.ir);
-            console.log(`✅ Loaded contract: [${namespace}] -> ${contract.file}`);
-        }
-
-        if (Object.keys(multiIr).length === 0) {
-            console.error("❌ Error: No valid contracts were loaded. Aborting generation.");
-            process.exit(1);
-        }
-
-        // Ensure output directory exists
-        await fs.ensureDir(outputDir);
-
-        // 3. Pass the MultiIR Map to the generators (We will update these in Phase 3)
-        const modelsContent = generateModels(multiIr);
-        await fs.writeFile(path.join(outputDir, 'models.ts'), modelsContent);
-
-        const sdkContent = generateSdk(multiIr);
-        await fs.writeFile(path.join(outputDir, 'sdk.ts'), sdkContent);
-
-        console.log(`\n🎉 ATMX Multi-Contract SDK generated successfully in ${outputDir}`);
-    });
-
-program.parse();
+  .command("generate")
+  .requiredOption("-c, --config <path>", "Path to the atmx.config.json file")
+  .requiredOption("-o, --output <dir>", "Output directory for generated files")
+  .option("-r, --react", "Generate React Hooks instead of Vanilla JS strings") // ✨ NEW
+  .action(async (options) => {
+    const configPath = path.resolve(options.config);
+    const outputDir = path.resolve(options.output);
+
+    if (!fs.existsSync(configPath)) {
+      console.error(`❌ Error: Config file not found at ${configPath}`);
+      process.exit(1);
+    }
+
+    // 1. Read the Config File
+    const rawConfig: AtmxMultiConfig = await fs.readJSON(configPath);
+
+    if (!rawConfig.contracts || Object.keys(rawConfig.contracts).length === 0) {
+      console.error(
+        "❌ Error: Invalid config file. Missing 'contracts' dictionary.",
+      );
+      process.exit(1);
+    }
+
+    const configDir = path.dirname(configPath);
+    const multiIr: MultiIR = {};
+
+    // 2. Loop through the contracts and parse the local .axiom files
+    for (const [namespace, contract] of Object.entries(rawConfig.contracts)) {
+      // Resolve the .axiom file path relative to where the config file is located
+      // (e.g., if config is in /public, and file is "./auth.axiom", it looks in /public/auth.axiom)
+      const axiomFilePath = path.resolve(configDir, contract.file);
+
+      if (!fs.existsSync(axiomFilePath)) {
+        console.warn(
+          `⚠️ Warning: Contract file not found for namespace '${namespace}' at ${axiomFilePath}. Skipping...`,
+        );
+        continue;
+      }
+
+      const rawFile = await fs.readJSON(axiomFilePath);
+
+      if (!rawFile.ir) {
+        console.warn(
+          `⚠️ Warning: Invalid .axiom file for namespace '${namespace}'. Missing 'ir' property. Skipping...`,
+        );
+        continue;
+      }
+
+      // Normalize the IR (snake_case -> camelCase) and store it by namespace
+      multiIr[namespace] = normalizeIr(rawFile.ir);
+      console.log(`✅ Loaded contract: [${namespace}] -> ${contract.file}`);
+    }
+
+    if (Object.keys(multiIr).length === 0) {
+      console.error(
+        "❌ Error: No valid contracts were loaded. Aborting generation.",
+      );
+      process.exit(1);
+    }
+
+    // Ensure output directory exists
+    await fs.ensureDir(outputDir);
+
+    // 3. Pass the MultiIR Map to the generators
+    const modelsContent = generateModels(multiIr);
+    await fs.writeFile(path.join(outputDir, "models.ts"), modelsContent);
+
+    // ✨ NEW: Pass the react flag down
+    const sdkContent = generateSdk(multiIr, options.react);
+    await fs.writeFile(path.join(outputDir, "sdk.ts"), sdkContent);
+
+    console.log(
+      `\n🎉 ATMX Multi-Contract SDK generated successfully in ${outputDir}`,
+    );
+  });
+
+program.parse();