@akanjs/cli 2.3.5-rc.3 → 2.3.5-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.3.5-rc.3",
+  "version": "2.3.5-rc.5",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -35,7 +35,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.3.5-rc.3",
+    "akanjs": "2.3.5-rc.5",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",

package/templates/lib/sig.ts

@@ -13,12 +13,13 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
 
   const signalNames = [...(libs.length === 0 ? ["base"] : libs), ...databaseModules, ...serviceModules];
-  const fetchSignalChunks = Array.from({ length: Math.ceil(signalNames.length / 4) }, (_, idx) =>
-    signalNames.slice(idx * 4, idx * 4 + 4),
-  );
+  const importedFetchParts = (libs.length === 0 ? ["base"] : libs).map((signal) => `SafeFetchPart<typeof ${signal}>`);
+  const databaseFetchTypes = databaseModules.map((module) => `${capitalize(module)}Fetch`);
+  const serviceFetchTypes = serviceModules.map((module) => `${capitalize(module)}Fetch`);
+  const fetchTypeParts = [...importedFetchParts, ...databaseFetchTypes, ...serviceFetchTypes];
 
   return `
-import { FetchClient, type FetchClientType } from "akanjs/fetch";
+import { FetchClient, type GetFetchTypeFromEndpoint, type GetFetchTypeFromSlice } from "akanjs/fetch";
 import { SignalRegistry, serverSignal${libs.length === 0 ? ", fetch as base" : ""} } from "akanjs/signal";
 ${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/server";`).join("\n")}
 
@@ -59,10 +60,18 @@ ${databaseModules.map((module) => `export const ${module} = SignalRegistry.regis
 ${serviceModules.map((module) => `export const ${module} = SignalRegistry.registerService("${module}" as const, ${module}Sig.${capitalize(module)}Internal, ${module}Sig.${capitalize(module)}Endpoint, ${capitalize(module)});`).join("\n")}
 
 export const fetchSignals = [${signalNames.join(", ")}] as const;
-${fetchSignalChunks
-  .map((chunk, idx) => `type Fetch${idx} = FetchClientType<readonly [${chunk.map((signal) => `typeof ${signal}`).join(", ")}]>;`)
+type IsAny<Type> = 0 extends 1 & Type ? true : false;
+type SafeFetchPart<Type> = IsAny<Type> extends true ? unknown : Type;
+${databaseModules
+  .map(
+    (module) =>
+      `type ${capitalize(module)}Fetch = GetFetchTypeFromEndpoint<typeof ${module}Sig.${capitalize(module)}Endpoint, typeof ${module}Sig.${capitalize(module)}Slice> & GetFetchTypeFromSlice<typeof ${module}Sig.${capitalize(module)}Slice>;`,
+  )
+  .join("\n")}
+${serviceModules
+  .map((module) => `type ${capitalize(module)}Fetch = GetFetchTypeFromEndpoint<typeof ${module}Sig.${capitalize(module)}Endpoint>;`)
   .join("\n")}
-export type Fetch = ${fetchSignalChunks.map((_, idx) => `Fetch${idx}`).join(" & ")};
+export type Fetch = ${fetchTypeParts.length ? fetchTypeParts.join(" &\n  ") : "unknown"};
 export const fetch: Fetch = (FetchClient.from as (...signals: unknown[]) => unknown)(...fetchSignals) as Fetch;
 
 export const getSerializedSignal = () => fetch.serializedSignal