akanjs 2.0.0-beta.1 → 2.0.0-beta.3

package/cli/index.js

@@ -9949,10 +9949,12 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
-  async version(workspace) {
+  async version({ log = true } = {}) {
     const pkgJson = await FileSys.readJson("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 } });
@@ -9971,15 +9973,22 @@ class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
-    await pkg.updatePackageJsonDependencies(npmDeps, npmDevDeps);
+    const packageRuntimeDependencies = { akanjs: ["daisyui"] };
+    const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const rootPackageJson = await pkg.workspace.getPackageJson();
+    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    if (allMissingDeps.length > 0)
+      throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $2`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
     }
   }
   async updateWorskpaceRootPackageJson(workspace, rootPackageJson) {
@@ -9996,8 +10005,8 @@ class PackageRunner extends runner("package") {
 }
 
 class PackageScript extends script("package", [PackageRunner]) {
-  async version(workspace) {
-    await this.packageRunner.version(workspace);
+  async version({ log = true } = {}) {
+    return await this.packageRunner.version({ log });
   }
   async createPackage(workspace, pkgName) {
     const spinner2 = workspace.spinning(`Creating package in pkgs/${pkgName}...`);
@@ -11043,8 +11052,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" }).with(Workspace).exec(async function(workspace) {
-    await this.packageScript.version(workspace);
+  version: target({ desc: "Show version information for all packages" }).exec(async function() {
+    await this.packageScript.version();
   }),
   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, "-"));
@@ -11252,13 +11261,8 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 import path37 from "path";
 
 import path36 from "path";
-import latestVersion2 from "latest-version";
-
 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 workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
@@ -11270,7 +11274,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: {
@@ -11299,14 +11302,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");
@@ -11374,15 +11382,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.command.ts

@@ -3,11 +3,9 @@ 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" })
-    .with(Workspace)
-    .exec(async function (workspace) {
-      await this.packageScript.version(workspace);
-    }),
+  version: target({ desc: "Show version information for all packages" }).exec(async function () {
+    await this.packageScript.version();
+  }),
   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

@@ -10,10 +10,11 @@ import {
 import { $ } from "bun";
 
 export class PackageRunner extends runner("package") {
-  async version(workspace: Workspace) {
+  async version({ log = true }: { log?: boolean } = {}) {
     const pkgJson = await FileSys.readJson<PackageJson>("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 } });
@@ -32,17 +33,24 @@ export class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
+    const packageRuntimeDependencies: Record<string, string[]> = { akanjs: ["daisyui"] };
+    const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const rootPackageJson = await pkg.workspace.getPackageJson();
+    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    if (allMissingDeps.length > 0)
+      throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
 
-    await pkg.updatePackageJsonDependencies(npmDeps, npmDevDeps);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
 
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
     }
   }
 

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({ log = true }: { log?: boolean } = {}) {
+    return await this.packageRunner.version({ 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.1",
+  "version": "2.0.0-beta.3",
   "sourceType": "module",
   "type": "module",
   "bin": {
@@ -153,6 +153,7 @@
     "compare-versions": "^6.1.1",
     "cordova-plugin-purchase": "^13.16.0",
     "croner": "^10.0.1",
+    "daisyui": "^5.5.20",
     "dataloader": "^2.2.3",
     "dayjs": "^1.11.20",
     "file-saver": "^2.0.5",