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

package/pipeline/PipelineDefinition.test.ts

@@ -70,6 +70,15 @@ describe("PipelineDefinition", () => {
     );
   });
 
+  test("the workspace's apps are in code-point order, whatever the machine's locale", async () => {
+    await withWorkspace(
+      { "apps/api/akan.config.ts": "export default {};\n", "apps/Web/akan.config.ts": "export default {};\n" },
+      async (workspace) => {
+        expect((await PipelineDefinition.load(workspace, [])).workspaceApps).toEqual(["Web", "api"]);
+      },
+    );
+  });
+
   test("a config that cannot load is an error naming the file, never a silent default", async () => {
     await withWorkspace(
       {

package/pipeline/PipelineDefinition.ts

@@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import type { AppPipelineConfig, WorkspacePipelineConfig } from "akanjs";
 import type { PipelineDiagnostic, PipelinePlanContext, PipelinePlanResult } from "akanjs/common";
+import { toError } from "akanjs/common";
 import { AkanAppConfig, AkanWorkspaceConfig } from "../akanConfig";
 import { AppExecutor, type WorkspaceExecutor } from "../executors";
 import { FileSys } from "../fileSys";
@@ -44,7 +45,7 @@ export class PipelineDefinition {
   }
 
   async #load(apps: readonly string[]) {
-    this.workspaceApps = (await this.#workspace.getApps()).sort((a, b) => a.localeCompare(b));
+    this.workspaceApps = (await this.#workspace.getApps()).sort();
     this.workspaceSource = await this.#loadWorkspace();
     for (const app of new Set(apps)) {
       if (!this.workspaceApps.includes(app)) continue;
@@ -68,7 +69,7 @@ export class PipelineDefinition {
       const targets = await resolveMobileTargets(AppExecutor.from(this.#workspace, app), "all");
       return { targets: targets.map(({ name, config }) => ({ name, updates: !!config.updates })) };
     } catch (error) {
-      return { error: error instanceof Error ? error.message : String(error) };
+      return { error: toError(error).message };
     }
   }
 
@@ -105,7 +106,7 @@ export class PipelineDefinition {
     this.diagnostics.push({
       severity: "error",
       code: "pipeline.load.failed",
-      message: `could not load: ${error instanceof Error ? error.message : String(error)}`,
+      message: `could not load: ${toError(error).message}`,
       file,
       path: null,
     });

package/pipeline/PipelineDryRun.test.ts

@@ -76,6 +76,33 @@ describe("PipelineDryRun", () => {
     );
   });
 
+  test("a phase of one stage still names its app", () => {
+    const result = PipelineCompiler.compile({
+      context: { ...context, apps: ["web"] },
+      workspaceApps: ["web"],
+      workspace: {
+        file: "akan.config.ts",
+        sha256: sha,
+        pipeline: { after: [{ name: "E2E", matrix: "apps", sh: "bun run e2e" }] },
+      },
+      apps: new Map([["web", { file: "apps/web/akan.config.ts", sha256: sha, pipeline: null }]]),
+      akanVersion: "3.0.3",
+    });
+    expect(PipelineDryRun.render(result)).toBe(
+      [
+        "plan v1 · branch develop · env develop · trigger push · apps web",
+        "from akan.config.ts, apps/web/akan.config.ts (default)",
+        "",
+        "prepare  (executor)          checkout · env · install · plan",
+        "build    build       Build   web  action build",
+        "package  docker      Docker  web  action docker",
+        "deploy   deploy      Deploy  → web (one at a time)",
+        "finish   e2e         E2E     web  bun run e2e",
+        "finish   (executor)          cleanup",
+      ].join("\n"),
+    );
+  });
+
   test("a failed plan prints its diagnostics", () => {
     const rendered = PipelineDryRun.render({
       ok: false,

package/pipeline/PipelineDryRun.ts

@@ -6,7 +6,7 @@ import type {
   PipelinePlanStage,
 } from "akanjs/common";
 
-/** A plan as a person reads it: one line per phase in run order, the executor's own work included. Runs nothing. */
+/** A plan as a person reads it: one line per phase in run order, the executor's own work included. */
 export class PipelineDryRun {
   static render(result: PipelinePlanResult) {
     const lines = result.ok ? PipelineDryRun.#plan(result.plan) : ["no plan: the definition has errors"];
@@ -61,7 +61,7 @@ export class PipelineDryRun {
       const command = stage?.steps
         .map((step) => (step.kind === "sh" ? step.name : `action ${step.action}`))
         .join(" · ");
-      return [labels[0], command].filter((part) => part && part !== stage?.name).join("  ");
+      return [labels[0], command].filter((part) => part && part !== phase.name).join("  ");
     }
     return `‖ ${labels.join(" · ")}`;
   }