@etsoo/appscript 1.2.38 → 1.2.42

package/lib/cjs/bridges/BridgeUtils.d.ts

@@ -0,0 +1,15 @@
+import { IBridgeHost } from './IBridgeHost';
+/**
+ * Bridge utils
+ */
+export declare namespace BridgeUtils {
+    /**
+     * Is electron client
+     * @returns Result
+     */
+    function isElectronClient(): boolean;
+    /**
+     * Bridge host
+     */
+    const host: IBridgeHost | undefined;
+}

package/lib/cjs/bridges/BridgeUtils.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BridgeUtils = void 0;
+/**
+ * Bridge utils
+ */
+var BridgeUtils;
+(function (BridgeUtils) {
+    /**
+     * Is electron client
+     * @returns Result
+     */
+    function isElectronClient() {
+        // Renderer process
+        if (typeof window !== 'undefined' &&
+            typeof window.process === 'object' &&
+            window.process.type === 'renderer') {
+            return true;
+        }
+        // Main process
+        if (typeof process !== 'undefined' &&
+            typeof process.versions === 'object' &&
+            !!process.versions.electron) {
+            return true;
+        }
+        // Detect the user agent when the `nodeIntegration` option is set to true
+        if (typeof navigator === 'object' &&
+            typeof navigator.userAgent === 'string' &&
+            navigator.userAgent.indexOf('Electron') >= 0) {
+            return true;
+        }
+        return false;
+    }
+    BridgeUtils.isElectronClient = isElectronClient;
+    /**
+     * Bridge host
+     */
+    BridgeUtils.host = isElectronClient()
+        ? globalThis.electron
+        : undefined;
+})(BridgeUtils = exports.BridgeUtils || (exports.BridgeUtils = {}));

package/lib/cjs/bridges/IBridgeHost.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Bridge host
+ */
+export interface IBridgeHost {
+    /**
+     * Change culture
+     * @param locale Locale
+     */
+    changeCulture(locale: string): void;
+    /**
+     * Exit the application
+     */
+    exit(): void;
+    /**
+     * Load application
+     * @param name App name
+     */
+    loadApp(name: string): void;
+}

package/lib/cjs/index.d.ts

@@ -5,9 +5,8 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/UserRole';
-export * from './bridges/ElectronBridge';
-export * from './bridges/IAppData';
-export * from './bridges/IBridge';
+export * from './bridges/BridgeUtils';
+export * from './bridges/IBridgeHost';
 export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/EntityStatus';

package/lib/cjs/index.js

@@ -21,9 +21,8 @@ __exportStar(require("./app/CoreApp"), exports);
 __exportStar(require("./app/ExternalSettings"), exports);
 __exportStar(require("./app/UserRole"), exports);
 // bridges
-__exportStar(require("./bridges/ElectronBridge"), exports);
-__exportStar(require("./bridges/IAppData"), exports);
-__exportStar(require("./bridges/IBridge"), exports);
+__exportStar(require("./bridges/BridgeUtils"), exports);
+__exportStar(require("./bridges/IBridgeHost"), exports);
 // business
 __exportStar(require("./business/BusinessTax"), exports);
 __exportStar(require("./business/BusinessUtils"), exports);

package/lib/cjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Action result
  */
@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error): IActionResult<D>;
+    static create<D extends {} = {}>(error: Error): IActionResult<D>;
 }

package/lib/cjs/result/IActionResult.d.ts

@@ -1,19 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 /**
  * Result errors
  * Indexable type
@@ -24,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -65,4 +50,10 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export declare type ActionResultId = IActionResult<IdResultData>;
+export declare type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+    id: T;
+}>;
+/**
+ * Action result with dynamic data
+ */
+export declare type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/cjs/result/InitCallResult.d.ts

@@ -1,8 +1,8 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */

package/lib/mjs/bridges/BridgeUtils.d.ts

@@ -0,0 +1,15 @@
+import { IBridgeHost } from './IBridgeHost';
+/**
+ * Bridge utils
+ */
+export declare namespace BridgeUtils {
+    /**
+     * Is electron client
+     * @returns Result
+     */
+    function isElectronClient(): boolean;
+    /**
+     * Bridge host
+     */
+    const host: IBridgeHost | undefined;
+}

package/lib/mjs/bridges/BridgeUtils.js

