@akanjs/cli 0.9.58 → 0.9.59

package/cjs/index.js

@@ -272,8 +272,8 @@ var import_ora = __toESM(require("ora"));
 var Spinner = class _Spinner {
   static padding = 12;
   spinner;
-  stopWatch;
-  startAt;
+  stopWatch = null;
+  startAt = /* @__PURE__ */ new Date();
   prefix;
   message;
   enableSpin;
@@ -711,7 +711,6 @@ var import_meta = {};
 var makeAppConfig = (config, props) => {
   const { name, repoName } = props;
   return {
-    rootLib: config.rootLib,
     libs: config.libs ?? [],
     backend: {
       docker: makeDockerfile("backend", config.backend?.docker ?? {}, props),
@@ -753,7 +752,6 @@ var getAppConfig = async (appRoot, props) => {
 };
 var makeLibConfig = (config, props) => {
   return {
-    rootLib: config.rootLib,
     libs: config.libs ?? [],
     backend: {
       explicitDependencies: config.backend?.explicitDependencies ?? []
@@ -1429,32 +1427,31 @@ var ScanInfo = class {
   constructor(scanResult) {
     this.name = scanResult.name;
     this.scanResult = scanResult;
-    Object.entries(scanResult.files).forEach(
-      ([key, value]) => {
-        const { databases, services, scalars } = value;
-        databases.forEach((modelName) => {
-          const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
-          model.add(key);
-          this.database.set(modelName, model);
-          this.file[key].all.add(modelName);
-          this.file[key].databases.add(modelName);
-        });
-        services?.forEach((serviceName) => {
-          const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
-          service.add(key);
-          this.service.set(serviceName, service);
-          this.file[key].all.add(serviceName);
-          this.file[key].services.add(serviceName);
-        });
-        scalars?.forEach((scalarName) => {
-          const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
-          scalar.add(key);
-          this.scalar.set(scalarName, scalar);
-          this.file[key].all.add(scalarName);
-          this.file[key].scalars.add(scalarName);
-        });
-      }
-    );
+    Object.entries(scanResult.files).forEach(([_key, value]) => {
+      const key = _key;
+      const { databases, services, scalars } = value;
+      databases.forEach((modelName) => {
+        const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
+        model.add(key);
+        this.database.set(modelName, model);
+        this.file[key].all.add(modelName);
+        this.file[key].databases.add(modelName);
+      });
+      services?.forEach((serviceName) => {
+        const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
+        service.add(key);
+        this.service.set(serviceName, service);
+        this.file[key].all.add(serviceName);
+        this.file[key].services.add(serviceName);
+      });
+      scalars?.forEach((scalarName) => {
+        const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
+        scalar.add(key);
+        this.scalar.set(scalarName, scalar);
+        this.file[key].all.add(scalarName);
+        this.file[key].scalars.add(scalarName);
+      });
+    });
   }
   getScanResult() {
     return this.scanResult;
@@ -2145,10 +2142,10 @@ var Executor = class _Executor {
     targetPath,
     scanInfo,
     overwrite = true
-  }, dict = {}) {
+  }, dict = {}, options = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const result = getContent.default(scanInfo ?? null, dict);
+      const result = getContent.default(scanInfo ?? null, dict, options);
       if (result === null)
         return null;
       const filename = typeof result === "object" ? result.filename : import_path4.default.basename(targetPath).replace(".js", ".ts");
@@ -2180,6 +2177,7 @@ var Executor = class _Executor {
     template,
     scanInfo,
     dict = {},
+    options = {},
     overwrite = true
   }) {
     const templatePath = `${getDirname(import_meta2.url)}/src/templates${template ? `/${template}` : ""}`;
@@ -2188,7 +2186,8 @@ var Executor = class _Executor {
       const filename = import_path4.default.basename(prefixTemplatePath);
       const fileContent = await this.#applyTemplateFile(
         { templatePath: prefixTemplatePath, targetPath: import_path4.default.join(basePath2, filename), scanInfo, overwrite },
-        dict
+        dict,
+        options
       );
       return fileContent ? [fileContent] : [];
     } else {
@@ -2199,7 +2198,8 @@ var Executor = class _Executor {
           if (import_fs4.default.statSync(subpath).isFile()) {
             const fileContent = await this.#applyTemplateFile(
               { templatePath: subpath, targetPath: import_path4.default.join(basePath2, subdir), scanInfo, overwrite },
-              dict
+              dict,
+              options
             );
             return fileContent ? [fileContent] : [];
           } else
@@ -2208,7 +2208,8 @@ var Executor = class _Executor {
               template: import_path4.default.join(template, subdir),
               scanInfo,
               dict,
-              overwrite
+              overwrite,
+              options
             });
         })
       )).flat();
@@ -2449,6 +2450,7 @@ var SysExecutor = class extends Executor {
     const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this, { refresh }) : await LibInfo.fromExecutor(this, { refresh });
     if (write) {
       await Promise.all([
+        this._applyTemplate({ basePath: "env", template: "env", scanInfo }),
         this._applyTemplate({ basePath: "lib", template: "lib", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "server.ts", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "client.ts", scanInfo }),
@@ -2477,6 +2479,7 @@ var SysExecutor = class extends Executor {
         const libInfos = [...scanInfo.getLibInfos().values()];
         await Promise.all(
           libInfos.map((libInfo) => [
+            libInfo.exec._applyTemplate({ basePath: "env", template: "env", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: "lib", template: "lib", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "server.ts", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "client.ts", scanInfo: libInfo }),
@@ -2674,8 +2677,6 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
   }
 };
 var LibExecutor = class _LibExecutor extends SysExecutor {
-  workspaceRoot;
-  repoName;
   dist;
   emoji = execEmoji.lib;
   constructor({ workspace, name }) {
@@ -2767,7 +2768,7 @@ var getHostConfig = (host = akanCloudHost) => {
 };
 var setHostConfig = (host = akanCloudHost, config = {}) => {
   const akanConfig = getAkanGlobalConfig();
-  akanConfig[host] = config;
+  akanConfig.cloudHost[host] = config;
   setAkanGlobalConfig(akanConfig);
 };
 var getSelf = async (token) => {
@@ -2874,24 +2875,24 @@ var FileEditor = class {
 var CapacitorApp = class {
   constructor(app) {
     this.app = app;
+    this.project = new import_project.MobileProject(this.app.cwdPath, {
+      android: { path: "android" },
+      ios: { path: "ios/App" }
+    });
   }
   project;
   iosTargetName = "App";
   async init() {
-    const project = new import_project.MobileProject(this.app.cwdPath, {
-      android: { path: "android" },
-      ios: { path: "ios/App" }
-    });
-    await project.load();
+    const project = this.project;
+    await this.project.load();
     if (!project.android) {
       await this.app.spawn("npx", ["cap", "add", "android"]);
-      await project.load();
+      await this.project.load();
     }
     if (!project.ios) {
       await this.app.spawn("npx", ["cap", "add", "ios"]);
-      await project.load();
+      await this.project.load();
     }
-    this.project = project;
     return this;
   }
   async save() {
@@ -3314,13 +3315,16 @@ var handleOption = (programCommand, argMeta) => {
     flag = argMeta.name.slice(0, 1).toLowerCase(),
     desc = argMeta.name,
     example,
-    enum: choices,
+    enum: enumChoices,
     ask
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
+  const choices = enumChoices?.map(
+    (choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() }
+  );
   programCommand.option(
     `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
-    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.join(", ")})` : ""}`
+    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.map((choice) => choice.name).join(", ")})` : ""}`
   );
   return programCommand;
 };
@@ -3345,7 +3349,7 @@ var convertOptionValue = (value, type) => {
 var getOptionValue = async (argMeta, opt) => {
   const {
     name,
-    argsOption: { enum: choices, default: defaultValue, type, desc, nullable, example, ask }
+    argsOption: { enum: enumChoices, default: defaultValue, type, desc, nullable, example, ask }
   } = argMeta;
   if (opt[argMeta.name] !== void 0)
     return convertOptionValue(opt[argMeta.name], type ?? "string");
@@ -3353,11 +3357,11 @@ var getOptionValue = async (argMeta, opt) => {
     return defaultValue;
   else if (nullable)
     return null;
-  if (choices) {
-    const choice = await (0, import_prompts3.select)({
-      message: ask ?? desc ?? `Select the ${name} value`,
-      choices: choices.map((choice2) => choice2.toString())
-    });
+  if (enumChoices) {
+    const choices = enumChoices.map(
+      (choice2) => typeof choice2 === "object" ? { value: choice2.value, name: choice2.label } : { value: choice2, name: choice2.toString() }
+    );
+    const choice = await (0, import_prompts3.select)({ message: ask ?? desc ?? `Select the ${name} value`, choices });
     return choice;
   } else if (type === "boolean") {
     const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
@@ -3647,7 +3651,7 @@ var AiSession = class _AiSession {
   }
   messageHistory = [];
   sessionKey;
-  isCacheLoaded;
+  isCacheLoaded = false;
   workspace;
   constructor(type, { workspace, cacheKey, isContinued }) {
     this.workspace = workspace;
@@ -4453,11 +4457,12 @@ var import_vite_plugin_commonjs = __toESM(require("vite-plugin-commonjs"), 1);
 var import_vite_plugin_node_polyfills = require("vite-plugin-node-polyfills");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 var ApplicationRunner = class {
-  async createApplication(appName, workspace) {
+  async createApplication(appName, workspace, libs = []) {
     await workspace.applyTemplate({
       basePath: `apps/${appName}`,
       template: "app",
-      dict: { appName, companyName: workspace.repoName, startDomain: "localhost" }
+      dict: { appName, companyName: workspace.repoName, startDomain: "localhost" },
+      options: { libs }
     });
     workspace.setTsPaths("app", appName);
     return AppExecutor.from(workspace, appName);
@@ -4547,7 +4552,7 @@ var ApplicationRunner = class {
     });
     const rootPackageJson = app.workspace.getPackageJson();
     const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson);
-    buildResult.outputFiles.map((file) => app.dist.writeFile(file.path, file.text));
+    buildResult.outputFiles.forEach((file) => app.dist.writeFile(file.path, file.text));
     const appPackageJson = {
       name: `${app.name}/backend`,
       description: `${app.name} backend`,
@@ -4605,7 +4610,7 @@ var ApplicationRunner = class {
       "react-dom",
       "typescript"
     ]);
-    buildResult.outputFiles.map((file) => app.dist.writeFile(file.path, file.text));
+    buildResult.outputFiles.forEach((file) => app.dist.writeFile(file.path, file.text));
     const appPackageJson = {
       name: `${app.name}/frontend`,
       description: `${app.name} frontend`,
@@ -5173,9 +5178,9 @@ var ApplicationRunner = class {
 var ApplicationScript = class {
   #runner = new ApplicationRunner();
   libraryScript = new LibraryScript();
-  async createApplication(appName, workspace, { start = false } = {}) {
+  async createApplication(appName, workspace, { start = false, libs = [] } = {}) {
     const spinner = workspace.spinning("Creating application...");
-    const app = await this.#runner.createApplication(appName, workspace);
+    const app = await this.#runner.createApplication(appName, workspace, libs);
     spinner.succeed(`Application created in apps/${app.name}`);
     await this.syncApplication(app);
     if (start)
@@ -5831,7 +5836,7 @@ ${import_chalk6.default.green("\u27A4")} Authentication Required`));
     const tag = isOfficialRelease ? "latest" : patchVersionOfBase.split("-").at(1) ?? "dev";
     const getNextVersion = async (prefix, tag2) => {
       try {
-        const latestPublishedVersionOfBase = await (0, import_latest_version.default)("@akanjs/base", { version: prefix });
+        const latestPublishedVersionOfBase = await (0, import_latest_version.default)("@akanjs/base", { version: tag2 });
         const latestPatch = parseInt(latestPublishedVersionOfBase.split(".").at(-1) ?? "0");
         const nextVersion2 = `${prefix}.${latestPatch + 1}`;
         return { nextVersion: nextVersion2, latestPublishedVersion: latestPublishedVersionOfBase };
@@ -5866,17 +5871,17 @@ ${import_chalk6.default.green("\u27A4")} Authentication Required`));
     );
     Logger.info("All libraries are published to npm");
   }
-  async update(workspace) {
+  async update(workspace, tag = "latest") {
     if (!workspace.exists("package.json"))
-      await workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]);
+      await workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest", `--tag=${tag}`]);
     else
       await Promise.all([
-        workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]),
-        this.#updateAkanPkgs(workspace)
+        workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest", `--tag=${tag}`]),
+        this.#updateAkanPkgs(workspace, tag)
       ]);
   }
-  async #updateAkanPkgs(workspace) {
-    const latestPublishedVersionOfBase = await (0, import_latest_version.default)("@akanjs/base");
+  async #updateAkanPkgs(workspace, tag = "latest") {
+    const latestPublishedVersionOfBase = await (0, import_latest_version.default)("@akanjs/base", { version: tag });
     const rootPackageJson = workspace.getPackageJson();
     if (!rootPackageJson.dependencies)
       throw new Error("No dependencies found in package.json");
@@ -5920,9 +5925,9 @@ var CloudScript = class {
     );
     await this.#runner.deployAkan(workspace, akanPkgs);
   }
-  async update(workspace) {
+  async update(workspace, tag = "latest") {
     const spinner = workspace.spinning("Updating Akan.js packages and CLI...");
-    await this.#runner.update(workspace);
+    await this.#runner.update(workspace, tag);
     spinner.succeed("Akan.js packages and CLI updated, global version is below");
     Logger.raw("> Akan version: ");
     await workspace.spawn("akan", ["--version"], { stdio: "inherit" });
@@ -5950,8 +5955,8 @@ var CloudCommand = class {
   async deployAkan(workspace) {
     await this.cloudScript.deployAkan(workspace);
   }
-  async update(workspace) {
-    await this.cloudScript.update(workspace);
+  async update(workspace, tag) {
+    await this.cloudScript.update(workspace, tag);
   }
 };
 __decorateClass([
@@ -5981,7 +5986,12 @@ __decorateClass([
 ], CloudCommand.prototype, "deployAkan", 1);
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Workspace())
+  __decorateParam(0, Workspace()),
+  __decorateParam(1, Option("tag", {
+    desc: "tag of the update",
+    default: "latest",
+    enum: ["latest", "dev", "canary", "beta", "rc", "alpha"]
+  }))
 ], CloudCommand.prototype, "update", 1);
 CloudCommand = __decorateClass([
   Commands()
@@ -6777,11 +6787,13 @@ var WorkspaceScript = class {
   #runner = new WorkspaceRunner();
   applicationScript = new ApplicationScript();
   libraryScript = new LibraryScript();
-  async createWorkspace(repoName, appName, dirname3 = ".") {
+  async createWorkspace(repoName, appName, dirname3 = ".", installLibs) {
     const workspace = await this.#runner.createWorkspace(repoName, appName, dirname3);
-    await this.libraryScript.installLibrary(workspace, "util");
-    await this.libraryScript.installLibrary(workspace, "shared");
-    await this.applicationScript.createApplication(appName, workspace);
+    if (installLibs) {
+      await this.libraryScript.installLibrary(workspace, "util");
+      await this.libraryScript.installLibrary(workspace, "shared");
+    }
+    await this.applicationScript.createApplication(appName, workspace, { libs: installLibs ? ["util", "shared"] : [] });
     Logger.rawLog(`
 \u{1F389} Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
     Logger.rawLog(`\u{1F680} Run \`cd ${repoName} && akan start ${appName}\` to start the development server.`);
@@ -6841,11 +6853,12 @@ var WorkspaceScript = class {
 // pkgs/@akanjs/cli/src/workspace/workspace.command.ts
 var WorkspaceCommand = class {
   workspaceScript = new WorkspaceScript();
-  async createWorkspace(workspaceName, app, dir) {
+  async createWorkspace(workspaceName, app, dir, libs) {
     await this.workspaceScript.createWorkspace(
       workspaceName.toLowerCase().replace(/ /g, "-"),
       app.toLowerCase().replace(/ /g, "-"),
-      dir
+      dir,
+      libs
     );
   }
   async generateMongo(workspace) {
@@ -6871,7 +6884,18 @@ __decorateClass([
   Target.Public(),
   __decorateParam(0, Argument("workspaceName", { desc: "what is the name of your organization?" })),
   __decorateParam(1, Option("app", { desc: "what is the codename of your first application? (e.g. myapp)" })),
-  __decorateParam(2, Option("dir", { desc: "directory of workspace", default: process.env.USE_AKANJS_PKGS === "true" ? "local" : "." }))
+  __decorateParam(2, Option("dir", { desc: "directory of workspace", default: process.env.USE_AKANJS_PKGS === "true" ? "local" : "." })),
+  __decorateParam(3, Option("libs", {
+    type: "boolean",
+    desc: "Do you want to install shared and util libraries? (admin, user file, etc.)",
+    enum: [
+      { label: "No, I want to start with empty workspace (Recommended)", value: false },
+      {
+        label: "Yes, I want to accelerate development by installing shared and util libraries (for akanjs experts)",
+        value: true
+      }
+    ]
+  }))
 ], WorkspaceCommand.prototype, "createWorkspace", 1);
 __decorateClass([
   Target.Public(),

package/cjs/src/guidelines/sharedUiUsage/sharedUiUsage.instruction.md

@@ -88,8 +88,6 @@ const MyComponent = () => {
         value={formState.status}
         items={cnst.Status}
         onChange={(status) => st.do.setStatusOnMyModel(status)}
-        model="myModel"
-        field="status"
       />
     </>
   );
@@ -280,7 +278,6 @@ Components seamlessly integrate with the state management:
 ## Best Practices
 
 1. **Use the appropriate component type** for each part of your feature:
-
    - Use **Field** components for data entry
    - Use **Data** components for data visualization and management
    - Use **Load** components for data fetching

package/cjs/src/templates/app/akan.config.js

@@ -22,14 +22,13 @@ __export(akan_config_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(akan_config_exports);
-function getContent(scanInfo, dict) {
+function getContent(scanInfo, dict, options) {
   return `
 import type { AppConfig } from "@akanjs/config";
 
-const config: AppConfig = {
-  rootLib: "shared",
+const config: AppConfig = ${options.libs.length ? `{
   libs: ["util", "shared"],
-};
+}` : "{}"};
 
 export default config;
   `;

package/cjs/src/templates/app/app/[lang]/layout.js

@@ -22,7 +22,8 @@ __export(layout_exports, {
   default: () => getContent
 });
 module.exports = __toCommonJS(layout_exports);
-function getContent(scanInfo, dict) {
+function getContent(scanInfo, dict, options) {
+  const isUsingShared = options.libs.includes("shared");
   return {
     filename: "layout.tsx",
     content: `
@@ -31,7 +32,7 @@ import { RootLayoutProps } from "@akanjs/client";
 import { System } from "@akanjs/ui";
 import { env } from "@${dict.appName}/env/env.client";
 import { fetch } from "@${dict.appName}/client";
-import { Auth } from "@shared/ui";
+${isUsingShared ? "import { Auth } from '@shared/ui';" : ""}
 
 export const metadata = { title: "${dict.appName}" };
 
@@ -45,8 +46,7 @@ export default function Layout({ children, params }: RootLayoutProps) {
       // className="bg-base-100"
       env={env}
     >
-      {children}
-      <Auth.User />
+      {children}${isUsingShared ? "\n      <Auth.User />\n      <Auth.Admin />" : ""}
     </System.Provider>
   );
 }

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

@@ -30,7 +30,10 @@ function getContent(scanInfo, dict) {
 import { st } from "@${dict.appName}/client";
 import { System } from "@akanjs/ui";
 
-export default function Layout({ children }) {
+interface LayoutProps {
+  children: React.ReactNode;
+}
+export default function Layout({ children }: LayoutProps) {
   return <System.Root st={st}>{children}</System.Root>;
 }
   `

package/cjs/src/templates/app/env/env.server.testing.ts.template

@@ -1,7 +1,6 @@
-import { env as shared } from "@shared/server";
-
 import type { ModulesOptions } from "../lib/option";
+import { libEnv } from "./env.server.type";
 
 export const env: ModulesOptions = {
-  ...shared,
+  ...libEnv,
 };

package/cjs/src/templates/app/lib/___appName__/__appName__.dictionary.js

@@ -24,9 +24,12 @@ __export(appName_dictionary_exports, {
 module.exports = __toCommonJS(appName_dictionary_exports);
 function getContent(scanInfo, dict) {
   return `
-import type { SignalDictionary } from "@akanjs/dictionary";
+import { serviceDictionary } from "@akanjs/dictionary";
+
 import type { ${dict.AppName}Endpoint } from "./${dict.appName}.signal";
 
-export const dictionary = {} satisfies SignalDictionary<${dict.AppName}Endpoint>;
-  `;
+export const dictionary = serviceDictionary(["en", "ko"])
+  .endpoint<${dict.AppName}Endpoint>((fn) => ({}))
+  .translate({});
+`;
 }

package/cjs/src/templates/app/lib/___appName__/__appName__.service.js

@@ -26,6 +26,6 @@ function getContent(scanInfo, dict) {
   return `
 import { serve } from "@akanjs/service";
 
-export class ${dict.AppName}Service extends serve("${dict.appName}" as const, { serverMode: "batch" }) {}
+export class ${dict.AppName}Service extends serve("${dict.appName}" as const, { serverMode: "batch" }, () => ({})) {}
 `;
 }

package/cjs/src/templates/env/env.server.type.js

@@ -0,0 +1,36 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// pkgs/@akanjs/cli/src/templates/env/env.server.type.ts
+var env_server_type_exports = {};
+__export(env_server_type_exports, {
+  default: () => getContent
+});
+module.exports = __toCommonJS(env_server_type_exports);
+function getContent(scanInfo, dict = {}) {
+  if (!scanInfo)
+    return null;
+  const libs = scanInfo.getLibs();
+  return `
+${libs.length ? libs.map((lib) => `import { env as ${lib}Option } from "@${lib}/server";`).join("\n") : 'import { baseEnv } from "@akanjs/base";'}
+
+export const libEnv = {
+${libs.length ? libs.map((lib) => `  ...${lib}Option,`).join("\n") : "  ...baseEnv,"}
+};
+`;
+}

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

@@ -27,7 +27,6 @@ function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
   const libs = scanInfo.getLibs();
-  const rootLib = scanInfo.akanConfig.rootLib;
   const libInfos = [...scanInfo.getLibInfos().values()];
   const extendedModels = Object.fromEntries(
     [...scanInfo.file.signal.databases].map(
@@ -50,7 +49,7 @@ ${Object.entries(extendedModels).map(([modelName, extendedModels2]) => {
 }`;
   }).join("\n")}
 
-export const root = ${libs.length ? rootLib ?? libs[0] : "baseFetch"};
+export const root = ${libs.length ? libs[0] : "baseFetch"};
 export const libFetches = [${libs.length ? libs.map((lib) => `${lib}.fetch`).join(", ") : "baseFetch"}] as const;
 `;
 }

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

@@ -57,7 +57,7 @@ ${[...databaseModules, ...serviceModules].map((module2) => `  ${capitalize(modul
 );
 export const serializedSignals = signals.map((signal) => signalInfo.serialize(signal));
 
-${databaseModules.map((module2) => `export const ${module2} = gqlOf(cnst.${module2}, db.${module2}.Filter, ${capitalize(module2)}Signal${scanInfo.name !== "shared" && ["user", "setting", "summary"].includes(module2) ? `, { overwrite: root.${module2} }` : ""});`).join("\n")}
+${databaseModules.map((module2) => `export const ${module2} = gqlOf(cnst.${module2}, db.${module2}.Filter, ${capitalize(module2)}Signal);`).join("\n")}
 
 export const fetch = makeFetch(...libFetches, {
 ${databaseModules.map((module2) => `...${module2},`).join("\n")}

package/cjs/src/templates/libRoot/.gitignore.template

@@ -1,14 +1,15 @@
 **/script.ts
 **/script*.ts
 **/.env
-**/env.client.debug.ts*
-**/env.client.develop.ts*
-**/env.client.main.ts*
-**/env.client.testing.ts*
-**/env.server.debug.ts*
-**/env.server.develop.ts*
-**/env.server.main.ts*
-**/env.server.testing.ts*
+**/env.client.debug.ts
+**/env.client.develop.ts
+**/env.client.main.ts
+**/env.client.testing.ts
+**/env.server.debug.ts
+**/env.server.develop.ts
+**/env.server.main.ts
+**/env.server.testing.ts
+**/env.server.type.ts
 
 # System Files
 .DS_Store

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

@@ -27,7 +27,6 @@ function getContent(scanInfo, dict) {
 import type { LibConfig } from "@akanjs/config";
 
 const config: LibConfig = {
-  rootLib: "shared",
   libs: ["util", "shared"],
 };
 

package/cjs/src/templates/libRoot/env/env.server.example.ts.template

@@ -1,7 +1,6 @@
-import { env as shared } from "@shared/server";
-
 import type { ModulesOptions } from "../lib/option";
+import { libEnv } from "./env.server.type";
 
 export const env: ModulesOptions = {
-  ...shared,
+  ...libEnv,
 };

package/cjs/src/templates/libRoot/env/env.server.testing.ts.template

@@ -1,7 +1,6 @@
-import { env as shared } from "@shared/server";
-
 import type { ModulesOptions } from "../lib/option";
+import { libEnv } from "./env.server.type";
 
 export const env: ModulesOptions = {
-  ...shared,
+  ...libEnv,
 };