openxiangda 1.0.97 → 1.0.99

package/lib/cli.js

@@ -3542,7 +3542,8 @@ async function resource(args) {
     return;
   }
 
-  const manifest = loadWorkspaceResources();
+  const typeFilters = getResourceTypeFilters(positional, flags);
+  const manifest = loadWorkspaceResources({ typeFilters });
   if (subcommand === 'typegen') {
     const result = generateResourceTypes(manifest, flags.out || flags.output);
     if (flags.json) return writeJson(result);
@@ -4958,11 +4959,108 @@ const RESOURCE_SPECS = [
   },
 ];
 
-function loadWorkspaceResources() {
+const RESOURCE_TYPE_ALIASES = new Map([
+  ['role', 'roles'],
+  ['roles', 'roles'],
+  ['connector', 'connectors'],
+  ['connectors', 'connectors'],
+  ['notification', 'notifications'],
+  ['notifications', 'notifications'],
+  ['notification-template', 'notifications'],
+  ['notification-templates', 'notifications'],
+  ['notification-type-config', 'notifications'],
+  ['notification-type-configs', 'notifications'],
+  ['menu', 'menus'],
+  ['menus', 'menus'],
+  ['workflow', 'workflows'],
+  ['workflows', 'workflows'],
+  ['automation', 'automations'],
+  ['automations', 'automations'],
+  ['function', 'functions'],
+  ['functions', 'functions'],
+  ['data-view', 'dataViews'],
+  ['data-views', 'dataViews'],
+  ['dataview', 'dataViews'],
+  ['dataviews', 'dataViews'],
+  ['data-view-resource', 'dataViews'],
+  ['auth', 'authConfigs'],
+  ['auth-config', 'authConfigs'],
+  ['auth-configs', 'authConfigs'],
+  ['authconfig', 'authConfigs'],
+  ['authconfigs', 'authConfigs'],
+  ['route', 'routes'],
+  ['routes', 'routes'],
+  ['public-access', 'publicAccessPolicies'],
+  ['public-access-policy', 'publicAccessPolicies'],
+  ['public-access-policies', 'publicAccessPolicies'],
+  ['publicaccess', 'publicAccessPolicies'],
+  ['publicaccesspolicy', 'publicAccessPolicies'],
+  ['publicaccesspolicies', 'publicAccessPolicies'],
+  ['page-permission-group', 'pagePermissionGroups'],
+  ['page-permission-groups', 'pagePermissionGroups'],
+  ['page-group', 'pagePermissionGroups'],
+  ['page-groups', 'pagePermissionGroups'],
+  ['pagepermissiongroup', 'pagePermissionGroups'],
+  ['pagepermissiongroups', 'pagePermissionGroups'],
+  ['form-permission-group', 'formPermissionGroups'],
+  ['form-permission-groups', 'formPermissionGroups'],
+  ['form-group', 'formPermissionGroups'],
+  ['form-groups', 'formPermissionGroups'],
+  ['formpermissiongroup', 'formPermissionGroups'],
+  ['formpermissiongroups', 'formPermissionGroups'],
+  ['form-setting', 'formSettings'],
+  ['form-settings', 'formSettings'],
+  ['settings-form', 'formSettings'],
+  ['settings-forms', 'formSettings'],
+  ['formsetting', 'formSettings'],
+  ['formsettings', 'formSettings'],
+]);
+
+function getResourceTypeFilters(positional = [], flags = {}) {
+  const rawValues = [
+    ...positional,
+    flags.type,
+    flags['resource-type'],
+    flags['resource-types'],
+  ]
+    .filter(Boolean)
+    .flatMap(value => String(value).split(','))
+    .map(value => value.trim())
+    .filter(Boolean);
+
+  if (rawValues.length === 0) return null;
+
+  const filters = new Set();
+  for (const rawType of rawValues) {
+    const normalized = normalizeResourceTypeAlias(rawType);
+    const key = RESOURCE_TYPE_ALIASES.get(normalized);
+    if (!key) {
+      fail(`未知资源类型: ${rawType}`);
+    }
+    filters.add(key);
+  }
+  return filters;
+}
+
+function normalizeResourceTypeAlias(value) {
+  return String(value || '')
+    .trim()
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .replace(/[_\s]+/g, '-')
+    .toLowerCase();
+}
+
+function loadWorkspaceResources(options = {}) {
   const baseDir = path.join(process.cwd(), 'src', 'resources');
-  const manifest = { baseDir };
+  const typeFilters = options.typeFilters || null;
+  const manifest = {
+    baseDir,
+    ...(typeFilters ? { resourceTypeFilters: Array.from(typeFilters).sort() } : {}),
+  };
   for (const spec of RESOURCE_SPECS) {
-    manifest[spec.key] = readResourceItems(baseDir, spec);
+    manifest[spec.key] = !typeFilters || typeFilters.has(spec.key)
+      ? readResourceItems(baseDir, spec)
+      : [];
   }
   return manifest;
 }
@@ -5733,6 +5831,7 @@ async function buildResourcePlan(config, target, manifest) {
   return {
     appType: target.appType,
     profile: target.profileName,
+    ...(manifest.resourceTypeFilters ? { resourceTypeFilters: manifest.resourceTypeFilters } : {}),
     actions,
     summary: summarizeActions(actions),
   };
@@ -5742,6 +5841,7 @@ async function publishResourceManifest(config, target, manifest, options = {}) {
   const result = {
     appType: target.appType,
     profile: target.profileName,
+    ...(manifest.resourceTypeFilters ? { resourceTypeFilters: manifest.resourceTypeFilters } : {}),
     published: [],
     pruned: [],
     warnings: [],
@@ -8467,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 || '') &&
@@ -8482,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
@@ -8497,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
   );
 }
 
@@ -8685,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);
 }
 

package/package.json

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