@openfin/fdc3-api 39.82.12 → 39.83.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -99,7 +99,7 @@ declare type ApiInjection = DomainApiSettings;
99
99
  * Generated when a new Platform's API becomes responsive.
100
100
  * @interface
101
101
  */
102
- declare type ApiReadyEvent = BaseEvent & {
102
+ declare type ApiReadyEvent = BaseEvents.BaseEvent & {
103
103
  topic: 'application';
104
104
  type: 'platform-api-ready';
105
105
  };
@@ -911,7 +911,7 @@ declare namespace ApplicationEvents {
911
911
  PropagatedApplicationEvent,
912
912
  PropagatedEventType_3 as PropagatedEventType,
913
913
  PropagatedApplicationEventType,
914
- Payload_4 as Payload,
914
+ Payload_5 as Payload,
915
915
  ByType_3 as ByType
916
916
  }
917
917
  }
@@ -1704,7 +1704,7 @@ declare type BaseEvent_10 = Events.BaseEvents.BaseEvent;
1704
1704
  * A base Channel event.
1705
1705
  * @interface
1706
1706
  */
1707
- declare type BaseEvent_2 = NamedEvent & {
1707
+ declare type BaseEvent_2 = BaseEvents.NamedEvent & {
1708
1708
  channelName: string;
1709
1709
  channelId: string;
1710
1710
  };
@@ -1774,6 +1774,7 @@ declare namespace BaseEvents {
1774
1774
  NotCloseRequested,
1775
1775
  PropagatedEventType,
1776
1776
  PropagatedEvent,
1777
+ Payload_2 as Payload,
1777
1778
  EventHandler,
1778
1779
  BaseEvent,
1779
1780
  IdentityEvent,
@@ -1914,7 +1915,7 @@ declare type BrowserContentCreationRule = BaseContentCreationRule & {
1914
1915
  *
1915
1916
  * @typeParam Type String key specifying the event to extract
1916
1917
  */
1917
- declare type ByType<Type extends EventType> = Payload_2<Type>;
1918
+ declare type ByType<Type extends EventType> = Payload_3<Type>;
1918
1919
 
1919
1920
  /**
1920
1921
  * Extracts a single event type matching the given key from the Window {@link Event} union.
@@ -1923,7 +1924,7 @@ declare type ByType<Type extends EventType> = Payload_2<Type>;
1923
1924
  *
1924
1925
  * @typeParam Type String key specifying the event to extract
1925
1926
  */
1926
- declare type ByType_2<Type extends EventType_2> = Payload_3<Type>;
1927
+ declare type ByType_2<Type extends EventType_2> = Payload_4<Type>;
1927
1928
 
1928
1929
  /**
1929
1930
  * Extracts a single event type matching the given key from the Application {@link Event} union.
@@ -1932,7 +1933,7 @@ declare type ByType_2<Type extends EventType_2> = Payload_3<Type>;
1932
1933
  *
1933
1934
  * @typeParam Type String key specifying the event to extract
1934
1935
  */
1935
- declare type ByType_3<Type extends EventType_3> = Payload_4<Type>;
1936
+ declare type ByType_3<Type extends EventType_3> = Payload_5<Type>;
1936
1937
 
1937
1938
  /**
1938
1939
  * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
@@ -1941,7 +1942,7 @@ declare type ByType_3<Type extends EventType_3> = Payload_4<Type>;
1941
1942
  *
1942
1943
  * @typeParam Type String key specifying the event to extract
1943
1944
  */
1944
- declare type ByType_4<Type extends EventType_4> = Payload_5<Type>;
1945
+ declare type ByType_4<Type extends EventType_4> = Payload_6<Type>;
1945
1946
 
1946
1947
  /**
1947
1948
  * Extracts a single event type matching the given key from the Frame {@link Event} union.
@@ -1950,7 +1951,7 @@ declare type ByType_4<Type extends EventType_4> = Payload_5<Type>;
1950
1951
  *
1951
1952
  * @typeParam Type String key specifying the event to extract
1952
1953
  */
1953
- declare type ByType_5<Type extends EventType_5> = Payload_6<Type>;
1954
+ declare type ByType_5<Type extends EventType_5> = Payload_7<Type>;
1954
1955
 
1955
1956
  /**
1956
1957
  * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
@@ -1959,7 +1960,7 @@ declare type ByType_5<Type extends EventType_5> = Payload_6<Type>;
1959
1960
  *
1960
1961
  * @typeParam Type String key specifying the event to extract
1961
1962
  */
1962
- declare type ByType_6<Type extends EventType_6> = Payload_7<Type>;
1963
+ declare type ByType_6<Type extends EventType_6> = Payload_8<Type>;
1963
1964
 
1964
1965
  /**
1965
1966
  * Extracts a single event type matching the given key from the Platform {@link Event} union.
@@ -1968,7 +1969,7 @@ declare type ByType_6<Type extends EventType_6> = Payload_7<Type>;
1968
1969
  *
1969
1970
  * @typeParam Type String key specifying the event to extract
1970
1971
  */
1971
- declare type ByType_7<Type extends EventType_7> = Payload_8<Type>;
1972
+ declare type ByType_7<Type extends EventType_7> = Payload_9<Type>;
1972
1973
 
1973
1974
  /**
1974
1975
  * Extracts a single event type matching the given key from the System {@link Event} union.
@@ -1977,7 +1978,7 @@ declare type ByType_7<Type extends EventType_7> = Payload_8<Type>;
1977
1978
  *
1978
1979
  * @typeParam Type String key specifying the event to extract
1979
1980
  */
1980
- declare type ByType_8<Type extends EventType_8> = Payload_9<Type>;
1981
+ declare type ByType_8<Type extends EventType_8> = Payload_10<Type>;
1981
1982
 
1982
1983
  /**
1983
1984
  * Extracts a single event type matching the given key from the Layout DOM {@link Event} union.
@@ -1986,7 +1987,7 @@ declare type ByType_8<Type extends EventType_8> = Payload_9<Type>;
1986
1987
  *
1987
1988
  * @typeParam Type String key specifying the event to extract
1988
1989
  */
1989
- declare type ByType_9<Type extends EventType_9> = Payload_10<Type>;
1990
+ declare type ByType_9<Type extends EventType_9> = Payload_11<Type>;
1990
1991
 
1991
1992
  /**
1992
1993
  * Configuration for page capture.
@@ -3698,6 +3699,7 @@ declare type ContainerCreatedEvent = LayoutDOMEvent & {
3698
3699
 
3699
3700
  /**
3700
3701
  * Generated when content navigation or redirection is blocked by {@link OpenFin.DomainSettings}.
3702
+ * @interface
3701
3703
  */
3702
3704
  declare type ContentBlockedEvent = NamedEvent & {
3703
3705
  type: 'content-blocked';
@@ -4354,6 +4356,10 @@ declare type DomainSettingsRule = {
4354
4356
  * Settings applied when a webcontents has been navigated to a matched domain.
4355
4357
  */
4356
4358
  options: PerDomainSettings;
4359
+ /**
4360
+ * Options to use when comparing URIs to the `match` patterns.
4361
+ */
4362
+ matchOptions?: RuleMatchOptions;
4357
4363
  };
4358
4364
 
4359
4365
  /**
@@ -4798,9 +4804,7 @@ declare class EventAggregator extends EmitterMap {
4798
4804
  * @remarks Selects the correct type for the event
4799
4805
  * payload from the provided union based on the provided string literal type.
4800
4806
  */
4801
- declare type EventHandler<EmitterEvent extends BaseEvent, EventType extends string> = (payload: Extract<EmitterEvent, {
4802
- type: EventType;
4803
- }>, ...args: any[]) => void;
4807
+ declare type EventHandler<EmitterEvent extends BaseEvent, EventType extends string> = (payload: Payload_2<EmitterEvent, EventType>, ...args: any[]) => void;
4804
4808
 
4805
4809
  declare namespace Events {
4806
4810
  export {
@@ -4936,7 +4940,7 @@ declare namespace ExternalApplicationEvents {
4936
4940
  ExternalApplicationEvent,
4937
4941
  EventType_4 as EventType,
4938
4942
  ExternalApplicationEventType,
4939
- Payload_5 as Payload,
4943
+ Payload_6 as Payload,
4940
4944
  ByType_4 as ByType
4941
4945
  }
4942
4946
  }
@@ -5733,7 +5737,7 @@ declare namespace FrameEvents {
5733
5737
  FrameEvent,
5734
5738
  EventType_5 as EventType,
5735
5739
  FrameEventType,
5736
- Payload_6 as Payload,
5740
+ Payload_7 as Payload,
5737
5741
  ByType_5 as ByType
5738
5742
  }
5739
5743
  }
@@ -5973,7 +5977,7 @@ declare namespace GlobalHotkeyEvents {
5973
5977
  GlobalHotkeyEvent,
5974
5978
  EventType_6 as EventType,
5975
5979
  GlobalHotkeyEventType,
5976
- Payload_7 as Payload,
5980
+ Payload_8 as Payload,
5977
5981
  ByType_6 as ByType
5978
5982
  }
5979
5983
  }
@@ -8053,7 +8057,7 @@ declare namespace LayoutDOMEvents {
8053
8057
  LayoutStateChangedEvent,
8054
8058
  Event_12 as Event,
8055
8059
  EventType_9 as EventType,
8056
- Payload_10 as Payload,
8060
+ Payload_11 as Payload,
8057
8061
  ByType_9 as ByType
8058
8062
  }
8059
8063
  }
@@ -9240,10 +9244,42 @@ declare type NavigationRules = {
9240
9244
  allowlist?: string[];
9241
9245
  /** Forbidden URLs for navigation. */
9242
9246
  denylist?: string[];
9247
+ /**
9248
+ * Options to use when comparing URIs to the `allowlist` and `denylist` patterns.
9249
+ */
9250
+ matchOptions?: RuleMatchOptions;
9243
9251
  };
9244
9252
 
9245
9253
  declare type NewConnectConfig = ConfigWithUuid & ConfigWithRuntime;
9246
9254
 
9255
+ declare interface NodeNetworkInterfaceBase {
9256
+ address: string;
9257
+ netmask: string;
9258
+ mac: string;
9259
+ internal: boolean;
9260
+ cidr: string | null;
9261
+ }
9262
+
9263
+ declare type NodeNetworkInterfaceInfo = NodeNetworkInterfaceInfoIPv4 | NodeNetworkInterfaceInfoIPv6;
9264
+
9265
+ declare interface NodeNetworkInterfaceInfoIPv4 extends NodeNetworkInterfaceBase {
9266
+ family: 'IPv4';
9267
+ scopeid?: undefined;
9268
+ }
9269
+
9270
+ declare interface NodeNetworkInterfaceInfoIPv6 extends NodeNetworkInterfaceBase {
9271
+ family: 'IPv6';
9272
+ scopeid: number;
9273
+ }
9274
+
9275
+ declare interface NodeUserInfo {
9276
+ username: string;
9277
+ uid: number;
9278
+ gid: number;
9279
+ shell: string | null;
9280
+ homedir: string;
9281
+ }
9282
+
9247
9283
  /**
9248
9284
  * @interface
9249
9285
  */
@@ -9389,6 +9425,7 @@ declare namespace OpenFin {
9389
9425
  Api,
9390
9426
  ApiSettings,
9391
9427
  InjectionType,
9428
+ RuleMatchOptions,
9392
9429
  NavigationRules,
9393
9430
  ContentNavigation,
9394
9431
  ContentRedirect,
@@ -9472,6 +9509,7 @@ declare namespace OpenFin {
9472
9509
  Time,
9473
9510
  CpuInfo,
9474
9511
  GpuInfo,
9512
+ OSInfo,
9475
9513
  HostSpecs,
9476
9514
  PrinterInfo_2 as PrinterInfo,
9477
9515
  Dpi,
@@ -9679,6 +9717,25 @@ declare type OptionsChangedEvent = BaseEvent_5 & {
9679
9717
  diff: OpenFin.WindowOptionDiff;
9680
9718
  };
9681
9719
 
9720
+ /**
9721
+ * @interface
9722
+ * The keys represent the output from calling individual Node `os` APIs.
9723
+ * For example, `userInfo` will have the output of calling `os.userInfo()`. For more information
9724
+ * see [Node `os` API docs](https://nodejs.org/docs/latest-v20.x/api/os.html)
9725
+ */
9726
+ declare type OSInfo = {
9727
+ platform: string;
9728
+ release: string;
9729
+ version: string;
9730
+ /**
9731
+ * Throws if a user has no username or homedir.
9732
+ * See [Node os.userInfo docs for more info](https://nodejs.org/docs/latest-v20.x/api/os.html#osuserinfooptions)
9733
+ */
9734
+ userInfo: NodeUserInfo;
9735
+ hostname: string;
9736
+ networkInterfaces: Record<string, NodeNetworkInterfaceInfo[] | undefined>;
9737
+ };
9738
+
9682
9739
  declare type OverrideCallback<T extends any = PlatformProvider, U extends T = T> = (arg: Constructor<T>) => U | Promise<U>;
9683
9740
 
9684
9741
  /**
@@ -9707,86 +9764,110 @@ declare type Payload<Success extends boolean = boolean, Data = any> = {
9707
9764
  error?: Success extends false ? ErrorPlainObject | undefined : never;
9708
9765
  };
9709
9766
 
9767
+ /**
9768
+ * Extracts a single event type matching the given key from the System {@link Event} union.
9769
+ *
9770
+ * @see {@link ByType}
9771
+ *
9772
+ * @typeParam Type String key specifying the event to extract
9773
+ */
9774
+ declare type Payload_10<Type extends EventType_8> = BaseEvents.Payload<Event_11, Type>;
9775
+
9710
9776
  /**
9711
9777
  * Extracts a single event type matching the given key from the Layout DOM {@link Event} union.
9712
9778
  *
9713
9779
  * @typeParam Type String key specifying the event to extract
9714
9780
  */
9715
- declare type Payload_10<Type extends EventType_9> = Extract<Event_12, {
9781
+ declare type Payload_11<Type extends EventType_9> = Extract<Event_12, {
9716
9782
  type: Type;
9717
9783
  }>;
9718
9784
 
9785
+ /**
9786
+ * Extracts a single event type matching the given type key from the provided EmitterEvent union.
9787
+ *
9788
+ * @remarks Each event emitter namespace defines its own reduction of this type that fixes the Event parameter to
9789
+ * the appropriate payload union for that namespace.
9790
+ *
9791
+ * @typeParam Event Union of payloads for events on the given emitter
9792
+ * @see {@link ByType}
9793
+ *
9794
+ * @typeParam Type String key specifying the event to extract from the union
9795
+ *
9796
+ * @see {@link OpenFin.Events.ApplicationEvents.Payload}
9797
+ * @see {@link OpenFin.Events.ExternalApplicationEvents.Payload}
9798
+ * @see {@link OpenFin.Events.FrameEvents.Payload}
9799
+ * @see {@link OpenFin.Events.GlobalHotkeyEvents.Payload}
9800
+ * @see {@link OpenFin.Events.PlatformEvents.Payload}
9801
+ * @see {@link OpenFin.Events.SystemEvents.Payload}
9802
+ * @see {@link OpenFin.Events.ViewEvents.Payload}
9803
+ * @see {@link OpenFin.Events.WindowEvents.Payload}
9804
+ */
9805
+ declare type Payload_2<Event extends BaseEvent, EventType extends string> = Extract<Event, {
9806
+ type: EventType;
9807
+ }>;
9808
+
9719
9809
  /**
9720
9810
  * Extracts a single event type matching the given key from the View {@link Event} union.
9721
9811
  *
9812
+ * @see {@link ByType}
9813
+ *
9722
9814
  * @typeParam Type String key specifying the event to extract
9723
9815
  */
9724
- declare type Payload_2<Type extends EventType> = Extract<Event_4, {
9725
- type: Type;
9726
- }>;
9816
+ declare type Payload_3<Type extends EventType> = BaseEvents.Payload<Event_4, Type>;
9727
9817
 
9728
9818
  /**
9729
9819
  * Extracts a single event type matching the given key from the Window {@link Event} union.
9730
9820
  *
9821
+ * @see {@link ByType}
9822
+ *
9731
9823
  * @typeParam Type String key specifying the event to extract
9732
9824
  */
9733
- declare type Payload_3<Type extends EventType_2> = Extract<Event_6, {
9734
- type: Type;
9735
- }>;
9825
+ declare type Payload_4<Type extends EventType_2> = BaseEvents.Payload<Event_6, Type>;
9736
9826
 
9737
9827
  /**
9738
9828
  * Extracts a single event type matching the given key from the Application {@link Event} union.
9739
9829
  *
9830
+ * @see {@link ByType}
9831
+ *
9740
9832
  * @typeParam Type String key specifying the event to extract
9741
9833
  */
9742
- declare type Payload_4<Type extends EventType_3> = Extract<Event_3, {
9743
- type: Type;
9744
- }>;
9834
+ declare type Payload_5<Type extends EventType_3> = BaseEvents.Payload<Event_3, Type>;
9745
9835
 
9746
9836
  /**
9747
9837
  * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
9748
9838
  *
9839
+ * @see {@link ByType}
9840
+ *
9749
9841
  * @typeParam Type String key specifying the event to extract
9750
9842
  */
9751
- declare type Payload_5<Type extends EventType_4> = Extract<Event_7, {
9752
- type: Type;
9753
- }>;
9843
+ declare type Payload_6<Type extends EventType_4> = BaseEvents.Payload<Event_7, Type>;
9754
9844
 
9755
9845
  /**
9756
9846
  * Extracts a single event type matching the given key from the Frame {@link Event} union.
9757
9847
  *
9848
+ * @see {@link ByType}
9849
+ *
9758
9850
  * @typeParam Type String key specifying the event to extract
9759
9851
  */
9760
- declare type Payload_6<Type extends EventType_5> = Extract<Event_8, {
9761
- type: Type;
9762
- }>;
9852
+ declare type Payload_7<Type extends EventType_5> = BaseEvents.Payload<Event_8, Type>;
9763
9853
 
9764
9854
  /**
9765
9855
  * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
9766
9856
  *
9857
+ * @see {@link ByType}
9858
+ *
9767
9859
  * @typeParam Type String key specifying the event to extract
9768
9860
  */
9769
- declare type Payload_7<Type extends EventType_6> = Extract<Event_9, {
9770
- type: Type;
9771
- }>;
9861
+ declare type Payload_8<Type extends EventType_6> = BaseEvents.Payload<Event_9, Type>;
9772
9862
 
9773
9863
  /**
9774
9864
  * Extracts a single event type matching the given key from the Platform {@link Event} union.
9775
9865
  *
9776
- * @typeParam Type String key specifying the event to extract
9777
- */
9778
- declare type Payload_8<Type extends EventType_7> = Extract<Event_10, {
9779
- type: Type;
9780
- }>;
9781
-
9782
- /**
9783
- * Extracts a single event type matching the given key from the System {@link Event} union.
9866
+ * @see {@link ByType}
9784
9867
  *
9785
9868
  * @typeParam Type String key specifying the event to extract
9786
9869
  */
9787
- declare type Payload_9<Type extends EventType_8> = Extract<Event_11, {
9788
- type: Type;
9789
- }>;
9870
+ declare type Payload_9<Type extends EventType_7> = BaseEvents.Payload<Event_10, Type>;
9790
9871
 
9791
9872
  /**
9792
9873
  * @interface
@@ -10481,7 +10562,7 @@ declare namespace PlatformEvents {
10481
10562
  PlatformEvent,
10482
10563
  EventType_7 as EventType,
10483
10564
  PlatformEventType,
10484
- Payload_8 as Payload,
10565
+ Payload_9 as Payload,
10485
10566
  ByType_7 as ByType
10486
10567
  }
10487
10568
  }
@@ -11916,6 +11997,8 @@ declare interface ProtocolMap extends ProtocolMapBase {
11916
11997
  };
11917
11998
  response: void;
11918
11999
  };
12000
+ 'get-host-specs': GetterCall<OpenFin.HostSpecs>;
12001
+ 'get-os-info': GetterCall<OpenFin.OSInfo>;
11919
12002
  'system-get-printers': GetterCall<OpenFin.PrinterInfo[]>;
11920
12003
  'system-register-shutdown-handler': VoidCall;
11921
12004
  'get-domain-settings': ApiCall<OpenFin.ApplicationIdentity, OpenFin.DefaultDomainSettings>;
@@ -12309,6 +12392,17 @@ declare interface RTCProtocolOffer extends ProtocolPacketBase {
12309
12392
  };
12310
12393
  }
12311
12394
 
12395
+ /**
12396
+ * Controls the behavior of the navigation URI pattern matching algorithm.
12397
+ */
12398
+ declare type RuleMatchOptions = {
12399
+ /**
12400
+ * Matches all schemes rather than just http and https when a wild card is specified. For example, `'*://*.site.com'` will
12401
+ * only match urls which begin with `'http:'` or `'https:'` unless this setting is `true`.
12402
+ */
12403
+ matchAllSchemes?: boolean;
12404
+ };
12405
+
12312
12406
  declare type RunRequestedEvent = OpenFin.ApplicationEvents.RunRequestedEvent;
12313
12407
 
12314
12408
  /**
@@ -12761,7 +12855,7 @@ declare type Snapshot = {
12761
12855
  * _Note_ - In the case of using a custom provider, if a window has a layout property but does not call _Layout.init_ this event may not fire.
12762
12856
  * @interface
12763
12857
  */
12764
- declare type SnapshotAppliedEvent = BaseEvent & {
12858
+ declare type SnapshotAppliedEvent = BaseEvents.BaseEvent & {
12765
12859
  topic: 'application';
12766
12860
  type: 'platform-snapshot-applied';
12767
12861
  };
@@ -13245,7 +13339,8 @@ declare class System extends EmitterBase<OpenFin.SystemEvent> {
13245
13339
  */
13246
13340
  getRvmInfo(): Promise<OpenFin.RVMInfo>;
13247
13341
  /**
13248
- * Retrieves system information.
13342
+ * Retrieves general system information. If you need more detailed information about the
13343
+ * OS and the currently logged in user, use `fin.System.getOSInfo()` instead.
13249
13344
  *
13250
13345
  * @example
13251
13346
  * ```js
@@ -13253,6 +13348,15 @@ declare class System extends EmitterBase<OpenFin.SystemEvent> {
13253
13348
  * ```
13254
13349
  */
13255
13350
  getHostSpecs(): Promise<OpenFin.HostSpecs>;
13351
+ /**
13352
+ * Retrieves information about the OS and the currently logged in user.
13353
+ *
13354
+ * @example
13355
+ * ```js
13356
+ * fin.System.getOSInfo().then(specs => console.log(specs)).catch(err => console.log(err));
13357
+ * ```
13358
+ */
13359
+ getOSInfo(): Promise<OpenFin.OSInfo>;
13256
13360
  /**
13257
13361
  * Runs an executable or batch file. A path to the file must be included in options.
13258
13362
  * <br> A uuid may be optionally provided. If not provided, OpenFin will create a uuid for the new process.
@@ -14366,7 +14470,7 @@ declare namespace SystemEvents {
14366
14470
  SystemEvent,
14367
14471
  EventType_8 as EventType,
14368
14472
  SystemEventType,
14369
- Payload_9 as Payload,
14473
+ Payload_10 as Payload,
14370
14474
  ByType_8 as ByType
14371
14475
  }
14372
14476
  }
@@ -14380,6 +14484,7 @@ declare type SystemEventType = EventType_8;
14380
14484
  * @interface
14381
14485
  */
14382
14486
  declare type SystemPermissions = {
14487
+ getOSInfo: boolean;
14383
14488
  getAllExternalWindows: boolean;
14384
14489
  launchExternalProcess: boolean | {
14385
14490
  enabled: boolean;
@@ -15493,7 +15598,7 @@ declare namespace ViewEvents {
15493
15598
  PropagatedViewEvent,
15494
15599
  PropagatedEventType_2 as PropagatedEventType,
15495
15600
  PropagatedViewEventType,
15496
- Payload_2 as Payload,
15601
+ Payload_3 as Payload,
15497
15602
  ByType
15498
15603
  }
15499
15604
  }
@@ -18014,7 +18119,7 @@ declare namespace WindowEvents {
18014
18119
  PropagatedEvent_3 as PropagatedEvent,
18015
18120
  PropagatedWindowEvent,
18016
18121
  PropagatedWindowEventType,
18017
- Payload_3 as Payload,
18122
+ Payload_4 as Payload,
18018
18123
  ByType_2 as ByType
18019
18124
  }
18020
18125
  }