@@ -0,0 +1,38 @@
+/**
+ * Bridge utils
+ */
+export var BridgeUtils;
+(function (BridgeUtils) {
+    /**
+     * Is electron client
+     * @returns Result
+     */
+    function isElectronClient() {
+        // Renderer process
+        if (typeof window !== 'undefined' &&
+            typeof window.process === 'object' &&
+            window.process.type === 'renderer') {
+            return true;
+        }
+        // Main process
+        if (typeof process !== 'undefined' &&
+            typeof process.versions === 'object' &&
+            !!process.versions.electron) {
+            return true;
+        }
+        // Detect the user agent when the `nodeIntegration` option is set to true
+        if (typeof navigator === 'object' &&
+            typeof navigator.userAgent === 'string' &&
+            navigator.userAgent.indexOf('Electron') >= 0) {
+            return true;
+        }
+        return false;
+    }
+    BridgeUtils.isElectronClient = isElectronClient;
+    /**
+     * Bridge host
+     */
+    BridgeUtils.host = isElectronClient()
+        ? globalThis.electron
+        : undefined;
+})(BridgeUtils || (BridgeUtils = {}));

package/lib/mjs/bridges/IBridgeHost.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Bridge host
+ */
+export interface IBridgeHost {
+    /**
+     * Change culture
+     * @param locale Locale
+     */
+    changeCulture(locale: string): void;
+    /**
+     * Exit the application
+     */
+    exit(): void;
+    /**
+     * Load application
+     * @param name App name
+     */
+    loadApp(name: string): void;
+}

package/lib/mjs/index.d.ts

@@ -5,9 +5,8 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/UserRole';
-export * from './bridges/ElectronBridge';
-export * from './bridges/IAppData';
-export * from './bridges/IBridge';
+export * from './bridges/BridgeUtils';
+export * from './bridges/IBridgeHost';
 export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/EntityStatus';

package/lib/mjs/index.js

@@ -8,9 +8,8 @@ export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/UserRole';
 // bridges
-export * from './bridges/ElectronBridge';
-export * from './bridges/IAppData';
-export * from './bridges/IBridge';
+export * from './bridges/BridgeUtils';
+export * from './bridges/IBridgeHost';
 // business
 export * from './business/BusinessTax';
 export * from './business/BusinessUtils';

package/lib/mjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Action result
  */
@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error): IActionResult<D>;
+    static create<D extends {} = {}>(error: Error): IActionResult<D>;
 }

package/lib/mjs/result/IActionResult.d.ts

@@ -1,19 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 /**
  * Result errors
  * Indexable type
@@ -24,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -65,4 +50,10 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export declare type ActionResultId = IActionResult<IdResultData>;
+export declare type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+    id: T;
+}>;
+/**
+ * Action result with dynamic data
+ */
+export declare type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/mjs/result/InitCallResult.d.ts

@@ -1,8 +1,8 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.38",
+    "version": "1.2.42",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,23 +54,23 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/restclient": "^1.0.64",
-        "@etsoo/shared": "^1.1.10",
+        "@etsoo/shared": "^1.1.11",
         "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.17.0",
-        "@babel/core": "^7.17.0",
+        "@babel/core": "^7.17.2",
         "@babel/plugin-transform-runtime": "^7.17.0",
         "@babel/preset-env": "^7.16.11",
-        "@babel/runtime-corejs3": "^7.17.0",
+        "@babel/runtime-corejs3": "^7.17.2",
         "@types/jest": "^27.4.0",
         "@typescript-eslint/eslint-plugin": "^5.11.0",
         "@typescript-eslint/parser": "^5.11.0",
         "eslint": "^8.8.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
-        "jest": "^27.5.0",
+        "jest": "^27.5.1",
         "ts-jest": "^27.1.3",
         "typescript": "^4.5.5"
     }

package/src/bridges/BridgeUtils.ts

