@sqlanvil/cli 1.1.0 → 1.1.2

package/bundle.js

@@ -38608,7 +38608,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.1.0";
+const version = "1.1.2";
 const dataformVersion = "3.0.59";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -38844,6 +38844,17 @@ class CompileChildProcess extends BaseWorker {
     }
 }
 
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 const CREDENTIALS_FILENAME = ".df-credentials.json";
 function read(credentialsPath, warehouse = "bigquery") {
     var _a;
@@ -38857,16 +38868,17 @@ function read(credentialsPath, warehouse = "bigquery") {
     catch (e) {
         throw new Error(`Error reading credentials file: ${e.message}`);
     }
+    const warehouseCredentials = __rest(credentialsAsJson, ["connections"]);
     const isPostgres = warehouse.toLowerCase() === "postgres" || warehouse.toLowerCase() === "supabase";
     if (isPostgres) {
-        const credentials = verifyObjectMatchesProto(sqlanvil.PostgresConnection, credentialsAsJson);
+        const credentials = verifyObjectMatchesProto(sqlanvil.PostgresConnection, warehouseCredentials);
         if (!credentials.host) {
             throw new Error(`Error reading credentials file: the host field is required`);
         }
         return credentials;
     }
     else {
-        const credentials = verifyObjectMatchesProto(sqlanvil.BigQuery, credentialsAsJson);
+        const credentials = verifyObjectMatchesProto(sqlanvil.BigQuery, warehouseCredentials);
         if (!((_a = Object.keys(credentials).find(key => key === "projectId")) === null || _a === void 0 ? void 0 : _a.length)) {
             throw new Error(`Error reading credentials file: the projectId field is required`);
         }
@@ -39082,10 +39094,10 @@ function resolveConnection(projectDir, connectionName) {
         throw new Error(`Missing .df-credentials.json in ${projectDir}.`);
     }
     const allCreds = JSON.parse(fs__namespace.readFileSync(credsPath, "utf8"));
-    const credentials = allCreds[connectionName];
+    const credentials = allCreds.connections && allCreds.connections[connectionName];
     if (!credentials) {
         throw new Error(`No credentials for connection "${connectionName}" in .df-credentials.json ` +
-            `(expected a top-level "${connectionName}" key).`);
+            `(expected a "connections.${connectionName}" entry).`);
     }
     return { name: connectionName, definition, credentials };
 }

package/package.json

@@ -61,7 +61,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.1.0",
+    "version": "1.1.2",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"