@akanjs/cli 0.9.55 → 0.9.57

package/cjs/src/templates/module/__model__.dictionary.js

@@ -24,66 +24,26 @@ __export(model_dictionary_exports, {
 module.exports = __toCommonJS(model_dictionary_exports);
 function getContent(scanInfo, dict) {
   return `
-import { baseTrans, getBaseSignalTrans, ModelDictionary, SignalDictionary } from "@akanjs/dictionary";
-
-import type { ${dict.Model}, ${dict.Model}Filter, ${dict.Model}Insight, ${dict.Model}Summary } from "./${dict.model}.constant";
-import type { ${dict.Model}Signal } from "./${dict.model}.signal";
-
-export const modelDictionary = {
-  ...baseTrans,
-  modelName: ["${dict.Model}", "${dict.Model}"],
-  modelDesc: [
-    "${dict.Model} description",
-    "${dict.Model} \uC124\uBA85",
-  ],
-
-  // * ==================== Model ==================== * //
-  field: ["Field", "\uD544\uB4DC"],
-  "desc-field": ["Field", "\uD544\uB4DC"],
-  // * ==================== Model ==================== * //
-
-  // * ==================== Insight ==================== * //
-  count: ["Count", "\uAC1C\uC218"],
-  "desc-count": ["${dict.Model} count in current query settting", "\uD604\uC7AC \uCFFC\uB9AC \uC124\uC815\uC5D0 \uB9DE\uB294 \uBC30\uB108 \uC218"],
-  // * ==================== Insight ==================== * //
-
-  // * ==================== Filter ==================== * //
-  "qry-inStatus": ["In Status", "\uC0C1\uD0DC"],
-  "qrydesc-inStatus": ["Filter by status", "\uC0C1\uD0DC\uBCC4 \uD544\uD130\uB9C1"],
-  "qarg-inStatus-status": ["Status", "\uC0C1\uD0DC"],
-  "qargdesc-inStatus-status": ["Filter by status", "\uC0C1\uD0DC\uBCC4 \uD544\uD130\uB9C1"],
-  // * ==================== Filter ==================== * //
-
-  // * ==================== Etc ==================== * //
-  "enum-status-active": ["Active", "\uD65C\uC131"],
-  "enumdesc-status-active": ["Active status", "\uD65C\uC131 \uC0C1\uD0DC"],
-  // * ==================== Etc ==================== * //
-} satisfies ModelDictionary<${dict.Model}, ${dict.Model}Insight, ${dict.Model}Filter>;
-
-export const signalDictionary = {
-  ...getBaseSignalTrans("${dict.model}" as const),
-  // * ==================== Endpoint ==================== * //
-  "api-${dict.model}ListInPublic": ["${dict.Model} List In Public", "\uACF5\uAC1C\uB41C ${dict.Model} \uB9AC\uC2A4\uD2B8"],
-  "apidesc-${dict.model}ListInPublic": ["Get a list of public ${dict.model}", "\uACF5\uAC1C\uB41C ${dict.Model}\uC758 \uB9AC\uC2A4\uD2B8\uB97C \uAC00\uC838\uC635\uB2C8\uB2E4"],
-  "arg-${dict.model}ListInPublic-statuses": ["Statuses", "\uC0C1\uD0DC"],
-  "argdesc-${dict.model}ListInPublic-statuses": ["Statuses to filter", "\uD544\uD130\uB9C1\uD560 \uC0C1\uD0DC"],
-  "arg-${dict.model}ListInPublic-skip": ["Skip", "\uAC74\uB108\uB6F0\uAE30"],
-  "argdesc-${dict.model}ListInPublic-skip": ["Number of items to skip", "\uAC74\uB108\uB6F8 \uC544\uC774\uD15C \uC218"],
-  "arg-${dict.model}ListInPublic-limit": ["Limit", "\uC81C\uD55C"],
-  "argdesc-${dict.model}ListInPublic-limit": ["Maximum number of items to return", "\uBC18\uD658\uD560 \uCD5C\uB300 \uC544\uC774\uD15C \uC218"],
-  "arg-${dict.model}ListInPublic-sort": ["Sort", "\uC815\uB82C"],
-  "argdesc-${dict.model}ListInPublic-sort": ["Sort order of the items", "\uC544\uC774\uD15C\uC758 \uC815\uB82C \uC21C\uC11C"],
-
-  "api-${dict.model}InsightInPublic": ["${dict.Model} Insight In Public", "\uACF5\uAC1C\uB41C ${dict.Model} \uC778\uC0AC\uC774\uD2B8"],
-  "apidesc-${dict.model}InsightInPublic": [
-    "Get insight data for public ${dict.model}",
-    "\uACF5\uAC1C\uB41C ${dict.Model}\uC5D0 \uB300\uD55C \uC778\uC0AC\uC774\uD2B8 \uB370\uC774\uD130\uB97C \uAC00\uC838\uC635\uB2C8\uB2E4",
-  ],
-  "arg-${dict.model}InsightInPublic-statuses": ["Statuses", "\uC0C1\uD0DC"],
-  "argdesc-${dict.model}InsightInPublic-statuses": ["Statuses to filter", "\uD544\uD130\uB9C1\uD560 \uC0C1\uD0DC"],
-  // * ==================== Endpoint ==================== * //
-} satisfies SignalDictionary<${dict.Model}Signal, ${dict.Model}>;
-
-export const ${dict.model}Dictionary = { ...modelDictionary, ...signalDictionary };
+import { modelDictionary } from "@akanjs/dictionary";
+
+import type { ${dict.Model}, ${dict.Model}Insight } from "./${dict.model}.constant";
+import type { ${dict.Model}Filter } from "./${dict.model}.document";
+import type { ${dict.Model}Endpoint, ${dict.Model}Slice } from "./${dict.model}.signal";
+
+export const dictionary = modelDictionary(["en", "ko"])
+  .of((t) =>
+    t(["${dict.Model}", "${dict.Model}"]).desc(["${dict.Model} description", "${dict.Model} \uC124\uBA85"])
+  )
+  .model<${dict.Model}>((t) => ({
+    field: t(["Field", "\uD544\uB4DC"]).desc(["Field description", "\uD544\uB4DC \uC124\uBA85"]),
+  }))
+  .insight<${dict.Model}Insight>((t) => ({}))
+  .query<${dict.Model}Filter>((fn) => ({}))
+  .slice<${dict.Model}Slice>((fn) => ({
+    inPublic: fn(["${dict.Model} In Public", "${dict.Model} \uACF5\uAC1C"]).arg((t) => ({})),
+  }))
+  .endpoint<${dict.Model}Endpoint>((fn) => ({}))
+  .error({})
+  .translate({});
 `;
 }

package/cjs/src/templates/module/__model__.document.js

@@ -24,13 +24,18 @@ __export(model_document_exports, {
 module.exports = __toCommonJS(model_document_exports);
 function getContent(scanInfo, dict) {
   return `
-import { beyond, by, into, type SchemaOf } from "@akanjs/document";
+import { beyond, by, from, into, type SchemaOf } from "@akanjs/document";
 
 import * as cnst from "../cnst";
 
+export class ${dict.Model}Filter extends from(cnst.${dict.Model}, (filter) => ({
+  query: {},
+  sort: {},
+})) {}
+
 export class ${dict.Model} extends by(cnst.${dict.Model}) {}
 
-export class ${dict.Model}Model extends into(${dict.Model}, cnst.${dict.model}) {}
+export class ${dict.Model}Model extends into(${dict.Model}, ${dict.Model}Filter, cnst.${dict.model}) {}
 
 export class ${dict.Model}Middleware extends beyond(${dict.Model}Model, ${dict.Model}) {
   onSchema(schema: SchemaOf<${dict.Model}Model, ${dict.Model}>) {

package/cjs/src/templates/module/__model__.signal.js

@@ -24,36 +24,22 @@ __export(model_signal_exports, {
 module.exports = __toCommonJS(model_signal_exports);
 function getContent(scanInfo, dict) {
   return `
-import { Int } from "@akanjs/base";
-import type { SortOf } from "@akanjs/document";
-import { Arg, signal, Mutation, Query, resolve } from "@akanjs/signal";
+import { Public } from "@akanjs/nest";
+import { endpoint, internal, slice } from "@akanjs/signal";
+import { Admin } from "@shared/nest";
 
 import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.Model}Signal extends signal(cnst.${dict.model}, cnst.Srvs, {
-  guards: { get: "Public", cru: "Public },
-}) {
-  // * /////////////////////////////////////
-  // * Public Slice
-  @Query.Public(() => [cnst.${dict.Model}])
-  async ${dict.model}ListInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null,
-    @Arg.Query("skip", () => Int, { nullable: true }) skip: number | null,
-    @Arg.Query("limit", () => Int, { nullable: true }) limit: number | null,
-    @Arg.Query("sort", () => String, { nullable: true }) sort: SortOf<cnst.${dict.Model}Filter> | null
-  ) {
-    const ${dict.models} = await this.${dict.model}Service.listByStatuses(statuses, { skip, limit, sort });
-    return resolve<cnst.${dict.Model}[]>(${dict.models});
-  }
-  @Query.Public(() => cnst.${dict.Model}Insight)
-  async ${dict.model}InsightInPublic(
-    @Arg.Query("statuses", () => [String], { nullable: true }) statuses: cnst.${dict.Model}Status[] | null
-  ) {
-    const ${dict.model}Insight = await this.${dict.model}Service.insightByStatuses(statuses);
-    return resolve<cnst.${dict.Model}Insight>(${dict.model}Insight);
-  }
-  // * Public Slice
-  // * /////////////////////////////////////
-}
+export class ${dict.Model}Internal extends internal(srv.${dict.model}, () => ({})) {}
+
+export class ${dict.Model}Slice extends slice(srv.${dict.model}, { guards: { root: Admin, get: Public, cru: Public } }, (init) => ({
+  inPublic: init()
+    .exec(function () {
+      return this.${dict.model}Service.queryAny();
+    }),
+})) {}
+
+export class ${dict.Model}Endpoint extends endpoint(srv.${dict.model}, () => ({})) {}
 `;
 }

package/cjs/src/templates/module/__model__.store.js

@@ -26,8 +26,7 @@ function getContent(scanInfo, dict) {
   return `
 import { store } from "@akanjs/store";
 
-import * as cnst from "../cnst";
-import { fetch, sig } from "../useClient";
+import { sig } from "../useClient";
 
 export class ${dict.Model}Store extends store(sig.${dict.model}, {
   // state

package/cjs/src/templates/server.js

@@ -31,15 +31,15 @@ function getContent(scanInfo, dict = {}) {
   const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("service"));
   const scalarModules = [...scanInfo.scalar.entries()];
   return `
-import { databaseModuleOf, scalarModulesOf, serviceModuleOf, type Module } from "@akanjs/server";
-${libs.map((lib) => `import { registerModules as register${capitalize(lib)}Modules } from "@${lib}/server";`).join("\n")}
+import { databaseModuleOf, scalarModulesOf, serviceModuleOf, type Module, type Middleware } from "@akanjs/server";
+${libs.map((lib) => `import { registerModules as register${capitalize(lib)}Modules, registerMiddlewares as register${capitalize(lib)}Middlewares } from "@${lib}/server";`).join("\n")}
   
 import * as cnst from "./lib/cnst";
 import * as db from "./lib/db";
 import * as srv from "./lib/srv";
 import { allSrvs } from "./lib/srv";
 import * as sig from "./lib/sig";
-import { type ModulesOptions, registerGlobalModule } from "./lib/option";
+import { type ModulesOptions, registerGlobalModule, registerGlobalMiddlewares } from "./lib/option";
 
 // database modules
 ${databaseModules.map(([model]) => {
@@ -67,6 +67,14 @@ ${databaseModules.map(([model]) => `    register${capitalize(model)}Module(),`).
   return modules;
 };
 
+export const registerMiddlewares = (options: ModulesOptions, isChild?: boolean) => {
+  const middlewares = [
+${libs.map((lib) => `    ...(!isChild ? register${capitalize(lib)}Middlewares(options, true) : []),`).join("\n")}
+    ...registerGlobalMiddlewares(options),
+  ] as Middleware[];
+  return middlewares;
+};
+
 export { env } from "./env/env.server.testing";
 export * as db from "./lib/db";
 export * as srv from "./lib/srv";

package/cjs/src/templates/workspaceRoot/.gitignore.template

@@ -11,10 +11,12 @@ apps/*/data
 /releases
 apps/*/scripts
 **/.env
+**/env.client.local.ts
 **/env.client.debug.ts
 **/env.client.develop.ts
 **/env.client.main.ts
 **/env.client.testing.ts
+**/env.server.local.ts
 **/env.server.debug.ts
 **/env.server.develop.ts
 **/env.server.main.ts

package/esm/index.js

@@ -208,7 +208,7 @@ var Logger = class _Logger {
     const contentMsg = this.#colorize(content, logLevel);
     const timeDiffMsg = clc.yellow(`+${now.diff(_Logger.#startAt, "ms")}ms`);
     if (typeof window === "undefined")
-      process[writeStreamType].write(
+      process[writeStreamType]?.write(
         `${processMsg} ${timestampMsg} ${logLevelMsg} ${contextMsg} ${contentMsg} ${timeDiffMsg}
 `
       );
@@ -1986,10 +1986,10 @@ var Executor = class _Executor {
     this.logger.verbose(`Remove file ${readPath}`);
     return this;
   }
-  removeDir(dirPath) {
+  async removeDir(dirPath) {
     const readPath = this.getPath(dirPath);
     if (fs8.existsSync(readPath))
-      fs8.rmSync(readPath, { recursive: true });
+      await fs8.promises.rm(readPath, { recursive: true });
     this.logger.verbose(`Remove directory ${readPath}`);
     return this;
   }
@@ -2037,7 +2037,8 @@ var Executor = class _Executor {
     const dest = this.getPath(destPath);
     if (!fs8.existsSync(src))
       return;
-    if (!fs8.existsSync(dest))
+    const isDirectory = fs8.statSync(src).isDirectory();
+    if (!fs8.existsSync(dest) && isDirectory)
       await fsPromise.mkdir(dest, { recursive: true });
     await fsPromise.cp(src, dest, { recursive: true });
   }
@@ -2592,32 +2593,23 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
     return this.#akanConfig;
   }
   async syncAssets(libDeps) {
-    const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
+    const projectPublicPath = `${this.cwdPath}/public`;
+    const projectAssetsPath = `${this.cwdPath}/assets`;
+    const projectPublicLibPath = `${projectPublicPath}/libs`;
+    const projectAssetsLibPath = `${projectAssetsPath}/libs`;
+    await Promise.all([this.removeDir(projectPublicLibPath), this.removeDir(projectAssetsLibPath)]);
+    const targetPublicDeps = libDeps.filter((dep) => this.exists(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
+    const targetAssetsDeps = libDeps.filter((dep) => this.exists(`${this.workspace.workspaceRoot}/libs/${dep}/assets`));
     await Promise.all([
-      fs8.existsSync(projectPublicLibPath) && fsPromise.rm(projectPublicLibPath, { recursive: true }),
-      fs8.existsSync(projectAssetsLibPath) && fsPromise.rm(projectAssetsLibPath, { recursive: true })
-    ]);
-    const targetPublicDeps = libDeps.filter(
-      (dep) => fs8.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`)
-    );
-    const targetAssetsDeps = libDeps.filter(
-      (dep) => fs8.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`)
-    );
-    await Promise.all([
-      ...targetPublicDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
-      ...targetAssetsDeps.map((dep) => fsPromise.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
+      ...targetPublicDeps.map((dep) => this.mkdir(`${projectPublicLibPath}/${dep}`)),
+      ...targetAssetsDeps.map((dep) => this.mkdir(`${projectAssetsLibPath}/${dep}`))
     ]);
     await Promise.all([
       ...targetPublicDeps.map(
-        (dep) => fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
-          recursive: true
-        })
+        (dep) => this.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`)
       ),
       ...targetAssetsDeps.map(
-        (dep) => fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
-          recursive: true
-        })
+        (dep) => this.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`)
       )
     ]);
   }
@@ -5923,8 +5915,8 @@ var requestUnit = ({
 var ModuleRunner = class {
   async createModule(workspace, sysType, sysName, moduleName, description) {
   }
-  removeModule(module) {
-    module.sys.removeDir(`lib/${module.name}`);
+  async removeModule(module) {
+    await module.sys.removeDir(`lib/${module.name}`);
   }
   async createComponentTemplate(module, type) {
     await module.sys.applyTemplate({
@@ -6061,8 +6053,8 @@ var ModuleScript = class {
     await this.createTemplate(executor);
     sys3.log(`Module ${name} created in ${sys3.type}s/${sys3.name}/lib/${name}`);
   }
-  removeModule(mod) {
-    this.#runner.removeModule(mod);
+  async removeModule(mod) {
+    await this.#runner.removeModule(mod);
   }
   async createService(workspace, name) {
   }
@@ -6140,8 +6132,8 @@ var ModuleCommand = class {
     const name = lowerlize(moduleName.replace(/ /g, ""));
     await this.moduleScript.createModuleTemplate(sys3, name, { page });
   }
-  removeModule(module) {
-    this.moduleScript.removeModule(module);
+  async removeModule(module) {
+    await this.moduleScript.removeModule(module);
   }
   async createView(module) {
     await this.moduleScript.createView(module);
@@ -6940,8 +6932,8 @@ var ScalarScript = class {
     const { session, scalarNames } = await this.#runner.createScalarConstant(sys3, scalarName);
     await this.#runner.updateScalarDictionaries(sys3, scalarNames, { session });
   }
-  removeScalar(sys3, scalarName) {
-    sys3.removeDir(`lib/__scalar/${scalarName}`);
+  async removeScalar(sys3, scalarName) {
+    await sys3.removeDir(`lib/__scalar/${scalarName}`);
   }
 };
 
@@ -6951,8 +6943,8 @@ var ScalarCommand = class {
   async createScalar(sys3, scalarName) {
     await this.scalarScript.createScalar(sys3, lowerlize(scalarName.replace(/ /g, "")));
   }
-  removeScalar(sys3, scalarName) {
-    this.scalarScript.removeScalar(sys3, scalarName);
+  async removeScalar(sys3, scalarName) {
+    await this.scalarScript.removeScalar(sys3, scalarName);
   }
 };
 __decorateClass([

package/esm/src/guidelines/databaseModule/databaseModule.instruction.md

@@ -207,7 +207,7 @@ import * as cnst from "../cnst";
 import type * as db from "../db";
 
 export class UserSignal extends DbSignal(cnst.userCnst, cnst.Srvs, {
-  guards: { get: Query.Public, cru: Mutation.Admin },
+  guards: { root: Admin, get: Query.Public, cru: Mutation.Admin },
 }) {
   @Mutation.Public(() => cnst.util.AccessToken)
   async signin(
@@ -578,30 +578,36 @@ export const Layout = () => (
 ## Best Practices
 
 1. **Naming Conventions**
+
    - Use PascalCase for classes and components (e.g., `UserService`, `User.Unit.tsx`)
    - Use camelCase for files (e.g., `user.service.ts`, `user.document.ts`)
 
 2. **Security**
+
    - Use `@Field.Secret` for sensitive data like passwords
    - Apply proper permission guards to queries and mutations (`@Query.Admin`, `@Mutation.Public`)
    - Validate input data using the `validate` option in `@Field.Prop`
 
 3. **Code Organization**
+
    - Keep business logic in service files
    - Use signals for API calls only, not for business logic
    - Define reusable utility methods in document models
 
 4. **Performance**
+
    - Use dataloader pattern (`@Loader.ByField`) for efficient database access
    - Create proper indexes in the middleware
    - Use projections to limit returned fields when appropriate
 
 5. **Testing**
+
    - Create signal tests for each API endpoint
    - Mock services for unit testing signals
    - Use integration tests for testing complex workflows
 
 6. **UI Components**
+
    - Follow the separation between Template, Unit, View, and Zone components
    - Make components reusable across different parts of the application
    - Use dictionary files for all UI text to support internationalization

package/esm/src/guidelines/modelSignal/modelSignal.instruction.md

@@ -27,7 +27,7 @@ import * as cnst from "../cnst";
 import type * as db from "../db";
 
 export class ModelNameSignal extends DbSignal(cnst.modelNameCnst, cnst.Srvs, {
-  guards: { get: Query.Public, cru: Mutation.User },
+  guards: { root: Admin, get: Query.Public, cru: Mutation.User },
 }) {
   // Signal methods here...
 }
@@ -259,7 +259,7 @@ DbSignal creates standard operations that you don't need to implement:
 
 ```typescript
 export class BoardSignal extends DbSignal(cnst.boardCnst, cnst.Srvs, {
-  guards: { get: Query.Public, cru: Mutation.Admin },
+  guards: { root: Admin, get: Query.Public, cru: Mutation.Admin },
 }) {
   // Custom methods beyond CRUD go here
 }
@@ -378,7 +378,7 @@ async getProjectDetails(
 
 ```typescript
 export class ProductSignal extends DbSignal(cnst.productCnst, cnst.Srvs, {
-  guards: { get: Query.Public, cru: Mutation.Admin },
+  guards: { root: Admin, get: Query.Public, cru: Mutation.Admin },
 }) {
   // Custom methods beyond auto-generated CRUD
   @Query.Public(() => [cnst.Product])

package/esm/src/guidelines/modelTemplate/modelTemplate.instruction.md

@@ -49,7 +49,7 @@ export const General = ({ id }: { id?: string }) => {
   return (
     <div className="grid grid-cols-1 gap-4">
       <Field.Text
-        label={l.field("model", "fieldName")}
+        label={l("model.fieldName")}
         value={form.fieldName}
         onChange={(v) => st.do.setFieldNameOn[Model](v)}
       />
@@ -139,7 +139,7 @@ useEffect(() => {
 
 ```tsx
 <Field.List
-  label={l.field("map", "spawnPositions")}
+  label={l("map.spawnPositions")}
   value={form.spawnPositions}
   onAdd={() => st.do.addSpawnPosition(defaultPosition)}
   renderItem={(position, idx) => (
@@ -201,12 +201,12 @@ useEffect(() => {
 const { l } = usePage();
 
 // Basic field
-<Field.Text label={l.field("model", "name")} />
+<Field.Text label={l("model.name")} />
 
 // With description
 <Field.Text
-  label={l.field("model", "email")}
-  desc={l.desc("model", "email")}
+  label={l("model.email")}
+  desc={l("model.email.desc")}
 />
 
 // Dynamic content

package/esm/src/guidelines/sharedUiUsage/sharedUiUsage.generate.json

@@ -85,13 +85,6 @@
       "path": "{apps,libs}/*/lib/*/*.{Template,Unit,View,Zone}.tsx",
       "filterText": "sliceName",
       "sample": 5
-    },
-    {
-      "type": "example",
-      "description": "Internationalization usage examples",
-      "path": "{apps,libs}/*/lib/*/*.{Template,Unit,View}.tsx",
-      "filterText": "l.field",
-      "sample": 3
     }
   ],
   "update": {

package/esm/src/guidelines/sharedUiUsage/sharedUiUsage.instruction.md

@@ -64,8 +64,8 @@ const MyComponent = () => {
   return (
     <>
       <Field.Text
-        label={l.field("myModel", "title")}
-        desc={l.desc("myModel", "title")}
+        label={l("myModel.title")}
+        desc={l("myModel.title.desc")}
         value={formState.title}
         onChange={(value) => st.do.setTitleOnMyModel(value)}
         nullable={false}
@@ -73,8 +73,8 @@ const MyComponent = () => {
       />
 
       <Field.Number
-        label={l.field("myModel", "amount")}
-        desc={l.desc("myModel", "amount")}
+        label={l("myModel.amount")}
+        desc={l("myModel.amount.desc")}
         value={formState.amount}
         onChange={(value) => st.do.setAmountOnMyModel(value)}
         min={0}
@@ -83,8 +83,8 @@ const MyComponent = () => {
       />
 
       <Field.ToggleSelect
-        label={l.field("myModel", "status")}
-        desc={l.desc("myModel", "status")}
+        label={l("myModel.status")}
+        desc={l("myModel.status.desc")}
         value={formState.status}
         items={cnst.Status}
         onChange={(status) => st.do.setStatusOnMyModel(status)}
@@ -266,7 +266,7 @@ Components automatically integrate with the internationalization system:
 ```tsx
 const { l } = usePage();
 
-<Field.Text label={l.field("user", "name")} desc={l.desc("user", "name")} placeholder={l("user.namePlaceholder")} />;
+<Field.Text label={l("user.name")} desc={l("user.name.desc")} placeholder={l("user.namePlaceholder")} />;
 ```
 
 ### State Management Integration

package/esm/src/templates/__scalar/__model__/__model__.constant.js

@@ -3,7 +3,6 @@ function getContent(scanInfo, dict) {
   return `
 import { via } from "@akanjs/constant";
 
-
 export class ${dict.Model} extends via((field) => ({
   field: field(String),
 })) {}

package/esm/src/templates/__scalar/__model__/__model__.dictionary.js

@@ -5,7 +5,7 @@ import { ModelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-export const modelDictionary = {
+export const dictionary = {
   modelName: ["${dict.Model}", "${dict.Model}"],
   modelDesc: ["${dict.Model}", "${dict.Model}"],
 
@@ -17,8 +17,6 @@ export const modelDictionary = {
   // * ==================== Etc ==================== * //
   // * ==================== Etc ==================== * //
 } satisfies ModelDictionary<${dict.Model}>;
-
-export const ${dict.model}Dictionary = modelDictionary;
 `;
 }
 export {

package/esm/src/templates/app/instrumentation.js

@@ -0,0 +1,12 @@
+// pkgs/@akanjs/cli/src/templates/app/instrumentation.ts
+function getContent(scanInfo, dict) {
+  return `
+import { registerClient } from "./client";
+
+export const register = async () => {
+  await registerClient();
+};`;
+}
+export {
+  getContent as default
+};

package/esm/src/templates/app/lib/___appName__/__appName__.dictionary.js

@@ -2,13 +2,9 @@
 function getContent(scanInfo, dict) {
   return `
 import type { SignalDictionary } from "@akanjs/dictionary";
-import type { ${dict.AppName}Signal } from "./${dict.appName}.signal";
+import type { ${dict.AppName}Endpoint } from "./${dict.appName}.signal";
 
-const dictionary = {} as const;
-
-export const signalDictionary = {} satisfies SignalDictionary<${dict.AppName}Signal>;
-
-export const ${dict.appName}Dictionary = { ...dictionary, ...signalDictionary };
+export const dictionary = {} satisfies SignalDictionary<${dict.AppName}Endpoint>;
   `;
 }
 export {

package/esm/src/templates/app/lib/___appName__/__appName__.signal.js

@@ -1,11 +1,13 @@
 // pkgs/@akanjs/cli/src/templates/app/lib/___appName__/__appName__.signal.ts
 function getContent(scanInfo, dict) {
   return `
-import { signal } from "@akanjs/signal";
+import { endpoint, internal } from "@akanjs/signal";
 
-import * as cnst from "../cnst";
+import * as srv from "../srv";
 
-export class ${dict.AppName}Signal extends signal("${dict.AppName}" as const, cnst.Srvs) {}
+export class ${dict.AppName}Internal extends internal(srv.${dict.appName}, () => ({})) {}
+
+export class ${dict.AppName}Endpoint extends endpoint(srv.${dict.appName}, () => ({})) {}
   `;
 }
 export {

package/esm/src/templates/app/lib/option.js

@@ -1,7 +1,7 @@
 // pkgs/@akanjs/cli/src/templates/app/lib/option.ts
 function getContent(scanInfo, dict = {}) {
   return `
-import { useGlobals } from "@akanjs/server";
+import { Middleware, useGlobals } from "@akanjs/server";
 
 import type { LibOptions } from "./__lib/lib.service";
 
@@ -15,6 +15,11 @@ export const registerGlobalModule = (options: ModulesOptions) => {
     useAsyncs: {},
   });
 };
+
+export const registerGlobalMiddlewares = (options: ModulesOptions) => {
+  return [] as Middleware[];
+};
+
   `;
 }
 export {

package/esm/src/templates/app/main.js

@@ -4,12 +4,12 @@ function getContent(scanInfo, dict) {
 import { createNestApp } from "@akanjs/server";
 
 import { env } from "./env/env.server";
-import { registerModules } from "./server";
+import { registerModules, registerMiddlewares } from "./server";
 
 const bootstrap = async () => {
   const serverMode = process.env.SERVER_MODE as "federation" | "batch" | "all" | null;
   if (!serverMode) throw new Error("SERVER_MODE environment variable is not defined");
-  await createNestApp({ registerModules, serverMode, env });
+  await createNestApp({ registerModules, registerMiddlewares, serverMode, env });
 };
 void bootstrap();
   `;

package/esm/src/templates/lib/__lib/lib.dictionary.js

@@ -19,8 +19,7 @@ ${libs.map((lib) => `import { dict as ${lib} } from "@${lib}/server";`).join("\n
 
 ${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
     return `export const ${modelName} = {
-  models: Object.assign({}, ${extendedModels2.map((libName) => `${libName}.${modelName}.modelDictionary`).join(", ")}),
-  signals: Object.assign({}, ${extendedModels2.map((libName) => `${libName}.${modelName}.signalDictionary`).join(", ")}),
+  dictionaries: [${extendedModels2.map((libName) => `${libName}.${modelName}.dictionary`).join(", ")}] as const,
 };`;
   }).join("\n")}