@akanjs/cli 2.2.0-rc.4 → 2.2.0

package/incrementalBuilder.proc.js

@@ -4515,6 +4515,7 @@ async function appHasStModule(appCwdPath) {
   return Bun.file(path10.join(appCwdPath, "lib", "st.ts")).exists();
 }
 var IMPLICIT_LAYOUT_DIR = path10.join(".akan", "generated", "root-layouts");
+var IMPLICIT_DICT_DIR = path10.join(".akan", "generated", "dict");
 function getRootBoundarySegments(key) {
   const match = LAYOUT_KEY_RE.exec(key);
   if (!match)
@@ -4531,6 +4532,9 @@ function implicitRootLayoutAbsPath(appCwdPath, segments) {
   const filename = segments.length ? `${segments.join("__")}__root_layout.tsx` : "__root_layout.tsx";
   return path10.join(path10.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
 }
+function implicitDictionaryMacroAbsPath(appCwdPath) {
+  return path10.join(path10.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
+}
 function isRootBoundarySegments(segments, basePaths) {
   const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
   if (firstVisibleIndex === -1)
@@ -4582,10 +4586,22 @@ async function assertEnvClientConvention(appCwdPath, appName) {
     throw new Error(`[route-convention] app "${appName}" must provide env/env.client.ts exporting "env" for generated System.Provider`);
   }
 }
+async function writeGeneratedDictionaryMacroFile(appCwdPath, appName) {
+  const absPath = implicitDictionaryMacroAbsPath(appCwdPath);
+  await mkdir3(path10.dirname(absPath), { recursive: true });
+  await Bun.write(absPath, `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
+
+export const allDictionary = getAllDictionary();
+`);
+  return absPath;
+}
 async function writeGeneratedRootLayoutFile(opts) {
   await assertEnvClientConvention(opts.appCwdPath, opts.appName);
+  const dictMacroAbsPath = opts.includeSystemProvider ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName) : null;
   const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
   await mkdir3(path10.dirname(absPath), { recursive: true });
+  const dictMacroRel = dictMacroAbsPath ? path10.relative(path10.dirname(absPath), dictMacroAbsPath).split(path10.sep).join("/") : null;
+  const dictMacroSpecifier = dictMacroRel ? dictMacroRel.startsWith(".") ? dictMacroRel : `./${dictMacroRel}` : null;
   const sourceRel = opts.boundary.sourceAbsPath ? path10.relative(path10.dirname(absPath), opts.boundary.sourceAbsPath).split(path10.sep).join("/") : null;
   const sourceSpecifier = sourceRel ? sourceRel.startsWith(".") ? sourceRel : `./${sourceRel}` : null;
   const inheritedSourceAbsPath = opts.rootSourceAbsPath && opts.rootSourceAbsPath !== opts.boundary.sourceAbsPath ? opts.rootSourceAbsPath : null;
@@ -4607,12 +4623,8 @@ const userLayout = {};
 import { loadFonts } from "akanjs/client";
 import { System } from "akanjs/ui";
 import { env } from "@apps/${opts.appName}/env/env.client";
+import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
 ${clientImport}${inheritedImport}${userImport}
-// SSR builds (target=bun) load the full dictionary server-side and pass only the active locale to the client.
-// CSR builds (target=browser) fold this branch to undefined, so the macro-seeded dictionary is used and the
-// server-only dict module (which pulls @libs/*/server) is dead-code-eliminated out of the browser bundle.
-const getActiveLocaleDictionary =
-  process.env.AKAN_PUBLIC_RENDER_ENV === "ssr" ? (await import("@apps/${opts.appName}/lib/dict")).getDictionary : undefined;
 const userFonts = userLayout.fonts ?? inheritedLayout.fonts ?? [];
 const defaultFonts = userFonts.filter((font) => font.default);
 if (defaultFonts.length > 1) throw new Error("[route-convention] only one default font is allowed per root layout");
@@ -4644,7 +4656,7 @@ export default function GeneratedLayout({ children, params, searchParams }: Layo
       gaTrackingId={userLayout.gaTrackingId ?? inheritedLayout.gaTrackingId}
       layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
       reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
-      dictionary={getActiveLocaleDictionary ? getActiveLocaleDictionary(params.lang) : undefined}
+      dictionary={allDictionary[params.lang]}
     >
       <UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>
     </System.Provider>

package/index.js

@@ -4513,6 +4513,7 @@ async function appHasStModule(appCwdPath) {
   return Bun.file(path10.join(appCwdPath, "lib", "st.ts")).exists();
 }
 var IMPLICIT_LAYOUT_DIR = path10.join(".akan", "generated", "root-layouts");
+var IMPLICIT_DICT_DIR = path10.join(".akan", "generated", "dict");
 function getRootBoundarySegments(key) {
   const match = LAYOUT_KEY_RE.exec(key);
   if (!match)
@@ -4529,6 +4530,9 @@ function implicitRootLayoutAbsPath(appCwdPath, segments) {
   const filename = segments.length ? `${segments.join("__")}__root_layout.tsx` : "__root_layout.tsx";
   return path10.join(path10.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
 }
+function implicitDictionaryMacroAbsPath(appCwdPath) {
+  return path10.join(path10.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
+}
 function isRootBoundarySegments(segments, basePaths) {
   const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
   if (firstVisibleIndex === -1)
@@ -4580,10 +4584,22 @@ async function assertEnvClientConvention(appCwdPath, appName) {
     throw new Error(`[route-convention] app "${appName}" must provide env/env.client.ts exporting "env" for generated System.Provider`);
   }
 }
+async function writeGeneratedDictionaryMacroFile(appCwdPath, appName) {
+  const absPath = implicitDictionaryMacroAbsPath(appCwdPath);
+  await mkdir3(path10.dirname(absPath), { recursive: true });
+  await Bun.write(absPath, `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
+
+export const allDictionary = getAllDictionary();
+`);
+  return absPath;
+}
 async function writeGeneratedRootLayoutFile(opts) {
   await assertEnvClientConvention(opts.appCwdPath, opts.appName);
+  const dictMacroAbsPath = opts.includeSystemProvider ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName) : null;
   const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
   await mkdir3(path10.dirname(absPath), { recursive: true });
+  const dictMacroRel = dictMacroAbsPath ? path10.relative(path10.dirname(absPath), dictMacroAbsPath).split(path10.sep).join("/") : null;
+  const dictMacroSpecifier = dictMacroRel ? dictMacroRel.startsWith(".") ? dictMacroRel : `./${dictMacroRel}` : null;
   const sourceRel = opts.boundary.sourceAbsPath ? path10.relative(path10.dirname(absPath), opts.boundary.sourceAbsPath).split(path10.sep).join("/") : null;
   const sourceSpecifier = sourceRel ? sourceRel.startsWith(".") ? sourceRel : `./${sourceRel}` : null;
   const inheritedSourceAbsPath = opts.rootSourceAbsPath && opts.rootSourceAbsPath !== opts.boundary.sourceAbsPath ? opts.rootSourceAbsPath : null;
@@ -4605,12 +4621,8 @@ const userLayout = {};
 import { loadFonts } from "akanjs/client";
 import { System } from "akanjs/ui";
 import { env } from "@apps/${opts.appName}/env/env.client";
+import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
 ${clientImport}${inheritedImport}${userImport}
-// SSR builds (target=bun) load the full dictionary server-side and pass only the active locale to the client.
-// CSR builds (target=browser) fold this branch to undefined, so the macro-seeded dictionary is used and the
-// server-only dict module (which pulls @libs/*/server) is dead-code-eliminated out of the browser bundle.
-const getActiveLocaleDictionary =
-  process.env.AKAN_PUBLIC_RENDER_ENV === "ssr" ? (await import("@apps/${opts.appName}/lib/dict")).getDictionary : undefined;
 const userFonts = userLayout.fonts ?? inheritedLayout.fonts ?? [];
 const defaultFonts = userFonts.filter((font) => font.default);
 if (defaultFonts.length > 1) throw new Error("[route-convention] only one default font is allowed per root layout");
@@ -4642,7 +4654,7 @@ export default function GeneratedLayout({ children, params, searchParams }: Layo
       gaTrackingId={userLayout.gaTrackingId ?? inheritedLayout.gaTrackingId}
       layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
       reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
-      dictionary={getActiveLocaleDictionary ? getActiveLocaleDictionary(params.lang) : undefined}
+      dictionary={allDictionary[params.lang]}
     >
       <UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>
     </System.Provider>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.2.0-rc.4",
+  "version": "2.2.0",
   "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.2.0-rc.4",
+    "akanjs": "2.2.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",

package/templates/lib/dict.ts

@@ -1,10 +1,7 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
 const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
-export default function getContent(
-  scanInfo: AppInfo | LibInfo | null,
-  dict: { [key: string]: string } = {},
-) {
+export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
   if (!scanInfo) return null;
   const databaseModules = scanInfo.getDatabaseModules();
   const scalarModules = scanInfo.getScalarModules();
@@ -12,7 +9,7 @@ export default function getContent(
   const libs = scanInfo.getLibs();
   return `
 import { makeDictionary, makeTrans, registerScalarTrans, registerServiceTrans, registerModelTrans${libs.length === 0 ? `, dictionary as base` : ""} } from "akanjs/dictionary";
-${libs.length ? libs.map((lib) => `import { dictionary as ${lib} } from "@libs/${lib}/lib/dict";`).join("\n") : ""}
+${libs.length ? libs.map((lib) => `import { dictionary as ${lib} } from "@libs/${lib}/server";`).join("\n") : ""}
 
 ${databaseModules.map((module) => `import * as ${module} from "./${module}/${module}.dictionary";`).join("\n")}
 ${serviceModules.map((module) => `import * as ${module} from "./_${module}/${module}.dictionary";`).join("\n")}

package/templates/lib/sig.ts

@@ -15,7 +15,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   return `
 import { FetchClient } 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}/lib/sig";`).join("\n")}
+${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/server";`).join("\n")}
 
 ${[...scanInfo.database.entries()]
   .filter(([_, files]) => files.has("signal"))