openxiangda 1.0.94 → 1.0.96

package/lib/cli.js

@@ -24,7 +24,9 @@ const { assertCanInitializeWorkspace, initWorkspace } = require('./workspace-ini
 const { bootstrapWorkspace } = require('./workspace-bootstrap');
 const {
   getDesignGates,
+  getDesignTopicCatalog,
   getResourceExplain,
+  renderDesignHelp,
   renderDesignGatesText,
   renderDesignTemplate,
   renderResourceExplain,
@@ -49,6 +51,9 @@ const RUNTIME_UPLOAD_CONCURRENCY = 3;
 
 async function main(argv) {
   const [command, ...rest] = argv;
+  if (command === 'version' || command === '--version' || command === '-v') {
+    return version(rest);
+  }
   if (!command || command === 'help' || command === '--help' || command === '-h') {
     printHelp();
     return;
@@ -91,6 +96,7 @@ function printHelp() {
   print(`OpenXiangda CLI
 
 Usage:
+  openxiangda version [--json]
   openxiangda login <platform-url> [--profile name]
   openxiangda update check|install [--json] [--registry https://registry.npmjs.org]
   openxiangda platform add <name> <platform-url>
@@ -153,6 +159,7 @@ Usage:
 
 OpenXiangda 使用普通用户登录 token，不需要 AK/SK。
 表单页、流程表单页和代码页的主链路是 sy-lowcode-app-workspace + openxiangda workspace publish。
+新 React SPA 公开访问使用 public-access 命令和 src/resources/public-access；settings public-access 仅用于旧表单公开设置兼容/修复。
 JS_CODE V2 使用 trusted_node；AI 源码必须写在 src/js-code-nodes/<scriptCode>/index.ts，代码自动化源码写在 src/automations/<resourceCode>/index.ts。definition-json 中的 sourceFile.localPath 会在 validate/create/publish 时先 TS 校验、再构建并上传为快照。`);
 }
 
@@ -233,6 +240,17 @@ function wantsSubcommandHelp(subcommand, flags) {
   );
 }
 
+async function version(args) {
+  const { flags } = parseArgs(args);
+  const result = {
+    name: NPM_PACKAGE_NAME,
+    version: CURRENT_VERSION,
+    updateCheckCommand: 'openxiangda update check --json',
+  };
+  if (flags.json) return writeJson(result);
+  print(CURRENT_VERSION);
+}
+
 async function update(args) {
   const requestedSubcommand = args[0] && !args[0].startsWith('--') ? args[0] : 'check';
   const parsedArgs = requestedSubcommand === args[0] ? args.slice(1) : args;
@@ -435,7 +453,8 @@ async function design(args) {
   const { flags, positional } = parseArgs(rest);
   const topic = flags.topic || positional[0];
   if (wantsSubcommandHelp(subcommand, flags)) {
-    print('用法: openxiangda design gates|template [--topic new-app,public-access] [--json]');
+    if (flags.json) return writeJson(getDesignTopicCatalog());
+    print(renderDesignHelp());
     return;
   }
 
@@ -466,7 +485,7 @@ async function doctor(args) {
     return;
   }
   const config = loadConfig();
-  const profileName = flags.profile || config.currentProfile;
+  const profileName = resolveDoctorProfileName(config, flags);
   const result = {
     cli: {
       version: CURRENT_VERSION,
@@ -561,6 +580,24 @@ async function doctor(args) {
   printDoctorReport(result);
 }
 
+function resolveDoctorProfileName(config, flags) {
+  if (flags.profile) return flags.profile;
+  const state = loadProjectState();
+  const boundEntries = Object.entries(state.profiles || {}).filter(([, bound]) => bound?.appType);
+  const requestedAppType = flags['app-type'];
+  if (requestedAppType) {
+    const matched = boundEntries.find(([, bound]) => bound.appType === requestedAppType);
+    if (matched) return matched[0];
+  }
+  if (config.currentProfile && state.profiles?.[config.currentProfile]?.appType) {
+    return config.currentProfile;
+  }
+  if (boundEntries.length === 1) {
+    return boundEntries[0][0];
+  }
+  return config.currentProfile;
+}
+
 function printDoctorReport(result) {
   const lines = [
     `OpenXiangda doctor v${result.cli.version}`,
@@ -3998,7 +4035,9 @@ async function commands(args) {
   const { flags } = parseArgs(args);
   const manifest = {
     name: 'openxiangda',
+    version: CURRENT_VERSION,
     commands: [
+      'version [--json]',
       'login <platform-url> [--profile name]',
       'update check|install',
       'platform add|list|use|remove',
@@ -4025,10 +4064,19 @@ async function commands(args) {
       'permission form-group-list|form-group-create|form-group-update|form-group-delete|form-group-bind|form-summary|menu-permissions',
       'settings get|save|indexes|indexes-save|data-management|data-management-save|public-access|public-access-save|public-access-delete',
       'resource validate|plan|publish|pull|typegen|explain',
+      'runtime deploy|releases|activate',
       'inspect app|form|workflow|automation|permissions',
       'feedback preview|submit',
       'skill install|status|bootstrap',
     ],
+    designTopics: getDesignTopicCatalog(),
+    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.',
+      '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.',
+    ],
   };
   if (flags.json) return writeJson(manifest);
   print(JSON.stringify(manifest, null, 2));
@@ -5047,6 +5095,9 @@ function validateWorkspaceResources(manifest) {
   const errors = [];
   const warnings = [];
   const counts = {};
+  if (!fs.existsSync(manifest.baseDir)) {
+    warnings.push('未发现 src/resources；多资源正式开发请在该目录声明资源，或使用一等 CLI 子命令进行只读诊断/小步维护');
+  }
   for (const spec of RESOURCE_SPECS) {
     const items = manifest[spec.key] || [];
     counts[spec.key] = items.length;

package/lib/design-gates.js

@@ -219,19 +219,112 @@ const DESIGN_GATE_TOPICS = [
   },
 ];
 
+const DESIGN_GATE_TOPIC_ALIASES = {
+  app: 'new-app',
+  application: 'new-app',
+  dashboard: 'complex-page',
+  page: 'complex-page',
+  pages: 'complex-page',
+  login: 'auth',
+  register: 'auth',
+  registration: 'auth',
+  sso: 'auth',
+  public: 'public-access',
+  guest: 'public-access',
+  visitor: 'public-access',
+  visitors: 'public-access',
+  permission: 'permissions',
+  role: 'permissions',
+  roles: 'permissions',
+  workflow: 'workflow-automation',
+  automation: 'workflow-automation',
+  function: 'workflow-automation',
+  functions: 'workflow-automation',
+  'app-function': 'workflow-automation',
+  js_code: 'workflow-automation',
+  jscode: 'workflow-automation',
+  connector: 'connector-notification',
+  connectors: 'connector-notification',
+  notification: 'connector-notification',
+  notifications: 'connector-notification',
+  integration: 'connector-notification',
+  integrations: 'connector-notification',
+  webhook: 'connector-notification',
+  resource: 'resource-maintenance',
+  resources: 'resource-maintenance',
+  maintenance: 'resource-maintenance',
+};
+
+function resolveTopicSelection(topicCode) {
+  if (!topicCode || topicCode === 'all') {
+    return { requested: ['all'], wanted: null, unknown: [] };
+  }
+  const knownCodes = new Set(DESIGN_GATE_TOPICS.map(topic => topic.code));
+  const requested = String(topicCode)
+    .split(/[,/|+\s]+/)
+    .map(item => item.trim())
+    .filter(Boolean);
+  const wanted = new Set();
+  const unknown = [];
+  for (const item of requested) {
+    const normalized = item.toLowerCase();
+    const code = DESIGN_GATE_TOPIC_ALIASES[normalized] || normalized;
+    if (knownCodes.has(code)) {
+      wanted.add(code);
+    } else {
+      unknown.push(item);
+    }
+  }
+  return { requested, wanted, unknown };
+}
+
 function selectTopics(topicCode) {
-  if (!topicCode || topicCode === 'all') return DESIGN_GATE_TOPICS;
-  const wanted = new Set(String(topicCode).split(',').map(item => item.trim()).filter(Boolean));
-  return DESIGN_GATE_TOPICS.filter(topic => wanted.has(topic.code));
+  const selection = resolveTopicSelection(topicCode);
+  if (!selection.wanted) return DESIGN_GATE_TOPICS;
+  return DESIGN_GATE_TOPICS.filter(topic => selection.wanted.has(topic.code));
 }
 
 function getDesignGates(topicCode) {
+  const selection = resolveTopicSelection(topicCode);
   return {
     hardRule: DESIGN_GATE_HARD_RULE,
+    requestedTopics: selection.requested,
+    unknownTopics: selection.unknown,
     topics: selectTopics(topicCode),
   };
 }
 
+function getDesignTopicCatalog() {
+  return {
+    hardRule: DESIGN_GATE_HARD_RULE,
+    topics: DESIGN_GATE_TOPICS.map(topic => ({
+      code: topic.code,
+      title: topic.title,
+      triggers: topic.triggers,
+    })),
+    aliases: DESIGN_GATE_TOPIC_ALIASES,
+  };
+}
+
+function renderDesignHelp() {
+  const catalog = getDesignTopicCatalog();
+  const lines = [
+    '用法: openxiangda design gates|template [--topic code[,code...]] [--json]',
+    '',
+    catalog.hardRule,
+    '',
+    'Topics:',
+  ];
+  for (const topic of catalog.topics) {
+    lines.push(`- ${topic.code}: ${topic.title} (${topic.triggers.join('、')})`);
+  }
+  lines.push('', 'Aliases:');
+  for (const [alias, code] of Object.entries(catalog.aliases).sort()) {
+    lines.push(`- ${alias} -> ${code}`);
+  }
+  return lines.join('\n');
+}
+
 function renderDesignGatesText(topicCode) {
   const gates = getDesignGates(topicCode);
   const lines = [gates.hardRule, ''];
@@ -441,8 +534,11 @@ function renderResourceExplain(type) {
 module.exports = {
   DESIGN_GATE_HARD_RULE,
   DESIGN_GATE_TOPICS,
+  DESIGN_GATE_TOPIC_ALIASES,
   getDesignGates,
+  getDesignTopicCatalog,
   getResourceExplain,
+  renderDesignHelp,
   renderDesignGatesText,
   renderDesignTemplate,
   renderResourceExplain,

package/package.json

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