@ic-reactor/codegen 0.2.0 → 0.3.1

package/src/bindgen.ts

@@ -1,10 +1,10 @@
 /**
  * Bindgen utilities
  *
- * Generates TypeScript declarations from Candid files using @icp-sdk/bindgen.
+ * Generates TypeScript declarations from Candid files using @ic-reactor/parser.
  */
 
-import { generate } from "@icp-sdk/bindgen/core"
+import { didToJs, didToTs } from "@ic-reactor/parser"
 import path from "node:path"
 import fs from "node:fs"
 
@@ -27,7 +27,8 @@ export interface BindgenResult {
  * Generate TypeScript declarations from a Candid file
  *
  * This creates:
- * - declarations/<canisterName>.did.ts - IDL factory and types
+ * - declarations/<canisterName>.js - IDL factory
+ * - declarations/<canisterName>.d.ts - Types
  */
 export async function generateDeclarations(
   options: BindgenOptions
@@ -44,8 +45,12 @@ export async function generateDeclarations(
   }
 
   const declarationsDir = path.join(outDir, "declarations")
+  const didFileName = path.basename(didFile) // e.g., "my_canister.did"
 
   try {
+    // Read content first so we can safely delete the directory if didFile is inside it
+    const didContent = fs.readFileSync(didFile, "utf-8")
+
     // Ensure the output directory exists
     if (!fs.existsSync(outDir)) {
       fs.mkdirSync(outDir, { recursive: true })
@@ -57,17 +62,18 @@ export async function generateDeclarations(
     }
     fs.mkdirSync(declarationsDir, { recursive: true })
 
-    // Note: bindgen appends "declarations" internally, so we pass the parent directory
-    await generate({
-      didFile,
-      outDir, // Pass the parent directory; bindgen appends "declarations"
-      output: {
-        actor: {
-          disabled: true, // We don't need actor creation, we use Reactor
-        },
-        force: true, // Overwrite existing files
-      },
-    })
+    const jsContent = didToJs(didContent)
+    const tsContent = didToTs(didContent)
+
+    // Write .did, .js and .d.ts
+    const baseName = didFileName.replace(/\.did$/, "")
+    const jsPath = path.join(declarationsDir, baseName + ".js")
+    const dtsPath = path.join(declarationsDir, baseName + ".d.ts")
+    const didPath = path.join(declarationsDir, didFileName)
+
+    fs.writeFileSync(jsPath, jsContent)
+    fs.writeFileSync(dtsPath, tsContent)
+    fs.writeFileSync(didPath, didContent)
 
     return {
       success: true,
@@ -90,24 +96,6 @@ export function declarationsExist(
   canisterName: string
 ): boolean {
   const declarationsDir = path.join(outDir, "declarations")
-  const didTsPath = path.join(declarationsDir, `${canisterName}.did.ts`)
+  const didTsPath = path.join(declarationsDir, `${canisterName}.d.ts`)
   return fs.existsSync(didTsPath)
 }
-
-/**
- * Save a Candid source to a file (for use with fetch command)
- */
-export function saveCandidFile(
-  candidSource: string,
-  outDir: string,
-  canisterName: string
-): string {
-  const candidDir = path.join(outDir, "candid")
-  if (!fs.existsSync(candidDir)) {
-    fs.mkdirSync(candidDir, { recursive: true })
-  }
-
-  const candidPath = path.join(candidDir, `${canisterName}.did`)
-  fs.writeFileSync(candidPath, candidSource)
-  return candidPath
-}

package/src/index.ts

@@ -5,47 +5,16 @@
  * Used by both @ic-reactor/vite-plugin and @ic-reactor/cli.
  */
 
-// Types
-export type {
-  MethodInfo,
-  CanisterConfig,
-  HookType,
-  GeneratorOptions,
-  ReactorGeneratorOptions,
-} from "./types.js"
-
 // Naming utilities
-export {
-  toPascalCase,
-  toCamelCase,
-  getHookFileName,
-  getHookExportName,
-  getReactHookName,
-  getReactorName,
-  getServiceTypeName,
-} from "./naming.js"
-
-// DID parsing
-export {
-  parseDIDFile,
-  extractMethods,
-  getMethodsByType,
-  formatMethodForDisplay,
-} from "./did.js"
+export { toPascalCase, getReactorName, getServiceTypeName } from "./naming.js"
 
 // Bindgen utilities
-export {
-  generateDeclarations,
-  declarationsExist,
-  saveCandidFile,
-} from "./bindgen.js"
+export { generateDeclarations, declarationsExist } from "./bindgen.js"
 export type { BindgenOptions, BindgenResult } from "./bindgen.js"
 
 // Template generators
 export { generateReactorFile } from "./templates/reactor.js"
-export { generateQueryHook } from "./templates/query.js"
-export type { QueryHookOptions } from "./templates/query.js"
-export { generateMutationHook } from "./templates/mutation.js"
-export type { MutationHookOptions } from "./templates/mutation.js"
-export { generateInfiniteQueryHook } from "./templates/infiniteQuery.js"
-export type { InfiniteQueryHookOptions } from "./templates/infiniteQuery.js"
+export type { ReactorGeneratorOptions } from "./templates/reactor.js"
+
+export { generateClientFile } from "./templates/client.js"
+export type { ClientGeneratorOptions } from "./templates/client.js"

package/src/templates/__snapshots__/client.test.ts.snap

@@ -0,0 +1,35 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`Client File Generation > generates correctly with custom query client 1`] = `
+"import { ClientManager } from "@ic-reactor/react"
+import { queryClient } from "../query-client"
+
+/**
+ * IC Reactor Client Manager
+ * 
+ * Auto-generated by @ic-reactor/codegen
+ */
+export const clientManager = new ClientManager({
+  queryClient,
+  withCanisterEnv: true,
+})
+"
+`;
+
+exports[`Client File Generation > generates correctly with default host 1`] = `
+"import { ClientManager } from "@ic-reactor/react"
+import { QueryClient } from "@tanstack/react-query"
+
+export const queryClient = new QueryClient()
+
+/**
+ * IC Reactor Client Manager
+ * 
+ * Auto-generated by @ic-reactor/codegen
+ */
+export const clientManager = new ClientManager({
+  queryClient,
+  withCanisterEnv: true,
+})
+"
+`;

package/src/templates/__snapshots__/reactor.test.ts.snap

@@ -1,138 +1,14 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Reactor File Generation > Advanced Mode > generates per-method hooks correctly 1`] = `
-"/**
- * MyCanister Reactor (Advanced)
- *
- * Auto-generated by @ic-reactor/codegen
- * Includes reactor instance, actor hooks, and per-method static hooks.
- */
-
-import {
-  DisplayReactor,
-  createActorHooks,
-  createQuery,
-  createMutation,
-} from "@ic-reactor/react"
-import { clientManager } from "../../client"
-import { idlFactory, type _SERVICE } from "./declarations/my_canister.did"
-
-type MyCanisterService = _SERVICE
-
-/**
- * MyCanister Reactor — Display mode.
- * Automatically converts bigint → string, Principal → string, etc.
- */
-export const myCanisterReactor = new DisplayReactor<MyCanisterService>({
-  clientManager,
-  idlFactory,
-  name: "my_canister",
-})
-
-const {
-  useActorQuery: useMyCanisterQuery,
-  useActorSuspenseQuery: useMyCanisterSuspenseQuery,
-  useActorInfiniteQuery: useMyCanisterInfiniteQuery,
-  useActorSuspenseInfiniteQuery: useMyCanisterSuspenseInfiniteQuery,
-  useActorMutation: useMyCanisterMutation,
-  useActorMethod: useMyCanisterMethod,
-} = createActorHooks(myCanisterReactor)
-
-export {
-  useMyCanisterQuery,
-  useMyCanisterSuspenseQuery,
-  useMyCanisterInfiniteQuery,
-  useMyCanisterSuspenseInfiniteQuery,
-  useMyCanisterMutation,
-  useMyCanisterMethod,
-}
-
-// Per-method static hooks (no-args methods only)
-
-export const listItemsQuery = createQuery(myCanisterReactor, {
-  functionName: "list_items",
-})
-
-export const updateStatusMutation = createMutation(myCanisterReactor, {
-  functionName: "update_status",
-})
-
-export { idlFactory }
-export type { MyCanisterService }
-"
-`;
-
-exports[`Reactor File Generation > Fallback Mode > generates correctly without declarations 1`] = `
-"/**
- * MyCanister Reactor
- *
- * Auto-generated by @ic-reactor/codegen
- *
- * ⚠️ Declarations were not generated. Run:
- *   npx @icp-sdk/bindgen --input <path-to-did> --output ./my_canister/declarations
- * Then uncomment the import below and remove the fallback type.
- */
-
-import { DisplayReactor, createActorHooks } from "@ic-reactor/react"
-import { clientManager } from "../../client"
-
-// TODO: Uncomment after generating declarations:
-// import { idlFactory, type _SERVICE as MyCanisterService } from "./declarations/my_canister.did"
-
-// Fallback — replace with generated types
-type MyCanisterService = Record<string, (...args: unknown[]) => Promise<unknown>>
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const idlFactory = ({ IDL }: { IDL: any }) => IDL.Service({})
-
-/**
- * MyCanister Reactor — Display mode.
- * Automatically converts bigint → string, Principal → string, etc.
- */
-export const myCanisterReactor = new DisplayReactor<MyCanisterService>({
-  clientManager,
-  idlFactory,
-  name: "my_canister",
-})
-
-const {
-  useActorQuery: useMyCanisterQuery,
-  useActorSuspenseQuery: useMyCanisterSuspenseQuery,
-  useActorInfiniteQuery: useMyCanisterInfiniteQuery,
-  useActorSuspenseInfiniteQuery: useMyCanisterSuspenseInfiniteQuery,
-  useActorMutation: useMyCanisterMutation,
-  useActorMethod: useMyCanisterMethod,
-} = createActorHooks(myCanisterReactor)
-
-export {
-  useMyCanisterQuery,
-  useMyCanisterSuspenseQuery,
-  useMyCanisterInfiniteQuery,
-  useMyCanisterSuspenseInfiniteQuery,
-  useMyCanisterMutation,
-  useMyCanisterMethod,
-}
-
-export { idlFactory }
-export type { MyCanisterService }
-"
-`;
-
-exports[`Reactor File Generation > Simple Mode > generates correctly 1`] = `
-"/**
- * MyCanister Reactor
- *
- * Auto-generated by @ic-reactor/codegen
- */
-
-import { DisplayReactor, createActorHooks } from "@ic-reactor/react"
+exports[`Reactor File Generation > Standard Mode > generates correctly 1`] = `
+"import { DisplayReactor, createActorHooks } from "@ic-reactor/react"
 import { clientManager } from "../../client"
-import { idlFactory, type _SERVICE } from "./declarations/my_canister.did"
+import { idlFactory, type _SERVICE } from "./declarations/my_canister"
 
 export type MyCanisterService = _SERVICE
 
 /**
- * MyCanister Reactor — Display mode.
- * Automatically converts bigint → string, Principal → string, etc.
+ * MyCanister Display Reactor
  */
 export const myCanisterReactor = new DisplayReactor<MyCanisterService>({
   clientManager,
@@ -140,7 +16,7 @@ export const myCanisterReactor = new DisplayReactor<MyCanisterService>({
   name: "my_canister",
 })
 
-const {
+export const {
   useActorQuery: useMyCanisterQuery,
   useActorSuspenseQuery: useMyCanisterSuspenseQuery,
   useActorInfiniteQuery: useMyCanisterInfiniteQuery,
@@ -148,16 +24,5 @@ const {
   useActorMutation: useMyCanisterMutation,
   useActorMethod: useMyCanisterMethod,
 } = createActorHooks(myCanisterReactor)
-
-export {
-  useMyCanisterQuery,
-  useMyCanisterSuspenseQuery,
-  useMyCanisterInfiniteQuery,
-  useMyCanisterSuspenseInfiniteQuery,
-  useMyCanisterMutation,
-  useMyCanisterMethod,
-}
-
-export { idlFactory }
 "
 `;

package/src/templates/client.test.ts

@@ -0,0 +1,20 @@
+import { describe, it, expect } from "vitest"
+import { generateClientFile } from "./client"
+
+describe("Client File Generation", () => {
+  it("generates correctly with default host", () => {
+    const result = generateClientFile()
+    expect(result).toMatchSnapshot()
+    expect(result).toContain(
+      'import { QueryClient } from "@tanstack/react-query'
+    )
+  })
+
+  it("generates correctly with custom query client", () => {
+    const result = generateClientFile({
+      queryClientPath: "../query-client",
+    })
+    expect(result).toMatchSnapshot()
+    expect(result).toContain('import { queryClient } from "../query-client"')
+  })
+})

package/src/templates/client.ts

@@ -0,0 +1,37 @@
+/**
+ * Client Manager Generator
+ */
+
+export interface ClientGeneratorOptions {
+  /** Optional path to an existing queryClient */
+  queryClientPath?: string
+}
+
+/**
+ * Generate a central client manager file
+ */
+export function generateClientFile(
+  options: ClientGeneratorOptions = {}
+): string {
+  const { queryClientPath } = options
+
+  return `import { ClientManager } from "@ic-reactor/react"
+${
+  queryClientPath
+    ? `import { queryClient } from "${queryClientPath}"`
+    : `import { QueryClient } from "@tanstack/react-query"
+
+export const queryClient = new QueryClient()`
+}
+
+/**
+ * IC Reactor Client Manager
+ * 
+ * Auto-generated by @ic-reactor/codegen
+ */
+export const clientManager = new ClientManager({
+  queryClient,
+  withCanisterEnv: true,
+})
+`
+}

package/src/templates/reactor.test.ts

@@ -1,19 +1,14 @@
 import { describe, it, expect } from "vitest"
-import { generateReactorFile } from "./reactor"
-import type { ReactorGeneratorOptions } from "../types"
+import { generateReactorFile, type ReactorGeneratorOptions } from "./reactor"
 
 describe("Reactor File Generation", () => {
   const baseOptions: ReactorGeneratorOptions = {
     canisterName: "my_canister",
-    canisterConfig: {
-      didFile: "path/to/my_canister.did",
-      outDir: "src/declarations/my_canister",
-      clientManagerPath: "../../client",
-    },
-    hasDeclarations: true,
+    didFile: "path/to/my_canister.did",
+    clientManagerPath: "../../client",
   }
 
-  describe("Simple Mode", () => {
+  describe("Standard Mode", () => {
     it("generates correctly", () => {
       const result = generateReactorFile(baseOptions)
       expect(result).toMatchSnapshot()
@@ -22,57 +17,7 @@ describe("Reactor File Generation", () => {
     it("uses default client path if not provided", () => {
       const options = { ...baseOptions, canisterConfig: { didFile: "foo.did" } }
       const result = generateReactorFile(options)
-      expect(result).toContain(
-        'import { clientManager } from "../../lib/client"'
-      )
-    })
-  })
-
-  describe("Advanced Mode", () => {
-    it("generates per-method hooks correctly", () => {
-      const didContent = `service : {
-        get_user: (nat) -> (opt User) query;
-        list_items: () -> (vec Item) query;
-        create_item: (Item) -> (Result);
-        update_status: () -> (Result); // No args mutation
-      }`
-
-      const options: ReactorGeneratorOptions = {
-        ...baseOptions,
-        advanced: true,
-        didContent,
-      }
-
-      const result = generateReactorFile(options)
-      expect(result).toMatchSnapshot()
-      // Should include static query creation for no-arg method
-      expect(result).toContain(
-        "export const listItemsQuery = createQuery(myCanisterReactor, {"
-      )
-      // Should handle mutation
-      expect(result).toContain(
-        "export const updateStatusMutation = createMutation(myCanisterReactor, {"
-      )
-      // Should NOT handle methods with args
-      expect(result).not.toContain("export const getUserQuery = createQuery")
-      expect(result).not.toContain(
-        "export const createItemMutation = createMutation"
-      )
-    })
-  })
-
-  describe("Fallback Mode", () => {
-    it("generates correctly without declarations", () => {
-      const options: ReactorGeneratorOptions = {
-        ...baseOptions,
-        hasDeclarations: false,
-      }
-      const result = generateReactorFile(options)
-      expect(result).toMatchSnapshot()
-
-      expect(result).toContain(
-        "type MyCanisterService = Record<string, (...args: unknown[]) => Promise<unknown>>"
-      )
+      expect(result).toContain('import { clientManager } from "../../client"')
     })
   })
 })