akanjs 2.0.0-beta.3 → 2.0.0-beta.4

package/cli/index.js

@@ -9946,11 +9946,12 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 })) {
 }
 
+import path36 from "path";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
-  async version({ log = true } = {}) {
-    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;
     if (log)
       Logger.rawLog(`${pkgJson.name}@${version}`);
@@ -10005,8 +10006,8 @@ class PackageRunner extends runner("package") {
 }
 
 class PackageScript extends script("package", [PackageRunner]) {
-  async version({ log = true } = {}) {
-    return await this.packageRunner.version({ log });
+  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}...`);
@@ -10265,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;
   }
@@ -11052,8 +11053,8 @@ class ModuleCommand extends command("module", [ModuleScript], ({ public: target
 }
 
 class PackageCommand extends command("package", [PackageScript], ({ public: target }) => ({
-  version: target({ desc: "Show version information for all packages" }).exec(async function() {
-    await this.packageScript.version();
+  version: target({ desc: "Show version information for all packages" }).with(Workspace).exec(async function(workspace) {
+    await this.packageScript.version(workspace);
   }),
   createPackage: target({ desc: "Create a new package in pkgs/akanjs/" }).option("name", String, { desc: "name of package" }).with(Workspace).exec(async function(name, workspace) {
     await this.packageScript.createPackage(workspace, name.toLowerCase().replace(/ /g, "-"));
@@ -11258,13 +11259,13 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 })) {
 }
 
-import path37 from "path";
+import path38 from "path";
 
-import path36 from "path";
+import path37 from "path";
 class WorkspaceRunner extends runner("workspace") {
   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({
@@ -11327,7 +11328,7 @@ class WorkspaceScript extends script("workspace", [
     } 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.`);

package/cli/package/package.command.ts

@@ -3,9 +3,11 @@ import { command, Pkg, Workspace } from "akanjs/devkit";
 import { PackageScript } from "./package.script";
 
 export class PackageCommand extends command("package", [PackageScript], ({ public: target }) => ({
-  version: target({ desc: "Show version information for all packages" }).exec(async function () {
-    await this.packageScript.version();
-  }),
+  version: target({ desc: "Show version information for all packages" })
+    .with(Workspace)
+    .exec(async function (workspace) {
+      await this.packageScript.version(workspace);
+    }),
   createPackage: target({ desc: "Create a new package in pkgs/akanjs/" })
     .option("name", String, { desc: "name of package" })
     .with(Workspace)

package/cli/package/package.runner.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { Logger } from "akanjs/common";
 import {
   FileSys,
@@ -10,8 +11,12 @@ import {
 import { $ } from "bun";
 
 export class PackageRunner extends runner("package") {
-  async version({ log = true }: { log?: boolean } = {}) {
-    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;
     if (log) Logger.rawLog(`${pkgJson.name}@${version}`);
     return version;

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({ log = true }: { log?: boolean } = {}) {
-    return await this.packageRunner.version({ log });
+  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/package.json

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