Merge branch 'DefinitelyTyped:master' into master

Author: marle3003

.github/CODEOWNERS

@@ -708,7 +708,7 @@
 /types/bull-arena/                                      @levibostian @gtpan77
 /types/bumblebee-hotword/                               @sheunglaili
 /types/bump-regex/                                      @silkentrance
-/types/bun/                                             @Jarred-Sumner @electroid @paperclover @robobun @dylan-conway @nektro @RiskyMH @alii
+/types/bun/                                             @Jarred-Sumner @electroid @robobun @dylan-conway @nektro @RiskyMH @alii
 /types/bundle-id/                                       @LeoDog896
 /types/bundle-name/                                     @LeoDog896
 /types/bunnymq/                                         @cyrilschumacher
@@ -1139,6 +1139,7 @@
 /types/counterpart/                                     @santiagodoldan
 /types/country-data/                                    @biltongza @mikemaccana
 /types/country-flag-icons/                              @peterblazejewicz
+/types/country-iso/                                     @TylerWon
 /types/country-list/                                    @iRoachie @Kimahriman
 /types/country-list/v1/                                 @iRoachie
 /types/country-list-js/                                 @digorydoo
@@ -3599,7 +3600,7 @@
 /types/jcof/                                            @MatyiFKBT
 /types/jconv/                                           @thany
 /types/jdataview/                                       @RReverser
-/types/jest/                                            @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @UselessPickles @r3nya @hotell @sebald @andys8 @antoinebrault @gstamac @ExE-Boss @quassnoi @Belco90 @tonyhallett @ycmjason @pawfa @gerkindev @domdomegg @mrazauskas
+/types/jest/                                            @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @UselessPickles @r3nya @hotell @sebald @andys8 @antoinebrault @gstamac @ExE-Boss @quassnoi @Belco90 @tonyhallett @ycmjason @pawfa @gerkindev @domdomegg
 /types/jest-axe/                                        @erbridge
 /types/jest-dev-server/                                 @ifiokjr @UziTech
 /types/jest-environment-puppeteer/                      @ifiokjr
@@ -5169,6 +5170,7 @@
 /types/node/                                            @Microsoft @jkomyno @alvis @r3nya @btoueg @smac89 @touffy @DeividasBakanas @eyqs @Hannes-Magnusson-CK @hoo29 @kjin @ajafff @islishude @mwiktorczyk @mohsen1 @galkin @parambirs @eps1lon @ThomasdenH @WilcoBakker @wwwy3y3 @samuela @kuehlein @bhongy @chyzwar @trivikr @yoursunny @qwelias @ExE-Boss @peterblazejewicz @addaleax @victorperin @NodeJS @LinusU @wafuwafu13 @mcollina @Semigradsky @Renegade334
 /types/node/v18/                                        @Microsoft @jkomyno @alvis @r3nya @btoueg @smac89 @touffy @DeividasBakanas @eyqs @Hannes-Magnusson-CK @hoo29 @kjin @ajafff @islishude @mwiktorczyk @mohsen1 @galkin @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @samuela @kuehlein @bhongy @chyzwar @trivikr @yoursunny @qwelias @ExE-Boss @peterblazejewicz @addaleax @victorperin @NodeJS @LinusU @wafuwafu13 @mcollina @Semigradsky
 /types/node/v20/                                        @Microsoft @jkomyno @alvis @r3nya @btoueg @smac89 @touffy @DeividasBakanas @eyqs @Hannes-Magnusson-CK @hoo29 @kjin @ajafff @islishude @mwiktorczyk @mohsen1 @galkin @parambirs @eps1lon @ThomasdenH @WilcoBakker @wwwy3y3 @samuela @kuehlein @bhongy @chyzwar @trivikr @yoursunny @qwelias @ExE-Boss @peterblazejewicz @addaleax @victorperin @NodeJS @LinusU @wafuwafu13 @mcollina @Semigradsky
+/types/node/v22/                                        @Microsoft @jkomyno @alvis @r3nya @btoueg @smac89 @touffy @DeividasBakanas @eyqs @Hannes-Magnusson-CK @hoo29 @kjin @ajafff @islishude @mwiktorczyk @mohsen1 @galkin @parambirs @eps1lon @ThomasdenH @WilcoBakker @wwwy3y3 @samuela @kuehlein @bhongy @chyzwar @trivikr @yoursunny @qwelias @ExE-Boss @peterblazejewicz @addaleax @victorperin @NodeJS @LinusU @wafuwafu13 @mcollina @Semigradsky @Renegade334
 /types/node-7z/                                         @erkie @colin969
 /types/node-abi/                                        @ffflorian
 /types/node-apple-receipt-verify/                       @serinuntius

notNeededPackages.json

@@ -2149,6 +2149,10 @@
             "libraryName": "@ffmpeg-installer/ffmpeg",
             "asOfVersion": "1.1.0"
         },
+        "ffmpeg-static": {
+            "libraryName": "ffmpeg-static",
+            "asOfVersion": "5.1.0"
+        },
         "fhir-kit-client": {
             "libraryName": "fhir-kit-client",
             "asOfVersion": "1.6.7"
@@ -2597,6 +2601,10 @@
             "libraryName": "@hapi/boom",
             "asOfVersion": "9.0.0"
         },
