@etsoo/shared 1.2.55 → 1.2.57

package/__tests__/DataTypes.ts

@@ -217,6 +217,26 @@ test("Tests for AddAndEditType", () => {
   expect(data2.name).toBe(data3.name);
 });
 
+test("Tests for AddOrEditType", () => {
+  type Entity = {
+    id: number;
+    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" };
+
+  const data4: EditEntity = { id: 1, name: "hello", changedFields: ["name"] };
+
+  expect(data1.name).toBe(data2.name);
+  expect(data2.name).toBe(data3.name);
+  expect(data3.name).toBe(data4.name);
+});
+
 test("Tests for BasicTemplate", () => {
   const template: DataTypes.BasicTemplate = {
     id: "number",

package/__tests__/DomUtils.ts

@@ -253,7 +253,7 @@ test("Tests for getCulture", () => {
 });
 
 test("Tests for getLocationKey", () => {
-  expect(DomUtils.getLocationKey("test")).toBe("http://localhost/:test");
+  expect(DomUtils.getLocationKey("test")).toBe("http://localhost:3000/:test");
 });
 
 test("Tests for headersToObject", () => {
@@ -292,7 +292,7 @@ test("Tests for mergeURLSearchParams", () => {
 
 test("Tests for setFocus", () => {
   // Arrange
-  const focus = jest.fn();
+  const focus = vi.fn();
 
   const root = document.body;
   const container = document.createElement("div");
@@ -419,7 +419,7 @@ test("Tests for getUserAgentData 8", () => {
 
 test("Tests for setupLogging", async () => {
   // Arrange
-  const action = jest.fn((data: ErrorData) => {
+  const action = vi.fn((data: ErrorData) => {
     expect(data.message).toBe("Test");
   });
   DomUtils.setupLogging(action, true, globalThis.self);

package/__tests__/EHistory.ts

@@ -29,13 +29,13 @@ test("Tests for history", () => {
 });
 
 test("Tests for events", () => {
-  const navigatorFn = jest.fn();
-  const navigatorStopFn = jest.fn((event: EHistoryNavigateEvent) => {
+  const navigatorFn = vi.fn();
+  const navigatorStopFn = vi.fn((event: EHistoryNavigateEvent) => {
     event.stopImmediatePropagation();
   });
-  const clearFn = jest.fn();
-  const pushFn = jest.fn();
-  const replaceFn = jest.fn();
+  const clearFn = vi.fn();
+  const pushFn = vi.fn();
+  const replaceFn = vi.fn();
 
   const history = new LHistory(3);
 

package/__tests__/ExtendUtils.ts

@@ -25,7 +25,7 @@ test("Tests for applyMixins", () => {
 
 test("Tests for delayedExecutor", () => {
   // Arrange
-  const f = jest.fn();
+  const f = vi.fn();
 
   const e = ExtendUtils.delayedExecutor(f, 50);
 

package/__tests__/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "Node10",
+    "module": "ES2022",
+    "moduleResolution": "bundler",
     "allowJs": false,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -12,6 +12,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "declaration": true
+    "declaration": true,
+    "types": ["vitest/globals"]
   }
 }

package/lib/cjs/DataTypes.d.ts

@@ -147,7 +147,7 @@ export declare namespace DataTypes {
     }, D extends string = "id"> = (Omit<T, D> & {
         [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     });
     /**
      * Add or edit conditional type
@@ -158,7 +158,7 @@ export declare namespace DataTypes {
     }, // Entity modal
     E extends boolean, // Editing or not
     D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     };
     /**
      * Key collection, like { key1: {}, key2: {} }

package/lib/cjs/Utils.d.ts

@@ -158,7 +158,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignore fields
      * @returns
      */
-    function getDataChanges(input: object, initData: object, ignoreFields?: string[]): string[];
+    function getDataChanges<T extends object>(input: T, initData: object, ignoreFields?: string[]): (keyof T & string)[];
     /**
      * Get nested value from object
      * @param data Data

package/lib/mjs/DataTypes.d.ts

@@ -147,7 +147,7 @@ export declare namespace DataTypes {
     }, D extends string = "id"> = (Omit<T, D> & {
         [key in D]?: undefined | never;
     }) | (Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     });
     /**
      * Add or edit conditional type
@@ -158,7 +158,7 @@ export declare namespace DataTypes {
     }, // Entity modal
     E extends boolean, // Editing or not
     D extends string = "id"> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
-        changedFields?: string[];
+        changedFields?: (keyof T & string)[];
     };
     /**
      * Key collection, like { key1: {}, key2: {} }

package/lib/mjs/Utils.d.ts

@@ -158,7 +158,7 @@ export declare namespace Utils {
      * @param ignoreFields Ignore fields
      * @returns
      */
-    function getDataChanges(input: object, initData: object, ignoreFields?: string[]): string[];
+    function getDataChanges<T extends object>(input: T, initData: object, ignoreFields?: string[]): (keyof T & string)[];
     /**
      * Get nested value from object
      * @param data Data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.55",
+  "version": "1.2.57",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -14,23 +14,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
-    "test": "jest",
-    "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand"
-  },
-  "jest": {
-    "automock": false,
-    "testMatch": [
-      "<rootDir>/__tests__/**/*.ts"
-    ],
-    "testEnvironment": "jsdom",
-    "moduleFileExtensions": [
-      "js",
-      "ts",
-      "d.ts"
-    ],
-    "transform": {
-      ".+\\.ts$": "ts-jest"
-    }
+    "test": "vitest"
   },
   "repository": {
     "type": "git",
@@ -52,12 +36,11 @@
   },
   "homepage": "https://github.com/ETSOO/Shared#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.14",
     "@types/lodash.isequal": "^4.5.8",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.2"
+    "@vitejs/plugin-react": "^4.3.4",
+    "jsdom": "^26.0.0",
+    "typescript": "^5.7.3",
+    "vitest": "^2.1.8"
   },
   "dependencies": {
     "lodash.isequal": "^4.5.0"

package/src/DataTypes.ts

@@ -191,7 +191,8 @@ export namespace DataTypes {
     D extends string = "id"
   > =
     | (Omit<T, D> & { [key in D]?: undefined | never })
-    | (Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] });
+    | (Partial<T> &
+        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] });
 
   /**
    * Add or edit conditional type
@@ -203,7 +204,8 @@ export namespace DataTypes {
     D extends string = "id" // Default is 'id' field
   > = E extends false
     ? Optional<T, D>
-    : Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] };
+    : Partial<T> &
+        Readonly<Pick<T, D>> & { changedFields?: (keyof T & string)[] };
 
   /**
    * Key collection, like { key1: {}, key2: {} }

package/src/Utils.ts

@@ -403,13 +403,13 @@ export namespace Utils {
    * @param ignoreFields Ignore fields
    * @returns
    */
-  export function getDataChanges(
-    input: object,
+  export function getDataChanges<T extends object>(
+    input: T,
     initData: object,
     ignoreFields: string[] = ["id"]
-  ): string[] {
+  ): (keyof T & string)[] {
     // Changed fields
-    const changes: string[] = [];
+    const changes: (keyof T & string)[] = [];
 
     Object.entries(input).forEach(([key, value]) => {
       // Ignore fields, no process
@@ -431,7 +431,7 @@ export namespace Utils {
             Reflect.deleteProperty(input, key);
             return;
           }
-          changes.push(key);
+          changes.push(key as any);
           return;
         }
 
@@ -451,7 +451,7 @@ export namespace Utils {
       }
 
       // Hold the key
-      changes.push(key);
+      changes.push(key as any);
     });
 
     return changes;

package/tsconfig.cjs.json

@@ -10,7 +10,7 @@
     "declaration": true,
     "strict": true,
     "esModuleInterop": true,
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "dom.iterable", "ESNext"]
   },

package/tsconfig.json

@@ -2,15 +2,15 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "Node10",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
     "isolatedModules": true,
     "outDir": "./lib/mjs",
     "noEmit": false,
     "declaration": true,
     "strict": true,
     "esModuleInterop": true,
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "dom.iterable", "esnext"]
   },

package/vite.config.mts

@@ -0,0 +1,11 @@
+import { defineConfig } from "vitest/config";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig({
+  plugins: [react()],
+  test: {
+    globals: true,
+    environment: "jsdom",
+    include: ["__tests__/**/*.ts(x)?"]
+  }
+});