@etsoo/shared 1.2.61 → 1.2.63

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2004-2024 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
+Copyright (c) 2004-2025 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/__tests__/ExtendUtils.ts

@@ -20,9 +20,39 @@ test("Tests for applyMixins", () => {
   interface a extends b, c {}
   ExtendUtils.applyMixins(a, [b, c]);
   const item = new a();
+  expect(item.m()).toBe(1);
   expect(item.m2()).toBe("hello");
 });
 
+test("Tests for applyMixins with override", () => {
+  class a {
+    m() {
+      return 0;
+    }
+    get id() {
+      return 1;
+    }
+  }
+  class b {
+    m(id: number) {
+      return id;
+    }
+    get id() {
+      return 2;
+    }
+  }
+
+  interface a extends b {
+    m(id: number): number;
+  }
+  ExtendUtils.applyMixins(a, [b], true);
+  const item = new a();
+  expect(item.id).toBe(2);
+  // As the method is overridden, the return value should be undefined
+  expect(item.m()).toBe(undefined);
+  expect(item.m(3)).toBe(3);
+});
+
 test("Tests for delayedExecutor", () => {
   // Arrange
   const f = vi.fn();

package/__tests__/Utils.ts

@@ -304,12 +304,16 @@ test("Tests for getResult", () => {
   type test = ((visible: boolean) => number) | number;
   const input: test = (visible) => (visible ? 1 : 0);
   const inputNumber: test = 5;
+  const inputAny: test = input as any;
 
   // Act & assert
   const result = Utils.getResult(input, true);
   expect(result).toBe(1);
   expect(Utils.getResult(input, false)).toBe(0);
 
+  const result1 = Utils.getResult(inputAny, false);
+  expect(result1).toBe(0);
+
   const valueResult = Utils.getResult(inputNumber);
   expect(valueResult).toBe(5);
 });

package/lib/cjs/ExtendUtils.d.ts

@@ -8,8 +8,9 @@ export declare namespace ExtendUtils {
      * https://www.typescriptlang.org/docs/handbook/mixins.html#understanding-the-sample
      * @param derivedCtor Mixin target class
      * @param baseCtors Mixin base classes
+     * @param override Override or not
      */
-    function applyMixins(derivedCtor: any, baseCtors: any[]): void;
+    function applyMixins(derivedCtor: any, baseCtors: any[], override?: boolean): void;
     /**
      * Create delayed executor
      * @param func Function

package/lib/cjs/ExtendUtils.js

@@ -12,13 +12,15 @@ var ExtendUtils;
      * https://www.typescriptlang.org/docs/handbook/mixins.html#understanding-the-sample
      * @param derivedCtor Mixin target class
      * @param baseCtors Mixin base classes
+     * @param override Override or not
      */
-    function applyMixins(derivedCtor, baseCtors) {
+    function applyMixins(derivedCtor, baseCtors, override = false) {
         baseCtors.forEach((baseCtor) => {
             Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
-                if (name !== "constructor") {
-                    // eslint-disable-next-line no-param-reassign
-                    derivedCtor.prototype[name] = baseCtor.prototype[name];
+                if (name !== "constructor" &&
+                    (override || !derivedCtor.prototype[name])) {
+                    Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
+                        Object.create(null));
                 }
             });
         });

package/lib/cjs/Utils.d.ts

@@ -173,7 +173,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    export const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never | []) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
+    export const getResult: <R, T = DataTypes.Func<R> | R>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never | []) => R;
     /**
      * Get time zone
      * @param tz Default timezone, default is UTC

package/lib/cjs/Utils.js

@@ -339,7 +339,9 @@ var Utils;
      * @returns Result
      */
     Utils.getResult = (input, ...args) => {
-        return typeof input === "function" ? input(...args) : input;
+        return typeof input === "function"
+            ? input(...args)
+            : input;
     };
     /**
      * Get time zone

package/lib/mjs/ExtendUtils.d.ts

@@ -8,8 +8,9 @@ export declare namespace ExtendUtils {
      * https://www.typescriptlang.org/docs/handbook/mixins.html#understanding-the-sample
      * @param derivedCtor Mixin target class
      * @param baseCtors Mixin base classes
+     * @param override Override or not
      */
-    function applyMixins(derivedCtor: any, baseCtors: any[]): void;
+    function applyMixins(derivedCtor: any, baseCtors: any[], override?: boolean): void;
     /**
      * Create delayed executor
      * @param func Function

package/lib/mjs/ExtendUtils.js

@@ -9,13 +9,15 @@ export var ExtendUtils;
      * https://www.typescriptlang.org/docs/handbook/mixins.html#understanding-the-sample
      * @param derivedCtor Mixin target class
      * @param baseCtors Mixin base classes
+     * @param override Override or not
      */
-    function applyMixins(derivedCtor, baseCtors) {
+    function applyMixins(derivedCtor, baseCtors, override = false) {
         baseCtors.forEach((baseCtor) => {
             Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
-                if (name !== "constructor") {
-                    // eslint-disable-next-line no-param-reassign
-                    derivedCtor.prototype[name] = baseCtor.prototype[name];
+                if (name !== "constructor" &&
+                    (override || !derivedCtor.prototype[name])) {
+                    Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
+                        Object.create(null));
                 }
             });
         });

package/lib/mjs/Utils.d.ts

@@ -173,7 +173,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    export const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never | []) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
+    export const getResult: <R, T = DataTypes.Func<R> | R>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never | []) => R;
     /**
      * Get time zone
      * @param tz Default timezone, default is UTC

package/lib/mjs/Utils.js

@@ -333,7 +333,9 @@ export var Utils;
      * @returns Result
      */
     Utils.getResult = (input, ...args) => {
-        return typeof input === "function" ? input(...args) : input;
+        return typeof input === "function"
+            ? input(...args)
+            : input;
     };
     /**
      * Get time zone

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.61",
+  "version": "1.2.63",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -39,8 +39,8 @@
     "@types/lodash.isequal": "^4.5.8",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.5"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.9"
   },
   "dependencies": {
     "lodash.isequal": "^4.5.0"

package/src/ExtendUtils.ts

@@ -11,13 +11,25 @@ export namespace ExtendUtils {
    * https://www.typescriptlang.org/docs/handbook/mixins.html#understanding-the-sample
    * @param derivedCtor Mixin target class
    * @param baseCtors Mixin base classes
+   * @param override Override or not
    */
-  export function applyMixins(derivedCtor: any, baseCtors: any[]) {
+  export function applyMixins(
+    derivedCtor: any,
+    baseCtors: any[],
+    override = false
+  ) {
     baseCtors.forEach((baseCtor) => {
       Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
-        if (name !== "constructor") {
-          // eslint-disable-next-line no-param-reassign
-          derivedCtor.prototype[name] = baseCtor.prototype[name];
+        if (
+          name !== "constructor" &&
+          (override || !derivedCtor.prototype[name])
+        ) {
+          Object.defineProperty(
+            derivedCtor.prototype,
+            name,
+            Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
+              Object.create(null)
+          );
         }
       });
     });

package/src/Utils.ts

@@ -498,8 +498,10 @@ export namespace Utils {
   export const getResult = <R, T = DataTypes.Func<R> | R>(
     input: T,
     ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never | []
-  ): T extends DataTypes.Func<R> ? ReturnType<T> : T => {
-    return typeof input === "function" ? input(...args) : input;
+  ): R => {
+    return typeof input === "function"
+      ? input(...args)
+      : (input as unknown as R);
   };
 
   /**