schema-dsl 1.1.1 → 1.1.2

package/lib/adapters/DslAdapter.js

@@ -268,12 +268,59 @@ class DslAdapter {
    * @param {string} baseType - 基础类型
    * @param {string} constraint - 约束字符串
    * @returns {Object} 约束对象
+   *
+   * @example
+   * // 比较运算符 (v1.2.0+)
+   * _parseConstraint('number', '>0')     // { exclusiveMinimum: 0 }
+   * _parseConstraint('number', '>=18')   // { minimum: 18 }
+   * _parseConstraint('number', '<100')   // { exclusiveMaximum: 100 }
+   * _parseConstraint('number', '<=100')  // { maximum: 100 }
+   * _parseConstraint('number', '=100')   // { enum: [100] }
+   * _parseConstraint('number', '>0.5')   // { exclusiveMinimum: 0.5 } 支持小数
    */
   static _parseConstraint(baseType, constraint) {
     if (!constraint) return {};
 
     const result = {};
 
+    // ========== 比较运算符（v1.1.2新增，最高优先级）==========
+    if (baseType === 'number' || baseType === 'integer') {
+      // 1. 大于等于: >=18, >=-10 (支持负数)
+      const gteMatch = constraint.match(/^>=(-?\d+(?:\.\d+)?)$/);
+      if (gteMatch) {
+        result.minimum = parseFloat(gteMatch[1]);
+        return result;
+      }
+
+      // 2. 小于等于: <=100, <=-10 (支持负数)
+      const lteMatch = constraint.match(/^<=(-?\d+(?:\.\d+)?)$/);
+      if (lteMatch) {
+        result.maximum = parseFloat(lteMatch[1]);
+        return result;
+      }
+
+      // 3. 大于: >0, >-10 (不包括边界值，支持负数)
+      const gtMatch = constraint.match(/^>(-?\d+(?:\.\d+)?)$/);
+      if (gtMatch) {
+        result.exclusiveMinimum = parseFloat(gtMatch[1]);
+        return result;
+      }
+
+      // 4. 小于: <100, <-10 (不包括边界值，支持负数)
+      const ltMatch = constraint.match(/^<(-?\d+(?:\.\d+)?)$/);
+      if (ltMatch) {
+        result.exclusiveMaximum = parseFloat(ltMatch[1]);
+        return result;
+      }
+
+      // 5. 等于: =100, =-10 (支持负数)
+      const eqMatch = constraint.match(/^=(-?\d+(?:\.\d+)?)$/);
+      if (eqMatch) {
+        result.enum = [parseFloat(eqMatch[1])];
+        return result;
+      }
+    }
+
     // 枚举: value1|value2|value3 （优先检查，避免被数字范围误判）
     if (constraint.includes('|') && !/^\d+-\d+$/.test(constraint)) {
       result.enum = constraint.split('|').map(v => v.trim());
@@ -281,7 +328,8 @@ class DslAdapter {
     }
 
     // 范围约束: min-max 或 min- 或 -max
-    const rangeMatch = constraint.match(/^(\d*)-(\d*)$/);
+    // 支持小数: 0.5-99.9
+    const rangeMatch = constraint.match(/^(\d*\.?\d*)-(\d*\.?\d*)$/);
     if (rangeMatch) {
       const [, min, max] = rangeMatch;
       if (baseType === 'string') {
@@ -291,20 +339,21 @@ class DslAdapter {
         if (min) result.minItems = parseInt(min, 10);
         if (max) result.maxItems = parseInt(max, 10);
       } else {
-        if (min) result.minimum = parseInt(min, 10);
-        if (max) result.maximum = parseInt(max, 10);
+        if (min) result.minimum = parseFloat(min);
+        if (max) result.maximum = parseFloat(max);
       }
       return result;
     }
 
     // 单个约束: min, max
-    const singleMatch = constraint.match(/^(\d+)$/);
+    // 支持小数: 99.99
+    const singleMatch = constraint.match(/^(\d+(?:\.\d+)?)$/);
     if (singleMatch) {
-      const value = parseInt(singleMatch[1], 10);
+      const value = parseFloat(singleMatch[1]);
       if (baseType === 'string') {
-        result.maxLength = value;
+        result.maxLength = Math.floor(value);
       } else if (baseType === 'array') {
-        result.maxItems = value;
+        result.maxItems = Math.floor(value);
       } else {
         result.maximum = value;
       }

package/lib/core/DslBuilder.js

@@ -383,12 +383,58 @@ class DslBuilder {
   /**
    * 解析约束
    * @private
+   *
+   * @example
+   * // 比较运算符 (v1.2.0+)
+   * _parseConstraint('number', '>0')     // { exclusiveMinimum: 0 }
+   * _parseConstraint('number', '>=18')   // { minimum: 18 }
+   * _parseConstraint('number', '<100')   // { exclusiveMaximum: 100 }
+   * _parseConstraint('number', '<=100')  // { maximum: 100 }
+   * _parseConstraint('number', '=100')   // { enum: [100] }
    */
   _parseConstraint(type, constraint) {
     const result = {};
 
     if (type === 'string' || type === 'number' || type === 'integer') {
-      // 范围约束: min-max
+      // ========== 比较运算符（v1.1.2新增，仅number/integer，最高优先级）==========
+      if (type === 'number' || type === 'integer') {
+        // 1. 大于等于: >=18, >=-10 (支持负数)
+        const gteMatch = constraint.match(/^>=(-?\d+(?:\.\d+)?)$/);
+        if (gteMatch) {
+          result.minimum = parseFloat(gteMatch[1]);
+          return result;
+        }
+
+        // 2. 小于等于: <=100, <=-10 (支持负数)
+        const lteMatch = constraint.match(/^<=(-?\d+(?:\.\d+)?)$/);
+        if (lteMatch) {
+          result.maximum = parseFloat(lteMatch[1]);
+          return result;
+        }
+
+        // 3. 大于: >0, >-10 (不包括边界值，支持负数)
+        const gtMatch = constraint.match(/^>(-?\d+(?:\.\d+)?)$/);
+        if (gtMatch) {
+          result.exclusiveMinimum = parseFloat(gtMatch[1]);
+          return result;
+        }
+
+        // 4. 小于: <100, <-10 (不包括边界值，支持负数)
+        const ltMatch = constraint.match(/^<(-?\d+(?:\.\d+)?)$/);
+        if (ltMatch) {
+          result.exclusiveMaximum = parseFloat(ltMatch[1]);
+          return result;
+        }
+
+        // 5. 等于: =100, =-10 (支持负数)
+        const eqMatch = constraint.match(/^=(-?\d+(?:\.\d+)?)$/);
+        if (eqMatch) {
+          result.enum = [parseFloat(eqMatch[1])];
+          return result;
+        }
+      }
+
+      // ========== 范围约束: min-max ==========
       if (constraint.includes('-')) {
         const [min, max] = constraint.split('-').map(v => v.trim());
 

package/package.json

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