@etsoo/appscript 1.3.66 → 1.3.67

package/__tests__/app/CoreApp.ts

@@ -192,6 +192,13 @@ test('Tests for initCallUpdateLocal', () => {
     expect(passphrase).not.toBeNull();
 });
 
+test('Tests for formatFullName', () => {
+    expect(app.formatFullName('亿速', null)).toBe('亿速');
+    expect(app.formatFullName(null, null)).toBe('');
+    expect(app.formatFullName('亿速', '思维')).toBe('亿速思维');
+    expect(app.formatFullName('Xiao', 'Garry')).toBe('Garry Xiao');
+});
+
 test('Tests for getRoles', () => {
     var roles = app.getRoles(UserRole.User | UserRole.Manager | UserRole.Admin);
     expect(roles.length).toBe(3);

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

@@ -322,6 +322,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
     /**
      * Format refresh token result
      * @param result Refresh token result

package/lib/cjs/app/CoreApp.js

@@ -785,6 +785,22 @@ class CoreApp {
             this.refreshTokenFailed();
         });
     }
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName, givenName) {
+        if (!familyName)
+            return givenName !== null && givenName !== void 0 ? givenName : '';
+        if (!givenName)
+            return familyName !== null && familyName !== void 0 ? familyName : '';
+        const wf = givenName + ' ' + familyName;
+        if (wf.containChinese() || wf.containJapanese() || wf.containKorean()) {
+            return familyName + givenName;
+        }
+        return wf;
+    }
     /**
      * Format refresh token result
      * @param result Refresh token result

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

@@ -252,6 +252,12 @@ export interface IApp {
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
     /**
      * Format refresh token result
      * @param result Refresh token result

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

@@ -322,6 +322,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
     /**
      * Format refresh token result
      * @param result Refresh token result

package/lib/mjs/app/CoreApp.js

@@ -782,6 +782,22 @@ export class CoreApp {
             this.refreshTokenFailed();
         });
     }
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName, givenName) {
+        if (!familyName)
+            return givenName !== null && givenName !== void 0 ? givenName : '';
+        if (!givenName)
+            return familyName !== null && familyName !== void 0 ? familyName : '';
+        const wf = givenName + ' ' + familyName;
+        if (wf.containChinese() || wf.containJapanese() || wf.containKorean()) {
+            return familyName + givenName;
+        }
+        return wf;
+    }
     /**
      * Format refresh token result
      * @param result Refresh token result

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

@@ -252,6 +252,12 @@ export interface IApp {
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
     /**
      * Format refresh token result
      * @param result Refresh token result

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.66",
+    "version": "1.3.67",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,18 +52,18 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.23",
-        "@etsoo/restclient": "^1.0.84",
-        "@etsoo/shared": "^1.1.88",
+        "@etsoo/notificationbase": "^1.1.24",
+        "@etsoo/restclient": "^1.0.85",
+        "@etsoo/shared": "^1.1.89",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.20.7",
-        "@babel/core": "^7.20.12",
-        "@babel/plugin-transform-runtime": "^7.19.6",
+        "@babel/cli": "^7.21.0",
+        "@babel/core": "^7.21.0",
+        "@babel/plugin-transform-runtime": "^7.21.0",
         "@babel/preset-env": "^7.20.2",
-        "@babel/runtime-corejs3": "^7.20.13",
+        "@babel/runtime-corejs3": "^7.21.0",
         "@types/jest": "^29.4.0",
         "jest": "^29.4.3",
         "jest-environment-jsdom": "^29.4.3",

package/src/app/CoreApp.ts

@@ -1104,6 +1104,24 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(
+        familyName: string | undefined | null,
+        givenName: string | undefined | null
+    ) {
+        if (!familyName) return givenName ?? '';
+        if (!givenName) return familyName ?? '';
+        const wf = givenName + ' ' + familyName;
+        if (wf.containChinese() || wf.containJapanese() || wf.containKorean()) {
+            return familyName + givenName;
+        }
+        return wf;
+    }
+
     /**
      * Format refresh token result
      * @param result Refresh token result

package/src/app/IApp.ts

@@ -345,6 +345,16 @@ export interface IApp {
         silent?: boolean
     ): void;
 
+    /**
+     * Format as full name
+     * @param familyName Family name
+     * @param givenName Given name
+     */
+    formatFullName(
+        familyName: string | undefined | null,
+        givenName: string | undefined | null
+    ): string;
+
     /**
      * Format refresh token result
      * @param result Refresh token result