@akanjs/cli 0.9.33 → 0.9.34

package/cjs/index.js

@@ -717,6 +717,44 @@ import config from "./akan.config";
 export default getNextConfig(config, appInfo);
 `;
 
+// pkgs/@akanjs/config/src/types.ts
+var archs = ["amd64", "arm64"];
+var getDefaultFileScan = () => ({
+  constants: {
+    databases: [],
+    scalars: []
+  },
+  dictionary: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  documents: {
+    databases: [],
+    scalars: []
+  },
+  services: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  signal: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  store: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  components: {
+    databases: [],
+    services: [],
+    scalars: []
+  }
+});
+
 // pkgs/@akanjs/config/src/akanConfig.ts
 var makeAppConfig = (config, props) => {
   const { name, repoName, serveDomain, env, command = "build" } = props;
@@ -840,7 +878,7 @@ WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
 COPY . .
-ENV PORT 4200
+ENV PORT=4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
@@ -859,44 +897,6 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
   }
 };
 
-// pkgs/@akanjs/config/src/types.ts
-var archs = ["amd64", "arm64"];
-var getDefaultFileScan = () => ({
-  constants: {
-    databases: [],
-    scalars: []
-  },
-  dictionary: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  documents: {
-    databases: [],
-    scalars: []
-  },
-  services: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  signal: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  store: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  components: {
-    databases: [],
-    services: [],
-    scalars: []
-  }
-});
-
 // pkgs/@akanjs/devkit/src/executors.ts
 var import_chalk3 = __toESM(require("chalk"));
 var import_child_process = require("child_process");
@@ -1790,10 +1790,11 @@ var WorkspaceExecutor = class _WorkspaceExecutor extends Executor {
     const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? envFile.NEXT_PUBLIC_SERVE_DOMAIN;
     if (!serveDomain)
       throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
+    const portOffset = parseInt(process.env.PORT_OFFSET ?? envFile.PORT_OFFSET ?? "0");
     const env = process.env.NEXT_PUBLIC_ENV ?? envFile.NEXT_PUBLIC_ENV ?? "debug";
     if (!env)
       throw new Error("NEXT_PUBLIC_ENV is not set");
-    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env, portOffset };
   }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
@@ -3412,9 +3413,9 @@ var import_dotenv2 = __toESM(require("dotenv"), 1);
 var LibraryRunner = class {
   async createLibrary(libName, workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
-    const lib = LibExecutor.from(workspace, libName);
-    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName } });
+    await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
     workspace.setTsPaths("lib", libName);
+    const lib = LibExecutor.from(workspace, libName);
     return lib;
   }
   async removeLibrary(lib) {
@@ -3909,17 +3910,23 @@ var ApplicationRunner = class {
     });
     await app.spawn("node", [`scripts/${filename}.js`], {
       stdio: "inherit",
-      env: this.#getEnv(app)
+      env: this.#getEnv(app, "backend")
     });
   }
-  #getEnv(app, env = {}) {
+  #getEnv(app, target, env = {}) {
     const rootEnv = import_dotenv3.default.parse(app.workspace.readFile(".env"));
+    const basePort = target === "backend" ? 8080 : target === "frontend" ? 4200 : target === "csr" ? 4201 : void 0;
+    const portOffset = app.workspace.getBaseDevEnv().portOffset;
+    const PORT = basePort ? (basePort + portOffset).toString() : void 0;
+    const NEXT_PUBLIC_SERVER_PORT = portOffset ? (8080 + portOffset).toString() : void 0;
     return {
       ...process.env,
       ...rootEnv,
       NEXT_PUBLIC_APP_NAME: app.name,
       AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
       NODE_NO_WARNINGS: "1",
+      ...PORT ? { PORT, NEXT_PUBLIC_CLIENT_PORT: PORT } : {},
+      ...NEXT_PUBLIC_SERVER_PORT ? { NEXT_PUBLIC_SERVER_PORT } : {},
       ...env
     };
   }
@@ -3933,7 +3940,7 @@ var ApplicationRunner = class {
       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 }) };
+    return { env: this.#getEnv(app, target, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app) {
     await this.#prepareCommand(app, "start", "backend");
@@ -4026,15 +4033,16 @@ var ApplicationRunner = class {
   } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "frontend");
     if (open2)
-      setTimeout(() => (0, import_open.default)("http://localhost:4200"), 3e3);
+      setTimeout(() => (0, import_open.default)(`http://localhost:${env.PORT ?? 4200}`), 3e3);
     onStart?.();
