@akanjs/cli 0.9.41 → 0.9.42

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

@@ -22,7 +22,7 @@ __export(model_store_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(model_store_exports);
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { stateOf, Store } from "@akanjs/store";
 

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

@@ -22,7 +22,7 @@ __export(module_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(module_exports);
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: "index.tsx",
     content: `

package/cjs/src/templates/{libRoot/lib/user → moduleRoot}/index.js

@@ -16,46 +16,34 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// pkgs/@akanjs/cli/src/templates/libRoot/lib/user/index.tsx
-var user_exports = {};
-__export(user_exports, {
+// pkgs/@akanjs/cli/src/templates/moduleRoot/index.tsx
+var moduleRoot_exports = {};
+__export(moduleRoot_exports, {
   default: () => getContent
 });
-module.exports = __toCommonJS(user_exports);
-function getContent(scanResult, dict = {}) {
+module.exports = __toCommonJS(moduleRoot_exports);
+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: `
-import { Signal } from "@akanjs/ui";
-import { AiOutlineUser } from "react-icons/ai";
+${fileTypes.map((type) => `import * as ${type} from "./${dict.Model}.${type}";`).join("\n")}
 
-import * as Template from "./User.Template";
-import * as Unit from "./User.Unit";
-import * as Util from "./User.Util";
-import * as View from "./User.View";
-import * as Zone from "./User.Zone";
-
-export const User = {
-  Menu: {
-    Admin: {
-      key: "user",
-      label: "User",
-      icon: <AiOutlineUser />,
-      render: () => <Zone.Admin />,
-    },
-    Doc: {
-      key: "user",
-      label: "User",
-      icon: <AiOutlineUser />,
-      render: () => <Signal.Doc.Zone refName="user" />,
-    },
-  },
-  Template,
-  Unit,
-  Util,
-  View,
-  Zone,
-};
-    `
+export const ${dict.Model} = { ${fileTypes.join(", ")} };`
   };
 }

package/cjs/src/templates/server.js

@@ -23,28 +23,46 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 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((module2) => `import { register${capitalize(module2)}Module } from "./lib/_${module2}/_server";`).join("\n")}
-${databaseModules.map((module2) => `import { register${capitalize(module2)}Module } from "./lib/${module2}/_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((module2) => `    register${capitalize(module2)}Module(options),`).join("\n")}
-${databaseModules.map((module2) => `    register${capitalize(module2)}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/cjs/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