@etsoo/shared 1.1.87 → 1.1.89

package/README.md

@@ -204,6 +204,7 @@ DOM/window related utilities
 |mergeFormData|Merge form data to primary one|
 |mergeURLSearchParams|Merge URL search parameters|
 |setFocus|Set HTML element focus by name|
+|verifyPermission|Verify file system permission|
 
 ## ExtendUtils
 Extend current class/object functioning
@@ -245,6 +246,7 @@ String and other related utilities
 |addBlankItem|Add blank item to collection|
 |arrayDifferences|Array 1 items do not exist in Array 2 or reverse match|
 |charsToNumber|Base64 chars to number|
+|containChinese|Check the input string contains Chinese character or not|
 |correctTypes|Correct object's property value type|
 |equals|Two values equal|
 |exclude|Exclude specific items|

package/__tests__/Utils.ts

@@ -13,6 +13,14 @@ test('Tests for addBlankItem', () => {
     expect(options.length).toBe(3);
 });
 
+test('Tests for containChinese', () => {
+    expect('123 abC'.containChinese()).toBeFalsy();
+    expect('亿速思维'.containChinese()).toBeTruthy();
+    expect('亿速Etsoo'.containChinese()).toBeTruthy();
+    expect('김 민수'.containKorean()).toBeTruthy();
+    expect('ぁ-ん'.containJapanese()).toBeTruthy();
+});
+
 test('Tests for arrayDifferences', () => {
     const a1 = ['a', 'b', 'c', 'e'];
     const a2 = ['a', 'c', 'd'];

package/lib/cjs/DomUtils.d.ts

@@ -57,7 +57,7 @@ export declare namespace DomUtils {
      * @param suggestedName Suggested file name
      * @param autoDetect Auto detect, false will use link click way
      */
-    function downloadFile(data: ReadableStream | Blob, suggestedName?: string, autoDetect?: boolean): Promise<boolean>;
+    function downloadFile(data: ReadableStream | Blob, suggestedName?: string, autoDetect?: boolean): Promise<boolean | undefined>;
     /**
      * File to data URL
      * @param file File
@@ -141,4 +141,12 @@ export declare namespace DomUtils {
      * @param container Container, limits the element range
      */
     function setFocus(name: string | object, container?: HTMLElement): void;
+    /**
+     * Verify file system permission
+     * https://developer.mozilla.org/en-US/docs/Web/API/FileSystemHandle/requestPermission
+     * @param fileHandle FileSystemHandle
+     * @param withWrite With write permission
+     * @returns Result
+     */
+    function verifyPermission(fileHandle: any, withWrite?: boolean): Promise<boolean>;
 }

package/lib/cjs/DomUtils.js

@@ -242,9 +242,12 @@ var DomUtils;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (autoDetect && 'showSaveFilePicker' in globalThis) {
+                    // AbortError - Use dismisses the window
                     const handle = yield globalThis.showSaveFilePicker({
                         suggestedName
                     });
+                    if (!(yield verifyPermission(handle, true)))
+                        return undefined;
                     const stream = yield handle.createWritable();
                     if (data instanceof Blob) {
                         data.stream().pipeTo(stream);
@@ -474,4 +477,31 @@ var DomUtils;
             element.focus();
     }
     DomUtils.setFocus = setFocus;
+    /**
+     * Verify file system permission
+     * https://developer.mozilla.org/en-US/docs/Web/API/FileSystemHandle/requestPermission
+     * @param fileHandle FileSystemHandle
+     * @param withWrite With write permission
+     * @returns Result
+     */
+    function verifyPermission(fileHandle, withWrite = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!('queryPermission' in fileHandle) ||
+                !('requestPermission' in fileHandle))
+                return false;
+            // FileSystemHandlePermissionDescriptor
+            const opts = { mode: withWrite ? 'readwrite' : 'read' };
+            // Check if we already have permission, if so, return true.
+            if ((yield fileHandle.queryPermission(opts)) === 'granted') {
+                return true;
+            }
+            // Request permission to the file, if the user grants permission, return true.
+            if ((yield fileHandle.requestPermission(opts)) === 'granted') {
+                return true;
+            }
+            // The user did not grant permission, return false.
+            return false;
+        });
+    }
+    DomUtils.verifyPermission = verifyPermission;
 })(DomUtils = exports.DomUtils || (exports.DomUtils = {}));

package/lib/cjs/Utils.d.ts

@@ -1,9 +1,27 @@
 import { DataTypes } from './DataTypes';
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;

package/lib/cjs/Utils.js

@@ -15,6 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const DataTypes_1 = require("./DataTypes");
 const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
