hono 2.3.1 → 2.4.0

package/dist/validator/validator.js

@@ -0,0 +1,406 @@
+// src/validator/validator.ts
+import { JSONPathCopy } from "./../utils/json.js";
+import { rule } from "./rule.js";
+import { sanitizer } from "./sanitizer.js";
+var VObjectBase = class {
+  constructor(container, key) {
+    this.keys = [];
+    this._isOptional = false;
+    this.getValidators = () => {
+      const validators = [];
+      const thisKeys = [];
+      Object.assign(thisKeys, this.keys);
+      const walk = (container, keys, isOptional) => {
+        for (const v of Object.values(container)) {
+          if (v instanceof VArray || v instanceof VObject) {
+            isOptional || (isOptional = v._isOptional);
+            keys.push(...v.keys);
+            walk(v.container, keys, isOptional);
+            const tmp = [];
+            Object.assign(tmp, thisKeys);
+            keys = tmp;
+          } else if (v instanceof VBase) {
+            if (isOptional)
+              v.isOptional();
+            v.baseKeys.push(...keys);
+            validators.push(v);
+          }
+        }
+      };
+      walk(this.container, this.keys, this._isOptional);
+      return validators;
+    };
+    this.container = container;
+    if (this instanceof VArray) {
+      this.keys.push(key, "[*]");
+    } else if (this instanceof VObject) {
+      this.keys.push(key);
+    }
+  }
+  isOptional() {
+    this._isOptional = true;
+    return this;
+  }
+};
+var VObject = class extends VObjectBase {
+  constructor(container, key) {
+    super(container, key);
+  }
+};
+var VArray = class extends VObjectBase {
+  constructor(container, key) {
+    super(container, key);
+    this.type = "array";
+  }
+};
+var Validator = class {
+  constructor() {
+    this.isArray = false;
+    this.query = (key) => new VString({ target: "query", key });
+    this.queries = (key) => new VStringArray({ target: "queries", key });
+    this.header = (key) => new VString({ target: "header", key });
+    this.body = (key) => new VString({ target: "body", key });
+    this.json = (key) => {
+      if (this.isArray) {
+        return new VStringArray({ target: "json", key });
+      } else {
+        return new VString({ target: "json", key });
+      }
+    };
+    this.array = (path, validator) => {
+      this.isArray = true;
+      const res = validator(this);
+      const arr = new VArray(res, path);
+      return arr;
+    };
+    this.object = (path, validator) => {
+      this.isArray = false;
+      const res = validator(this);
+      const obj = new VObject(res, path);
+      return obj;
+    };
+  }
+};
+var VBase = class {
+  constructor(options) {
+    this.baseKeys = [];
+    this._nested = () => this.baseKeys.length ? true : false;
+    this.addSanitizer = (sanitizer2) => {
+      this.sanitizers.push(sanitizer2);
+      return this;
+    };
+    this.message = (text) => {
+      const len = this.rules.length;
+      if (len >= 1) {
+        this.rules[len - 1].customMessage = text;
+      }
+      return this;
+    };
+    this.isRequired = () => {
+      return this.addRule("isRequired", (value) => {
+        if (value !== void 0 && value !== null && value !== "")
+          return true;
+        return false;
+      });
+    };
+    this.isOptional = () => {
+      this._optional = true;
+      return this.addRule("isOptional", () => true);
+    };
+    this.isEqual = (comparison) => {
+      return this.addRule("isEqual", (value) => {
+        return value === comparison;
+      });
+    };
+    this.asNumber = () => {
+      const newVNumber = new VNumber({ ...this, type: "number" });
+      if (this.isArray)
+        return newVNumber.asArray();
+      return newVNumber;
+    };
+    this.asBoolean = () => {
+      const newVBoolean = new VBoolean({ ...this, type: "boolean" });
+      if (this.isArray)
+        return newVBoolean.asArray();
+      return newVBoolean;
+    };
+    this.validate = async (req) => {
+      let value = void 0;
+      let jsonData = void 0;
+      if (this.target === "query") {
+        value = req.query(this.key);
+      }
+      if (this.target === "queries") {
+        value = req.queries(this.key);
+      }
+      if (this.target === "header") {
+        value = req.header(this.key);
+      }
+      if (this.target === "body") {
+        const body = await req.parseBody();
+        value = body[this.key];
+      }
+      if (this.target === "json") {
+        if (this._nested()) {
+          this.key = `${this.baseKeys.join(".")}.${this.key}`;
+        }
+        let obj = {};
+        try {
+          obj = await req.json();
+        } catch (e) {
+          throw new Error("Malformed JSON in request body");
+        }
+        const dst = {};
+        value = JSONPathCopy(obj, dst, this.key);
+        if (this._nested())
+          jsonData = dst;
+      }
+      const results = [];
+      let typeRule = this.rules.shift();
+      for (const rule2 of this.rules) {
+        if (rule2.type === "type") {
+          typeRule = rule2;
+        } else if (rule2.type === "value") {
+          const result = this.validateRule(rule2, value);
+          result.jsonData || (result.jsonData = jsonData);
+          results.push(result);
+        }
+      }
+      if (typeRule) {
+        const typeResult = this.validateRule(typeRule, value);
+        typeResult.jsonData || (typeResult.jsonData = jsonData);
+        results.unshift(typeResult);
+        this.rules.unshift(typeRule);
+      }
+      return results;
+    };
+    this.validateType = (value) => {
+      if (this.isArray) {
+        if (!Array.isArray(value)) {
+          return false;
+        }
+        for (const val of value) {
+          if (typeof val === "undefined" && this._nested()) {
+            value.pop();
+          }
+          for (const val2 of value) {
+            if (typeof val2 !== this.type) {
+              if (!this._optional || typeof val2 !== "undefined")
+                return false;
+            }
+          }
+        }
+      } else {
+        if (typeof value !== this.type) {
+          if (this._optional && (typeof value === "undefined" || Array.isArray(value))) {
+          } else {
+            return false;
+          }
+        }
+      }
+      return true;
+    };
+    this.validateValue = (func, value) => {
+      if (this._optional && typeof value === "undefined")
+        return true;
+      if (Array.isArray(value)) {
+        if (value.length === 0 && !this._optional)
+          return false;
+        for (const sanitizer2 of this.sanitizers) {
+          value = value.map((innerVal) => sanitizer2(innerVal));
+        }
+        for (const val of value) {
+          if (!func(val)) {
+            return false;
+          }
+        }
+        return true;
+      } else {
+        for (const sanitizer2 of this.sanitizers) {
+          value = sanitizer2(value);
+        }
+        if (!func(value)) {
+          return false;
+        }
+        return true;
+      }
+    };
+    this.getMessage = (opts) => {
+      let keyText;
+      const valueText = Array.isArray(opts.value) ? `${opts.value.map(
+        (val) => val === void 0 ? "undefined" : typeof val === "string" ? `"${val}"` : val
+      ).join(", ")}` : opts.value;
+      switch (this.target) {
+        case "query":
+          keyText = `the query parameter "${this.key}"`;
+          break;
+        case "queries":
+          keyText = `the query parameters "${this.key}"`;
+          break;
+        case "header":
+          keyText = `the request header "${this.key}"`;
+          break;
+        case "body":
+          keyText = `the request body "${this.key}"`;
+          break;
+        case "json":
+          keyText = `the JSON body "${this.key}"`;
+          break;
+      }
+      return `Invalid Value [${valueText}]: ${keyText} is invalid - ${opts.ruleName}`;
+    };
+    this.target = options.target;
+    this.key = options.key;
+    this.type = options.type || "string";
+    this.rules = [
+      {
+        name: this.getTypeRuleName(),
+        type: "type",
+        func: this.validateType
+      }
+    ];
+    this.sanitizers = [];
+    this._optional = false;
+    this.isArray = options.isArray || false;
+  }
+  addRule(arg, func) {
+    if (typeof arg === "string" && func) {
+      this.rules.push({ name: arg, func, type: "value" });
+    } else if (arg instanceof Function) {
+      this.rules.push({ name: arg.name, func: arg, type: "value" });
+    }
+    return this;
+  }
+  get(value) {
+    const len = this.rules.length;
+    if (len > 0) {
+      this.rules[this.rules.length - 1].customMessage = value;
+    }
+    return this;
+  }
+  getTypeRuleName() {
+    const prefix = "should be";
+    return this.isArray ? `${prefix} "${this.type}[]"` : `${prefix} "${this.type}"`;
+  }
+  validateRule(rule2, value) {
+    let isValid = false;
+    if (this._nested() && this.target != "json") {
+      isValid = false;
+    } else if (rule2.type === "value") {
+      isValid = this.validateValue(rule2.func, value);
+    } else if (rule2.type === "type") {
+      isValid = this.validateType(value);
+    }
+    const message = isValid ? void 0 : rule2.customMessage || this.getMessage({ ruleName: rule2.name, value });
+    const result = {
+      isValid,
+      message,
+      target: this.target,
+      key: this.key,
+      value,
+      ruleName: rule2.name,
+      ruleType: rule2.type
+    };
+    return result;
+  }
+};
+var VString = class extends VBase {
+  constructor(options) {
+    super(options);
+    this.asArray = () => {
+      return new VStringArray(this);
+    };
+    this.isEmpty = (options = { ignore_whitespace: false }) => {
+      return this.addRule("isEmpty", (value) => rule.isEmpty(value, options));
+    };
+    this.isLength = (options, arg2) => {
+      return this.addRule("isLength", (value) => rule.isLength(value, options, arg2));
+    };
+    this.isAlpha = () => {
+      return this.addRule("isAlpha", (value) => rule.isAlpha(value));
+    };
+    this.isNumeric = () => {
+      return this.addRule("isNumeric", (value) => rule.isNumeric(value));
+    };
+    this.contains = (elem, options = {
+      ignoreCase: false,
+      minOccurrences: 1
+    }) => {
+      return this.addRule("contains", (value) => rule.contains(value, elem, options));
+    };
+    this.isIn = (options) => {
+      return this.addRule("isIn", (value) => rule.isIn(value, options));
+    };
+    this.match = (regExp) => {
+      return this.addRule("match", (value) => rule.match(value, regExp));
+    };
+    this.trim = () => {
+      return this.addSanitizer((value) => sanitizer.trim(value));
+    };
+    this.type = "string";
+  }
+};
+var VNumber = class extends VBase {
+  constructor(options) {
+    super(options);
+    this.asArray = () => {
+      return new VNumberArray(this);
+    };
+    this.isGte = (min) => {
+      return this.addRule("isGte", (value) => rule.isGte(value, min));
+    };
+    this.isLte = (min) => {
+      return this.addRule("isLte", (value) => rule.isLte(value, min));
+    };
+    this.type = "number";
+  }
+};
+var VBoolean = class extends VBase {
+  constructor(options) {
+    super(options);
+    this.asArray = () => {
+      return new VBooleanArray(this);
+    };
+    this.isTrue = () => {
+      return this.addRule("isTrue", (value) => rule.isTrue(value));
+    };
+    this.isFalse = () => {
+      return this.addRule("isFalse", (value) => rule.isFalse(value));
+    };
+    this.type = "boolean";
+  }
+};
+var VNumberArray = class extends VNumber {
+  constructor(options) {
+    super(options);
+    this.isArray = true;
+    this.rules[0].name = this.getTypeRuleName();
+  }
+};
+var VStringArray = class extends VString {
+  constructor(options) {
+    super(options);
+    this.isArray = true;
+    this.rules[0].name = this.getTypeRuleName();
+  }
+};
+var VBooleanArray = class extends VBoolean {
+  constructor(options) {
+    super(options);
+    this.isArray = true;
+    this.rules[0].name = this.getTypeRuleName();
+  }
+};
+export {
+  VArray,
+  VBase,
+  VBoolean,
+  VBooleanArray,
+  VNumber,
+  VNumberArray,
+  VObject,
+  VObjectBase,
+  VString,
+  VStringArray,
+  Validator
+};

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "hono",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Ultrafast web framework for Cloudflare Workers.",
-  "main": "dist/index.js",
+  "main": "dist/cjs/index.js",
+  "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -13,11 +14,12 @@
     "test:deno": "deno test --allow-read deno_test",
     "test:bun": "bun wiptest --jsx-import-source ../src/middleware/jsx/jsx-dev-runtime bun_test/index.test.tsx",
     "test:all": "yarn test && yarn test:deno && yarn test:bun",
