@akanjs/cli 0.9.41 → 0.9.43

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

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

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

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

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

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

package/esm/src/templates/client.js

@@ -1,11 +1,17 @@
 // pkgs/@akanjs/cli/src/templates/client.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 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/esm/src/templates/crudPages/[__model__Id]/edit/page.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/crudPages/[__model__Id]/edit/page.tsx
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return {
     filename: "page.tsx",
     content: `

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

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

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

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

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

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

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

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

package/esm/src/templates/index.js

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

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

@@ -1,13 +1,15 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/extends/summary.constant.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 databaseModulesExceptExtends = scanResult.files.constants.databases.filter(
+  const databaseModules = scanInfo.getDatabaseModules();
+  const databaseModulesExceptExtends = databaseModules.filter(
     (module) => !["summary", "user", "setting"].includes(module)
   );
-  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/esm/src/templates/lib/__lib/lib.constant.js

@@ -1,17 +1,13 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.constant.ts
-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/esm/src/templates/lib/__lib/lib.dictionary.js

@@ -1,9 +1,9 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.dictionary.ts
-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(
     (module) => module !== "summary" && module !== "setting"
   );
   return `

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

@@ -1,9 +1,9 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.document.ts
-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/esm/src/templates/lib/__lib/lib.service.js

@@ -1,25 +1,20 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.service.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 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(
     (module) => !["summary", "setting", "user"].includes(module)
   );
-  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";
@@ -27,29 +22,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((module) => `  @Srv() protected readonly ${module}Service: srv.${capitalize(module)}Service;`).join("\n")}
   
