@akanjs/cli 3.1.0-rc.1 → 3.1.0-rc.10

package/templates/appSample/lib/task/Task.Util.tsx

@@ -20,7 +20,7 @@ interface StartProps {
 }
 
 export const Start = ({ taskId }: StartProps) => (
-  <button className={jellyButtonRecipe({ variant: "primary", size: "xs" })} onClick={() => st.do.startTask(taskId)}>
+  <button type="button" className={jellyButtonRecipe({ variant: "primary", size: "xs" })} onClick={() => st.do.startTask(taskId)}>
     {usePage().l("task.taskStart")}
   </button>
 );
@@ -30,7 +30,7 @@ interface CompleteProps {
 }
 
 export const Complete = ({ taskId }: CompleteProps) => (
-  <button className={jellyButtonRecipe({ variant: "success", size: "xs" })} onClick={() => st.do.completeTask(taskId)}>
+  <button type="button" className={jellyButtonRecipe({ variant: "success", size: "xs" })} onClick={() => st.do.completeTask(taskId)}>
     {usePage().l("task.taskComplete")}
   </button>
 );
@@ -41,7 +41,7 @@ interface RemoveProps {
 
 export const Remove = ({ taskId }: RemoveProps) => (
   <Model.Remove modelId={taskId} slice={fetch.slice.task}>
-    <button className={jellyButtonRecipe({ variant: "ghost", size: "xs" }, "text-destructive")}>
+    <button type="button" className={jellyButtonRecipe({ variant: "ghost", size: "xs" }, "text-destructive")}>
       {usePage().l("task.taskRemove")}
     </button>
   </Model.Remove>
@@ -63,16 +63,16 @@ export const Toolbox = ({ taskId, status }: ToolboxProps) => {
         <>
           {status === "todo" && (
             <li>
-              <button onClick={() => st.do.startTask(taskId)}>{l("task.taskStart")}</button>
+              <button type="button" onClick={() => st.do.startTask(taskId)}>{l("task.taskStart")}</button>
             </li>
           )}
           {status === "inProgress" && (
             <li>
-              <button onClick={() => st.do.completeTask(taskId)}>{l("task.taskComplete")}</button>
+              <button type="button" onClick={() => st.do.completeTask(taskId)}>{l("task.taskComplete")}</button>
             </li>
           )}
           <li>
-            <button className="text-destructive" onClick={() => st.do.removeTask(taskId)}>
+            <button type="button" className="text-destructive" onClick={() => st.do.removeTask(taskId)}>
               {l("task.taskRemove")}
             </button>
           </li>
@@ -93,7 +93,7 @@ export const Toolbox = ({ taskId, status }: ToolboxProps) => {
 // New Task Button: Model.NewWrapper — triggers new Task creation form
 // export const NewTask = () => (
 //   <Model.NewWrapper partial={{}}>
-//     <button className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>+ New Task</button>
+//     <button type="button" className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>+ New Task</button>
 //   </Model.NewWrapper>
 // );
 `,

package/templates/appSample/lib/task/Task.Zone.tsx

@@ -31,7 +31,7 @@ export const Card = ({ className, init }: CardProps) => {
         <div className="flex flex-col items-center gap-4 py-16 text-center">
           <div className="text-foreground/40 text-lg">{l("task.taskNoTasks")}</div>
           <Link href="/task/new">
-            <button className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>
+            <button type="button" className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>
               {l("task.taskCreateFirst")}
             </button>
           </Link>

package/templates/appSample/ui/QuantityControl.tsx

@@ -30,7 +30,7 @@ export const QuantityControl = ({
 }: QuantityControlProps) => {
   return (
     <div className={cn("inline-flex items-center gap-1", className)}>
-      <button
+      <button type="button"
         className={jellyButtonRecipe({ variant: "default", size: "icon" }, "size-7")}
         disabled={value <= min}
         onClick={() => onChange(Math.max(min, value - 1))}
@@ -38,7 +38,7 @@ export const QuantityControl = ({
         −
       </button>
       <span className="w-8 text-center font-medium tabular-nums">{value}</span>
-      <button
+      <button type="button"
         className={jellyButtonRecipe({ variant: "default", size: "icon" }, "size-7")}
         disabled={value >= max}
         onClick={() => onChange(Math.min(max, value + 1))}

package/templates/crudSinglePage/page.tsx

@@ -24,7 +24,7 @@ export default page()
         <div className="flex animate-fadeIn items-center gap-4 px-4 pt-4">
           <div className="font-bold text-lg md:text-4xl">{l("${dict.model}.modelName")}</div>
           <Model.New
-            trigger={<button className={buttonRecipe({ size: "sm", variant: "ghost" })}>{l("base.new")}</button>}
+            trigger={<button type="button" className={buttonRecipe({ size: "sm", variant: "ghost" })}>{l("base.new")}</button>}
             slice={fetch.slice.${dict.model}InPublic}
             renderTitle="id"
           >

package/templates/lib/cnst.ts

@@ -7,7 +7,6 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const databaseModules = scanInfo.getDatabaseModules();
   const scalarModules = scanInfo.getScalarModules();
   const libs = scanInfo.getLibs();
-  const libInfos = scanInfo.getLibInfos();
   return `
 import { ConstantRegistry } from "akanjs/constant";
 ${scalarModules.map((module) => `import * as ${module}Cnst from "./__scalar/${module}/${module}.constant";`).join("\n")}

package/templates/workspaceRoot/.gitignore.template

@@ -1,27 +1,18 @@
 **/dist
-/node_modules
-/.akan
+**/node_modules
+**/.akan
 .vscode/*
 .DS_Store
 Thumbs.db
 *.env
-**/node_modules
 /data
 apps/*/data
 /releases
 apps/*/scripts
-**/.env
-**/env.client.local.ts
-**/env.client.debug.ts
-**/env.client.develop.ts
-**/env.client.main.ts
-**/env.client.testing.ts
-**/env.server.local.ts
-**/env.server.debug.ts
-**/env.server.develop.ts
-**/env.server.main.ts
-**/env.server.testing.ts
-**/env.server.type.ts
+**/env.client.*.ts
+!**/env.client.type.ts
+**/env.server.*.ts
+!**/env.server.example.ts
 **/*secrets.yaml
 **/kubeconfig.yaml
 **/secrets.*
@@ -46,7 +37,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 
-build/
 .gradle
 local.properties
 *.iml
@@ -56,19 +46,18 @@ local.properties
 !debug.keystore
 
 **/public/precache.*.*.js
-**/public/sw.js
-**/public/workbox-*.js
-**/public/worker-*.js
-**/public/fallback-*.js
 **/public/precache.*.*.js.map
-**/public/sw.js.map
+**/public/*sw.js
+**/public/*sw.js.map
+**/public/workbox-*.js
 **/public/workbox-*.js.map
+**/public/worker-*.js
 **/public/worker-*.js.map
 **/public/fallback-*.js
+**/public/fallback-*.js.map
 **/public/libs
 **/private/libs
 **/page/**/(libs)
-**/public/firebase-messaging-sw.js
 
 **/android/keystore.properties
 **/vendor/bundle/
@@ -78,24 +67,18 @@ local.properties
 **/*-secret.yaml
 
 # Akanjs files
-**/akan.app.json
-**/akan.lib.json
-**/akan.pkg.json
-**/next.config.ts
-**/next-env.d.ts
-apps/**/lib/__lib/**
-libs/**/lib/__lib/**
-apps/*/lib/cnst.ts
-apps/*/lib/dict.ts
-apps/*/lib/db.ts
-apps/*/lib/srv.ts
-apps/*/lib/st.ts
-apps/*/lib/sig.ts
-apps/*/lib/useClient.ts
-apps/*/lib/useServer.ts
-apps/*/lib/*/index.tsx
-apps/*/lib/*/index.ts
-apps/*/lib/__scalar/*/index.ts
+**/akan.*.json
+*/*/lib/__lib/**
+*/*/lib/cnst.ts
+*/*/lib/dict.ts
+*/*/lib/db.ts
+*/*/lib/srv.ts
+*/*/lib/st.ts
+*/*/lib/sig.ts
+*/*/lib/useClient.ts
+*/*/lib/useServer.ts
+*/*/lib/*/index.ts*
+*/*/lib/__scalar/*/index.ts
 apps/*/ui/index.ts
 apps/*/webkit/index.ts
 apps/*/srvkit/index.ts
@@ -103,17 +86,6 @@ apps/*/common/index.ts
 apps/*/plugin/index.ts
 apps/*/client.ts
 apps/*/server.ts
-libs/*/lib/cnst.ts
-libs/*/lib/dict.ts
-libs/*/lib/db.ts
-libs/*/lib/srv.ts
-libs/*/lib/st.ts
-libs/*/lib/sig.ts
-libs/*/lib/useClient.ts
-libs/*/lib/useServer.ts
-libs/*/lib/*/index.tsx
-libs/*/lib/*/index.ts
-libs/*/lib/__scalar/*/index.ts
 libs/*/ui/index.ts
 libs/*/webkit/index.ts
 libs/*/srvkit/index.ts
@@ -122,5 +94,4 @@ libs/*/plugin/index.ts
 libs/*/client.ts
 libs/*/server.ts
 libs/*/index.ts
-**/.akan
 **/tsconfig.tsbuildinfo

package/templates/workspaceRoot/biome.json.template

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.5.12/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.14/schema.json",
   "extends": ["@akanjs/devkit/biome.base.json"],
   "files": {
     "includes": [

package/{tunnel.command-jx3tdm2d.js → tunnel.command-2kw8vt9g.js}

@@ -4,21 +4,25 @@ import {
   runner,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-jw1zm273.js";
 import"./index-52w0fvh8.js";
 import {
   AppExecutor
-} from "./index-55mynnqs.js";
+} from "./index-va06nr10.js";
 import {
   GlobalConfig,
   CloudApi
-} from "./index-pgj2rt78.js";
+} from "./index-cpb3nvma.js";
+import"./index-m9jj544v.js";
+import"./index-g1mbppa9.js";
+import"./index-192ha4xh.js";
 import {
   TunnelShare2
-} from "./index-56d2g8ms.js";
+} from "./index-qwa5k1j8.js";
 import {
   writeClipboard
 } from "./index-p6pbz9n5.js";
+import"./index-665zp9rs.js";
 
 // pkgs/@akanjs/cli/tunnel/tunnel.script.ts
 import { select } from "@inquirer/prompts";

package/{workflow.command-jx0wag5r.js → workflow.command-2djwmpqf.js}

@@ -3,20 +3,20 @@ import {
   Workspace,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-jw1zm273.js";
 import"./index-52w0fvh8.js";
-import"./index-55mynnqs.js";
+import"./index-va06nr10.js";
 import"./index-hj6w4ka1.js";
-import"./index-05g3jayg.js";
-import"./index-2mx692qq.js";
-import"./index-2etcv0sc.js";
-import"./index-e0cvze1s.js";
-import"./index-ctanya41.js";
-import"./index-fm46xrf1.js";
-import"./index-c76k723e.js";
+import"./index-trpasv9q.js";
+import"./index-5edzv8fn.js";
+import"./index-86jt2a0e.js";
+import"./index-fmzcs8v6.js";
+import"./index-awbdfcf2.js";
+import"./index-j4mkhz93.js";
+import"./index-1p98exm2.js";
 import {
   WorkflowRunner
-} from "./index-rwq3ekqc.js";
+} from "./index-1xj2t7cb.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.script.ts
 import { Logger } from "akanjs/common";

package/{workspace.command-yxd7rr7g.js → workspace.command-6qfgq4b4.js}

@@ -5,7 +5,7 @@ import {
   runner,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-jw1zm273.js";
 import {
   FileSys2
 } from "./index-52w0fvh8.js";
@@ -19,64 +19,68 @@ import {
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-55mynnqs.js";
+} from "./index-va06nr10.js";
 import {
   countBlocking,
   formatStyleContract,
   ThemeValidator
-} from "./index-n68jx79w.js";
+} from "./index-62md4dwy.js";
 import {
   collectRecipeSources2,
   scanRecipes2
 } from "./index-hj6w4ka1.js";
-import"./index-05g3jayg.js";
-import"./index-2mx692qq.js";
+import"./index-trpasv9q.js";
+import"./index-5edzv8fn.js";
 import"./index-zzvvc845.js";
 import {
   AgentScript
-} from "./index-v29746vb.js";
-import"./index-k9rrten6.js";
-import"./index-1w2qaee2.js";
+} from "./index-tamvyvj3.js";
+import"./index-5nd1wtkv.js";
+import"./index-vk0pa0mn.js";
+import"./index-m9jj544v.js";
+import"./index-g1mbppa9.js";
+import"./index-192ha4xh.js";
 import {
   LibraryScript
-} from "./index-c1x0be5j.js";
+} from "./index-pydbnfez.js";
 import {
   ApplicationScript
-} from "./index-jx4bzvwg.js";
+} from "./index-d47ypebv.js";
 import"./index-7md2g9vw.js";
-import"./index-pgj2rt78.js";
-import"./index-2ahj896a.js";
+import"./index-cpb3nvma.js";
+import"./index-tvehn2sp.js";
 import {
   PackageScript
-} from "./index-gnyf1fqy.js";
+} from "./index-j237xtew.js";
 import {
   getNpmRegistryUrl,
   getLatestPackageVersion
-} from "./index-8ggztp8k.js";
+} from "./index-fyq1z6kt.js";
 import {
   CloudScript2
-} from "./index-rc5rwyps.js";
-import"./index-ae5pwhgs.js";
-import"./index-fm46xrf1.js";
-import"./index-2etcv0sc.js";
-import"./index-e0cvze1s.js";
-import"./index-ctanya41.js";
-import"./index-c76k723e.js";
-import"./index-rwq3ekqc.js";
+} from "./index-bspm21y1.js";
+import"./index-d72hfmdm.js";
+import"./index-j4mkhz93.js";
+import"./index-86jt2a0e.js";
+import"./index-fmzcs8v6.js";
+import"./index-awbdfcf2.js";
+import"./index-1p98exm2.js";
+import"./index-1xj2t7cb.js";
 import {
   ContextScript
-} from "./index-8r4d7cmt.js";
-import"./index-qt22xstj.js";
+} from "./index-4mhy6qme.js";
+import"./index-35hc95h5.js";
+import"./index-665zp9rs.js";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
-import { generateKeyPairSync } from "crypto";
 import { mkdir, writeFile } from "fs/promises";
 import path from "path";
 
 // pkgs/@akanjs/devkit/biomeBase.ts
