openyida 2026.7.18 → 2026.7.21

package/lib/app/check-page.js

@@ -6,7 +6,8 @@ const { lintYidaSource, printLintResult } = require('./page-linter');
 const { buildPageSource, shouldBuildPageSource } = require('./page-compat');
 const { warnLargePageSource } = require('./page-size-guard');
 const { t } = require('../core/i18n');
-const { warn, error, hint } = require('../core/chalk');
+const { warn, hint } = require('../core/chalk');
+const { throwCommandError, throwUsage } = require('../core/command-errors');
 
 function parseArgs(args) {
   return {
@@ -20,14 +21,17 @@ async function run(args) {
   const options = parseArgs(args || []);
 
   if (!options.sourceFile) {
-    warn(t('cli.check_page_usage'));
-    warn(t('cli.check_page_example'));
-    process.exit(1);
+    throwUsage(t('cli.check_page_usage'), t('cli.check_page_example'), {
+      code: 'CHECK_PAGE_INVALID_ARGUMENTS',
+    });
   }
 
   const sourcePath = path.resolve(options.sourceFile);
   if (!fs.existsSync(sourcePath)) {
-    error(t('publish.source_not_found', sourcePath));
+    throwCommandError(t('publish.source_not_found', sourcePath), {
+      code: 'CHECK_PAGE_SOURCE_NOT_FOUND',
+      details: { sourcePath },
+    });
   }
 
   const sourceCode = fs.readFileSync(sourcePath, 'utf-8');
@@ -63,7 +67,13 @@ async function run(args) {
   }
 
   if (!ok) {
-    process.exit(1);
+    throwCommandError(t('check_page.failed'), {
+      code: 'CHECK_PAGE_FAILED',
+      details: {
+        errors: lintResult.errors,
+        buildErrors,
+      },
+    });
   }
 }
 

package/lib/app/compile.js

@@ -7,7 +7,8 @@ const { runLintCheck } = require('./page-linter');
 const { buildPageFile, shouldBuildPageSource } = require('./page-compat');
 const { warnLargePageSource } = require('./page-size-guard');
 const { t } = require('../core/i18n');
-const { warn, error, info, step } = require('../core/chalk');
+const { warn, info, step } = require('../core/chalk');
+const { throwCommandError, throwUsage } = require('../core/command-errors');
 
 /**
  * compile 命令：只编译自定义页面源码，不发布到宜搭。
@@ -15,9 +16,9 @@ const { warn, error, info, step } = require('../core/chalk');
  */
 async function run(args) {
   if (!args || args.length < 1) {
-    warn(t('cli.compile_usage'));
-    warn(t('cli.compile_example'));
-    process.exit(1);
+    throwUsage(t('cli.compile_usage'), t('cli.compile_example'), {
+      code: 'COMPILE_INVALID_ARGUMENTS',
+    });
   }
 
   const skipLint = args.includes('--skip-lint');
@@ -25,7 +26,10 @@ async function run(args) {
   const filteredArgs = args.filter(arg => arg !== '--skip-lint' && arg !== '--compat' && arg !== '--modern');
   let sourcePath = path.resolve(filteredArgs[0]);
   if (!fs.existsSync(sourcePath)) {
-    error(t('publish.source_not_found', sourcePath));
+    throwCommandError(t('publish.source_not_found', sourcePath), {
+      code: 'COMPILE_SOURCE_NOT_FOUND',
+      details: { sourcePath },
+    });
   }
 
   const initialSourceCode = fs.readFileSync(sourcePath, 'utf-8');
@@ -35,7 +39,10 @@ async function run(args) {
     const buildResult = buildPageFile(sourcePath, { modern: compat, skipSizeWarning: true });
     if (!buildResult.ok) {
       buildResult.errors.forEach((issue) => warn(`${issue.code}: ${issue.message}`));
-      process.exit(1);
+      throwCommandError(t('build_page.failed'), {
+        code: 'COMPILE_BUILD_PAGE_FAILED',
+        details: { errors: buildResult.errors },
+      });
     }
     sourcePath = buildResult.outputPath;
     info(t('build_page.output', sourcePath));
@@ -46,7 +53,10 @@ async function run(args) {
     const sourceCode = fs.readFileSync(sourcePath, 'utf-8');
     const lintPassed = runLintCheck(sourceCode, sourcePath);
     if (!lintPassed) {
-      process.exit(1);
+      throwCommandError(t('check_page.failed'), {
+        code: 'COMPILE_LINT_FAILED',
+        details: { sourcePath },
+      });
     }
   } else {
     info(t('publish.lint_skipped'));

package/lib/app/create-app.js

@@ -17,6 +17,11 @@ const { createAuthRef } = require('../core/yida-client');
 const { t } = require('../core/i18n');
 const { buildYidaI18n, normalizeYidaLocale, resolveContentLocale } = require('../core/yida-i18n');
 const { parseOpenOption, withBrowserHandoff } = require('../core/browser-handoff');
+const { throwCommandError } = require('../core/command-errors');
+const {
+  assertLegacyDirectWriteAllowed,
+  extractLegacyGuardArgs,
+} = require('../core/legacy-schema-guard');
 const { assertPresetThemeKey } = require('./theme-presets');
 
 const DEFAULT_APP_OPTIONS = {
@@ -280,7 +285,8 @@ function buildCreateAppPayload(params, auth, contentLocale, openExclusive, openP
 
 async function run(args) {
   const openOption = parseOpenOption(args);
-  args = openOption.args;
+  const guardSplit = extractLegacyGuardArgs(openOption.args);
+  args = guardSplit.args;
 
   if (hasHelpFlag(args)) {
     printUsage();
@@ -300,6 +306,12 @@ async function run(args) {
     chalkError(t('create_app.usage'), { hint: t('create_app.example') });
   }
 
+  assertLegacyDirectWriteAllowed({
+    command: 'create-app',
+    resourceType: 'app',
+    action: 'create',
+  }, { guardOptions: guardSplit.guardOptions });
+
   const { appName, description, icon, iconColor, colour, navTheme, layoutDirection } = params;
 
   const { c, banner, step, label, success: chalkSuccess, result: chalkResult } = require('../core/chalk');
@@ -370,7 +382,7 @@ async function run(args) {
     const errorMsg = response ? response.errorMsg || t('common.unknown_error') : t('common.request_failed');
     chalkResult(false, t('create_app.failed', errorMsg));
     console.log(JSON.stringify({ success: false, error: errorMsg }));
-    process.exit(1);
+    throwCommandError(errorMsg);
   }
 }
 

package/lib/app/create-form/api-path.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * create-form/api-path.js
+ *
+ * 接口路径生成：构建宜搭表单设计相关的 API 请求路径。
+ *
+ * @param {string} appType         应用标识（appType）
+ * @param {string} apiName         接口名称（不含扩展名），如 saveFormSchema
+ * @param {object} [options]       可选项
+ * @param {string} [options.prefix]        额外的路径前缀（会以 / 拼接）
+ * @param {string} [options.namespace]     命名空间，默认 dingtalk
+ * @param {boolean} [options.addTimestamp] 是否追加 _stamp 时间戳查询参数
+ * @returns {string} 拼接完成的 API 请求路径
+ */
+function buildApiPath(appType, apiName, options = {}) {
+  const { prefix = '', namespace = 'dingtalk', addTimestamp = false } = options;
+  const prefixPath = prefix ? `/${prefix}` : '';
+  const timestamp = addTimestamp ? `?_stamp=${Date.now()}` : '';
+  return `/${namespace}/web/${appType}${prefixPath}/query/formdesign/${apiName}.json${timestamp}`;
+}
+
+module.exports = {
+  buildApiPath,
+};

package/lib/app/create-form/args.js

@@ -85,6 +85,7 @@ function createParseArgs(dependencies) {
       labelAlign: 'top',
       contentLocale: null,
       browserOpenMode: openOption.mode,
+      legacyGuardOptions: openOption.legacyGuardOptions || null,
     };
 
     const args = [...rawArgs];
@@ -118,6 +119,18 @@ function createParseArgs(dependencies) {
       }
     }
 
+    if (args.includes('--help') || args.includes('-h')) {
+      usage(t('create_form.usage_create_short'));
+      hint(t('create_form.usage_update_short'));
+      hint(t('create_form.example_create'));
+      hint(t('create_form.example_update'));
+      return {
+        mode: 'help',
+        help: true,
+        ...options
+      };
+    }
+
     const mode = args[0];
 
     if (mode === 'create') {

package/lib/app/create-form/commands.js

@@ -17,7 +17,11 @@ function dispatchCreateFormCommand(parsedArgs, authContext, handlers) {
     case 'add-option':
       return handlers.addOption(...args);
     case 'create':
+      return handlers.create(...args);
     default:
+      if (parsedArgs.mode && parsedArgs.mode !== 'create') {
+        throw new Error('Unknown create-form mode: ' + parsedArgs.mode);
+      }
       return handlers.create(...args);
   }
 }

package/lib/app/create-form/definition-reader.js

@@ -47,11 +47,11 @@ function createDefinitionReaders(dependencies) {
       } else if (typeof parsed === 'object' && parsed !== null) {
         fields = parsed.fields || [];
         columns = parsed.columns !== undefined ? parsed.columns : 1;
-        validations = Array.isArray(parsed.validations)
-          ? parsed.validations
-          : Array.isArray(parsed.rules)
-            ? parsed.rules
-            : [];
+        if (Array.isArray(parsed.validations)) {
+          validations = parsed.validations;
+        } else if (Array.isArray(parsed.rules)) {
+          validations = parsed.rules;
+        }
       } else {
         throw new Error(t('create_form.fields_format_invalid'));
       }
@@ -91,14 +91,14 @@ function createDefinitionReaders(dependencies) {
       path,
       error,
       inlineObject: true,
-      missingMessage: '补丁文件不存在: ',
+      missingMessage: t('create_form.patch_file_not_found'),
     });
 
     try {
       const patch = safeParseJson(rawContent);
       if (Array.isArray(patch)) {
         if (patch.length === 0) {
-          throw new Error('补丁数组不能为空');
+          throw new Error(t('create_form.patch_must_not_be_empty'));
         }
         return patch;
       }
@@ -110,9 +110,9 @@ function createDefinitionReaders(dependencies) {
           return [patch];
         }
       }
-      throw new Error('补丁必须是数组、{operations: []} 或单个操作对象');
+      throw new Error(t('create_form.patch_invalid_shape'));
     } catch (parseError) {
-      error('补丁 JSON 解析失败: ' + parseError.message);
+      error(t('create_form.patch_parse_failed') + parseError.message);
     }
   }
 
@@ -122,21 +122,21 @@ function createDefinitionReaders(dependencies) {
       path,
       error,
       inlineObject: true,
-      missingMessage: '规则文件不存在: ',
+      missingMessage: t('create_form.rule_file_not_found'),
     });
 
     try {
       const parsed = safeParseJson(rawContent);
       if (Array.isArray(parsed)) {
         if (parsed.length === 0) {
-          throw new Error('规则数组不能为空');
+          throw new Error(t('create_form.rule_array_empty'));
         }
         return parsed;
       }
       if (parsed && typeof parsed === 'object') {
         if (Array.isArray(parsed.rules)) {
           if (parsed.rules.length === 0) {
-            throw new Error('rules 数组不能为空');
+            throw new Error(t('create_form.rules_array_empty'));
           }
           return parsed.rules;
         }
@@ -144,9 +144,9 @@ function createDefinitionReaders(dependencies) {
           return [parsed];
         }
       }
-      throw new Error('规则必须是数组、{rules: []} 或单个规则对象');
+      throw new Error(t('create_form.rule_invalid_shape'));
     } catch (parseError) {
-      error('规则 JSON 解析失败: ' + parseError.message);
+      error(t('create_form.rule_parse_failed') + parseError.message);
     }
   }
 
@@ -160,27 +160,27 @@ function createDefinitionReaders(dependencies) {
       path,
       error,
       inlineObject: true,
-      missingMessage: '校验规则文件不存在: ',
+      missingMessage: t('create_form.validation_file_not_found'),
     });
 
     try {
       const parsed = safeParseJson(rawContent);
       if (Array.isArray(parsed)) {
         if (parsed.length === 0) {
-          throw new Error('校验规则数组不能为空');
+          throw new Error(t('create_form.validation_array_empty'));
         }
         return parsed;
       }
       if (parsed && typeof parsed === 'object') {
         if (Array.isArray(parsed.validations)) {
           if (parsed.validations.length === 0) {
-            throw new Error('validations 数组不能为空');
+            throw new Error(t('create_form.validations_array_empty'));
           }
           return parsed.validations;
         }
         if (Array.isArray(parsed.rules)) {
           if (parsed.rules.length === 0) {
-            throw new Error('rules 数组不能为空');
+            throw new Error(t('create_form.rules_array_empty'));
           }
           return parsed.rules;
         }
@@ -188,9 +188,9 @@ function createDefinitionReaders(dependencies) {
           return [parsed];
         }
       }
-      throw new Error('校验规则必须是数组、{validations: []}、{rules: []} 或单个规则对象');
+      throw new Error(t('create_form.validation_invalid_shape'));
     } catch (parseError) {
-      error('校验规则 JSON 解析失败: ' + parseError.message);
+      error(t('create_form.validation_parse_failed') + parseError.message);
     }
   }
 
@@ -200,17 +200,17 @@ function createDefinitionReaders(dependencies) {
       path,
       error,
       inlineObject: true,
-      missingMessage: '数据源文件不存在: ',
+      missingMessage: t('create_form.datasource_file_not_found'),
     });
 
     try {
       const parsed = safeParseJson(rawContent);
       if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-        throw new Error('数据源配置必须是对象');
+        throw new Error(t('create_form.datasource_must_be_object'));
       }
       return parsed;
     } catch (parseError) {
-      error('数据源 JSON 解析失败: ' + parseError.message);
+      error(t('create_form.datasource_parse_failed') + parseError.message);
     }
   }
 

