[pull] master from DefinitelyTyped:master

.github/workflows/UpdateCodeowners.yml

@@ -27,14 +27,14 @@ jobs:
 
       - uses: ./.github/actions/setup-for-scripts
 
-      - run: git config --global user.email "typescriptbot@microsoft.com"
-      - run: git config --global user.name "TypeScript Bot"
+      - run: git config --global user.email "290192711+typescript-automation[bot]@users.noreply.github.com"
+      - run: git config --global user.name "typescript-automation[bot]"
 
       - run: pnpm run update-codeowners
 
       - uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
-          commit_author: 'TypeScript Bot <typescriptbot@microsoft.com>'
+          commit_author: 'typescript-automation[bot] <290192711+typescript-automation[bot]@users.noreply.github.com>'
           commit_message: '🤖 Update CODEOWNERS'
-          commit_user_email: 'typescriptbot@microsoft.com'
-          commit_user_name: 'TypeScript Bot'
+          commit_user_email: '290192711+typescript-automation[bot]@users.noreply.github.com'
+          commit_user_name: 'typescript-automation[bot]'

.github/workflows/format-and-commit.yml

@@ -12,12 +12,11 @@ on:
 jobs:
   dprint-fmt:
     runs-on: ubuntu-slim
+    permissions:
+      contents: write
     if: github.repository == 'DefinitelyTyped/DefinitelyTyped'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          # Use a deploy key so that CI triggers on pushes; we want to know if formatting broke something.
-          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - uses: ./.github/actions/setup-for-scripts
 
       - name: Get date
@@ -42,7 +41,7 @@ jobs:
 
       - uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
-          commit_author: 'TypeScript Bot <typescriptbot@microsoft.com>'
+          commit_author: 'typescript-automation[bot] <290192711+typescript-automation[bot]@users.noreply.github.com>'
           commit_message: '🤖 dprint fmt'
-          commit_user_email: 'typescriptbot@microsoft.com'
-          commit_user_name: 'TypeScript Bot'
+          commit_user_email: '290192711+typescript-automation[bot]@users.noreply.github.com'
+          commit_user_name: 'typescript-automation[bot]'

.github/workflows/ghostbuster.yml

@@ -32,8 +32,8 @@ jobs:
       - if: ${{ inputs.skipPR == 'true' }}
         run: |
           if [ -n "`git status -s`" ]; then
-            git config --global user.email "typescriptbot@microsoft.com"
-            git config --global user.name "TypeScript Bot"
+            git config --global user.email "290192711+typescript-automation[bot]@users.noreply.github.com"
+            git config --global user.name "typescript-automation[bot]"
             git commit -am "Remove contributors with deleted accounts #no-publishing-comment"
             # Script can take a bit to run; with such an active repo there's a good chance
             # someone has merged a PR in that time.
@@ -46,8 +46,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: 'Remove contributors with deleted accounts #no-publishing-comment'
-          committer: 'TypeScript Bot <typescriptbot@microsoft.com>'
-          author: 'TypeScript Bot <typescriptbot@microsoft.com>'
+          committer: 'typescript-automation[bot] <290192711+typescript-automation[bot]@users.noreply.github.com>'
+          author: 'typescript-automation[bot] <290192711+typescript-automation[bot]@users.noreply.github.com>'
           branch: 'bust-ghosts'
           branch-suffix: short-commit-hash
           delete-branch: true

.github/workflows/support-window.yml

@@ -45,7 +45,7 @@ jobs:
 
       - uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
-          commit_author: 'TypeScript Bot <typescriptbot@microsoft.com>'
+          commit_author: 'typescript-automation[bot] <290192711+typescript-automation[bot]@users.noreply.github.com>'
           commit_message: '🤖 Update support window'
-          commit_user_email: 'typescriptbot@microsoft.com'
-          commit_user_name: 'TypeScript Bot'
+          commit_user_email: '290192711+typescript-automation[bot]@users.noreply.github.com'
+          commit_user_name: 'typescript-automation[bot]'

types/apple-mapkit/apple-mapkit-tests.ts

