openxiangda 1.0.236 → 1.0.237

package/lib/cli.js

@@ -166,7 +166,10 @@ const {
   withReleaseClientSessionArgs,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
-const { createDeliveryV2Cli } = require('./delivery-v2-cli');
+const {
+  createDeliveryV2Cli,
+  deliveryV2SourceRevision,
+} = require('./delivery-v2-cli');
 const {
   describeOpenApiOperation,
   listOpenApiOperations,
@@ -1477,20 +1480,6 @@ function getDeliveryV2Cli() {
   return deliveryV2Cli;
 }
 
-function deliveryV2SourceRevision(packageDigest) {
-  return {
-    repo: `sha256:${packageDigest}`,
-    repositoryId: `sha256:${packageDigest}`,
-    repoAliases: [`sha256:${packageDigest}`],
-    baseCommit: packageDigest,
-    treeHash: packageDigest,
-    branch: 'delivery-v2',
-    mainBranch: null,
-    remoteName: null,
-    remoteUrlHash: null,
-  };
-}
-
 function installDeliveryV2Context(target, run, targets = {}) {
   const control = run?.control || {};
   const publishLeaseId = String(control.publishLeaseId || '').trim();
@@ -1509,7 +1498,7 @@ function installDeliveryV2Context(target, run, targets = {}) {
       'DELIVERY_CONTROL_INVALID: ReleaseRun 缺少 publishLease/baseline/change/session/package 控制信息'
     );
   }
-  const sourceRevision = deliveryV2SourceRevision(packageDigest);
+  const sourceRevision = deliveryV2SourceRevision(target, packageDigest);
   saveChangeBaseline(target, {
     baselineId,
     appType: target.appType,

package/lib/delivery-v2-cli.js

@@ -166,6 +166,35 @@ function createClientSessionId() {
     .toString('hex')}`;
 }
 
+function deliveryV2SourceRevision(target, packageDigest) {
+  const packageRepositoryId = `sha256:${packageDigest}`;
+  const logicalRepositoryId = String(
+    target?.logicalApp?.sourceRepositoryId ||
+      target?.state?.logicalApp?.sourceRepositoryId ||
+      ''
+  )
+    .trim()
+    .toLowerCase();
+  const repoAliases = Array.from(
+    new Set(
+      [packageRepositoryId, logicalRepositoryId].filter(value =>
+        /^sha256:[a-f0-9]{64}$/.test(value)
+      )
+    )
+  ).sort();
+  return {
+    repo: packageRepositoryId,
+    repositoryId: packageRepositoryId,
+    repoAliases,
+    baseCommit: packageDigest,
+    treeHash: packageDigest,
+    branch: 'delivery-v2',
+    mainBranch: null,
+    remoteName: null,
+    remoteUrlHash: null,
+  };
+}
+
 function usageError(message) {
   const error = new Error(message);
   error.code = 'DELIVERY_USAGE_ERROR';
@@ -213,4 +242,5 @@ function assertDependencies(value) {
 
 module.exports = {
   createDeliveryV2Cli,
+  deliveryV2SourceRevision,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.236",
+  "version": "1.0.237",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {