@etsoo/shared 1.2.62 → 1.2.64

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/README.md

@@ -130,8 +130,6 @@ Data type definitions and type safe functions. ListItemType, ListItemType1 and L
 |                Name | Description                                                            |
 | ------------------: | ---------------------------------------------------------------------- |
 |            DataType | Data type enum                                                         |
-|      AddAndEditType | Add and edit data type                                                 |
-|       AddOrEditType | Add or edit conditional type                                           |
 |         addUrlParam | Add parameter to URL                                                   |
 |        addUrlParams | Add parameters to URL                                                  |
 |               Basic | Basic types, includes number, bigint, Date, boolean, string            |
@@ -144,6 +142,7 @@ Data type definitions and type safe functions. ListItemType, ListItemType1 and L
 |   CultureDefinition | Culture definition                                                     |
 |                  DI | Dynamic interface with multiple properties                             |
 |                 DIS | Dynamic interface with single property                                 |
+|            EditType | Create edit type from adding type                                      |
 |            EnumBase | Enum base type                                                         |
 |           EnumValue | Enum value type                                                        |
 |        ExtendedEnum | Extended type enum                                                     |

package/__tests__/DataTypes.ts

@@ -202,39 +202,18 @@ test("Tests for jsonReplacer", () => {
   expect(json2).toBe('{"c":{"c2":false}}');
 });
 
-test("Tests for AddAndEditType", () => {
-  type Entity = DataTypes.AddAndEditType<{
-    id: number;
-    name: string;
-    age?: number;
-  }>;
-
-  const data1: Entity = { id: 1, name: "hello", changedFields: ["name"] };
-  const data2: Entity = { id: undefined, name: "hello" };
-  const data3: Entity = { name: "hello" };
-
-  expect(data1.name).toBe(data2.name);
-  expect(data2.name).toBe(data3.name);
-});
-
-test("Tests for AddOrEditType", () => {
-  type Entity = {
-    id: number;
+test("Tests for EditType", () => {
+  type AddEntity = {
     name: string;
     age?: number;
   };
-  type AddEntity = DataTypes.AddOrEditType<Entity, false>;
-  type EditEntity = DataTypes.AddOrEditType<Entity, true>;
 
-  const data1: AddEntity = { id: 1, name: "hello" };
-  const data2: AddEntity = { id: undefined, name: "hello" };
-  const data3: AddEntity = { name: "hello" };
+  type EditType = DataTypes.EditType<AddEntity>;
 
-  const data4: EditEntity = { id: 1, name: "hello", changedFields: ["name"] };
+  const data1: EditType = { id: 1, name: "hello", changedFields: ["name"] };
+  const data2: EditType = { id: 1, name: "hello", age: 1 };
 
   expect(data1.name).toBe(data2.name);
-  expect(data2.name).toBe(data3.name);
-  expect(data3.name).toBe(data4.name);
 });
 
 test("Tests for BasicTemplate", () => {

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/DataTypes.d.ts

@@ -139,25 +139,10 @@ export declare namespace DataTypes {
      */
     type Placement = keyof typeof PlacementEnum;
     /**
-     * Add and edit data type
-     * ChangedFields for editing case
-     */
-    type AddAndEditType<T extends {
-        [key in D]: IdType;
-    }, D extends string = "id"> = (Omit<T, D> & {
-        [key in D]?: undefined | never;
-    }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: (keyof T & string)[];
-    });
-    /**
-     * Add or edit conditional type
-     * ChangedFields for editing case
+     * Edit type from adding type
      */
-    type AddOrEditType<T extends {
-        [key in D]: IdType;
-    }, // Entity modal
-    E extends boolean, // Editing or not
-    D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
+    type EditType<T, I extends IdType = number> = Partial<T> & {
+        id: I;
         changedFields?: (keyof T & string)[];
     };
     /**

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/DataTypes.d.ts

@@ -139,25 +139,10 @@ export declare namespace DataTypes {
      */
     type Placement = keyof typeof PlacementEnum;
     /**
-     * Add and edit data type
-     * ChangedFields for editing case
-     */
-    type AddAndEditType<T extends {
-        [key in D]: IdType;
-    }, D extends string = "id"> = (Omit<T, D> & {
-        [key in D]?: undefined | never;
-    }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: (keyof T & string)[];
-    });
-    /**
-     * Add or edit conditional type
-     * ChangedFields for editing case
+     * Edit type from adding type
      */
-    type AddOrEditType<T extends {
-        [key in D]: IdType;
-    }, // Entity modal
-    E extends boolean, // Editing or not
-    D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
+    type EditType<T, I extends IdType = number> = Partial<T> & {
+        id: I;
         changedFields?: (keyof T & string)[];
     };
     /**

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.62",
+  "version": "1.2.64",
   "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.7"
+    "typescript": "^5.8.2",
+    "vitest": "^3.1.1"
   },
   "dependencies": {
     "lodash.isequal": "^4.5.0"

package/src/DataTypes.ts

@@ -183,29 +183,12 @@ export namespace DataTypes {
   export type Placement = keyof typeof PlacementEnum;
 
   /**
-   * Add and edit data type
-   * ChangedFields for editing case
-   */
-  export type AddAndEditType<
-    T extends { [key in D]: IdType },
-    D extends string = "id"
-  > =
-    | (Omit<T, D> & { [key in D]?: undefined | never })
-    | (Partial<T> &
-        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] });
-
-  /**
-   * Add or edit conditional type
-   * ChangedFields for editing case
-   */
-  export type AddOrEditType<
-    T extends { [key in D]: IdType }, // Entity modal
-    E extends boolean, // Editing or not
-    D extends string = "id" // Default is 'id' field
-  > = E extends false
-    ? Optional<T, D>
-    : Partial<T> &
-        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] };
+   * Edit type from adding type
+   */
+  export type EditType<T, I extends IdType = number> = Partial<T> & {
+    id: I;
+    changedFields?: (keyof T & string)[];
+  };
 
   /**
    * Key collection, like { key1: {}, key2: {} }

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);
   };
 
   /**