@akanjs/cli 0.9.56 → 0.9.57

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

@@ -1,7 +1,7 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.document.ts
 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";
 

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

@@ -1,18 +1,19 @@
 // pkgs/@akanjs/cli/src/templates/module/__model__.signal.ts
 function getContent(scanInfo, dict) {
   return `
+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}Internal extends internal(srv.${dict.model}, () => ({})) {}
 
-export class ${dict.Model}Slice extends slice(srv.${dict.model}, { guards: { get: "Public", cru: "Public" } }, (init) => ({
+export class ${dict.Model}Slice extends slice(srv.${dict.model}, { guards: { root: Admin, get: Public, cru: Public } }, (init) => ({
   inPublic: init()
-    .search("statuses", [cnst.${dict.Model}Status])
-    .exec(function (statuses) {
-      return this.${dict.model}Service.queryByStatuses(statuses);
+    .exec(function () {
+      return this.${dict.model}Service.queryAny();
     }),
 })) {}
 

package/esm/src/templates/server.js

@@ -8,15 +8,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]) => {
@@ -44,6 +44,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/package.json

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

package/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/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/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/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/src/module/module.command.d.ts

@@ -3,7 +3,7 @@ import { ModuleScript } from "./module.script";
 export declare class ModuleCommand {
     moduleScript: ModuleScript;
     createModule(moduleName: string, sys: Sys, page: boolean): Promise<void>;
-    removeModule(module: Module): void;
+    removeModule(module: Module): Promise<void>;
     createView(module: Module): Promise<void>;
     createUnit(module: Module): Promise<void>;
     createTemplate(module: Module): Promise<void>;

package/src/module/module.runner.d.ts

@@ -1,7 +1,7 @@
 import { type Module, Workspace } from "@akanjs/devkit";
 export declare class ModuleRunner {
     createModule(workspace: Workspace, sysType: "app" | "lib", sysName: string, moduleName: string, description: string): Promise<void>;
-    removeModule(module: Module): void;
+    removeModule(module: Module): Promise<void>;
     createComponentTemplate(module: Module, type: "unit" | "view" | "template" | "zone" | "util"): Promise<{
         component: {
             filename: string;

package/src/module/module.script.d.ts

@@ -8,7 +8,7 @@ export declare class ModuleScript {
     }): Promise<void>;
     createModule(sys: Sys, name: string, description?: string, schemaDescription?: string): Promise<void>;
     createModule_(sys: Sys, name: string, description: string, schemaDescription: string): Promise<void>;
-    removeModule(mod: Module): void;
+    removeModule(mod: Module): Promise<void>;
     createService(workspace: Workspace, name: string): Promise<void>;
     createTest(workspace: Workspace, name: string): Promise<void>;
     createTemplate(mod: Module): Promise<void>;

package/src/scalar/scalar.command.d.ts

@@ -3,5 +3,5 @@ import { ScalarScript } from "./scalar.script";
 export declare class ScalarCommand {
     scalarScript: ScalarScript;
     createScalar(sys: Sys, scalarName: string): Promise<void>;
-    removeScalar(sys: Sys, scalarName: string): void;
+    removeScalar(sys: Sys, scalarName: string): Promise<void>;
 }

package/src/scalar/scalar.script.d.ts

@@ -2,5 +2,5 @@ import { type Sys } from "@akanjs/devkit";
 export declare class ScalarScript {
     #private;
     createScalar(sys: Sys, scalarName: string): Promise<void>;
-    removeScalar(sys: Sys, scalarName: string): void;
+    removeScalar(sys: Sys, scalarName: string): Promise<void>;
 }