@etsoo/appscript 1.5.86 → 1.5.88

package/__tests__/app/CoreApp.ts

@@ -48,6 +48,8 @@ test("Tests for encrypt / decrypt", async () => {
   const input = "Hello, world!";
   const passphrase = "My password";
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   // Act
   const encrypted = app.encrypt(input, passphrase);
   const plain = app.decrypt(encrypted, passphrase);
@@ -59,6 +61,8 @@ test("Tests for encryptEnhanced / decryptEnhanced", async () => {
   const input = "Hello, world!";
   const passphrase = "My password";
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   // Act
   const encrypted = app.encryptEnhanced(input, passphrase);
   const plain = app.decryptEnhanced(encrypted, passphrase);

package/__tests__/app/TestApp.ts

@@ -56,7 +56,7 @@ var container = new NotificationContainerTest((update) => {});
 
 // Is local test (integration test)
 // Make sure your local environment is ready
-export const isLocalTest = process.env.NODE_ENV === "local";
+export const isLocalTest = vi.stubEnv("NODE_ENV", "local");
 
 // Test application class
 export class TestApp extends CoreApp<

package/__tests__/tsconfig.json

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

package/lib/cjs/app/CoreApp.d.ts

@@ -603,8 +603,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token with success
      * @param user User data
      * @param token Refresh token
+     * @param callback Callback
      */
-    protected refreshTokenSucceed(user: U, token: string): Promise<void>;
+    protected refreshTokenSucceed(user: U, token: string, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js

@@ -1421,9 +1421,7 @@ class CoreApp {
                 }
                 else {
                     // Further processing
-                    await this.refreshTokenSucceed(result.data, token);
-                    // Callback
-                    callback?.(true);
+                    await this.refreshTokenSucceed(result.data, token, callback);
                     // Exit
                     return;
                 }
@@ -1460,10 +1458,13 @@ class CoreApp {
      * Refresh token with success
      * @param user User data
      * @param token Refresh token
+     * @param callback Callback
      */
-    async refreshTokenSucceed(user, token) {
+    async refreshTokenSucceed(user, token, callback) {
         // User login
         this.userLogin(user, token);
+        // Callback
+        callback?.(true);
     }
     /**
      * Setup callback

package/lib/mjs/app/CoreApp.d.ts

@@ -603,8 +603,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token with success
      * @param user User data
      * @param token Refresh token
+     * @param callback Callback
      */
-    protected refreshTokenSucceed(user: U, token: string): Promise<void>;
+    protected refreshTokenSucceed(user: U, token: string, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -1418,9 +1418,7 @@ export class CoreApp {
                 }
                 else {
                     // Further processing
-                    await this.refreshTokenSucceed(result.data, token);
-                    // Callback
-                    callback?.(true);
+                    await this.refreshTokenSucceed(result.data, token, callback);
                     // Exit
                     return;
                 }
@@ -1457,10 +1455,13 @@ export class CoreApp {
      * Refresh token with success
      * @param user User data
      * @param token Refresh token
+     * @param callback Callback
      */
-    async refreshTokenSucceed(user, token) {
+    async refreshTokenSucceed(user, token, callback) {
         // User login
         this.userLogin(user, token);
+        // Callback
+        callback?.(true);
     }
     /**
      * Setup callback

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.86",
+  "version": "1.5.88",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -13,27 +13,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
-    "format": "prettier --write src/**/*.ts",
-    "lint": "eslint --ext .ts src/",
-    "test": "jest",
-    "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand"
-  },
-  "jest": {
-    "automock": false,
-    "testMatch": [
-      "<rootDir>/__tests__/**/*.ts"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/__tests__/app/TestApp.ts"
-    ],
-    "testEnvironment": "jsdom",
-    "transform": {
-      ".+\\.jsx?$": "babel-jest",
-      ".+\\.tsx?$": "ts-jest"
-    },
-    "transformIgnorePatterns": [
-      "/node_modules/(?!@etsoo/).+\\.js$"
-    ]
+    "test": "vitest"
   },
   "repository": {
     "type": "git",
@@ -48,16 +28,16 @@
     "青岛亿速思维",
     "上海亿商"
   ],
-  "author": "Garry Xiao",
+  "author": "ETSOO",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/ETSOO/AppScript/issues"
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/restclient": "^1.1.17",
-    "@etsoo/shared": "^1.2.55",
+    "@etsoo/notificationbase": "^1.1.55",
+    "@etsoo/restclient": "^1.1.18",
+    "@etsoo/shared": "^1.2.57",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
@@ -67,10 +47,9 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime-corejs3": "^7.26.0",
     "@types/crypto-js": "^4.2.2",
-    "@types/jest": "^29.5.14",
-    "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"
   }
 }

package/src/app/CoreApp.ts

@@ -1937,10 +1937,7 @@ export abstract class CoreApp<
           };
         } else {
           // Further processing
-          await this.refreshTokenSucceed(result.data, token);
-
-          // Callback
-          callback?.(true);
+          await this.refreshTokenSucceed(result.data, token, callback);
 
           // Exit
           return;
@@ -1980,10 +1977,18 @@ export abstract class CoreApp<
    * Refresh token with success
    * @param user User data
    * @param token Refresh token
+   * @param callback Callback
    */
-  protected async refreshTokenSucceed(user: U, token: string) {
+  protected async refreshTokenSucceed(
+    user: U,
+    token: string,
+    callback?: (result?: boolean | IActionResult) => boolean | void
+  ) {
     // User login
     this.userLogin(user, token);
+
+    // Callback
+    callback?.(true);
   }
 
   /**

package/tsconfig.json

@@ -3,8 +3,8 @@
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     "target": "ES2020",
     "allowJs": false,
-    "module": "ESNext",
-    "moduleResolution": "Node10",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "outDir": "./lib/mjs",

package/vite.config.mts

@@ -0,0 +1,12 @@
+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)?"],
+    exclude: ["__tests__/app/TestApp.ts"]
+  }
+});