@openfin/core 40.103.4 → 40.103.5

package/out/mock-alpha.d.ts

@@ -4486,6 +4486,10 @@ declare type DomainSettings = {
      * more information, see the documentation for the individual properties.
      */
     default?: PerDomainSettings;
+    /**
+     * {@inheritDoc MultipleDomainMatchBehavior}
+     */
+    multipleMatchBehavior?: MultipleDomainMatchBehavior;
 };
 
 /**
@@ -4498,7 +4502,7 @@ declare type DomainSettingsRule = {
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
      * the domain(s) for which the rule applies.
      */
-    match?: string[];
+    match: string[];
     /**
      * Settings applied when a webcontents has been navigated to a matched domain.
      */
@@ -8864,6 +8868,19 @@ declare type MonitorInfoChangedEvent = BaseEvent_9 & OpenFin_2.MonitorInfo & {
  */
 declare type MultiInstanceViewBehavior = 'reparent' | 'duplicate' | 'default';
 
+/**
+ * Behavior for handling multiple {@link DomainSettingsRule} matches.
+ */
+declare type MultipleDomainMatchBehavior = 
+/**
+* Apply only the first matching rule in the list.
+*/
+'pick-first'
+/**
+* Deep-merge all matching rules in the list, prioritizing earlier matches.  Treats arrays as primitives.
+*/
+| 'deep-merge';
+
 /**
  * @interface
  */
@@ -9604,6 +9621,7 @@ declare namespace OpenFin_2 {
         RuntimeInfo,
         DefaultDomainSettings,
         DefaultDomainSettingsRule,
+        MultipleDomainMatchBehavior,
         DomainSettings,
         ApiInjection,
         DomainApiSettings,
@@ -9969,7 +9987,7 @@ declare type PerDomainSettings = {
         /**
          * {@inheritdoc ScreenCaptureBehavior}
          */
-        screenCapture: ScreenCaptureBehavior;
+        screenCapture?: ScreenCaptureBehavior;
         /**
          * {@inheritdoc ClipboardPermissions}
          */

package/out/mock-beta.d.ts

@@ -4486,6 +4486,10 @@ declare type DomainSettings = {
      * more information, see the documentation for the individual properties.
      */
     default?: PerDomainSettings;
+    /**
+     * {@inheritDoc MultipleDomainMatchBehavior}
+     */
+    multipleMatchBehavior?: MultipleDomainMatchBehavior;
 };
 
 /**
@@ -4498,7 +4502,7 @@ declare type DomainSettingsRule = {
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
      * the domain(s) for which the rule applies.
      */
-    match?: string[];
+    match: string[];
     /**
      * Settings applied when a webcontents has been navigated to a matched domain.
      */
@@ -8864,6 +8868,19 @@ declare type MonitorInfoChangedEvent = BaseEvent_9 & OpenFin_2.MonitorInfo & {
  */
 declare type MultiInstanceViewBehavior = 'reparent' | 'duplicate' | 'default';
 
+/**
+ * Behavior for handling multiple {@link DomainSettingsRule} matches.
+ */
+declare type MultipleDomainMatchBehavior = 
+/**
+* Apply only the first matching rule in the list.
+*/
+'pick-first'
+/**
+* Deep-merge all matching rules in the list, prioritizing earlier matches.  Treats arrays as primitives.
+*/
+| 'deep-merge';
+
 /**
  * @interface
  */
@@ -9604,6 +9621,7 @@ declare namespace OpenFin_2 {
         RuntimeInfo,
         DefaultDomainSettings,
         DefaultDomainSettingsRule,
+        MultipleDomainMatchBehavior,
         DomainSettings,
         ApiInjection,
         DomainApiSettings,
@@ -9969,7 +9987,7 @@ declare type PerDomainSettings = {
         /**
          * {@inheritdoc ScreenCaptureBehavior}
          */
-        screenCapture: ScreenCaptureBehavior;
+        screenCapture?: ScreenCaptureBehavior;
         /**
          * {@inheritdoc ClipboardPermissions}
          */

package/out/mock-public.d.ts

@@ -4486,6 +4486,10 @@ declare type DomainSettings = {
      * more information, see the documentation for the individual properties.
      */
     default?: PerDomainSettings;
+    /**
+     * {@inheritDoc MultipleDomainMatchBehavior}
+     */
+    multipleMatchBehavior?: MultipleDomainMatchBehavior;
 };
 
 /**
@@ -4498,7 +4502,7 @@ declare type DomainSettingsRule = {
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
      * the domain(s) for which the rule applies.
      */
-    match?: string[];
+    match: string[];
     /**
      * Settings applied when a webcontents has been navigated to a matched domain.
      */
@@ -8864,6 +8868,19 @@ declare type MonitorInfoChangedEvent = BaseEvent_9 & OpenFin_2.MonitorInfo & {
  */
 declare type MultiInstanceViewBehavior = 'reparent' | 'duplicate' | 'default';
 
+/**
+ * Behavior for handling multiple {@link DomainSettingsRule} matches.
+ */
+declare type MultipleDomainMatchBehavior = 
+/**
+* Apply only the first matching rule in the list.
+*/
+'pick-first'
+/**
+* Deep-merge all matching rules in the list, prioritizing earlier matches.  Treats arrays as primitives.
+*/
+| 'deep-merge';
+
 /**
  * @interface
  */
@@ -9604,6 +9621,7 @@ declare namespace OpenFin_2 {
         RuntimeInfo,
         DefaultDomainSettings,
         DefaultDomainSettingsRule,
+        MultipleDomainMatchBehavior,
         DomainSettings,
         ApiInjection,
         DomainApiSettings,
@@ -9969,7 +9987,7 @@ declare type PerDomainSettings = {
         /**
          * {@inheritdoc ScreenCaptureBehavior}
          */
-        screenCapture: ScreenCaptureBehavior;
+        screenCapture?: ScreenCaptureBehavior;
         /**
          * {@inheritdoc ClipboardPermissions}
          */

package/out/stub.d.ts

@@ -4545,6 +4545,10 @@ declare type DomainSettings = {
      * more information, see the documentation for the individual properties.
      */
     default?: PerDomainSettings;
+    /**
+     * {@inheritDoc MultipleDomainMatchBehavior}
+     */
+    multipleMatchBehavior?: MultipleDomainMatchBehavior;
 };
 
 /**
@@ -4557,7 +4561,7 @@ declare type DomainSettingsRule = {
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
      * the domain(s) for which the rule applies.
      */
-    match?: string[];
+    match: string[];
     /**
      * Settings applied when a webcontents has been navigated to a matched domain.
      */
@@ -9160,6 +9164,19 @@ declare type MonitorInfoChangedEvent = BaseEvent_9 & OpenFin_2.MonitorInfo & {
  */
 declare type MultiInstanceViewBehavior = 'reparent' | 'duplicate' | 'default';
 
+/**
+ * Behavior for handling multiple {@link DomainSettingsRule} matches.
+ */
+declare type MultipleDomainMatchBehavior = 
+/**
+* Apply only the first matching rule in the list.
+*/
+'pick-first'
+/**
+* Deep-merge all matching rules in the list, prioritizing earlier matches.  Treats arrays as primitives.
+*/
+| 'deep-merge';
+
 /**
  * @interface
  */
@@ -9922,6 +9939,7 @@ declare namespace OpenFin_2 {
         RuntimeInfo,
         DefaultDomainSettings,
         DefaultDomainSettingsRule,
+        MultipleDomainMatchBehavior,
         DomainSettings,
         ApiInjection,
         DomainApiSettings,
@@ -10287,7 +10305,7 @@ declare type PerDomainSettings = {
         /**
          * {@inheritdoc ScreenCaptureBehavior}
          */
-        screenCapture: ScreenCaptureBehavior;
+        screenCapture?: ScreenCaptureBehavior;
         /**
          * {@inheritdoc ClipboardPermissions}
          */

package/out/stub.js

@@ -15333,7 +15333,13 @@ PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 	    const getResultPromise = new Promise((resolve, reject) => {
 	        fin.InterApplicationBus.subscribe({ uuid: '*' }, guid, (intentResult) => {
 	            resolve(intentResult);
-	        }).catch(() => reject(new Error('getResult is not supported in this environment')));
+	        }).catch(() => {
+	            // not supported in web, suppress the error
+	            if (interopModule.wire.environment.type === 'other') {
+	                resolve(undefined);
+	            }
+	            reject(new Error('getResult is not supported in this environment'));
+	        });
 	    });
 	    // Adding the intentResolutionResultId to the intentObj. Because fireIntent only accepts a single arg, we have to slap it in here.
 	    const metadata = app ? { target: app, intentResolutionResultId: guid } : { intentResolutionResultId: guid };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "40.103.4",
+    "version": "40.103.5",
     "description": "The core renderer entry point of OpenFin",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "out/stub.js",