@akanjs/cli 0.0.150 → 0.0.152

package/cjs/index.js

@@ -612,7 +612,8 @@ var withBase = (appName, config, libs, routes = []) => {
         ...[appName, ...libs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
         "@contract",
         "@akanjs/next",
-        "@akanjs/common"
+        "@akanjs/common",
+        "@akanjs/ui"
       ]
     },
     // modularizeImports: {
@@ -1435,19 +1436,19 @@ var Executor = class _Executor {
       ...options
     });
     let stdout = "";
+    let stderr = "";
     proc.stdout?.on("data", (data) => {
       stdout += data;
-    });
-    proc.stdout?.on("data", (data) => {
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
+      stderr += data;
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject({ code, signal, stdout });
+          reject({ code, signal, stdout, stderr });
         else
           resolve(stdout);
       });
@@ -1634,11 +1635,12 @@ var Executor = class _Executor {
     dict = {},
     overwrite = true
   }) {
-    const templatePath = `${__dirname}/src/templates${template ? `/${template}` : ""}`.replace(".ts", ".js");
-    if (import_fs4.default.statSync(templatePath).isFile()) {
-      const filename = import_path3.default.basename(templatePath);
+    const templatePath = `${__dirname}/src/templates${template ? `/${template}` : ""}`;
+    const prefixTemplatePath = templatePath.endsWith(".tsx") ? templatePath : templatePath.replace(".ts", ".js");
+    if (import_fs4.default.statSync(prefixTemplatePath).isFile()) {
+      const filename = import_path3.default.basename(prefixTemplatePath);
       const fileContent = await this.#applyTemplateFile(
-        { templatePath, targetPath: import_path3.default.join(basePath2, filename), scanResult, overwrite },
+        { templatePath: prefixTemplatePath, targetPath: import_path3.default.join(basePath2, filename), scanResult, overwrite },
         dict
       );
       return fileContent ? [fileContent] : [];
@@ -2893,7 +2895,6 @@ var runCommands = async (...commands) => {
           } catch (e) {
             const errMsg = e instanceof Error ? e.message : typeof e === "string" ? e : JSON.stringify(e);
             Logger.error(`Command Error: ${import_chalk4.default.red(errMsg)}`);
-            console.error(e);
             throw e;
           }
         });
@@ -3204,6 +3205,7 @@ var Builder = class {
       format,
       outdir: `${this.#distExecutor.cwdPath}/${format}`,
       logLevel: "error",
+      // external: ["react", "react-dom"],
       loader: assetLoader
     };
   }