@@ -0,0 +1,48 @@
+import { IBridgeHost } from './IBridgeHost';
+
+/**
+ * Bridge utils
+ */
+export namespace BridgeUtils {
+    /**
+     * Is electron client
+     * @returns Result
+     */
+    export function isElectronClient() {
+        // Renderer process
+        if (
+            typeof window !== 'undefined' &&
+            typeof window.process === 'object' &&
+            (window.process as any).type === 'renderer'
+        ) {
+            return true;
+        }
+
+        // Main process
+        if (
+            typeof process !== 'undefined' &&
+            typeof process.versions === 'object' &&
+            !!process.versions.electron
+        ) {
+            return true;
+        }
+
+        // Detect the user agent when the `nodeIntegration` option is set to true
+        if (
+            typeof navigator === 'object' &&
+            typeof navigator.userAgent === 'string' &&
+            navigator.userAgent.indexOf('Electron') >= 0
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Bridge host
+     */
+    export const host = isElectronClient()
+        ? ((globalThis as any).electron as IBridgeHost)
+        : undefined;
+}

package/src/bridges/IBridgeHost.ts

@@ -0,0 +1,21 @@
+/**
+ * Bridge host
+ */
+export interface IBridgeHost {
+    /**
+     * Change culture
+     * @param locale Locale
+     */
+    changeCulture(locale: string): void;
+
+    /**
+     * Exit the application
+     */
+    exit(): void;
+
+    /**
+     * Load application
+     * @param name App name
+     */
+    loadApp(name: string): void;
+}

package/src/index.ts

@@ -10,9 +10,8 @@ export * from './app/ExternalSettings';
 export * from './app/UserRole';
 
 // bridges
-export * from './bridges/ElectronBridge';
-export * from './bridges/IAppData';
-export * from './bridges/IBridge';
+export * from './bridges/BridgeUtils';
+export * from './bridges/IBridgeHost';
 
 // business
 export * from './business/BusinessTax';

package/src/result/ActionResult.ts

@@ -1,5 +1,5 @@
 import { ApiError } from '@etsoo/restclient';
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 
 /**
  * Action result
@@ -9,7 +9,7 @@ export class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends IResultData = IResultData>(error: Error) {
+    static create<D extends {} = {}>(error: Error) {
         // If the error is ApiError, hold the status
         const status = error instanceof ApiError ? error.status : undefined;
 

package/src/result/IActionResult.ts

@@ -1,20 +1,4 @@
-/**
- * Result data
- * Indexable type
- */
-export interface IResultData {
-    readonly [key: string]: any;
-}
-
-/**
- * Result data with id, follow this style to extend for specific model
- */
-export interface IdResultData extends IResultData {
-    /**
-     * Id
-     */
-    id: number | string;
-}
+import { DataTypes } from '@etsoo/shared';
 
 /**
  * Result errors
@@ -27,7 +11,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends IResultData = IResultData> {
+export interface IActionResult<D extends {} = {}> {
     /**
      * Status code
      */
@@ -77,4 +61,12 @@ export interface IActionResult<D extends IResultData = IResultData> {
 /**
  * Action result with id data
  */
-export type ActionResultId = IActionResult<IdResultData>;
+export type IdActionResult<T extends DataTypes.IdType = number> =
+    IActionResult<{
+        id: T;
+    }>;
+
+/**
+ * Action result with dynamic data
+ */
+export type DynamicActionResult = IActionResult<Record<string, any>>;

package/src/result/InitCallResult.ts

@@ -1,9 +1,9 @@
-import { IActionResult, IResultData } from './IActionResult';
+import { IActionResult } from './IActionResult';
 
 /**
  * Init call result data
  */
-export interface InitCallResultData extends IResultData {
+export interface InitCallResultData {
     /**
      * Device id
      */

package/lib/cjs/bridges/ElectronBridge.d.ts

@@ -1,7 +0,0 @@
-import { IBridge } from './IBridge';
-/**
- * Electron bridge class
- * copes with preload.js, contextBridge.exposeInMainWorld
- * BrowserWindow.webPreferences, contextIsolation: true
- */
-export declare const AppRuntime: IBridge;

package/lib/cjs/bridges/ElectronBridge.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppRuntime = void 0;
-/**
- * Electron bridge class
- * copes with preload.js, contextBridge.exposeInMainWorld
- * BrowserWindow.webPreferences, contextIsolation: true
- */
-exports.AppRuntime = globalThis.appRuntime;

package/lib/cjs/bridges/IAppData.d.ts

@@ -1,17 +0,0 @@
-/**
- * Bridge App Data interface
- */
-export interface IAppData {
-    /**
-     * Application name
-     */
-    name: string;
-    /**
-     * Application version
-     */
-    version: string;
-    /**
-     * Application path
-     */
-    path: string;
-}

package/lib/cjs/bridges/IBridge.d.ts

@@ -1,26 +0,0 @@
-/**
- * IBridge unsubscribe type
- */
-declare type IBridgeUnsubscribe = () => void;
-/**
- * IBridge subscribe listener type
- */
-declare type IBridgeListener = (...args: any[]) => void;
-/**
- * window.external calls bridge interface
- */
-export interface IBridge {
-    /**
-     * Send data to the host process with an unique channel
-     * @param channel an unique channel
-     * @param data Data to send
-     */
-    send(channel: string, data?: any): void;
-    /**
-     * Subscribe to the host process
-     * @param channel an unique channel
-     * @param listener callback listener
-     */
-    subscribe(channel: string, listener: IBridgeListener): IBridgeUnsubscribe;
-}
-export {};

package/lib/cjs/bridges/IBridge.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/mjs/bridges/ElectronBridge.d.ts

@@ -1,7 +0,0 @@
-import { IBridge } from './IBridge';
-/**
- * Electron bridge class
- * copes with preload.js, contextBridge.exposeInMainWorld
- * BrowserWindow.webPreferences, contextIsolation: true
- */
-export declare const AppRuntime: IBridge;

package/lib/mjs/bridges/ElectronBridge.js

@@ -1,6 +0,0 @@
-/**
- * Electron bridge class
- * copes with preload.js, contextBridge.exposeInMainWorld
- * BrowserWindow.webPreferences, contextIsolation: true
- */
-export const AppRuntime = globalThis.appRuntime;

package/lib/mjs/bridges/IAppData.d.ts

@@ -1,17 +0,0 @@
-/**
- * Bridge App Data interface
- */
-export interface IAppData {
-    /**
-     * Application name
-     */
-    name: string;
-    /**
-     * Application version
-     */
-    version: string;
-    /**
-     * Application path
-     */
-    path: string;
-}

package/lib/mjs/bridges/IBridge.d.ts

@@ -1,26 +0,0 @@
-/**
- * IBridge unsubscribe type
- */
-declare type IBridgeUnsubscribe = () => void;
-/**
- * IBridge subscribe listener type
- */
-declare type IBridgeListener = (...args: any[]) => void;
-/**
- * window.external calls bridge interface
- */
-export interface IBridge {
-    /**
-     * Send data to the host process with an unique channel
-     * @param channel an unique channel
-     * @param data Data to send
-     */
-    send(channel: string, data?: any): void;
-    /**
-     * Subscribe to the host process
-     * @param channel an unique channel
-     * @param listener callback listener
-     */
-    subscribe(channel: string, listener: IBridgeListener): IBridgeUnsubscribe;
-}
-export {};

package/lib/mjs/bridges/IBridge.js

@@ -1 +0,0 @@
-export {};

package/src/bridges/ElectronBridge.ts

@@ -1,8 +0,0 @@
-import { IBridge } from './IBridge';
-
-/**
- * Electron bridge class
- * copes with preload.js, contextBridge.exposeInMainWorld
- * BrowserWindow.webPreferences, contextIsolation: true
- */
-export const AppRuntime = (globalThis as any).appRuntime as IBridge;

package/src/bridges/IAppData.ts

@@ -1,19 +0,0 @@
-/**
- * Bridge App Data interface
- */
-export interface IAppData {
-    /**
-     * Application name
-     */
-    name: string;
-
-    /**
-     * Application version
-     */
-    version: string;
-
-    /**
-     * Application path
-     */
-    path: string;
-}

package/src/bridges/IBridge.ts

@@ -1,28 +0,0 @@
-/**
- * IBridge unsubscribe type
- */
-type IBridgeUnsubscribe = () => void;
-
-/**
- * IBridge subscribe listener type
- */
-type IBridgeListener = (...args: any[]) => void;
-
-/**
- * window.external calls bridge interface
- */
-export interface IBridge {
-    /**
-     * Send data to the host process with an unique channel
-     * @param channel an unique channel
-     * @param data Data to send
-     */
-    send(channel: string, data?: any): void;
-
-    /**
-     * Subscribe to the host process
-     * @param channel an unique channel
-     * @param listener callback listener
-     */
-    subscribe(channel: string, listener: IBridgeListener): IBridgeUnsubscribe;
-}