+String.prototype.containChinese = function () {
+    const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+String.prototype.containKorean = function () {
+    const regExp = /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+String.prototype.containJapanese = function () {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {

package/lib/mjs/DomUtils.d.ts

@@ -57,7 +57,7 @@ export declare namespace DomUtils {
      * @param suggestedName Suggested file name
      * @param autoDetect Auto detect, false will use link click way
      */
-    function downloadFile(data: ReadableStream | Blob, suggestedName?: string, autoDetect?: boolean): Promise<boolean>;
+    function downloadFile(data: ReadableStream | Blob, suggestedName?: string, autoDetect?: boolean): Promise<boolean | undefined>;
     /**
      * File to data URL
      * @param file File
@@ -141,4 +141,12 @@ export declare namespace DomUtils {
      * @param container Container, limits the element range
      */
     function setFocus(name: string | object, container?: HTMLElement): void;
+    /**
+     * Verify file system permission
+     * https://developer.mozilla.org/en-US/docs/Web/API/FileSystemHandle/requestPermission
+     * @param fileHandle FileSystemHandle
+     * @param withWrite With write permission
+     * @returns Result
+     */
+    function verifyPermission(fileHandle: any, withWrite?: boolean): Promise<boolean>;
 }

package/lib/mjs/DomUtils.js

@@ -239,9 +239,12 @@ export var DomUtils;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (autoDetect && 'showSaveFilePicker' in globalThis) {
+                    // AbortError - Use dismisses the window
                     const handle = yield globalThis.showSaveFilePicker({
                         suggestedName
                     });
+                    if (!(yield verifyPermission(handle, true)))
+                        return undefined;
                     const stream = yield handle.createWritable();
                     if (data instanceof Blob) {
                         data.stream().pipeTo(stream);
@@ -471,4 +474,31 @@ export var DomUtils;
             element.focus();
     }
     DomUtils.setFocus = setFocus;
+    /**
+     * Verify file system permission
+     * https://developer.mozilla.org/en-US/docs/Web/API/FileSystemHandle/requestPermission
+     * @param fileHandle FileSystemHandle
+     * @param withWrite With write permission
+     * @returns Result
+     */
+    function verifyPermission(fileHandle, withWrite = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!('queryPermission' in fileHandle) ||
+                !('requestPermission' in fileHandle))
+                return false;
+            // FileSystemHandlePermissionDescriptor
+            const opts = { mode: withWrite ? 'readwrite' : 'read' };
+            // Check if we already have permission, if so, return true.
+            if ((yield fileHandle.queryPermission(opts)) === 'granted') {
+                return true;
+            }
+            // Request permission to the file, if the user grants permission, return true.
+            if ((yield fileHandle.requestPermission(opts)) === 'granted') {
+                return true;
+            }
+            // The user did not grant permission, return false.
+            return false;
+        });
+    }
+    DomUtils.verifyPermission = verifyPermission;
 })(DomUtils || (DomUtils = {}));

package/lib/mjs/Utils.d.ts

@@ -1,9 +1,27 @@
 import { DataTypes } from './DataTypes';
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;

package/lib/mjs/Utils.js

@@ -9,6 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { DataTypes } from './DataTypes';
 import isEqual from 'lodash.isequal';
+String.prototype.containChinese = function () {
+    const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+String.prototype.containKorean = function () {
+    const regExp = /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+String.prototype.containJapanese = function () {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.87",
+    "version": "1.1.89",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,12 +54,12 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.2.5",
+        "@types/jest": "^29.4.0",
         "@types/lodash.isequal": "^4.5.6",
-        "jest": "^29.3.1",
-        "jest-environment-jsdom": "^29.3.1",
-        "ts-jest": "^29.0.3",
-        "typescript": "^4.9.4"
+        "jest": "^29.4.3",
+        "jest-environment-jsdom": "^29.4.3",
+        "ts-jest": "^29.0.5",
+        "typescript": "^4.9.5"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/DomUtils.ts

@@ -284,10 +284,13 @@ export namespace DomUtils {
     ) {
         try {
             if (autoDetect && 'showSaveFilePicker' in globalThis) {
+                // AbortError - Use dismisses the window
                 const handle = await (globalThis as any).showSaveFilePicker({
                     suggestedName
                 });
 
+                if (!(await verifyPermission(handle, true))) return undefined;
+
                 const stream = await handle.createWritable();
 
                 if (data instanceof Blob) {
@@ -547,4 +550,38 @@ export namespace DomUtils {
 
         if (element != null) element.focus();
     }
+
+    /**
+     * Verify file system permission
+     * https://developer.mozilla.org/en-US/docs/Web/API/FileSystemHandle/requestPermission
+     * @param fileHandle FileSystemHandle
+     * @param withWrite With write permission
+     * @returns Result
+     */
+    export async function verifyPermission(
+        fileHandle: any,
+        withWrite: boolean = false
+    ) {
+        if (
+            !('queryPermission' in fileHandle) ||
+            !('requestPermission' in fileHandle)
+        )
+            return false;
+
+        // FileSystemHandlePermissionDescriptor
+        const opts = { mode: withWrite ? 'readwrite' : 'read' };
+
+        // Check if we already have permission, if so, return true.
+        if ((await fileHandle.queryPermission(opts)) === 'granted') {
+            return true;
+        }
+
+        // Request permission to the file, if the user grants permission, return true.
+        if ((await fileHandle.requestPermission(opts)) === 'granted') {
+            return true;
+        }
+
+        // The user did not grant permission, return false.
+        return false;
+    }
 }

package/src/Utils.ts

@@ -3,9 +3,30 @@ import isEqual from 'lodash.isequal';
 
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
+
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;
@@ -51,6 +72,23 @@ declare global {
     }
 }
 
+String.prototype.containChinese = function (this: string): boolean {
+    const regExp =
+        /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+
+String.prototype.containKorean = function (this: string): boolean {
+    const regExp =
+        /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+
+String.prototype.containJapanese = function (this: string): boolean {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
+
 String.prototype.format = function (
     this: string,
     ...parameters: string[]