-var biomeVersion = "2.5.12";
+var biomeVersion = "2.5.14";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
+import { Ed25519Key } from "akanjs/server/ed25519Key";
 var defaultWorkspacePeerDependencies = new Set([
   "@react-spring/web",
   "@use-gesture/react",
@@ -97,19 +101,16 @@ var defaultMaxDiagnostics = 200;
 class WorkspaceRunner extends runner("workspace") {
   async machineKeygen(workspace, out) {
     const file = path.resolve(workspace.workspaceRoot, out);
-    const { privateKey, publicKey } = generateKeyPairSync("ed25519");
+    const { privatePem, publicKey } = Ed25519Key.generate();
     await mkdir(path.dirname(file), { recursive: true });
     try {
-      await writeFile(file, privateKey.export({ format: "pem", type: "pkcs8" }).toString(), {
-        mode: 384,
-        flag: "wx"
-      });
+      await writeFile(file, privatePem, { mode: 384, flag: "wx" });
     } catch (error) {
       if (error.code === "EEXIST")
         throw new Error(`${file} exists; machine-keygen never overwrites a key. Name another file.`);
       throw error;
     }
-    return { file, publicKey: publicKey.export({ format: "jwk" }).x ?? "" };
+    return { file, publicKey };
   }
   async generateAgentRules(workspace, { overwrite = false, cursorRules = true } = {}) {
     const [appNames] = await workspace.getExecs();
@@ -383,7 +384,8 @@ class WorkspaceScript extends script("workspace", [
   }
   async machineKeygen(workspace, out) {
     const { file, publicKey } = await this.workspaceRunner.machineKeygen(workspace, out);
-    Logger.rawLog(`Wrote the private key to ${file} (mode 600). Set it as AKAN_MACHINE_PRIVATE_KEY on the server that issues machine tokens; nothing else needs it.`);
+    const access = process.platform === "win32" ? "; Windows gives it the permissions of its folder, so keep it in one only you can read" : " (mode 600)";
+    Logger.rawLog(`Wrote the private key to ${file}${access}. Set it as AKAN_MACHINE_PRIVATE_KEY on the server that issues machine tokens; nothing else needs it.`);
     Logger.rawLog(`A server that only verifies them takes the public key:
 AKAN_MACHINE_PUBLIC_KEY=${publicKey}`);
   }
@@ -495,7 +497,9 @@ class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public
   }),
   machineKeygen: target({
     desc: "Make an Ed25519 key for machine tokens: write the private key to a file, print the public key"
-  }).arg("out", String, { desc: "file the private key is written to (mode 600); an existing one is refused" }).with(Workspace).exec(async function(out, workspace) {
+  }).arg("out", String, {
+    desc: "file the private key is written to (mode 600; on Windows, its folder's permissions); an existing one is refused"
+  }).with(Workspace).exec(async function(out, workspace) {
     await this.workspaceScript.machineKeygen(workspace, out);
   }),
   syncAll: target({ desc: "Sync dependencies and configuration for all apps and libraries" }).with(Workspace).exec(async function(workspace) {

package/TunnelShare-q4jq08qg.js

@@ -1,9 +0,0 @@
-// @bun
-import {
-  TunnelShare2
-} from "./index-56d2g8ms.js";
-import"./index-pgj2rt78.js";
-import"./index-52w0fvh8.js";
-export {
-  TunnelShare2 as TunnelShare
-};

package/cloud.script-h6pvcpa2.js

@@ -1,20 +0,0 @@
-// @bun
-import {
-  CloudScript2
-} from "./index-rc5rwyps.js";
-import"./index-8ggztp8k.js";
-import"./index-jx4bzvwg.js";
-import"./index-qt22xstj.js";
-import"./index-c1x0be5j.js";
-import"./index-gnyf1fqy.js";
-import"./index-1w2qaee2.js";
-import"./index-pgj2rt78.js";
-import"./index-6jjtnhkw.js";
-import"./index-7md2g9vw.js";
-import"./index-k9rrten6.js";
-import"./index-55mynnqs.js";
-import"./index-2ahj896a.js";
-import"./index-52w0fvh8.js";
-export {
-  CloudScript2 as CloudScript
-};

package/context.runner-atcrzz5b.js

@@ -1,21 +0,0 @@
-// @bun
-import {
-  ContextRunner2
-} from "./index-ae5pwhgs.js";
-import"./index-rwq3ekqc.js";
-import"./index-c76k723e.js";
-import"./index-ctanya41.js";
-import"./index-fm46xrf1.js";
-import"./index-e0cvze1s.js";
-import"./index-2etcv0sc.js";
-import"./index-1w2qaee2.js";
-import"./index-2mx692qq.js";
-import"./index-05g3jayg.js";
-import"./index-zzvvc845.js";
-import"./index-6jjtnhkw.js";
-import"./index-55mynnqs.js";
-import"./index-hj6w4ka1.js";
-import"./index-52w0fvh8.js";
-export {
-  ContextRunner2 as ContextRunner
-};

package/index-6w0rbr9d.js

@@ -1,68 +0,0 @@
-// @bun
-// pkgs/@akanjs/devkit/typecheck/projectTypecheck.ts
-import { mkdir, rm } from "fs/promises";
-import path from "path";
-
-class ProjectTypecheck2 {
-  projectDir;
-  workspaceRoot;
-  env;
-  static #testIncludes = ["**/*.test.ts", "**/*.test.tsx", "**/*.spec.ts", "**/*.spec.tsx"];
-  static #excludes = [".akan/**", "node_modules/**", "local/**"];
-  constructor(projectDir, workspaceRoot, env) {
-    this.projectDir = projectDir;
-    this.workspaceRoot = workspaceRoot;
-    this.env = env;
-  }
-  get typecheckDir() {
-    return path.join(this.projectDir, ".akan", "typecheck");
-  }
-  async run(entries, { clean = false, incremental = true, tests = false } = {}) {
-    const name = tests ? "tsconfig.tests" : "tsconfig";
-    await mkdir(this.typecheckDir, { recursive: true });
-    const tsconfig = {
-      extends: "../../tsconfig.json",
-      compilerOptions: { noEmit: true, incremental, tsBuildInfoFile: `./${name}.tsbuildinfo` },
-      include: [...entries, ...tests ? ProjectTypecheck2.#testIncludes.map((glob) => `../../${glob}`) : []],
-      ...tests ? { exclude: ProjectTypecheck2.#excludes.map((glob) => `../../${glob}`) } : {},
-      references: []
-    };
-    const tsconfigPath = path.join(this.typecheckDir, `${name}.json`);
-    await Bun.write(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
-`);
-    if (clean)
-      await rm(path.join(this.typecheckDir, `${name}.tsbuildinfo`), { force: true });
-    await this.#check(tsconfigPath);
-    return tsconfigPath;
-  }
-  async#check(tsconfigPath) {
-    const proc = Bun.spawn([process.execPath, await this.#workerEntry()], {
-      cwd: this.workspaceRoot,
-      env: { ...this.env, AKAN_COMMAND_TYPE: "typecheck", AKAN_TYPECHECK_TSCONFIG: tsconfigPath },
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const [stdout, stderr, exitCode] = await Promise.all([
-      new Response(proc.stdout).text(),
-      new Response(proc.stderr).text(),
-      proc.exited
-    ]);
-    if (exitCode !== 0)
-      throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
-  }
-  async#workerEntry() {
-    const candidates = [
-      path.join(this.workspaceRoot, "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
-      path.join(this.workspaceRoot, "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
-      path.join(import.meta.dir, "typecheck.proc.js"),
-      path.join(import.meta.dir, "typecheck.proc.ts"),
-      path.join(import.meta.dir, "..", "typecheck.proc.js")
-    ];
-    for (const candidate of candidates)
-      if (await Bun.file(candidate).exists())
-        return candidate;
-    throw new Error(`[cli] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
-  }
-}
-
-export { ProjectTypecheck2 };