package/lib/app/create-form/field-normalizers.js

@@ -26,12 +26,32 @@ function createFieldNormalizers(deps) {
     throw new Error('createFieldNormalizers requires a toDesignerValidationRule function');
   }
 
+  function makeOptionSid(optionIndex) {
+    return 'serial_' + Date.now().toString(36) + '_' + optionIndex;
+  }
+
+  function pickOptionValue(option, rawText) {
+    if (option.value !== undefined) {
+      return option.value;
+    }
+    if (option.id !== undefined) {
+      return option.id;
+    }
+    if (option.key !== undefined) {
+      return option.key;
+    }
+    return rawText;
+  }
+
   function buildOptionDataSource(options) {
+    if (!Array.isArray(options)) {
+      return [];
+    }
     return options.map(function (optionText, optionIndex) {
       return {
         text: i18n(optionText, optionText, optionText),
         value: optionText,
-        sid: 'serial_' + Date.now().toString(36) + optionIndex,
+        sid: makeOptionSid(optionIndex),
         disable: false,
         defaultChecked: false,
       };
@@ -44,20 +64,18 @@ function createFieldNormalizers(deps) {
       return {
         text: i18n(optionText, optionText, optionText),
         value: optionText,
-        sid: 'serial_' + Date.now().toString(36) + optionIndex,
+        sid: makeOptionSid(optionIndex),
         disable: false,
         defaultChecked: false,
       };
     }
     if (option && typeof option === 'object') {
       const rawText = option.text || option.label || option.name || option.title || option.value || '';
-      const rawValue = option.value !== undefined ? option.value :
-        option.id !== undefined ? option.id :
-          option.key !== undefined ? option.key : rawText;
+      const rawValue = pickOptionValue(option, rawText);
       return {
         text: rawText && typeof rawText === 'object' ? rawText : i18n(String(rawText), String(rawText), String(rawText)),
         value: String(rawValue),
-        sid: option.sid || 'serial_' + Date.now().toString(36) + optionIndex,
+        sid: option.sid || makeOptionSid(optionIndex),
         disable: option.disable || false,
         defaultChecked: option.defaultChecked || false,
       };
@@ -66,7 +84,7 @@ function createFieldNormalizers(deps) {
     return {
       text: i18n(fallbackText, fallbackText, fallbackText),
       value: fallbackText,
-      sid: 'serial_' + Date.now().toString(36) + optionIndex,
+      sid: makeOptionSid(optionIndex),
       disable: false,
       defaultChecked: false,
     };
@@ -234,6 +252,7 @@ function createFieldNormalizers(deps) {
       unified_social_credit_code: 'unifiedSocialCreditCode',
       mail: 'email',
       e_mail: 'email',
+      email: 'email',
       required: 'required',
       compare: 'compare',
       crossfield: 'compare',

package/lib/app/create-form/schema-patch.js

@@ -5,7 +5,7 @@ function decodeJsonPointerSegment(segment) {
 }
 
 function splitJsonPointer(pointer) {
-  if (pointer === '' || pointer === '/') {
+  if (pointer === '') {
     return [];
   }
   if (!String(pointer).startsWith('/')) {
@@ -16,6 +16,9 @@ function splitJsonPointer(pointer) {
 
 function deepMerge(target, source) {
   Object.keys(source || {}).forEach(function (key) {
+    if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+      return;
+    }
     const value = source[key];
     if (value && typeof value === 'object' && !Array.isArray(value)) {
       if (!target[key] || typeof target[key] !== 'object' || Array.isArray(target[key])) {