@wener/utils 1.1.54 → 1.1.58

package/lib/io/parseDataUri.test.js

@@ -32,12 +32,24 @@ function _async_to_generator(fn) {
 function _object_without_properties(source, excluded) {
     if (source == null)
         return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
+    var target = {}, sourceKeys, key, i;
+    if (typeof Reflect !== "undefined" && Reflect.ownKeys) {
+        sourceKeys = Reflect.ownKeys(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
+            if (excluded.indexOf(key) >= 0)
+                continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key))
+                continue;
+            target[key] = source[key];
+        }
+        return target;
+    }
+    target = _object_without_properties_loose(source, excluded);
     if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for (i = 0; i < sourceSymbolKeys.length; i++) {
-            key = sourceSymbolKeys[i];
+        sourceKeys = Object.getOwnPropertySymbols(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
             if (excluded.indexOf(key) >= 0)
                 continue;
             if (!Object.prototype.propertyIsEnumerable.call(source, key))
@@ -50,13 +62,13 @@ function _object_without_properties(source, excluded) {
 function _object_without_properties_loose(source, excluded) {
     if (source == null)
         return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
+    var target = {}, sourceKeys = Object.getOwnPropertyNames(source), key, i;
     for (i = 0; i < sourceKeys.length; i++) {
         key = sourceKeys[i];
         if (excluded.indexOf(key) >= 0)
             continue;
+        if (!Object.prototype.propertyIsEnumerable.call(source, key))
+            continue;
         target[key] = source[key];
     }
     return target;
@@ -71,9 +83,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/langs/AsyncCloser.js

@@ -68,9 +68,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {

package/lib/langs/deepFreeze.js

@@ -1,13 +1,13 @@
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 /**
  * Freezes the given object and all its nested objects recursively.
  *
  * @param {T} obj - The object to freeze.
  * @returns {T} - The frozen object.
- */ function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-export function deepFreeze(obj) {
+ */ export function deepFreeze(obj) {
     if (obj === null || (typeof obj === "undefined" ? "undefined" : _type_of(obj)) !== 'object') {
         return obj;
     }

package/lib/langs/mixin.js

@@ -1,19 +1,13 @@
 /**
- * Helper type to convert a union to an intersection.
- *
- * @internal
- */ /**
- * Applies the given mixins to the a common base class.
+ * Applies the given mixins to a common base class.
  *
  * @param Base The base class to apply the mixins to.
- * @param mixins The mixins to apply. All mixins must extend a common base class or an empty class.
+ * @param mixins The mixins to apply sequentially.
  * @returns A class constructor with all mixins applied.
  *
- * @typeParam T The type of the base class.
- * @typeParam M The type of the mixin functions.
- *
- * @example ```ts
- * class Dog extends mixin(Animal, FourLegged, Carnivore, PackHunting, Barking, Domesticated) {}
+ * @example
+ * ```ts
+ * class Dog extends mixin(Animal, FourLegged, Carnivore) {}
  * ```
  */ export function mixin(Base) {
     for(var _len = arguments.length, mixins = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
@@ -22,4 +16,4 @@
     return mixins.reduce(function(mix, applyMixin) {
         return applyMixin(mix);
     }, Base);
-} // https://github.com/1nVitr0/lib-ts-mixin-extended
+}

package/lib/langs/mixin.test.js

@@ -76,6 +76,56 @@ function _is_native_reflect_construct() {
 import { expect, test } from "vitest";
 import { mixin } from "./mixin.js";
 test("mixin", function () {
+    // @Ent()
+    var User = /*#__PURE__*/ function (_mixin) {
+        "use strict";
+        _inherits(User, _mixin);
+        function User() {
+            _class_call_check(this, User);
+            var _this;
+            _this = _call_super(this, User, arguments), _define_property(_this, "a", void 0);
+            return _this;
+        }
+        return User;
+    }(mixin(BaseResource, withFooFields));
+    // @Ent()
+    var User2 = /*#__PURE__*/ function (_mixin) {
+        "use strict";
+        _inherits(User2, _mixin);
+        function User2() {
+            _class_call_check(this, User2);
+            var _this;
+            _this = _call_super(this, User2, arguments), _define_property(_this, "x", "x");
+            return _this;
+        }
+        return User2;
+    }(mixin(BaseEnt, withFooFields));
+    // type works
+    var usr = new User();
+    expect(usr.foo, "foo");
+    var u2 = new User2();
+    console.log(u2);
+});
+//  <T extends EntityClass<unknown>>(options?: EntityOptions<T>): (target: T) => void;
+// @Ent()
+var BaseResource = function BaseResource() {
+    "use strict";
+    _class_call_check(this, BaseResource);
+    _define_property(this, "id", "");
+};
+// @Ent()
+var BaseEnt = /*#__PURE__*/ function (BaseResource) {
+    "use strict";
+    _inherits(BaseEnt, BaseResource);
+    function BaseEnt() {
+        _class_call_check(this, BaseEnt);
+        var _this;
+        _this = _call_super(this, BaseEnt, arguments), _define_property(_this, "base", "base");
+        return _this;
+    }
+    return BaseEnt;
+}(BaseResource);
+test("mixin deep not working", function () {
     // @ts-ignore
     var User = /*#__PURE__*/ function (_mixin) {
         "use strict";
@@ -96,11 +146,6 @@ test("mixin", function () {
         id: ""
     });
 });
-var BaseResource = function BaseResource() {
-    "use strict";
-    _class_call_check(this, BaseResource);
-    _define_property(this, "id", "");
-};
 function createBarFields() {
     return function (Base) {
         // nested type not working

package/lib/langs/mixin2.js

@@ -0,0 +1,26 @@
+/**
+ * Helper type to convert a union to an intersection.
+ *
+ * @internal
+ */ /**
+ * Applies the given mixins to the a common base class.
+ *
+ * @param Base The base class to apply the mixins to.
+ * @param mixins The mixins to apply. All mixins must extend a common base class or an empty class.
+ * @returns A class constructor with all mixins applied.
+ *
+ * @typeParam T The type of the base class.
+ * @typeParam M The type of the mixin functions.
+ *
+ * @example ```ts
+ * class Dog extends mixin(Animal, FourLegged, Carnivore, PackHunting, Barking, Domesticated) {}
+ * ```
+ */ export function mixin(Base) {
+    for(var _len = arguments.length, mixins = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+        mixins[_key - 1] = arguments[_key];
+    }
+    return mixins.reduce(function(mix, applyMixin) {
+        return applyMixin(mix);
+    }, Base);
+} // this is complex, may cause ts unable to resolve prototype typing
+ // https://github.com/1nVitr0/lib-ts-mixin-extended

package/lib/langs/parseBoolean.js

@@ -1,5 +1,6 @@
-export function parseBoolean(s) {
-    var strict = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+export function parseBoolean(s, options) {
+    var _ref;
+    var strict = typeof options === 'boolean' ? options : (_ref = options === null || options === void 0 ? void 0 : options.strict) !== null && _ref !== void 0 ? _ref : false;
     if (typeof s === 'boolean') {
         return s;
     }

package/lib/langs/shallowEqual.js

@@ -1,12 +1,12 @@
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 /**
  * shallow compare - support object, array
  *
  * @see {@link https://github.com/pmndrs/zustand/blob/main/src/shallow.ts zustand/src/shallow.ts}
- */ function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-export function shallowEqual(objA, objB) {
+ */ export function shallowEqual(objA, objB) {
     if (Object.is(objA, objB)) {
         return true;
     }

package/lib/libs/ms.js

@@ -1,8 +1,8 @@
-// Helpers.
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+// Helpers.
 var s = 1000;
 var m = s * 60;
 var h = m * 60;

package/lib/maths/clamp.js

@@ -1,90 +1,11 @@
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length)
-        len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++)
-        arr2[i] = arr[i];
-    return arr2;
-}
-function _array_with_holes(arr) {
-    if (Array.isArray(arr))
-        return arr;
-}
-function _iterable_to_array_limit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null)
-        return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
-            _arr.push(_s.value);
-            if (i && _arr.length === i)
-                break;
-        }
-    }
-    catch (err) {
-        _d = true;
-        _e = err;
-    }
-    finally {
-        try {
-            if (!_n && _i["return"] != null)
-                _i["return"]();
-        }
-        finally {
-            if (_d)
-                throw _e;
-        }
-    }
-    return _arr;
-}
-function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _sliced_to_array(arr, i) {
-    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o)
-        return;
-    if (typeof o === "string")
-        return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor)
-        n = o.constructor.name;
-    if (n === "Map" || n === "Set")
-        return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-        return _array_like_to_array(o, minLen);
-}
-import { isDefined } from "../langs/isDefined.js";
-import { isNil } from "../langs/isNil.js";
-export function clamp(value) {
-    for (var _len = arguments.length, o = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        o[_key - 1] = arguments[_key];
-    }
-    var min, max, def;
-    if (o.length === 1 && o[0] && _type_of(o[0]) === "object") {
-        var ref, ref1;
-        ref = o[0], min = ref.min, max = ref.max, ref1 = ref.default, def = ref1 === void 0 ? min : ref1, ref;
-    }
-    else {
-        var ref2, ref3;
-        ref2 = _sliced_to_array(o, 3), min = ref2[0], max = ref2[1], ref3 = ref2[2], def = ref3 === void 0 ? min : ref3, ref2;
-    }
-    if (isNil(value)) {
-        return def;
+export function clamp(value, min, max, def) {
+    if (value == null) {
+        return def !== null && def !== void 0 ? def : min;
     }
-    if (isDefined(min) && value < min) {
+    if (min != null && value < min) {
         return min;
     }
-    if (isDefined(max) && value > max) {
+    if (max != null && value > max) {
         return max;
     }
     return value;

package/lib/maths/clamp.test.js

@@ -63,6 +63,7 @@ import { expect, test } from "vitest";
 import { clamp } from "./clamp.js";
 test("clamp", function () {
     for (var _i = 0, _iter = [
+        // 基本用法
         [
             [
                 null,
@@ -116,68 +117,65 @@ test("clamp", function () {
         ],
         [
             [
-                11,
-                {
-                    min: 1,
-                    max: 10
-                }
+                0,
+                1,
+                10,
+                5
             ],
-            10
+            1
         ],
+        // 只限制 min
         [
             [
-                null,
-                {
-                    min: 1,
-                    max: 10
-                }
+                1,
+                2,
+                undefined
             ],
-            1
+            2
         ],
         [
             [
-                null,
-                {
-                    min: 1,
-                    max: 10,
-                    default: 5
-                }
+                5,
+                2,
+                undefined
             ],
             5
         ],
+        // 只限制 max
         [
             [
-                2n,
                 1,
-                10,
-                5
+                undefined,
+                0
             ],
-            2n
+            0
         ],
         [
             [
-                1,
-                2
+                5,
+                undefined,
+                10
             ],
-            2
+            5
         ],
+        // BigInt
         [
             [
-                1,
-                undefined,
-                0
+                2n,
+                1n,
+                10n,
+                5n
             ],
-            0
-        ],
-        [
-            [],
-            undefined
+            2n
         ],
         [
             [
-                null
+                11n,
+                1n,
+                10n,
+                5n
             ],
-            undefined
+            10n
         ]
     ]; _i < _iter.length; _i++) {
         var _iter__i = _sliced_to_array(_iter[_i], 2), a = _iter__i[0], b = _iter__i[1];