openxiangda 1.0.168 → 1.0.170

package/lib/cli.js

@@ -1692,6 +1692,33 @@ function recordStagedAppReleaseResources(
   return writeStagedResourcesFiles(changeId, output, context);
 }
 
+function normalizeSatisfiedAppReleaseSelectors(values) {
+  return unique(
+    (Array.isArray(values) ? values : [])
+      .map(value => String(value || '').trim())
+      .filter(value => /^form:[A-Za-z0-9][A-Za-z0-9._-]*$/.test(value))
+  ).sort();
+}
+
+function recordSatisfiedAppReleaseSelectors(changeId, selectors, target) {
+  const incoming = normalizeSatisfiedAppReleaseSelectors(selectors);
+  if (!changeId || incoming.length === 0) return [];
+  const contextFile = stagedResourcesContextFileForChange(changeId);
+  const context = assertStagedResourcesContext(target, changeId);
+  const satisfiedSelectors = normalizeSatisfiedAppReleaseSelectors([
+    ...(context.satisfiedSelectors || []),
+    ...incoming,
+  ]);
+  const temporary = `${contextFile}.${process.pid}.tmp`;
+  fs.writeFileSync(
+    temporary,
+    `${JSON.stringify({ ...context, satisfiedSelectors }, null, 2)}\n`,
+    { mode: 0o600 }
+  );
+  fs.renameSync(temporary, contextFile);
+  return satisfiedSelectors;
+}
+
 function exactStringSet(left, right) {
   const normalize = values =>
     Array.from(
@@ -1723,7 +1750,7 @@ function assertStagedAppReleaseScope(target, flags, resources) {
       'APP_RELEASE_STAGED_SCOPE_REQUIRED: staged child activation 必须显式提供 --change'
     );
   }
-  assertStagedResourcesContext(target, changeId);
+  const stagedContext = assertStagedResourcesContext(target, changeId);
   let scope;
   try {
     scope = getSddChangeScope({
@@ -1767,9 +1794,15 @@ function assertStagedAppReleaseScope(target, flags, resources) {
   }
 
   const expectedForms = (targets.forms || []).map(String).sort();
-  const actualForms = byKind('FormRelease')
-    .map(resource => stagedFormCode(target, resource))
-    .sort();
+  const satisfiedForms = normalizeSatisfiedAppReleaseSelectors(
+    stagedContext?.satisfiedSelectors
+  )
+    .filter(selector => selector.startsWith('form:'))
+    .map(selector => selector.slice('form:'.length));
+  const actualForms = unique([
+    ...byKind('FormRelease').map(resource => stagedFormCode(target, resource)),
+    ...satisfiedForms,
+  ]).sort();
   if (!exactStringSet(actualForms, expectedForms)) {
     fail(
       `APP_RELEASE_STAGED_SCOPE_MISMATCH: FormRelease 必须精确覆盖 ${expectedForms.join(',') || '(none)'}`
@@ -8885,6 +8918,18 @@ async function resource(args) {
         target
       );
     }
+    const satisfiedFormSelectors = (result.published || [])
+      .filter(
+        item => item?.kind === 'formSetting' && item?.action === 'noop'
+      )
+      .map(item => `form:${item.code}`);
+    if (satisfiedFormSelectors.length > 0 && stagedChangeId) {
+      result.satisfiedSelectors = recordSatisfiedAppReleaseSelectors(
+        stagedChangeId,
+        satisfiedFormSelectors,
+        target
+      );
+    }
     result.timings = telemetry.stop();
     if (flags.json) return writeJson(result);
     printResourceResult(result);
@@ -14016,7 +14061,7 @@ function backendReleaseResultSummary(
     kind: 'BackendRelease',
     identity: { releaseId: release.id },
     action: 'update',
-    hash: release.verificationHash || release.manifestHash,
+    hash: release.manifestHash,
     metadata: resolvedProtocolVersion
       ? {
           protocolVersion: resolvedProtocolVersion,

package/package.json

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