@akanjs/cli 0.9.41 → 0.9.43

package/esm/src/templates/libRoot/lib/user/user.signal.test.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/lib/user/user.signal.test.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import * as userSpec from "@${dict.libName}/lib/user/user.signal.spec";
 

package/esm/src/templates/libRoot/lib/user/user.store.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/lib/user/user.store.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 import { stateOf, Store } from "@akanjs/store";
 

package/esm/src/templates/libRoot/nest/backendLogic.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/nest/backendLogic.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 // \uD604 \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C\uB294 \uBC31\uC5D4\uB4DC\uC5D0\uC11C \uC0AC\uC6A9\uD558\uB294 \uB85C\uC9C1\uC744 \uCD94\uAC00\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 // @${dict.libName}/nest\uC5D0\uC11C\uB294 \uD074\uB77C\uC774\uC5B8\uD2B8 \uAD00\uB828 \uB77C\uC774\uBE0C\uB7EC\uB9AC(@*/client, @*/next)\uB97C import\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.

package/esm/src/templates/libRoot/nest/index.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/nest/index.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export * from "./backendLogic";
   `;

package/esm/src/templates/libRoot/next/frontendLogic.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/next/frontendLogic.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 // \uD604 \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C\uB294 \uD504\uB860\uD2B8\uC5D4\uB4DC\uC5D0\uC11C \uC0AC\uC6A9\uD558\uB294 \uB85C\uC9C1\uC744 \uCD94\uAC00\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 // @${dict.libName}/next\uC5D0\uC11C\uB294 \uD074\uB77C\uC774\uC5B8\uD2B8 \uAD00\uB828 \uB77C\uC774\uBE0C\uB7EC\uB9AC(@*/server, @*/nest)\uB97C import\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.

package/esm/src/templates/libRoot/next/index.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/next/index.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export * from "./frontendLogic";
   `;

package/esm/src/templates/libRoot/ui/index.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/ui/index.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 // export { YourComponent } from "./YourComponent";
   `;

package/esm/src/templates/module/__Model__.Template.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__Model__.Template.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: `${dict.Model}.Template.tsx`,
     content: `

package/esm/src/templates/module/__Model__.Unit.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__Model__.Unit.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: `${dict.Model}.Unit.tsx`,
     content: `

package/esm/src/templates/module/__Model__.Util.js

@@ -1,46 +1,16 @@
 // pkgs/@akanjs/cli/src/templates/module/__Model__.Util.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: `${dict.Model}.Util.tsx`,
     content: `
 "use client";
-import { ModelDashboardProps, ModelInsightProps } from "@akanjs/client";
-import { getQueryMap } from "@akanjs/constant";
-import { cnst } from "@${dict.sysName}/client";
-import { Data } from "@akanjs/ui";
+import { Model } from "@akanjs/ui";
 
