openxiangda 1.0.98 → 1.0.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cli.js +29 -12
- package/package.json +1 -1
package/lib/cli.js
CHANGED
|
@@ -8567,7 +8567,9 @@ function clonePlainJson(value) {
|
|
|
8567
8567
|
function workflowEquals(bound, desired, existing) {
|
|
8568
8568
|
if (!existing) return false;
|
|
8569
8569
|
const desiredDefinition = resolveManifestPlainJson(desired, 'definitionJson', 'definitionFile');
|
|
8570
|
-
const desiredView =
|
|
8570
|
+
const desiredView =
|
|
8571
|
+
resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true) ??
|
|
8572
|
+
resolveManifestPlainJson(desired, 'previewJson', 'previewFile', true);
|
|
8571
8573
|
const desiredFormUuid = resolveManifestFormUuid(bound, desired);
|
|
8572
8574
|
return (
|
|
8573
8575
|
String(existing.resourceCode || '') === String(desired.code || desired.resourceCode || '') &&
|
|
@@ -8582,7 +8584,9 @@ function automationEquals(target, desired, existing) {
|
|
|
8582
8584
|
if (!existing) return false;
|
|
8583
8585
|
const desiredDefinition = resolveManifestPlainJson(desired, 'definitionJson', 'definitionFile');
|
|
8584
8586
|
applyResourceBindingsToRuntimeDefinition(target.bound, desired, desiredDefinition);
|
|
8585
|
-
const desiredView =
|
|
8587
|
+
const desiredView =
|
|
8588
|
+
resolveManifestPlainJson(desired, 'viewJson', 'viewFile', true) ??
|
|
8589
|
+
resolveManifestPlainJson(desired, 'previewJson', 'previewFile', true);
|
|
8586
8590
|
const automationPayload = resolveAutomationManifestPayload(target, desired);
|
|
8587
8591
|
const desiredTags =
|
|
8588
8592
|
desired.tags === undefined
|
|
@@ -8597,17 +8601,29 @@ function automationEquals(target, desired, existing) {
|
|
|
8597
8601
|
? Boolean(desired.isEnabled)
|
|
8598
8602
|
: undefined;
|
|
8599
8603
|
|
|
8604
|
+
const matches = {
|
|
8605
|
+
resourceCode: String(existing.resourceCode || '') === String(desired.code || desired.resourceCode || ''),
|
|
8606
|
+
name: String(existing.name || '') === String(desired.name || desired.code || ''),
|
|
8607
|
+
description: String(existing.description || '') === String(desired.description || ''),
|
|
8608
|
+
formUuid: String(existing.formUuid || '') === String(automationPayload.formUuid || ''),
|
|
8609
|
+
triggerConfig: jsonEqualsForPlan(existing.triggerConfig, automationPayload.triggerConfig, desired.__dir),
|
|
8610
|
+
definitionJson: jsonEqualsForPlan(existing.definitionJson, desiredDefinition, desired.__dir),
|
|
8611
|
+
viewJson: optionalJsonEqualsForPlan(existing.viewJson, desiredView, desired.__dir),
|
|
8612
|
+
tags: desiredTags === undefined ? true : String(existing.tags || '') === desiredTags,
|
|
8613
|
+
published: desired.publish ? Boolean(existing.isPublished) === true : true,
|
|
8614
|
+
enabled: desiredEnabled === undefined ? true : Boolean(existing.isEnabled) === desiredEnabled,
|
|
8615
|
+
};
|
|
8600
8616
|
return (
|
|
8601
|
-
|
|
8602
|
-
|
|
8603
|
-
|
|
8604
|
-
|
|
8605
|
-
|
|
8606
|
-
|
|
8607
|
-
|
|
8608
|
-
|
|
8609
|
-
|
|
8610
|
-
|
|
8617
|
+
matches.resourceCode &&
|
|
8618
|
+
matches.name &&
|
|
8619
|
+
matches.description &&
|
|
8620
|
+
matches.formUuid &&
|
|
8621
|
+
matches.triggerConfig &&
|
|
8622
|
+
matches.definitionJson &&
|
|
8623
|
+
matches.viewJson &&
|
|
8624
|
+
matches.tags &&
|
|
8625
|
+
matches.published &&
|
|
8626
|
+
matches.enabled
|
|
8611
8627
|
);
|
|
8612
8628
|
}
|
|
8613
8629
|
|
|
@@ -8785,6 +8801,7 @@ function normalizeJsonForPlan(value, baseDir, keyName) {
|
|
|
8785
8801
|
result.runtimeMode = result.runtimeMode || 'trusted_node';
|
|
8786
8802
|
result.sourceType = result.sourceType || 'file_snapshot';
|
|
8787
8803
|
}
|
|
8804
|
+
if (result.code === '') delete result.code;
|
|
8788
8805
|
return sortObjectForStableJson(result);
|
|
8789
8806
|
}
|
|
8790
8807
|
|