@prisma-next/cli 0.1.0-dev.29 → 0.1.0-dev.30

package/dist/cli.js

@@ -61,6 +61,7 @@ import {
   errorConfigFileNotFound as errorConfigFileNotFound2,
   errorConfigValidation,
   errorContractConfigMissing,
+  errorContractMissingExtensionPacks,
   errorContractValidationFailed,
   errorDatabaseUrlRequired,
   errorDriverRequired,
@@ -1137,7 +1138,7 @@ function createContractEmitCommand() {
         target: config.target,
         adapter: config.adapter,
         driver: config.driver,
-        extensions: config.extensions ?? []
+        extensionPacks: config.extensionPacks ?? []
       });
       let contractRaw;
       if (typeof contractConfig.source === "function") {
@@ -1198,6 +1199,9 @@ import { redactDatabaseUrl } from "@prisma-next/utils/redact-db-url";
 import { Command as Command2 } from "commander";
 
 // src/utils/framework-components.ts
+import {
+  checkContractComponentRequirements
+} from "@prisma-next/contract/framework-components";
 function assertFrameworkComponentsCompatible(expectedFamilyId, expectedTargetId, frameworkComponents) {
   for (let i = 0; i < frameworkComponents.length; i++) {
     const component = frameworkComponents[i];
@@ -1243,6 +1247,40 @@ function assertFrameworkComponentsCompatible(expectedFamilyId, expectedTargetId,
   }
   return frameworkComponents;
 }
+function assertContractRequirementsSatisfied({
+  contract,
+  family,
+  target,
+  adapter,
+  extensionPacks
+}) {
+  const providedComponentIds = /* @__PURE__ */ new Set([target.id, adapter.id]);
+  for (const extension of extensionPacks ?? []) {
+    providedComponentIds.add(extension.id);
+  }
+  const result = checkContractComponentRequirements({
+    contract,
+    expectedTargetFamily: family.familyId,
+    expectedTargetId: target.targetId,
+    providedComponentIds
+  });
+  if (result.familyMismatch) {
+    throw errorConfigValidation("contract.targetFamily", {
+      why: `Contract was emitted for family '${result.familyMismatch.actual}' but CLI config is wired to '${result.familyMismatch.expected}'.`
+    });
+  }
+  if (result.targetMismatch) {
+    throw errorConfigValidation("contract.target", {
+      why: `Contract target '${result.targetMismatch.actual}' does not match CLI target '${result.targetMismatch.expected}'.`
+    });
+  }
+  if (result.missingExtensionPackIds.length > 0) {
+    throw errorContractMissingExtensionPacks({
+      missingExtensionPacks: result.missingExtensionPackIds,
+      providedComponentIds: [...providedComponentIds]
+    });
+  }
+}
 
 // src/commands/db-init.ts
 function createDbInitCommand() {
@@ -1355,15 +1393,22 @@ function createDbInitCommand() {
           target: config.target,
           adapter: config.adapter,
           driver: driverDescriptor,
-          extensions: config.extensions ?? []
+          extensionPacks: config.extensionPacks ?? []
         });
-        const rawComponents = [config.target, config.adapter, ...config.extensions ?? []];
+        const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
         const frameworkComponents = assertFrameworkComponentsCompatible(
           config.family.familyId,
           config.target.targetId,
           rawComponents
         );
         const contractIR = familyInstance.validateContractIR(contractJson);
+        assertContractRequirementsSatisfied({
+          contract: contractIR,
+          family: config.family,
+          target: config.target,
+          adapter: config.adapter,
+          extensionPacks: config.extensionPacks
+        });
         const planner = migrations.createPlanner(familyInstance);
         const runner = migrations.createRunner(familyInstance);
         const schemaIR = await withSpinner(() => familyInstance.introspect({ driver }), {
@@ -1621,10 +1666,18 @@ function createDbIntrospectCommand() {
           target: config.target,
           adapter: config.adapter,
           driver: driverDescriptor,
-          extensions: config.extensions ?? []
+          extensionPacks: config.extensionPacks ?? []
         });
         if (contractIR) {
-          contractIR = familyInstance.validateContractIR(contractIR);
+          const validatedContract = familyInstance.validateContractIR(contractIR);
+          assertContractRequirementsSatisfied({
+            contract: validatedContract,
+            family: config.family,
+            target: config.target,
+            adapter: config.adapter,
+            extensionPacks: config.extensionPacks
+          });
+          contractIR = validatedContract;
         }
         let schemaIR;
         try {
@@ -1764,32 +1817,39 @@ function createDbSchemaVerifyCommand() {
         });
       }
       const contractJson = JSON.parse(contractJsonContent);
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired3();
-      }
       if (!config.driver) {
         throw errorDriverRequired3();
       }
       const driverDescriptor = config.driver;
+      const familyInstance = config.family.create({
+        target: config.target,
+        adapter: config.adapter,
+        driver: driverDescriptor,
+        extensionPacks: config.extensionPacks ?? []
+      });
+      const contractIR = familyInstance.validateContractIR(contractJson);
+      assertContractRequirementsSatisfied({
+        contract: contractIR,
+        family: config.family,
+        target: config.target,
+        adapter: config.adapter,
+        extensionPacks: config.extensionPacks
+      });
+      const dbUrl = options.db ?? config.db?.url;
+      if (!dbUrl) {
+        throw errorDatabaseUrlRequired3();
+      }
       const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
         message: "Connecting to database...",
         flags
       });
       try {
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensions: config.extensions ?? []
-        });
-        const rawComponents = [config.target, config.adapter, ...config.extensions ?? []];
+        const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
         const frameworkComponents = assertFrameworkComponentsCompatible(
           config.family.familyId,
           config.target.targetId,
           rawComponents
         );
