@akanjs/cli 3.0.0-alpha.2 → 3.0.0-alpha.20

package/templates/lib/srv.ts

@@ -13,7 +13,11 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
   return `
 import { ServiceModel } from "akanjs/service";
-${libs.length ? libs.map((lib) => `import { option as ${lib} } from "@libs/${lib}/server";`).join("\n") : 'import type { BackendEnv } from "akanjs/base";'}
+${
+  libs.length
+    ? libs.map((lib) => `import * as ${lib} from "@libs/${lib}/lib/option";`).join("\n")
+    : 'import type { BackendEnv } from "akanjs/base";'
+}
 
 import * as cnst from "./cnst";
 import * as db from "./db";
@@ -21,7 +25,7 @@ import * as db from "./db";
 ${databaseModules.map((module) => `import { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `import { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}
 
-${libs.map((lib) => `export { srv as ${lib} } from "@libs/${lib}/server";`).join("\n")}
+${libs.map((lib) => `export * as ${lib} from "@libs/${lib}/lib/srv";`).join("\n")}
 
 ${databaseModules.map((module) => `export { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `export { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}

package/templates/lib/useClient.ts

@@ -1,16 +1,22 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
+  const isApp = (scanInfo?.type ?? "lib") === "app";
   return `
 import { makePageProto, registerClientRuntime } from "akanjs/client";
 import { FetchClient } from "akanjs/fetch";
 import * as cnst from "./cnst";
-import { getAllDictionary } from "./dict" with { type: "macro" };
-import type * as dict from "./dict";
+${isApp ? `import { getAllDictionary } from "./dict" with { type: "macro" };\n` : ""}import type * as dict from "./dict";
 import { getSerializedSignal } from "./sig" with { type: "macro" };
 import type * as signal from "./sig";
 
-const dictionary = process.env.AKAN_PUBLIC_RENDER_ENV === "csr" ? getAllDictionary() : {};
+${
+  isApp
+    ? `const dictionary = process.env.AKAN_PUBLIC_RENDER_ENV === "csr" ? getAllDictionary() : {};`
+    : `// dict.ts is cumulative, so a lib dictionary is a subset of the mounting app's. Translator state is global,
+// so the app's seed already resolves l() here — seeding again would ship the same payload a second time.
+const dictionary = {};`
+}
 const pageProto = makePageProto<typeof dict>(dictionary);
 const fetchProto = FetchClient.build<typeof signal>(cnst, getSerializedSignal(), { Err: pageProto.Err });
 export const runtime = registerClientRuntime({ ...pageProto, ...fetchProto }, { scope: ${JSON.stringify(scanInfo?.type ?? "lib")} });

package/templates/module/__Model__.Util.tsx

@@ -21,7 +21,7 @@ interface RemoveProps {
 export const Remove = ({ ${dict.model}Id }: RemoveProps) => {
   const { l } = usePage();
   return (
-    <Model.Remove modelId={${dict.model}Id} slice={fetch.slice["${dict.model}"]}>
+    <Model.Remove modelId={${dict.model}Id} slice={fetch.slice.${dict.model}}>
       <BiTrash /> {l("base.remove")}
     </Model.Remove>
   );

package/templates/module/__Model__.Zone.tsx

@@ -12,9 +12,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     content: `
 "use client";
 import { Load } from "akanjs/ui";
-// Alias the domain namespace so the Card/View exports below never collide with the model name
-// (a model literally named "card" or "view" would otherwise shadow this import).
-import { type cnst, ${dict.Model} as ${dict.Model}Domain } from "@${dict.sysType}s/${dict.sysName}/client";
+import { type cnst, ${dict.Model} as ${dict.Model} } from "@${dict.sysType}s/${dict.sysName}/client";
 import type { ClientInit, ClientView, SliceMeta } from "akanjs/fetch";
 
 interface CardProps {
@@ -28,7 +26,7 @@ export const Card = ({ className, init, slice }: CardProps) => {
       className={className}
       init={init}
       renderItem={(${dict.model}) => (
-        <${dict.Model}Domain.Unit.Card key={${dict.model}.id} href={\`/${dict.model}/\${${dict.model}.id}\`} ${dict.model}={${dict.model}} />
+        <${dict.Model}.Unit.Card key={${dict.model}.id} href={\`/${dict.model}/\${${dict.model}.id}\`} ${dict.model}={${dict.model}} />
       )}
     />
   );
@@ -39,7 +37,7 @@ interface ViewProps {
   view: ClientView<"${dict.model}", cnst.${dict.Model}>;
 }
 export const View = ({ view }: ViewProps) => {
-  return <Load.View view={view} renderView={(${dict.model}) => <${dict.Model}Domain.View.General ${dict.model}={${dict.model}} />} />;
+  return <Load.View view={view} renderView={(${dict.model}) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />} />;
 };
 `,
   };