@akanjs/cli 3.1.0-rc.0 → 3.1.0-rc.2

package/templates/app/env/env.client.type.ts

@@ -5,8 +5,7 @@ interface Dict {
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict = {}) {
   return `
-export type AppClientEnv = {
-  // apply public envs here
-};
+// Replace with the public env keys this app reads, e.g. { google?: { mapKey: string } }.
+export type AppClientEnv = Record<never, never>;
   `;
 }

package/templates/app/page/styles.css.template

@@ -317,3 +317,11 @@
     margin-block: -0.15em;
   }
 }
+
+/* A descendant with a surface of its own covers the clipped sugar, so the transparent color it inherits would leave
+   it blank. It takes the primary color back; layered under utilities, a text-* class of its own still wins. */
+@layer base {
+  .text-primary:not(svg, [class*="bg-"], [class*="jelly"], [class*="glass"], [class*="-current"]) [class*="bg-"]:not([class*="bg-clip"]) {
+    color: var(--primary);
+  }
+}

package/{tunnel.command-9x8nfn75.js → tunnel.command-7820vtxq.js}

@@ -4,21 +4,24 @@ import {
   runner,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-31ce9vhg.js";
 import"./index-52w0fvh8.js";
 import {
   AppExecutor
-} from "./index-55mynnqs.js";
+} from "./index-2etqq75t.js";
 import {
   GlobalConfig,
   CloudApi
-} from "./index-r2tpeb3n.js";
+} from "./index-6726qr1m.js";
+import"./index-0909wckt.js";
+import"./index-nq045px5.js";
 import {
   TunnelShare2
-} from "./index-7bymavqk.js";
+} from "./index-sby8fe1p.js";
 import {
   writeClipboard
 } from "./index-p6pbz9n5.js";
+import"./index-kc8z134d.js";
 
 // pkgs/@akanjs/cli/tunnel/tunnel.script.ts
 import { select } from "@inquirer/prompts";

package/{workflow.command-jx0wag5r.js → workflow.command-n5sv4wqz.js}

@@ -3,20 +3,20 @@ import {
   Workspace,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-31ce9vhg.js";
 import"./index-52w0fvh8.js";
-import"./index-55mynnqs.js";
+import"./index-2etqq75t.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-rhbabmja.js";
+import"./index-rk9sdys3.js";
+import"./index-jwqtchha.js";
+import"./index-z507nzhg.js";
+import"./index-sqfdmb5b.js";
+import"./index-nq2ja5e0.js";
+import"./index-h85cxfkg.js";
 import {
   WorkflowRunner
-} from "./index-rwq3ekqc.js";
+} from "./index-hnby7p9n.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.script.ts
 import { Logger } from "akanjs/common";

package/{workspace.command-cmj6mqyk.js → workspace.command-zdy60jh8.js}

@@ -5,7 +5,7 @@ import {
   runner,
   script,
   command
-} from "./index-6jjtnhkw.js";
+} from "./index-31ce9vhg.js";
 import {
   FileSys2
 } from "./index-52w0fvh8.js";
@@ -19,7 +19,7 @@ import {
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-55mynnqs.js";
+} from "./index-2etqq75t.js";
 import {
   countBlocking,
   formatStyleContract,
@@ -29,47 +29,49 @@ import {
   collectRecipeSources2,
   scanRecipes2
 } from "./index-hj6w4ka1.js";
-import"./index-05g3jayg.js";
-import"./index-2mx692qq.js";
+import"./index-rhbabmja.js";
+import"./index-rk9sdys3.js";
 import"./index-zzvvc845.js";
 import {
   AgentScript
-} from "./index-v29746vb.js";
+} from "./index-e9prnmyt.js";
 import"./index-k9rrten6.js";
-import"./index-kjvrq3nc.js";
+import"./index-g0vwzy9m.js";
+import"./index-0909wckt.js";
+import"./index-nq045px5.js";
 import {
   LibraryScript
-} from "./index-c1x0be5j.js";
+} from "./index-bea2gwc6.js";
 import {
   ApplicationScript
-} from "./index-p9ystjrp.js";
+} from "./index-20cebtth.js";
 import"./index-7md2g9vw.js";
-import"./index-r2tpeb3n.js";
+import"./index-6726qr1m.js";
 import"./index-2ahj896a.js";
 import {
   PackageScript
-} from "./index-gnyf1fqy.js";
+} from "./index-tz5evhdr.js";
 import {
   getNpmRegistryUrl,
   getLatestPackageVersion
-} from "./index-y8q31011.js";
+} from "./index-3reaaa1h.js";
 import {
   CloudScript2
-} from "./index-tn4rpqp1.js";
-import"./index-0bm04n5g.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-fjsv10hd.js";
+import"./index-pyxn1b53.js";
+import"./index-nq2ja5e0.js";
+import"./index-jwqtchha.js";
+import"./index-z507nzhg.js";
+import"./index-sqfdmb5b.js";
+import"./index-h85cxfkg.js";
+import"./index-hnby7p9n.js";
 import {
   ContextScript
-} from "./index-jyv387qw.js";
-import"./index-qt22xstj.js";
+} from "./index-tv8fjaba.js";
+import"./index-58vvz603.js";
+import"./index-kc8z134d.js";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
-import { generateKeyPairSync } from "crypto";
 import { mkdir, writeFile } from "fs/promises";
 import path from "path";
 
@@ -77,6 +79,7 @@ import path from "path";
 var biomeVersion = "2.5.12";
 
 // 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 +100,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 +383,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 +496,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-21mm6dr5.js

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

package/cloud.script-r7eyfey4.js

@@ -1,20 +0,0 @@
-// @bun
-import {
-  CloudScript2
-} from "./index-tn4rpqp1.js";
-import"./index-y8q31011.js";
-import"./index-p9ystjrp.js";
-import"./index-qt22xstj.js";
-import"./index-c1x0be5j.js";
-import"./index-gnyf1fqy.js";
-import"./index-kjvrq3nc.js";
-import"./index-r2tpeb3n.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-hqd1ppqe.js

@@ -1,21 +0,0 @@
-// @bun
-import {
-  ContextRunner2
-} from "./index-0bm04n5g.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-kjvrq3nc.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 };