-    "lint": "eslint --ext js,ts src .eslintrc.js",
-    "lint:fix": "eslint --ext js,ts src .eslintrc.js --fix",
+    "lint": "eslint --ext js,ts src .eslintrc.cjs",
+    "lint:fix": "eslint --ext js,ts src .eslintrc.cjs --fix",
     "denoify": "rimraf deno_dist && denoify && rimraf 'deno_dist/**/*.test.ts'",
-    "build": "rimraf dist && tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
-    "watch": "tsc --project tsconfig.build.json -w",
+    "copy:package.cjs.json": "cp ./package.cjs.json ./dist/cjs/package.json",
+    "build": "rimraf dist && tsx ./build.ts && yarn copy:package.cjs.json",
+    "watch": "rimraf dist && tsx ./build.ts --watch && yarn copy:package.cjs.json",
     "prerelease": "yarn denoify && yarn test:deno && yarn build",
     "release": "np"
   },
@@ -91,7 +93,7 @@
       "require": "./dist/cjs/middleware/serve-static/bun.js"
     },
     "./serve-static.module": {
-      "import": "./dist/middleware/serve-static/module.mjs"
+      "import": "./dist/middleware/serve-static/module.js"
     },
     "./validator": {
       "import": "./dist/middleware/validator/index.js",
@@ -173,7 +175,7 @@
         "./dist/middleware/serve-static/bun.d.ts"
       ],
       "serve-static.module": [
-        "./dist/middleware/serve-static/module.d.mts"
+        "./dist/middleware/serve-static/module.d.ts"
       ],
       "validator": [
         "./dist/middleware/validator"
@@ -226,12 +228,15 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^3.16.0",
     "@types/crypto-js": "^4.1.1",
+    "@types/glob": "^8.0.0",
     "@types/jest": "^29.0.2",
     "@types/node": "^17.0.29",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
+    "arg": "^5.0.2",
     "crypto-js": "^4.1.1",
     "denoify": "^1.1.1",
+    "esbuild": "^0.15.12",
     "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-define-config": "^1.4.0",
@@ -247,6 +252,7 @@
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.0.1",
+    "tsx": "^3.11.0",
     "typescript": "^4.8.3"
   },
   "engines": {

package/dist/cjs/middleware/validator/rule.js

@@ -1,66 +0,0 @@
-"use strict";
-// Some validation rules is are based on Validator.js
-// Validator.js
-// License (MIT)
-// Copyright (c) 2018 Chris O'Hara <cohara87@gmail.com>
-// https://github.com/validatorjs/validator.js
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rule = void 0;
-exports.rule = {
-    // string
-    isEmpty(value, options = { ignore_whitespace: false }) {
-        return (options.ignore_whitespace ? value.trim().length : value.length) === 0;
-    },
-    isLength: (value, options, arg2) => {
-        let min;
-        let max;
-        if (typeof options === 'object') {
-            min = options.min || 0;
-            max = options.max;
-        }
-        else {
-            // backwards compatibility: isLength(str, min [, max])
-            min = options || 0;
-            max = arg2;
-        }
-        const presentationSequences = value.match(/(\uFE0F|\uFE0E)/g) || [];
-        const surrogatePairs = value.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g) || [];
-        const len = value.length - presentationSequences.length - surrogatePairs.length;
-        return len >= min && (typeof max === 'undefined' || len <= max);
-    },
-    isAlpha: (value) => {
-        return /^[A-Z]+$/i.test(value);
-    },
-    isNumeric: (value) => {
-        return /^[0-9]+$/.test(value);
-    },
-    contains: (value, elem, options = {
-        ignoreCase: false,
-        minOccurrences: 1,
-    }) => {
-        options.ignoreCase || (options.ignoreCase = false);
-        options.minOccurrences || (options.minOccurrences = 1);
-        if (options.ignoreCase) {
-            return value.toLowerCase().split(elem.toLowerCase()).length > options.minOccurrences;
-        }
-        return value.split(elem).length > options.minOccurrences;
-    },
-    isIn: (value, options) => {
-        if (typeof options === 'object') {
-            for (const elem of options) {
-                if (elem === value)
-                    return true;
-            }
-        }
-        return false;
-    },
-    match: (value, regExp) => {
-        return regExp.test(value);
-    },
-    // number
-    isGte: (value, min) => min <= value,
-    isLte: (value, max) => value <= max,
-    // boolean
-    isTrue: (value) => value === true,
-    isFalse: (value) => value === false,
-};

package/dist/cjs/middleware/validator/sanitizer.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sanitizer = void 0;
-exports.sanitizer = {
-    trim: (value) => value.trim(),
-};