openxiangda 1.0.237 → 1.0.239

package/lib/delivery-v2-executor.js

@@ -2,6 +2,8 @@ const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const {
+  collectConfigurationManifestCodes,
+  collectManifestCodes,
   compileAppPackage,
   sha256,
   sha256Canonical,
@@ -220,17 +222,25 @@ function createDeliveryV2Executor(dependencies) {
     const originalCwd = process.cwd();
     const executionTarget = {
       ...input.target,
-      deploymentId: input.target.deploymentId || null,
+      deploymentId:
+        input.run?.deploymentId ||
+        input.run?.control?.deploymentId ||
+        input.target.deploymentId ||
+        null,
     };
     let activeRun = input.run;
     let currentStep = 'preparing';
     let currentComponent = 'delivery-v2';
     try {
       process.chdir(input.executionRoot);
+      const executionTargets = normalizeLegacyPackageTargetsForExecution(
+        input.targets,
+        input.executionRoot
+      );
       deps.installDeliveryContext(
         executionTarget,
         activeRun,
-        input.targets
+        executionTargets
       );
       restoreDeliveryCheckpointFiles(
         input.executionRoot,
@@ -252,7 +262,7 @@ function createDeliveryV2Executor(dependencies) {
       );
       const steps = decorateSteps(
         buildWorkspaceReleaseSteps(
-          input.targets,
+          executionTargets,
           input.packageManifest.runtimeMode,
           executionTarget.profileName,
           activeRun.control?.changeId
@@ -285,6 +295,14 @@ function createDeliveryV2Executor(dependencies) {
             activeRun.result?.[doneStage] || { resumed: true };
           continue;
         }
+        if (step.id === 'app-finalize') {
+          prepareAppFinalizeStep(step, {
+            executionRoot: input.executionRoot,
+            run: activeRun,
+            target: executionTarget,
+            steps,
+          });
+        }
         currentStep = step.id;
         currentComponent = step.stagedKind || step.id;
         const result = await deps.runOpenXiangdaInProcess(step.args, {
@@ -785,6 +803,22 @@ function decorateSteps(
         step.args.push('--environment-id', target.environmentId);
       }
       step.args.push('--delivery-run-id', run.id);
+      const stagedIndex = step.args.indexOf('--staged-resources-json');
+      if (stagedIndex >= 0 && target.deploymentId) {
+        step.args[stagedIndex + 1] = path
+          .relative(
+            executionRoot,
+            path.join(
+              deliveryReleaseDirectory(
+                executionRoot,
+                run.control?.changeId,
+                target.deploymentId
+              ),
+              'staged-resources.json'
+            )
+          )
+          .replace(/\\/g, '/');
+      }
     }
     step.command = commandFromArgs(step.args);
     result.push(step);
@@ -852,6 +886,70 @@ function compactStepResult(stepId, result, context = {}) {
   return compact;
 }
 
+function prepareAppFinalizeStep(step, context = {}) {
+  const stagedIndex = step.args.indexOf('--staged-resources-json');
+  if (stagedIndex < 0) {
+    return {
+      mode: 'frozen-capture',
+      stagedResourceCount: 0,
+    };
+  }
+
+  const stagedStepIds = (context.steps || [])
+    .filter(candidate => Boolean(candidate.stagedKind))
+    .map(candidate => candidate.id);
+  const incompleteStagedCheckpoints = stagedStepIds.filter(stepId => {
+    const checkpointResult =
+      context.run?.result?.[checkpointName('done', stepId)];
+    if (!checkpointResult?.id) return false;
+    return (
+      normalizeCheckpointStagedResources(
+        checkpointResult.stagedResources || []
+      ).length === 0
+    );
+  });
+  if (incompleteStagedCheckpoints.length > 0) {
+    throw deliveryError(
+      'DELIVERY_CHECKPOINT_STAGED_RESOURCES_MISSING',
+      `服务端检查点 ${incompleteStagedCheckpoints.join(
+        ', '
+      )} 已记录子 Release，但缺少可恢复 stagedResources`,
+      false
+    );
+  }
+
+  const restored = restoreDeliveryCheckpointFiles(
+    context.executionRoot,
+    context.run,
+    context.target
+  );
+  if (restored.stagedResourceCount === 0) {
+    step.args.splice(stagedIndex, 2);
+    step.command = commandFromArgs(step.args);
+    return {
+      mode: 'frozen-capture',
+      stagedResourceCount: 0,
+    };
+  }
+
+  const stagedResourcesPath = path.resolve(
+    context.executionRoot,
+    step.args[stagedIndex + 1]
+  );
+  if (!fs.existsSync(stagedResourcesPath)) {
+    throw deliveryError(
+      'DELIVERY_CHECKPOINT_FILE_MISSING',
+      '服务端 stagedResources 检查点已恢复，但 app-finalize 暂存资源文件缺失',
+      false
+    );
+  }
+  step.command = commandFromArgs(step.args);
+  return {
+    mode: 'staged-children',
+    stagedResourceCount: restored.stagedResourceCount,
+  };
+}
+
 function restoreDeliveryCheckpointFiles(executionRoot, run, target) {
   const changeId = String(run?.control?.changeId || '').trim();
   if (!changeId) return { stagedResourceCount: 0, restored: false };
@@ -1090,6 +1188,66 @@ function defaultIdempotencyKey(kind, target, digest) {
   ].join(':');
 }
 
+function normalizeLegacyPackageTargetsForExecution(targets, executionRoot) {
+  const selectors = targets?.resourceSelectors?.dataViews;
+  if (!Array.isArray(selectors) || selectors.length === 0) return targets;
+  const dataViewDir = path.join(
+    path.resolve(executionRoot),
+    'src',
+    'resources',
+    'data-views'
+  );
+  if (!fs.existsSync(dataViewDir)) return targets;
+
+  const actualCodes = new Set();
+  const legacyNestedCodes = new Set();
+  const visit = directory => {
+    for (const entry of fs
+      .readdirSync(directory, { withFileTypes: true })
+      .sort((left, right) => left.name.localeCompare(right.name))) {
+      const absolute = path.join(directory, entry.name);
+      if (entry.isDirectory()) {
+        visit(absolute);
+        continue;
+      }
+      if (!entry.isFile() || !entry.name.endsWith('.json')) continue;
+      let value;
+      try {
+        value = JSON.parse(fs.readFileSync(absolute, 'utf8'));
+      } catch {
+        // The resource command remains responsible for reporting malformed
+        // manifests. This compatibility normalization only narrows selectors.
+        continue;
+      }
+      const topLevelCodes = collectConfigurationManifestCodes(
+        'data-view',
+        value
+      );
+      for (const code of topLevelCodes) {
+        actualCodes.add(code);
+      }
+      const topLevelSet = new Set(topLevelCodes);
+      for (const code of collectManifestCodes(value)) {
+        if (!topLevelSet.has(code)) legacyNestedCodes.add(code);
+      }
+    }
+  };
+  visit(dataViewDir);
+  if (actualCodes.size === 0 || legacyNestedCodes.size === 0) return targets;
+
+  const filtered = selectors.filter(
+    code => !legacyNestedCodes.has(String(code)) || actualCodes.has(String(code))
+  );
+  if (filtered.length === selectors.length) return targets;
+  return {
+    ...targets,
+    resourceSelectors: {
+      ...(targets.resourceSelectors || {}),
+      dataViews: filtered,
+    },
+  };
+}
+
 function normalizeDigest(value) {
   const digest = String(value || '')
     .trim()
@@ -1162,6 +1320,9 @@ module.exports = {
   CONFIG_TARGET_BY_RESOURCE_TYPE,
   compactStepResult,
   createDeliveryV2Executor,
+  decorateSteps,
+  normalizeLegacyPackageTargetsForExecution,
+  prepareAppFinalizeStep,
   releaseTargets,
   restoreDeliveryCheckpointFiles,
   structuredFailure,

package/lib/delivery-v2-package.js

@@ -285,7 +285,9 @@ function discoverResourceInventory(workspaceRoot, files) {
       relative.startsWith(prefix)
     );
     if (matched) {
-      for (const code of codes) addConfiguration(matched[1], code);
+      for (const code of collectConfigurationManifestCodes(matched[1], value)) {
+        addConfiguration(matched[1], code);
+      }
     }
   }
   return {
@@ -301,6 +303,33 @@ function discoverResourceInventory(workspaceRoot, files) {
   };
 }
 
+function collectConfigurationManifestCodes(type, value) {
+  if (type !== 'data-view') return collectManifestCodes(value);
+
+  const result = new Set();
+  const addItem = item => {
+    if (!item || typeof item !== 'object' || Array.isArray(item)) return;
+    const code = String(item.code || item.resourceCode || '').trim();
+    if (code) result.add(code);
+  };
+  if (Array.isArray(value)) {
+    value.forEach(addItem);
+    return [...result];
+  }
+  if (!value || typeof value !== 'object') return [];
+  const rootCode = String(value.code || value.resourceCode || '').trim();
+  if (rootCode) {
+    result.add(rootCode);
+    return [...result];
+  }
+  for (const key of ['dataViews', 'data-views']) {
+    const items = value[key];
+    if (Array.isArray(items)) items.forEach(addItem);
+    else addItem(items);
+  }
+  return [...result];
+}
+
 function collectManifestCodes(value, result = new Set()) {
   if (Array.isArray(value)) {
     for (const item of value) collectManifestCodes(item, result);
@@ -686,6 +715,8 @@ module.exports = {
   COMPILER_VERSION,
   PACKAGE_SCHEMA_VERSION,
   canonicalJson,
+  collectConfigurationManifestCodes,
+  collectManifestCodes,
   compileAppPackage,
   discoverResourceInventory,
   layerForSourceFile,

package/package.json

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