@@ -3524,7 +3526,8 @@ var ApplicationRunner = class {
     if (target === "frontend") {
       await app.exec("rm -rf .next");
       app.writeFile("next.config.ts", defaultNextConfigFile);
-    }
+    } else if (target === "csr")
+      await app.workspace.exec("rm -rf node_modules/.vite");
     return { env: this.#getEnv(app, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app) {
@@ -3612,7 +3615,7 @@ var ApplicationRunner = class {
     if (open2)
       setTimeout(() => (0, import_open.default)("http://localhost:4200"), 3e3);
     onStart?.();
-    await app.spawn("npx", ["next", "dev", "-p", "4200", ...turbo ? ["--turbo"] : []], { env });
+    await app.spawn("npx", ["next", "dev", "-p", "4200", ...turbo ? ["--turbo"] : []], { env, stdio: "inherit" });
   }
   async #getViteConfig(app, command) {
     const { env } = await this.#prepareCommand(app, command, "csr");
@@ -4856,7 +4859,7 @@ var requestTemplate = ({
 	 \uCF54\uB529 \uADDC\uCE59
 		 - \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC544\uC774\uCF58: react-icons \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
-		 - CSS: tailwind, DaisyUI(btn, input, badge \uAC19\uC740 \uAE30\uBCF8 \uC694\uC18C\uB9CC \uC0AC\uC6A9 \uAC00\uB2A5, card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
+		 - CSS: tailwind, DaisyUI(card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
 		 - Ui Component: @util/ui \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC870\uAC74\uBD80 \uD074\uB798\uC2A4: clsx \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 	 \uCF54\uB4DC \uC2A4\uD0C0\uC77C
@@ -4914,7 +4917,7 @@ var requestView = ({
 	 \uCF54\uB529 \uADDC\uCE59
 		 - \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC544\uC774\uCF58: react-icons \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
-		 - CSS: tailwind, DaisyUI(btn, input, badge \uAC19\uC740 \uAE30\uBCF8 \uC694\uC18C\uB9CC \uC0AC\uC6A9 \uAC00\uB2A5, card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
+		 - CSS: tailwind, DaisyUI(card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
 		 - Ui Component: @util/ui \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC870\uAC74\uBD80 \uD074\uB798\uC2A4: clsx \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 	 \uCF54\uB4DC \uC2A4\uD0C0\uC77C
@@ -4975,7 +4978,7 @@ var requestUnit = ({
 	 \uCF54\uB529 \uADDC\uCE59
 		 - \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC544\uC774\uCF58: react-icons \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
-		 - CSS: tailwind, DaisyUI(btn, input, badge \uAC19\uC740 \uAE30\uBCF8 \uC694\uC18C\uB9CC \uC0AC\uC6A9 \uAC00\uB2A5, card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
+		 - CSS: tailwind, DaisyUI(card/hero \uAC19\uC740 \uBCF5\uC7A1\uD55C \uCEF4\uD3EC\uB10C\uD2B8 \uC0AC\uC6A9 X) \uC0AC\uC6A9
 		 - Ui Component: @util/ui \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 		 - \uC870\uAC74\uBD80 \uD074\uB798\uC2A4: clsx \uB77C\uC774\uBE0C\uB7EC\uB9AC \uC0AC\uC6A9
 	 \uCF54\uB4DC \uC2A4\uD0C0\uC77C
@@ -5021,7 +5024,7 @@ var ModuleRunner = class {
   async createComponentTemplate(module2, type) {
     await module2.sys.applyTemplate({
       basePath: `./lib/${module2.name}`,
-      template: `module/__model__.${capitalize(type)}.ts`,
+      template: `module/__Model__.${capitalize(type)}.tsx`,
       dict: { model: module2.name, appName: module2.sys.name }
     });
     return {

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

@@ -374,7 +374,7 @@ Here's a complete example of components for a "Product" feature:
 ```tsx
 import { clsx, ModelProps } from "@akanjs/client";
 import { cnst } from "@app/client";
-import { Image, Link } from "@util/ui";
+import { Image, Link } from "@akanjs/ui";
 
 export const Card = ({ product, href }: ModelProps<"product", cnst.Product>) => {
   return (
@@ -395,7 +395,7 @@ export const Card = ({ product, href }: ModelProps<"product", cnst.Product>) =>
 ```tsx
 import { clsx } from "@akanjs/client";
 import { cnst } from "@app/client";
-import { Button, Image } from "@util/ui";
+import { Button, Image } from "@akanjs/ui";
 
 interface ProductViewProps {
   className?: string;
@@ -445,7 +445,8 @@ export const General = ({ className, product }: ProductViewProps) => {
 "use client";
 import { clsx } from "@akanjs/client";
 import { st } from "@app/client";
-import { Button, Input, Upload } from "@util/ui";
+import { Button, Input } from "@akanjs/ui";
+import { Upload } from "@util/ui";
 import { AiOutlinePlus } from "react-icons/ai";
 
 export const General = () => {
@@ -520,8 +521,8 @@ export const General = () => {
 import { ModelDashboardProps } from "@akanjs/client";
 import { getQueryMap } from "@akanjs/constant";
 import { cnst, st } from "@app/client";
-import { Data } from "@shared/ui";
-import { Button } from "@util/ui";
+import { Data } from "@akanjs/ui";
+import { Button } from "@akanjs/ui";
 
 export const Stat = ({
   className,
@@ -591,7 +592,7 @@ export const PriceFilter = ({
 import { ModelsProps } from "@akanjs/client";
 import { ClientInit, ClientView } from "@akanjs/signal";
 import { cnst, Product } from "@app/client";
-import { Data, Load } from "@shared/ui";
+import { Data, Load } from "@akanjs/ui";
 
 export const Admin = ({ sliceName = "product", init, query }: ModelsProps<cnst.Product>) => {
   return (

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

@@ -379,29 +379,16 @@ export const registerUserModule = (option: ModulesOptions) =>
 #### Template Component (`[ModuleName].Template.tsx`)
 
 ```tsx
-import { Button, Form } from "@util/ui";
+import { Button } from "@akanjs/ui";
 
 import { dict } from "../dict";
 import { st } from "../st";
 
 export const General = () => {
-  const { userForm } = st.use.user();
-  const { signin, setUserForm } = st.do.user();
+  const { userForm } = st.use.userForm();
 
   return (
-    <Form onSubmit={signin}>
-      <Form.Item label={dict.user.email}>
-        <Form.Input type="email" value={userForm.email} onChange={(e) => setUserForm({ email: e.target.value })} />
-      </Form.Item>
-      <Form.Item label={dict.user.password}>
-        <Form.Input
-          type="password"
-          value={userForm.password || ""}
-          onChange={(e) => setUserForm({ password: e.target.value })}
-        />
-      </Form.Item>
-      <Button type="submit">{dict.user.signin}</Button>
-    </Form>
+    // WIP
   );
 };
 ```
@@ -473,7 +460,7 @@ export const User = () => (
 #### Client Exports (`index.tsx`)
 
 ```tsx
-import { Signal } from "@util/ui";
+import { Signal } from "@akanjs/ui";
 import { FaUser } from "react-icons/fa";
 
 import * as Template from "./User.Template";

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

@@ -340,7 +340,7 @@ const drones = await this.listByName("myDrone", { sort: "alphabetical" });
 | `maxlength`  | `number`             | -       | Maximum string length                  | `@Field.Prop(()=> String, { maxlength: 30 }) title: string;`           |
 | `query`      | `object`             | -       | Query value for Summary fields         | `@Field.Prop(() => Int, { query: { status: { $ne: 'inactive' } })`     |
 | `accumulate` | `object`             | -       | Aggregation value for Insight fields   | `@Field.Prop(() => Int, { accumulate: { $sum: 1 } }) count: number;`   |
-| `example`    | `any`                | -       | Example value for API docs             | `@Field.Prop(()=> String, { example: "hello@akanjs.com" }) email;`     |
+| `example`    | `any`                | -       | Example value for API docs             | `@Field.Prop(()=> String, { example: "contact@akanjs.com" }) email;`   |
 | `of`         | `any`                | -       | Value type for Map fields              | `@Field.Prop(()=> Map, { of: Date }) readAts: Map<string, Dayjs>;`     |
 | `validate`   | `(value) => boolean` | -       | Custom validation function             | `@Field.Prop(()=> String, { validate: (v)=> v.includes("@") }) email;` |
 

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

@@ -39,7 +39,7 @@ A typical Model.Unit.tsx file exports multiple component variations:
 ```tsx
 import { clsx } from "clsx";
 import { cnst } from "@your-lib/client";
-import { Image, Link } from "@util/ui";
+import { Image, Link } from "@akanjs/ui";
 
 // Compact representation (minimal details)
 export const Abstract = ({
@@ -253,7 +253,7 @@ export const Card = ({ user, className }: { user: cnst.LightUser; className?: st
 Always use the optimized `Image` component from `@util/ui` with proper attributes:
 
 ```tsx
-import { Image } from "@util/ui";
+import { Image } from "@akanjs/ui";
 
 export const Card = ({ product }: { product: cnst.LightProduct }) => (
   <div className="card">

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

@@ -748,7 +748,7 @@ export const Product = ({ product }: ProductViewProps) => (
 ### 1. Optimize Images and Media
 
 ```tsx
-import { Image } from "@util/ui"; // Optimized image component
+import { Image } from "@akanjs/ui"; // Optimized image component
 
 export const General = ({ product }: ProductViewProps) => (
   <div className="product-view">

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

@@ -33,7 +33,7 @@ Example: `apps/angelo/lib/bizAccount/bizAccount.Zone.tsx`
 ```tsx
 "use client";
 
-import { Load, Data } from "@shared/ui";
+import { Load, Data } from "@akanjs/ui";
 import { ModelsProps } from "@akanjs/client";
 import { ClientInit, ClientView } from "@akanjs/signal";
 import { Model } from "./index";
@@ -275,7 +275,7 @@ Zone components are typically used within page.tsx files using the Load.Page pat
 
 ```tsx
 // app/[lang]/(app)/model/page.tsx
-import { Load } from "@shared/ui";
+import { Load } from "@akanjs/ui";
 import { fetch } from "@akanjs/signal";
 import { Model } from "@app/lib";
 
@@ -465,7 +465,7 @@ export const Dashboard = ({ className }: { className?: string }) => {
 "use client";
 
 import { useEffect } from "react";
-import { Load } from "@shared/ui";
+import { Load } from "@akanjs/ui";
 import { fetch, subscriptions } from "@akanjs/signal";
 
 export const LiveFeed = ({ className, init }: { className?: string; init: ClientInit<"model", cnst.LightModel> }) => {

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

@@ -19,22 +19,17 @@ The `@shared/ui` library in the Akan.js framework provides a comprehensive set o
 
 ### Importing Components
 
-All UI components are available as named exports from the `@shared/ui` package:
+UI components are available as named exports from the `@shared/ui` package:
 
 ```tsx
-import { Field, Data, Load, Model, System, Only, Editor, Property } from "@shared/ui";
+import { Field, Only, Editor } from "@shared/ui";
 ```
 
 Each namespace contains specialized components for specific use cases:
 
 - **Field**: Form inputs and data entry components
-- **Data**: Data visualization and management interfaces
-- **Load**: Data loading patterns with SSR/CSR support
-- **Model**: CRUD operations with modal and inline editing
-- **System**: Application-level providers and utilities
 - **Only**: Conditional rendering based on user state and device
 - **Editor**: Rich text editing capabilities
-- **Property**: Metadata-driven property editing
 
 ### Component Organization in Your Module
 
@@ -106,7 +101,7 @@ const MyComponent = () => {
 Data components are used to display and manage collections of data:
 
 ```tsx
-import { Data, Model } from "@shared/ui";
+import { Data, Model } from "@akanjs/ui";
 
 export const MyFeatureAdmin = ({ sliceName = "myFeature" }) => {
   return (
@@ -128,7 +123,7 @@ export const MyFeatureAdmin = ({ sliceName = "myFeature" }) => {
 Load components handle data fetching and state management:
 
 ```tsx
-import { Load } from "@shared/ui";
+import { Load } from "@akanjs/ui";
 
 export const MyFeatureView = ({ id }) => {
   return (
@@ -161,7 +156,7 @@ export const MyFeatureList = () => {
 Model components handle create, read, update and delete operations:
 
 ```tsx
-import { Model } from "@shared/ui";
+import { Model } from "@akanjs/ui";
 
 export const CreateMyFeature = () => {
   return (

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

@@ -14,7 +14,7 @@ import { Button } from "@util/ui";
 import { Button, Input, Link, Image } from "@util/ui";
 
 // Namespace component import
-import { Dialog } from "@util/ui";
+import { Dialog } from "@akanjs/ui";
 ```
 
 ## Component Organization and Usage

package/cjs/src/templates/app/app/[lang]/(__appName__)/(public)/forgotpassword/page.js

@@ -26,7 +26,7 @@ function getContent(scanResult, dict = {}) {
   return {
     filename: "page.tsx",
     content: `
-import { Image, Link } from "@util/ui";
+import { Image, Link } from "@akanjs/ui";
 import { User } from "@shared/client";
 
 export default function Page() {

package/cjs/src/templates/app/app/[lang]/(__appName__)/(public)/signin/page.js

@@ -26,7 +26,7 @@ function getContent(scanResult, dict) {
   return {
     filename: "page.tsx",
     content: `
-import { Image } from "@util/ui";
+import { Image } from "@akanjs/ui";
 import { User } from "@shared/client";
 import { getSelf, router } from "@akanjs/client";
 

package/cjs/src/templates/app/app/[lang]/(__appName__)/(public)/unknown/page.js

@@ -26,11 +26,11 @@ function getContent(scanResult, dict) {
   return {
     filename: "page.tsx",
     content: `
-import { Load, System } from "@shared/ui";
+import { Load, System } from "@akanjs/ui";
 
 interface PageProps {
   searchParams: Promise<{
-    p?: string;
+    p: string;
   }>;
 }
 
@@ -42,7 +42,7 @@ export default function Page({ searchParams }: PageProps) {
         const { p } = await searchParams;
         return { p } as const;
       }}
-      render={({ p }) => <System.Reconnect dev={true} />}
+      render={({ p }) => <System.Reconnect path={p} dev={true} />}
     />
   );
 }

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

@@ -28,7 +28,7 @@ function getContent(scanResult, dict) {
     content: `
 import "./styles.css";
 import { RootLayoutProps } from "@akanjs/client";
-import { System } from "@shared/ui";
+import { System } from "@akanjs/ui";
 import { env } from "@${dict.appName}/env/env.client";
 import { fetch } from "@${dict.appName}/client";
 

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

@@ -27,7 +27,7 @@ function getContent(scanResult, dict) {
     filename: "layout.tsx",
     content: `
 import "../(${dict.appName})/styles.css";
-import { System } from "@shared/ui";
+import { System } from "@akanjs/ui";
 import { env } from "@${dict.appName}/env/env.client";
 import { fetch } from "@${dict.appName}/client";
 import type { RootLayoutProps } from "@akanjs/client";

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

@@ -28,7 +28,7 @@ function getContent(scanResult, dict) {
     content: `
 "use client";
 import { st } from "@${dict.appName}/client";
-import { System } from "@shared/ui";
+import { System } from "@akanjs/ui";
 
 export default function Layout({ children }) {
   return <System.Root st={st}>{children}</System.Root>;

package/cjs/src/templates/app/lib/setting/Setting.Zone.js

@@ -29,8 +29,8 @@ function getContent(scanResult, dict) {
 "use client";
 import { ModelsProps } from "@akanjs/client";
 import { Setting, st, usePage } from "@${dict.appName}/client";
-import { Model } from "@shared/ui";
-import { Loading } from "@util/ui";
+import { Model } from "@akanjs/ui";
+import { Loading } from "@akanjs/ui";
 import { useEffect } from "react";
 import { AiOutlineEdit } from "react-icons/ai";
 

package/cjs/src/templates/app/lib/setting/index.js

@@ -26,7 +26,7 @@ function getContent(scanResult, dict = {}) {
   return {
     filename: "index.tsx",
     content: `
-import { Signal } from "@util/ui";
+import { Signal } from "@akanjs/ui";
 import { AiOutlineSetting } from "react-icons/ai";
 
 import * as Template from "./Setting.Template";

package/cjs/src/templates/app/lib/summary/Summary.Zone.js

@@ -30,8 +30,8 @@ function getContent(scanResult, dict) {
 import { ModelsProps } from "@akanjs/client";
 import { DefaultOf } from "@akanjs/signal";
 import { st, Summary } from "@${dict.appName}/client";
-import { Data } from "@shared/ui";
-import { Loading } from "@util/ui";
+import { Data } from "@akanjs/ui";
+import { Loading } from "@akanjs/ui";
 
 import { cnst } from "../cnst";
 

package/cjs/src/templates/app/lib/summary/index.js

@@ -26,7 +26,7 @@ function getContent(scanResult, dict = {}) {
   return {
     filename: "index.tsx",
     content: `
-import { Signal } from "@util/ui";
+import { Signal } from "@akanjs/ui";
 import { AiOutlineLineChart } from "react-icons/ai";
 
 import * as Template from "./Summary.Template";

package/cjs/src/templates/app/lib/user/User.Template.js

@@ -29,7 +29,7 @@ function getContent(scanResult, dict) {
 "use client";
 import { clsx } from "@akanjs/client";
 import { Field } from "@shared/ui";
-import { Layout } from "@util/ui";
+import { Layout } from "@akanjs/ui";
 import { st, usePage } from "@${dict.appName}/client";
 
 interface UserEditProps {

package/cjs/src/templates/app/lib/user/User.Util.js

@@ -30,7 +30,7 @@ function getContent(scanResult, dict) {
 import { ModelDashboardProps, ModelInsightProps } from "@akanjs/client";
 import { getQueryMap } from "@akanjs/constant";
 import { cnst, st } from "@${dict.appName}/client";
-import { Data } from "@shared/ui";
+import { Data } from "@akanjs/ui";
 import { AiOutlineEdit, AiOutlineLock, AiOutlineUnlock } from "react-icons/ai";
 
 export const Stat = ({

package/cjs/src/templates/app/lib/user/User.Zone.js

@@ -30,7 +30,7 @@ function getContent(scanResult, dict) {
 import { ModelsProps } from "@akanjs/client";
 import { DefaultOf } from "@akanjs/signal";
 import { cnst, st, User } from "@${dict.appName}/client";
-import { Data, Model } from "@shared/ui";
+import { Data, Model } from "@akanjs/ui";
 
 export const Admin = ({ sliceName = "user", init, query }: ModelsProps<cnst.User>) => {
   return (

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

@@ -26,7 +26,7 @@ function getContent(scanResult, dict = {}) {
   return {
     filename: "index.tsx",
     content: `
-import { Signal } from "@util/ui";
+import { Signal } from "@akanjs/ui";
 import { AiOutlineUser } from "react-icons/ai";
 
 import * as Template from "./User.Template";

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

@@ -32,8 +32,7 @@ import { registerModules } from "./server";
 const bootstrap = async () => {
   const serverMode = process.env.SERVER_MODE as "federation" | "batch" | "all" | null;
   if (!serverMode) throw new Error("SERVER_MODE environment variable is not defined");
-  const app = await createNestApp({ registerModules, serverMode, env });
-  return () => app.close();
+  await createNestApp({ registerModules, serverMode, env });
 };
 void bootstrap();
   `;

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

@@ -26,7 +26,7 @@ function getContent(scanResult, dict) {
   return {
     filename: "Footer.tsx",
     content: `
-import { Image, Link } from "@util/ui";
+import { Image, Link } from "@akanjs/ui";
 
 export const Footer = () => {
   return (

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

@@ -40,7 +40,7 @@ import {
   AiOutlineWindows,
 } from "react-icons/ai";
 import { User } from "@shared/client";
-import { Layout, Link } from "@util/ui";
+import { Layout, Link } from "@akanjs/ui";
 import { ReactNode } from "react";
 import { clsx } from "@akanjs/client";
 

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

@@ -27,7 +27,7 @@ function getContent(scanResult, dict) {
     filename: "page.tsx",
     content: `
 import { AiOutlineTeam } from "react-icons/ai";
-import { Load } from "@shared/ui";
+import { Load } from "@akanjs/ui";
 import { fetch, usePage, ${dict.Model} } from "${dict.appName}/client";
 import type { CsrConfig } from "@akanjs/client";
 

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

@@ -27,8 +27,8 @@ function getContent(scanResult, dict) {
     filename: "page.tsx",
     content: `
 import { ${dict.Model}, fetch, usePage } from "${dict.appName}/client";
-import { Link } from "@util/ui";
-import { Load } from "@shared/ui";
+import { Link } from "@akanjs/ui";
+import { Load } from "@akanjs/ui";
 import { getSelf } from "@akanjs/client";
 import { AiOutlineEdit } from "react-icons/ai";
 import type { CsrConfig } from "@akanjs/client";

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

@@ -27,7 +27,7 @@ function getContent(scanResult, dict) {
     filename: "page.tsx",
     content: `
 import { AiOutlineTeam } from "react-icons/ai";
-import { Load } from "@shared/ui";
+import { Load } from "@akanjs/ui";
 import { cnst, fetch, usePage, ${dict.Model} } from "${dict.appName}/client";
 import { getSelf } from "@akanjs/client";
 import type { CsrConfig } from "@akanjs/client";

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

@@ -27,8 +27,8 @@ function getContent(scanResult, dict) {
     filename: "page.tsx",
     content: `
 import { ${dict.Model}, fetch, usePage } from "${dict.appName}/client";
-import { Link } from "@util/ui";
-import { Load } from "@shared/ui";
+import { Link } from "@akanjs/ui";
+import { Load } from "@akanjs/ui";
 import { getSelf } from "@akanjs/client";
 import type { CsrConfig } from "@akanjs/client";
 

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

@@ -30,12 +30,12 @@ function getContent(scanResult, dict = {}) {
     (module2) => module2 !== "summary" && module2 !== "setting"
   );
   return `
-${libs.length === 0 ? `import { rootDictionary } from "@akanjs/dictionary";` : ""}
+${libs.length === 0 ? `import { dictionary as base } from "@akanjs/dictionary";` : ""}
 ${libs.map((lib) => `import { dictionary as ${lib} } from "@${lib}";`).join("\n")}
 
 ${moduleDictionaries.map((module2) => `import { ${module2}SummaryDictionary } from "../${module2}/${module2}.dictionary";`).join("\n")}
 
-export const libDictionaries = [${libs.length === 0 ? "rootDictionary" : libs.join(", ")}] as const;
+export const libDictionaries = [${libs.length === 0 ? "base" : libs.join(", ")}] as const;
 
 export const libSummaryDictionary = { ${moduleDictionaries.map((module2) => `...${module2}SummaryDictionary`).join(", ")} };
 `;

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

@@ -27,10 +27,10 @@ function getContent(scanResult, dict = {}) {
     return null;
   const libs = scanResult.akanConfig.libs;
   return `
-${libs.length > 0 ? "" : `import { baseFetch } from "@akanjs/signal";`}
+${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] : "baseFetch"};
-export const libFetches = [${libs.length ? libs.join(", ") : "baseFetch"}] as const;
+export const root = ${libs.length ? scanResult.akanConfig.rootLib ?? libs[0] : "base"};
+export const libFetches = [${libs.length ? libs.join(", ") : "base"}] as const;
 `;
 }

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

@@ -27,8 +27,9 @@ function getContent(scanResult, dict = {}) {
     return null;
   const libs = scanResult.akanConfig.libs;
   return `
+import { store as base } from "@akanjs/store";
 ${libs.map((lib) => `import { store as ${lib} } from "@${lib}/client";`).join("\n")}
 
-export const libStores = [${libs.join(", ")}] as const;
+export const libStores = [${[...libs, "base"].join(", ")}] as const;
 `;
 }

package/cjs/src/templates/libRoot/lib/setting/Setting.Zone.js

@@ -29,8 +29,8 @@ function getContent(scanResult, dict) {
 "use client";
 import { ModelsProps } from "@akanjs/client";
 import { Setting, st, usePage } from "@${dict.libName}/client";
-import { Model } from "@shared/ui";
-import { Loading } from "@util/ui";
+import { Model } from "@akanjs/ui";
+import { Loading } from "@akanjs/ui";
 import { useEffect } from "react";
 import { AiOutlineEdit } from "react-icons/ai";
 

package/cjs/src/templates/libRoot/lib/setting/index.js

@@ -26,7 +26,7 @@ function getContent(scanResult, dict = {}) {
   return {
     filename: "index.tsx",
     content: `
-import { Signal } from "@util/ui";
+import { Signal } from "@akanjs/ui";
 import { AiOutlineSetting } from "react-icons/ai";
 
 import * as Template from "./Setting.Template";