-    return app.spawnSync("npx", ["next", "dev", "-p", "4200", ...turbo ? ["--turbo"] : []], {
+    return app.spawnSync("npx", ["next", "dev", ...env.PORT ? ["-p", env.PORT] : [], ...turbo ? ["--turbo"] : []], {
       env,
       stdio: withInk ? ["ignore", "pipe", "pipe"] : "inherit"
     });
   }
   async #getViteConfig(app, command, viteConfig = {}) {
     const { env } = await this.#prepareCommand(app, command, "csr");
+    const { NODE_ENV, NODE_NO_WARNINGS, ...applyEnvs } = env;
     const tsconfig = app.workspace.getTsConfig();
     const akanConfig = await app.getConfig();
     const basePaths = akanConfig.frontend.routes ? [...new Set(akanConfig.frontend.routes.map(({ basePath: basePath2 }) => basePath2))].join(",") : void 0;
@@ -4094,13 +4102,13 @@ var ApplicationRunner = class {
       },
       define: {
         "process.env": {
+          ...applyEnvs,
           AKAN_COMMAND_TYPE: "start",
           NEXT_PUBLIC_REPO_NAME: app.workspace.repoName,
           NEXT_PUBLIC_SERVE_DOMAIN: processEnv.NEXT_PUBLIC_SERVE_DOMAIN ?? "localhost",
           NEXT_PUBLIC_ENV: processEnv.NEXT_PUBLIC_ENV ?? "debug",
           NEXT_PUBLIC_OPERATION_MODE: processEnv.NEXT_PUBLIC_OPERATION_MODE ?? "local",
           NEXT_PUBLIC_LOG_LEVEL: processEnv.NEXT_PUBLIC_LOG_LEVEL ?? "log",
-          NEXT_PUBLIC_APP_NAME: app.name,
           APP_OPERATION_MODE: processEnv.APP_OPERATION_MODE ?? "local",
           AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
           AKAN_APP_ROOT: app.cwdPath,
@@ -4149,7 +4157,7 @@ var ApplicationRunner = class {
       } : {}
     );
     const server = await vite.createServer(config);
-    await server.listen(4201);
+    await server.listen(4201 + app.workspace.getBaseDevEnv().portOffset);
     onStart?.();
     if (open2)
       setTimeout(() => (0, import_open.default)("http://localhost:4201"), 3e3);
@@ -4399,7 +4407,7 @@ var ApplicationRunner = class {
       ["node_modules/jest/bin/jest.js", `apps/${app.name}`, "-c", `apps/${app.name}/jest.config.ts`],
       {
         env: {
-          ...this.#getEnv(app),
+          ...this.#getEnv(app, "backend"),
           NEXT_PUBLIC_ENV: "testing",
           NEXT_PUBLIC_OPERATION_MODE: "local",
           NEXT_PUBLIC_APP_NAME: app.name,

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

@@ -27,19 +27,18 @@ function getContent(scanResult, dict) {
     filename: `${dict.Model}.View.tsx`,
     content: `
 import { clsx } from "@akanjs/client";
-import { cnst } from "@${dict.sysName}/client";
-import { Image } from "@akanjs/ui";
+import { cnst, usePage } from "@${dict.sysName}/client";
 
 interface ${dict.Model}ViewProps {
   className?: string;
   ${dict.model}: cnst.${dict.Model};
-  self?: { id?: string } | null;
 }
 
-export const General = ({ className, ${dict.model}, self }: ${dict.Model}ViewProps) => {
+export const General = ({ className, ${dict.model} }: ${dict.Model}ViewProps) => {
+  const { l } = usePage();
   return (
-    <div className={clsx(className, "animate-fadeIn w-full")}>
-      <div>{${dict.model}.id}</div>
+    <div className={clsx("w-full", className)}>
+      <div>{l("${dict.model}.id")}: {${dict.model}.id}</div>
     </div>
   );
 };

package/esm/index.js

@@ -697,6 +697,44 @@ import config from "./akan.config";
 export default getNextConfig(config, appInfo);
 `;
 
+// pkgs/@akanjs/config/src/types.ts
+var archs = ["amd64", "arm64"];
+var getDefaultFileScan = () => ({
+  constants: {
+    databases: [],
+    scalars: []
+  },
+  dictionary: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  documents: {
+    databases: [],
+    scalars: []
+  },
+  services: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  signal: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  store: {
+    databases: [],
+    services: [],
+    scalars: []
+  },
+  components: {
+    databases: [],
+    services: [],
+    scalars: []
+  }
+});
+
 // pkgs/@akanjs/config/src/akanConfig.ts
 var makeAppConfig = (config, props) => {
   const { name, repoName, serveDomain, env, command = "build" } = props;
@@ -820,7 +858,7 @@ WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
 COPY . .
-ENV PORT 4200
+ENV PORT=4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
@@ -839,44 +877,6 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
   }
 };
 
-// pkgs/@akanjs/config/src/types.ts
-var archs = ["amd64", "arm64"];
-var getDefaultFileScan = () => ({
-  constants: {
-    databases: [],
-    scalars: []
-  },
-  dictionary: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  documents: {
-    databases: [],
-    scalars: []
-  },
-  services: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  signal: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  store: {
-    databases: [],
-    services: [],
-    scalars: []
-  },
-  components: {
-    databases: [],
-    services: [],
-    scalars: []
-  }
-});
-
 // pkgs/@akanjs/devkit/src/executors.ts
 import chalk3 from "chalk";
 import { exec, fork, spawn } from "child_process";
@@ -1769,10 +1769,11 @@ var WorkspaceExecutor = class _WorkspaceExecutor extends Executor {
     const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? envFile.NEXT_PUBLIC_SERVE_DOMAIN;
     if (!serveDomain)
       throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
+    const portOffset = parseInt(process.env.PORT_OFFSET ?? envFile.PORT_OFFSET ?? "0");
     const env = process.env.NEXT_PUBLIC_ENV ?? envFile.NEXT_PUBLIC_ENV ?? "debug";
     if (!env)
       throw new Error("NEXT_PUBLIC_ENV is not set");
-    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env, portOffset };
   }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
@@ -3394,9 +3395,9 @@ import dotenv2 from "dotenv";
 var LibraryRunner = class {
   async createLibrary(libName, workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
-    const lib = LibExecutor.from(workspace, libName);
-    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName } });
+    await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
     workspace.setTsPaths("lib", libName);
+    const lib = LibExecutor.from(workspace, libName);
     return lib;
   }
   async removeLibrary(lib) {
@@ -3891,17 +3892,23 @@ var ApplicationRunner = class {
     });
     await app.spawn("node", [`scripts/${filename}.js`], {
       stdio: "inherit",
-      env: this.#getEnv(app)
+      env: this.#getEnv(app, "backend")
     });
   }
-  #getEnv(app, env = {}) {
+  #getEnv(app, target, env = {}) {
     const rootEnv = dotenv3.parse(app.workspace.readFile(".env"));
+    const basePort = target === "backend" ? 8080 : target === "frontend" ? 4200 : target === "csr" ? 4201 : void 0;
+    const portOffset = app.workspace.getBaseDevEnv().portOffset;
+    const PORT = basePort ? (basePort + portOffset).toString() : void 0;
+    const NEXT_PUBLIC_SERVER_PORT = portOffset ? (8080 + portOffset).toString() : void 0;
     return {
       ...process.env,
       ...rootEnv,
       NEXT_PUBLIC_APP_NAME: app.name,
       AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
       NODE_NO_WARNINGS: "1",
+      ...PORT ? { PORT, NEXT_PUBLIC_CLIENT_PORT: PORT } : {},
+      ...NEXT_PUBLIC_SERVER_PORT ? { NEXT_PUBLIC_SERVER_PORT } : {},
       ...env
     };
   }
