peryl 1.5.31 → 1.5.32

package/dist/browser-esmodule/cache.js

@@ -49,10 +49,7 @@ function $7efa2fa466d7ec34$export$69a3209f1a06c04d(func, delay = 300) {
             }
             const res = data[key][0];
             Object.keys(data).forEach((key)=>{
-                if (data[key][2] + delay < now) {
-                    delete data[key];
-                    console.log("delete", key);
-                }
+                if (data[key][2] + delay < now) delete data[key];
             });
             return res;
         });

package/dist/browser-esmodule/cache.js.map

@@ -1 +1 @@
-{"mappings":";;;;;;;A,I,kC,a,U,S,I,S,O,E,U,E,C,E,S,E;I,S,M,K,E;Q,O,iB,I,Q,I,E,S,O,E;Y,Q;Q,E;I;I,O,I,C,K,C,I,O,C,E,S,O,E,M,E;Q,S,U,K,E;Y,I;gB,K,U,I,C;Y,E,O,G;gB,O;Y;Q;Q,S,S,K,E;Y,I;gB,K,S,C,Q,C;Y,E,O,G;gB,O;Y;Q;Q,S,K,M,E;Y,O,I,G,Q,O,K,I,M,O,K,E,I,C,W,S;Q;Q,K,A,C,Y,U,K,C,S,c,E,C,E,I;I;A;AAGM,SAAU,0CAA2B,IAAO,EAAE,QAAQ,GAAG,EAA/D;IAEI,IAAI,OAA6C,CAAA;IACjD,OAAO,SAA2B,GAAG,IAAU,EAA/C;Q,O,gC,I,E,K,G,K,G,Y;YACI,MAAM,MAAM,KAAK,SAAS,CAAC;YAC3B,MAAM,SAAS,IAAI,CAAC,IAAI;YACxB,MAAM,MAAM,KAAK,GAAG;YACpB,IAAI,CAAC,UAAU,MAAM,MAAM,CAAC,EAAE,GAAG,OAAO;gBACpC,MAAM,QAAQ,MAAM,KAAK,KAAK,CAAC,IAAI,EAAE;gBACrC,IAAI,CAAC,IAAI,GAAG;oBAAC;oBAAO;oBAAM;iBAAI;YACjC,CAAA;YACD,MAAM,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,CAAA,MAA1B;gBACI,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,KAAK;oBAC5B,OAAO,IAAI,CAAC,IAAI;oBAChB,QAAQ,GAAG,CAAC,UAAU;gBACzB,CAAA;YACL;YACA,OAAO;QACX;IAAC;AACL;AAGM,SAAU,0CAAM,QAAQ,GAAG,EAAjC;IACI,OAAO,SAAU,MAAW,EAAE,WAAmB,EAAE,UAA8B,EAAjF;QACI,MAAM,SAAS,WAAW,KAAK;QAC/B,WAAW,KAAK,GAAG,0CAA0B,QAAQ;QACrD,OAAO;IACX;AACJ","sources":["src/cache.ts"],"sourcesContent":["\ntype Fnc<R> = (this: any, ...args: any[]) => R;\n\nexport function cache<R, F extends Fnc<R>>(func: F, delay = 300) {\n    type Args = F extends (...args: infer P) => R ? P : never;\n    let data: { [key: string]: [R, Args, number] } = {};\n    return async function (this: any, ...args: Args): Promise<R> {\n        const key = JSON.stringify(args);\n        const record = data[key];\n        const now = Date.now();\n        if (!record || now > record[2] + delay) {\n            const value = await func.apply(this, args);\n            data[key] = [value, args, now];\n        }\n        const res = data[key][0];\n        Object.keys(data).forEach(key => {\n            if (data[key][2] + delay < now) {\n                delete data[key];\n                console.log(\"delete\", key);\n            }\n        });\n        return res;\n    };\n}\n\n// Decorator\nexport function Cache(delay = 300) {\n    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {\n        const method = descriptor.value;\n        descriptor.value = cache<any, typeof method>(method, delay);\n        return descriptor;\n    };\n}\n\n\n// TEST\n\n// const d = cache(\n//     function async (this: any, x: string, y: number): string {\n//         console.log(\"cache\", x, y);\n//         return `cache ${x}, ${y} - ${Date.now()}`;\n//     },\n//     300);\n\n// d(\"peter\", 3).then(console.log);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 200);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 500);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 700);\n\n// const o = {\n//     x: \"o.x\",\n//     m: async function (y: number) {\n//         console.log(\"o.m\", this.x, y);\n//         return `o.m ${this.x}, ${y} - ${Date.now()}`;\n//     },\n//     d: ({} as any)\n// };\n// o.d = cache(o.m, 300);\n// o.d(\"test\", 3).then(console.log);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 200);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 500);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 700);\n\n// class O {\n//     x: string = \"O.x\";\n\n//     @Cache(300)\n//     async m(y: string) {\n//         console.log(\"O.m\", this.x, y);\n//         return `O.m ${this.x}, ${y} - ${Date.now()}`;\n//     }\n// }\n// const obj = new O();\n// // obj.m = cache(obj.m, 300); // decorator equivalent\n// // obj.m(\"m(p)\");\n\n// obj.m(\"m(p)\").then(console.log);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 200);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 500);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 700);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 900);\n"],"names":[],"version":3,"file":"cache.js.map"}
+{"mappings":";;;;;;;A,I,kC,a,U,S,I,S,O,E,U,E,C,E,S,E;I,S,M,K,E;Q,O,iB,I,Q,I,E,S,O,E;Y,Q;Q,E;I;I,O,I,C,K,C,I,O,C,E,S,O,E,M,E;Q,S,U,K,E;Y,I;gB,K,U,I,C;Y,E,O,G;gB,O;Y;Q;Q,S,S,K,E;Y,I;gB,K,S,C,Q,C;Y,E,O,G;gB,O;Y;Q;Q,S,K,M,E;Y,O,I,G,Q,O,K,I,M,O,K,E,I,C,W,S;Q;Q,K,A,C,Y,U,K,C,S,c,E,C,E,I;I;A;AAGM,SAAU,0CAA2B,IAAO,EAAE,QAAQ,GAAG,EAA/D;IAEI,IAAI,OAA6C,CAAA;IACjD,OAAO,SAA2B,GAAG,IAAU,EAA/C;Q,O,gC,I,E,K,G,K,G,Y;YACI,MAAM,MAAM,KAAK,SAAS,CAAC;YAC3B,MAAM,SAAS,IAAI,CAAC,IAAI;YACxB,MAAM,MAAM,KAAK,GAAG;YACpB,IAAI,CAAC,UAAU,MAAM,MAAM,CAAC,EAAE,GAAG,OAAO;gBACpC,MAAM,QAAQ,MAAM,KAAK,KAAK,CAAC,IAAI,EAAE;gBACrC,IAAI,CAAC,IAAI,GAAG;oBAAC;oBAAO;oBAAM;iBAAI;YACjC,CAAA;YACD,MAAM,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,CAAA,MAA1B;gBACI,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,KACvB,OAAO,IAAI,CAAC,IAAI;YAGxB;YACA,OAAO;QACX;IAAC;AACL;AAGM,SAAU,0CAAM,QAAQ,GAAG,EAAjC;IACI,OAAO,SAAU,MAAW,EAAE,WAAmB,EAAE,UAA8B,EAAjF;QACI,MAAM,SAAS,WAAW,KAAK;QAC/B,WAAW,KAAK,GAAG,0CAA0B,QAAQ;QACrD,OAAO;IACX;AACJ","sources":["src/cache.ts"],"sourcesContent":["\ntype Fnc<R> = (this: any, ...args: any[]) => R;\n\nexport function cache<R, F extends Fnc<R>>(func: F, delay = 300) {\n    type Args = F extends (...args: infer P) => R ? P : never;\n    let data: { [key: string]: [R, Args, number] } = {};\n    return async function (this: any, ...args: Args): Promise<R> {\n        const key = JSON.stringify(args);\n        const record = data[key];\n        const now = Date.now();\n        if (!record || now > record[2] + delay) {\n            const value = await func.apply(this, args);\n            data[key] = [value, args, now];\n        }\n        const res = data[key][0];\n        Object.keys(data).forEach(key => {\n            if (data[key][2] + delay < now) {\n                delete data[key];\n                // console.log(\"delete\", key);\n            }\n        });\n        return res;\n    };\n}\n\n// Decorator\nexport function Cache(delay = 300) {\n    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {\n        const method = descriptor.value;\n        descriptor.value = cache<any, typeof method>(method, delay);\n        return descriptor;\n    };\n}\n\n\n// TEST\n\n// const d = cache(\n//     function async (this: any, x: string, y: number): string {\n//         console.log(\"cache\", x, y);\n//         return `cache ${x}, ${y} - ${Date.now()}`;\n//     },\n//     300);\n\n// d(\"peter\", 3).then(console.log);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 200);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 500);\n// setTimeout(() => d(\"peter\", 3).then(console.log), 700);\n\n// const o = {\n//     x: \"o.x\",\n//     m: async function (y: number) {\n//         console.log(\"o.m\", this.x, y);\n//         return `o.m ${this.x}, ${y} - ${Date.now()}`;\n//     },\n//     d: ({} as any)\n// };\n// o.d = cache(o.m, 300);\n// o.d(\"test\", 3).then(console.log);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 200);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 500);\n// setTimeout(() => o.d(\"test\", 3).then(console.log), 700);\n\n// class O {\n//     x: string = \"O.x\";\n\n//     @Cache(300)\n//     async m(y: string) {\n//         console.log(\"O.m\", this.x, y);\n//         return `O.m ${this.x}, ${y} - ${Date.now()}`;\n//     }\n// }\n// const obj = new O();\n// // obj.m = cache(obj.m, 300); // decorator equivalent\n// // obj.m(\"m(p)\");\n\n// obj.m(\"m(p)\").then(console.log);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 200);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 500);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 700);\n// setTimeout(() => obj.m(\"m(p)\").then(console.log), 900);\n"],"names":[],"version":3,"file":"cache.js.map"}

