openxiangda 1.0.98 → 1.0.100

package/lib/cli.js

@@ -8567,7 +8567,9 @@ function clonePlainJson(value) {
 function workflowEquals(bound, desired, existing) {
   if (!existing) return false;
   const desiredDefinition = resolveManifestPlainJson(desired, 'definitionJson', 'definitionFile');
-  const desiredView = resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true);
+  const desiredView =
+    resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true) ??
+    resolveManifestPlainJson(desired, 'previewJson', 'previewFile', true);
   const desiredFormUuid = resolveManifestFormUuid(bound, desired);
   return (
     String(existing.resourceCode || '') === String(desired.code || desired.resourceCode || '') &&
@@ -8582,7 +8584,9 @@ function automationEquals(target, desired, existing) {
   if (!existing) return false;
   const desiredDefinition = resolveManifestPlainJson(desired, 'definitionJson', 'definitionFile');
   applyResourceBindingsToRuntimeDefinition(target.bound, desired, desiredDefinition);
-  const desiredView = resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true);
+  const desiredView =
+    resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true) ??
+    resolveManifestPlainJson(desired, 'previewJson', 'previewFile', true);
   const automationPayload = resolveAutomationManifestPayload(target, desired);
   const desiredTags =
     desired.tags === undefined
@@ -8597,17 +8601,29 @@ function automationEquals(target, desired, existing) {
         ? Boolean(desired.isEnabled)
         : undefined;
 
+  const matches = {
+    resourceCode: String(existing.resourceCode || '') === String(desired.code || desired.resourceCode || ''),
+    name: String(existing.name || '') === String(desired.name || desired.code || ''),
+    description: String(existing.description || '') === String(desired.description || ''),
+    formUuid: String(existing.formUuid || '') === String(automationPayload.formUuid || ''),
+    triggerConfig: jsonEqualsForPlan(existing.triggerConfig, automationPayload.triggerConfig, desired.__dir),
+    definitionJson: jsonEqualsForPlan(existing.definitionJson, desiredDefinition, desired.__dir),
+    viewJson: optionalJsonEqualsForPlan(existing.viewJson, desiredView, desired.__dir),
+    tags: desiredTags === undefined ? true : String(existing.tags || '') === desiredTags,
+    published: desired.publish ? Boolean(existing.isPublished) === true : true,
+    enabled: desiredEnabled === undefined ? true : Boolean(existing.isEnabled) === desiredEnabled,
+  };
   return (
-    String(existing.resourceCode || '') === String(desired.code || desired.resourceCode || '') &&
-    String(existing.name || '') === String(desired.name || desired.code || '') &&
-    String(existing.description || '') === String(desired.description || '') &&
-    String(existing.formUuid || '') === String(automationPayload.formUuid || '') &&
-    jsonEqualsForPlan(existing.triggerConfig, automationPayload.triggerConfig, desired.__dir) &&
-    jsonEqualsForPlan(existing.definitionJson, desiredDefinition, desired.__dir) &&
-    optionalJsonEqualsForPlan(existing.viewJson, desiredView, desired.__dir) &&
-    (desiredTags === undefined ? true : String(existing.tags || '') === desiredTags) &&
-    (desired.publish ? Boolean(existing.isPublished) === true : true) &&
-    (desiredEnabled === undefined ? true : Boolean(existing.isEnabled) === desiredEnabled)
+    matches.resourceCode &&
+    matches.name &&
+    matches.description &&
+    matches.formUuid &&
+    matches.triggerConfig &&
+    matches.definitionJson &&
+    matches.viewJson &&
+    matches.tags &&
+    matches.published &&
+    matches.enabled
   );
 }
 
@@ -8785,6 +8801,7 @@ function normalizeJsonForPlan(value, baseDir, keyName) {
     result.runtimeMode = result.runtimeMode || 'trusted_node';
     result.sourceType = result.sourceType || 'file_snapshot';
   }
+  if (result.code === '') delete result.code;
   return sortObjectForStableJson(result);
 }
 
@@ -8795,12 +8812,15 @@ function normalizeLocalSourceFileForPlan(localPath, baseDir) {
   const resolvedLocalPath = fs.existsSync(baseResolvedPath)
     ? baseResolvedPath
     : cwdResolvedPath;
-  const bundlePath = resolveJsCodeBundlePathForPlan(resolvedLocalPath);
-  if (bundlePath && fs.existsSync(bundlePath)) {
+  const sourceInfo = getJsCodeSourceInfoForPlan(resolvedLocalPath);
+  if (sourceInfo) {
+    ensureJsCodeBundleForPlan(sourceInfo);
+  }
+  if (sourceInfo?.bundlePath && fs.existsSync(sourceInfo.bundlePath)) {
     return {
       sha256: crypto
         .createHash('sha256')
-        .update(fs.readFileSync(bundlePath))
+        .update(fs.readFileSync(sourceInfo.bundlePath))
         .digest('hex'),
     };
   }
@@ -8810,6 +8830,10 @@ function normalizeLocalSourceFileForPlan(localPath, baseDir) {
 }
 
 function resolveJsCodeBundlePathForPlan(localPath) {
+  return getJsCodeSourceInfoForPlan(localPath)?.bundlePath || null;
+}
+
+function getJsCodeSourceInfoForPlan(localPath) {
   const extension = path.extname(localPath).toLowerCase();
   if (extension && extension !== '.ts' && extension !== '.tsx') return null;
   const normalized = localPath.replace(/\\/g, '/');
@@ -8824,7 +8848,39 @@ function resolveJsCodeBundlePathForPlan(localPath) {
       ? 'automations'
       : 'js-code-nodes';
   const workspaceRoot = findWorkspaceRoot(localPath);
-  return path.join(workspaceRoot, 'dist', sourceKind, matched[1], 'index.cjs');
+  const scriptCode = matched[1];
+  return {
+    workspaceRoot,
+    sourceKind,
+    scriptCode,
+    bundlePath: path.join(workspaceRoot, 'dist', sourceKind, scriptCode, 'index.cjs'),
+  };
+}
+
+const jsCodePlanBuildCache = new Set();
+
+function ensureJsCodeBundleForPlan(sourceInfo) {
+  if (fs.existsSync(sourceInfo.bundlePath)) return;
+  const cacheKey = [
+    sourceInfo.workspaceRoot,
+    sourceInfo.sourceKind,
+    sourceInfo.scriptCode,
+  ].join('\0');
+  if (jsCodePlanBuildCache.has(cacheKey)) return;
+  jsCodePlanBuildCache.add(cacheKey);
+  const result = runWorkspaceJsCodeBuild(
+    sourceInfo.workspaceRoot,
+    sourceInfo.scriptCode,
+    sourceInfo.sourceKind
+  );
+  if (result.status !== 0) {
+    if (result.stdout) process.stderr.write(result.stdout);
+    if (result.stderr) process.stderr.write(result.stderr);
+    fail(`JS_CODE bundle构建失败，无法生成资源计划: ${sourceInfo.scriptCode}`);
+  }
+  if (!fs.existsSync(sourceInfo.bundlePath)) {
+    fail(`JS_CODE bundle构建未生成产物，无法生成资源计划: ${sourceInfo.bundlePath}`);
+  }
 }
 
 function sortObjectForStableJson(value) {

package/package.json

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