@todesktop/shared 7.58.0 → 7.62.0

package/lib/base.d.ts

@@ -0,0 +1,12 @@
+export interface Schemable {
+    schemaVersion?: number;
+}
+export interface BaseApp extends Schemable {
+    id: string;
+    subscription?: {
+        status: string;
+        subscriptionId: string;
+        itemId: string;
+        planId: string;
+    };
+}

package/lib/base.js

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

package/lib/desktopify2.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-import { IApp, ISwitchableValue } from "./toDesktop";
+import { ISwitchableValue } from "./toDesktop";
 import { MenuItemConstructorOptions, BrowserWindowConstructorOptions, WebPreferences } from "@todesktop/client-electron-types";
+import { BaseApp, Schemable } from "./base";
 /**
  * Custom ToDesktop Roles for Application & Tray Menus
  */
@@ -41,7 +42,7 @@ export interface DesktopifyAppTray {
     rightClick: DesktopifyAppTrayAction;
     leftClick: DesktopifyAppTrayAction;
 }
-export declare type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions[];
+export declare type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions;
 /**
  * Whitelist of allowed DesktopifyWindow Options.
  * These attrs (if set) are passed to the `BrowserWindow` constructor
@@ -135,15 +136,11 @@ export interface DesktopifyAppWindow {
         webPreferences?: Pick<WebPreferences, whitelistedWebPreferencesOptions>;
     };
 }
-export interface DesktopifyApp2 {
+export interface DesktopifyApp2 extends Schemable {
     /**
      * The name of the app
      */
     name: string;
-    /**
-     * A unique app id
-     */
-    id: string;
     /**
      * The app icon
      */
@@ -250,9 +247,7 @@ export interface DesktopifyApp2 {
      */
     menus: DesktopifyAppMenu[];
 }
