@todesktop/shared 7.57.0 → 7.61.0

package/lib/desktopify2.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { IApp, ISwitchableValue } from "./toDesktop";
+import { IApp, ISwitchableValue, Schemable } from "./toDesktop";
 import { MenuItemConstructorOptions, BrowserWindowConstructorOptions, WebPreferences } from "@todesktop/client-electron-types";
 /**
  * Custom ToDesktop Roles for Application & Tray Menus
@@ -41,6 +41,7 @@ export interface DesktopifyAppTray {
     rightClick: DesktopifyAppTrayAction;
     leftClick: DesktopifyAppTrayAction;
 }
+export declare type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions;
 /**
  * Whitelist of allowed DesktopifyWindow Options.
  * These attrs (if set) are passed to the `BrowserWindow` constructor
@@ -82,7 +83,7 @@ export interface DesktopifyAppWindow {
     /**
      * The window's application menu
      */
-    applicationMenu: DesktopifyMenuItemConstructorOptions[];
+    applicationMenu: DesktopifyAppMenu[];
     /**
      * Keyboard shortcut to toggle window visibility
      */
@@ -134,15 +135,19 @@ export interface DesktopifyAppWindow {
         webPreferences?: Pick<WebPreferences, whitelistedWebPreferencesOptions>;
     };
 }
-export interface DesktopifyApp2 {
-    /**
-     * The name of the app
-     */
-    name: string;
+export interface DesktopifyApp2 extends Schemable {
     /**
      * A unique app id
      */
     id: string;
+    /**
+     * The current schema version, 2 or higher
+     */
+    schemaVersion: number;
+    /**
+     * The name of the app
+     */
+    name: string;
     /**
      * The app icon
      */
@@ -244,9 +249,14 @@ export interface DesktopifyApp2 {
      * The app's trays
      */
     trays: DesktopifyAppTray[];
+    /**
+     * The app's menus
+     */
+    menus: DesktopifyAppMenu[];
 }
 export interface IApp2 extends IApp {
     windows: DesktopifyAppWindow[];
     trays: DesktopifyAppTray[];
+    menus: DesktopifyAppMenu[];
 }
 export {};

package/lib/desktopify2.js

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

package/lib/toDesktop.d.ts

@@ -1,4 +1,7 @@
 import { ExtraFileReference, FilePath, IAppBuilderLib, URL } from "./desktopify";
+export interface Schemable {
+    schemaVersion?: number;
+}
 export declare type IUploadFileStatus = "error" | "success" | "done" | "uploading" | "removed";
 export interface IUploadFile {
     uid: string;
@@ -233,7 +236,7 @@ export interface CustomWindowsCodeSignEV {
     hsmCertType: WindowsHSMCertType.ev;
     hsmCertName: string;
 }
-export interface IApp {
+export interface IApp extends Schemable {
     appModelId: string;
     appPkgName?: string;
     appProtocol?: ISwitchableValue<string>;
@@ -302,9 +305,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;

package/package.json

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

package/src/desktopify2.ts

@@ -1,4 +1,4 @@
-import { IApp, ISwitchableValue } from "./toDesktop";
+import { IApp, ISwitchableValue, Schemable } from "./toDesktop";
 import {
   MenuItemConstructorOptions,
   BrowserWindowConstructorOptions,
@@ -67,6 +67,8 @@ export interface DesktopifyAppTray {
   leftClick: DesktopifyAppTrayAction;
 }
 
+export type DesktopifyAppMenu = DesktopifyMenuItemConstructorOptions;
+
 /**
  * Whitelist of allowed DesktopifyWindow Options.
  * These attrs (if set) are passed to the `BrowserWindow` constructor
@@ -112,7 +114,7 @@ export const allowedBrowserWindowConstructorOptions: Readonly<
   "visualEffectState",
   "titleBarStyle",
   "trafficLightPosition",
-  "roundedCorners",
+  // "roundedCorners",
   "fullscreenWindowTitle",
   "thickFrame",
   "type",
@@ -183,7 +185,7 @@ export interface DesktopifyAppWindow {
   /**
    * The window's application menu
    */
-  applicationMenu: DesktopifyMenuItemConstructorOptions[];
+  applicationMenu: DesktopifyAppMenu[];
   /**
    * Keyboard shortcut to toggle window visibility
    */
@@ -240,15 +242,19 @@ export interface DesktopifyAppWindow {
 }
 // TODO: Look into hasMinHeight, etc
 
-export interface DesktopifyApp2 {
-  /**
-   * The name of the app
-   */
-  name: string;
+export interface DesktopifyApp2 extends Schemable {
   /**
    * A unique app id
    */
   id: string;
+  /**
+   * The current schema version, 2 or higher
+   */
+  schemaVersion: number;
+  /**
+   * The name of the app
+   */
+  name: string;
   /**
    * The app icon
    */
@@ -350,9 +356,14 @@ export interface DesktopifyApp2 {
    * The app's trays
    */
   trays: DesktopifyAppTray[];
+  /**
+   * The app's menus
+   */
+  menus: DesktopifyAppMenu[];
 }
 
 export interface IApp2 extends IApp {
   windows: DesktopifyAppWindow[];
   trays: DesktopifyAppTray[];
+  menus: DesktopifyAppMenu[];
 }

package/src/toDesktop.ts

@@ -5,6 +5,10 @@ import {
   URL,
 } from "./desktopify";
 
+export interface Schemable {
+  schemaVersion?: number;
+}
+
 export type IUploadFileStatus =
   | "error"
   | "success"
@@ -267,7 +271,7 @@ export interface CustomWindowsCodeSignEV {
   hsmCertName: string;
 }
 
-export interface IApp {
+export interface IApp extends Schemable {
   appModelId: string;
   appPkgName?: string;
   appProtocol?: ISwitchableValue<string>;
@@ -334,9 +338,8 @@ export interface IApp {
   pollForAppUpdatesEveryXMinutes?: number;
 }
 
-export interface IUser {
+export interface IUser extends Schemable {
   id: string;
-  schemaVersion?: number;
   authInfo?: {};
   avatar?: string;
   currentApplication?: string;