@akanjs/cli 0.9.41 → 0.9.43

package/cjs/src/templates/app/lib/user/user.service.js

@@ -22,7 +22,7 @@ __export(user_service_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(user_service_exports);
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { ExtendedUserService, Service } from "@akanjs/service";
 
@@ -31,12 +31,6 @@ import { cnst } from "../cnst";
 import * as db from "../db";
 
 @Service("UserService")
-export class UserService extends ExtendedUserService(db.userDb, LibUserService) {
-  async summarize${dict.AppName}(): Promise<cnst.${dict.AppName}UserSummary> {
-    return {
-      ...(await this.userModel.getSummary()),
-    };
-  }
-}
-  `;
+export class UserService extends ExtendedUserService(db.userDb, LibUserService) {}
+`;
 }

package/cjs/src/templates/app/lib/user/user.signal.js

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

package/cjs/src/templates/app/lib/user/user.signal.spec.js

@@ -22,7 +22,7 @@ __export(user_signal_spec_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(user_signal_spec_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 import * as adminSpec from "@shared/lib/admin/admin.signal.spec";
 import * as userSpec from "@shared/lib/user/user.signal.spec";

package/cjs/src/templates/app/lib/user/user.signal.test.js

@@ -22,7 +22,7 @@ __export(user_signal_test_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(user_signal_test_exports);
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import * as userSpec from "@${dict.appName}/lib/user/user.signal.spec";
 

package/cjs/src/templates/app/lib/user/user.store.js

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

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

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

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

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

package/cjs/src/templates/app/nest/backendLogic.js

@@ -22,7 +22,7 @@ __export(backendLogic_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(backendLogic_exports);
-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.appName}/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/cjs/src/templates/app/nest/index.js

@@ -22,7 +22,7 @@ __export(nest_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(nest_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export * from "./backendLogic";
   `;

package/cjs/src/templates/app/next/frontendLogic.js

@@ -22,7 +22,7 @@ __export(frontendLogic_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(frontendLogic_exports);
-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.appName}/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/cjs/src/templates/app/next/index.js

@@ -22,7 +22,7 @@ __export(next_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(next_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export * from "./frontendLogic";
   `;

package/cjs/src/templates/app/ui/UiComponent.js

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

package/cjs/src/templates/app/ui/index.js

@@ -22,7 +22,7 @@ __export(ui_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(ui_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export { UiComponent } from "./UiComponent";
 `;

package/cjs/src/templates/client.js

@@ -23,12 +23,18 @@ __export(client_exports, {
 });
 module.exports = __toCommonJS(client_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 databaseModules = scanResult.files.components.databases;
-  const scalarModules = scanResult.files.components.scalars;
-  const serviceModules = scanResult.files.components.services;
+  const databaseModules = [...scanInfo.database.entries()].filter(
+    ([_, fileTypes]) => fileTypes.has("template") || fileTypes.has("unit") || fileTypes.has("util") || fileTypes.has("view") || fileTypes.has("zone")
+  ).map(([key]) => key);
+  const scalarModules = [...scanInfo.scalar.entries()].filter(
+    ([_, fileTypes]) => fileTypes.has("template") || fileTypes.has("unit") || fileTypes.has("util") || fileTypes.has("view") || fileTypes.has("zone")
+  ).map(([key]) => key);
+  const serviceModules = [...scanInfo.service.entries()].filter(
+    ([_, fileTypes]) => fileTypes.has("template") || fileTypes.has("unit") || fileTypes.has("util") || fileTypes.has("view") || fileTypes.has("zone")
+  ).map(([key]) => key);
   return `
 export { st } from "./lib/st";
 export { store } from "./lib/store";

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

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

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

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

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

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

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

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

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

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

package/cjs/src/templates/index.js

@@ -22,7 +22,7 @@ __export(templates_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(templates_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 export { cnst } from "./lib/cnst";
 export { fetch } from "./lib/fetch";

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

@@ -23,14 +23,16 @@ __export(summary_constant_exports, {
 });
 module.exports = __toCommonJS(summary_constant_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 databaseModulesExceptExtends = scanResult.files.constants.databases.filter(
+  const databaseModules = scanInfo.getDatabaseModules();
+  const databaseModulesExceptExtends = databaseModules.filter(
     (module2) => !["summary", "user", "setting"].includes(module2)
   );
-  const hasUser = scanResult.files.constants.databases.includes("user");
-  const hasSummary = scanResult.files.constants.databases.includes("summary");
+  const scanResult = scanInfo.getScanResult();
+  const hasUser = databaseModules.includes("user");
+  const hasSummary = databaseModules.includes("summary");
   const isRootUserLib = !scanResult.akanConfig.rootLib;
   if (!hasSummary)
     return null;

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

@@ -22,19 +22,15 @@ __export(lib_constant_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_constant_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
+  const scanResult = scanInfo.getScanResult();
   const libs = scanResult.akanConfig.libs;
-  const userLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("user")
-  );
-  const settingLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("setting")
-  );
-  const summaryLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("summary")
-  );
+  const libInfos = scanInfo.getLibInfos();
+  const userLibs = libs.filter((libName) => libInfos.get(libName)?.file.constant.databases.has("user"));
+  const settingLibs = libs.filter((libName) => libInfos.get(libName)?.file.constant.databases.has("setting"));
+  const summaryLibs = libs.filter((libName) => libInfos.get(libName)?.file.constant.databases.has("summary"));
   return `
 ${libs.map((lib) => `import { cnst as ${lib} } from "@${lib}";`).join("\n")}
 

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

@@ -22,11 +22,11 @@ __export(lib_dictionary_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_dictionary_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const libs = scanResult.akanConfig.libs;
-  const moduleDictionaries = scanResult.files.constants.databases.filter(
+  const libs = scanInfo.getLibs();
+  const moduleDictionaries = [...scanInfo.file.dictionary.databases].filter(
     (module2) => module2 !== "summary" && module2 !== "setting"
   );
   return `

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

@@ -22,11 +22,11 @@ __export(lib_document_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_document_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const libs = scanResult.akanConfig.libs;
-  const rootLib = scanResult.akanConfig.rootLib;
+  const libs = scanInfo.getLibs();
+  const rootLib = scanInfo.akanConfig.rootLib;
   return `
 ${libs.map((lib) => `import { db as ${lib} } from "@${lib}/server";`).join("\n")}
 

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

@@ -23,26 +23,21 @@ __export(lib_service_exports, {
 });
 module.exports = __toCommonJS(lib_service_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 libsHasSummary = libs.filter((lib) => scanResult.libs[lib].files.constants.databases.includes("summary"));
-  const databaseModules = scanResult.files.constants.databases;
+  const libs = scanInfo.getLibs();
+  const libInfos = [...scanInfo.getLibInfos().values()];
+  const libInfosHasSummary = libInfos.filter((libInfo) => libInfo.database.has("summary"));
+  const databaseModules = scanInfo.getDatabaseModules();
   const databaseModulesWithoutExtendModels = databaseModules.filter(
     (module2) => !["summary", "setting", "user"].includes(module2)
   );
-  const userLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("user")
-  );
-  const settingLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("setting")
-  );
-  const summaryLibs = scanResult.akanConfig.libs.filter(
-    (libName) => scanResult.libs[libName].files.constants.databases.includes("summary")
-  );
+  const userLibInfos = libInfos.filter((libInfo) => libInfo.database.has("user"));
+  const settingLibInfos = libInfos.filter((libInfo) => libInfo.database.has("setting"));
+  const summaryLibInfos = libInfos.filter((libInfo) => libInfo.database.has("summary"));
   return `
-${libs.length ? libsHasSummary.length ? `import { ExtendedSummaryService, MixSrvs, Srv } from "@akanjs/service";` : `import { DbService, Srv } from "@akanjs/service";` : `import type { BackendEnv } from "@akanjs/base";`}
+${libs.length ? libInfosHasSummary.length ? `import { ExtendedSummaryService, MixSrvs, Srv } from "@akanjs/service";` : `import { DbService, 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";
@@ -50,29 +45,29 @@ import type * as srv from "../srv";
 
 ${libs.map((lib) => `export { srv as ${lib} } from "@${lib}/server";`).join("\n")}
 
-${summaryLibs.length > 0 ? `export const LibSummaryService = MixSrvs(${summaryLibs.map((lib) => `${lib}.SummaryService`).join(", ")});` : ""}
-${settingLibs.length > 0 ? `export const LibSettingService = MixSrvs(${settingLibs.map((lib) => `${lib}.SettingService`).join(", ")});` : ""}
-${userLibs.length > 0 ? `export const LibUserService = MixSrvs(${userLibs.map((lib) => `${lib}.UserService`).join(", ")});` : ""}
+${summaryLibInfos.length > 0 ? `export const LibSummaryService = MixSrvs(${summaryLibInfos.map((libInfo) => `${libInfo.name}.SummaryService`).join(", ")});` : ""}
+${settingLibInfos.length > 0 ? `export const LibSettingService = MixSrvs(${settingLibInfos.map((libInfo) => `${libInfo.name}.SettingService`).join(", ")});` : ""}
+${userLibInfos.length > 0 ? `export const LibUserService = MixSrvs(${userLibInfos.map((libInfo) => `${libInfo.name}.UserService`).join(", ")});` : ""}
 
 export const libAllSrvs = { ${libs.map((lib) => `...${lib}.allSrvs`).join(", ")} };
 
 export type LibOptions = ${libs.length ? libs.map((lib) => `${lib}Option.ModulesOptions`).join(" & ") : "BackendEnv"};
 ${libs.length ? `
-export class ProtoSummaryService extends ${libsHasSummary.length ? "ExtendedSummaryService(db.summaryDb, LibSummaryService)" : "DbService(db.summaryDb)"} {
+export class ProtoSummaryService extends ${libInfosHasSummary.length ? "ExtendedSummaryService(db.summaryDb, LibSummaryService)" : "DbService(db.summaryDb)"} {
   @Srv() protected readonly userService: srv.UserService;
 ${databaseModulesWithoutExtendModels.map((module2) => `  @Srv() protected readonly ${module2}Service: srv.${capitalize(module2)}Service;`).join("\n")}
   
-  async get${capitalize(scanResult.name)}Summary() {
+  async get${capitalize(scanInfo.name)}Summary() {
     return {
 ${databaseModulesWithoutExtendModels.map((module2) => `      ...(await this.${module2}Service.summarize()),`).join("\n")}
-      ...(await this.userService.summarize${capitalize(scanResult.name)}()),
+      ...(await this.userService.summarize()),
     };
   }
-${scanResult.type === "app" ? `
+${scanInfo.exec.type === "app" ? `
   async makeSummary(archiveType: "periodic" | "non-periodic" = "non-periodic"): Promise<db.Summary> {
     const summary = {
-${libsHasSummary.map((lib) => `      ...(await this.get${capitalize(lib)}Summary()),`).join("\n")}
-      ...(await this.get${capitalize(scanResult.name)}Summary()),
+${libInfosHasSummary.map((libInfo) => `      ...(await this.get${capitalize(libInfo.name)}Summary()),`).join("\n")}
+      ...(await this.get${capitalize(scanInfo.name)}Summary()),
     };
     return (await this.summaryModel.archive(archiveType, summary)) as unknown as db.Summary;
   }

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

@@ -22,15 +22,16 @@ __export(lib_signal_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_signal_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const libs = scanResult.akanConfig.libs;
+  const libs = scanInfo.getLibs();
+  const rootLib = scanInfo.akanConfig.rootLib;
   return `
 ${libs.length > 0 ? "" : `import { fetch as base } from "@akanjs/signal";`}
 ${libs.map((lib) => `import { fetch as ${lib} } from "@${lib}";`).join("\n")}
 
-export const root = ${libs.length ? scanResult.akanConfig.rootLib ?? libs[0] : "base"};
+export const root = ${libs.length ? rootLib ?? libs[0] : "base"};
 export const libFetches = [${libs.length ? libs.join(", ") : "base"}] as const;
 `;
 }

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

@@ -22,10 +22,10 @@ __export(lib_store_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(lib_store_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const libs = scanResult.akanConfig.libs;
+  const libs = scanInfo.getLibs();
   return `
 import { store as base } from "@akanjs/store";
 ${libs.map((lib) => `import { store as ${lib} } from "@${lib}/client";`).join("\n")}

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

@@ -22,7 +22,7 @@ __export(cnst_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(cnst_exports);
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 import type { AllSrvs } from "./srv";
 

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

@@ -22,17 +22,19 @@ __export(cnst_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(cnst_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const databaseModules = scanResult.files.constants.databases;
-  const scalarModules = scanResult.files.constants.scalars;
-  const rootLib = scanResult.akanConfig.rootLib;
+  const databaseModules = scanInfo.getDatabaseModules();
+  const scalarModules = scanInfo.getScalarModules();
+  const rootLib = scanInfo.akanConfig.rootLib;
   return `
-import { cnstOf } from "@akanjs/constant";
+import { cnstOf, scalarCnstOf } from "@akanjs/constant";
 
 ${rootLib ? `import { root } from "./__lib/lib.constant";` : ""}
 ${databaseModules.map((module2) => `import * as ${module2} from "./${module2}/${module2}.constant";`).join("\n")}
+${scalarModules.map((module2) => `import { ${capitalize(module2)} } from "./__scalar/${module2}/${module2}.constant";`).join("\n")}
 
 export * from "./__lib/lib.constant";
 ${databaseModules.map((module2) => `export * from "./${module2}/${module2}.constant";`).join("\n")}
@@ -40,12 +42,13 @@ ${scalarModules.map((module2) => `export * from "./__scalar/${module2}/${module2
 
 ${databaseModules.map((module2) => {
     const names = {
-      Module: module2.charAt(0).toUpperCase() + module2.slice(1)
+      Module: capitalize(module2)
     };
     if (module2 === "setting" || module2 === "summary")
       return `export const ${module2}Cnst = cnstOf("${module2}" as const, ${module2}.${names.Module}Input, ${module2}.${names.Module}, ${module2}.Light${names.Module}, ${rootLib ? "root" : module2}.${names.Module}Insight, ${rootLib ? "root" : module2}.${names.Module}Filter);`;
     else
       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, ${module2}.${names.Module}Summary);`;
   }).join("\n")}
+${scalarModules.map((module2) => `export const ${module2}Cnst = scalarCnstOf("${module2}" as const, ${capitalize(module2)});`).join("\n")}
 `;
 }

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

@@ -22,12 +22,12 @@ __export(db_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(db_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const databaseModules = scanResult.files.constants.databases;
-  const scalarModules = scanResult.files.constants.scalars;
-  const rootLib = scanResult.akanConfig.rootLib;
+  const databaseModules = scanInfo.getDatabaseModules();
+  const scalarModules = scanInfo.getScalarModules();
+  const rootLib = scanInfo.akanConfig.rootLib;
   return `
 import { dbOf } from "@akanjs/document";
 

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

@@ -22,12 +22,12 @@ __export(dict_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(dict_exports);
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
-  const databaseModules = scanResult.files.dictionary.databases;
-  const scalarModules = scanResult.files.dictionary.scalars;
-  const serviceModules = scanResult.files.dictionary.services;
+  const databaseModules = scanInfo.getDatabaseModules();
+  const scalarModules = scanInfo.getScalarModules();
+  const serviceModules = scanInfo.getServiceModules();
   return `
 import { makeDictionary, makeTrans } from "@akanjs/dictionary";
 

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

@@ -23,12 +23,12 @@ __export(fetch_exports, {
 });
 module.exports = __toCommonJS(fetch_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 databaseModules = scanResult.files.signal.databases;
-  const scalarConstantModules = scanResult.files.constants.scalars;
-  const serviceModules = scanResult.files.signal.services;
+  const databaseModules = [...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module2]) => module2);
+  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";
 
@@ -36,11 +36,11 @@ import { root, libFetches } from "./__lib/lib.signal";
 import { cnst } from "./cnst";
 import * as sig from "./sig";
 
-${databaseModules.map((module2) => `${["user", "setting", "summary"].includes(module2) ? "export " : ""}const ${module2}Gql = gqlOf(cnst.${module2}Cnst, sig.${capitalize(module2)}Signal${scanResult.name !== "shared" && ["user", "setting", "summary"].includes(module2) ? `, { overwrite: root.${module2}Gql }` : ""});`).join("\n")}
+${databaseModules.map((module2) => `${["user", "setting", "summary"].includes(module2) ? "export " : ""}const ${module2}Gql = gqlOf(cnst.${module2}Cnst, sig.${capitalize(module2)}Signal${scanInfo.name !== "shared" && ["user", "setting", "summary"].includes(module2) ? `, { overwrite: root.${module2}Gql }` : ""});`).join("\n")}
 
 export const fetch = makeFetch(...libFetches, {
 ${databaseModules.map((module2) => `...${module2}Gql,`).join("\n")}
-${scalarConstantModules.map((module2) => `...scalarUtilOf("${module2}" as const, cnst.${capitalize(module2)}),`).join("\n")}
+${scalarConstantModules.map((module2) => `...scalarUtilOf(cnst.${module2}Cnst),`).join("\n")}
 ${serviceModules.map((module2) => `...fetchOf(sig.${capitalize(module2)}Signal),`).join("\n")}
 ${databaseModules.map((module2) => `${module2}Gql,`).join("\n")}
 });

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

@@ -23,15 +23,11 @@ __export(sig_exports, {
 });
 module.exports = __toCommonJS(sig_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 databaseModules = scanResult.files.signal.databases;
-  const scalarModules = scanResult.files.signal.scalars;
-  const serviceModules = scanResult.files.signal.services;
   return `
-${databaseModules.map((module2) => `export { ${capitalize(module2)}Signal } from "./${module2}/${module2}.signal";`).join("\n")}
-${serviceModules.map((module2) => `export { ${capitalize(module2)}Signal } from "./_${module2}/${module2}.signal";`).join("\n")}
-${scalarModules.map((module2) => `export { ${capitalize(module2)}Signal } from "./__scalar/${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")}
 `;
 }

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

@@ -23,28 +23,25 @@ __export(srv_exports, {
 });
 module.exports = __toCommonJS(srv_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 databaseModules = scanResult.files.services.databases;
-  const scalarModules = scanResult.files.services.scalars;
-  const serviceModules = scanResult.files.services.services;
+  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 { 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")}
-${scalarModules.map((module2) => `import { ${capitalize(module2)}Service } from "./${module2}/${module2}.service";`).join("\n")}
 
 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")}
-${scalarModules.map((module2) => `export { ${capitalize(module2)}Service } from "./${module2}/${module2}.service";`).join("\n")}
 
 export const allSrvs = {
   ...libAllSrvs,
-  ${[...databaseModules, ...scalarModules, ...serviceModules].map((module2) => `${capitalize(module2)}Service`).join(",\n  ")}
+  ${[...databaseModules, ...serviceModules].map((module2) => `${capitalize(module2)}Service`).join(",\n  ")}
 } as const;
 
 export type AllSrvs = GetServices<typeof allSrvs>;