@akanjs/cli 0.9.13 → 0.9.15

package/cjs/index.js

@@ -724,43 +724,11 @@ var makeAppConfig = (config, props) => {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
     backend: {
-      dockerfile: config.backend?.dockerfile ?? `FROM node:22-slim
-RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apt-get update && apt-get upgrade -y && apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
-ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
-RUN mkdir -p /workspace
-WORKDIR /workspace
-COPY ./package.json ./package.json
-RUN npx pnpm i --prod
-COPY . .
-ENV PORT 8080
-ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${name}
-ENV NEXT_PUBLIC_ENV=${env}
-ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-CMD ["node", "main.js"]`,
+      docker: makeDockerfile("backend", config.backend?.docker ?? {}, props),
       explicitDependencies: config.backend?.explicitDependencies ?? []
     },
     frontend: {
-      dockerfile: config.frontend?.dockerfile ?? `FROM node:22-alpine
-RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apk --no-cache add git
-RUN mkdir -p /workspace
-WORKDIR /workspace
-COPY ./package.json ./package.json
-RUN npx pnpm i --prod
-COPY . .
-ENV PORT 4200
-ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${name}
-ENV NEXT_PUBLIC_ENV=${env}
-ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-CMD ["npm", "start"]`,
+      docker: makeDockerfile("frontend", config.frontend?.docker ?? {}, props),
       nextConfig: withBase(
         name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
@@ -806,8 +774,93 @@ var getLibConfig = async (libRoot, props) => {
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeLibConfig(config, props);
 };
+var getDockerRunScripts = (runs) => {
+  return runs.map((run) => {
+    if (typeof run === "string")
+      return `RUN ${run}`;
+    else
+      return Object.entries(run).map(
+        ([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then   ${script} fi`
+      ).join("\n");
+  });
+};
+var getDockerImageScript = (image, defaultImage) => {
+  if (typeof image === "string")
+    return `FROM ${image}`;
+  else
+    return archs.map((arch) => `FROM ${image[arch] ?? defaultImage} AS ${arch}`).join("\n");
+};
+var makeDockerfile = (type, config, props) => {
+  const { name, repoName, serveDomain, env } = props;
+  if (config.content)
+    return { content: config.content, image: {}, preRuns: [], postRuns: [], command: [] };
+  const preRunScripts = getDockerRunScripts(config.preRuns ?? []);
+  const postRunScripts = getDockerRunScripts(config.postRuns ?? []);
+  if (type === "backend") {
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-slim") : "FROM node:22-slim";
+    const command = config.command ?? ["node", "main.js"];
+    const content = `${imageScript}
+RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+RUN apt-get update && apt-get upgrade -y 
+RUN apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
+${preRunScripts.join("\n")}
+RUN mkdir -p /workspace
+WORKDIR /workspace
+COPY ./package.json ./package.json
+RUN npx pnpm i --prod
+COPY . .
+ENV PORT=8080
+ENV NODE_OPTIONS=--max_old_space_size=8192
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${name}
+ENV NEXT_PUBLIC_ENV=${env}
+ENV NEXT_PUBLIC_OPERATION_MODE=cloud
+${postRunScripts.join("\n")}
+CMD [${command.map((c) => `"${c}"`).join(",")}]`;
+    return {
+      content,
+      image: imageScript,
+      preRuns: config.preRuns ?? [],
+      postRuns: config.postRuns ?? [],
+      command
+    };
+  } else {
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-alpine") : "FROM node:22-alpine";
+    const command = config.command ?? ["npm", "start"];
+    const content = `${imageScript}
+RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+ARG TARGETARCH
+RUN apk --no-cache add git
+${preRunScripts.join("\n")}
+RUN mkdir -p /workspace
+WORKDIR /workspace
+COPY ./package.json ./package.json
+RUN npx pnpm i --prod
+COPY . .
+ENV PORT 4200
+ENV NODE_OPTIONS=--max_old_space_size=8192
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${name}
+ENV NEXT_PUBLIC_ENV=${env}
+ENV NEXT_PUBLIC_OPERATION_MODE=cloud
+${postRunScripts.join("\n")}
+CMD [${command.map((c) => `"${c}"`).join(",")}]`;
+    return {
+      content,
+      image: imageScript,
+      preRuns: config.preRuns ?? [],
+      postRuns: config.postRuns ?? [],
+      command
+    };
+  }
+};
 
 // pkgs/@akanjs/config/src/types.ts
+var archs = ["amd64", "arm64"];
 var getDefaultFileScan = () => ({
   constants: {
     databases: [],
@@ -2191,17 +2244,28 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    if (import_fs4.default.existsSync(projectPublicLibPath))
-      await import_promises.default.rm(projectPublicLibPath, { recursive: true });
+    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
+    await Promise.all([
+      import_fs4.default.existsSync(projectPublicLibPath) && import_promises.default.rm(projectPublicLibPath, { recursive: true }),
+      import_fs4.default.existsSync(projectAssetsLibPath) && import_promises.default.rm(projectAssetsLibPath, { recursive: true })
+    ]);
     const targetDeps = libDeps.filter((dep) => import_fs4.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all(targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
-    await Promise.all(
-      targetDeps.map(
-        (dep) => import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+    await Promise.all([
+      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
+      ...targetDeps.map((dep) => import_promises.default.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
+    ]);
+    await Promise.all([
+      ...targetDeps.map(
+        (dep) => import_fs4.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+          recursive: true
+        })
+      ),
+      ...targetDeps.map(
+        (dep) => import_fs4.default.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && import_promises.default.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
           recursive: true
         })
       )
-    );
+    ]);
   }
 };
 var LibExecutor = class _LibExecutor extends SysExecutor {
@@ -2566,7 +2630,7 @@ var extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =>
     ...pacakgeJson.dependencies ?? {},
     ...pacakgeJson.devDependencies ?? {}
   };
-  const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
+  const requireRegex = /(?:require\s*\(|import\s*(?:[\w\s{},*]*\s+from\s*)?|import\s*\()\s*['"`]([^'"`]+)['"`]/g;
   for (const { text } of filepaths.filter(({ path: path9 }) => path9.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {
@@ -3929,6 +3993,8 @@ var ApplicationRunner = class {
       app.writeFile("next.config.ts", defaultNextConfigFile);
     } else if (target === "csr")
       await app.workspace.exec("rm -rf node_modules/.vite");
+    else if (target === "backend")
+      await app.cp("assets", import_path4.default.join(app.dist.cwdPath, "backend", "assets"));
     return { env: this.#getEnv(app, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app) {
@@ -3957,7 +4023,7 @@ var ApplicationRunner = class {
       dependencies
     };
     app.dist.writeJson("backend/package.json", appPackageJson);
-    app.dist.writeFile(import_path4.default.join(app.dist.cwdPath, "backend", "Dockerfile"), akanConfig.backend.dockerfile);
+    app.dist.writeFile(import_path4.default.join(app.dist.cwdPath, "backend", "Dockerfile"), akanConfig.backend.docker.content);
   }
   async startBackend(app, { open: open2 = false, onStart } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "backend");
@@ -3976,7 +4042,7 @@ var ApplicationRunner = class {
     onStart?.();
     if (open2)
       setTimeout(() => (0, import_open.default)("http://localhost:8080/backend/graphql"), 3e3);
-    await app.dist.spawn("node", ["--watch", "backend/main.js"], { env, stdio: "inherit" });
+    await app.dist.spawn("node", ["--watch", "main.js"], { env, stdio: "inherit", cwd: `${app.dist.cwdPath}/backend` });
   }
   async buildFrontend(app, { spawnOptions } = {}) {
     const { env } = await this.#prepareCommand(app, "build", "frontend");
@@ -3991,7 +4057,6 @@ var ApplicationRunner = class {
       format: "esm",
       write: false,
       logLevel: "warning"
-      // footer: { js: "module.exports = module.exports.default;" },
     });
     const rootPackageJson = app.workspace.readJson("package.json");
     const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson, ["next", "react", "react-dom"]);
@@ -4009,7 +4074,7 @@ var ApplicationRunner = class {
       app.cp(".next", import_path4.default.join(app.dist.cwdPath, "frontend", ".next")),
       app.cp("public", import_path4.default.join(app.dist.cwdPath, "frontend", "public"))
     ]);
-    app.dist.writeFile("frontend/Dockerfile", akanConfig.frontend.dockerfile);
+    app.dist.writeFile("frontend/Dockerfile", akanConfig.frontend.docker.content);
   }
   async startFrontend(app, { open: open2 = false, turbo = true, onStart } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "frontend");
@@ -4992,6 +5057,15 @@ ${import_chalk6.default.green("\u27A4")} Authentication Required`));
     Logger.info("All libraries are published to npm");
   }
   async update(workspace) {
+    if (!workspace.exists("package.json"))
+      await workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]);
+    else
+      await Promise.all([
+        workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]),
+        this.#updateAkanPkgs(workspace)
+      ]);
+  }
+  async #updateAkanPkgs(workspace) {
     const latestPublishedVersionOfBase = await (0, import_latest_version.default)("@akanjs/base");
     const rootPackageJson = workspace.readJson("package.json");
     if (!rootPackageJson.dependencies)
@@ -5005,10 +5079,7 @@ ${import_chalk6.default.green("\u27A4")} Authentication Required`));
         Object.assign(rootPackageJson.devDependencies ?? {}, { [dependency]: latestPublishedVersionOfBase });
     });
     workspace.writeJson("package.json", rootPackageJson);
-    await Promise.all([
-      workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]),
-      workspace.spawn("pnpm", ["install"])
-    ]);
+    await workspace.spawn("pnpm", ["install"]);
   }
 };
 
@@ -5664,13 +5735,9 @@ var ModuleScript = class {
 // pkgs/@akanjs/cli/src/module/module.command.ts
 var ModuleCommand = class {
   moduleScript = new ModuleScript();
-  async createModule(sys3, moduleName, description, schemaDescription, ai) {
+  async createModule(moduleName, sys3) {
     const name = lowerlize(moduleName.replace(/ /g, ""));
-    if (ai) {
-      await this.moduleScript.createModule(sys3, name, description, schemaDescription);
-    } else {
-      await this.moduleScript.createModuleTemplate(sys3, name);
-    }
+    await this.moduleScript.createModuleTemplate(sys3, name);
   }
   removeModule(module2) {
     this.moduleScript.removeModule(module2);
@@ -5687,11 +5754,8 @@ var ModuleCommand = class {
 };
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("moduleName", { desc: "name of module" })),
-  __decorateParam(2, Option("description", { desc: "description of module" })),
-  __decorateParam(3, Option("schemaDescription", { desc: "schema description of module" })),
-  __decorateParam(4, Option("ai", { type: "boolean", default: false, desc: "use ai to create module" }))
+  __decorateParam(0, Argument("moduleName", { desc: "name of module" })),
+  __decorateParam(1, Sys())
 ], ModuleCommand.prototype, "createModule", 1);
 __decorateClass([
   Target.Public(),

package/cjs/src/templates/module/__Model__.Template.js

@@ -28,18 +28,17 @@ function getContent(scanResult, dict) {
     content: `
 "use client";
 import { cnst, st, usePage } from "@${dict.sysName}/client";
-import { Field } from "@shared/ui";
-import { Layout } from "@akanjs/ui";
+import { Layout, Field } from "@akanjs/ui";
 
 interface ${dict.Model}EditProps {
-  ${dict.model}Id?: string | null;
+  className?: string;
 }
 
-export const General = ({ ${dict.model}Id = undefined }: ${dict.Model}EditProps) => {
+export const General = ({ className }: ${dict.Model}EditProps) => {
   const ${dict.model}Form = st.use.${dict.model}Form();
   const { l } = usePage();
   return (
-    <Layout.Template>
+    <Layout.Template className={className}>
       <Field.Text
         label={l.field("${dict.model}", "id")}
         desc={l.desc("${dict.model}", "id")}

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

@@ -43,10 +43,7 @@ export class ${dict.Model}Object extends via(${dict.Model}Input) {
 }
 
 @Model.Light("Light${dict.Model}")
-export class Light${dict.Model} extends via(${dict.Model}Object, [
-  "field",
-  "status",
-] as const) {}
+export class Light${dict.Model} extends via(${dict.Model}Object, ["status"] as const) {}
 
 @Model.Full("${dict.Model}")
 export class ${dict.Model} extends via(${dict.Model}Object, Light${dict.Model}) {}
@@ -69,9 +66,7 @@ export class ${dict.Model}Filter extends sortOf(${dict.Model}, {}) {
   inStatus(
     @Filter.Arg("status", () => String) status: ${dict.Model}Status,
   ) {
-    return {
-      status,
-    };
+    return { status };
   }
 }
 `;

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

@@ -67,6 +67,7 @@ local.properties
 **/public/worker-*.js.map
 **/public/fallback-*.js
 **/public/libs
+**/assets/libs
 
 **/vendor/bundle/
 **/ios/App/App/public

package/esm/index.js

@@ -704,43 +704,11 @@ var makeAppConfig = (config, props) => {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
     backend: {
-      dockerfile: config.backend?.dockerfile ?? `FROM node:22-slim
-RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apt-get update && apt-get upgrade -y && apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
-ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
-RUN mkdir -p /workspace
-WORKDIR /workspace
-COPY ./package.json ./package.json
-RUN npx pnpm i --prod
-COPY . .
-ENV PORT 8080
-ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${name}
-ENV NEXT_PUBLIC_ENV=${env}
-ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-CMD ["node", "main.js"]`,
+      docker: makeDockerfile("backend", config.backend?.docker ?? {}, props),
       explicitDependencies: config.backend?.explicitDependencies ?? []
     },
     frontend: {
-      dockerfile: config.frontend?.dockerfile ?? `FROM node:22-alpine
-RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apk --no-cache add git
-RUN mkdir -p /workspace
-WORKDIR /workspace
-COPY ./package.json ./package.json
-RUN npx pnpm i --prod
-COPY . .
-ENV PORT 4200
-ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${name}
-ENV NEXT_PUBLIC_ENV=${env}
-ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-CMD ["npm", "start"]`,
+      docker: makeDockerfile("frontend", config.frontend?.docker ?? {}, props),
       nextConfig: withBase(
         name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
@@ -786,8 +754,93 @@ var getLibConfig = async (libRoot, props) => {
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeLibConfig(config, props);
 };
+var getDockerRunScripts = (runs) => {
+  return runs.map((run) => {
+    if (typeof run === "string")
+      return `RUN ${run}`;
+    else
+      return Object.entries(run).map(
+        ([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then   ${script} fi`
+      ).join("\n");
+  });
+};
+var getDockerImageScript = (image, defaultImage) => {
+  if (typeof image === "string")
+    return `FROM ${image}`;
+  else
+    return archs.map((arch) => `FROM ${image[arch] ?? defaultImage} AS ${arch}`).join("\n");
+};
+var makeDockerfile = (type, config, props) => {
+  const { name, repoName, serveDomain, env } = props;
+  if (config.content)
+    return { content: config.content, image: {}, preRuns: [], postRuns: [], command: [] };
+  const preRunScripts = getDockerRunScripts(config.preRuns ?? []);
+  const postRunScripts = getDockerRunScripts(config.postRuns ?? []);
+  if (type === "backend") {
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-slim") : "FROM node:22-slim";
+    const command = config.command ?? ["node", "main.js"];
+    const content = `${imageScript}
+RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+RUN apt-get update && apt-get upgrade -y 
+RUN apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
+${preRunScripts.join("\n")}
+RUN mkdir -p /workspace
+WORKDIR /workspace
+COPY ./package.json ./package.json
+RUN npx pnpm i --prod
+COPY . .
+ENV PORT=8080
+ENV NODE_OPTIONS=--max_old_space_size=8192
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${name}
+ENV NEXT_PUBLIC_ENV=${env}
+ENV NEXT_PUBLIC_OPERATION_MODE=cloud
+${postRunScripts.join("\n")}
+CMD [${command.map((c) => `"${c}"`).join(",")}]`;
+    return {
+      content,
+      image: imageScript,
+      preRuns: config.preRuns ?? [],
+      postRuns: config.postRuns ?? [],
+      command
+    };
+  } else {
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-alpine") : "FROM node:22-alpine";
+    const command = config.command ?? ["npm", "start"];
+    const content = `${imageScript}
+RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+ARG TARGETARCH
+RUN apk --no-cache add git
+${preRunScripts.join("\n")}
+RUN mkdir -p /workspace
+WORKDIR /workspace
+COPY ./package.json ./package.json
+RUN npx pnpm i --prod
+COPY . .
+ENV PORT 4200
+ENV NODE_OPTIONS=--max_old_space_size=8192
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${name}
+ENV NEXT_PUBLIC_ENV=${env}
+ENV NEXT_PUBLIC_OPERATION_MODE=cloud
+${postRunScripts.join("\n")}
+CMD [${command.map((c) => `"${c}"`).join(",")}]`;
+    return {
+      content,
+      image: imageScript,
+      preRuns: config.preRuns ?? [],
+      postRuns: config.postRuns ?? [],
+      command
+    };
+  }
+};
 
 // pkgs/@akanjs/config/src/types.ts
+var archs = ["amd64", "arm64"];
 var getDefaultFileScan = () => ({
   constants: {
     databases: [],
@@ -2170,17 +2223,28 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
-    if (fs8.existsSync(projectPublicLibPath))
-      await fsPromise.rm(projectPublicLibPath, { recursive: true });
+    const projectAssetsLibPath = `${this.cwdPath}/assets/libs`;
+    await Promise.all([
+      fs8.existsSync(projectPublicLibPath) && fsPromise.rm(projectPublicLibPath, { recursive: true }),
+      fs8.existsSync(projectAssetsLibPath) && fsPromise.rm(projectAssetsLibPath, { recursive: true })
+    ]);
     const targetDeps = libDeps.filter((dep) => fs8.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`));
-    await Promise.all(targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })));
-    await Promise.all(
-      targetDeps.map(
-        (dep) => fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+    await Promise.all([
+      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectPublicLibPath}/${dep}`, { recursive: true })),
+      ...targetDeps.map((dep) => fsPromise.mkdir(`${projectAssetsLibPath}/${dep}`, { recursive: true }))
+    ]);
+    await Promise.all([
+      ...targetDeps.map(
+        (dep) => fs8.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/public`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/public`, `${projectPublicLibPath}/${dep}`, {
+          recursive: true
+        })
+      ),
+      ...targetDeps.map(
+        (dep) => fs8.existsSync(`${this.workspace.workspaceRoot}/libs/${dep}/assets`) && fsPromise.cp(`${this.workspace.workspaceRoot}/libs/${dep}/assets`, `${projectAssetsLibPath}/${dep}`, {
           recursive: true
         })
       )
-    );
+    ]);
   }
 };
 var LibExecutor = class _LibExecutor extends SysExecutor {
@@ -2545,7 +2609,7 @@ var extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) =>
     ...pacakgeJson.dependencies ?? {},
     ...pacakgeJson.devDependencies ?? {}
   };
-  const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
+  const requireRegex = /(?:require\s*\(|import\s*(?:[\w\s{},*]*\s+from\s*)?|import\s*\()\s*['"`]([^'"`]+)['"`]/g;
   for (const { text } of filepaths.filter(({ path: path9 }) => path9.endsWith(".js"))) {
     let requireMatch;
     while ((requireMatch = requireRegex.exec(text)) !== null) {
@@ -3911,6 +3975,8 @@ var ApplicationRunner = class {
       app.writeFile("next.config.ts", defaultNextConfigFile);
     } else if (target === "csr")
       await app.workspace.exec("rm -rf node_modules/.vite");
+    else if (target === "backend")
+      await app.cp("assets", path7.join(app.dist.cwdPath, "backend", "assets"));
     return { env: this.#getEnv(app, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app) {
@@ -3939,7 +4005,7 @@ var ApplicationRunner = class {
       dependencies
     };
     app.dist.writeJson("backend/package.json", appPackageJson);
-    app.dist.writeFile(path7.join(app.dist.cwdPath, "backend", "Dockerfile"), akanConfig.backend.dockerfile);
+    app.dist.writeFile(path7.join(app.dist.cwdPath, "backend", "Dockerfile"), akanConfig.backend.docker.content);
   }
   async startBackend(app, { open: open2 = false, onStart } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "backend");
@@ -3958,7 +4024,7 @@ var ApplicationRunner = class {
     onStart?.();
     if (open2)
       setTimeout(() => openBrowser("http://localhost:8080/backend/graphql"), 3e3);
-    await app.dist.spawn("node", ["--watch", "backend/main.js"], { env, stdio: "inherit" });
+    await app.dist.spawn("node", ["--watch", "main.js"], { env, stdio: "inherit", cwd: `${app.dist.cwdPath}/backend` });
   }
   async buildFrontend(app, { spawnOptions } = {}) {
     const { env } = await this.#prepareCommand(app, "build", "frontend");
@@ -3973,7 +4039,6 @@ var ApplicationRunner = class {
       format: "esm",
       write: false,
       logLevel: "warning"
-      // footer: { js: "module.exports = module.exports.default;" },
     });
     const rootPackageJson = app.workspace.readJson("package.json");
     const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson, ["next", "react", "react-dom"]);
@@ -3991,7 +4056,7 @@ var ApplicationRunner = class {
       app.cp(".next", path7.join(app.dist.cwdPath, "frontend", ".next")),
       app.cp("public", path7.join(app.dist.cwdPath, "frontend", "public"))
     ]);
-    app.dist.writeFile("frontend/Dockerfile", akanConfig.frontend.dockerfile);
+    app.dist.writeFile("frontend/Dockerfile", akanConfig.frontend.docker.content);
   }
   async startFrontend(app, { open: open2 = false, turbo = true, onStart } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "frontend");
@@ -4974,6 +5039,15 @@ ${chalk6.green("\u27A4")} Authentication Required`));
     Logger.info("All libraries are published to npm");
   }
   async update(workspace) {
+    if (!workspace.exists("package.json"))
+      await workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]);
+    else
+      await Promise.all([
+        workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]),
+        this.#updateAkanPkgs(workspace)
+      ]);
+  }
+  async #updateAkanPkgs(workspace) {
     const latestPublishedVersionOfBase = await latestVersion("@akanjs/base");
     const rootPackageJson = workspace.readJson("package.json");
     if (!rootPackageJson.dependencies)
@@ -4987,10 +5061,7 @@ ${chalk6.green("\u27A4")} Authentication Required`));
         Object.assign(rootPackageJson.devDependencies ?? {}, { [dependency]: latestPublishedVersionOfBase });
     });
     workspace.writeJson("package.json", rootPackageJson);
-    await Promise.all([
-      workspace.spawn("npm", ["update", "-g", "@akanjs/cli", "--latest"]),
-      workspace.spawn("pnpm", ["install"])
-    ]);
+    await workspace.spawn("pnpm", ["install"]);
   }
 };
 
@@ -5646,13 +5717,9 @@ var ModuleScript = class {
 // pkgs/@akanjs/cli/src/module/module.command.ts
 var ModuleCommand = class {
   moduleScript = new ModuleScript();
-  async createModule(sys3, moduleName, description, schemaDescription, ai) {
+  async createModule(moduleName, sys3) {
     const name = lowerlize(moduleName.replace(/ /g, ""));
-    if (ai) {
-      await this.moduleScript.createModule(sys3, name, description, schemaDescription);
-    } else {
-      await this.moduleScript.createModuleTemplate(sys3, name);
-    }
+    await this.moduleScript.createModuleTemplate(sys3, name);
   }
   removeModule(module) {
     this.moduleScript.removeModule(module);
@@ -5669,11 +5736,8 @@ var ModuleCommand = class {
 };
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("moduleName", { desc: "name of module" })),
-  __decorateParam(2, Option("description", { desc: "description of module" })),
-  __decorateParam(3, Option("schemaDescription", { desc: "schema description of module" })),
-  __decorateParam(4, Option("ai", { type: "boolean", default: false, desc: "use ai to create module" }))
+  __decorateParam(0, Argument("moduleName", { desc: "name of module" })),
+  __decorateParam(1, Sys())
 ], ModuleCommand.prototype, "createModule", 1);
 __decorateClass([
   Target.Public(),

package/esm/src/templates/module/__Model__.Template.js

@@ -5,18 +5,17 @@ function getContent(scanResult, dict) {
     content: `
 "use client";
 import { cnst, st, usePage } from "@${dict.sysName}/client";
-import { Field } from "@shared/ui";
-import { Layout } from "@akanjs/ui";
+import { Layout, Field } from "@akanjs/ui";
 
 interface ${dict.Model}EditProps {
-  ${dict.model}Id?: string | null;
+  className?: string;
 }
 
-export const General = ({ ${dict.model}Id = undefined }: ${dict.Model}EditProps) => {
+export const General = ({ className }: ${dict.Model}EditProps) => {
   const ${dict.model}Form = st.use.${dict.model}Form();
   const { l } = usePage();
   return (
-    <Layout.Template>
+    <Layout.Template className={className}>
       <Field.Text
         label={l.field("${dict.model}", "id")}
         desc={l.desc("${dict.model}", "id")}

package/esm/src/templates/module/__model__.constant.js

@@ -20,10 +20,7 @@ export class ${dict.Model}Object extends via(${dict.Model}Input) {
 }
 
 @Model.Light("Light${dict.Model}")
-export class Light${dict.Model} extends via(${dict.Model}Object, [
-  "field",
-  "status",
-] as const) {}
+export class Light${dict.Model} extends via(${dict.Model}Object, ["status"] as const) {}
 
 @Model.Full("${dict.Model}")
 export class ${dict.Model} extends via(${dict.Model}Object, Light${dict.Model}) {}
@@ -46,9 +43,7 @@ export class ${dict.Model}Filter extends sortOf(${dict.Model}, {}) {
   inStatus(
     @Filter.Arg("status", () => String) status: ${dict.Model}Status,
   ) {
-    return {
-      status,
-    };
+    return { status };
   }
 }
 `;

package/esm/src/templates/workspaceRoot/.gitignore.template

@@ -67,6 +67,7 @@ local.properties
 **/public/worker-*.js.map
 **/public/fallback-*.js
 **/public/libs
+**/assets/libs
 
 **/vendor/bundle/
 **/ios/App/App/public

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "bin": {
     "akan": "esm/index.js"
   },
@@ -40,13 +40,16 @@
     "js-yaml": "^4.1.0",
     "latest-version": "^9.0.0",
     "lodash": "^4.17.21",
+    "next": "15.3.2",
     "next-pwa": "5.6.0",
     "open": "^10.1.1",
     "ora": "^3.4.0",
     "pluralize": "^8.0.0",
     "qrcode": "^1.5.4",
     "react": "18.3.1",
+    "react-icons": "^5.4.0",
     "reflect-metadata": "^0.2.2",
+    "tsconfig-paths": "^4.2.0",
     "tunnel-ssh": "^5.2.0",
     "typescript": "5.8.3",
     "uuid": "^11.0.3",

package/src/cloud/cloud.runner.d.ts

@@ -1,5 +1,6 @@
 import { type Workspace } from "@akanjs/devkit";
 export declare class CloudRunner {
+    #private;
     login(): Promise<boolean>;
     logout(): void;
     setLlm(): Promise<void>;

package/src/module/module.command.d.ts

@@ -2,7 +2,7 @@ import { Module, Sys } from "@akanjs/devkit";
 import { ModuleScript } from "./module.script";
 export declare class ModuleCommand {
     moduleScript: ModuleScript;
-    createModule(sys: Sys, moduleName: string, description: string, schemaDescription: string, ai: boolean): Promise<void>;
+    createModule(moduleName: string, sys: Sys): Promise<void>;
     removeModule(module: Module): void;
     createView(module: Module): Promise<void>;
     createUnit(module: Module): Promise<void>;