-export interface IApp2 extends IApp {
-    windows: DesktopifyAppWindow[];
-    trays: DesktopifyAppTray[];
-    menus: DesktopifyAppMenu[];
+export interface IApp2 extends BaseApp {
+    desktopApp?: DesktopifyApp2;
 }
 export {};

package/lib/desktopify2.js

@@ -43,7 +43,7 @@ exports.allowedBrowserWindowConstructorOptions = [
     "visualEffectState",
     "titleBarStyle",
     "trafficLightPosition",
-    "roundedCorners",
+    // "roundedCorners",
     "fullscreenWindowTitle",
     "thickFrame",
     "type",

package/lib/index.d.ts

@@ -3,6 +3,7 @@ export * from "./desktopify";
 export * from "./validations";
 export * from "./getSiteInfo";
 export * from "./plans";
+export * from './base';
 export * from "./desktopify2";
 declare const schemaVersion: string;
 export { schemaVersion };

package/lib/toDesktop.d.ts

@@ -1,3 +1,4 @@
+import { BaseApp, Schemable } from "./base";
 import { ExtraFileReference, FilePath, IAppBuilderLib, URL } from "./desktopify";
 export declare type IUploadFileStatus = "error" | "success" | "done" | "uploading" | "removed";
 export interface IUploadFile {
@@ -191,12 +192,6 @@ export interface IAppPublishedVersions {
     desktopify?: string;
     version?: string;
 }
-interface IStripeSubscription {
-    status: string;
-    subscriptionId: string;
-    itemId: string;
-    planId: string;
-}
 export interface ISwitchableValue<T> {
     enabled: boolean;
     value: T;
@@ -233,7 +228,7 @@ export interface CustomWindowsCodeSignEV {
     hsmCertType: WindowsHSMCertType.ev;
     hsmCertName: string;
 }
-export interface IApp {
+export interface IApp extends BaseApp {
     appModelId: string;
     appPkgName?: string;
     appProtocol?: ISwitchableValue<string>;
@@ -254,7 +249,6 @@ export interface IApp {
     };
     icon?: string;
     icons?: IIcon[];
-    id: string;
     internalUrls?: ISwitchableValue<string>;
     isContextMenuDisabled: boolean;
     isDevToolsDisabled: boolean;
@@ -293,7 +287,6 @@ export interface IApp {
     snapStore?: {
         login?: string;
     };
-    subscription?: IStripeSubscription;
     themeSource?: "system" | "light" | "dark";
     themeSourceMac?: "system" | "light" | "dark";
     toggleVisibilityKeyboardShortcut?: ISwitchableValue<string>;
@@ -302,9 +295,8 @@ export interface IApp {
     windowOptions: IWindowOptions;
     pollForAppUpdatesEveryXMinutes?: number;
 }
-export interface IUser {
+export interface IUser extends Schemable {
     id: string;
-    schemaVersion?: number;
     authInfo?: {};
     avatar?: string;
     currentApplication?: string;
@@ -322,4 +314,3 @@ export interface CiInput {
     buildId?: string;
     userId: string;
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todesktop/shared",
-  "version": "7.58.0",
+  "version": "7.62.0",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/src/base.ts

@@ -0,0 +1,13 @@
+export interface Schemable {
+  schemaVersion?: number;
+}
+
+export interface BaseApp extends Schemable {
+  id: string;
+  subscription?: {
+    status: string;
+    subscriptionId: string;
+    itemId: string;
+    planId: string;
+  };
+}

package/src/desktopify2.ts

@@ -1,9 +1,10 @@
-import { IApp, ISwitchableValue } from "./toDesktop";
+import { ISwitchableValue } from "./toDesktop";
 import {
   MenuItemConstructorOptions,
   BrowserWindowConstructorOptions,
   WebPreferences,
 } from "@todesktop/client-electron-types";
+import { BaseApp, Schemable } from "./base";
 
 /**
  * Custom ToDesktop Roles for Application & Tray Menus
@@ -67,7 +68,7 @@ export interface DesktopifyAppTray {
   leftClick: DesktopifyAppTrayAction;
 }
 
-export type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions[];
+export type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions;
 
 /**
  * Whitelist of allowed DesktopifyWindow Options.
@@ -114,7 +115,7 @@ export const allowedBrowserWindowConstructorOptions: Readonly<
   "visualEffectState",
   "titleBarStyle",
   "trafficLightPosition",
-  "roundedCorners",
+  // "roundedCorners",
   "fullscreenWindowTitle",
   "thickFrame",
   "type",
@@ -242,15 +243,11 @@ export interface DesktopifyAppWindow {
 }
 // TODO: Look into hasMinHeight, etc
 
-export interface DesktopifyApp2 {
+export interface DesktopifyApp2 extends Schemable {
   /**
    * The name of the app
    */
   name: string;
-  /**
-   * A unique app id
-   */
-  id: string;
   /**
    * The app icon
    */
@@ -358,8 +355,6 @@ export interface DesktopifyApp2 {
   menus: DesktopifyAppMenu[];
 }
 
-export interface IApp2 extends IApp {
-  windows: DesktopifyAppWindow[];
-  trays: DesktopifyAppTray[];
-  menus: DesktopifyAppMenu[];
+export interface IApp2 extends BaseApp {
+  desktopApp?: DesktopifyApp2;
 }

package/src/index.ts

@@ -5,6 +5,7 @@ export * from "./desktopify";
 export * from "./validations";
 export * from "./getSiteInfo";
 export * from "./plans";
+export * from './base';
 
 export * from "./desktopify2";
 

package/src/toDesktop.ts

@@ -1,3 +1,4 @@
+import { BaseApp, Schemable } from "./base";
 import {
   ExtraFileReference,
   FilePath,
@@ -216,13 +217,6 @@ export interface IAppPublishedVersions {
   version?: string;
 }
 
-interface IStripeSubscription {
-  status: string;
-  subscriptionId: string;
-  itemId: string;
-  planId: string;
-}
-
 export interface ISwitchableValue<T> {
   enabled: boolean;
   value: T;
@@ -267,7 +261,7 @@ export interface CustomWindowsCodeSignEV {
   hsmCertName: string;
 }
 
-export interface IApp {
+export interface IApp extends BaseApp {
   appModelId: string;
   appPkgName?: string;
   appProtocol?: ISwitchableValue<string>;
@@ -286,7 +280,6 @@ export interface IApp {
   environmentVariables?: { [propertyName: string]: string };
   icon?: string;
   icons?: IIcon[];
-  id: string;
   internalUrls?: ISwitchableValue<string>;
   isContextMenuDisabled: boolean;
   isDevToolsDisabled: boolean;
@@ -301,7 +294,6 @@ export interface IApp {
   shouldUseRealUserAgent?: boolean;
   extraBrowserWindowOptions?: string;
   enablePushNotifications?: boolean;
-
   isTransitioningFromSquirrelWindows?: boolean;
   jsToInject?: string;
   menubarIcon?: string;
@@ -324,7 +316,6 @@ export interface IApp {
   shouldOnlySendAbsolutelyNecessaryRequests?: boolean;
   shouldReuseRendererProcess?: boolean;
   snapStore?: { login?: string };
-  subscription?: IStripeSubscription;
   themeSource?: "system" | "light" | "dark";
   themeSourceMac?: "system" | "light" | "dark";
   toggleVisibilityKeyboardShortcut?: ISwitchableValue<string>;
@@ -334,9 +325,8 @@ export interface IApp {
   pollForAppUpdatesEveryXMinutes?: number;
 }
 
-export interface IUser {
+export interface IUser extends Schemable {
   id: string;
-  schemaVersion?: number;
   authInfo?: {};
   avatar?: string;
   currentApplication?: string;