-export const Stat = ({
-  className,
-  summary,
-  sliceName = "${dict.model}",
-  queryMap = getQueryMap(cnst.${dict.Model}Summary),
-  hidePresents,
-}: ModelDashboardProps<cnst.Summary>) => {
-  return (
-    <Data.Dashboard
-      className={className}
-      summary={summary}
-      sliceName={sliceName}
-      queryMap={queryMap}
-      columns={["total${dict.Model}"]}
-      hidePresents={hidePresents}
-    />
-  );
-};
-
-export const Insight = ({
-  className,
-  insight,
-  sliceName = "${dict.model}",
-}: ModelInsightProps<cnst.${dict.Model}Insight>) => {
-  return (
-    <Data.Insight
-      className={className}
-      insight={insight}
-      sliceName={sliceName}
-      columns={["count"]}
-    />
-  );
+interface RemoveProps {
+  ${dict.model}Id: string;
+}
+export const Remove = ({ ${dict.model}Id }: RemoveProps) => {
+  return <Model.Remove modelId={${dict.model}Id} sliceName="${dict.model}" />;
 };
 `
   };

package/esm/src/templates/module/__Model__.View.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__Model__.View.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: `${dict.Model}.View.tsx`,
     content: `

package/esm/src/templates/module/__Model__.Zone.js

@@ -1,36 +1,12 @@
 // pkgs/@akanjs/cli/src/templates/module/__Model__.Zone.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: `${dict.Model}.Zone.tsx`,
     content: `
 "use client";
-import { Data, Load } from "@akanjs/ui";
-import { ModelsProps } from "@akanjs/client";
+import { Load } from "@akanjs/ui";
 import { cnst, ${dict.Model} } from "@${dict.sysName}/client";
-import { ClientInit, ClientView, DefaultOf } from "@akanjs/signal";
-
-export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<cnst.${dict.Model}>) => {
-  return (
-    <Data.ListContainer
-      init={init}
-      query={query}
-      sliceName={sliceName}
-      renderItem={${dict.Model}.Unit.Card}
-      renderDashboard={${dict.Model}.Util.Stat}
-      renderInsight={${dict.Model}.Util.Insight}
-      renderTemplate={${dict.Model}.Template.General}
-      renderTitle={(${dict.model}: DefaultOf<cnst.${dict.Model}>) => \`${dict.Model} - \${${dict.model}.id ? ${dict.model}.id : "New"}\`}
-      renderView={(${dict.model}: cnst.${dict.Model}) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />}
-      columns={[
-        "id",
-        "status",
-        "createdAt",
-        "updatedAt",
-      ]}
-      actions={(${dict.model}: cnst.Light${dict.Model}, idx) => ["remove", "edit", "view"]}
-    />
-  );
-};
+import { ClientInit, ClientView } from "@akanjs/signal";
 
 interface CardProps {
   className?: string;

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

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.constant.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { enumOf, Int } from "@akanjs/base";
 import { Field, Filter, Model, sortOf, via } from "@akanjs/constant";

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

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.dictionary.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import {
   baseTrans,

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

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.document.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { beyond, by, Database, into, type SchemaOf } from "@akanjs/document";
 
@@ -12,13 +12,7 @@ export class ${dict.Model}Input extends by(cnst.${dict.Model}Input) {}
 export class ${dict.Model} extends by(cnst.${dict.Model}) {}
 
 @Database.Model(() => cnst.${dict.Model})
-export class ${dict.Model}Model extends into(${dict.Model}, cnst.${dict.model}Cnst) {
-  async getSummary(): Promise<cnst.${dict.Model}Summary> {
-    return {
-      ...(await this.getDefaultSummary()),
-    };
-  }
-}
+export class ${dict.Model}Model extends into(${dict.Model}, cnst.${dict.model}Cnst) {}
 
 @Database.Middleware(() => cnst.${dict.Model})
 export class ${dict.Model}Middleware extends beyond(${dict.Model}Model, ${dict.Model}) {

package/esm/src/templates/module/__model__.service.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.service.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { DbService, Service } from "@akanjs/service";
 
@@ -7,13 +7,7 @@ import { cnst } from "../cnst";
 import * as db from "../db";
 
 @Service("${dict.Model}Service")
-export class ${dict.Model}Service extends DbService(db.${dict.model}Db) {
-  async summarize(): Promise<cnst.${dict.Model}Summary> {
-    return {
-      ...(await this.${dict.model}Model.getSummary()),
-    };
-  }
-}
+export class ${dict.Model}Service extends DbService(db.${dict.model}Db) {}
 `;
 }
 export {

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

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.signal.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { Int } from "@akanjs/base";
 import { SortOf } from "@akanjs/constant";

package/esm/src/templates/module/__model__.signal.spec.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.signal.spec.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import * as adminSpec from "@shared/lib/admin/admin.signal.spec";
 import * as userSpec from "@${dict.sysName}/lib/user/user.signal.spec";

package/esm/src/templates/module/__model__.signal.test.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.signal.test.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import * as adminSpec from "@shared/lib/admin/admin.signal.spec";
 import * as userSpec from "@${dict.sysName}/lib/user/user.signal.spec";

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

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.store.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { stateOf, Store } from "@akanjs/store";
 

package/esm/src/templates/module/index.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/module/index.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: "index.tsx",
     content: `

package/esm/src/templates/moduleRoot/index.js

@@ -0,0 +1,29 @@
+// pkgs/@akanjs/cli/src/templates/moduleRoot/index.tsx
+function getContent(scanInfo, dict) {
+  const moduleInfo = scanInfo.database.get(dict.model) ?? scanInfo.service.get(dict.model);
+  if (!moduleInfo)
+    return null;
+  const fileTypes = [];
+  if (moduleInfo.has("template"))
+    fileTypes.push("Template");
+  if (moduleInfo.has("unit"))
+    fileTypes.push("Unit");
+  if (moduleInfo.has("util"))
+    fileTypes.push("Util");
+  if (moduleInfo.has("view"))
+    fileTypes.push("View");
+  if (moduleInfo.has("zone"))
+    fileTypes.push("Zone");
+  if (fileTypes.length === 0)
+    return null;
+  return {
+    filename: "index.tsx",
+    content: `
+${fileTypes.map((type) => `import * as ${type} from "./${dict.Model}.${type}";`).join("\n")}
+
+export const ${dict.Model} = { ${fileTypes.join(", ")} };`
+  };
+}
+export {
+  getContent as default
+};

package/esm/src/templates/server.js

@@ -1,27 +1,45 @@
 // pkgs/@akanjs/cli/src/templates/server.ts
 var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const libs = scanResult.akanConfig.libs;
-  const databaseModules = scanResult.files.services.databases;
-  const serviceModules = scanResult.files.services.services;
+  const libs = scanInfo.getLibs();
+  const databaseModules = [...scanInfo.database.entries()].filter(([_, files]) => files.has("service"));
+  const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("service"));
+  const scalarModules = [...scanInfo.scalar.entries()];
   return `
-import type { Module } from "@akanjs/server";
+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 { registerScalarModule } from "./lib/__scalar/_server";
-${serviceModules.map((module) => `import { register${capitalize(module)}Module } from "./lib/_${module}/_server";`).join("\n")}
-${databaseModules.map((module) => `import { register${capitalize(module)}Module } from "./lib/${module}/_server";`).join("\n")}
+  
+import * as db from "./lib/db";
+import { allSrvs } from "./lib/srv";
+import { cnst } from "./lib/cnst";
+import * as srv from "./lib/srv";
+import * as sig from "./lib/sig";
 import { type ModulesOptions, registerGlobalModule } from "./lib/option";
 
+// database modules
+${databaseModules.map(([model]) => {
+    const Model = capitalize(model);
+    return `const register${Model}Module = () => databaseModuleOf({ constant: cnst.${model}Cnst, database: db.${model}Db, signal: sig.${Model}Signal, service: srv.${Model}Service }, allSrvs);`;
+  }).join("\n")}
+
+// service modules
+${serviceModules.map(([model, moduleInfo]) => {
+    const Model = capitalize(model);
+    return `const register${Model}Module = () => serviceModuleOf({ service: srv.${Model}Service${moduleInfo.has("signal") ? `, signal: sig.${Model}Signal` : ""} }, allSrvs);`;
+  }).join("\n")}
+
+// scalar modules
+const registerScalarModule = () => scalarModulesOf({ constants: [${scalarModules.map(([model]) => `cnst.${capitalize(model)}`).join(", ")}] }, allSrvs);
+
 export const registerModules = (options: ModulesOptions, isChild?: boolean) => {
   const modules = [
 ${libs.map((lib) => `    ...(!isChild ? register${capitalize(lib)}Modules(options, true) : []),`).join("\n")}
     registerGlobalModule(options),
-    registerScalarModule(options),
-${serviceModules.map((module) => `    register${capitalize(module)}Module(options),`).join("\n")}
-${databaseModules.map((module) => `    register${capitalize(module)}Module(options),`).join("\n")}
+    registerScalarModule(),
+${serviceModules.map(([model]) => `    register${capitalize(model)}Module(),`).join("\n")}
+${databaseModules.map(([model]) => `    register${capitalize(model)}Module(),`).join("\n")}
   ] as Module[];
   return modules;
 };

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

@@ -94,7 +94,7 @@ apps/*/lib/st.ts
 apps/*/lib/sig.ts
 apps/*/lib/store.ts
 apps/*/lib/usePage.ts
-apps/*/lib/__scalar/_server.ts
+apps/*/lib/*/index.tsx
 apps/*/client.ts
 apps/*/server.ts
 libs/*/lib/cnst.ts
@@ -107,7 +107,7 @@ libs/*/lib/st.ts
 libs/*/lib/sig.ts
 libs/*/lib/store.ts
 libs/*/lib/usePage.ts
-libs/*/lib/__scalar/_server.ts
+apps/*/lib/*/index.tsx
 libs/*/client.ts
 libs/*/server.ts
 libs/*/index.ts

package/esm/src/templates/workspaceRoot/.vscode/settings.json.template

@@ -2,7 +2,6 @@
   "testing.saveBeforeTest": false,
   "jest.autoRun": "false",
   "jestTestExplorer.flattenExplorer": false,
-  "eslint.validate": ["json"],
   "prettier.configPath": ".prettierrc.json",
   "tailwindCSS.classAttributes": ["class", "className", ".*Class", ".*ClassName"],
   "colorize.languages": ["typescript", "javascript", "css", "scss"],

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.41",
+  "version": "0.9.43",
   "bin": {
     "akan": "esm/index.js"
   },

package/src/application/application.runner.d.ts

@@ -1,5 +1,4 @@
 import EventEmitter from "node:events";
-import { type AppConfigResult } from "@akanjs/config";
 import { App, AppExecutor, type Workspace } from "@akanjs/devkit";
 import type { SpawnOptions } from "child_process";
 import * as vite from "vite";
@@ -13,8 +12,8 @@ export declare class ApplicationRunner {
     #private;
     createApplication(appName: string, workspace: Workspace): Promise<AppExecutor>;
     removeApplication(app: App): Promise<void>;
-    getConfig(app: App): Promise<AppConfigResult>;
-    scanSync(app: App, akanConfig: AppConfigResult): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
+    getConfig(app: App): Promise<import("@akanjs/config").AppConfigResult>;
+    scanSync(app: App): Promise<import("@akanjs/devkit").AppInfo | import("@akanjs/devkit").LibInfo>;
     getScriptFilename(app: App): Promise<string>;
     runScript(app: App, filename: string): Promise<void>;
     buildBackend(app: App): Promise<void>;

package/src/application/application.script.d.ts

@@ -8,7 +8,7 @@ export declare class ApplicationScript {
         start?: boolean;
     }): Promise<void>;
     removeApplication(app: App): Promise<void>;
-    syncApplication(app: App): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
+    syncApplication(app: App): Promise<import("@akanjs/devkit").AppInfo | import("@akanjs/devkit").LibInfo>;
     script(app: App, filename: string | null): Promise<void>;
     build(app: App): Promise<void>;
     start(app: App, { dbup, open }?: {

package/src/guidelines/___library/sharedUiStructureDescription.en.md

@@ -733,7 +733,6 @@ SlateContent
 Purpose: Metadata-driven property editing
 
 - prop: string - Property name
-- slice: StoreOf<any, any> - Store slice
 - renderTemplate?: (form: any) => ReactNode - Custom edit renderer
 - renderView?: (model: any) => ReactNode - Custom view renderer
 - modelPath?: string - Model path in store

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

@@ -22,7 +22,6 @@ libs/shared/lib/[module-name]/
 ├── [ModuleName].Util.tsx          // Utility components (dashboard, insights)
 ├── [ModuleName].View.tsx          // Single item view components
 ├── [ModuleName].Zone.tsx          // Main zone layout and routing
-├── _server.ts                     // Module registration
 ├── [module-name].constant.ts      // Model definitions
 ├── [module-name].dictionary.ts    // Translations
 ├── [module-name].document.ts      // Database schema
@@ -347,34 +346,7 @@ export const userDict = {
 };
 ```
 
-### 7. Register Module (`_server.ts`)
-
-Create module registration for the server:
-
-```typescript
-import { databaseModuleOf } from "@akanjs/server";
-
-import { cnst } from "../cnst";
-import * as db from "../db";
-import type { ModulesOptions } from "../option";
-import { allSrvs } from "../srv";
-import { UserService } from "./user.service";
-import { UserSignal } from "./user.signal";
-
-export const registerUserModule = (option: ModulesOptions) =>
-  databaseModuleOf(
-    {
-      constant: cnst.userCnst,
-      database: db.userDb,
-      signal: UserSignal,
-      service: UserService,
-      uses: { securityConfig: option.securityConfig },
-    },
-    allSrvs
-  );
-```
-
-### 8. Create UI Components
+### 7. Create UI Components
 
 #### Template Component (`[ModuleName].Template.tsx`)
 
@@ -494,21 +466,8 @@ In your server bootstrap file:
 
 ```typescript
 import { createNestApp } from "@akanjs/server";
-import { registerUserModule } from "./user/_server";
-import { registerAdminModule } from "./admin/_server";
-
-const startServer = async () => {
-  const app = await createNestApp({
-    env: serverEnv,
-    registerModules: (options) => [
-      registerUserModule(options),
-      registerAdminModule(options),
-      // Register other modules...
-    ],
-  });
-
-  return app;
-};
+
+====== outdated, ned to be rewrited ======
 ```
 
 ### 2. Using Services in Controllers or Other Services
@@ -625,36 +584,30 @@ 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