@@ -3915,7 +3922,7 @@ var ApplicationRunner = class {
       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 }) };
+    return { env: this.#getEnv(app, target, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app) {
     await this.#prepareCommand(app, "start", "backend");
@@ -4008,15 +4015,16 @@ var ApplicationRunner = class {
   } = {}) {
     const { env } = await this.#prepareCommand(app, "start", "frontend");
     if (open2)
-      setTimeout(() => openBrowser("http://localhost:4200"), 3e3);
+      setTimeout(() => openBrowser(`http://localhost:${env.PORT ?? 4200}`), 3e3);
     onStart?.();
-    return app.spawnSync("npx", ["next", "dev", "-p", "4200", ...turbo ? ["--turbo"] : []], {
+    return app.spawnSync("npx", ["next", "dev", ...env.PORT ? ["-p", env.PORT] : [], ...turbo ? ["--turbo"] : []], {
       env,
       stdio: withInk ? ["ignore", "pipe", "pipe"] : "inherit"
     });
   }
   async #getViteConfig(app, command, viteConfig = {}) {
     const { env } = await this.#prepareCommand(app, command, "csr");
+    const { NODE_ENV, NODE_NO_WARNINGS, ...applyEnvs } = env;
     const tsconfig = app.workspace.getTsConfig();
     const akanConfig = await app.getConfig();
     const basePaths = akanConfig.frontend.routes ? [...new Set(akanConfig.frontend.routes.map(({ basePath: basePath2 }) => basePath2))].join(",") : void 0;
@@ -4076,13 +4084,13 @@ var ApplicationRunner = class {
       },
       define: {
         "process.env": {
+          ...applyEnvs,
           AKAN_COMMAND_TYPE: "start",
           NEXT_PUBLIC_REPO_NAME: app.workspace.repoName,
           NEXT_PUBLIC_SERVE_DOMAIN: processEnv.NEXT_PUBLIC_SERVE_DOMAIN ?? "localhost",
           NEXT_PUBLIC_ENV: processEnv.NEXT_PUBLIC_ENV ?? "debug",
           NEXT_PUBLIC_OPERATION_MODE: processEnv.NEXT_PUBLIC_OPERATION_MODE ?? "local",
           NEXT_PUBLIC_LOG_LEVEL: processEnv.NEXT_PUBLIC_LOG_LEVEL ?? "log",
-          NEXT_PUBLIC_APP_NAME: app.name,
           APP_OPERATION_MODE: processEnv.APP_OPERATION_MODE ?? "local",
           AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
           AKAN_APP_ROOT: app.cwdPath,
@@ -4131,7 +4139,7 @@ var ApplicationRunner = class {
       } : {}
     );
     const server = await vite.createServer(config);
-    await server.listen(4201);
+    await server.listen(4201 + app.workspace.getBaseDevEnv().portOffset);
     onStart?.();
     if (open2)
       setTimeout(() => openBrowser("http://localhost:4201"), 3e3);
@@ -4381,7 +4389,7 @@ var ApplicationRunner = class {
       ["node_modules/jest/bin/jest.js", `apps/${app.name}`, "-c", `apps/${app.name}/jest.config.ts`],
       {
         env: {
-          ...this.#getEnv(app),
+          ...this.#getEnv(app, "backend"),
           NEXT_PUBLIC_ENV: "testing",
           NEXT_PUBLIC_OPERATION_MODE: "local",
           NEXT_PUBLIC_APP_NAME: app.name,

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

@@ -4,19 +4,18 @@ function getContent(scanResult, dict) {
     filename: `${dict.Model}.View.tsx`,
     content: `
 import { clsx } from "@akanjs/client";
-import { cnst } from "@${dict.sysName}/client";
-import { Image } from "@akanjs/ui";
+import { cnst, usePage } from "@${dict.sysName}/client";
 
 interface ${dict.Model}ViewProps {
   className?: string;
   ${dict.model}: cnst.${dict.Model};
-  self?: { id?: string } | null;
 }
 
-export const General = ({ className, ${dict.model}, self }: ${dict.Model}ViewProps) => {
+export const General = ({ className, ${dict.model} }: ${dict.Model}ViewProps) => {
+  const { l } = usePage();
   return (
-    <div className={clsx(className, "animate-fadeIn w-full")}>
-      <div>{${dict.model}.id}</div>
+    <div className={clsx("w-full", className)}>
+      <div>{l("${dict.model}.id")}: {${dict.model}.id}</div>
     </div>
   );
 };

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.33",
+  "version": "0.9.34",
   "bin": {
     "akan": "esm/index.js"
   },