schema-dsl 1.1.4 → 1.1.6

package/lib/locales/en-US.js

@@ -26,10 +26,17 @@ module.exports = {
   'error.conflict': 'Operation conflict: {{#reason}}',
 
   // I18nError - Account related (v1.1.1)
-  'account.notFound': 'Account not found',
+  // v1.1.5: Using object format for some examples
+  'account.notFound': {
+    code: 'ACCOUNT_NOT_FOUND',
+    message: 'Account not found'
+  },
   'account.inactive': 'Account is inactive',
   'account.banned': 'Account has been banned',
-  'account.insufficientBalance': 'Insufficient balance, current: {{#balance}}, required: {{#required}}',
+  'account.insufficientBalance': {
+    code: 'INSUFFICIENT_BALANCE',
+    message: 'Insufficient balance, current: {{#balance}}, required: {{#required}}'
+  },
   'account.insufficientCredits': 'Insufficient credits, current: {{#credits}}, required: {{#required}}',
 
   // I18nError - User related (v1.1.1)
@@ -38,7 +45,10 @@ module.exports = {
   'user.noPermission': 'No admin permission',
 
   // I18nError - Order related (v1.1.1)
-  'order.notPaid': 'Order not paid',
+  'order.notPaid': {
+    code: 'ORDER_NOT_PAID',
+    message: 'Order not paid'
+  },
   'order.paymentMissing': 'Payment information missing',
   'order.addressMissing': 'Shipping address missing',
 
@@ -86,6 +96,8 @@ module.exports = {
   // v1.0.2
   'object.missing': '{{#label}} is missing required properties',
   'object.schema': '{{#label}} contains additional properties',
+  // v1.1.6 - additionalProperties
+  'additionalProperties': '{{#label}} must NOT have additional properties: {{#key}}',
 
   // Array
   'array.base': '{{#label}} must be an array',

package/lib/locales/es-ES.js

@@ -44,6 +44,8 @@ module.exports = {
   'object.min': '{{#label}} debe tener al menos {{#limit}} propiedades',
   'object.max': '{{#label}} debe tener como máximo {{#limit}} propiedades',
   'object.unknown': '{{#label}} contiene una propiedad desconocida: {{#key}}',
+  // v1.1.6 - additionalProperties
+  'additionalProperties': '{{#label}} NO debe tener propiedades adicionales: {{#key}}',
 
   // Array
   'array.base': '{{#label}} debe ser un array',

package/lib/locales/fr-FR.js

@@ -44,6 +44,8 @@ module.exports = {
   'object.min': '{{#label}} doit avoir au moins {{#limit}} propriétés',
   'object.max': '{{#label}} doit avoir au plus {{#limit}} propriétés',
   'object.unknown': '{{#label}} contient une propriété inconnue : {{#key}}',
+  // v1.1.6 - additionalProperties
+  'additionalProperties': '{{#label}} NE doit PAS avoir de propriétés supplémentaires : {{#key}}',
 
   // Array
   'array.base': '{{#label}} doit être un tableau',

package/lib/locales/ja-JP.js

@@ -49,6 +49,8 @@ module.exports = {
   'object.min': '{{#label}}は少なくとも{{#limit}}個のプロパティを持つ必要があります',
   'object.max': '{{#label}}は最大{{#limit}}個のプロパティを持つことができます',
   'object.unknown': '{{#label}}に未知のプロパティが含まれています: {{#key}}',
+  // v1.1.6 - additionalProperties
+  'additionalProperties': '{{#label}}に追加のプロパティを含めてはいけません: {{#key}}',
 
   // Array
   'array.base': '{{#label}}は配列である必要があります',

package/lib/locales/zh-CN.js

@@ -17,6 +17,7 @@ module.exports = {
   'conditional.blocked': '账号已被封禁',
   'conditional.notAllowed': '不允许注册',
 
+  // I18nError - 通用错误消息 (v1.1.1)
   // I18nError - 通用错误消息 (v1.1.1)
   'error.notFound': '找不到{{#resource}}',
   'error.forbidden': '没有权限访问{{#resource}}',
@@ -26,10 +27,17 @@ module.exports = {
   'error.conflict': '操作冲突: {{#reason}}',
 
   // I18nError - 账户相关 (v1.1.1)
-  'account.notFound': '账户不存在',
+  // v1.1.5: 部分使用对象格式示例
+  'account.notFound': {
+    code: 'ACCOUNT_NOT_FOUND',
+    message: '账户不存在'
+  },
   'account.inactive': '账户未激活',
   'account.banned': '账户已被封禁',
-  'account.insufficientBalance': '余额不足，当前余额{{#balance}}，需要{{#required}}',
+  'account.insufficientBalance': {
+    code: 'INSUFFICIENT_BALANCE',
+    message: '余额不足，当前余额{{#balance}}，需要{{#required}}'
+  },
   'account.insufficientCredits': '积分不足，当前积分{{#credits}}，需要{{#required}}',
 
   // I18nError - 用户相关 (v1.1.1)
@@ -38,7 +46,10 @@ module.exports = {
   'user.noPermission': '没有管理员权限',
 
   // I18nError - 订单相关 (v1.1.1)
-  'order.notPaid': '订单未支付',
+  'order.notPaid': {
+    code: 'ORDER_NOT_PAID',
+    message: '订单未支付'
+  },
   'order.paymentMissing': '缺少支付信息',
   'order.addressMissing': '缺少收货地址',
 
@@ -86,6 +97,8 @@ module.exports = {
   // v1.0.2新增
   'object.missing': '{{#label}}缺少必需属性',
   'object.schema': '{{#label}}包含额外属性',
+  // v1.1.6新增 - additionalProperties
+  'additionalProperties': '{{#label}}不允许有额外属性: {{#key}}',
 
   // Array
   'array.base': '{{#label}}必须是数组类型',

package/lib/validators/CustomKeywords.js

@@ -90,12 +90,20 @@ class CustomKeywords {
               // ajv 默认不支持同步验证中的异步操作
               // 这里我们只能抛出错误提示
               // 真正的异步支持需要 Validator.validateAsync
-              throw new Error(Locale.getMessage('ASYNC_VALIDATION_NOT_SUPPORTED'));
+              const messageConfig = Locale.getMessage('ASYNC_VALIDATION_NOT_SUPPORTED');
+              const errorMessage = typeof messageConfig === 'object' && messageConfig.message
+                ? messageConfig.message
+                : messageConfig;
+              throw new Error(errorMessage);
             }
 
             // 处理返回值
             if (result === false) {
-              validate.errors = [{ message: Locale.getMessage('CUSTOM_VALIDATION_FAILED') }];
+              const messageConfig = Locale.getMessage('CUSTOM_VALIDATION_FAILED');
+              const errorMessage = typeof messageConfig === 'object' && messageConfig.message
+                ? messageConfig.message
+                : messageConfig;
+              validate.errors = [{ message: errorMessage }];
               return false;
             }
             if (typeof result === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "schema-dsl",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "简洁强大的JSON Schema验证库 - DSL语法 + String扩展 + 便捷validate",
   "main": "index.js",
   "types": "index.d.ts",

package/test-three-rounds-check.js

@@ -0,0 +1,375 @@
+/**
+ * 三轮深度检查脚本
+ *
+ * 第一轮：验证所有ajv错误类型的参数映射
+ * 第二轮：边界情况和极端值测试
+ * 第三轮：并发和性能测试
+ */
+
+const Ajv = require('ajv');
+const addFormats = require('ajv-formats');
+const ErrorFormatter = require('./lib/core/ErrorFormatter');
+
+console.log('🔍 开始三轮深度检查...\n');
+console.log('='.repeat(80));
+
+// ============================================================================
+// 第一轮：验证所有ajv错误类型的参数映射
+// ============================================================================
+
+console.log('\n【第一轮】验证所有ajv错误类型的参数映射\n');
+
+const ajv = new Ajv({ allErrors: true, strict: false });
+addFormats(ajv);
+
+const testCases = [
+  {
+    name: 'required',
+    schema: { type: 'object', properties: { name: { type: 'string' } }, required: ['name'] },
+    data: {},
+    expectedParams: ['missingProperty']
+  },
+  {
+    name: 'minLength',
+    schema: { type: 'string', minLength: 3 },
+    data: 'ab',
+    expectedParams: ['limit']
+  },
+  {
+    name: 'maxLength',
+    schema: { type: 'string', maxLength: 10 },
+    data: 'this is too long string',
+    expectedParams: ['limit']
+  },
+  {
+    name: 'minimum',
+    schema: { type: 'number', minimum: 10 },
+    data: 5,
+    expectedParams: ['limit', 'comparison']
+  },
+  {
+    name: 'maximum',
+    schema: { type: 'number', maximum: 100 },
+    data: 150,
+    expectedParams: ['limit', 'comparison']
+  },
+  {
+    name: 'enum',
+    schema: { type: 'string', enum: ['pro', 'basic', 'free'] },
+    data: 'premium',
+    expectedParams: ['allowedValues']
+  },
+  {
+    name: 'pattern',
+    schema: { type: 'string', pattern: '^[a-z]+$' },
+    data: 'ABC123',
+    expectedParams: ['pattern']
+  },
+  {
+    name: 'format (email)',
+    schema: { type: 'string', format: 'email' },
+    data: 'invalid-email',
+    expectedParams: ['format']
+  },
+  {
+    name: 'type',
+    schema: { type: 'number' },
+    data: 'not a number',
+    expectedParams: ['type']
+  },
+  {
+    name: 'minItems',
+    schema: { type: 'array', minItems: 2 },
+    data: [1],
+    expectedParams: ['limit']
+  },
+  {
+    name: 'maxItems',
+    schema: { type: 'array', maxItems: 5 },
+    data: [1, 2, 3, 4, 5, 6],
+    expectedParams: ['limit']
+  },
+  {
+    name: 'minProperties',
+    schema: { type: 'object', minProperties: 2 },
+    data: { a: 1 },
+    expectedParams: ['limit']
+  },
+  {
+    name: 'maxProperties',
+    schema: { type: 'object', maxProperties: 3 },
+    data: { a: 1, b: 2, c: 3, d: 4 },
+    expectedParams: ['limit']
+  },
+  {
+    name: 'additionalProperties',
+    schema: { type: 'object', properties: { name: { type: 'string' } }, additionalProperties: false },
+    data: { name: 'John', age: 30 },
+    expectedParams: ['additionalProperty']
+  },
+  {
+    name: 'uniqueItems',
+    schema: { type: 'array', uniqueItems: true },
+    data: [1, 2, 2, 3],
+    expectedParams: ['i', 'j']
+  },
+  {
+    name: 'const',
+    schema: { const: 'fixed_value' },
+    data: 'wrong_value',
+    expectedParams: ['allowedValue']
+  }
+];
+
+let round1Passed = 0;
+let round1Failed = 0;
+
+testCases.forEach(({ name, schema, data, expectedParams }) => {
+  const validate = ajv.compile(schema);
+  const valid = validate(data);
+
+  if (!valid && validate.errors) {
+    const formatter = new ErrorFormatter('en-US');
+    const formatted = formatter.formatDetailed(validate.errors);
+
+    const hasTemplateVars = formatted.some(err =>
+      err.message.includes('{{#') || err.message.includes('}}')
+    );
+
+    if (hasTemplateVars) {
+      console.log(`❌ ${name}: 错误消息包含未替换的模板变量`);
+      console.log(`   消息: ${formatted[0].message}`);
+      console.log(`   ajv参数: ${JSON.stringify(validate.errors[0].params)}`);
+      round1Failed++;
+    } else {
+      console.log(`✅ ${name}: 参数映射正确`);
+      round1Passed++;
+    }
+  }
+});
+
+console.log(`\n第一轮结果: ${round1Passed} 通过, ${round1Failed} 失败`);
+
+// ============================================================================
+// 第二轮：边界情况和极端值测试
+// ============================================================================
+
+console.log('\n' + '='.repeat(80));
+console.log('\n【第二轮】边界情况和极端值测试\n');
+
+const boundaryTests = [
+  {
+    name: '空字符串枚举',
+    schema: { type: 'string', enum: ['', 'a', 'b'] },
+    data: 'c'
+  },
+  {
+    name: '超长枚举列表',
+    schema: { type: 'string', enum: Array(100).fill(0).map((_, i) => `value${i}`) },
+    data: 'invalid'
+  },
+  {
+    name: '数字0作为枚举值',
+    schema: { type: 'number', enum: [0, 1, 2] },
+    data: 3
+  },
+  {
+    name: 'null作为枚举值',
+    schema: { enum: [null, 'a', 'b'] },
+    data: 'c'
+  },
+  {
+    name: 'undefined作为数据',
+    schema: { type: 'string' },
+    data: undefined
+  },
+  {
+    name: '非常深的嵌套对象',
+    schema: {
+      type: 'object',
+      properties: {
+        level1: {
+          type: 'object',
+          properties: {
+            level2: {
+              type: 'object',
+              properties: {
+                level3: {
+                  type: 'object',
+                  properties: {
+                    value: { type: 'string', enum: ['a', 'b'] }
+                  },
+                  required: ['value']
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    data: { level1: { level2: { level3: { value: 'c' } } } }
+  },
+  {
+    name: '包含特殊字符的属性名',
+    schema: {
+      type: 'object',
+      properties: {
+        'user-name': { type: 'string' },
+        'user.email': { type: 'string' }
+      },
+      additionalProperties: false
+    },
+    data: { 'user-name': 'John', 'user.email': 'john@example.com', 'extra-field': 'value' }
+  },
+  {
+    name: '极大数值',
+    schema: { type: 'number', maximum: 1000 },
+    data: Number.MAX_SAFE_INTEGER
+  },
+  {
+    name: '极小数值',
+    schema: { type: 'number', minimum: -1000 },
+    data: Number.MIN_SAFE_INTEGER
+  },
+  {
+    name: 'NaN值',
+    schema: { type: 'number' },
+    data: NaN
+  },
+  {
+    name: 'Infinity值',
+    schema: { type: 'number', maximum: 1000 },
+    data: Infinity
+  }
+];
+
+let round2Passed = 0;
+let round2Failed = 0;
+
+boundaryTests.forEach(({ name, schema, data }) => {
+  try {
+    const validate = ajv.compile(schema);
+    const valid = validate(data);
+
+    if (!valid && validate.errors) {
+      const formatter = new ErrorFormatter('en-US');
+      const formatted = formatter.formatDetailed(validate.errors);
+
+      const hasTemplateVars = formatted.some(err =>
+        err.message.includes('{{#') || err.message.includes('}}')
+      );
+
+      const hasUndefined = formatted.some(err =>
+        err.message.includes('undefined')
+      );
+
+      if (hasTemplateVars) {
+        console.log(`❌ ${name}: 包含未替换的模板变量`);
+        console.log(`   消息: ${formatted[0].message}`);
+        round2Failed++;
+      } else if (hasUndefined && !name.includes('undefined')) {
+        console.log(`⚠️  ${name}: 包含undefined（可能正常）`);
+        console.log(`   消息: ${formatted[0].message}`);
+        round2Passed++;
+      } else {
+        console.log(`✅ ${name}: 处理正确`);
+        round2Passed++;
+      }
+    }
+  } catch (error) {
+    console.log(`❌ ${name}: 抛出异常 - ${error.message}`);
+    round2Failed++;
+  }
+});
+
+console.log(`\n第二轮结果: ${round2Passed} 通过, ${round2Failed} 失败`);
+
+// ============================================================================
+// 第三轮：多语言一致性测试
+// ============================================================================
+
+console.log('\n' + '='.repeat(80));
+console.log('\n【第三轮】多语言一致性测试\n');
+
+const languages = ['en-US', 'zh-CN', 'es-ES', 'fr-FR', 'ja-JP'];
+const multiLangTests = [
+  {
+    name: 'enum错误',
+    schema: { type: 'string', enum: ['pro', 'basic', 'free'] },
+    data: 'premium'
+  },
+  {
+    name: 'additionalProperties错误',
+    schema: { type: 'object', properties: { name: { type: 'string' } }, additionalProperties: false },
+    data: { name: 'John', age: 30 }
+  },
+  {
+    name: 'required错误',
+    schema: { type: 'object', properties: { name: { type: 'string' } }, required: ['name'] },
+    data: {}
+  },
+  {
+    name: 'type错误',
+    schema: { type: 'number' },
+    data: 'not a number'
+  }
+];
+
+let round3Passed = 0;
+let round3Failed = 0;
+
+multiLangTests.forEach(({ name, schema, data }) => {
+  const validate = ajv.compile(schema);
+  const valid = validate(data);
+
+  if (!valid && validate.errors) {
+    let allLangsPassed = true;
+
+    languages.forEach(lang => {
+      const formatter = new ErrorFormatter(lang);
+      const formatted = formatter.formatDetailed(validate.errors);
+
+      const hasTemplateVars = formatted.some(err =>
+        err.message.includes('{{#') || err.message.includes('}}')
+      );
+
+      if (hasTemplateVars) {
+        console.log(`❌ ${name} (${lang}): 包含未替换的模板变量`);
+        console.log(`   消息: ${formatted[0].message}`);
+        allLangsPassed = false;
+      }
+    });
+
+    if (allLangsPassed) {
+      console.log(`✅ ${name}: 所有语言正确`);
+      round3Passed++;
+    } else {
+      round3Failed++;
+    }
+  }
+});
+
+console.log(`\n第三轮结果: ${round3Passed} 通过, ${round3Failed} 失败`);
+
+// ============================================================================
+// 总结
+// ============================================================================
+
+console.log('\n' + '='.repeat(80));
+console.log('\n【总结】三轮深度检查结果\n');
+
+const totalPassed = round1Passed + round2Passed + round3Passed;
+const totalFailed = round1Failed + round2Failed + round3Failed;
+const totalTests = totalPassed + totalFailed;
+
+console.log(`第一轮（参数映射）: ${round1Passed}/${round1Passed + round1Failed} 通过`);
+console.log(`第二轮（边界情况）: ${round2Passed}/${round2Passed + round2Failed} 通过`);
+console.log(`第三轮（多语言）: ${round3Passed}/${round3Passed + round3Failed} 通过`);
+console.log(`\n总计: ${totalPassed}/${totalTests} 通过`);
+
+if (totalFailed === 0) {
+  console.log('\n✅ 所有检查通过！没有发现问题。');
+} else {
+  console.log(`\n⚠️  发现 ${totalFailed} 个问题需要修复。`);
+  process.exit(1);
+}