@akanjs/cli 0.9.48 → 0.9.49

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

@@ -40,7 +40,7 @@ Model.Template.tsx files are client-side React components that define the form s
 "use client";
 import { Field } from "@shared/ui";
 import { st } from "@[project]/client";
-import { usePage } from "@[project]/lib/usePage";
+import { usePage } from "@[project]/lib/useClient";
 
 export const General = ({ id }: { id?: string }) => {
   const form = st.use.[model]Form();
@@ -466,7 +466,7 @@ const DockerRegistry = ({ value, onChange }) => (
 
 ```tsx
 // Model.constant.ts
-@Model.Input("ProjectInput")
+
 export class ProjectInput {
   @Field.Prop(() => String)
   name: string;

package/cjs/src/guidelines/modelUnit/modelUnit.instruction.md

@@ -148,7 +148,7 @@ Model Units work with LightModel types defined in constant files:
 
 ```tsx
 // In your constant.ts file
-@Model.Light("LightProduct")
+
 export class LightProduct extends via(ProductObject, ["name", "price", "sku", "inStock"] as const) {
   get displayPrice() {
     return `${this.price.toLocaleString()} KRW`;
@@ -503,7 +503,7 @@ Type error: Property 'description' does not exist on type 'LightProduct'
 
 ```tsx
 // In constant.ts
-@Model.Light("LightProduct")
+
 export class LightProduct extends via(ProductObject, ["name", "price", "sku"] as const) {
   // Only these fields are guaranteed to be available
 }

package/cjs/src/guidelines/scalarConstant/scalarConstant.instruction.md

@@ -41,7 +41,7 @@ export const Status = enumOf(["active", "inactive"] as const);
 export type Status = enumOf<typeof Status>;
 
 // 3. Scalar model class (SINGLE CLASS PER FILE)
-@Model.Scalar("ScalarName") // Must match class name
+// Must match class name
 export class ScalarName {
   // Field definitions
   @Field.Prop(() => FieldType, { ...options })
@@ -74,7 +74,7 @@ import { OtherScalar } from "../other-scalar/other-scalar.constant";
 ### Basic Structure
 
 ```typescript
-@Model.Scalar("ScalarName") // String must match class name
+// String must match class name
 export class ScalarName {
   // Field definitions go here
 }
@@ -207,7 +207,6 @@ status: Status;
 Scalar classes can include static methods for common operations on the scalar type:
 
 ```typescript
-@Model.Scalar("Coordinate")
 export class Coordinate {
   @Field.Prop(() => [Float], { default: [0, 0] })
   coordinates: number[];
@@ -305,8 +304,8 @@ export type Status = enumOf<typeof Status>;
 
 ```typescript
 // ❌ Wrong (violates single-responsibility)
-@Model.Scalar("Address") class Address { ... }
-@Model.Scalar("User") class User { ... }
+ class Address { ... }
+ class User { ... }
 
 // ✅ Correct (separate files)
 // address.constant.ts
@@ -339,7 +338,7 @@ createdAt: Dayjs;
 export class GeoLocation { ... }
 
 // ✅ Correct
-@Model.Scalar("GeoLocation")
+
 export class GeoLocation { ... }
 ```
 
@@ -352,7 +351,6 @@ export class GeoLocation { ... }
 import { Float } from "@akanjs/base";
 import { Field, Model } from "@akanjs/constant";
 
-@Model.Scalar("Amount")
 export class Amount {
   @Field.Prop(() => Float, { min: 0, default: 0 })
   value: number;
@@ -373,7 +371,6 @@ import { Field, Model } from "@akanjs/constant";
 export const AccuracyLevel = enumOf(["low", "medium", "high"] as const);
 export type AccuracyLevel = enumOf<typeof AccuracyLevel>;
 
-@Model.Scalar("GeoLocation")
 export class GeoLocation {
   @Field.Prop(() => Float, {
     min: -90,
@@ -418,7 +415,6 @@ import { Int, Float } from "@akanjs/base";
 import { Field, Model } from "@akanjs/constant";
 import { Dimension } from "../dimension/dimension.constant";
 
-@Model.Scalar("ProductSpec")
 export class ProductSpec {
   @Field.Prop(() => String)
   sku: string;
@@ -450,7 +446,6 @@ export class ProductSpec {
 import { Float } from "@akanjs/base";
 import { Field, Model } from "@akanjs/constant";
 
-@Model.Scalar("Coordinate")
 export class Coordinate {
   @Field.Prop(() => [Float], { default: [0, 0], example: [127.114367, 37.497114] })
   coordinates: number[];
@@ -477,7 +472,7 @@ export class Coordinate {
 1. **Location**: `__scalar/<camelCase>/<camelCase>.constant.ts`
 2. **Structure**: Single `@Model.Scalar` class per file
 3. **Naming**: Class name = PascalCase directory name
-4. **Decorator**: `@Model.Scalar("ClassName")` with exact class name match
+4. **Decorator**: `` with exact class name match
 5. **Enum Values**: Always camelCase (`active`, not `ACTIVE`)
 6. **Fields**: Use `@Field.Prop` with arrow function types
 7. **Arrays**: Wrap in `[]` (e.g., `[Int]`)

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

@@ -24,12 +24,11 @@ __export(model_constant_exports, {
 module.exports = __toCommonJS(model_constant_exports);
 function getContent(scanInfo, dict) {
   return `
-import { Field, Model } from "@akanjs/constant";
+import { via } from "@akanjs/constant";
 
-@Model.Scalar("${dict.Model}")
-export class ${dict.Model} {
-  @Field.Prop(() => String)
-  field: string;
-}
+
+export class ${dict.Model} extends via((field) => ({
+  field: field(String),
+})) {}
 `;
 }

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

@@ -28,7 +28,7 @@ import { ModelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-const modelDictionary = {
+export const modelDictionary = {
   modelName: ["${dict.Model}", "${dict.Model}"],
   modelDesc: ["${dict.Model}", "${dict.Model}"],
 

package/cjs/src/templates/app/app/[lang]/layout.js

@@ -43,7 +43,6 @@ export default function Layout({ children, params }: RootLayoutProps) {
       head={<link rel="icon" href="/favicon.ico" />}
       // className="bg-base-100"
       env={env}
-      fetch={fetch}
     >
       {children}
     </System.Provider>

package/cjs/src/templates/app/app/csr.js

@@ -28,7 +28,9 @@ function getContent(scanInfo, dict) {
     content: `
 import { bootCsr } from "@akanjs/next";
 
-void bootCsr(import.meta.glob("./**/*.tsx"));
+import { registerClient } from "../client";
+
+void bootCsr(import.meta.glob("./**/*.tsx"), registerClient);
   `
   };
 }

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

@@ -29,7 +29,7 @@ import type { ${dict.AppName}Signal } from "./${dict.appName}.signal";
 
 const dictionary = {} as const;
 
-const signalDictionary = {} satisfies SignalDictionary<${dict.AppName}Signal>;
+export const signalDictionary = {} satisfies SignalDictionary<${dict.AppName}Signal>;
 
 export const ${dict.appName}Dictionary = { ...dictionary, ...signalDictionary };
   `;

package/cjs/src/templates/app/lib/___appName__/__appName__.service.js

@@ -24,9 +24,8 @@ __export(appName_service_exports, {
 module.exports = __toCommonJS(appName_service_exports);
 function getContent(scanInfo, dict) {
   return `
-import { LogService, Service } from "@akanjs/service";
+import { serve } from "@akanjs/service";
 
-@Service("${dict.appName}Service", { serverMode: "batch" })
-export class ${dict.AppName}Service extends LogService("${dict.appName}Service") {}
+export class ${dict.AppName}Service extends serve("${dict.appName}" as const, { serverMode: "batch" }) {}
 `;
 }

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

@@ -24,11 +24,10 @@ __export(appName_signal_exports, {
 module.exports = __toCommonJS(appName_signal_exports);
 function getContent(scanInfo, dict) {
   return `
-import { LogSignal, Signal } from "@akanjs/signal";
+import { signal } from "@akanjs/signal";
 
 import * as cnst from "../cnst";
 
-@Signal({ name: "${dict.AppName}" })
-export class ${dict.AppName}Signal extends LogSignal(cnst.Srvs) {}
+export class ${dict.AppName}Signal extends signal("${dict.AppName}" as const, cnst.Srvs) {}
   `;
 }

package/cjs/src/templates/app/lib/___appName__/__appName__.store.js

@@ -24,10 +24,9 @@ __export(appName_store_exports, {
 module.exports = __toCommonJS(appName_store_exports);
 function getContent(scanInfo, dict) {
   return `
-import { scalarStateOf, Store } from "@akanjs/store";
+import { store } from "@akanjs/store";
 
-@Store({ name: "${dict.appName}" })
-export class ${dict.AppName}Store extends scalarStateOf("${dict.appName}" as const, {
+export class ${dict.AppName}Store extends store("${dict.appName}" as const, {
   // state
 }) {
   // action

package/cjs/src/templates/client.js

@@ -36,10 +36,10 @@ function getContent(scanInfo, dict = {}) {
     ([_, fileTypes]) => fileTypes.has("template") || fileTypes.has("unit") || fileTypes.has("util") || fileTypes.has("view") || fileTypes.has("zone")
   ).map(([key]) => key);
   return `
-export { Revert, msg, usePage } from "./lib/usePage";
-export { st, store } from "./lib/st";
-export { fetch } from "./lib/sig";
-export * as cnst from "./lib/cnst"
+export * as cnst from "./lib/cnst";
+export { msg, Revert, usePage, fetch, sig, registerClient } from "./lib/useClient";
+export { st, RootStore } from "./lib/st";
+export * as store from "./lib/st";
 ${scalarModules.map((module2) => `export { ${capitalize(module2)} } from "./lib/__scalar/${module2}";`).join("\n")}
 ${serviceModules.map((module2) => `export { ${capitalize(module2)} } from "./lib/_${module2}";`).join("\n")}
 ${databaseModules.map((module2) => `export { ${capitalize(module2)} } from "./lib/${module2}";`).join("\n")}

package/cjs/src/templates/crudPages/[__model__Id]/edit/page.js

@@ -48,7 +48,7 @@ export default function Page({ params }: PageProps) {
         <div className="container">
           <div className="flex justify-between m-4 mt-8">
             <div className="text-xl text-primary flex gap-2 items-center">
-              {l("shared.updateModel", { model: l("${dict.model}.modelName") })}
+              {l("base.updateModel", { model: l("${dict.model}.modelName") })}
             </div>
           </div>
           <Load.Edit

package/cjs/src/templates/crudPages/[__model__Id]/page.js

@@ -63,7 +63,7 @@ export default function Page({ params }: PageProps) {
             <${dict.Model}.Zone.View view={${dict.model}View} />
             <Link href={\`/${dict.model}/\${${dict.model}.id}/edit\`}>
               <button className="btn">
-                {l("shared.updateModel", { model: l("${dict.model}.modelName") })}
+                {l("base.updateModel", { model: l("${dict.model}.modelName") })}
               </button>
             </Link>
           </div>

package/cjs/src/templates/crudPages/new/page.js

@@ -43,7 +43,7 @@ export default function Page() {
         <div className="container">
           <div className="flex justify-between m-4 mt-8">
             <div className="text-xl text-primary flex gap-2 items-center">
-              + {l("shared.createModel", { model: l("${dict.model}.modelName") })}
+              + {l("base.createModel", { model: l("${dict.model}.modelName") })}
             </div>
           </div>
           <Load.Edit

package/cjs/src/templates/crudPages/page.js

@@ -46,7 +46,7 @@ export default function Page() {
             <div className="animate-fadeIn px-4 pt-4 flex gap-4 items-center">
               <div className="font-bold text-lg md:text-4xl">${dict.Model}s</div>
               <Link href={\`/${dict.model}/new\`}>
-                <button className="btn">+ {l("shared.createModel", { model: l("${dict.model}.modelName") })}</button>
+                <button className="btn">+ {l("base.createModel", { model: l("${dict.model}.modelName") })}</button>
               </Link>
             </div>
             <div>{l("${dict.model}.modelDesc")}</div>

package/cjs/src/templates/index.js

@@ -25,6 +25,5 @@ module.exports = __toCommonJS(templates_exports);
 function getContent(scanInfo, dict = {}) {
   return `
 export * as cnst from "./lib/cnst";
-export { fetch } from "./lib/sig";
 `;
 }

package/cjs/src/templates/lib/__lib/lib.constant.js

@@ -50,7 +50,6 @@ ${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
   lights: [${extendedModels2.map((libName) => `${libName}.Light${ModelName}`).join(", ")}] as const,
   models: [${extendedModels2.map((libName) => `${libName}.${ModelName}`).join(", ")}] as const,
   insights: [${extendedModels2.map((libName) => `${libName}.${ModelName}Insight`).join(", ")}] as const,
-  filters: [${extendedModels2.map((libName) => `${libName}.${ModelName}Filter`).join(", ")}] as const,
 }`;
   }).join("\n")}
 

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

@@ -37,13 +37,16 @@ function getContent(scanInfo, dict = {}) {
     ).filter(([_, libNames]) => libNames.length > 0)
   );
   return `
-${libs.length === 0 ? `import { dictionary as base } from "@akanjs/dictionary";` : ""}
-${libs.map((lib) => `import { dictionary as ${lib} } from "@${lib}/server";`).join("\n")}
+${libs.length === 0 ? `import * as base from "@akanjs/dictionary";` : ""}
+${libs.map((lib) => `import { dict as ${lib} } from "@${lib}/server";`).join("\n")}
 
 ${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
-    return `export const ${modelName} = Object.assign({}, ${extendedModels2.map((libName) => `${libName}.${modelName}`).join(", ")});`;
+    return `export const ${modelName} = {
+  models: Object.assign({}, ${extendedModels2.map((libName) => `${libName}.${modelName}.modelDictionary`).join(", ")}),
+  signals: Object.assign({}, ${extendedModels2.map((libName) => `${libName}.${modelName}.signalDictionary`).join(", ")}),
+};`;
   }).join("\n")}
 
-export const allLibs = [${libs.length === 0 ? "base" : libs.join(", ")}] as const;
+export const allLibs = [${libs.length === 0 ? "base.dictionary" : libs.map((lib) => `${lib}.dictionary`).join(", ")}] as const;
 `;
 }

package/cjs/src/templates/lib/__lib/lib.document.js

@@ -41,9 +41,10 @@ ${libs.map((lib) => `export { db as ${lib} } from "@${lib}/server";`).join("\n")
 
 ${Object.entries(extendedModels).map(
     ([modelName, extendedModels2]) => `export const ${modelName} = {
-  inputs: [${extendedModels2.map((libName) => `${libName}.${modelName}Db.Input`).join(", ")}] as const,
-  docs: [${extendedModels2.map((libName) => `${libName}.${modelName}Db.Doc`).join(", ")}] as const,
-  models: [${extendedModels2.map((libName) => `${libName}.${modelName}Db.Model`).join(", ")}] as const,
+  inputs: [${extendedModels2.map((libName) => `${libName}.${modelName}.Input`).join(", ")}] as const,
+  docs: [${extendedModels2.map((libName) => `${libName}.${modelName}.Doc`).join(", ")}] as const,
+  models: [${extendedModels2.map((libName) => `${libName}.${modelName}.Model`).join(", ")}] as const,
+  filters: [${extendedModels2.map((libName) => `${libName}.${modelName}.Filter`).join(", ")}] as const,
 }`
   ).join("\n")}
 export const allLibs = [${libs.join(", ")}] as const;

package/cjs/src/templates/lib/__lib/lib.service.js

@@ -37,7 +37,7 @@ function getContent(scanInfo, dict = {}) {
     ).filter(([_, libNames]) => libNames.length > 0)
   );
   return `
-${libs.length ? `import { DbService, Srv } from "@akanjs/service";` : `import type { BackendEnv } from "@akanjs/base";`}
+${libs.length ? `import { serve, Srv } from "@akanjs/service";` : `import type { BackendEnv } from "@akanjs/base";`}
 ${libs.map((lib) => `import { option as ${lib}Option, srv as ${lib} } from "@${lib}/server";`).join("\n")}
 
 import * as db from "../db";

package/cjs/src/templates/lib/__lib/lib.signal.js

@@ -22,16 +22,35 @@ __export(lib_signal_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_signal_exports);
+var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
   const libs = scanInfo.getLibs();
   const rootLib = scanInfo.akanConfig.rootLib;
+  const libInfos = [...scanInfo.getLibInfos().values()];
+  const extendedModels = Object.fromEntries(
+    [...scanInfo.file.signal.databases].map(
+      (modelName) => [
+        modelName,
+        libInfos.filter((libInfo) => libInfo.file.signal.databases.has(modelName)).map((libInfo) => libInfo.name)
+      ]
+    ).filter(([_, libNames]) => libNames.length > 0)
+  );
   return `
-${libs.length > 0 ? "" : `import { fetch as base } from "@akanjs/signal";`}
-${libs.map((lib) => `import { fetch as ${lib} } from "@${lib}";`).join("\n")}
+${libs.length > 0 ? "" : `import { fetch as baseFetch } from "@akanjs/signal";`}
+${libs.map((lib) => `import { sig as ${lib} } from "@${lib}/server";`).join("\n")}
 
-export const root = ${libs.length ? rootLib ?? libs[0] : "base"};
-export const libFetches = [${libs.length ? libs.join(", ") : "base"}] as const;
+${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
+    const ModelName = capitalize(modelName);
+    return `export const ${modelName} = {
+  internals: [${extendedModels2.map((libName) => `${libName}.${ModelName}Internal`).join(", ")}] as const,
+  slices: [${extendedModels2.map((libName) => `${libName}.${ModelName}Slice`).join(", ")}] as const,
+  endpoints: [${extendedModels2.map((libName) => `${libName}.${ModelName}Endpoint`).join(", ")}] as const,
+}`;
+  }).join("\n")}
+
+export const root = ${libs.length ? rootLib ?? libs[0] : "baseFetch"};
+export const libFetches = [${libs.length ? libs.map((lib) => `${lib}.fetch`).join(", ") : "baseFetch"}] as const;
 `;
 }

package/cjs/src/templates/lib/__lib/lib.store.js

@@ -22,14 +22,31 @@ __export(lib_store_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_store_exports);
+var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
   const libs = scanInfo.getLibs();
+  const libInfos = [...scanInfo.getLibInfos().values()];
+  const extendedModels = Object.fromEntries(
+    [...scanInfo.file.store.databases].map(
+      (modelName) => [
+        modelName,
+        libInfos.filter((libInfo) => libInfo.file.store.databases.has(modelName)).map((libInfo) => libInfo.name)
+      ]
+    ).filter(([_, libNames]) => libNames.length > 0)
+  );
   return `
-import { store as base } from "@akanjs/store";
+import * as base from "@akanjs/store";
 ${libs.map((lib) => `import { store as ${lib} } from "@${lib}/client";`).join("\n")}
 
-export const libStores = [${[...libs, "base"].join(", ")}] as const;
+${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
+    const ModelName = capitalize(modelName);
+    return `export const ${modelName} = {
+  stores: [${extendedModels2.map((libName) => `${libName}.${ModelName}Store`).join(", ")}] as const,
+}`;
+  }).join("\n")}
+
+export const libStores = [${[...libs, "base"].map((lib) => `${lib}.RootStore`).join(", ")}] as const;
 `;
 }

package/cjs/src/templates/lib/cnst.js

@@ -28,11 +28,19 @@ function getContent(scanInfo, dict = {}) {
     return null;
   const databaseModules = scanInfo.getDatabaseModules();
   const scalarModules = scanInfo.getScalarModules();
+  const libInfos = scanInfo.getLibInfos();
+  const extendedModelMap = new Map(
+    [...scanInfo.file.constant.databases].map(
+      (modelName) => [
+        modelName,
+        [...libInfos.values()].filter((libInfo) => libInfo.file.constant.databases.has(modelName)).map((libInfo) => libInfo.name)
+      ]
+    ).filter(([_, libNames]) => libNames.length > 0)
+  );
   return `
-import type { AllSrvs } from "./srv";
 import { cnstOf, scalarCnstOf } from "@akanjs/constant";
 
-${databaseModules.map((module2) => `import * as ${module2} from "./${module2}/${module2}.constant";`).join("\n")}
+${databaseModules.map((module2) => `import * as ${module2}Cnst from "./${module2}/${module2}.constant";`).join("\n")}
 ${scalarModules.map((module2) => `import { ${capitalize(module2)} } from "./__scalar/${module2}/${module2}.constant";`).join("\n")}
 
 export * from "./__lib/lib.constant";
@@ -41,10 +49,8 @@ ${scalarModules.map((module2) => `export * from "./__scalar/${module2}/${module2
 
 ${databaseModules.map((module2) => {
     const names = { Module: capitalize(module2) };
-    return `export const ${module2}Cnst = cnstOf("${module2}" as const, ${module2}.${names.Module}Input, ${module2}.${names.Module}, ${module2}.Light${names.Module}, ${module2}.${names.Module}Insight, ${module2}.${names.Module}Filter);`;
+    return `export const ${module2} = cnstOf("${module2}" as const, ${module2}Cnst.${names.Module}Input, ${module2}Cnst.${names.Module}, ${module2}Cnst.Light${names.Module}, ${module2}Cnst.${names.Module}Insight${extendedModelMap.has(module2) ? ", { overwrite: true }" : ""});`;
   }).join("\n")}
-${scalarModules.map((module2) => `export const ${module2}Cnst = scalarCnstOf("${module2}" as const, ${capitalize(module2)});`).join("\n")}
-
-export const Srvs = {} as AllSrvs;
+${scalarModules.map((module2) => `export const ${module2} = scalarCnstOf("${module2}" as const, ${capitalize(module2)});`).join("\n")}
 `;
 }

package/cjs/src/templates/lib/db.js

@@ -22,25 +22,32 @@ __export(db_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(db_exports);
+var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
   const databaseModules = scanInfo.getDatabaseModules();
   const scalarModules = scanInfo.getScalarModules();
   return `
-import { dbOf } from "@akanjs/document";
+import { by, dbOf, scalarDbOf } from "@akanjs/document";
 
 import * as cnst from "./cnst";
 
-${databaseModules.map((module2) => `import * as ${module2} from "./${module2}/${module2}.document";`).join("\n")}
+${databaseModules.map((module2) => `import * as ${module2}Db from "./${module2}/${module2}.document";`).join("\n")}
+${scalarModules.map((module2) => `import { ${capitalize(module2)} } from "./__scalar/${module2}/${module2}.document";`).join("\n")}
+
+${databaseModules.map((module2) => `class ${capitalize(module2)}Input extends by(cnst.${capitalize(module2)}Input) {}`).join("\n")}
+export type { ${databaseModules.map((module2) => `${capitalize(module2)}Input`).join(", ")} };
 
 export type * from "./__lib/lib.document";
+
 ${databaseModules.map((module2) => `export type * from "./${module2}/${module2}.document";`).join("\n")}
 ${scalarModules.map((module2) => `export type * from "./__scalar/${module2}/${module2}.document";`).join("\n")}
 
 ${databaseModules.map((module2) => {
     const names = { Module: module2.charAt(0).toUpperCase() + module2.slice(1) };
-    return `export const ${module2}Db = dbOf("${module2}" as const, ${module2}.${names.Module}Input, ${module2}.${names.Module}, ${module2}.${names.Module}Model, ${module2}.${names.Module}Middleware, cnst.${names.Module}, cnst.${names.Module}Insight, cnst.${names.Module}Filter);`;
+    return `export const ${module2} = dbOf("${module2}" as const, ${names.Module}Input, ${module2}Db.${names.Module}, ${module2}Db.${names.Module}Model, ${module2}Db.${names.Module}Middleware, cnst.${names.Module}, cnst.${names.Module}Insight, ${module2}Db.${names.Module}Filter);`;
   }).join("\n")}
+${scalarModules.map((module2) => `export const ${module2} = scalarDbOf("${module2}" as const, ${capitalize(module2)});`).join("\n")}
 `;
 }

package/cjs/src/templates/lib/dict.js

@@ -32,12 +32,20 @@ function getContent(scanInfo, dict = {}) {
 import { makeDictionary, makeTrans } from "@akanjs/dictionary";
 
 import { allLibs } from "./__lib/lib.dictionary";
-${databaseModules.map((module2) => `import { ${module2}Dictionary } from "./${module2}/${module2}.dictionary";`).join("\n")}
-${serviceModules.map((module2) => `import { ${module2}Dictionary } from "./_${module2}/${module2}.dictionary";`).join("\n")}
-${scalarModules.map((module2) => `import { ${module2}Dictionary } from "./__scalar/${module2}/${module2}.dictionary";`).join("\n")}
+${databaseModules.map((module2) => `import * as ${module2} from "./${module2}/${module2}.dictionary";`).join("\n")}
+${serviceModules.map((module2) => `import * as ${module2} from "./_${module2}/${module2}.dictionary";`).join("\n")}
+${scalarModules.map((module2) => `import * as ${module2} from "./__scalar/${module2}/${module2}.dictionary";`).join("\n")}
+
+${databaseModules.map((module2) => `export * as ${module2} from "./${module2}/${module2}.dictionary";`).join("\n")}
+${serviceModules.map((module2) => `export * as ${module2} from "./_${module2}/${module2}.dictionary";`).join("\n")}
+${scalarModules.map((module2) => `export * as ${module2} from "./__scalar/${module2}/${module2}.dictionary";`).join("\n")}
 
 export const dictionary = makeDictionary(...allLibs, {
-  ${[...databaseModules, ...scalarModules, ...serviceModules].map((module2) => `${module2}: ${module2}Dictionary`).join(",\n  ")}
+  ${[
+    ...databaseModules.map((module2) => `${module2}: { ...${module2}.modelDictionary, ...${module2}.signalDictionary }`),
+    ...scalarModules.map((module2) => `${module2}: ${module2}.dictionary`),
+    ...serviceModules.map((module2) => `${module2}: ${module2}.dictionary`)
+  ].join(",\n  ")}
 } as const);
  
 export const { Revert, translate, msg } = makeTrans(dictionary);

package/cjs/src/templates/lib/sig.js

@@ -30,24 +30,35 @@ function getContent(scanInfo, dict = {}) {
   const scalarConstantModules = [...scanInfo.scalar.entries()].filter(([_, files]) => files.has("constant")).map(([module2]) => module2);
   const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => module2);
   return `
-import { fetchOf, gqlOf, makeFetch, scalarUtilOf } from "@akanjs/signal";
+import { fetchOf, gqlOf, makeFetch, mergeSignals, signalInfo } from "@akanjs/signal";
 
 import { root, libFetches } from "./__lib/lib.signal";
 import * as cnst from "./cnst";
+import * as db from "./db";
 
-${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `import { ${capitalize(module2)}Signal } from "./${module2}/${module2}.signal";`).join("\n")}
-${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `import { ${capitalize(module2)}Signal } from "./_${module2}/${module2}.signal";`).join("\n")}
+${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `import * as ${module2}Sig from "./${module2}/${module2}.signal";`).join("\n")}
+${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `import * as ${module2}Sig from "./_${module2}/${module2}.signal";`).join("\n")}
 
-${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `export { ${capitalize(module2)}Signal } from "./${module2}/${module2}.signal";`).join("\n")}
-${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `export { ${capitalize(module2)}Signal } from "./_${module2}/${module2}.signal";`).join("\n")}
+${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `export * from "./${module2}/${module2}.signal";`).join("\n")}
+${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => `export * from "./_${module2}/${module2}.signal";`).join("\n")}
 
-${databaseModules.map((module2) => `${["user", "setting", "summary"].includes(module2) ? "export " : ""}const ${module2}Gql = gqlOf(cnst.${module2}Cnst, ${capitalize(module2)}Signal${scanInfo.name !== "shared" && ["user", "setting", "summary"].includes(module2) ? `, { overwrite: root.${module2}Gql }` : ""});`).join("\n")}
+${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(
+    ([module2]) => `export class ${capitalize(module2)}Signal extends mergeSignals(${module2}Sig.${capitalize(module2)}Endpoint, ${module2}Sig.${capitalize(module2)}Internal, ${module2}Sig.${capitalize(module2)}Slice) {}`
+  ).join("\n")}
+${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(
+    ([module2]) => `export const ${capitalize(module2)}Signal = mergeSignals(${module2}Sig.${capitalize(module2)}Endpoint, ${module2}Sig.${capitalize(module2)}Internal);`
+  ).join("\n")}
+
+const signals = signalInfo.registerSignals(
+${[...databaseModules, ...serviceModules].map((module2) => `  ${capitalize(module2)}Signal,`).join("\n")}
+);
+export const serializedSignals = signals.map((signal) => signalInfo.serialize(signal));
+
+${databaseModules.map((module2) => `export const ${module2} = gqlOf(cnst.${module2}, db.${module2}.Filter, ${capitalize(module2)}Signal${scanInfo.name !== "shared" && ["user", "setting", "summary"].includes(module2) ? `, { overwrite: root.${module2} }` : ""});`).join("\n")}
 
 export const fetch = makeFetch(...libFetches, {
-${databaseModules.map((module2) => `...${module2}Gql,`).join("\n")}
-${scalarConstantModules.map((module2) => `...scalarUtilOf(cnst.${module2}Cnst),`).join("\n")}
+${databaseModules.map((module2) => `...${module2},`).join("\n")}
 ${serviceModules.map((module2) => `...fetchOf(${capitalize(module2)}Signal),`).join("\n")}
-${databaseModules.map((module2) => `${module2}Gql,`).join("\n")}
 });
 `;
 }

package/cjs/src/templates/lib/srv.js

@@ -29,8 +29,9 @@ function getContent(scanInfo, dict = {}) {
   const databaseModules = [...scanInfo.database.entries()].filter(([_, files]) => files.has("service")).map(([module2]) => module2);
   const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("service")).map(([module2]) => module2);
   return `
-import { GetServices } from "@akanjs/service";
+import { GetServices, ServiceModule, serviceInfo } from "@akanjs/service";
 
+import * as cnst from "./cnst";
 import { libAllSrvs } from "./__lib/lib.service";
 ${databaseModules.map((module2) => `import { ${capitalize(module2)}Service } from "./${module2}/${module2}.service";`).join("\n")}
 ${serviceModules.map((module2) => `import { ${capitalize(module2)}Service } from "./_${module2}/${module2}.service";`).join("\n")}
@@ -39,11 +40,11 @@ export * from "./__lib/lib.service";
 ${databaseModules.map((module2) => `export { ${capitalize(module2)}Service } from "./${module2}/${module2}.service";`).join("\n")}
 ${serviceModules.map((module2) => `export { ${capitalize(module2)}Service } from "./_${module2}/${module2}.service";`).join("\n")}
 
-export const allSrvs = {
-  ...libAllSrvs,
+export const srvs = serviceInfo.registerServices({
   ${[...databaseModules, ...serviceModules].map((module2) => `${capitalize(module2)}Service`).join(",\n  ")}
-} as const;
-
-export type AllSrvs = GetServices<typeof allSrvs>;
+});
+export const allSrvs = { ...libAllSrvs, ...srvs } as const;
+${databaseModules.map((module2) => `export const ${module2} = new ServiceModule("${module2}" as const, { ${capitalize(module2)}Service }, cnst.${module2});`).join("\n")}
+${serviceModules.map((module2) => `export const ${module2} = new ServiceModule("${module2}" as const, { ${capitalize(module2)}Service });`).join("\n")}
 `;
 }