+        "hapi__catbox": {
+            "libraryName": "@hapi/catbox",
+            "asOfVersion": "12.1.0"
+        },
         "hapi__catbox-memory": {
             "libraryName": "@hapi/catbox-memory",
             "asOfVersion": "6.0.2"
@@ -3601,6 +3609,10 @@
             "libraryName": "lambda-phi",
             "asOfVersion": "1.0.1"
         },
+        "lang.js": {
+            "libraryName": "lang.js",
+            "asOfVersion": "1.1.13"
+        },
         "latest-semver": {
             "libraryName": "latest-semver",
             "asOfVersion": "2.0.0"
@@ -6887,6 +6899,10 @@
             "libraryName": "spotify-web-api-js",
             "asOfVersion": "0.21.0"
         },
+        "sql-bricks": {
+            "libraryName": "sql-bricks",
+            "asOfVersion": "3.0.0"
+        },
         "sql-formatter": {
             "libraryName": "sql-formatter",
             "asOfVersion": "4.0.1"
@@ -7639,6 +7655,10 @@
             "libraryName": "viewerjs",
             "asOfVersion": "1.0.0"
         },
+        "vinyl-file": {
+            "libraryName": "vinyl-file",
+            "asOfVersion": "4.1.0"
+        },
         "vite-plugin-react-control-statements": {
             "libraryName": "vite-plugin-react-control-statements",
             "asOfVersion": "0.0.1"

types/aws-lambda/test/cloudfront-tests.ts

@@ -7,6 +7,7 @@ import type {
     CloudFrontRequestHandler,
     CloudFrontRequestResult,
     CloudFrontResponseEvent,
+    CloudFrontResponseEventRecord,
     CloudFrontResponseHandler,
     CloudFrontResponseResult,
     CloudFrontS3Origin,
@@ -554,6 +555,133 @@ const originResponseEvent: CloudFrontResponseEvent = {
     ],
 };
 
+const originResponseEventRecord: CloudFrontResponseEventRecord = {
+    cf: {
+        config: {
+            distributionDomainName: "d111111abcdef8.cloudfront.net",
+            distributionId: "EDFDVBD6EXAMPLE",
+            eventType: "origin-response",
+            requestId: "4TyzHTaYWb1GX1qTfsHhEqV6HUDd_BzoBZnwfnvQc_1oF26ClkoUSEQ==",
+        },
+        request: {
+            clientIp: "203.0.113.178",
+            headers: {
+                "x-forwarded-for": [
+                    {
+                        key: "X-Forwarded-For",
+                        value: "203.0.113.178",
+                    },
+                ],
+                "user-agent": [
+                    {
+                        key: "User-Agent",
+                        value: "Amazon CloudFront",
+                    },
+                ],
+                via: [
+                    {
+                        key: "Via",
+                        value: "2.0 8f22423015641505b8c857a37450d6c0.cloudfront.net (CloudFront)",
+                    },
+                ],
+                host: [
+                    {
+                        key: "Host",
+                        value: "example.org",
+                    },
+                ],
+                "cache-control": [
+                    {
+                        key: "Cache-Control",
+                        value: "no-cache, cf-no-cache",
+                    },
+                ],
+            },
+            method: "GET",
+            origin: {
+                custom: {
+                    customHeaders: {},
+                    domainName: "example.org",
+                    keepaliveTimeout: 5,
+                    path: "",
+                    port: 443,
+                    protocol: "https",
+                    readTimeout: 30,
+                    sslProtocols: ["TLSv1", "TLSv1.1", "TLSv1.2"],
+                },
+            },
+            querystring: "",
+            uri: "/",
+        },
+        response: {
+            headers: {
+                "access-control-allow-credentials": [
+                    {
+                        key: "Access-Control-Allow-Credentials",
+                        value: "true",
+                    },
+                ],
+                "access-control-allow-origin": [
+                    {
+                        key: "Access-Control-Allow-Origin",
+                        value: "*",
+                    },
+                ],
+                date: [
+                    {
+                        key: "Date",
+                        value: "Mon, 13 Jan 2020 20:12:38 GMT",
+                    },
+                ],
+                "referrer-policy": [
+                    {
+                        key: "Referrer-Policy",
+                        value: "no-referrer-when-downgrade",
+                    },
+                ],
+                server: [
+                    {
+                        key: "Server",
+                        value: "ExampleCustomOriginServer",
+                    },
+                ],
+                "x-content-type-options": [
+                    {
+                        key: "X-Content-Type-Options",
+                        value: "nosniff",
+                    },
+                ],
+                "x-frame-options": [
+                    {
+                        key: "X-Frame-Options",
+                        value: "DENY",
+                    },
+                ],
+                "x-xss-protection": [
+                    {
+                        key: "X-XSS-Protection",
+                        value: "1; mode=block",
+                    },
+                ],
+                "content-type": [
+                    {
+                        key: "Content-Type",
+                        value: "text/html; charset=utf-8",
+                    },
+                ],
+                "content-length": [
+                    {
+                        key: "Content-Length",
+                        value: "9593",
+                    },
+                ],
+            },
+            status: "200",
+            statusDescription: "OK",
+        },
+    },
+};
+
 const cloudFrontFunctionsEvent: CloudFrontFunctionsEvent = {
     version: "1.0",
     context: {

types/aws-lambda/trigger/cloudfront-response.d.ts

@@ -4,18 +4,20 @@ import { Callback, Handler } from "../handler";
 export type CloudFrontResponseHandler = Handler<CloudFrontResponseEvent, CloudFrontResponseResult>;
 export type CloudFrontResponseCallback = Callback<CloudFrontResponseResult>;
 
+export interface CloudFrontResponseEventRecord {
+    cf: CloudFrontEvent & {
+        readonly request: Pick<CloudFrontRequest, Exclude<keyof CloudFrontRequest, "body">>;
+        response: CloudFrontResponse;
+    };
+}
+
 /**
  * CloudFront viewer response or origin response event
  *
  * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html#lambda-event-structure-response
  */
 export interface CloudFrontResponseEvent {
-    Records: Array<{
-        cf: CloudFrontEvent & {
-            readonly request: Pick<CloudFrontRequest, Exclude<keyof CloudFrontRequest, "body">>;
-            response: CloudFrontResponse;
-        };
-    }>;
+    Records: CloudFrontResponseEventRecord[];
 }
 
 export type CloudFrontResponseResult = undefined | null | CloudFrontResultResponse;

types/ffmpeg-static/.npmignore types/country-iso/.npmignoretypes/ffmpeg-static/.npmignore renamed to types/country-iso/.npmignore

@@ -0,0 +1,4 @@
+import { get } from "country-iso";
+
+// $ExpectType string[]
+const results = get(51.5074, -0.1278);

types/country-iso/country-iso-tests.ts

@@ -0,0 +1 @@
+export function get(lat: number, lng: number): string[];

types/country-iso/index.d.ts

@@ -0,0 +1,17 @@
+{
+    "private": true,
+    "name": "@types/country-iso",
+    "version": "2.0.9999",
+    "projects": [
+        "https://github.com/simonepri/country-iso#readme"
+    ],
+    "devDependencies": {
+        "@types/country-iso": "workspace:."
+    },
+    "owners": [
+        {
+            "name": "Tyler Won",
+            "githubUsername": "TylerWon"
+        }
+    ]
+}

types/country-iso/package.json

@@ -6,14 +6,14 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "sql-bricks-tests.ts"
+        "country-iso-tests.ts"
     ]
 }

types/sql-bricks/tsconfig.json types/country-iso/tsconfig.jsontypes/sql-bricks/tsconfig.json renamed to types/country-iso/tsconfig.json

@@ -387,6 +387,73 @@ docker.createNetwork({ Name: "networkName" }, (err, network) => {
     });
 });
 
