schema-dsl 1.0.0 → 1.0.4

package/index.js

@@ -1,11 +1,11 @@
 /**
- * SchemaIO 2.0 - 主入口文件
+ * schema-dsl - 主入口文件
  *
  * 统一的DSL Builder Pattern
  * 简洁 + 强大 = 完美平衡
  *
  * @module schema-dsl
- * @version 2.0.0
+ * @version 1.0.3
  */
 
 // ========== 核心层 ==========
@@ -35,48 +35,44 @@ dsl.if = dsl.DslAdapter.if;
  * 全局配置
  * @param {Object} options - 配置选项
  * @param {Object} options.patterns - 验证规则扩展 (phone, idCard, creditCard)
- * @param {Object} options.phone - 手机号验证规则扩展 (兼容旧版)
+ * @param {string|Object} options.i18n - 多语言配置（目录路径或语言包对象）
  */
 dsl.config = function (options = {}) {
   const patterns = require('./lib/config/patterns');
 
-  // 兼容旧版 options.phone
-  if (options.phone) {
-    Object.assign(patterns.phone, options.phone);
-  }
-
-  // 新版 options.patterns
+  // patterns 配置
   if (options.patterns) {
     if (options.patterns.phone) Object.assign(patterns.phone, options.patterns.phone);
     if (options.patterns.idCard) Object.assign(patterns.idCard, options.patterns.idCard);
     if (options.patterns.creditCard) Object.assign(patterns.creditCard, options.patterns.creditCard);
   }
 
-  // 多语言支持 (v2.1.0)
-  if (options.locales) {
-    if (typeof options.locales === 'object') {
-      Object.keys(options.locales).forEach(locale => {
-        Locale.addLocale(locale, options.locales[locale]);
-      });
-    } else if (typeof options.locales === 'string') {
-      // 支持传入目录路径
-      try {
-        const fs = require('fs');
-        const path = require('path');
-        if (fs.existsSync(options.locales) && fs.statSync(options.locales).isDirectory()) {
-          const files = fs.readdirSync(options.locales);
-          files.forEach(file => {
-            if (file.endsWith('.js') || file.endsWith('.json')) {
-              const localeName = path.basename(file, path.extname(file));
-              const messages = require(path.resolve(options.locales, file));
-              Locale.addLocale(localeName, messages);
-            }
-          });
-        }
-      } catch (e) {
-        console.warn('[SchemaIO] Failed to load locales from path:', e.message);
+  // 多语言支持 (v1.0.1 优化)
+  if (options.i18n) {
+    // 方式 1: 传入目录路径（字符串）
+    if (typeof options.i18n === 'string') {
+      const fs = require('fs');
+      const path = require('path');
+
+      if (fs.existsSync(options.i18n) && fs.statSync(options.i18n).isDirectory()) {
+        const files = fs.readdirSync(options.i18n);
+        files.forEach(file => {
+          if (file.endsWith('.js') || file.endsWith('.json')) {
+            const localeName = path.basename(file, path.extname(file));
+            const messages = require(path.resolve(options.i18n, file));
+            Locale.addLocale(localeName, messages);
+          }
+        });
+      } else {
+        console.warn('[schema-dsl] i18n path does not exist:', options.i18n);
       }
     }
+    // 方式 2: 直接传入对象
+    else if (typeof options.i18n === 'object') {
+      Object.keys(options.i18n).forEach(locale => {
+        Locale.addLocale(locale, options.i18n[locale]);
+      });
+    }
   }
 };
 
@@ -154,7 +150,7 @@ installStringExtensions(dsl);
  *   }
  * });
  */
-dsl.config = function(options = {}) {
+dsl.config = function (options = {}) {
   // ========== 用户语言包配置 ==========
   if (options.i18n) {
     const { localesPath, locales } = options.i18n;
@@ -276,7 +272,7 @@ module.exports = {
   CONSTANTS,
 
   // 版本信息
-  VERSION: '2.1.0'
+  VERSION: '1.0.3'
 };
 
 

package/lib/config/constants.js

@@ -236,7 +236,7 @@ module.exports = {
     DEFAULT_STYLE: 'joi',
 
     // API版本
-    VERSION: '2.0.0'
+    VERSION: '1.0.3'
   },
 
   // ========== 插件配置 ==========

package/lib/config/patterns/common.js

@@ -0,0 +1,47 @@
+/**
+ * 通用验证模式（v1.0.2新增）
+ *
+ * @module lib/config/patterns/common
+ */
+
+module.exports = {
+  /**
+   * 域名验证
+   * 支持格式: example.com, sub.example.com
+   */
+  domain: {
+    pattern: /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/i,
+    key: 'pattern.domain',
+    min: 3,
+    max: 253
+  },
+
+  /**
+   * IP地址验证（IPv4 或 IPv6）
+   * 支持格式: 192.168.1.1, 2001:0db8:85a3::8a2e:0370:7334
+   */
+  ip: {
+    // 同时支持IPv4和IPv6的复合正则
+    pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/,
+    key: 'pattern.ip'
+  },
+
+  /**
+   * Base64编码验证
+   * 支持标准Base64格式（带或不带padding）
+   */
+  base64: {
+    pattern: /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,
+    key: 'pattern.base64'
+  },
+
+  /**
+   * JWT令牌验证
+   * 支持格式: header.payload.signature
+   */
+  jwt: {
+    pattern: /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/,
+    key: 'pattern.jwt'
+  }
+};
+

package/lib/config/patterns/index.js

@@ -4,5 +4,6 @@ module.exports = {
   creditCard: require('./creditCard'),
   licensePlate: require('./licensePlate'),
   postalCode: require('./postalCode'),
-  passport: require('./passport')
+  passport: require('./passport'),
+  common: require('./common')  // v1.0.2新增
 };