openxiangda 1.0.217 → 1.0.219

package/lib/cli.js

@@ -6132,6 +6132,14 @@ function normalizeSatisfiedAppReleaseSelectors(values) {
   ).sort();
 }
 
+function satisfiedFormCodesFromContext(context) {
+  return new Set(
+    normalizeSatisfiedAppReleaseSelectors(context?.satisfiedSelectors)
+      .filter(selector => selector.startsWith('form:'))
+      .map(selector => selector.slice('form:'.length))
+  );
+}
+
 function recordSatisfiedAppReleaseSelectors(changeId, selectors, target) {
   const incoming = normalizeSatisfiedAppReleaseSelectors(selectors);
   if (!changeId || incoming.length === 0) return [];
@@ -6178,14 +6186,14 @@ function stagedFormCode(target, resource) {
   return formUuid;
 }
 
-function reusableStagedFormReleaseCandidates(target, changeId) {
+function reusableStagedResourcesContext(target, changeId) {
   const normalizedChangeId = String(changeId || '').trim();
-  if (!normalizedChangeId) return [];
+  if (!normalizedChangeId) return null;
   const file = stagedResourcesFileForChange(
     normalizedChangeId,
     target.deploymentId
   );
-  if (!fs.existsSync(file)) return [];
+  if (!fs.existsSync(file)) return null;
   const contextFile = stagedResourcesContextFileForChange(
     normalizedChangeId,
     target.deploymentId
@@ -6210,6 +6218,17 @@ function reusableStagedFormReleaseCandidates(target, changeId) {
       );
     }
   }
+  return context;
+}
+
+function reusableStagedFormReleaseCandidates(target, changeId) {
+  const normalizedChangeId = String(changeId || '').trim();
+  if (!normalizedChangeId) return [];
+  if (!reusableStagedResourcesContext(target, normalizedChangeId)) return [];
+  const file = stagedResourcesFileForChange(
+    normalizedChangeId,
+    target.deploymentId
+  );
   const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
   const resources = Array.isArray(parsed) && parsed.length === 0
     ? []
@@ -27408,6 +27427,14 @@ function getCandidateBuildControlFiles() {
   return unique(files).sort();
 }
 
+function isDirectory(value) {
+  try {
+    return fs.statSync(value).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
 function getCandidateSourceFiles(plan) {
   const files = new Set(plan.changedFiles || []);
   for (const file of getCandidateBuildControlFiles()) files.add(file);
@@ -29059,6 +29086,9 @@ async function resolveStagedLocalFormContractSnapshots(
       changeId,
       { formCodes }
     );
+  const satisfiedFormCodes = satisfiedFormCodesFromContext(
+    reusableStagedResourcesContext(target, changeId)
+  );
   const snapshots = new Map();
   for (const formCode of formCodes) {
     const formUuid = resolveManifestFormUuid(
@@ -29067,7 +29097,18 @@ async function resolveStagedLocalFormContractSnapshots(
       { fallbackToCode: false }
     );
     const staged = stagedOverlays.get(formCode);
-    if (!staged || staged.formUuid !== formUuid) {
+    if (!staged) {
+      if (satisfiedFormCodes.has(formCode)) {
+        // form-stage proved this exact selector is a noop in the current
+        // deployment. Let buildFormFieldContractPlan read the active frozen
+        // snapshot instead of requiring an unnecessary immutable child.
+        continue;
+      }
+      fail(
+        `FORM_FIELD_STAGED_CONTRACT_REQUIRED: ${formCode} 尚未在 change ${changeId} 的当前 deployment 中获得 verified FormRelease`
+      );
+    }
+    if (staged.formUuid !== formUuid) {
       fail(
         `FORM_FIELD_STAGED_CONTRACT_REQUIRED: ${formCode} 尚未在 change ${changeId} 的当前 deployment 中获得 verified FormRelease`
       );
@@ -29216,4 +29257,5 @@ function buildWorkspacePublishEnv(
 module.exports = {
   buildResourceManifestSddTargets,
   main,
+  satisfiedFormCodesFromContext,
 };

package/package.json

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