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

package/{index-ctanya41.js → index-awbdfcf2.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   script
-} from "./index-6jjtnhkw.js";
+} from "./index-jw1zm273.js";
 import {
   AppExecutor,
   LibExecutor,
   ModuleExecutor
-} from "./index-55mynnqs.js";
+} from "./index-va06nr10.js";
 import {
   workflowStatus,
   compactDiagnostics,
@@ -41,10 +41,10 @@ import {
   hasSignalFactoryEntry,
   insertSignalFactoryEntry,
   addFieldUiPolicyForType
-} from "./index-05g3jayg.js";
+} from "./index-trpasv9q.js";
 import {
   ModuleScript
-} from "./index-e0cvze1s.js";
+} from "./index-fmzcs8v6.js";
 
 // pkgs/@akanjs/cli/primitive/primitive.script.ts
 import { capitalize, lowerlize } from "akanjs/common";

package/{index-3hx1z96c.js → index-bqbf654f.js}

@@ -26,7 +26,7 @@ class ConfigLock {
   }
   static async#take(lockPath) {
     const handle = await open(lockPath, "wx", 384).catch((error) => {
-      if (error.code === "EEXIST")
+      if (error.code === "EEXIST" || process.platform === "win32" && error.code === "EPERM")
         return null;
       throw error;
     });

package/{index-rc5rwyps.js → index-bspm21y1.js}

@@ -1,26 +1,29 @@
 // @bun
 import {
   GlobalConfig,
-  CloudApi
-} from "./index-pgj2rt78.js";
-import {
-  script
-} from "./index-6jjtnhkw.js";
+  CloudApi,
+  CloudUpdates,
+  PipelineSecrets
+} from "./index-cpb3nvma.js";
 import {
   PkgExecutor
-} from "./index-55mynnqs.js";
+} from "./index-va06nr10.js";
 import {
-  NativeApp
-} from "./index-1w2qaee2.js";
+  NativePublicEnv,
+  UpdatePackFolder
+} from "./index-g1mbppa9.js";
+import {
+  script
+} from "./index-jw1zm273.js";
 import {
   ApplicationScript
-} from "./index-jx4bzvwg.js";
+} from "./index-d47ypebv.js";
 import {
   PackageScript
-} from "./index-gnyf1fqy.js";
+} from "./index-j237xtew.js";
 import {
   CloudRunner
-} from "./index-8ggztp8k.js";
+} from "./index-fyq1z6kt.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";
@@ -31,12 +34,14 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
   async logout(workspace, host) {
     await this.cloudRunner.logout(await GlobalConfig.hostFor(workspace, host));
   }