@@ -5,7 +5,7 @@ import {
     AnnotationConstructorOptions,
     BoundingRegion,
     CameraZoomRange,
-    CameraZoomRangeConstructorOptions,
+    CameraZoomRangeData,
     CircleOverlay,
     Coordinate,
     CoordinateRegion,
@@ -31,8 +31,6 @@ import {
     LookAroundPreviewOptions,
     Map,
     MapConstructorOptions,
-    MapKitEvent,
-    MapKitEventListener,
     MapKitInitializationOptions,
     MapPoint,
     MapRect,
@@ -43,7 +41,8 @@ import {
     Overlay,
     OverlayOptions,
     Padding,
-    PaddingConstructorOptions,
+    PaddingData,
+    Place,
     PlaceAnnotation,
     PlaceDetail,
     PlaceDetailOptions,
@@ -154,7 +153,7 @@ const paddingFromOptions: Padding = new mapkit.Padding(
         right: 20,
         bottom: 30,
         left: 40,
-    } satisfies PaddingConstructorOptions,
+    } satisfies PaddingData,
 );
 const paddingCopy: Padding = padding.copy();
 const paddingsEqual: boolean = padding.equals(paddingCopy);
@@ -166,7 +165,7 @@ const zoomRangeFromOptions: CameraZoomRange = new mapkit.CameraZoomRange(
     {
         minCameraDistance: 100,
         maxCameraDistance: 10000,
-    } satisfies CameraZoomRangeConstructorOptions,
+    } satisfies CameraZoomRangeData,
 );
 const zoomRangeCopy: CameraZoomRange = zoomRange.copy();
 const minDistance: number = zoomRange.minCameraDistance;
@@ -348,7 +347,7 @@ map.addOverlay(circle);
 map.addOverlays([polygon, polyline]);
 
 map.selectedOverlay = circle;
-const topOverlay: Overlay | undefined = map.topOverlayAtPoint(pagePoint);
+const topOverlay: Overlay | null = map.topOverlayAtPoint(pagePoint);
 const overlaysAtPoint: Overlay[] = map.overlaysAtPoint(pagePoint);
 map.removeOverlay(circle);
 map.removeOverlays([polygon, polyline]);
@@ -385,32 +384,26 @@ const geocodeLookupOptions: GeocoderLookupOptions = {
     limitToCountries: "US,CA",
 };
 