package/dist/browser-esmodule/index.js

@@ -3699,9 +3699,6 @@ class $85168c9146c8a7dc$export$312ff19fe6f84b5e extends $85168c9146c8a7dc$export
         if ("min" in opts) {
             if (obj.length < opts.min) err = true;
         }
-        if ("min" in opts && "max" in opts) {
-            if (obj.length > opts.max && obj.length < opts.min) err = true;
-        }
         if (err) return msgs.not_in_range ? $85168c9146c8a7dc$export$5dfe2efd653fcea4(msgs.not_in_range, Object.assign(Object.assign({}, opts.data), {
             min: "min" in opts ? "" + ((_a = opts.min) !== null && _a !== void 0 ? _a : "") : "",
             max: "max" in opts ? "" + ((_b = opts.max) !== null && _b !== void 0 ? _b : "") : ""
@@ -3842,7 +3839,7 @@ class $85168c9146c8a7dc$export$73e260ca9e9e4b55 extends $85168c9146c8a7dc$export
             if (opts.max && obj.getTime() > opts.max.getTime()) err = true;
         }
         if ("min" in opts) {
-            if (opts.min && obj < opts.min) err = true;
+            if (opts.min && obj.getTime() < opts.min.getTime()) err = true;
         }
         if (err) return msgs.not_in_range ? $85168c9146c8a7dc$export$5dfe2efd653fcea4(msgs.not_in_range, Object.assign(Object.assign({}, opts.data), {
             min: "min" in opts && opts.min ? this.dateToStr(opts.min) : "",