@prisma-next/cli 0.3.0-dev.13 → 0.3.0-dev.14

package/dist/cli.js

@@ -64,7 +64,7 @@ import {
   errorContractConfigMissing,
   errorContractMissingExtensionPacks,
   errorContractValidationFailed,
-  errorDatabaseUrlRequired,
+  errorDatabaseConnectionRequired,
   errorDriverRequired,
   errorFamilyReadMarkerSqlRequired,
   errorFileNotFound,
@@ -1348,10 +1348,10 @@ function createDbInitCommand() {
           { where: { path: contractPathAbsolute } }
         );
       }
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired({
-          why: `Database URL is required for db init (set db.url in ${configPath}, or pass --db <url>)`
+      const dbConnection = options.db ?? config.db?.connection;
+      if (!dbConnection) {
+        throw errorDatabaseConnectionRequired({
+          why: `Database connection is required for db init (set db.connection in ${configPath}, or pass --db <url>)`
         });
       }
       if (!config.driver) {
@@ -1366,20 +1366,20 @@ function createDbInitCommand() {
       const migrations = config.target.migrations;
       let driver;
       try {
-        driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
+        driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
           message: "Connecting to database...",
           flags
         });
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         const code = error.code;
-        const redacted = redactDatabaseUrl(dbUrl);
+        const redacted = typeof dbConnection === "string" ? redactDatabaseUrl(dbConnection) : void 0;
         throw errorRuntime("Database connection failed", {
           why: message,
-          fix: "Verify the database URL, ensure the database is reachable, and confirm credentials/permissions",
+          fix: "Verify the database connection, ensure the database is reachable, and confirm credentials/permissions",
           meta: {
             ...typeof code !== "undefined" ? { code } : {},
-            ...redacted
+            ...redacted ?? {}
           }
         });
       }
@@ -1581,7 +1581,7 @@ function createDbInitCommand() {
 import { readFile as readFile2 } from "fs/promises";
 import { relative as relative4, resolve as resolve4 } from "path";
 import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired2,
+  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired2,
   errorDriverRequired as errorDriverRequired2,
   errorRuntime as errorRuntime2,
   errorUnexpected as errorUnexpected3
@@ -1627,8 +1627,8 @@ function createDbIntrospectCommand() {
         if (options.db) {
           const maskedUrl = options.db.replace(/:([^:@]+)@/, ":****@");
           details.push({ label: "database", value: maskedUrl });
-        } else if (config.db?.url) {
-          const maskedUrl = config.db.url.replace(/:([^:@]+)@/, ":****@");
+        } else if (config.db?.connection && typeof config.db.connection === "string") {
+          const maskedUrl = config.db.connection.replace(/:([^:@]+)@/, ":****@");
           details.push({ label: "database", value: maskedUrl });
         }
         const header = formatStyledHeader({
@@ -1640,15 +1640,15 @@ function createDbIntrospectCommand() {
         });
         console.log(header);
       }
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired2();
+      const dbConnection = options.db ?? config.db?.connection;
+      if (!dbConnection) {
+        throw errorDatabaseConnectionRequired2();
       }
       if (!config.driver) {
         throw errorDriverRequired2();
       }
       const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
+      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
         message: "Connecting to database...",
         flags
       });
@@ -1698,6 +1698,7 @@ function createDbIntrospectCommand() {
         if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
           console.log("");
         }
+        const connectionForMeta = typeof dbConnection === "string" ? dbConnection.replace(/:([^:@]+)@/, ":****@") : void 0;
         const introspectResult = {
           ok: true,
           summary: "Schema introspected successfully",
@@ -1706,15 +1707,10 @@ function createDbIntrospectCommand() {
             id: config.target.targetId
           },
           schema: schemaIR,
-          ...configPath || options.db || config.db?.url ? {
+          ...configPath || connectionForMeta ? {
             meta: {
               ...configPath ? { configPath } : {},
-              ...options.db || config.db?.url ? {
-                dbUrl: (options.db ?? config.db?.url ?? "").replace(
-                  /:([^:@]+)@/,
-                  ":****@"
-                )
-              } : {}
+              ...connectionForMeta ? { dbUrl: connectionForMeta } : {}
             }
           } : {},
           timings: {
@@ -1746,7 +1742,7 @@ function createDbIntrospectCommand() {
 import { readFile as readFile3 } from "fs/promises";
 import { relative as relative5, resolve as resolve5 } from "path";
 import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired3,
+  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired3,
   errorDriverRequired as errorDriverRequired3,
   errorFileNotFound as errorFileNotFound2,
   errorRuntime as errorRuntime3,
@@ -1817,11 +1813,11 @@ function createDbSchemaVerifyCommand() {
       const familyInstance = config.family.create(stack);
       const contractIR = familyInstance.validateContractIR(contractJson);
       assertContractRequirementsSatisfied({ contract: contractIR, stack });
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired3();
+      const dbConnection = options.db ?? config.db?.connection;
+      if (!dbConnection) {
+        throw errorDatabaseConnectionRequired3();
       }
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
+      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
         message: "Connecting to database...",
         flags
       });
@@ -1884,7 +1880,7 @@ function createDbSchemaVerifyCommand() {
 import { readFile as readFile4 } from "fs/promises";
 import { relative as relative6, resolve as resolve6 } from "path";
 import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired4,
+  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired4,
   errorDriverRequired as errorDriverRequired4,
   errorFileNotFound as errorFileNotFound3,
   errorRuntime as errorRuntime4,
@@ -1942,9 +1938,9 @@ function createDbSignCommand() {
         });
       }
       const contractJson = JSON.parse(contractJsonContent);
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired4();
+      const dbConnection = options.db ?? config.db?.connection;
+      if (!dbConnection) {
+        throw errorDatabaseConnectionRequired4();
       }
       if (!config.driver) {
         throw errorDriverRequired4();
@@ -1965,7 +1961,7 @@ function createDbSignCommand() {
         config.target.targetId,
         rawComponents
       );
-      const driver = await driverDescriptor.create(dbUrl);
+      const driver = await driverDescriptor.create(dbConnection);
       try {
         let schemaVerifyResult;
         try {
@@ -2055,7 +2051,7 @@ function createDbSignCommand() {
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative7, resolve as resolve7 } from "path";
 import {
-  errorDatabaseUrlRequired as errorDatabaseUrlRequired5,
+  errorDatabaseConnectionRequired as errorDatabaseConnectionRequired5,
   errorDriverRequired as errorDriverRequired5,
   errorFileNotFound as errorFileNotFound4,
   errorHashMismatch as errorHashMismatch2,
@@ -2116,15 +2112,15 @@ function createDbVerifyCommand() {
         });
       }
       const contractJson = JSON.parse(contractJsonContent);
-      const dbUrl = options.db ?? config.db?.url;
-      if (!dbUrl) {
-        throw errorDatabaseUrlRequired5();
+      const dbConnection = options.db ?? config.db?.connection;
+      if (!dbConnection) {
+        throw errorDatabaseConnectionRequired5();
       }
       if (!config.driver) {
         throw errorDriverRequired5();
       }
       const driverDescriptor = config.driver;
-      const driver = await withSpinner(() => driverDescriptor.create(dbUrl), {
+      const driver = await withSpinner(() => driverDescriptor.create(dbConnection), {
         message: "Connecting to database...",
         flags
       });