akanjs 2.0.0-beta.2 → 2.0.0-beta.4

package/cli/index.js

@@ -9946,13 +9946,16 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 })) {
 }
 
+import path36 from "path";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
-  async version(workspace) {
-    const pkgJson = await FileSys.readJson("package.json");
+  async version(workspace, { log = true } = {}) {
+    const pkgJson = await FileSys.readJson(process.env.USE_AKANJS_PKGS === "true" ? `${workspace.workspaceRoot}/pkgs/akanjs/package.json` : `${path36.dirname(Bun.main)}/package.json`);
     const version = pkgJson.version;
-    Logger.rawLog(`${pkgJson.name}@${version}`);
+    if (log)
+      Logger.rawLog(`${pkgJson.name}@${version}`);
+    return version;
   }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
@@ -10003,8 +10006,8 @@ class PackageRunner extends runner("package") {
 }
 
 class PackageScript extends script("package", [PackageRunner]) {
-  async version(workspace) {
-    await this.packageRunner.version(workspace);
+  async version(workspace, { log = true } = {}) {
+    return await this.packageRunner.version(workspace, { log });
   }
   async createPackage(workspace, pkgName) {
     const spinner2 = workspace.spinning(`Creating package in pkgs/${pkgName}...`);
@@ -10263,14 +10266,14 @@ class GuidelinePrompt extends Prompter {
   async#getScanFilePaths(matchPattern, { avoidDirs = ["node_modules", ".next"], filterText } = {}) {
     const glob = new Bun.Glob(matchPattern);
     const paths = [];
-    for await (const path36 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
-      if (avoidDirs.some((dir) => path36.includes(dir)))
+    for await (const path37 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
+      if (avoidDirs.some((dir) => path37.includes(dir)))
         continue;
-      const fileContent = await FileSys.readText(path36);
+      const fileContent = await FileSys.readText(path37);
       const textFilter = filterText ? new RegExp(filterText) : null;
       if (filterText && !textFilter?.test(fileContent))
         continue;
-      paths.push(path36);
+      paths.push(path37);
     }
     return paths;
   }
@@ -11256,18 +11259,13 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 })) {
 }
 
-import path37 from "path";
-
-import path36 from "path";
-import latestVersion2 from "latest-version";
+import path38 from "path";
 
+import path37 from "path";
 class WorkspaceRunner extends runner("workspace") {
-  async#resolveAkanVersion(tag) {
-    return /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(tag) ? tag : await latestVersion2("akanjs", { version: tag });
-  }
-  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", tag = "latest", init = true }) {
+  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", init = true, akanVersion }) {
     const cwdPath = process.cwd();
-    const workspaceRoot = path36.join(cwdPath, dirname3, repoName);
+    const workspaceRoot = path37.join(cwdPath, dirname3, repoName);
     const workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
     const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname3}/${repoName}...`);
     await workspace.applyTemplate({
@@ -11277,7 +11275,6 @@ class WorkspaceRunner extends runner("workspace") {
     });
     templateSpinner.succeed(`Workspace files created in ${dirname3}/${repoName}`);
     const rootPackageJson = await workspace.getPackageJson();
-    const akanVersion = await this.#resolveAkanVersion(tag);
     const packageJson = {
       ...rootPackageJson,
       dependencies: {
@@ -11306,14 +11303,19 @@ class WorkspaceRunner extends runner("workspace") {
   }
 }
 
-class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationScript, LibraryScript]) {
-  async createWorkspace(repoName, appName, {
-    dirname: dirname3 = ".",
-    installLibs = false,
-    tag = "latest",
-    init = true
-  }) {
-    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, { dirname: dirname3, tag, init });
+class WorkspaceScript extends script("workspace", [
+  WorkspaceRunner,
+  ApplicationScript,
+  LibraryScript,
+  PackageScript
+]) {
+  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", installLibs = false, init = true }) {
+    const akanVersion = await this.packageScript.version({ log: false });
+    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, {
+      dirname: dirname3,
+      init,
+      akanVersion
+    });
     if (installLibs) {
       await this.libraryScript.installLibrary(workspace, "util");
       await this.libraryScript.installLibrary(workspace, "shared");
@@ -11326,7 +11328,7 @@ class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationS
     } catch (_) {
       gitSpinner.fail("Git repository initialization failed. It's not fatal, you can commit manually");
     }
-    const workspacePath = path37.join(dirname3, repoName);
+    const workspacePath = path38.join(dirname3, repoName);
     Logger.rawLog(`
 \uD83C\uDF89 Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
     Logger.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);
@@ -11381,15 +11383,12 @@ class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public
         value: true
       }
     ]
