From 9391b44996e833fc63f0b2bc4c6c90e47c12a3b8 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 28 Dec 2020 13:38:28 +0100 Subject: [PATCH 01/23] fix(tabs): ios safeArea calculation (#9089) * fix(tabs): ios safeArea calculation * feat(tabs): respect iosOverflowSafeArea value --- .../src/tabs/frame-in-tabs-inner-page-1.xml | 13 ++++++++-- apps/ui/src/tabs/frame-in-tabs-overflow.xml | 24 +++++++++++++++++++ apps/ui/src/tabs/main-page.ts | 1 + packages/core/ui/tabs/index.ios.ts | 14 ++++++----- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 apps/ui/src/tabs/frame-in-tabs-overflow.xml diff --git a/apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml b/apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml index f0c7c0c06..6e84cd59d 100644 --- a/apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml +++ b/apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml @@ -1,3 +1,12 @@ - \ No newline at end of file + + + diff --git a/apps/ui/src/tabs/frame-in-tabs-overflow.xml b/apps/ui/src/tabs/frame-in-tabs-overflow.xml new file mode 100644 index 000000000..e0df8bd11 --- /dev/null +++ b/apps/ui/src/tabs/frame-in-tabs-overflow.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/ui/src/tabs/main-page.ts b/apps/ui/src/tabs/main-page.ts index df5477457..7e9ffb6d1 100644 --- a/apps/ui/src/tabs/main-page.ts +++ b/apps/ui/src/tabs/main-page.ts @@ -31,6 +31,7 @@ export function loadExamples() { examples.set('nested-bottom-navigation', 'tabs/nested-bottom-navigation-page'); examples.set('custom-tabstrip', 'tabs/custom-tabstrip-page'); examples.set('frame-in-tabs', 'tabs/frame-in-tabs'); + examples.set('frame-in-tabs-overflow', 'tabs/frame-in-tabs-overflow'); examples.set('item-color', 'tabs/item-color-page'); examples.set('dynamic-color-change', 'tabs/dynamic-color-change-page'); diff --git a/packages/core/ui/tabs/index.ios.ts b/packages/core/ui/tabs/index.ios.ts index 32a4a6e25..1a186804c 100644 --- a/packages/core/ui/tabs/index.ios.ts +++ b/packages/core/ui/tabs/index.ios.ts @@ -172,20 +172,22 @@ class UIPageViewControllerImpl extends UIPageViewController { safeAreaInsetsTop = this.topLayoutGuide.length; } + let conditionalSafeAreaBottom = owner.iosOverflowSafeArea ? safeAreaInsetsBottom : 0; let scrollViewTop = 0; - let scrollViewHeight = this.view.bounds.size.height + safeAreaInsetsBottom; + let scrollViewHeight = this.view.bounds.size.height + conditionalSafeAreaBottom; if (owner.tabStrip) { - scrollViewTop = this.tabBar.frame.size.height; - scrollViewHeight = this.view.bounds.size.height - this.tabBar.frame.size.height + safeAreaInsetsBottom; - let tabBarTop = safeAreaInsetsTop; const tabBarHeight = this.tabBar.frame.size.height; + let tabBarTop = safeAreaInsetsTop; + + scrollViewTop = tabBarHeight; + scrollViewHeight = this.view.bounds.size.height - tabBarHeight + conditionalSafeAreaBottom; const tabsPosition = owner.tabsPosition; if (tabsPosition === 'bottom') { - tabBarTop = this.view.frame.size.height - this.tabBar.frame.size.height - safeAreaInsetsBottom; + tabBarTop = this.view.frame.size.height - tabBarHeight - safeAreaInsetsBottom; scrollViewTop = this.view.frame.origin.y; - scrollViewHeight = this.view.frame.size.height - safeAreaInsetsBottom; + scrollViewHeight = this.view.frame.size.height - tabBarHeight; } let parent = owner.parent; From ea67422fcf3106db1359a358e897a63827a642f3 Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Mon, 28 Dec 2020 13:39:55 +0100 Subject: [PATCH 02/23] feat: iosIgnoreSafeArea property (#9092) * feat: ios added ignoreSafeArea property * fix: ensure it works when no viewControllerView --- packages/core/ui/core/view/index.ios.ts | 8 ++++++-- packages/core/ui/core/view/view-common.ts | 9 ++++++++- packages/core/ui/core/view/view-helper/index.ios.ts | 8 ++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts index 7a1c87707..2f4cc7d9e 100644 --- a/packages/core/ui/core/view/index.ios.ts +++ b/packages/core/ui/core/view/index.ios.ts @@ -262,7 +262,9 @@ export class View extends ViewCommon implements ViewDefinition { if (majorVersion <= 10) { return null; } - + if (this.iosIgnoreSafeArea) { + return frame; + } if (!this.iosOverflowSafeArea || !this.iosOverflowSafeAreaEnabled) { return IOSHelper.shrinkToSafeArea(this, frame); } else if (this.nativeViewProtected && this.nativeViewProtected.window) { @@ -275,7 +277,9 @@ export class View extends ViewCommon implements ViewDefinition { public getSafeAreaInsets(): { left; top; right; bottom } { const safeAreaInsets = this.nativeViewProtected && this.nativeViewProtected.safeAreaInsets; const insets = { left: 0, top: 0, right: 0, bottom: 0 }; - + if (this.iosIgnoreSafeArea) { + return insets; + } if (safeAreaInsets) { insets.left = layout.round(layout.toDevicePixels(safeAreaInsets.left)); insets.top = layout.round(layout.toDevicePixels(safeAreaInsets.top)); diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts index 6def02644..8649cfe8a 100644 --- a/packages/core/ui/core/view/view-common.ts +++ b/packages/core/ui/core/view/view-common.ts @@ -758,7 +758,8 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { public isUserInteractionEnabled: boolean; public iosOverflowSafeArea: boolean; public iosOverflowSafeAreaEnabled: boolean; - + public iosIgnoreSafeArea: boolean; + get isLayoutValid(): boolean { return this._isLayoutValid; } @@ -1055,3 +1056,9 @@ export const iosOverflowSafeAreaEnabledProperty = new InheritedProperty Date: Mon, 28 Dec 2020 06:46:04 -0600 Subject: [PATCH 03/23] fix(compat): add screen and device aliases (#9088) * fix: Add old names to platform for compatibility * Simplify code * fix: apply changes to definitions Co-authored-by: Igor Randjelovic --- packages/core/platform/index.android.ts | 6 ++++++ packages/core/platform/index.d.ts | 14 ++++++++++++++ packages/core/platform/index.ios.ts | 6 ++++++ 3 files changed, 26 insertions(+) diff --git a/packages/core/platform/index.android.ts b/packages/core/platform/index.android.ts index 56db49cec..e174b7025 100644 --- a/packages/core/platform/index.android.ts +++ b/packages/core/platform/index.android.ts @@ -57,6 +57,9 @@ export class Screen { static mainScreen = new MainScreen(); } +// This retains compatibility with NS6 +export const screen = Screen; + class DeviceRef { private _manufacturer: string; private _model: string; @@ -145,5 +148,8 @@ class DeviceRef { export const Device = new DeviceRef(); +// This retains compatibility with NS6 +export const device = Device; + export const isAndroid = global.isAndroid; export const isIOS = global.isIOS; diff --git a/packages/core/platform/index.d.ts b/packages/core/platform/index.d.ts index aec73b096..2250bc73b 100644 --- a/packages/core/platform/index.d.ts +++ b/packages/core/platform/index.d.ts @@ -121,7 +121,21 @@ export class Screen { static mainScreen: ScreenMetrics; } +/** + * An object describing general information about a display. + * + * This retains compatibility with NS6 + */ +export const screen = Screen; + /** * Gets the current device information. */ export const Device: IDevice; + +/** + * Gets the current device information. + * + * This retains compatibility with NS6 + */ +export const device = Device; diff --git a/packages/core/platform/index.ios.ts b/packages/core/platform/index.ios.ts index ef1de6bc1..291896615 100644 --- a/packages/core/platform/index.ios.ts +++ b/packages/core/platform/index.ios.ts @@ -119,9 +119,15 @@ class MainScreen { export const Device = new DeviceRef(); +// This retains compatibility with NS6 +export const device = Device; + export class Screen { static mainScreen = new MainScreen(); } +// This retains compatibility with NS6 +export const screen = Screen; + export const isAndroid = global.isAndroid; export const isIOS = global.isIOS; From d09a564296669dcffd03cd32b18f7a6454c7c472 Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Mon, 28 Dec 2020 13:47:00 +0100 Subject: [PATCH 04/23] fix: android modal not following activity windowSoftInputMode (#9042) * fix android modal not following activity windowSoftInputMode Also added an android modal parameter to set a custom windowSoftInputMode * fix softInputMode set too soon * Update packages/core/ui/core/view/index.android.ts Co-authored-by: Igor Randjelovic * Update packages/core/ui/core/view-base/index.d.ts Co-authored-by: Igor Randjelovic * Update packages/core/ui/core/view-base/index.ts Co-authored-by: Igor Randjelovic Co-authored-by: Igor Randjelovic --- packages/core/ui/core/view-base/index.d.ts | 5 +++++ packages/core/ui/core/view-base/index.ts | 6 ++++++ packages/core/ui/core/view/index.android.ts | 24 ++++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/packages/core/ui/core/view-base/index.d.ts b/packages/core/ui/core/view-base/index.d.ts index 4e7313dbd..1c88ea81b 100644 --- a/packages/core/ui/core/view-base/index.d.ts +++ b/packages/core/ui/core/view-base/index.d.ts @@ -83,6 +83,11 @@ export interface ShowModalOptions { * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. */ cancelable?: boolean; + /** + * An optional parameter specifying the windowSoftInputMode of the dialog window + * For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode + */ + windowSoftInputMode?: number; }; /** * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts index 67e4010b0..39a585c24 100644 --- a/packages/core/ui/core/view-base/index.ts +++ b/packages/core/ui/core/view-base/index.ts @@ -87,6 +87,12 @@ export interface ShowModalOptions { * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. */ cancelable?: boolean; + + /** + * An optional parameter specifying the windowSoftInputMode of the dialog window. + * For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode + */ + windowSoftInputMode?: number; }; /** * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts index 0a3e50b7b..fe7b0b7d4 100644 --- a/packages/core/ui/core/view/index.android.ts +++ b/packages/core/ui/core/view/index.android.ts @@ -76,6 +76,7 @@ interface DialogOptions { animated: boolean; stretched: boolean; cancelable: boolean; + windowSoftInputMode: number; shownCallback: () => void; dismissCallback: () => void; } @@ -168,6 +169,7 @@ function initializeDialogFragment() { class DialogFragmentImpl extends androidx.fragment.app.DialogFragment { public owner: View; private _fullscreen: boolean; + private _windowSoftInputMode: number; private _animated: boolean; private _stretched: boolean; private _cancelable: boolean; @@ -192,6 +194,7 @@ function initializeDialogFragment() { this._stretched = options.stretched; this._dismissCallback = options.dismissCallback; this._shownCallback = options.shownCallback; + this._windowSoftInputMode = options.windowSoftInputMode; this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0); let theme = this.getTheme(); @@ -229,6 +232,16 @@ function initializeDialogFragment() { owner._setupAsRootView(this.getActivity()); owner._isAddedToNativeVisualTree = true; + // we need to set the window SoftInputMode here. + // it wont work is set in onStart + const window = this.getDialog().getWindow(); + if (this._windowSoftInputMode !== undefined) { + window.setSoftInputMode(this._windowSoftInputMode); + } else { + // the dialog seems to not follow the default activity softInputMode, + // thus set we set it here. + window.setSoftInputMode((owner._context).getWindow().getAttributes().softInputMode); + } return owner.nativeViewProtected; } @@ -672,10 +685,14 @@ export class View extends ViewCommon { df.setArguments(args); let cancelable = true; + let windowSoftInputMode: number; - if (options.android && (options).android.cancelable !== undefined) { - cancelable = !!(options).android.cancelable; - console.log('ShowModalOptions.android.cancelable is deprecated. Use ShowModalOptions.cancelable instead.'); + if (options.android) { + if ((options).android.cancelable !== undefined) { + cancelable = !!(options).android.cancelable; + console.log('ShowModalOptions.android.cancelable is deprecated. Use ShowModalOptions.cancelable instead.'); + } + windowSoftInputMode = (options).android.windowSoftInputMode; } cancelable = options.cancelable !== undefined ? !!options.cancelable : cancelable; @@ -686,6 +703,7 @@ export class View extends ViewCommon { animated: !!options.animated, stretched: !!options.stretched, cancelable: cancelable, + windowSoftInputMode: windowSoftInputMode, shownCallback: () => this._raiseShownModallyEvent(), dismissCallback: () => this.closeModal(), }; From e16bc606ef6ed506cbc38e50247a59637d898b50 Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Mon, 28 Dec 2020 14:48:14 +0200 Subject: [PATCH 05/23] fix: android ActivityIndicator custom color affecting other indicators on the page (#9026) * fix(core): Setting color of an Android ActivityIndicator changed the color of the rest of ActivityIndicators in the same page. * test: Updated ActivityIndicator sample. * perf: Call mutate() only if color is actually changed. --- apps/ui/src/progress-bar/activity-indicator-page.xml | 7 ++++++- packages/core/ui/activity-indicator/index.android.ts | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/ui/src/progress-bar/activity-indicator-page.xml b/apps/ui/src/progress-bar/activity-indicator-page.xml index 1a5c6734e..6040774b1 100644 --- a/apps/ui/src/progress-bar/activity-indicator-page.xml +++ b/apps/ui/src/progress-bar/activity-indicator-page.xml @@ -1,4 +1,9 @@ - + + + + + + diff --git a/packages/core/ui/activity-indicator/index.android.ts b/packages/core/ui/activity-indicator/index.android.ts index 16259e955..bf0c42e89 100644 --- a/packages/core/ui/activity-indicator/index.android.ts +++ b/packages/core/ui/activity-indicator/index.android.ts @@ -47,10 +47,12 @@ export class ActivityIndicator extends ActivityIndicatorBase { return -1; } [colorProperty.setNative](value: number | Color) { - if (value instanceof Color) { - this.nativeViewProtected.getIndeterminateDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN); + const color = value instanceof Color ? value.android : value; + const drawable = this.nativeViewProtected.getIndeterminateDrawable().mutate(); + if (color) { + drawable.setColorFilter(color, android.graphics.PorterDuff.Mode.SRC_IN); } else { - this.nativeViewProtected.getIndeterminateDrawable().clearColorFilter(); + drawable.clearColorFilter(); } } } From b47ce0a97c38547d060fb4626df02d63f518f721 Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Mon, 28 Dec 2020 14:50:23 +0200 Subject: [PATCH 06/23] fix: android Tabs selected item color incorrectly applied (#9040) * fix: selected-item-color gets applied to wrong TabStripItems * chore: Added selection colors to 2 ui examples. * chore: Removing used for testing. --- apps/ui/src/tabs/swipe-disabled-page.ts | 15 ++++++ apps/ui/src/tabs/swipe-disabled-page.xml | 2 +- apps/ui/src/tabs/tabs-position-page.xml | 2 +- .../platforms/android/widgets-release.aar | Bin 216017 -> 215886 bytes packages/core/ui/tabs/index.android.ts | 48 +++++++++--------- packages/core/ui/tabs/tabs-common.ts | 2 +- .../nativescript/widgets/TabViewPager.java | 2 +- .../org/nativescript/widgets/TabsBar.java | 10 ---- 8 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 apps/ui/src/tabs/swipe-disabled-page.ts diff --git a/apps/ui/src/tabs/swipe-disabled-page.ts b/apps/ui/src/tabs/swipe-disabled-page.ts new file mode 100644 index 000000000..9e9b4869f --- /dev/null +++ b/apps/ui/src/tabs/swipe-disabled-page.ts @@ -0,0 +1,15 @@ +import { EventData, Page, Tabs } from '@nativescript/core'; + +export function goToFirst(args: EventData) { + console.log('---> goToFirst'); + const page = (args.object).page; + const tabsNav = page.getViewById('tabs'); + tabsNav.selectedIndex = 0; +} + +export function goToSecond(args: EventData) { + console.log('---> goToSecond'); + const page = (args.object).page; + const tabsNav = page.getViewById('tabs'); + tabsNav.selectedIndex = 1; +} diff --git a/apps/ui/src/tabs/swipe-disabled-page.xml b/apps/ui/src/tabs/swipe-disabled-page.xml index 5799d7393..5d81f4482 100644 --- a/apps/ui/src/tabs/swipe-disabled-page.xml +++ b/apps/ui/src/tabs/swipe-disabled-page.xml @@ -4,7 +4,7 @@ - + diff --git a/apps/ui/src/tabs/tabs-position-page.xml b/apps/ui/src/tabs/tabs-position-page.xml index 914d7755c..0002affc5 100644 --- a/apps/ui/src/tabs/tabs-position-page.xml +++ b/apps/ui/src/tabs/tabs-position-page.xml @@ -4,7 +4,7 @@ - + diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar index 33aff71acac77680a5b4855893d1e450339b2bd3..30ac9b12e547883880aa869c297dc4f4f58d5369 100644 GIT binary patch delta 80232 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

y9kOqM^%Ij?nC{QTLRg?2Gss1iG?IXqI#t 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

g!CDopTHA!;xWhF=Zo3`# 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

jvq@-wxqd10#|*mI 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 CQBX_( diff --git a/packages/core/ui/tabs/index.android.ts b/packages/core/ui/tabs/index.android.ts index a152df827..842ef66be 100644 --- a/packages/core/ui/tabs/index.android.ts +++ b/packages/core/ui/tabs/index.android.ts @@ -141,6 +141,7 @@ function initializeNativeClasses() { public items: Array; private mCurTransaction: androidx.fragment.app.FragmentTransaction; private mCurrentPrimaryItem: androidx.fragment.app.Fragment; + private mCurrentPosition = -1; constructor(public owner: Tabs) { super(); @@ -238,9 +239,27 @@ function initializeNativeClasses() { } this.mCurrentPrimaryItem = fragment; - this.owner.selectedIndex = position; + const previousPosition = this.mCurrentPosition; + this.mCurrentPosition = position; const tab = this.owner; + tab.selectedIndex = position; + + // Update tabstrip items + if (position != previousPosition) { + const tabStripItems = tab.tabStrip && tab.tabStrip.items; + + if (position >= 0 && tabStripItems && tabStripItems[position]) { + tabStripItems[position]._emit(TabStripItem.selectEvent); + tab._setItemColor(tabStripItems[position]); + } + + if (previousPosition >= 0 && tabStripItems && tabStripItems[previousPosition]) { + tabStripItems[previousPosition]._emit(TabStripItem.unselectEvent); + tab._setItemColor(tabStripItems[previousPosition]); + } + } + const tabItems = tab.items; const newTabItem = tabItems ? tabItems[position] : null; @@ -290,25 +309,6 @@ function initializeNativeClasses() { return global.__native(this); } - public onSelectedPositionChange(position: number, prevPosition: number): void { - const owner = this.owner; - if (!owner) { - return; - } - - const tabStripItems = owner.tabStrip && owner.tabStrip.items; - - if (position >= 0 && tabStripItems && tabStripItems[position]) { - tabStripItems[position]._emit(TabStripItem.selectEvent); - owner._setItemColor(tabStripItems[position]); - } - - if (prevPosition >= 0 && tabStripItems && tabStripItems[prevPosition]) { - tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent); - owner._setItemColor(tabStripItems[prevPosition]); - } - } - public onTap(position: number): boolean { const owner = this.owner; if (!owner) { @@ -952,11 +952,9 @@ export class Tabs extends TabsBase { } [selectedIndexProperty.setNative](value: number) { - // TODO - // if (Trace.isEnabled()) { - // Trace.write("TabView this._viewPager.setCurrentItem(" + value + ", " + smoothScroll + ");", traceCategory); - // } - this._viewPager.setCurrentItem(value, this.animationEnabled); + if (this._viewPager.getCurrentItem() != value) { + this._viewPager.setCurrentItem(value); + } } [itemsProperty.getDefault](): TabContentItem[] { diff --git a/packages/core/ui/tabs/tabs-common.ts b/packages/core/ui/tabs/tabs-common.ts index f4a4b9933..efca84bbe 100644 --- a/packages/core/ui/tabs/tabs-common.ts +++ b/packages/core/ui/tabs/tabs-common.ts @@ -12,7 +12,7 @@ export * from '../tab-navigation-base/tab-navigation-base'; export * from '../tab-navigation-base/tab-strip'; export * from '../tab-navigation-base/tab-strip-item'; -export const traceCategory = 'TabView'; +export const traceCategory = 'Tabs'; @CSSType('Tabs') export class TabsBase extends TabNavigationBase implements TabsDefinition { diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java index aa8ecf5ae..c6c5da37c 100644 --- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java +++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java @@ -56,7 +56,7 @@ public class TabViewPager extends ViewPager { @Override public void setCurrentItem(int item) { - boolean smoothScroll = this.animationEnabled && this.swipePageEnabled; + boolean smoothScroll = this.animationEnabled; super.setCurrentItem(item, smoothScroll); } } diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabsBar.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabsBar.java index 3f9e53dbe..9d2404241 100644 --- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabsBar.java +++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/TabsBar.java @@ -317,10 +317,6 @@ public class TabsBar extends HorizontalScrollView { return true; } - public void onSelectedPositionChange(int position, int prevPosition) { - // to be overridden in JS - } - private void populateTabStrip() { final PagerAdapter adapter = mViewPager.getAdapter(); final OnClickListener tabClickListener = new TabClickListener(); @@ -394,12 +390,6 @@ public class TabsBar extends HorizontalScrollView { return; } - int prevPosition = mTabStrip.getSelectedPosition(); - - if (prevPosition != position) { - onSelectedPositionChange(position, prevPosition); - } - mTabStrip.onTabsViewPagerPageChanged(position, positionOffset); View selectedTitle = mTabStrip.getChildAt(position); From 1a0c643b681e054518d8c96764bc24f88ca4b10a Mon Sep 17 00:00:00 2001 From: Jamie Birch <14055146+shirakaba@users.noreply.github.com> Date: Mon, 28 Dec 2020 12:51:23 +0000 Subject: [PATCH 07/23] fix: rollback CopyWebpackPlugin to v4.6.0 (#9099) --- packages/webpack/package.json | 2 +- packages/webpack/templates/webpack.angular.js | 14 ++++++++------ packages/webpack/templates/webpack.javascript.js | 14 ++++++-------- packages/webpack/templates/webpack.svelte.js | 14 ++++++-------- packages/webpack/templates/webpack.typescript.js | 14 ++++++-------- packages/webpack/templates/webpack.vue.js | 13 ++++++------- 6 files changed, 33 insertions(+), 38 deletions(-) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 4b001858f..63a022d7e 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -52,7 +52,7 @@ "dependencies": { "@angular-devkit/core": "~10.0.0", "clean-webpack-plugin": "~3.0.0", - "copy-webpack-plugin": "~6.0.2", + "copy-webpack-plugin": "4.6.0", "css": "~3.0.0", "css-loader": "~4.2.0", "escape-string-regexp": "~4.0.0", diff --git a/packages/webpack/templates/webpack.angular.js b/packages/webpack/templates/webpack.angular.js index 33088382a..1472428ae 100644 --- a/packages/webpack/templates/webpack.angular.js +++ b/packages/webpack/templates/webpack.angular.js @@ -116,9 +116,9 @@ module.exports = env => { const copyIgnore = { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }; const copyTargets = [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ...copyReplacements + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + ...copyReplacements, ]; if (!production) { @@ -395,9 +395,11 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: copyTargets, - }), + new CopyWebpackPlugin([ + ...copyTargets, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin('bundle'), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.javascript.js b/packages/webpack/templates/webpack.javascript.js index 589ef274e..69c197a69 100644 --- a/packages/webpack/templates/webpack.javascript.js +++ b/packages/webpack/templates/webpack.javascript.js @@ -244,14 +244,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack diff --git a/packages/webpack/templates/webpack.svelte.js b/packages/webpack/templates/webpack.svelte.js index 7013c4522..c552dbae5 100644 --- a/packages/webpack/templates/webpack.svelte.js +++ b/packages/webpack/templates/webpack.svelte.js @@ -297,14 +297,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.typescript.js b/packages/webpack/templates/webpack.typescript.js index bde3a35b0..cb43e5966 100644 --- a/packages/webpack/templates/webpack.typescript.js +++ b/packages/webpack/templates/webpack.typescript.js @@ -273,14 +273,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.vue.js b/packages/webpack/templates/webpack.vue.js index e61f20362..12987e9bc 100644 --- a/packages/webpack/templates/webpack.vue.js +++ b/packages/webpack/templates/webpack.vue.js @@ -301,13 +301,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.+(jpg|png)', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } } - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader From 875dc138a8df8c7fa0b40ad42d9a990023c7c32b Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 28 Dec 2020 14:23:16 +0100 Subject: [PATCH 08/23] chore(release): @nativescript/webpack@4.0.0 --- packages/webpack/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 63a022d7e..a36b8222c 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/webpack", - "version": "3.0.8", + "version": "4.0.0", "main": "index", "description": "Webpack plugin for NativeScript", "homepage": "https://nativescript.org", From 69b7fc377a562dd241808174587254054e8aa6bb Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 28 Dec 2020 14:37:01 +0100 Subject: [PATCH 09/23] ci: add workflows for different packages --- .../{npm_release.yml => npm_release_core.yml} | 3 ++ .github/workflows/npm_release_types.yml | 42 +++++++++++++++++++ .github/workflows/npm_release_webpack.yml | 41 ++++++++++++++++++ 3 files changed, 86 insertions(+) rename .github/workflows/{npm_release.yml => npm_release_core.yml} (93%) create mode 100644 .github/workflows/npm_release_types.yml create mode 100644 .github/workflows/npm_release_webpack.yml diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release_core.yml similarity index 93% rename from .github/workflows/npm_release.yml rename to .github/workflows/npm_release_core.yml index 1e479ab7e..821f5dd1f 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release_core.yml @@ -3,6 +3,8 @@ name: '@nativescript/core -> npm' on: push: branches: [ 'master' ] + paths: + - 'packages/core/*' env: NPM_TAG: 'next' @@ -26,6 +28,7 @@ jobs: working-directory: packages/core run: npm version $NPM_VERSION + # TODO: build ui-mobile-base first - name: Build @nativescript/core run: npx nx run core:build diff --git a/.github/workflows/npm_release_types.yml b/.github/workflows/npm_release_types.yml new file mode 100644 index 000000000..dd815dc0b --- /dev/null +++ b/.github/workflows/npm_release_types.yml @@ -0,0 +1,42 @@ +# TODO: modify to build android & ios types first and then merge into types +#name: '@nativescript/types -> npm' +# +#on: +# push: +# branches: [ 'master' ] +# paths: +# - 'packages/types/*' +# +#env: +# NPM_TAG: 'next' +# +#jobs: +# release: +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v2 +# +# - name: Setup +# run: npm install +# +# - name: Generate Version +# working-directory: packages/types +# run: | +# echo NPM_VERSION=$(node -e "console.log(require('./package.json').version);")-$NPM_TAG-$(date +"%m-%d-%Y")-$GITHUB_RUN_ID >> $GITHUB_ENV +# +# - name: Bump Version +# working-directory: packages/types +# run: npm version $NPM_VERSION +# +# - name: Build @nativescript/types +# run: npx nx run core:build +# +# - name: Publish @nativescript/types +# working-directory: dist/packages +# env: +# NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} +# run: | +# echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ../../.npmrc +# echo "Publishing @nativescript/types@$NPM_VERSION to NPM with tag $NPM_TAG..." +# npm publish nativescript-types-$NPM_VERSION.tgz --tag $NPM_TAG diff --git a/.github/workflows/npm_release_webpack.yml b/.github/workflows/npm_release_webpack.yml new file mode 100644 index 000000000..c4f2affa0 --- /dev/null +++ b/.github/workflows/npm_release_webpack.yml @@ -0,0 +1,41 @@ +name: '@nativescript/webpack -> npm' + +on: + push: + branches: [ 'master' ] + paths: + - 'packages/webpack/*' + +env: + NPM_TAG: 'next' + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup + run: npm install + + - name: Generate Version + working-directory: packages/webpack + run: | + echo NPM_VERSION=$(node -e "console.log(require('./package.json').version);")-$NPM_TAG-$(date +"%m-%d-%Y")-$GITHUB_RUN_ID >> $GITHUB_ENV + + - name: Bump Version + working-directory: packages/webpack + run: npm version $NPM_VERSION + + - name: Build @nativescript/webpack + run: npx nx run webpack:build + + - name: Publish @nativescript/webpack + working-directory: dist/packages + env: + NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} + run: | + echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ../../.npmrc + echo "Publishing @nativescript/webpack@$NPM_VERSION to NPM with tag $NPM_TAG..." + npm publish nativescript-webpack.tgz --tag $NPM_TAG --dry-run From b4857f87cbf17f9e2a7db03aaba3cfa30d2cda9d Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 28 Dec 2020 14:38:57 +0100 Subject: [PATCH 10/23] ci: add empty action for types --- .github/workflows/npm_release_types.yml | 35 ++++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/npm_release_types.yml b/.github/workflows/npm_release_types.yml index dd815dc0b..fcc2e9e90 100644 --- a/.github/workflows/npm_release_types.yml +++ b/.github/workflows/npm_release_types.yml @@ -1,20 +1,23 @@ # TODO: modify to build android & ios types first and then merge into types -#name: '@nativescript/types -> npm' -# -#on: -# push: -# branches: [ 'master' ] -# paths: -# - 'packages/types/*' -# -#env: -# NPM_TAG: 'next' -# -#jobs: -# release: -# runs-on: ubuntu-latest -# -# steps: +name: '@nativescript/types -> npm' + +on: + push: + branches: [ 'master' ] + paths: + - 'packages/types/*' + +env: + NPM_TAG: 'next' + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - name: Todo + run: | + echo "TODO: implement action" # - uses: actions/checkout@v2 # # - name: Setup From 9aad2dbdbcf7e786183af9abbf16b4009c756ae3 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 30 Dec 2020 07:57:10 -0800 Subject: [PATCH 11/23] feat(ios): types for latest ios 14.3 with Xcode 12.3 (#9118) --- .gitignore | 5 +- apps/automated/package.json | 3 +- apps/toolbox/package.json | 2 + apps/ui/package.json | 3 +- package.json | 4 +- packages/core/package.json | 2 +- packages/types-android/package.json | 2 +- packages/types-ios/package.json | 2 +- packages/types-ios/src/lib/ios/ios.d.ts | 19 +- .../src/lib/ios/objc-x86_64/objc!ARKit.d.ts | 412 ++- .../ios/objc-x86_64/objc!AVFoundation.d.ts | 259 +- .../src/lib/ios/objc-x86_64/objc!AVKit.d.ts | 10 + .../lib/ios/objc-x86_64/objc!Accelerate.d.ts | 807 +++++- .../ios/objc-x86_64/objc!Accessibility.d.ts | 49 + .../lib/ios/objc-x86_64/objc!AdServices.d.ts | 20 + .../src/lib/ios/objc-x86_64/objc!AppClip.d.ts | 30 + .../objc!AppTrackingTransparency.d.ts | 26 + .../ios/objc-x86_64/objc!AppleArchive.d.ts | 347 +++ .../objc-x86_64/objc!AppleTextureEncoder.d.ts | 4 +- .../ios/objc-x86_64/objc!AudioToolbox.d.ts | 87 +- .../objc!AuthenticationServices.d.ts | 118 + ...objc!AutomaticAssessmentConfiguration.d.ts | 77 + .../lib/ios/objc-x86_64/objc!CFNetwork.d.ts | 6 +- .../src/lib/ios/objc-x86_64/objc!CallKit.d.ts | 2 + .../src/lib/ios/objc-x86_64/objc!CarPlay.d.ts | 880 +++++- .../lib/ios/objc-x86_64/objc!ClassKit.d.ts | 56 +- .../lib/ios/objc-x86_64/objc!ClockKit.d.ts | 22 + .../lib/ios/objc-x86_64/objc!CloudKit.d.ts | 104 +- .../lib/ios/objc-x86_64/objc!Contacts.d.ts | 10 + .../ios/objc-x86_64/objc!CoreAudioTypes.d.ts | 4 + .../ios/objc-x86_64/objc!CoreBluetooth.d.ts | 8 +- .../lib/ios/objc-x86_64/objc!CoreData.d.ts | 125 +- .../ios/objc-x86_64/objc!CoreFoundation.d.ts | 14 + .../ios/objc-x86_64/objc!CoreGraphics.d.ts | 56 + .../lib/ios/objc-x86_64/objc!CoreHaptics.d.ts | 4 + .../lib/ios/objc-x86_64/objc!CoreImage.d.ts | 575 +++- .../ios/objc-x86_64/objc!CoreLocation.d.ts | 33 +- .../lib/ios/objc-x86_64/objc!CoreMIDI.d.ts | 291 +- .../src/lib/ios/objc-x86_64/objc!CoreML.d.ts | 94 +- .../lib/ios/objc-x86_64/objc!CoreMedia.d.ts | 8 + .../lib/ios/objc-x86_64/objc!CoreMotion.d.ts | 80 +- .../src/lib/ios/objc-x86_64/objc!CoreNFC.d.ts | 285 +- .../ios/objc-x86_64/objc!CoreSpotlight.d.ts | 4 + .../ios/objc-x86_64/objc!CoreTelephony.d.ts | 4 + .../lib/ios/objc-x86_64/objc!CoreText.d.ts | 12 +- .../lib/ios/objc-x86_64/objc!CoreVideo.d.ts | 54 +- .../src/lib/ios/objc-x86_64/objc!Darwin.d.ts | 208 +- .../objc!DeveloperToolsSupport.d.ts | 13 + .../lib/ios/objc-x86_64/objc!DeviceCheck.d.ts | 25 +- .../lib/ios/objc-x86_64/objc!Dispatch.d.ts | 2 + .../objc!ExposureNotification.d.ts | 351 +++ .../ios/objc-x86_64/objc!FileProvider.d.ts | 34 +- .../lib/ios/objc-x86_64/objc!Foundation.d.ts | 87 +- .../ios/objc-x86_64/objc!GameController.d.ts | 1018 ++++++- .../src/lib/ios/objc-x86_64/objc!GameKit.d.ts | 175 +- .../lib/ios/objc-x86_64/objc!HealthKit.d.ts | 397 ++- .../src/lib/ios/objc-x86_64/objc!HomeKit.d.ts | 33 +- .../src/lib/ios/objc-x86_64/objc!ICU.d.ts | 22 +- .../lib/ios/objc-x86_64/objc!IOSurface.d.ts | 88 +- .../ios/objc-x86_64/objc!IdentityLookup.d.ts | 8 +- .../objc-x86_64/objc!ImageCaptureCore.d.ts | 83 +- .../src/lib/ios/objc-x86_64/objc!ImageIO.d.ts | 33 + .../src/lib/ios/objc-x86_64/objc!Intents.d.ts | 638 ++++- .../lib/ios/objc-x86_64/objc!IntentsUI.d.ts | 4 + .../ios/objc-x86_64/objc!JavaScriptCore.d.ts | 10 +- .../objc-x86_64/objc!LocalAuthentication.d.ts | 4 +- .../src/lib/ios/objc-x86_64/objc!MachO.d.ts | 107 +- .../src/lib/ios/objc-x86_64/objc!MapKit.d.ts | 99 +- .../lib/ios/objc-x86_64/objc!MediaPlayer.d.ts | 4 + .../src/lib/ios/objc-x86_64/objc!Metal.d.ts | 960 ++++++- .../objc!MetalPerformanceShadersGraph.d.ts | 538 ++++ .../lib/ios/objc-x86_64/objc!MetricKit.d.ts | 225 ++ .../ios/objc-x86_64/objc!NaturalLanguage.d.ts | 18 + .../objc-x86_64/objc!NearbyInteraction.d.ts | 138 + .../src/lib/ios/objc-x86_64/objc!Network.d.ts | 154 +- .../objc-x86_64/objc!NetworkExtension.d.ts | 159 +- .../src/lib/ios/objc-x86_64/objc!OSLog.d.ts | 0 .../lib/ios/objc-x86_64/objc!ObjectiveC.d.ts | 9 +- .../src/lib/ios/objc-x86_64/objc!PDFKit.d.ts | 6 +- .../src/lib/ios/objc-x86_64/objc!PassKit.d.ts | 412 ++- .../lib/ios/objc-x86_64/objc!PencilKit.d.ts | 151 + .../src/lib/ios/objc-x86_64/objc!Photos.d.ts | 84 +- .../lib/ios/objc-x86_64/objc!PhotosUI.d.ts | 80 + .../objc!QuickLookThumbnailing.d.ts | 2 + .../lib/ios/objc-x86_64/objc!ReplayKit.d.ts | 13 +- .../src/lib/ios/objc-x86_64/objc!SQLite3.d.ts | 20 + .../ios/objc-x86_64/objc!SafariServices.d.ts | 2 + .../lib/ios/objc-x86_64/objc!SceneKit.d.ts | 14 +- .../lib/ios/objc-x86_64/objc!ScreenTime.d.ts | 62 + .../lib/ios/objc-x86_64/objc!Security.d.ts | 8 + .../lib/ios/objc-x86_64/objc!SensorKit.d.ts | 623 +++++ .../lib/ios/objc-x86_64/objc!SpriteKit.d.ts | 4 + .../lib/ios/objc-x86_64/objc!StoreKit.d.ts | 141 +- .../src/lib/ios/objc-x86_64/objc!UIKit.d.ts | 2447 ++++++++++++++++- .../objc!UniformTypeIdentifiers.d.ts | 331 +++ .../objc-x86_64/objc!UserNotifications.d.ts | 10 +- .../objc!VideoSubscriberAccount.d.ts | 4 +- .../ios/objc-x86_64/objc!VideoToolbox.d.ts | 20 + .../src/lib/ios/objc-x86_64/objc!Vision.d.ts | 724 ++++- .../src/lib/ios/objc-x86_64/objc!WebKit.d.ts | 109 +- .../lib/ios/objc-x86_64/objc!WidgetKit.d.ts | 4 + .../src/lib/ios/objc-x86_64/objc!dnssd.d.ts | 8 + .../src/lib/ios/objc-x86_64/objc!iAd.d.ts | 12 +- .../src/lib/ios/objc-x86_64/objc!launch.d.ts | 99 - .../src/lib/ios/objc-x86_64/objc!libxslt.d.ts | 370 --- .../src/lib/ios/objc-x86_64/objc!os.d.ts | 29 +- .../lib/ios/objc-x86_64/objc!os_object.d.ts | 7 + .../ios/objc-x86_64/objc!os_workgroup.d.ts | 77 + .../src/lib/ios/objc-x86_64/objc!simd.d.ts | 214 +- tools/scripts/typings-gen.sh | 16 +- workspace.json | 3 +- 111 files changed, 15681 insertions(+), 1088 deletions(-) create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!Accessibility.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!AdServices.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!AppClip.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!AppTrackingTransparency.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleArchive.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!AutomaticAssessmentConfiguration.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!ClockKit.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!DeveloperToolsSupport.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!ExposureNotification.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!MetalPerformanceShadersGraph.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!NearbyInteraction.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!OSLog.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!ScreenTime.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!SensorKit.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!UniformTypeIdentifiers.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!WidgetKit.d.ts delete mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!launch.d.ts delete mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!libxslt.d.ts create mode 100644 packages/types-ios/src/lib/ios/objc-x86_64/objc!os_workgroup.d.ts diff --git a/.gitignore b/.gitignore index 01a2cd1ad..c862395dc 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,7 @@ Thumbs.db # core # https://github.com/NativeScript/nativescript-dev-webpack/issues/932 -!packages/core/xml/index.js \ No newline at end of file +!packages/core/xml/index.js + +# types +ios-typings-prj \ No newline at end of file diff --git a/apps/automated/package.json b/apps/automated/package.json index 4ac3b0d15..67a19b86e 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -14,7 +14,8 @@ "@nativescript/core": "file:../../packages/core" }, "devDependencies": { - "@nativescript/ios": "7.0.0", + "@nativescript/android": "7.0.1", + "@nativescript/ios": "7.1.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json index 61a742272..4bca9f519 100644 --- a/apps/toolbox/package.json +++ b/apps/toolbox/package.json @@ -11,6 +11,8 @@ "@nativescript/core": "file:../../packages/core" }, "devDependencies": { + "@nativescript/android": "7.0.1", + "@nativescript/ios": "7.1.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" } diff --git a/apps/ui/package.json b/apps/ui/package.json index c1b026215..600d2fd41 100644 --- a/apps/ui/package.json +++ b/apps/ui/package.json @@ -11,7 +11,8 @@ "@nativescript/core": "file:../../packages/core" }, "devDependencies": { - "@nativescript/ios": "7.0.0", + "@nativescript/android": "7.0.1", + "@nativescript/ios": "7.1.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/package.json b/package.json index b9c8af025..3b2119498 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.0.13", + "version": "7.1.0", "license": "MIT", "scripts": { "setup": "npx rimraf hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup", @@ -45,7 +45,7 @@ "mocha": "^8.0.1", "mocha-typescript": "^1.1.17", "module-alias": "^2.2.2", - "nativescript": "~7.0.6", + "nativescript": "~7.1.0", "node-sass": "~4.14.1", "parse-css": "git+https://github.com/tabatkins/parse-css.git", "parserlib": "^1.1.1", diff --git a/packages/core/package.json b/packages/core/package.json index c9dd07356..9ee967ea9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.0.13", + "version": "7.1.0", "homepage": "https://nativescript.org", "repository": { "type": "git", diff --git a/packages/types-android/package.json b/packages/types-android/package.json index b8431f405..eb8e90e46 100644 --- a/packages/types-android/package.json +++ b/packages/types-android/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/types-android", - "version": "7.0.4", + "version": "7.1.0", "description": "NativeScript Types for Android.", "homepage": "https://nativescript.org", "repository": { diff --git a/packages/types-ios/package.json b/packages/types-ios/package.json index 32ba9c4de..1963ab6ac 100644 --- a/packages/types-ios/package.json +++ b/packages/types-ios/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/types-ios", - "version": "7.0.4", + "version": "7.1.0", "description": "NativeScript Types for iOS.", "homepage": "https://nativescript.org", "repository": { diff --git a/packages/types-ios/src/lib/ios/ios.d.ts b/packages/types-ios/src/lib/ios/ios.d.ts index 051056739..4ca974780 100644 --- a/packages/types-ios/src/lib/ios/ios.d.ts +++ b/packages/types-ios/src/lib/ios/ios.d.ts @@ -3,20 +3,27 @@ /// /// /// +/// /// +/// /// /// /// +/// +/// +/// /// /// /// /// +/// /// /// /// /// /// /// +/// /// /// /// @@ -43,11 +50,13 @@ /// /// /// +/// /// /// /// /// /// +/// /// /// /// @@ -82,15 +91,18 @@ /// /// /// +/// /// /// /// /// /// +/// /// /// /// /// +/// /// /// /// @@ -108,7 +120,9 @@ /// /// /// +/// /// +/// /// /// /// @@ -118,6 +132,7 @@ /// /// /// +/// /// /// /// @@ -126,15 +141,15 @@ /// /// /// +/// /// /// /// /// -/// /// /// -/// /// /// +/// /// /// diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ARKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ARKit.d.ts index f07a90bf4..29d9bce1e 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ARKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ARKit.d.ts @@ -1,4 +1,15 @@ +declare const enum ARAltitudeSource { + + Unknown = 0, + + Coarse = 1, + + Precise = 2, + + UserDefined = 3 +} + declare class ARAnchor extends NSObject implements ARAnchorCopying, NSSecureCoding { static alloc(): ARAnchor; // inherited from NSObject @@ -45,6 +56,64 @@ declare var ARAnchorCopying: { prototype: ARAnchorCopying; }; +declare class ARAppClipCodeAnchor extends ARAnchor implements ARTrackable { + + static alloc(): ARAppClipCodeAnchor; // inherited from NSObject + + static new(): ARAppClipCodeAnchor; // inherited from NSObject + + readonly radius: number; + + readonly url: NSURL; + + readonly urlDecodingState: ARAppClipCodeURLDecodingState; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly isTracked: boolean; // inherited from ARTrackable + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + +declare const enum ARAppClipCodeURLDecodingState { + + Decoding = 0, + + Failed = 1, + + Decoded = 2 +} + declare var ARBlendShapeLocationBrowDownLeft: string; declare var ARBlendShapeLocationBrowDownRight: string; @@ -211,6 +280,8 @@ declare class ARBodyTrackingConfiguration extends ARConfiguration { static new(): ARBodyTrackingConfiguration; // inherited from NSObject + appClipCodeTrackingEnabled: boolean; + autoFocusEnabled: boolean; automaticImageScaleEstimationEnabled: boolean; @@ -228,6 +299,8 @@ declare class ARBodyTrackingConfiguration extends ARConfiguration { planeDetection: ARPlaneDetection; wantsHDREnvironmentTextures: boolean; + + static readonly supportsAppClipCodeTracking: boolean; } declare class ARCamera extends NSObject implements NSCopying { @@ -346,6 +419,15 @@ declare const enum ARCollaborationDataPriority { Optional = 1 } +declare const enum ARConfidenceLevel { + + Low = 0, + + Medium = 1, + + High = 2 +} + declare class ARConfiguration extends NSObject implements NSCopying { static alloc(): ARConfiguration; // inherited from NSObject @@ -371,6 +453,17 @@ declare class ARConfiguration extends NSObject implements NSCopying { copyWithZone(zone: interop.Pointer | interop.Reference): any; } +declare class ARDepthData extends NSObject { + + static alloc(): ARDepthData; // inherited from NSObject + + static new(): ARDepthData; // inherited from NSObject + + readonly confidenceMap: any; + + readonly depthMap: any; +} + declare class ARDirectionalLightEstimate extends ARLightEstimate { static alloc(): ARDirectionalLightEstimate; // inherited from NSObject @@ -424,8 +517,14 @@ declare const enum ARErrorCode { MicrophoneUnauthorized = 104, + LocationUnauthorized = 105, + WorldTrackingFailed = 200, + GeoTrackingNotAvailableAtLocation = 201, + + GeoTrackingFailed = 202, + InvalidReferenceImage = 300, InvalidReferenceObject = 301, @@ -442,7 +541,9 @@ declare const enum ARErrorCode { ObjectMergeFailed = 401, - FileIOFailed = 500 + FileIOFailed = 500, + + RequestFailed = 501 } declare var ARErrorDomain: string; @@ -572,12 +673,18 @@ declare class ARFrame extends NSObject implements NSCopying { readonly estimatedDepthData: any; + readonly geoTrackingStatus: ARGeoTrackingStatus; + readonly lightEstimate: ARLightEstimate; readonly rawFeaturePoints: ARPointCloud; + readonly sceneDepth: ARDepthData; + readonly segmentationBuffer: any; + readonly smoothedSceneDepth: ARDepthData; + readonly timestamp: number; readonly worldMappingStatus: ARWorldMappingStatus; @@ -599,7 +706,230 @@ declare const enum ARFrameSemantics { PersonSegmentationWithDepth = 3, - BodyDetection = 4 + BodyDetection = 4, + + SceneDepth = 8, + + SmoothedSceneDepth = 16 +} + +declare class ARGeoAnchor extends ARAnchor implements ARTrackable { + + static alloc(): ARGeoAnchor; // inherited from NSObject + + static new(): ARGeoAnchor; // inherited from NSObject + + readonly altitude: number; + + readonly altitudeSource: ARAltitudeSource; + + readonly coordinate: CLLocationCoordinate2D; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly isTracked: boolean; // inherited from ARTrackable + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + constructor(o: { coordinate: CLLocationCoordinate2D; }); + + constructor(o: { coordinate: CLLocationCoordinate2D; altitude: number; }); + + constructor(o: { name: string; coordinate: CLLocationCoordinate2D; }); + + constructor(o: { name: string; coordinate: CLLocationCoordinate2D; altitude: number; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + initWithCoordinate(coordinate: CLLocationCoordinate2D): this; + + initWithCoordinateAltitude(coordinate: CLLocationCoordinate2D, altitude: number): this; + + initWithNameCoordinate(name: string, coordinate: CLLocationCoordinate2D): this; + + initWithNameCoordinateAltitude(name: string, coordinate: CLLocationCoordinate2D, altitude: number): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + +declare const enum ARGeoTrackingAccuracy { + + Undetermined = 0, + + Low = 1, + + Medium = 2, + + High = 3 +} + +declare class ARGeoTrackingConfiguration extends ARConfiguration { + + static alloc(): ARGeoTrackingConfiguration; // inherited from NSObject + + static checkAvailabilityAtCoordinateCompletionHandler(coordinate: CLLocationCoordinate2D, completionHandler: (p1: boolean, p2: NSError) => void): void; + + static checkAvailabilityWithCompletionHandler(completionHandler: (p1: boolean, p2: NSError) => void): void; + + static new(): ARGeoTrackingConfiguration; // inherited from NSObject + + appClipCodeTrackingEnabled: boolean; + + automaticImageScaleEstimationEnabled: boolean; + + detectionImages: NSSet; + + detectionObjects: NSSet; + + environmentTexturing: AREnvironmentTexturing; + + maximumNumberOfTrackedImages: number; + + planeDetection: ARPlaneDetection; + + wantsHDREnvironmentTextures: boolean; + + static readonly supportsAppClipCodeTracking: boolean; +} + +declare const enum ARGeoTrackingState { + + NotAvailable = 0, + + Initializing = 1, + + Localizing = 2, + + Localized = 3 +} + +declare const enum ARGeoTrackingStateReason { + + None = 0, + + NotAvailableAtLocation = 1, + + NeedLocationPermissions = 2, + + WorldTrackingUnstable = 3, + + WaitingForLocation = 4, + + WaitingForAvailabilityCheck = 5, + + GeoDataNotLoaded = 6, + + DevicePointedTooLow = 7, + + VisualLocalizationFailed = 8 +} + +declare class ARGeoTrackingStatus extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): ARGeoTrackingStatus; // inherited from NSObject + + static new(): ARGeoTrackingStatus; // inherited from NSObject + + readonly accuracy: ARGeoTrackingAccuracy; + + readonly state: ARGeoTrackingState; + + readonly stateReason: ARGeoTrackingStateReason; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class ARGeometryElement extends NSObject implements NSSecureCoding { + + static alloc(): ARGeometryElement; // inherited from NSObject + + static new(): ARGeometryElement; // inherited from NSObject + + readonly buffer: MTLBuffer; + + readonly bytesPerIndex: number; + + readonly count: number; + + readonly indexCountPerPrimitive: number; + + readonly primitiveType: ARGeometryPrimitiveType; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare const enum ARGeometryPrimitiveType { + + Line = 0, + + Triangle = 1 +} + +declare class ARGeometrySource extends NSObject implements NSSecureCoding { + + static alloc(): ARGeometrySource; // inherited from NSObject + + static new(): ARGeometrySource; // inherited from NSObject + + readonly buffer: MTLBuffer; + + readonly componentsPerVector: number; + + readonly count: number; + + readonly format: MTLVertexFormat; + + readonly offset: number; + + readonly stride: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; } declare class ARHitTestResult extends NSObject { @@ -727,6 +1057,57 @@ declare const enum ARMatteResolution { Half = 1 } +declare class ARMeshAnchor extends ARAnchor { + + static alloc(): ARMeshAnchor; // inherited from NSObject + + static new(): ARMeshAnchor; // inherited from NSObject + + readonly geometry: ARMeshGeometry; +} + +declare const enum ARMeshClassification { + + None = 0, + + Wall = 1, + + Floor = 2, + + Ceiling = 3, + + Table = 4, + + Seat = 5, + + Window = 6, + + Door = 7 +} + +declare class ARMeshGeometry extends NSObject implements NSSecureCoding { + + static alloc(): ARMeshGeometry; // inherited from NSObject + + static new(): ARMeshGeometry; // inherited from NSObject + + readonly classification: ARGeometrySource; + + readonly faces: ARGeometryElement; + + readonly normals: ARGeometrySource; + + readonly vertices: ARGeometrySource; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class ARObjectAnchor extends ARAnchor { static alloc(): ARObjectAnchor; // inherited from NSObject @@ -1274,6 +1655,15 @@ declare var ARSKViewDelegate: { prototype: ARSKViewDelegate; }; +declare const enum ARSceneReconstruction { + + None = 0, + + Mesh = 1, + + MeshWithClassification = 3 +} + declare const enum ARSegmentationClass { None = 0, @@ -1303,6 +1693,8 @@ declare class ARSession extends NSObject { getCurrentWorldMapWithCompletionHandler(completionHandler: (p1: ARWorldMap, p2: NSError) => void): void; + getGeoLocationForPointCompletionHandler(position: interop.Reference, completionHandler: (p1: CLLocationCoordinate2D, p2: number, p3: NSError) => void): void; + pause(): void; raycast(query: ARRaycastQuery): NSArray; @@ -1339,6 +1731,8 @@ interface ARSessionObserver extends NSObjectProtocol { sessionCameraDidChangeTrackingState?(session: ARSession, camera: ARCamera): void; + sessionDidChangeGeoTrackingStatus?(session: ARSession, geoTrackingStatus: ARGeoTrackingStatus): void; + sessionDidFailWithError?(session: ARSession, error: NSError): void; sessionDidOutputAudioSampleBuffer?(session: ARSession, audioSampleBuffer: any): void; @@ -1371,7 +1765,9 @@ declare const enum ARSessionRunOptions { RemoveExistingAnchors = 2, - StopTrackedRaycasts = 4 + StopTrackedRaycasts = 4, + + ResetSceneReconstruction = 8 } declare class ARSkeleton extends NSObject { @@ -1434,6 +1830,8 @@ declare class ARSkeletonDefinition extends NSObject { indexForJointName(jointName: string): number; } +declare function ARSkeletonJointNameForRecognizedPointKey(recognizedPointKey: string): string; + declare var ARSkeletonJointNameHead: string; declare var ARSkeletonJointNameLeftFoot: string; @@ -1556,6 +1954,10 @@ declare class ARWorldTrackingConfiguration extends ARConfiguration { static new(): ARWorldTrackingConfiguration; // inherited from NSObject + static supportsSceneReconstruction(sceneReconstruction: ARSceneReconstruction): boolean; + + appClipCodeTrackingEnabled: boolean; + autoFocusEnabled: boolean; automaticImageScaleEstimationEnabled: boolean; @@ -1574,9 +1976,13 @@ declare class ARWorldTrackingConfiguration extends ARConfiguration { planeDetection: ARPlaneDetection; + sceneReconstruction: ARSceneReconstruction; + userFaceTrackingEnabled: boolean; wantsHDREnvironmentTextures: boolean; + static readonly supportsAppClipCodeTracking: boolean; + static readonly supportsUserFaceTracking: boolean; } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVFoundation.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVFoundation.d.ts index 9cab21441..0c530bf37 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVFoundation.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVFoundation.d.ts @@ -182,6 +182,10 @@ declare var AVAssetDownloadTaskMediaSelectionPrefersMultichannelKey: string; declare var AVAssetDownloadTaskMinimumRequiredMediaBitrateKey: string; +declare var AVAssetDownloadTaskMinimumRequiredPresentationSizeKey: string; + +declare var AVAssetDownloadTaskPrefersHDRKey: string; + declare class AVAssetDownloadURLSession extends NSURLSession { static alloc(): AVAssetDownloadURLSession; // inherited from NSObject @@ -663,6 +667,56 @@ declare class AVAssetResourceRenewalRequest extends AVAssetResourceLoadingReques static new(): AVAssetResourceRenewalRequest; // inherited from NSObject } +declare class AVAssetSegmentReport extends NSObject { + + static alloc(): AVAssetSegmentReport; // inherited from NSObject + + static new(): AVAssetSegmentReport; // inherited from NSObject + + readonly segmentType: AVAssetSegmentType; + + readonly trackReports: NSArray; +} + +declare class AVAssetSegmentReportSampleInformation extends NSObject { + + static alloc(): AVAssetSegmentReportSampleInformation; // inherited from NSObject + + static new(): AVAssetSegmentReportSampleInformation; // inherited from NSObject + + readonly isSyncSample: boolean; + + readonly length: number; + + readonly offset: number; + + readonly presentationTimeStamp: CMTime; +} + +declare class AVAssetSegmentTrackReport extends NSObject { + + static alloc(): AVAssetSegmentTrackReport; // inherited from NSObject + + static new(): AVAssetSegmentTrackReport; // inherited from NSObject + + readonly duration: CMTime; + + readonly earliestPresentationTimeStamp: CMTime; + + readonly firstVideoSampleInformation: AVAssetSegmentReportSampleInformation; + + readonly mediaType: string; + + readonly trackID: number; +} + +declare const enum AVAssetSegmentType { + + Initialization = 1, + + Separable = 2 +} + declare class AVAssetTrack extends NSObject implements AVAsynchronousKeyValueLoading, NSCopying { static alloc(): AVAssetTrack; // inherited from NSObject @@ -778,10 +832,16 @@ declare class AVAssetWriter extends NSObject { readonly availableMediaTypes: NSArray; + delegate: AVAssetWriterDelegate; + directoryForTemporaryFiles: NSURL; readonly error: NSError; + initialMovieFragmentSequenceNumber: number; + + initialSegmentStartTime: CMTime; + readonly inputGroups: NSArray; readonly inputs: NSArray; @@ -794,14 +854,22 @@ declare class AVAssetWriter extends NSObject { readonly outputFileType: string; + outputFileTypeProfile: string; + readonly outputURL: NSURL; overallDurationHint: CMTime; + preferredOutputSegmentInterval: CMTime; + + producesCombinableFragments: boolean; + shouldOptimizeForNetworkUse: boolean; readonly status: AVAssetWriterStatus; + constructor(o: { contentType: UTType; }); + constructor(o: { URL: NSURL; fileType: string; }); addInput(input: AVAssetWriterInput): void; @@ -822,6 +890,10 @@ declare class AVAssetWriter extends NSObject { finishWritingWithCompletionHandler(handler: () => void): void; + flushSegment(): void; + + initWithContentType(outputContentType: UTType): this; + initWithURLFileTypeError(outputURL: NSURL, outputFileType: string): this; startSessionAtSourceTime(startTime: CMTime): void; @@ -829,6 +901,17 @@ declare class AVAssetWriter extends NSObject { startWriting(): boolean; } +interface AVAssetWriterDelegate extends NSObjectProtocol { + + assetWriterDidOutputSegmentDataSegmentType?(writer: AVAssetWriter, segmentData: NSData, segmentType: AVAssetSegmentType): void; + + assetWriterDidOutputSegmentDataSegmentTypeSegmentReport?(writer: AVAssetWriter, segmentData: NSData, segmentType: AVAssetSegmentType, segmentReport: AVAssetSegmentReport): void; +} +declare var AVAssetWriterDelegate: { + + prototype: AVAssetWriterDelegate; +}; + declare class AVAssetWriterInput extends NSObject { static alloc(): AVAssetWriterInput; // inherited from NSObject @@ -2385,6 +2468,8 @@ declare class AVAudioSession extends NSObject { readonly inputNumberOfChannels: number; + readonly inputOrientation: AVAudioStereoOrientation; + readonly maximumInputNumberOfChannels: number; readonly maximumOutputNumberOfChannels: number; @@ -2411,6 +2496,8 @@ declare class AVAudioSession extends NSObject { readonly preferredInputNumberOfChannels: number; + readonly preferredInputOrientation: AVAudioStereoOrientation; + readonly preferredOutputNumberOfChannels: number; readonly preferredSampleRate: number; @@ -2465,6 +2552,8 @@ declare class AVAudioSession extends NSObject { setPreferredInputNumberOfChannelsError(count: number): boolean; + setPreferredInputOrientationError(orientation: AVAudioStereoOrientation): boolean; + setPreferredOutputNumberOfChannelsError(count: number): boolean; setPreferredSampleRateError(sampleRate: number): boolean; @@ -2630,8 +2719,12 @@ declare var AVAudioSessionPolarPatternCardioid: string; declare var AVAudioSessionPolarPatternOmnidirectional: string; +declare var AVAudioSessionPolarPatternStereo: string; + declare var AVAudioSessionPolarPatternSubcardioid: string; +declare var AVAudioSessionPortAVB: string; + declare var AVAudioSessionPortAirPlay: string; declare var AVAudioSessionPortBluetoothA2DP: string; @@ -2673,6 +2766,10 @@ declare class AVAudioSessionPortDescription extends NSObject { setPreferredDataSourceError(dataSource: AVAudioSessionDataSourceDescription): boolean; } +declare var AVAudioSessionPortDisplayPort: string; + +declare var AVAudioSessionPortFireWire: string; + declare var AVAudioSessionPortHDMI: string; declare var AVAudioSessionPortHeadphones: string; @@ -2690,8 +2787,14 @@ declare const enum AVAudioSessionPortOverride { Speaker = 1936747378 } +declare var AVAudioSessionPortPCI: string; + +declare var AVAudioSessionPortThunderbolt: string; + declare var AVAudioSessionPortUSBAudio: string; +declare var AVAudioSessionPortVirtual: string; + declare const enum AVAudioSessionPromptStyle { None = 1852796517, @@ -2859,6 +2962,17 @@ declare class AVAudioSourceNode extends AVAudioNode implements AVAudioMixing { self(): this; } +declare const enum AVAudioSpatializationFormats { + + None = 0, + + MonoAndStereo = 3, + + Multichannel = 4, + + MonoStereoAndMultichannel = 7 +} + interface AVAudioStereoMixing extends NSObjectProtocol { pan: number; @@ -2868,6 +2982,19 @@ declare var AVAudioStereoMixing: { prototype: AVAudioStereoMixing; }; +declare const enum AVAudioStereoOrientation { + + None = 0, + + Portrait = 1, + + PortraitUpsideDown = 2, + + LandscapeRight = 3, + + LandscapeLeft = 4 +} + declare class AVAudioTime extends NSObject { static alloc(): AVAudioTime; // inherited from NSObject @@ -3532,7 +3659,9 @@ declare const enum AVCaptureColorSpace { sRGB = 0, - P3_D65 = 1 + P3_D65 = 1, + + HLG_BT2020 = 2 } declare class AVCaptureConnection extends NSObject { @@ -3772,6 +3901,8 @@ declare class AVCaptureDevice extends NSObject { readonly lowLightBoostSupported: boolean; + readonly manufacturer: string; + readonly maxAvailableVideoZoomFactor: number; readonly maxExposureTargetBias: number; @@ -3794,6 +3925,8 @@ declare class AVCaptureDevice extends NSObject { subjectAreaChangeMonitoringEnabled: boolean; + readonly suspended: boolean; + readonly systemPressureState: AVCaptureSystemPressureState; readonly torchActive: boolean; @@ -4326,6 +4459,8 @@ declare var AVCapturePhotoCaptureDelegate: { interface AVCapturePhotoFileDataRepresentationCustomizer extends NSObjectProtocol { + replacementAppleProRAWCompressionSettingsForPhotoDefaultSettingsMaximumBitDepth?(photo: AVCapturePhoto, defaultSettings: NSDictionary, maximumBitDepth: number): NSDictionary; + replacementDepthDataForPhoto?(photo: AVCapturePhoto): AVDepthData; replacementEmbeddedThumbnailPixelBufferWithPhotoFormatForPhoto?(replacementEmbeddedThumbnailPhotoFormatOut: interop.Pointer | interop.Reference>, photo: AVCapturePhoto): any; @@ -4349,8 +4484,16 @@ declare class AVCapturePhotoOutput extends AVCaptureOutput { static alloc(): AVCapturePhotoOutput; // inherited from NSObject + static isAppleProRAWPixelFormat(pixelFormat: number): boolean; + + static isBayerRAWPixelFormat(pixelFormat: number): boolean; + static new(): AVCapturePhotoOutput; // inherited from NSObject + appleProRAWEnabled: boolean; + + readonly appleProRAWSupported: boolean; + readonly autoRedEyeReductionSupported: boolean; readonly availableLivePhotoVideoCodecTypes: NSArray; @@ -4369,6 +4512,10 @@ declare class AVCapturePhotoOutput extends AVCaptureOutput { readonly cameraCalibrationDataDeliverySupported: boolean; + contentAwareDistortionCorrectionEnabled: boolean; + + readonly contentAwareDistortionCorrectionSupported: boolean; + depthDataDeliveryEnabled: boolean; readonly depthDataDeliverySupported: boolean; @@ -4457,6 +4604,8 @@ declare class AVCapturePhotoSettings extends NSObject implements NSCopying { static photoSettingsWithRawPixelFormatTypeRawFileTypeProcessedFormatProcessedFileType(rawPixelFormatType: number, rawFileType: string, processedFormat: NSDictionary, processedFileType: string): AVCapturePhotoSettings; + autoContentAwareDistortionCorrectionEnabled: boolean; + autoDualCameraFusionEnabled: boolean; autoRedEyeReductionEnabled: boolean; @@ -4530,6 +4679,8 @@ declare class AVCaptureResolvedPhotoSettings extends NSObject { static new(): AVCaptureResolvedPhotoSettings; // inherited from NSObject + readonly contentAwareDistortionCorrectionEnabled: boolean; + readonly dualCameraFusionEnabled: boolean; readonly embeddedThumbnailDimensions: CMVideoDimensions; @@ -5416,7 +5567,13 @@ declare const enum AVError { SessionHardwareCostOverage = -11872, - UnsupportedDeviceActiveFormat = -11873 + UnsupportedDeviceActiveFormat = -11873, + + IncorrectlyConfigured = -11875, + + SegmentStartedWithNonSyncSample = -11876, + + RosettaNotInstalled = -11877 } declare var AVErrorDeviceKey: string; @@ -5473,6 +5630,10 @@ declare var AVFileTypeMPEG4: string; declare var AVFileTypeMPEGLayer3: string; +declare var AVFileTypeProfileMPEG4AppleHLS: string; + +declare var AVFileTypeProfileMPEG4CMAFCompliant: string; + declare var AVFileTypeQuickTimeMovie: string; declare var AVFileTypeSunAU: string; @@ -5506,6 +5667,8 @@ declare class AVFragmentedAsset extends AVURLAsset implements AVFragmentMinding static new(): AVFragmentedAsset; // inherited from NSObject + static objectWithItemProviderDataTypeIdentifierError(data: NSData, typeIdentifier: string): AVFragmentedAsset; // inherited from NSItemProviderReading + readonly associatedWithFragmentMinder: boolean; // inherited from AVFragmentMinding trackWithTrackID(trackID: number): AVFragmentedAssetTrack; @@ -5671,6 +5834,8 @@ declare var AVMediaCharacteristicAudible: string; declare var AVMediaCharacteristicContainsAlphaChannel: string; +declare var AVMediaCharacteristicContainsHDRVideo: string; + declare var AVMediaCharacteristicContainsOnlyForcedSubtitles: string; declare var AVMediaCharacteristicDescribesMusicAndSoundForAccessibility: string; @@ -5867,6 +6032,8 @@ declare class AVMetadataCatBodyObject extends AVMetadataBodyObject implements NS copyWithZone(zone: interop.Pointer | interop.Reference): any; } +declare var AVMetadataCommonIdentifierAccessibilityDescription: string; + declare var AVMetadataCommonIdentifierAlbumName: string; declare var AVMetadataCommonIdentifierArtist: string; @@ -5913,6 +6080,8 @@ declare var AVMetadataCommonIdentifierTitle: string; declare var AVMetadataCommonIdentifierType: string; +declare var AVMetadataCommonKeyAccessibilityDescription: string; + declare var AVMetadataCommonKeyAlbumName: string; declare var AVMetadataCommonKeyArtist: string; @@ -6215,6 +6384,8 @@ declare var AVMetadataID3MetadataKeyUserURL: string; declare var AVMetadataID3MetadataKeyYear: string; +declare var AVMetadataISOUserDataKeyAccessibilityDescription: string; + declare var AVMetadataISOUserDataKeyCopyright: string; declare var AVMetadataISOUserDataKeyDate: string; @@ -6441,6 +6612,8 @@ declare var AVMetadataIdentifierID3MetadataUserURL: string; declare var AVMetadataIdentifierID3MetadataYear: string; +declare var AVMetadataIdentifierISOUserDataAccessibilityDescription: string; + declare var AVMetadataIdentifierISOUserDataCopyright: string; declare var AVMetadataIdentifierISOUserDataDate: string; @@ -6451,6 +6624,8 @@ declare var AVMetadataIdentifierIcyMetadataStreamTitle: string; declare var AVMetadataIdentifierIcyMetadataStreamURL: string; +declare var AVMetadataIdentifierQuickTimeMetadataAccessibilityDescription: string; + declare var AVMetadataIdentifierQuickTimeMetadataAlbum: string; declare var AVMetadataIdentifierQuickTimeMetadataArranger: string; @@ -6517,6 +6692,8 @@ declare var AVMetadataIdentifierQuickTimeMetadataLocationBody: string; declare var AVMetadataIdentifierQuickTimeMetadataLocationDate: string; +declare var AVMetadataIdentifierQuickTimeMetadataLocationHorizontalAccuracyInMeters: string; + declare var AVMetadataIdentifierQuickTimeMetadataLocationISO6709: string; declare var AVMetadataIdentifierQuickTimeMetadataLocationName: string; @@ -6557,6 +6734,8 @@ declare var AVMetadataIdentifierQuickTimeMetadataYear: string; declare var AVMetadataIdentifierQuickTimeMetadataiXML: string; +declare var AVMetadataIdentifierQuickTimeUserDataAccessibilityDescription: string; + declare var AVMetadataIdentifierQuickTimeUserDataAlbum: string; declare var AVMetadataIdentifierQuickTimeUserDataArranger: string; @@ -6898,6 +7077,8 @@ declare var AVMetadataObjectTypeSalientObject: string; declare var AVMetadataObjectTypeUPCECode: string; +declare var AVMetadataQuickTimeMetadataKeyAccessibilityDescription: string; + declare var AVMetadataQuickTimeMetadataKeyAlbum: string; declare var AVMetadataQuickTimeMetadataKeyArranger: string; @@ -6980,6 +7161,8 @@ declare var AVMetadataQuickTimeMetadataKeyYear: string; declare var AVMetadataQuickTimeMetadataKeyiXML: string; +declare var AVMetadataQuickTimeUserDataKeyAccessibilityDescription: string; + declare var AVMetadataQuickTimeUserDataKeyAlbum: string; declare var AVMetadataQuickTimeUserDataKeyArranger: string; @@ -7771,6 +7954,8 @@ declare class AVPlayer extends NSObject { static readonly availableHDRModes: AVPlayerHDRMode; + static readonly eligibleForHDRPlayback: boolean; + constructor(o: { playerItem: AVPlayerItem; }); constructor(o: { URL: NSURL; }); @@ -7829,6 +8014,8 @@ declare const enum AVPlayerActionAtItemEnd { declare var AVPlayerAvailableHDRModesDidChangeNotification: string; +declare var AVPlayerEligibleForHDRPlaybackDidChangeNotification: string; + declare const enum AVPlayerHDRMode { HLG = 1, @@ -7850,6 +8037,10 @@ declare class AVPlayerItem extends NSObject implements NSCopying { static playerItemWithURL(URL: NSURL): AVPlayerItem; + allowedAudioSpatializationFormats: AVAudioSpatializationFormats; + + appliesPerFrameHDRDisplayMetadata: boolean; + readonly asset: AVAsset; audioMix: AVAudioMix; @@ -7920,6 +8111,8 @@ declare class AVPlayerItem extends NSObject implements NSCopying { seekingWaitsForVideoCompositionRendering: boolean; + startsOnFirstEligibleVariant: boolean; + readonly status: AVPlayerItemStatus; textStyleRules: NSArray; @@ -8574,6 +8767,8 @@ declare class AVSampleBufferDisplayLayer extends CALayer implements AVQueuedSamp preventsDisplaySleepDuringVideoPlayback: boolean; + readonly requiresFlushToResumeDecoding: boolean; + readonly status: AVQueuedSampleBufferRenderingStatus; videoGravity: string; @@ -8631,6 +8826,8 @@ declare var AVSampleBufferDisplayLayerFailedToDecodeNotification: string; declare var AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey: string; +declare var AVSampleBufferDisplayLayerRequiresFlushToResumeDecodingDidChangeNotification: string; + declare class AVSampleBufferRenderSynchronizer extends NSObject { static alloc(): AVSampleBufferRenderSynchronizer; // inherited from NSObject @@ -8693,6 +8890,8 @@ declare class AVSemanticSegmentationMatte extends NSObject { semanticSegmentationMatteByReplacingSemanticSegmentationMatteWithPixelBufferError(pixelBuffer: any): this; } +declare var AVSemanticSegmentationMatteTypeGlasses: string; + declare var AVSemanticSegmentationMatteTypeHair: string; declare var AVSemanticSegmentationMatteTypeSkin: string; @@ -8827,6 +9026,8 @@ declare class AVSpeechUtterance extends NSObject implements NSCopying, NSSecureC preUtteranceDelay: number; + prefersAssistiveTechnologySettings: boolean; + rate: number; readonly speechString: string; @@ -8941,7 +9142,7 @@ declare var AVTrackAssociationTypeSelectionFollower: string; declare var AVTrackAssociationTypeTimecode: string; -declare class AVURLAsset extends AVAsset implements AVContentKeyRecipient { +declare class AVURLAsset extends AVAsset implements AVContentKeyRecipient, NSItemProviderReading, NSItemProviderWriting { static URLAssetWithURLOptions(URL: NSURL, options: NSDictionary): AVURLAsset; @@ -8955,21 +9156,69 @@ declare class AVURLAsset extends AVAsset implements AVContentKeyRecipient { static isPlayableExtendedMIMEType(extendedMIMEType: string): boolean; + static itemProviderVisibilityForRepresentationWithTypeIdentifier(typeIdentifier: string): NSItemProviderRepresentationVisibility; + static new(): AVURLAsset; // inherited from NSObject + static objectWithItemProviderDataTypeIdentifierError(data: NSData, typeIdentifier: string): AVURLAsset; + readonly URL: NSURL; readonly assetCache: AVAssetCache; readonly resourceLoader: AVAssetResourceLoader; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + readonly mayRequireContentKeysForMediaDataProcessing: boolean; // inherited from AVContentKeyRecipient + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly writableTypeIdentifiersForItemProvider: NSArray; // inherited from NSItemProviderWriting + + readonly // inherited from NSObjectProtocol + + static readonly readableTypeIdentifiersForItemProvider: NSArray; // inherited from NSItemProviderReading + + static readonly writableTypeIdentifiersForItemProvider: NSArray; // inherited from NSItemProviderWriting + constructor(o: { URL: NSURL; options: NSDictionary; }); + class(): typeof NSObject; + compatibleTrackForCompositionTrack(compositionTrack: AVCompositionTrack): AVAssetTrack; + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + initWithURLOptions(URL: NSURL, options: NSDictionary): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + itemProviderVisibilityForRepresentationWithTypeIdentifier(typeIdentifier: string): NSItemProviderRepresentationVisibility; + + loadDataWithTypeIdentifierForItemProviderCompletionHandler(typeIdentifier: string, completionHandler: (p1: NSData, p2: NSError) => void): NSProgress; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare var AVURLAssetAllowsCellularAccessKey: string; @@ -8994,6 +9243,8 @@ declare var AVVideoApertureModeEncodedPixels: string; declare var AVVideoApertureModeProductionAperture: string; +declare var AVVideoAppleProRAWBitDepthKey: string; + declare var AVVideoAverageBitRateKey: string; declare var AVVideoAverageNonDroppableFrameRateKey: string; @@ -9052,6 +9303,8 @@ interface AVVideoCompositing extends NSObjectProtocol { sourcePixelBufferAttributes: NSDictionary; + supportsHDRSourceFrames?: boolean; + supportsWideColorSourceFrames?: boolean; anticipateRenderingUsingHint?(renderHint: AVVideoCompositionRenderHint): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVKit.d.ts index 684bc1138..b7fd4c81e 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AVKit.d.ts @@ -29,6 +29,8 @@ declare class AVPictureInPictureController extends NSObject { static pictureInPictureButtonStopImageCompatibleWithTraitCollection(traitCollection: UITraitCollection): UIImage; + canStartPictureInPictureAutomaticallyFromInline: boolean; + delegate: AVPictureInPictureControllerDelegate; readonly pictureInPictureActive: boolean; @@ -39,6 +41,8 @@ declare class AVPictureInPictureController extends NSObject { readonly playerLayer: AVPlayerLayer; + requiresLinearPlayback: boolean; + static readonly pictureInPictureButtonStartImage: UIImage; static readonly pictureInPictureButtonStopImage: UIImage; @@ -81,6 +85,8 @@ declare class AVPlayerViewController extends UIViewController { allowsPictureInPicturePlayback: boolean; + canStartPictureInPictureAutomaticallyFromInline: boolean; + readonly contentOverlayView: UIView; delegate: AVPlayerViewControllerDelegate; @@ -95,8 +101,12 @@ declare class AVPlayerViewController extends UIViewController { readonly readyForDisplay: boolean; + requiresLinearPlayback: boolean; + showsPlaybackControls: boolean; + showsTimecodes: boolean; + updatesNowPlayingInfoCenter: boolean; readonly videoBounds: CGRect; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accelerate.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accelerate.d.ts index bbebab078..ab8023484 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accelerate.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accelerate.d.ts @@ -36,9 +36,136 @@ declare const enum BNNSActivationFunction { IntegerLinearSaturatePerChannel = 10, - Softmax = 11 + Softmax = 11, + + GELUApproximation = 12, + + Gumbel = 13, + + GumbelMax = 14, + + HardSigmoid = 15, + + Softplus = 16, + + Softsign = 17, + + ELU = 18, + + ClampedLeakyRectifiedLinear = 19, + + LinearWithBias = 20, + + LogSoftmax = 21, + + LogSigmoid = 22, + + SELU = 23, + + CELU = 24, + + HardShrink = 25, + + SoftShrink = 26, + + TanhShrink = 27, + + Threshold = 28, + + PReLUPerChannel = 29, + + GELUApproximation2 = 30 } +declare function BNNSApplyMultiheadAttention(F: interop.Pointer | interop.Reference, batch_size: number, query: interop.Pointer | interop.Reference, query_stride: number, key: interop.Pointer | interop.Reference, key_stride: number, key_mask: interop.Pointer | interop.Reference, key_mask_stride: number, value: interop.Pointer | interop.Reference, value_stride: number, output: interop.Pointer | interop.Reference, output_stride: number, add_to_attention: interop.Pointer | interop.Reference, backprop_cache_size: interop.Pointer | interop.Reference, backprop_cache: interop.Pointer | interop.Reference, workspace_size: interop.Pointer | interop.Reference, workspace: interop.Pointer | interop.Reference): number; + +declare function BNNSApplyMultiheadAttentionBackward(F: interop.Pointer | interop.Reference, batch_size: number, query: interop.Pointer | interop.Reference, query_stride: number, query_param_delta: interop.Pointer | interop.Reference, key: interop.Pointer | interop.Reference, key_stride: number, key_mask: interop.Pointer | interop.Reference, key_mask_stride: number, key_param_delta: interop.Pointer | interop.Reference, value: interop.Pointer | interop.Reference, value_stride: number, value_param_delta: interop.Pointer | interop.Reference, add_to_attention: interop.Pointer | interop.Reference, key_attn_bias_delta: interop.Pointer | interop.Reference, value_attn_bias_delta: interop.Pointer | interop.Reference, output: interop.Pointer | interop.Reference, output_stride: number, output_param_delta: interop.Pointer | interop.Reference, backprop_cache_size: number, backprop_cache: interop.Pointer | interop.Reference, workspace_size: interop.Pointer | interop.Reference, workspace: interop.Pointer | interop.Reference): number; + +interface BNNSArithmeticBinary { + in1: BNNSNDArrayDescriptor; + in1_type: BNNSDescriptorType; + in2: BNNSNDArrayDescriptor; + in2_type: BNNSDescriptorType; + out: BNNSNDArrayDescriptor; + out_type: BNNSDescriptorType; +} +declare var BNNSArithmeticBinary: interop.StructType; + +declare function BNNSArithmeticFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, number_of_inputs: number, _in: interop.Pointer | interop.Reference>, in_stride: interop.Pointer | interop.Reference, in_delta: interop.Pointer | interop.Reference>, in_delta_stride: interop.Pointer | interop.Reference, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number): number; + +declare function BNNSArithmeticFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, number_of_inputs: number, _in: interop.Pointer | interop.Reference>, in_stride: interop.Pointer | interop.Reference, out: interop.Pointer | interop.Reference, out_stride: number): number; + +declare const enum BNNSArithmeticFunction { + + Add = 0, + + Subtract = 1, + + Multiply = 2, + + Divide = 3, + + SquareRoot = 4, + + ReciprocalSquareRoot = 5, + + Ceil = 6, + + Floor = 7, + + Round = 8, + + Sin = 9, + + Cos = 10, + + Tan = 11, + + Asin = 12, + + Acos = 13, + + Atan = 14, + + Sinh = 15, + + Cosh = 16, + + Tanh = 17, + + Asinh = 18, + + Acosh = 19, + + Atanh = 20, + + Pow = 21, + + Exp = 22, + + Exp2 = 23, + + Log = 24, + + Log2 = 25, + + MultiplyNoNaN = 26, + + DivideNoNaN = 27 +} + +interface BNNSArithmeticUnary { + in: BNNSNDArrayDescriptor; + in_type: BNNSDescriptorType; + out: BNNSNDArrayDescriptor; + out_type: BNNSDescriptorType; +} +declare var BNNSArithmeticUnary: interop.StructType; + +declare function BNNSCompareTensor(in0: interop.Pointer | interop.Reference, in1: interop.Pointer | interop.Reference, op: BNNSRelationalOperator, out: interop.Pointer | interop.Reference): number; + +declare function BNNSComputeLSTMTrainingCacheCapacity(layer_params: interop.Pointer | interop.Reference): number; + interface BNNSConvolutionLayerParameters { x_stride: number; y_stride: number; @@ -54,6 +181,59 @@ interface BNNSConvolutionLayerParameters { } declare var BNNSConvolutionLayerParameters: interop.StructType; +declare function BNNSCopy(dest: interop.Pointer | interop.Reference, src: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): number; + +declare const enum BNNSDataLayout { + + LayoutVector = 65536, + + Layout1DLastMajor = 98304, + + Layout1DFirstMajor = 98305, + + LayoutRowMajorMatrix = 131072, + + LayoutColumnMajorMatrix = 131073, + + Layout2DLastMajor = 163840, + + Layout2DFirstMajor = 163841, + + LayoutImageCHW = 196608, + + Layout3DLastMajor = 229376, + + Layout3DFirstMajor = 229377, + + LayoutConvolutionWeightsOIHW = 262144, + + LayoutConvolutionWeightsOIHrWr = 262145, + + LayoutConvolutionWeightsIOHrWr = 262146, + + LayoutConvolutionWeightsOIHW_Pack32 = 262160, + + Layout4DLastMajor = 294912, + + Layout4DFirstMajor = 294913, + + Layout5DLastMajor = 360448, + + Layout5DFirstMajor = 360449, + + Layout6DLastMajor = 425984, + + Layout6DFirstMajor = 425985, + + Layout7DLastMajor = 491520, + + Layout7DFirstMajor = 491521, + + Layout8DLastMajor = 557056, + + Layout8DFirstMajor = 557057 +} + declare const enum BNNSDataType { FloatBit = 65536, @@ -64,6 +244,12 @@ declare const enum BNNSDataType { IntBit = 131072, + Int1 = 131073, + + Int2 = 131074, + + Int4 = 131076, + Int8 = 131080, Int16 = 131088, @@ -72,6 +258,12 @@ declare const enum BNNSDataType { UIntBit = 262144, + UInt1 = 262145, + + UInt2 = 262146, + + UInt4 = 262148, + UInt8 = 262152, UInt16 = 262160, @@ -80,17 +272,94 @@ declare const enum BNNSDataType { IndexedBit = 524288, - Indexed8 = 524296 + Indexed1 = 524289, + + Indexed2 = 524290, + + Indexed4 = 524292, + + Indexed8 = 524296, + + MiscellaneousBit = 1048576, + + Boolean = 1048584 } +declare const enum BNNSDescriptorType { + + Constant = 0, + + Sample = 1, + + Parameter = 2 +} + +declare function BNNSDirectApplyActivationBatch(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference, batch_size: number, in_stride: number, out_stride: number): number; + +declare function BNNSDirectApplyBroadcastMatMul(transA: boolean, transB: boolean, alpha: number, inputA: interop.Pointer | interop.Reference, inputB: interop.Pointer | interop.Reference, output: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): void; + +declare function BNNSDirectApplyInTopK(K: number, axis: number, batch_size: number, input: interop.Pointer | interop.Reference, input_batch_stride: number, test_indices: interop.Pointer | interop.Reference, test_indices_batch_stride: number, output: interop.Pointer | interop.Reference, output_batch_stride: number, filter_params: interop.Pointer | interop.Reference): number; + +declare function BNNSDirectApplyLSTMBatchBackward(layer_params: interop.Pointer | interop.Reference, layer_delta_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference, training_cache_ptr: interop.Pointer | interop.Reference, training_cache_capacity: number): number; + +declare function BNNSDirectApplyLSTMBatchTrainingCaching(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference, training_cache_ptr: interop.Pointer | interop.Reference, training_cache_capacity: number): number; + +declare function BNNSDirectApplyReduction(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): number; + +declare function BNNSDirectApplyTopK(K: number, axis: number, batch_size: number, input: interop.Pointer | interop.Reference, input_batch_stride: number, best_values: interop.Pointer | interop.Reference, best_values_batch_stride: number, best_indices: interop.Pointer | interop.Reference, best_indices_batch_stride: number, filter_params: interop.Pointer | interop.Reference): number; + declare function BNNSFilterApply(filter: interop.Pointer | interop.Reference, _in: interop.Pointer | interop.Reference, out: interop.Pointer | interop.Reference): number; +declare function BNNSFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number, weights_delta: interop.Pointer | interop.Reference, bias_delta: interop.Pointer | interop.Reference): number; + +declare function BNNSFilterApplyBackwardTwoInputBatch(filter: interop.Pointer | interop.Reference, batch_size: number, inA: interop.Pointer | interop.Reference, inA_stride: number, inA_delta: interop.Pointer | interop.Reference, inA_delta_stride: number, inB: interop.Pointer | interop.Reference, inB_stride: number, inB_delta: interop.Pointer | interop.Reference, inB_delta_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number, weights_delta: interop.Pointer | interop.Reference, bias_delta: interop.Pointer | interop.Reference): number; + declare function BNNSFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, out: interop.Pointer | interop.Reference, out_stride: number): number; +declare function BNNSFilterApplyTwoInput(filter: interop.Pointer | interop.Reference, inA: interop.Pointer | interop.Reference, inB: interop.Pointer | interop.Reference, out: interop.Pointer | interop.Reference): number; + +declare function BNNSFilterApplyTwoInputBatch(filter: interop.Pointer | interop.Reference, batch_size: number, inA: interop.Pointer | interop.Reference, inA_stride: number, inB: interop.Pointer | interop.Reference, inB_stride: number, out: interop.Pointer | interop.Reference, out_stride: number): number; + declare function BNNSFilterCreateConvolutionLayer(in_desc: interop.Pointer | interop.Reference, out_desc: interop.Pointer | interop.Reference, layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; declare function BNNSFilterCreateFullyConnectedLayer(in_desc: interop.Pointer | interop.Reference, out_desc: interop.Pointer | interop.Reference, layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; +declare function BNNSFilterCreateFusedLayer(number_of_fused_filters: number, filter_type: interop.Pointer | interop.Reference, layer_params: interop.Pointer | interop.Reference>, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerActivation(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerArithmetic(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerBroadcastMatMul(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerConvolution(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerDropout(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerFullyConnected(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerGram(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerLoss(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerMultiheadAttention(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerNormalization(normType: BNNSFilterType, layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerPadding(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerPermute(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerPooling(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerReduction(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerResize(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerTensorContraction(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function BNNSFilterCreateLayerTransposedConvolution(layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + declare function BNNSFilterCreatePoolingLayer(in_desc: interop.Pointer | interop.Reference, out_desc: interop.Pointer | interop.Reference, layer_params: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; declare function BNNSFilterCreateVectorActivationLayer(in_desc: interop.Pointer | interop.Reference, out_desc: interop.Pointer | interop.Reference, activation: interop.Pointer | interop.Reference, filter_params: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; @@ -105,6 +374,23 @@ interface BNNSFilterParameters { } declare var BNNSFilterParameters: interop.StructType; +declare const enum BNNSFilterType { + + Convolution = 0, + + FullyConnected = 1, + + BatchNorm = 2, + + InstanceNorm = 3, + + LayerNorm = 4, + + GroupNorm = 5, + + TransposedConvolution = 6 +} + declare const enum BNNSFlags { UseClientPtr = 1 @@ -119,6 +405,12 @@ interface BNNSFullyConnectedLayerParameters { } declare var BNNSFullyConnectedLayerParameters: interop.StructType; +declare function BNNSFusedFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number, delta_parameters: interop.Pointer | interop.Reference>): number; + +declare function BNNSFusedFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, training: boolean): number; + +declare function BNNSGetPointer(filter: interop.Pointer | interop.Reference, target: BNNSPointerSpecifier): BNNSNDArrayDescriptor; + interface BNNSImageStackDescriptor { width: number; height: number; @@ -131,6 +423,29 @@ interface BNNSImageStackDescriptor { } declare var BNNSImageStackDescriptor: interop.StructType; +declare const enum BNNSInterpolationMethod { + + Nearest = 0, + + Linear = 1 +} + +interface BNNSLSTMDataDescriptor { + data_desc: BNNSNDArrayDescriptor; + hidden_desc: BNNSNDArrayDescriptor; + cell_state_desc: BNNSNDArrayDescriptor; +} +declare var BNNSLSTMDataDescriptor: interop.StructType; + +interface BNNSLSTMGateDescriptor { + iw_desc: interop.Reference; + hw_desc: BNNSNDArrayDescriptor; + cw_desc: BNNSNDArrayDescriptor; + b_desc: BNNSNDArrayDescriptor; + activation: BNNSActivation; +} +declare var BNNSLSTMGateDescriptor: interop.StructType; + interface BNNSLayerData { data: interop.Pointer | interop.Reference; data_type: BNNSDataType; @@ -140,10 +455,428 @@ interface BNNSLayerData { } declare var BNNSLayerData: interop.StructType; +declare const enum BNNSLayerFlags { + + LSTMBidirectional = 1, + + LSTMDefaultActivations = 2 +} + +interface BNNSLayerParametersActivation { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + activation: BNNSActivation; + axis_flags: number; +} +declare var BNNSLayerParametersActivation: interop.StructType; + +interface BNNSLayerParametersArithmetic { + arithmetic_function: BNNSArithmeticFunction; + arithmetic_function_fields: interop.Pointer | interop.Reference; + activation: BNNSActivation; +} +declare var BNNSLayerParametersArithmetic: interop.StructType; + +interface BNNSLayerParametersBroadcastMatMul { + alpha: number; + beta: number; + transA: boolean; + transB: boolean; + quadratic: boolean; + a_is_weights: boolean; + b_is_weights: boolean; + iA_desc: BNNSNDArrayDescriptor; + iB_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; +} +declare var BNNSLayerParametersBroadcastMatMul: interop.StructType; + +interface BNNSLayerParametersConvolution { + i_desc: BNNSNDArrayDescriptor; + w_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + bias: BNNSNDArrayDescriptor; + activation: BNNSActivation; + x_stride: number; + y_stride: number; + x_dilation_stride: number; + y_dilation_stride: number; + x_padding: number; + y_padding: number; + groups: number; + pad: interop.Reference; +} +declare var BNNSLayerParametersConvolution: interop.StructType; + +interface BNNSLayerParametersDropout { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + rate: number; + seed: number; + control: number; +} +declare var BNNSLayerParametersDropout: interop.StructType; + +interface BNNSLayerParametersFullyConnected { + i_desc: BNNSNDArrayDescriptor; + w_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + bias: BNNSNDArrayDescriptor; + activation: BNNSActivation; +} +declare var BNNSLayerParametersFullyConnected: interop.StructType; + +interface BNNSLayerParametersGram { + alpha: number; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; +} +declare var BNNSLayerParametersGram: interop.StructType; + +interface BNNSLayerParametersLSTM { + input_size: number; + hidden_size: number; + batch_size: number; + num_layers: number; + seq_len: number; + dropout: number; + lstm_flags: number; + sequence_descriptor: BNNSNDArrayDescriptor; + input_descriptor: BNNSLSTMDataDescriptor; + output_descriptor: BNNSLSTMDataDescriptor; + input_gate: BNNSLSTMGateDescriptor; + forget_gate: BNNSLSTMGateDescriptor; + candidate_gate: BNNSLSTMGateDescriptor; + output_gate: BNNSLSTMGateDescriptor; + hidden_activation: BNNSActivation; +} +declare var BNNSLayerParametersLSTM: interop.StructType; + +interface BNNSLayerParametersLossBase { + function: BNNSLossFunction; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + reduction: BNNSLossReductionFunction; +} +declare var BNNSLayerParametersLossBase: interop.StructType; + +interface BNNSLayerParametersLossHuber { + function: BNNSLossFunction; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + reduction: BNNSLossReductionFunction; + huber_delta: number; +} +declare var BNNSLayerParametersLossHuber: interop.StructType; + +interface BNNSLayerParametersLossSigmoidCrossEntropy { + function: BNNSLossFunction; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + reduction: BNNSLossReductionFunction; + label_smooth: number; +} +declare var BNNSLayerParametersLossSigmoidCrossEntropy: interop.StructType; + +interface BNNSLayerParametersLossSoftmaxCrossEntropy { + function: BNNSLossFunction; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + reduction: BNNSLossReductionFunction; + label_smooth: number; +} +declare var BNNSLayerParametersLossSoftmaxCrossEntropy: interop.StructType; + +interface BNNSLayerParametersLossYolo { + function: BNNSLossFunction; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + reduction: BNNSLossReductionFunction; + huber_delta: number; + number_of_grid_columns: number; + number_of_grid_rows: number; + number_of_anchor_boxes: number; + anchor_box_size: number; + rescore: boolean; + scale_xy: number; + scale_wh: number; + scale_object: number; + scale_no_object: number; + scale_classification: number; + object_minimum_iou: number; + no_object_maximum_iou: number; + anchors_data: interop.Pointer | interop.Reference; +} +declare var BNNSLayerParametersLossYolo: interop.StructType; + +interface BNNSLayerParametersMultiheadAttention { + query: BNNSMHAProjectionParameters; + key: BNNSMHAProjectionParameters; + value: BNNSMHAProjectionParameters; + add_zero_attn: boolean; + key_attn_bias: BNNSNDArrayDescriptor; + value_attn_bias: BNNSNDArrayDescriptor; + output: BNNSMHAProjectionParameters; + dropout: number; + seed: number; +} +declare var BNNSLayerParametersMultiheadAttention: interop.StructType; + +interface BNNSLayerParametersNormalization { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + beta_desc: BNNSNDArrayDescriptor; + gamma_desc: BNNSNDArrayDescriptor; + moving_mean_desc: BNNSNDArrayDescriptor; + moving_variance_desc: BNNSNDArrayDescriptor; + momentum: number; + epsilon: number; + activation: BNNSActivation; + num_groups: number; + normalization_axis: number; +} +declare var BNNSLayerParametersNormalization: interop.StructType; + +interface BNNSLayerParametersPadding { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + padding_size: interop.Reference>; + padding_mode: BNNSPaddingMode; + padding_value: number; +} +declare var BNNSLayerParametersPadding: interop.StructType; + +interface BNNSLayerParametersPermute { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + permutation: interop.Reference; +} +declare var BNNSLayerParametersPermute: interop.StructType; + +interface BNNSLayerParametersPooling { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + bias: BNNSNDArrayDescriptor; + activation: BNNSActivation; + pooling_function: BNNSPoolingFunction; + k_width: number; + k_height: number; + x_stride: number; + y_stride: number; + x_dilation_stride: number; + y_dilation_stride: number; + x_padding: number; + y_padding: number; + pad: interop.Reference; +} +declare var BNNSLayerParametersPooling: interop.StructType; + +interface BNNSLayerParametersReduction { + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + w_desc: BNNSNDArrayDescriptor; + reduce_func: BNNSReduceFunction; + epsilon: number; +} +declare var BNNSLayerParametersReduction: interop.StructType; + +interface BNNSLayerParametersResize { + method: BNNSInterpolationMethod; + i_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; + align_corners: boolean; +} +declare var BNNSLayerParametersResize: interop.StructType; + +interface BNNSLayerParametersTensorContraction { + operation: string; + alpha: number; + beta: number; + iA_desc: BNNSNDArrayDescriptor; + iB_desc: BNNSNDArrayDescriptor; + o_desc: BNNSNDArrayDescriptor; +} +declare var BNNSLayerParametersTensorContraction: interop.StructType; + +declare function BNNSLossFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, labels: interop.Pointer | interop.Reference, labels_stride: number, weights: interop.Pointer | interop.Reference, weights_size: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number): number; + +declare function BNNSLossFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, labels: interop.Pointer | interop.Reference, labels_stride: number, weights: interop.Pointer | interop.Reference, weights_size: number, out: interop.Pointer | interop.Reference, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number): number; + +declare const enum BNNSLossFunction { + + SoftmaxCrossEntropy = 1, + + SigmoidCrossEntropy = 2, + + MeanSquareError = 3, + + Huber = 4, + + Yolo = 5, + + Log = 6, + + CosineDistance = 7, + + Hinge = 8, + + MeanAbsoluteError = 9, + + CategoricalCrossEntropy = 10 +} + +declare const enum BNNSLossReductionFunction { + + None = 0, + + Sum = 1, + + WeightedMean = 2, + + Mean = 3, + + NonZeroWeightMean = 4 +} + +interface BNNSMHAProjectionParameters { + target_desc: BNNSNDArrayDescriptor; + weights: BNNSNDArrayDescriptor; + bias: BNNSNDArrayDescriptor; +} +declare var BNNSMHAProjectionParameters: interop.StructType; + +interface BNNSNDArrayDescriptor { + flags: BNNSNDArrayFlags; + layout: BNNSDataLayout; + size: interop.Reference; + stride: interop.Reference; + data: interop.Pointer | interop.Reference; + data_type: BNNSDataType; + table_data: interop.Pointer | interop.Reference; + table_data_type: BNNSDataType; + data_scale: number; + data_bias: number; +} +declare var BNNSNDArrayDescriptor: interop.StructType; + +declare const enum BNNSNDArrayFlags { + + BackpropSet = 0, + + BackpropAccumulate = 1 +} + +declare function BNNSNormalizationFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number, beta_delta: interop.Pointer | interop.Reference, gamma_delta: interop.Pointer | interop.Reference): number; + +declare function BNNSNormalizationFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, training: boolean): number; + +interface BNNSOptimizerAdamFields { + learning_rate: number; + beta1: number; + beta2: number; + time_step: number; + epsilon: number; + gradient_scale: number; + regularization_scale: number; + clip_gradients: boolean; + clip_gradients_min: number; + clip_gradients_max: number; + regularization_func: BNNSOptimizerRegularizationFunction; +} +declare var BNNSOptimizerAdamFields: interop.StructType; + +declare const enum BNNSOptimizerFunction { + + SGDMomentum = 1, + + Adam = 2, + + RMSProp = 3 +} + +interface BNNSOptimizerRMSPropFields { + learning_rate: number; + alpha: number; + epsilon: number; + centered: boolean; + momentum: number; + gradient_scale: number; + regularization_scale: number; + clip_gradients: boolean; + clip_gradients_min: number; + clip_gradients_max: number; + regularization_func: BNNSOptimizerRegularizationFunction; +} +declare var BNNSOptimizerRMSPropFields: interop.StructType; + +declare const enum BNNSOptimizerRegularizationFunction { + + None = 0, + + L1 = 1, + + L2 = 2 +} + +interface BNNSOptimizerSGDMomentumFields { + learning_rate: number; + momentum: number; + gradient_scale: number; + regularization_scale: number; + clip_gradients: boolean; + clip_gradients_min: number; + clip_gradients_max: number; + nesterov: boolean; + regularization_func: BNNSOptimizerRegularizationFunction; + sgd_momentum_variant: BNNSOptimizerSGDMomentumVariant; +} +declare var BNNSOptimizerSGDMomentumFields: interop.StructType; + +declare const enum BNNSOptimizerSGDMomentumVariant { + + SGDMomentumVariant0 = 0, + + SGDMomentumVariant1 = 1, + + SGDMomentumVariant2 = 2 +} + +declare function BNNSOptimizerStep(_function: BNNSOptimizerFunction, OptimizerAlgFields: interop.Pointer | interop.Reference, number_of_parameters: number, parameters: interop.Pointer | interop.Reference>, gradients: interop.Pointer | interop.Reference>, accumulators: interop.Pointer | interop.Reference>, filter_params: interop.Pointer | interop.Reference): number; + +declare const enum BNNSPaddingMode { + + Constant = 0, + + Reflect = 1, + + Symmetric = 2 +} + +declare function BNNSPermuteFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number): number; + +declare const enum BNNSPointerSpecifier { + + Alpha = 0, + + Beta = 1 +} + +declare function BNNSPoolingFilterApplyBackwardBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, in_delta: interop.Pointer | interop.Reference, in_delta_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, out_delta: interop.Pointer | interop.Reference, out_delta_stride: number, bias_delta: interop.Pointer | interop.Reference, indices: interop.Pointer | interop.Reference, idx_stride: number): number; + +declare function BNNSPoolingFilterApplyBatch(filter: interop.Pointer | interop.Reference, batch_size: number, _in: interop.Pointer | interop.Reference, in_stride: number, out: interop.Pointer | interop.Reference, out_stride: number, indices: interop.Pointer | interop.Reference, idx_stride: number): number; + declare const enum BNNSPoolingFunction { Max = 0, + AverageCountIncludePadding = 1, + + AverageCountExcludePadding = 2, + + UnMax = 3, + + L2Norm = 4, + Average = 1 } @@ -162,6 +895,66 @@ interface BNNSPoolingLayerParameters { } declare var BNNSPoolingLayerParameters: interop.StructType; +declare const enum BNNSReduceFunction { + + Max = 0, + + Min = 1, + + ArgMax = 2, + + ArgMin = 3, + + Mean = 4, + + MeanNonZero = 5, + + Sum = 6, + + SumSquare = 7, + + SumLog = 8, + + L1Norm = 9, + + LogicalOr = 10, + + LogicalAnd = 11, + + Any = 10, + + All = 11 +} + +declare const enum BNNSRelationalOperator { + + Equal = 0, + + Less = 1, + + LessEqual = 2, + + Greater = 3, + + GreaterEqual = 4, + + NotEqual = 5, + + LogicalAND = 6, + + LogicalOR = 7, + + LogicalNOT = 8, + + LogicalNAND = 9, + + LogicalNOR = 10, + + LogicalXOR = 11 +} + +declare function BNNSTranspose(dest: interop.Pointer | interop.Reference, src: interop.Pointer | interop.Reference, axis0: number, axis1: number, filter_params: interop.Pointer | interop.Reference): number; + interface BNNSVectorDescriptor { size: number; data_type: BNNSDataType; @@ -5311,6 +6104,8 @@ declare function vImageConverter_CreateForCGToCVImageFormat(srcFormat: interop.P declare function vImageConverter_CreateForCVToCGImageFormat(srcFormat: any, destFormat: interop.Pointer | interop.Reference, backgroundColor: interop.Pointer | interop.Reference, flags: number, error: interop.Pointer | interop.Reference): interop.Unmanaged; +declare function vImageConverter_CreateWithCGColorConversionInfo(colorConversionInfoRef: any, sFormat: interop.Pointer | interop.Reference, dFormat: interop.Pointer | interop.Reference, bg: interop.Pointer | interop.Reference, flags: number, error: interop.Pointer | interop.Reference): interop.Unmanaged; + declare function vImageConverter_CreateWithCGImageFormat(srcFormat: interop.Pointer | interop.Reference, destFormat: interop.Pointer | interop.Reference, backgroundColor: interop.Pointer | interop.Reference, flags: number, error: interop.Pointer | interop.Reference): interop.Unmanaged; declare function vImageConverter_CreateWithColorSyncCodeFragment(codeFragment: any, srcFormat: interop.Pointer | interop.Reference, destFormat: interop.Pointer | interop.Reference, backgroundColor: interop.Pointer | interop.Reference, flags: number, error: interop.Pointer | interop.Reference): interop.Unmanaged; @@ -5758,6 +6553,14 @@ declare function vImageSelectChannels_ARGB8888(newSrc: interop.Pointer | interop declare function vImageSelectChannels_ARGBFFFF(newSrc: interop.Pointer | interop.Reference, origSrc: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, copyMask: number, flags: number): number; +declare function vImageSepConvolve_Planar16U(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, tempBuffer: interop.Pointer | interop.Reference, srcOffsetToROI_X: number, srcOffsetToROI_Y: number, kernelX: interop.Pointer | interop.Reference, kernelX_width: number, kernelY: interop.Pointer | interop.Reference, kernelY_width: number, bias: number, backgroundColor: number, flags: number): number; + +declare function vImageSepConvolve_Planar8(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, tempBuffer: interop.Pointer | interop.Reference, srcOffsetToROI_X: number, srcOffsetToROI_Y: number, kernelX: interop.Pointer | interop.Reference, kernelX_width: number, kernelY: interop.Pointer | interop.Reference, kernelY_width: number, bias: number, backgroundColor: number, flags: number): number; + +declare function vImageSepConvolve_Planar8to16U(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, tempBuffer: interop.Pointer | interop.Reference, srcOffsetToROI_X: number, srcOffsetToROI_Y: number, kernelX: interop.Pointer | interop.Reference, kernelX_width: number, kernelY: interop.Pointer | interop.Reference, kernelY_width: number, scale: number, bias: number, backgroundColor: number, flags: number): number; + +declare function vImageSepConvolve_PlanarF(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, tempBuffer: interop.Pointer | interop.Reference, srcOffsetToROI_X: number, srcOffsetToROI_Y: number, kernelX: interop.Pointer | interop.Reference, kernelX_width: number, kernelY: interop.Pointer | interop.Reference, kernelY_width: number, bias: number, backgroundColor: number, flags: number): number; + declare function vImageSymmetricPiecewiseGamma_Planar16Q12(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, exponentialCoeffs: interop.Reference, gamma: number, linearCoeffs: interop.Reference, boundary: number, flags: number): number; declare function vImageSymmetricPiecewiseGamma_PlanarF(src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, exponentialCoeffs: interop.Reference, gamma: number, linearCoeffs: interop.Reference, boundary: number, flags: number): number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accessibility.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accessibility.d.ts new file mode 100644 index 000000000..51a93e5dc --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Accessibility.d.ts @@ -0,0 +1,49 @@ + +declare class AXCustomContent extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): AXCustomContent; // inherited from NSObject + + static customContentWithAttributedLabelAttributedValue(label: NSAttributedString, value: NSAttributedString): AXCustomContent; + + static customContentWithLabelValue(label: string, value: string): AXCustomContent; + + static new(): AXCustomContent; // inherited from NSObject + + readonly attributedLabel: NSAttributedString; + + readonly attributedValue: NSAttributedString; + + importance: AXCustomContentImportance; + + readonly label: string; + + readonly value: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare const enum AXCustomContentImportance { + + Default = 0, + + High = 1 +} + +interface AXCustomContentProvider extends NSObjectProtocol { + + accessibilityCustomContent: NSArray; +} +declare var AXCustomContentProvider: { + + prototype: AXCustomContentProvider; +}; + +declare function AXNameFromColor(color: any): string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AdServices.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AdServices.d.ts new file mode 100644 index 000000000..4c5df5252 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AdServices.d.ts @@ -0,0 +1,20 @@ + +declare class AAAttribution extends NSObject { + + static alloc(): AAAttribution; // inherited from NSObject + + static attributionTokenWithError(): string; + + static new(): AAAttribution; // inherited from NSObject +} + +declare const enum AAAttributionErrorCode { + + NetworkError = 1, + + InternalError = 2, + + PlatformNotSupported = 3 +} + +declare var AAAttributionErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppClip.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppClip.d.ts new file mode 100644 index 000000000..9c9e8111a --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppClip.d.ts @@ -0,0 +1,30 @@ + +declare class APActivationPayload extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): APActivationPayload; // inherited from NSObject + + static new(): APActivationPayload; // inherited from NSObject + + readonly URL: NSURL; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + confirmAcquiredInRegionCompletionHandler(region: CLRegion, completionHandler: (p1: boolean, p2: NSError) => void): void; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare const enum APActivationPayloadErrorCode { + + Disallowed = 1, + + DoesNotMatch = 2 +} + +declare var APActivationPayloadErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppTrackingTransparency.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppTrackingTransparency.d.ts new file mode 100644 index 000000000..a6ffbce85 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppTrackingTransparency.d.ts @@ -0,0 +1,26 @@ + +declare class ATTrackingManager extends NSObject { + + static alloc(): ATTrackingManager; // inherited from NSObject + + static new(): ATTrackingManager; // inherited from NSObject + + static requestTrackingAuthorizationWithCompletionHandler(completion: (p1: ATTrackingManagerAuthorizationStatus) => void): void; + + static readonly trackingAuthorizationStatus: ATTrackingManagerAuthorizationStatus; +} + +declare const enum ATTrackingManagerAuthorizationStatus { + + NotDetermined = 0, + + Restricted = 1, + + Denied = 2, + + Authorized = 3 +} + +declare var AppTrackingTransparencyVersionNumber: number; + +declare var AppTrackingTransparencyVersionString: interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleArchive.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleArchive.d.ts new file mode 100644 index 000000000..bb667ecaa --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleArchive.d.ts @@ -0,0 +1,347 @@ + +declare const enum AAACEQualifierTypes { + + A_ACE_QUALIFIER_TYPE_USER = 85, + + A_ACE_QUALIFIER_TYPE_GROUP = 71, + + A_ACE_QUALIFIER_TYPE_SID = 83, + + A_ACE_QUALIFIER_TYPE_UUID = 73 +} + +interface AAAccessControlEntry { + tag: acl_tag_t; + perms: number; + flags: number; + qualifier_type: number; +} +declare var AAAccessControlEntry: interop.StructType; + +declare function AAArchiveStreamCancel(s: interop.Pointer | interop.Reference): void; + +declare function AAArchiveStreamClose(s: interop.Pointer | interop.Reference): number; + +declare function AAArchiveStreamProcess(istream: interop.Pointer | interop.Reference, ostream: interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): number; + +declare function AAArchiveStreamReadHeader(s: interop.Pointer | interop.Reference, header: interop.Pointer | interop.Reference>): number; + +declare function AAArchiveStreamWriteHeader(s: interop.Pointer | interop.Reference, header: interop.Pointer | interop.Reference): number; + +declare function AAArchiveStreamWritePathList(s: interop.Pointer | interop.Reference, path_list: interop.Pointer | interop.Reference, key_set: interop.Pointer | interop.Reference, dir: string | interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): number; + +declare function AAByteStreamCancel(s: interop.Pointer | interop.Reference): void; + +declare function AAByteStreamClose(s: interop.Pointer | interop.Reference): number; + +declare function AAByteStreamPRead(s: interop.Pointer | interop.Reference, buf: interop.Pointer | interop.Reference, nbyte: number, offset: number): number; + +declare function AAByteStreamPWrite(s: interop.Pointer | interop.Reference, buf: interop.Pointer | interop.Reference, nbyte: number, offset: number): number; + +declare function AAByteStreamProcess(istream: interop.Pointer | interop.Reference, ostream: interop.Pointer | interop.Reference): number; + +declare function AAByteStreamRead(s: interop.Pointer | interop.Reference, buf: interop.Pointer | interop.Reference, nbyte: number): number; + +declare function AAByteStreamSeek(s: interop.Pointer | interop.Reference, offset: number, whence: number): number; + +declare function AAByteStreamWrite(s: interop.Pointer | interop.Reference, buf: interop.Pointer | interop.Reference, nbyte: number): number; + +declare const enum AACompressionAlgorithms { + + A_COMPRESSION_ALGORITHM_NONE = 0, + + A_COMPRESSION_ALGORITHM_LZ4 = 256, + + A_COMPRESSION_ALGORITHM_ZLIB = 1285, + + A_COMPRESSION_ALGORITHM_LZMA = 774, + + A_COMPRESSION_ALGORITHM_LZFSE = 2049 +} + +declare function AACompressionOutputStreamOpen(compressed_stream: interop.Pointer | interop.Reference, compression_algorithm: number, block_size: number, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AACompressionOutputStreamOpenExisting(compressed_stream: interop.Pointer | interop.Reference, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AAConvertArchiveOutputStreamOpen(stream: interop.Pointer | interop.Reference, insert_key_set: interop.Pointer | interop.Reference, remove_key_set: interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AACustomArchiveStreamOpen(): interop.Pointer | interop.Reference; + +declare function AACustomArchiveStreamSetCancelProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): void; + +declare function AACustomArchiveStreamSetCloseProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => number>): void; + +declare function AACustomArchiveStreamSetData(s: interop.Pointer | interop.Reference, data: interop.Pointer | interop.Reference): void; + +declare function AACustomArchiveStreamSetReadHeaderProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference>) => number>): void; + +declare function AACustomArchiveStreamSetWriteHeaderProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => number>): void; + +declare function AACustomByteStreamOpen(): interop.Pointer | interop.Reference; + +declare function AACustomByteStreamSetCancelProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): void; + +declare function AACustomByteStreamSetCloseProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => number>): void; + +declare function AACustomByteStreamSetData(s: interop.Pointer | interop.Reference, data: interop.Pointer | interop.Reference): void; + +declare function AACustomByteStreamSetPReadProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: number) => number>): void; + +declare function AACustomByteStreamSetPWriteProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: number) => number>): void; + +declare function AACustomByteStreamSetReadProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number) => number>): void; + +declare function AACustomByteStreamSetSeekProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: number) => number>): void; + +declare function AACustomByteStreamSetWriteProc(s: interop.Pointer | interop.Reference, proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number) => number>): void; + +declare function AADecodeArchiveInputStreamOpen(stream: interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AADecompressionInputStreamOpen(compressed_stream: interop.Pointer | interop.Reference, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AADecompressionRandomAccessInputStreamOpen(compressed_stream: interop.Pointer | interop.Reference, alloc_limit: number, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AAEncodeArchiveOutputStreamOpen(stream: interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AAEntryACLBlobAppendEntry(acl: interop.Pointer | interop.Reference, ace: interop.Pointer | interop.Reference, qualifier_value: string | interop.Pointer | interop.Reference, qualifier_size: number): number; + +declare function AAEntryACLBlobApplyToPath(acl: interop.Pointer | interop.Reference, dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, flags: number): number; + +declare function AAEntryACLBlobClear(acl: interop.Pointer | interop.Reference): number; + +declare function AAEntryACLBlobCreate(): interop.Pointer | interop.Reference; + +declare function AAEntryACLBlobCreateWithEncodedData(data: string | interop.Pointer | interop.Reference, data_size: number): interop.Pointer | interop.Reference; + +declare function AAEntryACLBlobCreateWithPath(dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, flags: number): interop.Pointer | interop.Reference; + +declare function AAEntryACLBlobDestroy(acl: interop.Pointer | interop.Reference): void; + +declare function AAEntryACLBlobGetEncodedData(acl: interop.Pointer | interop.Reference): string; + +declare function AAEntryACLBlobGetEncodedSize(acl: interop.Pointer | interop.Reference): number; + +declare function AAEntryACLBlobGetEntry(acl: interop.Pointer | interop.Reference, i: number, ace: interop.Pointer | interop.Reference, qualifier_capacity: number, qualifier_value: string | interop.Pointer | interop.Reference, qualifier_size: interop.Pointer | interop.Reference): number; + +declare function AAEntryACLBlobGetEntryCount(acl: interop.Pointer | interop.Reference): number; + +declare function AAEntryACLBlobRemoveEntry(acl: interop.Pointer | interop.Reference, i: number): number; + +declare function AAEntryACLBlobSetEntry(acl: interop.Pointer | interop.Reference, i: number, ace: interop.Pointer | interop.Reference, qualifier_value: string | interop.Pointer | interop.Reference, qualifier_size: number): number; + +declare const enum AAEntryMessages { + + A_ENTRY_MESSAGE_SEARCH_PRUNE_DIR = 10, + + A_ENTRY_MESSAGE_SEARCH_EXCLUDE = 11, + + A_ENTRY_MESSAGE_SEARCH_FAIL = 12, + + A_ENTRY_MESSAGE_EXTRACT_BEGIN = 20, + + A_ENTRY_MESSAGE_EXTRACT_END = 21, + + A_ENTRY_MESSAGE_EXTRACT_FAIL = 22, + + A_ENTRY_MESSAGE_EXTRACT_ATTRIBUTES = 23, + + A_ENTRY_MESSAGE_EXTRACT_XAT = 24, + + A_ENTRY_MESSAGE_EXTRACT_ACL = 25, + + A_ENTRY_MESSAGE_ENCODE_SCANNING = 30, + + A_ENTRY_MESSAGE_ENCODE_WRITING = 31, + + A_ENTRY_MESSAGE_CONVERT_EXCLUDE = 40, + + A_ENTRY_MESSAGE_PROCESS_EXCLUDE = 50, + + A_ENTRY_MESSAGE_DECODE_READING = 60 +} + +declare const enum AAEntryTypes { + + A_ENTRY_TYPE_REG = 70, + + A_ENTRY_TYPE_DIR = 68, + + A_ENTRY_TYPE_LNK = 76, + + A_ENTRY_TYPE_FIFO = 80, + + A_ENTRY_TYPE_CHR = 67, + + A_ENTRY_TYPE_BLK = 66, + + A_ENTRY_TYPE_SOCK = 83, + + A_ENTRY_TYPE_WHT = 87, + + A_ENTRY_TYPE_DOOR = 82, + + A_ENTRY_TYPE_PORT = 84, + + A_ENTRY_TYPE_METADATA = 77 +} + +declare function AAEntryXATBlobAppendEntry(xat: interop.Pointer | interop.Reference, key: string | interop.Pointer | interop.Reference, data: string | interop.Pointer | interop.Reference, data_size: number): number; + +declare function AAEntryXATBlobApplyToPath(xat: interop.Pointer | interop.Reference, dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, flags: number): number; + +declare function AAEntryXATBlobClear(xat: interop.Pointer | interop.Reference): number; + +declare function AAEntryXATBlobCreate(): interop.Pointer | interop.Reference; + +declare function AAEntryXATBlobCreateWithEncodedData(data: string | interop.Pointer | interop.Reference, data_size: number): interop.Pointer | interop.Reference; + +declare function AAEntryXATBlobCreateWithPath(dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, flags: number): interop.Pointer | interop.Reference; + +declare function AAEntryXATBlobDestroy(xat: interop.Pointer | interop.Reference): void; + +declare function AAEntryXATBlobGetEncodedData(xat: interop.Pointer | interop.Reference): string; + +declare function AAEntryXATBlobGetEncodedSize(xat: interop.Pointer | interop.Reference): number; + +declare function AAEntryXATBlobGetEntry(xat: interop.Pointer | interop.Reference, i: number, key_capacity: number, key: string | interop.Pointer | interop.Reference, key_length: interop.Pointer | interop.Reference, data_capacity: number, data: string | interop.Pointer | interop.Reference, data_size: interop.Pointer | interop.Reference): number; + +declare function AAEntryXATBlobGetEntryCount(xat: interop.Pointer | interop.Reference): number; + +declare function AAEntryXATBlobRemoveEntry(xat: interop.Pointer | interop.Reference, i: number): number; + +declare function AAEntryXATBlobSetEntry(xat: interop.Pointer | interop.Reference, i: number, key: string | interop.Pointer | interop.Reference, data: string | interop.Pointer | interop.Reference, data_size: number): number; + +declare function AAExtractArchiveOutputStreamOpen(dir: string | interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AAFieldKeySetClear(key_set: interop.Pointer | interop.Reference): number; + +declare function AAFieldKeySetClone(key_set: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function AAFieldKeySetCreate(): interop.Pointer | interop.Reference; + +declare function AAFieldKeySetCreateWithString(s: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function AAFieldKeySetDestroy(key_set: interop.Pointer | interop.Reference): void; + +declare function AAFieldKeySetGetKeyCount(key_set: interop.Pointer | interop.Reference): number; + +declare function AAFieldKeySetInsertKeySet(key_set: interop.Pointer | interop.Reference, s: interop.Pointer | interop.Reference): number; + +declare function AAFieldKeySetRemoveKeySet(key_set: interop.Pointer | interop.Reference, s: interop.Pointer | interop.Reference): number; + +declare function AAFieldKeySetSelectKeySet(key_set: interop.Pointer | interop.Reference, s: interop.Pointer | interop.Reference): number; + +declare function AAFieldKeySetSerialize(key_set: interop.Pointer | interop.Reference, capacity: number, s: string | interop.Pointer | interop.Reference): number; + +declare const enum AAFieldTypes { + + A_FIELD_TYPE_FLAG = 0, + + A_FIELD_TYPE_UINT = 1, + + A_FIELD_TYPE_STRING = 2, + + A_FIELD_TYPE_HASH = 3, + + A_FIELD_TYPE_TIMESPEC = 4, + + A_FIELD_TYPE_BLOB = 5 +} + +declare function AAFileStreamOpenWithFD(fd: number, automatic_close: number): interop.Pointer | interop.Reference; + +declare function AAFileStreamOpenWithPath(path: string | interop.Pointer | interop.Reference, open_flags: number, open_mode: number): interop.Pointer | interop.Reference; + +declare const enum AAFlags { + + A_FLAG_IGNORE_EPERM = 1, + + A_FLAG_ARCHIVE_DEDUPLICATE_DAT = 2, + + A_FLAG_ARCHIVE_NO_RESOLVE_ACL_QUALIFIERS = 4, + + A_FLAG_REPLACE_ATTRIBUTES = 8, + + A_FLAG_EXTRACT_NO_AUTO_DEDUP = 16, + + A_FLAG_EXTRACT_NO_AUTO_SPARSE = 32, + + A_FLAG_CROSS_VOLUME_BOUNDARIES = 64, + + A_FLAG_EXTRACT_AUTO_DEDUP_AS_HARD_LINKS = 128, + + A_FLAG_DECODE_INSERT_IDX = 256, + + A_FLAG_EXCLUDE_METADATA_ENTRIES = 512, + + A_FLAG_VERBOSITY_0 = 0, + + A_FLAG_VERBOSITY_1 = 4611686018427387904, + + A_FLAG_VERBOSITY_2 = -9223372036854775808, + + A_FLAG_VERBOSITY_3 = -4611686018427387904 +} + +declare const enum AAHashFunctions { + + A_HASH_FUNCTION_CRC32 = 1, + + A_HASH_FUNCTION_SHA1 = 2, + + A_HASH_FUNCTION_SHA256 = 3, + + A_HASH_FUNCTION_SHA384 = 4, + + A_HASH_FUNCTION_SHA512 = 5 +} + +declare function AAHeaderAssign(header: interop.Pointer | interop.Reference, from_header: interop.Pointer | interop.Reference): number; + +declare function AAHeaderClear(header: interop.Pointer | interop.Reference): number; + +declare function AAHeaderClone(header: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function AAHeaderCreate(): interop.Pointer | interop.Reference; + +declare function AAHeaderCreateWithEncodedData(data_size: number, data: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function AAHeaderCreateWithPath(key_set: interop.Pointer | interop.Reference, dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, flags: number): interop.Pointer | interop.Reference; + +declare function AAHeaderDestroy(header: interop.Pointer | interop.Reference): void; + +declare function AAHeaderGetEncodedData(header: interop.Pointer | interop.Reference): string; + +declare function AAHeaderGetEncodedSize(header: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldBlob(header: interop.Pointer | interop.Reference, i: number, size: interop.Pointer | interop.Reference, offset: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldCount(header: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldHash(header: interop.Pointer | interop.Reference, i: number, capacity: number, hash_function: interop.Pointer | interop.Reference, value: string | interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldString(header: interop.Pointer | interop.Reference, i: number, capacity: number, value: string | interop.Pointer | interop.Reference, length: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldTimespec(header: interop.Pointer | interop.Reference, i: number, value: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetFieldType(header: interop.Pointer | interop.Reference, i: number): number; + +declare function AAHeaderGetFieldUInt(header: interop.Pointer | interop.Reference, i: number, value: interop.Pointer | interop.Reference): number; + +declare function AAHeaderGetPayloadSize(header: interop.Pointer | interop.Reference): number; + +declare function AAHeaderRemoveField(header: interop.Pointer | interop.Reference, i: number): number; + +declare function AAPathListCreateWithDirectoryContents(dir: string | interop.Pointer | interop.Reference, path: string | interop.Pointer | interop.Reference, msg_data: interop.Pointer | interop.Reference, msg_proc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: string, p4: interop.Pointer | interop.Reference) => number>, flags: number, n_threads: number): interop.Pointer | interop.Reference; + +declare function AAPathListDestroy(path_list: interop.Pointer | interop.Reference): void; + +declare function AAPathListNodeFirst(path_list: interop.Pointer | interop.Reference): number; + +declare function AAPathListNodeGetPath(path_list: interop.Pointer | interop.Reference, node: number, path_capacity: number, path: string | interop.Pointer | interop.Reference, path_length: interop.Pointer | interop.Reference): number; + +declare function AAPathListNodeNext(path_list: interop.Pointer | interop.Reference, node: number): number; + +declare function AASharedBufferPipeOpen(ostream: interop.Pointer | interop.Reference>, istream: interop.Pointer | interop.Reference>, buffer_capacity: number): number; + +declare function AATempFileStreamOpen(): interop.Pointer | interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleTextureEncoder.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleTextureEncoder.d.ts index f5309e65e..39033d952 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleTextureEncoder.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AppleTextureEncoder.d.ts @@ -24,6 +24,8 @@ interface at_block_buffer_t { } declare var at_block_buffer_t: interop.StructType; +declare function at_block_format_convert_to_MTLPixelFormat(blockFormat: at_block_format_t, flags: at_flags_t): number; + declare const enum at_block_format_t { at_block_format_invalid = 0, @@ -107,7 +109,7 @@ declare const enum at_block_format_t { at_block_format_count = 43 } -declare function at_block_format_to_MTLPixelFormat(p1: at_block_format_t): number; +declare function at_block_format_to_MTLPixelFormat(blockFormat: at_block_format_t): number; declare function at_encoder_compress_texels(encoder: NSObject, src: interop.Pointer | interop.Reference, dest: interop.Pointer | interop.Reference, errorThreshold: number, flags: at_flags_t): number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AudioToolbox.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AudioToolbox.d.ts index 5e60a4fac..f318266dc 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AudioToolbox.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AudioToolbox.d.ts @@ -93,6 +93,8 @@ declare class AUAudioUnit extends NSObject { musicalContextBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference, p5: interop.Pointer | interop.Reference, p6: interop.Pointer | interop.Reference) => boolean; + readonly osWorkgroup: OS_os_workgroup; + readonly outputBusses: AUAudioUnitBusArray; outputEnabled: boolean; @@ -107,6 +109,8 @@ declare class AUAudioUnit extends NSObject { readonly renderBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: number, p5: interop.Pointer | interop.Reference, p6: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: number, p5: interop.Pointer | interop.Reference) => number) => number; + readonly renderContextObserver: (p1: interop.Pointer | interop.Reference) => void; + renderQuality: number; readonly renderResourcesAllocated: boolean; @@ -645,6 +649,22 @@ declare const enum AUSpatialMixerAttenuationCurve { kSpatialMixerAttenuationCurve_Linear = 3 } +declare const enum AUSpatialMixerOutputType { + + kSpatialMixerOutputType_Headphones = 1, + + kSpatialMixerOutputType_BuiltInSpeakers = 2, + + kSpatialMixerOutputType_ExternalSpeakers = 3 +} + +declare const enum AUSpatialMixerPointSourceInHeadMode { + + kSpatialMixerPointSourceInHeadMode_Mono = 0, + + kSpatialMixerPointSourceInHeadMode_Bypass = 1 +} + declare const enum AUSpatialMixerRenderingFlags { kSpatialMixerRenderingFlags_InterAuralDelay = 1, @@ -652,6 +672,17 @@ declare const enum AUSpatialMixerRenderingFlags { kSpatialMixerRenderingFlags_DistanceAttenuation = 4 } +declare const enum AUSpatialMixerSourceMode { + + kSpatialMixerSourceMode_SpatializeIfMono = 0, + + kSpatialMixerSourceMode_Bypass = 1, + + kSpatialMixerSourceMode_PointSource = 2, + + kSpatialMixerSourceMode_AmbienceBed = 3 +} + declare const enum AUSpatializationAlgorithm { kSpatializationAlgorithm_EqualPowerPanning = 0, @@ -666,7 +697,9 @@ declare const enum AUSpatializationAlgorithm { kSpatializationAlgorithm_StereoPassThrough = 5, - kSpatializationAlgorithm_HRTFHQ = 6 + kSpatializationAlgorithm_HRTFHQ = 6, + + kSpatializationAlgorithm_UseOutputType = 7 } interface AudioBalanceFade { @@ -729,6 +762,8 @@ declare function AudioCodecSetProperty(inCodec: interop.Pointer | interop.Refere declare function AudioCodecUninitialize(inCodec: interop.Pointer | interop.Reference): number; +declare function AudioComponentCopyIcon(comp: interop.Pointer | interop.Reference): UIImage; + declare function AudioComponentCopyName(inComponent: interop.Pointer | interop.Reference, outName: interop.Pointer | interop.Reference): number; declare function AudioComponentCount(inDesc: interop.Pointer | interop.Reference): number; @@ -1295,13 +1330,6 @@ interface AudioUnitParameterHistoryInfo { } declare var AudioUnitParameterHistoryInfo: interop.StructType; -interface AudioUnitParameterIDName { - inID: number; - inDesiredLength: number; - outName: string; -} -declare var AudioUnitParameterIDName: interop.StructType; - interface AudioUnitParameterInfo { name: interop.Reference; unitName: string; @@ -1315,6 +1343,13 @@ interface AudioUnitParameterInfo { } declare var AudioUnitParameterInfo: interop.StructType; +interface AudioUnitParameterNameInfo { + inID: number; + inDesiredLength: number; + outName: string; +} +declare var AudioUnitParameterNameInfo: interop.StructType; + declare const enum AudioUnitParameterOptions { kAudioUnitParameterFlag_CFNameRelease = 16, @@ -1479,6 +1514,12 @@ declare const enum AudioUnitRenderActionFlags { kAudioUnitRenderAction_DoNotCheckRenderArgs = 512 } +interface AudioUnitRenderContext { + workgroup: OS_os_workgroup; + reserved: interop.Reference; +} +declare var AudioUnitRenderContext: interop.StructType; + declare function AudioUnitReset(inUnit: interop.Pointer | interop.Reference, inScope: number, inElement: number): number; declare function AudioUnitSetParameter(inUnit: interop.Pointer | interop.Reference, inID: number, inScope: number, inElement: number, inValue: number, inBufferOffsetInFrames: number): number; @@ -2572,6 +2613,8 @@ declare const kAudioFileAIFFType: number; declare const kAudioFileAMRType: number; +declare const kAudioFileBW64Type: number; + declare const kAudioFileBadPropertySizeError: number; declare const kAudioFileCAFType: number; @@ -2696,6 +2739,8 @@ declare const kAudioFilePropertyFrameToPacket: number; declare const kAudioFilePropertyID3Tag: number; +declare const kAudioFilePropertyID3TagOffset: number; + declare const kAudioFilePropertyInfoDictionary: number; declare const kAudioFilePropertyIsOptimized: number; @@ -2820,6 +2865,8 @@ declare const kAudioFileUnsupportedPropertyError: number; declare const kAudioFileWAVEType: number; +declare const kAudioFileWave64Type: number; + declare const kAudioFormatBadPropertySizeError: number; declare const kAudioFormatBadSpecifierSizeError: number; @@ -2830,6 +2877,8 @@ declare const kAudioFormatProperty_ASBDFromMPEGPacket: number; declare const kAudioFormatProperty_AreChannelLayoutsEquivalent: number; +declare const kAudioFormatProperty_AvailableDecodeNumberChannels: number; + declare const kAudioFormatProperty_AvailableEncodeBitRates: number; declare const kAudioFormatProperty_AvailableEncodeChannelLayoutTags: number; @@ -2930,6 +2979,8 @@ declare const kAudioOutputUnitProperty_MIDICallbacks: number; declare const kAudioOutputUnitProperty_NodeComponentDescription: number; +declare const kAudioOutputUnitProperty_OSWorkgroup: number; + declare const kAudioOutputUnitProperty_RemoteControlToHost: number; declare const kAudioOutputUnitProperty_SetInputCallback: number; @@ -3460,6 +3511,8 @@ declare const kAudioUnitProperty_PresentationLatency: number; declare const kAudioUnitProperty_RemoteControlEventListener: number; +declare const kAudioUnitProperty_RenderContextObserver: number; + declare const kAudioUnitProperty_RenderQuality: number; declare const kAudioUnitProperty_RequestViewController: number; @@ -3494,8 +3547,14 @@ declare const kAudioUnitProperty_SpatialMixerAttenuationCurve: number; declare const kAudioUnitProperty_SpatialMixerDistanceParams: number; +declare const kAudioUnitProperty_SpatialMixerOutputType: number; + +declare const kAudioUnitProperty_SpatialMixerPointSourceInHeadMode: number; + declare const kAudioUnitProperty_SpatialMixerRenderingFlags: number; +declare const kAudioUnitProperty_SpatialMixerSourceMode: number; + declare const kAudioUnitProperty_SpatializationAlgorithm: number; declare const kAudioUnitProperty_StreamFormat: number; @@ -3864,6 +3923,10 @@ declare const kExtAudioFileError_MaxPacketSizeUnknown: number; declare const kExtAudioFileError_NonPCMClientFormat: number; +declare const kExtAudioFilePacketTableInfoOverride_UseFileValue: number; + +declare const kExtAudioFilePacketTableInfoOverride_UseFileValueIfValid: number; + declare const kExtAudioFileProperty_AudioConverter: number; declare const kExtAudioFileProperty_AudioFile: number; @@ -4082,6 +4145,8 @@ declare const kRoundTripAACParam_Format: number; declare const kRoundTripAACParam_RateOrQuality: number; +declare const kSampleDelayParam_DelayFrames: number; + declare const kSequenceTrackProperty_AutomatedParameters: number; declare const kSequenceTrackProperty_LoopInfo: number; @@ -4108,6 +4173,12 @@ declare const kSpatialMixerParam_Gain: number; declare const kSpatialMixerParam_GlobalReverbGain: number; +declare const kSpatialMixerParam_HeadPitch: number; + +declare const kSpatialMixerParam_HeadRoll: number; + +declare const kSpatialMixerParam_HeadYaw: number; + declare const kSpatialMixerParam_MaxGain: number; declare const kSpatialMixerParam_MinGain: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AuthenticationServices.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AuthenticationServices.d.ts index c8cc97ced..0db4ccc5c 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AuthenticationServices.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AuthenticationServices.d.ts @@ -1,4 +1,110 @@ +declare class ASAccountAuthenticationModificationController extends NSObject { + + static alloc(): ASAccountAuthenticationModificationController; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationController; // inherited from NSObject + + delegate: ASAccountAuthenticationModificationControllerDelegate; + + presentationContextProvider: ASAccountAuthenticationModificationControllerPresentationContextProviding; + + performRequest(request: ASAccountAuthenticationModificationRequest): void; +} + +interface ASAccountAuthenticationModificationControllerDelegate extends NSObjectProtocol { + + accountAuthenticationModificationControllerDidFailRequestWithError?(controller: ASAccountAuthenticationModificationController, request: ASAccountAuthenticationModificationRequest, error: NSError): void; + + accountAuthenticationModificationControllerDidSuccessfullyCompleteRequestWithUserInfo?(controller: ASAccountAuthenticationModificationController, request: ASAccountAuthenticationModificationRequest, userInfo: NSDictionary): void; +} +declare var ASAccountAuthenticationModificationControllerDelegate: { + + prototype: ASAccountAuthenticationModificationControllerDelegate; +}; + +interface ASAccountAuthenticationModificationControllerPresentationContextProviding extends NSObjectProtocol { + + presentationAnchorForAccountAuthenticationModificationController(controller: ASAccountAuthenticationModificationController): UIWindow; +} +declare var ASAccountAuthenticationModificationControllerPresentationContextProviding: { + + prototype: ASAccountAuthenticationModificationControllerPresentationContextProviding; +}; + +declare class ASAccountAuthenticationModificationExtensionContext extends NSExtensionContext { + + static alloc(): ASAccountAuthenticationModificationExtensionContext; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationExtensionContext; // inherited from NSObject + + completeChangePasswordRequestWithUpdatedCredentialUserInfo(updatedCredential: ASPasswordCredential, userInfo: NSDictionary): void; + + completeUpgradeToSignInWithAppleWithUserInfo(userInfo: NSDictionary): void; + + getSignInWithAppleUpgradeAuthorizationWithStateNonceCompletionHandler(state: string, nonce: string, completionHandler: (p1: ASAuthorizationAppleIDCredential, p2: NSError) => void): void; +} + +declare class ASAccountAuthenticationModificationReplacePasswordWithSignInWithAppleRequest extends ASAccountAuthenticationModificationRequest { + + static alloc(): ASAccountAuthenticationModificationReplacePasswordWithSignInWithAppleRequest; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationReplacePasswordWithSignInWithAppleRequest; // inherited from NSObject + + readonly serviceIdentifier: ASCredentialServiceIdentifier; + + readonly user: string; + + readonly userInfo: NSDictionary; + + constructor(o: { user: string; serviceIdentifier: ASCredentialServiceIdentifier; userInfo: NSDictionary; }); + + initWithUserServiceIdentifierUserInfo(user: string, serviceIdentifier: ASCredentialServiceIdentifier, userInfo: NSDictionary): this; +} + +declare class ASAccountAuthenticationModificationRequest extends NSObject { + + static alloc(): ASAccountAuthenticationModificationRequest; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationRequest; // inherited from NSObject +} + +declare class ASAccountAuthenticationModificationUpgradePasswordToStrongPasswordRequest extends ASAccountAuthenticationModificationRequest { + + static alloc(): ASAccountAuthenticationModificationUpgradePasswordToStrongPasswordRequest; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationUpgradePasswordToStrongPasswordRequest; // inherited from NSObject + + readonly serviceIdentifier: ASCredentialServiceIdentifier; + + readonly user: string; + + readonly userInfo: NSDictionary; + + constructor(o: { user: string; serviceIdentifier: ASCredentialServiceIdentifier; userInfo: NSDictionary; }); + + initWithUserServiceIdentifierUserInfo(user: string, serviceIdentifier: ASCredentialServiceIdentifier, userInfo: NSDictionary): this; +} + +declare class ASAccountAuthenticationModificationViewController extends UIViewController { + + static alloc(): ASAccountAuthenticationModificationViewController; // inherited from NSObject + + static new(): ASAccountAuthenticationModificationViewController; // inherited from NSObject + + readonly extensionContext: ASAccountAuthenticationModificationExtensionContext; + + cancelRequest(): void; + + changePasswordWithoutUserInteractionForServiceIdentifierExistingCredentialNewPasswordUserInfo(serviceIdentifier: ASCredentialServiceIdentifier, existingCredential: ASPasswordCredential, newPassword: string, userInfo: NSDictionary): void; + + convertAccountToSignInWithAppleWithoutUserInteractionForServiceIdentifierExistingCredentialUserInfo(serviceIdentifier: ASCredentialServiceIdentifier, existingCredential: ASPasswordCredential, userInfo: NSDictionary): void; + + prepareInterfaceToChangePasswordForServiceIdentifierExistingCredentialNewPasswordUserInfo(serviceIdentifier: ASCredentialServiceIdentifier, existingCredential: ASPasswordCredential, newPassword: string, userInfo: NSDictionary): void; + + prepareInterfaceToConvertAccountToSignInWithAppleForServiceIdentifierExistingCredentialUserInfo(serviceIdentifier: ASCredentialServiceIdentifier, existingCredential: ASPasswordCredential, userInfo: NSDictionary): void; +} + declare class ASAuthorization extends NSObject { static alloc(): ASAuthorization; // inherited from NSObject @@ -332,6 +438,8 @@ declare var ASAuthorizationProvider: { prototype: ASAuthorizationProvider; }; +declare var ASAuthorizationProviderAuthorizationOperationConfigurationRemoved: string; + declare class ASAuthorizationProviderExtensionAuthorizationRequest extends NSObject { static alloc(): ASAuthorizationProviderExtensionAuthorizationRequest; // inherited from NSObject @@ -342,12 +450,18 @@ declare class ASAuthorizationProviderExtensionAuthorizationRequest extends NSObj readonly callerBundleIdentifier: string; + readonly callerManaged: boolean; + + readonly callerTeamIdentifier: string; + readonly extensionData: NSDictionary; readonly httpBody: NSData; readonly httpHeaders: NSDictionary; + readonly localizedCallerDisplayName: string; + readonly realm: string; readonly requestedOperation: string; @@ -636,6 +750,8 @@ declare const enum ASExtensionErrorCode { declare var ASExtensionErrorDomain: string; +declare var ASExtensionLocalizedFailureReasonErrorKey: string; + declare class ASPasswordCredential extends NSObject implements ASAuthorizationCredential { static alloc(): ASPasswordCredential; // inherited from NSObject @@ -752,6 +868,8 @@ declare class ASWebAuthenticationSession extends NSObject { static new(): ASWebAuthenticationSession; // inherited from NSObject + readonly canStart: boolean; + prefersEphemeralWebBrowserSession: boolean; presentationContextProvider: ASWebAuthenticationPresentationContextProviding; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!AutomaticAssessmentConfiguration.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AutomaticAssessmentConfiguration.d.ts new file mode 100644 index 000000000..a4a75474c --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!AutomaticAssessmentConfiguration.d.ts @@ -0,0 +1,77 @@ + +declare class AEAssessmentConfiguration extends NSObject implements NSCopying { + + static alloc(): AEAssessmentConfiguration; // inherited from NSObject + + static new(): AEAssessmentConfiguration; // inherited from NSObject + + allowsAccessibilitySpeech: boolean; + + allowsActivityContinuation: boolean; + + allowsContinuousPathKeyboard: boolean; + + allowsDictation: boolean; + + allowsKeyboardShortcuts: boolean; + + allowsPasswordAutoFill: boolean; + + allowsPredictiveKeyboard: boolean; + + allowsSpellCheck: boolean; + + autocorrectMode: AEAutocorrectMode; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum AEAssessmentErrorCode { + + Unknown = 1 +} + +declare var AEAssessmentErrorDomain: string; + +declare class AEAssessmentSession extends NSObject { + + static alloc(): AEAssessmentSession; // inherited from NSObject + + static new(): AEAssessmentSession; // inherited from NSObject + + readonly active: boolean; + + delegate: AEAssessmentSessionDelegate; + + constructor(o: { configuration: AEAssessmentConfiguration; }); + + begin(): void; + + end(): void; + + initWithConfiguration(configuration: AEAssessmentConfiguration): this; +} + +interface AEAssessmentSessionDelegate extends NSObjectProtocol { + + assessmentSessionDidBegin?(session: AEAssessmentSession): void; + + assessmentSessionDidEnd?(session: AEAssessmentSession): void; + + assessmentSessionFailedToBeginWithError?(session: AEAssessmentSession, error: NSError): void; + + assessmentSessionWasInterruptedWithError?(session: AEAssessmentSession, error: NSError): void; +} +declare var AEAssessmentSessionDelegate: { + + prototype: AEAssessmentSessionDelegate; +}; + +declare const enum AEAutocorrectMode { + + None = 0, + + Spelling = 1, + + Punctuation = 2 +} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CFNetwork.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CFNetwork.d.ts index 5012849ea..9d0086e3d 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CFNetwork.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CFNetwork.d.ts @@ -246,7 +246,9 @@ declare const enum CFNetServicesError { kCFNetServicesErrorInvalid = -72006, - kCFNetServicesErrorTimeout = -72007 + kCFNetServicesErrorTimeout = -72007, + + kCFNetServicesErrorMissingRequiredConfiguration = -72008 } declare function CFNetworkCopyProxiesForAutoConfigurationScript(proxyAutoConfigurationScript: string, targetURL: NSURL, error: interop.Pointer | interop.Reference): interop.Unmanaged>; @@ -512,6 +514,8 @@ declare var kCFHTTPVersion1_1: string; declare var kCFHTTPVersion2_0: string; +declare var kCFHTTPVersion3_0: string; + declare var kCFNetworkProxiesHTTPEnable: string; declare var kCFNetworkProxiesHTTPPort: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CallKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CallKit.d.ts index 3f6466bde..b5e900c75 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CallKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CallKit.d.ts @@ -139,6 +139,8 @@ declare class CXCallDirectoryManager extends NSObject { getEnabledStatusForExtensionWithIdentifierCompletionHandler(identifier: string, completion: (p1: CXCallDirectoryEnabledStatus, p2: NSError) => void): void; + openSettingsWithCompletionHandler(completion: (p1: NSError) => void): void; + reloadExtensionWithIdentifierCompletionHandler(identifier: string, completion: (p1: NSError) => void): void; } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CarPlay.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CarPlay.d.ts index d0d0cc620..66431e0f1 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CarPlay.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CarPlay.d.ts @@ -60,6 +60,8 @@ declare class CPAlertTemplate extends CPTemplate { readonly titleVariants: NSArray; + static readonly maximumActionCount: number; + constructor(o: { titleVariants: NSArray | string[]; actions: NSArray | CPAlertAction[]; }); initWithTitleVariantsActions(titleVariants: NSArray | string[], actions: NSArray | CPAlertAction[]): this; @@ -86,6 +88,8 @@ declare class CPBarButton extends NSObject implements NSSecureCoding { static new(): CPBarButton; // inherited from NSObject + buttonStyle: CPBarButtonStyle; + readonly buttonType: CPBarButtonType; enabled: boolean; @@ -98,12 +102,20 @@ declare class CPBarButton extends NSObject implements NSSecureCoding { constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { image: UIImage; handler: (p1: CPBarButton) => void; }); + + constructor(o: { title: string; handler: (p1: CPBarButton) => void; }); + constructor(o: { type: CPBarButtonType; handler: (p1: CPBarButton) => void; }); encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; + initWithImageHandler(image: UIImage, handler: (p1: CPBarButton) => void): this; + + initWithTitleHandler(title: string, handler: (p1: CPBarButton) => void): this; + initWithTypeHandler(type: CPBarButtonType, handler: (p1: CPBarButton) => void): this; } @@ -120,6 +132,13 @@ declare var CPBarButtonProviding: { prototype: CPBarButtonProviding; }; +declare const enum CPBarButtonStyle { + + None = 0, + + Rounded = 1 +} + declare const enum CPBarButtonType { Text = 0, @@ -127,6 +146,142 @@ declare const enum CPBarButtonType { Image = 1 } +declare class CPButton extends NSObject { + + static alloc(): CPButton; // inherited from NSObject + + static new(): CPButton; // inherited from NSObject + + enabled: boolean; + + readonly image: UIImage; + + title: string; + + constructor(o: { image: UIImage; handler: (p1: CPButton) => void; }); + + initWithImageHandler(image: UIImage, handler: (p1: CPButton) => void): this; +} + +declare var CPButtonMaximumImageSize: CGSize; + +declare class CPContact extends NSObject implements NSSecureCoding { + + static alloc(): CPContact; // inherited from NSObject + + static new(): CPContact; // inherited from NSObject + + actions: NSArray; + + image: UIImage; + + informativeText: string; + + name: string; + + subtitle: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { name: string; image: UIImage; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithNameImage(name: string, image: UIImage): this; +} + +declare class CPContactCallButton extends CPButton { + + static alloc(): CPContactCallButton; // inherited from NSObject + + static new(): CPContactCallButton; // inherited from NSObject + + constructor(o: { handler: (p1: CPButton) => void; }); + + initWithHandler(handler: (p1: CPButton) => void): this; +} + +declare class CPContactDirectionsButton extends CPButton { + + static alloc(): CPContactDirectionsButton; // inherited from NSObject + + static new(): CPContactDirectionsButton; // inherited from NSObject + + constructor(o: { handler: (p1: CPButton) => void; }); + + initWithHandler(handler: (p1: CPButton) => void): this; +} + +declare class CPContactMessageButton extends CPButton { + + static alloc(): CPContactMessageButton; // inherited from NSObject + + static new(): CPContactMessageButton; // inherited from NSObject + + readonly phoneOrEmail: string; + + constructor(o: { phoneOrEmail: string; }); + + initWithPhoneOrEmail(phoneOrEmail: string): this; +} + +declare class CPContactTemplate extends CPTemplate implements CPBarButtonProviding { + + static alloc(): CPContactTemplate; // inherited from NSObject + + static new(): CPContactTemplate; // inherited from NSObject + + contact: CPContact; + + backButton: CPBarButton; // inherited from CPBarButtonProviding + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + leadingNavigationBarButtons: NSArray; // inherited from CPBarButtonProviding + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + trailingNavigationBarButtons: NSArray; // inherited from CPBarButtonProviding + + readonly // inherited from NSObjectProtocol + + constructor(o: { contact: CPContact; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + initWithContact(contact: CPContact): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + declare const enum CPContentStyle { Light = 1, @@ -134,6 +289,40 @@ declare const enum CPContentStyle { Dark = 2 } +declare class CPDashboardButton extends NSObject implements NSSecureCoding { + + static alloc(): CPDashboardButton; // inherited from NSObject + + static new(): CPDashboardButton; // inherited from NSObject + + readonly image: UIImage; + + readonly subtitleVariants: NSArray; + + readonly titleVariants: NSArray; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { titleVariants: NSArray | string[]; subtitleVariants: NSArray | string[]; image: UIImage; handler: (p1: CPDashboardButton) => void; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithTitleVariantsSubtitleVariantsImageHandler(titleVariants: NSArray | string[], subtitleVariants: NSArray | string[], image: UIImage, handler: (p1: CPDashboardButton) => void): this; +} + +declare class CPDashboardController extends NSObject { + + static alloc(): CPDashboardController; // inherited from NSObject + + static new(): CPDashboardController; // inherited from NSObject + + shortcutButtons: NSArray; +} + declare class CPGridButton extends NSObject implements NSSecureCoding { static alloc(): CPGridButton; // inherited from NSObject @@ -237,12 +426,78 @@ declare class CPImageSet extends NSObject implements NSSecureCoding { initWithLightContentImageDarkContentImage(lightImage: UIImage, darkImage: UIImage): this; } +declare class CPInformationItem extends NSObject implements NSSecureCoding { + + static alloc(): CPInformationItem; // inherited from NSObject + + static new(): CPInformationItem; // inherited from NSObject + + readonly detail: string; + + readonly title: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { title: string; detail: string; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithTitleDetail(title: string, detail: string): this; +} + +declare class CPInformationRatingItem extends CPInformationItem { + + static alloc(): CPInformationRatingItem; // inherited from NSObject + + static new(): CPInformationRatingItem; // inherited from NSObject + + readonly maximumRating: number; + + readonly rating: number; + + constructor(o: { rating: number; maximumRating: number; title: string; detail: string; }); + + initWithRatingMaximumRatingTitleDetail(rating: number, maximumRating: number, title: string, detail: string): this; +} + +declare class CPInformationTemplate extends CPTemplate { + + static alloc(): CPInformationTemplate; // inherited from NSObject + + static new(): CPInformationTemplate; // inherited from NSObject + + actions: NSArray; + + items: NSArray; + + readonly layout: CPInformationTemplateLayout; + + title: string; + + constructor(o: { title: string; layout: CPInformationTemplateLayout; items: NSArray | CPInformationItem[]; actions: NSArray | CPTextButton[]; }); + + initWithTitleLayoutItemsActions(title: string, layout: CPInformationTemplateLayout, items: NSArray | CPInformationItem[], actions: NSArray | CPTextButton[]): this; +} + +declare const enum CPInformationTemplateLayout { + + Leading = 0, + + TwoColumn = 1 +} + declare class CPInterfaceController extends NSObject { static alloc(): CPInterfaceController; // inherited from NSObject static new(): CPInterfaceController; // inherited from NSObject + readonly carTraitCollection: UITraitCollection; + delegate: CPInterfaceControllerDelegate; prefersDarkUserInterfaceStyle: boolean; @@ -257,17 +512,31 @@ declare class CPInterfaceController extends NSObject { dismissTemplateAnimated(animated: boolean): void; + dismissTemplateAnimatedCompletion(animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + popTemplateAnimated(animated: boolean): void; + popTemplateAnimatedCompletion(animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + popToRootTemplateAnimated(animated: boolean): void; + popToRootTemplateAnimatedCompletion(animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + popToTemplateAnimated(targetTemplate: CPTemplate, animated: boolean): void; + popToTemplateAnimatedCompletion(targetTemplate: CPTemplate, animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + presentTemplateAnimated(templateToPresent: CPTemplate, animated: boolean): void; + presentTemplateAnimatedCompletion(templateToPresent: CPTemplate, animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + pushTemplateAnimated(templateToPush: CPTemplate, animated: boolean): void; + pushTemplateAnimatedCompletion(templateToPush: CPTemplate, animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; + setRootTemplateAnimated(rootTemplate: CPTemplate, animated: boolean): void; + + setRootTemplateAnimatedCompletion(rootTemplate: CPTemplate, animated: boolean, completion: (p1: boolean, p2: NSError) => void): void; } interface CPInterfaceControllerDelegate extends NSObjectProtocol { @@ -292,41 +561,172 @@ declare const enum CPLimitableUserInterface { Lists = 2 } -declare class CPListItem extends NSObject implements NSSecureCoding { +declare class CPListImageRowItem extends NSObject implements CPSelectableListItem { + + static alloc(): CPListImageRowItem; // inherited from NSObject + + static new(): CPListImageRowItem; // inherited from NSObject + + readonly gridImages: NSArray; + + listImageRowHandler: (p1: CPListImageRowItem, p2: number, p3: () => void) => void; + + text: string; + + static readonly maximumImageSize: CGSize; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + handler: (p1: CPSelectableListItem, p2: () => void) => void; // inherited from CPSelectableListItem + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + userInfo: any; // inherited from CPListTemplateItem + + readonly // inherited from NSObjectProtocol + + constructor(o: { text: string; images: NSArray | UIImage[]; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + initWithTextImages(text: string, images: NSArray | UIImage[]): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + updateImages(gridImages: NSArray | UIImage[]): void; +} + +declare class CPListItem extends NSObject implements CPSelectableListItem { static alloc(): CPListItem; // inherited from NSObject static new(): CPListItem; // inherited from NSObject + readonly accessoryImage: UIImage; + + accessoryType: CPListItemAccessoryType; + readonly detailText: string; + explicitContent: boolean; + readonly image: UIImage; + playbackProgress: number; + + playing: boolean; + + playingIndicatorLocation: CPListItemPlayingIndicatorLocation; + readonly showsDisclosureIndicator: boolean; - readonly text: string; + showsExplicitLabel: boolean; - userInfo: any; + static readonly maximumImageSize: CGSize; - static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + readonly debugDescription: string; // inherited from NSObjectProtocol - constructor(o: { coder: NSCoder; }); // inherited from NSCoding + readonly description: string; // inherited from NSObjectProtocol + + handler: (p1: CPSelectableListItem, p2: () => void) => void; // inherited from CPSelectableListItem + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly text: string; // inherited from CPListTemplateItem + + userInfo: any; // inherited from CPListTemplateItem + + readonly // inherited from NSObjectProtocol constructor(o: { text: string; detailText: string; }); constructor(o: { text: string; detailText: string; image: UIImage; }); + constructor(o: { text: string; detailText: string; image: UIImage; accessoryImage: UIImage; accessoryType: CPListItemAccessoryType; }); + constructor(o: { text: string; detailText: string; image: UIImage; showsDisclosureIndicator: boolean; }); - encodeWithCoder(coder: NSCoder): void; + class(): typeof NSObject; - initWithCoder(coder: NSCoder): this; + conformsToProtocol(aProtocol: any /* Protocol */): boolean; initWithTextDetailText(text: string, detailText: string): this; initWithTextDetailTextImage(text: string, detailText: string, image: UIImage): this; + initWithTextDetailTextImageAccessoryImageAccessoryType(text: string, detailText: string, image: UIImage, accessoryImage: UIImage, accessoryType: CPListItemAccessoryType): this; + initWithTextDetailTextImageShowsDisclosureIndicator(text: string, detailText: string, image: UIImage, showsDisclosureIndicator: boolean): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + setAccessoryImage(accessoryImage: UIImage): void; + + setDetailText(detailText: string): void; + + setImage(image: UIImage): void; + + setText(text: string): void; +} + +declare const enum CPListItemAccessoryType { + + None = 0, + + DisclosureIndicator = 1, + + Cloud = 2 +} + +declare const enum CPListItemPlayingIndicatorLocation { + + Leading = 0, + + Trailing = 1 } declare class CPListSection extends NSObject implements NSSecureCoding { @@ -337,7 +737,7 @@ declare class CPListSection extends NSObject implements NSSecureCoding { readonly header: string; - readonly items: NSArray; + readonly items: NSArray; readonly sectionIndexTitle: string; @@ -345,17 +745,21 @@ declare class CPListSection extends NSObject implements NSSecureCoding { constructor(o: { coder: NSCoder; }); // inherited from NSCoding - constructor(o: { items: NSArray | CPListItem[]; }); + constructor(o: { items: NSArray | CPListTemplateItem[]; }); - constructor(o: { items: NSArray | CPListItem[]; header: string; sectionIndexTitle: string; }); + constructor(o: { items: NSArray | CPListTemplateItem[]; header: string; sectionIndexTitle: string; }); encodeWithCoder(coder: NSCoder): void; + indexOfItem(item: CPListTemplateItem): number; + initWithCoder(coder: NSCoder): this; - initWithItems(items: NSArray | CPListItem[]): this; + initWithItems(items: NSArray | CPListTemplateItem[]): this; - initWithItemsHeaderSectionIndexTitle(items: NSArray | CPListItem[], header: string, sectionIndexTitle: string): this; + initWithItemsHeaderSectionIndexTitle(items: NSArray | CPListTemplateItem[], header: string, sectionIndexTitle: string): this; + + itemAtIndex(index: number): CPListTemplateItem; } declare class CPListTemplate extends CPTemplate implements CPBarButtonProviding { @@ -366,10 +770,22 @@ declare class CPListTemplate extends CPTemplate implements CPBarButtonProviding delegate: CPListTemplateDelegate; + emptyViewSubtitleVariants: NSArray; + + emptyViewTitleVariants: NSArray; + + readonly itemCount: number; + + readonly sectionCount: number; + readonly sections: NSArray; readonly title: string; + static readonly maximumItemCount: number; + + static readonly maximumSectionCount: number; + backButton: CPBarButton; // inherited from CPBarButtonProviding readonly debugDescription: string; // inherited from NSObjectProtocol @@ -394,6 +810,8 @@ declare class CPListTemplate extends CPTemplate implements CPBarButtonProviding conformsToProtocol(aProtocol: any /* Protocol */): boolean; + indexPathForItem(item: CPListTemplateItem): NSIndexPath; + initWithTitleSections(title: string, sections: NSArray | CPListSection[]): this; isEqual(object: any): boolean; @@ -426,6 +844,17 @@ declare var CPListTemplateDelegate: { prototype: CPListTemplateDelegate; }; +interface CPListTemplateItem extends NSObjectProtocol { + + text: string; + + userInfo: any; +} +declare var CPListTemplateItem: { + + prototype: CPListTemplateItem; +}; + declare class CPManeuver extends NSObject implements NSCopying, NSSecureCoding { static alloc(): CPManeuver; // inherited from NSObject @@ -434,12 +863,26 @@ declare class CPManeuver extends NSObject implements NSCopying, NSSecureCoding { attributedInstructionVariants: NSArray; + dashboardAttributedInstructionVariants: NSArray; + + dashboardInstructionVariants: NSArray; + + dashboardJunctionImage: UIImage; + + dashboardSymbolImage: UIImage; + initialTravelEstimates: CPTravelEstimates; instructionVariants: NSArray; junctionImage: UIImage; + notificationAttributedInstructionVariants: NSArray; + + notificationInstructionVariants: NSArray; + + notificationSymbolImage: UIImage; + symbolImage: UIImage; symbolSet: CPImageSet; @@ -571,6 +1014,8 @@ declare class CPMapTemplate extends CPTemplate implements CPBarButtonProviding { showRouteChoicesPreviewForTripTextConfiguration(tripPreview: CPTrip, textConfiguration: CPTripPreviewTextConfiguration): void; + showTripPreviewsSelectedTripTextConfiguration(tripPreviews: NSArray | CPTrip[], selectedTrip: CPTrip, textConfiguration: CPTripPreviewTextConfiguration): void; + showTripPreviewsTextConfiguration(tripPreviews: NSArray | CPTrip[], textConfiguration: CPTripPreviewTextConfiguration): void; startNavigationSessionForTrip(trip: CPTrip): CPNavigationSession; @@ -627,7 +1072,133 @@ declare var CPMapTemplateDelegate: { prototype: CPMapTemplateDelegate; }; -declare var CPMaximumListItemImageSize: CGSize; +declare var CPMaximumMessageItemImageSize: CGSize; + +declare var CPMaximumNumberOfGridImages: number; + +declare class CPMessageComposeBarButton extends CPBarButton { + + static alloc(): CPMessageComposeBarButton; // inherited from NSObject + + static new(): CPMessageComposeBarButton; // inherited from NSObject + + constructor(o: { image: UIImage; }); + + initWithImage(image: UIImage): this; +} + +declare const enum CPMessageLeadingItem { + + None = 0, + + Pin = 1, + + Star = 2 +} + +declare class CPMessageListItem extends NSObject implements CPListTemplateItem { + + static alloc(): CPMessageListItem; // inherited from NSObject + + static new(): CPMessageListItem; // inherited from NSObject + + conversationIdentifier: string; + + detailText: string; + + leadingConfiguration: CPMessageListItemLeadingConfiguration; + + phoneOrEmailAddress: string; + + text: string; + + trailingConfiguration: CPMessageListItemTrailingConfiguration; + + trailingText: string; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + userInfo: any; // inherited from CPListTemplateItem + + readonly // inherited from NSObjectProtocol + + constructor(o: { conversationIdentifier: string; text: string; leadingConfiguration: CPMessageListItemLeadingConfiguration; trailingConfiguration: CPMessageListItemTrailingConfiguration; detailText: string; trailingText: string; }); + + constructor(o: { fullName: string; phoneOrEmailAddress: string; leadingConfiguration: CPMessageListItemLeadingConfiguration; trailingConfiguration: CPMessageListItemTrailingConfiguration; detailText: string; trailingText: string; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + initWithConversationIdentifierTextLeadingConfigurationTrailingConfigurationDetailTextTrailingText(conversationIdentifier: string, text: string, leadingConfiguration: CPMessageListItemLeadingConfiguration, trailingConfiguration: CPMessageListItemTrailingConfiguration, detailText: string, trailingText: string): this; + + initWithFullNamePhoneOrEmailAddressLeadingConfigurationTrailingConfigurationDetailTextTrailingText(fullName: string, phoneOrEmailAddress: string, leadingConfiguration: CPMessageListItemLeadingConfiguration, trailingConfiguration: CPMessageListItemTrailingConfiguration, detailText: string, trailingText: string): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + +declare class CPMessageListItemLeadingConfiguration extends NSObject { + + static alloc(): CPMessageListItemLeadingConfiguration; // inherited from NSObject + + static new(): CPMessageListItemLeadingConfiguration; // inherited from NSObject + + readonly leadingImage: UIImage; + + readonly leadingItem: CPMessageLeadingItem; + + readonly unread: boolean; + + constructor(o: { leadingItem: CPMessageLeadingItem; leadingImage: UIImage; unread: boolean; }); + + initWithLeadingItemLeadingImageUnread(leadingItem: CPMessageLeadingItem, leadingImage: UIImage, unread: boolean): this; +} + +declare class CPMessageListItemTrailingConfiguration extends NSObject { + + static alloc(): CPMessageListItemTrailingConfiguration; // inherited from NSObject + + static new(): CPMessageListItemTrailingConfiguration; // inherited from NSObject + + readonly trailingImage: UIImage; + + readonly trailingItem: CPMessageTrailingItem; + + constructor(o: { trailingItem: CPMessageTrailingItem; trailingImage: UIImage; }); + + initWithTrailingItemTrailingImage(trailingItem: CPMessageTrailingItem, trailingImage: UIImage): this; +} + +declare const enum CPMessageTrailingItem { + + None = 0, + + Mute = 1 +} declare class CPNavigationAlert extends NSObject implements NSSecureCoding { @@ -698,6 +1269,113 @@ declare class CPNavigationSession extends NSObject { updateTravelEstimatesForManeuver(estimates: CPTravelEstimates, maneuver: CPManeuver): void; } +declare class CPNowPlayingAddToLibraryButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingAddToLibraryButton; // inherited from NSObject + + static new(): CPNowPlayingAddToLibraryButton; // inherited from NSObject +} + +declare class CPNowPlayingButton extends NSObject implements NSSecureCoding { + + static alloc(): CPNowPlayingButton; // inherited from NSObject + + static new(): CPNowPlayingButton; // inherited from NSObject + + enabled: boolean; + + selected: boolean; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { handler: (p1: CPNowPlayingButton) => void; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithHandler(handler: (p1: CPNowPlayingButton) => void): this; +} + +declare var CPNowPlayingButtonMaximumImageSize: CGSize; + +declare class CPNowPlayingImageButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingImageButton; // inherited from NSObject + + static new(): CPNowPlayingImageButton; // inherited from NSObject + + readonly image: UIImage; + + constructor(o: { image: UIImage; handler: (p1: CPNowPlayingButton) => void; }); + + initWithImageHandler(image: UIImage, handler: (p1: CPNowPlayingButton) => void): this; +} + +declare class CPNowPlayingMoreButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingMoreButton; // inherited from NSObject + + static new(): CPNowPlayingMoreButton; // inherited from NSObject +} + +declare class CPNowPlayingPlaybackRateButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingPlaybackRateButton; // inherited from NSObject + + static new(): CPNowPlayingPlaybackRateButton; // inherited from NSObject +} + +declare class CPNowPlayingRepeatButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingRepeatButton; // inherited from NSObject + + static new(): CPNowPlayingRepeatButton; // inherited from NSObject +} + +declare class CPNowPlayingShuffleButton extends CPNowPlayingButton { + + static alloc(): CPNowPlayingShuffleButton; // inherited from NSObject + + static new(): CPNowPlayingShuffleButton; // inherited from NSObject +} + +declare class CPNowPlayingTemplate extends CPTemplate { + + static alloc(): CPNowPlayingTemplate; // inherited from NSObject + + static new(): CPNowPlayingTemplate; // inherited from NSObject + + albumArtistButtonEnabled: boolean; + + readonly nowPlayingButtons: NSArray; + + upNextButtonEnabled: boolean; + + upNextTitle: string; + + static readonly sharedTemplate: CPNowPlayingTemplate; + + addObserver(observer: CPNowPlayingTemplateObserver): void; + + removeObserver(observer: CPNowPlayingTemplateObserver): void; + + updateNowPlayingButtons(nowPlayingButtons: NSArray | CPNowPlayingButton[]): void; +} + +interface CPNowPlayingTemplateObserver extends NSObjectProtocol { + + nowPlayingTemplateAlbumArtistButtonTapped?(nowPlayingTemplate: CPNowPlayingTemplate): void; + + nowPlayingTemplateUpNextButtonTapped?(nowPlayingTemplate: CPNowPlayingTemplate): void; +} +declare var CPNowPlayingTemplateObserver: { + + prototype: CPNowPlayingTemplateObserver; +}; + declare const enum CPPanDirection { None = 0, @@ -711,6 +1389,79 @@ declare const enum CPPanDirection { Down = 8 } +declare class CPPointOfInterest extends NSObject implements NSSecureCoding { + + static alloc(): CPPointOfInterest; // inherited from NSObject + + static new(): CPPointOfInterest; // inherited from NSObject + + detailSubtitle: string; + + detailSummary: string; + + detailTitle: string; + + location: MKMapItem; + + pinImage: UIImage; + + primaryButton: CPTextButton; + + secondaryButton: CPTextButton; + + subtitle: string; + + summary: string; + + title: string; + + userInfo: any; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { location: MKMapItem; title: string; subtitle: string; summary: string; detailTitle: string; detailSubtitle: string; detailSummary: string; pinImage: UIImage; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithLocationTitleSubtitleSummaryDetailTitleDetailSubtitleDetailSummaryPinImage(location: MKMapItem, title: string, subtitle: string, summary: string, detailTitle: string, detailSubtitle: string, detailSummary: string, pinImage: UIImage): this; +} + +declare class CPPointOfInterestTemplate extends CPTemplate { + + static alloc(): CPPointOfInterestTemplate; // inherited from NSObject + + static new(): CPPointOfInterestTemplate; // inherited from NSObject + + pointOfInterestDelegate: CPPointOfInterestTemplateDelegate; + + readonly pointsOfInterest: NSArray; + + selectedIndex: number; + + title: string; + + constructor(o: { title: string; pointsOfInterest: NSArray | CPPointOfInterest[]; selectedIndex: number; }); + + initWithTitlePointsOfInterestSelectedIndex(title: string, pointsOfInterest: NSArray | CPPointOfInterest[], selectedIndex: number): this; + + setPointsOfInterestSelectedIndex(pointsOfInterest: NSArray | CPPointOfInterest[], selectedIndex: number): void; +} + +interface CPPointOfInterestTemplateDelegate extends NSObjectProtocol { + + pointOfInterestTemplateDidChangeMapRegion(pointOfInterestTemplate: CPPointOfInterestTemplate, region: MKCoordinateRegion): void; + + pointOfInterestTemplateDidSelectPointOfInterest?(pointOfInterestTemplate: CPPointOfInterestTemplate, pointOfInterest: CPPointOfInterest): void; +} +declare var CPPointOfInterestTemplateDelegate: { + + prototype: CPPointOfInterestTemplateDelegate; +}; + declare class CPRouteChoice extends NSObject implements NSCopying, NSSecureCoding { static alloc(): CPRouteChoice; // inherited from NSObject @@ -762,6 +1513,15 @@ declare var CPSearchTemplateDelegate: { prototype: CPSearchTemplateDelegate; }; +interface CPSelectableListItem extends CPListTemplateItem { + + handler: (p1: CPSelectableListItem, p2: () => void) => void; +} +declare var CPSelectableListItem: { + + prototype: CPSelectableListItem; +}; + declare class CPSessionConfiguration extends NSObject { static alloc(): CPSessionConfiguration; // inherited from NSObject @@ -790,12 +1550,50 @@ declare var CPSessionConfigurationDelegate: { prototype: CPSessionConfigurationDelegate; }; +declare class CPTabBarTemplate extends CPTemplate { + + static alloc(): CPTabBarTemplate; // inherited from NSObject + + static new(): CPTabBarTemplate; // inherited from NSObject + + delegate: CPTabBarTemplateDelegate; + + readonly selectedTemplate: CPTemplate; + + readonly templates: NSArray; + + static readonly maximumTabCount: number; + + constructor(o: { templates: NSArray | CPTemplate[]; }); + + initWithTemplates(templates: NSArray | CPTemplate[]): this; + + updateTemplates(newTemplates: NSArray | CPTemplate[]): void; +} + +interface CPTabBarTemplateDelegate extends NSObjectProtocol { + + tabBarTemplateDidSelectTemplate(tabBarTemplate: CPTabBarTemplate, selectedTemplate: CPTemplate): void; +} +declare var CPTabBarTemplateDelegate: { + + prototype: CPTabBarTemplateDelegate; +}; + declare class CPTemplate extends NSObject implements NSSecureCoding { static alloc(): CPTemplate; // inherited from NSObject static new(): CPTemplate; // inherited from NSObject + showsTabBadge: boolean; + + tabImage: UIImage; + + tabSystemItem: UITabBarSystemItem; + + tabTitle: string; + userInfo: any; static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding @@ -807,6 +1605,32 @@ declare class CPTemplate extends NSObject implements NSSecureCoding { initWithCoder(coder: NSCoder): this; } +declare class CPTemplateApplicationDashboardScene extends UIScene { + + static alloc(): CPTemplateApplicationDashboardScene; // inherited from NSObject + + static new(): CPTemplateApplicationDashboardScene; // inherited from NSObject + + readonly dashboardController: CPDashboardController; + + readonly dashboardWindow: UIWindow; + + delegate: CPTemplateApplicationDashboardSceneDelegate; +} + +interface CPTemplateApplicationDashboardSceneDelegate extends UISceneDelegate { + + templateApplicationDashboardSceneDidConnectDashboardControllerToWindow?(templateApplicationDashboardScene: CPTemplateApplicationDashboardScene, dashboardController: CPDashboardController, window: UIWindow): void; + + templateApplicationDashboardSceneDidDisconnectDashboardControllerFromWindow?(templateApplicationDashboardScene: CPTemplateApplicationDashboardScene, dashboardController: CPDashboardController, window: UIWindow): void; +} +declare var CPTemplateApplicationDashboardSceneDelegate: { + + prototype: CPTemplateApplicationDashboardSceneDelegate; +}; + +declare var CPTemplateApplicationDashboardSceneSessionRoleApplication: string; + declare class CPTemplateApplicationScene extends UIScene { static alloc(): CPTemplateApplicationScene; // inherited from NSObject @@ -822,8 +1646,12 @@ declare class CPTemplateApplicationScene extends UIScene { interface CPTemplateApplicationSceneDelegate extends UISceneDelegate { + templateApplicationSceneDidConnectInterfaceController?(templateApplicationScene: CPTemplateApplicationScene, interfaceController: CPInterfaceController): void; + templateApplicationSceneDidConnectInterfaceControllerToWindow?(templateApplicationScene: CPTemplateApplicationScene, interfaceController: CPInterfaceController, window: CPWindow): void; + templateApplicationSceneDidDisconnectInterfaceController?(templateApplicationScene: CPTemplateApplicationScene, interfaceController: CPInterfaceController): void; + templateApplicationSceneDidDisconnectInterfaceControllerFromWindow?(templateApplicationScene: CPTemplateApplicationScene, interfaceController: CPInterfaceController, window: CPWindow): void; templateApplicationSceneDidSelectManeuver?(templateApplicationScene: CPTemplateApplicationScene, maneuver: CPManeuver): void; @@ -837,6 +1665,30 @@ declare var CPTemplateApplicationSceneDelegate: { declare var CPTemplateApplicationSceneSessionRoleApplication: string; +declare class CPTextButton extends NSObject { + + static alloc(): CPTextButton; // inherited from NSObject + + static new(): CPTextButton; // inherited from NSObject + + textStyle: CPTextButtonStyle; + + title: string; + + constructor(o: { title: string; textStyle: CPTextButtonStyle; handler: (p1: CPTextButton) => void; }); + + initWithTitleTextStyleHandler(title: string, textStyle: CPTextButtonStyle, handler: (p1: CPTextButton) => void): this; +} + +declare const enum CPTextButtonStyle { + + Normal = 0, + + Cancel = 1, + + Confirm = 2 +} + declare const enum CPTimeRemainingColor { Default = 0, @@ -1009,3 +1861,5 @@ declare class CPWindow extends UIWindow { templateApplicationScene: CPTemplateApplicationScene; } + +declare var CarPlayErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClassKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClassKit.d.ts index 64ab6368d..e5282508a 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClassKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClassKit.d.ts @@ -69,14 +69,30 @@ declare class CLSContext extends CLSObject { readonly active: boolean; + assignable: boolean; + readonly currentActivity: CLSActivity; + customTypeName: string; + displayOrder: number; readonly identifier: string; + readonly identifierPath: NSArray; + readonly parent: CLSContext; + readonly progressReportingCapabilities: NSSet; + + suggestedAge: NSRange; + + suggestedCompletionTime: NSRange; + + summary: string; + + thumbnail: any; + title: string; topic: string; @@ -89,6 +105,8 @@ declare class CLSContext extends CLSObject { addChildContext(child: CLSContext): void; + addProgressReportingCapabilities(capabilities: NSSet): void; + becomeActive(): void; createNewActivity(): CLSActivity; @@ -99,7 +117,11 @@ declare class CLSContext extends CLSObject { removeFromParent(): void; + resetProgressReportingCapabilities(): void; + resignActive(): void; + + setType(type: CLSContextType): void; } interface CLSContextProvider { @@ -159,7 +181,11 @@ declare const enum CLSContextType { Audio = 14, - Video = 15 + Video = 15, + + Course = 16, + + Custom = 17 } declare class CLSDataStore extends NSObject { @@ -258,6 +284,34 @@ declare var CLSPredicateKeyPathTopic: string; declare var CLSPredicateKeyPathUniversalLinkURL: string; +declare class CLSProgressReportingCapability extends CLSObject { + + static alloc(): CLSProgressReportingCapability; // inherited from NSObject + + static new(): CLSProgressReportingCapability; // inherited from NSObject + + readonly details: string; + + readonly kind: CLSProgressReportingCapabilityKind; + + constructor(o: { kind: CLSProgressReportingCapabilityKind; details: string; }); + + initWithKindDetails(kind: CLSProgressReportingCapabilityKind, details: string): this; +} + +declare const enum CLSProgressReportingCapabilityKind { + + Duration = 0, + + Percent = 1, + + Binary = 2, + + Quantity = 3, + + Score = 4 +} + declare class CLSQuantityItem extends CLSActivityItem { static alloc(): CLSQuantityItem; // inherited from NSObject diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClockKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClockKit.d.ts new file mode 100644 index 000000000..919c87eea --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ClockKit.d.ts @@ -0,0 +1,22 @@ + +declare class CLKWatchFaceLibrary extends NSObject { + + static alloc(): CLKWatchFaceLibrary; // inherited from NSObject + + static new(): CLKWatchFaceLibrary; // inherited from NSObject + + addWatchFaceAtURLCompletionHandler(fileURL: NSURL, handler: (p1: NSError) => void): void; +} + +declare const enum CLKWatchFaceLibraryErrorCode { + + NotFileURL = 1, + + InvalidFile = 2, + + PermissionDenied = 3, + + FaceNotAvailable = 4 +} + +declare var CLKWatchFaceLibraryErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CloudKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CloudKit.d.ts index b32d43ce2..c389c4699 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CloudKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CloudKit.d.ts @@ -118,8 +118,6 @@ declare class CKContainer extends NSObject { databaseWithDatabaseScope(databaseScope: CKDatabaseScope): CKDatabase; - discoverAllContactUserInfosWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; - discoverAllIdentitiesWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; discoverUserIdentityWithEmailAddressCompletionHandler(email: string, completionHandler: (p1: CKUserIdentity, p2: NSError) => void): void; @@ -128,10 +126,6 @@ declare class CKContainer extends NSObject { discoverUserIdentityWithUserRecordIDCompletionHandler(userRecordID: CKRecordID, completionHandler: (p1: CKUserIdentity, p2: NSError) => void): void; - discoverUserInfoWithEmailAddressCompletionHandler(email: string, completionHandler: (p1: CKDiscoveredUserInfo, p2: NSError) => void): void; - - discoverUserInfoWithUserRecordIDCompletionHandler(userRecordID: CKRecordID, completionHandler: (p1: CKDiscoveredUserInfo, p2: NSError) => void): void; - fetchAllLongLivedOperationIDsWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; fetchLongLivedOperationWithIDCompletionHandler(operationID: string, completionHandler: (p1: CKOperation, p2: NSError) => void): void; @@ -240,15 +234,6 @@ declare class CKDatabaseSubscription extends CKSubscription implements NSCopying initWithSubscriptionID(subscriptionID: string): this; } -declare class CKDiscoverAllContactsOperation extends CKOperation { - - static alloc(): CKDiscoverAllContactsOperation; // inherited from NSObject - - static new(): CKDiscoverAllContactsOperation; // inherited from NSObject - - discoverAllContactsCompletionBlock: (p1: NSArray, p2: NSError) => void; -} - declare class CKDiscoverAllUserIdentitiesOperation extends CKOperation { static alloc(): CKDiscoverAllUserIdentitiesOperation; // inherited from NSObject @@ -277,38 +262,6 @@ declare class CKDiscoverUserIdentitiesOperation extends CKOperation { initWithUserIdentityLookupInfos(userIdentityLookupInfos: NSArray | CKUserIdentityLookupInfo[]): this; } -declare class CKDiscoverUserInfosOperation extends CKOperation { - - static alloc(): CKDiscoverUserInfosOperation; // inherited from NSObject - - static new(): CKDiscoverUserInfosOperation; // inherited from NSObject - - discoverUserInfosCompletionBlock: (p1: NSDictionary, p2: NSDictionary, p3: NSError) => void; - - emailAddresses: NSArray; - - userRecordIDs: NSArray; - - constructor(o: { emailAddresses: NSArray | string[]; userRecordIDs: NSArray | CKRecordID[]; }); - - initWithEmailAddressesUserRecordIDs(emailAddresses: NSArray | string[], userRecordIDs: NSArray | CKRecordID[]): this; -} - -declare class CKDiscoveredUserInfo extends NSObject { - - static alloc(): CKDiscoveredUserInfo; // inherited from NSObject - - static new(): CKDiscoveredUserInfo; // inherited from NSObject - - readonly displayContact: CNContact; - - readonly firstName: string; - - readonly lastName: string; - - readonly userRecordID: CKRecordID; -} - declare const enum CKErrorCode { InternalError = 1, @@ -802,6 +755,8 @@ declare class CKNotification extends NSObject { readonly subscriptionID: string; + readonly subscriptionOwnerUserRecordID: CKRecordID; + readonly subtitle: string; readonly subtitleLocalizationArgs: NSArray; @@ -1044,8 +999,6 @@ declare class CKQueryNotification extends CKNotification { readonly databaseScope: CKDatabaseScope; - readonly isPublicDatabase: boolean; - readonly queryNotificationReason: CKQueryNotificationReason; readonly recordFields: NSDictionary; @@ -1099,17 +1052,31 @@ declare class CKQuerySubscription extends CKSubscription implements NSCopying, N static new(): CKQuerySubscription; // inherited from NSObject + readonly predicate: NSPredicate; + readonly querySubscriptionOptions: CKQuerySubscriptionOptions; + readonly recordType: string; + + zoneID: CKRecordZoneID; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { recordType: string; predicate: NSPredicate; options: CKQuerySubscriptionOptions; }); + + constructor(o: { recordType: string; predicate: NSPredicate; subscriptionID: string; options: CKQuerySubscriptionOptions; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; + + initWithRecordTypePredicateOptions(recordType: string, predicate: NSPredicate, querySubscriptionOptions: CKQuerySubscriptionOptions): this; + + initWithRecordTypePredicateSubscriptionIDOptions(recordType: string, predicate: NSPredicate, subscriptionID: string, querySubscriptionOptions: CKQuerySubscriptionOptions): this; } declare const enum CKQuerySubscriptionOptions { @@ -1498,7 +1465,7 @@ declare class CKServerChangeToken extends NSObject implements NSCopying, NSSecur initWithCoder(coder: NSCoder): this; } -declare class CKShare extends CKRecord implements NSSecureCoding { +declare class CKShare extends CKRecord implements NSCopying, NSSecureCoding { static alloc(): CKShare; // inherited from NSObject @@ -1524,6 +1491,8 @@ declare class CKShare extends CKRecord implements NSSecureCoding { addParticipant(participant: CKShareParticipant): void; + copyWithZone(zone: interop.Pointer | interop.Reference): any; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; @@ -1655,54 +1624,19 @@ declare class CKSubscription extends NSObject implements NSCopying, NSSecureCodi notificationInfo: CKNotificationInfo; - readonly predicate: NSPredicate; - - readonly recordType: string; - readonly subscriptionID: string; - readonly subscriptionOptions: CKSubscriptionOptions; - readonly subscriptionType: CKSubscriptionType; - zoneID: CKRecordZoneID; - static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding - constructor(o: { recordType: string; predicate: NSPredicate; options: CKSubscriptionOptions; }); - - constructor(o: { recordType: string; predicate: NSPredicate; subscriptionID: string; options: CKSubscriptionOptions; }); - - constructor(o: { zoneID: CKRecordZoneID; options: CKSubscriptionOptions; }); - - constructor(o: { zoneID: CKRecordZoneID; subscriptionID: string; options: CKSubscriptionOptions; }); - copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; - - initWithRecordTypePredicateOptions(recordType: string, predicate: NSPredicate, subscriptionOptions: CKSubscriptionOptions): this; - - initWithRecordTypePredicateSubscriptionIDOptions(recordType: string, predicate: NSPredicate, subscriptionID: string, subscriptionOptions: CKSubscriptionOptions): this; - - initWithZoneIDOptions(zoneID: CKRecordZoneID, subscriptionOptions: CKSubscriptionOptions): this; - - initWithZoneIDSubscriptionIDOptions(zoneID: CKRecordZoneID, subscriptionID: string, subscriptionOptions: CKSubscriptionOptions): this; -} - -declare const enum CKSubscriptionOptions { - - FiresOnRecordCreation = 1, - - FiresOnRecordUpdate = 2, - - FiresOnRecordDeletion = 4, - - FiresOnce = 8 } declare const enum CKSubscriptionType { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Contacts.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Contacts.d.ts index 84f26b17c..014f64cf2 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Contacts.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Contacts.d.ts @@ -411,6 +411,10 @@ declare class CNContactFormatter extends NSFormatter implements NSSecureCoding { style: CNContactFormatterStyle; + static readonly descriptorForRequiredKeysForDelimiter: CNKeyDescriptor; + + static readonly descriptorForRequiredKeysForNameOrder: CNKeyDescriptor; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -1023,6 +1027,8 @@ declare var CNLabelContactRelationGranddaughter: string; declare var CNLabelContactRelationGranddaughterDaughtersDaughter: string; +declare var CNLabelContactRelationGranddaughterOrNiece: string; + declare var CNLabelContactRelationGranddaughterSonsDaughter: string; declare var CNLabelContactRelationGrandfather: string; @@ -1055,6 +1061,8 @@ declare var CNLabelContactRelationGrandson: string; declare var CNLabelContactRelationGrandsonDaughtersSon: string; +declare var CNLabelContactRelationGrandsonOrNephew: string; + declare var CNLabelContactRelationGrandsonSonsSon: string; declare var CNLabelContactRelationGranduncle: string; @@ -1275,6 +1283,8 @@ declare var CNLabelHome: string; declare var CNLabelOther: string; +declare var CNLabelPhoneNumberAppleWatch: string; + declare var CNLabelPhoneNumberHomeFax: string; declare var CNLabelPhoneNumberMain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreAudioTypes.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreAudioTypes.d.ts index 14e749760..8f9daa474 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreAudioTypes.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreAudioTypes.d.ts @@ -528,6 +528,10 @@ declare const kAudioChannelLayoutTag_Ambisonic_B_Format: number; declare const kAudioChannelLayoutTag_Atmos_5_1_2: number; +declare const kAudioChannelLayoutTag_Atmos_5_1_4: number; + +declare const kAudioChannelLayoutTag_Atmos_7_1_2: number; + declare const kAudioChannelLayoutTag_Atmos_7_1_4: number; declare const kAudioChannelLayoutTag_Atmos_9_1_6: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreBluetooth.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreBluetooth.d.ts index 3050c9bcf..1bc51b653 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreBluetooth.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreBluetooth.d.ts @@ -305,7 +305,13 @@ declare const enum CBError { UnknownDevice = 12, - OperationNotSupported = 13 + OperationNotSupported = 13, + + PeerRemovedPairingInformation = 14, + + EncryptionTimedOut = 15, + + TooManyLEPairedDevices = 16 } declare var CBErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreData.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreData.d.ts index fd65f04ff..abd1f91c2 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreData.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreData.d.ts @@ -172,22 +172,46 @@ declare class NSBatchInsertRequest extends NSPersistentStoreRequest { static alloc(): NSBatchInsertRequest; // inherited from NSObject + static batchInsertRequestWithEntityNameDictionaryHandler(entityName: string, handler: (p1: NSMutableDictionary) => boolean): NSBatchInsertRequest; + + static batchInsertRequestWithEntityNameManagedObjectHandler(entityName: string, handler: (p1: NSManagedObject) => boolean): NSBatchInsertRequest; + static batchInsertRequestWithEntityNameObjects(entityName: string, dictionaries: NSArray> | NSDictionary[]): NSBatchInsertRequest; static new(): NSBatchInsertRequest; // inherited from NSObject + dictionaryHandler: (p1: NSMutableDictionary) => boolean; + readonly entity: NSEntityDescription; readonly entityName: string; + managedObjectHandler: (p1: NSManagedObject) => boolean; + objectsToInsert: NSArray>; resultType: NSBatchInsertRequestResultType; + constructor(o: { entity: NSEntityDescription; dictionaryHandler: (p1: NSMutableDictionary) => boolean; }); + + constructor(o: { entity: NSEntityDescription; managedObjectHandler: (p1: NSManagedObject) => boolean; }); + + constructor(o: { entityName: string; dictionaryHandler: (p1: NSMutableDictionary) => boolean; }); + + constructor(o: { entityName: string; managedObjectHandler: (p1: NSManagedObject) => boolean; }); + constructor(o: { entityName: string; objects: NSArray> | NSDictionary[]; }); constructor(o: { entity: NSEntityDescription; objects: NSArray> | NSDictionary[]; }); + initWithEntityDictionaryHandler(entity: NSEntityDescription, handler: (p1: NSMutableDictionary) => boolean): this; + + initWithEntityManagedObjectHandler(entity: NSEntityDescription, handler: (p1: NSManagedObject) => boolean): this; + + initWithEntityNameDictionaryHandler(entityName: string, handler: (p1: NSMutableDictionary) => boolean): this; + + initWithEntityNameManagedObjectHandler(entityName: string, handler: (p1: NSManagedObject) => boolean): this; + initWithEntityNameObjects(entityName: string, dictionaries: NSArray> | NSDictionary[]): this; initWithEntityObjects(entity: NSEntityDescription, dictionaries: NSArray> | NSDictionary[]): this; @@ -329,6 +353,8 @@ declare const enum NSDeleteRule { DenyDeleteRule = 3 } +declare var NSDeletedObjectIDsKey: string; + declare var NSDeletedObjectsKey: string; declare class NSDerivedAttributeDescription extends NSAttributeDescription { @@ -488,7 +514,7 @@ declare class NSExpressionDescription extends NSPropertyDescription { declare const NSExternalRecordImportError: number; -declare class NSFetchIndexDescription extends NSObject implements NSCoding { +declare class NSFetchIndexDescription extends NSObject implements NSCoding, NSCopying { static alloc(): NSFetchIndexDescription; // inherited from NSObject @@ -506,6 +532,8 @@ declare class NSFetchIndexDescription extends NSObject implements NSCoding { constructor(o: { name: string; elements: NSArray | NSFetchIndexElementDescription[]; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; @@ -513,7 +541,7 @@ declare class NSFetchIndexDescription extends NSObject implements NSCoding { initWithNameElements(name: string, elements: NSArray | NSFetchIndexElementDescription[]): this; } -declare class NSFetchIndexElementDescription extends NSObject implements NSCoding { +declare class NSFetchIndexElementDescription extends NSObject implements NSCoding, NSCopying { static alloc(): NSFetchIndexElementDescription; // inherited from NSObject @@ -533,6 +561,8 @@ declare class NSFetchIndexElementDescription extends NSObject implements NSCodin constructor(o: { property: NSPropertyDescription; collationType: NSFetchIndexElementType; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; @@ -786,10 +816,14 @@ declare var NSInferMappingModelAutomaticallyOption: string; declare const NSInferredMappingModelError: number; +declare var NSInsertedObjectIDsKey: string; + declare var NSInsertedObjectsKey: string; declare var NSInvalidatedAllObjectsKey: string; +declare var NSInvalidatedObjectIDsKey: string; + declare var NSInvalidatedObjectsKey: string; declare class NSManagedObject extends NSObject implements NSFetchRequestResult { @@ -1031,8 +1065,12 @@ declare const enum NSManagedObjectContextConcurrencyType { MainQueueConcurrencyType = 2 } +declare var NSManagedObjectContextDidMergeChangesObjectIDsNotification: string; + declare var NSManagedObjectContextDidSaveNotification: string; +declare var NSManagedObjectContextDidSaveObjectIDsNotification: string; + declare const NSManagedObjectContextLockingError: number; declare var NSManagedObjectContextObjectsDidChangeNotification: string; @@ -1333,6 +1371,12 @@ declare class NSPersistentCloudKitContainer extends NSPersistentContainer { static persistentContainerWithNameManagedObjectModel(name: string, model: NSManagedObjectModel): NSPersistentCloudKitContainer; // inherited from NSPersistentContainer + canDeleteRecordForManagedObjectWithID(objectID: NSManagedObjectID): boolean; + + canModifyManagedObjectsInStore(store: NSPersistentStore): boolean; + + canUpdateRecordForManagedObjectWithID(objectID: NSManagedObjectID): boolean; + initializeCloudKitSchemaWithOptionsError(options: NSPersistentCloudKitContainerSchemaInitializationOptions): boolean; recordForManagedObjectID(managedObjectID: NSManagedObjectID): CKRecord; @@ -1344,6 +1388,77 @@ declare class NSPersistentCloudKitContainer extends NSPersistentContainer { recordsForManagedObjectIDs(managedObjectIDs: NSArray | NSManagedObjectID[]): NSDictionary; } +declare class NSPersistentCloudKitContainerEvent extends NSObject implements NSCopying { + + static alloc(): NSPersistentCloudKitContainerEvent; // inherited from NSObject + + static new(): NSPersistentCloudKitContainerEvent; // inherited from NSObject + + readonly endDate: Date; + + readonly error: NSError; + + readonly identifier: NSUUID; + + readonly startDate: Date; + + readonly storeIdentifier: string; + + readonly succeeded: boolean; + + readonly type: NSPersistentCloudKitContainerEventType; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare var NSPersistentCloudKitContainerEventChangedNotification: string; + +declare class NSPersistentCloudKitContainerEventRequest extends NSPersistentStoreRequest { + + static alloc(): NSPersistentCloudKitContainerEventRequest; // inherited from NSObject + + static fetchEventsAfterDate(date: Date): NSPersistentCloudKitContainerEventRequest; + + static fetchEventsAfterEvent(event: NSPersistentCloudKitContainerEvent): NSPersistentCloudKitContainerEventRequest; + + static fetchEventsMatchingFetchRequest(fetchRequest: NSFetchRequest): NSPersistentCloudKitContainerEventRequest; + + static fetchRequestForEvents(): NSFetchRequest; + + static new(): NSPersistentCloudKitContainerEventRequest; // inherited from NSObject + + resultType: NSPersistentCloudKitContainerEventResultType; +} + +declare class NSPersistentCloudKitContainerEventResult extends NSPersistentStoreResult { + + static alloc(): NSPersistentCloudKitContainerEventResult; // inherited from NSObject + + static new(): NSPersistentCloudKitContainerEventResult; // inherited from NSObject + + readonly result: any; + + readonly resultType: NSPersistentCloudKitContainerEventResultType; +} + +declare const enum NSPersistentCloudKitContainerEventResultType { + + Events = 0, + + CountEvents = 1 +} + +declare const enum NSPersistentCloudKitContainerEventType { + + Setup = 0, + + Import = 1, + + Export = 2 +} + +declare var NSPersistentCloudKitContainerEventUserInfoKey: string; + declare class NSPersistentCloudKitContainerOptions extends NSObject { static alloc(): NSPersistentCloudKitContainerOptions; // inherited from NSObject @@ -1352,6 +1467,8 @@ declare class NSPersistentCloudKitContainerOptions extends NSObject { readonly containerIdentifier: string; + databaseScope: CKDatabaseScope; + constructor(o: { containerIdentifier: string; }); initWithContainerIdentifier(containerIdentifier: string): this; @@ -1901,6 +2018,8 @@ declare class NSQueryGenerationToken extends NSObject implements NSCopying, NSSe declare var NSReadOnlyPersistentStoreOption: string; +declare var NSRefreshedObjectIDsKey: string; + declare var NSRefreshedObjectsKey: string; declare class NSRelationshipDescription extends NSPropertyDescription { @@ -1986,6 +2105,8 @@ declare var NSStoreUUIDKey: string; declare var NSUUIDChangedPersistentStoresKey: string; +declare var NSUpdatedObjectIDsKey: string; + declare var NSUpdatedObjectsKey: string; declare const NSValidationDateTooLateError: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreFoundation.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreFoundation.d.ts index c2c5f0aa8..7ef050a35 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreFoundation.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreFoundation.d.ts @@ -2678,6 +2678,8 @@ declare var kCFBuddhistCalendar: any; declare var kCFBundleDevelopmentRegionKey: string; +declare const kCFBundleExecutableArchitectureARM64: number; + declare const kCFBundleExecutableArchitectureI386: number; declare const kCFBundleExecutableArchitecturePPC: number; @@ -3148,6 +3150,8 @@ declare var kCFURLEffectiveIconKey: string; declare var kCFURLFileAllocatedSizeKey: string; +declare var kCFURLFileContentIdentifierKey: string; + declare var kCFURLFileDirectoryContents: string; declare var kCFURLFileExists: string; @@ -3218,10 +3222,14 @@ declare var kCFURLIsMountTriggerKey: string; declare var kCFURLIsPackageKey: string; +declare var kCFURLIsPurgeableKey: string; + declare var kCFURLIsReadableKey: string; declare var kCFURLIsRegularFileKey: string; +declare var kCFURLIsSparseKey: string; + declare var kCFURLIsSymbolicLinkKey: string; declare var kCFURLIsSystemImmutableKey: string; @@ -3248,6 +3256,10 @@ declare var kCFURLLocalizedNameKey: string; declare var kCFURLLocalizedTypeDescriptionKey: string; +declare var kCFURLMayHaveExtendedAttributesKey: string; + +declare var kCFURLMayShareFileContentKey: string; + declare var kCFURLNameKey: string; declare var kCFURLParentDirectoryURLKey: string; @@ -3344,6 +3356,8 @@ declare var kCFURLVolumeSupportsExtendedSecurityKey: string; declare var kCFURLVolumeSupportsFileCloningKey: string; +declare var kCFURLVolumeSupportsFileProtectionKey: string; + declare var kCFURLVolumeSupportsHardLinksKey: string; declare var kCFURLVolumeSupportsImmutableFilesKey: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreGraphics.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreGraphics.d.ts index 99147d9d6..672e16059 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreGraphics.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreGraphics.d.ts @@ -160,8 +160,14 @@ declare function CGColorCreateCopyByMatchingToColorSpace(p1: any, intent: CGColo declare function CGColorCreateCopyWithAlpha(color: any, alpha: number): any; +declare function CGColorCreateGenericCMYK(cyan: number, magenta: number, yellow: number, black: number, alpha: number): any; + +declare function CGColorCreateGenericGray(gray: number, alpha: number): any; + declare function CGColorCreateGenericGrayGamma2_2(gray: number, alpha: number): any; +declare function CGColorCreateGenericRGB(red: number, green: number, blue: number, alpha: number): any; + declare function CGColorCreateSRGB(red: number, green: number, blue: number, alpha: number): any; declare function CGColorCreateWithPattern(space: any, pattern: any, components: interop.Pointer | interop.Reference): any; @@ -174,6 +180,8 @@ declare function CGColorGetColorSpace(color: any): any; declare function CGColorGetComponents(color: any): interop.Pointer | interop.Reference; +declare function CGColorGetConstantColor(colorName: string): any; + declare function CGColorGetNumberOfComponents(color: any): number; declare function CGColorGetPattern(color: any): any; @@ -215,12 +223,18 @@ declare function CGColorSpaceCreateDeviceGray(): any; declare function CGColorSpaceCreateDeviceRGB(): any; +declare function CGColorSpaceCreateExtended(space: any): any; + +declare function CGColorSpaceCreateExtendedLinearized(space: any): any; + declare function CGColorSpaceCreateICCBased(nComponents: number, range: interop.Pointer | interop.Reference, profile: any, alternate: any): any; declare function CGColorSpaceCreateIndexed(baseSpace: any, lastIndex: number, colorTable: string | interop.Pointer | interop.Reference): any; declare function CGColorSpaceCreateLab(whitePoint: interop.Reference, blackPoint: interop.Reference, range: interop.Reference): any; +declare function CGColorSpaceCreateLinearized(space: any): any; + declare function CGColorSpaceCreatePattern(baseSpace: any): any; declare function CGColorSpaceCreateWithICCData(data: any): any; @@ -278,6 +292,10 @@ declare function CGColorSpaceRetain(space: any): any; declare function CGColorSpaceSupportsOutput(space: any): boolean; +declare function CGColorSpaceUsesExtendedRange(space: any): boolean; + +declare function CGColorSpaceUsesITUR_2100TF(p1: any): boolean; + declare function CGContextAddArc(c: any, x: number, y: number, radius: number, startAngle: number, endAngle: number, clockwise: number): void; declare function CGContextAddArcToPoint(c: any, x1: number, y1: number, x2: number, y2: number, radius: number): void; @@ -1495,6 +1513,10 @@ declare var CGVector: interop.StructType; declare function CGVectorMake(dx: number, dy: number): CGVector; +declare var kCGColorBlack: string; + +declare var kCGColorClear: string; + declare var kCGColorConversionBlackPointCompensation: string; declare var kCGColorConversionTRCSize: string; @@ -1509,10 +1531,16 @@ declare var kCGColorSpaceDisplayP3: string; declare var kCGColorSpaceDisplayP3_HLG: string; +declare var kCGColorSpaceDisplayP3_PQ: string; + declare var kCGColorSpaceDisplayP3_PQ_EOTF: string; +declare var kCGColorSpaceExtendedDisplayP3: string; + declare var kCGColorSpaceExtendedGray: string; +declare var kCGColorSpaceExtendedITUR_2020: string; + declare var kCGColorSpaceExtendedLinearDisplayP3: string; declare var kCGColorSpaceExtendedLinearGray: string; @@ -1541,8 +1569,14 @@ declare var kCGColorSpaceITUR_2020: string; declare var kCGColorSpaceITUR_2020_HLG: string; +declare var kCGColorSpaceITUR_2020_PQ: string; + declare var kCGColorSpaceITUR_2020_PQ_EOTF: string; +declare var kCGColorSpaceITUR_2100_HLG: string; + +declare var kCGColorSpaceITUR_2100_PQ: string; + declare var kCGColorSpaceITUR_709: string; declare var kCGColorSpaceLinearGray: string; @@ -1553,6 +1587,8 @@ declare var kCGColorSpaceROMMRGB: string; declare var kCGColorSpaceSRGB: string; +declare var kCGColorWhite: string; + declare var kCGFontIndexInvalid: number; declare var kCGFontIndexMax: number; @@ -1579,6 +1615,10 @@ declare var kCGPDFContextAuthor: string; declare var kCGPDFContextBleedBox: string; +declare var kCGPDFContextCreateLinearizedPDF: string; + +declare var kCGPDFContextCreatePDFA: string; + declare var kCGPDFContextCreator: string; declare var kCGPDFContextCropBox: string; @@ -1589,6 +1629,10 @@ declare var kCGPDFContextKeywords: string; declare var kCGPDFContextMediaBox: string; +declare var kCGPDFContextOutputIntent: string; + +declare var kCGPDFContextOutputIntents: string; + declare var kCGPDFContextOwnerPassword: string; declare var kCGPDFContextSubject: string; @@ -1614,3 +1658,15 @@ declare var kCGPDFTagPropertyAlternativeText: any; declare var kCGPDFTagPropertyLanguageText: any; declare var kCGPDFTagPropertyTitleText: any; + +declare var kCGPDFXDestinationOutputProfile: string; + +declare var kCGPDFXInfo: string; + +declare var kCGPDFXOutputCondition: string; + +declare var kCGPDFXOutputConditionIdentifier: string; + +declare var kCGPDFXOutputIntentSubtype: string; + +declare var kCGPDFXRegistryName: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreHaptics.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreHaptics.d.ts index c49764ead..cd1c91948 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreHaptics.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreHaptics.d.ts @@ -144,6 +144,10 @@ declare const enum CHHapticEngineStoppedReason { NotifyWhenFinished = 4, + EngineDestroyed = 5, + + GameControllerDisconnect = 6, + SystemError = -1 } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreImage.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreImage.d.ts index 20e5f6018..0871eedde 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreImage.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreImage.d.ts @@ -40,6 +40,95 @@ declare var CIAffineTile: { customAttributes?(): NSDictionary; }; +interface CIAreaAverage extends CIAreaReductionFilter { +} +declare var CIAreaAverage: { + + prototype: CIAreaAverage; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaHistogram extends CIAreaReductionFilter { + + count: number; + + scale: number; +} +declare var CIAreaHistogram: { + + prototype: CIAreaHistogram; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMaximum extends CIAreaReductionFilter { +} +declare var CIAreaMaximum: { + + prototype: CIAreaMaximum; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMaximumAlpha extends CIAreaReductionFilter { +} +declare var CIAreaMaximumAlpha: { + + prototype: CIAreaMaximumAlpha; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMinMax extends CIAreaReductionFilter { +} +declare var CIAreaMinMax: { + + prototype: CIAreaMinMax; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMinMaxRed extends CIAreaReductionFilter { +} +declare var CIAreaMinMaxRed: { + + prototype: CIAreaMinMaxRed; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMinimum extends CIAreaReductionFilter { +} +declare var CIAreaMinimum: { + + prototype: CIAreaMinimum; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaMinimumAlpha extends CIAreaReductionFilter { +} +declare var CIAreaMinimumAlpha: { + + prototype: CIAreaMinimumAlpha; + + customAttributes?(): NSDictionary; +}; + +interface CIAreaReductionFilter extends CIFilterProtocol { + + extent: CGRect; + + inputImage: CIImage; +} +declare var CIAreaReductionFilter: { + + prototype: CIAreaReductionFilter; + + customAttributes?(): NSDictionary; +}; + interface CIAttributedTextImageGenerator extends CIFilterProtocol { scaleFactor: number; @@ -314,6 +403,42 @@ declare var CIBoxBlur: { customAttributes?(): NSDictionary; }; +interface CIBumpDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; + + scale: number; +} +declare var CIBumpDistortion: { + + prototype: CIBumpDistortion; + + customAttributes?(): NSDictionary; +}; + +interface CIBumpDistortionLinear extends CIFilterProtocol { + + angle: number; + + center: CGPoint; + + inputImage: CIImage; + + radius: number; + + scale: number; +} +declare var CIBumpDistortionLinear: { + + prototype: CIBumpDistortionLinear; + + customAttributes?(): NSDictionary; +}; + interface CICMYKHalftone extends CIFilterProtocol { angle: number; @@ -356,6 +481,21 @@ declare var CICheckerboardGenerator: { customAttributes?(): NSDictionary; }; +interface CICircleSplashDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; +} +declare var CICircleSplashDistortion: { + + prototype: CICircleSplashDistortion; + + customAttributes?(): NSDictionary; +}; + interface CICircularScreen extends CIFilterProtocol { center: CGPoint; @@ -373,6 +513,23 @@ declare var CICircularScreen: { customAttributes?(): NSDictionary; }; +interface CICircularWrap extends CIFilterProtocol { + + angle: number; + + center: CGPoint; + + inputImage: CIImage; + + radius: number; +} +declare var CICircularWrap: { + + prototype: CICircularWrap; + + customAttributes?(): NSDictionary; +}; + interface CICode128BarcodeGenerator extends CIFilterProtocol { barcodeHeight: number; @@ -477,6 +634,19 @@ declare class CIColor extends NSObject implements NSCopying, NSSecureCoding { initWithRedGreenBlueColorSpace(r: number, g: number, b: number, colorSpace: any): this; } +interface CIColorAbsoluteDifference extends CIFilterProtocol { + + inputImage: CIImage; + + inputImage2: CIImage; +} +declare var CIColorAbsoluteDifference: { + + prototype: CIColorAbsoluteDifference; + + customAttributes?(): NSDictionary; +}; + interface CIColorClamp extends CIFilterProtocol { inputImage: CIImage; @@ -703,6 +873,39 @@ declare var CIColorPosterize: { customAttributes?(): NSDictionary; }; +interface CIColorThreshold extends CIFilterProtocol { + + inputImage: CIImage; + + threshold: number; +} +declare var CIColorThreshold: { + + prototype: CIColorThreshold; + + customAttributes?(): NSDictionary; +}; + +interface CIColorThresholdOtsu extends CIFilterProtocol { + + inputImage: CIImage; +} +declare var CIColorThresholdOtsu: { + + prototype: CIColorThresholdOtsu; + + customAttributes?(): NSDictionary; +}; + +interface CIColumnAverage extends CIAreaReductionFilter { +} +declare var CIColumnAverage: { + + prototype: CIColumnAverage; + + customAttributes?(): NSDictionary; +}; + interface CIComicEffect extends CIFilterProtocol { inputImage: CIImage; @@ -775,6 +978,8 @@ declare class CIContext extends NSObject { depthBlurEffectFilterForImageDataOptions(data: NSData, options: NSDictionary): CIFilter; + depthBlurEffectFilterForImageDisparityImagePortraitEffectsMatteHairSemanticSegmentationGlassesMatteGainMapOrientationOptions(image: CIImage, disparityImage: CIImage, portraitEffectsMatte: CIImage, hairSemanticSegmentation: CIImage, glassesMatte: CIImage, gainMap: CIImage, orientation: CGImagePropertyOrientation, options: NSDictionary): CIFilter; + depthBlurEffectFilterForImageDisparityImagePortraitEffectsMatteHairSemanticSegmentationOrientationOptions(image: CIImage, disparityImage: CIImage, portraitEffectsMatte: CIImage, hairSemanticSegmentation: CIImage, orientation: CGImagePropertyOrientation, options: NSDictionary): CIFilter; depthBlurEffectFilterForImageDisparityImagePortraitEffectsMatteOrientationOptions(image: CIImage, disparityImage: CIImage, portraitEffectsMatte: CIImage, orientation: CGImagePropertyOrientation, options: NSDictionary): CIFilter; @@ -799,7 +1004,7 @@ declare class CIContext extends NSObject { renderToCVPixelBufferBoundsColorSpace(image: CIImage, buffer: any, bounds: CGRect, colorSpace: any): void; - renderToIOSurfaceBoundsColorSpace(image: CIImage, surface: any, bounds: CGRect, colorSpace: any): void; + renderToIOSurfaceBoundsColorSpace(image: CIImage, surface: IOSurface, bounds: CGRect, colorSpace: any): void; renderToMTLTextureCommandBufferBoundsColorSpace(image: CIImage, texture: MTLTexture, commandBuffer: MTLCommandBuffer, bounds: CGRect, colorSpace: any): void; @@ -1042,6 +1247,21 @@ declare var CIDisparityToDepth: { customAttributes?(): NSDictionary; }; +interface CIDisplacementDistortion extends CIFilterProtocol { + + displacementImage: CIImage; + + inputImage: CIImage; + + scale: number; +} +declare var CIDisplacementDistortion: { + + prototype: CIDisplacementDistortion; + + customAttributes?(): NSDictionary; +}; + interface CIDissolveTransition extends CITransitionFilter { } declare var CIDissolveTransition: { @@ -1096,6 +1316,29 @@ declare var CIDotScreen: { customAttributes?(): NSDictionary; }; +interface CIDroste extends CIFilterProtocol { + + inputImage: CIImage; + + insetPoint0: CGPoint; + + insetPoint1: CGPoint; + + periodicity: number; + + rotation: number; + + strands: number; + + zoom: number; +} +declare var CIDroste: { + + prototype: CIDroste; + + customAttributes?(): NSDictionary; +}; + interface CIEdgePreserveUpsample extends CIFilterProtocol { inputImage: CIImage; @@ -1244,6 +1487,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static CMYKHalftone(): CIFilter; + static KMeansFilter(): CIFilter; + static LabDeltaE(): CIFilter; static PDF417BarcodeGenerator(): CIFilter; @@ -1260,6 +1505,22 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static alloc(): CIFilter; // inherited from NSObject + static areaAverageFilter(): CIFilter; + + static areaHistogramFilter(): CIFilter; + + static areaMaximumAlphaFilter(): CIFilter; + + static areaMaximumFilter(): CIFilter; + + static areaMinMaxFilter(): CIFilter; + + static areaMinMaxRedFilter(): CIFilter; + + static areaMinimumAlphaFilter(): CIFilter; + + static areaMinimumFilter(): CIFilter; + static attributedTextImageGeneratorFilter(): CIFilter; static aztecCodeGeneratorFilter(): CIFilter; @@ -1284,12 +1545,22 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static boxBlurFilter(): CIFilter; + static bumpDistortionFilter(): CIFilter; + + static bumpDistortionLinearFilter(): CIFilter; + static checkerboardGeneratorFilter(): CIFilter; + static circleSplashDistortionFilter(): CIFilter; + static circularScreenFilter(): CIFilter; + static circularWrapFilter(): CIFilter; + static code128BarcodeGeneratorFilter(): CIFilter; + static colorAbsoluteDifferenceFilter(): CIFilter; + static colorBlendModeFilter(): CIFilter; static colorBurnBlendModeFilter(): CIFilter; @@ -1322,6 +1593,12 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static colorPosterizeFilter(): CIFilter; + static colorThresholdFilter(): CIFilter; + + static colorThresholdOtsuFilter(): CIFilter; + + static columnAverageFilter(): CIFilter; + static comicEffectFilter(): CIFilter; static convolution3X3Filter(): CIFilter; @@ -1354,6 +1631,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static disparityToDepthFilter(): CIFilter; + static displacementDistortionFilter(): CIFilter; + static dissolveTransitionFilter(): CIFilter; static ditherFilter(): CIFilter; @@ -1364,6 +1643,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static dotScreenFilter(): CIFilter; + static drosteFilter(): CIFilter; + static edgePreserveUpsampleFilter(): CIFilter; static edgeWorkFilter(): CIFilter; @@ -1412,6 +1693,10 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static gaussianGradientFilter(): CIFilter; + static glassDistortionFilter(): CIFilter; + + static glassLozengeFilter(): CIFilter; + static glideReflectedTileFilter(): CIFilter; static gloomFilter(): CIFilter; @@ -1426,6 +1711,10 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static highlightShadowAdjustFilter(): CIFilter; + static histogramDisplayFilter(): CIFilter; + + static holeDistortionFilter(): CIFilter; + static hueAdjustFilter(): CIFilter; static hueBlendModeFilter(): CIFilter; @@ -1444,6 +1733,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static lenticularHaloGeneratorFilter(): CIFilter; + static lightTunnelFilter(): CIFilter; + static lightenBlendModeFilter(): CIFilter; static lineOverlayFilter(): CIFilter; @@ -1506,6 +1797,10 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static new(): CIFilter; // inherited from NSObject + static ninePartStretchedFilter(): CIFilter; + + static ninePartTiledFilter(): CIFilter; + static noiseReductionFilter(): CIFilter; static opTileFilter(): CIFilter; @@ -1550,6 +1845,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static pinLightBlendModeFilter(): CIFilter; + static pinchDistortionFilter(): CIFilter; + static pixellateFilter(): CIFilter; static pointillizeFilter(): CIFilter; @@ -1564,6 +1861,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static roundedRectangleGeneratorFilter(): CIFilter; + static rowAverageFilter(): CIFilter; + static sRGBToneCurveToLinearFilter(): CIFilter; static saliencyMapFilter(): CIFilter; @@ -1604,6 +1903,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static straightenFilter(): CIFilter; + static stretchCropFilter(): CIFilter; + static stripesGeneratorFilter(): CIFilter; static subtractBlendModeFilter(): CIFilter; @@ -1622,12 +1923,16 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static toneCurveFilter(): CIFilter; + static torusLensDistortionFilter(): CIFilter; + static triangleKaleidoscopeFilter(): CIFilter; static triangleTileFilter(): CIFilter; static twelvefoldReflectedTileFilter(): CIFilter; + static twirlDistortionFilter(): CIFilter; + static unsharpMaskFilter(): CIFilter; static vibranceFilter(): CIFilter; @@ -1636,6 +1941,8 @@ declare class CIFilter extends NSObject implements NSCopying, NSSecureCoding { static vignetteFilter(): CIFilter; + static vortexDistortionFilter(): CIFilter; + static whitePointAdjustFilter(): CIFilter; static xRayFilter(): CIFilter; @@ -1867,6 +2174,42 @@ declare var CIGaussianGradient: { customAttributes?(): NSDictionary; }; +interface CIGlassDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + scale: number; + + textureImage: CIImage; +} +declare var CIGlassDistortion: { + + prototype: CIGlassDistortion; + + customAttributes?(): NSDictionary; +}; + +interface CIGlassLozenge extends CIFilterProtocol { + + inputImage: CIImage; + + point0: CGPoint; + + point1: CGPoint; + + radius: number; + + refraction: number; +} +declare var CIGlassLozenge: { + + prototype: CIGlassLozenge; + + customAttributes?(): NSDictionary; +}; + interface CIGlideReflectedTile extends CIFilterProtocol { angle: number; @@ -1963,6 +2306,38 @@ declare var CIHighlightShadowAdjust: { customAttributes?(): NSDictionary; }; +interface CIHistogramDisplay extends CIFilterProtocol { + + height: number; + + highLimit: number; + + inputImage: CIImage; + + lowLimit: number; +} +declare var CIHistogramDisplay: { + + prototype: CIHistogramDisplay; + + customAttributes?(): NSDictionary; +}; + +interface CIHoleDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; +} +declare var CIHoleDistortion: { + + prototype: CIHoleDistortion; + + customAttributes?(): NSDictionary; +}; + interface CIHueAdjust extends CIFilterProtocol { angle: number; @@ -2031,9 +2406,9 @@ declare class CIImage extends NSObject implements NSCopying, NSSecureCoding { static imageWithDepthDataOptions(data: AVDepthData, options: NSDictionary): CIImage; - static imageWithIOSurface(surface: any): CIImage; + static imageWithIOSurface(surface: IOSurface): CIImage; - static imageWithIOSurfaceOptions(surface: any, options: NSDictionary): CIImage; + static imageWithIOSurfaceOptions(surface: IOSurface, options: NSDictionary): CIImage; static imageWithImageProviderSizeFormatColorSpaceOptions(p: any, width: number, height: number, f: number, cs: any, options: NSDictionary): CIImage; @@ -2123,9 +2498,9 @@ declare class CIImage extends NSObject implements NSCopying, NSSecureCoding { constructor(o: { depthData: AVDepthData; options: NSDictionary; }); - constructor(o: { IOSurface: any; }); + constructor(o: { IOSurface: IOSurface; }); - constructor(o: { IOSurface: any; options: NSDictionary; }); + constructor(o: { IOSurface: IOSurface; options: NSDictionary; }); constructor(o: { image: UIImage; }); @@ -2229,9 +2604,9 @@ declare class CIImage extends NSObject implements NSCopying, NSSecureCoding { initWithDepthDataOptions(data: AVDepthData, options: NSDictionary): this; - initWithIOSurface(surface: any): this; + initWithIOSurface(surface: IOSurface): this; - initWithIOSurfaceOptions(surface: any, options: NSDictionary): this; + initWithIOSurfaceOptions(surface: IOSurface, options: NSDictionary): this; initWithImage(image: UIImage): this; @@ -2299,7 +2674,7 @@ interface CIImageProcessorInput { region: CGRect; - surface: any; + surface: IOSurface; } declare var CIImageProcessorInput: { @@ -2343,13 +2718,30 @@ interface CIImageProcessorOutput { region: CGRect; - surface: any; + surface: IOSurface; } declare var CIImageProcessorOutput: { prototype: CIImageProcessorOutput; }; +interface CIKMeans extends CIAreaReductionFilter { + + count: number; + + inputMeans: CIImage; + + passes: number; + + perceptual: boolean; +} +declare var CIKMeans: { + + prototype: CIKMeans; + + customAttributes?(): NSDictionary; +}; + interface CIKaleidoscope extends CIFilterProtocol { angle: number; @@ -2371,6 +2763,8 @@ declare class CIKernel extends NSObject { static alloc(): CIKernel; // inherited from NSObject + static kernelNamesFromMetalLibraryData(data: NSData): NSArray; + static kernelWithFunctionNameFromMetalLibraryDataError(name: string, data: NSData): CIKernel; static kernelWithFunctionNameFromMetalLibraryDataOutputPixelFormatError(name: string, data: NSData, format: number): CIKernel; @@ -2474,6 +2868,23 @@ declare var CILenticularHaloGenerator: { customAttributes?(): NSDictionary; }; +interface CILightTunnel extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; + + rotation: number; +} +declare var CILightTunnel: { + + prototype: CILightTunnel; + + customAttributes?(): NSDictionary; +}; + interface CILineOverlay extends CIFilterProtocol { NRNoiseLevel: number; @@ -2732,6 +3143,42 @@ declare var CIMotionBlur: { customAttributes?(): NSDictionary; }; +interface CINinePartStretched extends CIFilterProtocol { + + breakpoint0: CGPoint; + + breakpoint1: CGPoint; + + growAmount: CGPoint; + + inputImage: CIImage; +} +declare var CINinePartStretched: { + + prototype: CINinePartStretched; + + customAttributes?(): NSDictionary; +}; + +interface CINinePartTiled extends CIFilterProtocol { + + breakpoint0: CGPoint; + + breakpoint1: CGPoint; + + flipYTiles: boolean; + + growAmount: CGPoint; + + inputImage: CIImage; +} +declare var CINinePartTiled: { + + prototype: CINinePartTiled; + + customAttributes?(): NSDictionary; +}; + interface CINoiseReduction extends CIFilterProtocol { inputImage: CIImage; @@ -2991,6 +3438,23 @@ declare var CIPhotoEffect: { customAttributes?(): NSDictionary; }; +interface CIPinchDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; + + scale: number; +} +declare var CIPinchDistortion: { + + prototype: CIPinchDistortion; + + customAttributes?(): NSDictionary; +}; + interface CIPixellate extends CIFilterProtocol { center: CGPoint; @@ -3252,6 +3716,15 @@ declare var CIRoundedRectangleGenerator: { customAttributes?(): NSDictionary; }; +interface CIRowAverage extends CIAreaReductionFilter { +} +declare var CIRowAverage: { + + prototype: CIRowAverage; + + customAttributes?(): NSDictionary; +}; + interface CISRGBToneCurveToLinear extends CIFilterProtocol { inputImage: CIImage; @@ -3489,6 +3962,23 @@ declare var CIStraighten: { customAttributes?(): NSDictionary; }; +interface CIStretchCrop extends CIFilterProtocol { + + centerStretchAmount: number; + + cropAmount: number; + + inputImage: CIImage; + + size: CGPoint; +} +declare var CIStretchCrop: { + + prototype: CIStretchCrop; + + customAttributes?(): NSDictionary; +}; + interface CIStripesGenerator extends CIFilterProtocol { center: CGPoint; @@ -3631,6 +4121,25 @@ declare var CIToneCurve: { customAttributes?(): NSDictionary; }; +interface CITorusLensDistortion extends CIFilterProtocol { + + center: CGPoint; + + inputImage: CIImage; + + radius: number; + + refraction: number; + + width: number; +} +declare var CITorusLensDistortion: { + + prototype: CITorusLensDistortion; + + customAttributes?(): NSDictionary; +}; + interface CITransitionFilter extends CIFilterProtocol { inputImage: CIImage; @@ -3699,6 +4208,23 @@ declare var CITwelvefoldReflectedTile: { customAttributes?(): NSDictionary; }; +interface CITwirlDistortion extends CIFilterProtocol { + + angle: number; + + center: CGPoint; + + inputImage: CIImage; + + radius: number; +} +declare var CITwirlDistortion: { + + prototype: CITwirlDistortion; + + customAttributes?(): NSDictionary; +}; + interface CIUnsharpMask extends CIFilterProtocol { inputImage: CIImage; @@ -3852,6 +4378,23 @@ declare var CIVignetteEffect: { customAttributes?(): NSDictionary; }; +interface CIVortexDistortion extends CIFilterProtocol { + + angle: number; + + center: CGPoint; + + inputImage: CIImage; + + radius: number; +} +declare var CIVortexDistortion: { + + prototype: CIVortexDistortion; + + customAttributes?(): NSDictionary; +}; + declare class CIWarpKernel extends CIKernel { static alloc(): CIWarpKernel; // inherited from NSObject @@ -4022,6 +4565,8 @@ declare var kCIContextCacheIntermediates: string; declare var kCIContextHighQualityDownsample: string; +declare var kCIContextName: string; + declare var kCIContextOutputColorSpace: string; declare var kCIContextOutputPremultiplied: string; @@ -4106,10 +4651,14 @@ declare var kCIImageAuxiliaryDisparity: string; declare var kCIImageAuxiliaryPortraitEffectsMatte: string; +declare var kCIImageAuxiliarySemanticSegmentationGlassesMatte: string; + declare var kCIImageAuxiliarySemanticSegmentationHairMatte: string; declare var kCIImageAuxiliarySemanticSegmentationSkinMatte: string; +declare var kCIImageAuxiliarySemanticSegmentationSkyMatte: string; + declare var kCIImageAuxiliarySemanticSegmentationTeethMatte: string; declare var kCIImageColorSpace: string; @@ -4134,12 +4683,18 @@ declare var kCIImageRepresentationDisparityImage: string; declare var kCIImageRepresentationPortraitEffectsMatteImage: string; +declare var kCIImageRepresentationSemanticSegmentationGlassesMatteImage: string; + declare var kCIImageRepresentationSemanticSegmentationHairMatteImage: string; declare var kCIImageRepresentationSemanticSegmentationSkinMatteImage: string; +declare var kCIImageRepresentationSemanticSegmentationSkyMatteImage: string; + declare var kCIImageRepresentationSemanticSegmentationTeethMatteImage: string; +declare var kCIImageToneMapHDRtoSDR: string; + declare var kCIInputAllowDraftModeKey: string; declare var kCIInputAmountKey: string; @@ -4200,6 +4755,8 @@ declare var kCIInputIntensityKey: string; declare var kCIInputLinearSpaceFilter: string; +declare var kCIInputLocalToneMapAmountKey: string; + declare var kCIInputLuminanceNoiseReductionAmountKey: string; declare var kCIInputMaskImageKey: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreLocation.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreLocation.d.ts index e5193b816..f4bbdd0cb 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreLocation.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreLocation.d.ts @@ -1,4 +1,11 @@ +declare const enum CLAccuracyAuthorization { + + FullAccuracy = 0, + + ReducedAccuracy = 1 +} + declare const enum CLActivityType { Other = 1, @@ -208,7 +215,9 @@ declare const enum CLError { kCLErrorRangingUnavailable = 16, - kCLErrorRangingFailure = 17 + kCLErrorRangingFailure = 17, + + kCLErrorPromptDeclined = 18 } declare class CLFloor extends NSObject implements NSCopying, NSSecureCoding { @@ -300,12 +309,16 @@ declare class CLLocation extends NSObject implements CKRecordValue, NSCopying, N readonly course: number; + readonly courseAccuracy: number; + readonly floor: CLFloor; readonly horizontalAccuracy: number; readonly speed: number; + readonly speedAccuracy: number; + readonly timestamp: Date; readonly verticalAccuracy: number; @@ -326,6 +339,8 @@ declare class CLLocation extends NSObject implements CKRecordValue, NSCopying, N constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { coordinate: CLLocationCoordinate2D; altitude: number; horizontalAccuracy: number; verticalAccuracy: number; course: number; courseAccuracy: number; speed: number; speedAccuracy: number; timestamp: Date; }); + constructor(o: { coordinate: CLLocationCoordinate2D; altitude: number; horizontalAccuracy: number; verticalAccuracy: number; course: number; speed: number; timestamp: Date; }); constructor(o: { coordinate: CLLocationCoordinate2D; altitude: number; horizontalAccuracy: number; verticalAccuracy: number; timestamp: Date; }); @@ -346,6 +361,8 @@ declare class CLLocation extends NSObject implements CKRecordValue, NSCopying, N initWithCoder(coder: NSCoder): this; + initWithCoordinateAltitudeHorizontalAccuracyVerticalAccuracyCourseCourseAccuracySpeedSpeedAccuracyTimestamp(coordinate: CLLocationCoordinate2D, altitude: number, hAccuracy: number, vAccuracy: number, course: number, courseAccuracy: number, speed: number, speedAccuracy: number, timestamp: Date): this; + initWithCoordinateAltitudeHorizontalAccuracyVerticalAccuracyCourseSpeedTimestamp(coordinate: CLLocationCoordinate2D, altitude: number, hAccuracy: number, vAccuracy: number, course: number, speed: number, timestamp: Date): this; initWithCoordinateAltitudeHorizontalAccuracyVerticalAccuracyTimestamp(coordinate: CLLocationCoordinate2D, altitude: number, hAccuracy: number, vAccuracy: number, timestamp: Date): this; @@ -407,10 +424,16 @@ declare class CLLocationManager extends NSObject { static significantLocationChangeMonitoringAvailable(): boolean; + readonly accuracyAuthorization: CLAccuracyAuthorization; + activityType: CLActivityType; allowsBackgroundLocationUpdates: boolean; + readonly authorizationStatus: CLAuthorizationStatus; + + readonly authorizedForWidgetUpdates: boolean; + delegate: CLLocationManagerDelegate; desiredAccuracy: number; @@ -455,6 +478,10 @@ declare class CLLocationManager extends NSObject { requestStateForRegion(region: CLRegion): void; + requestTemporaryFullAccuracyAuthorizationWithPurposeKey(purposeKey: string): void; + + requestTemporaryFullAccuracyAuthorizationWithPurposeKeyCompletion(purposeKey: string, completion: (p1: NSError) => void): void; + requestWhenInUseAuthorization(): void; startMonitoringForRegion(region: CLRegion): void; @@ -490,6 +517,8 @@ declare class CLLocationManager extends NSObject { interface CLLocationManagerDelegate extends NSObjectProtocol { + locationManagerDidChangeAuthorization?(manager: CLLocationManager): void; + locationManagerDidChangeAuthorizationStatus?(manager: CLLocationManager, status: CLAuthorizationStatus): void; locationManagerDidDetermineStateForRegion?(manager: CLLocationManager, state: CLRegionState, region: CLRegion): void; @@ -690,6 +719,8 @@ declare var kCLLocationAccuracyKilometer: number; declare var kCLLocationAccuracyNearestTenMeters: number; +declare var kCLLocationAccuracyReduced: number; + declare var kCLLocationAccuracyThreeKilometers: number; declare var kCLLocationCoordinate2DInvalid: CLLocationCoordinate2D; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMIDI.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMIDI.d.ts index 83b5fed81..eec53f65a 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMIDI.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMIDI.d.ts @@ -8,6 +8,71 @@ interface MIDICIDeviceIdentification { } declare var MIDICIDeviceIdentification: interop.StructType; +declare class MIDICIDeviceInfo extends NSObject implements NSSecureCoding { + + static alloc(): MIDICIDeviceInfo; // inherited from NSObject + + static new(): MIDICIDeviceInfo; // inherited from NSObject + + readonly family: NSData; + + readonly manufacturerID: NSData; + + readonly midiDestination: number; + + readonly modelNumber: NSData; + + readonly revisionLevel: NSData; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { destination: number; manufacturer: NSData; family: NSData; model: NSData; revision: NSData; }); + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithDestinationManufacturerFamilyModelRevision(midiDestination: number, manufacturer: NSData, family: NSData, modelNumber: NSData, revisionLevel: NSData): this; +} + +declare class MIDICIDiscoveredNode extends NSObject implements NSSecureCoding { + + static alloc(): MIDICIDiscoveredNode; // inherited from NSObject + + static new(): MIDICIDiscoveredNode; // inherited from NSObject + + readonly destination: number; + + readonly deviceInfo: MIDICIDeviceInfo; + + readonly maximumSysExSize: number; + + readonly supportsProfiles: boolean; + + readonly supportsProperties: boolean; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class MIDICIDiscoveryManager extends NSObject { + + static alloc(): MIDICIDiscoveryManager; // inherited from NSObject + + static new(): MIDICIDiscoveryManager; // inherited from NSObject + + static sharedInstance(): MIDICIDiscoveryManager; + + discoverWithHandler(completedHandler: (p1: NSArray) => void): void; +} + declare class MIDICIProfile extends NSObject implements NSSecureCoding { static alloc(): MIDICIProfile; // inherited from NSObject @@ -22,15 +87,34 @@ declare class MIDICIProfile extends NSObject implements NSSecureCoding { constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { data: NSData; }); + constructor(o: { data: NSData; name: string; }); encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; + initWithData(data: NSData): this; + initWithDataName(data: NSData, inName: string): this; } +interface MIDICIProfileResponderDelegate extends NSObjectProtocol { + + connectInitiatorWithDeviceInfo(initiatorMUID: number, deviceInfo: MIDICIDeviceInfo): boolean; + + handleDataForProfileOnChannelData?(aProfile: MIDICIProfile, channel: number, inData: NSData): void; + + initiatorDisconnected(initiatorMUID: number): void; + + willSetProfileOnChannelEnabled?(aProfile: MIDICIProfile, channel: number, shouldEnable: boolean): boolean; +} +declare var MIDICIProfileResponderDelegate: { + + prototype: MIDICIProfileResponderDelegate; +}; + declare class MIDICIProfileState extends NSObject implements NSSecureCoding { static alloc(): MIDICIProfileState; // inherited from NSObject @@ -41,52 +125,116 @@ declare class MIDICIProfileState extends NSObject implements NSSecureCoding { readonly enabledProfiles: NSArray; + readonly midiChannel: number; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + constructor(o: { channel: number; enabledProfiles: NSArray | MIDICIProfile[]; disabledProfiles: NSArray | MIDICIProfile[]; }); + constructor(o: { coder: NSCoder; }); // inherited from NSCoding constructor(o: { enabledProfiles: NSArray | MIDICIProfile[]; disabledProfiles: NSArray | MIDICIProfile[]; }); encodeWithCoder(coder: NSCoder): void; + initWithChannelEnabledProfilesDisabledProfiles(midiChannelNum: number, enabled: NSArray | MIDICIProfile[], disabled: NSArray | MIDICIProfile[]): this; + initWithCoder(coder: NSCoder): this; initWithEnabledProfilesDisabledProfiles(enabled: NSArray | MIDICIProfile[], disabled: NSArray | MIDICIProfile[]): this; } +declare class MIDICIResponder extends NSObject { + + static alloc(): MIDICIResponder; // inherited from NSObject + + static new(): MIDICIResponder; // inherited from NSObject + + readonly deviceInfo: MIDICIDeviceInfo; + + readonly initiators: NSArray; + + readonly profileDelegate: MIDICIProfileResponderDelegate; + + constructor(o: { deviceInfo: MIDICIDeviceInfo; profileDelegate: MIDICIProfileResponderDelegate; profileStates: NSArray | MIDICIProfileState[]; supportProperties: boolean; }); + + initWithDeviceInfoProfileDelegateProfileStatesSupportProperties(deviceInfo: MIDICIDeviceInfo, delegate: MIDICIProfileResponderDelegate, profileList: NSArray | MIDICIProfileState[], propertiesSupported: boolean): this; + + notifyProfileOnChannelIsEnabled(aProfile: MIDICIProfile, channel: number, enabledState: boolean): boolean; + + sendProfileOnChannelProfileData(aProfile: MIDICIProfile, channel: number, profileSpecificData: NSData): boolean; + + start(): boolean; + + stop(): void; +} + declare class MIDICISession extends NSObject { static alloc(): MIDICISession; // inherited from NSObject static new(): MIDICISession; // inherited from NSObject - readonly deviceIdentification: MIDICIDeviceIdentification; + readonly deviceInfo: MIDICIDeviceInfo; - readonly entity: number; + readonly maxPropertyRequests: number; + + readonly maxSysExSize: number; + + readonly midiDestination: number; profileChangedCallback: (p1: MIDICISession, p2: number, p3: MIDICIProfile, p4: boolean) => void; - propertyChangedCallback: (p1: MIDICISession, p2: number, p3: NSData) => void; + profileSpecificDataHandler: (p1: MIDICISession, p2: number, p3: MIDICIProfile, p4: NSData) => void; readonly supportsProfileCapability: boolean; readonly supportsPropertyCapability: boolean; - constructor(o: { MIDIEntity: number; dataReadyHandler: () => void; }); + constructor(o: { discoveredNode: MIDICIDiscoveredNode; dataReadyHandler: () => void; disconnectHandler: (p1: MIDICISession, p2: NSError) => void; }); disableProfileOnChannelError(profile: MIDICIProfile, channel: number): boolean; enableProfileOnChannelError(profile: MIDICIProfile, channel: number): boolean; - getPropertyOnChannelResponseHandler(inquiry: NSData, channel: number, handler: (p1: MIDICISession, p2: number, p3: NSData, p4: NSError) => void): void; - - hasPropertyOnChannelResponseHandler(inquiry: NSData, channel: number, handler: (p1: MIDICISession, p2: number, p3: NSData, p4: NSError) => void): void; - - initWithMIDIEntityDataReadyHandler(entity: number, handler: () => void): this; + initWithDiscoveredNodeDataReadyHandlerDisconnectHandler(discoveredNode: MIDICIDiscoveredNode, handler: () => void, disconnectHandler: (p1: MIDICISession, p2: NSError) => void): this; profileStateForChannel(channel: number): MIDICIProfileState; - setPropertyOnChannelResponseHandler(inquiry: NSData, channel: number, handler: (p1: MIDICISession, p2: number, p3: NSData, p4: NSError) => void): void; + sendProfileOnChannelProfileData(profile: MIDICIProfile, channel: number, profileSpecificData: NSData): boolean; +} + +declare const enum MIDICVStatus { + + kMIDICVStatusNoteOff = 8, + + kMIDICVStatusNoteOn = 9, + + kMIDICVStatusPolyPressure = 10, + + kMIDICVStatusControlChange = 11, + + kMIDICVStatusProgramChange = 12, + + kMIDICVStatusChannelPressure = 13, + + kMIDICVStatusPitchBend = 14, + + kMIDICVStatusRegisteredPNC = 0, + + kMIDICVStatusAssignablePNC = 1, + + kMIDICVStatusRegisteredControl = 2, + + kMIDICVStatusAssignableControl = 3, + + kMIDICVStatusRelRegisteredControl = 4, + + kMIDICVStatusRelAssignableControl = 5, + + kMIDICVStatusPerNotePitchBend = 6, + + kMIDICVStatusPerNoteMgmt = 15 } declare var MIDIChannelsWholePort: number; @@ -110,6 +258,8 @@ declare function MIDIDestinationCreate(client: number, name: string, readProc: i declare function MIDIDestinationCreateWithBlock(client: number, name: string, outDest: interop.Pointer | interop.Reference, readBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => void): number; +declare function MIDIDestinationCreateWithProtocol(client: number, name: string, protocol: MIDIProtocolID, outDest: interop.Pointer | interop.Reference, readBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => void): number; + declare function MIDIDeviceAddEntity(device: number, name: string, embedded: boolean, numSourceEndpoints: number, numDestinationEndpoints: number, newEntity: interop.Pointer | interop.Reference): number; declare function MIDIDeviceCreate(owner: interop.Pointer | interop.Reference>, name: string, manufacturer: string, model: string, outDevice: interop.Pointer | interop.Reference): number; @@ -128,6 +278,8 @@ declare function MIDIDeviceListGetDevice(devList: number, index0: number): numbe declare function MIDIDeviceListGetNumberOfDevices(devList: number): number; +declare function MIDIDeviceNewEntity(device: number, name: string, protocol: MIDIProtocolID, embedded: boolean, numSourceEndpoints: number, numDestinationEndpoints: number, newEntity: interop.Pointer | interop.Reference): number; + declare function MIDIDeviceRemoveEntity(device: number, entity: number): number; interface MIDIDriverInterface { @@ -143,6 +295,8 @@ interface MIDIDriverInterface { EnableSource: interop.FunctionReference<(p1: interop.Pointer | interop.Reference>, p2: number, p3: boolean) => number>; Flush: interop.FunctionReference<(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference) => number>; Monitor: interop.FunctionReference<(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference) => number>; + SendPackets: interop.FunctionReference<(p1: interop.Pointer | interop.Reference>, p2: interop.Pointer | interop.Reference, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference) => number>; + MonitorEvents: interop.FunctionReference<(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference) => number>; } declare var MIDIDriverInterface: interop.StructType; @@ -166,6 +320,24 @@ declare function MIDIEntityGetNumberOfSources(entity: number): number; declare function MIDIEntityGetSource(entity: number, sourceIndex0: number): number; +interface MIDIEventList { + protocol: MIDIProtocolID; + numPackets: number; + packet: interop.Reference; +} +declare var MIDIEventList: interop.StructType; + +declare function MIDIEventListAdd(evtlist: interop.Pointer | interop.Reference, listSize: number, curPacket: interop.Pointer | interop.Reference, time: number, wordCount: number, words: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +declare function MIDIEventListInit(evtlist: interop.Pointer | interop.Reference, protocol: MIDIProtocolID): interop.Pointer | interop.Reference; + +interface MIDIEventPacket { + timeStamp: number; + wordCount: number; + words: interop.Reference; +} +declare var MIDIEventPacket: interop.StructType; + declare function MIDIExternalDeviceCreate(name: string, manufacturer: string, model: string, outDevice: interop.Pointer | interop.Reference): number; declare function MIDIFlushOutput(dest: number): number; @@ -202,6 +374,44 @@ declare function MIDIInputPortCreate(client: number, portName: string, readProc: declare function MIDIInputPortCreateWithBlock(client: number, portName: string, outPort: interop.Pointer | interop.Reference, readBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => void): number; +declare function MIDIInputPortCreateWithProtocol(client: number, portName: string, protocol: MIDIProtocolID, outPort: interop.Pointer | interop.Reference, receiveBlock: (p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => void): number; + +declare const enum MIDIMessageType { + + kMIDIMessageTypeUtility = 0, + + kMIDIMessageTypeSystem = 1, + + kMIDIMessageTypeChannelVoice1 = 2, + + kMIDIMessageTypeSysEx = 3, + + kMIDIMessageTypeChannelVoice2 = 4, + + kMIDIMessageTypeData128 = 5 +} + +interface MIDIMessage_128 { + word0: number; + word1: number; + word2: number; + word3: number; +} +declare var MIDIMessage_128: interop.StructType; + +interface MIDIMessage_64 { + word0: number; + word1: number; +} +declare var MIDIMessage_64: interop.StructType; + +interface MIDIMessage_96 { + word0: number; + word1: number; + word2: number; +} +declare var MIDIMessage_96: interop.StructType; + declare var MIDINetworkBonjourServiceType: string; declare class MIDINetworkConnection extends NSObject { @@ -398,12 +608,23 @@ declare function MIDIPortDisconnectSource(port: number, source: number): number; declare function MIDIPortDispose(port: number): number; +declare const enum MIDIProtocolID { + + kMIDIProtocol_1_0 = 1, + + kMIDIProtocol_2_0 = 2 +} + declare function MIDIReceived(src: number, pktlist: interop.Pointer | interop.Reference): number; +declare function MIDIReceivedEventList(src: number, evtlist: interop.Pointer | interop.Reference): number; + declare function MIDIRestart(): number; declare function MIDISend(port: number, dest: number, pktlist: interop.Pointer | interop.Reference): number; +declare function MIDISendEventList(port: number, dest: number, evtlist: interop.Pointer | interop.Reference): number; + declare function MIDISendSysex(request: interop.Pointer | interop.Reference): number; declare function MIDISetupAddDevice(device: number): number; @@ -416,6 +637,19 @@ declare function MIDISetupRemoveExternalDevice(device: number): number; declare function MIDISourceCreate(client: number, name: string, outSrc: interop.Pointer | interop.Reference): number; +declare function MIDISourceCreateWithProtocol(client: number, name: string, protocol: MIDIProtocolID, outSrc: interop.Pointer | interop.Reference): number; + +declare const enum MIDISysExStatus { + + kMIDISysExStatusComplete = 0, + + kMIDISysExStatusStart = 1, + + kMIDISysExStatusContinue = 2, + + kMIDISysExStatusEnd = 3 +} + interface MIDISysexSendRequest { destination: number; data: string; @@ -427,6 +661,33 @@ interface MIDISysexSendRequest { } declare var MIDISysexSendRequest: interop.StructType; +declare const enum MIDISystemStatus { + + kMIDIStatusStartOfExclusive = 240, + + kMIDIStatusEndOfExclusive = 247, + + kMIDIStatusMTC = 241, + + kMIDIStatusSongPosPointer = 242, + + kMIDIStatusSongSelect = 243, + + kMIDIStatusTuneRequest = 246, + + kMIDIStatusTimingClock = 248, + + kMIDIStatusStart = 250, + + kMIDIStatusContinue = 251, + + kMIDIStatusStop = 252, + + kMIDIStatusActiveSending = 254, + + kMIDIStatusSystemReset = 255 +} + declare function MIDIThruConnectionCreate(inPersistentOwnerID: string, inConnectionParams: NSData, outConnection: interop.Pointer | interop.Reference): number; declare function MIDIThruConnectionDispose(connection: number): number; @@ -535,6 +796,14 @@ declare const kMIDINoCurrentSetup: number; declare const kMIDINotPermitted: number; +declare const kMIDINoteAttributeManufacturerSpecific: number; + +declare const kMIDINoteAttributeNone: number; + +declare const kMIDINoteAttributePitch: number; + +declare const kMIDINoteAttributeProfileSpecific: number; + declare const kMIDIObjectNotFound: number; declare var kMIDIObjectType_ExternalMask: MIDIObjectType; @@ -591,6 +860,8 @@ declare var kMIDIPropertyPanDisruptsStereo: string; declare var kMIDIPropertyPrivate: string; +declare var kMIDIPropertyProtocolID: string; + declare var kMIDIPropertyReceiveChannels: string; declare var kMIDIPropertyReceivesBankSelectLSB: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreML.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreML.d.ts index b12692e2d..769c08e3c 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreML.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreML.d.ts @@ -87,7 +87,7 @@ declare class MLDictionaryConstraint extends NSObject implements NSSecureCoding initWithCoder(coder: NSCoder): this; } -declare class MLDictionaryFeatureProvider extends NSObject implements MLFeatureProvider, NSFastEnumeration { +declare class MLDictionaryFeatureProvider extends NSObject implements MLFeatureProvider, NSFastEnumeration, NSSecureCoding { static alloc(): MLDictionaryFeatureProvider; // inherited from NSObject @@ -96,12 +96,20 @@ declare class MLDictionaryFeatureProvider extends NSObject implements MLFeatureP readonly dictionary: NSDictionary; readonly featureNames: NSSet; // inherited from MLFeatureProvider + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding [Symbol.iterator](): Iterator; + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { dictionary: NSDictionary; }); + encodeWithCoder(coder: NSCoder): void; + featureValueForName(featureName: string): MLFeatureValue; + initWithCoder(coder: NSCoder): this; + initWithDictionaryError(dictionary: NSDictionary): this; objectForKeyedSubscript(featureName: string): MLFeatureValue; @@ -170,7 +178,7 @@ declare const enum MLFeatureType { Sequence = 7 } -declare class MLFeatureValue extends NSObject implements NSCopying { +declare class MLFeatureValue extends NSObject implements NSCopying, NSSecureCoding { static alloc(): MLFeatureValue; // inherited from NSObject @@ -226,8 +234,16 @@ declare class MLFeatureValue extends NSObject implements NSCopying { readonly undefined: boolean; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + copyWithZone(zone: interop.Pointer | interop.Reference): any; + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + isEqualToFeatureValue(value: MLFeatureValue): boolean; } @@ -349,6 +365,8 @@ declare class MLModel extends NSObject { static compileModelAtURLError(modelURL: NSURL): NSURL; + static loadContentsOfURLConfigurationCompletionHandler(url: NSURL, configuration: MLModelConfiguration, handler: (p1: MLModel, p2: NSError) => void): void; + static modelWithContentsOfURLConfigurationError(url: NSURL, configuration: MLModelConfiguration): MLModel; static modelWithContentsOfURLError(url: NSURL): MLModel; @@ -372,6 +390,38 @@ declare class MLModel extends NSObject { declare var MLModelAuthorKey: string; +declare class MLModelCollection extends NSObject { + + static alloc(): MLModelCollection; // inherited from NSObject + + static beginAccessingModelCollectionWithIdentifierCompletionHandler(identifier: string, completionHandler: (p1: MLModelCollection, p2: NSError) => void): NSProgress; + + static endAccessingModelCollectionWithIdentifierCompletionHandler(identifier: string, completionHandler: (p1: boolean, p2: NSError) => void): void; + + static new(): MLModelCollection; // inherited from NSObject + + readonly deploymentID: string; + + readonly entries: NSDictionary; + + readonly identifier: string; +} + +declare var MLModelCollectionDidChangeNotification: string; + +declare class MLModelCollectionEntry extends NSObject { + + static alloc(): MLModelCollectionEntry; // inherited from NSObject + + static new(): MLModelCollectionEntry; // inherited from NSObject + + readonly modelIdentifier: string; + + readonly modelURL: NSURL; + + isEqualToModelCollectionEntry(entry: MLModelCollectionEntry): boolean; +} + declare class MLModelConfiguration extends NSObject implements NSCopying, NSSecureCoding { static alloc(): MLModelConfiguration; // inherited from NSObject @@ -405,6 +455,8 @@ declare class MLModelDescription extends NSObject implements NSSecureCoding { static new(): MLModelDescription; // inherited from NSObject + readonly classLabels: NSArray; + readonly inputDescriptionsByName: NSDictionary; readonly isUpdatable: boolean; @@ -446,7 +498,13 @@ declare const enum MLModelError { Update = 6, - Parameters = 7 + Parameters = 7, + + ModelDecryptionKeyFetch = 8, + + ModelDecryption = 9, + + ModelCollection = 10 } declare var MLModelErrorDomain: string; @@ -455,10 +513,12 @@ declare var MLModelLicenseKey: string; declare var MLModelVersionStringKey: string; -declare class MLMultiArray extends NSObject { +declare class MLMultiArray extends NSObject implements NSSecureCoding { static alloc(): MLMultiArray; // inherited from NSObject + static multiArrayByConcatenatingMultiArraysAlongAxisDataType(multiArrays: NSArray | MLMultiArray[], axis: number, dataType: MLMultiArrayDataType): MLMultiArray; + static new(): MLMultiArray; // inherited from NSObject readonly count: number; @@ -470,12 +530,20 @@ declare class MLMultiArray extends NSObject { readonly shape: NSArray; readonly strides: NSArray; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding [index: number]: number; + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { dataPointer: interop.Pointer | interop.Reference; shape: NSArray | number[]; dataType: MLMultiArrayDataType; strides: NSArray | number[]; deallocator: (p1: interop.Pointer | interop.Reference) => void; }); constructor(o: { shape: NSArray | number[]; dataType: MLMultiArrayDataType; }); + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + initWithDataPointerShapeDataTypeStridesDeallocatorError(dataPointer: interop.Pointer | interop.Reference, shape: NSArray | number[], dataType: MLMultiArrayDataType, strides: NSArray | number[], deallocator: (p1: interop.Pointer | interop.Reference) => void): this; initWithShapeDataTypeError(shape: NSArray | number[], dataType: MLMultiArrayDataType): this; @@ -514,8 +582,12 @@ declare const enum MLMultiArrayDataType { Double = 65600, + Float64 = 65600, + Float32 = 65568, + Float = 65568, + Int32 = 131104 } @@ -637,7 +709,7 @@ declare class MLPredictionOptions extends NSObject { usesCPUOnly: boolean; } -declare class MLSequence extends NSObject { +declare class MLSequence extends NSObject implements NSSecureCoding { static alloc(): MLSequence; // inherited from NSObject @@ -654,6 +726,14 @@ declare class MLSequence extends NSObject { readonly stringValues: NSArray; readonly type: MLFeatureType; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; } declare class MLSequenceConstraint extends NSObject implements NSSecureCoding { @@ -748,10 +828,14 @@ declare class MLUpdateTask extends MLTask { static new(): MLUpdateTask; // inherited from NSObject + static updateTaskForModelAtURLTrainingDataCompletionHandlerError(modelURL: NSURL, trainingData: MLBatchProvider, completionHandler: (p1: MLUpdateContext) => void): MLUpdateTask; + static updateTaskForModelAtURLTrainingDataConfigurationCompletionHandlerError(modelURL: NSURL, trainingData: MLBatchProvider, configuration: MLModelConfiguration, completionHandler: (p1: MLUpdateContext) => void): MLUpdateTask; static updateTaskForModelAtURLTrainingDataConfigurationProgressHandlersError(modelURL: NSURL, trainingData: MLBatchProvider, configuration: MLModelConfiguration, progressHandlers: MLUpdateProgressHandlers): MLUpdateTask; + static updateTaskForModelAtURLTrainingDataProgressHandlersError(modelURL: NSURL, trainingData: MLBatchProvider, progressHandlers: MLUpdateProgressHandlers): MLUpdateTask; + resumeWithParameters(updateParameters: NSDictionary): void; } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMedia.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMedia.d.ts index 6f30de87d..a0beb27b0 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMedia.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMedia.d.ts @@ -879,6 +879,8 @@ declare var kCMFormatDescriptionExtension_OriginalCompressionSettings: string; declare var kCMFormatDescriptionExtension_PixelAspectRatio: string; +declare var kCMFormatDescriptionExtension_ProtectedContentOriginalFormat: string; + declare var kCMFormatDescriptionExtension_RevisionLevel: string; declare var kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms: string; @@ -1069,6 +1071,10 @@ declare const kCMMediaType_TimeCode: number; declare const kCMMediaType_Video: number; +declare const kCMMemoryPoolError_AllocationFailed: number; + +declare const kCMMemoryPoolError_InvalidParameter: number; + declare var kCMMemoryPoolOption_AgeOutPeriod: string; declare var kCMMetadataBaseDataType_AffineTransformF64: string; @@ -1734,3 +1740,5 @@ declare const kCMVideoCodecType_MPEG4Video: number; declare const kCMVideoCodecType_SorensonVideo: number; declare const kCMVideoCodecType_SorensonVideo3: number; + +declare const kCMVideoCodecType_VP9: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMotion.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMotion.d.ts index 2dce2bdbb..e9ef6cc85 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMotion.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreMotion.d.ts @@ -114,9 +114,20 @@ declare class CMDeviceMotion extends CMLogItem { readonly rotationRate: CMRotationRate; + readonly sensorLocation: CMDeviceMotionSensorLocation; + readonly userAcceleration: CMAcceleration; } +declare const enum CMDeviceMotionSensorLocation { + + Default = 0, + + HeadphoneLeft = 1, + + HeadphoneRight = 2 +} + declare class CMDyskineticSymptomResult extends NSObject implements NSCopying, NSSecureCoding { static alloc(): CMDyskineticSymptomResult; // inherited from NSObject @@ -166,11 +177,26 @@ declare const enum CMError { NotEntitled = 110, - NotAuthorized = 111 + NotAuthorized = 111, + + NilData = 112, + + Size = 113 } declare var CMErrorDomain: string; +declare const enum CMFallDetectionEventUserResolution { + + Confirmed = 0, + + Dismissed = 1, + + Rejected = 2, + + Unresponsive = 3 +} + declare class CMGyroData extends CMLogItem { static alloc(): CMGyroData; // inherited from NSObject @@ -180,6 +206,40 @@ declare class CMGyroData extends CMLogItem { readonly rotationRate: CMRotationRate; } +declare class CMHeadphoneMotionManager extends NSObject { + + static alloc(): CMHeadphoneMotionManager; // inherited from NSObject + + static authorizationStatus(): CMAuthorizationStatus; + + static new(): CMHeadphoneMotionManager; // inherited from NSObject + + delegate: CMHeadphoneMotionManagerDelegate; + + readonly deviceMotion: CMDeviceMotion; + + readonly deviceMotionActive: boolean; + + readonly deviceMotionAvailable: boolean; + + startDeviceMotionUpdates(): void; + + startDeviceMotionUpdatesToQueueWithHandler(queue: NSOperationQueue, handler: (p1: CMDeviceMotion, p2: NSError) => void): void; + + stopDeviceMotionUpdates(): void; +} + +interface CMHeadphoneMotionManagerDelegate extends NSObjectProtocol { + + headphoneMotionManagerDidConnect?(manager: CMHeadphoneMotionManager): void; + + headphoneMotionManagerDidDisconnect?(manager: CMHeadphoneMotionManager): void; +} +declare var CMHeadphoneMotionManagerDelegate: { + + prototype: CMHeadphoneMotionManagerDelegate; +}; + declare class CMLogItem extends NSObject implements NSCopying, NSSecureCoding { static alloc(): CMLogItem; // inherited from NSObject @@ -461,6 +521,15 @@ declare class CMRecordedAccelerometerData extends CMAccelerometerData { readonly startDate: Date; } +declare class CMRecordedRotationRateData extends CMRotationRateData { + + static alloc(): CMRecordedRotationRateData; // inherited from NSObject + + static new(): CMRecordedRotationRateData; // inherited from NSObject + + readonly startDate: Date; +} + interface CMRotationMatrix { m11: number; m12: number; @@ -481,6 +550,15 @@ interface CMRotationRate { } declare var CMRotationRate: interop.StructType; +declare class CMRotationRateData extends CMLogItem { + + static alloc(): CMRotationRateData; // inherited from NSObject + + static new(): CMRotationRateData; // inherited from NSObject + + readonly rotationRate: CMRotationRate; +} + declare class CMSensorDataList extends NSObject implements NSFastEnumeration { static alloc(): CMSensorDataList; // inherited from NSObject diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreNFC.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreNFC.d.ts index a2d223d21..789949cd0 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreNFC.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreNFC.d.ts @@ -1,26 +1,68 @@ -declare const enum EncryptionId { - - AES = 79, - - AES_DES = 65 -} - declare var NFCErrorDomain: string; +declare const enum NFCFeliCaEncryptionId { + + NFCFeliCaEncryptionIdAES = 79, + + NFCFeliCaEncryptionIdAES_DES = 65, + + EncryptionIdAES = 79, + + EncryptionIdAES_DES = 65 +} + +declare const enum NFCFeliCaPollingRequestCode { + + NFCFeliCaPollingRequestCodeNoRequest = 0, + + NFCFeliCaPollingRequestCodeSystemCode = 1, + + NFCFeliCaPollingRequestCodeCommunicationPerformance = 2, + + PollingRequestCodeNoRequest = 0, + + PollingRequestCodeSystemCode = 1, + + PollingRequestCodeCommunicationPerformance = 2 +} + +declare const enum NFCFeliCaPollingTimeSlot { + + NFCFeliCaPollingTimeSlotMax1 = 0, + + NFCFeliCaPollingTimeSlotMax2 = 1, + + NFCFeliCaPollingTimeSlotMax4 = 3, + + NFCFeliCaPollingTimeSlotMax8 = 7, + + NFCFeliCaPollingTimeSlotMax16 = 15, + + PollingTimeSlotMax1 = 0, + + PollingTimeSlotMax2 = 1, + + PollingTimeSlotMax4 = 3, + + PollingTimeSlotMax8 = 7, + + PollingTimeSlotMax16 = 15 +} + interface NFCFeliCaTag extends NFCNDEFTag, NFCTag { currentIDm: NSData; currentSystemCode: NSData; - pollingWithSystemCodeRequestCodeTimeSlotCompletionHandler(systemCode: NSData, requestCode: PollingRequestCode, timeSlot: PollingTimeSlot, completionHandler: (p1: NSData, p2: NSData, p3: NSError) => void): void; + pollingWithSystemCodeRequestCodeTimeSlotCompletionHandler(systemCode: NSData, requestCode: NFCFeliCaPollingRequestCode, timeSlot: NFCFeliCaPollingTimeSlot, completionHandler: (p1: NSData, p2: NSData, p3: NSError) => void): void; readWithoutEncryptionWithServiceCodeListBlockListCompletionHandler(serviceCodeList: NSArray | NSData[], blockList: NSArray | NSData[], completionHandler: (p1: number, p2: number, p3: NSArray, p4: NSError) => void): void; requestResponseWithCompletionHandler(completionHandler: (p1: number, p2: NSError) => void): void; - requestServiceV2WithNodeCodeListCompletionHandler(nodeCodeList: NSArray | NSData[], completionHandler: (p1: number, p2: number, p3: EncryptionId, p4: NSArray, p5: NSArray, p6: NSError) => void): void; + requestServiceV2WithNodeCodeListCompletionHandler(nodeCodeList: NSArray | NSData[], completionHandler: (p1: number, p2: number, p3: NFCFeliCaEncryptionId, p4: NSArray, p5: NSArray, p6: NSError) => void): void; requestServiceWithNodeCodeListCompletionHandler(nodeCodeList: NSArray | NSData[], completionHandler: (p1: NSArray, p2: NSError) => void): void; @@ -92,6 +134,52 @@ declare class NFCISO15693ReaderSession extends NFCReaderSession { restartPolling(): void; } +declare const enum NFCISO15693RequestFlag { + + NFCISO15693RequestFlagDualSubCarriers = 1, + + NFCISO15693RequestFlagHighDataRate = 2, + + NFCISO15693RequestFlagProtocolExtension = 8, + + NFCISO15693RequestFlagSelect = 16, + + NFCISO15693RequestFlagAddress = 32, + + NFCISO15693RequestFlagOption = 64, + + NFCISO15693RequestFlagCommandSpecificBit8 = 128, + + RequestFlagDualSubCarriers = 1, + + RequestFlagHighDataRate = 2, + + RequestFlagProtocolExtension = 8, + + RequestFlagSelect = 16, + + RequestFlagAddress = 32, + + RequestFlagOption = 64 +} + +declare const enum NFCISO15693ResponseFlag { + + Error = 1, + + ResponseBufferValid = 2, + + FinalResponse = 4, + + ProtocolExtension = 8, + + BlockSecurityStatusBit5 = 16, + + BlockSecurityStatusBit6 = 32, + + WaitTimeExtension = 64 +} + interface NFCISO15693Tag extends NFCNDEFTag, NFCTag { icManufacturerCode: number; @@ -100,47 +188,69 @@ interface NFCISO15693Tag extends NFCNDEFTag, NFCTag { identifier: NSData; - customCommandWithRequestFlagCustomCommandCodeCustomRequestParametersCompletionHandler(flags: RequestFlag, customCommandCode: number, customRequestParameters: NSData, completionHandler: (p1: NSData, p2: NSError) => void): void; + authenticateWithRequestFlagsCryptoSuiteIdentifierMessageCompletionHandler(flags: NFCISO15693RequestFlag, cryptoSuiteIdentifier: number, message: NSData, completionHandler: (p1: NFCISO15693ResponseFlag, p2: NSData, p3: NSError) => void): void; - extendedLockBlockWithRequestFlagsBlockNumberCompletionHandler(flags: RequestFlag, blockNumber: number, completionHandler: (p1: NSError) => void): void; + challengeWithRequestFlagsCryptoSuiteIdentifierMessageCompletionHandler(flags: NFCISO15693RequestFlag, cryptoSuiteIdentifier: number, message: NSData, completionHandler: (p1: NSError) => void): void; - extendedReadMultipleBlocksWithRequestFlagsBlockRangeCompletionHandler(flags: RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; + customCommandWithRequestFlagCustomCommandCodeCustomRequestParametersCompletionHandler(flags: NFCISO15693RequestFlag, customCommandCode: number, customRequestParameters: NSData, completionHandler: (p1: NSData, p2: NSError) => void): void; - extendedReadSingleBlockWithRequestFlagsBlockNumberCompletionHandler(flags: RequestFlag, blockNumber: number, completionHandler: (p1: NSData, p2: NSError) => void): void; + extendedFastReadMultipleBlocksWithRequestFlagBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; - extendedWriteSingleBlockWithRequestFlagsBlockNumberDataBlockCompletionHandler(flags: RequestFlag, blockNumber: number, dataBlock: NSData, completionHandler: (p1: NSError) => void): void; + extendedGetMultipleBlockSecurityStatusWithRequestFlagBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; - getMultipleBlockSecurityStatusWithRequestFlagBlockRangeCompletionHandler(flags: RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; + extendedLockBlockWithRequestFlagsBlockNumberCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, completionHandler: (p1: NSError) => void): void; - getSystemInfoWithRequestFlagCompletionHandler(flags: RequestFlag, completionHandler: (p1: number, p2: number, p3: number, p4: number, p5: number, p6: NSError) => void): void; + extendedReadMultipleBlocksWithRequestFlagsBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; - lockAFIWithRequestFlagCompletionHandler(flags: RequestFlag, completionHandler: (p1: NSError) => void): void; + extendedReadSingleBlockWithRequestFlagsBlockNumberCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, completionHandler: (p1: NSData, p2: NSError) => void): void; - lockBlockWithRequestFlagsBlockNumberCompletionHandler(flags: RequestFlag, blockNumber: number, completionHandler: (p1: NSError) => void): void; + extendedWriteMultipleBlocksWithRequestFlagsBlockRangeDataBlocksCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, dataBlocks: NSArray | NSData[], completionHandler: (p1: NSError) => void): void; - lockDFSIDWithRequestFlagCompletionHandler(flags: RequestFlag, completionHandler: (p1: NSError) => void): void; + extendedWriteSingleBlockWithRequestFlagsBlockNumberDataBlockCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, dataBlock: NSData, completionHandler: (p1: NSError) => void): void; + + fastReadMultipleBlocksWithRequestFlagBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; + + getMultipleBlockSecurityStatusWithRequestFlagBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; + + getSystemInfoAndUIDWithRequestFlagCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSData, p2: number, p3: number, p4: number, p5: number, p6: number, p7: NSError) => void): void; + + getSystemInfoWithRequestFlagCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: number, p2: number, p3: number, p4: number, p5: number, p6: NSError) => void): void; + + keyUpdateWithRequestFlagsKeyIdentifierMessageCompletionHandler(flags: NFCISO15693RequestFlag, keyIdentifier: number, message: NSData, completionHandler: (p1: NFCISO15693ResponseFlag, p2: NSData, p3: NSError) => void): void; + + lockAFIWithRequestFlagCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSError) => void): void; + + lockBlockWithRequestFlagsBlockNumberCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, completionHandler: (p1: NSError) => void): void; + + lockDFSIDWithRequestFlagCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSError) => void): void; + + lockDSFIDWithRequestFlagCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSError) => void): void; + + readBufferWithRequestFlagsCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NFCISO15693ResponseFlag, p2: NSData, p3: NSError) => void): void; readMultipleBlocksWithConfigurationCompletionHandler(readConfiguration: NFCISO15693ReadMultipleBlocksConfiguration, completionHandler: (p1: NSData, p2: NSError) => void): void; - readMultipleBlocksWithRequestFlagsBlockRangeCompletionHandler(flags: RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; + readMultipleBlocksWithRequestFlagsBlockRangeCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, completionHandler: (p1: NSArray, p2: NSError) => void): void; - readSingleBlockWithRequestFlagsBlockNumberCompletionHandler(flags: RequestFlag, blockNumber: number, completionHandler: (p1: NSData, p2: NSError) => void): void; + readSingleBlockWithRequestFlagsBlockNumberCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, completionHandler: (p1: NSData, p2: NSError) => void): void; - resetToReadyWithRequestFlagsCompletionHandler(flags: RequestFlag, completionHandler: (p1: NSError) => void): void; + resetToReadyWithRequestFlagsCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSError) => void): void; - selectWithRequestFlagsCompletionHandler(flags: RequestFlag, completionHandler: (p1: NSError) => void): void; + selectWithRequestFlagsCompletionHandler(flags: NFCISO15693RequestFlag, completionHandler: (p1: NSError) => void): void; sendCustomCommandWithConfigurationCompletionHandler(commandConfiguration: NFCISO15693CustomCommandConfiguration, completionHandler: (p1: NSData, p2: NSError) => void): void; + sendRequestWithFlagCommandCodeDataCompletionHandler(flags: number, commandCode: number, data: NSData, completionHandler: (p1: NFCISO15693ResponseFlag, p2: NSData, p3: NSError) => void): void; + stayQuietWithCompletionHandler(completionHandler: (p1: NSError) => void): void; - writeAFIWithRequestFlagAfiCompletionHandler(flags: RequestFlag, afi: number, completionHandler: (p1: NSError) => void): void; + writeAFIWithRequestFlagAfiCompletionHandler(flags: NFCISO15693RequestFlag, afi: number, completionHandler: (p1: NSError) => void): void; - writeDSFIDWithRequestFlagDsfidCompletionHandler(flags: RequestFlag, dsfid: number, completionHandler: (p1: NSError) => void): void; + writeDSFIDWithRequestFlagDsfidCompletionHandler(flags: NFCISO15693RequestFlag, dsfid: number, completionHandler: (p1: NSError) => void): void; - writeMultipleBlocksWithRequestFlagsBlockRangeDataBlocksCompletionHandler(flags: RequestFlag, blockRange: NSRange, dataBlocks: NSArray | NSData[], completionHandler: (p1: NSError) => void): void; + writeMultipleBlocksWithRequestFlagsBlockRangeDataBlocksCompletionHandler(flags: NFCISO15693RequestFlag, blockRange: NSRange, dataBlocks: NSArray | NSData[], completionHandler: (p1: NSError) => void): void; - writeSingleBlockWithRequestFlagsBlockNumberDataBlockCompletionHandler(flags: RequestFlag, blockNumber: number, dataBlock: NSData, completionHandler: (p1: NSError) => void): void; + writeSingleBlockWithRequestFlagsBlockNumberDataBlockCompletionHandler(flags: NFCISO15693RequestFlag, blockNumber: number, dataBlock: NSData, completionHandler: (p1: NSError) => void): void; } declare var NFCISO15693Tag: { @@ -370,6 +480,8 @@ declare const enum NFCReaderError { ReaderErrorParameterOutOfBound = 5, + ReaderErrorRadioDisabled = 6, + ReaderTransceiveErrorTagConnectionLost = 100, ReaderTransceiveErrorRetryExceeded = 101, @@ -380,6 +492,8 @@ declare const enum NFCReaderError { ReaderTransceiveErrorTagNotConnected = 104, + ReaderTransceiveErrorPacketTooLong = 105, + ReaderSessionInvalidationErrorUserCanceled = 200, ReaderSessionInvalidationErrorSessionTimeout = 201, @@ -588,17 +702,63 @@ declare class NFCVASCommandConfiguration extends NSObject implements NSCopying { static new(): NFCVASCommandConfiguration; // inherited from NSObject - mode: VASMode; + mode: NFCVASMode; passTypeIdentifier: string; url: NSURL; - constructor(o: { VASMode: VASMode; passTypeIdentifier: string; url: NSURL; }); + constructor(o: { VASMode: NFCVASMode; passTypeIdentifier: string; url: NSURL; }); copyWithZone(zone: interop.Pointer | interop.Reference): any; - initWithVASModePassTypeIdentifierUrl(mode: VASMode, passTypeIdentifier: string, url: NSURL): this; + initWithVASModePassTypeIdentifierUrl(mode: NFCVASMode, passTypeIdentifier: string, url: NSURL): this; +} + +declare const enum NFCVASErrorCode { + + NFCVASErrorCodeSuccess = 36864, + + NFCVASErrorCodeDataNotFound = 27267, + + NFCVASErrorCodeDataNotActivated = 25223, + + NFCVASErrorCodeWrongParameters = 27392, + + NFCVASErrorCodeWrongLCField = 26368, + + NFCVASErrorCodeUserIntervention = 27012, + + NFCVASErrorCodeIncorrectData = 27264, + + NFCVASErrorCodeUnsupportedApplicationVersion = 25408, + + VASErrorCodeSuccess = 36864, + + VASErrorCodeDataNotFound = 27267, + + VASErrorCodeDataNotActivated = 25223, + + VASErrorCodeWrongParameters = 27392, + + VASErrorCodeWrongLCField = 26368, + + VASErrorCodeUserIntervention = 27012, + + VASErrorCodeIncorrectData = 27264, + + VASErrorCodeUnsupportedApplicationVersion = 25408 +} + +declare const enum NFCVASMode { + + NFCVASModeURLOnly = 0, + + NFCVASModeNormal = 1, + + VASModeURLOnly = 0, + + VASModeNormal = 1 } declare class NFCVASReaderSession extends NFCReaderSession { @@ -633,72 +793,9 @@ declare class NFCVASResponse extends NSObject implements NSCopying { readonly mobileToken: NSData; - readonly status: VASErrorCode; + readonly status: NFCVASErrorCode; readonly vasData: NSData; copyWithZone(zone: interop.Pointer | interop.Reference): any; } - -declare const enum PollingRequestCode { - - NoRequest = 0, - - SystemCode = 1, - - CommunicationPerformance = 2 -} - -declare const enum PollingTimeSlot { - - Max1 = 0, - - Max2 = 1, - - Max4 = 3, - - Max8 = 7, - - Max16 = 15 -} - -declare const enum RequestFlag { - - DualSubCarriers = 1, - - HighDataRate = 2, - - ProtocolExtension = 8, - - Select = 16, - - Address = 32, - - Option = 64 -} - -declare const enum VASErrorCode { - - Success = 36864, - - DataNotFound = 27267, - - DataNotActivated = 25223, - - WrongParameters = 27392, - - WrongLCField = 26368, - - UserIntervention = 27012, - - IncorrectData = 27264, - - UnsupportedApplicationVersion = 25408 -} - -declare const enum VASMode { - - URLOnly = 0, - - Normal = 1 -} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreSpotlight.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreSpotlight.d.ts index f4135b967..528eb6c5e 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreSpotlight.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreSpotlight.d.ts @@ -689,6 +689,8 @@ declare class CSSearchableItemAttributeSet extends NSObject implements NSCopying constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { contentType: UTType; }); + constructor(o: { itemContentType: string; }); copyWithZone(zone: interop.Pointer | interop.Reference): any; @@ -697,6 +699,8 @@ declare class CSSearchableItemAttributeSet extends NSObject implements NSCopying initWithCoder(coder: NSCoder): this; + initWithContentType(contentType: UTType): this; + initWithItemContentType(itemContentType: string): this; setValueForCustomKey(value: NSSecureCoding, key: CSCustomAttributeKey): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreTelephony.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreTelephony.d.ts index 7486c89f9..82a7679c7 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreTelephony.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreTelephony.d.ts @@ -139,6 +139,10 @@ declare var CTRadioAccessTechnologyHSUPA: string; declare var CTRadioAccessTechnologyLTE: string; +declare var CTRadioAccessTechnologyNR: string; + +declare var CTRadioAccessTechnologyNRNSA: string; + declare var CTRadioAccessTechnologyWCDMA: string; declare var CTRadioAccessTechnologyeHRPD: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreText.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreText.d.ts index 8a9a8ea95..76dc061af 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreText.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreText.d.ts @@ -115,6 +115,8 @@ declare function CTFontCopyLocalizedName(font: UIFont, nameKey: string, actualLa declare function CTFontCopyName(font: UIFont, nameKey: string): string; +declare function CTFontCopyNameForGlyph(font: UIFont, glyph: number): string; + declare function CTFontCopyPostScriptName(font: UIFont): string; declare function CTFontCopySupportedLanguages(font: UIFont): NSArray; @@ -300,6 +302,8 @@ declare const enum CTFontManagerError { kCTFontManagerErrorExceededResourceLimit = 106, + kCTFontManagerErrorAssetNotFound = 107, + kCTFontManagerErrorNotRegistered = 201, kCTFontManagerErrorInUse = 202, @@ -316,7 +320,9 @@ declare const enum CTFontManagerError { kCTFontManagerErrorDuplicatedName = 305, - kCTFontManagerErrorInvalidFilePath = 306 + kCTFontManagerErrorInvalidFilePath = 306, + + kCTFontManagerErrorUnsupportedScope = 307 } declare function CTFontManagerRegisterFontDescriptors(fontDescriptors: NSArray | any[], scope: CTFontManagerScope, enabled: boolean, registrationHandler: (p1: NSArray, p2: boolean) => boolean): void; @@ -1752,6 +1758,8 @@ declare var kCTFontOpenTypeFeatureTag: string; declare var kCTFontOpenTypeFeatureValue: string; +declare var kCTFontOpticalSizeAttribute: string; + declare var kCTFontOrientationAttribute: string; declare var kCTFontPostScriptCIDNameKey: string; @@ -1948,6 +1956,8 @@ declare var kCTFontUniqueNameKey: string; declare var kCTFontVariationAttribute: string; +declare var kCTFontVariationAxesAttribute: string; + declare var kCTFontVariationAxisDefaultValueKey: string; declare var kCTFontVariationAxisHiddenKey: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreVideo.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreVideo.d.ts index 38092cfe9..27cadfec7 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreVideo.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!CoreVideo.d.ts @@ -91,7 +91,7 @@ declare function CVPixelBufferCreateResolvedAttributesDictionary(allocator: any, declare function CVPixelBufferCreateWithBytes(allocator: any, width: number, height: number, pixelFormatType: number, baseAddress: interop.Pointer | interop.Reference, bytesPerRow: number, releaseCallback: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference) => void>, releaseRefCon: interop.Pointer | interop.Reference, pixelBufferAttributes: NSDictionary, pixelBufferOut: interop.Pointer | interop.Reference): number; -declare function CVPixelBufferCreateWithIOSurface(allocator: any, surface: any, pixelBufferAttributes: NSDictionary, pixelBufferOut: interop.Pointer | interop.Reference): number; +declare function CVPixelBufferCreateWithIOSurface(allocator: any, surface: IOSurface, pixelBufferAttributes: NSDictionary, pixelBufferOut: interop.Pointer | interop.Reference): number; declare function CVPixelBufferCreateWithPlanarBytes(allocator: any, width: number, height: number, pixelFormatType: number, dataPtr: interop.Pointer | interop.Reference, dataSize: number, numberOfPlanes: number, planeBaseAddress: interop.Reference>, planeWidth: interop.Reference, planeHeight: interop.Reference, planeBytesPerRow: interop.Reference, releaseCallback: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: number, p5: interop.Reference>) => void>, releaseRefCon: interop.Pointer | interop.Reference, pixelBufferAttributes: NSDictionary, pixelBufferOut: interop.Pointer | interop.Reference): number; @@ -113,7 +113,7 @@ declare function CVPixelBufferGetHeight(pixelBuffer: any): number; declare function CVPixelBufferGetHeightOfPlane(pixelBuffer: any, planeIndex: number): number; -declare function CVPixelBufferGetIOSurface(pixelBuffer: any): interop.Unmanaged; +declare function CVPixelBufferGetIOSurface(pixelBuffer: any): interop.Unmanaged; declare function CVPixelBufferGetPixelFormatType(pixelBuffer: any): number; @@ -482,6 +482,26 @@ declare var kCVPixelBufferPoolMaximumBufferAgeKey: string; declare var kCVPixelBufferPoolMinimumBufferCountKey: string; +declare var kCVPixelBufferProResRAWKey_BlackLevel: string; + +declare var kCVPixelBufferProResRAWKey_ColorMatrix: string; + +declare var kCVPixelBufferProResRAWKey_GainFactor: string; + +declare var kCVPixelBufferProResRAWKey_RecommendedCrop: string; + +declare var kCVPixelBufferProResRAWKey_SenselSitingOffsets: string; + +declare var kCVPixelBufferProResRAWKey_WhiteBalanceBlueFactor: string; + +declare var kCVPixelBufferProResRAWKey_WhiteBalanceCCT: string; + +declare var kCVPixelBufferProResRAWKey_WhiteBalanceRedFactor: string; + +declare var kCVPixelBufferProResRAWKey_WhiteLevel: string; + +declare var kCVPixelBufferVersatileBayerKey_BayerPattern: string; + declare var kCVPixelBufferWidthKey: string; declare var kCVPixelFormatBitsPerBlock: string; @@ -566,6 +586,8 @@ declare const kCVPixelFormatType_16LE5551: number; declare const kCVPixelFormatType_16LE565: number; +declare const kCVPixelFormatType_16VersatileBayer: number; + declare const kCVPixelFormatType_1IndexedGray_WhiteIsZero: number; declare const kCVPixelFormatType_1Monochrome: number; @@ -616,6 +638,10 @@ declare const kCVPixelFormatType_422YpCbCr16: number; declare const kCVPixelFormatType_422YpCbCr8: number; +declare const kCVPixelFormatType_422YpCbCr8BiPlanarFullRange: number; + +declare const kCVPixelFormatType_422YpCbCr8BiPlanarVideoRange: number; + declare const kCVPixelFormatType_422YpCbCr8FullRange: number; declare const kCVPixelFormatType_422YpCbCr8_yuvs: number; @@ -638,6 +664,10 @@ declare const kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange: number; declare const kCVPixelFormatType_444YpCbCr8: number; +declare const kCVPixelFormatType_444YpCbCr8BiPlanarFullRange: number; + +declare const kCVPixelFormatType_444YpCbCr8BiPlanarVideoRange: number; + declare const kCVPixelFormatType_48RGB: number; declare const kCVPixelFormatType_4Indexed: number; @@ -648,6 +678,10 @@ declare const kCVPixelFormatType_64ARGB: number; declare const kCVPixelFormatType_64RGBAHalf: number; +declare const kCVPixelFormatType_64RGBALE: number; + +declare const kCVPixelFormatType_64RGBA_DownscaledProResRAW: number; + declare const kCVPixelFormatType_8Indexed: number; declare const kCVPixelFormatType_8IndexedGray_WhiteIsZero: number; @@ -662,12 +696,20 @@ declare const kCVPixelFormatType_DisparityFloat16: number; declare const kCVPixelFormatType_DisparityFloat32: number; +declare const kCVPixelFormatType_OneComponent10: number; + +declare const kCVPixelFormatType_OneComponent12: number; + +declare const kCVPixelFormatType_OneComponent16: number; + declare const kCVPixelFormatType_OneComponent16Half: number; declare const kCVPixelFormatType_OneComponent32Float: number; declare const kCVPixelFormatType_OneComponent8: number; +declare const kCVPixelFormatType_TwoComponent16: number; + declare const kCVPixelFormatType_TwoComponent16Half: number; declare const kCVPixelFormatType_TwoComponent32Float: number; @@ -716,4 +758,12 @@ declare const kCVReturnUnsupported: number; declare const kCVReturnWouldExceedAllocationThreshold: number; +declare const kCVVersatileBayer_BayerPattern_BGGR: number; + +declare const kCVVersatileBayer_BayerPattern_GBRG: number; + +declare const kCVVersatileBayer_BayerPattern_GRBG: number; + +declare const kCVVersatileBayer_BayerPattern_RGGB: number; + declare var kCVZeroTime: CVTime; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts index 13cfe2705..75ec97407 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts @@ -218,13 +218,6 @@ declare function OSAtomicXor32OrigBarrier(__theMask: number, __theValue: interop declare const OSBigEndian: number; -interface OSFifoQueueHead { - opaque1: interop.Pointer | interop.Reference; - opaque2: interop.Pointer | interop.Reference; - opaque3: number; -} -declare var OSFifoQueueHead: interop.StructType; - declare const OSLittleEndian: number; declare function OSMemoryBarrier(): void; @@ -1056,6 +1049,18 @@ interface __Reply__mach_port_kernel_object_t { } declare var __Reply__mach_port_kernel_object_t: interop.StructType<__Reply__mach_port_kernel_object_t>; +interface __Reply__mach_port_kobject_description_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + RetCode: number; + object_type: number; + object_addr: number; + descriptionOffset: number; + descriptionCnt: number; + description: interop.Reference; +} +declare var __Reply__mach_port_kobject_description_t: interop.StructType<__Reply__mach_port_kobject_description_t>; + interface __Reply__mach_port_kobject_t { Head: mach_msg_header_t; NDR: NDR_record_t; @@ -1376,6 +1381,15 @@ interface __Reply__processor_set_tasks_t { } declare var __Reply__processor_set_tasks_t: interop.StructType<__Reply__processor_set_tasks_t>; +interface __Reply__processor_set_tasks_with_flavor_t { + Head: mach_msg_header_t; + msgh_body: mach_msg_body_t; + task_list: mach_msg_ool_ports_descriptor_t; + NDR: NDR_record_t; + task_listCnt: number; +} +declare var __Reply__processor_set_tasks_with_flavor_t: interop.StructType<__Reply__processor_set_tasks_with_flavor_t>; + interface __Reply__processor_set_threads_t { Head: mach_msg_header_t; msgh_body: mach_msg_body_t; @@ -1420,6 +1434,13 @@ interface __Reply__task_assign_t { } declare var __Reply__task_assign_t: interop.StructType<__Reply__task_assign_t>; +interface __Reply__task_create_suid_cred_t { + Head: mach_msg_header_t; + msgh_body: mach_msg_body_t; + delegation: mach_msg_port_descriptor_t; +} +declare var __Reply__task_create_suid_cred_t: interop.StructType<__Reply__task_create_suid_cred_t>; + interface __Reply__task_create_t { Head: mach_msg_header_t; msgh_body: mach_msg_body_t; @@ -1800,6 +1821,15 @@ interface __Reply__thread_assign_t { } declare var __Reply__thread_assign_t: interop.StructType<__Reply__thread_assign_t>; +interface __Reply__thread_convert_thread_state_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + RetCode: number; + out_stateCnt: number; + out_state: interop.Reference; +} +declare var __Reply__thread_convert_thread_state_t: interop.StructType<__Reply__thread_convert_thread_state_t>; + interface __Reply__thread_create_running_t { Head: mach_msg_header_t; msgh_body: mach_msg_body_t; @@ -2887,6 +2917,13 @@ interface __Request__mach_port_kernel_object_t { } declare var __Request__mach_port_kernel_object_t: interop.StructType<__Request__mach_port_kernel_object_t>; +interface __Request__mach_port_kobject_description_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + name: number; +} +declare var __Request__mach_port_kobject_description_t: interop.StructType<__Request__mach_port_kobject_description_t>; + interface __Request__mach_port_kobject_t { Head: mach_msg_header_t; NDR: NDR_record_t; @@ -3173,6 +3210,13 @@ interface __Request__processor_set_tasks_t { } declare var __Request__processor_set_tasks_t: interop.StructType<__Request__processor_set_tasks_t>; +interface __Request__processor_set_tasks_with_flavor_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + flavor: number; +} +declare var __Request__processor_set_tasks_with_flavor_t: interop.StructType<__Request__processor_set_tasks_with_flavor_t>; + interface __Request__processor_set_threads_t { Head: mach_msg_header_t; } @@ -3214,6 +3258,16 @@ interface __Request__task_assign_t { } declare var __Request__task_assign_t: interop.StructType<__Request__task_assign_t>; +interface __Request__task_create_suid_cred_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + pathOffset: number; + pathCnt: number; + path: interop.Reference; + uid: number; +} +declare var __Request__task_create_suid_cred_t: interop.StructType<__Request__task_create_suid_cred_t>; + interface __Request__task_create_t { Head: mach_msg_header_t; msgh_body: mach_msg_body_t; @@ -3569,6 +3623,17 @@ interface __Request__thread_assign_t { } declare var __Request__thread_assign_t: interop.StructType<__Request__thread_assign_t>; +interface __Request__thread_convert_thread_state_t { + Head: mach_msg_header_t; + NDR: NDR_record_t; + direction: number; + flavor: number; + in_stateCnt: number; + in_state: interop.Reference; + out_stateCnt: number; +} +declare var __Request__thread_convert_thread_state_t: interop.StructType<__Request__thread_convert_thread_state_t>; + interface __Request__thread_create_running_t { Head: mach_msg_header_t; NDR: NDR_record_t; @@ -4018,6 +4083,8 @@ declare function __cospi(p1: number): number; declare function __cospif(p1: number): number; +declare function __darwin_check_fd_set_overflow(p1: number, p2: interop.Pointer | interop.Reference, p3: number): number; + interface __darwin_pthread_handler_rec { __routine: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>; __arg: interop.Pointer | interop.Reference; @@ -4206,12 +4273,8 @@ declare function _host_page_size(host: number, out_page_size: interop.Pointer | declare function _kernelrpc_mach_port_allocate_trap(target: number, right: number, name: interop.Pointer | interop.Reference): number; -declare function _kernelrpc_mach_port_construct_trap(target: number, options: interop.Pointer | interop.Reference, context: number, name: interop.Pointer | interop.Reference): number; - declare function _kernelrpc_mach_port_deallocate_trap(target: number, name: number): number; -declare function _kernelrpc_mach_port_destroy_trap(target: number, name: number): number; - declare function _kernelrpc_mach_port_destruct_trap(target: number, name: number, srdelta: number, guard: number): number; declare function _kernelrpc_mach_port_extract_member_trap(target: number, name: number, pset: number): number; @@ -4314,8 +4377,6 @@ interface _pcred { } declare var _pcred: interop.StructType<_pcred>; -declare function _pthread_mutex_enable_legacy_mode(): void; - declare function _setjmp(p1: interop.Reference): number; interface _ucred { @@ -4570,6 +4631,8 @@ declare function adjtime(p1: interop.Pointer | interop.Reference, p2: i declare function alarm(p1: number): number; +declare function aligned_alloc(__alignment: number, __size: number): interop.Pointer | interop.Reference; + declare function alloca(p1: number): interop.Pointer | interop.Reference; declare const alphaStage: number; @@ -5309,17 +5372,6 @@ declare function fclonefileat(p1: number, p2: number, p3: string | interop.Point declare function fclose(p1: interop.Pointer | interop.Reference): number; -interface fcodeblobs_t { - f_cd_hash: interop.Pointer | interop.Reference; - f_hash_size: number; - f_cd_buffer: interop.Pointer | interop.Reference; - f_cd_size: number; - f_out_size: interop.Pointer | interop.Reference; - f_arch: number; - __padding: number; -} -declare var fcodeblobs_t: interop.StructType; - declare function fcopyfile(from_fd: number, to_fd: number, p3: interop.Pointer | interop.Reference, flags: number): number; declare function fcvt(p1: number, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference): string; @@ -5395,6 +5447,13 @@ declare function fgetpos(p1: interop.Pointer | interop.Reference, p2: inte declare function fgets(p1: string | interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference): string; +interface fgetsigsinfo_t { + fg_file_start: number; + fg_info_request: number; + fg_sig_is_platform: number; +} +declare var fgetsigsinfo_t: interop.StructType; + declare function fgetwc(p1: interop.Pointer | interop.Reference): number; declare function fgetwc_l(p1: interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference): number; @@ -5596,6 +5655,9 @@ interface fsignatures_t { fs_file_start: number; fs_blob_start: interop.Pointer | interop.Reference; fs_blob_size: number; + fs_fsignatures_size: number; + fs_cdhash: interop.Reference; + fs_hash_type: number; } declare var fsignatures_t: interop.StructType; @@ -5646,6 +5708,14 @@ interface fstore_t { } declare var fstore_t: interop.StructType; +interface fsupplement_t { + fs_file_start: number; + fs_blob_start: number; + fs_blob_size: number; + fs_orig_fd: number; +} +declare var fsupplement_t: interop.StructType; + declare function fsync(p1: number): number; declare function fsync_volume_np(p1: number, p2: number): number; @@ -6089,7 +6159,7 @@ declare function host_security_set_task_token(host_security: number, target_task declare function host_set_UNDServer(host: number, server: number): number; -declare function host_set_atm_diagnostic_flag(host_priv: number, diagnostic_flag: number): number; +declare function host_set_atm_diagnostic_flag(host: number, diagnostic_flag: number): number; declare function host_set_exception_ports(host_priv: number, exception_mask: number, new_port: number, behavior: number, new_flavor: number): number; @@ -7218,8 +7288,6 @@ declare function mach_port_allocate_name(task: number, right: number, name: numb declare function mach_port_allocate_qos(task: number, right: number, qos: interop.Pointer | interop.Reference, name: interop.Pointer | interop.Reference): number; -declare function mach_port_construct(task: number, options: interop.Pointer | interop.Reference, context: number, name: interop.Pointer | interop.Reference): number; - declare function mach_port_deallocate(task: number, name: number): number; interface mach_port_deleted_notification_t { @@ -7276,6 +7344,8 @@ declare const enum mach_port_guard_exception_codes { kGUARD_EXC_STRICT_REPLY = 64, + kGUARD_EXC_MSG_FILTERED = 128, + kGUARD_EXC_INVALID_RIGHT = 256, kGUARD_EXC_INVALID_NAME = 512, @@ -7320,6 +7390,8 @@ declare function mach_port_kernel_object(task: number, name: number, object_type declare function mach_port_kobject(task: number, name: number, object_type: interop.Pointer | interop.Reference, object_addr: interop.Pointer | interop.Reference): number; +declare function mach_port_kobject_description(task: number, name: number, object_type: interop.Pointer | interop.Reference, object_addr: interop.Pointer | interop.Reference, description: interop.Reference): number; + interface mach_port_limits_t { mpl_qlimit: number; } @@ -7331,13 +7403,6 @@ declare function mach_port_move_member(task: number, member: number, after: numb declare function mach_port_names(task: number, names: interop.Pointer | interop.Reference>, namesCnt: interop.Pointer | interop.Reference, types: interop.Pointer | interop.Reference>, typesCnt: interop.Pointer | interop.Reference): number; -interface mach_port_options_t { - flags: number; - mpl: mach_port_limits_t; - reserved: interop.Reference; -} -declare var mach_port_options_t: interop.StructType; - declare function mach_port_peek(task: number, name: number, trailer_type: number, request_seqnop: interop.Pointer | interop.Reference, msg_sizep: interop.Pointer | interop.Reference, msg_idp: interop.Pointer | interop.Reference, trailer_infop: string | interop.Pointer | interop.Reference, trailer_infopCnt: interop.Pointer | interop.Reference): number; interface mach_port_qos_t { @@ -7362,7 +7427,7 @@ declare function mach_port_set_seqno(task: number, name: number, seqno: number): declare function mach_port_space_basic_info(task: number, basic_info: interop.Pointer | interop.Reference): number; -declare function mach_port_space_info(task: number, space_info: interop.Pointer | interop.Reference, table_info: interop.Pointer | interop.Reference>, table_infoCnt: interop.Pointer | interop.Reference, tree_info: interop.Pointer | interop.Reference>, tree_infoCnt: interop.Pointer | interop.Reference): number; +declare function mach_port_space_info(space: number, space_info: interop.Pointer | interop.Reference, table_info: interop.Pointer | interop.Reference>, table_infoCnt: interop.Pointer | interop.Reference, tree_info: interop.Pointer | interop.Reference>, tree_infoCnt: interop.Pointer | interop.Reference): number; interface mach_port_status_t { mps_pset: number; @@ -8179,6 +8244,8 @@ declare function posix_spawnattr_destroy(p1: interop.Pointer | interop.Reference declare function posix_spawnattr_get_qos_class_np(__attr: interop.Pointer | interop.Reference>, __qos_class: interop.Pointer | interop.Reference): number; +declare function posix_spawnattr_getarchpref_np(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference, p5: interop.Pointer | interop.Reference): number; + declare function posix_spawnattr_getbinpref_np(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference): number; declare function posix_spawnattr_getflags(p1: interop.Pointer | interop.Reference>, p2: interop.Pointer | interop.Reference): number; @@ -8191,8 +8258,12 @@ declare function posix_spawnattr_getsigmask(p1: interop.Pointer | interop.Refere declare function posix_spawnattr_init(p1: interop.Pointer | interop.Reference>): number; +declare function posix_spawnattr_set_csm_np(attr: interop.Pointer | interop.Reference>, flags: number): number; + declare function posix_spawnattr_set_qos_class_np(__attr: interop.Pointer | interop.Reference>, __qos_class: qos_class_t): number; +declare function posix_spawnattr_setarchpref_np(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference, p5: interop.Pointer | interop.Reference): number; + declare function posix_spawnattr_setauditsessionport_np(p1: interop.Pointer | interop.Reference>, p2: number): number; declare function posix_spawnattr_setbinpref_np(p1: interop.Pointer | interop.Reference>, p2: number, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference): number; @@ -8201,6 +8272,8 @@ declare function posix_spawnattr_setexceptionports_np(p1: interop.Pointer | inte declare function posix_spawnattr_setflags(p1: interop.Pointer | interop.Reference>, p2: number): number; +declare function posix_spawnattr_setnosmt_np(attr: interop.Pointer | interop.Reference>): number; + declare function posix_spawnattr_setpgroup(p1: interop.Pointer | interop.Reference>, p2: number): number; declare function posix_spawnattr_setsigdefault(p1: interop.Pointer | interop.Reference>, p2: interop.Pointer | interop.Reference): number; @@ -8219,6 +8292,8 @@ declare function powl(p1: number, p2: number): number; declare function pread(__fd: number, __buf: interop.Pointer | interop.Reference, __nbyte: number, __offset: number): number; +declare function preadv(p1: number, p2: interop.Pointer | interop.Reference, p3: number, p4: number): number; + interface proc_rlimit_control_wakeupmon { wm_flags: number; wm_rate: number; @@ -8285,6 +8360,8 @@ declare function processor_set_statistics(pset: number, flavor: number, info_out declare function processor_set_tasks(processor_set: number, task_list: interop.Pointer | interop.Reference>, task_listCnt: interop.Pointer | interop.Reference): number; +declare function processor_set_tasks_with_flavor(processor_set: number, flavor: number, task_list: interop.Pointer | interop.Reference>, task_listCnt: interop.Pointer | interop.Reference): number; + declare function processor_set_threads(processor_set: number, thread_list: interop.Pointer | interop.Reference>, thread_listCnt: interop.Pointer | interop.Reference): number; declare function processor_start(processor: number): number; @@ -8380,6 +8457,8 @@ declare function pthread_condattr_init(p1: interop.Pointer | interop.Reference<_ declare function pthread_condattr_setpshared(p1: interop.Pointer | interop.Reference<_opaque_pthread_condattr_t>, p2: number): number; +declare function pthread_cpu_number_np(cpu_number_out: interop.Pointer | interop.Reference): number; + declare function pthread_create(p1: interop.Pointer | interop.Reference>, p2: interop.Pointer | interop.Reference<_opaque_pthread_attr_t>, p3: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => interop.Pointer | interop.Reference>, p4: interop.Pointer | interop.Reference): number; declare function pthread_create_from_mach_thread(p1: interop.Pointer | interop.Reference>, p2: interop.Pointer | interop.Reference<_opaque_pthread_attr_t>, p3: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => interop.Pointer | interop.Reference>, p4: interop.Pointer | interop.Reference): number; @@ -8550,6 +8629,8 @@ declare function putwchar_l(p1: number, p2: interop.Pointer | interop.Reference< declare function pwrite(__fd: number, __buf: interop.Pointer | interop.Reference, __nbyte: number, __offset: number): number; +declare function pwritev(p1: number, p2: interop.Pointer | interop.Reference, p3: number, p4: number): number; + declare function qos_class_main(): qos_class_t; declare function qos_class_self(): qos_class_t; @@ -8956,6 +9037,47 @@ interface rusage_info_v4 { } declare var rusage_info_v4: interop.StructType; +interface rusage_info_v5 { + ri_uuid: interop.Reference; + ri_user_time: number; + ri_system_time: number; + ri_pkg_idle_wkups: number; + ri_interrupt_wkups: number; + ri_pageins: number; + ri_wired_size: number; + ri_resident_size: number; + ri_phys_footprint: number; + ri_proc_start_abstime: number; + ri_proc_exit_abstime: number; + ri_child_user_time: number; + ri_child_system_time: number; + ri_child_pkg_idle_wkups: number; + ri_child_interrupt_wkups: number; + ri_child_pageins: number; + ri_child_elapsed_abstime: number; + ri_diskio_bytesread: number; + ri_diskio_byteswritten: number; + ri_cpu_time_qos_default: number; + ri_cpu_time_qos_maintenance: number; + ri_cpu_time_qos_background: number; + ri_cpu_time_qos_utility: number; + ri_cpu_time_qos_legacy: number; + ri_cpu_time_qos_user_initiated: number; + ri_cpu_time_qos_user_interactive: number; + ri_billed_system_time: number; + ri_serviced_system_time: number; + ri_logical_writes: number; + ri_lifetime_max_phys_footprint: number; + ri_instructions: number; + ri_cycles: number; + ri_billed_energy: number; + ri_serviced_energy: number; + ri_interval_max_phys_footprint: number; + ri_runnable_time: number; + ri_flags: number; +} +declare var rusage_info_v5: interop.StructType; + declare function ruserok(p1: string | interop.Pointer | interop.Reference, p2: number, p3: string | interop.Pointer | interop.Reference, p4: string | interop.Pointer | interop.Reference): number; interface sa_endpoints_t { @@ -9019,6 +9141,8 @@ declare function seed48(p1: interop.Reference): interop.Pointer | intero declare function seekdir(p1: interop.Pointer | interop.Reference, p2: number): void; +declare function select(p1: number, p2: interop.Pointer | interop.Reference, p3: interop.Pointer | interop.Reference, p4: interop.Pointer | interop.Reference, p5: interop.Pointer | interop.Reference): number; + interface sem { semval: number; sempid: number; @@ -9521,6 +9645,8 @@ declare function strsep(__stringp: interop.Pointer | interop.Reference, declare function strsignal(__sig: number): string; +declare function strsignal_r(__sig: number, __strsignalbuf: string | interop.Pointer | interop.Reference, __buflen: number): number; + declare function strspn(__s: string | interop.Pointer | interop.Reference, __charset: string | interop.Pointer | interop.Reference): number; declare function strstr(__big: string | interop.Pointer | interop.Reference, __little: string | interop.Pointer | interop.Reference): string; @@ -9555,6 +9681,8 @@ declare function strtoll(__str: string | interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: interop.Pointer | interop.Reference): number; +declare function strtonum(__numstr: string | interop.Pointer | interop.Reference, __minval: number, __maxval: number, __errstrp: interop.Pointer | interop.Reference): number; + declare function strtoq(__str: string | interop.Pointer | interop.Reference, __endptr: interop.Pointer | interop.Reference, __base: number): number; declare function strtoq_l(p1: string | interop.Pointer | interop.Reference, p2: interop.Pointer | interop.Reference, p3: number, p4: interop.Pointer | interop.Reference): number; @@ -9680,12 +9808,14 @@ interface task_basic_info_64 { declare var task_basic_info_64: interop.StructType; interface task_category_policy { - role: number; + role: task_role_t; } declare var task_category_policy: interop.StructType; declare function task_create(target_task: number, ledgers: interop.Pointer | interop.Reference, ledgersCnt: number, inherit_memory: number, child_task: interop.Pointer | interop.Reference): number; +declare function task_create_suid_cred(task: number, path: interop.Reference, uid: number, delegation: interop.Pointer | interop.Reference): number; + interface task_dyld_info { all_image_info_addr: number; all_image_info_size: number; @@ -9807,7 +9937,7 @@ declare function task_resume(target_task: number): number; declare function task_resume2(suspend_token: number): number; -declare const enum task_role { +declare const enum task_role_t { TASK_RENICED = -1, @@ -10105,6 +10235,8 @@ interface thread_basic_info { } declare var thread_basic_info: interop.StructType; +declare function thread_convert_thread_state(thread: number, direction: number, flavor: number, in_state: interop.Pointer | interop.Reference, in_stateCnt: number, out_state: interop.Pointer | interop.Reference, out_stateCnt: interop.Pointer | interop.Reference): number; + declare function thread_create(parent_task: number, child_act: interop.Pointer | interop.Reference): number; declare function thread_create_running(parent_task: number, flavor: number, new_state: interop.Pointer | interop.Reference, new_stateCnt: number, child_act: interop.Pointer | interop.Reference): number; @@ -10800,6 +10932,8 @@ interface vm_statistics64 { } declare var vm_statistics64: interop.StructType; +declare function vm_stats(info: interop.Pointer | interop.Reference, count: interop.Pointer | interop.Reference): number; + declare function vm_wire(host_priv: number, task: number, address: number, size: number, desired_access: number): number; declare function vm_write(target_task: number, address: number, data: number, dataCnt: number): number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeveloperToolsSupport.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeveloperToolsSupport.d.ts new file mode 100644 index 000000000..3e492536f --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeveloperToolsSupport.d.ts @@ -0,0 +1,13 @@ + +interface PreviewDisplaying extends NSObjectProtocol { + + customPreviewSizeCornerRadius?: number; + + displayingLivePreview: boolean; + + wantsCustomPreviewSize: boolean; +} +declare var PreviewDisplaying: { + + prototype: PreviewDisplaying; +}; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeviceCheck.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeviceCheck.d.ts index 2203cf7ca..ccf8eb419 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeviceCheck.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!DeviceCheck.d.ts @@ -1,4 +1,21 @@ +declare class DCAppAttestService extends NSObject { + + static alloc(): DCAppAttestService; // inherited from NSObject + + static new(): DCAppAttestService; // inherited from NSObject + + readonly supported: boolean; + + static readonly sharedService: DCAppAttestService; + + attestKeyClientDataHashCompletionHandler(keyId: string, clientDataHash: NSData, completionHandler: (p1: NSData, p2: NSError) => void): void; + + generateAssertionClientDataHashCompletionHandler(keyId: string, clientDataHash: NSData, completionHandler: (p1: NSData, p2: NSError) => void): void; + + generateKeyWithCompletionHandler(completionHandler: (p1: string, p2: NSError) => void): void; +} + declare class DCDevice extends NSObject { static alloc(): DCDevice; // inherited from NSObject @@ -16,7 +33,13 @@ declare const enum DCError { UnknownSystemFailure = 0, - FeatureUnsupported = 1 + FeatureUnsupported = 1, + + InvalidInput = 2, + + InvalidKey = 3, + + ServerUnavailable = 4 } declare var DCErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Dispatch.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Dispatch.d.ts index 76d2ef819..3f23f3f96 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Dispatch.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Dispatch.d.ts @@ -350,4 +350,6 @@ declare function dispatch_workloop_create_inactive(label: string | interop.Point declare function dispatch_workloop_set_autorelease_frequency(workloop: NSObject, frequency: dispatch_autorelease_frequency_t): void; +declare function dispatch_workloop_set_os_workgroup(workloop: NSObject, workgroup: OS_os_workgroup): void; + declare function dispatch_write(fd: number, data: NSObject, queue: NSObject, handler: (p1: NSObject, p2: number) => void): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ExposureNotification.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ExposureNotification.d.ts new file mode 100644 index 000000000..3053bbdc3 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ExposureNotification.d.ts @@ -0,0 +1,351 @@ + +declare const ENAttenuationMax: number; + +declare const ENAttenuationMin: number; + +declare const enum ENAuthorizationStatus { + + Unknown = 0, + + Restricted = 1, + + NotAuthorized = 2, + + Authorized = 3 +} + +declare const enum ENCalibrationConfidence { + + Lowest = 0, + + Low = 1, + + Medium = 2, + + High = 3 +} + +declare var ENDaysSinceOnsetOfSymptomsUnknown: number; + +declare const enum ENDiagnosisReportType { + + Unknown = 0, + + ConfirmedTest = 1, + + ConfirmedClinicalDiagnosis = 2, + + SelfReported = 3, + + Recursive = 4, + + Revoked = 5 +} + +declare const enum ENErrorCode { + + Unknown = 1, + + BadParameter = 2, + + NotEntitled = 3, + + NotAuthorized = 4, + + Unsupported = 5, + + Invalidated = 6, + + BluetoothOff = 7, + + InsufficientStorage = 8, + + NotEnabled = 9, + + APIMisuse = 10, + + Internal = 11, + + InsufficientMemory = 12, + + RateLimited = 13, + + Restricted = 14, + + BadFormat = 15, + + DataInaccessible = 16, + + TravelStatusNotAvailable = 17 +} + +declare var ENErrorDomain: string; + +declare class ENExposureConfiguration extends NSObject { + + static alloc(): ENExposureConfiguration; // inherited from NSObject + + static new(): ENExposureConfiguration; // inherited from NSObject + + attenuationDurationThresholds: NSArray; + + attenuationLevelValues: NSArray; + + attenuationWeight: number; + + daysSinceLastExposureLevelValues: NSArray; + + daysSinceLastExposureThreshold: number; + + daysSinceLastExposureWeight: number; + + durationLevelValues: NSArray; + + durationWeight: number; + + immediateDurationWeight: number; + + infectiousnessForDaysSinceOnsetOfSymptoms: NSDictionary; + + infectiousnessHighWeight: number; + + infectiousnessStandardWeight: number; + + mediumDurationWeight: number; + + metadata: NSDictionary; + + minimumRiskScore: number; + + minimumRiskScoreFullRange: number; + + nearDurationWeight: number; + + otherDurationWeight: number; + + reportTypeConfirmedClinicalDiagnosisWeight: number; + + reportTypeConfirmedTestWeight: number; + + reportTypeNoneMap: ENDiagnosisReportType; + + reportTypeRecursiveWeight: number; + + reportTypeSelfReportedWeight: number; + + transmissionRiskLevelValues: NSArray; + + transmissionRiskWeight: number; +} + +declare class ENExposureDaySummary extends NSObject { + + static alloc(): ENExposureDaySummary; // inherited from NSObject + + static new(): ENExposureDaySummary; // inherited from NSObject + + readonly confirmedClinicalDiagnosisSummary: ENExposureSummaryItem; + + readonly confirmedTestSummary: ENExposureSummaryItem; + + readonly date: Date; + + readonly daySummary: ENExposureSummaryItem; + + readonly recursiveSummary: ENExposureSummaryItem; + + readonly selfReportedSummary: ENExposureSummaryItem; +} + +declare class ENExposureDetectionSummary extends NSObject { + + static alloc(): ENExposureDetectionSummary; // inherited from NSObject + + static new(): ENExposureDetectionSummary; // inherited from NSObject + + readonly attenuationDurations: NSArray; + + readonly daySummaries: NSArray; + + readonly daysSinceLastExposure: number; + + readonly matchedKeyCount: number; + + readonly maximumRiskScore: number; + + readonly maximumRiskScoreFullRange: number; + + readonly metadata: NSDictionary; + + readonly riskScoreSumFullRange: number; +} + +declare class ENExposureInfo extends NSObject { + + static alloc(): ENExposureInfo; // inherited from NSObject + + static new(): ENExposureInfo; // inherited from NSObject + + readonly attenuationDurations: NSArray; + + readonly attenuationValue: number; + + readonly date: Date; + + readonly daysSinceOnsetOfSymptoms: number; + + readonly diagnosisReportType: ENDiagnosisReportType; + + readonly duration: number; + + readonly metadata: NSDictionary; + + readonly totalRiskScore: number; + + readonly totalRiskScoreFullRange: number; + + readonly transmissionRiskLevel: number; +} + +declare class ENExposureSummaryItem extends NSObject { + + static alloc(): ENExposureSummaryItem; // inherited from NSObject + + static new(): ENExposureSummaryItem; // inherited from NSObject + + readonly maximumScore: number; + + readonly scoreSum: number; + + readonly weightedDurationSum: number; +} + +declare class ENExposureWindow extends NSObject { + + static alloc(): ENExposureWindow; // inherited from NSObject + + static new(): ENExposureWindow; // inherited from NSObject + + readonly calibrationConfidence: ENCalibrationConfidence; + + readonly date: Date; + + readonly diagnosisReportType: ENDiagnosisReportType; + + readonly infectiousness: ENInfectiousness; + + readonly scanInstances: NSArray; +} + +declare const enum ENInfectiousness { + + None = 0, + + Standard = 1, + + High = 2 +} + +declare class ENManager extends NSObject { + + static alloc(): ENManager; // inherited from NSObject + + static new(): ENManager; // inherited from NSObject + + dispatchQueue: NSObject; + + readonly exposureNotificationEnabled: boolean; + + readonly exposureNotificationStatus: ENStatus; + + invalidationHandler: () => void; + + static readonly authorizationStatus: ENAuthorizationStatus; + + activateWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + detectExposuresWithConfigurationCompletionHandler(configuration: ENExposureConfiguration, completionHandler: (p1: ENExposureDetectionSummary, p2: NSError) => void): NSProgress; + + detectExposuresWithConfigurationDiagnosisKeyURLsCompletionHandler(configuration: ENExposureConfiguration, diagnosisKeyURLs: NSArray | NSURL[], completionHandler: (p1: ENExposureDetectionSummary, p2: NSError) => void): NSProgress; + + getDiagnosisKeysWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + + getExposureInfoFromSummaryUserExplanationCompletionHandler(summary: ENExposureDetectionSummary, userExplanation: string, completionHandler: (p1: NSArray, p2: NSError) => void): NSProgress; + + getExposureWindowsFromSummaryCompletionHandler(summary: ENExposureDetectionSummary, completionHandler: (p1: NSArray, p2: NSError) => void): NSProgress; + + getTestDiagnosisKeysWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + + getUserTraveledWithCompletionHandler(completionHandler: (p1: boolean, p2: NSError) => void): void; + + invalidate(): void; + + setExposureNotificationEnabledCompletionHandler(enabled: boolean, completionHandler: (p1: NSError) => void): void; +} + +declare const ENRiskLevelMax: number; + +declare const ENRiskLevelMin: number; + +declare const ENRiskLevelValueMax: number; + +declare const ENRiskLevelValueMin: number; + +declare const ENRiskScoreMax: number; + +declare const ENRiskScoreMin: number; + +declare const ENRiskWeightDefault: number; + +declare const ENRiskWeightDefaultV2: number; + +declare const ENRiskWeightMax: number; + +declare const ENRiskWeightMaxV2: number; + +declare const ENRiskWeightMin: number; + +declare class ENScanInstance extends NSObject { + + static alloc(): ENScanInstance; // inherited from NSObject + + static new(): ENScanInstance; // inherited from NSObject + + readonly minimumAttenuation: number; + + readonly secondsSinceLastScan: number; + + readonly typicalAttenuation: number; +} + +declare const enum ENStatus { + + Unknown = 0, + + Active = 1, + + Disabled = 2, + + BluetoothOff = 3, + + Restricted = 4, + + Paused = 5, + + Unauthorized = 6 +} + +declare class ENTemporaryExposureKey extends NSObject { + + static alloc(): ENTemporaryExposureKey; // inherited from NSObject + + static new(): ENTemporaryExposureKey; // inherited from NSObject + + keyData: NSData; + + rollingPeriod: number; + + rollingStartNumber: number; + + transmissionRiskLevel: number; +} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!FileProvider.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!FileProvider.d.ts index ca59944ac..e73eaafce 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!FileProvider.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!FileProvider.d.ts @@ -73,11 +73,7 @@ declare const enum NSFileProviderErrorCode { ServerUnreachable = -1004, - NoSuchItem = -1005, - - VersionOutOfDate = -1006, - - DirectoryNotEmpty = -1007 + NoSuchItem = -1005 } declare var NSFileProviderErrorCollidingItemKey: string; @@ -157,6 +153,8 @@ interface NSFileProviderItem extends NSObjectProtocol { contentModificationDate?: Date; + contentType?: UTType; + creationDate?: Date; documentSize?: number; @@ -191,7 +189,7 @@ interface NSFileProviderItem extends NSObjectProtocol { trashed?: boolean; - typeIdentifier: string; + typeIdentifier?: string; uploaded?: boolean; @@ -229,30 +227,6 @@ declare const enum NSFileProviderItemCapabilities { AllowsAll = 63 } -interface NSFileProviderItemDecorating extends NSFileProviderItem { -} -declare var NSFileProviderItemDecorating: { - - prototype: NSFileProviderItemDecorating; -}; - -interface NSFileProviderItemFlags extends NSObjectProtocol { - - hidden: boolean; - - pathExtensionHidden: boolean; - - userExecutable: boolean; - - userReadable: boolean; - - userWritable: boolean; -} -declare var NSFileProviderItemFlags: { - - prototype: NSFileProviderItemFlags; -}; - declare class NSFileProviderManager extends NSObject { static addDomainCompletionHandler(domain: NSFileProviderDomain, completionHandler: (p1: NSError) => void): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Foundation.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Foundation.d.ts index 6983c74ff..46cecb5ad 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Foundation.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Foundation.d.ts @@ -576,6 +576,8 @@ declare const NSBundleErrorMaximum: number; declare const NSBundleErrorMinimum: number; +declare const NSBundleExecutableArchitectureARM64: number; + declare const NSBundleExecutableArchitectureI386: number; declare const NSBundleExecutableArchitecturePPC: number; @@ -1202,6 +1204,10 @@ declare class NSCoder extends NSObject { decodeArrayOfObjCTypeCountAt(itemType: string | interop.Pointer | interop.Reference, count: number, array: interop.Pointer | interop.Reference): void; + decodeArrayOfObjectsOfClassForKey(cls: typeof NSObject, key: string): NSArray; + + decodeArrayOfObjectsOfClassesForKey(classes: NSSet, key: string): NSArray; + decodeBoolForKey(key: string): boolean; decodeBytesForKeyReturnedLength(key: string, lengthp: interop.Pointer | interop.Reference): string; @@ -1226,6 +1232,10 @@ declare class NSCoder extends NSObject { decodeDataObject(): NSData; + decodeDictionaryWithKeysOfClassObjectsOfClassForKey(keyCls: typeof NSObject, objectCls: typeof NSObject, key: string): NSDictionary; + + decodeDictionaryWithKeysOfClassesObjectsOfClassesForKey(keyClasses: NSSet, objectClasses: NSSet, key: string): NSDictionary; + decodeDirectionalEdgeInsetsForKey(key: string): NSDirectionalEdgeInsets; decodeDoubleForKey(key: string): number; @@ -1852,6 +1862,8 @@ declare class NSDate extends NSObject implements CKRecordValue, NSCopying, NSSec static date(): NSDate; + static dateWithSRAbsoluteTime(time: number): NSDate; + static dateWithTimeIntervalSince1970(secs: number): NSDate; static dateWithTimeIntervalSinceDate(secsToBeAdded: number, date: Date): NSDate; @@ -1862,6 +1874,8 @@ declare class NSDate extends NSObject implements CKRecordValue, NSCopying, NSSec static new(): NSDate; // inherited from NSObject + readonly srAbsoluteTime: number; + readonly timeIntervalSince1970: number; readonly timeIntervalSinceNow: number; @@ -1892,6 +1906,8 @@ declare class NSDate extends NSObject implements CKRecordValue, NSCopying, NSSec constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { SRAbsoluteTime: number; }); + constructor(o: { timeIntervalSince1970: number; }); constructor(o: { timeInterval: number; sinceDate: Date; }); @@ -1920,6 +1936,8 @@ declare class NSDate extends NSObject implements CKRecordValue, NSCopying, NSSec initWithCoder(coder: NSCoder): this; + initWithSRAbsoluteTime(time: number): this; + initWithTimeIntervalSince1970(secs: number): this; initWithTimeIntervalSinceDate(secsToBeAdded: number, date: Date): this; @@ -4733,6 +4751,14 @@ declare class NSKeyedUnarchiver extends NSCoder { static unarchiveTopLevelObjectWithDataError(data: NSData): any; + static unarchivedArrayOfObjectsOfClassFromDataError(cls: typeof NSObject, data: NSData): NSArray; + + static unarchivedArrayOfObjectsOfClassesFromDataError(classes: NSSet, data: NSData): NSArray; + + static unarchivedDictionaryWithKeysOfClassObjectsOfClassFromDataError(keyCls: typeof NSObject, valueCls: typeof NSObject, data: NSData): NSDictionary; + + static unarchivedDictionaryWithKeysOfClassesObjectsOfClassesFromDataError(keyClasses: NSSet, valueClasses: NSSet, data: NSData): NSDictionary; + static unarchivedObjectOfClassFromDataError(cls: typeof NSObject, data: NSData): any; static unarchivedObjectOfClassesFromDataError(classes: NSSet, data: NSData): any; @@ -6404,7 +6430,9 @@ declare const enum NSNetServicesError { InvalidError = -72006, - TimeoutError = -72007 + TimeoutError = -72007, + + MissingRequiredConfigurationError = -72008 } declare var NSNetServicesErrorCode: string; @@ -7723,6 +7751,8 @@ declare class NSProcessInfo extends NSObject { readonly hostName: string; + readonly iOSAppOnMac: boolean; + readonly lowPowerModeEnabled: boolean; readonly macCatalystApp: boolean; @@ -8880,6 +8910,8 @@ declare class NSString extends NSObject implements CKRecordValue, CNKeyDescripto constructor(o: { bytes: interop.Pointer | interop.Reference; length: number; encoding: number; }); + constructor(o: { bytesNoCopy: interop.Pointer | interop.Reference; length: number; encoding: number; deallocator: (p1: interop.Pointer | interop.Reference, p2: number) => void; }); + constructor(o: { bytesNoCopy: interop.Pointer | interop.Reference; length: number; encoding: number; freeWhenDone: boolean; }); constructor(o: { CString: string | interop.Pointer | interop.Reference; }); @@ -8892,6 +8924,8 @@ declare class NSString extends NSObject implements CKRecordValue, CNKeyDescripto constructor(o: { characters: interop.Pointer | interop.Reference; length: number; }); + constructor(o: { charactersNoCopy: interop.Pointer | interop.Reference; length: number; deallocator: (p1: interop.Pointer | interop.Reference, p2: number) => void; }); + constructor(o: { charactersNoCopy: interop.Pointer | interop.Reference; length: number; freeWhenDone: boolean; }); constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -9012,6 +9046,8 @@ declare class NSString extends NSObject implements CKRecordValue, CNKeyDescripto initWithBytesLengthEncoding(bytes: interop.Pointer | interop.Reference, len: number, encoding: number): this; + initWithBytesNoCopyLengthEncodingDeallocator(bytes: interop.Pointer | interop.Reference, len: number, encoding: number, deallocator: (p1: interop.Pointer | interop.Reference, p2: number) => void): this; + initWithBytesNoCopyLengthEncodingFreeWhenDone(bytes: interop.Pointer | interop.Reference, len: number, encoding: number, freeBuffer: boolean): this; initWithCString(bytes: string | interop.Pointer | interop.Reference): this; @@ -9024,6 +9060,8 @@ declare class NSString extends NSObject implements CKRecordValue, CNKeyDescripto initWithCharactersLength(characters: interop.Pointer | interop.Reference, length: number): this; + initWithCharactersNoCopyLengthDeallocator(chars: interop.Pointer | interop.Reference, len: number, deallocator: (p1: interop.Pointer | interop.Reference, p2: number) => void): this; + initWithCharactersNoCopyLengthFreeWhenDone(characters: interop.Pointer | interop.Reference, length: number, freeBuffer: boolean): this; initWithCoder(coder: NSCoder): this; @@ -9140,14 +9178,20 @@ declare class NSString extends NSObject implements CKRecordValue, CNKeyDescripto sizeWithFontMinFontSizeActualFontSizeForWidthLineBreakMode(font: UIFont, minFontSize: number, actualFontSize: interop.Pointer | interop.Reference, width: number, lineBreakMode: NSLineBreakMode): CGSize; + sr_sensorForDeletionRecordsFromSensor(): string; + stringByAddingPercentEncodingWithAllowedCharacters(allowedCharacters: NSCharacterSet): string; stringByAddingPercentEscapesUsingEncoding(enc: number): string; stringByAppendingPathComponent(str: string): string; + stringByAppendingPathComponentConformingToType(partialName: string, contentType: UTType): string; + stringByAppendingPathExtension(str: string): string; + stringByAppendingPathExtensionForType(contentType: UTType): string; + stringByAppendingString(aString: string): string; stringByApplyingTransformReverse(transform: string, reverse: boolean): string; @@ -9245,6 +9289,10 @@ declare const enum NSStringEnumerationOptions { BySentences = 4, + ByCaretPositions = 5, + + ByDeletionClusters = 6, + Reverse = 256, SubstringNotRequired = 512, @@ -9804,10 +9852,14 @@ declare class NSURL extends NSObject implements NSCopying, NSItemProviderReading URLByAppendingPathComponent(pathComponent: string): NSURL; + URLByAppendingPathComponentConformingToType(partialName: string, contentType: UTType): NSURL; + URLByAppendingPathComponentIsDirectory(pathComponent: string, isDirectory: boolean): NSURL; URLByAppendingPathExtension(pathExtension: string): NSURL; + URLByAppendingPathExtensionForType(contentType: UTType): NSURL; + bookmarkDataWithOptionsIncludingResourceValuesForKeysRelativeToURLError(options: NSURLBookmarkCreationOptions, keys: NSArray | string[], relativeURL: NSURL): NSData; checkPromisedItemIsReachableAndReturnError(): boolean; @@ -10214,6 +10266,8 @@ declare var NSURLContentAccessDateKey: string; declare var NSURLContentModificationDateKey: string; +declare var NSURLContentTypeKey: string; + declare var NSURLCreationDateKey: string; declare class NSURLCredential extends NSObject implements NSCopying, NSSecureCoding { @@ -10446,6 +10500,8 @@ declare const NSURLErrorZeroByteResource: number; declare var NSURLFileAllocatedSizeKey: string; +declare var NSURLFileContentIdentifierKey: string; + declare var NSURLFileProtectionComplete: string; declare var NSURLFileProtectionCompleteUnlessOpen: string; @@ -10502,10 +10558,14 @@ declare var NSURLIsMountTriggerKey: string; declare var NSURLIsPackageKey: string; +declare var NSURLIsPurgeableKey: string; + declare var NSURLIsReadableKey: string; declare var NSURLIsRegularFileKey: string; +declare var NSURLIsSparseKey: string; + declare var NSURLIsSymbolicLinkKey: string; declare var NSURLIsSystemImmutableKey: string; @@ -10532,6 +10592,10 @@ declare var NSURLLocalizedNameKey: string; declare var NSURLLocalizedTypeDescriptionKey: string; +declare var NSURLMayHaveExtendedAttributesKey: string; + +declare var NSURLMayShareFileContentKey: string; + declare var NSURLNameKey: string; declare var NSURLParentDirectoryURLKey: string; @@ -11235,6 +11299,19 @@ declare class NSURLSessionTaskMetrics extends NSObject { readonly transactionMetrics: NSArray; } +declare const enum NSURLSessionTaskMetricsDomainResolutionProtocol { + + Unknown = 0, + + UDP = 1, + + TCP = 2, + + TLS = 3, + + HTTPS = 4 +} + declare const enum NSURLSessionTaskMetricsResourceFetchType { Unknown = 0, @@ -11293,6 +11370,8 @@ declare class NSURLSessionTaskTransactionMetrics extends NSObject { readonly domainLookupStartDate: Date; + readonly domainResolutionProtocol: NSURLSessionTaskMetricsDomainResolutionProtocol; + readonly expensive: boolean; readonly fetchStartDate: Date; @@ -11546,6 +11625,8 @@ declare var NSURLVolumeSupportsExtendedSecurityKey: string; declare var NSURLVolumeSupportsFileCloningKey: string; +declare var NSURLVolumeSupportsFileProtectionKey: string; + declare var NSURLVolumeSupportsHardLinksKey: string; declare var NSURLVolumeSupportsImmutableFilesKey: string; @@ -12666,6 +12747,8 @@ declare class NSUserActivity extends NSObject implements NSItemProviderReading, readonly activityType: string; + readonly appClipActivationPayload: APActivationPayload; + contentAttributeSet: CSSearchableItemAttributeSet; readonly contextIdentifierPath: NSArray; @@ -12704,6 +12787,8 @@ declare class NSUserActivity extends NSObject implements NSItemProviderReading, requiredUserInfoKeys: NSSet; + shortcutAvailability: INShortcutAvailabilityOptions; + suggestedInvocationPhrase: string; supportsContinuationStreams: boolean; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameController.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameController.d.ts index 04b548367..e5f3d64d4 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameController.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameController.d.ts @@ -6,7 +6,34 @@ interface GCAcceleration { } declare var GCAcceleration: interop.StructType; -declare class GCController extends NSObject { +declare class GCColor extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): GCColor; // inherited from NSObject + + static new(): GCColor; // inherited from NSObject + + readonly blue: number; + + readonly green: number; + + readonly red: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { red: number; green: number; blue: number; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithRedGreenBlue(red: number, green: number, blue: number): this; +} + +declare class GCController extends NSObject implements GCDevice { static alloc(): GCController; // inherited from NSObject @@ -24,13 +51,17 @@ declare class GCController extends NSObject { readonly attachedToDevice: boolean; + readonly battery: GCDeviceBattery; + controllerPausedHandler: (p1: GCController) => void; readonly extendedGamepad: GCExtendedGamepad; readonly gamepad: GCGamepad; - handlerQueue: NSObject; + readonly haptics: GCDeviceHaptics; + + readonly light: GCDeviceLight; readonly microGamepad: GCMicroGamepad; @@ -38,13 +69,53 @@ declare class GCController extends NSObject { playerIndex: GCControllerPlayerIndex; - readonly productCategory: string; - readonly snapshot: boolean; - readonly vendorName: string; + static readonly current: GCController; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + handlerQueue: NSObject; // inherited from GCDevice + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly physicalInputProfile: GCPhysicalInputProfile; // inherited from GCDevice + + readonly productCategory: string; // inherited from GCDevice + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly vendorName: string; // inherited from GCDevice + + readonly // inherited from NSObjectProtocol capture(): GCController; + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare class GCControllerAxisInput extends GCControllerElement { @@ -70,6 +141,10 @@ declare class GCControllerButtonInput extends GCControllerElement { pressedChangedHandler: (p1: GCControllerButtonInput, p2: number, p3: boolean) => void; + readonly touched: boolean; + + touchedChangedHandler: (p1: GCControllerButtonInput, p2: number, p3: boolean, p4: boolean) => void; + readonly value: number; valueChangedHandler: (p1: GCControllerButtonInput, p2: number, p3: boolean) => void; @@ -77,10 +152,14 @@ declare class GCControllerButtonInput extends GCControllerElement { setValue(value: number): void; } +declare var GCControllerDidBecomeCurrentNotification: string; + declare var GCControllerDidConnectNotification: string; declare var GCControllerDidDisconnectNotification: string; +declare var GCControllerDidStopBeingCurrentNotification: string; + declare class GCControllerDirectionPad extends GCControllerElement { static alloc(): GCControllerDirectionPad; // inherited from NSObject @@ -110,9 +189,23 @@ declare class GCControllerElement extends NSObject { static new(): GCControllerElement; // inherited from NSObject + readonly aliases: NSSet; + readonly analog: boolean; + readonly boundToSystemGesture: boolean; + readonly collection: GCControllerElement; + + localizedName: string; + + preferredSystemGestureState: GCSystemGestureState; + + sfSymbolsName: string; + + unmappedLocalizedName: string; + + unmappedSfSymbolsName: string; } declare const enum GCControllerPlayerIndex { @@ -128,10 +221,117 @@ declare const enum GCControllerPlayerIndex { Index4 = 3 } +declare class GCControllerTouchpad extends GCControllerElement { + + static alloc(): GCControllerTouchpad; // inherited from NSObject + + static new(): GCControllerTouchpad; // inherited from NSObject + + readonly button: GCControllerButtonInput; + + reportsAbsoluteTouchSurfaceValues: boolean; + + touchDown: (p1: GCControllerTouchpad, p2: number, p3: number, p4: number, p5: boolean) => void; + + touchMoved: (p1: GCControllerTouchpad, p2: number, p3: number, p4: number, p5: boolean) => void; + + readonly touchState: GCTouchState; + + readonly touchSurface: GCControllerDirectionPad; + + touchUp: (p1: GCControllerTouchpad, p2: number, p3: number, p4: number, p5: boolean) => void; + + setValueForXAxisYAxisTouchDownButtonValue(xAxis: number, yAxis: number, touchDown: boolean, buttonValue: number): void; +} + declare var GCCurrentExtendedGamepadSnapshotDataVersion: GCExtendedGamepadSnapshotDataVersion; declare var GCCurrentMicroGamepadSnapshotDataVersion: GCMicroGamepadSnapshotDataVersion; +interface GCDevice extends NSObjectProtocol { + + handlerQueue: NSObject; + + physicalInputProfile: GCPhysicalInputProfile; + + productCategory: string; + + vendorName: string; +} +declare var GCDevice: { + + prototype: GCDevice; +}; + +declare class GCDeviceBattery extends NSObject { + + static alloc(): GCDeviceBattery; // inherited from NSObject + + static new(): GCDeviceBattery; // inherited from NSObject + + readonly batteryLevel: number; + + readonly batteryState: GCDeviceBatteryState; +} + +declare const enum GCDeviceBatteryState { + + Unknown = -1, + + Discharging = 0, + + Charging = 1, + + Full = 2 +} + +declare class GCDeviceCursor extends GCControllerDirectionPad { + + static alloc(): GCDeviceCursor; // inherited from NSObject + + static new(): GCDeviceCursor; // inherited from NSObject +} + +declare class GCDeviceHaptics extends NSObject { + + static alloc(): GCDeviceHaptics; // inherited from NSObject + + static new(): GCDeviceHaptics; // inherited from NSObject + + readonly supportedLocalities: NSSet; + + createEngineWithLocality(locality: string): CHHapticEngine; +} + +declare class GCDeviceLight extends NSObject { + + static alloc(): GCDeviceLight; // inherited from NSObject + + static new(): GCDeviceLight; // inherited from NSObject + + color: GCColor; +} + +declare class GCDirectionalGamepad extends GCMicroGamepad { + + static alloc(): GCDirectionalGamepad; // inherited from NSObject + + static new(): GCDirectionalGamepad; // inherited from NSObject +} + +declare class GCDualShockGamepad extends GCExtendedGamepad { + + static alloc(): GCDualShockGamepad; // inherited from NSObject + + static new(): GCDualShockGamepad; // inherited from NSObject + + readonly touchpadButton: GCControllerButtonInput; + + readonly touchpadPrimary: GCControllerDirectionPad; + + readonly touchpadSecondary: GCControllerDirectionPad; +} + interface GCEulerAngles { pitch: number; yaw: number; @@ -148,7 +348,7 @@ declare class GCEventViewController extends UIViewController { controllerUserInteractionEnabled: boolean; } -declare class GCExtendedGamepad extends NSObject { +declare class GCExtendedGamepad extends GCPhysicalInputProfile { static alloc(): GCExtendedGamepad; // inherited from NSObject @@ -158,6 +358,8 @@ declare class GCExtendedGamepad extends NSObject { readonly buttonB: GCControllerButtonInput; + readonly buttonHome: GCControllerButtonInput; + readonly buttonMenu: GCControllerButtonInput; readonly buttonOptions: GCControllerButtonInput; @@ -264,7 +466,7 @@ declare const enum GCExtendedGamepadSnapshotDataVersion { Version2 = 257 } -declare class GCGamepad extends NSObject { +declare class GCGamepad extends GCPhysicalInputProfile { static alloc(): GCGamepad; // inherited from NSObject @@ -324,7 +526,645 @@ declare class GCGamepadSnapshot extends GCGamepad { initWithSnapshotData(data: NSData): this; } -declare class GCMicroGamepad extends NSObject { +declare var GCHapticDurationInfinite: number; + +declare var GCHapticsLocalityAll: string; + +declare var GCHapticsLocalityDefault: string; + +declare var GCHapticsLocalityHandles: string; + +declare var GCHapticsLocalityLeftHandle: string; + +declare var GCHapticsLocalityLeftTrigger: string; + +declare var GCHapticsLocalityRightHandle: string; + +declare var GCHapticsLocalityRightTrigger: string; + +declare var GCHapticsLocalityTriggers: string; + +declare var GCInputButtonA: string; + +declare var GCInputButtonB: string; + +declare var GCInputButtonHome: string; + +declare var GCInputButtonMenu: string; + +declare var GCInputButtonOptions: string; + +declare var GCInputButtonX: string; + +declare var GCInputButtonY: string; + +declare var GCInputDirectionPad: string; + +declare var GCInputDualShockTouchpadButton: string; + +declare var GCInputDualShockTouchpadOne: string; + +declare var GCInputDualShockTouchpadTwo: string; + +declare var GCInputLeftShoulder: string; + +declare var GCInputLeftThumbstick: string; + +declare var GCInputLeftThumbstickButton: string; + +declare var GCInputLeftTrigger: string; + +declare var GCInputRightShoulder: string; + +declare var GCInputRightThumbstick: string; + +declare var GCInputRightThumbstickButton: string; + +declare var GCInputRightTrigger: string; + +declare var GCInputXboxPaddleFour: string; + +declare var GCInputXboxPaddleOne: string; + +declare var GCInputXboxPaddleThree: string; + +declare var GCInputXboxPaddleTwo: string; + +declare var GCKeyA: string; + +declare var GCKeyApplication: string; + +declare var GCKeyB: string; + +declare var GCKeyBackslash: string; + +declare var GCKeyC: string; + +declare var GCKeyCapsLock: string; + +declare var GCKeyCloseBracket: string; + +declare var GCKeyCodeApplication: number; + +declare var GCKeyCodeBackslash: number; + +declare var GCKeyCodeCapsLock: number; + +declare var GCKeyCodeCloseBracket: number; + +declare var GCKeyCodeComma: number; + +declare var GCKeyCodeDeleteForward: number; + +declare var GCKeyCodeDeleteOrBackspace: number; + +declare var GCKeyCodeDownArrow: number; + +declare var GCKeyCodeEight: number; + +declare var GCKeyCodeEnd: number; + +declare var GCKeyCodeEqualSign: number; + +declare var GCKeyCodeEscape: number; + +declare var GCKeyCodeF1: number; + +declare var GCKeyCodeF10: number; + +declare var GCKeyCodeF11: number; + +declare var GCKeyCodeF12: number; + +declare var GCKeyCodeF2: number; + +declare var GCKeyCodeF3: number; + +declare var GCKeyCodeF4: number; + +declare var GCKeyCodeF5: number; + +declare var GCKeyCodeF6: number; + +declare var GCKeyCodeF7: number; + +declare var GCKeyCodeF8: number; + +declare var GCKeyCodeF9: number; + +declare var GCKeyCodeFive: number; + +declare var GCKeyCodeFour: number; + +declare var GCKeyCodeGraveAccentAndTilde: number; + +declare var GCKeyCodeHome: number; + +declare var GCKeyCodeHyphen: number; + +declare var GCKeyCodeInsert: number; + +declare var GCKeyCodeInternational1: number; + +declare var GCKeyCodeInternational2: number; + +declare var GCKeyCodeInternational3: number; + +declare var GCKeyCodeInternational4: number; + +declare var GCKeyCodeInternational5: number; + +declare var GCKeyCodeInternational6: number; + +declare var GCKeyCodeInternational7: number; + +declare var GCKeyCodeInternational8: number; + +declare var GCKeyCodeInternational9: number; + +declare var GCKeyCodeKeyA: number; + +declare var GCKeyCodeKeyB: number; + +declare var GCKeyCodeKeyC: number; + +declare var GCKeyCodeKeyD: number; + +declare var GCKeyCodeKeyE: number; + +declare var GCKeyCodeKeyF: number; + +declare var GCKeyCodeKeyG: number; + +declare var GCKeyCodeKeyH: number; + +declare var GCKeyCodeKeyI: number; + +declare var GCKeyCodeKeyJ: number; + +declare var GCKeyCodeKeyK: number; + +declare var GCKeyCodeKeyL: number; + +declare var GCKeyCodeKeyM: number; + +declare var GCKeyCodeKeyN: number; + +declare var GCKeyCodeKeyO: number; + +declare var GCKeyCodeKeyP: number; + +declare var GCKeyCodeKeyQ: number; + +declare var GCKeyCodeKeyR: number; + +declare var GCKeyCodeKeyS: number; + +declare var GCKeyCodeKeyT: number; + +declare var GCKeyCodeKeyU: number; + +declare var GCKeyCodeKeyV: number; + +declare var GCKeyCodeKeyW: number; + +declare var GCKeyCodeKeyX: number; + +declare var GCKeyCodeKeyY: number; + +declare var GCKeyCodeKeyZ: number; + +declare var GCKeyCodeKeypad0: number; + +declare var GCKeyCodeKeypad1: number; + +declare var GCKeyCodeKeypad2: number; + +declare var GCKeyCodeKeypad3: number; + +declare var GCKeyCodeKeypad4: number; + +declare var GCKeyCodeKeypad5: number; + +declare var GCKeyCodeKeypad6: number; + +declare var GCKeyCodeKeypad7: number; + +declare var GCKeyCodeKeypad8: number; + +declare var GCKeyCodeKeypad9: number; + +declare var GCKeyCodeKeypadAsterisk: number; + +declare var GCKeyCodeKeypadEnter: number; + +declare var GCKeyCodeKeypadEqualSign: number; + +declare var GCKeyCodeKeypadHyphen: number; + +declare var GCKeyCodeKeypadNumLock: number; + +declare var GCKeyCodeKeypadPeriod: number; + +declare var GCKeyCodeKeypadPlus: number; + +declare var GCKeyCodeKeypadSlash: number; + +declare var GCKeyCodeLANG1: number; + +declare var GCKeyCodeLANG2: number; + +declare var GCKeyCodeLANG3: number; + +declare var GCKeyCodeLANG4: number; + +declare var GCKeyCodeLANG5: number; + +declare var GCKeyCodeLANG6: number; + +declare var GCKeyCodeLANG7: number; + +declare var GCKeyCodeLANG8: number; + +declare var GCKeyCodeLANG9: number; + +declare var GCKeyCodeLeftAlt: number; + +declare var GCKeyCodeLeftArrow: number; + +declare var GCKeyCodeLeftControl: number; + +declare var GCKeyCodeLeftGUI: number; + +declare var GCKeyCodeLeftShift: number; + +declare var GCKeyCodeNine: number; + +declare var GCKeyCodeNonUSBackslash: number; + +declare var GCKeyCodeNonUSPound: number; + +declare var GCKeyCodeOne: number; + +declare var GCKeyCodeOpenBracket: number; + +declare var GCKeyCodePageDown: number; + +declare var GCKeyCodePageUp: number; + +declare var GCKeyCodePause: number; + +declare var GCKeyCodePeriod: number; + +declare var GCKeyCodePower: number; + +declare var GCKeyCodePrintScreen: number; + +declare var GCKeyCodeQuote: number; + +declare var GCKeyCodeReturnOrEnter: number; + +declare var GCKeyCodeRightAlt: number; + +declare var GCKeyCodeRightArrow: number; + +declare var GCKeyCodeRightControl: number; + +declare var GCKeyCodeRightGUI: number; + +declare var GCKeyCodeRightShift: number; + +declare var GCKeyCodeScrollLock: number; + +declare var GCKeyCodeSemicolon: number; + +declare var GCKeyCodeSeven: number; + +declare var GCKeyCodeSix: number; + +declare var GCKeyCodeSlash: number; + +declare var GCKeyCodeSpacebar: number; + +declare var GCKeyCodeTab: number; + +declare var GCKeyCodeThree: number; + +declare var GCKeyCodeTwo: number; + +declare var GCKeyCodeUpArrow: number; + +declare var GCKeyCodeZero: number; + +declare var GCKeyComma: string; + +declare var GCKeyD: string; + +declare var GCKeyDeleteForward: string; + +declare var GCKeyDeleteOrBackspace: string; + +declare var GCKeyDownArrow: string; + +declare var GCKeyE: string; + +declare var GCKeyEight: string; + +declare var GCKeyEnd: string; + +declare var GCKeyEqualSign: string; + +declare var GCKeyEscape: string; + +declare var GCKeyF: string; + +declare var GCKeyF1: string; + +declare var GCKeyF10: string; + +declare var GCKeyF11: string; + +declare var GCKeyF12: string; + +declare var GCKeyF2: string; + +declare var GCKeyF3: string; + +declare var GCKeyF4: string; + +declare var GCKeyF5: string; + +declare var GCKeyF6: string; + +declare var GCKeyF7: string; + +declare var GCKeyF8: string; + +declare var GCKeyF9: string; + +declare var GCKeyFive: string; + +declare var GCKeyFour: string; + +declare var GCKeyG: string; + +declare var GCKeyGraveAccentAndTilde: string; + +declare var GCKeyH: string; + +declare var GCKeyHome: string; + +declare var GCKeyHyphen: string; + +declare var GCKeyI: string; + +declare var GCKeyInsert: string; + +declare var GCKeyInternational1: string; + +declare var GCKeyInternational2: string; + +declare var GCKeyInternational3: string; + +declare var GCKeyInternational4: string; + +declare var GCKeyInternational5: string; + +declare var GCKeyInternational6: string; + +declare var GCKeyInternational7: string; + +declare var GCKeyInternational8: string; + +declare var GCKeyInternational9: string; + +declare var GCKeyJ: string; + +declare var GCKeyK: string; + +declare var GCKeyKeypad0: string; + +declare var GCKeyKeypad1: string; + +declare var GCKeyKeypad2: string; + +declare var GCKeyKeypad3: string; + +declare var GCKeyKeypad4: string; + +declare var GCKeyKeypad5: string; + +declare var GCKeyKeypad6: string; + +declare var GCKeyKeypad7: string; + +declare var GCKeyKeypad8: string; + +declare var GCKeyKeypad9: string; + +declare var GCKeyKeypadAsterisk: string; + +declare var GCKeyKeypadEnter: string; + +declare var GCKeyKeypadEqualSign: string; + +declare var GCKeyKeypadHyphen: string; + +declare var GCKeyKeypadNumLock: string; + +declare var GCKeyKeypadPeriod: string; + +declare var GCKeyKeypadPlus: string; + +declare var GCKeyKeypadSlash: string; + +declare var GCKeyL: string; + +declare var GCKeyLANG1: string; + +declare var GCKeyLANG2: string; + +declare var GCKeyLANG3: string; + +declare var GCKeyLANG4: string; + +declare var GCKeyLANG5: string; + +declare var GCKeyLANG6: string; + +declare var GCKeyLANG7: string; + +declare var GCKeyLANG8: string; + +declare var GCKeyLANG9: string; + +declare var GCKeyLeftAlt: string; + +declare var GCKeyLeftArrow: string; + +declare var GCKeyLeftControl: string; + +declare var GCKeyLeftGUI: string; + +declare var GCKeyLeftShift: string; + +declare var GCKeyM: string; + +declare var GCKeyN: string; + +declare var GCKeyNine: string; + +declare var GCKeyNonUSBackslash: string; + +declare var GCKeyNonUSPound: string; + +declare var GCKeyO: string; + +declare var GCKeyOne: string; + +declare var GCKeyOpenBracket: string; + +declare var GCKeyP: string; + +declare var GCKeyPageDown: string; + +declare var GCKeyPageUp: string; + +declare var GCKeyPause: string; + +declare var GCKeyPeriod: string; + +declare var GCKeyPower: string; + +declare var GCKeyPrintScreen: string; + +declare var GCKeyQ: string; + +declare var GCKeyQuote: string; + +declare var GCKeyR: string; + +declare var GCKeyReturnOrEnter: string; + +declare var GCKeyRightAlt: string; + +declare var GCKeyRightArrow: string; + +declare var GCKeyRightControl: string; + +declare var GCKeyRightGUI: string; + +declare var GCKeyRightShift: string; + +declare var GCKeyS: string; + +declare var GCKeyScrollLock: string; + +declare var GCKeySemicolon: string; + +declare var GCKeySeven: string; + +declare var GCKeySix: string; + +declare var GCKeySlash: string; + +declare var GCKeySpacebar: string; + +declare var GCKeyT: string; + +declare var GCKeyTab: string; + +declare var GCKeyThree: string; + +declare var GCKeyTwo: string; + +declare var GCKeyU: string; + +declare var GCKeyUpArrow: string; + +declare var GCKeyV: string; + +declare var GCKeyW: string; + +declare var GCKeyX: string; + +declare var GCKeyY: string; + +declare var GCKeyZ: string; + +declare var GCKeyZero: string; + +declare class GCKeyboard extends NSObject implements GCDevice { + + static alloc(): GCKeyboard; // inherited from NSObject + + static new(): GCKeyboard; // inherited from NSObject + + readonly keyboardInput: GCKeyboardInput; + + static readonly coalescedKeyboard: GCKeyboard; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + handlerQueue: NSObject; // inherited from GCDevice + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly physicalInputProfile: GCPhysicalInputProfile; // inherited from GCDevice + + readonly productCategory: string; // inherited from GCDevice + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly vendorName: string; // inherited from GCDevice + + readonly // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + +declare var GCKeyboardDidConnectNotification: string; + +declare var GCKeyboardDidDisconnectNotification: string; + +declare class GCKeyboardInput extends GCPhysicalInputProfile { + + static alloc(): GCKeyboardInput; // inherited from NSObject + + static new(): GCKeyboardInput; // inherited from NSObject + + readonly anyKeyPressed: boolean; + + keyChangedHandler: (p1: GCKeyboardInput, p2: GCControllerButtonInput, p3: number, p4: boolean) => void; + + buttonForKeyCode(code: number): GCControllerButtonInput; +} + +declare class GCMicroGamepad extends GCPhysicalInputProfile { static alloc(): GCMicroGamepad; // inherited from NSObject @@ -403,20 +1243,34 @@ declare class GCMotion extends NSObject { static new(): GCMotion; // inherited from NSObject + readonly acceleration: GCAcceleration; + readonly attitude: GCQuaternion; readonly controller: GCController; readonly gravity: GCAcceleration; + readonly hasAttitude: boolean; + readonly hasAttitudeAndRotationRate: boolean; + readonly hasGravityAndUserAcceleration: boolean; + + readonly hasRotationRate: boolean; + readonly rotationRate: GCRotationRate; + sensorsActive: boolean; + + readonly sensorsRequireManualActivation: boolean; + readonly userAcceleration: GCAcceleration; valueChangedHandler: (p1: GCMotion) => void; + setAcceleration(acceleration: GCAcceleration): void; + setAttitude(attitude: GCQuaternion): void; setGravity(gravity: GCAcceleration): void; @@ -428,6 +1282,121 @@ declare class GCMotion extends NSObject { setUserAcceleration(userAcceleration: GCAcceleration): void; } +declare class GCMouse extends NSObject implements GCDevice { + + static alloc(): GCMouse; // inherited from NSObject + + static mice(): NSArray; + + static new(): GCMouse; // inherited from NSObject + + readonly mouseInput: GCMouseInput; + + static readonly current: GCMouse; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + handlerQueue: NSObject; // inherited from GCDevice + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly physicalInputProfile: GCPhysicalInputProfile; // inherited from GCDevice + + readonly productCategory: string; // inherited from GCDevice + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly vendorName: string; // inherited from GCDevice + + readonly // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + +declare var GCMouseDidBecomeCurrentNotification: string; + +declare var GCMouseDidConnectNotification: string; + +declare var GCMouseDidDisconnectNotification: string; + +declare var GCMouseDidStopBeingCurrentNotification: string; + +declare class GCMouseInput extends GCPhysicalInputProfile { + + static alloc(): GCMouseInput; // inherited from NSObject + + static new(): GCMouseInput; // inherited from NSObject + + readonly auxiliaryButtons: NSArray; + + readonly leftButton: GCControllerButtonInput; + + readonly middleButton: GCControllerButtonInput; + + mouseMovedHandler: (p1: GCMouseInput, p2: number, p3: number) => void; + + readonly rightButton: GCControllerButtonInput; + + readonly scroll: GCDeviceCursor; +} + +declare class GCPhysicalInputProfile extends NSObject { + + static alloc(): GCPhysicalInputProfile; // inherited from NSObject + + static new(): GCPhysicalInputProfile; // inherited from NSObject + + readonly allAxes: NSSet; + + readonly allButtons: NSSet; + + readonly allDpads: NSSet; + + readonly allElements: NSSet; + + readonly axes: NSDictionary; + + readonly buttons: NSDictionary; + + readonly device: GCDevice; + + readonly dpads: NSDictionary; + + readonly elements: NSDictionary; + + readonly lastEventTimestamp: number; + + capture(): this; + + objectForKeyedSubscript(key: string): GCControllerElement; + + setStateFromPhysicalInput(physicalInput: GCPhysicalInputProfile): void; +} + interface GCQuaternion { x: number; y: number; @@ -443,6 +1412,39 @@ interface GCRotationRate { } declare var GCRotationRate: interop.StructType; +declare const enum GCSystemGestureState { + + Enabled = 0, + + AlwaysReceive = 1, + + Disabled = 2 +} + +declare const enum GCTouchState { + + Up = 0, + + Down = 1, + + Moving = 2 +} + +declare class GCXboxGamepad extends GCExtendedGamepad { + + static alloc(): GCXboxGamepad; // inherited from NSObject + + static new(): GCXboxGamepad; // inherited from NSObject + + readonly paddleButton1: GCControllerButtonInput; + + readonly paddleButton2: GCControllerButtonInput; + + readonly paddleButton3: GCControllerButtonInput; + + readonly paddleButton4: GCControllerButtonInput; +} + declare function NSDataFromGCExtendedGamepadSnapShotDataV100(snapshotData: interop.Pointer | interop.Reference): NSData; declare function NSDataFromGCExtendedGamepadSnapshotData(snapshotData: interop.Pointer | interop.Reference): NSData; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameKit.d.ts index 64ac56d73..a01622f55 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!GameKit.d.ts @@ -1,4 +1,42 @@ +declare class GKAccessPoint extends NSObject { + + static alloc(): GKAccessPoint; // inherited from NSObject + + static new(): GKAccessPoint; // inherited from NSObject + + active: boolean; + + readonly frameInScreenCoordinates: CGRect; + + readonly isPresentingGameCenter: boolean; + + location: GKAccessPointLocation; + + parentWindow: UIWindow; + + showHighlights: boolean; + + readonly visible: boolean; + + static readonly shared: GKAccessPoint; + + triggerAccessPointWithHandler(handler: () => void): void; + + triggerAccessPointWithStateHandler(state: GKGameCenterViewControllerState, handler: () => void): void; +} + +declare const enum GKAccessPointLocation { + + TopLeading = 0, + + TopTrailing = 1, + + BottomLeading = 2, + + BottomTrailing = 3 +} + declare class GKAchievement extends NSObject implements NSCoding, NSSecureCoding { static alloc(): GKAchievement; // inherited from NSObject @@ -55,8 +93,6 @@ declare class GKAchievement extends NSObject implements NSCoding, NSSecureCoding issueChallengeToPlayersMessage(playerIDs: NSArray | string[], message: string): void; - issueChallengeToPlayersMessageMethod(playerIDs: NSArray | string[], message: string): void; - reportAchievementWithCompletionHandler(completionHandler: (p1: NSError) => void): void; selectChallengeablePlayerIDsWithCompletionHandler(playerIDs: NSArray | string[], completionHandler: (p1: NSArray, p2: NSError) => void): void; @@ -132,15 +168,6 @@ declare var GKAchievementViewControllerDelegate: { prototype: GKAchievementViewControllerDelegate; }; -declare const enum GKAuthenticationType { - - AuthenticatingWithoutUI = 0, - - AuthenticatingWithGreenBuddyUI = 1, - - AuthenticatingWithAuthKitInvocation = 2 -} - declare class GKBasePlayer extends NSObject { static alloc(): GKBasePlayer; // inherited from NSObject @@ -323,7 +350,13 @@ declare const enum GKErrorCode { RestrictedToAutomatch = 30, - APINotAvailable = 31 + APINotAvailable = 31, + + NotAuthorized = 32, + + ConnectionTimeout = 33, + + APIObsolete = 34 } declare var GKErrorDomain: string; @@ -384,6 +417,22 @@ declare class GKGameCenterViewController extends UINavigationController { leaderboardTimeScope: GKLeaderboardTimeScope; viewState: GKGameCenterViewControllerState; + + constructor(o: { achievementID: string; }); + + constructor(o: { leaderboardID: string; playerScope: GKLeaderboardPlayerScope; timeScope: GKLeaderboardTimeScope; }); + + constructor(o: { leaderboard: GKLeaderboard; playerScope: GKLeaderboardPlayerScope; }); + + constructor(o: { state: GKGameCenterViewControllerState; }); + + initWithAchievementID(achievementID: string): this; + + initWithLeaderboardIDPlayerScopeTimeScope(leaderboardID: string, playerScope: GKLeaderboardPlayerScope, timeScope: GKLeaderboardTimeScope): this; + + initWithLeaderboardPlayerScope(leaderboard: GKLeaderboard, playerScope: GKLeaderboardPlayerScope): this; + + initWithState(state: GKGameCenterViewControllerState): this; } declare const enum GKGameCenterViewControllerState { @@ -394,7 +443,11 @@ declare const enum GKGameCenterViewControllerState { Achievements = 1, - Challenges = 2 + Challenges = 2, + + LocalPlayerProfile = 3, + + Dashboard = 4 } declare class GKGameSession extends NSObject { @@ -569,12 +622,20 @@ declare class GKLeaderboard extends NSObject { static loadLeaderboardsWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + static loadLeaderboardsWithIDsCompletionHandler(leaderboardIDs: NSArray | string[], completionHandler: (p1: NSArray, p2: NSError) => void): void; + static new(): GKLeaderboard; // inherited from NSObject static setDefaultLeaderboardWithCompletionHandler(leaderboardIdentifier: string, completionHandler: (p1: NSError) => void): void; + static submitScoreContextPlayerLeaderboardIDsCompletionHandler(score: number, context: number, player: GKPlayer, leaderboardIDs: NSArray | string[], completionHandler: (p1: NSError) => void): void; + + readonly baseLeaderboardID: string; + category: string; + readonly duration: number; + readonly groupIdentifier: string; identifier: string; @@ -585,16 +646,22 @@ declare class GKLeaderboard extends NSObject { readonly maxRange: number; + readonly nextStartDate: Date; + playerScope: GKLeaderboardPlayerScope; range: NSRange; readonly scores: NSArray; + readonly startDate: Date; + timeScope: GKLeaderboardTimeScope; readonly title: string; + readonly type: GKLeaderboardType; + constructor(o: { playerIDs: NSArray | string[]; }); constructor(o: { players: NSArray | GKPlayer[]; }); @@ -603,9 +670,38 @@ declare class GKLeaderboard extends NSObject { initWithPlayers(players: NSArray | GKPlayer[]): this; + loadEntriesForPlayerScopeTimeScopeRangeCompletionHandler(playerScope: GKLeaderboardPlayerScope, timeScope: GKLeaderboardTimeScope, range: NSRange, completionHandler: (p1: GKLeaderboardEntry, p2: NSArray, p3: number, p4: NSError) => void): void; + + loadEntriesForPlayersTimeScopeCompletionHandler(players: NSArray | GKPlayer[], timeScope: GKLeaderboardTimeScope, completionHandler: (p1: GKLeaderboardEntry, p2: NSArray, p3: NSError) => void): void; + loadImageWithCompletionHandler(completionHandler: (p1: UIImage, p2: NSError) => void): void; + loadPreviousOccurrenceWithCompletionHandler(completionHandler: (p1: GKLeaderboard, p2: NSError) => void): void; + loadScoresWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + + submitScoreContextPlayerCompletionHandler(score: number, context: number, player: GKPlayer, completionHandler: (p1: NSError) => void): void; +} + +declare class GKLeaderboardEntry extends NSObject { + + static alloc(): GKLeaderboardEntry; // inherited from NSObject + + static new(): GKLeaderboardEntry; // inherited from NSObject + + readonly context: number; + + readonly date: Date; + + readonly formattedScore: string; + + readonly player: GKPlayer; + + readonly rank: number; + + readonly score: number; + + challengeComposeControllerWithMessagePlayersCompletionHandler(message: string, players: NSArray | GKPlayer[], completionHandler: (p1: UIViewController, p2: boolean, p3: NSArray) => void): UIViewController; } declare const enum GKLeaderboardPlayerScope { @@ -615,6 +711,21 @@ declare const enum GKLeaderboardPlayerScope { FriendsOnly = 1 } +declare class GKLeaderboardScore extends NSObject { + + static alloc(): GKLeaderboardScore; // inherited from NSObject + + static new(): GKLeaderboardScore; // inherited from NSObject + + context: number; + + leaderboardID: string; + + player: GKPlayer; + + value: number; +} + declare class GKLeaderboardSet extends NSObject implements NSCoding, NSSecureCoding { static alloc(): GKLeaderboardSet; // inherited from NSObject @@ -640,6 +751,8 @@ declare class GKLeaderboardSet extends NSObject implements NSCoding, NSSecureCod loadImageWithCompletionHandler(completionHandler: (p1: UIImage, p2: NSError) => void): void; loadLeaderboardsWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + + loadLeaderboardsWithHandler(handler: (p1: NSArray, p2: NSError) => void): void; } declare const enum GKLeaderboardTimeScope { @@ -651,6 +764,13 @@ declare const enum GKLeaderboardTimeScope { AllTime = 2 } +declare const enum GKLeaderboardType { + + Classic = 0, + + Recurring = 1 +} + declare class GKLeaderboardViewController extends GKGameCenterViewController { static alloc(): GKLeaderboardViewController; // inherited from NSObject @@ -689,6 +809,8 @@ declare class GKLocalPlayer extends GKPlayer implements GKSavedGameListener { readonly multiplayerGamingRestricted: boolean; + readonly personalizedCommunicationRestricted: boolean; + readonly underage: boolean; static readonly local: GKLocalPlayer; @@ -715,6 +837,8 @@ declare class GKLocalPlayer extends GKPlayer implements GKSavedGameListener { deleteSavedGamesWithNameCompletionHandler(name: string, handler: (p1: NSError) => void): void; + fetchItemsForIdentityVerificationSignature(completionHandler: (p1: NSURL, p2: NSData, p3: NSData, p4: number, p5: NSError) => void): void; + fetchSavedGamesWithCompletionHandler(handler: (p1: NSArray, p2: NSError) => void): void; generateIdentityVerificationSignatureWithCompletionHandler(completionHandler: (p1: NSURL, p2: NSData, p3: NSData, p4: number, p5: NSError) => void): void; @@ -929,6 +1053,8 @@ declare class GKMatchmakerViewController extends UINavigationController { matchmakerDelegate: GKMatchmakerViewControllerDelegate; + matchmakingMode: GKMatchmakingMode; + constructor(o: { invite: GKInvite; }); constructor(o: { matchRequest: GKMatchRequest; }); @@ -967,6 +1093,15 @@ declare var GKMatchmakerViewControllerDelegate: { prototype: GKMatchmakerViewControllerDelegate; }; +declare const enum GKMatchmakingMode { + + Default = 0, + + NearbyOnly = 1, + + AutomatchOnly = 2 +} + declare class GKNotificationBanner extends NSObject { static alloc(): GKNotificationBanner; // inherited from NSObject @@ -988,7 +1123,9 @@ declare const enum GKPeerConnectionState { StateDisconnected = 3, - StateConnecting = 4 + StateConnecting = 4, + + StateConnectedRelay = 5 } declare const enum GKPeerPickerConnectionType { @@ -1055,6 +1192,8 @@ declare class GKPlayer extends GKBasePlayer { readonly isFriend: boolean; + readonly isInvitable: boolean; + readonly teamPlayerID: string; loadPhotoForSizeWithCompletionHandler(size: GKPhotoSize, completionHandler: (p1: UIImage, p2: NSError) => void): void; @@ -1075,6 +1214,8 @@ declare const enum GKPlayerConnectionState { declare var GKPlayerDidChangeNotificationName: string; +declare var GKPlayerIDNoLongerAvailable: string; + declare class GKSavedGame extends NSObject implements NSCopying { static alloc(): GKSavedGame; // inherited from NSObject @@ -1109,6 +1250,8 @@ declare class GKScore extends NSObject implements NSCoding, NSSecureCoding { static new(): GKScore; // inherited from NSObject + static reportLeaderboardScoresWithEligibleChallengesWithCompletionHandler(scores: NSArray | GKLeaderboardScore[], challenges: NSArray | GKChallenge[], completionHandler: (p1: NSError) => void): void; + static reportScoresWithCompletionHandler(scores: NSArray | GKScore[], completionHandler: (p1: NSError) => void): void; static reportScoresWithEligibleChallengesWithCompletionHandler(scores: NSArray | GKScore[], challenges: NSArray | GKChallenge[], completionHandler: (p1: NSError) => void): void; @@ -1163,8 +1306,6 @@ declare class GKScore extends NSObject implements NSCoding, NSSecureCoding { issueChallengeToPlayersMessage(playerIDs: NSArray | string[], message: string): void; - issueChallengeToPlayersMessageMethod(playerIDs: NSArray | string[], message: string): void; - reportScoreWithCompletionHandler(completionHandler: (p1: NSError) => void): void; } @@ -1451,6 +1592,8 @@ declare class GKTurnBasedMatch extends NSObject { endMatchInTurnWithMatchDataCompletionHandler(matchData: NSData, completionHandler: (p1: NSError) => void): void; + endMatchInTurnWithMatchDataLeaderboardScoresAchievementsCompletionHandler(matchData: NSData, scores: NSArray | GKLeaderboardScore[], achievements: NSArray | any[], completionHandler: (p1: NSError) => void): void; + endMatchInTurnWithMatchDataScoresAchievementsCompletionHandler(matchData: NSData, scores: NSArray | GKScore[], achievements: NSArray | GKAchievement[], completionHandler: (p1: NSError) => void): void; endTurnWithNextParticipantMatchDataCompletionHandler(nextParticipant: GKTurnBasedParticipant, matchData: NSData, completionHandler: (p1: NSError) => void): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!HealthKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!HealthKit.d.ts index 697eb31bf..bc0118a36 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!HealthKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!HealthKit.d.ts @@ -1,4 +1,30 @@ +declare const enum HKActivityMoveMode { + + ActiveEnergy = 1, + + AppleMoveTime = 2 +} + +declare class HKActivityMoveModeObject extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): HKActivityMoveModeObject; // inherited from NSObject + + static new(): HKActivityMoveModeObject; // inherited from NSObject + + readonly activityMoveMode: HKActivityMoveMode; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class HKActivitySummary extends NSObject implements NSCopying, NSSecureCoding { static alloc(): HKActivitySummary; // inherited from NSObject @@ -9,10 +35,16 @@ declare class HKActivitySummary extends NSObject implements NSCopying, NSSecureC activeEnergyBurnedGoal: HKQuantity; + activityMoveMode: HKActivityMoveMode; + appleExerciseTime: HKQuantity; appleExerciseTimeGoal: HKQuantity; + appleMoveTime: HKQuantity; + + appleMoveTimeGoal: HKQuantity; + appleStandHours: HKQuantity; appleStandHoursGoal: HKQuantity; @@ -67,6 +99,13 @@ declare class HKAnchoredObjectQuery extends HKQuery { initWithTypePredicateAnchorLimitResultsHandler(type: HKSampleType, predicate: NSPredicate, anchor: HKQueryAnchor, limit: number, handler: (p1: HKAnchoredObjectQuery, p2: NSArray, p3: NSArray, p4: HKQueryAnchor, p5: NSError) => void): this; } +declare const enum HKAppleECGAlgorithmVersion { + + Version1 = 1, + + Version2 = 2 +} + declare class HKAudiogramSample extends HKSample { static alloc(): HKAudiogramSample; // inherited from NSObject @@ -274,37 +313,140 @@ declare class HKCategoryType extends HKSampleType { static new(): HKCategoryType; // inherited from NSObject } +declare var HKCategoryTypeIdentifierAbdominalCramps: string; + +declare var HKCategoryTypeIdentifierAcne: string; + +declare var HKCategoryTypeIdentifierAppetiteChanges: string; + declare var HKCategoryTypeIdentifierAppleStandHour: string; declare var HKCategoryTypeIdentifierAudioExposureEvent: string; +declare var HKCategoryTypeIdentifierBladderIncontinence: string; + +declare var HKCategoryTypeIdentifierBloating: string; + +declare var HKCategoryTypeIdentifierBreastPain: string; + declare var HKCategoryTypeIdentifierCervicalMucusQuality: string; +declare var HKCategoryTypeIdentifierChestTightnessOrPain: string; + +declare var HKCategoryTypeIdentifierChills: string; + +declare var HKCategoryTypeIdentifierConstipation: string; + +declare var HKCategoryTypeIdentifierContraceptive: string; + +declare var HKCategoryTypeIdentifierCoughing: string; + +declare var HKCategoryTypeIdentifierDiarrhea: string; + +declare var HKCategoryTypeIdentifierDizziness: string; + +declare var HKCategoryTypeIdentifierDrySkin: string; + +declare var HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent: string; + +declare var HKCategoryTypeIdentifierFainting: string; + +declare var HKCategoryTypeIdentifierFatigue: string; + +declare var HKCategoryTypeIdentifierFever: string; + +declare var HKCategoryTypeIdentifierGeneralizedBodyAche: string; + +declare var HKCategoryTypeIdentifierHairLoss: string; + +declare var HKCategoryTypeIdentifierHandwashingEvent: string; + +declare var HKCategoryTypeIdentifierHeadache: string; + +declare var HKCategoryTypeIdentifierHeadphoneAudioExposureEvent: string; + +declare var HKCategoryTypeIdentifierHeartburn: string; + declare var HKCategoryTypeIdentifierHighHeartRateEvent: string; +declare var HKCategoryTypeIdentifierHotFlashes: string; + declare var HKCategoryTypeIdentifierIntermenstrualBleeding: string; declare var HKCategoryTypeIdentifierIrregularHeartRhythmEvent: string; +declare var HKCategoryTypeIdentifierLactation: string; + +declare var HKCategoryTypeIdentifierLossOfSmell: string; + +declare var HKCategoryTypeIdentifierLossOfTaste: string; + +declare var HKCategoryTypeIdentifierLowCardioFitnessEvent: string; + declare var HKCategoryTypeIdentifierLowHeartRateEvent: string; +declare var HKCategoryTypeIdentifierLowerBackPain: string; + +declare var HKCategoryTypeIdentifierMemoryLapse: string; + declare var HKCategoryTypeIdentifierMenstrualFlow: string; declare var HKCategoryTypeIdentifierMindfulSession: string; +declare var HKCategoryTypeIdentifierMoodChanges: string; + +declare var HKCategoryTypeIdentifierNausea: string; + +declare var HKCategoryTypeIdentifierNightSweats: string; + declare var HKCategoryTypeIdentifierOvulationTestResult: string; +declare var HKCategoryTypeIdentifierPelvicPain: string; + +declare var HKCategoryTypeIdentifierPregnancy: string; + +declare var HKCategoryTypeIdentifierRapidPoundingOrFlutteringHeartbeat: string; + +declare var HKCategoryTypeIdentifierRunnyNose: string; + declare var HKCategoryTypeIdentifierSexualActivity: string; +declare var HKCategoryTypeIdentifierShortnessOfBreath: string; + +declare var HKCategoryTypeIdentifierSinusCongestion: string; + +declare var HKCategoryTypeIdentifierSkippedHeartbeat: string; + declare var HKCategoryTypeIdentifierSleepAnalysis: string; +declare var HKCategoryTypeIdentifierSleepChanges: string; + +declare var HKCategoryTypeIdentifierSoreThroat: string; + declare var HKCategoryTypeIdentifierToothbrushingEvent: string; +declare var HKCategoryTypeIdentifierVaginalDryness: string; + +declare var HKCategoryTypeIdentifierVomiting: string; + +declare var HKCategoryTypeIdentifierWheezing: string; + declare const enum HKCategoryValue { NotApplicable = 0 } +declare const enum HKCategoryValueAppetiteChanges { + + Unspecified = 0, + + NoChange = 1, + + Decreased = 2, + + Increased = 3 +} + declare const enum HKCategoryValueAppleStandHour { Stood = 0, @@ -330,6 +472,38 @@ declare const enum HKCategoryValueCervicalMucusQuality { EggWhite = 5 } +declare const enum HKCategoryValueContraceptive { + + Unspecified = 1, + + Implant = 2, + + Injection = 3, + + IntrauterineDevice = 4, + + IntravaginalRing = 5, + + Oral = 6, + + Patch = 7 +} + +declare const enum HKCategoryValueEnvironmentalAudioExposureEvent { + + MomentaryLimit = 1 +} + +declare const enum HKCategoryValueHeadphoneAudioExposureEvent { + + SevenDayLimit = 1 +} + +declare const enum HKCategoryValueLowCardioFitnessEvent { + + LowFitness = 1 +} + declare const enum HKCategoryValueMenstrualFlow { Unspecified = 1, @@ -356,6 +530,26 @@ declare const enum HKCategoryValueOvulationTestResult { EstrogenSurge = 4 } +declare const enum HKCategoryValuePresence { + + Present = 0, + + NotPresent = 1 +} + +declare const enum HKCategoryValueSeverity { + + Unspecified = 0, + + NotPresent = 1, + + Mild = 2, + + Moderate = 3, + + Severe = 4 +} + declare const enum HKCategoryValueSleepAnalysis { InBed = 0, @@ -372,6 +566,8 @@ declare class HKCharacteristicType extends HKObjectType { static new(): HKCharacteristicType; // inherited from NSObject } +declare var HKCharacteristicTypeIdentifierActivityMoveMode: string; + declare var HKCharacteristicTypeIdentifierBiologicalSex: string; declare var HKCharacteristicTypeIdentifierBloodType: string; @@ -416,6 +612,8 @@ declare var HKClinicalTypeIdentifierAllergyRecord: string; declare var HKClinicalTypeIdentifierConditionRecord: string; +declare var HKClinicalTypeIdentifierCoverageRecord: string; + declare var HKClinicalTypeIdentifierImmunizationRecord: string; declare var HKClinicalTypeIdentifierLabResultRecord: string; @@ -563,6 +761,17 @@ declare class HKDevice extends NSObject implements NSCopying, NSSecureCoding { initWithNameManufacturerModelHardwareVersionFirmwareVersionSoftwareVersionLocalIdentifierUDIDeviceIdentifier(name: string, manufacturer: string, model: string, hardwareVersion: string, firmwareVersion: string, softwareVersion: string, localIdentifier: string, UDIDeviceIdentifier: string): this; } +declare const enum HKDevicePlacementSide { + + Unknown = 0, + + Left = 1, + + Right = 2, + + Central = 3 +} + declare var HKDevicePropertyKeyFirmwareVersion: string; declare var HKDevicePropertyKeyHardwareVersion: string; @@ -637,6 +846,85 @@ declare class HKDocumentType extends HKSampleType { declare var HKDocumentTypeIdentifierCDA: string; +declare class HKElectrocardiogram extends HKSample { + + static alloc(): HKElectrocardiogram; // inherited from NSObject + + static new(): HKElectrocardiogram; // inherited from NSObject + + readonly averageHeartRate: HKQuantity; + + readonly classification: HKElectrocardiogramClassification; + + readonly numberOfVoltageMeasurements: number; + + readonly samplingFrequency: HKQuantity; + + readonly symptomsStatus: HKElectrocardiogramSymptomsStatus; +} + +declare const enum HKElectrocardiogramClassification { + + NotSet = 0, + + SinusRhythm = 1, + + AtrialFibrillation = 2, + + InconclusiveLowHeartRate = 3, + + InconclusiveHighHeartRate = 4, + + InconclusivePoorReading = 5, + + InconclusiveOther = 6, + + Unrecognized = 100 +} + +declare const enum HKElectrocardiogramLead { + + AppleWatchSimilarToLeadI = 1 +} + +declare class HKElectrocardiogramQuery extends HKQuery { + + static alloc(): HKElectrocardiogramQuery; // inherited from NSObject + + static new(): HKElectrocardiogramQuery; // inherited from NSObject + + constructor(o: { electrocardiogram: HKElectrocardiogram; dataHandler: (p1: HKElectrocardiogramQuery, p2: HKElectrocardiogramVoltageMeasurement, p3: boolean, p4: NSError) => void; }); + + initWithElectrocardiogramDataHandler(electrocardiogram: HKElectrocardiogram, dataHandler: (p1: HKElectrocardiogramQuery, p2: HKElectrocardiogramVoltageMeasurement, p3: boolean, p4: NSError) => void): this; +} + +declare const enum HKElectrocardiogramSymptomsStatus { + + NotSet = 0, + + None = 1, + + Present = 2 +} + +declare class HKElectrocardiogramType extends HKSampleType { + + static alloc(): HKElectrocardiogramType; // inherited from NSObject + + static new(): HKElectrocardiogramType; // inherited from NSObject +} + +declare class HKElectrocardiogramVoltageMeasurement extends NSObject { + + static alloc(): HKElectrocardiogramVoltageMeasurement; // inherited from NSObject + + static new(): HKElectrocardiogramVoltageMeasurement; // inherited from NSObject + + readonly timeSinceSampleStart: number; + + quantityForLead(lead: HKElectrocardiogramLead): HKQuantity; +} + declare const enum HKErrorCode { NoError = 0, @@ -659,17 +947,27 @@ declare const enum HKErrorCode { ErrorUserExitedWorkoutSession = 9, - ErrorRequiredAuthorizationDenied = 10 + ErrorRequiredAuthorizationDenied = 10, + + ErrorNoData = 11 } declare var HKErrorDomain: string; +declare var HKFHIRReleaseDSTU2: string; + +declare var HKFHIRReleaseR4: string; + +declare var HKFHIRReleaseUnknown: string; + declare class HKFHIRResource extends NSObject implements NSCopying, NSSecureCoding { static alloc(): HKFHIRResource; // inherited from NSObject static new(): HKFHIRResource; // inherited from NSObject + readonly FHIRVersion: HKFHIRVersion; + readonly data: NSData; readonly identifier: string; @@ -693,18 +991,55 @@ declare var HKFHIRResourceTypeAllergyIntolerance: string; declare var HKFHIRResourceTypeCondition: string; +declare var HKFHIRResourceTypeCoverage: string; + declare var HKFHIRResourceTypeImmunization: string; declare var HKFHIRResourceTypeMedicationDispense: string; declare var HKFHIRResourceTypeMedicationOrder: string; +declare var HKFHIRResourceTypeMedicationRequest: string; + declare var HKFHIRResourceTypeMedicationStatement: string; declare var HKFHIRResourceTypeObservation: string; declare var HKFHIRResourceTypeProcedure: string; +declare class HKFHIRVersion extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): HKFHIRVersion; // inherited from NSObject + + static new(): HKFHIRVersion; // inherited from NSObject + + static primaryDSTU2Version(): HKFHIRVersion; + + static primaryR4Version(): HKFHIRVersion; + + static versionFromVersionStringError(versionString: string): HKFHIRVersion; + + readonly FHIRRelease: string; + + readonly majorVersion: number; + + readonly minorVersion: number; + + readonly patchVersion: number; + + readonly stringRepresentation: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare const enum HKFitzpatrickSkinType { NotSet = 0, @@ -749,6 +1084,8 @@ declare class HKHealthStore extends NSObject { static new(): HKHealthStore; // inherited from NSObject + activityMoveModeWithError(): HKActivityMoveModeObject; + addSamplesToWorkoutCompletion(samples: NSArray | HKSample[], workout: HKWorkout, completion: (p1: boolean, p2: NSError) => void): void; authorizationStatusForType(type: HKObjectType): HKAuthorizationStatus; @@ -874,12 +1211,20 @@ declare const enum HKInsulinDeliveryReason { declare var HKMetadataKeyAlpineSlopeGrade: string; +declare var HKMetadataKeyAppleDeviceCalibrated: string; + +declare var HKMetadataKeyAppleECGAlgorithmVersion: string; + +declare var HKMetadataKeyAudioExposureDuration: string; + declare var HKMetadataKeyAudioExposureLevel: string; declare var HKMetadataKeyAverageMETs: string; declare var HKMetadataKeyAverageSpeed: string; +declare var HKMetadataKeyBarometricPressure: string; + declare var HKMetadataKeyBloodGlucoseMealTime: string; declare var HKMetadataKeyBodyTemperatureSensorLocation: string; @@ -892,6 +1237,8 @@ declare var HKMetadataKeyDeviceManufacturerName: string; declare var HKMetadataKeyDeviceName: string; +declare var HKMetadataKeyDevicePlacementSide: string; + declare var HKMetadataKeyDeviceSerialNumber: string; declare var HKMetadataKeyDigitalSignature: string; @@ -922,6 +1269,8 @@ declare var HKMetadataKeyInsulinDeliveryReason: string; declare var HKMetadataKeyLapLength: string; +declare var HKMetadataKeyLowCardioFitnessEventThreshold: string; + declare var HKMetadataKeyMaximumSpeed: string; declare var HKMetadataKeyMenstrualCycleStart: string; @@ -948,6 +1297,8 @@ declare var HKMetadataKeyUDIProductionIdentifier: string; declare var HKMetadataKeyVO2MaxTestType: string; +declare var HKMetadataKeyVO2MaxValue: string; + declare var HKMetadataKeyWasTakenInLab: string; declare var HKMetadataKeyWasUserEntered: string; @@ -1036,6 +1387,8 @@ declare class HKObjectType extends NSObject implements NSCopying, NSSecureCoding static documentTypeForIdentifier(identifier: string): HKDocumentType; + static electrocardiogramType(): HKElectrocardiogramType; + static new(): HKObjectType; // inherited from NSObject static quantityTypeForIdentifier(identifier: string): HKQuantityType; @@ -1070,6 +1423,8 @@ declare class HKObserverQuery extends HKQuery { declare var HKPredicateKeyPathAverage: string; +declare var HKPredicateKeyPathAverageHeartRate: string; + declare var HKPredicateKeyPathCDAAuthorName: string; declare var HKPredicateKeyPathCDACustodianName: string; @@ -1092,6 +1447,10 @@ declare var HKPredicateKeyPathDateComponents: string; declare var HKPredicateKeyPathDevice: string; +declare var HKPredicateKeyPathECGClassification: string; + +declare var HKPredicateKeyPathECGSymptomsStatus: string; + declare var HKPredicateKeyPathEndDate: string; declare var HKPredicateKeyPathMax: string; @@ -1402,6 +1761,12 @@ declare var HKQuantityTypeIdentifierRespiratoryRate: string; declare var HKQuantityTypeIdentifierRestingHeartRate: string; +declare var HKQuantityTypeIdentifierSixMinuteWalkTestDistance: string; + +declare var HKQuantityTypeIdentifierStairAscentSpeed: string; + +declare var HKQuantityTypeIdentifierStairDescentSpeed: string; + declare var HKQuantityTypeIdentifierStepCount: string; declare var HKQuantityTypeIdentifierSwimmingStrokeCount: string; @@ -1412,8 +1777,16 @@ declare var HKQuantityTypeIdentifierVO2Max: string; declare var HKQuantityTypeIdentifierWaistCircumference: string; +declare var HKQuantityTypeIdentifierWalkingAsymmetryPercentage: string; + +declare var HKQuantityTypeIdentifierWalkingDoubleSupportPercentage: string; + declare var HKQuantityTypeIdentifierWalkingHeartRateAverage: string; +declare var HKQuantityTypeIdentifierWalkingSpeed: string; + +declare var HKQuantityTypeIdentifierWalkingStepLength: string; + declare class HKQuery extends NSObject { static alloc(): HKQuery; // inherited from NSObject @@ -1430,8 +1803,14 @@ declare class HKQuery extends NSObject { static predicateForClinicalRecordsWithFHIRResourceType(resourceType: string): NSPredicate; + static predicateForElectrocardiogramsWithClassification(classification: HKElectrocardiogramClassification): NSPredicate; + + static predicateForElectrocardiogramsWithSymptomsStatus(symptomsStatus: HKElectrocardiogramSymptomsStatus): NSPredicate; + static predicateForObjectWithUUID(UUID: NSUUID): NSPredicate; + static predicateForObjectsAssociatedWithElectrocardiogram(electrocardiogram: HKElectrocardiogram): NSPredicate; + static predicateForObjectsFromDevices(devices: NSSet): NSPredicate; static predicateForObjectsFromSource(source: HKSource): NSPredicate; @@ -1513,6 +1892,8 @@ declare class HKSample extends HKObject { readonly endDate: Date; + readonly hasUndeterminedDuration: boolean; + readonly sampleType: HKSampleType; readonly startDate: Date; @@ -1836,6 +2217,8 @@ declare class HKUnit extends NSObject implements NSCopying, NSSecureCoding { static inchUnit(): HKUnit; + static inchesOfMercuryUnit(): HKUnit; + static internationalUnit(): HKUnit; static jouleUnit(): HKUnit; @@ -1906,6 +2289,10 @@ declare class HKUnit extends NSObject implements NSCopying, NSSecureCoding { static unitFromString(string: string): HKUnit; + static voltUnit(): HKUnit; + + static voltUnitWithMetricPrefix(prefix: HKMetricPrefix): HKUnit; + static yardUnit(): HKUnit; readonly unitString: string; @@ -2229,6 +2616,14 @@ declare const enum HKWorkoutActivityType { FitnessGaming = 76, + CardioDance = 77, + + SocialDance = 78, + + Pickleball = 79, + + Cooldown = 80, + Other = 3000 } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!HomeKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!HomeKit.d.ts index d95face55..243440bfb 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!HomeKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!HomeKit.d.ts @@ -958,6 +958,15 @@ declare const enum HMCharacteristicValueCurrentHeaterCoolerState { Cooling = 3 } +declare const enum HMCharacteristicValueCurrentHeatingCooling { + + Off = 0, + + Heat = 1, + + Cool = 2 +} + declare const enum HMCharacteristicValueCurrentHumidifierDehumidifierState { Inactive = 0, @@ -1178,6 +1187,13 @@ declare const enum HMCharacteristicValueTargetAirPurifierState { Automatic = 1 } +declare const enum HMCharacteristicValueTargetDoorState { + + Open = 0, + + Closed = 1 +} + declare const enum HMCharacteristicValueTargetFanState { Manual = 0, @@ -1203,6 +1219,13 @@ declare const enum HMCharacteristicValueTargetHumidifierDehumidifierState { Dehumidify = 2 } +declare const enum HMCharacteristicValueTargetLockMechanismState { + + Unsecured = 0, + + Secured = 1 +} + declare const enum HMCharacteristicValueTargetSecuritySystemState { StayArm = 0, @@ -1471,7 +1494,15 @@ declare const enum HMErrorCode { MaximumAccessoriesOfTypeInHome = 97, - WiFiCredentialGenerationFailed = 98 + WiFiCredentialGenerationFailed = 98, + + EnterpriseNetworkNotSupported = 99, + + TimedOutWaitingForAccessory = 100, + + AccessoryCommunicationFailure = 101, + + FailedToJoinNetwork = 102 } declare var HMErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ICU.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ICU.d.ts index ace09fdea..7a93b7a6f 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ICU.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ICU.d.ts @@ -618,7 +618,23 @@ declare const enum UBlockCode { LOCK_WANCHO = 300, - LOCK_COUNT = 301, + LOCK_CHORASMIAN = 301, + + LOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G = 302, + + LOCK_DIVES_AKURU = 303, + + LOCK_KHITAN_SMALL_SCRIPT = 304, + + LOCK_LISU_SUPPLEMENT = 305, + + LOCK_SYMBOLS_FOR_LEGACY_COMPUTING = 306, + + LOCK_TANGUT_SUPPLEMENT = 307, + + LOCK_YEZIDI = 308, + + LOCK_COUNT = 309, LOCK_INVALID_CODE = -1 } @@ -1271,7 +1287,9 @@ declare const enum UIndicPositionalCategory { U_INPC_TOP_AND_RIGHT = 13, - U_INPC_VISUAL_ORDER_LEFT = 14 + U_INPC_VISUAL_ORDER_LEFT = 14, + + U_INPC_TOP_AND_BOTTOM_AND_LEFT = 15 } declare const enum UIndicSyllabicCategory { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IOSurface.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IOSurface.d.ts index d0c641459..5dc6941ed 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IOSurface.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IOSurface.d.ts @@ -84,7 +84,7 @@ declare class IOSurface extends NSObject implements NSSecureCoding { declare function IOSurfaceAlignProperty(property: string, value: number): number; -declare function IOSurfaceAllowsPixelSizeCasting(buffer: any): boolean; +declare function IOSurfaceAllowsPixelSizeCasting(buffer: IOSurface): boolean; declare const enum IOSurfaceComponentName { @@ -127,81 +127,81 @@ declare const enum IOSurfaceComponentType { kIOSurfaceComponentTypeFloat = 3 } -declare function IOSurfaceCopyAllValues(buffer: any): NSDictionary; +declare function IOSurfaceCopyAllValues(buffer: IOSurface): NSDictionary; -declare function IOSurfaceCopyValue(buffer: any, key: string): any; +declare function IOSurfaceCopyValue(buffer: IOSurface, key: string): any; -declare function IOSurfaceCreate(properties: NSDictionary): any; +declare function IOSurfaceCreate(properties: NSDictionary): IOSurface; -declare function IOSurfaceCreateMachPort(buffer: any): number; +declare function IOSurfaceCreateMachPort(buffer: IOSurface): number; -declare function IOSurfaceDecrementUseCount(buffer: any): void; +declare function IOSurfaceDecrementUseCount(buffer: IOSurface): void; -declare function IOSurfaceGetAllocSize(buffer: any): number; +declare function IOSurfaceGetAllocSize(buffer: IOSurface): number; -declare function IOSurfaceGetBaseAddress(buffer: any): interop.Pointer | interop.Reference; +declare function IOSurfaceGetBaseAddress(buffer: IOSurface): interop.Pointer | interop.Reference; -declare function IOSurfaceGetBaseAddressOfPlane(buffer: any, planeIndex: number): interop.Pointer | interop.Reference; +declare function IOSurfaceGetBaseAddressOfPlane(buffer: IOSurface, planeIndex: number): interop.Pointer | interop.Reference; -declare function IOSurfaceGetBitDepthOfComponentOfPlane(buffer: any, planeIndex: number, componentIndex: number): number; +declare function IOSurfaceGetBitDepthOfComponentOfPlane(buffer: IOSurface, planeIndex: number, componentIndex: number): number; -declare function IOSurfaceGetBitOffsetOfComponentOfPlane(buffer: any, planeIndex: number, componentIndex: number): number; +declare function IOSurfaceGetBitOffsetOfComponentOfPlane(buffer: IOSurface, planeIndex: number, componentIndex: number): number; -declare function IOSurfaceGetBytesPerElement(buffer: any): number; +declare function IOSurfaceGetBytesPerElement(buffer: IOSurface): number; -declare function IOSurfaceGetBytesPerElementOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetBytesPerElementOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetBytesPerRow(buffer: any): number; +declare function IOSurfaceGetBytesPerRow(buffer: IOSurface): number; -declare function IOSurfaceGetBytesPerRowOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetBytesPerRowOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetElementHeight(buffer: any): number; +declare function IOSurfaceGetElementHeight(buffer: IOSurface): number; -declare function IOSurfaceGetElementHeightOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetElementHeightOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetElementWidth(buffer: any): number; +declare function IOSurfaceGetElementWidth(buffer: IOSurface): number; -declare function IOSurfaceGetElementWidthOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetElementWidthOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetHeight(buffer: any): number; +declare function IOSurfaceGetHeight(buffer: IOSurface): number; -declare function IOSurfaceGetHeightOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetHeightOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetID(buffer: any): number; +declare function IOSurfaceGetID(buffer: IOSurface): number; -declare function IOSurfaceGetNameOfComponentOfPlane(buffer: any, planeIndex: number, componentIndex: number): IOSurfaceComponentName; +declare function IOSurfaceGetNameOfComponentOfPlane(buffer: IOSurface, planeIndex: number, componentIndex: number): IOSurfaceComponentName; -declare function IOSurfaceGetNumberOfComponentsOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetNumberOfComponentsOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceGetPixelFormat(buffer: any): number; +declare function IOSurfaceGetPixelFormat(buffer: IOSurface): number; -declare function IOSurfaceGetPlaneCount(buffer: any): number; +declare function IOSurfaceGetPlaneCount(buffer: IOSurface): number; declare function IOSurfaceGetPropertyAlignment(property: string): number; declare function IOSurfaceGetPropertyMaximum(property: string): number; -declare function IOSurfaceGetRangeOfComponentOfPlane(buffer: any, planeIndex: number, componentIndex: number): IOSurfaceComponentRange; +declare function IOSurfaceGetRangeOfComponentOfPlane(buffer: IOSurface, planeIndex: number, componentIndex: number): IOSurfaceComponentRange; -declare function IOSurfaceGetSeed(buffer: any): number; +declare function IOSurfaceGetSeed(buffer: IOSurface): number; -declare function IOSurfaceGetSubsampling(buffer: any): IOSurfaceSubsampling; +declare function IOSurfaceGetSubsampling(buffer: IOSurface): IOSurfaceSubsampling; declare function IOSurfaceGetTypeID(): number; -declare function IOSurfaceGetTypeOfComponentOfPlane(buffer: any, planeIndex: number, componentIndex: number): IOSurfaceComponentType; +declare function IOSurfaceGetTypeOfComponentOfPlane(buffer: IOSurface, planeIndex: number, componentIndex: number): IOSurfaceComponentType; -declare function IOSurfaceGetUseCount(buffer: any): number; +declare function IOSurfaceGetUseCount(buffer: IOSurface): number; -declare function IOSurfaceGetWidth(buffer: any): number; +declare function IOSurfaceGetWidth(buffer: IOSurface): number; -declare function IOSurfaceGetWidthOfPlane(buffer: any, planeIndex: number): number; +declare function IOSurfaceGetWidthOfPlane(buffer: IOSurface, planeIndex: number): number; -declare function IOSurfaceIncrementUseCount(buffer: any): void; +declare function IOSurfaceIncrementUseCount(buffer: IOSurface): void; -declare function IOSurfaceIsInUse(buffer: any): boolean; +declare function IOSurfaceIsInUse(buffer: IOSurface): boolean; -declare function IOSurfaceLock(buffer: any, options: IOSurfaceLockOptions, seed: interop.Pointer | interop.Reference): number; +declare function IOSurfaceLock(buffer: IOSurface, options: IOSurfaceLockOptions, seed: interop.Pointer | interop.Reference): number; declare const enum IOSurfaceLockOptions { @@ -210,9 +210,9 @@ declare const enum IOSurfaceLockOptions { kIOSurfaceLockAvoidSync = 2 } -declare function IOSurfaceLookup(csid: number): any; +declare function IOSurfaceLookup(csid: number): IOSurface; -declare function IOSurfaceLookupFromMachPort(port: number): any; +declare function IOSurfaceLookupFromMachPort(port: number): IOSurface; declare var IOSurfacePropertyAllocSizeKey: string; @@ -269,15 +269,15 @@ declare const enum IOSurfacePurgeabilityState { kIOSurfacePurgeableKeepCurrent = 3 } -declare function IOSurfaceRemoveAllValues(buffer: any): void; +declare function IOSurfaceRemoveAllValues(buffer: IOSurface): void; -declare function IOSurfaceRemoveValue(buffer: any, key: string): void; +declare function IOSurfaceRemoveValue(buffer: IOSurface, key: string): void; -declare function IOSurfaceSetPurgeable(buffer: any, newState: number, oldState: interop.Pointer | interop.Reference): number; +declare function IOSurfaceSetPurgeable(buffer: IOSurface, newState: number, oldState: interop.Pointer | interop.Reference): number; -declare function IOSurfaceSetValue(buffer: any, key: string, value: any): void; +declare function IOSurfaceSetValue(buffer: IOSurface, key: string, value: any): void; -declare function IOSurfaceSetValues(buffer: any, keysAndValues: NSDictionary): void; +declare function IOSurfaceSetValues(buffer: IOSurface, keysAndValues: NSDictionary): void; declare const enum IOSurfaceSubsampling { @@ -292,7 +292,7 @@ declare const enum IOSurfaceSubsampling { kIOSurfaceSubsampling411 = 4 } -declare function IOSurfaceUnlock(buffer: any, options: IOSurfaceLockOptions, seed: interop.Pointer | interop.Reference): number; +declare function IOSurfaceUnlock(buffer: IOSurface, options: IOSurfaceLockOptions, seed: interop.Pointer | interop.Reference): number; declare var kIOSurfaceAllocSize: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IdentityLookup.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IdentityLookup.d.ts index d6c0d9fd1..7ad2b0161 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IdentityLookup.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IdentityLookup.d.ts @@ -131,7 +131,13 @@ declare const enum ILMessageFilterAction { Allow = 1, - Filter = 2 + Junk = 2, + + Filter = 2, + + Promotion = 3, + + Transaction = 4 } declare const enum ILMessageFilterError { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageCaptureCore.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageCaptureCore.d.ts index 974f16286..6b2c06d2e 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageCaptureCore.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageCaptureCore.d.ts @@ -1,4 +1,12 @@ +declare var ICAuthorizationStatusAuthorized: string; + +declare var ICAuthorizationStatusDenied: string; + +declare var ICAuthorizationStatusNotDetermined: string; + +declare var ICAuthorizationStatusRestricted: string; + declare class ICCameraDevice extends ICDevice { static alloc(): ICCameraDevice; // inherited from NSObject @@ -23,6 +31,8 @@ declare class ICCameraDevice extends ICDevice { readonly mediaFiles: NSArray; + mediaPresentation: ICMediaPresentation; + ptpEventHandler: (p1: NSData) => void; readonly tetheredCaptureEnabled: boolean; @@ -106,6 +116,8 @@ declare var ICCameraDeviceDownloadDelegate: { prototype: ICCameraDeviceDownloadDelegate; }; +declare var ICCameraDeviceSupportsHEIF: string; + declare class ICCameraFile extends ICCameraItem { static alloc(): ICCameraFile; // inherited from NSObject @@ -298,6 +310,16 @@ declare class ICDeviceBrowser extends NSObject { readonly devices: NSArray; + readonly suspended: boolean; + + contentsAuthorizationStatus(): string; + + controlAuthorizationStatus(): string; + + requestContentsAuthorizationWithCompletion(completion: (p1: string) => void): void; + + requestControlAuthorizationWithCompletion(completion: (p1: string) => void): void; + start(): void; stop(): void; @@ -311,7 +333,15 @@ interface ICDeviceBrowserDelegate extends NSObjectProtocol { deviceBrowserDidAddDeviceMoreComing(browser: ICDeviceBrowser, device: ICDevice, moreComing: boolean): void; + deviceBrowserDidCancelSuspendOperations?(browser: ICDeviceBrowser): void; + deviceBrowserDidRemoveDeviceMoreGoing(browser: ICDeviceBrowser, device: ICDevice, moreGoing: boolean): void; + + deviceBrowserDidResumeOperations?(browser: ICDeviceBrowser): void; + + deviceBrowserDidSuspendOperations?(browser: ICDeviceBrowser): void; + + deviceBrowserWillSuspendOperations?(browser: ICDeviceBrowser): void; } declare var ICDeviceBrowserDelegate: { @@ -426,6 +456,13 @@ declare const enum ICLegacyReturnCode { InvalidSessionErr = -9921 } +declare const enum ICMediaPresentation { + + ConvertedAssets = 1, + + OriginalAssets = 2 +} + declare var ICOverwrite: string; declare const enum ICReturnCode { @@ -506,7 +543,7 @@ declare const enum ICReturnCode { SessionNotOpened = -9958, - ExFATVolumeInvalid = -21200, + ExFATVolumeInvalid = 21200, MultiErrorDictionary = -30000 } @@ -538,62 +575,68 @@ declare const enum ICReturnConnectionErrorCode { DriverExited = -21350, - ClosedSessionSuddenly = -21351, + ClosedSessionSuddenly = -21349, - EjectedSuddenly = -21352, + EjectedSuddenly = -21348, - SessionAlreadyOpen = -21353, + SessionAlreadyOpen = -21347, - EjectFailed = -21354, + EjectFailed = -21346, - FailedToOpen = -21355, + FailedToOpen = -21345, - FailedToOpenDevice = -21356 + FailedToOpenDevice = -21344, + + NotAuthorizedToOpenDevice = -21343 } declare const enum ICReturnDownloadErrorCode { PathInvalid = -21100, - FileWritable = -21101 + FileWritable = -21099 } declare const enum ICReturnMetadataErrorCode { - NotAvailable = -21050, + NotAvailable = -20150, - AlreadyFetching = -21051, + AlreadyFetching = -20149, - Canceled = -21052, + Canceled = -20148, - Invalid = -21053 + Invalid = -20147 } declare const enum ICReturnObjectErrorCode { CodeObjectDoesNotExist = -21450, - CodeObjectDataOffsetInvalid = -21451, + CodeObjectDataOffsetInvalid = -21449, - CodeObjectCouldNotBeRead = -21452, + CodeObjectCouldNotBeRead = -21448, - CodeObjectDataEmpty = -21453 + CodeObjectDataEmpty = -21447, + + CodeObjectDataRequestTooLarge = -21446 } declare const enum ICReturnPTPDeviceErrorCode { - FailedToSendCommand = -21100 + FailedToSendCommand = -21250, + + NotAuthorizedToSendCommand = -21249 } declare const enum ICReturnThumbnailErrorCode { NotAvailable = -21000, - AlreadyFetching = -21001, + AlreadyFetching = -20999, - Canceled = -21002, + Canceled = -20098, - Invalid = -21003 + Invalid = -20097 } declare var ICSaveAsFilename: string; @@ -611,3 +654,5 @@ declare var ICTransportTypeMassStorage: string; declare var ICTransportTypeTCPIP: string; declare var ICTransportTypeUSB: string; + +declare var ICTruncateAfterSuccessfulDownload: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageIO.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageIO.d.ts index bb7abfdcf..92f7a5e2b 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageIO.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ImageIO.d.ts @@ -137,6 +137,13 @@ declare const enum CGImagePropertyOrientation { kCGImagePropertyOrientationLeft = 8 } +declare const enum CGImagePropertyTGACompression { + + kCGImageTGACompressionNone = 0, + + kCGImageTGACompressionRLE = 1 +} + declare function CGImageSourceCopyAuxiliaryDataInfoAtIndex(isrc: any, index: number, auxiliaryImageDataType: string): NSDictionary; declare function CGImageSourceCopyMetadataAtIndex(isrc: any, index: number, options: NSDictionary): any; @@ -210,12 +217,18 @@ declare var kCGImageAuxiliaryDataTypeDepth: string; declare var kCGImageAuxiliaryDataTypeDisparity: string; +declare var kCGImageAuxiliaryDataTypeHDRGainMap: string; + declare var kCGImageAuxiliaryDataTypePortraitEffectsMatte: string; +declare var kCGImageAuxiliaryDataTypeSemanticSegmentationGlassesMatte: string; + declare var kCGImageAuxiliaryDataTypeSemanticSegmentationHairMatte: string; declare var kCGImageAuxiliaryDataTypeSemanticSegmentationSkinMatte: string; +declare var kCGImageAuxiliaryDataTypeSemanticSegmentationSkyMatte: string; + declare var kCGImageAuxiliaryDataTypeSemanticSegmentationTeethMatte: string; declare var kCGImageDestinationBackgroundColor: string; @@ -236,6 +249,8 @@ declare var kCGImageDestinationOptimizeColorForSharing: string; declare var kCGImageDestinationOrientation: string; +declare var kCGImageDestinationPreserveGainMap: string; + declare var kCGImageMetadataEnumerateRecursively: string; declare var kCGImageMetadataNamespaceDublinCore: string; @@ -1456,6 +1471,10 @@ declare var kCGImagePropertyProfileName: string; declare var kCGImagePropertyRawDictionary: string; +declare var kCGImagePropertyTGACompression: string; + +declare var kCGImagePropertyTGADictionary: string; + declare var kCGImagePropertyTIFFArtist: string; declare var kCGImagePropertyTIFFCompression: string; @@ -1500,6 +1519,20 @@ declare var kCGImagePropertyTIFFYResolution: string; declare var kCGImagePropertyThumbnailImages: string; +declare var kCGImagePropertyWebPCanvasPixelHeight: string; + +declare var kCGImagePropertyWebPCanvasPixelWidth: string; + +declare var kCGImagePropertyWebPDelayTime: string; + +declare var kCGImagePropertyWebPDictionary: string; + +declare var kCGImagePropertyWebPFrameInfoArray: string; + +declare var kCGImagePropertyWebPLoopCount: string; + +declare var kCGImagePropertyWebPUnclampedDelayTime: string; + declare var kCGImagePropertyWidth: string; declare var kCGImageSourceCreateThumbnailFromImageAlways: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Intents.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Intents.d.ts index fcadfffad..100eb064f 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Intents.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Intents.d.ts @@ -196,7 +196,9 @@ declare class INAddMediaMediaDestinationResolutionResult extends INMediaDestinat declare const enum INAddMediaMediaDestinationUnsupportedReason { - PlaylistNameNotFound = 1 + PlaylistNameNotFound = 1, + + PlaylistNotEditable = 2 } declare class INAddMediaMediaItemResolutionResult extends INMediaItemResolutionResult { @@ -240,7 +242,11 @@ declare const enum INAddMediaMediaItemUnsupportedReason { CellularDataSettings = 5, - RestrictedContent = 6 + RestrictedContent = 6, + + ServiceUnavailable = 7, + + RegionRestriction = 8 } declare class INAddTasksIntent extends INIntent { @@ -779,6 +785,64 @@ declare class INBillTypeResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INBillTypeResolutionResult; // inherited from INIntentResolutionResult } +declare class INBoatReservation extends INReservation implements NSCopying, NSSecureCoding { + + static alloc(): INBoatReservation; // inherited from NSObject + + static new(): INBoatReservation; // inherited from NSObject + + readonly boatTrip: INBoatTrip; + + readonly reservedSeat: INSeat; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservedSeat: INSeat; boatTrip: INBoatTrip; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservedSeatBoatTrip(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservedSeat: INSeat, boatTrip: INBoatTrip): this; +} + +declare class INBoatTrip extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INBoatTrip; // inherited from NSObject + + static new(): INBoatTrip; // inherited from NSObject + + readonly arrivalBoatTerminalLocation: CLPlacemark; + + readonly boatName: string; + + readonly boatNumber: string; + + readonly departureBoatTerminalLocation: CLPlacemark; + + readonly provider: string; + + readonly tripDuration: INDateComponentsRange; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { provider: string; boatName: string; boatNumber: string; tripDuration: INDateComponentsRange; departureBoatTerminalLocation: CLPlacemark; arrivalBoatTerminalLocation: CLPlacemark; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithProviderBoatNameBoatNumberTripDurationDepartureBoatTerminalLocationArrivalBoatTerminalLocation(provider: string, boatName: string, boatNumber: string, tripDuration: INDateComponentsRange, departureBoatTerminalLocation: CLPlacemark, arrivalBoatTerminalLocation: CLPlacemark): this; +} + declare class INBookRestaurantReservationIntent extends INIntent implements NSCopying { static alloc(): INBookRestaurantReservationIntent; // inherited from NSObject @@ -878,6 +942,68 @@ declare class INBooleanResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INBooleanResolutionResult; // inherited from INIntentResolutionResult } +declare class INBusReservation extends INReservation implements NSCopying, NSSecureCoding { + + static alloc(): INBusReservation; // inherited from NSObject + + static new(): INBusReservation; // inherited from NSObject + + readonly busTrip: INBusTrip; + + readonly reservedSeat: INSeat; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservedSeat: INSeat; busTrip: INBusTrip; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservedSeatBusTrip(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservedSeat: INSeat, busTrip: INBusTrip): this; +} + +declare class INBusTrip extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INBusTrip; // inherited from NSObject + + static new(): INBusTrip; // inherited from NSObject + + readonly arrivalBusStopLocation: CLPlacemark; + + readonly arrivalPlatform: string; + + readonly busName: string; + + readonly busNumber: string; + + readonly departureBusStopLocation: CLPlacemark; + + readonly departurePlatform: string; + + readonly provider: string; + + readonly tripDuration: INDateComponentsRange; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { provider: string; busName: string; busNumber: string; tripDuration: INDateComponentsRange; departureBusStopLocation: CLPlacemark; departurePlatform: string; arrivalBusStopLocation: CLPlacemark; arrivalPlatform: string; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithProviderBusNameBusNumberTripDurationDepartureBusStopLocationDeparturePlatformArrivalBusStopLocationArrivalPlatform(provider: string, busName: string, busNumber: string, tripDuration: INDateComponentsRange, departureBusStopLocation: CLPlacemark, departurePlatform: string, arrivalBusStopLocation: CLPlacemark, arrivalPlatform: string): this; +} + declare const enum INCallAudioRoute { Unknown = 0, @@ -1009,6 +1135,56 @@ declare class INCallRecord extends NSObject implements NSCopying, NSSecureCoding initWithIdentifierDateCreatedCallerCallRecordTypeCallCapabilityCallDurationUnseenNumberOfCalls(identifier: string, dateCreated: Date, caller: INPerson, callRecordType: INCallRecordType, callCapability: INCallCapability, callDuration: number, unseen: number, numberOfCalls: number): this; } +declare class INCallRecordFilter extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INCallRecordFilter; // inherited from NSObject + + static new(): INCallRecordFilter; // inherited from NSObject + + readonly callCapability: INCallCapability; + + readonly callTypes: INCallRecordTypeOptions; + + readonly participants: NSArray; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { participants: NSArray | INPerson[]; callTypes: INCallRecordTypeOptions; callCapability: INCallCapability; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithParticipantsCallTypesCallCapability(participants: NSArray | INPerson[], callTypes: INCallRecordTypeOptions, callCapability: INCallCapability): this; +} + +declare class INCallRecordResolutionResult extends INIntentResolutionResult { + + static alloc(): INCallRecordResolutionResult; // inherited from NSObject + + static confirmationRequiredWithCallRecordToConfirm(callRecordToConfirm: INCallRecord): INCallRecordResolutionResult; + + static confirmationRequiredWithItemToConfirmForReason(itemToConfirm: any, reason: number): INCallRecordResolutionResult; // inherited from INIntentResolutionResult + + static disambiguationWithCallRecordsToDisambiguate(callRecordsToDisambiguate: NSArray | INCallRecord[]): INCallRecordResolutionResult; + + static needsValue(): INCallRecordResolutionResult; // inherited from INIntentResolutionResult + + static new(): INCallRecordResolutionResult; // inherited from NSObject + + static notRequired(): INCallRecordResolutionResult; // inherited from INIntentResolutionResult + + static successWithResolvedCallRecord(resolvedCallRecord: INCallRecord): INCallRecordResolutionResult; + + static unsupported(): INCallRecordResolutionResult; // inherited from INIntentResolutionResult + + static unsupportedWithReason(reason: number): INCallRecordResolutionResult; // inherited from INIntentResolutionResult +} + declare const enum INCallRecordType { Unknown = 0, @@ -1218,6 +1394,47 @@ declare const enum INCancelWorkoutIntentResponseCode { Success = 7 } +declare class INCar extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INCar; // inherited from NSObject + + static new(): INCar; // inherited from NSObject + + readonly carIdentifier: string; + + readonly color: any; + + readonly displayName: string; + + readonly headUnit: INCarHeadUnit; + + readonly make: string; + + readonly model: string; + + readonly supportedChargingConnectors: NSArray; + + readonly year: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { carIdentifier: string; displayName: string; year: string; make: string; model: string; color: any; headUnit: INCarHeadUnit; supportedChargingConnectors: NSArray | string[]; }); + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCarIdentifierDisplayNameYearMakeModelColorHeadUnitSupportedChargingConnectors(carIdentifier: string, displayName: string, year: string, make: string, model: string, color: any, headUnit: INCarHeadUnit, supportedChargingConnectors: NSArray | string[]): this; + + initWithCoder(coder: NSCoder): this; + + maximumPowerForChargingConnectorType(chargingConnectorType: string): NSMeasurement; + + setMaximumPowerForChargingConnectorType(power: NSMeasurement, chargingConnectorType: string): void; +} + declare const enum INCarAirCirculationMode { Unknown = 0, @@ -1300,6 +1517,22 @@ declare class INCarAudioSourceResolutionResult extends INIntentResolutionResult static unsupportedWithReason(reason: number): INCarAudioSourceResolutionResult; // inherited from INIntentResolutionResult } +declare var INCarChargingConnectorTypeCCS1: string; + +declare var INCarChargingConnectorTypeCCS2: string; + +declare var INCarChargingConnectorTypeCHAdeMO: string; + +declare var INCarChargingConnectorTypeGBTAC: string; + +declare var INCarChargingConnectorTypeGBTDC: string; + +declare var INCarChargingConnectorTypeJ1772: string; + +declare var INCarChargingConnectorTypeMennekes: string; + +declare var INCarChargingConnectorTypeTesla: string; + interface INCarCommandsDomainHandling extends INActivateCarSignalIntentHandling, INGetCarLockStatusIntentHandling, INGetCarPowerLevelStatusIntentHandling, INSetCarLockStatusIntentHandling { } declare var INCarCommandsDomainHandling: { @@ -1343,6 +1576,31 @@ declare class INCarDefrosterResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INCarDefrosterResolutionResult; // inherited from INIntentResolutionResult } +declare class INCarHeadUnit extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INCarHeadUnit; // inherited from NSObject + + static new(): INCarHeadUnit; // inherited from NSObject + + readonly bluetoothIdentifier: string; + + readonly iAP2Identifier: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { bluetoothIdentifier: string; iAP2Identifier: string; }); + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithBluetoothIdentifierIAP2Identifier(bluetoothIdentifier: string, iAP2Identifier: string): this; + + initWithCoder(coder: NSCoder): this; +} + interface INCarPlayDomainHandling extends INSaveProfileInCarIntentHandling, INSetAudioSourceInCarIntentHandling, INSetClimateSettingsInCarIntentHandling, INSetDefrosterSettingsInCarIntentHandling, INSetProfileInCarIntentHandling, INSetSeatSettingsInCarIntentHandling { } declare var INCarPlayDomainHandling: { @@ -1787,6 +2045,23 @@ declare class INDateSearchTypeResolutionResult extends INIntentResolutionResult static unsupportedWithReason(reason: number): INDateSearchTypeResolutionResult; // inherited from INIntentResolutionResult } +declare const enum INDayOfWeekOptions { + + Monday = 1, + + Tuesday = 2, + + Wednesday = 4, + + Thursday = 8, + + Friday = 16, + + Saturday = 32, + + Sunday = 64 +} + declare class INDefaultCardTemplate extends NSObject implements NSCopying, NSSecureCoding { static alloc(): INDefaultCardTemplate; // inherited from NSObject @@ -2114,7 +2389,7 @@ declare class INExtension extends NSObject implements INIntentHandlerProviding { self(): this; } -declare class INFile extends NSObject { +declare class INFile extends NSObject implements NSSecureCoding { static alloc(): INFile; // inherited from NSObject @@ -2131,6 +2406,14 @@ declare class INFile extends NSObject { filename: string; readonly typeIdentifier: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; } declare class INFileResolutionResult extends INIntentResolutionResult { @@ -2205,6 +2488,8 @@ declare class INFlightReservation extends INReservation implements NSCopying, NS constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; reservedSeat: INSeat; flight: INFlight; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservedSeat: INSeat; flight: INFlight; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -2212,6 +2497,8 @@ declare class INFlightReservation extends INReservation implements NSCopying, NS initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsReservedSeatFlight(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], reservedSeat: INSeat, flight: INFlight): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservedSeatFlight(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservedSeat: INSeat, flight: INFlight): this; } declare class INGetAvailableRestaurantReservationBookingDefaultsIntent extends INIntent { @@ -2422,6 +2709,10 @@ interface INGetCarPowerLevelStatusIntentHandling extends NSObjectProtocol { handleGetCarPowerLevelStatusCompletion(intent: INGetCarPowerLevelStatusIntent, completion: (p1: INGetCarPowerLevelStatusIntentResponse) => void): void; resolveCarNameForGetCarPowerLevelStatusWithCompletion?(intent: INGetCarPowerLevelStatusIntent, completion: (p1: INSpeakableStringResolutionResult) => void): void; + + startSendingUpdatesForGetCarPowerLevelStatusToObserver?(intent: INGetCarPowerLevelStatusIntent, observer: INGetCarPowerLevelStatusIntentResponseObserver): void; + + stopSendingUpdatesForGetCarPowerLevelStatus?(intent: INGetCarPowerLevelStatusIntent): void; } declare var INGetCarPowerLevelStatusIntentHandling: { @@ -2434,16 +2725,42 @@ declare class INGetCarPowerLevelStatusIntentResponse extends INIntentResponse { static new(): INGetCarPowerLevelStatusIntentResponse; // inherited from NSObject + activeConnector: string; + + carIdentifier: string; + chargePercentRemaining: number; charging: number; + chargingFormulaArguments: NSDictionary; + readonly code: INGetCarPowerLevelStatusIntentResponseCode; + consumptionFormulaArguments: NSDictionary; + + currentBatteryCapacity: NSMeasurement; + + dateOfLastStateUpdate: NSDateComponents; + distanceRemaining: NSMeasurement; + distanceRemainingElectric: NSMeasurement; + + distanceRemainingFuel: NSMeasurement; + fuelPercentRemaining: number; + maximumBatteryCapacity: NSMeasurement; + + maximumDistance: NSMeasurement; + + maximumDistanceElectric: NSMeasurement; + + maximumDistanceFuel: NSMeasurement; + + minimumBatteryCapacity: NSMeasurement; + minutesToFull: number; constructor(o: { code: INGetCarPowerLevelStatusIntentResponseCode; userActivity: NSUserActivity; }); @@ -2466,6 +2783,15 @@ declare const enum INGetCarPowerLevelStatusIntentResponseCode { FailureRequiringAppLaunch = 5 } +interface INGetCarPowerLevelStatusIntentResponseObserver extends NSObjectProtocol { + + getCarPowerLevelStatusResponseDidUpdate(response: INGetCarPowerLevelStatusIntentResponse): void; +} +declare var INGetCarPowerLevelStatusIntentResponseObserver: { + + prototype: INGetCarPowerLevelStatusIntentResponseObserver; +}; + declare class INGetReservationDetailsIntent extends INIntent { static alloc(): INGetReservationDetailsIntent; // inherited from NSObject @@ -2760,6 +3086,8 @@ declare class INImage extends NSObject implements NSCopying, NSSecureCoding { static new(): INImage; // inherited from NSObject + static systemImageNamed(systemImageName: string): INImage; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -2827,6 +3155,8 @@ declare class INIntent extends NSObject implements NSCopying, NSSecureCoding { readonly intentDescription: string; + shortcutAvailability: INShortcutAvailabilityOptions; + suggestedInvocationPhrase: string; static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding @@ -3054,6 +3384,54 @@ declare class INLengthResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INLengthResolutionResult; // inherited from INIntentResolutionResult } +declare class INListCarsIntent extends INIntent { + + static alloc(): INListCarsIntent; // inherited from NSObject + + static new(): INListCarsIntent; // inherited from NSObject +} + +interface INListCarsIntentHandling extends NSObjectProtocol { + + confirmListCarsCompletion?(intent: INListCarsIntent, completion: (p1: INListCarsIntentResponse) => void): void; + + handleListCarsCompletion(intent: INListCarsIntent, completion: (p1: INListCarsIntentResponse) => void): void; +} +declare var INListCarsIntentHandling: { + + prototype: INListCarsIntentHandling; +}; + +declare class INListCarsIntentResponse extends INIntentResponse { + + static alloc(): INListCarsIntentResponse; // inherited from NSObject + + static new(): INListCarsIntentResponse; // inherited from NSObject + + cars: NSArray; + + readonly code: INListCarsIntentResponseCode; + + constructor(o: { code: INListCarsIntentResponseCode; userActivity: NSUserActivity; }); + + initWithCodeUserActivity(code: INListCarsIntentResponseCode, userActivity: NSUserActivity): this; +} + +declare const enum INListCarsIntentResponseCode { + + Unspecified = 0, + + Ready = 1, + + InProgress = 2, + + Success = 3, + + Failure = 4, + + FailureRequiringAppLaunch = 5 +} + declare class INListRideOptionsIntent extends INIntent { static alloc(): INListRideOptionsIntent; // inherited from NSObject @@ -3191,6 +3569,8 @@ declare class INLodgingReservation extends INReservation implements NSCopying, N constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; lodgingBusinessLocation: CLPlacemark; reservationDuration: INDateComponentsRange; numberOfAdults: number; numberOfChildren: number; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; lodgingBusinessLocation: CLPlacemark; reservationDuration: INDateComponentsRange; numberOfAdults: number; numberOfChildren: number; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -3198,6 +3578,8 @@ declare class INLodgingReservation extends INReservation implements NSCopying, N initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsLodgingBusinessLocationReservationDurationNumberOfAdultsNumberOfChildren(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], lodgingBusinessLocation: CLPlacemark, reservationDuration: INDateComponentsRange, numberOfAdults: number, numberOfChildren: number): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLLodgingBusinessLocationReservationDurationNumberOfAdultsNumberOfChildren(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, lodgingBusinessLocation: CLPlacemark, reservationDuration: INDateComponentsRange, numberOfAdults: number, numberOfChildren: number): this; } declare class INMassResolutionResult extends INIntentResolutionResult { @@ -3408,7 +3790,11 @@ declare const enum INMediaItemType { Station = 17, - Music = 18 + Music = 18, + + AlgorithmicRadioStation = 19, + + News = 20 } declare const enum INMediaReference { @@ -3450,8 +3836,6 @@ declare class INMediaSearch extends NSObject implements NSCopying, NSSecureCodin constructor(o: { coder: NSCoder; }); // inherited from NSCoding - constructor(o: { mediaType: INMediaItemType; sortOrder: INMediaSortOrder; mediaName: string; artistName: string; albumName: string; genreNames: NSArray | string[]; moodNames: NSArray | string[]; activityNames: NSArray | string[]; releaseDate: INDateComponentsRange; reference: INMediaReference; mediaIdentifier: string; }); - constructor(o: { mediaType: INMediaItemType; sortOrder: INMediaSortOrder; mediaName: string; artistName: string; albumName: string; genreNames: NSArray | string[]; moodNames: NSArray | string[]; releaseDate: INDateComponentsRange; reference: INMediaReference; mediaIdentifier: string; }); copyWithZone(zone: interop.Pointer | interop.Reference): any; @@ -3460,8 +3844,6 @@ declare class INMediaSearch extends NSObject implements NSCopying, NSSecureCodin initWithCoder(coder: NSCoder): this; - initWithMediaTypeSortOrderMediaNameArtistNameAlbumNameGenreNamesMoodNamesActivityNamesReleaseDateReferenceMediaIdentifier(mediaType: INMediaItemType, sortOrder: INMediaSortOrder, mediaName: string, artistName: string, albumName: string, genreNames: NSArray | string[], moodNames: NSArray | string[], activityNames: NSArray | string[], releaseDate: INDateComponentsRange, reference: INMediaReference, mediaIdentifier: string): this; - initWithMediaTypeSortOrderMediaNameArtistNameAlbumNameGenreNamesMoodNamesReleaseDateReferenceMediaIdentifier(mediaType: INMediaItemType, sortOrder: INMediaSortOrder, mediaName: string, artistName: string, albumName: string, genreNames: NSArray | string[], moodNames: NSArray | string[], releaseDate: INDateComponentsRange, reference: INMediaReference, mediaIdentifier: string): this; } @@ -3872,8 +4254,12 @@ declare class INObject extends NSObject implements INSpeakable, NSCopying, NSSec alternativeSpeakableMatches: NSArray; + displayImage: INImage; + readonly displayString: string; + subtitleString: string; + readonly debugDescription: string; // inherited from NSObjectProtocol readonly description: string; // inherited from NSObjectProtocol @@ -3902,6 +4288,10 @@ declare class INObject extends NSObject implements INSpeakable, NSCopying, NSSec constructor(o: { identifier: string; displayString: string; pronunciationHint: string; }); + constructor(o: { identifier: string; displayString: string; pronunciationHint: string; subtitleString: string; displayImage: INImage; }); + + constructor(o: { identifier: string; displayString: string; subtitleString: string; displayImage: INImage; }); + class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; @@ -3916,6 +4306,10 @@ declare class INObject extends NSObject implements INSpeakable, NSCopying, NSSec initWithIdentifierDisplayStringPronunciationHint(identifier: string, displayString: string, pronunciationHint: string): this; + initWithIdentifierDisplayStringPronunciationHintSubtitleStringDisplayImage(identifier: string, displayString: string, pronunciationHint: string, subtitleString: string, displayImage: INImage): this; + + initWithIdentifierDisplayStringSubtitleStringDisplayImage(identifier: string, displayString: string, subtitleString: string, displayImage: INImage): this; + isEqual(object: any): boolean; isKindOfClass(aClass: typeof NSObject): boolean; @@ -3935,6 +4329,37 @@ declare class INObject extends NSObject implements INSpeakable, NSCopying, NSSec self(): this; } +declare class INObjectCollection extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INObjectCollection; // inherited from NSObject + + static new(): INObjectCollection; // inherited from NSObject + + readonly allItems: NSArray; + + readonly sections: NSArray>; + + usesIndexedCollation: boolean; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { items: NSArray | ObjectType[]; }); + + constructor(o: { sections: NSArray> | INObjectSection[]; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithItems(items: NSArray | ObjectType[]): this; + + initWithSections(sections: NSArray> | INObjectSection[]): this; +} + declare class INObjectResolutionResult extends INIntentResolutionResult { static alloc(): INObjectResolutionResult; // inherited from NSObject @@ -3958,6 +4383,61 @@ declare class INObjectResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INObjectResolutionResult; // inherited from INIntentResolutionResult } +declare class INObjectSection extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): INObjectSection; // inherited from NSObject + + static new(): INObjectSection; // inherited from NSObject + + readonly items: NSArray; + + readonly title: string; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { title: string; items: NSArray | ObjectType[]; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithTitleItems(title: string, items: NSArray | ObjectType[]): this; +} + +declare const enum INOutgoingMessageType { + + Unknown = 0, + + OutgoingMessageText = 1, + + OutgoingMessageAudio = 2 +} + +declare class INOutgoingMessageTypeResolutionResult extends INIntentResolutionResult { + + static alloc(): INOutgoingMessageTypeResolutionResult; // inherited from NSObject + + static confirmationRequiredWithItemToConfirmForReason(itemToConfirm: any, reason: number): INOutgoingMessageTypeResolutionResult; // inherited from INIntentResolutionResult + + static confirmationRequiredWithOutgoingMessageTypeToConfirm(outgoingMessageTypeToConfirm: INOutgoingMessageType): INOutgoingMessageTypeResolutionResult; + + static needsValue(): INOutgoingMessageTypeResolutionResult; // inherited from INIntentResolutionResult + + static new(): INOutgoingMessageTypeResolutionResult; // inherited from NSObject + + static notRequired(): INOutgoingMessageTypeResolutionResult; // inherited from INIntentResolutionResult + + static successWithResolvedOutgoingMessageType(resolvedOutgoingMessageType: INOutgoingMessageType): INOutgoingMessageTypeResolutionResult; + + static unsupported(): INOutgoingMessageTypeResolutionResult; // inherited from INIntentResolutionResult + + static unsupportedWithReason(reason: number): INOutgoingMessageTypeResolutionResult; // inherited from INIntentResolutionResult +} + declare class INParameter extends NSObject implements NSCopying, NSSecureCoding { static alloc(): INParameter; // inherited from NSObject @@ -4401,7 +4881,7 @@ declare class INPaymentStatusResolutionResult extends INIntentResolutionResult { static unsupportedWithReason(reason: number): INPaymentStatusResolutionResult; // inherited from INIntentResolutionResult } -interface INPaymentsDomainHandling extends INRequestPaymentIntentHandling, INSendPaymentIntentHandling { +interface INPaymentsDomainHandling extends INPayBillIntentHandling, INRequestPaymentIntentHandling, INSearchForAccountsIntentHandling, INSearchForBillsIntentHandling, INSendPaymentIntentHandling, INTransferMoneyIntentHandling { } declare var INPaymentsDomainHandling: { @@ -4476,6 +4956,8 @@ declare class INPerson extends NSObject implements INSpeakable, NSCopying, NSSec constructor(o: { personHandle: INPersonHandle; nameComponents: NSPersonNameComponents; displayName: string; image: INImage; contactIdentifier: string; customIdentifier: string; isMe: boolean; }); + constructor(o: { personHandle: INPersonHandle; nameComponents: NSPersonNameComponents; displayName: string; image: INImage; contactIdentifier: string; customIdentifier: string; relationship: string; }); + class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; @@ -4498,6 +4980,8 @@ declare class INPerson extends NSObject implements INSpeakable, NSCopying, NSSec initWithPersonHandleNameComponentsDisplayNameImageContactIdentifierCustomIdentifierIsMe(personHandle: INPersonHandle, nameComponents: NSPersonNameComponents, displayName: string, image: INImage, contactIdentifier: string, customIdentifier: string, isMe: boolean): this; + initWithPersonHandleNameComponentsDisplayNameImageContactIdentifierCustomIdentifierRelationship(personHandle: INPersonHandle, nameComponents: NSPersonNameComponents, displayName: string, image: INImage, contactIdentifier: string, customIdentifier: string, relationship: string): this; + isEqual(object: any): boolean; isKindOfClass(aClass: typeof NSObject): boolean; @@ -4560,6 +5044,8 @@ declare var INPersonHandleLabelOther: string; declare var INPersonHandleLabelPager: string; +declare var INPersonHandleLabelSchool: string; + declare var INPersonHandleLabelWork: string; declare var INPersonHandleLabelWorkFax: string; @@ -4859,7 +5345,11 @@ declare const enum INPlayMediaMediaItemUnsupportedReason { CellularDataSettings = 5, - RestrictedContent = 6 + RestrictedContent = 6, + + ServiceUnavailable = 7, + + RegionRestriction = 8 } declare class INPlayMediaPlaybackSpeedResolutionResult extends INDoubleResolutionResult { @@ -5086,12 +5576,16 @@ declare class INRecurrenceRule extends NSObject implements NSCopying, NSSecureCo readonly interval: number; + readonly weeklyRecurrenceDays: INDayOfWeekOptions; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding constructor(o: { interval: number; frequency: INRecurrenceFrequency; }); + constructor(o: { interval: number; frequency: INRecurrenceFrequency; weeklyRecurrenceDays: INDayOfWeekOptions; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -5099,6 +5593,8 @@ declare class INRecurrenceRule extends NSObject implements NSCopying, NSSecureCo initWithCoder(coder: NSCoder): this; initWithIntervalFrequency(interval: number, frequency: INRecurrenceFrequency): this; + + initWithIntervalFrequencyWeeklyRecurrenceDays(interval: number, frequency: INRecurrenceFrequency, weeklyRecurrenceDays: INDayOfWeekOptions): this; } declare const enum INRelativeReference { @@ -5288,6 +5784,8 @@ declare class INRentalCarReservation extends INReservation implements NSCopying, constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; rentalCar: INRentalCar; rentalDuration: INDateComponentsRange; pickupLocation: CLPlacemark; dropOffLocation: CLPlacemark; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; rentalCar: INRentalCar; rentalDuration: INDateComponentsRange; pickupLocation: CLPlacemark; dropOffLocation: CLPlacemark; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -5295,6 +5793,8 @@ declare class INRentalCarReservation extends INReservation implements NSCopying, initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsRentalCarRentalDurationPickupLocationDropOffLocation(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], rentalCar: INRentalCar, rentalDuration: INDateComponentsRange, pickupLocation: CLPlacemark, dropOffLocation: CLPlacemark): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLRentalCarRentalDurationPickupLocationDropOffLocation(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, rentalCar: INRentalCar, rentalDuration: INDateComponentsRange, pickupLocation: CLPlacemark, dropOffLocation: CLPlacemark): this; } declare class INRequestPaymentCurrencyAmountResolutionResult extends INCurrencyAmountResolutionResult { @@ -5553,6 +6053,8 @@ declare class INReservation extends NSObject implements NSCopying, NSSecureCodin static new(): INReservation; // inherited from NSObject + readonly URL: NSURL; + readonly actions: NSArray; readonly bookingTime: Date; @@ -5565,6 +6067,8 @@ declare class INReservation extends NSObject implements NSCopying, NSSecureCodin readonly reservationStatus: INReservationStatus; + readonly url: NSURL; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -5764,6 +6268,8 @@ declare class INRestaurantReservation extends INReservation implements NSCopying constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; reservationDuration: INDateComponentsRange; partySize: number; restaurantLocation: CLPlacemark; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservationDuration: INDateComponentsRange; partySize: number; restaurantLocation: CLPlacemark; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -5771,6 +6277,8 @@ declare class INRestaurantReservation extends INReservation implements NSCopying initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsReservationDurationPartySizeRestaurantLocation(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], reservationDuration: INDateComponentsRange, partySize: number, restaurantLocation: CLPlacemark): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservationDurationPartySizeRestaurantLocation(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservationDuration: INDateComponentsRange, partySize: number, restaurantLocation: CLPlacemark): this; } declare class INRestaurantReservationBooking extends NSObject implements NSCopying, NSSecureCoding { @@ -6214,7 +6722,7 @@ declare class INRideVehicle extends NSObject implements NSCopying, NSSecureCodin initWithCoder(coder: NSCoder): this; } -interface INRidesharingDomainHandling extends INGetRideStatusIntentHandling, INListRideOptionsIntentHandling, INRequestRideIntentHandling { +interface INRidesharingDomainHandling extends INCancelRideIntentHandling, INGetRideStatusIntentHandling, INListRideOptionsIntentHandling, INRequestRideIntentHandling, INSendRideFeedbackIntentHandling { } declare var INRidesharingDomainHandling: { @@ -6624,7 +7132,11 @@ declare const enum INSearchForMediaMediaItemUnsupportedReason { CellularDataSettings = 5, - RestrictedContent = 6 + RestrictedContent = 6, + + ServiceUnavailable = 7, + + RegionRestriction = 8 } declare class INSearchForMessagesIntent extends INIntent { @@ -6960,18 +7472,33 @@ declare class INSeat extends NSObject implements NSCopying, NSSecureCoding { initWithSeatSectionSeatRowSeatNumberSeatingType(seatSection: string, seatRow: string, seatNumber: string, seatingType: string): this; } +declare class INSendMessageAttachment extends NSObject { + + static alloc(): INSendMessageAttachment; // inherited from NSObject + + static attachmentWithAudioMessageFile(audioMessageFile: INFile): INSendMessageAttachment; + + static new(): INSendMessageAttachment; // inherited from NSObject + + readonly audioMessageFile: INFile; +} + declare class INSendMessageIntent extends INIntent { static alloc(): INSendMessageIntent; // inherited from NSObject static new(): INSendMessageIntent; // inherited from NSObject + readonly attachments: NSArray; + readonly content: string; readonly conversationIdentifier: string; readonly groupName: string; + readonly outgoingMessageType: INOutgoingMessageType; + readonly recipients: NSArray; readonly sender: INPerson; @@ -6984,9 +7511,17 @@ declare class INSendMessageIntent extends INIntent { constructor(o: { recipients: NSArray | INPerson[]; content: string; speakableGroupName: INSpeakableString; conversationIdentifier: string; serviceName: string; sender: INPerson; }); + constructor(o: { recipients: NSArray | INPerson[]; outgoingMessageType: INOutgoingMessageType; content: string; speakableGroupName: INSpeakableString; conversationIdentifier: string; serviceName: string; sender: INPerson; }); + + constructor(o: { recipients: NSArray | INPerson[]; outgoingMessageType: INOutgoingMessageType; content: string; speakableGroupName: INSpeakableString; conversationIdentifier: string; serviceName: string; sender: INPerson; attachments: NSArray | INSendMessageAttachment[]; }); + initWithRecipientsContentGroupNameServiceNameSender(recipients: NSArray | INPerson[], content: string, groupName: string, serviceName: string, sender: INPerson): this; initWithRecipientsContentSpeakableGroupNameConversationIdentifierServiceNameSender(recipients: NSArray | INPerson[], content: string, speakableGroupName: INSpeakableString, conversationIdentifier: string, serviceName: string, sender: INPerson): this; + + initWithRecipientsOutgoingMessageTypeContentSpeakableGroupNameConversationIdentifierServiceNameSender(recipients: NSArray | INPerson[], outgoingMessageType: INOutgoingMessageType, content: string, speakableGroupName: INSpeakableString, conversationIdentifier: string, serviceName: string, sender: INPerson): this; + + initWithRecipientsOutgoingMessageTypeContentSpeakableGroupNameConversationIdentifierServiceNameSenderAttachments(recipients: NSArray | INPerson[], outgoingMessageType: INOutgoingMessageType, content: string, speakableGroupName: INSpeakableString, conversationIdentifier: string, serviceName: string, sender: INPerson, attachments: NSArray | INSendMessageAttachment[]): this; } interface INSendMessageIntentHandling extends NSObjectProtocol { @@ -6999,6 +7534,8 @@ interface INSendMessageIntentHandling extends NSObjectProtocol { resolveGroupNameForSendMessageWithCompletion?(intent: INSendMessageIntent, completion: (p1: INStringResolutionResult) => void): void; + resolveOutgoingMessageTypeForSendMessageWithCompletion?(intent: INSendMessageIntent, completion: (p1: INOutgoingMessageTypeResolutionResult) => void): void; + resolveRecipientsForSendMessageCompletion?(intent: INSendMessageIntent, completion: (p1: NSArray) => void): void; resolveRecipientsForSendMessageWithCompletion?(intent: INSendMessageIntent, completion: (p1: NSArray) => void): void; @@ -8039,6 +8576,23 @@ declare class INShortcut extends NSObject implements NSCopying, NSSecureCoding { initWithUserActivity(userActivity: NSUserActivity): this; } +declare const enum INShortcutAvailabilityOptions { + + SleepMindfulness = 1, + + SleepJournaling = 2, + + SleepMusic = 4, + + SleepPodcasts = 8, + + SleepReading = 16, + + SleepWrapUpYourDay = 32, + + SleepYogaAndStretching = 64 +} + declare const enum INSiriAuthorizationStatus { NotDetermined = 0, @@ -8454,6 +9008,40 @@ declare const enum INStartCallCallCapabilityUnsupportedReason { CameraNotAccessible = 3 } +declare class INStartCallCallRecordToCallBackResolutionResult extends INCallRecordResolutionResult { + + static alloc(): INStartCallCallRecordToCallBackResolutionResult; // inherited from NSObject + + static confirmationRequiredWithCallRecordToConfirm(callRecordToConfirm: INCallRecord): INStartCallCallRecordToCallBackResolutionResult; // inherited from INCallRecordResolutionResult + + static confirmationRequiredWithItemToConfirmForReason(itemToConfirm: any, reason: number): INStartCallCallRecordToCallBackResolutionResult; // inherited from INIntentResolutionResult + + static disambiguationWithCallRecordsToDisambiguate(callRecordsToDisambiguate: NSArray | INCallRecord[]): INStartCallCallRecordToCallBackResolutionResult; // inherited from INCallRecordResolutionResult + + static needsValue(): INStartCallCallRecordToCallBackResolutionResult; // inherited from INIntentResolutionResult + + static new(): INStartCallCallRecordToCallBackResolutionResult; // inherited from NSObject + + static notRequired(): INStartCallCallRecordToCallBackResolutionResult; // inherited from INIntentResolutionResult + + static successWithResolvedCallRecord(resolvedCallRecord: INCallRecord): INStartCallCallRecordToCallBackResolutionResult; // inherited from INCallRecordResolutionResult + + static unsupported(): INStartCallCallRecordToCallBackResolutionResult; // inherited from INIntentResolutionResult + + static unsupportedForReason(reason: INStartCallCallRecordToCallBackUnsupportedReason): INStartCallCallRecordToCallBackResolutionResult; + + static unsupportedWithReason(reason: number): INStartCallCallRecordToCallBackResolutionResult; // inherited from INIntentResolutionResult + + constructor(o: { callRecordResolutionResult: INCallRecordResolutionResult; }); + + initWithCallRecordResolutionResult(callRecordResolutionResult: INCallRecordResolutionResult): this; +} + +declare const enum INStartCallCallRecordToCallBackUnsupportedReason { + + NoMatchingCall = 1 +} + declare class INStartCallContactResolutionResult extends INPersonResolutionResult { static alloc(): INStartCallContactResolutionResult; // inherited from NSObject @@ -8510,6 +9098,10 @@ declare class INStartCallIntent extends INIntent { readonly callCapability: INCallCapability; + readonly callRecordFilter: INCallRecordFilter; + + readonly callRecordToCallBack: INCallRecord; + readonly contacts: NSArray; readonly destinationType: INCallDestinationType; @@ -8518,7 +9110,11 @@ declare class INStartCallIntent extends INIntent { constructor(o: { audioRoute: INCallAudioRoute; destinationType: INCallDestinationType; contacts: NSArray | INPerson[]; recordTypeForRedialing: INCallRecordType; callCapability: INCallCapability; }); + constructor(o: { callRecordFilter: INCallRecordFilter; callRecordToCallBack: INCallRecord; audioRoute: INCallAudioRoute; destinationType: INCallDestinationType; contacts: NSArray | INPerson[]; callCapability: INCallCapability; }); + initWithAudioRouteDestinationTypeContactsRecordTypeForRedialingCallCapability(audioRoute: INCallAudioRoute, destinationType: INCallDestinationType, contacts: NSArray | INPerson[], recordTypeForRedialing: INCallRecordType, callCapability: INCallCapability): this; + + initWithCallRecordFilterCallRecordToCallBackAudioRouteDestinationTypeContactsCallCapability(callRecordFilter: INCallRecordFilter, callRecordToCallBack: INCallRecord, audioRoute: INCallAudioRoute, destinationType: INCallDestinationType, contacts: NSArray | INPerson[], callCapability: INCallCapability): this; } interface INStartCallIntentHandling extends NSObjectProtocol { @@ -8529,6 +9125,8 @@ interface INStartCallIntentHandling extends NSObjectProtocol { resolveCallCapabilityForStartCallWithCompletion?(intent: INStartCallIntent, completion: (p1: INStartCallCallCapabilityResolutionResult) => void): void; + resolveCallRecordToCallBackForStartCallWithCompletion?(intent: INStartCallIntent, completion: (p1: INCallRecordResolutionResult) => void): void; + resolveContactsForStartCallWithCompletion?(intent: INStartCallIntent, completion: (p1: NSArray) => void): void; resolveDestinationTypeForStartCallWithCompletion?(intent: INStartCallIntent, completion: (p1: INCallDestinationTypeResolutionResult) => void): void; @@ -8538,6 +9136,8 @@ declare var INStartCallIntentHandling: { prototype: INStartCallIntentHandling; }; +declare var INStartCallIntentIdentifier: string; + declare class INStartCallIntentResponse extends INIntentResponse { static alloc(): INStartCallIntentResponse; // inherited from NSObject @@ -9215,6 +9815,8 @@ declare class INTicketedEventReservation extends INReservation implements NSCopy constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; reservedSeat: INSeat; event: INTicketedEvent; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservedSeat: INSeat; event: INTicketedEvent; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -9222,6 +9824,8 @@ declare class INTicketedEventReservation extends INReservation implements NSCopy initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsReservedSeatEvent(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], reservedSeat: INSeat, event: INTicketedEvent): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservedSeatEvent(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservedSeat: INSeat, event: INTicketedEvent): this; } declare class INTimeIntervalResolutionResult extends INIntentResolutionResult { @@ -9261,6 +9865,8 @@ declare class INTrainReservation extends INReservation implements NSCopying, NSS constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; reservedSeat: INSeat; trainTrip: INTrainTrip; }); + constructor(o: { itemReference: INSpeakableString; reservationNumber: string; bookingTime: Date; reservationStatus: INReservationStatus; reservationHolderName: string; actions: NSArray | INReservationAction[]; URL: NSURL; reservedSeat: INSeat; trainTrip: INTrainTrip; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; @@ -9268,6 +9874,8 @@ declare class INTrainReservation extends INReservation implements NSCopying, NSS initWithCoder(coder: NSCoder): this; initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsReservedSeatTrainTrip(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], reservedSeat: INSeat, trainTrip: INTrainTrip): this; + + initWithItemReferenceReservationNumberBookingTimeReservationStatusReservationHolderNameActionsURLReservedSeatTrainTrip(itemReference: INSpeakableString, reservationNumber: string, bookingTime: Date, reservationStatus: INReservationStatus, reservationHolderName: string, actions: NSArray | INReservationAction[], URL: NSURL, reservedSeat: INSeat, trainTrip: INTrainTrip): this; } declare class INTrainTrip extends NSObject implements NSCopying, NSSecureCoding { @@ -9537,7 +10145,11 @@ declare const enum INUpdateMediaAffinityMediaItemUnsupportedReason { CellularDataSettings = 5, - RestrictedContent = 6 + RestrictedContent = 6, + + ServiceUnavailable = 7, + + RegionRestriction = 8 } declare class INUserContext extends NSObject implements NSSecureCoding { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IntentsUI.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IntentsUI.d.ts index 633dedb66..7cb928d54 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!IntentsUI.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!IntentsUI.d.ts @@ -17,10 +17,14 @@ declare class INUIAddVoiceShortcutButton extends UIButton { static buttonWithType(buttonType: UIButtonType): INUIAddVoiceShortcutButton; // inherited from UIButton + static buttonWithTypePrimaryAction(buttonType: UIButtonType, primaryAction: UIAction): INUIAddVoiceShortcutButton; // inherited from UIButton + static new(): INUIAddVoiceShortcutButton; // inherited from NSObject static systemButtonWithImageTargetAction(image: UIImage, target: any, action: string): INUIAddVoiceShortcutButton; // inherited from UIButton + static systemButtonWithPrimaryAction(primaryAction: UIAction): INUIAddVoiceShortcutButton; // inherited from UIButton + cornerRadius: number; delegate: INUIAddVoiceShortcutButtonDelegate; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!JavaScriptCore.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!JavaScriptCore.d.ts index ffbda0b5f..29fe89dea 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!JavaScriptCore.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!JavaScriptCore.d.ts @@ -377,11 +377,11 @@ declare class JSValue extends NSObject { constructWithArguments(_arguments: NSArray | any[]): JSValue; - definePropertyDescriptor(property: string, descriptor: any): void; + definePropertyDescriptor(property: any, descriptor: any): void; - deleteProperty(property: string): boolean; + deleteProperty(property: any): boolean; - hasProperty(property: string): boolean; + hasProperty(property: any): boolean; invokeMethodWithArguments(method: string, _arguments: NSArray | any[]): JSValue; @@ -401,7 +401,7 @@ declare class JSValue extends NSObject { setValueAtIndex(value: any, index: number): void; - setValueForProperty(value: any, property: string): void; + setValueForProperty(value: any, property: any): void; toArray(): NSArray; @@ -435,7 +435,7 @@ declare class JSValue extends NSObject { valueAtIndex(index: number): JSValue; - valueForProperty(property: string): JSValue; + valueForProperty(property: any): JSValue; } declare function JSValueCreateJSONString(ctx: interop.Pointer | interop.Reference, value: interop.Pointer | interop.Reference, indent: number, exception: interop.Pointer | interop.Reference>): interop.Pointer | interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!LocalAuthentication.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!LocalAuthentication.d.ts index 93f99d759..af2f17ffb 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!LocalAuthentication.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!LocalAuthentication.d.ts @@ -62,7 +62,9 @@ declare class LAContext extends NSObject { declare const enum LACredentialType { - ApplicationPassword = 0 + ApplicationPassword = 0, + + SmartCardPIN = -3 } declare const enum LAError { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MachO.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MachO.d.ts index 87f6230f9..0e8e3c0dc 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MachO.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MachO.d.ts @@ -119,6 +119,36 @@ declare const UNWIND_ARM64_MODE_FRAMELESS: number; declare const UNWIND_ARM64_MODE_MASK: number; +declare const UNWIND_ARM_DWARF_SECTION_OFFSET: number; + +declare const UNWIND_ARM_FRAME_D_REG_COUNT_MASK: number; + +declare const UNWIND_ARM_FRAME_FIRST_PUSH_R4: number; + +declare const UNWIND_ARM_FRAME_FIRST_PUSH_R5: number; + +declare const UNWIND_ARM_FRAME_FIRST_PUSH_R6: number; + +declare const UNWIND_ARM_FRAME_SECOND_PUSH_R10: number; + +declare const UNWIND_ARM_FRAME_SECOND_PUSH_R11: number; + +declare const UNWIND_ARM_FRAME_SECOND_PUSH_R12: number; + +declare const UNWIND_ARM_FRAME_SECOND_PUSH_R8: number; + +declare const UNWIND_ARM_FRAME_SECOND_PUSH_R9: number; + +declare const UNWIND_ARM_FRAME_STACK_ADJUST_MASK: number; + +declare const UNWIND_ARM_MODE_DWARF: number; + +declare const UNWIND_ARM_MODE_FRAME: number; + +declare const UNWIND_ARM_MODE_FRAME_D: number; + +declare const UNWIND_ARM_MODE_MASK: number; + declare const UNWIND_HAS_LSDA: number; declare const UNWIND_IS_NOT_FUNCTION_START: number; @@ -215,6 +245,8 @@ declare function _dyld_register_func_for_add_image(func: interop.FunctionReferen declare function _dyld_register_func_for_remove_image(func: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number) => void>): void; +declare function _dyld_shared_cache_contains_path(path: string | interop.Pointer | interop.Reference): boolean; + declare var _mh_bundle_header: mach_header_64; declare var _mh_dylib_header: mach_header_64; @@ -250,67 +282,6 @@ interface data_in_code_entry { } declare var data_in_code_entry: interop.StructType; -interface dyld_all_image_infos { - version: number; - infoArrayCount: number; - infoArray: interop.Pointer | interop.Reference; - notification: interop.FunctionReference<(p1: dyld_image_mode, p2: number, p3: interop.Reference) => void>; - processDetachedFromSharedRegion: boolean; - libSystemInitialized: boolean; - dyldImageLoadAddress: interop.Pointer | interop.Reference; - jitInfo: interop.Pointer | interop.Reference; - dyldVersion: string; - errorMessage: string; - terminationFlags: number; - coreSymbolicationShmPage: interop.Pointer | interop.Reference; - systemOrderFlag: number; - uuidArrayCount: number; - uuidArray: interop.Pointer | interop.Reference; - dyldAllImageInfosAddress: interop.Pointer | interop.Reference; - initialImageCount: number; - errorKind: number; - errorClientOfDylibPath: string; - errorTargetDylibPath: string; - errorSymbol: string; - sharedCacheSlide: number; - sharedCacheUUID: interop.Reference; - sharedCacheBaseAddress: number; - infoArrayChangeTimestamp: number; - dyldPath: string; - notifyPorts: interop.Reference; - reserved: interop.Reference; - compact_dyld_image_info_addr: number; - compact_dyld_image_info_size: number; - platform: number; -} -declare var dyld_all_image_infos: interop.StructType; - -declare const dyld_error_kind_dylib_missing: number; - -declare const dyld_error_kind_dylib_version: number; - -declare const dyld_error_kind_dylib_wrong_arch: number; - -declare const dyld_error_kind_none: number; - -declare const dyld_error_kind_symbol_missing: number; - -interface dyld_image_info { - imageLoadAddress: interop.Pointer | interop.Reference; - imageFilePath: string; - imageFileModDate: number; -} -declare var dyld_image_info: interop.StructType; - -declare const enum dyld_image_mode { - - dyld_image_adding = 0, - - dyld_image_removing = 1, - - dyld_image_info_change = 2 -} - interface dyld_info_command { cmd: number; cmdsize: number; @@ -327,20 +298,6 @@ interface dyld_info_command { } declare var dyld_info_command: interop.StructType; -declare var dyld_shared_cache_ranges: dyld_shared_cache_rangesStruct; - -interface dyld_shared_cache_rangesStruct { - sharedRegionsCount: number; - ranges: interop.Reference<{ start: number; length: number; }>; -} -declare var dyld_shared_cache_rangesStruct: interop.StructType; - -interface dyld_uuid_info { - imageLoadAddress: interop.Pointer | interop.Reference; - imageUUID: interop.Reference; -} -declare var dyld_uuid_info: interop.StructType; - interface dylib_module { module_name: number; iextdefsym: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MapKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MapKit.d.ts index a0c2fccb7..ac341c46d 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MapKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MapKit.d.ts @@ -70,6 +70,10 @@ declare class MKAnnotationView extends UIView { selected: boolean; + selectedZPriority: number; + + zPriority: number; + constructor(o: { annotation: MKAnnotation; reuseIdentifier: string; }); initWithAnnotationReuseIdentifier(annotation: MKAnnotation, reuseIdentifier: string): this; @@ -87,7 +91,9 @@ declare const enum MKAnnotationViewCollisionMode { Rectangle = 0, - Circle = 1 + Circle = 1, + + None = 2 } declare const enum MKAnnotationViewDragState { @@ -103,6 +109,14 @@ declare const enum MKAnnotationViewDragState { Ending = 4 } +declare var MKAnnotationViewZPriorityDefaultSelected: number; + +declare var MKAnnotationViewZPriorityDefaultUnselected: number; + +declare var MKAnnotationViewZPriorityMax: number; + +declare var MKAnnotationViewZPriorityMin: number; + declare class MKCircle extends MKShape implements MKOverlay { static alloc(): MKCircle; // inherited from NSObject @@ -172,6 +186,10 @@ declare class MKCircleRenderer extends MKOverlayPathRenderer { readonly circle: MKCircle; + strokeEnd: number; + + strokeStart: number; + constructor(o: { circle: MKCircle; }); initWithCircle(circle: MKCircle): this; @@ -536,6 +554,19 @@ declare class MKGeodesicPolyline extends MKPolyline { static polylineWithPointsCount(points: interop.Pointer | interop.Reference, count: number): MKGeodesicPolyline; // inherited from MKPolyline } +declare class MKGradientPolylineRenderer extends MKPolylineRenderer { + + static alloc(): MKGradientPolylineRenderer; // inherited from NSObject + + static new(): MKGradientPolylineRenderer; // inherited from NSObject + + readonly colors: NSArray; + + readonly locations: NSArray; + + setColorsAtLocations(colors: NSArray | UIColor[], locations: NSArray | number[]): void; +} + declare var MKLaunchOptionsCameraKey: string; declare var MKLaunchOptionsDirectionsModeDefault: string; @@ -556,6 +587,31 @@ declare var MKLaunchOptionsMapTypeKey: string; declare var MKLaunchOptionsShowsTrafficKey: string; +declare class MKLocalPointsOfInterestRequest extends NSObject implements NSCopying { + + static alloc(): MKLocalPointsOfInterestRequest; // inherited from NSObject + + static new(): MKLocalPointsOfInterestRequest; // inherited from NSObject + + readonly coordinate: CLLocationCoordinate2D; + + pointOfInterestFilter: MKPointOfInterestFilter; + + readonly radius: number; + + readonly region: MKCoordinateRegion; + + constructor(o: { centerCoordinate: CLLocationCoordinate2D; radius: number; }); + + constructor(o: { coordinateRegion: MKCoordinateRegion; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithCenterCoordinateRadius(coordinate: CLLocationCoordinate2D, radius: number): this; + + initWithCoordinateRegion(region: MKCoordinateRegion): this; +} + declare class MKLocalSearch extends NSObject { static alloc(): MKLocalSearch; // inherited from NSObject @@ -564,10 +620,14 @@ declare class MKLocalSearch extends NSObject { readonly searching: boolean; + constructor(o: { pointsOfInterestRequest: MKLocalPointsOfInterestRequest; }); + constructor(o: { request: MKLocalSearchRequest; }); cancel(): void; + initWithPointsOfInterestRequest(request: MKLocalPointsOfInterestRequest): this; + initWithRequest(request: MKLocalSearchRequest): this; startWithCompletionHandler(completionHandler: (p1: MKLocalSearchResponse, p2: NSError) => void): void; @@ -1285,6 +1345,10 @@ declare class MKMultiPoint extends MKShape implements MKGeoJSONObject { isMemberOfClass(aClass: typeof NSObject): boolean; + locationAtPointIndex(index: number): number; + + locationsAtPointIndexes(indexes: NSIndexSet): NSArray; + performSelector(aSelector: string): any; performSelectorWithObject(aSelector: string, object: any): any; @@ -1901,6 +1965,8 @@ declare class MKPointOfInterestFilter extends NSObject implements NSCopying, NSS initWithCoder(coder: NSCoder): this; } +declare var MKPointsOfInterestRequestMaxRadius: number; + declare class MKPolygon extends MKMultiPoint implements MKGeoJSONObject, MKOverlay { static alloc(): MKPolygon; // inherited from NSObject @@ -1974,6 +2040,10 @@ declare class MKPolygonRenderer extends MKOverlayPathRenderer { readonly polygon: MKPolygon; + strokeEnd: number; + + strokeStart: number; + constructor(o: { polygon: MKPolygon; }); initWithPolygon(polygon: MKPolygon): this; @@ -2071,6 +2141,10 @@ declare class MKPolylineRenderer extends MKOverlayPathRenderer { readonly polyline: MKPolyline; + strokeEnd: number; + + strokeStart: number; + constructor(o: { polyline: MKPolyline; }); initWithPolyline(polyline: MKPolyline): this; @@ -2416,6 +2490,25 @@ declare class MKUserLocation extends NSObject implements MKAnnotation { setCoordinate(newCoordinate: CLLocationCoordinate2D): void; } +declare class MKUserLocationView extends MKAnnotationView { + + static alloc(): MKUserLocationView; // inherited from NSObject + + static appearance(): MKUserLocationView; // inherited from UIAppearance + + static appearanceForTraitCollection(trait: UITraitCollection): MKUserLocationView; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): MKUserLocationView; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray | typeof NSObject[]): MKUserLocationView; // inherited from UIAppearance + + static appearanceWhenContainedIn(ContainerClass: typeof NSObject): MKUserLocationView; // inherited from UIAppearance + + static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): MKUserLocationView; // inherited from UIAppearance + + static new(): MKUserLocationView; // inherited from NSObject +} + declare class MKUserTrackingBarButtonItem extends UIBarButtonItem { static alloc(): MKUserTrackingBarButtonItem; // inherited from NSObject @@ -2432,6 +2525,10 @@ declare class MKUserTrackingBarButtonItem extends UIBarButtonItem { static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): MKUserTrackingBarButtonItem; // inherited from UIAppearance + static fixedSpaceItemOfWidth(width: number): MKUserTrackingBarButtonItem; // inherited from UIBarButtonItem + + static flexibleSpaceItem(): MKUserTrackingBarButtonItem; // inherited from UIBarButtonItem + static new(): MKUserTrackingBarButtonItem; // inherited from NSObject mapView: MKMapView; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MediaPlayer.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MediaPlayer.d.ts index 87d39cfd7..115a20a68 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MediaPlayer.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MediaPlayer.d.ts @@ -549,6 +549,8 @@ declare class MPMediaPlaylist extends MPMediaItemCollection { readonly authorDisplayName: string; + readonly cloudGlobalID: string; + readonly descriptionText: string; readonly name: string; @@ -592,6 +594,8 @@ declare class MPMediaPlaylistCreationMetadata extends NSObject { declare var MPMediaPlaylistPropertyAuthorDisplayName: string; +declare var MPMediaPlaylistPropertyCloudGlobalID: string; + declare var MPMediaPlaylistPropertyDescriptionText: string; declare var MPMediaPlaylistPropertyName: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Metal.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Metal.d.ts index 06239b0b4..a4a617fbf 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Metal.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Metal.d.ts @@ -1,4 +1,139 @@ +interface MTLAccelerationStructure extends MTLResource { + + size: number; +} +declare var MTLAccelerationStructure: { + + prototype: MTLAccelerationStructure; +}; + +declare class MTLAccelerationStructureBoundingBoxGeometryDescriptor extends MTLAccelerationStructureGeometryDescriptor { + + static alloc(): MTLAccelerationStructureBoundingBoxGeometryDescriptor; // inherited from NSObject + + static descriptor(): MTLAccelerationStructureBoundingBoxGeometryDescriptor; + + static new(): MTLAccelerationStructureBoundingBoxGeometryDescriptor; // inherited from NSObject + + boundingBoxBuffer: MTLBuffer; + + boundingBoxBufferOffset: number; + + boundingBoxCount: number; + + boundingBoxStride: number; +} + +interface MTLAccelerationStructureCommandEncoder extends MTLCommandEncoder { + + buildAccelerationStructureDescriptorScratchBufferScratchBufferOffset(accelerationStructure: MTLAccelerationStructure, descriptor: MTLAccelerationStructureDescriptor, scratchBuffer: MTLBuffer, scratchBufferOffset: number): void; + + copyAccelerationStructureToAccelerationStructure(sourceAccelerationStructure: MTLAccelerationStructure, destinationAccelerationStructure: MTLAccelerationStructure): void; + + copyAndCompactAccelerationStructureToAccelerationStructure(sourceAccelerationStructure: MTLAccelerationStructure, destinationAccelerationStructure: MTLAccelerationStructure): void; + + refitAccelerationStructureDescriptorDestinationScratchBufferScratchBufferOffset(sourceAccelerationStructure: MTLAccelerationStructure, descriptor: MTLAccelerationStructureDescriptor, destinationAccelerationStructure: MTLAccelerationStructure, scratchBuffer: MTLBuffer, scratchBufferOffset: number): void; + + sampleCountersInBufferAtSampleIndexWithBarrier(sampleBuffer: MTLCounterSampleBuffer, sampleIndex: number, barrier: boolean): void; + + updateFence(fence: MTLFence): void; + + useHeap(heap: MTLHeap): void; + + useHeapsCount(heaps: interop.Reference, count: number): void; + + useResourceUsage(resource: MTLResource, usage: MTLResourceUsage): void; + + useResourcesCountUsage(resources: interop.Reference, count: number, usage: MTLResourceUsage): void; + + waitForFence(fence: MTLFence): void; + + writeCompactedAccelerationStructureSizeToBufferOffset(accelerationStructure: MTLAccelerationStructure, buffer: MTLBuffer, offset: number): void; +} +declare var MTLAccelerationStructureCommandEncoder: { + + prototype: MTLAccelerationStructureCommandEncoder; +}; + +declare class MTLAccelerationStructureDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLAccelerationStructureDescriptor; // inherited from NSObject + + static new(): MTLAccelerationStructureDescriptor; // inherited from NSObject + + usage: MTLAccelerationStructureUsage; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLAccelerationStructureGeometryDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLAccelerationStructureGeometryDescriptor; // inherited from NSObject + + static new(): MTLAccelerationStructureGeometryDescriptor; // inherited from NSObject + + allowDuplicateIntersectionFunctionInvocation: boolean; + + intersectionFunctionTableOffset: number; + + opaque: boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum MTLAccelerationStructureInstanceOptions { + + None = 0, + + DisableTriangleCulling = 1, + + TriangleFrontFacingWindingCounterClockwise = 2, + + Opaque = 4, + + NonOpaque = 8 +} + +interface MTLAccelerationStructureSizes { + accelerationStructureSize: number; + buildScratchBufferSize: number; + refitScratchBufferSize: number; +} +declare var MTLAccelerationStructureSizes: interop.StructType; + +declare class MTLAccelerationStructureTriangleGeometryDescriptor extends MTLAccelerationStructureGeometryDescriptor { + + static alloc(): MTLAccelerationStructureTriangleGeometryDescriptor; // inherited from NSObject + + static descriptor(): MTLAccelerationStructureTriangleGeometryDescriptor; + + static new(): MTLAccelerationStructureTriangleGeometryDescriptor; // inherited from NSObject + + indexBuffer: MTLBuffer; + + indexBufferOffset: number; + + indexType: MTLIndexType; + + triangleCount: number; + + vertexBuffer: MTLBuffer; + + vertexBufferOffset: number; + + vertexStride: number; +} + +declare const enum MTLAccelerationStructureUsage { + + None = 0, + + Refit = 1, + + PreferFastBuild = 2 +} + declare class MTLArgument extends NSObject { static alloc(): MTLArgument; // inherited from NSObject @@ -91,6 +226,8 @@ interface MTLArgumentEncoder extends NSObjectProtocol { newArgumentEncoderForBufferAtIndex(index: number): MTLArgumentEncoder; + setAccelerationStructureAtIndex(accelerationStructure: MTLAccelerationStructure, index: number): void; + setArgumentBufferOffset(argumentBuffer: MTLBuffer, offset: number): void; setArgumentBufferStartOffsetArrayElement(argumentBuffer: MTLBuffer, startOffset: number, arrayElement: number): void; @@ -107,6 +244,10 @@ interface MTLArgumentEncoder extends NSObjectProtocol { setIndirectCommandBuffersWithRange(buffers: interop.Reference, range: NSRange): void; + setIntersectionFunctionTableAtIndex(intersectionFunctionTable: MTLIntersectionFunctionTable, index: number): void; + + setIntersectionFunctionTablesWithRange(intersectionFunctionTables: interop.Reference, range: NSRange): void; + setRenderPipelineStateAtIndex(pipeline: MTLRenderPipelineState, index: number): void; setRenderPipelineStatesWithRange(pipelines: interop.Reference, range: NSRange): void; @@ -118,6 +259,10 @@ interface MTLArgumentEncoder extends NSObjectProtocol { setTextureAtIndex(texture: MTLTexture, index: number): void; setTexturesWithRange(textures: interop.Reference, range: NSRange): void; + + setVisibleFunctionTableAtIndex(visibleFunctionTable: MTLVisibleFunctionTable, index: number): void; + + setVisibleFunctionTablesWithRange(visibleFunctionTables: interop.Reference, range: NSRange): void; } declare var MTLArgumentEncoder: { @@ -136,7 +281,15 @@ declare const enum MTLArgumentType { ImageblockData = 16, - Imageblock = 17 + Imageblock = 17, + + VisibleFunctionTable = 24, + + PrimitiveAccelerationStructure = 25, + + InstanceAccelerationStructure = 26, + + IntersectionFunctionTable = 27 } declare class MTLArrayType extends MTLType { @@ -324,6 +477,49 @@ declare const enum MTLBarrierScope { RenderTargets = 4 } +interface MTLBinaryArchive extends NSObjectProtocol { + + device: MTLDevice; + + label: string; + + addComputePipelineFunctionsWithDescriptorError(descriptor: MTLComputePipelineDescriptor): boolean; + + addRenderPipelineFunctionsWithDescriptorError(descriptor: MTLRenderPipelineDescriptor): boolean; + + addTileRenderPipelineFunctionsWithDescriptorError(descriptor: MTLTileRenderPipelineDescriptor): boolean; + + serializeToURLError(url: NSURL): boolean; +} +declare var MTLBinaryArchive: { + + prototype: MTLBinaryArchive; +}; + +declare class MTLBinaryArchiveDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLBinaryArchiveDescriptor; // inherited from NSObject + + static new(): MTLBinaryArchiveDescriptor; // inherited from NSObject + + url: NSURL; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare var MTLBinaryArchiveDomain: string; + +declare const enum MTLBinaryArchiveError { + + None = 0, + + InvalidFile = 1, + + UnexpectedElement = 2, + + CompilationFailure = 3 +} + declare const enum MTLBlendFactor { Zero = 0, @@ -418,6 +614,10 @@ interface MTLBlitCommandEncoder extends MTLCommandEncoder { resetTextureAccessCountersRegionMipLevelSlice(texture: MTLTexture, region: MTLRegion, mipLevel: number, slice: number): void; + resolveCountersInRangeDestinationBufferDestinationOffset(sampleBuffer: MTLCounterSampleBuffer, range: NSRange, destinationBuffer: MTLBuffer, destinationOffset: number): void; + + sampleCountersInBufferAtSampleIndexWithBarrier(sampleBuffer: MTLCounterSampleBuffer, sampleIndex: number, barrier: boolean): void; + updateFence(fence: MTLFence): void; waitForFence(fence: MTLFence): void; @@ -438,6 +638,46 @@ declare const enum MTLBlitOption { RowLinearPVRTC = 4 } +declare class MTLBlitPassDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLBlitPassDescriptor; // inherited from NSObject + + static blitPassDescriptor(): MTLBlitPassDescriptor; + + static new(): MTLBlitPassDescriptor; // inherited from NSObject + + readonly sampleBufferAttachments: MTLBlitPassSampleBufferAttachmentDescriptorArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLBlitPassSampleBufferAttachmentDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLBlitPassSampleBufferAttachmentDescriptor; // inherited from NSObject + + static new(): MTLBlitPassSampleBufferAttachmentDescriptor; // inherited from NSObject + + endOfEncoderSampleIndex: number; + + sampleBuffer: MTLCounterSampleBuffer; + + startOfEncoderSampleIndex: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLBlitPassSampleBufferAttachmentDescriptorArray extends NSObject { + + static alloc(): MTLBlitPassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + + static new(): MTLBlitPassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + [index: number]: MTLBlitPassSampleBufferAttachmentDescriptor; + + objectAtIndexedSubscript(attachmentIndex: number): MTLBlitPassSampleBufferAttachmentDescriptor; + + setObjectAtIndexedSubscript(attachment: MTLBlitPassSampleBufferAttachmentDescriptor, attachmentIndex: number): void; +} + interface MTLBuffer extends MTLResource { length: number; @@ -605,26 +845,36 @@ interface MTLCommandBuffer extends NSObjectProtocol { error: NSError; + errorOptions: MTLCommandBufferErrorOption; + kernelEndTime: number; kernelStartTime: number; label: string; + logs: MTLLogContainer; + retainedReferences: boolean; status: MTLCommandBufferStatus; + accelerationStructureCommandEncoder(): MTLAccelerationStructureCommandEncoder; + addCompletedHandler(block: (p1: MTLCommandBuffer) => void): void; addScheduledHandler(block: (p1: MTLCommandBuffer) => void): void; blitCommandEncoder(): MTLBlitCommandEncoder; + blitCommandEncoderWithDescriptor(blitPassDescriptor: MTLBlitPassDescriptor): MTLBlitCommandEncoder; + commit(): void; computeCommandEncoder(): MTLComputeCommandEncoder; + computeCommandEncoderWithDescriptor(computePassDescriptor: MTLComputePassDescriptor): MTLComputeCommandEncoder; + computeCommandEncoderWithDispatchType(dispatchType: MTLDispatchType): MTLComputeCommandEncoder; encodeSignalEventValue(event: MTLEvent, value: number): void; @@ -639,8 +889,6 @@ interface MTLCommandBuffer extends NSObjectProtocol { presentDrawable(drawable: MTLDrawable): void; - presentDrawableAfterMinimumDuration(drawable: MTLDrawable, duration: number): void; - presentDrawableAtTime(drawable: MTLDrawable, presentationTime: number): void; pushDebugGroup(string: string): void; @@ -649,6 +897,8 @@ interface MTLCommandBuffer extends NSObjectProtocol { resourceStateCommandEncoder(): MTLResourceStateCommandEncoder; + resourceStateCommandEncoderWithDescriptor(resourceStatePassDescriptor: MTLResourceStatePassDescriptor): MTLResourceStateCommandEncoder; + waitUntilCompleted(): void; waitUntilScheduled(): void; @@ -658,6 +908,34 @@ declare var MTLCommandBuffer: { prototype: MTLCommandBuffer; }; +declare class MTLCommandBufferDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLCommandBufferDescriptor; // inherited from NSObject + + static new(): MTLCommandBufferDescriptor; // inherited from NSObject + + errorOptions: MTLCommandBufferErrorOption; + + retainedReferences: boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +interface MTLCommandBufferEncoderInfo extends NSObjectProtocol { + + debugSignposts: NSArray; + + errorState: MTLCommandEncoderErrorState; + + label: string; +} +declare var MTLCommandBufferEncoderInfo: { + + prototype: MTLCommandBufferEncoderInfo; +}; + +declare var MTLCommandBufferEncoderInfoErrorKey: string; + declare const enum MTLCommandBufferError { None = 0, @@ -683,6 +961,13 @@ declare const enum MTLCommandBufferError { declare var MTLCommandBufferErrorDomain: string; +declare const enum MTLCommandBufferErrorOption { + + None = 0, + + EncoderExecutionStatus = 1 +} + declare const enum MTLCommandBufferStatus { NotEnqueued = 0, @@ -717,6 +1002,19 @@ declare var MTLCommandEncoder: { prototype: MTLCommandEncoder; }; +declare const enum MTLCommandEncoderErrorState { + + Unknown = 0, + + Completed = 1, + + Affected = 2, + + Pending = 3, + + Faulted = 4 +} + interface MTLCommandQueue extends NSObjectProtocol { device: MTLDevice; @@ -725,6 +1023,8 @@ interface MTLCommandQueue extends NSObjectProtocol { commandBuffer(): MTLCommandBuffer; + commandBufferWithDescriptor(descriptor: MTLCommandBufferDescriptor): MTLCommandBuffer; + commandBufferWithUnretainedReferences(): MTLCommandBuffer; insertDebugCaptureBoundary(): void; @@ -734,6 +1034,42 @@ declare var MTLCommandQueue: { prototype: MTLCommandQueue; }; +declare var MTLCommonCounterClipperInvocations: string; + +declare var MTLCommonCounterClipperPrimitivesOut: string; + +declare var MTLCommonCounterComputeKernelInvocations: string; + +declare var MTLCommonCounterFragmentCycles: string; + +declare var MTLCommonCounterFragmentInvocations: string; + +declare var MTLCommonCounterFragmentsPassed: string; + +declare var MTLCommonCounterPostTessellationVertexCycles: string; + +declare var MTLCommonCounterPostTessellationVertexInvocations: string; + +declare var MTLCommonCounterRenderTargetWriteCycles: string; + +declare var MTLCommonCounterSetStageUtilization: string; + +declare var MTLCommonCounterSetStatistic: string; + +declare var MTLCommonCounterSetTimestamp: string; + +declare var MTLCommonCounterTessellationCycles: string; + +declare var MTLCommonCounterTessellationInputPatches: string; + +declare var MTLCommonCounterTimestamp: string; + +declare var MTLCommonCounterTotalCycles: string; + +declare var MTLCommonCounterVertexCycles: string; + +declare var MTLCommonCounterVertexInvocations: string; + declare const enum MTLCompareFunction { Never = 0, @@ -761,10 +1097,18 @@ declare class MTLCompileOptions extends NSObject implements NSCopying { fastMathEnabled: boolean; + installName: string; + languageVersion: MTLLanguageVersion; + libraries: NSArray; + + libraryType: MTLLibraryType; + preprocessorMacros: NSDictionary; + preserveInvariance: boolean; + copyWithZone(zone: interop.Pointer | interop.Reference): any; } @@ -786,6 +1130,10 @@ interface MTLComputeCommandEncoder extends MTLCommandEncoder { memoryBarrierWithScope(scope: MTLBarrierScope): void; + sampleCountersInBufferAtSampleIndexWithBarrier(sampleBuffer: MTLCounterSampleBuffer, sampleIndex: number, barrier: boolean): void; + + setAccelerationStructureAtBufferIndex(accelerationStructure: MTLAccelerationStructure, bufferIndex: number): void; + setBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; setBufferOffsetAtIndex(offset: number, index: number): void; @@ -798,6 +1146,10 @@ interface MTLComputeCommandEncoder extends MTLCommandEncoder { setImageblockWidthHeight(width: number, height: number): void; + setIntersectionFunctionTableAtBufferIndex(intersectionFunctionTable: MTLIntersectionFunctionTable, bufferIndex: number): void; + + setIntersectionFunctionTablesWithBufferRange(intersectionFunctionTables: interop.Reference, range: NSRange): void; + setSamplerStateAtIndex(sampler: MTLSamplerState, index: number): void; setSamplerStateLodMinClampLodMaxClampAtIndex(sampler: MTLSamplerState, lodMinClamp: number, lodMaxClamp: number, index: number): void; @@ -816,6 +1168,10 @@ interface MTLComputeCommandEncoder extends MTLCommandEncoder { setThreadgroupMemoryLengthAtIndex(length: number, index: number): void; + setVisibleFunctionTableAtBufferIndex(visibleFunctionTable: MTLVisibleFunctionTable, bufferIndex: number): void; + + setVisibleFunctionTablesWithBufferRange(visibleFunctionTables: interop.Reference, range: NSRange): void; + updateFence(fence: MTLFence): void; useHeap(heap: MTLHeap): void; @@ -833,22 +1189,74 @@ declare var MTLComputeCommandEncoder: { prototype: MTLComputeCommandEncoder; }; +declare class MTLComputePassDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLComputePassDescriptor; // inherited from NSObject + + static computePassDescriptor(): MTLComputePassDescriptor; + + static new(): MTLComputePassDescriptor; // inherited from NSObject + + dispatchType: MTLDispatchType; + + readonly sampleBufferAttachments: MTLComputePassSampleBufferAttachmentDescriptorArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLComputePassSampleBufferAttachmentDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLComputePassSampleBufferAttachmentDescriptor; // inherited from NSObject + + static new(): MTLComputePassSampleBufferAttachmentDescriptor; // inherited from NSObject + + endOfEncoderSampleIndex: number; + + sampleBuffer: MTLCounterSampleBuffer; + + startOfEncoderSampleIndex: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLComputePassSampleBufferAttachmentDescriptorArray extends NSObject { + + static alloc(): MTLComputePassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + + static new(): MTLComputePassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + [index: number]: MTLComputePassSampleBufferAttachmentDescriptor; + + objectAtIndexedSubscript(attachmentIndex: number): MTLComputePassSampleBufferAttachmentDescriptor; + + setObjectAtIndexedSubscript(attachment: MTLComputePassSampleBufferAttachmentDescriptor, attachmentIndex: number): void; +} + declare class MTLComputePipelineDescriptor extends NSObject implements NSCopying { static alloc(): MTLComputePipelineDescriptor; // inherited from NSObject static new(): MTLComputePipelineDescriptor; // inherited from NSObject + binaryArchives: NSArray; + readonly buffers: MTLPipelineBufferDescriptorArray; computeFunction: MTLFunction; + insertLibraries: NSArray; + label: string; + linkedFunctions: MTLLinkedFunctions; + + maxCallStackDepth: number; + maxTotalThreadsPerThreadgroup: number; stageInputDescriptor: MTLStageInputOutputDescriptor; + supportAddingBinaryFunctions: boolean; + supportIndirectCommandBuffers: boolean; threadGroupSizeIsMultipleOfThreadExecutionWidth: boolean; @@ -881,13 +1289,124 @@ interface MTLComputePipelineState extends NSObjectProtocol { threadExecutionWidth: number; + functionHandleWithFunction(_function: MTLFunction): MTLFunctionHandle; + imageblockMemoryLengthForDimensions(imageblockDimensions: MTLSize): number; + + newComputePipelineStateWithAdditionalBinaryFunctionsError(functions: NSArray | MTLFunction[]): MTLComputePipelineState; + + newIntersectionFunctionTableWithDescriptor(descriptor: MTLIntersectionFunctionTableDescriptor): MTLIntersectionFunctionTable; + + newVisibleFunctionTableWithDescriptor(descriptor: MTLVisibleFunctionTableDescriptor): MTLVisibleFunctionTable; } declare var MTLComputePipelineState: { prototype: MTLComputePipelineState; }; +interface MTLCounter extends NSObjectProtocol { + + name: string; +} +declare var MTLCounter: { + + prototype: MTLCounter; +}; + +declare var MTLCounterErrorDomain: string; + +interface MTLCounterResultStageUtilization { + totalCycles: number; + vertexCycles: number; + tessellationCycles: number; + postTessellationVertexCycles: number; + fragmentCycles: number; + renderTargetCycles: number; +} +declare var MTLCounterResultStageUtilization: interop.StructType; + +interface MTLCounterResultStatistic { + tessellationInputPatches: number; + vertexInvocations: number; + postTessellationVertexInvocations: number; + clipperInvocations: number; + clipperPrimitivesOut: number; + fragmentInvocations: number; + fragmentsPassed: number; + computeKernelInvocations: number; +} +declare var MTLCounterResultStatistic: interop.StructType; + +interface MTLCounterResultTimestamp { + timestamp: number; +} +declare var MTLCounterResultTimestamp: interop.StructType; + +interface MTLCounterSampleBuffer extends NSObjectProtocol { + + device: MTLDevice; + + label: string; + + sampleCount: number; + + resolveCounterRange(range: NSRange): NSData; +} +declare var MTLCounterSampleBuffer: { + + prototype: MTLCounterSampleBuffer; +}; + +declare class MTLCounterSampleBufferDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLCounterSampleBufferDescriptor; // inherited from NSObject + + static new(): MTLCounterSampleBufferDescriptor; // inherited from NSObject + + counterSet: MTLCounterSet; + + label: string; + + sampleCount: number; + + storageMode: MTLStorageMode; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum MTLCounterSampleBufferError { + + OutOfMemory = 0, + + Invalid = 1, + + Internal = 2 +} + +declare const enum MTLCounterSamplingPoint { + + AtStageBoundary = 0, + + AtDrawBoundary = 1, + + AtDispatchBoundary = 2, + + AtTileDispatchBoundary = 3, + + AtBlitBoundary = 4 +} + +interface MTLCounterSet extends NSObjectProtocol { + + counters: NSArray; + + name: string; +} +declare var MTLCounterSet: { + + prototype: MTLCounterSet; +}; + declare function MTLCreateSystemDefaultDevice(): MTLDevice; declare const enum MTLCullMode { @@ -1057,7 +1576,15 @@ declare const enum MTLDataType { ComputePipeline = 79, - IndirectCommandBuffer = 80 + IndirectCommandBuffer = 80, + + VisibleFunctionTable = 115, + + IntersectionFunctionTable = 116, + + PrimitiveAccelerationStructure = 117, + + InstanceAccelerationStructure = 118 } declare const enum MTLDepthClipMode { @@ -1101,6 +1628,10 @@ interface MTLDevice extends NSObjectProtocol { argumentBuffersSupport: MTLArgumentBuffersTier; + barycentricCoordsSupported: boolean; + + counterSets: NSArray; + currentAllocatedSize: number; hasUnifiedMemory: boolean; @@ -1125,6 +1656,18 @@ interface MTLDevice extends NSObjectProtocol { sparseTileSizeInBytes: number; + supportsDynamicLibraries: boolean; + + supportsFunctionPointers: boolean; + + supportsPullModelInterpolation: boolean; + + supportsRaytracing: boolean; + + supportsShaderBarycentricCoordinates: boolean; + + accelerationStructureSizesWithDescriptor(descriptor: MTLAccelerationStructureDescriptor): MTLAccelerationStructureSizes; + convertSparsePixelRegionsToTileRegionsWithTileSizeAlignmentModeNumRegions?(pixelRegions: interop.Reference, tileRegions: interop.Reference, tileSize: MTLSize, mode: MTLSparseTextureRegionAlignmentMode, numRegions: number): void; convertSparseTileRegionsToPixelRegionsWithTileSizeNumRegions?(tileRegions: interop.Reference, pixelRegions: interop.Reference, tileSize: MTLSize, numRegions: number): void; @@ -1139,8 +1682,14 @@ interface MTLDevice extends NSObjectProtocol { minimumTextureBufferAlignmentForPixelFormat(format: MTLPixelFormat): number; + newAccelerationStructureWithDescriptor(descriptor: MTLAccelerationStructureDescriptor): MTLAccelerationStructure; + + newAccelerationStructureWithSize(size: number): MTLAccelerationStructure; + newArgumentEncoderWithArguments(_arguments: NSArray | MTLArgumentDescriptor[]): MTLArgumentEncoder; + newBinaryArchiveWithDescriptorError(descriptor: MTLBinaryArchiveDescriptor): MTLBinaryArchive; + newBufferWithBytesLengthOptions(pointer: interop.Pointer | interop.Reference, length: number, options: MTLResourceOptions): MTLBuffer; newBufferWithBytesNoCopyLengthOptionsDeallocator(pointer: interop.Pointer | interop.Reference, length: number, options: MTLResourceOptions, deallocator: (p1: interop.Pointer | interop.Reference, p2: number) => void): MTLBuffer; @@ -1163,12 +1712,18 @@ interface MTLDevice extends NSObjectProtocol { newComputePipelineStateWithFunctionOptionsReflectionError(computeFunction: MTLFunction, options: MTLPipelineOption, reflection: interop.Pointer | interop.Reference): MTLComputePipelineState; + newCounterSampleBufferWithDescriptorError(descriptor: MTLCounterSampleBufferDescriptor): MTLCounterSampleBuffer; + newDefaultLibrary(): MTLLibrary; newDefaultLibraryWithBundleError(bundle: NSBundle): MTLLibrary; newDepthStencilStateWithDescriptor(descriptor: MTLDepthStencilDescriptor): MTLDepthStencilState; + newDynamicLibraryError(library: MTLLibrary): MTLDynamicLibrary; + + newDynamicLibraryWithURLError(url: NSURL): MTLDynamicLibrary; + newEvent(): MTLEvent; newFence(): MTLFence; @@ -1209,10 +1764,14 @@ interface MTLDevice extends NSObjectProtocol { newTextureWithDescriptor(descriptor: MTLTextureDescriptor): MTLTexture; - newTextureWithDescriptorIosurfacePlane(descriptor: MTLTextureDescriptor, iosurface: any, plane: number): MTLTexture; + newTextureWithDescriptorIosurfacePlane(descriptor: MTLTextureDescriptor, iosurface: IOSurface, plane: number): MTLTexture; + + sampleTimestampsGpuTimestamp(cpuTimestamp: interop.Pointer | interop.Reference, gpuTimestamp: interop.Pointer | interop.Reference): void; sparseTileSizeWithTextureTypePixelFormatSampleCount(textureType: MTLTextureType, pixelFormat: MTLPixelFormat, sampleCount: number): MTLSize; + supportsCounterSampling(samplingPoint: MTLCounterSamplingPoint): boolean; + supportsFamily(gpuFamily: MTLGPUFamily): boolean; supportsFeatureSet(featureSet: MTLFeatureSet): boolean; @@ -1267,16 +1826,8 @@ declare var MTLDrawPrimitivesIndirectArguments: interop.StructType void): void; - present(): void; - presentAfterMinimumDuration(duration: number): void; - presentAtTime(presentationTime: number): void; } declare var MTLDrawable: { @@ -1284,6 +1835,38 @@ declare var MTLDrawable: { prototype: MTLDrawable; }; +interface MTLDynamicLibrary extends NSObjectProtocol { + + device: MTLDevice; + + installName: string; + + label: string; + + serializeToURLError(url: NSURL): boolean; +} +declare var MTLDynamicLibrary: { + + prototype: MTLDynamicLibrary; +}; + +declare var MTLDynamicLibraryDomain: string; + +declare const enum MTLDynamicLibraryError { + + None = 0, + + InvalidFile = 1, + + CompilationFailure = 2, + + UnresolvedInstallName = 3, + + DependencyLoadFailure = 4, + + Unsupported = 5 +} + interface MTLEvent extends NSObjectProtocol { device: MTLDevice; @@ -1383,6 +1966,8 @@ interface MTLFunction extends NSObjectProtocol { name: string; + options: MTLFunctionOptions; + patchControlPointCount: number; patchType: MTLPatchType; @@ -1432,13 +2017,91 @@ declare class MTLFunctionConstantValues extends NSObject implements NSCopying { setConstantValuesTypeWithRange(values: interop.Pointer | interop.Reference, type: MTLDataType, range: NSRange): void; } +declare class MTLFunctionDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLFunctionDescriptor; // inherited from NSObject + + static functionDescriptor(): MTLFunctionDescriptor; + + static new(): MTLFunctionDescriptor; // inherited from NSObject + + constantValues: MTLFunctionConstantValues; + + name: string; + + options: MTLFunctionOptions; + + specializedName: string; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +interface MTLFunctionHandle extends NSObjectProtocol { + + device: MTLDevice; + + functionType: MTLFunctionType; + + name: string; +} +declare var MTLFunctionHandle: { + + prototype: MTLFunctionHandle; +}; + +interface MTLFunctionLog extends NSObjectProtocol { + + debugLocation: MTLFunctionLogDebugLocation; + + encoderLabel: string; + + function: MTLFunction; + + type: MTLFunctionLogType; +} +declare var MTLFunctionLog: { + + prototype: MTLFunctionLog; +}; + +interface MTLFunctionLogDebugLocation extends NSObjectProtocol { + + URL: NSURL; + + column: number; + + functionName: string; + + line: number; +} +declare var MTLFunctionLogDebugLocation: { + + prototype: MTLFunctionLogDebugLocation; +}; + +declare const enum MTLFunctionLogType { + + Validation = 0 +} + +declare const enum MTLFunctionOptions { + + None = 0, + + CompileToBinary = 1 +} + declare const enum MTLFunctionType { Vertex = 1, Fragment = 2, - Kernel = 3 + Kernel = 3, + + Visible = 5, + + Intersection = 6 } declare const enum MTLGPUFamily { @@ -1455,6 +2118,8 @@ declare const enum MTLGPUFamily { Apple6 = 1006, + Apple7 = 1007, + Mac1 = 2001, Mac2 = 2002, @@ -1570,7 +2235,7 @@ declare var MTLIndirectCommandBuffer: { prototype: MTLIndirectCommandBuffer; }; -declare class MTLIndirectCommandBufferDescriptor extends NSObject { +declare class MTLIndirectCommandBufferDescriptor extends NSObject implements NSCopying { static alloc(): MTLIndirectCommandBufferDescriptor; // inherited from NSObject @@ -1587,6 +2252,8 @@ declare class MTLIndirectCommandBufferDescriptor extends NSObject { maxKernelBufferBindCount: number; maxVertexBufferBindCount: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; } interface MTLIndirectCommandBufferExecutionRange { @@ -1624,6 +2291,8 @@ interface MTLIndirectComputeCommand extends NSObjectProtocol { setComputePipelineState(pipelineState: MTLComputePipelineState): void; + setImageblockWidthHeight(width: number, height: number): void; + setKernelBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; setStageInRegion(region: MTLRegion): void; @@ -1658,6 +2327,81 @@ declare var MTLIndirectRenderCommand: { prototype: MTLIndirectRenderCommand; }; +declare class MTLInstanceAccelerationStructureDescriptor extends MTLAccelerationStructureDescriptor { + + static alloc(): MTLInstanceAccelerationStructureDescriptor; // inherited from NSObject + + static descriptor(): MTLInstanceAccelerationStructureDescriptor; + + static new(): MTLInstanceAccelerationStructureDescriptor; // inherited from NSObject + + instanceCount: number; + + instanceDescriptorBuffer: MTLBuffer; + + instanceDescriptorBufferOffset: number; + + instanceDescriptorStride: number; + + instancedAccelerationStructures: NSArray; +} + +declare class MTLIntersectionFunctionDescriptor extends MTLFunctionDescriptor implements NSCopying { + + static alloc(): MTLIntersectionFunctionDescriptor; // inherited from NSObject + + static new(): MTLIntersectionFunctionDescriptor; // inherited from NSObject + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum MTLIntersectionFunctionSignature { + + None = 0, + + Instancing = 1, + + TriangleData = 2, + + WorldSpaceData = 4 +} + +interface MTLIntersectionFunctionTable extends MTLResource { + + setBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; + + setBuffersOffsetsWithRange(buffers: interop.Reference, offsets: interop.Reference, range: NSRange): void; + + setFunctionAtIndex(_function: MTLFunctionHandle, index: number): void; + + setFunctionsWithRange(functions: interop.Reference, range: NSRange): void; + + setOpaqueTriangleIntersectionFunctionWithSignatureAtIndex(signature: MTLIntersectionFunctionSignature, index: number): void; + + setOpaqueTriangleIntersectionFunctionWithSignatureWithRange(signature: MTLIntersectionFunctionSignature, range: NSRange): void; + + setVisibleFunctionTableAtBufferIndex(functionTable: MTLVisibleFunctionTable, bufferIndex: number): void; + + setVisibleFunctionTablesWithBufferRange(functionTables: interop.Reference, bufferRange: NSRange): void; +} +declare var MTLIntersectionFunctionTable: { + + prototype: MTLIntersectionFunctionTable; +}; + +declare class MTLIntersectionFunctionTableDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLIntersectionFunctionTableDescriptor; // inherited from NSObject + + static intersectionFunctionTableDescriptor(): MTLIntersectionFunctionTableDescriptor; + + static new(): MTLIntersectionFunctionTableDescriptor; // inherited from NSObject + + functionCount: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare const enum MTLLanguageVersion { Version1_0 = 65536, @@ -1670,7 +2414,9 @@ declare const enum MTLLanguageVersion { Version2_1 = 131073, - Version2_2 = 131074 + Version2_2 = 131074, + + Version2_3 = 131075 } interface MTLLibrary extends NSObjectProtocol { @@ -1679,13 +2425,25 @@ interface MTLLibrary extends NSObjectProtocol { functionNames: NSArray; + installName: string; + label: string; + type: MTLLibraryType; + + newFunctionWithDescriptorCompletionHandler(descriptor: MTLFunctionDescriptor, completionHandler: (p1: MTLFunction, p2: NSError) => void): void; + + newFunctionWithDescriptorError(descriptor: MTLFunctionDescriptor): MTLFunction; + newFunctionWithName(functionName: string): MTLFunction; newFunctionWithNameConstantValuesCompletionHandler(name: string, constantValues: MTLFunctionConstantValues, completionHandler: (p1: MTLFunction, p2: NSError) => void): void; newFunctionWithNameConstantValuesError(name: string, constantValues: MTLFunctionConstantValues): MTLFunction; + + newIntersectionFunctionWithDescriptorCompletionHandler(descriptor: MTLIntersectionFunctionDescriptor, completionHandler: (p1: MTLFunction, p2: NSError) => void): void; + + newIntersectionFunctionWithDescriptorError(descriptor: MTLIntersectionFunctionDescriptor): MTLFunction; } declare var MTLLibrary: { @@ -1709,6 +2467,30 @@ declare const enum MTLLibraryError { declare var MTLLibraryErrorDomain: string; +declare const enum MTLLibraryType { + + Executable = 0, + + Dynamic = 1 +} + +declare class MTLLinkedFunctions extends NSObject implements NSCopying { + + static alloc(): MTLLinkedFunctions; // inherited from NSObject + + static linkedFunctions(): MTLLinkedFunctions; + + static new(): MTLLinkedFunctions; // inherited from NSObject + + binaryFunctions: NSArray; + + functions: NSArray; + + groups: NSDictionary>; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare const enum MTLLoadAction { DontCare = 0, @@ -1718,6 +2500,13 @@ declare const enum MTLLoadAction { Clear = 2 } +interface MTLLogContainer extends NSFastEnumeration { +} +declare var MTLLogContainer: { + + prototype: MTLLogContainer; +}; + interface MTLMapIndirectArguments { regionOriginX: number; regionOriginY: number; @@ -1821,7 +2610,9 @@ declare const enum MTLPipelineOption { ArgumentInfo = 1, - BufferTypeInfo = 2 + BufferTypeInfo = 2, + + FailOnBinaryArchiveMiss = 4 } declare const enum MTLPixelFormat { @@ -2126,6 +2917,17 @@ declare class MTLPointerType extends MTLType { elementStructType(): MTLStructType; } +declare class MTLPrimitiveAccelerationStructureDescriptor extends MTLAccelerationStructureDescriptor { + + static alloc(): MTLPrimitiveAccelerationStructureDescriptor; // inherited from NSObject + + static descriptor(): MTLPrimitiveAccelerationStructureDescriptor; + + static new(): MTLPrimitiveAccelerationStructureDescriptor; // inherited from NSObject + + geometryDescriptors: NSArray; +} + declare const enum MTLPrimitiveTopologyClass { Unspecified = 0, @@ -2323,6 +3125,8 @@ interface MTLRenderCommandEncoder extends MTLCommandEncoder { executeCommandsInBufferWithRange(indirectCommandBuffer: MTLIndirectCommandBuffer, executionRange: NSRange): void; + sampleCountersInBufferAtSampleIndexWithBarrier(sampleBuffer: MTLCounterSampleBuffer, sampleIndex: number, barrier: boolean): void; + setBlendColorRedGreenBlueAlpha(red: number, green: number, blue: number, alpha: number): void; setColorStoreActionAtIndex(storeAction: MTLStoreAction, colorAttachmentIndex: number): void; @@ -2341,10 +3145,10 @@ interface MTLRenderCommandEncoder extends MTLCommandEncoder { setDepthStoreActionOptions(storeActionOptions: MTLStoreActionOptions): void; - setFragmentBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; - setFragmentBufferOffsetAtIndex(offset: number, index: number): void; + setFragmentBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; + setFragmentBuffersOffsetsWithRange(buffers: interop.Reference, offsets: interop.Reference, range: NSRange): void; setFragmentBytesLengthAtIndex(bytes: interop.Pointer | interop.Reference, length: number, index: number): void; @@ -2383,10 +3187,10 @@ interface MTLRenderCommandEncoder extends MTLCommandEncoder { setThreadgroupMemoryLengthOffsetAtIndex(length: number, offset: number, index: number): void; - setTileBufferOffsetAtIndex(offset: number, index: number): void; - setTileBufferOffsetAtIndex(buffer: MTLBuffer, offset: number, index: number): void; + setTileBufferOffsetAtIndex(offset: number, index: number): void; + setTileBuffersOffsetsWithRange(buffers: interop.Reference, offsets: interop.Reference, range: NSRange): void; setTileBytesLengthAtIndex(bytes: interop.Pointer | interop.Reference, length: number, index: number): void; @@ -2545,6 +3349,8 @@ declare class MTLRenderPassDescriptor extends NSObject implements NSCopying { renderTargetWidth: number; + readonly sampleBufferAttachments: MTLRenderPassSampleBufferAttachmentDescriptorArray; + stencilAttachment: MTLRenderPassStencilAttachmentDescriptor; threadgroupMemoryLength: number; @@ -2562,6 +3368,37 @@ declare class MTLRenderPassDescriptor extends NSObject implements NSCopying { setSamplePositionsCount(positions: interop.Pointer | interop.Reference, count: number): void; } +declare class MTLRenderPassSampleBufferAttachmentDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLRenderPassSampleBufferAttachmentDescriptor; // inherited from NSObject + + static new(): MTLRenderPassSampleBufferAttachmentDescriptor; // inherited from NSObject + + endOfFragmentSampleIndex: number; + + endOfVertexSampleIndex: number; + + sampleBuffer: MTLCounterSampleBuffer; + + startOfFragmentSampleIndex: number; + + startOfVertexSampleIndex: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLRenderPassSampleBufferAttachmentDescriptorArray extends NSObject { + + static alloc(): MTLRenderPassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + + static new(): MTLRenderPassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + [index: number]: MTLRenderPassSampleBufferAttachmentDescriptor; + + objectAtIndexedSubscript(attachmentIndex: number): MTLRenderPassSampleBufferAttachmentDescriptor; + + setObjectAtIndexedSubscript(attachment: MTLRenderPassSampleBufferAttachmentDescriptor, attachmentIndex: number): void; +} + declare class MTLRenderPassStencilAttachmentDescriptor extends MTLRenderPassAttachmentDescriptor { static alloc(): MTLRenderPassStencilAttachmentDescriptor; // inherited from NSObject @@ -2622,6 +3459,8 @@ declare class MTLRenderPipelineDescriptor extends NSObject implements NSCopying alphaToOneEnabled: boolean; + binaryArchives: NSArray; + readonly colorAttachments: MTLRenderPipelineColorAttachmentDescriptorArray; depthAttachmentPixelFormat: MTLPixelFormat; @@ -2785,6 +3624,46 @@ declare var MTLResourceStateCommandEncoder: { prototype: MTLResourceStateCommandEncoder; }; +declare class MTLResourceStatePassDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLResourceStatePassDescriptor; // inherited from NSObject + + static new(): MTLResourceStatePassDescriptor; // inherited from NSObject + + static resourceStatePassDescriptor(): MTLResourceStatePassDescriptor; + + readonly sampleBufferAttachments: MTLResourceStatePassSampleBufferAttachmentDescriptorArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLResourceStatePassSampleBufferAttachmentDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLResourceStatePassSampleBufferAttachmentDescriptor; // inherited from NSObject + + static new(): MTLResourceStatePassSampleBufferAttachmentDescriptor; // inherited from NSObject + + endOfEncoderSampleIndex: number; + + sampleBuffer: MTLCounterSampleBuffer; + + startOfEncoderSampleIndex: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MTLResourceStatePassSampleBufferAttachmentDescriptorArray extends NSObject { + + static alloc(): MTLResourceStatePassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + + static new(): MTLResourceStatePassSampleBufferAttachmentDescriptorArray; // inherited from NSObject + [index: number]: MTLResourceStatePassSampleBufferAttachmentDescriptor; + + objectAtIndexedSubscript(attachmentIndex: number): MTLResourceStatePassSampleBufferAttachmentDescriptor; + + setObjectAtIndexedSubscript(attachment: MTLResourceStatePassSampleBufferAttachmentDescriptor, attachmentIndex: number): void; +} + declare const enum MTLResourceUsage { Read = 1, @@ -2815,12 +3694,23 @@ declare const enum MTLSamplerAddressMode { ClampToBorderColor = 5 } +declare const enum MTLSamplerBorderColor { + + TransparentBlack = 0, + + OpaqueBlack = 1, + + OpaqueWhite = 2 +} + declare class MTLSamplerDescriptor extends NSObject implements NSCopying { static alloc(): MTLSamplerDescriptor; // inherited from NSObject static new(): MTLSamplerDescriptor; // inherited from NSObject + borderColor: MTLSamplerBorderColor; + compareFunction: MTLCompareFunction; label: string; @@ -3168,7 +4058,7 @@ interface MTLTexture extends MTLResource { height: number; - iosurface: any; + iosurface: IOSurface; iosurfacePlane: number; @@ -3365,6 +4255,8 @@ declare class MTLTileRenderPipelineDescriptor extends NSObject implements NSCopy static new(): MTLTileRenderPipelineDescriptor; // inherited from NSObject + binaryArchives: NSArray; + readonly colorAttachments: MTLTileRenderPipelineColorAttachmentDescriptorArray; label: string; @@ -3641,6 +4533,30 @@ declare const enum MTLVisibilityResultMode { Counting = 2 } +interface MTLVisibleFunctionTable extends MTLResource { + + setFunctionAtIndex(_function: MTLFunctionHandle, index: number): void; + + setFunctionsWithRange(functions: interop.Reference, range: NSRange): void; +} +declare var MTLVisibleFunctionTable: { + + prototype: MTLVisibleFunctionTable; +}; + +declare class MTLVisibleFunctionTableDescriptor extends NSObject implements NSCopying { + + static alloc(): MTLVisibleFunctionTableDescriptor; // inherited from NSObject + + static new(): MTLVisibleFunctionTableDescriptor; // inherited from NSObject + + static visibleFunctionTableDescriptor(): MTLVisibleFunctionTableDescriptor; + + functionCount: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare const enum MTLWinding { Clockwise = 0, diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetalPerformanceShadersGraph.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetalPerformanceShadersGraph.d.ts new file mode 100644 index 000000000..4495ab6d0 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetalPerformanceShadersGraph.d.ts @@ -0,0 +1,538 @@ + +declare class MPSGraph extends NSObject { + + static alloc(): MPSGraph; // inherited from NSObject + + static new(): MPSGraph; // inherited from NSObject + + options: MPSGraphOptions; + + readonly placeholderTensors: NSArray; + + absoluteWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + acosWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + acoshWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + additionWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + applyStochasticGradientDescentWithLearningRateTensorVariableGradientTensorName(learningRateTensor: MPSGraphTensor, variable: MPSGraphVariableOp, gradientTensor: MPSGraphTensor, name: string): MPSGraphOperation; + + asinWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + asinhWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + assignVariableWithValueOfTensorName(variable: MPSGraphTensor, tensor: MPSGraphTensor, name: string): MPSGraphOperation; + + atan2WithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + atanWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + atanhWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + avgPooling2DGradientWithGradientTensorSourceTensorDescriptorName(gradient: MPSGraphTensor, source: MPSGraphTensor, descriptor: MPSGraphPooling2DOpDescriptor, name: string): MPSGraphTensor; + + avgPooling2DWithSourceTensorDescriptorName(source: MPSGraphTensor, descriptor: MPSGraphPooling2DOpDescriptor, name: string): MPSGraphTensor; + + ceilWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + clampWithTensorMinValueTensorMaxValueTensorName(tensor: MPSGraphTensor, minValueTensor: MPSGraphTensor, maxValueTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + concatTensorWithTensorDimensionName(tensor: MPSGraphTensor, tensor2: MPSGraphTensor, dimensionIndex: number, name: string): MPSGraphTensor; + + concatTensorsDimensionName(tensors: NSArray | MPSGraphTensor[], dimensionIndex: number, name: string): MPSGraphTensor; + + convolution2DDataGradientWithIncomingGradientTensorWeightsTensorOutputShapeForwardConvolutionDescriptorName(incomingGradient: MPSGraphTensor, weights: MPSGraphTensor, outputShape: NSArray | number[], forwardConvolutionDescriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + convolution2DWeightsGradientWithIncomingGradientTensorSourceTensorOutputShapeForwardConvolutionDescriptorName(incomingGradient: MPSGraphTensor, source: MPSGraphTensor, outputShape: NSArray | number[], forwardConvolutionDescriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + convolution2DWithSourceTensorWeightsTensorDescriptorName(source: MPSGraphTensor, weights: MPSGraphTensor, descriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + convolutionTranspose2DDataGradientWithIncomingGradientTensorWeightsTensorOutputShapeForwardConvolutionDescriptorName(incomingGradient: MPSGraphTensor, weights: MPSGraphTensor, outputShape: NSArray | number[], forwardConvolutionDescriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + convolutionTranspose2DWeightsGradientWithIncomingGradientTensorSourceTensorOutputShapeForwardConvolutionDescriptorName(incomingGradientTensor: MPSGraphTensor, source: MPSGraphTensor, outputShape: NSArray | number[], forwardConvolutionDescriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + convolutionTranspose2DWithSourceTensorWeightsTensorOutputShapeDescriptorName(source: MPSGraphTensor, weights: MPSGraphTensor, outputShape: NSArray | number[], descriptor: MPSGraphConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + cosWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + coshWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + depthwiseConvolution2DDataGradientWithIncomingGradientTensorWeightsTensorOutputShapeDescriptorName(incomingGradient: MPSGraphTensor, weights: MPSGraphTensor, outputShape: NSArray | number[], descriptor: MPSGraphDepthwiseConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + depthwiseConvolution2DWeightsGradientWithIncomingGradientTensorSourceTensorOutputShapeDescriptorName(incomingGradient: MPSGraphTensor, source: MPSGraphTensor, outputShape: NSArray | number[], descriptor: MPSGraphDepthwiseConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + depthwiseConvolution2DWithSourceTensorWeightsTensorDescriptorName(source: MPSGraphTensor, weights: MPSGraphTensor, descriptor: MPSGraphDepthwiseConvolution2DOpDescriptor, name: string): MPSGraphTensor; + + divisionNoNaNWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + divisionWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + dropoutTensorRateName(tensor: MPSGraphTensor, rate: number, name: string): MPSGraphTensor; + + dropoutTensorRateTensorName(tensor: MPSGraphTensor, rate: MPSGraphTensor, name: string): MPSGraphTensor; + + equalWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + erfWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + exponentBase10WithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + exponentBase2WithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + exponentWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + floorModuloWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + floorWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + gatherNDWithUpdatesTensorIndicesTensorBatchDimensionsName(updatesTensor: MPSGraphTensor, indicesTensor: MPSGraphTensor, batchDimensions: number, name: string): MPSGraphTensor; + + gatherWithUpdatesTensorIndicesTensorAxisBatchDimensionsName(updatesTensor: MPSGraphTensor, indicesTensor: MPSGraphTensor, axis: number, batchDimensions: number, name: string): MPSGraphTensor; + + gradientForPrimaryTensorWithTensorsName(primaryTensor: MPSGraphTensor, tensors: NSArray | MPSGraphTensor[], name: string): NSDictionary; + + greaterThanOrEqualToWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + greaterThanWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + identityWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + isFiniteWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + isInfiniteWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + isNaNWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + lessThanOrEqualToWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + lessThanWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logarithmBase10WithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logarithmBase2WithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logarithmWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalANDWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalNANDWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalNORWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalORWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalXNORWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + logicalXORWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + matrixMultiplicationWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + maxPooling2DGradientWithGradientTensorSourceTensorDescriptorName(gradient: MPSGraphTensor, source: MPSGraphTensor, descriptor: MPSGraphPooling2DOpDescriptor, name: string): MPSGraphTensor; + + maxPooling2DWithSourceTensorDescriptorName(source: MPSGraphTensor, descriptor: MPSGraphPooling2DOpDescriptor, name: string): MPSGraphTensor; + + maximumWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + meanOfTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + minimumWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + moduloWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + multiplicationWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + negativeWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + normalizationBetaGradientWithIncomingGradientTensorSourceTensorReductionAxesName(incomingGradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + normalizationGammaGradientWithIncomingGradientTensorSourceTensorMeanTensorVarianceTensorReductionAxesEpsilonName(incomingGradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, meanTensor: MPSGraphTensor, varianceTensor: MPSGraphTensor, axes: NSArray | number[], epsilon: number, name: string): MPSGraphTensor; + + normalizationGradientWithIncomingGradientTensorSourceTensorMeanTensorVarianceTensorGammaTensorGammaGradientTensorBetaGradientTensorReductionAxesEpsilonName(incomingGradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, meanTensor: MPSGraphTensor, varianceTensor: MPSGraphTensor, gamma: MPSGraphTensor, gammaGradient: MPSGraphTensor, betaGradient: MPSGraphTensor, axes: NSArray | number[], epsilon: number, name: string): MPSGraphTensor; + + normalizationWithTensorMeanTensorVarianceTensorGammaTensorBetaTensorEpsilonName(tensor: MPSGraphTensor, mean: MPSGraphTensor, variance: MPSGraphTensor, gamma: MPSGraphTensor, beta: MPSGraphTensor, epsilon: number, name: string): MPSGraphTensor; + + notEqualWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + notWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + oneHotWithIndicesTensorDepthAxisName(indicesTensor: MPSGraphTensor, depth: number, axis: number, name: string): MPSGraphTensor; + + oneHotWithIndicesTensorDepthName(indicesTensor: MPSGraphTensor, depth: number, name: string): MPSGraphTensor; + + padGradientWithIncomingGradientTensorSourceTensorPaddingModeLeftPaddingRightPaddingName(incomingGradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, paddingMode: MPSGraphPaddingMode, leftPadding: NSArray | number[], rightPadding: NSArray | number[], name: string): MPSGraphTensor; + + padTensorWithPaddingModeLeftPaddingRightPaddingConstantValueName(tensor: MPSGraphTensor, paddingMode: MPSGraphPaddingMode, leftPadding: NSArray | number[], rightPadding: NSArray | number[], constantValue: number, name: string): MPSGraphTensor; + + placeholderWithShapeName(shape: NSArray | number[], name: string): MPSGraphTensor; + + powerWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + reLUGradientWithIncomingGradientSourceTensorName(gradient: MPSGraphTensor, source: MPSGraphTensor, name: string): MPSGraphTensor; + + reLUWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + readVariableName(variable: MPSGraphTensor, name: string): MPSGraphTensor; + + reciprocalWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + reductionMaximumWithTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + reductionMaximumWithTensorAxisName(tensor: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + reductionMinimumWithTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + reductionMinimumWithTensorAxisName(tensor: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + reductionProductWithTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + reductionProductWithTensorAxisName(tensor: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + reductionSumWithTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + reductionSumWithTensorAxisName(tensor: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + reshapeTensorWithShapeName(tensor: MPSGraphTensor, shape: NSArray | number[], name: string): MPSGraphTensor; + + resizeTensorSizeModeCenterResultAlignCornersLayoutName(imagesTensor: MPSGraphTensor, size: NSArray | number[], mode: MPSGraphResizeMode, centerResult: boolean, alignCorners: boolean, layout: MPSGraphTensorNamedDataLayout, name: string): MPSGraphTensor; + + resizeWithGradientTensorInputModeCenterResultAlignCornersLayoutName(gradient: MPSGraphTensor, input: MPSGraphTensor, mode: MPSGraphResizeMode, centerResult: boolean, alignCorners: boolean, layout: MPSGraphTensorNamedDataLayout, name: string): MPSGraphTensor; + + reverseSquareRootWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + rintWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + roundWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + runAsyncWithFeedsTargetTensorsTargetOperationsExecutionDescriptor(feeds: NSDictionary, targetTensors: NSArray | MPSGraphTensor[], targetOperations: NSArray | MPSGraphOperation[], executionDescriptor: MPSGraphExecutionDescriptor): NSDictionary; + + runAsyncWithMTLCommandQueueFeedsTargetOperationsResultsDictionaryExecutionDescriptor(commandQueue: MTLCommandQueue, feeds: NSDictionary, targetOperations: NSArray | MPSGraphOperation[], resultsDictionary: NSDictionary, executionDescriptor: MPSGraphExecutionDescriptor): void; + + runAsyncWithMTLCommandQueueFeedsTargetTensorsTargetOperationsExecutionDescriptor(commandQueue: MTLCommandQueue, feeds: NSDictionary, targetTensors: NSArray | MPSGraphTensor[], targetOperations: NSArray | MPSGraphOperation[], executionDescriptor: MPSGraphExecutionDescriptor): NSDictionary; + + runWithFeedsTargetTensorsTargetOperations(feeds: NSDictionary, targetTensors: NSArray | MPSGraphTensor[], targetOperations: NSArray | MPSGraphOperation[]): NSDictionary; + + runWithMTLCommandQueueFeedsTargetOperationsResultsDictionary(commandQueue: MTLCommandQueue, feeds: NSDictionary, targetOperations: NSArray | MPSGraphOperation[], resultsDictionary: NSDictionary): void; + + runWithMTLCommandQueueFeedsTargetTensorsTargetOperations(commandQueue: MTLCommandQueue, feeds: NSDictionary, targetTensors: NSArray | MPSGraphTensor[], targetOperations: NSArray | MPSGraphOperation[]): NSDictionary; + + scatterNDWithUpdatesTensorIndicesTensorShapeBatchDimensionsName(updatesTensor: MPSGraphTensor, indicesTensor: MPSGraphTensor, shape: NSArray | number[], batchDimensions: number, name: string): MPSGraphTensor; + + selectWithPredicateTensorTruePredicateTensorFalsePredicateTensorName(predicateTensor: MPSGraphTensor, truePredicateTensor: MPSGraphTensor, falseSelectTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + sigmoidGradientWithIncomingGradientSourceTensorName(gradient: MPSGraphTensor, source: MPSGraphTensor, name: string): MPSGraphTensor; + + sigmoidWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + signWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + signbitWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + sinWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + sinhWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + sliceTensorDimensionStartLengthName(tensor: MPSGraphTensor, dimensionIndex: number, start: number, length: number, name: string): MPSGraphTensor; + + softMaxCrossEntropyGradientWithIncomingGradientTensorSourceTensorLabelsTensorAxisReductionTypeName(gradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, labelsTensor: MPSGraphTensor, axis: number, reductionType: MPSGraphLossReductionType, name: string): MPSGraphTensor; + + softMaxCrossEntropyWithSourceTensorLabelsTensorAxisReductionTypeName(sourceTensor: MPSGraphTensor, labelsTensor: MPSGraphTensor, axis: number, reductionType: MPSGraphLossReductionType, name: string): MPSGraphTensor; + + softMaxGradientWithIncomingGradientSourceTensorAxisName(gradient: MPSGraphTensor, source: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + softMaxWithTensorAxisName(tensor: MPSGraphTensor, axis: number, name: string): MPSGraphTensor; + + squareRootWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + squareWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + stochasticGradientDescentWithLearningRateTensorValuesTensorGradientTensorName(learningRateTensor: MPSGraphTensor, valuesTensor: MPSGraphTensor, gradientTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + subtractionWithPrimaryTensorSecondaryTensorName(primaryTensor: MPSGraphTensor, secondaryTensor: MPSGraphTensor, name: string): MPSGraphTensor; + + tanWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + tanhWithTensorName(tensor: MPSGraphTensor, name: string): MPSGraphTensor; + + tileGradientWithIncomingGradientTensorSourceTensorWithMultiplierName(incomingGradientTensor: MPSGraphTensor, sourceTensor: MPSGraphTensor, multiplier: NSArray | number[], name: string): MPSGraphTensor; + + tileTensorWithMultiplierName(tensor: MPSGraphTensor, multiplier: NSArray | number[], name: string): MPSGraphTensor; + + transposeTensorDimensionWithDimensionName(tensor: MPSGraphTensor, dimensionIndex: number, dimensionIndex2: number, name: string): MPSGraphTensor; + + varianceOfTensorAxesName(tensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; + + varianceOfTensorMeanTensorAxesName(tensor: MPSGraphTensor, meanTensor: MPSGraphTensor, axes: NSArray | number[], name: string): MPSGraphTensor; +} + +declare class MPSGraphConvolution2DOpDescriptor extends NSObject implements NSCopying { + + static alloc(): MPSGraphConvolution2DOpDescriptor; // inherited from NSObject + + static descriptorWithStrideInXStrideInYDilationRateInXDilationRateInYGroupsPaddingLeftPaddingRightPaddingTopPaddingBottomPaddingStyleDataLayoutWeightsLayout(strideInX: number, strideInY: number, dilationRateInX: number, dilationRateInY: number, groups: number, paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number, paddingStyle: MPSGraphPaddingStyle, dataLayout: MPSGraphTensorNamedDataLayout, weightsLayout: MPSGraphTensorNamedDataLayout): MPSGraphConvolution2DOpDescriptor; + + static descriptorWithStrideInXStrideInYDilationRateInXDilationRateInYGroupsPaddingStyleDataLayoutWeightsLayout(strideInX: number, strideInY: number, dilationRateInX: number, dilationRateInY: number, groups: number, paddingStyle: MPSGraphPaddingStyle, dataLayout: MPSGraphTensorNamedDataLayout, weightsLayout: MPSGraphTensorNamedDataLayout): MPSGraphConvolution2DOpDescriptor; + + static new(): MPSGraphConvolution2DOpDescriptor; // inherited from NSObject + + dataLayout: MPSGraphTensorNamedDataLayout; + + dilationRateInX: number; + + dilationRateInY: number; + + groups: number; + + paddingBottom: number; + + paddingLeft: number; + + paddingRight: number; + + paddingStyle: MPSGraphPaddingStyle; + + paddingTop: number; + + strideInX: number; + + strideInY: number; + + weightsLayout: MPSGraphTensorNamedDataLayout; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + setExplicitPaddingWithPaddingLeftPaddingRightPaddingTopPaddingBottom(paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number): void; +} + +declare class MPSGraphDepthwiseConvolution2DOpDescriptor extends NSObject implements NSCopying { + + static alloc(): MPSGraphDepthwiseConvolution2DOpDescriptor; // inherited from NSObject + + static descriptorWithDataLayoutWeightsLayout(dataLayout: MPSGraphTensorNamedDataLayout, weightsLayout: MPSGraphTensorNamedDataLayout): MPSGraphDepthwiseConvolution2DOpDescriptor; + + static descriptorWithStrideInXStrideInYDilationRateInXDilationRateInYPaddingLeftPaddingRightPaddingTopPaddingBottomPaddingStyleDataLayoutWeightsLayout(strideInX: number, strideInY: number, dilationRateInX: number, dilationRateInY: number, paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number, paddingStyle: MPSGraphPaddingStyle, dataLayout: MPSGraphTensorNamedDataLayout, weightsLayout: MPSGraphTensorNamedDataLayout): MPSGraphDepthwiseConvolution2DOpDescriptor; + + static new(): MPSGraphDepthwiseConvolution2DOpDescriptor; // inherited from NSObject + + dataLayout: MPSGraphTensorNamedDataLayout; + + dilationRateInX: number; + + dilationRateInY: number; + + paddingBottom: number; + + paddingLeft: number; + + paddingRight: number; + + paddingStyle: MPSGraphPaddingStyle; + + paddingTop: number; + + strideInX: number; + + strideInY: number; + + weightsLayout: MPSGraphTensorNamedDataLayout; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + setExplicitPaddingWithPaddingLeftPaddingRightPaddingTopPaddingBottom(paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number): void; +} + +declare class MPSGraphDevice extends NSObject { + + static alloc(): MPSGraphDevice; // inherited from NSObject + + static deviceWithMTLDevice(metalDevice: MTLDevice): MPSGraphDevice; + + static new(): MPSGraphDevice; // inherited from NSObject + + readonly metalDevice: MTLDevice; + + readonly type: MPSGraphDeviceType; +} + +declare const enum MPSGraphDeviceType { + + Metal = 0 +} + +declare class MPSGraphExecutionDescriptor extends NSObject { + + static alloc(): MPSGraphExecutionDescriptor; // inherited from NSObject + + static new(): MPSGraphExecutionDescriptor; // inherited from NSObject + + completionHandler: (p1: NSDictionary, p2: NSError) => void; + + scheduledHandler: (p1: NSDictionary, p2: NSError) => void; + + waitUntilCompleted: boolean; +} + +declare const enum MPSGraphLossReductionType { + + Axis = 0, + + Sum = 1 +} + +declare class MPSGraphOperation extends NSObject implements NSCopying { + + static alloc(): MPSGraphOperation; // inherited from NSObject + + static new(): MPSGraphOperation; // inherited from NSObject + + readonly controlDependencies: NSArray; + + readonly graph: MPSGraph; + + readonly inputTensors: NSArray; + + readonly name: string; + + readonly outputTensors: NSArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum MPSGraphOptions { + + None = 0, + + SynchronizeResults = 1, + + Verbose = 2, + + Default = 1 +} + +declare const enum MPSGraphPaddingMode { + + Constant = 0, + + Reflect = 1, + + Symmetric = 2 +} + +declare const enum MPSGraphPaddingStyle { + + Explicit = 0, + + TF_VALID = 1, + + TF_SAME = 2 +} + +declare class MPSGraphPooling2DOpDescriptor extends NSObject implements NSCopying { + + static alloc(): MPSGraphPooling2DOpDescriptor; // inherited from NSObject + + static descriptorWithKernelWidthKernelHeightStrideInXStrideInYDilationRateInXDilationRateInYPaddingLeftPaddingRightPaddingTopPaddingBottomPaddingStyleDataLayout(kernelWidth: number, kernelHeight: number, strideInX: number, strideInY: number, dilationRateInX: number, dilationRateInY: number, paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number, paddingStyle: MPSGraphPaddingStyle, dataLayout: MPSGraphTensorNamedDataLayout): MPSGraphPooling2DOpDescriptor; + + static descriptorWithKernelWidthKernelHeightStrideInXStrideInYPaddingStyleDataLayout(kernelWidth: number, kernelHeight: number, strideInX: number, strideInY: number, paddingStyle: MPSGraphPaddingStyle, dataLayout: MPSGraphTensorNamedDataLayout): MPSGraphPooling2DOpDescriptor; + + static new(): MPSGraphPooling2DOpDescriptor; // inherited from NSObject + + dataLayout: MPSGraphTensorNamedDataLayout; + + dilationRateInX: number; + + dilationRateInY: number; + + kernelHeight: number; + + kernelWidth: number; + + paddingBottom: number; + + paddingLeft: number; + + paddingRight: number; + + paddingStyle: MPSGraphPaddingStyle; + + paddingTop: number; + + strideInX: number; + + strideInY: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + setExplicitPaddingWithPaddingLeftPaddingRightPaddingTopPaddingBottom(paddingLeft: number, paddingRight: number, paddingTop: number, paddingBottom: number): void; +} + +declare const enum MPSGraphResizeMode { + + Nearest = 0, + + Bilinear = 1 +} + +declare class MPSGraphShapedType extends NSObject implements NSCopying { + + static alloc(): MPSGraphShapedType; // inherited from NSObject + + static new(): MPSGraphShapedType; // inherited from NSObject + + shape: NSArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + isEqualTo(object: MPSGraphShapedType): boolean; +} + +declare class MPSGraphTensor extends NSObject implements NSCopying { + + static alloc(): MPSGraphTensor; // inherited from NSObject + + static new(): MPSGraphTensor; // inherited from NSObject + + readonly operation: MPSGraphOperation; + + readonly shape: NSArray; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class MPSGraphTensorData extends NSObject { + + static alloc(): MPSGraphTensorData; // inherited from NSObject + + static new(): MPSGraphTensorData; // inherited from NSObject + + readonly device: MPSGraphDevice; + + readonly shape: NSArray; +} + +declare const enum MPSGraphTensorNamedDataLayout { + + NCHW = 0, + + NHWC = 1, + + OIHW = 2, + + HWIO = 3, + + CHW = 4, + + HWC = 5, + + HW = 6 +} + +declare class MPSGraphVariableOp extends MPSGraphOperation { + + static alloc(): MPSGraphVariableOp; // inherited from NSObject + + static new(): MPSGraphVariableOp; // inherited from NSObject + + readonly shape: NSArray; +} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetricKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetricKit.d.ts index a8281ec94..e17922541 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetricKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!MetricKit.d.ts @@ -1,4 +1,24 @@ +declare class MXAnimationMetric extends MXMetric { + + static alloc(): MXAnimationMetric; // inherited from NSObject + + static new(): MXAnimationMetric; // inherited from NSObject + + readonly scrollHitchTimeRatio: NSMeasurement; +} + +declare class MXAppExitMetric extends MXMetric { + + static alloc(): MXAppExitMetric; // inherited from NSObject + + static new(): MXAppExitMetric; // inherited from NSObject + + readonly backgroundExitData: MXBackgroundExitData; + + readonly foregroundExitData: MXForegroundExitData; +} + declare class MXAppLaunchMetric extends MXMetric { static alloc(): MXAppLaunchMetric; // inherited from NSObject @@ -55,15 +75,82 @@ declare class MXAverage extends NSObject implements NSSecureCoding { initWithCoder(coder: NSCoder): this; } +declare class MXBackgroundExitData extends NSObject implements NSSecureCoding { + + static alloc(): MXBackgroundExitData; // inherited from NSObject + + static new(): MXBackgroundExitData; // inherited from NSObject + + readonly cumulativeAbnormalExitCount: number; + + readonly cumulativeAppWatchdogExitCount: number; + + readonly cumulativeBackgroundTaskAssertionTimeoutExitCount: number; + + readonly cumulativeBadAccessExitCount: number; + + readonly cumulativeCPUResourceLimitExitCount: number; + + readonly cumulativeIllegalInstructionExitCount: number; + + readonly cumulativeMemoryPressureExitCount: number; + + readonly cumulativeMemoryResourceLimitExitCount: number; + + readonly cumulativeNormalAppExitCount: number; + + readonly cumulativeSuspendedWithLockedFileExitCount: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class MXCPUExceptionDiagnostic extends MXDiagnostic { + + static alloc(): MXCPUExceptionDiagnostic; // inherited from NSObject + + static new(): MXCPUExceptionDiagnostic; // inherited from NSObject + + readonly callStackTree: MXCallStackTree; + + readonly totalCPUTime: NSMeasurement; + + readonly totalSampledTime: NSMeasurement; +} + declare class MXCPUMetric extends MXMetric { static alloc(): MXCPUMetric; // inherited from NSObject static new(): MXCPUMetric; // inherited from NSObject + readonly cumulativeCPUInstructions: NSMeasurement; + readonly cumulativeCPUTime: NSMeasurement; } +declare class MXCallStackTree extends NSObject implements NSSecureCoding { + + static alloc(): MXCallStackTree; // inherited from NSObject + + static new(): MXCallStackTree; // inherited from NSObject + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + JSONRepresentation(): NSData; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class MXCellularConditionMetric extends MXMetric { static alloc(): MXCellularConditionMetric; // inherited from NSObject @@ -73,6 +160,79 @@ declare class MXCellularConditionMetric extends MXMetric { readonly histogrammedCellularConditionTime: MXHistogram; } +declare class MXCrashDiagnostic extends MXDiagnostic { + + static alloc(): MXCrashDiagnostic; // inherited from NSObject + + static new(): MXCrashDiagnostic; // inherited from NSObject + + readonly callStackTree: MXCallStackTree; + + readonly exceptionCode: number; + + readonly exceptionType: number; + + readonly signal: number; + + readonly terminationReason: string; + + readonly virtualMemoryRegionInfo: string; +} + +declare class MXDiagnostic extends NSObject implements NSSecureCoding { + + static alloc(): MXDiagnostic; // inherited from NSObject + + static new(): MXDiagnostic; // inherited from NSObject + + readonly applicationVersion: string; + + readonly metaData: MXMetaData; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + JSONRepresentation(): NSData; + + dictionaryRepresentation(): NSDictionary; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class MXDiagnosticPayload extends NSObject implements NSSecureCoding { + + static alloc(): MXDiagnosticPayload; // inherited from NSObject + + static new(): MXDiagnosticPayload; // inherited from NSObject + + readonly cpuExceptionDiagnostics: NSArray; + + readonly crashDiagnostics: NSArray; + + readonly diskWriteExceptionDiagnostics: NSArray; + + readonly hangDiagnostics: NSArray; + + readonly timeStampBegin: Date; + + readonly timeStampEnd: Date; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + JSONRepresentation(): NSData; + + dictionaryRepresentation(): NSDictionary; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class MXDiskIOMetric extends MXMetric { static alloc(): MXDiskIOMetric; // inherited from NSObject @@ -82,6 +242,17 @@ declare class MXDiskIOMetric extends MXMetric { readonly cumulativeLogicalWrites: NSMeasurement; } +declare class MXDiskWriteExceptionDiagnostic extends MXDiagnostic { + + static alloc(): MXDiskWriteExceptionDiagnostic; // inherited from NSObject + + static new(): MXDiskWriteExceptionDiagnostic; // inherited from NSObject + + readonly callStackTree: MXCallStackTree; + + readonly totalWritesCaused: NSMeasurement; +} + declare class MXDisplayMetric extends MXMetric { static alloc(): MXDisplayMetric; // inherited from NSObject @@ -91,6 +262,33 @@ declare class MXDisplayMetric extends MXMetric { readonly averagePixelLuminance: MXAverage; } +declare class MXForegroundExitData extends NSObject implements NSSecureCoding { + + static alloc(): MXForegroundExitData; // inherited from NSObject + + static new(): MXForegroundExitData; // inherited from NSObject + + readonly cumulativeAbnormalExitCount: number; + + readonly cumulativeAppWatchdogExitCount: number; + + readonly cumulativeBadAccessExitCount: number; + + readonly cumulativeIllegalInstructionExitCount: number; + + readonly cumulativeMemoryResourceLimitExitCount: number; + + readonly cumulativeNormalAppExitCount: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class MXGPUMetric extends MXMetric { static alloc(): MXGPUMetric; // inherited from NSObject @@ -100,6 +298,17 @@ declare class MXGPUMetric extends MXMetric { readonly cumulativeGPUTime: NSMeasurement; } +declare class MXHangDiagnostic extends MXDiagnostic { + + static alloc(): MXHangDiagnostic; // inherited from NSObject + + static new(): MXHangDiagnostic; // inherited from NSObject + + readonly callStackTree: MXCallStackTree; + + readonly hangDuration: NSMeasurement; +} + declare class MXHistogram extends NSObject implements NSSecureCoding { static alloc(): MXHistogram; // inherited from NSObject @@ -182,6 +391,8 @@ declare class MXMetaData extends NSObject implements NSSecureCoding { readonly osVersion: string; + readonly platformArchitecture: string; + readonly regionFormat: string; static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding @@ -192,6 +403,8 @@ declare class MXMetaData extends NSObject implements NSSecureCoding { JSONRepresentation(): NSData; + dictionaryRepresentation(): NSDictionary; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; @@ -211,6 +424,8 @@ declare class MXMetric extends NSObject implements NSSecureCoding { JSONRepresentation(): NSData; + dictionaryRepresentation(): NSDictionary; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; @@ -224,6 +439,8 @@ declare class MXMetricManager extends NSObject { static new(): MXMetricManager; // inherited from NSObject + readonly pastDiagnosticPayloads: NSArray; + readonly pastPayloads: NSArray; static readonly sharedManager: MXMetricManager; @@ -235,6 +452,8 @@ declare class MXMetricManager extends NSObject { interface MXMetricManagerSubscriber extends NSObjectProtocol { + didReceiveDiagnosticPayloads?(payloads: NSArray | MXDiagnosticPayload[]): void; + didReceiveMetricPayloads(payloads: NSArray | MXMetricPayload[]): void; } declare var MXMetricManagerSubscriber: { @@ -248,6 +467,10 @@ declare class MXMetricPayload extends NSObject implements NSSecureCoding { static new(): MXMetricPayload; // inherited from NSObject + readonly animationMetrics: MXAnimationMetric; + + readonly applicationExitMetrics: MXAppExitMetric; + readonly applicationLaunchMetrics: MXAppLaunchMetric; readonly applicationResponsivenessMetrics: MXAppResponsivenessMetric; @@ -290,6 +513,8 @@ declare class MXMetricPayload extends NSObject implements NSSecureCoding { JSONRepresentation(): NSData; + dictionaryRepresentation(): NSDictionary; + encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!NaturalLanguage.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NaturalLanguage.d.ts index a603f9bff..3b386e2f9 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!NaturalLanguage.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NaturalLanguage.d.ts @@ -10,12 +10,20 @@ declare class NLEmbedding extends NSObject { static currentRevisionForLanguage(language: string): number; + static currentSentenceEmbeddingRevisionForLanguage(language: string): number; + static embeddingWithContentsOfURLError(url: NSURL): NLEmbedding; static new(): NLEmbedding; // inherited from NSObject + static sentenceEmbeddingForLanguage(language: string): NLEmbedding; + + static sentenceEmbeddingForLanguageRevision(language: string, revision: number): NLEmbedding; + static supportedRevisionsForLanguage(language: string): NSIndexSet; + static supportedSentenceEmbeddingRevisionsForLanguage(language: string): NSIndexSet; + static wordEmbeddingForLanguage(language: string): NLEmbedding; static wordEmbeddingForLanguageRevision(language: string, revision: number): NLEmbedding; @@ -233,6 +241,10 @@ declare class NLModel extends NSObject { predictedLabelForString(string: string): string; + predictedLabelHypothesesForStringMaximumCount(string: string, maximumCount: number): NSDictionary; + + predictedLabelHypothesesForTokensMaximumCount(tokens: NSArray | string[], maximumCount: number): NSArray>; + predictedLabelsForTokens(tokens: NSArray | string[]): NSArray; } @@ -384,9 +396,13 @@ declare class NLTagger extends NSObject { tagAtIndexUnitSchemeTokenRange(characterIndex: number, unit: NLTokenUnit, scheme: string, tokenRange: interop.Pointer | interop.Reference): string; + tagHypothesesAtIndexUnitSchemeMaximumCountTokenRange(characterIndex: number, unit: NLTokenUnit, scheme: string, maximumCount: number, tokenRange: interop.Pointer | interop.Reference): NSDictionary; + tagsInRangeUnitSchemeOptionsTokenRanges(range: NSRange, unit: NLTokenUnit, scheme: string, options: NLTaggerOptions, tokenRanges: interop.Pointer | interop.Reference>): NSArray; tokenRangeAtIndexUnit(characterIndex: number, unit: NLTokenUnit): NSRange; + + tokenRangeForRangeUnit(range: NSRange, unit: NLTokenUnit): NSRange; } declare const enum NLTaggerAssetsResult { @@ -444,6 +460,8 @@ declare class NLTokenizer extends NSObject { tokenRangeAtIndex(characterIndex: number): NSRange; + tokenRangeForRange(range: NSRange): NSRange; + tokensForRange(range: NSRange): NSArray; } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!NearbyInteraction.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NearbyInteraction.d.ts new file mode 100644 index 000000000..793beb38d --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NearbyInteraction.d.ts @@ -0,0 +1,138 @@ + +declare class NIConfiguration extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): NIConfiguration; // inherited from NSObject + + static new(): NIConfiguration; // inherited from NSObject + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class NIDiscoveryToken extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): NIDiscoveryToken; // inherited from NSObject + + static new(): NIDiscoveryToken; // inherited from NSObject + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare const enum NIErrorCode { + + UnsupportedPlatform = -5889, + + InvalidConfiguration = -5888, + + SessionFailed = -5887, + + ResourceUsageTimeout = -5886, + + ActiveSessionsLimitExceeded = -5885, + + UserDidNotAllow = -5884 +} + +declare var NIErrorDomain: string; + +declare class NINearbyObject extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): NINearbyObject; // inherited from NSObject + + static new(): NINearbyObject; // inherited from NSObject + + readonly direction: interop.Reference; + + readonly discoveryToken: NIDiscoveryToken; + + readonly distance: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare var NINearbyObjectDirectionNotAvailable: interop.Reference; + +declare var NINearbyObjectDistanceNotAvailable: number; + +declare const enum NINearbyObjectRemovalReason { + + Timeout = 0, + + PeerEnded = 1 +} + +declare class NINearbyPeerConfiguration extends NIConfiguration { + + static alloc(): NINearbyPeerConfiguration; // inherited from NSObject + + static new(): NINearbyPeerConfiguration; // inherited from NSObject + + readonly peerDiscoveryToken: NIDiscoveryToken; + + constructor(o: { peerToken: NIDiscoveryToken; }); + + initWithPeerToken(peerToken: NIDiscoveryToken): this; +} + +declare class NISession extends NSObject { + + static alloc(): NISession; // inherited from NSObject + + static new(): NISession; // inherited from NSObject + + readonly configuration: NIConfiguration; + + delegate: NISessionDelegate; + + delegateQueue: NSObject; + + readonly discoveryToken: NIDiscoveryToken; + + static readonly supported: boolean; + + invalidate(): void; + + pause(): void; + + runWithConfiguration(configuration: NIConfiguration): void; +} + +interface NISessionDelegate extends NSObjectProtocol { + + sessionDidInvalidateWithError?(session: NISession, error: NSError): void; + + sessionDidRemoveNearbyObjectsWithReason?(session: NISession, nearbyObjects: NSArray | NINearbyObject[], reason: NINearbyObjectRemovalReason): void; + + sessionDidUpdateNearbyObjects?(session: NISession, nearbyObjects: NSArray | NINearbyObject[]): void; + + sessionSuspensionEnded?(session: NISession): void; + + sessionWasSuspended?(session: NISession): void; +} +declare var NISessionDelegate: { + + prototype: NISessionDelegate; +}; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Network.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Network.d.ts index 8515d77da..b3f54d950 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Network.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Network.d.ts @@ -34,6 +34,13 @@ declare var OS_nw_connection: { prototype: OS_nw_connection; }; +interface OS_nw_connection_group extends NSObjectProtocol { +} +declare var OS_nw_connection_group: { + + prototype: OS_nw_connection_group; +}; + interface OS_nw_content_context extends NSObjectProtocol { } declare var OS_nw_content_context: { @@ -83,6 +90,13 @@ declare var OS_nw_framer: { prototype: OS_nw_framer; }; +interface OS_nw_group_descriptor extends NSObjectProtocol { +} +declare var OS_nw_group_descriptor: { + + prototype: OS_nw_group_descriptor; +}; + interface OS_nw_interface extends NSObjectProtocol { } declare var OS_nw_interface: { @@ -125,6 +139,13 @@ declare var OS_nw_path_monitor: { prototype: OS_nw_path_monitor; }; +interface OS_nw_privacy_context extends NSObjectProtocol { +} +declare var OS_nw_privacy_context: { + + prototype: OS_nw_privacy_context; +}; + interface OS_nw_protocol_definition extends NSObjectProtocol { } declare var OS_nw_protocol_definition: { @@ -153,6 +174,20 @@ declare var OS_nw_protocol_stack: { prototype: OS_nw_protocol_stack; }; +interface OS_nw_resolution_report extends NSObjectProtocol { +} +declare var OS_nw_resolution_report: { + + prototype: OS_nw_resolution_report; +}; + +interface OS_nw_resolver_config extends NSObjectProtocol { +} +declare var OS_nw_resolver_config: { + + prototype: OS_nw_resolver_config; +}; + interface OS_nw_txt_record extends NSObjectProtocol { } declare var OS_nw_txt_record: { @@ -188,6 +223,8 @@ declare var _nw_parameters_configure_protocol_default_configuration: (p1: NSObje declare var _nw_parameters_configure_protocol_disable: (p1: NSObject) => void; +declare var _nw_privacy_context_default_context: NSObject; + declare var kNWErrorDomainDNS: string; declare var kNWErrorDomainPOSIX: string; @@ -264,7 +301,9 @@ declare const enum nw_browser_state_t { nw_browser_state_failed = 2, - nw_browser_state_cancelled = 3 + nw_browser_state_cancelled = 3, + + nw_browser_state_waiting = 4 } declare function nw_connection_access_establishment_report(connection: NSObject, queue: NSObject, access_block: (p1: NSObject) => void): void; @@ -293,6 +332,47 @@ declare function nw_connection_force_cancel(connection: NSObject): void; declare function nw_connection_get_maximum_datagram_size(connection: NSObject): number; +declare function nw_connection_group_cancel(group: NSObject): void; + +declare function nw_connection_group_copy_descriptor(group: NSObject): NSObject; + +declare function nw_connection_group_copy_local_endpoint_for_message(group: NSObject, context: NSObject): NSObject; + +declare function nw_connection_group_copy_parameters(group: NSObject): NSObject; + +declare function nw_connection_group_copy_path_for_message(group: NSObject, context: NSObject): NSObject; + +declare function nw_connection_group_copy_remote_endpoint_for_message(group: NSObject, context: NSObject): NSObject; + +declare function nw_connection_group_create(group_descriptor: NSObject, parameters: NSObject): NSObject; + +declare function nw_connection_group_extract_connection_for_message(group: NSObject, context: NSObject): NSObject; + +declare function nw_connection_group_reply(group: NSObject, inbound_message: NSObject, outbound_message: NSObject, content: NSObject): void; + +declare function nw_connection_group_send_message(group: NSObject, content: NSObject, endpoint: NSObject, context: NSObject, completion: (p1: NSObject) => void): void; + +declare function nw_connection_group_set_queue(group: NSObject, queue: NSObject): void; + +declare function nw_connection_group_set_receive_handler(group: NSObject, maximum_message_size: number, reject_oversized_messages: boolean, receive_handler: (p1: NSObject, p2: NSObject, p3: boolean) => void): void; + +declare function nw_connection_group_set_state_changed_handler(group: NSObject, state_changed_handler: (p1: nw_connection_group_state_t, p2: NSObject) => void): void; + +declare function nw_connection_group_start(group: NSObject): void; + +declare const enum nw_connection_group_state_t { + + nw_connection_group_state_invalid = 0, + + nw_connection_group_state_waiting = 1, + + nw_connection_group_state_ready = 2, + + nw_connection_group_state_failed = 3, + + nw_connection_group_state_cancelled = 4 +} + declare function nw_connection_receive(connection: NSObject, minimum_incomplete_length: number, maximum_length: number, completion: (p1: NSObject, p2: NSObject, p3: boolean, p4: NSObject) => void): void; declare function nw_connection_receive_message(connection: NSObject, completion: (p1: NSObject, p2: NSObject, p3: boolean, p4: NSObject) => void): void; @@ -457,6 +537,8 @@ declare function nw_establishment_report_copy_proxy_endpoint(report: NSObject): declare function nw_establishment_report_enumerate_protocols(report: NSObject, enumerate_block: (p1: NSObject, p2: number, p3: number) => boolean): void; +declare function nw_establishment_report_enumerate_resolution_reports(report: NSObject, enumerate_block: (p1: NSObject) => boolean): void; + declare function nw_establishment_report_enumerate_resolutions(report: NSObject, enumerate_block: (p1: nw_report_resolution_source_t, p2: number, p3: number, p4: NSObject, p5: NSObject) => boolean): void; declare function nw_establishment_report_get_attempt_started_after_milliseconds(report: NSObject): number; @@ -551,6 +633,12 @@ declare function nw_framer_write_output_data(framer: NSObject, output_data: NSOb declare function nw_framer_write_output_no_copy(framer: NSObject, output_length: number): boolean; +declare function nw_group_descriptor_add_endpoint(descriptor: NSObject, endpoint: NSObject): boolean; + +declare function nw_group_descriptor_create_multicast(multicast_group: NSObject): NSObject; + +declare function nw_group_descriptor_enumerate_endpoints(descriptor: NSObject, enumerate_block: (p1: NSObject) => boolean): void; + declare function nw_interface_get_index(interface: NSObject): number; declare function nw_interface_get_name(interface: NSObject): string; @@ -606,6 +694,8 @@ declare function nw_ip_options_set_calculate_receive_time(options: NSObject, cal declare function nw_ip_options_set_disable_fragmentation(options: NSObject, disable_fragmentation: boolean): void; +declare function nw_ip_options_set_disable_multicast_loopback(options: NSObject, disable_multicast_loopback: boolean): void; + declare function nw_ip_options_set_hop_limit(options: NSObject, hop_limit: number): void; declare function nw_ip_options_set_local_address_preference(options: NSObject, preference: nw_ip_local_address_preference_t): void; @@ -662,6 +752,12 @@ declare const enum nw_listener_state_t { nw_listener_state_cancelled = 4 } +declare function nw_multicast_group_descriptor_get_disable_unicast_traffic(multicast_descriptor: NSObject): boolean; + +declare function nw_multicast_group_descriptor_set_disable_unicast_traffic(multicast_descriptor: NSObject, disable_unicast_traffic: boolean): void; + +declare function nw_multicast_group_descriptor_set_specific_source(multicast_descriptor: NSObject, source: NSObject): void; + declare const enum nw_multipath_service_t { nw_multipath_service_disabled = 0, @@ -746,6 +842,8 @@ declare function nw_parameters_set_multipath_service(parameters: NSObject, multi declare function nw_parameters_set_prefer_no_proxy(parameters: NSObject, prefer_no_proxy: boolean): void; +declare function nw_parameters_set_privacy_context(parameters: NSObject, privacy_context: NSObject): void; + declare function nw_parameters_set_prohibit_constrained(parameters: NSObject, prohibit_constrained: boolean): void; declare function nw_parameters_set_prohibit_expensive(parameters: NSObject, prohibit_expensive: boolean): void; @@ -766,6 +864,8 @@ declare function nw_path_enumerate_interfaces(path: NSObject, enumerate_block: ( declare function nw_path_get_status(path: NSObject): nw_path_status_t; +declare function nw_path_get_unsatisfied_reason(path: NSObject): nw_path_unsatisfied_reason_t; + declare function nw_path_has_dns(path: NSObject): boolean; declare function nw_path_has_ipv4(path: NSObject): boolean; @@ -784,6 +884,8 @@ declare function nw_path_monitor_create(): NSObject; declare function nw_path_monitor_create_with_type(required_interface_type: nw_interface_type_t): NSObject; +declare function nw_path_monitor_prohibit_interface_type(monitor: NSObject, interface_type: nw_interface_type_t): void; + declare function nw_path_monitor_set_cancel_handler(monitor: NSObject, cancel_handler: () => void): void; declare function nw_path_monitor_set_queue(monitor: NSObject, queue: NSObject): void; @@ -803,8 +905,27 @@ declare const enum nw_path_status_t { nw_path_status_satisfiable = 3 } +declare const enum nw_path_unsatisfied_reason_t { + + nw_path_unsatisfied_reason_not_available = 0, + + nw_path_unsatisfied_reason_cellular_denied = 1, + + nw_path_unsatisfied_reason_wifi_denied = 2, + + nw_path_unsatisfied_reason_local_network_denied = 3 +} + declare function nw_path_uses_interface_type(path: NSObject, interface_type: nw_interface_type_t): boolean; +declare function nw_privacy_context_create(description: string | interop.Pointer | interop.Reference): NSObject; + +declare function nw_privacy_context_disable_logging(privacy_context: NSObject): void; + +declare function nw_privacy_context_flush_cache(privacy_context: NSObject): void; + +declare function nw_privacy_context_require_encrypted_name_resolution(privacy_context: NSObject, require_encrypted_name_resolution: boolean, fallback_resolver_config: NSObject): void; + declare function nw_protocol_copy_ip_definition(): NSObject; declare function nw_protocol_copy_tcp_definition(): NSObject; @@ -847,6 +968,19 @@ declare function nw_protocol_stack_set_transport_protocol(stack: NSObject, proto declare function nw_release(obj: interop.Pointer | interop.Reference): void; +declare const enum nw_report_resolution_protocol_t { + + nw_report_resolution_protocol_unknown = 0, + + nw_report_resolution_protocol_udp = 1, + + nw_report_resolution_protocol_tcp = 2, + + nw_report_resolution_protocol_tls = 3, + + nw_report_resolution_protocol_https = 4 +} + declare const enum nw_report_resolution_source_t { nw_report_resolution_source_query = 1, @@ -856,6 +990,24 @@ declare const enum nw_report_resolution_source_t { nw_report_resolution_source_expired_cache = 3 } +declare function nw_resolution_report_copy_preferred_endpoint(resolution_report: NSObject): NSObject; + +declare function nw_resolution_report_copy_successful_endpoint(resolution_report: NSObject): NSObject; + +declare function nw_resolution_report_get_endpoint_count(resolution_report: NSObject): number; + +declare function nw_resolution_report_get_milliseconds(resolution_report: NSObject): number; + +declare function nw_resolution_report_get_protocol(resolution_report: NSObject): nw_report_resolution_protocol_t; + +declare function nw_resolution_report_get_source(resolution_report: NSObject): nw_report_resolution_source_t; + +declare function nw_resolver_config_add_server_address(config: NSObject, server_address: NSObject): void; + +declare function nw_resolver_config_create_https(url_endpoint: NSObject): NSObject; + +declare function nw_resolver_config_create_tls(server_endpoint: NSObject): NSObject; + declare function nw_retain(obj: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; declare const enum nw_service_class_t { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!NetworkExtension.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NetworkExtension.d.ts index 5a45b9bc7..6653fbe17 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!NetworkExtension.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!NetworkExtension.d.ts @@ -7,8 +7,14 @@ declare class NEAppProxyFlow extends NSObject { static new(): NEAppProxyFlow; // inherited from NSObject + readonly isBound: boolean; + readonly metaData: NEFlowMetaData; + networkInterface: NSObject; + + readonly remoteHostname: string; + closeReadWithError(error: NSError): void; closeWriteWithError(error: NSError): void; @@ -89,6 +95,74 @@ declare class NEAppProxyUDPFlow extends NEAppProxyFlow { writeDatagramsSentByEndpointsCompletionHandler(datagrams: NSArray | NSData[], remoteEndpoints: NSArray | NWEndpoint[], completionHandler: (p1: NSError) => void): void; } +interface NEAppPushDelegate extends NSObjectProtocol { + + appPushManagerDidReceiveIncomingCallWithUserInfo(manager: NEAppPushManager, userInfo: NSDictionary): void; +} +declare var NEAppPushDelegate: { + + prototype: NEAppPushDelegate; +}; + +declare var NEAppPushErrorDomain: string; + +declare class NEAppPushManager extends NSObject { + + static alloc(): NEAppPushManager; // inherited from NSObject + + static loadAllFromPreferencesWithCompletionHandler(completionHandler: (p1: NSArray, p2: NSError) => void): void; + + static new(): NEAppPushManager; // inherited from NSObject + + readonly active: boolean; + + delegate: NEAppPushDelegate; + + enabled: boolean; + + localizedDescription: string; + + matchSSIDs: NSArray; + + providerBundleIdentifier: string; + + providerConfiguration: NSDictionary; + + loadFromPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + removeFromPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + saveToPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; +} + +declare const enum NEAppPushManagerError { + + ConfigurationInvalid = 1, + + ConfigurationNotLoaded = 2, + + InternalError = 3, + + InactiveSession = 4 +} + +declare class NEAppPushProvider extends NEProvider { + + static alloc(): NEAppPushProvider; // inherited from NSObject + + static new(): NEAppPushProvider; // inherited from NSObject + + readonly providerConfiguration: NSDictionary; + + handleTimerEvent(): void; + + reportIncomingCallWithUserInfo(userInfo: NSDictionary): void; + + startWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + stopWithReasonCompletionHandler(reason: NEProviderStopReason, completionHandler: () => void): void; +} + declare class NEAppRule extends NSObject implements NSCopying, NSSecureCoding { static alloc(): NEAppRule; // inherited from NSObject @@ -116,6 +190,33 @@ declare class NEAppRule extends NSObject implements NSCopying, NSSecureCoding { initWithSigningIdentifier(signingIdentifier: string): this; } +declare class NEDNSOverHTTPSSettings extends NEDNSSettings { + + static alloc(): NEDNSOverHTTPSSettings; // inherited from NSObject + + static new(): NEDNSOverHTTPSSettings; // inherited from NSObject + + serverURL: NSURL; +} + +declare class NEDNSOverTLSSettings extends NEDNSSettings { + + static alloc(): NEDNSOverTLSSettings; // inherited from NSObject + + static new(): NEDNSOverTLSSettings; // inherited from NSObject + + serverName: string; +} + +declare const enum NEDNSProtocol { + + Cleartext = 1, + + TLS = 2, + + HTTPS = 3 +} + declare var NEDNSProxyConfigurationDidChangeNotification: string; declare var NEDNSProxyErrorDomain: string; @@ -188,6 +289,8 @@ declare class NEDNSSettings extends NSObject implements NSCopying, NSSecureCodin static new(): NEDNSSettings; // inherited from NSObject + readonly dnsProtocol: NEDNSProtocol; + domainName: string; matchDomains: NSArray; @@ -213,6 +316,44 @@ declare class NEDNSSettings extends NSObject implements NSCopying, NSSecureCodin initWithServers(servers: NSArray | string[]): this; } +declare var NEDNSSettingsConfigurationDidChangeNotification: string; + +declare var NEDNSSettingsErrorDomain: string; + +declare class NEDNSSettingsManager extends NSObject { + + static alloc(): NEDNSSettingsManager; // inherited from NSObject + + static new(): NEDNSSettingsManager; // inherited from NSObject + + static sharedManager(): NEDNSSettingsManager; + + dnsSettings: NEDNSSettings; + + readonly enabled: boolean; + + localizedDescription: string; + + onDemandRules: NSArray; + + loadFromPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + removeFromPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; + + saveToPreferencesWithCompletionHandler(completionHandler: (p1: NSError) => void): void; +} + +declare const enum NEDNSSettingsManagerError { + + ConfigurationInvalid = 1, + + ConfigurationDisabled = 2, + + ConfigurationStale = 3, + + ConfigurationCannotBeRemoved = 4 +} + declare class NEEvaluateConnectionRule extends NSObject implements NSCopying, NSSecureCoding { static alloc(): NEEvaluateConnectionRule; // inherited from NSObject @@ -579,7 +720,9 @@ declare const enum NEFilterReportEvent { DataDecision = 2, - FlowClosed = 3 + FlowClosed = 3, + + Statistics = 4 } declare class NEFilterSocketFlow extends NEFilterFlow implements NSCopying, NSSecureCoding { @@ -592,6 +735,8 @@ declare class NEFilterSocketFlow extends NEFilterFlow implements NSCopying, NSSe readonly remoteEndpoint: NWEndpoint; + readonly remoteHostname: string; + readonly socketFamily: number; readonly socketProtocol: number; @@ -947,6 +1092,8 @@ declare class NEHotspotNetwork extends NSObject { static alloc(): NEHotspotNetwork; // inherited from NSObject + static fetchCurrentWithCompletionHandler(completionHandler: (p1: NEHotspotNetwork) => void): void; + static new(): NEHotspotNetwork; // inherited from NSObject readonly BSSID: string; @@ -1684,12 +1831,18 @@ declare class NEVPNProtocol extends NSObject implements NSCopying, NSSecureCodin disconnectOnSleep: boolean; + enforceRoutes: boolean; + + excludeLocalNetworks: boolean; + identityData: NSData; identityDataPassword: string; identityReference: NSData; + includeAllNetworks: boolean; + passwordReference: NSData; proxySettings: NEProxySettings; @@ -1737,6 +1890,8 @@ declare class NEVPNProtocolIKEv2 extends NEVPNProtocolIPSec { minimumTLSVersion: NEVPNIKEv2TLSVersion; + mtu: number; + serverCertificateCommonName: string; serverCertificateIssuerCommonName: string; @@ -1831,6 +1986,8 @@ declare class NWPath extends NSObject { static new(): NWPath; // inherited from NSObject + readonly constrained: boolean; + readonly expensive: boolean; readonly status: NWPathStatus; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!OSLog.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!OSLog.d.ts new file mode 100644 index 000000000..e69de29bb diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ObjectiveC.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ObjectiveC.d.ts index 63e116005..c7b57254a 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ObjectiveC.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ObjectiveC.d.ts @@ -345,13 +345,6 @@ declare const OBJC_SYNC_SUCCESS: number; declare const OBJC_WAIT_UNTIL_DONE: number; -declare class Protocol extends NSObject { - - static alloc(): Protocol; // inherited from NSObject - - static new(): Protocol; // inherited from NSObject -} - declare function _objc_flush_caches(cls: typeof NSObject): void; declare function _objc_msgForward(): void; @@ -580,7 +573,7 @@ declare function objc_setHook_getClass(newValue: interop.FunctionReference<(p1: declare function objc_setHook_getImageName(newValue: interop.FunctionReference<(p1: typeof NSObject, p2: interop.Pointer | interop.Reference) => boolean>, outOldValue: interop.Pointer | interop.Reference) => boolean>>): void; -declare function objc_setHook_setAssociatedObject(newValue: interop.FunctionReference<(p1: any, p2: interop.Pointer | interop.Reference, p3: any, p4: objc_AssociationPolicy) => void>, outOldValue: interop.Pointer | interop.Reference, p3: any, p4: objc_AssociationPolicy) => void>>): void; +declare function objc_setHook_lazyClassNamer(newValue: interop.FunctionReference<(p1: typeof NSObject) => string>, oldOutValue: interop.Pointer | interop.Reference string>>): void; declare function objc_setUncaughtExceptionHandler(fn: interop.FunctionReference<(p1: any) => void>): interop.FunctionReference<(p1: any) => void>; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PDFKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PDFKit.d.ts index ae9fd32b1..193b3b8b7 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PDFKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PDFKit.d.ts @@ -766,7 +766,9 @@ declare const enum PDFMarkupType { kPDFMarkupTypeStrikeOut = 1, - kPDFMarkupTypeUnderline = 2 + kPDFMarkupTypeUnderline = 2, + + kPDFMarkupTypeRedact = 3 } declare class PDFOutline extends NSObject { @@ -1091,6 +1093,8 @@ declare class PDFView extends UIView implements UIGestureRecognizerDelegate { gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer): boolean; + gestureRecognizerShouldReceiveEvent(gestureRecognizer: UIGestureRecognizer, event: _UIEvent): boolean; + gestureRecognizerShouldReceivePress(gestureRecognizer: UIGestureRecognizer, press: UIPress): boolean; gestureRecognizerShouldReceiveTouch(gestureRecognizer: UIGestureRecognizer, touch: UITouch): boolean; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PassKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PassKit.d.ts index 37c060041..374f963c4 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PassKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PassKit.d.ts @@ -1,4 +1,13 @@ +declare class PKAddCarKeyPassConfiguration extends PKAddSecureElementPassConfiguration { + + static alloc(): PKAddCarKeyPassConfiguration; // inherited from NSObject + + static new(): PKAddCarKeyPassConfiguration; // inherited from NSObject + + password: string; +} + declare class PKAddPassButton extends UIButton { static addPassButtonWithStyle(addPassButtonStyle: PKAddPassButtonStyle): PKAddPassButton; @@ -19,10 +28,14 @@ declare class PKAddPassButton extends UIButton { static buttonWithType(buttonType: UIButtonType): PKAddPassButton; // inherited from UIButton + static buttonWithTypePrimaryAction(buttonType: UIButtonType, primaryAction: UIAction): PKAddPassButton; // inherited from UIButton + static new(): PKAddPassButton; // inherited from NSObject static systemButtonWithImageTargetAction(image: UIImage, target: any, action: string): PKAddPassButton; // inherited from UIButton + static systemButtonWithPrimaryAction(primaryAction: UIAction): PKAddPassButton; // inherited from UIButton + addPassButtonStyle: PKAddPassButtonStyle; constructor(o: { addPassButtonStyle: PKAddPassButtonStyle; }); @@ -153,6 +166,82 @@ declare var PKAddPaymentPassViewControllerDelegate: { prototype: PKAddPaymentPassViewControllerDelegate; }; +declare class PKAddSecureElementPassConfiguration extends NSObject { + + static alloc(): PKAddSecureElementPassConfiguration; // inherited from NSObject + + static new(): PKAddSecureElementPassConfiguration; // inherited from NSObject + + issuerIdentifier: string; + + localizedDescription: string; +} + +declare const enum PKAddSecureElementPassErrorCode { + + UnknownError = 0, + + UserCanceledError = 1, + + UnavailableError = 2, + + InvalidConfigurationError = 3, + + DeviceNotSupportedError = 4, + + DeviceNotReadyError = 5 +} + +declare var PKAddSecureElementPassErrorDomain: string; + +declare class PKAddSecureElementPassViewController extends UIViewController { + + static alloc(): PKAddSecureElementPassViewController; // inherited from NSObject + + static canAddSecureElementPassWithConfiguration(configuration: PKAddSecureElementPassConfiguration): boolean; + + static new(): PKAddSecureElementPassViewController; // inherited from NSObject + + delegate: PKAddSecureElementPassViewControllerDelegate; + + constructor(o: { configuration: PKAddSecureElementPassConfiguration; delegate: PKAddSecureElementPassViewControllerDelegate; }); + + initWithConfigurationDelegate(configuration: PKAddSecureElementPassConfiguration, delegate: PKAddSecureElementPassViewControllerDelegate): this; +} + +interface PKAddSecureElementPassViewControllerDelegate extends NSObjectProtocol { + + addSecureElementPassViewControllerDidFinishAddingSecureElementPassError(controller: PKAddSecureElementPassViewController, pass: PKSecureElementPass, error: NSError): void; + + addSecureElementPassViewControllerDidFinishAddingSecureElementPassesError(controller: PKAddSecureElementPassViewController, passes: NSArray | PKSecureElementPass[], error: NSError): void; +} +declare var PKAddSecureElementPassViewControllerDelegate: { + + prototype: PKAddSecureElementPassViewControllerDelegate; +}; + +declare class PKAddShareablePassConfiguration extends PKAddSecureElementPassConfiguration { + + static alloc(): PKAddShareablePassConfiguration; // inherited from NSObject + + static configurationForPassMetadataProvisioningPolicyIdentifierPrimaryActionCompletion(passMetadata: NSArray | PKShareablePassMetadata[], provisioningPolicyIdentifier: string, action: PKAddShareablePassConfigurationPrimaryAction, completion: (p1: PKAddShareablePassConfiguration, p2: NSError) => void): void; + + static new(): PKAddShareablePassConfiguration; // inherited from NSObject + + readonly credentialsMetadata: NSArray; + + readonly primaryAction: PKAddShareablePassConfigurationPrimaryAction; + + readonly provisioningPolicyIdentifier: string; +} + +declare const enum PKAddShareablePassConfigurationPrimaryAction { + + Add = 0, + + Share = 1 +} + declare const enum PKAddressField { None = 0, @@ -181,6 +270,92 @@ declare const enum PKAutomaticPassPresentationSuppressionResult { Success = 4 } +declare const enum PKBarcodeEventConfigurationDataType { + + Unknown = 0, + + SigningKeyMaterial = 1, + + SigningCertificate = 2 +} + +declare class PKBarcodeEventConfigurationRequest extends NSObject { + + static alloc(): PKBarcodeEventConfigurationRequest; // inherited from NSObject + + static new(): PKBarcodeEventConfigurationRequest; // inherited from NSObject + + readonly configurationData: NSData; + + readonly configurationDataType: PKBarcodeEventConfigurationDataType; + + readonly deviceAccountIdentifier: string; +} + +declare class PKBarcodeEventMetadataRequest extends NSObject { + + static alloc(): PKBarcodeEventMetadataRequest; // inherited from NSObject + + static new(): PKBarcodeEventMetadataRequest; // inherited from NSObject + + readonly deviceAccountIdentifier: string; + + readonly lastUsedBarcodeIdentifier: string; +} + +declare class PKBarcodeEventMetadataResponse extends NSObject { + + static alloc(): PKBarcodeEventMetadataResponse; // inherited from NSObject + + static new(): PKBarcodeEventMetadataResponse; // inherited from NSObject + + paymentInformation: NSData; + + constructor(o: { paymentInformation: NSData; }); + + initWithPaymentInformation(paymentInformation: NSData): this; +} + +declare class PKBarcodeEventSignatureRequest extends NSObject { + + static alloc(): PKBarcodeEventSignatureRequest; // inherited from NSObject + + static new(): PKBarcodeEventSignatureRequest; // inherited from NSObject + + readonly amount: number; + + readonly barcodeIdentifier: string; + + readonly currencyCode: string; + + readonly deviceAccountIdentifier: string; + + readonly merchantName: string; + + readonly partialSignature: NSData; + + readonly rawMerchantName: string; + + readonly transactionDate: Date; + + readonly transactionIdentifier: string; + + readonly transactionStatus: string; +} + +declare class PKBarcodeEventSignatureResponse extends NSObject { + + static alloc(): PKBarcodeEventSignatureResponse; // inherited from NSObject + + static new(): PKBarcodeEventSignatureResponse; // inherited from NSObject + + signedData: NSData; + + constructor(o: { signedData: NSData; }); + + initWithSignedData(signedData: NSData): this; +} + declare class PKContact extends NSObject { static alloc(): PKContact; // inherited from NSObject @@ -275,6 +450,76 @@ declare var PKEncryptionSchemeECC_V2: string; declare var PKEncryptionSchemeRSA_V2: string; +interface PKIssuerProvisioningExtensionAuthorizationProviding extends NSObjectProtocol { + + completionHandler: (p1: PKIssuerProvisioningExtensionAuthorizationResult) => void; +} +declare var PKIssuerProvisioningExtensionAuthorizationProviding: { + + prototype: PKIssuerProvisioningExtensionAuthorizationProviding; +}; + +declare const enum PKIssuerProvisioningExtensionAuthorizationResult { + + Canceled = 0, + + Authorized = 1 +} + +declare class PKIssuerProvisioningExtensionHandler extends NSObject { + + static alloc(): PKIssuerProvisioningExtensionHandler; // inherited from NSObject + + static new(): PKIssuerProvisioningExtensionHandler; // inherited from NSObject + + generateAddPaymentPassRequestForPassEntryWithIdentifierConfigurationCertificateChainNonceNonceSignatureCompletionHandler(identifier: string, configuration: PKAddPaymentPassRequestConfiguration, certificates: NSArray | NSData[], nonce: NSData, nonceSignature: NSData, completion: (p1: PKAddPaymentPassRequest) => void): void; + + passEntriesWithCompletion(completion: (p1: NSArray) => void): void; + + remotePassEntriesWithCompletion(completion: (p1: NSArray) => void): void; + + statusWithCompletion(completion: (p1: PKIssuerProvisioningExtensionStatus) => void): void; +} + +declare class PKIssuerProvisioningExtensionPassEntry extends NSObject { + + static alloc(): PKIssuerProvisioningExtensionPassEntry; // inherited from NSObject + + static new(): PKIssuerProvisioningExtensionPassEntry; // inherited from NSObject + + readonly art: any; + + readonly identifier: string; + + readonly title: string; +} + +declare class PKIssuerProvisioningExtensionPaymentPassEntry extends PKIssuerProvisioningExtensionPassEntry { + + static alloc(): PKIssuerProvisioningExtensionPaymentPassEntry; // inherited from NSObject + + static new(): PKIssuerProvisioningExtensionPaymentPassEntry; // inherited from NSObject + + readonly addRequestConfiguration: PKAddPaymentPassRequestConfiguration; + + constructor(o: { identifier: string; title: string; art: any; addRequestConfiguration: PKAddPaymentPassRequestConfiguration; }); + + initWithIdentifierTitleArtAddRequestConfiguration(identifier: string, title: string, art: any, configuration: PKAddPaymentPassRequestConfiguration): this; +} + +declare class PKIssuerProvisioningExtensionStatus extends NSObject { + + static alloc(): PKIssuerProvisioningExtensionStatus; // inherited from NSObject + + static new(): PKIssuerProvisioningExtensionStatus; // inherited from NSObject + + passEntriesAvailable: boolean; + + remotePassEntriesAvailable: boolean; + + requiresAuthentication: boolean; +} + declare class PKLabeledValue extends NSObject { static alloc(): PKLabeledValue; // inherited from NSObject @@ -338,6 +583,8 @@ declare class PKPass extends PKObject { readonly remotePass: boolean; + readonly secureElementPass: PKSecureElementPass; + readonly serialNumber: string; readonly userInfo: NSDictionary; @@ -382,16 +629,24 @@ declare class PKPassLibrary extends NSObject { static requestAutomaticPassPresentationSuppressionWithResponseHandler(responseHandler: (p1: PKAutomaticPassPresentationSuppressionResult) => void): number; + readonly remoteSecureElementPasses: NSArray; + + readonly secureElementPassActivationAvailable: boolean; + activatePaymentPassWithActivationCodeCompletion(paymentPass: PKPaymentPass, activationCode: string, completion: (p1: boolean, p2: NSError) => void): void; activatePaymentPassWithActivationDataCompletion(paymentPass: PKPaymentPass, activationData: NSData, completion: (p1: boolean, p2: NSError) => void): void; + activateSecureElementPassWithActivationDataCompletion(secureElementPass: PKSecureElementPass, activationData: NSData, completion: (p1: boolean, p2: NSError) => void): void; + addPassesWithCompletionHandler(passes: NSArray | PKPass[], completion: (p1: PKPassLibraryAddPassesStatus) => void): void; canAddFelicaPass(): boolean; canAddPaymentPassWithPrimaryAccountIdentifier(primaryAccountIdentifier: string): boolean; + canAddSecureElementPassWithPrimaryAccountIdentifier(primaryAccountIdentifier: string): boolean; + containsPass(pass: PKPass): boolean; isPaymentPassActivationAvailable(): boolean; @@ -406,11 +661,15 @@ declare class PKPassLibrary extends NSObject { presentPaymentPass(pass: PKPaymentPass): void; + presentSecureElementPass(pass: PKSecureElementPass): void; + remotePaymentPasses(): NSArray; removePass(pass: PKPass): void; replacePassWithPass(pass: PKPass): boolean; + + signDataWithSecureElementPassCompletion(signData: NSData, secureElementPass: PKSecureElementPass, completion: (p1: NSData, p2: NSData, p3: NSError) => void): void; } declare const enum PKPassLibraryAddPassesStatus { @@ -440,6 +699,8 @@ declare const enum PKPassType { Barcode = 0, + SecureElement = 1, + Payment = 1, Any = -1 @@ -495,6 +756,8 @@ interface PKPaymentAuthorizationControllerDelegate extends NSObjectProtocol { paymentAuthorizationControllerDidFinish(controller: PKPaymentAuthorizationController): void; + paymentAuthorizationControllerDidRequestMerchantSessionUpdate?(controller: PKPaymentAuthorizationController, handler: (p1: PKPaymentRequestMerchantSessionUpdate) => void): void; + paymentAuthorizationControllerDidSelectPaymentMethodCompletion?(controller: PKPaymentAuthorizationController, paymentMethod: PKPaymentMethod, completion: (p1: NSArray) => void): void; paymentAuthorizationControllerDidSelectPaymentMethodHandler?(controller: PKPaymentAuthorizationController, paymentMethod: PKPaymentMethod, completion: (p1: PKPaymentRequestPaymentMethodUpdate) => void): void; @@ -508,6 +771,8 @@ interface PKPaymentAuthorizationControllerDelegate extends NSObjectProtocol { paymentAuthorizationControllerDidSelectShippingMethodHandler?(controller: PKPaymentAuthorizationController, shippingMethod: PKShippingMethod, completion: (p1: PKPaymentRequestShippingMethodUpdate) => void): void; paymentAuthorizationControllerWillAuthorizePayment?(controller: PKPaymentAuthorizationController): void; + + presentationWindowForPaymentAuthorizationController?(controller: PKPaymentAuthorizationController): UIWindow; } declare var PKPaymentAuthorizationControllerDelegate: { @@ -575,6 +840,8 @@ interface PKPaymentAuthorizationViewControllerDelegate extends NSObjectProtocol paymentAuthorizationViewControllerDidFinish(controller: PKPaymentAuthorizationViewController): void; + paymentAuthorizationViewControllerDidRequestMerchantSessionUpdate?(controller: PKPaymentAuthorizationViewController, handler: (p1: PKPaymentRequestMerchantSessionUpdate) => void): void; + paymentAuthorizationViewControllerDidSelectPaymentMethodCompletion?(controller: PKPaymentAuthorizationViewController, paymentMethod: PKPaymentMethod, completion: (p1: NSArray) => void): void; paymentAuthorizationViewControllerDidSelectPaymentMethodHandler?(controller: PKPaymentAuthorizationViewController, paymentMethod: PKPaymentMethod, completion: (p1: PKPaymentRequestPaymentMethodUpdate) => void): void; @@ -614,12 +881,16 @@ declare class PKPaymentButton extends UIButton { static buttonWithType(buttonType: UIButtonType): PKPaymentButton; // inherited from UIButton + static buttonWithTypePrimaryAction(buttonType: UIButtonType, primaryAction: UIAction): PKPaymentButton; // inherited from UIButton + static buttonWithTypeStyle(buttonType: PKPaymentButtonType, buttonStyle: PKPaymentButtonStyle): PKPaymentButton; static new(): PKPaymentButton; // inherited from NSObject static systemButtonWithImageTargetAction(image: UIImage, target: any, action: string): PKPaymentButton; // inherited from UIButton + static systemButtonWithPrimaryAction(primaryAction: UIAction): PKPaymentButton; // inherited from UIButton + cornerRadius: number; constructor(o: { paymentButtonType: PKPaymentButtonType; paymentButtonStyle: PKPaymentButtonStyle; }); @@ -633,7 +904,9 @@ declare const enum PKPaymentButtonStyle { WhiteOutline = 1, - Black = 2 + Black = 2, + + Automatic = 3 } declare const enum PKPaymentButtonType { @@ -652,7 +925,23 @@ declare const enum PKPaymentButtonType { Book = 6, - Subscribe = 7 + Subscribe = 7, + + Reload = 8, + + AddMoney = 9, + + TopUp = 10, + + Order = 11, + + Rent = 12, + + Support = 13, + + Contribute = 14, + + Tip = 15 } declare const enum PKPaymentErrorCode { @@ -672,6 +961,37 @@ declare var PKPaymentErrorDomain: string; declare var PKPaymentErrorPostalAddressUserInfoKey: string; +declare class PKPaymentInformationEventExtension extends NSObject { + + static alloc(): PKPaymentInformationEventExtension; // inherited from NSObject + + static new(): PKPaymentInformationEventExtension; // inherited from NSObject +} + +interface PKPaymentInformationRequestHandling { + + handleConfigurationRequestCompletion(configurationRequest: PKBarcodeEventConfigurationRequest, completion: () => void): void; + + handleInformationRequestCompletion(infoRequest: PKBarcodeEventMetadataRequest, completion: (p1: PKBarcodeEventMetadataResponse) => void): void; + + handleSignatureRequestCompletion(signatureRequest: PKBarcodeEventSignatureRequest, completion: (p1: PKBarcodeEventSignatureResponse) => void): void; +} +declare var PKPaymentInformationRequestHandling: { + + prototype: PKPaymentInformationRequestHandling; +}; + +declare class PKPaymentMerchantSession extends NSObject { + + static alloc(): PKPaymentMerchantSession; // inherited from NSObject + + static new(): PKPaymentMerchantSession; // inherited from NSObject + + constructor(o: { dictionary: NSDictionary; }); + + initWithDictionary(dictionary: NSDictionary): this; +} + declare class PKPaymentMethod extends NSObject { static alloc(): PKPaymentMethod; // inherited from NSObject @@ -686,6 +1006,8 @@ declare class PKPaymentMethod extends NSObject { readonly paymentPass: PKPaymentPass; + readonly secureElementPass: PKSecureElementPass; + readonly type: PKPaymentMethodType; } @@ -704,6 +1026,8 @@ declare const enum PKPaymentMethodType { declare var PKPaymentNetworkAmex: string; +declare var PKPaymentNetworkBarcode: string; + declare var PKPaymentNetworkCarteBancaire: string; declare var PKPaymentNetworkCarteBancaires: string; @@ -720,6 +1044,8 @@ declare var PKPaymentNetworkElectron: string; declare var PKPaymentNetworkElo: string; +declare var PKPaymentNetworkGirocard: string; + declare var PKPaymentNetworkIDCredit: string; declare var PKPaymentNetworkInterac: string; @@ -742,21 +1068,13 @@ declare var PKPaymentNetworkVPay: string; declare var PKPaymentNetworkVisa: string; -declare class PKPaymentPass extends PKPass { +declare class PKPaymentPass extends PKSecureElementPass { static alloc(): PKPaymentPass; // inherited from NSObject static new(): PKPaymentPass; // inherited from NSObject readonly activationState: PKPaymentPassActivationState; - - readonly deviceAccountIdentifier: string; - - readonly deviceAccountNumberSuffix: string; - - readonly primaryAccountIdentifier: string; - - readonly primaryAccountNumberSuffix: string; } declare const enum PKPaymentPassActivationState { @@ -825,6 +1143,21 @@ declare class PKPaymentRequest extends NSObject { supportedNetworks: NSArray; } +declare class PKPaymentRequestMerchantSessionUpdate extends NSObject { + + static alloc(): PKPaymentRequestMerchantSessionUpdate; // inherited from NSObject + + static new(): PKPaymentRequestMerchantSessionUpdate; // inherited from NSObject + + session: PKPaymentMerchantSession; + + status: PKPaymentAuthorizationStatus; + + constructor(o: { status: PKPaymentAuthorizationStatus; merchantSession: PKPaymentMerchantSession; }); + + initWithStatusMerchantSession(status: PKPaymentAuthorizationStatus, session: PKPaymentMerchantSession): this; +} + declare class PKPaymentRequestPaymentMethodUpdate extends PKPaymentRequestUpdate { static alloc(): PKPaymentRequestPaymentMethodUpdate; // inherited from NSObject @@ -916,6 +1249,63 @@ declare class PKPaymentToken extends NSObject { readonly transactionIdentifier: string; } +declare class PKSecureElementPass extends PKPass { + + static alloc(): PKSecureElementPass; // inherited from NSObject + + static new(): PKSecureElementPass; // inherited from NSObject + + readonly deviceAccountIdentifier: string; + + readonly deviceAccountNumberSuffix: string; + + readonly devicePassIdentifier: string; + + readonly pairedTerminalIdentifier: string; + + readonly passActivationState: PKSecureElementPassActivationState; + + readonly primaryAccountIdentifier: string; + + readonly primaryAccountNumberSuffix: string; +} + +declare const enum PKSecureElementPassActivationState { + + Activated = 0, + + RequiresActivation = 1, + + Activating = 2, + + Suspended = 3, + + Deactivated = 4 +} + +declare class PKShareablePassMetadata extends NSObject { + + static alloc(): PKShareablePassMetadata; // inherited from NSObject + + static new(): PKShareablePassMetadata; // inherited from NSObject + + readonly cardConfigurationIdentifier: string; + + readonly credentialIdentifier: string; + + readonly localizedDescription: string; + + readonly ownerDisplayName: string; + + readonly passThumbnailImage: any; + + readonly sharingInstanceIdentifier: string; + + constructor(o: { provisioningCredentialIdentifier: string; cardConfigurationIdentifier: string; sharingInstanceIdentifier: string; passThumbnailImage: any; ownerDisplayName: string; localizedDescription: string; }); + + initWithProvisioningCredentialIdentifierCardConfigurationIdentifierSharingInstanceIdentifierPassThumbnailImageOwnerDisplayNameLocalizedDescription(credentialIdentifier: string, cardConfigurationIdentifier: string, sharingInstanceIdentifier: string, passThumbnailImage: any, ownerDisplayName: string, localizedDescription: string): this; +} + declare class PKShippingMethod extends PKPaymentSummaryItem { static alloc(): PKShippingMethod; // inherited from NSObject diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PencilKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PencilKit.d.ts index 0ba51bfb2..d6af85f59 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PencilKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PencilKit.d.ts @@ -27,6 +27,8 @@ declare class PKCanvasView extends UIScrollView implements PKToolPickerObserver readonly drawingGestureRecognizer: UIGestureRecognizer; + drawingPolicy: PKCanvasViewDrawingPolicy; + rulerActive: boolean; tool: PKTool; @@ -89,6 +91,15 @@ declare var PKCanvasViewDelegate: { prototype: PKCanvasViewDelegate; }; +declare const enum PKCanvasViewDrawingPolicy { + + Default = 0, + + AnyInput = 1, + + PencilOnly = 2 +} + declare class PKDrawing extends NSObject implements NSCopying, NSSecureCoding { static alloc(): PKDrawing; // inherited from NSObject @@ -97,18 +108,24 @@ declare class PKDrawing extends NSObject implements NSCopying, NSSecureCoding { readonly bounds: CGRect; + readonly strokes: NSArray; + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding constructor(o: { data: NSData; }); + constructor(o: { strokes: NSArray | PKStroke[]; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; dataRepresentation(): NSData; drawingByAppendingDrawing(drawing: PKDrawing): PKDrawing; + drawingByAppendingStrokes(strokes: NSArray | PKStroke[]): PKDrawing; + drawingByApplyingTransform(transform: CGAffineTransform): PKDrawing; encodeWithCoder(coder: NSCoder): void; @@ -118,6 +135,8 @@ declare class PKDrawing extends NSObject implements NSCopying, NSSecureCoding { initWithCoder(coder: NSCoder): this; initWithDataError(data: NSData): this; + + initWithStrokes(strokes: NSArray | PKStroke[]): this; } declare class PKEraserTool extends PKTool { @@ -140,6 +159,40 @@ declare const enum PKEraserType { Bitmap = 1 } +declare class PKFloatRange extends NSObject implements NSCopying { + + static alloc(): PKFloatRange; // inherited from NSObject + + static new(): PKFloatRange; // inherited from NSObject + + readonly lowerBound: number; + + readonly upperBound: number; + + constructor(o: { lowerBound: number; upperBound: number; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithLowerBoundUpperBound(lowerBound: number, upperBound: number): this; +} + +declare class PKInk extends NSObject implements NSCopying { + + static alloc(): PKInk; // inherited from NSObject + + static new(): PKInk; // inherited from NSObject + + readonly color: UIColor; + + readonly inkType: string; + + constructor(o: { inkType: string; color: UIColor; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithInkTypeColor(type: string, color: UIColor): this; +} + declare var PKInkTypeMarker: string; declare var PKInkTypePen: string; @@ -162,6 +215,8 @@ declare class PKInkingTool extends PKTool { readonly color: UIColor; + readonly ink: PKInk; + readonly inkType: string; readonly width: number; @@ -170,9 +225,13 @@ declare class PKInkingTool extends PKTool { constructor(o: { inkType: string; color: UIColor; width: number; }); + constructor(o: { ink: PKInk; width: number; }); + initWithInkTypeColor(type: string, color: UIColor): this; initWithInkTypeColorWidth(type: string, color: UIColor, width: number): this; + + initWithInkWidth(ink: PKInk, width: number): this; } declare class PKLassoTool extends PKTool { @@ -182,6 +241,94 @@ declare class PKLassoTool extends PKTool { static new(): PKLassoTool; // inherited from NSObject } +declare class PKStroke extends NSObject implements NSCopying { + + static alloc(): PKStroke; // inherited from NSObject + + static new(): PKStroke; // inherited from NSObject + + readonly ink: PKInk; + + readonly mask: UIBezierPath; + + readonly maskedPathRanges: NSArray; + + readonly path: PKStrokePath; + + readonly renderBounds: CGRect; + + readonly transform: CGAffineTransform; + + constructor(o: { ink: PKInk; strokePath: PKStrokePath; transform: CGAffineTransform; mask: UIBezierPath; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithInkStrokePathTransformMask(ink: PKInk, strokePath: PKStrokePath, transform: CGAffineTransform, mask: UIBezierPath): this; +} + +declare class PKStrokePath extends NSObject implements NSCopying { + + static alloc(): PKStrokePath; // inherited from NSObject + + static new(): PKStrokePath; // inherited from NSObject + + readonly count: number; + + readonly creationDate: Date; + [index: number]: PKStrokePoint; + + constructor(o: { controlPoints: NSArray | PKStrokePoint[]; creationDate: Date; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + enumerateInterpolatedPointsInRangeStrideByDistanceUsingBlock(range: PKFloatRange, distanceStep: number, block: (p1: PKStrokePoint, p2: interop.Pointer | interop.Reference) => void): void; + + enumerateInterpolatedPointsInRangeStrideByParametricStepUsingBlock(range: PKFloatRange, parametricStep: number, block: (p1: PKStrokePoint, p2: interop.Pointer | interop.Reference) => void): void; + + enumerateInterpolatedPointsInRangeStrideByTimeUsingBlock(range: PKFloatRange, timeStep: number, block: (p1: PKStrokePoint, p2: interop.Pointer | interop.Reference) => void): void; + + initWithControlPointsCreationDate(controlPoints: NSArray | PKStrokePoint[], creationDate: Date): this; + + interpolatedLocationAt(parametricValue: number): CGPoint; + + interpolatedPointAt(parametricValue: number): PKStrokePoint; + + objectAtIndexedSubscript(i: number): PKStrokePoint; + + parametricValueOffsetByDistance(parametricValue: number, distanceStep: number): number; + + parametricValueOffsetByTime(parametricValue: number, timeStep: number): number; + + pointAtIndex(i: number): PKStrokePoint; +} + +declare class PKStrokePoint extends NSObject implements NSCopying { + + static alloc(): PKStrokePoint; // inherited from NSObject + + static new(): PKStrokePoint; // inherited from NSObject + + readonly altitude: number; + + readonly azimuth: number; + + readonly force: number; + + readonly location: CGPoint; + + readonly opacity: number; + + readonly size: CGSize; + + readonly timeOffset: number; + + constructor(o: { location: CGPoint; timeOffset: number; size: CGSize; opacity: number; force: number; azimuth: number; altitude: number; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithLocationTimeOffsetSizeOpacityForceAzimuthAltitude(location: CGPoint, timeOffset: number, size: CGSize, opacity: number, force: number, azimuth: number, altitude: number): this; +} + declare class PKTool extends NSObject implements NSCopying { static alloc(): PKTool; // inherited from NSObject @@ -209,6 +356,10 @@ declare class PKToolPicker extends NSObject { selectedTool: PKTool; + showsDrawingPolicyControls: boolean; + + stateAutosaveName: string; + addObserver(observer: PKToolPickerObserver): void; frameObscuredInView(view: UIView): CGRect; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Photos.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Photos.d.ts index 9fcc20848..531606eb3 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Photos.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Photos.d.ts @@ -1,4 +1,11 @@ +declare const enum PHAccessLevel { + + AddOnly = 1, + + ReadWrite = 2 +} + declare class PHAdjustmentData extends NSObject { static alloc(): PHAdjustmentData; // inherited from NSObject @@ -432,7 +439,9 @@ declare const enum PHAuthorizationStatus { Denied = 2, - Authorized = 3 + Authorized = 3, + + Limited = 4 } declare class PHCachingImageManager extends PHImageManager { @@ -543,6 +552,8 @@ declare class PHCollectionListChangeRequest extends PHChangeRequest { static changeRequestForCollectionListChildCollections(collectionList: PHCollectionList, childCollections: PHFetchResult): PHCollectionListChangeRequest; + static changeRequestForTopLevelCollectionListUserCollections(childCollections: PHFetchResult): PHCollectionListChangeRequest; + static creationRequestForCollectionListWithTitle(title: string): PHCollectionListChangeRequest; static deleteCollectionLists(collectionLists: NSFastEnumeration): void; @@ -852,7 +863,7 @@ declare var PHInvalidAssetResourceDataRequestID: number; declare var PHInvalidImageRequestID: number; -declare class PHLivePhoto extends NSObject implements NSCopying, NSSecureCoding { +declare class PHLivePhoto extends NSObject implements NSCopying, NSItemProviderReading, NSSecureCoding { static alloc(): PHLivePhoto; // inherited from NSObject @@ -860,19 +871,57 @@ declare class PHLivePhoto extends NSObject implements NSCopying, NSSecureCoding static new(): PHLivePhoto; // inherited from NSObject + static objectWithItemProviderDataTypeIdentifierError(data: NSData, typeIdentifier: string): PHLivePhoto; + static requestLivePhotoWithResourceFileURLsPlaceholderImageTargetSizeContentModeResultHandler(fileURLs: NSArray | NSURL[], image: UIImage, targetSize: CGSize, contentMode: PHImageContentMode, resultHandler: (p1: PHLivePhoto, p2: NSDictionary) => void): number; readonly size: CGSize; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + static readonly readableTypeIdentifiersForItemProvider: NSArray; // inherited from NSItemProviderReading + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare class PHLivePhotoEditingContext extends NSObject { @@ -1001,10 +1050,14 @@ declare class PHPhotoLibrary extends NSObject { static authorizationStatus(): PHAuthorizationStatus; + static authorizationStatusForAccessLevel(accessLevel: PHAccessLevel): PHAuthorizationStatus; + static new(): PHPhotoLibrary; // inherited from NSObject static requestAuthorization(handler: (p1: PHAuthorizationStatus) => void): void; + static requestAuthorizationForAccessLevelHandler(accessLevel: PHAccessLevel, handler: (p1: PHAuthorizationStatus) => void): void; + static sharedPhotoLibrary(): PHPhotoLibrary; readonly unavailabilityReason: NSError; @@ -1013,6 +1066,8 @@ declare class PHPhotoLibrary extends NSObject { performChangesCompletionHandler(changeBlock: () => void, completionHandler: (p1: boolean, p2: NSError) => void): void; + presentLimitedLibraryPickerFromViewController(controller: UIViewController): void; + registerAvailabilityObserver(observer: PHPhotoLibraryAvailabilityObserver): void; registerChangeObserver(observer: PHPhotoLibraryChangeObserver): void; @@ -1040,18 +1095,23 @@ declare var PHPhotoLibraryChangeObserver: { prototype: PHPhotoLibraryChangeObserver; }; +declare const enum PHPhotosError { + + Invalid = -1, + + UserCancelled = 3072, + + LibraryVolumeOffline = 3114, + + RelinquishingLibraryBundleToWriter = 3142, + + SwitchingSystemPhotoLibrary = 3143, + + NetworkAccessRequired = 3164 +} + declare var PHPhotosErrorDomain: string; -declare const PHPhotosErrorInvalid: number; - -declare const PHPhotosErrorLibraryVolumeOffline: number; - -declare const PHPhotosErrorRelinquishingLibraryBundleToWriter: number; - -declare const PHPhotosErrorSwitchingSystemPhotoLibrary: number; - -declare const PHPhotosErrorUserCancelled: number; - declare class PHVideoRequestOptions extends NSObject { static alloc(): PHVideoRequestOptions; // inherited from NSObject diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PhotosUI.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PhotosUI.d.ts index fcf092079..f8dd53f3d 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!PhotosUI.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!PhotosUI.d.ts @@ -82,3 +82,83 @@ declare const enum PHLivePhotoViewPlaybackStyle { Hint = 2 } + +declare class PHPickerConfiguration extends NSObject implements NSCopying { + + static alloc(): PHPickerConfiguration; // inherited from NSObject + + static new(): PHPickerConfiguration; // inherited from NSObject + + filter: PHPickerFilter; + + preferredAssetRepresentationMode: PHPickerConfigurationAssetRepresentationMode; + + selectionLimit: number; + + constructor(o: { photoLibrary: PHPhotoLibrary; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithPhotoLibrary(photoLibrary: PHPhotoLibrary): this; +} + +declare const enum PHPickerConfigurationAssetRepresentationMode { + + Automatic = 0, + + Current = 1, + + Compatible = 2 +} + +declare class PHPickerFilter extends NSObject implements NSCopying { + + static alloc(): PHPickerFilter; // inherited from NSObject + + static anyFilterMatchingSubfilters(subfilters: NSArray | PHPickerFilter[]): PHPickerFilter; + + static new(): PHPickerFilter; // inherited from NSObject + + static readonly imagesFilter: PHPickerFilter; + + static readonly livePhotosFilter: PHPickerFilter; + + static readonly videosFilter: PHPickerFilter; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class PHPickerResult extends NSObject { + + static alloc(): PHPickerResult; // inherited from NSObject + + static new(): PHPickerResult; // inherited from NSObject + + readonly assetIdentifier: string; + + readonly itemProvider: NSItemProvider; +} + +declare class PHPickerViewController extends UIViewController { + + static alloc(): PHPickerViewController; // inherited from NSObject + + static new(): PHPickerViewController; // inherited from NSObject + + readonly configuration: PHPickerConfiguration; + + delegate: PHPickerViewControllerDelegate; + + constructor(o: { configuration: PHPickerConfiguration; }); + + initWithConfiguration(configuration: PHPickerConfiguration): this; +} + +interface PHPickerViewControllerDelegate extends NSObjectProtocol { + + pickerDidFinishPicking(picker: PHPickerViewController, results: NSArray | PHPickerResult[]): void; +} +declare var PHPickerViewControllerDelegate: { + + prototype: PHPickerViewControllerDelegate; +}; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!QuickLookThumbnailing.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!QuickLookThumbnailing.d.ts index 0bfc9f729..d2277f5c6 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!QuickLookThumbnailing.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!QuickLookThumbnailing.d.ts @@ -37,6 +37,8 @@ declare class QLThumbnailGenerationRequest extends NSObject implements NSCopying static new(): QLThumbnailGenerationRequest; // inherited from NSObject + contentType: UTType; + iconMode: boolean; minimumDimension: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ReplayKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ReplayKit.d.ts index a567ea72c..644b942b9 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ReplayKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ReplayKit.d.ts @@ -188,13 +188,6 @@ declare var RPPreviewViewControllerDelegate: { prototype: RPPreviewViewControllerDelegate; }; -declare const enum RPPreviewViewControllerMode { - - Preview = 0, - - Share = 1 -} - declare const enum RPRecordingErrorCode { Unknown = -5800, @@ -265,6 +258,10 @@ declare const enum RPRecordingErrorCode { FailedToStartCaptureStack = -5833, + InvalidParameter = -5834, + + FilePermissions = -5835, + CodeSuccessful = 0 } @@ -312,6 +309,8 @@ declare class RPScreenRecorder extends NSObject { stopCaptureWithHandler(handler: (p1: NSError) => void): void; stopRecordingWithHandler(handler: (p1: RPPreviewViewController, p2: NSError) => void): void; + + stopRecordingWithOutputURLCompletionHandler(url: NSURL, completionHandler: (p1: NSError) => void): void; } interface RPScreenRecorderDelegate extends NSObjectProtocol { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SQLite3.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SQLite3.d.ts index de0791a07..d616a96d2 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SQLite3.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SQLite3.d.ts @@ -182,6 +182,8 @@ declare function sqlite3_create_collation16(p1: interop.Pointer | interop.Refere declare function sqlite3_create_collation_v2(p1: interop.Pointer | interop.Reference, zName: string | interop.Pointer | interop.Reference, eTextRep: number, pArg: interop.Pointer | interop.Reference, xCompare: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference, p4: number, p5: interop.Pointer | interop.Reference) => number>, xDestroy: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): number; +declare function sqlite3_create_filename(zDatabase: string | interop.Pointer | interop.Reference, zJournal: string | interop.Pointer | interop.Reference, zWal: string | interop.Pointer | interop.Reference, nParam: number, azParam: interop.Pointer | interop.Reference): string; + declare function sqlite3_create_function(db: interop.Pointer | interop.Reference, zFunctionName: string | interop.Pointer | interop.Reference, nArg: number, eTextRep: number, pApp: interop.Pointer | interop.Reference, xFunc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference>) => void>, xStep: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference>) => void>, xFinal: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): number; declare function sqlite3_create_function16(db: interop.Pointer | interop.Reference, zFunctionName: interop.Pointer | interop.Reference, nArg: number, eTextRep: number, pApp: interop.Pointer | interop.Reference, xFunc: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference>) => void>, xStep: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: number, p3: interop.Pointer | interop.Reference>) => void>, xFinal: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): number; @@ -198,6 +200,8 @@ declare function sqlite3_data_count(pStmt: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + declare function sqlite3_db_cacheflush(p1: interop.Pointer | interop.Reference): number; declare function sqlite3_db_filename(db: interop.Pointer | interop.Reference, zDbName: string | interop.Pointer | interop.Reference): string; @@ -216,6 +220,8 @@ declare function sqlite3_declare_vtab(p1: interop.Pointer | interop.Reference, zSchema: string | interop.Pointer | interop.Reference, pData: string | interop.Pointer | interop.Reference, szDb: number, szBuf: number, mFlags: number): number; +declare function sqlite3_drop_modules(db: interop.Pointer | interop.Reference, azKeep: interop.Pointer | interop.Reference): number; + declare function sqlite3_enable_shared_cache(p1: number): number; declare function sqlite3_errcode(db: interop.Pointer | interop.Reference): number; @@ -243,10 +249,18 @@ declare var sqlite3_file: interop.StructType; declare function sqlite3_file_control(p1: interop.Pointer | interop.Reference, zDbName: string | interop.Pointer | interop.Reference, op: number, p4: interop.Pointer | interop.Reference): number; +declare function sqlite3_filename_database(p1: string | interop.Pointer | interop.Reference): string; + +declare function sqlite3_filename_journal(p1: string | interop.Pointer | interop.Reference): string; + +declare function sqlite3_filename_wal(p1: string | interop.Pointer | interop.Reference): string; + declare function sqlite3_finalize(pStmt: interop.Pointer | interop.Reference): number; declare function sqlite3_free(p1: interop.Pointer | interop.Reference): void; +declare function sqlite3_free_filename(p1: string | interop.Pointer | interop.Reference): void; + declare function sqlite3_free_table(result: interop.Pointer | interop.Reference): void; declare function sqlite3_get_autocommit(p1: interop.Pointer | interop.Reference): number; @@ -599,6 +613,10 @@ declare function sqlite3_stmt_isexplain(pStmt: interop.Pointer | interop.Referen declare function sqlite3_stmt_readonly(pStmt: interop.Pointer | interop.Reference): number; +declare function sqlite3_stmt_scanstatus(pStmt: interop.Pointer | interop.Reference, idx: number, iScanStatusOp: number, pOut: interop.Pointer | interop.Reference): number; + +declare function sqlite3_stmt_scanstatus_reset(p1: interop.Pointer | interop.Reference): void; + declare function sqlite3_stmt_status(p1: interop.Pointer | interop.Reference, op: number, resetFlg: number): number; declare function sqlite3_str_append(p1: interop.Pointer | interop.Reference, zIn: string | interop.Pointer | interop.Reference, N: number): void; @@ -651,6 +669,8 @@ declare function sqlite3_uri_boolean(zFile: string | interop.Pointer | interop.R declare function sqlite3_uri_int64(p1: string | interop.Pointer | interop.Reference, p2: string | interop.Pointer | interop.Reference, p3: number): number; +declare function sqlite3_uri_key(zFilename: string | interop.Pointer | interop.Reference, N: number): string; + declare function sqlite3_uri_parameter(zFilename: string | interop.Pointer | interop.Reference, zParam: string | interop.Pointer | interop.Reference): string; declare function sqlite3_user_data(p1: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SafariServices.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SafariServices.d.ts index b417a0a39..f391548a5 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SafariServices.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SafariServices.d.ts @@ -116,6 +116,8 @@ interface SFSafariViewControllerDelegate extends NSObjectProtocol { safariViewControllerExcludedActivityTypesForURLTitle?(controller: SFSafariViewController, URL: NSURL, title: string): NSArray; safariViewControllerInitialLoadDidRedirectToURL?(controller: SFSafariViewController, URL: NSURL): void; + + safariViewControllerWillOpenInBrowser?(controller: SFSafariViewController): void; } declare var SFSafariViewControllerDelegate: { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SceneKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SceneKit.d.ts index cee85eb0b..0502aedca 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SceneKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SceneKit.d.ts @@ -846,7 +846,7 @@ declare class SCNCameraController extends NSObject { stopInertia(): void; - translateInCameraSpaceByXYZ(deltaX: number, deltaY: number, deltaX2: number): void; + translateInCameraSpaceByXYZ(deltaX: number, deltaY: number, deltaZ: number): void; } interface SCNCameraControllerDelegate extends NSObjectProtocol { @@ -1302,6 +1302,8 @@ declare class SCNGeometryElement extends NSObject implements NSSecureCoding { static alloc(): SCNGeometryElement; // inherited from NSObject + static geometryElementWithBufferPrimitiveTypePrimitiveCountBytesPerIndex(buffer: MTLBuffer, primitiveType: SCNGeometryPrimitiveType, primitiveCount: number, bytesPerIndex: number): SCNGeometryElement; + static geometryElementWithDataPrimitiveTypePrimitiveCountBytesPerIndex(data: NSData, primitiveType: SCNGeometryPrimitiveType, primitiveCount: number, bytesPerIndex: number): SCNGeometryElement; static geometryElementWithMDLSubmesh(mdlSubMesh: MDLSubmesh): SCNGeometryElement; @@ -1350,7 +1352,7 @@ declare class SCNGeometrySource extends NSObject implements NSSecureCoding { static alloc(): SCNGeometrySource; // inherited from NSObject - static geometrySourceWithBufferVertexFormatSemanticVertexCountDataOffsetDataStride(mtlBuffer: MTLBuffer, vertexFormat: MTLVertexFormat, semantic: string, vertexCount: number, offset: number, stride: number): SCNGeometrySource; + static geometrySourceWithBufferVertexFormatSemanticVertexCountDataOffsetDataStride(buffer: MTLBuffer, vertexFormat: MTLVertexFormat, semantic: string, vertexCount: number, offset: number, stride: number): SCNGeometrySource; static geometrySourceWithDataSemanticVectorCountFloatComponentsComponentsPerVectorBytesPerComponentDataOffsetDataStride(data: NSData, semantic: string, vectorCount: number, floatComponents: boolean, componentsPerVector: number, bytesPerComponent: number, offset: number, stride: number): SCNGeometrySource; @@ -2343,6 +2345,8 @@ declare class SCNNode extends NSObject implements NSCopying, NSSecureCoding, SCN readonly description: string; // inherited from NSObjectProtocol + readonly focusGroupIdentifier: string; // inherited from UIFocusEnvironment + readonly focusItemContainer: UIFocusItemContainer; // inherited from UIFocusEnvironment readonly frame: CGRect; // inherited from UIFocusItem @@ -3587,6 +3591,8 @@ declare class SCNRenderer extends NSObject implements SCNSceneRenderer, SCNTechn readonly currentRenderCommandEncoder: MTLRenderCommandEncoder; // inherited from SCNSceneRenderer + readonly currentRenderPassDescriptor: MTLRenderPassDescriptor; // inherited from SCNSceneRenderer + readonly currentViewport: CGRect; // inherited from SCNSceneRenderer readonly debugDescription: string; // inherited from NSObjectProtocol @@ -3850,6 +3856,8 @@ interface SCNSceneRenderer extends NSObjectProtocol { currentRenderCommandEncoder: MTLRenderCommandEncoder; + currentRenderPassDescriptor: MTLRenderPassDescriptor; + currentViewport: CGRect; debugOptions: SCNDebugOptions; @@ -4485,6 +4493,8 @@ declare class SCNView extends UIView implements SCNSceneRenderer, SCNTechniqueSu readonly currentRenderCommandEncoder: MTLRenderCommandEncoder; // inherited from SCNSceneRenderer + readonly currentRenderPassDescriptor: MTLRenderPassDescriptor; // inherited from SCNSceneRenderer + readonly currentViewport: CGRect; // inherited from SCNSceneRenderer readonly debugDescription: string; // inherited from NSObjectProtocol diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!ScreenTime.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ScreenTime.d.ts new file mode 100644 index 000000000..a809e74b8 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!ScreenTime.d.ts @@ -0,0 +1,62 @@ + +declare class STScreenTimeConfiguration extends NSObject { + + static alloc(): STScreenTimeConfiguration; // inherited from NSObject + + static new(): STScreenTimeConfiguration; // inherited from NSObject + + readonly enforcesChildRestrictions: boolean; +} + +declare class STScreenTimeConfigurationObserver extends NSObject { + + static alloc(): STScreenTimeConfigurationObserver; // inherited from NSObject + + static new(): STScreenTimeConfigurationObserver; // inherited from NSObject + + readonly configuration: STScreenTimeConfiguration; + + constructor(o: { updateQueue: NSObject; }); + + initWithUpdateQueue(updateQueue: NSObject): this; + + startObserving(): void; + + stopObserving(): void; +} + +declare class STWebHistory extends NSObject { + + static alloc(): STWebHistory; // inherited from NSObject + + static new(): STWebHistory; // inherited from NSObject + + constructor(o: { bundleIdentifier: string; }); + + deleteAllHistory(): void; + + deleteHistoryDuringInterval(interval: NSDateInterval): void; + + deleteHistoryForURL(url: NSURL): void; + + initWithBundleIdentifierError(bundleIdentifier: string): this; +} + +declare class STWebpageController extends UIViewController { + + static alloc(): STWebpageController; // inherited from NSObject + + static new(): STWebpageController; // inherited from NSObject + + URL: NSURL; + + readonly URLIsBlocked: boolean; + + URLIsPictureInPicture: boolean; + + URLIsPlayingVideo: boolean; + + suppressUsageRecording: boolean; + + setBundleIdentifierError(bundleIdentifier: string): boolean; +} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Security.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Security.d.ts index 26210412f..f81918e70 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Security.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Security.d.ts @@ -490,6 +490,8 @@ declare function SecTrustCopyCustomAnchorCertificates(trust: any, anchors: inter declare function SecTrustCopyExceptions(trust: any): NSData; +declare function SecTrustCopyKey(trust: any): any; + declare function SecTrustCopyPolicies(trust: any, policies: interop.Pointer | interop.Reference>): number; declare function SecTrustCopyProperties(trust: any): NSArray; @@ -877,6 +879,8 @@ declare const errSSLDecompressFail: number; declare const errSSLDecryptionFail: number; +declare const errSSLEarlyDataRejected: number; + declare const errSSLFatalAlert: number; declare const errSSLHandshakeFail: number; @@ -1035,6 +1039,8 @@ declare const errSecCertificateCannotOperate: number; declare const errSecCertificateExpired: number; +declare const errSecCertificateIsCA: number; + declare const errSecCertificateNameNotAllowed: number; declare const errSecCertificateNotValidYet: number; @@ -1599,6 +1605,8 @@ declare const errSecResourceSignBadCertChainLength: number; declare const errSecResourceSignBadExtKeyUsage: number; +declare const errSecRestrictedAPI: number; + declare const errSecSMIMEBadExtendedKeyUsage: number; declare const errSecSMIMEBadKeyUsage: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SensorKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SensorKit.d.ts new file mode 100644 index 000000000..0f23ceef0 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SensorKit.d.ts @@ -0,0 +1,623 @@ + +declare function SRAbsoluteTimeFromCFAbsoluteTime(cf: number): number; + +declare function SRAbsoluteTimeFromContinuousTime(cont: number): number; + +declare function SRAbsoluteTimeGetCurrent(): number; + +declare function SRAbsoluteTimeToCFAbsoluteTime(sr: number): number; + +interface SRAmbientLightChromaticity { + x: number; + y: number; +} +declare var SRAmbientLightChromaticity: interop.StructType; + +declare class SRAmbientLightSample extends NSObject { + + static alloc(): SRAmbientLightSample; // inherited from NSObject + + static new(): SRAmbientLightSample; // inherited from NSObject + + readonly chromaticity: SRAmbientLightChromaticity; + + readonly lux: NSMeasurement; + + readonly placement: SRAmbientLightSensorPlacement; +} + +declare const enum SRAmbientLightSensorPlacement { + + Unknown = 0, + + FrontTop = 1, + + FrontBottom = 2, + + FrontRight = 3, + + FrontLeft = 4, + + FrontTopRight = 5, + + FrontTopLeft = 6, + + FrontBottomRight = 7, + + FrontBottomLeft = 8 +} + +declare class SRApplicationUsage extends NSObject { + + static alloc(): SRApplicationUsage; // inherited from NSObject + + static new(): SRApplicationUsage; // inherited from NSObject + + readonly bundleIdentifier: string; + + readonly usageTime: number; +} + +declare const enum SRAuthorizationStatus { + + NotDetermined = 0, + + Authorized = 1, + + Denied = 2 +} + +declare const enum SRCrownOrientation { + + Left = 0, + + Right = 1 +} + +declare const enum SRDeletionReason { + + UserInitiated = 0, + + LowDiskSpace = 1, + + AgeLimit = 2, + + NoInterestedClients = 3, + + SystemInitiated = 4 +} + +declare class SRDeletionRecord extends NSObject implements NSSecureCoding { + + static alloc(): SRDeletionRecord; // inherited from NSObject + + static new(): SRDeletionRecord; // inherited from NSObject + + readonly endTime: number; + + readonly reason: SRDeletionReason; + + readonly startTime: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class SRDevice extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): SRDevice; // inherited from NSObject + + static new(): SRDevice; // inherited from NSObject + + readonly model: string; + + readonly name: string; + + readonly systemName: string; + + readonly systemVersion: string; + + static readonly currentDevice: SRDevice; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare var SRDeviceUsageCategoryBooks: string; + +declare var SRDeviceUsageCategoryBusiness: string; + +declare var SRDeviceUsageCategoryCatalogs: string; + +declare var SRDeviceUsageCategoryDeveloperTools: string; + +declare var SRDeviceUsageCategoryEducation: string; + +declare var SRDeviceUsageCategoryEntertainment: string; + +declare var SRDeviceUsageCategoryFinance: string; + +declare var SRDeviceUsageCategoryFoodAndDrink: string; + +declare var SRDeviceUsageCategoryGames: string; + +declare var SRDeviceUsageCategoryGraphicsAndDesign: string; + +declare var SRDeviceUsageCategoryHealthAndFitness: string; + +declare var SRDeviceUsageCategoryKids: string; + +declare var SRDeviceUsageCategoryLifestyle: string; + +declare var SRDeviceUsageCategoryMedical: string; + +declare var SRDeviceUsageCategoryMiscellaneous: string; + +declare var SRDeviceUsageCategoryMusic: string; + +declare var SRDeviceUsageCategoryNavigation: string; + +declare var SRDeviceUsageCategoryNews: string; + +declare var SRDeviceUsageCategoryNewsstand: string; + +declare var SRDeviceUsageCategoryPhotoAndVideo: string; + +declare var SRDeviceUsageCategoryProductivity: string; + +declare var SRDeviceUsageCategoryReference: string; + +declare var SRDeviceUsageCategoryShopping: string; + +declare var SRDeviceUsageCategorySocialNetworking: string; + +declare var SRDeviceUsageCategorySports: string; + +declare var SRDeviceUsageCategoryStickers: string; + +declare var SRDeviceUsageCategoryTravel: string; + +declare var SRDeviceUsageCategoryUtilities: string; + +declare var SRDeviceUsageCategoryWeather: string; + +declare class SRDeviceUsageReport extends NSObject { + + static alloc(): SRDeviceUsageReport; // inherited from NSObject + + static new(): SRDeviceUsageReport; // inherited from NSObject + + readonly applicationUsageByCategory: NSDictionary>; + + readonly duration: number; + + readonly notificationUsageByCategory: NSDictionary>; + + readonly totalScreenWakes: number; + + readonly totalUnlockDuration: number; + + readonly totalUnlocks: number; + + readonly webUsageByCategory: NSDictionary>; +} + +declare const enum SRErrorCode { + + InvalidEntitlement = 0, + + NoAuthorization = 1, + + DataInaccessible = 2, + + FetchRequestInvalid = 3, + + PromptDeclined = 4 +} + +declare var SRErrorDomain: string; + +declare class SRFetchRequest extends NSObject { + + static alloc(): SRFetchRequest; // inherited from NSObject + + static new(): SRFetchRequest; // inherited from NSObject + + device: SRDevice; + + from: number; + + to: number; +} + +declare class SRFetchResult extends NSObject implements NSCopying { + + static alloc(): SRFetchResult; // inherited from NSObject + + static new(): SRFetchResult; // inherited from NSObject + + readonly sample: SampleType; + + readonly timestamp: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class SRKeyboardMetrics extends NSObject { + + static alloc(): SRKeyboardMetrics; // inherited from NSObject + + static new(): SRKeyboardMetrics; // inherited from NSObject + + readonly anyTapToCharKey: SRKeyboardProbabilityMetric; + + readonly anyTapToPlaneChangeKey: SRKeyboardProbabilityMetric; + + readonly charKeyToAnyTapKey: SRKeyboardProbabilityMetric; + + readonly charKeyToDelete: SRKeyboardProbabilityMetric; + + readonly charKeyToPlaneChangeKey: SRKeyboardProbabilityMetric; + + readonly charKeyToPrediction: SRKeyboardProbabilityMetric; + + readonly charKeyToSpaceKey: SRKeyboardProbabilityMetric; + + readonly deleteDownErrorDistance: SRKeyboardProbabilityMetric; + + readonly deleteToCharKey: SRKeyboardProbabilityMetric; + + readonly deleteToDelete: SRKeyboardProbabilityMetric; + + readonly deleteToDeletes: NSArray>; + + readonly deleteToPath: SRKeyboardProbabilityMetric; + + readonly deleteToPlaneChangeKey: SRKeyboardProbabilityMetric; + + readonly deleteToShiftKey: SRKeyboardProbabilityMetric; + + readonly deleteToSpaceKey: SRKeyboardProbabilityMetric; + + readonly deleteTouchDownUp: SRKeyboardProbabilityMetric; + + readonly deleteUpErrorDistance: SRKeyboardProbabilityMetric; + + readonly downErrorDistance: SRKeyboardProbabilityMetric; + + readonly duration: number; + + readonly height: NSMeasurement; + + readonly keyboardIdentifier: string; + + readonly longWordDownErrorDistance: NSArray>; + + readonly longWordTouchDownDown: NSArray>; + + readonly longWordTouchDownUp: NSArray>; + + readonly longWordUpErrorDistance: NSArray>; + + readonly pathErrorDistanceRatio: NSArray; + + readonly pathToDelete: SRKeyboardProbabilityMetric; + + readonly pathToPath: SRKeyboardProbabilityMetric; + + readonly pathToSpace: SRKeyboardProbabilityMetric; + + readonly planeChangeKeyToCharKey: SRKeyboardProbabilityMetric; + + readonly planeChangeToAnyTap: SRKeyboardProbabilityMetric; + + readonly shortWordCharKeyDownErrorDistance: SRKeyboardProbabilityMetric; + + readonly shortWordCharKeyToCharKey: SRKeyboardProbabilityMetric; + + readonly shortWordCharKeyTouchDownUp: SRKeyboardProbabilityMetric; + + readonly shortWordCharKeyUpErrorDistance: SRKeyboardProbabilityMetric; + + readonly spaceDownErrorDistance: SRKeyboardProbabilityMetric; + + readonly spaceToCharKey: SRKeyboardProbabilityMetric; + + readonly spaceToDeleteKey: SRKeyboardProbabilityMetric; + + readonly spaceToPath: SRKeyboardProbabilityMetric; + + readonly spaceToPlaneChangeKey: SRKeyboardProbabilityMetric; + + readonly spaceToPredictionKey: SRKeyboardProbabilityMetric; + + readonly spaceToShiftKey: SRKeyboardProbabilityMetric; + + readonly spaceToSpaceKey: SRKeyboardProbabilityMetric; + + readonly spaceTouchDownUp: SRKeyboardProbabilityMetric; + + readonly spaceUpErrorDistance: SRKeyboardProbabilityMetric; + + readonly totalAlteredWords: number; + + readonly totalAutoCorrections: number; + + readonly totalDeletes: number; + + readonly totalDrags: number; + + readonly totalEmojis: number; + + readonly totalHitTestCorrections: number; + + readonly totalInsertKeyCorrections: number; + + readonly totalNearKeyCorrections: number; + + readonly totalPathLength: NSMeasurement; + + readonly totalPathTime: number; + + readonly totalPaths: number; + + readonly totalRetroCorrections: number; + + readonly totalSkipTouchCorrections: number; + + readonly totalSpaceCorrections: number; + + readonly totalSubstitutionCorrections: number; + + readonly totalTaps: number; + + readonly totalTranspositionCorrections: number; + + readonly totalTypingDuration: number; + + readonly totalWords: number; + + readonly touchDownDown: SRKeyboardProbabilityMetric; + + readonly touchDownUp: SRKeyboardProbabilityMetric; + + readonly upErrorDistance: SRKeyboardProbabilityMetric; + + readonly version: string; + + readonly width: NSMeasurement; +} + +declare class SRKeyboardProbabilityMetric extends NSObject { + + static alloc(): SRKeyboardProbabilityMetric; // inherited from NSObject + + static new(): SRKeyboardProbabilityMetric; // inherited from NSObject + + readonly distributionSampleValues: NSArray>; +} + +declare const enum SRLocationCategory { + + Unknown = 0, + + Home = 1, + + Work = 2, + + School = 3, + + Gym = 4 +} + +declare class SRMessagesUsageReport extends NSObject { + + static alloc(): SRMessagesUsageReport; // inherited from NSObject + + static new(): SRMessagesUsageReport; // inherited from NSObject + + readonly duration: number; + + readonly totalIncomingMessages: number; + + readonly totalOutgoingMessages: number; + + readonly totalUniqueContacts: number; +} + +declare const enum SRNotificationEvent { + + Unknown = 0, + + Received = 1, + + DefaultAction = 2, + + SupplementaryAction = 3, + + Clear = 4, + + NotificationCenterClearAll = 5, + + Removed = 6, + + Hide = 7, + + LongLook = 8, + + Silence = 9, + + AppLaunch = 10, + + Expired = 11, + + BannerPulldown = 12, + + TapCoalesce = 13, + + Deduped = 14, + + DeviceActivated = 15, + + DeviceUnlocked = 16 +} + +declare class SRNotificationUsage extends NSObject { + + static alloc(): SRNotificationUsage; // inherited from NSObject + + static new(): SRNotificationUsage; // inherited from NSObject + + readonly bundleIdentifier: string; + + readonly event: SRNotificationEvent; +} + +declare class SRPhoneUsageReport extends NSObject { + + static alloc(): SRPhoneUsageReport; // inherited from NSObject + + static new(): SRPhoneUsageReport; // inherited from NSObject + + readonly duration: number; + + readonly totalIncomingCalls: number; + + readonly totalOutgoingCalls: number; + + readonly totalPhoneCallDuration: number; + + readonly totalUniqueContacts: number; +} + +declare var SRSensorAccelerometer: string; + +declare var SRSensorAmbientLightSensor: string; + +declare var SRSensorDeviceUsageReport: string; + +declare var SRSensorKeyboardMetrics: string; + +declare var SRSensorMessagesUsageReport: string; + +declare var SRSensorOnWristState: string; + +declare var SRSensorPedometerData: string; + +declare var SRSensorPhoneUsageReport: string; + +declare class SRSensorReader extends NSObject { + + static alloc(): SRSensorReader; // inherited from NSObject + + static new(): SRSensorReader; // inherited from NSObject + + static requestAuthorizationForSensorsCompletion(sensors: NSSet, completion: (p1: NSError) => void): void; + + readonly authorizationStatus: SRAuthorizationStatus; + + delegate: SRSensorReaderDelegate; + + readonly sensor: string; + + constructor(o: { sensor: string; }); + + fetch(request: SRFetchRequest): void; + + fetchDevices(): void; + + initWithSensor(sensor: string): this; + + startRecording(): void; + + stopRecording(): void; +} + +interface SRSensorReaderDelegate extends NSObjectProtocol { + + sensorReaderDidChangeAuthorizationStatus?(reader: SRSensorReader, authorizationStatus: SRAuthorizationStatus): void; + + sensorReaderDidCompleteFetch?(reader: SRSensorReader, fetchRequest: SRFetchRequest): void; + + sensorReaderDidFetchDevices?(reader: SRSensorReader, devices: NSArray | SRDevice[]): void; + + sensorReaderDidStopRecording?(reader: SRSensorReader): void; + + sensorReaderFetchDevicesDidFailWithError?(reader: SRSensorReader, error: NSError): void; + + sensorReaderFetchingRequestDidFetchResult?(reader: SRSensorReader, fetchRequest: SRFetchRequest, result: SRFetchResult): boolean; + + sensorReaderFetchingRequestFailedWithError?(reader: SRSensorReader, fetchRequest: SRFetchRequest, error: NSError): void; + + sensorReaderStartRecordingFailedWithError?(reader: SRSensorReader, error: NSError): void; + + sensorReaderStopRecordingFailedWithError?(reader: SRSensorReader, error: NSError): void; + + sensorReaderWillStartRecording?(reader: SRSensorReader): void; +} +declare var SRSensorReaderDelegate: { + + prototype: SRSensorReaderDelegate; +}; + +declare var SRSensorRotationRate: string; + +declare var SRSensorVisits: string; + +declare class SRVisit extends NSObject { + + static alloc(): SRVisit; // inherited from NSObject + + static new(): SRVisit; // inherited from NSObject + + readonly arrivalDateInterval: NSDateInterval; + + readonly departureDateInterval: NSDateInterval; + + readonly distanceFromHome: number; + + readonly identifier: NSUUID; + + readonly locationCategory: SRLocationCategory; +} + +declare class SRWebUsage extends NSObject { + + static alloc(): SRWebUsage; // inherited from NSObject + + static new(): SRWebUsage; // inherited from NSObject + + readonly totalUsageTime: number; +} + +declare class SRWristDetection extends NSObject { + + static alloc(): SRWristDetection; // inherited from NSObject + + static new(): SRWristDetection; // inherited from NSObject + + readonly crownOrientation: SRCrownOrientation; + + readonly onWrist: boolean; + + readonly wristLocation: SRWristLocation; +} + +declare const enum SRWristLocation { + + Left = 0, + + Right = 1 +} diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SpriteKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SpriteKit.d.ts index 7c9632f01..83f9cd96a 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!SpriteKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!SpriteKit.d.ts @@ -964,6 +964,8 @@ declare class SKNode extends UIResponder implements NSCopying, NSSecureCoding, U readonly description: string; // inherited from NSObjectProtocol + readonly focusGroupIdentifier: string; // inherited from UIFocusEnvironment + readonly focusItemContainer: UIFocusItemContainer; // inherited from UIFocusEnvironment readonly frame: CGRect; // inherited from UIFocusItem @@ -2578,6 +2580,8 @@ declare class SKView extends UIView { delegate: NSObject; + disableDepthStencilBuffer: boolean; + frameInterval: number; ignoresSiblingOrder: boolean; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!StoreKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!StoreKit.d.ts index 9fd3ce888..29a5e8ba9 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!StoreKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!StoreKit.d.ts @@ -6,6 +6,8 @@ declare class SKAdNetwork extends NSObject { static new(): SKAdNetwork; // inherited from NSObject static registerAppForAdNetworkAttribution(): void; + + static updateConversionValue(conversionValue: number): void; } declare class SKArcadeService extends NSObject { @@ -182,7 +184,17 @@ declare const enum SKErrorCode { MissingOfferParams = 13, - InvalidOfferPrice = 14 + InvalidOfferPrice = 14, + + OverlayCancelled = 15, + + OverlayInvalidConfiguration = 16, + + OverlayTimeout = 17, + + IneligibleForOffer = 18, + + UnsupportedPlatform = 19 } declare var SKErrorDomain: string; @@ -208,6 +220,115 @@ declare class SKMutablePayment extends SKPayment { simulatesAskToBuyInSandbox: boolean; } +declare class SKOverlay extends NSObject { + + static alloc(): SKOverlay; // inherited from NSObject + + static dismissOverlayInScene(scene: UIWindowScene): void; + + static new(): SKOverlay; // inherited from NSObject + + readonly configuration: SKOverlayConfiguration; + + delegate: SKOverlayDelegate; + + constructor(o: { configuration: SKOverlayConfiguration; }); + + initWithConfiguration(configuration: SKOverlayConfiguration): this; + + presentInScene(scene: UIWindowScene): void; +} + +declare class SKOverlayAppClipConfiguration extends SKOverlayConfiguration { + + static alloc(): SKOverlayAppClipConfiguration; // inherited from NSObject + + static new(): SKOverlayAppClipConfiguration; // inherited from NSObject + + campaignToken: string; + + position: SKOverlayPosition; + + providerToken: string; + + constructor(o: { position: SKOverlayPosition; }); + + additionalValueForKey(key: string): any; + + initWithPosition(position: SKOverlayPosition): this; + + setAdditionalValueForKey(value: any, key: string): void; +} + +declare class SKOverlayAppConfiguration extends SKOverlayConfiguration { + + static alloc(): SKOverlayAppConfiguration; // inherited from NSObject + + static new(): SKOverlayAppConfiguration; // inherited from NSObject + + appIdentifier: string; + + campaignToken: string; + + position: SKOverlayPosition; + + providerToken: string; + + userDismissible: boolean; + + constructor(o: { appIdentifier: string; position: SKOverlayPosition; }); + + additionalValueForKey(key: string): any; + + initWithAppIdentifierPosition(appIdentifier: string, position: SKOverlayPosition): this; + + setAdditionalValueForKey(value: any, key: string): void; +} + +declare class SKOverlayConfiguration extends NSObject { + + static alloc(): SKOverlayConfiguration; // inherited from NSObject + + static new(): SKOverlayConfiguration; // inherited from NSObject +} + +interface SKOverlayDelegate extends NSObjectProtocol { + + storeOverlayDidFailToLoadWithError?(overlay: SKOverlay, error: NSError): void; + + storeOverlayDidFinishDismissal?(overlay: SKOverlay, transitionContext: SKOverlayTransitionContext): void; + + storeOverlayDidFinishPresentation?(overlay: SKOverlay, transitionContext: SKOverlayTransitionContext): void; + + storeOverlayWillStartDismissal?(overlay: SKOverlay, transitionContext: SKOverlayTransitionContext): void; + + storeOverlayWillStartPresentation?(overlay: SKOverlay, transitionContext: SKOverlayTransitionContext): void; +} +declare var SKOverlayDelegate: { + + prototype: SKOverlayDelegate; +}; + +declare const enum SKOverlayPosition { + + Bottom = 0, + + BottomRaised = 1 +} + +declare class SKOverlayTransitionContext extends NSObject { + + static alloc(): SKOverlayTransitionContext; // inherited from NSObject + + static new(): SKOverlayTransitionContext; // inherited from NSObject + + readonly endFrame: CGRect; + + readonly startFrame: CGRect; + + addAnimationBlock(block: () => void): void; +} + declare class SKPayment extends NSObject implements NSCopying, NSMutableCopying { static alloc(): SKPayment; // inherited from NSObject @@ -270,6 +391,8 @@ declare class SKPaymentQueue extends NSObject { readonly storefront: SKStorefront; + readonly transactionObservers: NSArray; + readonly transactions: NSArray; addPayment(payment: SKPayment): void; @@ -282,6 +405,8 @@ declare class SKPaymentQueue extends NSObject { pauseDownloads(downloads: NSArray | SKDownload[]): void; + presentCodeRedemptionSheet(): void; + removeTransactionObserver(observer: SKPaymentTransactionObserver): void; restoreCompletedTransactions(): void; @@ -290,12 +415,16 @@ declare class SKPaymentQueue extends NSObject { resumeDownloads(downloads: NSArray | SKDownload[]): void; + showPriceConsentIfNeeded(): void; + startDownloads(downloads: NSArray | SKDownload[]): void; } interface SKPaymentQueueDelegate extends NSObjectProtocol { paymentQueueShouldContinueTransactionInStorefront?(paymentQueue: SKPaymentQueue, transaction: SKPaymentTransaction, newStorefront: SKStorefront): boolean; + + paymentQueueShouldShowPriceConsent?(paymentQueue: SKPaymentQueue): boolean; } declare var SKPaymentQueueDelegate: { @@ -329,6 +458,8 @@ interface SKPaymentTransactionObserver extends NSObjectProtocol { paymentQueueDidChangeStorefront?(queue: SKPaymentQueue): void; + paymentQueueDidRevokeEntitlementsForProductIdentifiers?(queue: SKPaymentQueue, productIdentifiers: NSArray | string[]): void; + paymentQueueRemovedTransactions?(queue: SKPaymentQueue, transactions: NSArray | SKPaymentTransaction[]): void; paymentQueueRestoreCompletedTransactionsFailedWithError?(queue: SKPaymentQueue, error: NSError): void; @@ -377,6 +508,8 @@ declare class SKProduct extends NSObject { readonly isDownloadable: boolean; + readonly isFamilyShareable: boolean; + readonly localizedDescription: string; readonly localizedTitle: string; @@ -561,8 +694,12 @@ declare var SKStoreProductParameterAdNetworkIdentifier: string; declare var SKStoreProductParameterAdNetworkNonce: string; +declare var SKStoreProductParameterAdNetworkSourceAppStoreIdentifier: string; + declare var SKStoreProductParameterAdNetworkTimestamp: string; +declare var SKStoreProductParameterAdNetworkVersion: string; + declare var SKStoreProductParameterAdvertisingPartnerToken: string; declare var SKStoreProductParameterAffiliateToken: string; @@ -602,6 +739,8 @@ declare class SKStoreReviewController extends NSObject { static new(): SKStoreReviewController; // inherited from NSObject static requestReview(): void; + + static requestReviewInScene(windowScene: UIWindowScene): void; } declare class SKStorefront extends NSObject { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!UIKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UIKit.d.ts index a375a00dd..5b82c85e3 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!UIKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UIKit.d.ts @@ -245,10 +245,14 @@ declare class NSCollectionLayoutSection extends NSObject implements NSCopying { static sectionWithGroup(group: NSCollectionLayoutGroup): NSCollectionLayoutSection; + static sectionWithListConfigurationLayoutEnvironment(configuration: UICollectionLayoutListConfiguration, layoutEnvironment: NSCollectionLayoutEnvironment): NSCollectionLayoutSection; + boundarySupplementaryItems: NSArray; contentInsets: NSDirectionalEdgeInsets; + contentInsetsReference: UIContentInsetsReference; + decorationItems: NSArray; interGroupSpacing: number; @@ -402,6 +406,78 @@ declare var NSDefaultAttributesDocumentOption: string; declare var NSDefaultTabIntervalDocumentAttribute: string; +declare class NSDiffableDataSourceSectionSnapshot extends NSObject implements NSCopying { + + static alloc(): NSDiffableDataSourceSectionSnapshot; // inherited from NSObject + + static new(): NSDiffableDataSourceSectionSnapshot; // inherited from NSObject + + readonly items: NSArray; + + readonly rootItems: NSArray; + + readonly visibleItems: NSArray; + + appendItems(items: NSArray | ItemIdentifierType[]): void; + + appendItemsIntoParentItem(items: NSArray | ItemIdentifierType[], parentItem: ItemIdentifierType): void; + + collapseItems(items: NSArray | ItemIdentifierType[]): void; + + containsItem(item: ItemIdentifierType): boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + deleteAllItems(): void; + + deleteItems(items: NSArray | ItemIdentifierType[]): void; + + expandItems(items: NSArray | ItemIdentifierType[]): void; + + expandedItems(): NSArray; + + indexOfItem(item: ItemIdentifierType): number; + + insertItemsAfterItem(items: NSArray | ItemIdentifierType[], afterIdentifier: ItemIdentifierType): void; + + insertItemsBeforeItem(items: NSArray | ItemIdentifierType[], beforeIdentifier: ItemIdentifierType): void; + + insertSnapshotAfterItem(snapshot: NSDiffableDataSourceSectionSnapshot, item: ItemIdentifierType): ItemIdentifierType; + + insertSnapshotBeforeItem(snapshot: NSDiffableDataSourceSectionSnapshot, item: ItemIdentifierType): void; + + isExpanded(item: ItemIdentifierType): boolean; + + isVisible(item: ItemIdentifierType): boolean; + + levelOfItem(item: ItemIdentifierType): number; + + parentOfChildItem(childItem: ItemIdentifierType): ItemIdentifierType; + + replaceChildrenOfParentItemWithSnapshot(parentItem: ItemIdentifierType, snapshot: NSDiffableDataSourceSectionSnapshot): void; + + snapshotOfParentItem(parentItem: ItemIdentifierType): NSDiffableDataSourceSectionSnapshot; + + snapshotOfParentItemIncludingParentItem(parentItem: ItemIdentifierType, includingParentItem: boolean): NSDiffableDataSourceSectionSnapshot; + + visualDescription(): string; +} + +declare class NSDiffableDataSourceSectionTransaction extends NSObject { + + static alloc(): NSDiffableDataSourceSectionTransaction; // inherited from NSObject + + static new(): NSDiffableDataSourceSectionTransaction; // inherited from NSObject + + readonly difference: NSOrderedCollectionDifference; + + readonly finalSnapshot: NSDiffableDataSourceSectionSnapshot; + + readonly initialSnapshot: NSDiffableDataSourceSectionSnapshot; + + readonly sectionIdentifier: SectionIdentifierType; +} + declare class NSDiffableDataSourceSnapshot extends NSObject implements NSCopying { static alloc(): NSDiffableDataSourceSnapshot; // inherited from NSObject @@ -461,6 +537,21 @@ declare class NSDiffableDataSourceSnapshot extends NSObject { + + static alloc(): NSDiffableDataSourceTransaction; // inherited from NSObject + + static new(): NSDiffableDataSourceTransaction; // inherited from NSObject + + readonly difference: NSOrderedCollectionDifference; + + readonly finalSnapshot: NSDiffableDataSourceSnapshot; + + readonly initialSnapshot: NSDiffableDataSourceSnapshot; + + readonly sectionTransactions: NSArray>; +} + interface NSDirectionalEdgeInsets { top: number; leading: number; @@ -515,12 +606,14 @@ declare var NSHyphenationFactorDocumentAttribute: string; declare var NSKernAttributeName: string; -declare class NSLayoutAnchor extends NSObject { +declare class NSLayoutAnchor extends NSObject implements NSCoding, NSCopying { static alloc(): NSLayoutAnchor; // inherited from NSObject static new(): NSLayoutAnchor; // inherited from NSObject + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constraintEqualToAnchor(anchor: NSLayoutAnchor): NSLayoutConstraint; constraintEqualToAnchorConstant(anchor: NSLayoutAnchor, c: number): NSLayoutConstraint; @@ -532,6 +625,12 @@ declare class NSLayoutAnchor extends NSObject { constraintLessThanOrEqualToAnchor(anchor: NSLayoutAnchor): NSLayoutConstraint; constraintLessThanOrEqualToAnchorConstant(anchor: NSLayoutAnchor, c: number): NSLayoutConstraint; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; } declare const enum NSLayoutAttribute { @@ -960,6 +1059,17 @@ declare const enum NSLineBreakMode { ByTruncatingMiddle = 5 } +declare const enum NSLineBreakStrategy { + + None = 0, + + PushOut = 1, + + HangulWordPriority = 2, + + Standard = 65535 +} + declare var NSLinkAttributeName: string; declare class NSMutableParagraphStyle extends NSParagraphStyle { @@ -984,6 +1094,8 @@ declare class NSMutableParagraphStyle extends NSParagraphStyle { lineBreakMode: NSLineBreakMode; + lineBreakStrategy: NSLineBreakStrategy; + lineHeightMultiple: number; lineSpacing: number; @@ -1037,6 +1149,8 @@ declare class NSParagraphStyle extends NSObject implements NSCopying, NSMutableC readonly lineBreakMode: NSLineBreakMode; + readonly lineBreakStrategy: NSLineBreakStrategy; + readonly lineHeightMultiple: number; readonly lineSpacing: number; @@ -1460,6 +1574,8 @@ declare const enum NSTextWritingDirection { Override = 2 } +declare var NSTrackingAttributeName: string; + declare var NSUnderlineByWord: NSUnderlineStyle; declare var NSUnderlineColorAttributeName: string; @@ -1578,6 +1694,10 @@ declare var UIAccessibilityAssistiveTouchStatusDidChangeNotification: string; declare var UIAccessibilityBoldTextStatusDidChangeNotification: string; +declare function UIAccessibilityButtonShapesEnabled(): boolean; + +declare var UIAccessibilityButtonShapesEnabledStatusDidChangeNotification: string; + declare var UIAccessibilityClosedCaptioningStatusDidChangeNotification: string; interface UIAccessibilityContainerDataTable extends NSObjectProtocol { @@ -1653,6 +1773,8 @@ declare class UIAccessibilityCustomAction extends NSObject { attributedName: NSAttributedString; + image: UIImage; + name: string; selector: string; @@ -1661,18 +1783,34 @@ declare class UIAccessibilityCustomAction extends NSObject { constructor(o: { attributedName: NSAttributedString; actionHandler: (p1: UIAccessibilityCustomAction) => boolean; }); + constructor(o: { attributedName: NSAttributedString; image: UIImage; actionHandler: (p1: UIAccessibilityCustomAction) => boolean; }); + + constructor(o: { attributedName: NSAttributedString; image: UIImage; target: any; selector: string; }); + constructor(o: { attributedName: NSAttributedString; target: any; selector: string; }); constructor(o: { name: string; actionHandler: (p1: UIAccessibilityCustomAction) => boolean; }); + constructor(o: { name: string; image: UIImage; actionHandler: (p1: UIAccessibilityCustomAction) => boolean; }); + + constructor(o: { name: string; image: UIImage; target: any; selector: string; }); + constructor(o: { name: string; target: any; selector: string; }); initWithAttributedNameActionHandler(attributedName: NSAttributedString, actionHandler: (p1: UIAccessibilityCustomAction) => boolean): this; + initWithAttributedNameImageActionHandler(attributedName: NSAttributedString, image: UIImage, actionHandler: (p1: UIAccessibilityCustomAction) => boolean): this; + + initWithAttributedNameImageTargetSelector(attributedName: NSAttributedString, image: UIImage, target: any, selector: string): this; + initWithAttributedNameTargetSelector(attributedName: NSAttributedString, target: any, selector: string): this; initWithNameActionHandler(name: string, actionHandler: (p1: UIAccessibilityCustomAction) => boolean): this; + initWithNameImageActionHandler(name: string, image: UIImage, actionHandler: (p1: UIAccessibilityCustomAction) => boolean): this; + + initWithNameImageTargetSelector(name: string, image: UIImage, target: any, selector: string): this; + initWithNameTargetSelector(name: string, target: any, selector: string): this; } @@ -1952,6 +2090,10 @@ declare var UIAccessibilityPauseAssistiveTechnologyNotification: number; declare function UIAccessibilityPostNotification(notification: number, argument: any): void; +declare function UIAccessibilityPrefersCrossFadeTransitions(): boolean; + +declare var UIAccessibilityPrefersCrossFadeTransitionsStatusDidChangeNotification: string; + interface UIAccessibilityReadingContent { accessibilityAttributedContentForLineNumber?(lineNumber: number): NSAttributedString; @@ -2095,6 +2237,8 @@ declare const enum UIAccessibilityZoomType { declare class UIAction extends UIMenuElement { + static actionWithHandler(handler: (p1: UIAction) => void): UIAction; + static actionWithTitleImageIdentifierHandler(title: string, image: UIImage, identifier: string, handler: (p1: UIAction) => void): UIAction; static alloc(): UIAction; // inherited from NSObject @@ -2109,6 +2253,8 @@ declare class UIAction extends UIMenuElement { image: UIImage; + readonly sender: any; + state: UIMenuElementState; title: string; @@ -2519,7 +2665,11 @@ declare class UIActivityViewController extends UIViewController { constructor(o: { activityItems: NSArray | any[]; applicationActivities: NSArray | UIActivity[]; }); + constructor(o: { activityItemsConfiguration: UIActivityItemsConfigurationReading; }); + initWithActivityItemsApplicationActivities(activityItems: NSArray | any[], applicationActivities: NSArray | UIActivity[]): this; + + initWithActivityItemsConfiguration(activityItemsConfiguration: UIActivityItemsConfigurationReading): this; } interface UIAdaptivePresentationControllerDelegate extends NSObjectProtocol { @@ -2545,7 +2695,7 @@ declare var UIAdaptivePresentationControllerDelegate: { prototype: UIAdaptivePresentationControllerDelegate; }; -declare class UIAlertAction extends NSObject implements NSCopying { +declare class UIAlertAction extends NSObject implements NSCopying, UIAccessibilityIdentification { static actionWithTitleStyleHandler(title: string, style: UIAlertActionStyle, handler: (p1: UIAlertAction) => void): UIAlertAction; @@ -2559,7 +2709,43 @@ declare class UIAlertAction extends NSObject implements NSCopying { readonly title: string; + accessibilityIdentifier: string; // inherited from UIAccessibilityIdentification + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare const enum UIAlertActionStyle { @@ -2953,6 +3139,8 @@ interface UIApplicationDelegate extends NSObjectProtocol { applicationHandleWatchKitExtensionRequestReply?(application: UIApplication, userInfo: NSDictionary, reply: (p1: NSDictionary) => void): void; + applicationHandlerForIntent?(application: UIApplication, intent: INIntent): any; + applicationOpenURLOptions?(app: UIApplication, url: NSURL, options: NSDictionary): boolean; applicationOpenURLSourceApplicationAnnotation?(application: UIApplication, url: NSURL, sourceApplication: string, annotation: any): boolean; @@ -3264,6 +3452,78 @@ declare const enum UIAttachmentBehaviorType { Anchor = 1 } +declare const enum UIAxis { + + Neither = 0, + + Horizontal = 1, + + Vertical = 2, + + Both = 3 +} + +declare class UIBackgroundConfiguration extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): UIBackgroundConfiguration; // inherited from NSObject + + static clearConfiguration(): UIBackgroundConfiguration; + + static listAccompaniedSidebarCellConfiguration(): UIBackgroundConfiguration; + + static listGroupedCellConfiguration(): UIBackgroundConfiguration; + + static listGroupedHeaderFooterConfiguration(): UIBackgroundConfiguration; + + static listPlainCellConfiguration(): UIBackgroundConfiguration; + + static listPlainHeaderFooterConfiguration(): UIBackgroundConfiguration; + + static listSidebarCellConfiguration(): UIBackgroundConfiguration; + + static listSidebarHeaderConfiguration(): UIBackgroundConfiguration; + + static new(): UIBackgroundConfiguration; // inherited from NSObject + + backgroundColor: UIColor; + + backgroundColorTransformer: (p1: UIColor) => UIColor; + + backgroundInsets: NSDirectionalEdgeInsets; + + cornerRadius: number; + + customView: UIView; + + edgesAddingLayoutMarginsToBackgroundInsets: NSDirectionalRectEdge; + + strokeColor: UIColor; + + strokeColorTransformer: (p1: UIColor) => UIColor; + + strokeOutset: number; + + strokeWidth: number; + + visualEffect: UIVisualEffect; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + resolvedBackgroundColorForTintColor(tintColor: UIColor): UIColor; + + resolvedStrokeColorForTintColor(tintColor: UIColor): UIColor; + + updatedConfigurationForState(state: UIConfigurationState): this; +} + declare const enum UIBackgroundFetchResult { NewData = 0, @@ -3347,6 +3607,10 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): UIBarButtonItem; // inherited from UIAppearance + static fixedSpaceItemOfWidth(width: number): UIBarButtonItem; + + static flexibleSpaceItem(): UIBarButtonItem; + static new(): UIBarButtonItem; // inherited from NSObject action: string; @@ -3355,8 +3619,12 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa customView: UIView; + menu: UIMenu; + possibleTitles: NSSet; + primaryAction: UIAction; + style: UIBarButtonItemStyle; target: any; @@ -3379,6 +3647,10 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa readonly // inherited from NSObjectProtocol + constructor(o: { barButtonSystemItem: UIBarButtonSystemItem; menu: UIMenu; }); + + constructor(o: { barButtonSystemItem: UIBarButtonSystemItem; primaryAction: UIAction; }); + constructor(o: { barButtonSystemItem: UIBarButtonSystemItem; target: any; action: string; }); constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -3387,8 +3659,14 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa constructor(o: { image: UIImage; landscapeImagePhone: UIImage; style: UIBarButtonItemStyle; target: any; action: string; }); + constructor(o: { image: UIImage; menu: UIMenu; }); + constructor(o: { image: UIImage; style: UIBarButtonItemStyle; target: any; action: string; }); + constructor(o: { primaryAction: UIAction; }); + + constructor(o: { title: string; menu: UIMenu; }); + constructor(o: { title: string; style: UIBarButtonItemStyle; target: any; action: string; }); backButtonBackgroundImageForStateBarMetrics(state: UIControlState, barMetrics: UIBarMetrics): UIImage; @@ -3409,6 +3687,10 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa encodeWithCoder(coder: NSCoder): void; + initWithBarButtonSystemItemMenu(systemItem: UIBarButtonSystemItem, menu: UIMenu): this; + + initWithBarButtonSystemItemPrimaryAction(systemItem: UIBarButtonSystemItem, primaryAction: UIAction): this; + initWithBarButtonSystemItemTargetAction(systemItem: UIBarButtonSystemItem, target: any, action: string): this; initWithCoder(coder: NSCoder): this; @@ -3417,8 +3699,14 @@ declare class UIBarButtonItem extends UIBarItem implements NSCoding, UISpringLoa initWithImageLandscapeImagePhoneStyleTargetAction(image: UIImage, landscapeImagePhone: UIImage, style: UIBarButtonItemStyle, target: any, action: string): this; + initWithImageMenu(image: UIImage, menu: UIMenu): this; + initWithImageStyleTargetAction(image: UIImage, style: UIBarButtonItemStyle, target: any, action: string): this; + initWithPrimaryAction(primaryAction: UIAction): this; + + initWithTitleMenu(title: string, menu: UIMenu): this; + initWithTitleStyleTargetAction(title: string, style: UIBarButtonItemStyle, target: any, action: string): this; isEqual(object: any): boolean; @@ -3895,10 +4183,14 @@ declare class UIButton extends UIControl implements NSCoding, UIAccessibilityCon static buttonWithType(buttonType: UIButtonType): UIButton; + static buttonWithTypePrimaryAction(buttonType: UIButtonType, primaryAction: UIAction): UIButton; + static new(): UIButton; // inherited from NSObject static systemButtonWithImageTargetAction(image: UIImage, target: any, action: string): UIButton; + static systemButtonWithPrimaryAction(primaryAction: UIAction): UIButton; + adjustsImageWhenDisabled: boolean; adjustsImageWhenHighlighted: boolean; @@ -3929,8 +4221,16 @@ declare class UIButton extends UIControl implements NSCoding, UIAccessibilityCon lineBreakMode: NSLineBreakMode; + menu: UIMenu; + + pointerInteractionEnabled: boolean; + + pointerStyleProvider: (p1: UIButton, p2: UIPointerEffect, p3: UIPointerShape) => UIPointerStyle; + reversesTitleShadowWhenHighlighted: boolean; + role: UIButtonRole; + showsTouchWhenHighlighted: boolean; titleEdgeInsets: UIEdgeInsets; @@ -4020,6 +4320,17 @@ declare class UIButton extends UIControl implements NSCoding, UIAccessibilityCon titleShadowColorForState(state: UIControlState): UIColor; } +declare const enum UIButtonRole { + + Normal = 0, + + Primary = 1, + + Cancel = 2, + + Destructive = 3 +} + declare const enum UIButtonType { Custom = 0, @@ -4041,6 +4352,200 @@ declare const enum UIButtonType { RoundedRect = 1 } +declare class UICellAccessory extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): UICellAccessory; // inherited from NSObject + + static new(): UICellAccessory; // inherited from NSObject + + displayedState: UICellAccessoryDisplayedState; + + hidden: boolean; + + reservedLayoutWidth: number; + + tintColor: UIColor; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + +declare class UICellAccessoryCheckmark extends UICellAccessory { + + static alloc(): UICellAccessoryCheckmark; // inherited from NSObject + + static new(): UICellAccessoryCheckmark; // inherited from NSObject +} + +declare class UICellAccessoryCustomView extends UICellAccessory { + + static alloc(): UICellAccessoryCustomView; // inherited from NSObject + + static new(): UICellAccessoryCustomView; // inherited from NSObject + + readonly customView: UIView; + + maintainsFixedSize: boolean; + + readonly placement: UICellAccessoryPlacement; + + position: (p1: NSArray) => number; + + constructor(o: { customView: UIView; placement: UICellAccessoryPlacement; }); + + initWithCustomViewPlacement(customView: UIView, placement: UICellAccessoryPlacement): this; +} + +declare class UICellAccessoryDelete extends UICellAccessory { + + static alloc(): UICellAccessoryDelete; // inherited from NSObject + + static new(): UICellAccessoryDelete; // inherited from NSObject + + actionHandler: () => void; + + backgroundColor: UIColor; +} + +declare class UICellAccessoryDisclosureIndicator extends UICellAccessory { + + static alloc(): UICellAccessoryDisclosureIndicator; // inherited from NSObject + + static new(): UICellAccessoryDisclosureIndicator; // inherited from NSObject +} + +declare const enum UICellAccessoryDisplayedState { + + Always = 0, + + WhenEditing = 1, + + WhenNotEditing = 2 +} + +declare class UICellAccessoryInsert extends UICellAccessory { + + static alloc(): UICellAccessoryInsert; // inherited from NSObject + + static new(): UICellAccessoryInsert; // inherited from NSObject + + actionHandler: () => void; + + backgroundColor: UIColor; +} + +declare class UICellAccessoryLabel extends UICellAccessory { + + static alloc(): UICellAccessoryLabel; // inherited from NSObject + + static new(): UICellAccessoryLabel; // inherited from NSObject + + adjustsFontForContentSizeCategory: boolean; + + font: UIFont; + + readonly text: string; + + constructor(o: { text: string; }); + + initWithText(text: string): this; +} + +declare class UICellAccessoryMultiselect extends UICellAccessory { + + static alloc(): UICellAccessoryMultiselect; // inherited from NSObject + + static new(): UICellAccessoryMultiselect; // inherited from NSObject + + backgroundColor: UIColor; +} + +declare class UICellAccessoryOutlineDisclosure extends UICellAccessory { + + static alloc(): UICellAccessoryOutlineDisclosure; // inherited from NSObject + + static new(): UICellAccessoryOutlineDisclosure; // inherited from NSObject + + actionHandler: () => void; + + style: UICellAccessoryOutlineDisclosureStyle; +} + +declare const enum UICellAccessoryOutlineDisclosureStyle { + + Automatic = 0, + + Header = 1, + + Cell = 2 +} + +declare const enum UICellAccessoryPlacement { + + Leading = 0, + + Trailing = 1 +} + +declare function UICellAccessoryPositionAfterAccessoryOfClass(accessoryClass: typeof NSObject): (p1: NSArray) => number; + +declare function UICellAccessoryPositionBeforeAccessoryOfClass(accessoryClass: typeof NSObject): (p1: NSArray) => number; + +declare class UICellAccessoryReorder extends UICellAccessory { + + static alloc(): UICellAccessoryReorder; // inherited from NSObject + + static new(): UICellAccessoryReorder; // inherited from NSObject + + showsVerticalSeparator: boolean; +} + +declare var UICellAccessoryStandardDimension: number; + +declare const enum UICellConfigurationDragState { + + None = 0, + + Lifting = 1, + + Dragging = 2 +} + +declare const enum UICellConfigurationDropState { + + None = 0, + + NotTargeted = 1, + + Targeted = 2 +} + +declare class UICellConfigurationState extends UIViewConfigurationState { + + static alloc(): UICellConfigurationState; // inherited from NSObject + + static new(): UICellConfigurationState; // inherited from NSObject + + cellDragState: UICellConfigurationDragState; + + cellDropState: UICellConfigurationDropState; + + editing: boolean; + + expanded: boolean; + + reordering: boolean; + + swiped: boolean; +} + declare class UICloudSharingController extends UIViewController { static alloc(): UICloudSharingController; // inherited from NSObject @@ -4109,6 +4614,62 @@ declare var UICollectionElementKindSectionFooter: string; declare var UICollectionElementKindSectionHeader: string; +declare const enum UICollectionLayoutListAppearance { + + Plain = 0, + + Grouped = 1, + + InsetGrouped = 2, + + Sidebar = 3, + + SidebarPlain = 4 +} + +declare class UICollectionLayoutListConfiguration extends NSObject implements NSCopying { + + static alloc(): UICollectionLayoutListConfiguration; // inherited from NSObject + + static new(): UICollectionLayoutListConfiguration; // inherited from NSObject + + readonly appearance: UICollectionLayoutListAppearance; + + backgroundColor: UIColor; + + footerMode: UICollectionLayoutListFooterMode; + + headerMode: UICollectionLayoutListHeaderMode; + + leadingSwipeActionsConfigurationProvider: (p1: NSIndexPath) => UISwipeActionsConfiguration; + + showsSeparators: boolean; + + trailingSwipeActionsConfigurationProvider: (p1: NSIndexPath) => UISwipeActionsConfiguration; + + constructor(o: { appearance: UICollectionLayoutListAppearance; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithAppearance(appearance: UICollectionLayoutListAppearance): this; +} + +declare const enum UICollectionLayoutListFooterMode { + + None = 0, + + Supplementary = 1 +} + +declare const enum UICollectionLayoutListHeaderMode { + + None = 0, + + Supplementary = 1, + + FirstItemInSection = 2 +} + declare const enum UICollectionLayoutSectionOrthogonalScrollingBehavior { None = 0, @@ -4188,8 +4749,12 @@ declare class UICollectionView extends UIScrollView implements UIDataSourceTrans allowsMultipleSelection: boolean; + allowsMultipleSelectionDuringEditing: boolean; + allowsSelection: boolean; + allowsSelectionDuringEditing: boolean; + backgroundView: UIView; collectionViewLayout: UICollectionViewLayout; @@ -4204,6 +4769,8 @@ declare class UICollectionView extends UIScrollView implements UIDataSourceTrans dropDelegate: UICollectionViewDropDelegate; + editing: boolean; + readonly hasActiveDrag: boolean; readonly hasActiveDrop: boolean; @@ -4224,6 +4791,8 @@ declare class UICollectionView extends UIScrollView implements UIDataSourceTrans reorderingCadence: UICollectionViewReorderingCadence; + selectionFollowsFocus: boolean; + readonly visibleCells: NSArray; readonly debugDescription: string; // inherited from NSObjectProtocol @@ -4262,6 +4831,10 @@ declare class UICollectionView extends UIScrollView implements UIDataSourceTrans deleteSections(sections: NSIndexSet): void; + dequeueConfiguredReusableCellWithRegistrationForIndexPathItem(registration: UICollectionViewCellRegistration, indexPath: NSIndexPath, item: any): UICollectionViewCell; + + dequeueConfiguredReusableSupplementaryViewWithRegistrationForIndexPath(registration: UICollectionViewSupplementaryRegistration, indexPath: NSIndexPath): UICollectionReusableView; + dequeueReusableCellWithReuseIdentifierForIndexPath(identifier: string, indexPath: NSIndexPath): UICollectionViewCell; dequeueReusableSupplementaryViewOfKindWithReuseIdentifierForIndexPath(elementKind: string, identifier: string, indexPath: NSIndexPath): UICollectionReusableView; @@ -4369,8 +4942,18 @@ declare class UICollectionViewCell extends UICollectionReusableView { static new(): UICollectionViewCell; // inherited from NSObject + automaticallyUpdatesBackgroundConfiguration: boolean; + + automaticallyUpdatesContentConfiguration: boolean; + + backgroundConfiguration: UIBackgroundConfiguration; + backgroundView: UIView; + readonly configurationState: UICellConfigurationState; + + contentConfiguration: UIContentConfiguration; + readonly contentView: UIView; highlighted: boolean; @@ -4380,6 +4963,10 @@ declare class UICollectionViewCell extends UICollectionReusableView { selectedBackgroundView: UIView; dragStateDidChange(dragState: UICollectionViewCellDragState): void; + + setNeedsUpdateConfiguration(): void; + + updateConfigurationUsingState(state: UICellConfigurationState): void; } declare const enum UICollectionViewCellDragState { @@ -4391,10 +4978,29 @@ declare const enum UICollectionViewCellDragState { Dragging = 2 } +declare class UICollectionViewCellRegistration extends NSObject { + + static alloc(): UICollectionViewCellRegistration; // inherited from NSObject + + static new(): UICollectionViewCellRegistration; // inherited from NSObject + + static registrationWithCellClassConfigurationHandler(cellClass: typeof NSObject, configurationHandler: (p1: UICollectionViewCell, p2: NSIndexPath, p3: any) => void): UICollectionViewCellRegistration; + + static registrationWithCellNibConfigurationHandler(cellNib: UINib, configurationHandler: (p1: UICollectionViewCell, p2: NSIndexPath, p3: any) => void): UICollectionViewCellRegistration; + + readonly cellClass: typeof NSObject; + + readonly cellNib: UINib; + + readonly configurationHandler: (p1: UICollectionViewCell, p2: NSIndexPath, p3: any) => void; +} + declare class UICollectionViewCompositionalLayout extends UICollectionViewLayout { static alloc(): UICollectionViewCompositionalLayout; // inherited from NSObject + static layoutWithListConfiguration(configuration: UICollectionLayoutListConfiguration): UICollectionViewCompositionalLayout; + static new(): UICollectionViewCompositionalLayout; // inherited from NSObject configuration: UICollectionViewCompositionalLayoutConfiguration; @@ -4424,6 +5030,8 @@ declare class UICollectionViewCompositionalLayoutConfiguration extends NSObject boundarySupplementaryItems: NSArray; + contentInsetsReference: UIContentInsetsReference; + interSectionSpacing: number; scrollDirection: UICollectionViewScrollDirection; @@ -4463,6 +5071,8 @@ declare class UICollectionViewController extends UIViewController implements UIC class(): typeof NSObject; + collectionViewCanEditItemAtIndexPath(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; + collectionViewCanFocusItemAtIndexPath(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; collectionViewCanMoveItemAtIndexPath(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; @@ -4527,8 +5137,12 @@ declare class UICollectionViewController extends UIViewController implements UIC collectionViewWillDisplayCellForItemAtIndexPath(collectionView: UICollectionView, cell: UICollectionViewCell, indexPath: NSIndexPath): void; + collectionViewWillDisplayContextMenuWithConfigurationAnimator(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + collectionViewWillDisplaySupplementaryViewForElementKindAtIndexPath(collectionView: UICollectionView, view: UICollectionReusableView, elementKind: string, indexPath: NSIndexPath): void; + collectionViewWillEndContextMenuInteractionWithConfigurationAnimator(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + collectionViewWillPerformPreviewActionForMenuWithConfigurationAnimator(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating): void; conformsToProtocol(aProtocol: any /* Protocol */): boolean; @@ -4624,6 +5238,8 @@ declare var UICollectionViewDataSourcePrefetching: { interface UICollectionViewDelegate extends UIScrollViewDelegate { + collectionViewCanEditItemAtIndexPath?(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; + collectionViewCanFocusItemAtIndexPath?(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; collectionViewCanPerformActionForItemAtIndexPathWithSender?(collectionView: UICollectionView, action: string, indexPath: NSIndexPath, sender: any): boolean; @@ -4676,8 +5292,12 @@ interface UICollectionViewDelegate extends UIScrollViewDelegate { collectionViewWillDisplayCellForItemAtIndexPath?(collectionView: UICollectionView, cell: UICollectionViewCell, indexPath: NSIndexPath): void; + collectionViewWillDisplayContextMenuWithConfigurationAnimator?(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + collectionViewWillDisplaySupplementaryViewForElementKindAtIndexPath?(collectionView: UICollectionView, view: UICollectionReusableView, elementKind: string, indexPath: NSIndexPath): void; + collectionViewWillEndContextMenuInteractionWithConfigurationAnimator?(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + collectionViewWillPerformPreviewActionForMenuWithConfigurationAnimator?(collectionView: UICollectionView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating): void; indexPathForPreferredFocusedViewInCollectionView?(collectionView: UICollectionView): NSIndexPath; @@ -4712,6 +5332,10 @@ declare class UICollectionViewDiffableDataSource(): UICollectionViewDiffableDataSource; // inherited from NSObject + reorderingHandlers: UICollectionViewDiffableDataSourceReorderingHandlers; + + sectionSnapshotHandlers: UICollectionViewDiffableDataSourceSectionSnapshotHandlers; + supplementaryViewProvider: (p1: UICollectionView, p2: string, p3: NSIndexPath) => UICollectionReusableView; readonly debugDescription: string; // inherited from NSObjectProtocol @@ -4732,6 +5356,10 @@ declare class UICollectionViewDiffableDataSource, animatingDifferences: boolean, completion: () => void): void; + applySnapshotToSectionAnimatingDifferences(snapshot: NSDiffableDataSourceSectionSnapshot, sectionIdentifier: SectionIdentifierType, animatingDifferences: boolean): void; + + applySnapshotToSectionAnimatingDifferencesCompletion(snapshot: NSDiffableDataSourceSectionSnapshot, sectionIdentifier: SectionIdentifierType, animatingDifferences: boolean, completion: () => void): void; + class(): typeof NSObject; collectionViewCanMoveItemAtIndexPath(collectionView: UICollectionView, indexPath: NSIndexPath): boolean; @@ -4777,6 +5405,42 @@ declare class UICollectionViewDiffableDataSource; + + snapshotForSection(section: SectionIdentifierType): NSDiffableDataSourceSectionSnapshot; +} + +declare class UICollectionViewDiffableDataSourceReorderingHandlers extends NSObject implements NSCopying { + + static alloc(): UICollectionViewDiffableDataSourceReorderingHandlers; // inherited from NSObject + + static new(): UICollectionViewDiffableDataSourceReorderingHandlers; // inherited from NSObject + + canReorderItemHandler: (p1: ItemType) => boolean; + + didReorderHandler: (p1: NSDiffableDataSourceTransaction) => void; + + willReorderHandler: (p1: NSDiffableDataSourceTransaction) => void; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class UICollectionViewDiffableDataSourceSectionSnapshotHandlers extends NSObject implements NSCopying { + + static alloc(): UICollectionViewDiffableDataSourceSectionSnapshotHandlers; // inherited from NSObject + + static new(): UICollectionViewDiffableDataSourceSectionSnapshotHandlers; // inherited from NSObject + + shouldCollapseItemHandler: (p1: ItemType) => boolean; + + shouldExpandItemHandler: (p1: ItemType) => boolean; + + snapshotForExpandingParentItemHandler: (p1: ItemType, p2: NSDiffableDataSourceSectionSnapshot) => NSDiffableDataSourceSectionSnapshot; + + willCollapseItemHandler: (p1: ItemType) => void; + + willExpandItemHandler: (p1: ItemType) => void; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; } interface UICollectionViewDragDelegate extends NSObjectProtocol { @@ -5172,6 +5836,37 @@ declare class UICollectionViewLayoutInvalidationContext extends NSObject { invalidateSupplementaryElementsOfKindAtIndexPaths(elementKind: string, indexPaths: NSArray | NSIndexPath[]): void; } +declare class UICollectionViewListCell extends UICollectionViewCell { + + static alloc(): UICollectionViewListCell; // inherited from NSObject + + static appearance(): UICollectionViewListCell; // inherited from UIAppearance + + static appearanceForTraitCollection(trait: UITraitCollection): UICollectionViewListCell; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): UICollectionViewListCell; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray | typeof NSObject[]): UICollectionViewListCell; // inherited from UIAppearance + + static appearanceWhenContainedIn(ContainerClass: typeof NSObject): UICollectionViewListCell; // inherited from UIAppearance + + static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): UICollectionViewListCell; // inherited from UIAppearance + + static new(): UICollectionViewListCell; // inherited from NSObject + + accessories: NSArray; + + indentationLevel: number; + + indentationWidth: number; + + indentsAccessories: boolean; + + readonly separatorLayoutGuide: UILayoutGuide; + + defaultContentConfiguration(): UIListContentConfiguration; +} + declare class UICollectionViewPlaceholder extends NSObject { static alloc(): UICollectionViewPlaceholder; // inherited from NSObject @@ -5218,6 +5913,25 @@ declare const enum UICollectionViewScrollPosition { Right = 32 } +declare class UICollectionViewSupplementaryRegistration extends NSObject { + + static alloc(): UICollectionViewSupplementaryRegistration; // inherited from NSObject + + static new(): UICollectionViewSupplementaryRegistration; // inherited from NSObject + + static registrationWithSupplementaryClassElementKindConfigurationHandler(supplementaryClass: typeof NSObject, elementKind: string, configurationHandler: (p1: UICollectionReusableView, p2: string, p3: NSIndexPath) => void): UICollectionViewSupplementaryRegistration; + + static registrationWithSupplementaryNibElementKindConfigurationHandler(supplementaryNib: UINib, elementKind: string, configurationHandler: (p1: UICollectionReusableView, p2: string, p3: NSIndexPath) => void): UICollectionViewSupplementaryRegistration; + + readonly configurationHandler: (p1: UICollectionReusableView, p2: string, p3: NSIndexPath) => void; + + readonly elementKind: string; + + readonly supplementaryClass: typeof NSObject; + + readonly supplementaryNib: UINib; +} + declare class UICollectionViewTransitionLayout extends UICollectionViewLayout { static alloc(): UICollectionViewTransitionLayout; // inherited from NSObject @@ -5350,6 +6064,8 @@ declare class UIColor extends NSObject implements NSCopying, NSItemProviderReadi readonly CIColor: CIColor; + readonly accessibilityName: string; + static readonly blackColor: UIColor; static readonly blueColor: UIColor; @@ -5565,6 +6281,55 @@ declare class UIColor extends NSObject implements NSCopying, NSItemProviderReadi setStroke(): void; } +declare class UIColorPickerViewController extends UIViewController { + + static alloc(): UIColorPickerViewController; // inherited from NSObject + + static new(): UIColorPickerViewController; // inherited from NSObject + + delegate: UIColorPickerViewControllerDelegate; + + selectedColor: UIColor; + + supportsAlpha: boolean; +} + +interface UIColorPickerViewControllerDelegate extends NSObjectProtocol { + + colorPickerViewControllerDidFinish?(viewController: UIColorPickerViewController): void; + + colorPickerViewControllerDidSelectColor?(viewController: UIColorPickerViewController): void; +} +declare var UIColorPickerViewControllerDelegate: { + + prototype: UIColorPickerViewControllerDelegate; +}; + +declare class UIColorWell extends UIControl { + + static alloc(): UIColorWell; // inherited from NSObject + + static appearance(): UIColorWell; // inherited from UIAppearance + + static appearanceForTraitCollection(trait: UITraitCollection): UIColorWell; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): UIColorWell; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray | typeof NSObject[]): UIColorWell; // inherited from UIAppearance + + static appearanceWhenContainedIn(ContainerClass: typeof NSObject): UIColorWell; // inherited from UIAppearance + + static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): UIColorWell; // inherited from UIAppearance + + static new(): UIColorWell; // inherited from NSObject + + selectedColor: UIColor; + + supportsAlpha: boolean; + + title: string; +} + declare class UICommand extends UIMenuElement { static alloc(): UICommand; // inherited from NSObject @@ -5619,6 +6384,42 @@ declare class UICommandAlternate extends NSObject implements NSCopying, NSSecure declare var UICommandTagShare: string; +declare var UIConfigurationColorTransformerGrayscale: (p1: UIColor) => UIColor; + +declare var UIConfigurationColorTransformerMonochromeTint: (p1: UIColor) => UIColor; + +declare var UIConfigurationColorTransformerPreferredTint: (p1: UIColor) => UIColor; + +interface UIConfigurationState extends NSCopying, NSObjectProtocol, NSSecureCoding { + + traitCollection: UITraitCollection; + + customStateForKey(key: string): any; + + initWithTraitCollection?(traitCollection: UITraitCollection): UIConfigurationState; + + objectForKeyedSubscript(key: string): any; + + setCustomStateForKey(customState: any, key: string): void; + + setObjectForKeyedSubscript(obj: any, key: string): void; +} +declare var UIConfigurationState: { + + prototype: UIConfigurationState; +}; + +interface UIContentConfiguration extends NSCopying, NSObjectProtocol { + + makeContentView(): UIView; + + updatedConfigurationForState(state: UIConfigurationState): UIContentConfiguration; +} +declare var UIContentConfiguration: { + + prototype: UIContentConfiguration; +}; + interface UIContentContainer extends NSObjectProtocol { preferredContentSize: CGSize; @@ -5638,6 +6439,19 @@ declare var UIContentContainer: { prototype: UIContentContainer; }; +declare const enum UIContentInsetsReference { + + Automatic = 0, + + None = 1, + + SafeArea = 2, + + LayoutMargins = 3, + + ReadableContent = 4 +} + declare var UIContentSizeCategoryAccessibilityExtraExtraExtraLarge: string; declare var UIContentSizeCategoryAccessibilityExtraExtraLarge: string; @@ -5681,6 +6495,15 @@ declare var UIContentSizeCategorySmall: string; declare var UIContentSizeCategoryUnspecified: string; +interface UIContentView extends NSObjectProtocol { + + configuration: UIContentConfiguration; +} +declare var UIContentView: { + + prototype: UIContentView; +}; + declare class UIContextMenuConfiguration extends NSObject { static alloc(): UIContextMenuConfiguration; // inherited from NSObject @@ -5700,6 +6523,8 @@ declare class UIContextMenuInteraction extends NSObject implements UIInteraction readonly delegate: UIContextMenuInteractionDelegate; + readonly menuAppearance: UIContextMenuInteractionAppearance; + readonly debugDescription: string; // inherited from NSObjectProtocol readonly description: string; // inherited from NSObjectProtocol @@ -5722,6 +6547,8 @@ declare class UIContextMenuInteraction extends NSObject implements UIInteraction didMoveToView(view: UIView): void; + dismissMenu(): void; + initWithDelegate(delegate: UIContextMenuInteractionDelegate): this; isEqual(object: any): boolean; @@ -5744,6 +6571,8 @@ declare class UIContextMenuInteraction extends NSObject implements UIInteraction self(): this; + updateVisibleMenuWithBlock(block: (p1: UIMenu) => UIMenu): void; + willMoveToView(view: UIView): void; } @@ -5760,6 +6589,15 @@ declare var UIContextMenuInteractionAnimating: { prototype: UIContextMenuInteractionAnimating; }; +declare const enum UIContextMenuInteractionAppearance { + + Unknown = 0, + + Rich = 1, + + Compact = 2 +} + interface UIContextMenuInteractionCommitAnimating extends UIContextMenuInteractionAnimating { preferredCommitStyle: UIContextMenuInteractionCommitStyle; @@ -5821,7 +6659,7 @@ declare const enum UIContextualActionStyle { Destructive = 1 } -declare class UIControl extends UIView { +declare class UIControl extends UIView implements UIContextMenuInteractionDelegate { static alloc(): UIControl; // inherited from NSObject @@ -5847,6 +6685,10 @@ declare class UIControl extends UIView { contentVerticalAlignment: UIControlContentVerticalAlignment; + readonly contextMenuInteraction: UIContextMenuInteraction; + + contextMenuInteractionEnabled: boolean; + readonly effectiveContentHorizontalAlignment: UIControlContentHorizontalAlignment; enabled: boolean; @@ -5855,26 +6697,90 @@ declare class UIControl extends UIView { selected: boolean; + showsMenuAsPrimaryAction: boolean; + readonly state: UIControlState; readonly touchInside: boolean; readonly tracking: boolean; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + constructor(o: { frame: CGRect; primaryAction: UIAction; }); + actionsForTargetForControlEvent(target: any, controlEvent: UIControlEvents): NSArray; + addActionForControlEvents(action: UIAction, controlEvents: UIControlEvents): void; + addTargetActionForControlEvents(target: any, action: string, controlEvents: UIControlEvents): void; beginTrackingWithTouchWithEvent(touch: UITouch, event: _UIEvent): boolean; cancelTrackingWithEvent(event: _UIEvent): void; + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + contextMenuInteractionConfigurationForMenuAtLocation(interaction: UIContextMenuInteraction, location: CGPoint): UIContextMenuConfiguration; + + contextMenuInteractionPreviewForDismissingMenuWithConfiguration(interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration): UITargetedPreview; + + contextMenuInteractionPreviewForHighlightingMenuWithConfiguration(interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration): UITargetedPreview; + + contextMenuInteractionWillDisplayMenuForConfigurationAnimator(interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + + contextMenuInteractionWillEndForConfigurationAnimator(interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + + contextMenuInteractionWillPerformPreviewActionForMenuWithConfigurationAnimator(interaction: UIContextMenuInteraction, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating): void; + continueTrackingWithTouchWithEvent(touch: UITouch, event: _UIEvent): boolean; endTrackingWithTouchWithEvent(touch: UITouch, event: _UIEvent): void; + enumerateEventHandlers(iterator: (p1: UIAction, p2: any, p3: string, p4: UIControlEvents, p5: interop.Pointer | interop.Reference) => void): void; + + initWithFramePrimaryAction(frame: CGRect, primaryAction: UIAction): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + menuAttachmentPointForConfiguration(configuration: UIContextMenuConfiguration): CGPoint; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + removeActionForControlEvents(action: UIAction, controlEvents: UIControlEvents): void; + + removeActionForIdentifierForControlEvents(actionIdentifier: string, controlEvents: UIControlEvents): void; + removeTargetActionForControlEvents(target: any, action: string, controlEvents: UIControlEvents): void; + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + sendAction(action: UIAction): void; + sendActionToForEvent(action: string, target: any, event: _UIEvent): void; sendActionsForControlEvents(controlEvents: UIControlEvents): void; @@ -5930,6 +6836,8 @@ declare const enum UIControlEvents { PrimaryActionTriggered = 8192, + MenuActionTriggered = 16384, + EditingDidBegin = 65536, EditingChanged = 131072, @@ -6093,6 +7001,8 @@ declare class UIDatePicker extends UIControl implements NSCoding { datePickerMode: UIDatePickerMode; + readonly datePickerStyle: UIDatePickerStyle; + locale: NSLocale; maximumDate: Date; @@ -6101,7 +7011,7 @@ declare class UIDatePicker extends UIControl implements NSCoding { minuteInterval: number; - preferredDatePickerStyle: number; + preferredDatePickerStyle: UIDatePickerStyle; timeZone: NSTimeZone; @@ -6125,6 +7035,26 @@ declare const enum UIDatePickerMode { CountDownTimer = 3 } +declare const enum UIDatePickerStyle { + + Automatic = 0, + + Wheels = 1, + + Compact = 2, + + Inline = 3 +} + +declare class UIDeferredMenuElement extends UIMenuElement { + + static alloc(): UIDeferredMenuElement; // inherited from NSObject + + static elementWithProvider(elementProvider: (p1: (p1: NSArray) => void) => void): UIDeferredMenuElement; + + static new(): UIDeferredMenuElement; // inherited from NSObject +} + declare class UIDevice extends NSObject { static alloc(): UIDevice; // inherited from NSObject @@ -6520,6 +7450,8 @@ declare class UIDocumentBrowserViewController extends UIViewController implement browserUserInterfaceStyle: UIDocumentBrowserUserInterfaceStyle; + readonly contentTypesForRecentDocuments: NSArray; + customActions: NSArray; defaultDocumentAspectRatio: number; @@ -6532,6 +7464,8 @@ declare class UIDocumentBrowserViewController extends UIViewController implement shouldShowFileExtensions: boolean; + constructor(o: { forOpeningContentTypes: NSArray | UTType[]; }); + constructor(o: { forOpeningFilesWithContentTypes: NSArray | string[]; }); constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -6540,6 +7474,8 @@ declare class UIDocumentBrowserViewController extends UIViewController implement importDocumentAtURLNextToDocumentAtURLModeCompletionHandler(documentURL: NSURL, neighbourURL: NSURL, importMode: UIDocumentBrowserImportMode, completion: (p1: NSURL, p2: NSError) => void): void; + initForOpeningContentTypes(contentTypes: NSArray | UTType[]): this; + initForOpeningFilesWithContentTypes(allowedContentTypes: NSArray | string[]): this; initWithCoder(coder: NSCoder): this; @@ -6797,12 +7733,28 @@ declare class UIDocumentPickerViewController extends UIViewController { shouldShowFileExtensions: boolean; + constructor(o: { forExportingURLs: NSArray | NSURL[]; }); + + constructor(o: { forExportingURLs: NSArray | NSURL[]; asCopy: boolean; }); + + constructor(o: { forOpeningContentTypes: NSArray | UTType[]; }); + + constructor(o: { forOpeningContentTypes: NSArray | UTType[]; asCopy: boolean; }); + constructor(o: { documentTypes: NSArray | string[]; inMode: UIDocumentPickerMode; }); constructor(o: { URL: NSURL; inMode: UIDocumentPickerMode; }); constructor(o: { URLs: NSArray | NSURL[]; inMode: UIDocumentPickerMode; }); + initForExportingURLs(urls: NSArray | NSURL[]): this; + + initForExportingURLsAsCopy(urls: NSArray | NSURL[], asCopy: boolean): this; + + initForOpeningContentTypes(contentTypes: NSArray | UTType[]): this; + + initForOpeningContentTypesAsCopy(contentTypes: NSArray | UTType[], asCopy: boolean): this; + initWithDocumentTypesInMode(allowedUTIs: NSArray | string[], mode: UIDocumentPickerMode): this; initWithURLInMode(url: NSURL, mode: UIDocumentPickerMode): this; @@ -7379,6 +8331,10 @@ declare class _UIEvent extends NSObject { readonly allTouches: NSSet; + readonly buttonMask: UIEventButtonMask; + + readonly modifierFlags: UIKeyModifierFlags; + readonly subtype: UIEventSubtype; readonly timestamp: number; @@ -7396,6 +8352,15 @@ declare class _UIEvent extends NSObject { touchesForWindow(window: UIWindow): NSSet; } +declare const enum UIEventButtonMask { + + Primary = 1, + + Secondary = 2 +} + +declare function UIEventButtonMaskForButtonNumber(buttonNumber: number): UIEventButtonMask; + declare const enum UIEventSubtype { None = 0, @@ -7431,7 +8396,13 @@ declare const enum UIEventType { RemoteControl = 2, - Presses = 3 + Presses = 3, + + Scroll = 10, + + Hover = 11, + + Transform = 14 } declare class UIFeedbackGenerator extends NSObject { @@ -7554,6 +8525,8 @@ declare var UIFocusDidUpdateNotification: string; interface UIFocusEnvironment extends NSObjectProtocol { + focusGroupIdentifier?: string; + focusItemContainer: UIFocusItemContainer; parentFocusEnvironment: UIFocusEnvironment; @@ -8058,6 +9031,8 @@ declare class UIGestureRecognizer extends NSObject { allowedTouchTypes: NSArray; + readonly buttonMask: UIEventButtonMask; + cancelsTouchesInView: boolean; delaysTouchesBegan: boolean; @@ -8068,6 +9043,8 @@ declare class UIGestureRecognizer extends NSObject { enabled: boolean; + readonly modifierFlags: UIKeyModifierFlags; + name: string; readonly numberOfTouches: number; @@ -8116,6 +9093,8 @@ declare class UIGestureRecognizer extends NSObject { shouldBeRequiredToFailByGestureRecognizer(otherGestureRecognizer: UIGestureRecognizer): boolean; + shouldReceiveEvent(event: _UIEvent): boolean; + shouldRequireFailureOfGestureRecognizer(otherGestureRecognizer: UIGestureRecognizer): boolean; touchesBeganWithEvent(touches: NSSet, event: _UIEvent): void; @@ -8135,6 +9114,8 @@ interface UIGestureRecognizerDelegate extends NSObjectProtocol { gestureRecognizerShouldBegin?(gestureRecognizer: UIGestureRecognizer): boolean; + gestureRecognizerShouldReceiveEvent?(gestureRecognizer: UIGestureRecognizer, event: _UIEvent): boolean; + gestureRecognizerShouldReceivePress?(gestureRecognizer: UIGestureRecognizer, press: UIPress): boolean; gestureRecognizerShouldReceiveTouch?(gestureRecognizer: UIGestureRecognizer, touch: UITouch): boolean; @@ -9107,6 +10088,82 @@ declare const enum UIImpactFeedbackStyle { Rigid = 4 } +declare class UIIndirectScribbleInteraction extends NSObject implements UIInteraction { + + static alloc(): UIIndirectScribbleInteraction; // inherited from NSObject + + static new(): UIIndirectScribbleInteraction; // inherited from NSObject + + readonly delegate: UIIndirectScribbleInteractionDelegate; + + readonly handlingWriting: boolean; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly view: UIView; // inherited from UIInteraction + + readonly // inherited from NSObjectProtocol + + constructor(o: { delegate: UIIndirectScribbleInteractionDelegate; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + didMoveToView(view: UIView): void; + + initWithDelegate(delegate: UIIndirectScribbleInteractionDelegate): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + willMoveToView(view: UIView): void; +} + +interface UIIndirectScribbleInteractionDelegate extends NSObjectProtocol { + + indirectScribbleInteractionDidFinishWritingInElement?(interaction: UIIndirectScribbleInteraction, elementIdentifier: any): void; + + indirectScribbleInteractionFocusElementIfNeededReferencePointCompletion(interaction: UIIndirectScribbleInteraction, elementIdentifier: any, focusReferencePoint: CGPoint, completion: (p1: UIResponder) => void): void; + + indirectScribbleInteractionFrameForElement(interaction: UIIndirectScribbleInteraction, elementIdentifier: any): CGRect; + + indirectScribbleInteractionIsElementFocused(interaction: UIIndirectScribbleInteraction, elementIdentifier: any): boolean; + + indirectScribbleInteractionRequestElementsInRectCompletion(interaction: UIIndirectScribbleInteraction, rect: CGRect, completion: (p1: NSArray) => void): void; + + indirectScribbleInteractionShouldDelayFocusForElement?(interaction: UIIndirectScribbleInteraction, elementIdentifier: any): boolean; + + indirectScribbleInteractionWillBeginWritingInElement?(interaction: UIIndirectScribbleInteraction, elementIdentifier: any): void; +} +declare var UIIndirectScribbleInteractionDelegate: { + + prototype: UIIndirectScribbleInteractionDelegate; +}; + declare class UIInputView extends UIView { static alloc(): UIInputView; // inherited from NSObject @@ -9297,6 +10354,29 @@ declare var UIItemProviderPresentationSizeProviding: { prototype: UIItemProviderPresentationSizeProviding; }; +declare class UIKey extends NSObject implements NSCoding, NSCopying { + + static alloc(): UIKey; // inherited from NSObject + + static new(): UIKey; // inherited from NSObject + + readonly characters: string; + + readonly charactersIgnoringModifiers: string; + + readonly keyCode: UIKeyboardHIDUsage; + + readonly modifierFlags: UIKeyModifierFlags; + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; +} + declare class UIKeyCommand extends UICommand { static alloc(): UIKeyCommand; // inherited from NSObject @@ -9335,10 +10415,44 @@ declare var UIKeyInput: { declare var UIKeyInputDownArrow: string; +declare var UIKeyInputEnd: string; + declare var UIKeyInputEscape: string; +declare var UIKeyInputF1: string; + +declare var UIKeyInputF10: string; + +declare var UIKeyInputF11: string; + +declare var UIKeyInputF12: string; + +declare var UIKeyInputF1Var: string; + +declare var UIKeyInputF2: string; + +declare var UIKeyInputF3: string; + +declare var UIKeyInputF4: string; + +declare var UIKeyInputF5: string; + +declare var UIKeyInputF6: string; + +declare var UIKeyInputF7: string; + +declare var UIKeyInputF8: string; + +declare var UIKeyInputF9: string; + +declare var UIKeyInputHome: string; + declare var UIKeyInputLeftArrow: string; +declare var UIKeyInputPageDown: string; + +declare var UIKeyInputPageUp: string; + declare var UIKeyInputRightArrow: string; declare var UIKeyInputUpArrow: string; @@ -9389,6 +10503,369 @@ declare var UIKeyboardFrameBeginUserInfoKey: string; declare var UIKeyboardFrameEndUserInfoKey: string; +declare const enum UIKeyboardHIDUsage { + + KeyboardErrorRollOver = 1, + + KeyboardPOSTFail = 2, + + KeyboardErrorUndefined = 3, + + KeyboardA = 4, + + KeyboardB = 5, + + KeyboardC = 6, + + KeyboardD = 7, + + KeyboardE = 8, + + KeyboardF = 9, + + KeyboardG = 10, + + KeyboardH = 11, + + KeyboardI = 12, + + KeyboardJ = 13, + + KeyboardK = 14, + + KeyboardL = 15, + + KeyboardM = 16, + + KeyboardN = 17, + + KeyboardO = 18, + + KeyboardP = 19, + + KeyboardQ = 20, + + KeyboardR = 21, + + KeyboardS = 22, + + KeyboardT = 23, + + KeyboardU = 24, + + KeyboardV = 25, + + KeyboardW = 26, + + KeyboardX = 27, + + KeyboardY = 28, + + KeyboardZ = 29, + + Keyboard1 = 30, + + Keyboard2 = 31, + + Keyboard3 = 32, + + Keyboard4 = 33, + + Keyboard5 = 34, + + Keyboard6 = 35, + + Keyboard7 = 36, + + Keyboard8 = 37, + + Keyboard9 = 38, + + Keyboard0 = 39, + + KeyboardReturnOrEnter = 40, + + KeyboardEscape = 41, + + KeyboardDeleteOrBackspace = 42, + + KeyboardTab = 43, + + KeyboardSpacebar = 44, + + KeyboardHyphen = 45, + + KeyboardEqualSign = 46, + + KeyboardOpenBracket = 47, + + KeyboardCloseBracket = 48, + + KeyboardBackslash = 49, + + KeyboardNonUSPound = 50, + + KeyboardSemicolon = 51, + + KeyboardQuote = 52, + + KeyboardGraveAccentAndTilde = 53, + + KeyboardComma = 54, + + KeyboardPeriod = 55, + + KeyboardSlash = 56, + + KeyboardCapsLock = 57, + + KeyboardF1 = 58, + + KeyboardF2 = 59, + + KeyboardF3 = 60, + + KeyboardF4 = 61, + + KeyboardF5 = 62, + + KeyboardF6 = 63, + + KeyboardF7 = 64, + + KeyboardF8 = 65, + + KeyboardF9 = 66, + + KeyboardF10 = 67, + + KeyboardF11 = 68, + + KeyboardF12 = 69, + + KeyboardPrintScreen = 70, + + KeyboardScrollLock = 71, + + KeyboardPause = 72, + + KeyboardInsert = 73, + + KeyboardHome = 74, + + KeyboardPageUp = 75, + + KeyboardDeleteForward = 76, + + KeyboardEnd = 77, + + KeyboardPageDown = 78, + + KeyboardRightArrow = 79, + + KeyboardLeftArrow = 80, + + KeyboardDownArrow = 81, + + KeyboardUpArrow = 82, + + KeypadNumLock = 83, + + KeypadSlash = 84, + + KeypadAsterisk = 85, + + KeypadHyphen = 86, + + KeypadPlus = 87, + + KeypadEnter = 88, + + Keypad1 = 89, + + Keypad2 = 90, + + Keypad3 = 91, + + Keypad4 = 92, + + Keypad5 = 93, + + Keypad6 = 94, + + Keypad7 = 95, + + Keypad8 = 96, + + Keypad9 = 97, + + Keypad0 = 98, + + KeypadPeriod = 99, + + KeyboardNonUSBackslash = 100, + + KeyboardApplication = 101, + + KeyboardPower = 102, + + KeypadEqualSign = 103, + + KeyboardF13 = 104, + + KeyboardF14 = 105, + + KeyboardF15 = 106, + + KeyboardF16 = 107, + + KeyboardF17 = 108, + + KeyboardF18 = 109, + + KeyboardF19 = 110, + + KeyboardF20 = 111, + + KeyboardF21 = 112, + + KeyboardF22 = 113, + + KeyboardF23 = 114, + + KeyboardF24 = 115, + + KeyboardExecute = 116, + + KeyboardHelp = 117, + + KeyboardMenu = 118, + + KeyboardSelect = 119, + + KeyboardStop = 120, + + KeyboardAgain = 121, + + KeyboardUndo = 122, + + KeyboardCut = 123, + + KeyboardCopy = 124, + + KeyboardPaste = 125, + + KeyboardFind = 126, + + KeyboardMute = 127, + + KeyboardVolumeUp = 128, + + KeyboardVolumeDown = 129, + + KeyboardLockingCapsLock = 130, + + KeyboardLockingNumLock = 131, + + KeyboardLockingScrollLock = 132, + + KeypadComma = 133, + + KeypadEqualSignAS400 = 134, + + KeyboardInternational1 = 135, + + KeyboardInternational2 = 136, + + KeyboardInternational3 = 137, + + KeyboardInternational4 = 138, + + KeyboardInternational5 = 139, + + KeyboardInternational6 = 140, + + KeyboardInternational7 = 141, + + KeyboardInternational8 = 142, + + KeyboardInternational9 = 143, + + KeyboardLANG1 = 144, + + KeyboardLANG2 = 145, + + KeyboardLANG3 = 146, + + KeyboardLANG4 = 147, + + KeyboardLANG5 = 148, + + KeyboardLANG6 = 149, + + KeyboardLANG7 = 150, + + KeyboardLANG8 = 151, + + KeyboardLANG9 = 152, + + KeyboardAlternateErase = 153, + + KeyboardSysReqOrAttention = 154, + + KeyboardCancel = 155, + + KeyboardClear = 156, + + KeyboardPrior = 157, + + KeyboardReturn = 158, + + KeyboardSeparator = 159, + + KeyboardOut = 160, + + KeyboardOper = 161, + + KeyboardClearOrAgain = 162, + + KeyboardCrSelOrProps = 163, + + KeyboardExSel = 164, + + KeyboardLeftControl = 224, + + KeyboardLeftShift = 225, + + KeyboardLeftAlt = 226, + + KeyboardLeftGUI = 227, + + KeyboardRightControl = 228, + + KeyboardRightShift = 229, + + KeyboardRightAlt = 230, + + KeyboardRightGUI = 231, + + Keyboard_Reserved = 65535, + + KeyboardHangul = 144, + + KeyboardHanja = 145, + + KeyboardKanaSwitch = 144, + + KeyboardAlphanumericSwitch = 145, + + KeyboardKatakana = 146, + + KeyboardHiragana = 147, + + KeyboardZenkakuHankakuKanji = 148 +} + declare var UIKeyboardIsLocalUserInfoKey: string; declare const enum UIKeyboardType { @@ -9464,6 +10941,8 @@ declare class UILabel extends UIView implements NSCoding, UIContentSizeCategoryA lineBreakMode: NSLineBreakMode; + lineBreakStrategy: NSLineBreakStrategy; + minimumFontSize: number; minimumScaleFactor: number; @@ -9749,6 +11228,274 @@ declare const enum UILineBreakMode { MiddleTruncation = 5 } +declare class UIListContentConfiguration extends NSObject implements NSSecureCoding, UIContentConfiguration { + + static accompaniedSidebarCellConfiguration(): UIListContentConfiguration; + + static accompaniedSidebarSubtitleCellConfiguration(): UIListContentConfiguration; + + static alloc(): UIListContentConfiguration; // inherited from NSObject + + static cellConfiguration(): UIListContentConfiguration; + + static groupedFooterConfiguration(): UIListContentConfiguration; + + static groupedHeaderConfiguration(): UIListContentConfiguration; + + static new(): UIListContentConfiguration; // inherited from NSObject + + static plainFooterConfiguration(): UIListContentConfiguration; + + static plainHeaderConfiguration(): UIListContentConfiguration; + + static sidebarCellConfiguration(): UIListContentConfiguration; + + static sidebarHeaderConfiguration(): UIListContentConfiguration; + + static sidebarSubtitleCellConfiguration(): UIListContentConfiguration; + + static subtitleCellConfiguration(): UIListContentConfiguration; + + static valueCellConfiguration(): UIListContentConfiguration; + + attributedText: NSAttributedString; + + axesPreservingSuperviewLayoutMargins: UIAxis; + + directionalLayoutMargins: NSDirectionalEdgeInsets; + + image: UIImage; + + readonly imageProperties: UIListContentImageProperties; + + imageToTextPadding: number; + + prefersSideBySideTextAndSecondaryText: boolean; + + secondaryAttributedText: NSAttributedString; + + secondaryText: string; + + readonly secondaryTextProperties: UIListContentTextProperties; + + text: string; + + readonly textProperties: UIListContentTextProperties; + + textToSecondaryTextHorizontalPadding: number; + + textToSecondaryTextVerticalPadding: number; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + makeContentView(): UIView; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + updatedConfigurationForState(state: UIConfigurationState): this; +} + +declare class UIListContentImageProperties extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): UIListContentImageProperties; // inherited from NSObject + + static new(): UIListContentImageProperties; // inherited from NSObject + + accessibilityIgnoresInvertColors: boolean; + + cornerRadius: number; + + maximumSize: CGSize; + + preferredSymbolConfiguration: UIImageSymbolConfiguration; + + reservedLayoutSize: CGSize; + + tintColor: UIColor; + + tintColorTransformer: (p1: UIColor) => UIColor; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + resolvedTintColorForTintColor(tintColor: UIColor): UIColor; +} + +declare var UIListContentImageStandardDimension: number; + +declare const enum UIListContentTextAlignment { + + Natural = 0, + + Center = 1, + + Justified = 2 +} + +declare class UIListContentTextProperties extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): UIListContentTextProperties; // inherited from NSObject + + static new(): UIListContentTextProperties; // inherited from NSObject + + adjustsFontForContentSizeCategory: boolean; + + adjustsFontSizeToFitWidth: boolean; + + alignment: UIListContentTextAlignment; + + allowsDefaultTighteningForTruncation: boolean; + + color: UIColor; + + colorTransformer: (p1: UIColor) => UIColor; + + font: UIFont; + + lineBreakMode: NSLineBreakMode; + + minimumScaleFactor: number; + + numberOfLines: number; + + transform: UIListContentTextTransform; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + resolvedColor(): UIColor; +} + +declare const enum UIListContentTextTransform { + + None = 0, + + Uppercase = 1, + + Lowercase = 2, + + Capitalized = 3 +} + +declare class UIListContentView extends UIView implements UIContentView { + + static alloc(): UIListContentView; // inherited from NSObject + + static appearance(): UIListContentView; // inherited from UIAppearance + + static appearanceForTraitCollection(trait: UITraitCollection): UIListContentView; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): UIListContentView; // inherited from UIAppearance + + static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray | typeof NSObject[]): UIListContentView; // inherited from UIAppearance + + static appearanceWhenContainedIn(ContainerClass: typeof NSObject): UIListContentView; // inherited from UIAppearance + + static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray | typeof NSObject[]): UIListContentView; // inherited from UIAppearance + + static new(): UIListContentView; // inherited from NSObject + + configuration: UIListContentConfiguration; + + readonly imageLayoutGuide: UILayoutGuide; + + readonly secondaryTextLayoutGuide: UILayoutGuide; + + readonly textLayoutGuide: UILayoutGuide; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + + constructor(o: { configuration: UIListContentConfiguration; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + initWithConfiguration(configuration: UIListContentConfiguration): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; +} + declare class UILocalNotification extends NSObject implements NSCoding, NSCopying { static alloc(): UILocalNotification; // inherited from NSObject @@ -9874,6 +11621,8 @@ declare class UIMenu extends UIMenuElement { static alloc(): UIMenu; // inherited from NSObject + static menuWithChildren(children: NSArray | UIMenuElement[]): UIMenu; + static menuWithTitleChildren(title: string, children: NSArray | UIMenuElement[]): UIMenu; static menuWithTitleImageIdentifierOptionsChildren(title: string, image: UIImage, identifier: string, options: UIMenuOptions, children: NSArray | UIMenuElement[]): UIMenu; @@ -9984,7 +11733,7 @@ declare var UIMenuControllerWillShowMenuNotification: string; declare var UIMenuEdit: string; -declare class UIMenuElement extends NSObject implements NSCopying, NSSecureCoding { +declare class UIMenuElement extends NSObject implements NSCopying, NSSecureCoding, UIAccessibilityIdentification { static alloc(): UIMenuElement; // inherited from NSObject @@ -9994,15 +11743,51 @@ declare class UIMenuElement extends NSObject implements NSCopying, NSSecureCodin readonly title: string; + accessibilityIdentifier: string; // inherited from UIAccessibilityIdentification + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly // inherited from NSObjectProtocol + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + copyWithZone(zone: interop.Pointer | interop.Reference): any; encodeWithCoder(coder: NSCoder): void; initWithCoder(coder: NSCoder): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare const enum UIMenuElementAttributes { @@ -10060,6 +11845,8 @@ declare var UIMenuMinimizeAndZoom: string; declare var UIMenuNewScene: string; +declare var UIMenuOpenRecent: string; + declare const enum UIMenuOptions { DisplayInline = 1, @@ -10497,6 +12284,10 @@ declare class UINavigationItem extends NSObject implements NSCoding { backBarButtonItem: UIBarButtonItem; + backButtonDisplayMode: UINavigationItemBackButtonDisplayMode; + + backButtonTitle: string; + compactAppearance: UINavigationBarAppearance; hidesBackButton: boolean; @@ -10548,6 +12339,15 @@ declare class UINavigationItem extends NSObject implements NSCoding { setRightBarButtonItemsAnimated(items: NSArray | UIBarButtonItem[], animated: boolean): void; } +declare const enum UINavigationItemBackButtonDisplayMode { + + Default = 0, + + Generic = 1, + + Minimal = 2 +} + declare const enum UINavigationItemLargeTitleDisplayMode { Automatic = 0, @@ -10640,6 +12440,10 @@ declare class UIPageControl extends UIControl { static new(): UIPageControl; // inherited from NSObject + allowsContinuousInteraction: boolean; + + backgroundStyle: UIPageControlBackgroundStyle; + currentPage: number; currentPageIndicatorTintColor: UIColor; @@ -10648,15 +12452,41 @@ declare class UIPageControl extends UIControl { hidesForSinglePage: boolean; + readonly interactionState: UIPageControlInteractionState; + numberOfPages: number; pageIndicatorTintColor: UIColor; + preferredIndicatorImage: UIImage; + + indicatorImageForPage(page: number): UIImage; + + setIndicatorImageForPage(image: UIImage, page: number): void; + sizeForNumberOfPages(pageCount: number): CGSize; updateCurrentPageDisplay(): void; } +declare const enum UIPageControlBackgroundStyle { + + Automatic = 0, + + Prominent = 1, + + Minimal = 2 +} + +declare const enum UIPageControlInteractionState { + + None = 0, + + Discrete = 1, + + Continuous = 2 +} + declare class UIPageViewController extends UIViewController { static alloc(): UIPageViewController; // inherited from NSObject @@ -10760,6 +12590,8 @@ declare class UIPanGestureRecognizer extends UIGestureRecognizer { static new(): UIPanGestureRecognizer; // inherited from NSObject + allowedScrollTypesMask: UIScrollTypeMask; + maximumNumberOfTouches: number; minimumNumberOfTouches: number; @@ -10877,6 +12709,14 @@ declare class UIPasteboard extends NSObject { dataForPasteboardTypeInItemSet(pasteboardType: string, itemSet: NSIndexSet): NSArray; + detectPatternsForPatternsCompletionHandler(patterns: NSSet, completionHandler: (p1: NSSet, p2: NSError) => void): void; + + detectPatternsForPatternsInItemSetCompletionHandler(patterns: NSSet, itemSet: NSIndexSet, completionHandler: (p1: NSArray>, p2: NSError) => void): void; + + detectValuesForPatternsCompletionHandler(patterns: NSSet, completionHandler: (p1: NSDictionary, p2: NSError) => void): void; + + detectValuesForPatternsInItemSetCompletionHandler(patterns: NSSet, itemSet: NSIndexSet, completionHandler: (p1: NSArray>, p2: NSError) => void): void; + itemSetWithPasteboardTypes(pasteboardTypes: NSArray | string[]): NSIndexSet; pasteboardTypesForItemSet(itemSet: NSIndexSet): NSArray>; @@ -10906,6 +12746,12 @@ declare var UIPasteboardChangedTypesAddedKey: string; declare var UIPasteboardChangedTypesRemovedKey: string; +declare var UIPasteboardDetectionPatternNumber: string; + +declare var UIPasteboardDetectionPatternProbableWebSearch: string; + +declare var UIPasteboardDetectionPatternProbableWebURL: string; + declare var UIPasteboardNameFind: string; declare var UIPasteboardNameGeneral: string; @@ -10938,6 +12784,8 @@ declare class UIPencilInteraction extends NSObject implements UIInteraction { static readonly preferredTapAction: UIPencilPreferredAction; + static readonly prefersPencilOnlyDrawing: boolean; + readonly debugDescription: string; // inherited from NSObjectProtocol readonly description: string; // inherited from NSObjectProtocol @@ -11169,6 +13017,215 @@ declare class UIPinchGestureRecognizer extends UIGestureRecognizer { readonly velocity: number; } +declare class UIPointerEffect extends NSObject implements NSCopying { + + static alloc(): UIPointerEffect; // inherited from NSObject + + static effectWithPreview(preview: UITargetedPreview): UIPointerEffect; + + static new(): UIPointerEffect; // inherited from NSObject + + readonly preview: UITargetedPreview; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum UIPointerEffectTintMode { + + None = 0, + + Overlay = 1, + + Underlay = 2 +} + +declare class UIPointerHighlightEffect extends UIPointerEffect { + + static alloc(): UIPointerHighlightEffect; // inherited from NSObject + + static effectWithPreview(preview: UITargetedPreview): UIPointerHighlightEffect; // inherited from UIPointerEffect + + static new(): UIPointerHighlightEffect; // inherited from NSObject +} + +declare class UIPointerHoverEffect extends UIPointerEffect { + + static alloc(): UIPointerHoverEffect; // inherited from NSObject + + static effectWithPreview(preview: UITargetedPreview): UIPointerHoverEffect; // inherited from UIPointerEffect + + static new(): UIPointerHoverEffect; // inherited from NSObject + + preferredTintMode: UIPointerEffectTintMode; + + prefersScaledContent: boolean; + + prefersShadow: boolean; +} + +declare class UIPointerInteraction extends NSObject implements UIInteraction { + + static alloc(): UIPointerInteraction; // inherited from NSObject + + static new(): UIPointerInteraction; // inherited from NSObject + + readonly delegate: UIPointerInteractionDelegate; + + enabled: boolean; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly view: UIView; // inherited from UIInteraction + + readonly // inherited from NSObjectProtocol + + constructor(o: { delegate: UIPointerInteractionDelegate; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + didMoveToView(view: UIView): void; + + initWithDelegate(delegate: UIPointerInteractionDelegate): this; + + invalidate(): void; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + willMoveToView(view: UIView): void; +} + +interface UIPointerInteractionAnimating extends NSObjectProtocol { + + addAnimations(animations: () => void): void; + + addCompletion(completion: (p1: boolean) => void): void; +} +declare var UIPointerInteractionAnimating: { + + prototype: UIPointerInteractionAnimating; +}; + +interface UIPointerInteractionDelegate extends NSObjectProtocol { + + pointerInteractionRegionForRequestDefaultRegion?(interaction: UIPointerInteraction, request: UIPointerRegionRequest, defaultRegion: UIPointerRegion): UIPointerRegion; + + pointerInteractionStyleForRegion?(interaction: UIPointerInteraction, region: UIPointerRegion): UIPointerStyle; + + pointerInteractionWillEnterRegionAnimator?(interaction: UIPointerInteraction, region: UIPointerRegion, animator: UIPointerInteractionAnimating): void; + + pointerInteractionWillExitRegionAnimator?(interaction: UIPointerInteraction, region: UIPointerRegion, animator: UIPointerInteractionAnimating): void; +} +declare var UIPointerInteractionDelegate: { + + prototype: UIPointerInteractionDelegate; +}; + +declare class UIPointerLiftEffect extends UIPointerEffect { + + static alloc(): UIPointerLiftEffect; // inherited from NSObject + + static effectWithPreview(preview: UITargetedPreview): UIPointerLiftEffect; // inherited from UIPointerEffect + + static new(): UIPointerLiftEffect; // inherited from NSObject +} + +declare class UIPointerLockState extends NSObject { + + static alloc(): UIPointerLockState; // inherited from NSObject + + static new(): UIPointerLockState; // inherited from NSObject + + readonly locked: boolean; +} + +declare var UIPointerLockStateDidChangeNotification: string; + +declare var UIPointerLockStateSceneUserInfoKey: string; + +declare class UIPointerRegion extends NSObject implements NSCopying { + + static alloc(): UIPointerRegion; // inherited from NSObject + + static new(): UIPointerRegion; // inherited from NSObject + + static regionWithRectIdentifier(rect: CGRect, identifier: NSObjectProtocol): UIPointerRegion; + + readonly identifier: NSObjectProtocol; + + readonly rect: CGRect; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class UIPointerRegionRequest extends NSObject { + + static alloc(): UIPointerRegionRequest; // inherited from NSObject + + static new(): UIPointerRegionRequest; // inherited from NSObject + + readonly location: CGPoint; + + readonly modifiers: UIKeyModifierFlags; +} + +declare class UIPointerShape extends NSObject implements NSCopying { + + static alloc(): UIPointerShape; // inherited from NSObject + + static beamWithPreferredLengthAxis(length: number, axis: UIAxis): UIPointerShape; + + static new(): UIPointerShape; // inherited from NSObject + + static shapeWithPath(path: UIBezierPath): UIPointerShape; + + static shapeWithRoundedRect(rect: CGRect): UIPointerShape; + + static shapeWithRoundedRectCornerRadius(rect: CGRect, cornerRadius: number): UIPointerShape; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class UIPointerStyle extends NSObject implements NSCopying { + + static alloc(): UIPointerStyle; // inherited from NSObject + + static hiddenPointerStyle(): UIPointerStyle; + + static new(): UIPointerStyle; // inherited from NSObject + + static styleWithEffectShape(effect: UIPointerEffect, shape: UIPointerShape): UIPointerStyle; + + static styleWithShapeConstrainedAxes(shape: UIPointerShape, axes: UIAxis): UIPointerStyle; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare const enum UIPopoverArrowDirection { Up = 1, @@ -11399,6 +13456,8 @@ declare class UIPresentationController extends NSObject implements UIAppearanceC readonly description: string; // inherited from NSObjectProtocol + readonly focusGroupIdentifier: string; // inherited from UIFocusEnvironment + readonly focusItemContainer: UIFocusItemContainer; // inherited from UIFocusEnvironment readonly hash: number; // inherited from NSObjectProtocol @@ -11490,6 +13549,8 @@ declare class UIPress extends NSObject { readonly gestureRecognizers: NSArray; + readonly key: UIKey; + readonly phase: UIPressPhase; readonly responder: UIResponder; @@ -11528,7 +13589,11 @@ declare const enum UIPressType { Menu = 5, - PlayPause = 6 + PlayPause = 6, + + PageUp = 30, + + PageDown = 31 } declare class UIPressesEvent extends _UIEvent { @@ -11698,6 +13763,8 @@ declare class UIPreviewParameters extends NSObject implements NSCopying { backgroundColor: UIColor; + shadowPath: UIBezierPath; + visiblePath: UIBezierPath; constructor(o: { textLineRects: NSArray | NSValue[]; }); @@ -12509,6 +14576,8 @@ declare class UIScene extends UIResponder { delegate: UISceneDelegate; + readonly pointerLockState: UIPointerLockState; + readonly session: UISceneSession; title: string; @@ -12888,6 +14957,94 @@ declare var UIScreenshotServiceDelegate: { prototype: UIScreenshotServiceDelegate; }; +declare class UIScribbleInteraction extends NSObject implements UIInteraction { + + static alloc(): UIScribbleInteraction; // inherited from NSObject + + static new(): UIScribbleInteraction; // inherited from NSObject + + readonly delegate: UIScribbleInteractionDelegate; + + readonly handlingWriting: boolean; + + static readonly pencilInputExpected: boolean; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly view: UIView; // inherited from UIInteraction + + readonly // inherited from NSObjectProtocol + + constructor(o: { delegate: UIScribbleInteractionDelegate; }); + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + didMoveToView(view: UIView): void; + + initWithDelegate(delegate: UIScribbleInteractionDelegate): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + willMoveToView(view: UIView): void; +} + +interface UIScribbleInteractionDelegate extends NSObjectProtocol { + + scribbleInteractionDidFinishWriting?(interaction: UIScribbleInteraction): void; + + scribbleInteractionShouldBeginAtLocation?(interaction: UIScribbleInteraction, location: CGPoint): boolean; + + scribbleInteractionShouldDelayFocus?(interaction: UIScribbleInteraction): boolean; + + scribbleInteractionWillBeginWriting?(interaction: UIScribbleInteraction): void; +} +declare var UIScribbleInteractionDelegate: { + + prototype: UIScribbleInteractionDelegate; +}; + +declare const enum UIScrollType { + + Discrete = 0, + + Continuous = 1 +} + +declare const enum UIScrollTypeMask { + + Discrete = 1, + + Continuous = 2, + + All = 3 +} + declare class UIScrollView extends UIView implements NSCoding, UIFocusItemScrollableContainer { static alloc(): UIScrollView; // inherited from NSObject @@ -13643,8 +15800,12 @@ declare class UISegmentedControl extends UIControl implements NSCoding, UISpring constructor(o: { coder: NSCoder; }); // inherited from NSCoding + constructor(o: { frame: CGRect; actions: NSArray | UIAction[]; }); + constructor(o: { items: NSArray | any[]; }); + actionForSegmentAtIndex(segment: number): UIAction; + backgroundImageForStateBarMetrics(state: UIControlState, barMetrics: UIBarMetrics): UIImage; class(): typeof NSObject; @@ -13663,8 +15824,12 @@ declare class UISegmentedControl extends UIControl implements NSCoding, UISpring initWithCoder(coder: NSCoder): this; + initWithFrameActions(frame: CGRect, actions: NSArray | UIAction[]): this; + initWithItems(items: NSArray | any[]): this; + insertSegmentWithActionAtIndexAnimated(action: UIAction, segment: number, animated: boolean): void; + insertSegmentWithImageAtIndexAnimated(image: UIImage, segment: number, animated: boolean): void; insertSegmentWithTitleAtIndexAnimated(title: string, segment: number, animated: boolean): void; @@ -13691,8 +15856,12 @@ declare class UISegmentedControl extends UIControl implements NSCoding, UISpring retainCount(): number; + segmentIndexForActionIdentifier(actionIdentifier: string): number; + self(): this; + setActionForSegmentAtIndex(action: UIAction, segment: number): void; + setBackgroundImageForStateBarMetrics(backgroundImage: UIImage, state: UIControlState, barMetrics: UIBarMetrics): void; setContentOffsetForSegmentAtIndex(offset: CGSize, segment: number): void; @@ -13893,12 +16062,24 @@ declare class UISplitViewController extends UIViewController { maximumPrimaryColumnWidth: number; + maximumSupplementaryColumnWidth: number; + minimumPrimaryColumnWidth: number; + minimumSupplementaryColumnWidth: number; + preferredDisplayMode: UISplitViewControllerDisplayMode; + preferredPrimaryColumnWidth: number; + preferredPrimaryColumnWidthFraction: number; + preferredSplitBehavior: UISplitViewControllerSplitBehavior; + + preferredSupplementaryColumnWidth: number; + + preferredSupplementaryColumnWidthFraction: number; + presentsWithGesture: boolean; primaryBackgroundStyle: UISplitViewControllerBackgroundStyle; @@ -13907,7 +16088,27 @@ declare class UISplitViewController extends UIViewController { primaryEdge: UISplitViewControllerPrimaryEdge; + showsSecondaryOnlyButton: boolean; + + readonly splitBehavior: UISplitViewControllerSplitBehavior; + + readonly style: UISplitViewControllerStyle; + + readonly supplementaryColumnWidth: number; + viewControllers: NSArray; + + constructor(o: { style: UISplitViewControllerStyle; }); + + hideColumn(column: UISplitViewControllerColumn): void; + + initWithStyle(style: UISplitViewControllerStyle): this; + + setViewControllerForColumn(vc: UIViewController, column: UISplitViewControllerColumn): void; + + showColumn(column: UISplitViewControllerColumn): void; + + viewControllerForColumn(column: UISplitViewControllerColumn): UIViewController; } declare var UISplitViewControllerAutomaticDimension: number; @@ -13919,6 +16120,17 @@ declare const enum UISplitViewControllerBackgroundStyle { Sidebar = 1 } +declare const enum UISplitViewControllerColumn { + + Primary = 0, + + Supplementary = 1, + + Secondary = 2, + + Compact = 3 +} + interface UISplitViewControllerDelegate { primaryViewControllerForCollapsingSplitViewController?(splitViewController: UISplitViewController): UIViewController; @@ -13927,6 +16139,16 @@ interface UISplitViewControllerDelegate { splitViewControllerCollapseSecondaryViewControllerOntoPrimaryViewController?(splitViewController: UISplitViewController, secondaryViewController: UIViewController, primaryViewController: UIViewController): boolean; + splitViewControllerDidCollapse?(svc: UISplitViewController): void; + + splitViewControllerDidExpand?(svc: UISplitViewController): void; + + splitViewControllerDisplayModeForExpandingToProposedDisplayMode?(svc: UISplitViewController, proposedDisplayMode: UISplitViewControllerDisplayMode): UISplitViewControllerDisplayMode; + + splitViewControllerInteractivePresentationGestureDidEnd?(svc: UISplitViewController): void; + + splitViewControllerInteractivePresentationGestureWillBegin?(svc: UISplitViewController): void; + splitViewControllerPopoverControllerWillPresentViewController?(svc: UISplitViewController, pc: UIPopoverController, aViewController: UIViewController): void; splitViewControllerPreferredInterfaceOrientationForPresentation?(splitViewController: UISplitViewController): UIInterfaceOrientation; @@ -13941,10 +16163,16 @@ interface UISplitViewControllerDelegate { splitViewControllerSupportedInterfaceOrientations?(splitViewController: UISplitViewController): UIInterfaceOrientationMask; + splitViewControllerTopColumnForCollapsingToProposedTopColumn?(svc: UISplitViewController, proposedTopColumn: UISplitViewControllerColumn): UISplitViewControllerColumn; + splitViewControllerWillChangeToDisplayMode?(svc: UISplitViewController, displayMode: UISplitViewControllerDisplayMode): void; + splitViewControllerWillHideColumn?(svc: UISplitViewController, column: UISplitViewControllerColumn): void; + splitViewControllerWillHideViewControllerWithBarButtonItemForPopoverController?(svc: UISplitViewController, aViewController: UIViewController, barButtonItem: UIBarButtonItem, pc: UIPopoverController): void; + splitViewControllerWillShowColumn?(svc: UISplitViewController, column: UISplitViewControllerColumn): void; + splitViewControllerWillShowViewControllerInvalidatingBarButtonItem?(svc: UISplitViewController, aViewController: UIViewController, barButtonItem: UIBarButtonItem): void; targetDisplayModeForActionInSplitViewController?(svc: UISplitViewController): UISplitViewControllerDisplayMode; @@ -13958,6 +16186,18 @@ declare const enum UISplitViewControllerDisplayMode { Automatic = 0, + SecondaryOnly = 1, + + OneBesideSecondary = 2, + + OneOverSecondary = 3, + + TwoBesideSecondary = 4, + + TwoOverSecondary = 5, + + TwoDisplaceSecondary = 6, + PrimaryHidden = 1, AllVisible = 2, @@ -13972,6 +16212,26 @@ declare const enum UISplitViewControllerPrimaryEdge { Trailing = 1 } +declare const enum UISplitViewControllerSplitBehavior { + + Automatic = 0, + + Tile = 1, + + Overlay = 2, + + Displace = 3 +} + +declare const enum UISplitViewControllerStyle { + + Unspecified = 0, + + DoubleColumn = 1, + + TripleColumn = 2 +} + declare class UISpringLoadedInteraction extends NSObject implements UIInteraction { static alloc(): UISpringLoadedInteraction; // inherited from NSObject @@ -14430,8 +16690,14 @@ declare class UISwitch extends UIControl implements NSCoding { onTintColor: UIColor; + preferredStyle: UISwitchStyle; + + readonly style: UISwitchStyle; + thumbTintColor: UIColor; + title: string; + constructor(o: { coder: NSCoder; }); // inherited from NSCoding encodeWithCoder(coder: NSCoder): void; @@ -14441,6 +16707,15 @@ declare class UISwitch extends UIControl implements NSCoding { setOnAnimated(on: boolean, animated: boolean): void; } +declare const enum UISwitchStyle { + + Automatic = 0, + + Checkbox = 1, + + Sliding = 2 +} + declare const enum UISystemAnimation { Delete = 0 @@ -14945,6 +17220,8 @@ declare class UITableView extends UIScrollView implements NSCoding, UIDataSource sectionIndexTrackingBackgroundColor: UIColor; + selectionFollowsFocus: boolean; + separatorColor: UIColor; separatorEffect: UIVisualEffect; @@ -15118,8 +17395,18 @@ declare class UITableViewCell extends UIView implements NSCoding, UIGestureRecog accessoryView: UIView; + automaticallyUpdatesBackgroundConfiguration: boolean; + + automaticallyUpdatesContentConfiguration: boolean; + + backgroundConfiguration: UIBackgroundConfiguration; + backgroundView: UIView; + readonly configurationState: UICellConfigurationState; + + contentConfiguration: UIContentConfiguration; + readonly contentView: UIView; readonly detailTextLabel: UILabel; @@ -15208,6 +17495,8 @@ declare class UITableViewCell extends UIView implements NSCoding, UIGestureRecog conformsToProtocol(aProtocol: any /* Protocol */): boolean; + defaultContentConfiguration(): UIListContentConfiguration; + didTransitionToState(state: UITableViewCellStateMask): void; dragStateDidChange(dragState: UITableViewCellDragState): void; @@ -15218,6 +17507,8 @@ declare class UITableViewCell extends UIView implements NSCoding, UIGestureRecog gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer): boolean; + gestureRecognizerShouldReceiveEvent(gestureRecognizer: UIGestureRecognizer, event: _UIEvent): boolean; + gestureRecognizerShouldReceivePress(gestureRecognizer: UIGestureRecognizer, press: UIPress): boolean; gestureRecognizerShouldReceiveTouch(gestureRecognizer: UIGestureRecognizer, touch: UITouch): boolean; @@ -15256,8 +17547,12 @@ declare class UITableViewCell extends UIView implements NSCoding, UIGestureRecog setHighlightedAnimated(highlighted: boolean, animated: boolean): void; + setNeedsUpdateConfiguration(): void; + setSelectedAnimated(selected: boolean, animated: boolean): void; + updateConfigurationUsingState(state: UICellConfigurationState): void; + willTransitionToState(state: UITableViewCellStateMask): void; } @@ -15525,10 +17820,14 @@ declare class UITableViewController extends UIViewController implements UITableV tableViewWillDisplayCellForRowAtIndexPath(tableView: UITableView, cell: UITableViewCell, indexPath: NSIndexPath): void; + tableViewWillDisplayContextMenuWithConfigurationAnimator(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + tableViewWillDisplayFooterViewForSection(tableView: UITableView, view: UIView, section: number): void; tableViewWillDisplayHeaderViewForSection(tableView: UITableView, view: UIView, section: number): void; + tableViewWillEndContextMenuInteractionWithConfigurationAnimator(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + tableViewWillPerformPreviewActionForMenuWithConfigurationAnimator(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating): void; tableViewWillSelectRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): NSIndexPath; @@ -15666,10 +17965,14 @@ interface UITableViewDelegate extends NSObjectProtocol, UIScrollViewDelegate { tableViewWillDisplayCellForRowAtIndexPath?(tableView: UITableView, cell: UITableViewCell, indexPath: NSIndexPath): void; + tableViewWillDisplayContextMenuWithConfigurationAnimator?(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + tableViewWillDisplayFooterViewForSection?(tableView: UITableView, view: UIView, section: number): void; tableViewWillDisplayHeaderViewForSection?(tableView: UITableView, view: UIView, section: number): void; + tableViewWillEndContextMenuInteractionWithConfigurationAnimator?(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionAnimating): void; + tableViewWillPerformPreviewActionForMenuWithConfigurationAnimator?(tableView: UITableView, configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating): void; tableViewWillSelectRowAtIndexPath?(tableView: UITableView, indexPath: NSIndexPath): NSIndexPath; @@ -15911,8 +18214,18 @@ declare class UITableViewHeaderFooterView extends UIView { static new(): UITableViewHeaderFooterView; // inherited from NSObject + automaticallyUpdatesBackgroundConfiguration: boolean; + + automaticallyUpdatesContentConfiguration: boolean; + + backgroundConfiguration: UIBackgroundConfiguration; + backgroundView: UIView; + readonly configurationState: UIViewConfigurationState; + + contentConfiguration: UIContentConfiguration; + readonly contentView: UIView; readonly detailTextLabel: UILabel; @@ -15923,9 +18236,15 @@ declare class UITableViewHeaderFooterView extends UIView { constructor(o: { reuseIdentifier: string; }); + defaultContentConfiguration(): UIListContentConfiguration; + initWithReuseIdentifier(reuseIdentifier: string): this; prepareForReuse(): void; + + setNeedsUpdateConfiguration(): void; + + updateConfigurationUsingState(state: UIViewConfigurationState): void; } declare var UITableViewIndexSearch: string; @@ -16025,6 +18344,8 @@ declare class UITapGestureRecognizer extends UIGestureRecognizer { static new(): UITapGestureRecognizer; // inherited from NSObject + buttonMaskRequired: UIEventButtonMask; + numberOfTapsRequired: number; numberOfTouchesRequired: number; @@ -17804,7 +20125,13 @@ declare const enum UITouchPhase { Ended = 3, - Cancelled = 4 + Cancelled = 4, + + RegionEntered = 5, + + RegionMoved = 6, + + RegionExited = 7 } declare const enum UITouchProperties { @@ -17826,7 +20153,9 @@ declare const enum UITouchType { Pencil = 2, - Stylus = 2 + Stylus = 2, + + IndirectPointer = 3 } declare var UITrackingRunLoopMode: string; @@ -17839,6 +20168,8 @@ declare class UITraitCollection extends NSObject implements NSCopying, NSSecureC static traitCollectionWithAccessibilityContrast(accessibilityContrast: UIAccessibilityContrast): UITraitCollection; + static traitCollectionWithActiveAppearance(userInterfaceActiveAppearance: UIUserInterfaceActiveAppearance): UITraitCollection; + static traitCollectionWithDisplayGamut(displayGamut: UIDisplayGamut): UITraitCollection; static traitCollectionWithDisplayScale(scale: number): UITraitCollection; @@ -17865,6 +20196,8 @@ declare class UITraitCollection extends NSObject implements NSCopying, NSSecureC readonly accessibilityContrast: UIAccessibilityContrast; + readonly activeAppearance: UIUserInterfaceActiveAppearance; + readonly displayGamut: UIDisplayGamut; readonly displayScale: number; @@ -17945,6 +20278,15 @@ declare var UIUserActivityRestoring: { prototype: UIUserActivityRestoring; }; +declare const enum UIUserInterfaceActiveAppearance { + + Unspecified = -1, + + Inactive = 0, + + Active = 1 +} + declare const enum UIUserInterfaceIdiom { Unspecified = -1, @@ -17955,7 +20297,9 @@ declare const enum UIUserInterfaceIdiom { TV = 2, - CarPlay = 3 + CarPlay = 3, + + Mac = 5 } declare const enum UIUserInterfaceLayoutDirection { @@ -18284,6 +20628,8 @@ declare class UIView extends UIResponder implements CALayerDelegate, NSCoding, U readonly firstBaselineAnchor: NSLayoutYAxisAnchor; + focusGroupIdentifier: string; + readonly focused: boolean; frame: CGRect; @@ -18775,6 +21121,79 @@ declare const enum UIViewAutoresizing { FlexibleBottomMargin = 32 } +declare class UIViewConfigurationState extends NSObject implements UIConfigurationState { + + static alloc(): UIViewConfigurationState; // inherited from NSObject + + static new(): UIViewConfigurationState; // inherited from NSObject + + disabled: boolean; + + focused: boolean; + + highlighted: boolean; + + selected: boolean; + + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + traitCollection: UITraitCollection; // inherited from UIConfigurationState + + readonly // inherited from NSObjectProtocol + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { traitCollection: UITraitCollection; }); // inherited from UIConfigurationState + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + customStateForKey(key: string): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithTraitCollection(traitCollection: UITraitCollection): this; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + objectForKeyedSubscript(key: string): any; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + + setCustomStateForKey(customState: any, key: string): void; + + setObjectForKeyedSubscript(obj: any, key: string): void; +} + declare const enum UIViewContentMode { ScaleToFill = 0, @@ -18828,6 +21247,8 @@ declare class UIViewController extends UIResponder implements NSCoding, NSExtens readonly childViewControllerForHomeIndicatorAutoHidden: UIViewController; + readonly childViewControllerForPointerLock: UIViewController; + readonly childViewControllerForScreenEdgesDeferringSystemGestures: UIViewController; readonly childViewControllerForStatusBarHidden: UIViewController; @@ -18906,6 +21327,8 @@ declare class UIViewController extends UIResponder implements NSCoding, NSExtens readonly prefersHomeIndicatorAutoHidden: boolean; + readonly prefersPointerLocked: boolean; + readonly prefersStatusBarHidden: boolean; readonly presentationController: UIPresentationController; @@ -18970,6 +21393,8 @@ declare class UIViewController extends UIResponder implements NSCoding, NSExtens readonly description: string; // inherited from NSObjectProtocol + readonly focusGroupIdentifier: string; // inherited from UIFocusEnvironment + readonly focusItemContainer: UIFocusItemContainer; // inherited from UIFocusEnvironment readonly hash: number; // inherited from NSObjectProtocol @@ -19110,6 +21535,8 @@ declare class UIViewController extends UIResponder implements NSCoding, NSExtens setNeedsUpdateOfHomeIndicatorAutoHidden(): void; + setNeedsUpdateOfPrefersPointerLocked(): void; + setNeedsUpdateOfScreenEdgesDeferringSystemGestures(): void; setOverrideTraitCollectionForChildViewController(collection: UITraitCollection, childViewController: UIViewController): void; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!UniformTypeIdentifiers.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UniformTypeIdentifiers.d.ts new file mode 100644 index 000000000..cddfd978a --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UniformTypeIdentifiers.d.ts @@ -0,0 +1,331 @@ + +declare var UTTagClassFilenameExtension: string; + +declare var UTTagClassMIMEType: string; + +declare class UTType extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): UTType; // inherited from NSObject + + static exportedTypeWithIdentifier(identifier: string): UTType; + + static exportedTypeWithIdentifierConformingToType(identifier: string, parentType: UTType): UTType; + + static importedTypeWithIdentifier(identifier: string): UTType; + + static importedTypeWithIdentifierConformingToType(identifier: string, parentType: UTType): UTType; + + static new(): UTType; // inherited from NSObject + + static typeWithFilenameExtension(filenameExtension: string): UTType; + + static typeWithFilenameExtensionConformingToType(filenameExtension: string, supertype: UTType): UTType; + + static typeWithIdentifier(identifier: string): UTType; + + static typeWithMIMEType(mimeType: string): UTType; + + static typeWithMIMETypeConformingToType(mimeType: string, supertype: UTType): UTType; + + static typeWithTagTagClassConformingToType(tag: string, tagClass: string, supertype: UTType): UTType; + + static typesWithTagTagClassConformingToType(tag: string, tagClass: string, supertype: UTType): NSArray; + + readonly declared: boolean; + + readonly dynamic: boolean; + + readonly identifier: string; + + readonly localizedDescription: string; + + readonly preferredFilenameExtension: string; + + readonly preferredMIMEType: string; + + readonly publicType: boolean; + + readonly referenceURL: NSURL; + + readonly supertypes: NSSet; + + readonly tags: NSDictionary>; + + readonly version: number; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + conformsToType(type: UTType): boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + isSubtypeOfType(type: UTType): boolean; + + isSupertypeOfType(type: UTType): boolean; +} + +declare var UTType3DContent: UTType; + +declare var UTTypeAIFF: UTType; + +declare var UTTypeARReferenceObject: UTType; + +declare var UTTypeAVI: UTType; + +declare var UTTypeAliasFile: UTType; + +declare var UTTypeAppleArchive: UTType; + +declare var UTTypeAppleProtectedMPEG4Audio: UTType; + +declare var UTTypeAppleProtectedMPEG4Video: UTType; + +declare var UTTypeAppleScript: UTType; + +declare var UTTypeApplication: UTType; + +declare var UTTypeApplicationBundle: UTType; + +declare var UTTypeApplicationExtension: UTType; + +declare var UTTypeArchive: UTType; + +declare var UTTypeAssemblyLanguageSource: UTType; + +declare var UTTypeAudio: UTType; + +declare var UTTypeAudiovisualContent: UTType; + +declare var UTTypeBMP: UTType; + +declare var UTTypeBZ2: UTType; + +declare var UTTypeBinaryPropertyList: UTType; + +declare var UTTypeBookmark: UTType; + +declare var UTTypeBundle: UTType; + +declare var UTTypeCHeader: UTType; + +declare var UTTypeCPlusPlusHeader: UTType; + +declare var UTTypeCPlusPlusSource: UTType; + +declare var UTTypeCSource: UTType; + +declare var UTTypeCalendarEvent: UTType; + +declare var UTTypeCommaSeparatedText: UTType; + +declare var UTTypeCompositeContent: UTType; + +declare var UTTypeContact: UTType; + +declare var UTTypeContent: UTType; + +declare var UTTypeData: UTType; + +declare var UTTypeDatabase: UTType; + +declare var UTTypeDelimitedText: UTType; + +declare var UTTypeDirectory: UTType; + +declare var UTTypeDiskImage: UTType; + +declare var UTTypeEPUB: UTType; + +declare var UTTypeEXE: UTType; + +declare var UTTypeEmailMessage: UTType; + +declare var UTTypeExecutable: UTType; + +declare var UTTypeFileURL: UTType; + +declare var UTTypeFlatRTFD: UTType; + +declare var UTTypeFolder: UTType; + +declare var UTTypeFont: UTType; + +declare var UTTypeFramework: UTType; + +declare var UTTypeGIF: UTType; + +declare var UTTypeGZIP: UTType; + +declare var UTTypeHEIC: UTType; + +declare var UTTypeHEIF: UTType; + +declare var UTTypeHTML: UTType; + +declare var UTTypeICNS: UTType; + +declare var UTTypeICO: UTType; + +declare var UTTypeImage: UTType; + +declare var UTTypeInternetLocation: UTType; + +declare var UTTypeInternetShortcut: UTType; + +declare var UTTypeItem: UTType; + +declare var UTTypeJPEG: UTType; + +declare var UTTypeJSON: UTType; + +declare var UTTypeJavaScript: UTType; + +declare var UTTypeLivePhoto: UTType; + +declare var UTTypeLog: UTType; + +declare var UTTypeM3UPlaylist: UTType; + +declare var UTTypeMIDI: UTType; + +declare var UTTypeMP3: UTType; + +declare var UTTypeMPEG: UTType; + +declare var UTTypeMPEG2TransportStream: UTType; + +declare var UTTypeMPEG2Video: UTType; + +declare var UTTypeMPEG4Audio: UTType; + +declare var UTTypeMPEG4Movie: UTType; + +declare var UTTypeMessage: UTType; + +declare var UTTypeMountPoint: UTType; + +declare var UTTypeMovie: UTType; + +declare var UTTypeOSAScript: UTType; + +declare var UTTypeOSAScriptBundle: UTType; + +declare var UTTypeObjectiveCPlusPlusSource: UTType; + +declare var UTTypeObjectiveCSource: UTType; + +declare var UTTypePDF: UTType; + +declare var UTTypePHPScript: UTType; + +declare var UTTypePKCS12: UTType; + +declare var UTTypePNG: UTType; + +declare var UTTypePackage: UTType; + +declare var UTTypePerlScript: UTType; + +declare var UTTypePlainText: UTType; + +declare var UTTypePlaylist: UTType; + +declare var UTTypePluginBundle: UTType; + +declare var UTTypePresentation: UTType; + +declare var UTTypePropertyList: UTType; + +declare var UTTypePythonScript: UTType; + +declare var UTTypeQuickLookGenerator: UTType; + +declare var UTTypeQuickTimeMovie: UTType; + +declare var UTTypeRAWImage: UTType; + +declare var UTTypeRTF: UTType; + +declare var UTTypeRTFD: UTType; + +declare var UTTypeRealityFile: UTType; + +declare var UTTypeResolvable: UTType; + +declare var UTTypeRubyScript: UTType; + +declare var UTTypeSVG: UTType; + +declare var UTTypeSceneKitScene: UTType; + +declare var UTTypeScript: UTType; + +declare var UTTypeShellScript: UTType; + +declare var UTTypeSourceCode: UTType; + +declare var UTTypeSpotlightImporter: UTType; + +declare var UTTypeSpreadsheet: UTType; + +declare var UTTypeSwiftSource: UTType; + +declare var UTTypeSymbolicLink: UTType; + +declare var UTTypeSystemPreferencesPane: UTType; + +declare var UTTypeTIFF: UTType; + +declare var UTTypeTabSeparatedText: UTType; + +declare var UTTypeText: UTType; + +declare var UTTypeToDoItem: UTType; + +declare var UTTypeURL: UTType; + +declare var UTTypeURLBookmarkData: UTType; + +declare var UTTypeUSD: UTType; + +declare var UTTypeUSDZ: UTType; + +declare var UTTypeUTF16ExternalPlainText: UTType; + +declare var UTTypeUTF16PlainText: UTType; + +declare var UTTypeUTF8PlainText: UTType; + +declare var UTTypeUTF8TabSeparatedText: UTType; + +declare var UTTypeUnixExecutable: UTType; + +declare var UTTypeVCard: UTType; + +declare var UTTypeVideo: UTType; + +declare var UTTypeVolume: UTType; + +declare var UTTypeWAV: UTType; + +declare var UTTypeWebArchive: UTType; + +declare var UTTypeWebP: UTType; + +declare var UTTypeX509Certificate: UTType; + +declare var UTTypeXML: UTType; + +declare var UTTypeXMLPropertyList: UTType; + +declare var UTTypeXPCService: UTType; + +declare var UTTypeYAML: UTType; + +declare var UTTypeZIP: UTType; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!UserNotifications.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UserNotifications.d.ts index 28b9bac14..0871c63a2 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!UserNotifications.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!UserNotifications.d.ts @@ -37,7 +37,9 @@ declare const enum UNAuthorizationStatus { Authorized = 2, - Provisional = 3 + Provisional = 3, + + Ephemeral = 4 } declare class UNCalendarNotificationTrigger extends UNNotificationTrigger { @@ -317,7 +319,11 @@ declare const enum UNNotificationPresentationOptions { Sound = 2, - Alert = 4 + Alert = 4, + + List = 8, + + Banner = 16 } declare class UNNotificationRequest extends NSObject implements NSCopying, NSSecureCoding { diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoSubscriberAccount.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoSubscriberAccount.d.ts index 2dd26a55a..bc459b2cb 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoSubscriberAccount.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoSubscriberAccount.d.ts @@ -126,7 +126,9 @@ declare const enum VSErrorCode { InvalidVerificationToken = 5, - Rejected = 6 + Rejected = 6, + + Unsupported = 7 } declare var VSErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoToolbox.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoToolbox.d.ts index 28f816c5e..27a9a63d1 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoToolbox.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!VideoToolbox.d.ts @@ -177,6 +177,8 @@ declare var kVTCompressionPropertyKey_GammaLevel: string; declare var kVTCompressionPropertyKey_H264EntropyMode: string; +declare var kVTCompressionPropertyKey_HDRMetadataInsertionMode: string; + declare var kVTCompressionPropertyKey_ICCProfile: string; declare var kVTCompressionPropertyKey_MasteringDisplayColorVolume: string; @@ -205,6 +207,10 @@ declare var kVTCompressionPropertyKey_PixelBufferPoolIsShared: string; declare var kVTCompressionPropertyKey_PixelTransferProperties: string; +declare var kVTCompressionPropertyKey_PreserveDynamicHDRMetadata: string; + +declare var kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality: string; + declare var kVTCompressionPropertyKey_ProfileLevel: string; declare var kVTCompressionPropertyKey_ProgressiveScan: string; @@ -261,6 +267,8 @@ declare var kVTDecompressionPropertyKey_PixelFormatsWithReducedResolutionSupport declare var kVTDecompressionPropertyKey_PixelTransferProperties: string; +declare var kVTDecompressionPropertyKey_PropagatePerFrameHDRDisplayMetadata: string; + declare var kVTDecompressionPropertyKey_RealTime: string; declare var kVTDecompressionPropertyKey_ReducedCoefficientDecode: string; @@ -323,6 +331,10 @@ declare var kVTH264EntropyMode_CABAC: string; declare var kVTH264EntropyMode_CAVLC: string; +declare var kVTHDRMetadataInsertionMode_Auto: string; + +declare var kVTHDRMetadataInsertionMode_None: string; + declare const kVTImageRotationNotSupportedErr: number; declare const kVTInsufficientSourceColorDataErr: number; @@ -495,6 +507,8 @@ declare var kVTScalingMode_Normal: string; declare var kVTScalingMode_Trim: string; +declare const kVTSessionMalfunctionErr: number; + declare const kVTUnlimitedFrameDelayCount: number; declare const kVTVideoDecoderAuthorizationErr: number; @@ -503,6 +517,8 @@ declare const kVTVideoDecoderBadDataErr: number; declare const kVTVideoDecoderMalfunctionErr: number; +declare const kVTVideoDecoderNeedsRosettaErr: number; + declare const kVTVideoDecoderNotAvailableNowErr: number; declare const kVTVideoDecoderRemovedErr: number; @@ -537,8 +553,12 @@ declare var kVTVideoEncoderList_QualityRating: string; declare var kVTVideoEncoderList_SupportedSelectionProperties: string; +declare var kVTVideoEncoderList_SupportsFrameReordering: string; + declare const kVTVideoEncoderMalfunctionErr: number; +declare const kVTVideoEncoderNeedsRosettaErr: number; + declare const kVTVideoEncoderNotAvailableNowErr: number; declare var kVTVideoEncoderSpecification_EncoderID: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Vision.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Vision.d.ts index acbeecbd6..e9bf9bd34 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!Vision.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!Vision.d.ts @@ -1,8 +1,4 @@ -declare var VNAnimalDetectorCat: string; - -declare var VNAnimalDetectorDog: string; - declare var VNAnimalIdentifierCat: string; declare var VNAnimalIdentifierDog: string; @@ -60,6 +56,93 @@ declare var VNBarcodeSymbologyQR: string; declare var VNBarcodeSymbologyUPCE: string; +declare var VNBodyLandmarkKeyLeftAnkle: string; + +declare var VNBodyLandmarkKeyLeftEar: string; + +declare var VNBodyLandmarkKeyLeftElbow: string; + +declare var VNBodyLandmarkKeyLeftEye: string; + +declare var VNBodyLandmarkKeyLeftHip: string; + +declare var VNBodyLandmarkKeyLeftKnee: string; + +declare var VNBodyLandmarkKeyLeftShoulder: string; + +declare var VNBodyLandmarkKeyLeftWrist: string; + +declare var VNBodyLandmarkKeyNeck: string; + +declare var VNBodyLandmarkKeyNose: string; + +declare var VNBodyLandmarkKeyRightAnkle: string; + +declare var VNBodyLandmarkKeyRightEar: string; + +declare var VNBodyLandmarkKeyRightElbow: string; + +declare var VNBodyLandmarkKeyRightEye: string; + +declare var VNBodyLandmarkKeyRightHip: string; + +declare var VNBodyLandmarkKeyRightKnee: string; + +declare var VNBodyLandmarkKeyRightShoulder: string; + +declare var VNBodyLandmarkKeyRightWrist: string; + +declare var VNBodyLandmarkKeyRoot: string; + +declare var VNBodyLandmarkRegionKeyFace: string; + +declare var VNBodyLandmarkRegionKeyLeftArm: string; + +declare var VNBodyLandmarkRegionKeyLeftLeg: string; + +declare var VNBodyLandmarkRegionKeyRightArm: string; + +declare var VNBodyLandmarkRegionKeyRightLeg: string; + +declare var VNBodyLandmarkRegionKeyTorso: string; + +declare class VNCircle extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): VNCircle; // inherited from NSObject + + static new(): VNCircle; // inherited from NSObject + + readonly center: VNPoint; + + readonly diameter: number; + + readonly radius: number; + + static readonly zeroCircle: VNCircle; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { center: VNPoint; diameter: number; }); + + constructor(o: { center: VNPoint; radius: number; }); + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + containsPoint(point: VNPoint): boolean; + + containsPointInCircumferentialRingOfWidth(point: VNPoint, ringWidth: number): boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCenterDiameter(center: VNPoint, diameter: number): this; + + initWithCenterRadius(center: VNPoint, radius: number): this; + + initWithCoder(coder: NSCoder): this; +} + declare class VNClassificationObservation extends VNObservation { static alloc(): VNClassificationObservation; // inherited from NSObject @@ -86,6 +169,54 @@ declare class VNClassifyImageRequest extends VNImageBasedRequest { declare var VNClassifyImageRequestRevision1: number; +declare class VNContour extends NSObject implements NSCopying, VNRequestRevisionProviding { + + static alloc(): VNContour; // inherited from NSObject + + static new(): VNContour; // inherited from NSObject + + readonly aspectRatio: number; + + readonly childContourCount: number; + + readonly childContours: NSArray; + + readonly indexPath: NSIndexPath; + + readonly normalizedPath: any; + + readonly normalizedPoints: interop.Pointer | interop.Reference>; + + readonly pointCount: number; + + readonly requestRevision: number; // inherited from VNRequestRevisionProviding + + childContourAtIndexError(childContourIndex: number): VNContour; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + polygonApproximationWithEpsilonError(epsilon: number): VNContour; +} + +declare class VNContoursObservation extends VNObservation { + + static alloc(): VNContoursObservation; // inherited from NSObject + + static new(): VNContoursObservation; // inherited from NSObject + + readonly contourCount: number; + + readonly normalizedPath: any; + + readonly topLevelContourCount: number; + + readonly topLevelContours: NSArray; + + contourAtIndexError(contourIndex: number): VNContour; + + contourAtIndexPathError(indexPath: NSIndexPath): VNContour; +} + declare class VNCoreMLFeatureValueObservation extends VNObservation { static alloc(): VNCoreMLFeatureValueObservation; // inherited from NSObject @@ -144,6 +275,23 @@ declare class VNDetectBarcodesRequest extends VNImageBasedRequest { declare var VNDetectBarcodesRequestRevision1: number; +declare var VNDetectContourRequestRevision1: number; + +declare class VNDetectContoursRequest extends VNImageBasedRequest { + + static alloc(): VNDetectContoursRequest; // inherited from NSObject + + static new(): VNDetectContoursRequest; // inherited from NSObject + + contrastAdjustment: number; + + detectDarkOnLight: boolean; + + detectsDarkOnLight: boolean; + + maximumImageDimension: number; +} + declare class VNDetectFaceCaptureQualityRequest extends VNImageBasedRequest implements VNFaceObservationAccepting { static alloc(): VNDetectFaceCaptureQualityRequest; // inherited from NSObject @@ -189,6 +337,8 @@ declare class VNDetectFaceCaptureQualityRequest extends VNImageBasedRequest impl declare var VNDetectFaceCaptureQualityRequestRevision1: number; +declare var VNDetectFaceCaptureQualityRequestRevision2: number; + declare class VNDetectFaceLandmarksRequest extends VNImageBasedRequest implements VNFaceObservationAccepting { static alloc(): VNDetectFaceLandmarksRequest; // inherited from NSObject @@ -262,6 +412,50 @@ declare class VNDetectHorizonRequest extends VNImageBasedRequest { declare var VNDetectHorizonRequestRevision1: number; +declare class VNDetectHumanBodyPoseRequest extends VNImageBasedRequest { + + static alloc(): VNDetectHumanBodyPoseRequest; // inherited from NSObject + + static new(): VNDetectHumanBodyPoseRequest; // inherited from NSObject + + static supportedIdentifiedPointGroupKeysForRevisionError(revision: number): NSArray; + + static supportedIdentifiedPointKeysForRevisionError(revision: number): NSArray; + + static supportedJointNamesForRevisionError(revision: number): NSArray; + + static supportedJointsGroupNamesForRevisionError(revision: number): NSArray; + + static supportedRecognizedPointGroupKeysForRevisionError(revision: number): NSArray; + + static supportedRecognizedPointKeysForRevisionError(revision: number): NSArray; +} + +declare var VNDetectHumanBodyPoseRequestRevision1: number; + +declare class VNDetectHumanHandPoseRequest extends VNImageBasedRequest { + + static alloc(): VNDetectHumanHandPoseRequest; // inherited from NSObject + + static new(): VNDetectHumanHandPoseRequest; // inherited from NSObject + + static supportedIdentifiedPointGroupKeysForRevisionError(revision: number): NSArray; + + static supportedIdentifiedPointKeysForRevisionError(revision: number): NSArray; + + static supportedJointNamesForRevisionError(revision: number): NSArray; + + static supportedJointsGroupNamesForRevisionError(revision: number): NSArray; + + static supportedRecognizedPointGroupKeysForRevisionError(revision: number): NSArray; + + static supportedRecognizedPointKeysForRevisionError(revision: number): NSArray; + + maximumHandCount: number; +} + +declare var VNDetectHumanHandPoseRequestRevision1: number; + declare class VNDetectHumanRectanglesRequest extends VNImageBasedRequest { static alloc(): VNDetectHumanRectanglesRequest; // inherited from NSObject @@ -303,6 +497,29 @@ declare class VNDetectTextRectanglesRequest extends VNImageBasedRequest { declare var VNDetectTextRectanglesRequestRevision1: number; +declare class VNDetectTrajectoriesRequest extends VNStatefulRequest { + + static alloc(): VNDetectTrajectoriesRequest; // inherited from NSObject + + static new(): VNDetectTrajectoriesRequest; // inherited from NSObject + + maximumObjectSize: number; + + minimumObjectSize: number; + + objectMaximumNormalizedRadius: number; + + objectMinimumNormalizedRadius: number; + + readonly trajectoryLength: number; + + constructor(o: { frameAnalysisSpacing: CMTime; trajectoryLength: number; completionHandler: (p1: VNRequest, p2: NSError) => void; }); + + initWithFrameAnalysisSpacingTrajectoryLengthCompletionHandler(frameAnalysisSpacing: CMTime, trajectoryLength: number, completionHandler: (p1: VNRequest, p2: NSError) => void): this; +} + +declare var VNDetectTrajectoriesRequestRevision1: number; + declare class VNDetectedObjectObservation extends VNObservation { static alloc(): VNDetectedObjectObservation; // inherited from NSObject @@ -316,6 +533,15 @@ declare class VNDetectedObjectObservation extends VNObservation { readonly boundingBox: CGRect; } +declare class VNDetectedPoint extends VNPoint { + + static alloc(): VNDetectedPoint; // inherited from NSObject + + static new(): VNDetectedPoint; // inherited from NSObject + + readonly confidence: number; +} + declare const enum VNElementType { Unknown = 0, @@ -363,7 +589,9 @@ declare const enum VNErrorCode { UnsupportedRevision = 16, - DataUnavailable = 17 + DataUnavailable = 17, + + TimeStampNotFound = 18 } declare var VNErrorDomain: string; @@ -530,6 +758,99 @@ declare class VNGenerateObjectnessBasedSaliencyImageRequest extends VNImageBased declare var VNGenerateObjectnessBasedSaliencyImageRequestRevision1: number; +declare class VNGenerateOpticalFlowRequest extends VNTargetedImageRequest { + + static alloc(): VNGenerateOpticalFlowRequest; // inherited from NSObject + + static new(): VNGenerateOpticalFlowRequest; // inherited from NSObject + + computationAccuracy: VNGenerateOpticalFlowRequestComputationAccuracy; + + outputPixelFormat: number; +} + +declare const enum VNGenerateOpticalFlowRequestComputationAccuracy { + + Low = 0, + + Medium = 1, + + High = 2, + + VeryHigh = 3 +} + +declare var VNGenerateOpticalFlowRequestRevision1: number; + +declare class VNGeometryUtils extends NSObject { + + static alloc(): VNGeometryUtils; // inherited from NSObject + + static boundingCircleForContourError(contour: VNContour): VNCircle; + + static boundingCircleForPointsError(points: NSArray | VNPoint[]): VNCircle; + + static boundingCircleForSIMDPointsPointCountError(points: interop.Pointer | interop.Reference>, pointCount: number): VNCircle; + + static calculateAreaForContourOrientedAreaError(area: interop.Pointer | interop.Reference, contour: VNContour, orientedArea: boolean): boolean; + + static calculatePerimeterForContourError(perimeter: interop.Pointer | interop.Reference, contour: VNContour): boolean; + + static new(): VNGeometryUtils; // inherited from NSObject +} + +declare var VNHandLandmarkKeyIndexDIP: string; + +declare var VNHandLandmarkKeyIndexMCP: string; + +declare var VNHandLandmarkKeyIndexPIP: string; + +declare var VNHandLandmarkKeyIndexTIP: string; + +declare var VNHandLandmarkKeyLittleDIP: string; + +declare var VNHandLandmarkKeyLittleMCP: string; + +declare var VNHandLandmarkKeyLittlePIP: string; + +declare var VNHandLandmarkKeyLittleTIP: string; + +declare var VNHandLandmarkKeyMiddleDIP: string; + +declare var VNHandLandmarkKeyMiddleMCP: string; + +declare var VNHandLandmarkKeyMiddlePIP: string; + +declare var VNHandLandmarkKeyMiddleTIP: string; + +declare var VNHandLandmarkKeyRingDIP: string; + +declare var VNHandLandmarkKeyRingMCP: string; + +declare var VNHandLandmarkKeyRingPIP: string; + +declare var VNHandLandmarkKeyRingTIP: string; + +declare var VNHandLandmarkKeyThumbCMC: string; + +declare var VNHandLandmarkKeyThumbIP: string; + +declare var VNHandLandmarkKeyThumbMP: string; + +declare var VNHandLandmarkKeyThumbTIP: string; + +declare var VNHandLandmarkKeyWrist: string; + +declare var VNHandLandmarkRegionKeyIndexFinger: string; + +declare var VNHandLandmarkRegionKeyLittleFinger: string; + +declare var VNHandLandmarkRegionKeyMiddleFinger: string; + +declare var VNHandLandmarkRegionKeyRingFinger: string; + +declare var VNHandLandmarkRegionKeyThumb: string; + declare class VNHomographicImageRegistrationRequest extends VNImageRegistrationRequest { static alloc(): VNHomographicImageRegistrationRequest; // inherited from NSObject @@ -550,6 +871,142 @@ declare class VNHorizonObservation extends VNObservation { readonly transform: CGAffineTransform; } +declare class VNHumanBodyPoseObservation extends VNRecognizedPointsObservation { + + static alloc(): VNHumanBodyPoseObservation; // inherited from NSObject + + static new(): VNHumanBodyPoseObservation; // inherited from NSObject + + readonly availableJointNames: NSArray; + + readonly availableJointsGroupNames: NSArray; + + recognizedPointForJointNameError(jointName: string): VNRecognizedPoint; + + recognizedPointsForJointsGroupNameError(jointsGroupName: string): NSDictionary; +} + +declare var VNHumanBodyPoseObservationJointNameLeftAnkle: string; + +declare var VNHumanBodyPoseObservationJointNameLeftEar: string; + +declare var VNHumanBodyPoseObservationJointNameLeftElbow: string; + +declare var VNHumanBodyPoseObservationJointNameLeftEye: string; + +declare var VNHumanBodyPoseObservationJointNameLeftHip: string; + +declare var VNHumanBodyPoseObservationJointNameLeftKnee: string; + +declare var VNHumanBodyPoseObservationJointNameLeftShoulder: string; + +declare var VNHumanBodyPoseObservationJointNameLeftWrist: string; + +declare var VNHumanBodyPoseObservationJointNameNeck: string; + +declare var VNHumanBodyPoseObservationJointNameNose: string; + +declare var VNHumanBodyPoseObservationJointNameRightAnkle: string; + +declare var VNHumanBodyPoseObservationJointNameRightEar: string; + +declare var VNHumanBodyPoseObservationJointNameRightElbow: string; + +declare var VNHumanBodyPoseObservationJointNameRightEye: string; + +declare var VNHumanBodyPoseObservationJointNameRightHip: string; + +declare var VNHumanBodyPoseObservationJointNameRightKnee: string; + +declare var VNHumanBodyPoseObservationJointNameRightShoulder: string; + +declare var VNHumanBodyPoseObservationJointNameRightWrist: string; + +declare var VNHumanBodyPoseObservationJointNameRoot: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameAll: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameFace: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameLeftArm: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameLeftLeg: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameRightArm: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameRightLeg: string; + +declare var VNHumanBodyPoseObservationJointsGroupNameTorso: string; + +declare class VNHumanHandPoseObservation extends VNRecognizedPointsObservation { + + static alloc(): VNHumanHandPoseObservation; // inherited from NSObject + + static new(): VNHumanHandPoseObservation; // inherited from NSObject + + readonly availableJointNames: NSArray; + + readonly availableJointsGroupNames: NSArray; + + recognizedPointForJointNameError(jointName: string): VNRecognizedPoint; + + recognizedPointsForJointsGroupNameError(jointsGroupName: string): NSDictionary; +} + +declare var VNHumanHandPoseObservationJointNameIndexDIP: string; + +declare var VNHumanHandPoseObservationJointNameIndexMCP: string; + +declare var VNHumanHandPoseObservationJointNameIndexPIP: string; + +declare var VNHumanHandPoseObservationJointNameIndexTip: string; + +declare var VNHumanHandPoseObservationJointNameLittleDIP: string; + +declare var VNHumanHandPoseObservationJointNameLittleMCP: string; + +declare var VNHumanHandPoseObservationJointNameLittlePIP: string; + +declare var VNHumanHandPoseObservationJointNameLittleTip: string; + +declare var VNHumanHandPoseObservationJointNameMiddleDIP: string; + +declare var VNHumanHandPoseObservationJointNameMiddleMCP: string; + +declare var VNHumanHandPoseObservationJointNameMiddlePIP: string; + +declare var VNHumanHandPoseObservationJointNameMiddleTip: string; + +declare var VNHumanHandPoseObservationJointNameRingDIP: string; + +declare var VNHumanHandPoseObservationJointNameRingMCP: string; + +declare var VNHumanHandPoseObservationJointNameRingPIP: string; + +declare var VNHumanHandPoseObservationJointNameRingTip: string; + +declare var VNHumanHandPoseObservationJointNameThumbCMC: string; + +declare var VNHumanHandPoseObservationJointNameThumbIP: string; + +declare var VNHumanHandPoseObservationJointNameThumbMP: string; + +declare var VNHumanHandPoseObservationJointNameThumbTip: string; + +declare var VNHumanHandPoseObservationJointNameWrist: string; + +declare var VNHumanHandPoseObservationJointsGroupNameAll: string; + +declare var VNHumanHandPoseObservationJointsGroupNameIndexFinger: string; + +declare var VNHumanHandPoseObservationJointsGroupNameLittleFinger: string; + +declare var VNHumanHandPoseObservationJointsGroupNameMiddleFinger: string; + +declare var VNHumanHandPoseObservationJointsGroupNameRingFinger: string; + +declare var VNHumanHandPoseObservationJointsGroupNameThumb: string; + declare class VNImageAlignmentObservation extends VNObservation { static alloc(): VNImageAlignmentObservation; // inherited from NSObject @@ -617,6 +1074,10 @@ declare class VNImageRequestHandler extends NSObject { constructor(o: { CIImage: CIImage; orientation: CGImagePropertyOrientation; options: NSDictionary; }); + constructor(o: { CMSampleBuffer: any; options: NSDictionary; }); + + constructor(o: { CMSampleBuffer: any; orientation: CGImagePropertyOrientation; options: NSDictionary; }); + constructor(o: { CVPixelBuffer: any; options: NSDictionary; }); constructor(o: { CVPixelBuffer: any; orientation: CGImagePropertyOrientation; options: NSDictionary; }); @@ -637,6 +1098,10 @@ declare class VNImageRequestHandler extends NSObject { initWithCIImageOrientationOptions(image: CIImage, orientation: CGImagePropertyOrientation, options: NSDictionary): this; + initWithCMSampleBufferOptions(sampleBuffer: any, options: NSDictionary): this; + + initWithCMSampleBufferOrientationOptions(sampleBuffer: any, orientation: CGImagePropertyOrientation, options: NSDictionary): this; + initWithCVPixelBufferOptions(pixelBuffer: any, options: NSDictionary): this; initWithCVPixelBufferOrientationOptions(pixelBuffer: any, orientation: CGImagePropertyOrientation, options: NSDictionary): this; @@ -665,6 +1130,8 @@ declare function VNNormalizedFaceBoundingBoxPointForLandmarkPoint(faceLandmarkPo declare var VNNormalizedIdentityRect: CGRect; +declare function VNNormalizedPointForImagePoint(imagePoint: CGPoint, imageWidth: number, imageHeight: number): CGPoint; + declare function VNNormalizedRectForImageRect(imageRect: CGRect, imageWidth: number, imageHeight: number): CGRect; declare function VNNormalizedRectIsIdentityRect(normalizedRect: CGRect): boolean; @@ -677,6 +1144,8 @@ declare class VNObservation extends NSObject implements NSCopying, NSSecureCodin readonly confidence: number; + readonly timeRange: CMTimeRange; + readonly uuid: NSUUID; readonly requestRevision: number; // inherited from VNRequestRevisionProviding @@ -703,6 +1172,45 @@ declare class VNPixelBufferObservation extends VNObservation { readonly pixelBuffer: any; } +declare class VNPoint extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): VNPoint; // inherited from NSObject + + static distanceBetweenPointPoint(point1: VNPoint, point2: VNPoint): number; + + static new(): VNPoint; // inherited from NSObject + + static pointByApplyingVectorToPoint(vector: VNVector, point: VNPoint): VNPoint; + + readonly location: CGPoint; + + readonly x: number; + + readonly y: number; + + static readonly zeroPoint: VNPoint; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { location: CGPoint; }); + + constructor(o: { x: number; y: number; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + distanceToPoint(point: VNPoint): number; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithLocation(location: CGPoint): this; + + initWithXY(x: number, y: number): this; +} + declare class VNRecognizeAnimalsRequest extends VNImageBasedRequest { static alloc(): VNRecognizeAnimalsRequest; // inherited from NSObject @@ -773,6 +1281,8 @@ declare class VNRecognizeTextRequest extends VNImageBasedRequest implements VNRe declare var VNRecognizeTextRequestRevision1: number; +declare var VNRecognizeTextRequestRevision2: number; + declare class VNRecognizedObjectObservation extends VNDetectedObjectObservation { static alloc(): VNRecognizedObjectObservation; // inherited from NSObject @@ -786,6 +1296,34 @@ declare class VNRecognizedObjectObservation extends VNDetectedObjectObservation readonly labels: NSArray; } +declare class VNRecognizedPoint extends VNDetectedPoint { + + static alloc(): VNRecognizedPoint; // inherited from NSObject + + static new(): VNRecognizedPoint; // inherited from NSObject + + readonly identifier: string; +} + +declare var VNRecognizedPointGroupKeyAll: string; + +declare class VNRecognizedPointsObservation extends VNObservation { + + static alloc(): VNRecognizedPointsObservation; // inherited from NSObject + + static new(): VNRecognizedPointsObservation; // inherited from NSObject + + readonly availableGroupKeys: NSArray; + + readonly availableKeys: NSArray; + + keypointsMultiArrayAndReturnError(): MLMultiArray; + + recognizedPointForKeyError(pointKey: string): VNRecognizedPoint; + + recognizedPointsForGroupKeyError(groupKey: string): NSDictionary; +} + declare class VNRecognizedText extends NSObject implements NSCopying, NSSecureCoding { static alloc(): VNRecognizedText; // inherited from NSObject @@ -944,6 +1482,10 @@ declare class VNSequenceRequestHandler extends NSObject { performRequestsOnCIImageOrientationError(requests: NSArray | VNRequest[], image: CIImage, orientation: CGImagePropertyOrientation): boolean; + performRequestsOnCMSampleBufferError(requests: NSArray | VNRequest[], sampleBuffer: any): boolean; + + performRequestsOnCMSampleBufferOrientationError(requests: NSArray | VNRequest[], sampleBuffer: any, orientation: CGImagePropertyOrientation): boolean; + performRequestsOnCVPixelBufferError(requests: NSArray | VNRequest[], pixelBuffer: any): boolean; performRequestsOnCVPixelBufferOrientationError(requests: NSArray | VNRequest[], pixelBuffer: any, orientation: CGImagePropertyOrientation): boolean; @@ -957,6 +1499,23 @@ declare class VNSequenceRequestHandler extends NSObject { performRequestsOnImageURLOrientationError(requests: NSArray | VNRequest[], imageURL: NSURL, orientation: CGImagePropertyOrientation): boolean; } +declare class VNStatefulRequest extends VNImageBasedRequest { + + static alloc(): VNStatefulRequest; // inherited from NSObject + + static new(): VNStatefulRequest; // inherited from NSObject + + readonly frameAnalysisSpacing: CMTime; + + readonly minimumLatencyFrameCount: number; + + readonly requestFrameAnalysisSpacing: CMTime; + + constructor(o: { frameAnalysisSpacing: CMTime; completionHandler: (p1: VNRequest, p2: NSError) => void; }); + + initWithFrameAnalysisSpacingCompletionHandler(frameAnalysisSpacing: CMTime, completionHandler: (p1: VNRequest, p2: NSError) => void): this; +} + declare class VNTargetedImageRequest extends VNImageBasedRequest { static alloc(): VNTargetedImageRequest; // inherited from NSObject @@ -979,6 +1538,14 @@ declare class VNTargetedImageRequest extends VNImageBasedRequest { constructor(o: { targetedCIImage: CIImage; orientation: CGImagePropertyOrientation; options: NSDictionary; completionHandler: (p1: VNRequest, p2: NSError) => void; }); + constructor(o: { targetedCMSampleBuffer: any; options: NSDictionary; }); + + constructor(o: { targetedCMSampleBuffer: any; options: NSDictionary; completionHandler: (p1: VNRequest, p2: NSError) => void; }); + + constructor(o: { targetedCMSampleBuffer: any; orientation: CGImagePropertyOrientation; options: NSDictionary; }); + + constructor(o: { targetedCMSampleBuffer: any; orientation: CGImagePropertyOrientation; options: NSDictionary; completionHandler: (p1: VNRequest, p2: NSError) => void; }); + constructor(o: { targetedCVPixelBuffer: any; options: NSDictionary; }); constructor(o: { targetedCVPixelBuffer: any; options: NSDictionary; completionHandler: (p1: VNRequest, p2: NSError) => void; }); @@ -1019,6 +1586,14 @@ declare class VNTargetedImageRequest extends VNImageBasedRequest { initWithTargetedCIImageOrientationOptionsCompletionHandler(ciImage: CIImage, orientation: CGImagePropertyOrientation, options: NSDictionary, completionHandler: (p1: VNRequest, p2: NSError) => void): this; + initWithTargetedCMSampleBufferOptions(sampleBuffer: any, options: NSDictionary): this; + + initWithTargetedCMSampleBufferOptionsCompletionHandler(sampleBuffer: any, options: NSDictionary, completionHandler: (p1: VNRequest, p2: NSError) => void): this; + + initWithTargetedCMSampleBufferOrientationOptions(sampleBuffer: any, orientation: CGImagePropertyOrientation, options: NSDictionary): this; + + initWithTargetedCMSampleBufferOrientationOptionsCompletionHandler(sampleBuffer: any, orientation: CGImagePropertyOrientation, options: NSDictionary, completionHandler: (p1: VNRequest, p2: NSError) => void): this; + initWithTargetedCVPixelBufferOptions(pixelBuffer: any, options: NSDictionary): this; initWithTargetedCVPixelBufferOptionsCompletionHandler(pixelBuffer: any, options: NSDictionary, completionHandler: (p1: VNRequest, p2: NSError) => void): this; @@ -1108,6 +1683,19 @@ declare class VNTrackingRequest extends VNImageBasedRequest { trackingLevel: VNRequestTrackingLevel; } +declare class VNTrajectoryObservation extends VNObservation { + + static alloc(): VNTrajectoryObservation; // inherited from NSObject + + static new(): VNTrajectoryObservation; // inherited from NSObject + + readonly detectedPoints: NSArray; + + readonly equationCoefficients: interop.Reference; + + readonly projectedPoints: NSArray; +} + declare class VNTranslationalImageRegistrationRequest extends VNImageRegistrationRequest { static alloc(): VNTranslationalImageRegistrationRequest; // inherited from NSObject @@ -1117,4 +1705,130 @@ declare class VNTranslationalImageRegistrationRequest extends VNImageRegistratio declare var VNTranslationalImageRegistrationRequestRevision1: number; +declare class VNVector extends NSObject implements NSCopying, NSSecureCoding { + + static alloc(): VNVector; // inherited from NSObject + + static dotProductOfVectorVector(v1: VNVector, v2: VNVector): number; + + static new(): VNVector; // inherited from NSObject + + static unitVectorForVector(vector: VNVector): VNVector; + + static vectorByAddingVectorToVector(v1: VNVector, v2: VNVector): VNVector; + + static vectorByMultiplyingVectorByScalar(vector: VNVector, scalar: number): VNVector; + + static vectorBySubtractingVectorFromVector(v1: VNVector, v2: VNVector): VNVector; + + readonly length: number; + + readonly r: number; + + readonly squaredLength: number; + + readonly theta: number; + + readonly x: number; + + readonly y: number; + + static readonly zeroVector: VNVector; + + static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding + + constructor(o: { coder: NSCoder; }); // inherited from NSCoding + + constructor(o: { r: number; theta: number; }); + + constructor(o: { vectorHead: VNPoint; tail: VNPoint; }); + + constructor(o: { XComponent: number; yComponent: number; }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + encodeWithCoder(coder: NSCoder): void; + + initWithCoder(coder: NSCoder): this; + + initWithRTheta(r: number, theta: number): this; + + initWithVectorHeadTail(head: VNPoint, tail: VNPoint): this; + + initWithXComponentYComponent(x: number, y: number): this; +} + +declare var VNVideoProcessingOptionFrameCadence: string; + +declare var VNVideoProcessingOptionTimeInterval: string; + +declare class VNVideoProcessor extends NSObject { + + static alloc(): VNVideoProcessor; // inherited from NSObject + + static new(): VNVideoProcessor; // inherited from NSObject + + constructor(o: { URL: NSURL; }); + + addRequestProcessingOptionsError(request: VNRequest, processingOptions: VNVideoProcessorRequestProcessingOptions): boolean; + + addRequestWithProcessingOptionsError(request: VNRequest, processingOptions: NSDictionary): boolean; + + analyzeTimeRangeError(timeRange: CMTimeRange): boolean; + + analyzeWithTimeRangeError(timeRange: CMTimeRange): boolean; + + cancel(): void; + + initWithURL(videoURL: NSURL): this; + + removeRequestError(request: VNRequest): boolean; +} + +declare class VNVideoProcessorCadence extends NSObject implements NSCopying { + + static alloc(): VNVideoProcessorCadence; // inherited from NSObject + + static new(): VNVideoProcessorCadence; // inherited from NSObject + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class VNVideoProcessorFrameRateCadence extends VNVideoProcessorCadence { + + static alloc(): VNVideoProcessorFrameRateCadence; // inherited from NSObject + + static new(): VNVideoProcessorFrameRateCadence; // inherited from NSObject + + readonly frameRate: number; + + constructor(o: { frameRate: number; }); + + initWithFrameRate(frameRate: number): this; +} + +declare class VNVideoProcessorRequestProcessingOptions extends NSObject implements NSCopying { + + static alloc(): VNVideoProcessorRequestProcessingOptions; // inherited from NSObject + + static new(): VNVideoProcessorRequestProcessingOptions; // inherited from NSObject + + cadence: VNVideoProcessorCadence; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class VNVideoProcessorTimeIntervalCadence extends VNVideoProcessorCadence { + + static alloc(): VNVideoProcessorTimeIntervalCadence; // inherited from NSObject + + static new(): VNVideoProcessorTimeIntervalCadence; // inherited from NSObject + + readonly timeInterval: number; + + constructor(o: { timeInterval: number; }); + + initWithTimeInterval(timeInterval: number): this; +} + declare var VNVisionVersionNumber: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!WebKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!WebKit.d.ts index ec97fb949..a23835196 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!WebKit.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!WebKit.d.ts @@ -81,6 +81,21 @@ declare class WKContentRuleListStore extends NSObject { removeContentRuleListForIdentifierCompletionHandler(identifier: string, completionHandler: (p1: NSError) => void): void; } +declare class WKContentWorld extends NSObject { + + static alloc(): WKContentWorld; // inherited from NSObject + + static new(): WKContentWorld; // inherited from NSObject + + static worldWithName(name: string): WKContentWorld; + + readonly name: string; + + static readonly defaultClientWorld: WKContentWorld; + + static readonly pageWorld: WKContentWorld; +} + declare class WKContextMenuElementInfo extends NSObject { static alloc(): WKContextMenuElementInfo; // inherited from NSObject @@ -135,11 +150,43 @@ declare const enum WKErrorCode { AttributedStringContentFailedToLoad = 10, - AttributedStringContentLoadTimedOut = 11 + AttributedStringContentLoadTimedOut = 11, + + JavaScriptInvalidFrameTarget = 12, + + NavigationAppBoundDomain = 13, + + JavaScriptAppBoundDomain = 14 } declare var WKErrorDomain: string; +declare class WKFindConfiguration extends NSObject implements NSCopying { + + static alloc(): WKFindConfiguration; // inherited from NSObject + + static new(): WKFindConfiguration; // inherited from NSObject + + backwards: boolean; + + caseSensitive: boolean; + + wraps: boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class WKFindResult extends NSObject implements NSCopying { + + static alloc(): WKFindResult; // inherited from NSObject + + static new(): WKFindResult; // inherited from NSObject + + readonly matchFound: boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare class WKFrameInfo extends NSObject implements NSCopying { static alloc(): WKFrameInfo; // inherited from NSObject @@ -216,6 +263,8 @@ declare const enum WKNavigationActionPolicy { interface WKNavigationDelegate extends NSObjectProtocol { + webViewAuthenticationChallengeShouldAllowDeprecatedTLS?(webView: WKWebView, challenge: NSURLAuthenticationChallenge, decisionHandler: (p1: boolean) => void): void; + webViewDecidePolicyForNavigationActionDecisionHandler?(webView: WKWebView, navigationAction: WKNavigationAction, decisionHandler: (p1: WKNavigationActionPolicy) => void): void; webViewDecidePolicyForNavigationActionPreferencesDecisionHandler?(webView: WKWebView, navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: (p1: WKNavigationActionPolicy, p2: WKWebpagePreferences) => void): void; @@ -278,6 +327,17 @@ declare const enum WKNavigationType { Other = -1 } +declare class WKPDFConfiguration extends NSObject implements NSCopying { + + static alloc(): WKPDFConfiguration; // inherited from NSObject + + static new(): WKPDFConfiguration; // inherited from NSObject + + rect: CGRect; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + declare class WKPreferences extends NSObject implements NSSecureCoding { static alloc(): WKPreferences; // inherited from NSObject @@ -286,16 +346,12 @@ declare class WKPreferences extends NSObject implements NSSecureCoding { fraudulentWebsiteWarningEnabled: boolean; - javaEnabled: boolean; - javaScriptCanOpenWindowsAutomatically: boolean; javaScriptEnabled: boolean; minimumFontSize: number; - plugInsEnabled: boolean; - static readonly supportsSecureCoding: boolean; // inherited from NSSecureCoding constructor(o: { coder: NSCoder; }); // inherited from NSCoding @@ -361,6 +417,8 @@ declare class WKScriptMessage extends NSObject { readonly name: string; readonly webView: WKWebView; + + readonly world: WKContentWorld; } interface WKScriptMessageHandler extends NSObjectProtocol { @@ -372,6 +430,15 @@ declare var WKScriptMessageHandler: { prototype: WKScriptMessageHandler; }; +interface WKScriptMessageHandlerWithReply extends NSObjectProtocol { + + userContentControllerDidReceiveScriptMessageReplyHandler(userContentController: WKUserContentController, message: WKScriptMessage, replyHandler: (p1: any, p2: string) => void): void; +} +declare var WKScriptMessageHandlerWithReply: { + + prototype: WKScriptMessageHandlerWithReply; +}; + declare class WKSecurityOrigin extends NSObject { static alloc(): WKSecurityOrigin; // inherited from NSObject @@ -480,8 +547,12 @@ declare class WKUserContentController extends NSObject implements NSSecureCoding addContentRuleList(contentRuleList: WKContentRuleList): void; + addScriptMessageHandlerContentWorldName(scriptMessageHandler: WKScriptMessageHandler, world: WKContentWorld, name: string): void; + addScriptMessageHandlerName(scriptMessageHandler: WKScriptMessageHandler, name: string): void; + addScriptMessageHandlerWithReplyContentWorldName(scriptMessageHandlerWithReply: WKScriptMessageHandlerWithReply, contentWorld: WKContentWorld, name: string): void; + addUserScript(userScript: WKUserScript): void; encodeWithCoder(coder: NSCoder): void; @@ -490,11 +561,17 @@ declare class WKUserContentController extends NSObject implements NSSecureCoding removeAllContentRuleLists(): void; + removeAllScriptMessageHandlers(): void; + + removeAllScriptMessageHandlersFromContentWorld(contentWorld: WKContentWorld): void; + removeAllUserScripts(): void; removeContentRuleList(contentRuleList: WKContentRuleList): void; removeScriptMessageHandlerForName(name: string): void; + + removeScriptMessageHandlerForNameContentWorld(name: string, contentWorld: WKContentWorld): void; } declare class WKUserScript extends NSObject implements NSCopying { @@ -511,9 +588,13 @@ declare class WKUserScript extends NSObject implements NSCopying { constructor(o: { source: string; injectionTime: WKUserScriptInjectionTime; forMainFrameOnly: boolean; }); + constructor(o: { source: string; injectionTime: WKUserScriptInjectionTime; forMainFrameOnly: boolean; inContentWorld: WKContentWorld; }); + copyWithZone(zone: interop.Pointer | interop.Reference): any; initWithSourceInjectionTimeForMainFrameOnly(source: string, injectionTime: WKUserScriptInjectionTime, forMainFrameOnly: boolean): this; + + initWithSourceInjectionTimeForMainFrameOnlyInContentWorld(source: string, injectionTime: WKUserScriptInjectionTime, forMainFrameOnly: boolean, contentWorld: WKContentWorld): this; } declare const enum WKUserScriptInjectionTime { @@ -569,8 +650,12 @@ declare class WKWebView extends UIView { readonly loading: boolean; + mediaType: string; + navigationDelegate: WKNavigationDelegate; + pageZoom: number; + readonly scrollView: UIScrollView; readonly serverTrust: any; @@ -579,8 +664,18 @@ declare class WKWebView extends UIView { constructor(o: { frame: CGRect; configuration: WKWebViewConfiguration; }); + callAsyncJavaScriptArgumentsInFrameInContentWorldCompletionHandler(functionBody: string, _arguments: NSDictionary, frame: WKFrameInfo, contentWorld: WKContentWorld, completionHandler: (p1: any, p2: NSError) => void): void; + + createPDFWithConfigurationCompletionHandler(pdfConfiguration: WKPDFConfiguration, completionHandler: (p1: NSData, p2: NSError) => void): void; + + createWebArchiveDataWithCompletionHandler(completionHandler: (p1: NSData, p2: NSError) => void): void; + evaluateJavaScriptCompletionHandler(javaScriptString: string, completionHandler: (p1: any, p2: NSError) => void): void; + evaluateJavaScriptInFrameInContentWorldCompletionHandler(javaScriptString: string, frame: WKFrameInfo, contentWorld: WKContentWorld, completionHandler: (p1: any, p2: NSError) => void): void; + + findStringWithConfigurationCompletionHandler(string: string, configuration: WKFindConfiguration, completionHandler: (p1: WKFindResult) => void): void; + goBack(): WKNavigation; goForward(): WKNavigation; @@ -626,6 +721,8 @@ declare class WKWebViewConfiguration extends NSObject implements NSCopying, NSSe ignoresViewportScaleLimits: boolean; + limitsNavigationsToAppBoundDomains: boolean; + mediaPlaybackAllowsAirPlay: boolean; mediaPlaybackRequiresUserAction: boolean; @@ -667,6 +764,8 @@ declare class WKWebpagePreferences extends NSObject { static new(): WKWebpagePreferences; // inherited from NSObject + allowsContentJavaScript: boolean; + preferredContentMode: WKContentMode; } diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!WidgetKit.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!WidgetKit.d.ts new file mode 100644 index 000000000..77df9d906 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!WidgetKit.d.ts @@ -0,0 +1,4 @@ + +declare var WGWidgetUserInfoKeyFamily: string; + +declare var WGWidgetUserInfoKeyKind: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!dnssd.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!dnssd.d.ts index 8c988be43..59f74636c 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!dnssd.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!dnssd.d.ts @@ -108,6 +108,8 @@ declare const kDNSServiceErr_NoSuchRecord: number; declare const kDNSServiceErr_NotInitialized: number; +declare const kDNSServiceErr_PolicyDenied: number; + declare const kDNSServiceErr_PollingMode: number; declare const kDNSServiceErr_Refused: number; @@ -140,6 +142,8 @@ declare const kDNSServiceFlagsBrowseDomains: number; declare const kDNSServiceFlagsDefault: number; +declare const kDNSServiceFlagsEnableDNSSEC: number; + declare const kDNSServiceFlagsExpiredAnswer: number; declare const kDNSServiceFlagsForce: number; @@ -250,6 +254,8 @@ declare const kDNSServiceType_HINFO: number; declare const kDNSServiceType_HIP: number; +declare const kDNSServiceType_HTTPS: number; + declare const kDNSServiceType_IPSECKEY: number; declare const kDNSServiceType_ISDN: number; @@ -324,6 +330,8 @@ declare const kDNSServiceType_SRV: number; declare const kDNSServiceType_SSHFP: number; +declare const kDNSServiceType_SVCB: number; + declare const kDNSServiceType_TKEY: number; declare const kDNSServiceType_TSIG: number; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!iAd.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!iAd.d.ts index 1c2da7472..7d2496748 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!iAd.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!iAd.d.ts @@ -95,11 +95,21 @@ declare const enum ADClientError { Unknown = 0, + TrackingRestrictedOrDenied = 1, + LimitAdTracking = 1, MissingData = 2, - CorruptResponse = 3 + CorruptResponse = 3, + + RequestClientError = 4, + + RequestServerError = 5, + + RequestNetworkError = 6, + + UnsupportedPlatform = 7 } declare var ADClientErrorDomain: string; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!launch.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!launch.d.ts deleted file mode 100644 index 797adac18..000000000 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!launch.d.ts +++ /dev/null @@ -1,99 +0,0 @@ - -declare function launch_activate_socket(name: string | interop.Pointer | interop.Reference, fds: interop.Pointer | interop.Reference>, cnt: interop.Pointer | interop.Reference): number; - -declare function launch_data_alloc(type: launch_data_type_t): interop.Pointer | interop.Reference; - -declare function launch_data_array_get_count(larray: interop.Pointer | interop.Reference): number; - -declare function launch_data_array_get_index(larray: interop.Pointer | interop.Reference, idx: number): interop.Pointer | interop.Reference; - -declare function launch_data_array_set_index(larray: interop.Pointer | interop.Reference, lval: interop.Pointer | interop.Reference, idx: number): boolean; - -declare function launch_data_copy(ld: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; - -declare function launch_data_dict_get_count(ldict: interop.Pointer | interop.Reference): number; - -declare function launch_data_dict_insert(ldict: interop.Pointer | interop.Reference, lval: interop.Pointer | interop.Reference, key: string | interop.Pointer | interop.Reference): boolean; - -declare function launch_data_dict_iterate(ldict: interop.Pointer | interop.Reference, iterator: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: string, p3: interop.Pointer | interop.Reference) => void>, ctx: interop.Pointer | interop.Reference): void; - -declare function launch_data_dict_lookup(ldict: interop.Pointer | interop.Reference, key: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; - -declare function launch_data_dict_remove(ldict: interop.Pointer | interop.Reference, key: string | interop.Pointer | interop.Reference): boolean; - -declare function launch_data_free(ld: interop.Pointer | interop.Reference): void; - -declare function launch_data_get_bool(ld: interop.Pointer | interop.Reference): boolean; - -declare function launch_data_get_errno(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_fd(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_integer(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_machport(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_opaque(ld: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; - -declare function launch_data_get_opaque_size(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_real(ld: interop.Pointer | interop.Reference): number; - -declare function launch_data_get_string(ld: interop.Pointer | interop.Reference): string; - -declare function launch_data_get_type(ld: interop.Pointer | interop.Reference): launch_data_type_t; - -declare function launch_data_new_bool(val: boolean): interop.Pointer | interop.Reference; - -declare function launch_data_new_fd(fd: number): interop.Pointer | interop.Reference; - -declare function launch_data_new_integer(val: number): interop.Pointer | interop.Reference; - -declare function launch_data_new_machport(val: number): interop.Pointer | interop.Reference; - -declare function launch_data_new_opaque(bytes: interop.Pointer | interop.Reference, sz: number): interop.Pointer | interop.Reference; - -declare function launch_data_new_real(val: number): interop.Pointer | interop.Reference; - -declare function launch_data_new_string(val: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; - -declare function launch_data_set_bool(ld: interop.Pointer | interop.Reference, val: boolean): boolean; - -declare function launch_data_set_fd(ld: interop.Pointer | interop.Reference, fd: number): boolean; - -declare function launch_data_set_integer(ld: interop.Pointer | interop.Reference, val: number): boolean; - -declare function launch_data_set_machport(ld: interop.Pointer | interop.Reference, mp: number): boolean; - -declare function launch_data_set_opaque(ld: interop.Pointer | interop.Reference, bytes: interop.Pointer | interop.Reference, sz: number): boolean; - -declare function launch_data_set_real(ld: interop.Pointer | interop.Reference, val: number): boolean; - -declare function launch_data_set_string(ld: interop.Pointer | interop.Reference, val: string | interop.Pointer | interop.Reference): boolean; - -declare const enum launch_data_type_t { - - LAUNCH_DATA_DICTIONARY = 1, - - LAUNCH_DATA_ARRAY = 2, - - LAUNCH_DATA_FD = 3, - - LAUNCH_DATA_INTEGER = 4, - - LAUNCH_DATA_REAL = 5, - - LAUNCH_DATA_BOOL = 6, - - LAUNCH_DATA_STRING = 7, - - LAUNCH_DATA_OPAQUE = 8, - - LAUNCH_DATA_ERRNO = 9, - - LAUNCH_DATA_MACHPORT = 10 -} - -declare function launch_get_fd(): number; - -declare function launch_msg(request: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!libxslt.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!libxslt.d.ts deleted file mode 100644 index 1f16b7a4f..000000000 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!libxslt.d.ts +++ /dev/null @@ -1,370 +0,0 @@ - -interface _xsltDecimalFormat { - next: interop.Pointer | interop.Reference<_xsltDecimalFormat>; - name: string; - digit: string; - patternSeparator: string; - minusSign: string; - infinity: string; - noNumber: string; - decimalPoint: string; - grouping: string; - percent: string; - permille: string; - zeroDigit: string; -} -declare var _xsltDecimalFormat: interop.StructType<_xsltDecimalFormat>; - -interface _xsltDocument { - next: interop.Pointer | interop.Reference<_xsltDocument>; - main: number; - doc: interop.Pointer | interop.Reference<_xmlDoc>; - keys: interop.Pointer | interop.Reference; - includes: interop.Pointer | interop.Reference<_xsltDocument>; - preproc: number; - nbKeysComputed: number; -} -declare var _xsltDocument: interop.StructType<_xsltDocument>; - -interface _xsltFormatNumberInfo { - integer_hash: number; - integer_digits: number; - frac_digits: number; - frac_hash: number; - group: number; - multiplier: number; - add_decimal: number; - is_multiplier_set: number; - is_negative_pattern: number; -} -declare var _xsltFormatNumberInfo: interop.StructType<_xsltFormatNumberInfo>; - -interface _xsltKeyDef { - next: interop.Pointer | interop.Reference<_xsltKeyDef>; - inst: interop.Pointer | interop.Reference<_xmlNode>; - name: string; - nameURI: string; - match: string; - use: string; - comp: interop.Pointer | interop.Reference; - usecomp: interop.Pointer | interop.Reference; - nsList: interop.Pointer | interop.Reference>; - nsNr: number; -} -declare var _xsltKeyDef: interop.StructType<_xsltKeyDef>; - -interface _xsltKeyTable { - next: interop.Pointer | interop.Reference<_xsltKeyTable>; - name: string; - nameURI: string; - keys: interop.Pointer | interop.Reference; -} -declare var _xsltKeyTable: interop.StructType<_xsltKeyTable>; - -interface _xsltNumberData { - level: string; - count: string; - from: string; - value: string; - format: string; - has_format: number; - digitsPerGroup: number; - groupingCharacter: number; - groupingCharacterLen: number; - doc: interop.Pointer | interop.Reference<_xmlDoc>; - node: interop.Pointer | interop.Reference<_xmlNode>; - countPat: interop.Pointer | interop.Reference; - fromPat: interop.Pointer | interop.Reference; -} -declare var _xsltNumberData: interop.StructType<_xsltNumberData>; - -declare var xslDebugStatus: number; - -declare function xslDropCall(): void; - -declare function xsltCalibrateAdjust(delta: number): void; - -declare function xsltCleanupGlobals(): void; - -declare function xsltDebugDumpExtensions(output: interop.Pointer | interop.Reference): void; - -declare function xsltDebugGetDefaultTrace(): xsltDebugTraceCodes; - -declare function xsltDebugSetDefaultTrace(val: xsltDebugTraceCodes): void; - -declare const enum xsltDebugStatusCodes { - - XSLT_DEBUG_NONE = 0, - - XSLT_DEBUG_INIT = 1, - - XSLT_DEBUG_STEP = 2, - - XSLT_DEBUG_STEPOUT = 3, - - XSLT_DEBUG_NEXT = 4, - - XSLT_DEBUG_STOP = 5, - - XSLT_DEBUG_CONT = 6, - - XSLT_DEBUG_RUN = 7, - - XSLT_DEBUG_RUN_RESTART = 8, - - XSLT_DEBUG_QUIT = 9 -} - -declare const enum xsltDebugTraceCodes { - - XSLT_TRACE_ALL = -1, - - XSLT_TRACE_NONE = 0, - - XSLT_TRACE_COPY_TEXT = 1, - - XSLT_TRACE_PROCESS_NODE = 2, - - XSLT_TRACE_APPLY_TEMPLATE = 4, - - XSLT_TRACE_COPY = 8, - - XSLT_TRACE_COMMENT = 16, - - XSLT_TRACE_PI = 32, - - XSLT_TRACE_COPY_OF = 64, - - XSLT_TRACE_VALUE_OF = 128, - - XSLT_TRACE_CALL_TEMPLATE = 256, - - XSLT_TRACE_APPLY_TEMPLATES = 512, - - XSLT_TRACE_CHOOSE = 1024, - - XSLT_TRACE_IF = 2048, - - XSLT_TRACE_FOR_EACH = 4096, - - XSLT_TRACE_STRIP_SPACES = 8192, - - XSLT_TRACE_TEMPLATES = 16384, - - XSLT_TRACE_KEYS = 32768, - - XSLT_TRACE_VARIABLES = 65536 -} - -declare var xsltDocDefaultLoader: interop.FunctionReference<(p1: string, p2: interop.Pointer | interop.Reference, p3: number, p4: interop.Pointer | interop.Reference, p5: xsltLoadType) => interop.Pointer | interop.Reference<_xmlDoc>>; - -declare function xsltDocumentFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltDocumentSortFunction(list: interop.Pointer | interop.Reference<_xmlNodeSet>): void; - -declare function xsltElementAvailableFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare var xsltEngineVersion: string; - -declare var xsltExtMarker: string; - -declare function xsltExtModuleFunctionLookup(name: string | interop.Pointer | interop.Reference, URI: string | interop.Pointer | interop.Reference): interop.FunctionReference<(p1: interop.Pointer | interop.Reference<_xmlXPathParserContext>, p2: number) => void>; - -declare function xsltFormatNumberConversion(self: interop.Pointer | interop.Reference<_xsltDecimalFormat>, format: string | interop.Pointer | interop.Reference, number: number, result: interop.Pointer | interop.Reference): xmlXPathError; - -declare function xsltFormatNumberFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltFreeAVTList(avt: interop.Pointer | interop.Reference): void; - -declare function xsltFreeCompMatchList(comp: interop.Pointer | interop.Reference): void; - -declare function xsltFreeDocumentKeys(doc: interop.Pointer | interop.Reference<_xsltDocument>): void; - -declare function xsltFreeLocale(locale: interop.Pointer | interop.Reference): void; - -declare function xsltFreeLocales(): void; - -declare function xsltFreeSecurityPrefs(sec: interop.Pointer | interop.Reference): void; - -declare function xsltFunctionAvailableFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltFunctionNodeSet(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltGenerateIdFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare var xsltGenericDebug: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: string) => void>; - -declare var xsltGenericDebugContext: interop.Pointer | interop.Reference; - -declare var xsltGenericError: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: string) => void>; - -declare var xsltGenericErrorContext: interop.Pointer | interop.Reference; - -declare function xsltGetDebuggerStatus(): number; - -declare function xsltGetDefaultSecurityPrefs(): interop.Pointer | interop.Reference; - -declare function xsltGetNsProp(node: interop.Pointer | interop.Reference<_xmlNode>, name: string | interop.Pointer | interop.Reference, nameSpace: string | interop.Pointer | interop.Reference): string; - -declare function xsltGetQNameURI(node: interop.Pointer | interop.Reference<_xmlNode>, name: interop.Pointer | interop.Reference): string; - -declare function xsltGetUTF8Char(utf: string | interop.Pointer | interop.Reference, len: interop.Pointer | interop.Reference): number; - -declare function xsltGetXIncludeDefault(): number; - -declare function xsltInit(): void; - -declare function xsltInitGlobals(): void; - -declare function xsltIsBlank(str: string | interop.Pointer | interop.Reference): number; - -declare function xsltKeyFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare var xsltLibxmlVersion: number; - -declare var xsltLibxsltVersion: number; - -declare const enum xsltLoadType { - - XSLT_LOAD_START = 0, - - XSLT_LOAD_STYLESHEET = 1, - - XSLT_LOAD_DOCUMENT = 2 -} - -declare function xsltLocaleStrcmp(locale: interop.Pointer | interop.Reference, str1: string | interop.Pointer | interop.Reference, str2: string | interop.Pointer | interop.Reference): number; - -declare var xsltMaxDepth: number; - -declare var xsltMaxVars: number; - -declare function xsltNewLocale(langName: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; - -declare function xsltNewSecurityPrefs(): interop.Pointer | interop.Reference; - -declare function xsltNormalizeCompSteps(payload: interop.Pointer | interop.Reference, data: interop.Pointer | interop.Reference, name: string | interop.Pointer | interop.Reference): void; - -declare const enum xsltOutputType { - - XSLT_OUTPUT_XML = 0, - - XSLT_OUTPUT_HTML = 1, - - XSLT_OUTPUT_TEXT = 2 -} - -declare function xsltRegisterAllExtras(): void; - -declare function xsltRegisterAllFunctions(ctxt: interop.Pointer | interop.Reference<_xmlXPathContext>): void; - -declare function xsltRegisterExtModuleFunction(name: string | interop.Pointer | interop.Reference, URI: string | interop.Pointer | interop.Reference, _function: interop.FunctionReference<(p1: interop.Pointer | interop.Reference<_xmlXPathParserContext>, p2: number) => void>): number; - -declare function xsltRegisterTestModule(): void; - -declare const enum xsltSecurityOption { - - XSLT_SECPREF_READ_FILE = 1, - - XSLT_SECPREF_WRITE_FILE = 2, - - XSLT_SECPREF_CREATE_DIRECTORY = 3, - - XSLT_SECPREF_READ_NETWORK = 4, - - XSLT_SECPREF_WRITE_NETWORK = 5 -} - -declare function xsltSetDebuggerCallbacks(no: number, block: interop.Pointer | interop.Reference): number; - -declare function xsltSetDebuggerStatus(value: number): void; - -declare function xsltSetDefaultSecurityPrefs(sec: interop.Pointer | interop.Reference): void; - -declare function xsltSetGenericDebugFunc(ctx: interop.Pointer | interop.Reference, handler: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: string) => void>): void; - -declare function xsltSetGenericErrorFunc(ctx: interop.Pointer | interop.Reference, handler: interop.FunctionReference<(p1: interop.Pointer | interop.Reference, p2: string) => void>): void; - -declare function xsltSetLoaderFunc(f: interop.FunctionReference<(p1: string, p2: interop.Pointer | interop.Reference, p3: number, p4: interop.Pointer | interop.Reference, p5: xsltLoadType) => interop.Pointer | interop.Reference<_xmlDoc>>): void; - -declare function xsltSetXIncludeDefault(xinclude: number): void; - -declare function xsltSplitQName(dict: interop.Pointer | interop.Reference, name: string | interop.Pointer | interop.Reference, prefix: interop.Pointer | interop.Reference): string; - -declare function xsltStrxfrm(locale: interop.Pointer | interop.Reference, string: string | interop.Pointer | interop.Reference): string; - -declare const enum xsltStyleType { - - XSLT_FUNC_COPY = 1, - - XSLT_FUNC_SORT = 2, - - XSLT_FUNC_TEXT = 3, - - XSLT_FUNC_ELEMENT = 4, - - XSLT_FUNC_ATTRIBUTE = 5, - - XSLT_FUNC_COMMENT = 6, - - XSLT_FUNC_PI = 7, - - XSLT_FUNC_COPYOF = 8, - - XSLT_FUNC_VALUEOF = 9, - - XSLT_FUNC_NUMBER = 10, - - XSLT_FUNC_APPLYIMPORTS = 11, - - XSLT_FUNC_CALLTEMPLATE = 12, - - XSLT_FUNC_APPLYTEMPLATES = 13, - - XSLT_FUNC_CHOOSE = 14, - - XSLT_FUNC_IF = 15, - - XSLT_FUNC_FOREACH = 16, - - XSLT_FUNC_DOCUMENT = 17, - - XSLT_FUNC_WITHPARAM = 18, - - XSLT_FUNC_PARAM = 19, - - XSLT_FUNC_VARIABLE = 20, - - XSLT_FUNC_WHEN = 21, - - XSLT_FUNC_EXTENSION = 22 -} - -declare function xsltSystemPropertyFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltTimestamp(): number; - -declare const enum xsltTransformState { - - XSLT_STATE_OK = 0, - - XSLT_STATE_ERROR = 1, - - XSLT_STATE_STOPPED = 2 -} - -declare function xsltUninit(): void; - -declare function xsltUnparsedEntityURIFunction(ctxt: interop.Pointer | interop.Reference<_xmlXPathParserContext>, nargs: number): void; - -declare function xsltUnregisterExtModule(URI: string | interop.Pointer | interop.Reference): number; - -declare function xsltUnregisterExtModuleElement(name: string | interop.Pointer | interop.Reference, URI: string | interop.Pointer | interop.Reference): number; - -declare function xsltUnregisterExtModuleFunction(name: string | interop.Pointer | interop.Reference, URI: string | interop.Pointer | interop.Reference): number; - -declare function xsltUnregisterExtModuleTopLevel(name: string | interop.Pointer | interop.Reference, URI: string | interop.Pointer | interop.Reference): number; - -declare function xsltXPathFunctionLookup(ctxt: interop.Pointer | interop.Reference<_xmlXPathContext>, name: string | interop.Pointer | interop.Reference, ns_uri: string | interop.Pointer | interop.Reference): interop.FunctionReference<(p1: interop.Pointer | interop.Reference<_xmlXPathParserContext>, p2: number) => void>; - -declare function xsltXPathVariableLookup(ctxt: interop.Pointer | interop.Reference, name: string | interop.Pointer | interop.Reference, ns_uri: string | interop.Pointer | interop.Reference): interop.Pointer | interop.Reference<_xmlXPathObject>; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!os.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os.d.ts index 4ec0af9d8..c18ec13f7 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!os.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os.d.ts @@ -1,4 +1,11 @@ +interface OS_os_activity extends NSObjectProtocol { +} +declare var OS_os_activity: { + + prototype: OS_os_activity; +}; + interface OS_os_log extends NSObjectProtocol { } declare var OS_os_log: { @@ -8,15 +15,21 @@ declare var OS_os_log: { declare var __dso_handle: mach_header; +declare function _os_activity_create(dso: interop.Pointer | interop.Reference, description: string | interop.Pointer | interop.Reference, activity: NSObject, flags: os_activity_flag_t): NSObject; + +declare var _os_activity_current: void; + declare function _os_activity_initiate(dso: interop.Pointer | interop.Reference, description: string | interop.Pointer | interop.Reference, flags: os_activity_flag_t, activity_block: () => void): void; declare function _os_activity_initiate_f(dso: interop.Pointer | interop.Reference, description: string | interop.Pointer | interop.Reference, flags: os_activity_flag_t, context: interop.Pointer | interop.Reference, _function: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): void; declare function _os_activity_label_useraction(dso: interop.Pointer | interop.Reference, name: string | interop.Pointer | interop.Reference): void; +declare var _os_activity_none: void; + declare function _os_activity_set_breadcrumb(dso: interop.Pointer | interop.Reference, name: string | interop.Pointer | interop.Reference): void; -declare function _os_activity_start(dso: interop.Pointer | interop.Reference, description: string | interop.Pointer | interop.Reference, flags: os_activity_flag_t): number; +declare function _os_activity_start(dso: interop.Pointer | interop.Reference, description: string | interop.Pointer | interop.Reference, flags: os_activity_flag_t): NSObject; declare function _os_log_create(dso: interop.Pointer | interop.Reference, subsystem: string | interop.Pointer | interop.Reference, category: string | interop.Pointer | interop.Reference): NSObject; @@ -24,6 +37,8 @@ declare function _os_log_debug_impl(dso: interop.Pointer | interop.Reference, log: NSObject, type: os_log_type_t, format: string | interop.Pointer | interop.Reference, buf: string | interop.Pointer | interop.Reference, size: number): void; declare function _os_log_fault_impl(dso: interop.Pointer | interop.Reference, log: NSObject, type: os_log_type_t, format: string | interop.Pointer | interop.Reference, buf: string | interop.Pointer | interop.Reference, size: number): void; @@ -32,7 +47,11 @@ declare function _os_log_impl(dso: interop.Pointer | interop.Reference, log declare function _os_signpost_emit_with_name_impl(dso: interop.Pointer | interop.Reference, log: NSObject, type: os_signpost_type_t, spid: number, name: string | interop.Pointer | interop.Reference, format: string | interop.Pointer | interop.Reference, buf: string | interop.Pointer | interop.Reference, size: number): void; -declare function os_activity_end(activity: number): void; +declare function os_activity_apply(activity: NSObject, block: () => void): void; + +declare function os_activity_apply_f(activity: NSObject, context: interop.Pointer | interop.Reference, _function: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): void; + +declare function os_activity_end(activity: NSObject): void; declare const enum os_activity_flag_t { @@ -45,7 +64,11 @@ declare const enum os_activity_flag_t { declare function os_activity_get_active(entries: interop.Pointer | interop.Reference, count: interop.Pointer | interop.Reference): number; -declare function os_activity_get_identifier(activity: number, parent_id: interop.Pointer | interop.Reference): number; +declare function os_activity_get_identifier(activity: NSObject, parent_id: interop.Pointer | interop.Reference): number; + +declare function os_activity_scope_enter(activity: NSObject, state: interop.Pointer | interop.Reference): void; + +declare function os_activity_scope_leave(state: interop.Pointer | interop.Reference): void; interface os_activity_scope_state_s { opaque: interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_object.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_object.d.ts index 775634ba1..6c5e52acd 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_object.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_object.d.ts @@ -1,4 +1,11 @@ +declare class OS_object extends NSObject { + + static alloc(): OS_object; // inherited from NSObject + + static new(): OS_object; // inherited from NSObject +} + declare function os_release(object: interop.Pointer | interop.Reference): void; declare function os_retain(object: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_workgroup.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_workgroup.d.ts new file mode 100644 index 000000000..2e0f4dc67 --- /dev/null +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!os_workgroup.d.ts @@ -0,0 +1,77 @@ + +declare class OS_os_workgroup extends OS_object { + + static alloc(): OS_os_workgroup; // inherited from NSObject + + static new(): OS_os_workgroup; // inherited from NSObject +} + +declare class OS_os_workgroup_interval extends OS_os_workgroup implements OS_os_workgroup_intervalProtocol { + + static alloc(): OS_os_workgroup_interval; // inherited from NSObject + + static new(): OS_os_workgroup_interval; // inherited from NSObject +} + +interface OS_os_workgroup_intervalProtocol { +} +declare var OS_os_workgroup_intervalProtocol: { + + prototype: OS_os_workgroup_intervalProtocol; +}; + +declare class OS_os_workgroup_parallel extends OS_os_workgroup implements OS_os_workgroup_parallelProtocol { + + static alloc(): OS_os_workgroup_parallel; // inherited from NSObject + + static new(): OS_os_workgroup_parallel; // inherited from NSObject +} + +interface OS_os_workgroup_parallelProtocol { +} +declare var OS_os_workgroup_parallelProtocol: { + + prototype: OS_os_workgroup_parallelProtocol; +}; + +interface os_workgroup_attr_opaque_s { + sig: number; + opaque: interop.Reference; +} +declare var os_workgroup_attr_opaque_s: interop.StructType; + +declare function os_workgroup_cancel(wg: OS_os_workgroup): void; + +declare function os_workgroup_create_with_workgroup(name: string | interop.Pointer | interop.Reference, wg: OS_os_workgroup): OS_os_workgroup; + +declare function os_workgroup_get_working_arena(wg: OS_os_workgroup, index_out: interop.Pointer | interop.Reference): interop.Pointer | interop.Reference; + +interface os_workgroup_interval_data_opaque_s { + sig: number; + opaque: interop.Reference; +} +declare var os_workgroup_interval_data_opaque_s: interop.StructType; + +declare function os_workgroup_interval_finish(wg: OS_os_workgroup, data: interop.Pointer | interop.Reference): number; + +declare function os_workgroup_interval_start(wg: OS_os_workgroup, start: number, deadline: number, data: interop.Pointer | interop.Reference): number; + +declare function os_workgroup_interval_update(wg: OS_os_workgroup, deadline: number, data: interop.Pointer | interop.Reference): number; + +declare function os_workgroup_join(wg: OS_os_workgroup, token_out: interop.Pointer | interop.Reference): number; + +interface os_workgroup_join_token_opaque_s { + sig: number; + opaque: interop.Reference; +} +declare var os_workgroup_join_token_opaque_s: interop.StructType; + +declare function os_workgroup_leave(wg: OS_os_workgroup, token: interop.Pointer | interop.Reference): void; + +declare function os_workgroup_max_parallel_threads(wg: OS_os_workgroup, attr: interop.Pointer | interop.Reference): number; + +declare function os_workgroup_parallel_create(name: string | interop.Pointer | interop.Reference, attr: interop.Pointer | interop.Reference): OS_os_workgroup; + +declare function os_workgroup_set_working_arena(wg: OS_os_workgroup, arena: interop.Pointer | interop.Reference, max_workers: number, destructor: interop.FunctionReference<(p1: interop.Pointer | interop.Reference) => void>): number; + +declare function os_workgroup_testcancel(wg: OS_os_workgroup): boolean; diff --git a/packages/types-ios/src/lib/ios/objc-x86_64/objc!simd.d.ts b/packages/types-ios/src/lib/ios/objc-x86_64/objc!simd.d.ts index 906884f9e..89c4ef138 100644 --- a/packages/types-ios/src/lib/ios/objc-x86_64/objc!simd.d.ts +++ b/packages/types-ios/src/lib/ios/objc-x86_64/objc!simd.d.ts @@ -1,8 +1,4 @@ -declare function __cos_d2(x: interop.Reference): interop.Reference; - -declare function __cos_f4(x: interop.Reference): interop.Reference; - declare function __invert_d2(p1: simd_double2x2): simd_double2x2; declare function __invert_d3(p1: simd_double3x3): simd_double3x3; @@ -15,10 +11,6 @@ declare function __invert_f3(p1: simd_float3x3): simd_float3x3; declare function __invert_f4(p1: simd_float4x4): simd_float4x4; -declare function __sin_d2(x: interop.Reference): interop.Reference; - -declare function __sin_f4(x: interop.Reference): interop.Reference; - declare function __tg_acos(x: interop.Reference): interop.Reference; declare function __tg_acosFunction(x: interop.Reference): interop.Reference; @@ -859,6 +851,170 @@ declare function __tg_truncFunction7(x: interop.Reference): interop.Refe declare function __tg_truncFunction8(x: interop.Reference): interop.Reference; +declare function _simd_acos_d2(x: interop.Reference): interop.Reference; + +declare function _simd_acos_f4(x: interop.Reference): interop.Reference; + +declare function _simd_acosh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_acosh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_asin_d2(x: interop.Reference): interop.Reference; + +declare function _simd_asin_f4(x: interop.Reference): interop.Reference; + +declare function _simd_asinh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_asinh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_atan2_d2(y: interop.Reference, x: interop.Reference): interop.Reference; + +declare function _simd_atan2_f4(y: interop.Reference, x: interop.Reference): interop.Reference; + +declare function _simd_atan_d2(x: interop.Reference): interop.Reference; + +declare function _simd_atan_f4(x: interop.Reference): interop.Reference; + +declare function _simd_atanh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_atanh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_cbrt_d2(x: interop.Reference): interop.Reference; + +declare function _simd_cbrt_f4(x: interop.Reference): interop.Reference; + +declare function _simd_cos_d2(x: interop.Reference): interop.Reference; + +declare function _simd_cos_f4(x: interop.Reference): interop.Reference; + +declare function _simd_cosh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_cosh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_cospi_d2(x: interop.Reference): interop.Reference; + +declare function _simd_cospi_f4(x: interop.Reference): interop.Reference; + +declare function _simd_erf_d2(x: interop.Reference): interop.Reference; + +declare function _simd_erf_f4(x: interop.Reference): interop.Reference; + +declare function _simd_erfc_d2(x: interop.Reference): interop.Reference; + +declare function _simd_erfc_f4(x: interop.Reference): interop.Reference; + +declare function _simd_exp10_d2(x: interop.Reference): interop.Reference; + +declare function _simd_exp10_f4(x: interop.Reference): interop.Reference; + +declare function _simd_exp2_d2(x: interop.Reference): interop.Reference; + +declare function _simd_exp2_f4(x: interop.Reference): interop.Reference; + +declare function _simd_exp_d2(x: interop.Reference): interop.Reference; + +declare function _simd_exp_f4(x: interop.Reference): interop.Reference; + +declare function _simd_expm1_d2(x: interop.Reference): interop.Reference; + +declare function _simd_expm1_f4(x: interop.Reference): interop.Reference; + +declare function _simd_fma_d2(x: interop.Reference, y: interop.Reference, z: interop.Reference): interop.Reference; + +declare function _simd_fma_f4(x: interop.Reference, y: interop.Reference, z: interop.Reference): interop.Reference; + +declare function _simd_fmod_d2(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_fmod_f4(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_hypot_d2(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_hypot_f4(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_incircle_pd2(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference, p4: interop.Reference): number; + +declare function _simd_incircle_pf2(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference, p4: interop.Reference): number; + +declare function _simd_insphere_pd3(p1: interop.Pointer | interop.Reference): number; + +declare function _simd_insphere_pf3(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference, p4: interop.Reference, p5: interop.Reference): number; + +declare function _simd_log10_d2(x: interop.Reference): interop.Reference; + +declare function _simd_log10_f4(x: interop.Reference): interop.Reference; + +declare function _simd_log1p_d2(x: interop.Reference): interop.Reference; + +declare function _simd_log1p_f4(x: interop.Reference): interop.Reference; + +declare function _simd_log2_d2(x: interop.Reference): interop.Reference; + +declare function _simd_log2_f4(x: interop.Reference): interop.Reference; + +declare function _simd_log_d2(x: interop.Reference): interop.Reference; + +declare function _simd_log_f4(x: interop.Reference): interop.Reference; + +declare function _simd_nextafter_d2(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_nextafter_f4(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_orient_pd2(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference): number; + +declare function _simd_orient_pd3(p1: interop.Pointer | interop.Reference): number; + +declare function _simd_orient_pf2(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference): number; + +declare function _simd_orient_pf3(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference, p4: interop.Reference): number; + +declare function _simd_orient_vd2(p1: interop.Reference, p2: interop.Reference): number; + +declare function _simd_orient_vd3(p1: interop.Pointer | interop.Reference): number; + +declare function _simd_orient_vf2(p1: interop.Reference, p2: interop.Reference): number; + +declare function _simd_orient_vf3(p1: interop.Reference, p2: interop.Reference, p3: interop.Reference): number; + +declare function _simd_pow_d2(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_pow_f4(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_remainder_d2(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_remainder_f4(x: interop.Reference, y: interop.Reference): interop.Reference; + +declare function _simd_round_d2(x: interop.Reference): interop.Reference; + +declare function _simd_round_f4(x: interop.Reference): interop.Reference; + +declare function _simd_sin_d2(x: interop.Reference): interop.Reference; + +declare function _simd_sin_f4(x: interop.Reference): interop.Reference; + +declare function _simd_sinh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_sinh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_sinpi_d2(x: interop.Reference): interop.Reference; + +declare function _simd_sinpi_f4(x: interop.Reference): interop.Reference; + +declare function _simd_tan_d2(x: interop.Reference): interop.Reference; + +declare function _simd_tan_f4(x: interop.Reference): interop.Reference; + +declare function _simd_tanh_d2(x: interop.Reference): interop.Reference; + +declare function _simd_tanh_f4(x: interop.Reference): interop.Reference; + +declare function _simd_tanpi_d2(x: interop.Reference): interop.Reference; + +declare function _simd_tanpi_f4(x: interop.Reference): interop.Reference; + +declare function _simd_tgamma_d2(x: interop.Reference): interop.Reference; + +declare function _simd_tgamma_f4(x: interop.Reference): interop.Reference; + declare var matrix_identity_double2x2: simd_double2x2; declare var matrix_identity_double3x3: simd_double3x3; @@ -2189,6 +2345,14 @@ declare function simd_fractFunction8(x: interop.Reference): interop.Refe declare function simd_fractFunction9(x: interop.Reference): interop.Reference; +declare function simd_incircle(__x: interop.Reference, __a: interop.Reference, __b: interop.Reference, __c: interop.Reference): number; + +declare function simd_incircleFunction(__x: interop.Reference, __a: interop.Reference, __b: interop.Reference, __c: interop.Reference): number; + +declare function simd_insphere(__x: interop.Reference, __a: interop.Reference, __b: interop.Reference, __c: interop.Reference, __d: interop.Reference): number; + +declare function simd_insphereFunction(__x: interop.Reference, __a: interop.Reference, __b: interop.Reference, __c: interop.Reference, __d: interop.Reference): number; + declare function simd_int(__x: interop.Reference): interop.Reference; declare function simd_intFunction(__x: interop.Reference): interop.Reference; @@ -2283,6 +2447,16 @@ declare function simd_intFunction8(__x: interop.Reference): interop.Refe declare function simd_intFunction9(__x: interop.Reference): interop.Reference; +declare function simd_int_rte(__x: interop.Reference): interop.Reference; + +declare function simd_int_rteFunction(__x: interop.Reference): interop.Reference; + +declare function simd_int_rteFunction2(__x: interop.Reference): interop.Reference; + +declare function simd_int_rteFunction3(__x: interop.Reference): interop.Reference; + +declare function simd_int_rteFunction4(__x: interop.Reference): interop.Reference; + declare function simd_int_sat(__x: interop.Reference): interop.Reference; declare function simd_int_satFunction(__x: interop.Reference): interop.Reference; @@ -2549,6 +2723,14 @@ declare function simd_longFunction8(__x: interop.Reference): interop.Ref declare function simd_longFunction9(__x: interop.Reference): interop.Reference; +declare function simd_long_rte(__x: interop.Reference): interop.Reference; + +declare function simd_long_rteFunction(__x: interop.Reference): interop.Reference; + +declare function simd_long_rteFunction2(__x: interop.Reference): interop.Reference; + +declare function simd_long_rteFunction3(__x: interop.Reference): interop.Reference; + declare function simd_long_sat(__x: interop.Reference): interop.Reference; declare function simd_long_satFunction(__x: interop.Reference): interop.Reference; @@ -3263,6 +3445,22 @@ declare function simd_normalizeFunction8(__x: interop.Reference): intero declare function simd_normalizeFunction9(q: simd_quatf): simd_quatf; +declare function simd_orient(__x: interop.Reference, __y: interop.Reference): number; + +declare function simd_orientFunction(__x: interop.Reference, __y: interop.Reference): number; + +declare function simd_orientFunction2(__x: interop.Reference, __y: interop.Reference, __z: interop.Reference): number; + +declare function simd_orientFunction3(__x: interop.Reference, __y: interop.Reference, __z: interop.Reference): number; + +declare function simd_orientFunction4(__a: interop.Reference, __b: interop.Reference, __c: interop.Reference): number; + +declare function simd_orientFunction5(__a: interop.Reference, __b: interop.Reference, __c: interop.Reference): number; + +declare function simd_orientFunction6(__a: interop.Reference, __b: interop.Reference, __c: interop.Reference, __d: interop.Reference): number; + +declare function simd_orientFunction7(__a: interop.Reference, __b: interop.Reference, __c: interop.Reference, __d: interop.Reference): number; + declare function simd_precise_distance(__x: interop.Reference, __y: interop.Reference): number; declare function simd_precise_distanceFunction(__x: interop.Reference, __y: interop.Reference): number; diff --git a/tools/scripts/typings-gen.sh b/tools/scripts/typings-gen.sh index 50fd3b44f..eeec8bc49 100755 --- a/tools/scripts/typings-gen.sh +++ b/tools/scripts/typings-gen.sh @@ -19,10 +19,10 @@ then exit -2 fi -echo "Creating typings project with tns-ios@$IOS_RUNTIME_VERSION..." +echo "Creating typings project with @nativescript/ios@$IOS_RUNTIME_VERSION..." rm -rf ios-typings-prj -tns create --js ios-typings-prj -tns platform add ios@$IOS_RUNTIME_VERSION --path ios-typings-prj/ +ns create --js ios-typings-prj +ns platform add ios@$IOS_RUNTIME_VERSION --path ios-typings-prj/ if [ -n "$METADATA_GENERATOR_PATH" ] then @@ -33,10 +33,10 @@ then fi echo "Building project and generating typings..." -TNS_TYPESCRIPT_DECLARATIONS_PATH=$(pwd)/ios-typings-prj/typings tns build ios --debug --path ios-typings-prj/ +TNS_TYPESCRIPT_DECLARATIONS_PATH=$(pwd)/ios-typings-prj/typings ns build ios --debug --path ios-typings-prj/ echo "Deleting old ios typings (ios/objc-x86_64)..." -rm ios/objc-x86_64/* +rm packages/types-ios/src/lib/ios/objc-x86_64/* echo "Deleting Material Components typings..." rm ios-typings-prj/typings/x86_64/objc\!MaterialComponents.d.ts @@ -44,11 +44,13 @@ rm ios-typings-prj/typings/x86_64/objc\!MaterialComponents.d.ts perl -pi -e 's/.*\s(mdc_|MDCFontTextStyle|MDCAnimationTimingFunction).*\s*//g' ios-typings-prj/typings/x86_64/*.d.ts echo "Moving generated typings to ios/objc-x86_64..." -mv ios-typings-prj/typings/x86_64/* ios/objc-x86_64/ +mv ios-typings-prj/typings/x86_64/* packages/types-ios/src/lib/ios/objc-x86_64/ echo "Emitting (ios/ios.d.ts)..." -pushd ios +pushd packages/types-ios/src/lib/ios + +rm ios.d.ts echo '/// ' > ios.d.ts for i in `ls objc-x86_64/*.d.ts`; do diff --git a/workspace.json b/workspace.json index f31778a13..7c23c1ef4 100644 --- a/workspace.json +++ b/workspace.json @@ -183,8 +183,7 @@ "builder": "@nrwl/workspace:run-commands", "outputs": ["dist/packages"], "options": { - "commands": ["mkdir -p ../../dist/packages/types-ios", "cp -R src/* ../../dist/packages/types-ios", "cp package.json *.md ../../dist/packages/types-ios"], - "cwd": "packages/types-ios", + "commands": ["./tools/scripts/typings-gen.sh latest", "mkdir -p dist/packages/types-ios", "cp -R packages/types-ios/src/* dist/packages/types-ios", "cp packages/types-ios/package.json dist/packages/types-ios", "cp packages/types-ios/README.md dist/packages/types-ios/README.md"], "parallel": false } } From 9a380cd43e2ebff852155647e83b803b82a8a94b Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Wed, 30 Dec 2020 16:58:14 +0100 Subject: [PATCH 12/23] fix(core): prevent circular reference Frame <> Page (#9111) --- packages/core/ui/page/page-common.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts index 62c574842..a46095af0 100644 --- a/packages/core/ui/page/page-common.ts +++ b/packages/core/ui/page/page-common.ts @@ -6,7 +6,7 @@ import { Property, CssProperty } from '../core/properties'; import { Style } from '../styling/style'; import { Color } from '../../color'; import { EventData } from '../../data/observable'; -import { Frame } from '../frame'; +import type { Frame } from '../frame'; import { ActionBar } from '../action-bar'; import { KeyframeAnimationInfo } from '../animation/keyframe-animation'; import { profile } from '../../profiling'; @@ -94,7 +94,7 @@ export class PageBase extends ContentView { get frame(): Frame { const frame = this.parent; - return frame instanceof Frame ? frame : undefined; + return (frame && frame.constructor.name === 'Frame') ? frame as Frame : undefined; } private createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData { From e5a15bab3683a09a5d8b7423175a6ab377086286 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 30 Dec 2020 10:31:35 -0800 Subject: [PATCH 13/23] chore(release): @nativescript/core@7.1.0 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ packages/types/package.json | 6 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00250922b..f728acecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,32 @@ +# [7.1.0](https://github.com/NativeScript/NativeScript/compare/4.0.0-webpack...7.1.0) (2020-12-30) + + +### Bug Fixes + +* **android:** modal not following activity windowSoftInputMode ([#9042](https://github.com/NativeScript/NativeScript/issues/9042)) ([d09a564](https://github.com/NativeScript/NativeScript/commit/d09a564296669dcffd03cd32b18f7a6454c7c472)) +* **android:** ActivityIndicator custom color affecting other indicators on the page ([#9026](https://github.com/NativeScript/NativeScript/issues/9026)) ([e16bc60](https://github.com/NativeScript/NativeScript/commit/e16bc606ef6ed506cbc38e50247a59637d898b50)) +* **android:** Tabs selected item color incorrectly applied ([#9040](https://github.com/NativeScript/NativeScript/issues/9040)) ([b47ce0a](https://github.com/NativeScript/NativeScript/commit/b47ce0a97c38547d060fb4626df02d63f518f721)) +* **compat:** add screen and device aliases ([#9088](https://github.com/NativeScript/NativeScript/issues/9088)) ([4204ac8](https://github.com/NativeScript/NativeScript/commit/4204ac8308eda902efd787ce96971463eab343ab)) +* **core:** notify object now optional ([#9032](https://github.com/NativeScript/NativeScript/issues/9032)) ([539fd1e](https://github.com/NativeScript/NativeScript/commit/539fd1eb293241dc067bfdcc77613b0eb67b099f)) +* **ios:** ios 10 tab crash ([#9018](https://github.com/NativeScript/NativeScript/issues/9018)) ([b3f9c0d](https://github.com/NativeScript/NativeScript/commit/b3f9c0d0ac656f413653d79d5eb9fcb1a6e1ca0f)) +* **list-view:** handle reusing wrong view ([#9023](https://github.com/NativeScript/NativeScript/issues/9023)) ([64e0aa6](https://github.com/NativeScript/NativeScript/commit/64e0aa6a114c414ad190696919d4b206b637f61f)) +* **tabs:** ios safeArea calculation ([#9089](https://github.com/NativeScript/NativeScript/issues/9089)) ([9391b44](https://github.com/NativeScript/NativeScript/commit/9391b44996e833fc63f0b2bc4c6c90e47c12a3b8)) + +### Features + +* **android:** setInterval closer to web spec ([#9044](https://github.com/NativeScript/NativeScript/issues/9044)) ([1769de9](https://github.com/NativeScript/NativeScript/commit/1769de903392ab14ffb6c366ab86dc24b5289e81)) +* **ios:** types for latest ios 14.3 with Xcode 12.3 ([#9118](https://github.com/NativeScript/NativeScript/issues/9118)) ([9aad2db](https://github.com/NativeScript/NativeScript/commit/9aad2dbdbcf7e786183af9abbf16b4009c756ae3)) +* **ios** iosIgnoreSafeArea property ([#9092](https://github.com/NativeScript/NativeScript/issues/9092)) ([ea67422](https://github.com/NativeScript/NativeScript/commit/ea67422fcf3106db1359a358e897a63827a642f3)) +* **core:** queueMacroTask ([#8904](https://github.com/NativeScript/NativeScript/issues/8904)) ([e3dc89f](https://github.com/NativeScript/NativeScript/commit/e3dc89fbfc4dd8030097c7831479eb18cf23d8eb)) +* **core:** allow app to start without a root view ([#9056](https://github.com/NativeScript/NativeScript/issues/9056)) ([bd7c686](https://github.com/NativeScript/NativeScript/commit/bd7c686aaf55d26b2b483905bd5e0a453429cabd)) +* **frame:** add navigatingTo and navigatedTo events ([#9025](https://github.com/NativeScript/NativeScript/issues/9025)) ([cf96e72](https://github.com/NativeScript/NativeScript/commit/cf96e7252cdf66230cc03ddec907168e47d1f250)) + +### Performance + +* faster color parsing ([c569236](https://github.com/NativeScript/NativeScript/commit/c5692363575821ef588b2260e80ad5bbffe45293)) + + + ## [7.0.13](https://github.com/NativeScript/NativeScript/compare/7.0.12-core...7.0.13) (2020-10-28) diff --git a/packages/types/package.json b/packages/types/package.json index 3e110f126..688431db1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/types", - "version": "7.0.4", + "version": "7.1.0", "description": "NativeScript Types for all supported platforms.", "homepage": "https://nativescript.org", "repository": { @@ -12,7 +12,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@nativescript/types-ios": "7.0.4", - "@nativescript/types-android": "7.0.4" + "@nativescript/types-ios": "7.1.0", + "@nativescript/types-android": "7.1.0" } } From 79703a0a41e05ec0993a095fcb9d3995855b9330 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sun, 3 Jan 2021 14:09:36 -0800 Subject: [PATCH 14/23] chore: readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c210ec5ce..c934f18d9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- NativeScript + NativeScript

From b52414c4ad0e4c0ee6690f7965b09008754110d3 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sun, 3 Jan 2021 14:12:15 -0800 Subject: [PATCH 15/23] chore: readme --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index c934f18d9..7bb49109f 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,6 @@

-

-NativeScript -

- [![Build Status](https://travis-ci.org/NativeScript/NativeScript.svg?branch=master)](https://travis-ci.org/NativeScript/NativeScript) From 47ebb1d262aa9ebf29fe445e57d19910612d047f Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 5 Jan 2021 19:03:42 +0100 Subject: [PATCH 16/23] fix(core): const initializer in an ambient context (#9136) fixes #9135 --- packages/core/platform/index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/platform/index.d.ts b/packages/core/platform/index.d.ts index 2250bc73b..ceac382ce 100644 --- a/packages/core/platform/index.d.ts +++ b/packages/core/platform/index.d.ts @@ -126,7 +126,7 @@ export class Screen { * * This retains compatibility with NS6 */ -export const screen = Screen; +export const screen: Screen; /** * Gets the current device information. @@ -138,4 +138,4 @@ export const Device: IDevice; * * This retains compatibility with NS6 */ -export const device = Device; +export const device: IDevice; From 957a104f65d1fa33a06f55f475294ef23ecda446 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 5 Jan 2021 19:12:07 +0100 Subject: [PATCH 17/23] ci: fix paths --- .github/workflows/npm_release_core.yml | 2 +- .github/workflows/npm_release_types.yml | 2 +- .github/workflows/npm_release_webpack.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npm_release_core.yml b/.github/workflows/npm_release_core.yml index 821f5dd1f..9dd0d58c8 100644 --- a/.github/workflows/npm_release_core.yml +++ b/.github/workflows/npm_release_core.yml @@ -4,7 +4,7 @@ on: push: branches: [ 'master' ] paths: - - 'packages/core/*' + - 'packages/core/**' env: NPM_TAG: 'next' diff --git a/.github/workflows/npm_release_types.yml b/.github/workflows/npm_release_types.yml index fcc2e9e90..5ad8f6204 100644 --- a/.github/workflows/npm_release_types.yml +++ b/.github/workflows/npm_release_types.yml @@ -5,7 +5,7 @@ on: push: branches: [ 'master' ] paths: - - 'packages/types/*' + - 'packages/types/**' env: NPM_TAG: 'next' diff --git a/.github/workflows/npm_release_webpack.yml b/.github/workflows/npm_release_webpack.yml index c4f2affa0..ad622eb7b 100644 --- a/.github/workflows/npm_release_webpack.yml +++ b/.github/workflows/npm_release_webpack.yml @@ -4,7 +4,7 @@ on: push: branches: [ 'master' ] paths: - - 'packages/webpack/*' + - 'packages/webpack/**' env: NPM_TAG: 'next' From b8d828bef93154db338939afd9ae4781097fd851 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 13 Jan 2021 08:22:47 -0800 Subject: [PATCH 18/23] chore(release): @nativescript/core@7.1.1 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- packages/core/package.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f728acecd..ccaa124ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [7.1.1](https://github.com/NativeScript/NativeScript/compare/7.1.0-core...7.1.1) (2021-01-13) + + +### Bug Fixes + +* **core:** const initializer in an ambient context ([#9136](https://github.com/NativeScript/NativeScript/issues/9136)) ([47ebb1d](https://github.com/NativeScript/NativeScript/commit/47ebb1d262aa9ebf29fe445e57d19910612d047f)), closes [#9135](https://github.com/NativeScript/NativeScript/issues/9135) + + + # [7.1.0](https://github.com/NativeScript/NativeScript/compare/4.0.0-webpack...7.1.0) (2020-12-30) diff --git a/package.json b/package.json index 3b2119498..8756443dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.1.0", + "version": "7.1.1", "license": "MIT", "scripts": { "setup": "npx rimraf hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup", diff --git a/packages/core/package.json b/packages/core/package.json index 9ee967ea9..8aff3876d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.1.0", + "version": "7.1.1", "homepage": "https://nativescript.org", "repository": { "type": "git", From 882aa42e8573615aa5ba89396d0f0cdbb711bed3 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 13 Jan 2021 16:06:51 -0800 Subject: [PATCH 19/23] feat(core): rollup additional Utils --- packages/core/index.d.ts | 4 +++- packages/core/index.ts | 4 +++- packages/ui-mobile-base/package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts index 99a8e4f3f..e81e32221 100644 --- a/packages/core/index.d.ts +++ b/packages/core/index.d.ts @@ -93,7 +93,7 @@ export type { InstrumentationMode, TimerInfo } from './profiling'; export { encoding } from './text'; export * from './trace'; export * from './ui'; -import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, getModuleName, openFile, openUrl, isRealDevice, layout, ad as androidUtils, iOSNativeHelper as iosUtils, Source } from './utils'; +import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, getModuleName, openFile, openUrl, isRealDevice, layout, ad as androidUtils, iOSNativeHelper as iosUtils, Source, escapeRegexSymbols, convertString } from './utils'; import { ClassInfo, getClass, getBaseClasses, getClassInfo, isBoolean, isDefined, isFunction, isNullOrUndefined, isNumber, isObject, isString, isUndefined, toUIString, verifyCallback } from './utils/types'; export declare const Utils: { GC: typeof GC; @@ -107,6 +107,8 @@ export declare const Utils: { isMainThread: typeof isMainThread; dispatchToMainThread: typeof dispatchToMainThread; releaseNativeObject: typeof releaseNativeObject; + escapeRegexSymbols: typeof escapeRegexSymbols; + convertString: typeof convertString; getModuleName: typeof getModuleName; openFile: typeof openFile; openUrl: typeof openUrl; diff --git a/packages/core/index.ts b/packages/core/index.ts index 65879ead4..89f4e412f 100644 --- a/packages/core/index.ts +++ b/packages/core/index.ts @@ -110,7 +110,7 @@ export * from './trace'; export * from './ui'; -import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, queueMacrotask, releaseNativeObject, getModuleName, openFile, openUrl, isRealDevice, layout, ad as androidUtils, iOSNativeHelper as iosUtils, Source, RESOURCE_PREFIX, FILE_PREFIX } from './utils'; +import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, queueMacrotask, releaseNativeObject, getModuleName, openFile, openUrl, isRealDevice, layout, ad as androidUtils, iOSNativeHelper as iosUtils, Source, RESOURCE_PREFIX, FILE_PREFIX, escapeRegexSymbols, convertString } from './utils'; import { ClassInfo, getClass, getBaseClasses, getClassInfo, isBoolean, isDefined, isFunction, isNullOrUndefined, isNumber, isObject, isString, isUndefined, toUIString, verifyCallback } from './utils/types'; export const Utils = { @@ -126,6 +126,8 @@ export const Utils = { dispatchToMainThread, queueMacrotask, releaseNativeObject, + convertString, + escapeRegexSymbols, getModuleName, openFile, diff --git a/packages/ui-mobile-base/package.json b/packages/ui-mobile-base/package.json index 89820b440..8b62c5224 100644 --- a/packages/ui-mobile-base/package.json +++ b/packages/ui-mobile-base/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/ui-mobile-base", - "version": "7.0.0-rc.0", + "version": "7.0.0", "description": "Native UI base components used with NativeScript.", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" From 7a79a8988b55e7e0896e7ad38f571aba6987edb5 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 13 Jan 2021 16:07:14 -0800 Subject: [PATCH 20/23] fix(webpack): support other workspace config styles --- .../webpack/helpers/angular-config-parser.js | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/packages/webpack/helpers/angular-config-parser.js b/packages/webpack/helpers/angular-config-parser.js index b96be3a2a..95d4398f6 100644 --- a/packages/webpack/helpers/angular-config-parser.js +++ b/packages/webpack/helpers/angular-config-parser.js @@ -21,21 +21,26 @@ const parseWorkspaceConfig = function(platform, envConfigs, projectName, debug) if (workspaceConfig && projectName) { const projectSettings = workspaceConfig.projects[projectName]; if (projectSettings) { - + var targetProp = 'architect'; + if (!projectSettings.architect) { + targetProp = 'targets'; // Nx + } // default project configurations for (const envConfig of envConfigs) { - if (projectSettings.architect.default && projectSettings.architect.default.configurations) { - const defaultConfigurations = projectSettings.architect.default.configurations; - if (defaultConfigurations && defaultConfigurations[envConfig]) { - if (defaultConfigurations[envConfig].fileReplacements) { - for (const fileReplace of defaultConfigurations[envConfig].fileReplacements) { - if (debug) { - console.log('project fileReplacement:', fileReplace); - } - if (fileReplace.replace.indexOf('.ts') > -1) { - fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); - } else { - copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); + if (projectSettings[targetProp]) { + if (projectSettings[targetProp].default && projectSettings[targetProp].default.configurations) { + const defaultConfigurations = projectSettings[targetProp].default.configurations; + if (defaultConfigurations && defaultConfigurations[envConfig]) { + if (defaultConfigurations[envConfig].fileReplacements) { + for (const fileReplace of defaultConfigurations[envConfig].fileReplacements) { + if (debug) { + console.log('project fileReplacement:', fileReplace); + } + if (fileReplace.replace.indexOf('.ts') > -1) { + fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); + } else { + copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); + } } } } @@ -44,17 +49,19 @@ const parseWorkspaceConfig = function(platform, envConfigs, projectName, debug) } // platform specific configurations (always override top level project configurations) for (const envConfig of envConfigs) { - if (projectSettings.architect && projectSettings.architect[platform]) { - const platformConfig = projectSettings.architect[platform].configurations; - if (platformConfig && platformConfig[envConfig] && platformConfig[envConfig].fileReplacements) { - for (const fileReplace of platformConfig[envConfig].fileReplacements) { - if (debug) { - console.log(`"${platform}" specific fileReplacement:`, fileReplace); - } - if (fileReplace.replace.indexOf('.ts') > -1) { - fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); - } else { - copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); + if (projectSettings[targetProp]) { + if (projectSettings[targetProp] && projectSettings[targetProp][platform]) { + const platformConfig = projectSettings[targetProp][platform].configurations; + if (platformConfig && platformConfig[envConfig] && platformConfig[envConfig].fileReplacements) { + for (const fileReplace of platformConfig[envConfig].fileReplacements) { + if (debug) { + console.log(`"${platform}" specific fileReplacement:`, fileReplace); + } + if (fileReplace.replace.indexOf('.ts') > -1) { + fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); + } else { + copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); + } } } } From 29f2eb35de24f79b13c4a64cde6f1f0a085a35a1 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 13 Jan 2021 19:37:01 -0800 Subject: [PATCH 21/23] chore(release): @nativescript/core@7.1.2 --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- packages/core/package.json | 2 +- packages/webpack/package.json | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccaa124ed..771f4d46d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## [7.1.2](https://github.com/NativeScript/NativeScript/compare/7.1.1-core...7.1.2) (2021-01-14) + + +### Bug Fixes + +* **webpack:** support other workspace config styles ([7a79a89](https://github.com/NativeScript/NativeScript/commit/7a79a8988b55e7e0896e7ad38f571aba6987edb5)) + + +### Features + +* **core:** rollup additional Utils ([882aa42](https://github.com/NativeScript/NativeScript/commit/882aa42e8573615aa5ba89396d0f0cdbb711bed3)) + + + ## [7.1.1](https://github.com/NativeScript/NativeScript/compare/7.1.0-core...7.1.1) (2021-01-13) diff --git a/package.json b/package.json index 8756443dd..f3bbedee8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.1.1", + "version": "7.1.2", "license": "MIT", "scripts": { "setup": "npx rimraf hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup", diff --git a/packages/core/package.json b/packages/core/package.json index 8aff3876d..858e3e9b4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.1.1", + "version": "7.1.2", "homepage": "https://nativescript.org", "repository": { "type": "git", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index a36b8222c..52652eb40 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/webpack", - "version": "4.0.0", + "version": "4.0.1", "main": "index", "description": "Webpack plugin for NativeScript", "homepage": "https://nativescript.org", From 4690162384c731d6d652d90a9347cae06c0a0e0c Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sun, 17 Jan 2021 09:21:33 -0800 Subject: [PATCH 22/23] fix(android): BottomNavigation fragment child already has a parent (#9148) closes https://github.com/NativeScript/NativeScript/issues/8132 closes https://github.com/NativeScript/NativeScript/issues/7901 closes https://github.com/NativeScript/NativeScript/issues/9051 closes https://github.com/NativeScript/NativeScript/issues/8251 --- .../ui/bottom-navigation/index.android.ts | 86 ++++++++++++++----- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/packages/core/ui/bottom-navigation/index.android.ts b/packages/core/ui/bottom-navigation/index.android.ts index 6485a847d..e9ca17cc8 100644 --- a/packages/core/ui/bottom-navigation/index.android.ts +++ b/packages/core/ui/bottom-navigation/index.android.ts @@ -428,7 +428,7 @@ export class BottomNavigation extends TabNavigationBase { const fragmentToDetach = this._currentFragment; if (fragmentToDetach) { this.destroyItem((fragmentToDetach).index, fragmentToDetach); - this.commitCurrentTransaction(); + this.removeFragment(fragmentToDetach); } } @@ -454,28 +454,42 @@ export class BottomNavigation extends TabNavigationBase { private disposeTabFragments(): void { const fragmentManager = this._getFragmentManager(); - const transaction = fragmentManager.beginTransaction(); const fragments = fragmentManager.getFragments().toArray(); for (let i = 0; i < fragments.length; i++) { - transaction.remove(fragments[i]); + this.removeFragment(fragments[i]); } - - transaction.commitNowAllowingStateLoss(); } - private get currentTransaction(): androidx.fragment.app.FragmentTransaction { - if (!this._currentTransaction) { - const fragmentManager = this._getFragmentManager(); - this._currentTransaction = fragmentManager.beginTransaction(); - } - - return this._currentTransaction; - } - - private commitCurrentTransaction(): void { - if (this._currentTransaction) { - this._currentTransaction.commitNowAllowingStateLoss(); - this._currentTransaction = null; + private attachFragment(fragment: androidx.fragment.app.Fragment, id?: number, name?: string): void { + const fragmentManager = this._getFragmentManager(); + if (fragment) { + if (fragment.isAdded() || fragment.isRemoving()) { + // ignore + } else { + const fragmentExitTransition = fragment.getExitTransition(); + if (fragmentExitTransition && fragmentExitTransition instanceof org.nativescript.widgets.CustomTransition) { + fragmentExitTransition.setResetOnTransitionEnd(true); + } + if (fragmentManager) { + if (!fragmentManager.isDestroyed()) { + try { + if (fragmentManager.isStateSaved()) { + if (id && name) { + fragmentManager.beginTransaction().add(id, fragment, name).commitNowAllowingStateLoss(); + } else { + fragmentManager.beginTransaction().attach(fragment).commitNowAllowingStateLoss(); + } + } else { + if (id && name) { + fragmentManager.beginTransaction().add(id, fragment, name).commitNow(); + } else { + fragmentManager.beginTransaction().attach(fragment).commitNow(); + } + } + } catch (e) {} + } + } + } } } @@ -495,8 +509,6 @@ export class BottomNavigation extends TabNavigationBase { const fragment = this.instantiateItem(this._contentView, index); this.setPrimaryItem(index, fragment); - - this.commitCurrentTransaction(); } private instantiateItem(container: android.view.ViewGroup, position: number): androidx.fragment.app.Fragment { @@ -505,10 +517,10 @@ export class BottomNavigation extends TabNavigationBase { const fragmentManager = this._getFragmentManager(); let fragment: androidx.fragment.app.Fragment = fragmentManager.findFragmentByTag(name); if (fragment != null) { - this.currentTransaction.attach(fragment); + this.attachFragment(fragment); } else { fragment = TabFragment.newInstance(this._domId, position); - this.currentTransaction.add(container.getId(), fragment, name); + this.attachFragment(fragment, container.getId(), name); } if (fragment !== this._currentFragment) { @@ -545,7 +557,7 @@ export class BottomNavigation extends TabNavigationBase { private destroyItem(position: number, fragment: androidx.fragment.app.Fragment): void { if (fragment) { - this.currentTransaction.detach(fragment); + this.removeFragment(fragment); if (this._currentFragment === fragment) { this._currentFragment = null; } @@ -555,6 +567,34 @@ export class BottomNavigation extends TabNavigationBase { this.items[position].canBeLoaded = false; } } + private removeFragment(fragment: androidx.fragment.app.Fragment, fragmentManager?: any) { + if (!fragmentManager) { + fragmentManager = this._getFragmentManager(); + } + if (fragment) { + if (!fragment.isAdded() || fragment.isRemoving()) { + // ignore + return; + } else { + const fragmentExitTransition = fragment.getExitTransition(); + if (fragmentExitTransition && fragmentExitTransition instanceof org.nativescript.widgets.CustomTransition) { + fragmentExitTransition.setResetOnTransitionEnd(true); + } + if (fragment && fragment.isAdded() && !fragment.isRemoving()) { + const pfm = (fragment).getParentFragmentManager ? (fragment).getParentFragmentManager() : null; + if (pfm && !pfm.isDestroyed()) { + try { + if (pfm.isStateSaved()) { + pfm.beginTransaction().remove(fragment).commitNowAllowingStateLoss(); + } else { + pfm.beginTransaction().remove(fragment).commitNow(); + } + } catch (e) {} + } + } + } + } + } private setTabStripItems(items: Array) { if (!this.tabStrip || !items) { From 376f3ebdd79ccaa464fe63081bd67991f4ad6fe6 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sun, 17 Jan 2021 09:40:03 -0800 Subject: [PATCH 23/23] chore(release): @nativescript/core@7.1.3 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- packages/core/package.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 771f4d46d..78d1eb13a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [7.1.3](https://github.com/NativeScript/NativeScript/compare/7.1.2-core...7.1.3) (2021-01-17) + + +### Bug Fixes + +* **android:** BottomNavigation fragment child already has a parent ([#9148](https://github.com/NativeScript/NativeScript/issues/9148)) ([4690162](https://github.com/NativeScript/NativeScript/commit/4690162384c731d6d652d90a9347cae06c0a0e0c)) + + + ## [7.1.2](https://github.com/NativeScript/NativeScript/compare/7.1.1-core...7.1.2) (2021-01-14) diff --git a/package.json b/package.json index f3bbedee8..ed9191fe2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "7.1.2", + "version": "7.1.3", "license": "MIT", "scripts": { "setup": "npx rimraf hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup", diff --git a/packages/core/package.json b/packages/core/package.json index 858e3e9b4..d2ac0feaf 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.1.2", + "version": "7.1.3", "homepage": "https://nativescript.org", "repository": { "type": "git",