@ic-reactor/cli 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "CLI tool to generate shadcn-style React hooks for ICP canisters",
   "main": "dist/index.js",
@@ -33,10 +33,10 @@
     "@icp-sdk/core": "^5.0.0",
     "commander": "^14.0.3",
     "picocolors": "^1.1.1",
-    "@ic-reactor/codegen": "0.2.0"
+    "@ic-reactor/codegen": "0.3.1"
   },
   "devDependencies": {
-    "@types/node": "^25.2.2",
+    "@types/node": "^25.2.3",
     "tsup": "^8.3.5",
     "typescript": "~5.9.3"
   },

package/src/commands/index.ts

@@ -3,7 +3,5 @@
  */
 
 export { initCommand } from "./init.js"
-export { addCommand } from "./add.js"
 export { listCommand } from "./list.js"
 export { syncCommand } from "./sync.js"
-export { fetchCommand } from "./fetch.js"

package/src/commands/init.ts

@@ -54,8 +54,8 @@ export async function initCommand(options: InitOptions) {
     // Interactive mode
     const outDir = await p.text({
       message: "Where should generated hooks be placed?",
-      placeholder: "src/canisters",
-      defaultValue: "src/canisters",
+      placeholder: "src/lib/canisters",
+      defaultValue: "src/lib/canisters",
       validate: (value) => {
         if (!value) return "Output directory is required"
         return undefined
@@ -100,17 +100,17 @@ export async function initCommand(options: InitOptions) {
   ensureDir(fullOutDir)
 
   // Create a sample client manager if it doesn't exist
-  const clientManagerPath = path.join(projectRoot, "src/lib/client.ts")
+  const clientManagerPath = path.join(projectRoot, "src/lib/clients.ts")
   if (!fs.existsSync(clientManagerPath)) {
     const createClient = await p.confirm({
-      message: "Create a sample client manager at src/lib/client.ts?",
+      message: "Create a sample client manager at src/lib/clients.ts?",
       initialValue: true,
     })
 
     if (!p.isCancel(createClient) && createClient) {
       ensureDir(path.dirname(clientManagerPath))
       fs.writeFileSync(clientManagerPath, getClientManagerTemplate())
-      p.log.success(`Created ${pc.green("src/lib/client.ts")}`)
+      p.log.success(`Created ${pc.green("src/lib/clients.ts")}`)
     }
   }
 
@@ -170,8 +170,8 @@ async function promptForCanister(
   const clientManagerPath = await p.text({
     message:
       "Import path to your client manager (relative from generated hooks)",
-    placeholder: "../../lib/client",
-    defaultValue: "../../lib/client",
+    placeholder: "../../clients",
+    defaultValue: "../../clients",
   })
 
   if (p.isCancel(clientManagerPath)) return null

package/src/commands/sync.ts

@@ -8,21 +8,9 @@ import * as p from "@clack/prompts"
 import fs from "node:fs"
 import path from "node:path"
 import pc from "picocolors"
-import {
-  loadConfig,
-  getProjectRoot,
-  findConfigFile,
-  ensureDir,
-} from "../utils/config.js"
-import { parseDIDFile } from "@ic-reactor/codegen"
-import {
-  generateReactorFile,
-  generateQueryHook,
-  generateMutationHook,
-} from "../generators/index.js"
-import { getHookFileName } from "@ic-reactor/codegen"
+import { loadConfig, getProjectRoot, findConfigFile } from "../utils/config.js"
+import { generateReactorFile } from "../generators/index.js"
 import { generateDeclarations } from "@ic-reactor/codegen"
-import type { MethodInfo } from "@ic-reactor/codegen"
 
 interface SyncOptions {
   canister?: string
@@ -67,173 +55,52 @@ export async function syncCommand(options: SyncOptions) {
     }
     canistersToSync = [options.canister]
   } else {
-    // Sync all canisters with generated hooks
-    canistersToSync = canisterNames.filter(
-      (name) => (config.generatedHooks[name]?.length ?? 0) > 0
-    )
-
-    if (canistersToSync.length === 0) {
-      p.log.warn("No hooks have been generated yet. Run `add` first.")
-      process.exit(0)
-    }
+    canistersToSync = canisterNames
   }
 
   const spinner = p.spinner()
   spinner.start("Syncing hooks...")
 
   let totalUpdated = 0
-  let totalSkipped = 0
   const errors: string[] = []
 
   for (const canisterName of canistersToSync) {
     const canisterConfig = config.canisters[canisterName]
-    const generatedMethods = config.generatedHooks[canisterName] ?? []
-
-    if (generatedMethods.length === 0) {
-      continue
-    }
-
-    // Parse DID file
-    const didFilePath = path.resolve(projectRoot, canisterConfig.didFile)
-    let methods: MethodInfo[]
-
-    try {
-      methods = parseDIDFile(didFilePath)
-    } catch (error) {
-      errors.push(
-        `${canisterName}: Failed to parse DID file - ${(error as Error).message}`
-      )
-      continue
-    }
-
-    // Normalize hooks to objects
-    const hooks = generatedMethods.map((h) =>
-      typeof h === "string" ? { name: h } : h
-    )
-
-    // Check for removed methods
-    const currentMethodNames = methods.map((m) => m.name)
-    const removedMethods = hooks
-      .filter((h) => !currentMethodNames.includes(h.name))
-      .map((h) => h.name)
-
-    if (removedMethods.length > 0) {
-      p.log.warn(
-        `${canisterName}: Methods removed from DID: ${pc.yellow(removedMethods.join(", "))}`
-      )
-    }
-
-    // Check for new methods
-    const generatedNames = hooks.map((h) => h.name)
-    const newMethods = methods.filter((m) => !generatedNames.includes(m.name))
-
-    if (newMethods.length > 0) {
-      p.log.info(
-        `${canisterName}: New methods available: ${pc.cyan(newMethods.map((m) => m.name).join(", "))}`
-      )
-    }
 
     // Regenerate declarations if missing
     const canisterOutDir = path.join(projectRoot, config.outDir, canisterName)
-    const declarationsDir = path.join(canisterOutDir, "declarations")
+    const didFilePath = path.resolve(projectRoot, canisterConfig.didFile)
 
-    // Check if declarations exist and have files (not just nested empty dir)
-    const declarationsExist =
-      fs.existsSync(declarationsDir) &&
-      fs
-        .readdirSync(declarationsDir)
-        .some((f) => f.endsWith(".ts") || f.endsWith(".js"))
+    spinner.message(`Regenerating declarations for ${canisterName}...`)
 
-    if (!declarationsExist) {
-      spinner.message(`Regenerating declarations for ${canisterName}...`)
+    try {
       const bindgenResult = await generateDeclarations({
         didFile: didFilePath,
         outDir: canisterOutDir,
         canisterName,
       })
 
-      if (bindgenResult.success) {
-        totalUpdated++
-      } else {
+      if (!bindgenResult.success) {
+        errors.push(`${canisterName}: ${bindgenResult.error}`)
         p.log.warn(
           `Could not regenerate declarations for ${canisterName}: ${bindgenResult.error}`
         )
-      }
-    }
-
-    // Regenerate reactor.ts
-    const reactorPath = path.join(canisterOutDir, "reactor.ts")
-
-    const reactorContent = generateReactorFile({
-      canisterName,
-      canisterConfig,
-      config,
-      outDir: canisterOutDir,
-    })
-    fs.writeFileSync(reactorPath, reactorContent)
-    totalUpdated++
-
-    // Regenerate existing hooks
-    const hooksOutDir = path.join(canisterOutDir, "hooks")
-    ensureDir(hooksOutDir)
-
-    for (const hookConfig of hooks) {
-      const methodName = hookConfig.name
-      const method = methods.find((m) => m.name === methodName)
-
-      if (!method) {
-        // Method was removed, skip but warn
-        totalSkipped++
         continue
       }
 
-      // Determine hook type
-      let hookType: string = hookConfig.type || (method.type as string)
-
-      // If no explicit type in config, try to infer from existing files (backward compat)
-      if (!hookConfig.type) {
-        const infiniteQueryFileName = getHookFileName(
-          methodName,
-          "infiniteQuery"
-        )
-        if (fs.existsSync(path.join(hooksOutDir, infiniteQueryFileName))) {
-          hookType = "infiniteQuery"
-        }
-      }
-
-      const fileName = getHookFileName(methodName, hookType)
-      let content: string
-
-      if (hookType.includes("Query")) {
-        content = generateQueryHook({
-          canisterName,
-          method,
-          config,
-          type: hookType as any,
-        })
-      } else {
-        content = generateMutationHook({
-          canisterName,
-          method,
-          config,
-        })
-      }
-
-      const filePath = path.join(hooksOutDir, fileName)
-
-      // Check if file exists and has been customized
-      if (fs.existsSync(filePath)) {
-        const existingContent = fs.readFileSync(filePath, "utf-8")
+      // Regenerate index.ts
+      const reactorPath = path.join(canisterOutDir, "index.ts")
 
-        // If content is different from what we'd generate, skip (user customized)
-        if (existingContent !== content) {
-          totalSkipped++
-          continue
-        }
-      }
-
-      fs.writeFileSync(filePath, content)
+      const reactorContent = generateReactorFile({
+        canisterName,
+        canisterConfig,
+        config,
+      })
+      fs.writeFileSync(reactorPath, reactorContent)
       totalUpdated++
+    } catch (error) {
+      errors.push(`${canisterName}: ${(error as Error).message}`)
+      p.log.error(`Failed to sync ${canisterName}: ${(error as Error).message}`)
     }
   }
 
@@ -249,11 +116,7 @@ export async function syncCommand(options: SyncOptions) {
   }
 
   console.log()
-  p.note(
-    `Updated: ${pc.green(totalUpdated.toString())} files\n` +
-      `Skipped: ${pc.dim(totalSkipped.toString())} files (preserved customizations)`,
-    "Summary"
-  )
+  p.note(`Updated: ${pc.green(totalUpdated.toString())} canisters`, "Summary")
 
   p.outro(pc.green("✓ Sync complete!"))
 }

package/src/generators/index.ts

@@ -1,8 +1 @@
-/**
- * Generators barrel export
- */
-
 export { generateReactorFile } from "./reactor.js"
-export { generateQueryHook } from "./query.js"
-export { generateMutationHook } from "./mutation.js"
-export { generateInfiniteQueryHook } from "./infiniteQuery.js"

package/src/generators/reactor.ts

@@ -14,28 +14,17 @@ export interface ReactorGeneratorOptions {
   canisterName: string
   canisterConfig: CanisterConfig
   config: ReactorConfig
-  outDir: string
-  hasDeclarations?: boolean
 }
 
 /**
  * Generate the reactor.ts file content
  */
 export function generateReactorFile(options: ReactorGeneratorOptions): string {
-  const {
-    canisterName,
-    canisterConfig,
-    config,
-    hasDeclarations = true,
-  } = options
+  const { canisterName, canisterConfig, config } = options
 
   return generateReactorFileFromCodegen({
     canisterName,
     canisterConfig,
-    hasDeclarations,
     globalClientManagerPath: config.clientManagerPath,
-    // CLI doesn't currently expose advanced mode per-canister, but we default to false (simple mode)
-    // If we want to support it, we'd add 'advanced' to CanisterConfig or ReactorGeneratorOptions
-    advanced: false,
   })
 }

package/src/index.ts

@@ -8,10 +8,8 @@
 
 import { Command } from "commander"
 import { initCommand } from "./commands/init.js"
-import { addCommand } from "./commands/add.js"
 import { syncCommand } from "./commands/sync.js"
 import { listCommand } from "./commands/list.js"
-import { fetchCommand } from "./commands/fetch.js"
 import pc from "picocolors"
 
 const program = new Command()
@@ -30,24 +28,6 @@ program
   .option("-o, --out-dir <path>", "Output directory for generated hooks")
   .action(initCommand)
 
-program
-  .command("add")
-  .description("Add hooks for canister methods (from local .did file)")
-  .option("-c, --canister <name>", "Canister name to add hooks for")
-  .option("-m, --methods <methods...>", "Method names to generate hooks for")
-  .option("-a, --all", "Add hooks for all methods")
-  .action(addCommand)
-
-program
-  .command("fetch")
-  .description("Fetch Candid from a live canister and generate hooks")
-  .option("-i, --canister-id <id>", "Canister ID to fetch from")
-  .option("-n, --network <network>", "Network: 'ic' or 'local'", "ic")
-  .option("--name <name>", "Name for the canister in generated code")
-  .option("-m, --methods <methods...>", "Method names to generate hooks for")
-  .option("-a, --all", "Add hooks for all methods")
-  .action(fetchCommand)
-
 program
   .command("sync")
   .description("Sync hooks with .did file changes")

package/src/types.ts

@@ -5,7 +5,7 @@
  * are now in @ic-reactor/codegen.
  */
 
-import type { CanisterConfig, HookType } from "@ic-reactor/codegen"
+export type { CanisterConfig, HookType } from "@ic-reactor/codegen"
 
 export interface HookConfig {
   name: string

package/src/utils/config.ts

@@ -6,12 +6,12 @@ import fs from "node:fs"
 import path from "node:path"
 import type { ReactorConfig } from "../types.js"
 
-export const CONFIG_FILE_NAME = "reactor.config.json"
+export const CONFIG_FILE_NAME = "ic-reactor.json"
 
 export const DEFAULT_CONFIG: ReactorConfig = {
   $schema:
     "https://raw.githubusercontent.com/B3Pay/ic-reactor/main/packages/cli/schema.json",
-  outDir: "src/canisters",
+  outDir: "src/lib/canisters",
   canisters: {},
   generatedHooks: {},
 }