Merge remote-tracking branch 'origin/next' into esm-js-extensions

Author: taeold

package.json

@@ -198,6 +198,11 @@
       "import": "./lib/esm/v2/providers/firestore.mjs",
       "require": "./lib/v2/providers/firestore.js"
     },
+    "./dataconnect": {
+      "types": "./lib/v2/providers/dataconnect.d.ts",
+      "import": "./lib/esm/v2/providers/dataconnect.mjs",
+      "require": "./lib/v2/providers/dataconnect.js"
+    },
     "./v2": {
       "types": "./lib/v2/index.d.ts",
       "import": "./lib/esm/v2/index.mjs",
@@ -292,6 +297,11 @@
       "types": "./lib/v2/providers/firestore.d.ts",
       "import": "./lib/esm/v2/providers/firestore.mjs",
       "require": "./lib/v2/providers/firestore.js"
+    },
+    "./v2/dataconnect": {
+      "types": "./lib/v2/providers/dataconnect.d.ts",
+      "import": "./lib/esm/v2/providers/dataconnect.mjs",
+      "require": "./lib/v2/providers/dataconnect.js"
     }
   },
   "publishConfig": {
@@ -380,4 +390,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}

spec/common/metaprogramming.ts

@@ -23,3 +23,4 @@
 /* eslint-disable @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-function */
 export function expectType<Type>(value: Type) {}
 export function expectNever<Type extends never>() {}
+export function expectExtends<Type, Test extends Type>() {}

spec/common/params.spec.ts

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ignoreUnusedWarning OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { Extract, ParamsOf, Split } from "../../src/common/params";
+import { VarName, ParamsOf, Split } from "../../src/common/params";
 import { expectNever, expectType } from "./metaprogramming";
 
 describe("Params namespace", () => {
@@ -56,21 +56,21 @@ describe("Params namespace", () => {
     });
   });
 
-  describe("Extract", () => {
+  describe("VarName", () => {
     it("extracts nothing from strings without params", () => {
-      expectNever<Extract<"uid">>();
+      expectNever<VarName<"uid">>();
     });
 
     it("extracts {segment} captures", () => {
-      expectType<Extract<"{uid}">>("uid");
+      expectType<VarName<"{uid}">>("uid");
     });
 
     it("extracts {segment=*} captures", () => {
-      expectType<Extract<"{uid=*}">>("uid");
+      expectType<VarName<"{uid=*}">>("uid");
     });
 
     it("extracts {segment=**} captures", () => {
-      expectType<Extract<"{uid=**}">>("uid");
+      expectType<VarName<"{uid=**}">>("uid");
     });
   });