-  }).option("tag", String, {
-    desc: "tag of the update",
-    default: "latest"
   }).option("init", Boolean, {
     desc: "Do you want to initialize the workspace? (Recommended)",
     default: true
-  }).exec(async function(workspaceName, app, dir, libs, tag, init) {
+  }).exec(async function(workspaceName, app, dir, libs, init) {
     const appName = app || "app";
-    await this.workspaceScript.createWorkspace(workspaceName.toLowerCase().replace(/ /g, "-"), appName.toLowerCase().replace(/ /g, "-"), { dirname: dir, installLibs: libs, tag, init });
+    await this.workspaceScript.createWorkspace(workspaceName.toLowerCase().replace(/ /g, "-"), appName.toLowerCase().replace(/ /g, "-"), { dirname: dir, installLibs: libs, init });
   }),
   lint: target({ desc: "Lint and fix code in a specific app/lib/pkg" }).with(Exec).option("fix", Boolean, { default: true }).with(Workspace).exec(async function(exec2, fix, workspace) {
     await this.workspaceScript.lint(exec2, workspace, { fix });

package/cli/package/package.runner.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { Logger } from "akanjs/common";
 import {
   FileSys,
@@ -10,10 +11,15 @@ import {
 import { $ } from "bun";
 
 export class PackageRunner extends runner("package") {
-  async version(workspace: Workspace) {
-    const pkgJson = await FileSys.readJson<PackageJson>("package.json");
+  async version(workspace: Workspace, { log = true }: { log?: boolean } = {}) {
+    const pkgJson = await FileSys.readJson<PackageJson>(
+      process.env.USE_AKANJS_PKGS === "true"
+        ? `${workspace.workspaceRoot}/pkgs/akanjs/package.json`
+        : `${path.dirname(Bun.main)}/package.json`,
+    );
     const version = pkgJson.version;
-    Logger.rawLog(`${pkgJson.name}@${version}`);
+    if (log) Logger.rawLog(`${pkgJson.name}@${version}`);
+    return version;
   }
   async createPackage(workspace: Workspace, pkgName: string) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });

package/cli/package/package.script.ts

@@ -3,8 +3,8 @@ import { type Pkg, script, type Workspace } from "akanjs/devkit";
 import { PackageRunner } from "./package.runner";
 
 export class PackageScript extends script("package", [PackageRunner]) {
-  async version(workspace: Workspace) {
-    await this.packageRunner.version(workspace);
+  async version(workspace: Workspace, { log = true }: { log?: boolean } = {}) {
+    return await this.packageRunner.version(workspace, { log });
   }
   async createPackage(workspace: Workspace, pkgName: string) {
     const spinner = workspace.spinning(`Creating package in pkgs/${pkgName}...`);

package/cli/workspace/workspace.command.ts

@@ -22,20 +22,16 @@ export class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({
         },
       ],
     })
-    .option("tag", String, {
-      desc: "tag of the update",
-      default: "latest",
-    })
     .option("init", Boolean, {
       desc: "Do you want to initialize the workspace? (Recommended)",
       default: true,
     })
-    .exec(async function (workspaceName, app, dir, libs, tag, init) {
+    .exec(async function (workspaceName, app, dir, libs, init) {
       const appName = app || "app";
       await this.workspaceScript.createWorkspace(
         workspaceName.toLowerCase().replace(/ /g, "-"),
         appName.toLowerCase().replace(/ /g, "-"),
-        { dirname: dir, installLibs: libs, tag, init },
+        { dirname: dir, installLibs: libs, init },
       );
     }),
   lint: target({ desc: "Lint and fix code in a specific app/lib/pkg" })

package/cli/workspace/workspace.runner.ts

@@ -1,16 +1,11 @@
 import path from "node:path";
 import { type Exec, type PackageJson, runner, type Workspace, WorkspaceExecutor } from "akanjs/devkit";
-import latestVersion from "latest-version";
 
 export class WorkspaceRunner extends runner("workspace") {
-  async #resolveAkanVersion(tag: string) {
-    return /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(tag) ? tag : await latestVersion("akanjs", { version: tag });
-  }
-
   async createWorkspace(
     repoName: string,
     appName: string,
-    { dirname = ".", tag = "latest", init = true }: { dirname?: string; tag?: string; init?: boolean },
+    { dirname = ".", init = true, akanVersion }: { dirname?: string; init?: boolean; akanVersion: string },
   ) {
     const cwdPath = process.cwd();
     const workspaceRoot = path.join(cwdPath, dirname, repoName);
@@ -25,7 +20,6 @@ export class WorkspaceRunner extends runner("workspace") {
     templateSpinner.succeed(`Workspace files created in ${dirname}/${repoName}`);
     
     const rootPackageJson = await workspace.getPackageJson();
-    const akanVersion = await this.#resolveAkanVersion(tag);
     const packageJson: PackageJson = {
       ...rootPackageJson,
       dependencies: {

package/cli/workspace/workspace.script.ts

@@ -4,20 +4,26 @@ import { AppExecutor, type Exec, LibExecutor, PkgExecutor, script, type Workspac
 
 import { ApplicationScript } from "../application/application.script";
 import { LibraryScript } from "../library/library.script";
+import { PackageScript } from "../package/package.script";
 import { WorkspaceRunner } from "./workspace.runner";
 
-export class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationScript, LibraryScript]) {
+export class WorkspaceScript extends script("workspace", [
+  WorkspaceRunner,
+  ApplicationScript,
+  LibraryScript,
+  PackageScript,
+]) {
   async createWorkspace(
     repoName: string,
     appName: string,
-    {
-      dirname = ".",
-      installLibs = false,
-      tag = "latest",
-      init = true,
-    }: { dirname?: string; installLibs?: boolean; tag?: string; init?: boolean },
+    { dirname = ".", installLibs = false, init = true }: { dirname?: string; installLibs?: boolean; init?: boolean },
   ) {
-    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, { dirname, tag, init });
+    const akanVersion = await this.packageScript.version({ log: false });
+    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, {
+      dirname,
+      init,
+      akanVersion,
+    });
     if (installLibs) {
       await this.libraryScript.installLibrary(workspace, "util");
       await this.libraryScript.installLibrary(workspace, "shared");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "sourceType": "module",
   "type": "module",
   "bin": {