openxiangda 1.0.239 → 1.0.240

package/lib/cli.js

@@ -7292,6 +7292,11 @@ async function runAppReleaseCommand(
         environmentControl: appReleaseEnvironmentControl(flags),
       }
     );
+    const finalizedDataViews = await finalizeDeferredDataViewResources(
+      config,
+      target,
+      readCommaSeparatedFlag(flags, 'finalize-data-views')
+    );
     const bindingVerification =
       await verifyFinalizedBackendBindingContracts(
         config,
@@ -7336,6 +7341,9 @@ async function runAppReleaseCommand(
       prepared,
       verified,
       activated,
+      ...(finalizedDataViews
+        ? { finalizedDataViews }
+        : {}),
       ...(bindingVerification ? { bindingVerification } : {}),
       ...(healthWait ? { healthWait } : {}),
       ...(stateReconcileWarning ? { stateReconcileWarning } : {}),
@@ -14380,9 +14388,16 @@ async function resource(args) {
             manifest.scopeGrantSources || []
           )
         : [];
+    const dataViewFormCodes = stagedChangeId
+      ? resolveDataViewSourceFormCodes(
+          manifest.dataViews || [],
+          target.bound
+        )
+      : [];
     const stagedContractFormCodes = unique([
       ...workflowFormCodes,
       ...scopeGrantSourceFormCodes,
+      ...dataViewFormCodes,
     ]).sort();
     if (
       stagedContractFormCodes.length > 0 &&
@@ -23789,6 +23804,10 @@ async function findExistingScopeResource(config, target, segment, code) {
 }
 
 async function publishDataViewResources(config, target, dataViews, result, options = {}) {
+  const stagedFormBindingOverlays =
+    options.stagedFormBindingOverlays instanceof Map
+      ? options.stagedFormBindingOverlays
+      : new Map();
   for (const dataViewItem of dataViews) {
     if (shouldSkipNoopResource(options, 'dataView', dataViewItem.code)) {
       recordNoopResource(result, 'dataView', dataViewItem.code, options);
@@ -23796,6 +23815,18 @@ async function publishDataViewResources(config, target, dataViews, result, optio
     }
     const existing = await findExistingDataView(config, target, dataViewItem.code);
     const body = normalizeDataViewManifest(target.bound, dataViewItem);
+    const stagedFormReleases = options.finalizeDeferredDataViews
+      ? []
+      : stagedDataViewFormReleaseDependencies(
+          body,
+          stagedFormBindingOverlays
+        );
+    if (stagedFormReleases.length > 0) {
+      body.stagedFormReleases = stagedFormReleases;
+    }
+    if (options.finalizeDeferredDataViews) {
+      body.finalizeDeferred = true;
+    }
     const data = existing
       ? await requestWithAuth(
           config,
@@ -23819,10 +23850,26 @@ async function publishDataViewResources(config, target, dataViews, result, optio
     result.published.push({
       kind: 'dataView',
       code: dataViewItem.code,
-      action: existing ? 'update' : 'create',
+      action: options.finalizeDeferredDataViews
+        ? data?.status === 'active'
+          ? 'finalize'
+          : 'noop'
+        : existing
+          ? 'update'
+          : 'create',
       id: data?.id,
+      status: data?.status || null,
+      ...(stagedFormReleases.length > 0
+        ? {
+            activation: 'deferred-until-form-activation',
+            stagedFormReleaseCount: stagedFormReleases.length,
+          }
+        : {}),
     });
-    if (Array.isArray(body.permissionGroups)) {
+    if (
+      !options.finalizeDeferredDataViews &&
+      Array.isArray(body.permissionGroups)
+    ) {
       await publishDataViewPermissionGroups(config, target, dataViewItem.code, body.permissionGroups);
       result.published.push({
         kind: 'dataViewPermissionGroup',
@@ -23833,6 +23880,128 @@ async function publishDataViewResources(config, target, dataViews, result, optio
   }
 }
 
+function stagedDataViewFormReleaseDependencies(
+  body,
+  stagedFormBindingOverlays = new Map()
+) {
+  const overlaysByFormUuid = new Map(
+    Array.from(stagedFormBindingOverlays.values())
+      .map(overlay => [String(overlay?.formUuid || '').trim(), overlay])
+      .filter(([formUuid]) => Boolean(formUuid))
+  );
+  const sources = [
+    body?.definition?.base,
+    ...(body?.definition?.joins || []),
+  ].filter(Boolean);
+  const dependencies = new Map();
+  for (const source of sources) {
+    const formUuid = String(source?.formUuid || '').trim();
+    const staged = overlaysByFormUuid.get(formUuid);
+    if (!staged) continue;
+    dependencies.set(formUuid, {
+      formUuid,
+      releaseId: staged.releaseId,
+      contentHash: staged.contentHash,
+      baseRevision: staged.baseRevision,
+      parentReleaseId: staged.parentReleaseId,
+    });
+  }
+  return Array.from(dependencies.values()).sort((left, right) =>
+    left.formUuid.localeCompare(right.formUuid)
+  );
+}
+
+function resolveDataViewSourceFormCodes(dataViews, bound) {
+  const codeByFormUuid = new Map(
+    Object.entries(bound.resources?.forms || {})
+      .map(([formCode, resource]) => [
+        String(resource?.formUuid || '').trim(),
+        formCode,
+      ])
+      .filter(([formUuid]) => Boolean(formUuid))
+  );
+  const formCodes = [];
+  for (const dataView of dataViews || []) {
+    const definition =
+      dataView?.definition !== undefined
+        ? dataView.definition
+        : dataView;
+    const sources = [
+      definition?.base,
+      ...(definition?.joins || []),
+    ].filter(Boolean);
+    for (const source of sources) {
+      const formCode = String(
+        source?.formCode ||
+          source?.form ||
+          (source?.kind === 'form' ? source?.code : '') ||
+          codeByFormUuid.get(String(source?.formUuid || '').trim()) ||
+          ''
+      ).trim();
+      if (formCode) formCodes.push(formCode);
+    }
+  }
+  return unique(formCodes).sort();
+}
+
+async function finalizeDeferredDataViewResources(
+  config,
+  target,
+  codes
+) {
+  if (!Array.isArray(codes) || codes.length === 0) return null;
+  const selectors = codes.map(code => ({
+    key: 'dataViews',
+    code,
+    raw: code,
+  }));
+  const manifest = loadWorkspaceResources({
+    typeFilters: new Set(['dataViews']),
+    codeFilters: selectors,
+  });
+  if ((manifest.unmatchedResourceCodeFilters || []).length > 0) {
+    fail(
+      `DATA_VIEW_FINALIZE_SOURCE_MISSING: App finalize 找不到数据视图源码: ${manifest.unmatchedResourceCodeFilters.join(', ')}`
+    );
+  }
+  const result = {
+    appType: target.appType,
+    profile: target.profileName,
+    published: [],
+    warnings: [],
+  };
+  await publishDataViewResources(
+    config,
+    target,
+    manifest.dataViews || [],
+    result,
+    {
+      skipNoop: false,
+      finalizeDeferredDataViews: true,
+    }
+  );
+  const notActive = result.published.filter(
+    item => item.kind === 'dataView' && item.status !== 'active'
+  );
+  if (notActive.length > 0) {
+    fail(
+      `DATA_VIEW_FINALIZE_INCOMPLETE: ${notActive
+        .map(item => `${item.code}:${item.status || 'unknown'}`)
+        .join(', ')}`
+    );
+  }
+  return {
+    requested: codes,
+    finalized: result.published
+      .filter(item => item.kind === 'dataView')
+      .map(item => ({
+        code: item.code,
+        id: item.id || null,
+        status: item.status,
+      })),
+  };
+}
+
 async function publishStorageConfigResources(config, target, storageConfigs, result, options = {}) {
   for (const storageItem of storageConfigs) {
     const code = storageItem.code || storageItem.resourceCode;
@@ -29431,6 +29600,16 @@ function readStringFlag(flags, key) {
   return String(value).trim();
 }
 
+function readCommaSeparatedFlag(flags, key) {
+  const value = readStringFlag(flags, key);
+  return unique(
+    value
+      .split(',')
+      .map(item => item.trim())
+      .filter(Boolean)
+  ).sort();
+}
+
 function normalizeWorkspacePublishOptions(flags) {
   const targetForm = readStringFlag(flags, 'form');
   const targetPage = readStringFlag(flags, 'page');
@@ -29812,5 +29991,7 @@ module.exports = {
   buildScopeGrantSourceSyncDecision,
   main,
   resolveReleaseCommandScopedFiles,
+  resolveDataViewSourceFormCodes,
   satisfiedFormCodesFromContext,
+  stagedDataViewFormReleaseDependencies,
 };

package/lib/release-plan.js

@@ -327,6 +327,9 @@ function buildWorkspaceReleaseSteps(
   const stagesFormRelease =
     runtimeMode === 'react-spa' &&
     (targets.forms.length > 0 || formPermissionGroups.length > 0);
+  const deferredDataViewCodes = stagesFormRelease
+    ? uniqueSorted(targets.resourceSelectors?.dataViews || [])
+    : [];
   const directConfigurationSteps =
     buildDirectConfigurationReleaseSteps(
       targets,
@@ -437,6 +440,12 @@ function buildWorkspaceReleaseSteps(
                     `.openxiangda/releases/${changeId || 'change'}/staged-resources.json`,
                   ]
                 : []),
+              ...(deferredDataViewCodes.length > 0
+                ? [
+                    '--finalize-data-views',
+                    deferredDataViewCodes.join(','),
+                  ]
+                : []),
               '--wait',
             ],
             profileArg,

package/package.json

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