@faasjs/http 0.0.2-beta.346 → 0.0.2-beta.350

package/dist/index.d.ts

@@ -78,12 +78,14 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
     };
 }
 
+declare type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
 declare type ValidatorRuleOptions = {
-    type?: 'string' | 'number' | 'boolean' | 'object' | 'array';
+    type?: ValidatorRuleOptionsType;
     required?: boolean;
     in?: any[];
     default?: any;
     config?: Partial<ValidatorOptions>;
+    regexp?: RegExp;
 };
 declare type ValidatorOptions<Content = Record<string, any>> = {
     whitelist?: 'error' | 'ignore';

package/dist/index.js

@@ -1,8 +1,16 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,12 +23,96 @@ var __reExport = (target, module2, copyDefault, desc) => {
   }
   return target;
 };
+var __toESM = (module2, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+};
 var __toCommonJS = /* @__PURE__ */ ((cache) => {
   return (module2, temp) => {
     return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
   };
 })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
 
+// ../../node_modules/tsup/assets/cjs_shims.js
+var init_cjs_shims = __esm({
+  "../../node_modules/tsup/assets/cjs_shims.js"() {
+  }
+});
+
+// ../deep_merge/dist/index.js
+var require_dist = __commonJS({
+  "../deep_merge/dist/index.js"(exports, module2) {
+    init_cjs_shims();
+    var __defProp2 = Object.defineProperty;
+    var __defProps = Object.defineProperties;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __propIsEnum = Object.prototype.propertyIsEnumerable;
+    var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    var __spreadValues = (a, b) => {
+      for (var prop in b || (b = {}))
+        if (__hasOwnProp2.call(b, prop))
+          __defNormalProp(a, prop, b[prop]);
+      if (__getOwnPropSymbols)
+        for (var prop of __getOwnPropSymbols(b)) {
+          if (__propIsEnum.call(b, prop))
+            __defNormalProp(a, prop, b[prop]);
+        }
+      return a;
+    };
+    var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+    var __markAsModule2 = (target) => __defProp2(target, "__esModule", { value: true });
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __reExport2 = (target, module22, copyDefault, desc) => {
+      if (module22 && typeof module22 === "object" || typeof module22 === "function") {
+        for (let key of __getOwnPropNames2(module22))
+          if (!__hasOwnProp2.call(target, key) && (copyDefault || key !== "default"))
+            __defProp2(target, key, { get: () => module22[key], enumerable: !(desc = __getOwnPropDesc2(module22, key)) || desc.enumerable });
+      }
+      return target;
+    };
+    var __toCommonJS2 = /* @__PURE__ */ ((cache) => {
+      return (module22, temp) => {
+        return cache && cache.get(module22) || (temp = __reExport2(__markAsModule2({}), module22, 1), cache && cache.set(module22, temp), temp);
+      };
+    })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+    var src_exports2 = {};
+    __export2(src_exports2, {
+      deepMerge: () => deepMerge3
+    });
+    var shouldMerge = function(item) {
+      const type = Object.prototype.toString.call(item);
+      return type === "[object Object]" || type === "[object Array]";
+    };
+    function deepMerge3(...sources) {
+      let acc = /* @__PURE__ */ Object.create(null);
+      for (const source of sources)
+        if (source instanceof Array) {
+          if (!(acc instanceof Array))
+            acc = [];
+          acc = [...new Set(source.concat(...acc))];
+        } else if (shouldMerge(source))
+          for (const [key, value] of Object.entries(source)) {
+            let val;
+            if (shouldMerge(value))
+              val = deepMerge3(acc[key], value);
+            else
+              val = value;
+            acc = __spreadProps(__spreadValues({}, acc), {
+              [key]: val
+            });
+          }
+      return acc;
+    }
+    module2.exports = __toCommonJS2(src_exports2);
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -32,11 +124,16 @@ __export(src_exports, {
   Validator: () => Validator,
   useHttp: () => useHttp
 });
+init_cjs_shims();
 var import_func = require("@faasjs/func");
-var import_deep_merge2 = require("@faasjs/deep_merge");
+var import_deep_merge2 = __toESM(require_dist());
 var import_logger = require("@faasjs/logger");
 
+// src/cookie.ts
+init_cjs_shims();
+
 // src/session.ts
+init_cjs_shims();
 var import_crypto = require("crypto");
 var Session = class {
   constructor(cookie, config) {
@@ -113,7 +210,7 @@ var Session = class {
 };
 
 // src/cookie.ts
-var import_deep_merge = require("@faasjs/deep_merge");
+var import_deep_merge = __toESM(require_dist());
 var Cookie = class {
   constructor(config) {
     this.config = (0, import_deep_merge.deepMerge)({
@@ -179,6 +276,7 @@ var Cookie = class {
 };
 
 // src/validator.ts
+init_cjs_shims();
 var Validator = class {
   constructor(config, logger) {
     this.paramsConfig = config.params;
@@ -282,6 +380,16 @@ var Validator = class {
               throw error;
             }
           }
+        if (rule.regexp && (rule.type === "string" || !rule.type) && !rule.regexp.test(value)) {
+          const error = Error(`[${type}] ${baseKey}${key} must match ${rule.regexp}.`);
+          console.log("--------->22222");
+          if (config.onError) {
+            const res = config.onError(`${type}.rule.regexp`, `${baseKey}${key}`, value);
+            if (res)
+              throw new HttpError(res);
+          }
+          throw error;
+        }
         if (rule.in && !rule.in.includes(value)) {
           const error = Error(`[${type}] ${baseKey}${key} must be in ${rule.in.join(", ")}.`);
           if (config.onError) {

package/dist/index.mjs

@@ -1,3 +1,10 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -5,15 +12,120 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __reExport = (target, module, copyDefault, desc) => {
+  if (module && typeof module === "object" || typeof module === "function") {
+    for (let key of __getOwnPropNames(module))
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
+        __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
+  }
+  return target;
+};
+var __toESM = (module, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", !isNodeMode && module && module.__esModule ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
+};
+
+// ../../node_modules/tsup/assets/esm_shims.js
+import { fileURLToPath } from "url";
+import path from "path";
+var init_esm_shims = __esm({
+  "../../node_modules/tsup/assets/esm_shims.js"() {
+  }
+});
+
+// ../deep_merge/dist/index.js
+var require_dist = __commonJS({
+  "../deep_merge/dist/index.js"(exports, module) {
+    init_esm_shims();
+    var __defProp2 = Object.defineProperty;
+    var __defProps = Object.defineProperties;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __propIsEnum = Object.prototype.propertyIsEnumerable;
+    var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    var __spreadValues = (a, b) => {
+      for (var prop in b || (b = {}))
+        if (__hasOwnProp2.call(b, prop))
+          __defNormalProp(a, prop, b[prop]);
+      if (__getOwnPropSymbols)
+        for (var prop of __getOwnPropSymbols(b)) {
+          if (__propIsEnum.call(b, prop))
+            __defNormalProp(a, prop, b[prop]);
+        }
+      return a;
+    };
+    var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+    var __markAsModule2 = (target) => __defProp2(target, "__esModule", { value: true });
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __reExport2 = (target, module2, copyDefault, desc) => {
+      if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+        for (let key of __getOwnPropNames2(module2))
+          if (!__hasOwnProp2.call(target, key) && (copyDefault || key !== "default"))
+            __defProp2(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc2(module2, key)) || desc.enumerable });
+      }
+      return target;
+    };
+    var __toCommonJS = /* @__PURE__ */ ((cache) => {
+      return (module2, temp) => {
+        return cache && cache.get(module2) || (temp = __reExport2(__markAsModule2({}), module2, 1), cache && cache.set(module2, temp), temp);
+      };
+    })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+    var src_exports = {};
+    __export(src_exports, {
+      deepMerge: () => deepMerge3
+    });
+    var shouldMerge = function(item) {
+      const type = Object.prototype.toString.call(item);
+      return type === "[object Object]" || type === "[object Array]";
+    };
+    function deepMerge3(...sources) {
+      let acc = /* @__PURE__ */ Object.create(null);
+      for (const source of sources)
+        if (source instanceof Array) {
+          if (!(acc instanceof Array))
+            acc = [];
+          acc = [...new Set(source.concat(...acc))];
+        } else if (shouldMerge(source))
+          for (const [key, value] of Object.entries(source)) {
+            let val;
+            if (shouldMerge(value))
+              val = deepMerge3(acc[key], value);
+            else
+              val = value;
+            acc = __spreadProps(__spreadValues({}, acc), {
+              [key]: val
+            });
+          }
+      return acc;
+    }
+    module.exports = __toCommonJS(src_exports);
+  }
+});
 
 // src/index.ts
+init_esm_shims();
+var import_deep_merge2 = __toESM(require_dist());
 import {
   usePlugin
 } from "@faasjs/func";
-import { deepMerge as deepMerge2 } from "@faasjs/deep_merge";
 import { Logger } from "@faasjs/logger";
 
+// src/cookie.ts
+init_esm_shims();
+
 // src/session.ts
+init_esm_shims();
 import {
   randomBytes,
   pbkdf2Sync,
@@ -96,10 +208,10 @@ var Session = class {
 };
 
 // src/cookie.ts
-import { deepMerge } from "@faasjs/deep_merge";
+var import_deep_merge = __toESM(require_dist());
 var Cookie = class {
   constructor(config) {
-    this.config = deepMerge({
+    this.config = (0, import_deep_merge.deepMerge)({
       path: "/",
       expires: 31536e3,
       secure: true,
@@ -162,6 +274,7 @@ var Cookie = class {
 };
 
 // src/validator.ts
+init_esm_shims();
 var Validator = class {
   constructor(config, logger) {
     this.paramsConfig = config.params;
@@ -265,6 +378,16 @@ var Validator = class {
               throw error;
             }
           }
+        if (rule.regexp && (rule.type === "string" || !rule.type) && !rule.regexp.test(value)) {
+          const error = Error(`[${type}] ${baseKey}${key} must match ${rule.regexp}.`);
+          console.log("--------->22222");
+          if (config.onError) {
+            const res = config.onError(`${type}.rule.regexp`, `${baseKey}${key}`, value);
+            if (res)
+              throw new HttpError(res);
+          }
+          throw error;
+        }
         if (rule.in && !rule.in.includes(value)) {
           const error = Error(`[${type}] ${baseKey}${key} must be in ${rule.in.join(", ")}.`);
           if (config.onError) {
@@ -336,7 +459,7 @@ var Http = class {
     await next();
     this.logger.debug("\u7EC4\u88C5\u7F51\u5173\u914D\u7F6E");
     this.logger.debug("%j", data);
-    const config = data.config.plugins ? deepMerge2(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
+    const config = data.config.plugins ? (0, import_deep_merge2.deepMerge)(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
     if (!config.config.path) {
       config.config.path = "/" + ((_a = data.name) == null ? void 0 : _a.replace(/_/g, "/").replace(/\/index$/, ""));
       if (config.config.path === "/index")
@@ -355,7 +478,7 @@ var Http = class {
   async onMount(data, next) {
     this.logger.debug("[onMount] merge config");
     if (data.config.plugins && data.config.plugins[this.name || this.type])
-      this.config = deepMerge2(this.config, data.config.plugins[this.name || this.type].config);
+      this.config = (0, import_deep_merge2.deepMerge)(this.config, data.config.plugins[this.name || this.type].config);
     this.logger.debug("[onMount] prepare cookie & session");
     this.cookie = new Cookie(this.config.cookie || {});
     this.session = this.cookie.session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.2-beta.346",
+  "version": "0.0.2-beta.350",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/func": "^0.0.2-beta.346",
-    "@faasjs/logger": "^0.0.2-beta.346"
+    "@faasjs/func": "^0.0.2-beta.350",
+    "@faasjs/logger": "^0.0.2-beta.350"
   },
   "devDependencies": {
     "tsup": "*",