+// Should support all network create options
+// See: https://github.com/moby/moby/blob/7ea613d780be40e08665f0fc15bf53f5993455a9/api/types/network/network.go#L23-L46
+docker.createNetwork({
+    Name: "networkName",
+    CheckDuplicate: true,
+    abortSignal: new AbortController().signal,
+    Driver: "bridge",
+    Scope: "local",
+    EnableIPv4: true,
+    EnableIPv6: true,
+    IPAM: {
+        Driver: "default",
+        Options: {
+            foo: "bar",
+        },
+        Config: [
+            {
+                Subnet: "172.28.0.0/16",
+                IPRange: "172.28.1.0/24",
+                Gateway: "172.28.0.1",
+            },
+        ],
+    },
+    Internal: true,
+    Attachable: true,
+    Ingress: true,
+    // Docker doesn't accept ConfigFrom & ConfigOnly together,
+    // but that's not dockerode's job to enforce.
+    ConfigOnly: true,
+    ConfigFrom: { Network: "configOnlyNetwork" },
+    Options: { someOption: "someValue" },
+    Labels: { someLabel: "someValue" },
+}, (err, network) => {
+    network.remove((err, data) => {
+        // NOOP
+    });
+});
+
+// Should support all network create IPAM config options
+// See: https://github.com/moby/moby/blob/5d7550e9ef36f860738af643d321a132539452af/api/types/network/ipam.go#L11-L24
+docker.createNetwork({
+    Name: "ipamNetwork",
+    IPAM: {
+        Driver: "default",
+        Config: [
+            {
+                Subnet: "172.28.0.0/16",
+                IPRange: "172.28.5.0/24",
+                Gateway: "172.28.5.254",
+                AuxiliaryAddresses: {
+                    host1: "172.28.1.5",
+                    host2: "172.28.1.6",
+                    host3: "172.28.1.7",
+                },
+            },
+        ],
+        Options: {
+            foo: "bar",
+            bar: "0",
+        },
+    },
+}, (err, network) => {
+    network.remove((err, data) => {
+        // NOOP
+    });
+});
+
 docker.createVolume();
 
 docker.createVolume({ Name: "volumeName", abortSignal: new AbortController().signal });