@openfin/node-adapter 35.79.1 → 35.79.3

package/out/node-adapter-alpha.d.ts

@@ -5018,6 +5018,7 @@ declare type EntityTypeHelpers<T extends EntityType_2> = T extends 'view' ? {
 
 declare interface Environment {
     initLayoutManager(fin: OpenFin.Fin<OpenFin.EntityType>, wire: Transport, options: OpenFin.InitLayoutOptions): Promise<OpenFin.LayoutManager<OpenFin.LayoutSnapshot>>;
+    applyLayoutSnapshot(fin: OpenFin.Fin<OpenFin.EntityType>, layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.InitLayoutOptions): Promise<void>;
     createLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.CreateLayoutOptions): Promise<void>;
     destroyLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<void>;
     resolveLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<any>;
@@ -8505,16 +8506,17 @@ declare type LayoutIdentity = Identity_5 & {
 };
 
 /**
- * Generated when the window is created, and all of its layout's views have either finished or failed
- * navigation, once per layout. Does not emit for any layouts added via Layout.create() call.
+ * Generated after a layout is created and all of its views have either finished or failed navigation
+ * once per layout. Does not emit for layouts created using Layout.replace() API.
  * @interface
  */
 declare type LayoutInitializedEvent = BaseEvent_5 & {
     type: 'layout-initialized';
     layoutIdentity: OpenFin.LayoutIdentity;
-    ofViews: (OpenFin.Identity & {
+    ofViews: {
+        identity: OpenFin.Identity;
         entityType: 'view';
-    })[];
+    }[];
 };
 
 /**
@@ -8882,9 +8884,11 @@ declare type LayoutPresetType = 'columns' | 'grid' | 'rows' | 'tabs';
 declare type LayoutReadyEvent = BaseEvent_5 & {
     type: 'layout-ready';
     layoutIdentity: OpenFin.LayoutIdentity;
-    views: (OpenFin.Identity & {
+    views: {
+        identity: OpenFin.Identity;
         success: boolean;
-    })[];
+        error?: Error;
+    }[];
 };
 
 /**

package/out/node-adapter-beta.d.ts

@@ -5018,6 +5018,7 @@ declare type EntityTypeHelpers<T extends EntityType_2> = T extends 'view' ? {
 
 declare interface Environment {
     initLayoutManager(fin: OpenFin.Fin<OpenFin.EntityType>, wire: Transport, options: OpenFin.InitLayoutOptions): Promise<OpenFin.LayoutManager<OpenFin.LayoutSnapshot>>;
+    applyLayoutSnapshot(fin: OpenFin.Fin<OpenFin.EntityType>, layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.InitLayoutOptions): Promise<void>;
     createLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.CreateLayoutOptions): Promise<void>;
     destroyLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<void>;
     resolveLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<any>;
@@ -8505,16 +8506,17 @@ declare type LayoutIdentity = Identity_5 & {
 };
 
 /**
- * Generated when the window is created, and all of its layout's views have either finished or failed
- * navigation, once per layout. Does not emit for any layouts added via Layout.create() call.
+ * Generated after a layout is created and all of its views have either finished or failed navigation
+ * once per layout. Does not emit for layouts created using Layout.replace() API.
  * @interface
  */
 declare type LayoutInitializedEvent = BaseEvent_5 & {
     type: 'layout-initialized';
     layoutIdentity: OpenFin.LayoutIdentity;
-    ofViews: (OpenFin.Identity & {
+    ofViews: {
+        identity: OpenFin.Identity;
         entityType: 'view';
-    })[];
+    }[];
 };
 
 /**
@@ -8882,9 +8884,11 @@ declare type LayoutPresetType = 'columns' | 'grid' | 'rows' | 'tabs';
 declare type LayoutReadyEvent = BaseEvent_5 & {
     type: 'layout-ready';
     layoutIdentity: OpenFin.LayoutIdentity;
-    views: (OpenFin.Identity & {
+    views: {
+        identity: OpenFin.Identity;
         success: boolean;
-    })[];
+        error?: Error;
+    }[];
 };
 
 /**

package/out/node-adapter-public.d.ts

@@ -5018,6 +5018,7 @@ declare type EntityTypeHelpers<T extends EntityType_2> = T extends 'view' ? {
 
 declare interface Environment {
     initLayoutManager(fin: OpenFin.Fin<OpenFin.EntityType>, wire: Transport, options: OpenFin.InitLayoutOptions): Promise<OpenFin.LayoutManager<OpenFin.LayoutSnapshot>>;
+    applyLayoutSnapshot(fin: OpenFin.Fin<OpenFin.EntityType>, layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.InitLayoutOptions): Promise<void>;
     createLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.CreateLayoutOptions): Promise<void>;
     destroyLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<void>;
     resolveLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<any>;
@@ -8505,16 +8506,17 @@ declare type LayoutIdentity = Identity_5 & {
 };
 
 /**
- * Generated when the window is created, and all of its layout's views have either finished or failed
- * navigation, once per layout. Does not emit for any layouts added via Layout.create() call.
+ * Generated after a layout is created and all of its views have either finished or failed navigation
+ * once per layout. Does not emit for layouts created using Layout.replace() API.
  * @interface
  */
 declare type LayoutInitializedEvent = BaseEvent_5 & {
     type: 'layout-initialized';
     layoutIdentity: OpenFin.LayoutIdentity;
-    ofViews: (OpenFin.Identity & {
+    ofViews: {
+        identity: OpenFin.Identity;
         entityType: 'view';
-    })[];
+    }[];
 };
 
 /**
@@ -8882,9 +8884,11 @@ declare type LayoutPresetType = 'columns' | 'grid' | 'rows' | 'tabs';
 declare type LayoutReadyEvent = BaseEvent_5 & {
     type: 'layout-ready';
     layoutIdentity: OpenFin.LayoutIdentity;
-    views: (OpenFin.Identity & {
+    views: {
+        identity: OpenFin.Identity;
         success: boolean;
-    })[];
+        error?: Error;
+    }[];
 };
 
 /**

package/out/node-adapter.d.ts

@@ -5066,6 +5066,7 @@ declare type EntityTypeHelpers<T extends EntityType_2> = T extends 'view' ? {
 
 declare interface Environment {
     initLayoutManager(fin: OpenFin.Fin<OpenFin.EntityType>, wire: Transport, options: OpenFin.InitLayoutOptions): Promise<OpenFin.LayoutManager<OpenFin.LayoutSnapshot>>;
+    applyLayoutSnapshot(fin: OpenFin.Fin<OpenFin.EntityType>, layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.InitLayoutOptions): Promise<void>;
     createLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, options: OpenFin.CreateLayoutOptions): Promise<void>;
     destroyLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<void>;
     resolveLayout(layoutManager: OpenFin.LayoutManager<OpenFin.LayoutSnapshot>, layoutIdentity: OpenFin.LayoutIdentity): Promise<any>;
@@ -8634,16 +8635,17 @@ declare type LayoutIdentity = Identity_5 & {
 };
 
 /**
- * Generated when the window is created, and all of its layout's views have either finished or failed
- * navigation, once per layout. Does not emit for any layouts added via Layout.create() call.
+ * Generated after a layout is created and all of its views have either finished or failed navigation
+ * once per layout. Does not emit for layouts created using Layout.replace() API.
  * @interface
  */
 declare type LayoutInitializedEvent = BaseEvent_5 & {
     type: 'layout-initialized';
     layoutIdentity: OpenFin.LayoutIdentity;
-    ofViews: (OpenFin.Identity & {
+    ofViews: {
+        identity: OpenFin.Identity;
         entityType: 'view';
-    })[];
+    }[];
 };
 
 /**
@@ -9181,9 +9183,11 @@ declare type LayoutPresetType = 'columns' | 'grid' | 'rows' | 'tabs';
 declare type LayoutReadyEvent = BaseEvent_5 & {
     type: 'layout-ready';
     layoutIdentity: OpenFin.LayoutIdentity;
-    views: (OpenFin.Identity & {
+    views: {
+        identity: OpenFin.Identity;
         success: boolean;
-    })[];
+        error?: Error;
+    }[];
 };
 
 /**

package/out/node-adapter.js

@@ -11287,7 +11287,7 @@ const validate_1 = validate;
 const base_1$6 = base$1;
 const common_utils_1 = commonUtils;
 const layout_entities_1 = layoutEntities;
-const layout_constants_1 = layout_constants;
+const layout_constants_1$1 = layout_constants;
 /**
  *
  * Layouts give app providers the ability to embed multiple views in a single window. The Layout namespace
@@ -11432,7 +11432,7 @@ class Layout extends base_1$6.Base {
          * Lazily constructed {@link LayoutEntitiesClient} bound to this platform's client and identity
          * The client is for {@link LayoutEntitiesController}
          */
-        _Layout_layoutClient.set(this, new lazy_1.Lazy(async () => layout_entities_1.LayoutNode.newLayoutEntitiesClient(await this.platform.getClient(), layout_constants_1.LAYOUT_CONTROLLER_ID, this.identity)));
+        _Layout_layoutClient.set(this, new lazy_1.Lazy(async () => layout_entities_1.LayoutNode.newLayoutEntitiesClient(await this.platform.getClient(), layout_constants_1$1.LAYOUT_CONTROLLER_ID, this.identity)));
         /**
          * Replaces a Platform window's layout with a new layout.
          *
@@ -11660,11 +11660,12 @@ var __classPrivateFieldSet$4 = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _LayoutModule_instances, _LayoutModule_layoutInitializationAttempted, _LayoutModule_layoutManager, _LayoutModule_waitForBackCompatLayoutManager, _LayoutModule_getSafeLayoutManager;
+var _LayoutModule_instances, _LayoutModule_layoutInitializationAttempted, _LayoutModule_layoutManager, _LayoutModule_getSafeLayoutManager;
 Object.defineProperty(Factory$2, "__esModule", { value: true });
 Factory$2.LayoutModule = void 0;
 const base_1$5 = base$1;
 const Instance_1$2 = Instance$1;
+const layout_constants_1 = layout_constants;
 /**
  * Static namespace for OpenFin API methods that interact with the {@link Layout} class, available under `fin.Platform.Layout`.
  */
@@ -11723,45 +11724,18 @@ class LayoutModule extends base_1$5.Base {
                 throw new Error('Layout.init was already called, please use Layout.create to add additional layouts.');
             }
             __classPrivateFieldSet$4(this, _LayoutModule_layoutInitializationAttempted, true, "f");
+            // preload the client
+            await this.fin.Platform.getCurrentSync().getClient();
             __classPrivateFieldSet$4(this, _LayoutModule_layoutManager, await this.wire.environment.initLayoutManager(this.fin, this.wire, options), "f");
-            // in single-layout case, we return the undocumented layoutManager type (deprecate with CORE-1081)
-            let backCompatLayoutPromise;
+            await this.wire.environment.applyLayoutSnapshot(this.fin, __classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f"), options);
             if (!options.layoutManagerOverride) {
-                backCompatLayoutPromise = __classPrivateFieldGet$4(this, _LayoutModule_waitForBackCompatLayoutManager, "f").call(this, this.fin);
-            }
-            // apply the initial snapshot which in turn will call fin.Platform.Layout.create()
-            const platformClient = await this.fin.Platform.getCurrentSync().getClient();
-            const snapshot = await platformClient.dispatch('get-initial-layout-snapshot');
-            await __classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f").applyLayoutSnapshot(snapshot);
-            if (backCompatLayoutPromise) {
-                return backCompatLayoutPromise;
+                // in single-layout case, we return the undocumented layoutManager type (deprecate with CORE-1081)
+                const layoutIdentity = { layoutName: layout_constants_1.DEFAULT_LAYOUT_KEY, ...this.fin.me.identity };
+                const layoutManager = await this.wire.environment.resolveLayout(__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f"), layoutIdentity);
+                return Object.assign(this.wrapSync(layoutIdentity), { layoutManager });
             }
-            // warn user if they do not call create() in the next 30 seconds
-            setTimeout(() => {
-                if (__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f")?.size() === 0) {
-                    console.warn(`[Layout.init] Layout.init was called 30s ago, but no layouts have been created yet. Make sure you ` +
-                        `override LayoutManager.applyLayoutSnapshot, and then call fin.Platform.Layout.create()`);
-                }
-            }, 30000);
             return this.wrapSync(this.fin.me.identity);
         };
-        // deprecate with CORE-1081
-        _LayoutModule_waitForBackCompatLayoutManager.set(this, async (fin) => {
-            let layoutManager;
-            let resolve;
-            const layoutResolved = new Promise((r) => {
-                resolve = r;
-            });
-            // wait for a layout to be created
-            await fin.me.once('layout-ready', async ({ layoutIdentity }) => {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                layoutManager = await this.wire.environment.resolveLayout(__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f"), layoutIdentity);
-                // Backward compat - undocumented / not typed openfin-layout as layoutManager
-                // TODO: eventually deprecate this
-                resolve(Object.assign(this.wrapSync(layoutIdentity), { layoutManager }));
-            });
-            return layoutResolved;
-        });
         /**
          * Returns the layout manager for the current window
          * @returns
@@ -11871,7 +11845,7 @@ class LayoutModule extends base_1$5.Base {
     }
 }
 Factory$2.LayoutModule = LayoutModule;
-_LayoutModule_layoutInitializationAttempted = new WeakMap(), _LayoutModule_layoutManager = new WeakMap(), _LayoutModule_waitForBackCompatLayoutManager = new WeakMap(), _LayoutModule_instances = new WeakSet(), _LayoutModule_getSafeLayoutManager = function _LayoutModule_getSafeLayoutManager(method) {
+_LayoutModule_layoutInitializationAttempted = new WeakMap(), _LayoutModule_layoutManager = new WeakMap(), _LayoutModule_instances = new WeakSet(), _LayoutModule_getSafeLayoutManager = function _LayoutModule_getSafeLayoutManager(method) {
     if (!__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f")) {
         throw new Error(`You must call init before using the API ${method}`);
     }
@@ -16182,6 +16156,9 @@ function requireNodeEnv () {
 	    async initLayoutManager() {
 	        throw new Error('Method not implemented.');
 	    }
+	    async applyLayoutSnapshot() {
+	        throw new Error('Method not implemented.');
+	    }
 	    async createLayout() {
 	        throw new Error('Method not implemented.');
 	    }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/node-adapter",
-    "version": "35.79.1",
+    "version": "35.79.3",
     "description": "See README.md",
     "main": "out/node-adapter.js",
     "types": "out/node-adapter.d.ts",