openxiangda 1.0.96 → 1.0.98

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);
@@ -4073,7 +4074,7 @@ async function commands(args) {
     resourceNotes: [
       'For formal multi-resource development, prefer src/resources/** + openxiangda resource validate|plan|publish.',
       'Use first-class route/public-access/auth-config/function/connector/notification/data-view/menu/permission commands for discovery, diagnosis, dry-run, and small live fixes.',
-      'public-access is the new React SPA public policy resource for /view/:appType/public/* routes.',
+      'public-access is the new React SPA public policy resource for /view/:appType/public/* routes; page code should use PublicAccessGate, and Page SDK hooks must stay inside OpenXiangdaProvider + OpenXiangdaPageProvider.',
       'settings public-access is legacy form public-access compatibility/repair and should not be used for new React SPA apps.',
       'Direct live mutation commands should use --dry-run first and --write-manifest when the repository should remain source of truth.',
     ],
@@ -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: [],

package/lib/design-gates.js

@@ -95,7 +95,7 @@ const DESIGN_GATE_TOPICS = [
       '是否需要限流、过期时间、审计字段和回收策略',
     ],
     recommendedDefaults: [
-      '新 React SPA 仅使用 /view/:appType/public/* + routes + public-access policy',
+      '新 React SPA 仅使用 /view/:appType/public/* + routes + public-access policy + PublicAccessGate',
       '普通公开页用 scoped public session；敏感页用 ticket 模式',
       '未显式 grant 的 form/dataView/function/connector 一律拒绝',
     ],
@@ -357,7 +357,7 @@ function renderDesignTemplate(topicCode) {
     '## 2. 推荐方案',
     '- Runtime：React SPA',
     '- 资源发布：src/resources/** + openxiangda resource plan/publish',
-    '- 公开访问：仅使用 /view/:appType/public/* + routes + public-access policy',
+    '- 公开访问：仅使用 /view/:appType/public/* + routes + public-access policy + PublicAccessGate',
     '',
     '## 3. 待确认问题',
   ];
@@ -422,6 +422,7 @@ const RESOURCE_EXPLAINS = {
       'openxiangda public-access upsert --json-file src/resources/public-access/public_register.json',
       'openxiangda public-access session-test public_register --path /view/APP_XXX/public/register',
       'openxiangda public-access grant-check public_register --form-code customer',
+      'React 页面侧使用 PublicAccessGate；如果使用 Page SDK hooks，放在 OpenXiangdaProvider + OpenXiangdaPageProvider 内',
     ],
   },
   'auth-config': {

package/package.json

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