@git.zone/cli 6.6.2 → 6.7.2

package/ts/mod_release/index.ts

@@ -34,6 +34,9 @@ import {
   normalizeReleaseGitRemoteName,
   normalizeReleaseVersion,
   resolveGitCommonDirectory,
+  getReleaseArtifacts,
+  releasePackageArtifactFile,
+  type IReleasePackage,
   type IReleaseArtifact,
   type TReleaseJournal,
   type IReleaseJournalV1,
@@ -115,6 +118,15 @@ const runInternal = async (argvArg: any): Promise<void> => {
     planMode: workflow.confirmation === "plan",
   });
   printReleasePlan(workflow, branchContext);
+  if (
+    workflow.targets.includes("npm") &&
+    workflow.npmPackageSource === "tspublish"
+  ) {
+    const packagePlan = await planReleasePackages(branchContext.sourceCwd);
+    console.log("npm packages (dependency order):");
+    for (const module of packagePlan.modules)
+      console.log(`  ${module.name} (${module.folder})`);
+  }
   if (workflow.confirmation === "plan") {
     return;
   }
@@ -346,6 +358,14 @@ const assertReleaseConfiguration = (
   if (!workflowArg.targets.includes("npm")) {
     return;
   }
+  if (
+    workflowArg.npmPackageSource === "tspublish" &&
+    workflowArg.targets.includes("docker")
+  ) {
+    throw new Error(
+      "tspublish package releases support Git and npm targets; use a separate Docker release repository.",
+    );
+  }
   if (workflowArg.npmRegistries.length === 0) {
     throw new Error("The npm release target requires at least one registry.");
   }
@@ -410,7 +430,21 @@ const createDockerQualificationRequest = (
     version: versionArg,
   });
 