-  async get${capitalize(scanResult.name)}Summary() {
+  async get${capitalize(scanInfo.name)}Summary() {
     return {
 ${databaseModulesWithoutExtendModels.map((module) => `      ...(await this.${module}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/esm/src/templates/lib/__lib/lib.signal.js

@@ -1,13 +1,14 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.signal.ts
-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/esm/src/templates/lib/__lib/lib.store.js

@@ -1,8 +1,8 @@
 // pkgs/@akanjs/cli/src/templates/lib/__lib/lib.store.ts
-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/esm/src/templates/lib/cnst.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/lib/cnst.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 import type { AllSrvs } from "./srv";
 

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

@@ -1,15 +1,17 @@
 // pkgs/@akanjs/cli/src/templates/lib/cnst_.ts
-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((module) => `import * as ${module} from "./${module}/${module}.constant";`).join("\n")}
+${scalarModules.map((module) => `import { ${capitalize(module)} } from "./__scalar/${module}/${module}.constant";`).join("\n")}
 
 export * from "./__lib/lib.constant";
 ${databaseModules.map((module) => `export * from "./${module}/${module}.constant";`).join("\n")}
@@ -17,13 +19,14 @@ ${scalarModules.map((module) => `export * from "./__scalar/${module}/${module}.c
 
 ${databaseModules.map((module) => {
     const names = {
-      Module: module.charAt(0).toUpperCase() + module.slice(1)
+      Module: capitalize(module)
     };
     if (module === "setting" || module === "summary")
       return `export const ${module}Cnst = cnstOf("${module}" as const, ${module}.${names.Module}Input, ${module}.${names.Module}, ${module}.Light${names.Module}, ${rootLib ? "root" : module}.${names.Module}Insight, ${rootLib ? "root" : module}.${names.Module}Filter);`;
     else
       return `export const ${module}Cnst = cnstOf("${module}" as const, ${module}.${names.Module}Input, ${module}.${names.Module}, ${module}.Light${names.Module}, ${module}.${names.Module}Insight, ${module}.${names.Module}Filter, ${module}.${names.Module}Summary);`;
   }).join("\n")}
+${scalarModules.map((module) => `export const ${module}Cnst = scalarCnstOf("${module}" as const, ${capitalize(module)});`).join("\n")}
 `;
 }
 export {

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

@@ -1,10 +1,10 @@
 // pkgs/@akanjs/cli/src/templates/lib/db.ts
-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/esm/src/templates/lib/dict.js

@@ -1,10 +1,10 @@
 // pkgs/@akanjs/cli/src/templates/lib/dict.ts
-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/esm/src/templates/lib/fetch.js

@@ -1,11 +1,11 @@
 // pkgs/@akanjs/cli/src/templates/lib/fetch.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 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(([module]) => module);
+  const scalarConstantModules = [...scanInfo.scalar.entries()].filter(([_, files]) => files.has("constant")).map(([module]) => module);
+  const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module]) => module);
   return `
 import { fetchOf, gqlOf, makeFetch, scalarUtilOf } from "@akanjs/signal";
 
@@ -13,11 +13,11 @@ import { root, libFetches } from "./__lib/lib.signal";
 import { cnst } from "./cnst";
 import * as sig from "./sig";
 
-${databaseModules.map((module) => `${["user", "setting", "summary"].includes(module) ? "export " : ""}const ${module}Gql = gqlOf(cnst.${module}Cnst, sig.${capitalize(module)}Signal${scanResult.name !== "shared" && ["user", "setting", "summary"].includes(module) ? `, { overwrite: root.${module}Gql }` : ""});`).join("\n")}
+${databaseModules.map((module) => `${["user", "setting", "summary"].includes(module) ? "export " : ""}const ${module}Gql = gqlOf(cnst.${module}Cnst, sig.${capitalize(module)}Signal${scanInfo.name !== "shared" && ["user", "setting", "summary"].includes(module) ? `, { overwrite: root.${module}Gql }` : ""});`).join("\n")}
 
 export const fetch = makeFetch(...libFetches, {
 ${databaseModules.map((module) => `...${module}Gql,`).join("\n")}
-${scalarConstantModules.map((module) => `...scalarUtilOf("${module}" as const, cnst.${capitalize(module)}),`).join("\n")}
+${scalarConstantModules.map((module) => `...scalarUtilOf(cnst.${module}Cnst),`).join("\n")}
 ${serviceModules.map((module) => `...fetchOf(sig.${capitalize(module)}Signal),`).join("\n")}
 ${databaseModules.map((module) => `${module}Gql,`).join("\n")}
 });

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

@@ -1,15 +1,11 @@
 // pkgs/@akanjs/cli/src/templates/lib/sig.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 databaseModules = scanResult.files.signal.databases;
-  const scalarModules = scanResult.files.signal.scalars;
-  const serviceModules = scanResult.files.signal.services;
   return `
-${databaseModules.map((module) => `export { ${capitalize(module)}Signal } from "./${module}/${module}.signal";`).join("\n")}
-${serviceModules.map((module) => `export { ${capitalize(module)}Signal } from "./_${module}/${module}.signal";`).join("\n")}
-${scalarModules.map((module) => `export { ${capitalize(module)}Signal } from "./__scalar/${module}/${module}.signal";`).join("\n")}
+${[...scanInfo.database.entries()].filter(([_, files]) => files.has("signal")).map(([module]) => `export { ${capitalize(module)}Signal } from "./${module}/${module}.signal";`).join("\n")}
+${[...scanInfo.service.entries()].filter(([_, files]) => files.has("signal")).map(([module]) => `export { ${capitalize(module)}Signal } from "./_${module}/${module}.signal";`).join("\n")}
 `;
 }
 export {

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

@@ -1,27 +1,24 @@
 // pkgs/@akanjs/cli/src/templates/lib/srv.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 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(([module]) => module);
+  const serviceModules = [...scanInfo.service.entries()].filter(([_, files]) => files.has("service")).map(([module]) => module);
   return `
 import { GetServices } from "@akanjs/service";
 
 import { libAllSrvs } from "./__lib/lib.service";
 ${databaseModules.map((module) => `import { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `import { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}
-${scalarModules.map((module) => `import { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 
 export * from "./__lib/lib.service";
 ${databaseModules.map((module) => `export { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `export { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}
-${scalarModules.map((module) => `export { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 
 export const allSrvs = {
   ...libAllSrvs,
-  ${[...databaseModules, ...scalarModules, ...serviceModules].map((module) => `${capitalize(module)}Service`).join(",\n  ")}
+  ${[...databaseModules, ...serviceModules].map((module) => `${capitalize(module)}Service`).join(",\n  ")}
 } as const;
 
 export type AllSrvs = GetServices<typeof allSrvs>;

package/esm/src/templates/lib/st.js

@@ -1,6 +1,6 @@
 // pkgs/@akanjs/cli/src/templates/lib/st.ts
-function getContent(scanResult, dict = {}) {
-  if (!scanResult)
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
     return null;
   return `
 "use client";
@@ -8,7 +8,7 @@ import { makeStore, st as baseSt } from "@akanjs/store";
 
 import { store } from "./store";
 
-export const st = makeStore(baseSt, store${scanResult.type === "lib" ? `, { library: true }` : ""});
+export const st = makeStore(baseSt, store${scanInfo.type === "lib" ? `, { library: true }` : ""});
 `;
 }
 export {

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

@@ -1,15 +1,14 @@
 // pkgs/@akanjs/cli/src/templates/lib/store.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 names = {
-    name: scanResult.name,
-    Name: capitalize(scanResult.name)
+    name: scanInfo.name,
+    Name: capitalize(scanInfo.name)
   };
-  const databaseModules = scanResult.files.store.databases;
-  const scalarModules = scanResult.files.store.scalars;
-  const serviceModules = scanResult.files.store.services;
+  const databaseModules = [...scanInfo.database.entries()].filter(([_, fileTypes]) => fileTypes.has("store")).map(([key]) => key);
+  const serviceModules = [...scanInfo.service.entries()].filter(([_, fileTypes]) => fileTypes.has("store")).map(([key]) => key);
   return `
 "use client";
 import { MixStore, rootStoreOf } from "@akanjs/store";
@@ -17,11 +16,9 @@ import { MixStore, rootStoreOf } from "@akanjs/store";
 import { libStores } from "./__lib/lib.store";
 ${databaseModules.map((module) => `import { ${capitalize(module)}Store } from "./${module}/${module}.store";`).join("\n")}
 ${serviceModules.map((module) => `import { ${capitalize(module)}Store } from "./_${module}/${module}.store";`).join("\n")}
-${scalarModules.map((module) => `import { ${capitalize(module)}Store } from "./__scalar/${module}/${module}.store";`).join("\n")}
 export class RootStore extends MixStore(
   ...libStores,
-  ${names.Name}Store,
-  ${[...databaseModules, ...scalarModules, ...serviceModules].map((module) => `${capitalize(module)}Store`).join(",\n  ")}
+  ${[...databaseModules, ...serviceModules].map((module) => `${capitalize(module)}Store`).join(",\n  ")}
 ) {}
   
 export const store = rootStoreOf(RootStore);

package/esm/src/templates/lib/usePage.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/lib/usePage.ts
-function getContent(scanResult, dict = {}) {
+function getContent(scanInfo, dict = {}) {
   return `
 import { makePageProto } from "@akanjs/next";
 

package/esm/src/templates/libRoot/akan.config.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/akan.config.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import type { LibConfig } from "@akanjs/config";
 

package/esm/src/templates/libRoot/base/baseLogic.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/base/baseLogic.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 // \uD604 \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C\uB294 \uD504\uB85C\uC81D\uD2B8 \uB0B4 \uC804\uCCB4\uC801\uC73C\uB85C \uC0AC\uC6A9\uB418\uB294 \uB85C\uC9C1\uC744 \uAD6C\uD604\uD558\uBA70, \uB530\uB77C\uC11C \uBC31/\uD504\uB860\uD2B8 \uBE44\uC758\uC874\uC801\uC778 pure js \uCF54\uB4DC\uB9CC \uAD6C\uD604 \uAC00\uB2A5\uD569\uB2C8\uB2E4.
 // common\uD3F4\uB354\uC640 \uB2E4\uB978\uC810\uC740, base \uCF54\uB4DC\uB294 \uC2DC\uC2A4\uD15C \uC804\uCCB4\uC5D0\uC11C import\uB418\uC5B4 \uC0AC\uC6A9\uB418\uBBC0\uB85C, \uAC00\uC7A5 \uD575\uC2EC\uC801\uC778 \uB85C\uC9C1\uACFC \uCD94\uC0C1\uD654\uB41C \uAE30\uB2A5\uB9CC \uAD6C\uD604\uD574\uC57C\uD569\uB2C8\uB2E4.

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

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

package/esm/src/templates/libRoot/common/commonLogic.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/common/commonLogic.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 // \uD604 \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C\uB294 \uD504\uB85C\uC81D\uD2B8 \uB0B4 \uC804\uCCB4\uC801\uC73C\uB85C \uC0AC\uC6A9\uB418\uB294 \uC138\uBD80\uC801\uC778 \uB85C\uC9C1\uC744 \uAD6C\uD604\uD558\uBA70, \uB530\uB77C\uC11C \uBC31/\uD504\uB860\uD2B8 \uBE44\uC758\uC874\uC801\uC778 pure js \uCF54\uB4DC\uB9CC \uAD6C\uD604 \uAC00\uB2A5\uD569\uB2C8\uB2E4.
 // base\uD3F4\uB354\uC640 \uB2E4\uB978\uC810\uC740, common \uCF54\uB4DC\uB294 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC5D0\uC11C\uB9CC import\uB418\uAE30 \uB54C\uBB38\uC5D0, \uC678\uBD80\uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C import\uD574\uC11C \uC0AC\uC6A9\uD558\uAC70\uB098 \uC0C1\uC138\uD55C \uB85C\uC9C1\uC744 \uAD6C\uD604\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.

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

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

package/esm/src/templates/libRoot/jest.config.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/jest.config.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 //! will be replaced with akan.config.ts
 import "tsconfig-paths/register";

package/esm/src/templates/libRoot/lib/___libName__/__libName__.dictionary.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/lib/___libName__/__libName__.dictionary.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 const dictionary = {} as const;
 

package/esm/src/templates/libRoot/lib/___libName__/__libName__.service.js

@@ -1,5 +1,5 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/lib/___libName__/__libName__.service.ts
-function getContent(scanResult, dict) {
+function getContent(scanInfo, dict) {
   return `
 import { LogService, Service } from "@akanjs/service";
 

package/esm/src/templates/libRoot/lib/___libName__/__libName__.store.js

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

package/esm/src/templates/libRoot/lib/option.js

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