-        const contractIR = familyInstance.validateContractIR(contractJson);
         let schemaVerifyResult;
         try {
           schemaVerifyResult = await withSpinner(
@@ -1907,21 +1967,28 @@ function createDbSignCommand() {
         throw errorDriverRequired4();
       }
       const driverDescriptor = config.driver;
+      const familyInstance = config.family.create({
+        target: config.target,
+        adapter: config.adapter,
+        driver: driverDescriptor,
+        extensionPacks: config.extensionPacks ?? []
+      });
+      const contractIR = familyInstance.validateContractIR(contractJson);
+      assertContractRequirementsSatisfied({
+        contract: contractIR,
+        family: config.family,
+        target: config.target,
+        adapter: config.adapter,
+        extensionPacks: config.extensionPacks
+      });
+      const rawComponents = [config.target, config.adapter, ...config.extensionPacks ?? []];
+      const frameworkComponents = assertFrameworkComponentsCompatible(
+        config.family.familyId,
+        config.target.targetId,
+        rawComponents
+      );
       const driver = await driverDescriptor.create(dbUrl);
       try {
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensions: config.extensions ?? []
-        });
-        const rawComponents = [config.target, config.adapter, ...config.extensions ?? []];
-        const frameworkComponents = assertFrameworkComponentsCompatible(
-          config.family.familyId,
-          config.target.targetId,
-          rawComponents
-        );
-        const contractIR = familyInstance.validateContractIR(contractJson);
         let schemaVerifyResult;
         try {
           schemaVerifyResult = await withSpinner(
@@ -2087,9 +2154,16 @@ function createDbVerifyCommand() {
           target: config.target,
           adapter: config.adapter,
           driver: driverDescriptor,
-          extensions: config.extensions ?? []
+          extensionPacks: config.extensionPacks ?? []
         });
         const contractIR = familyInstance.validateContractIR(contractJson);
+        assertContractRequirementsSatisfied({
+          contract: contractIR,
+          family: config.family,
+          target: config.target,
+          adapter: config.adapter,
+          extensionPacks: config.extensionPacks
+        });
         let verifyResult;
         try {
           verifyResult = await withSpinner(