-const createReleaseJournal = async (
+export const planReleasePackages = async (
+  cwdArg: string,
+): Promise<plugins.tspublish.ITsPublishPlan> => {
+  const plan = await new plugins.tspublish.TsPublish().plan(cwdArg);
+  for (const module of plan.modules) {
+    if (module.registries.length !== 1 || module.registries[0] !== "useBase") {
+      throw new Error(
+        `${module.name}: GitZone-managed packages must declare registries: ["useBase"]. Configure destinations in release.targets.npm.`,
+      );
+    }
+  }
+  return plan;
+};
+
+export const createReleaseJournal = async (
   optionsArg: ICreateReleaseJournalOptions,
 ): Promise<{ store: ReleaseJournalStore; journal: TReleaseJournal }> => {
   const gitCommonDirectory = await resolveGitCommonDirectory(
@@ -437,13 +471,49 @@ const createReleaseJournal = async (
   );
   try {
     let artifact: IReleaseArtifact | null = null;
+    const packages: IReleasePackage[] = [];
     if (optionsArg.workflow.targets.includes("npm")) {
-      artifact = await packNpmArtifact(
-        optionsArg.smartshell,
-        optionsArg.releaseCwd,
-        temporaryDirectory,
-        optionsArg.version,
-      );
+      if (optionsArg.workflow.npmPackageSource === "tspublish") {
+        const plan = await planReleasePackages(optionsArg.releaseCwd);
+        if (plan.version !== optionsArg.version)
+          throw new Error("tspublish plan version differs from the release.");
+        const outputDirectory = plugins.path.join(
+          temporaryDirectory,
+          "prepared",
+        );
+        const prepared = await new plugins.tspublish.TsPublish().prepare(
+          optionsArg.releaseCwd,
+          outputDirectory,
+        );
+        if (
+          JSON.stringify(prepared.map(({ directory, ...module }) => module)) !==
+          JSON.stringify(plan.modules)
+        ) {
+          throw new Error("tspublish package plan changed during preparation.");
+        }
+        for (const module of prepared) {
+          const packed = await packNpmArtifact(
+            optionsArg.smartshell,
+            module.directory,
+            temporaryDirectory,
+            optionsArg.version,
+            releasePackageArtifactFile(module.name),
+          );
+          if (packed.packageName !== module.name)
+            throw new Error(
+              "Prepared package identity changed during packing.",
+            );
+          packages.push({ folder: module.folder, artifact: packed });
+        }
+        await plugins.fs.rm(outputDirectory, { recursive: true, force: true });
+      } else {
+        artifact = await packNpmArtifact(
+          optionsArg.smartshell,
+          optionsArg.releaseCwd,
+          temporaryDirectory,
+          optionsArg.version,
+        );
+      }
       await verifyCleanTree(
         optionsArg.smartshell,
         optionsArg.releaseCwd,
@@ -464,7 +534,7 @@ const createReleaseJournal = async (
     const journal = finalizeJournalCompletion(
       {
         kind: "gitzone-release-journal",
-        schemaVersion: optionsArg.dockerRequest ? 2 : 1,
+        schemaVersion: packages.length ? 3 : optionsArg.dockerRequest ? 2 : 1,
         revision: 1,
         release: {
           version: optionsArg.version,
@@ -473,6 +543,7 @@ const createReleaseJournal = async (
           tagOid: optionsArg.refs.tagOid,
         },
         artifact,
+        ...(packages.length ? { packages } : {}),
         git: {
           state: gitStatus.state,
           attempts: gitStatus.attempts,
@@ -492,18 +563,26 @@ const createReleaseJournal = async (
           alreadyPublished: optionsArg.workflow.targets.includes("npm")
             ? optionsArg.workflow.npmAlreadyPublished
             : "success",
-          registries: optionsArg.workflow.targets.includes("npm")
-            ? optionsArg.workflow.npmRegistries.map((registryArg) => {
-                const status = createInitialTargetStatus(true);
-                return {
-                  state: status.state,
-                  attempts: status.attempts,
-                  attempt: status.attempt,
-                  error: status.error,
-                  registry: registryArg,
-                };
-              })
-            : [],
+          registries: packages.length
+            ? packages.flatMap((entry) =>
+                optionsArg.workflow.npmRegistries.map((registry) => ({
+                  ...createInitialTargetStatus(true),
+                  registry,
+                  packageName: entry.artifact.packageName,
+                })),
+              )
+            : optionsArg.workflow.targets.includes("npm")
+              ? optionsArg.workflow.npmRegistries.map((registryArg) => {
+                  const status = createInitialTargetStatus(true);
+                  return {
+                    state: status.state,
+                    attempts: status.attempts,
+                    attempt: status.attempt,
+                    error: status.error,
+                    registry: registryArg,
+                  };
+                })
+              : [],
         },
         ...(optionsArg.dockerRequest
           ? {
@@ -675,13 +754,15 @@ const runReleaseResume = async (
     await tsdocker.assertCapabilities();
     await tsdocker.validate(journal.docker.request);
   }
-  if (journal.artifact) {
+  if (getReleaseArtifacts(journal).length) {
     await assertPnpmReleaseCapability(smartshellInstance, paths.cwd);
     await assertNoLegacyNpmPublisher(paths.cwd);
-    await verifyStoredNpmArtifact(
-      store.getArtifactPath(version),
-      journal.artifact,
-    );
+    for (const artifact of getReleaseArtifacts(journal)) {
+      await verifyStoredNpmArtifact(
+        store.getArtifactPath(version, artifact.file),
+        artifact,
+      );
+    }
   }
 
   const branchContext = await inspectReleaseBranch({
@@ -773,17 +854,24 @@ const assertResumeConfiguration = async (
   if (
     journalArg.npm.registries.length > 0 &&
     (JSON.stringify(currentRegistries) !==
-      JSON.stringify(
-        journalArg.npm.registries.map((registryArg) => registryArg.registry),
-      ) ||
+      JSON.stringify([
+        ...new Set(
+          journalArg.npm.registries.map((registryArg) => registryArg.registry),
+        ),
+      ]) ||
       workflowArg.npmAccessLevel !== journalArg.npm.access ||
+      workflowArg.npmPackageSource !==
+        (journalArg.schemaVersion === 3 ? "tspublish" : "root") ||
       workflowArg.npmAlreadyPublished !== journalArg.npm.alreadyPublished)
   ) {
     throw new Error(
       "Current npm release configuration does not match the journal.",
     );
   }
-  if (journalArg.git.state !== "skipped" || journalArg.artifact) {
+  if (
+    journalArg.git.state !== "skipped" ||
+    getReleaseArtifacts(journalArg).length
+  ) {
     await assertNoLegacyNpmPublisher(cwdArg);
   }
 };
@@ -797,7 +885,15 @@ const printReleaseJournalSummary = (journalArg: TReleaseJournal): void => {
   );
   console.log(`git: ${journalArg.git.state}`);
   for (const registry of journalArg.npm.registries) {
-    console.log(`npm ${registry.registry}: ${registry.state}`);
+    console.log(
+      `npm ${registry.packageName ? `${registry.packageName} ` : ""}${registry.registry}: ${registry.state}`,
+    );
+  }
+  if (journalArg.schemaVersion === 3) {
+    for (const { artifact } of journalArg.packages)
+      console.log(
+        `artifact ${artifact.packageName}: ${artifact.integrity} (${artifact.sha256})`,
+      );
   }
   if (journalArg.schemaVersion === 2) {
     console.log(
@@ -1143,6 +1239,7 @@ function printReleasePlan(
     `changelog: ${workflow.changelogFile}#${workflow.changelogPendingSection}`,
   );
   if (workflow.targets.includes("npm")) {
+    console.log(`npm package source: ${workflow.npmPackageSource}`);
     console.log(
       `npm registries: ${workflow.npmRegistries.length > 0 ? workflow.npmRegistries.join(", ") : "none"}`,
     );

package/ts/plugins.ts

@@ -20,6 +20,7 @@ import * as smartdelay from '@push.rocks/smartdelay';
 import * as smartbucket from '@push.rocks/smartbucket';
 import * as s3 from '@aws-sdk/client-s3';
 import * as tsdockerReleaseProtocol from '@git.zone/tsdocker/dist_ts/classes.releaseprotocol.js';
+import * as tspublish from '@git.zone/tspublish';
 
 export type {
   IReleaseCapabilitiesResult,
@@ -60,4 +61,5 @@ export {
   smartbucket,
   s3,
   tsdockerReleaseProtocol,
+  tspublish,
 };