@wener/utils 1.1.54 → 1.1.56

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/random.js

@@ -1,4 +1,3 @@
-// LCG pseudo random
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -21,9 +20,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) {
@@ -103,6 +110,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+// LCG pseudo random
 export function createRandom() {
     var _seed = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Date.now();
     var seed = 0;

package/lib/objects/merge/isMergeableObject.js

@@ -1,8 +1,8 @@
-// https://github.com/TehShrike/is-mergeable-object/blob/master/index.js
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+// https://github.com/TehShrike/is-mergeable-object/blob/master/index.js
 export function isMergeableObject(value) {
     return isNonNullObject(value) && !isSpecial(value);
 }

package/lib/objects/merge/merge.js

@@ -1,4 +1,3 @@
-// https://github.com/TehShrike/deepmerge/blob/master/index.js
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -53,6 +52,7 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
+// https://github.com/TehShrike/deepmerge/blob/master/index.js
 import { isMergeableObject as defaultIsMergeableObject } from "./isMergeableObject.js";
 function emptyTarget(val) {
     return Array.isArray(val) ? [] : {};

package/lib/objects/merge/merge.test.js

@@ -70,9 +70,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/objects/set.js

@@ -16,11 +16,19 @@ import { parseObjectPath } from "./parseObjectPath.js";
     var x, k;
     while (i < len) {
         k = path[i++];
+        // Security: Prevent prototype pollution
         if (k === "__proto__" || k === "constructor" || k === "prototype")
             break;
         // noinspection PointlessArithmeticExpressionJS
-        current = current[k] = i === len ? merging ? merge(current[k], val) : val : _type_of(x = current[k]) === (typeof path === "undefined" ? "undefined" : _type_of(path)) ? x : path[i] * 0 !== 0 || !!~("" + path[i]).indexOf(".") // eslint-disable-line
-            ? {} : [];
+        current = current[k] = i === len ? merging ? merge(current[k], val) : val : _type_of(x = current[k]) === (typeof path === "undefined" ? "undefined" : _type_of(path)) ? x : // If the next key is NOT an integer-like index, or contains a dot, create an Object.
+            // Otherwise, create an Array.
+            //
+            // path[i] * 0 !== 0 checks if it is NOT a number (NaN * 0 is NaN).
+            // !!~('' + path[i]).indexOf('.') checks if it contains a dot.
+            //
+            // @ts-expect-error hacky type check from dset
+            path[i] * 0 !== 0 || !!~("" + path[i]).indexOf(".") // eslint-disable-line
+                ? {} : [];
     }
 }
 export function merge(a, b) {

package/lib/objects/set.test.js

@@ -1,4 +1,4 @@
-/* eslint no-proto:0 no-prototype-builtins:0 */ function _instanceof(left, right) {
+function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     }
@@ -6,7 +6,7 @@
         return left instanceof right;
     }
 }
-import { describe, expect, it, test } from "vitest";
+/* eslint no-proto:0 no-prototype-builtins:0 */ import { describe, expect, it, test } from "vitest";
 import { set } from "./set.js";
 test("set basics", function () {
     expect(set({}, "c", 3), "should not give return value").toBe(undefined);

package/lib/scripts/getGenerateContext.js

@@ -93,9 +93,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) {
@@ -347,7 +355,7 @@ export function getGenerateContext(prefix) {
 }
 function write(dir, file, content) {
     return _async_to_generator(function () {
-        var size, dst, last, e;
+        var size, dst, last, unused;
         return _ts_generator(this, function (_state) {
             switch (_state.label) {
                 case 0:
@@ -374,7 +382,7 @@ function write(dir, file, content) {
                         4
                     ];
                 case 3:
-                    e = _state.sent();
+                    unused = _state.sent();
                     return [
                         3,
                         4

package/lib/server/fetch/createFetchWithProxyByNodeFetch.js

@@ -101,9 +101,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/server/fetch/createFetchWithProxyByUndici.js

@@ -139,9 +139,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/server/polyfill/polyfillBrowser.js

@@ -39,9 +39,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/server/polyfill/polyfillBrowser.test.js

@@ -39,9 +39,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/server/polyfill/polyfillCrypto.js

@@ -39,9 +39,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/server/polyfill/polyfillJsDom.js

@@ -37,12 +37,24 @@ function _class_call_check(instance, Constructor) {
 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))
@@ -55,13 +67,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;
@@ -76,9 +88,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/strings/renderTemplate.test.js

@@ -1,4 +1,4 @@
-/* eslint no-template-curly-in-string:0 */ function _array_like_to_array(arr, len) {
+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++)
@@ -59,7 +59,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
         return _array_like_to_array(o, minLen);
 }
-import { expect, test } from "vitest";
+/* eslint no-template-curly-in-string:0 */ import { expect, test } from "vitest";
 import { renderTemplate } from "./renderTemplate.js";
 test("renderTemplate", function () {
     var obj = {

package/lib/web/getRandomValues.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
@@ -8,6 +7,7 @@ function _instanceof(left, right) {
     }
 }
 var _globalThis_crypto_getRandomValues, _globalThis_crypto, _globalThis_msCrypto_getRandomValues, _globalThis_msCrypto;
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { getNodeCrypto } from "../crypto/getNodeCrypto.js";
 import { getGlobalThis } from "./getGlobalThis.js";
 var globalThis = getGlobalThis();

package/lib/web/structuredClone.js

@@ -1,8 +1,8 @@
-/* eslint no-proto:0 */ function _type_of(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-import { classOf } from "../langs/classOf.js";
+/* eslint no-proto:0 */ import { classOf } from "../langs/classOf.js";
 /**
  * Clone an object using structured cloning algorithm
  *

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@wener/utils",
-  "version": "1.1.54",
+  "version": "1.1.56",
   "type": "module",
   "description": "Utils for daily use",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wener/wode.git"
+    "url": "https://github.com/wenerme/wener.git",
+    "directory": "packages/wener-utils"
   },
-  "homepage": "https://github.com/wenerme/wode#readme",
+  "homepage": "https://github.com/wenerme/wener/tree/main/packages/wener-utils",
   "author": "wener",
   "license": "MIT",
+  "imports": {
+    "#/*": "./src/*"
+  },
   "exports": {
     ".": {
       "types": "./src/index.ts",
@@ -70,7 +74,7 @@
     "https-proxy-agent": "^7.0.6",
     "node-fetch": "^3.3.2",
     "undici": "^7.16.0",
-    "zod": "^4.1.12"
+    "zod": "^4.1.13"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/asyncs/Promises.ts

@@ -20,7 +20,8 @@ export class Promises {
 		}
 		let resolve: (value: T | PromiseLike<T>) => void;
 		let reject: (reason?: any) => void;
-		// @ts-ignore
+		// @ts-ignore -- Polyfill/Fallback for environment without Promise.withResolvers
+		// eslint-disable-next-line
 		const promise = new Promise<T>((res, rej) => {
 			resolve = res;
 			reject = rej;

package/src/asyncs/timeout.ts

@@ -3,7 +3,7 @@ export function timeout<T = any>(
 	ms: number,
 ): Promise<T> {
 	const error = new TimeoutError();
-	let timeout: any;
+	let timeout: ReturnType<typeof setTimeout>;
 	let ac: AbortController | undefined;
 	if (typeof pending === 'function') {
 		ac = new AbortController();

package/src/crypto/hashing.ts

@@ -1,10 +1,11 @@
 import { ArrayBuffers } from '../io/ArrayBuffers';
+import type { Bytes } from '../io/types';
 
 type HashEncoding = 'hex' | 'base64' | 'buffer';
 
 type HashFunction = {
 	(s: BinaryLike, o?: 'hex' | 'base64' | undefined): Promise<string>;
-	(s: BinaryLike, o: 'buffer'): Promise<ArrayBuffer>;
+	(s: BinaryLike, o: 'buffer'): Promise<Bytes>;
 };
 
 function createDigestFunction(a: string): HashFunction {
@@ -17,27 +18,27 @@ function createDigestFunction(a: string): HashFunction {
 	}) as HashFunction;
 }
 
-export function sha1(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha1(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha1(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 export function sha1(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-1', s, o);
 }
 
-export function sha256(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha256(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha256(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha256(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-256', s, o);
 }
 
-export function sha384(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha384(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha384(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha384(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-384', s, o);
 }
 
-export function sha512(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha512(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha512(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha512(s: BinaryLike, o?: DigestOptions) {
@@ -84,7 +85,7 @@ export function hmac<O extends DigestOptions>(
 	key: BinaryLike | CryptoKey,
 	data: BinaryLike,
 	o?: O,
-): Promise<IsStringCoding<O> extends true ? string : Buffer>;
+): Promise<IsStringCoding<O> extends true ? string : Bytes>;
 
 export async function hmac(
 	hash: 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512' | 'sha1' | 'sha256' | 'sha384' | 'sha512',

package/src/crypto/pem/pem.ts

@@ -1,4 +1,5 @@
 import { ArrayBuffers } from '../../io/ArrayBuffers';
+import type { Bytes } from '../../io/types';
 
 export interface Block {
 	/**
@@ -30,7 +31,7 @@ export interface Block {
 		| 'SM2 PARAMETERS';
 
 	header: Record<string, string>;
-	bytes: BufferSource;
+	bytes: Bytes;
 }
 
 export class PEM {
@@ -53,7 +54,7 @@ export class PEM {
 				type,
 				header,
 				//  avoid replaceAll
-				bytes: ArrayBuffers.from(b64.replace(/[\r\n]/g, ''), 'base64'),
+				bytes: ArrayBuffers.from(b64.replace(/[\r\n]/g, ''), 'base64', Uint8Array),
 			},
 			head: data.slice(0, match.index || 0),
 			tail: data.slice((match.index || 0) + match[0].length),

package/src/fetch/dumpRequest.ts

@@ -130,7 +130,7 @@ export async function dumpBodyContent({
 				if (typeof value === 'string') {
 					result += `${key}: ${value}\n`;
 				} else {
-					result += `${key}: [File: ${value.name || 'unknown'}]\n`;
+					result += `${key}: [File: ${(value as File).name || 'unknown'}]\n`;
 				}
 			}
 			return result;

package/src/langs/mixin.test.ts

@@ -1,9 +1,43 @@
 import { expect, test } from 'vitest';
 import { mixin } from './mixin';
 
-export type Constructor<T = {}> = new (...args: any[]) => T;
+// import type { Constructor } from '#/types';
+type Constructor<T = {}> = new (...args: any[]) => T;
+function Ent<T extends Function>(): (target: T) => void {
+	return () => {};
+}
 
 test('mixin', () => {
+	// @Ent()
+	class User extends mixin(BaseResource, withFooFields) {
+		a?: string;
+	}
+	// @Ent()
+	class User2 extends mixin(BaseEnt, withFooFields) {
+		x: string = 'x';
+	}
+
+	// type works
+	const usr = new User();
+	expect(usr.foo, 'foo');
+
+	const u2 = new User2();
+	console.log(u2);
+});
+
+//  <T extends EntityClass<unknown>>(options?: EntityOptions<T>): (target: T) => void;
+
+// @Ent()
+class BaseResource {
+	id?: string = '';
+}
+
+// @Ent()
+class BaseEnt extends BaseResource {
+	base: string = 'base';
+}
+
+test('mixin deep not working', () => {
 	// @ts-ignore
 	class User extends mixin(BaseResource, createBarFields()) {}
 
@@ -14,10 +48,6 @@ test('mixin', () => {
 	expect(usr).toEqual({ foo: 'foo', bar: 'bar', id: '' });
 });
 
-class BaseResource {
-	id?: string = '';
-}
-
 function createBarFields() {
 	return <TBase extends Constructor>(Base: TBase) => {
 		// nested type not working