-geocoder.lookup(
-    "Apple Park",
-    (error, response) => {
-        if (error) {
-            console.error("Geocoder error:", error);
-            return;
-        }
-        console.log("Geocoder results:", response?.results);
+geocoder.lookup("Apple Park", geocodeLookupOptions).then(
+    (response: GeocoderResponse) => {
+        console.log("Geocoder results:", response.results);
+    },
+    (error: Error) => {
+        console.error("Geocoder error:", error);
     },
-    geocodeLookupOptions,
 );
 
 const geocoderReverseLookupOptions: GeocoderReverseLookupOptions = {
     language: "en-US",
 };
 
-geocoder.reverseLookup(
-    coordinate,
-    (error, response: GeocoderResponse | undefined) => {
-        if (error) {
-            console.error("Reverse geocoder error:", error);
-            return;
-        }
-        console.log("Reverse geocoder results:", response?.results);
+geocoder.reverseLookup(coordinate, geocoderReverseLookupOptions).then(
+    (response: GeocoderResponse) => {
+        console.log("Reverse geocoder results:", response.results);
+    },
+    (error: Error) => {
+        console.error("Reverse geocoder error:", error);
     },
-    geocoderReverseLookupOptions,
 );
 
 const searchConstructorOptions: SearchConstructorOptions = {
@@ -434,14 +427,14 @@ const searchOptions: SearchOptions = {
 
 search.search(
     "coffee shops",
-    (error, response: SearchResponse | undefined) => {
-        if (error) {
-            console.error("Search error:", error);
-            return;
-        }
-        console.log("Search results:", response?.places);
-    },
     searchOptions,
+).then(
+    (response: SearchResponse) => {
+        console.log("Search results:", response.places);
+    },
+    (error: Error) => {
+        console.error("Search error:", error);
+    },
 );
 
 const searchAutocompleteOptions: SearchAutocompleteOptions = {
@@ -450,16 +443,13 @@ const searchAutocompleteOptions: SearchAutocompleteOptions = {
     includeAddresses: true,
 };
 
-search.autocomplete(
-    "coff",
-    (error, response: SearchAutocompleteResponse | undefined) => {
-        if (error) {
-            console.error("Autocomplete error:", error);
-            return;
-        }
-        console.log("Autocomplete results:", response?.results);
+search.autocomplete("coff", searchAutocompleteOptions).then(
+    (response: SearchAutocompleteResponse) => {
+        console.log("Autocomplete results:", response.results);
+    },
+    (error: Error) => {
+        console.error("Autocomplete error:", error);
     },
-    searchAutocompleteOptions,
 );
 
 const directionsConstructorOptions: DirectionsConstructorOptions = {
@@ -477,14 +467,12 @@ const directionsRequest: DirectionsRequest = {
     avoidTolls: false,
 };
 
-directions.route(
-    directionsRequest,
-    (error, response: DirectionsResponse | undefined) => {
-        if (error) {
-            console.error("Directions error:", error);
-            return;
-        }
-        console.log("Route results:", response?.routes);
+directions.route(directionsRequest).then(
+    (response: DirectionsResponse) => {
+        console.log("Route results:", response.routes);
+    },
+    (error: Error) => {
+        console.error("Directions error:", error);
     },
 );
 
@@ -494,24 +482,23 @@ const etaRequest: EtaRequestOptions = {
     transportType: mapkit.Directions.Transport.Walking,
 };
 
-directions.eta(etaRequest, (error, response: EtaResponse | undefined) => {
-    if (error) {
+directions.eta(etaRequest).then(
+    (response: EtaResponse) => {
+        console.log("ETA results:", response.etas);
+    },
+    (error: Error) => {
         console.error("ETA error:", error);
-        return;
-    }
-    console.log("ETA results:", response?.etas);
-});
+    },
+);
 
 const placeLookup: PlaceLookup = new mapkit.PlaceLookup({ language: "en-US" });
-placeLookup.getPlace(
-    "place-id-here",
-    (error, place) => {
-        if (error) {
-            console.error("Place lookup error:", error);
-            return;
-        }
+placeLookup.getPlace("place-id-here").then(
+    (place: Place) => {
         console.log("Place details:", place);
     },
+    (error: Error) => {
+        console.error("Place lookup error:", error);
+    },
 );
 
 const poiSearchOptions: PointsOfInterestSearchOptions = {
@@ -527,13 +514,12 @@ const poiSearch: PointsOfInterestSearch = new mapkit.PointsOfInterestSearch(
     poiSearchOptions,
 );
 
-poiSearch.search(
-    (error: Error | null, response?: PointsOfInterestSearchResponse) => {
-        if (error) {
-            console.error("POI search error:", error);
-            return;
-        }
-        console.log("POI results:", response?.places);
+poiSearch.search().then(
+    (response: PointsOfInterestSearchResponse) => {
+        console.log("POI results:", response.places);
+    },
+    (error: Error) => {
+        console.error("POI search error:", error);
     },
 );
 
@@ -640,7 +626,7 @@ map.removeItems(allItems);
 
 // ===== Event Handling =====
 
-const mapSelectListener: MapKitEventListener = (event: MapKitEvent) => {
+const mapSelectListener: EventListener = (event: Event) => {
     console.log("Map selected:", event);
 };
 
@@ -752,8 +738,8 @@ map.selectableMapFeatures = [
 
 map.annotationForMapFeature = mapFeatureAnnotation => {
     return new mapkit.MarkerAnnotation(mapFeatureAnnotation.coordinate, {
-        title: mapFeatureAnnotation.title,
-        subtitle: mapFeatureAnnotation.subtitle,
+        title: mapFeatureAnnotation.title ?? undefined,
+        subtitle: mapFeatureAnnotation.subtitle ?? undefined,
         color: "#FF3B30",
     });
 };
@@ -775,10 +761,8 @@ const annotationSize: Size = { width: 32, height: 32 };
 
 // ===== Utility Methods =====
 
-const requestId: number = search.search("query", () => {});
-if (requestId) {
-    search.cancel(requestId);
-}
+const abortController = new AbortController();
+const result: Promise<SearchResponse> = search.search("query", { signal: abortController.signal });
 
 map.destroy();