+  async#cloudApi(workspace, given) {
+    const host = await GlobalConfig.hostFor(workspace, given);
+    await this.login(workspace, host);
+    return await CloudApi.fromHost(workspace, host);
+  }
   async downloadEnv(workspace, workspaceId = workspace.getWorkspaceId({ allowEmpty: true }), { host: given } = {}) {
     if (workspaceId) {
-      const host = await GlobalConfig.hostFor(workspace, given);
-      await this.login(workspace, host);
-      const cloudApi = await CloudApi.fromHost(workspace, host);
-      await this.cloudRunner.downloadEnv(cloudApi, workspace, workspaceId);
+      await this.cloudRunner.downloadEnv(await this.#cloudApi(workspace, given), workspace, workspaceId);
       return;
     }
     await this.cloudRunner.downloadEnvByScp(workspace);
@@ -51,10 +56,7 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
       throw new Error("A scoped env upload needs a cloud workspace id \u2014 the scp target is workspace-wide.");
     const { files, path } = await this.cloudRunner.gatherEnvFiles(workspace, { scope, archivePath });
     if (workspaceId) {
-      const host = await GlobalConfig.hostFor(workspace, given);
-      await this.login(workspace, host);
-      const cloudApi = await CloudApi.fromHost(workspace, host);
-      await this.cloudRunner.uploadEnv(cloudApi, workspaceId, path);
+      await this.cloudRunner.uploadEnv(await this.#cloudApi(workspace, given), workspaceId, path);
       return { workspaceId, files };
     }
     await this.cloudRunner.uploadEnvByScp(workspace, path);
@@ -67,19 +69,16 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
     subspace,
     host: given
   }) {
-    const devProjectId = await this.cloudRunner.secretProject(workspace, subspace);
+    PipelineSecrets.assertName(name);
+    PipelineSecrets.assertBranch(branch);
+    const devProjectId = await this.cloudRunner.projectOf(workspace, subspace);
     const value = await this.cloudRunner.readSecretValue(name, file);
-    const host = await GlobalConfig.hostFor(workspace, given);
-    await this.login(workspace, host);
-    const cloudApi = await CloudApi.fromHost(workspace, host);
-    await this.cloudRunner.uploadSecret(cloudApi, devProjectId, { name, branch, value });
+    await this.cloudRunner.uploadSecret(await this.#cloudApi(workspace, given), devProjectId, { name, branch, value });
   }
   async listSecrets(workspace, { branch, subspace, host: given }) {
-    const devProjectId = await this.cloudRunner.secretProject(workspace, subspace);
-    const host = await GlobalConfig.hostFor(workspace, given);
-    await this.login(workspace, host);
-    const cloudApi = await CloudApi.fromHost(workspace, host);
-    await this.cloudRunner.listSecrets(cloudApi, devProjectId, branch);
+    PipelineSecrets.assertBranch(branch);
+    const devProjectId = await this.cloudRunner.projectOf(workspace, subspace);
+    await this.cloudRunner.listSecrets(await this.#cloudApi(workspace, given), devProjectId, branch);
   }
   async removeSecret(workspace, {
     name,
@@ -87,11 +86,10 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
     subspace,
     host: given
   }) {
-    const devProjectId = await this.cloudRunner.secretProject(workspace, subspace);
-    const host = await GlobalConfig.hostFor(workspace, given);
-    await this.login(workspace, host);
-    const cloudApi = await CloudApi.fromHost(workspace, host);
-    await this.cloudRunner.removeSecret(cloudApi, devProjectId, { name, branch });
+    PipelineSecrets.assertName(name);
+    PipelineSecrets.assertBranch(branch);
+    const devProjectId = await this.cloudRunner.projectOf(workspace, subspace);
+    await this.cloudRunner.removeSecret(await this.#cloudApi(workspace, given), devProjectId, { name, branch });
   }
   async pushUpdate(workspace, app, {
     platform,
@@ -103,31 +101,42 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
     host: given,
     write,
     allowLocalRelease,
-    pack: packDir
+    pack: packDir,
+    publicEnv
   }) {
-    const devProjectId = await this.cloudRunner.secretProject(workspace, subspace);
-    const pack = packDir ? await NativeApp.readPack(packDir) : await this.applicationScript.packUpdate(app, platform, {
-      target,
-      env,
-      write,
-      allowLocalRelease
-    });
-    if (pack.app !== app.name || pack.platform !== platform || target && pack.target !== target)
-      throw new Error(`The pack in ${pack.out} is ${pack.app} ${pack.target} ${pack.platform}, not ${app.name} ${target ?? pack.target} ${platform}.`);
-    if (pack.compat && !pack.compat.compatible) {
-      Logger.error(`The pack in ${pack.out} needs a new store build; it differs from the one ${pack.compat.against} came from:
-- ${pack.compat.problems.join(`
-- `)}`);
-      process.exitCode = 2;
-      return null;
-    }
-    const host = await GlobalConfig.hostFor(workspace, given);
-    await this.login(workspace, host);
-    return await this.cloudRunner.pushUpdate(await CloudApi.fromHost(workspace, host), devProjectId, pack, {
+    if (packDir && publicEnv)
+      throw new Error("--public-env picks what a pack is built with, and --pack uploads one already built: give one.");
+    const devProjectId = await this.cloudRunner.projectOf(workspace, subspace, app.name);
+    const pack = await this.#packToPush(app, { platform, target, env, write, allowLocalRelease, packDir, publicEnv });
+    const verdict = UpdatePackFolder.storeBuildVerdict(pack);
+    if (verdict)
+      throw verdict;
+    return await this.cloudRunner.pushUpdate(await this.#cloudApi(workspace, given), devProjectId, pack, {
       channel,
       notes
     });
   }
+  async#packToPush(app, {
+    platform,
+    target,
+    env,
+    write,
+    allowLocalRelease,
+    packDir,
+    publicEnv
+  }) {
+    if (packDir)
+      return await this.cloudRunner.readPack(app, packDir, { platform, target, env, allowLocalRelease });
+    if (!platform)
+      throw new Error("push-update needs --platform ios or android to pack, or --pack <dir> to upload what `akan pack-update` wrote.");
+    return await this.applicationScript.packUpdate(app, platform, {
+      target: target ?? undefined,
+      env: env ?? "main",
+      write,
+      allowLocalRelease,
+      publicEnv: publicEnv ?? undefined
+    });
+  }
   async registerBinary(workspace, app, {
     platform,
     distribution,
@@ -136,18 +145,20 @@ class CloudScript2 extends script("cloud", [CloudRunner, ApplicationScript, Pack
     subspace,
     host: given,
     write,
-    allowLocalRelease
+    allowLocalRelease,
+    publicEnv
   }) {
-    const devProjectId = await this.cloudRunner.secretProject(workspace, subspace);
+    const devProjectId = await this.cloudRunner.projectOf(workspace, subspace, app.name);
+    const storeBundle = await CloudUpdates.storeBundlePath(app, target, platform);
+    const recorded = !publicEnv && await NativePublicEnv.recordedIn(storeBundle);
     const pack = await this.applicationScript.packUpdate(app, platform, {
       target,
       env,
       write,
-      allowLocalRelease
+      allowLocalRelease,
+      publicEnv: publicEnv ?? (recorded ? storeBundle : undefined)
     });
-    const host = await GlobalConfig.hostFor(workspace, given);
-    await this.login(workspace, host);
-    return await this.cloudRunner.registerBinary(await CloudApi.fromHost(workspace, host), devProjectId, app, pack, {
+    return await this.cloudRunner.registerBinary(await this.#cloudApi(workspace, given), devProjectId, app, pack, {
       distribution,
       env
     });