@abloatai/cli 0.59.1 → 0.59.2

package/dist/cli.cjs

@@ -1443,7 +1443,6 @@ var init_bytes = __esm({
 // ../../node_modules/postgres/src/connection.js
 function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose = noop } = {}) {
   const {
-    sslnegotiation,
     ssl,
     max,
     user,
@@ -1461,7 +1460,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     target_session_attrs
   } = options;
   const sent = queue_default(), id = uid++, backend = { pid: null, secret: null }, idleTimer = timer(end, options.idle_timeout), lifeTimer = timer(end, options.max_lifetime), connectTimer = timer(connectTimedOut, options.connect_timeout);
-  let socket = null, cancelMessage, errorResponse = null, result = new Result(), incoming = Buffer.alloc(0), needsTypes = options.fetch_types, backendParameters = {}, statements = {}, statementId = Math.random().toString(36).slice(2), statementCount = 1, closedTime = 0, remaining = 0, hostIndex = 0, retries = 0, length = 0, delay = 0, rows = 0, serverSignature = null, nextWriteTimer = null, terminated = false, incomings = null, results = null, initial = null, ending = null, stream = null, chunk = null, ended = null, nonce = null, query = null, final = null;
+  let socket = null, cancelMessage, result = new Result(), incoming = Buffer.alloc(0), needsTypes = options.fetch_types, backendParameters = {}, statements = {}, statementId = Math.random().toString(36).slice(2), statementCount = 1, closedDate = 0, remaining = 0, hostIndex = 0, retries = 0, length = 0, delay = 0, rows = 0, serverSignature = null, nextWriteTimer = null, terminated = false, incomings = null, results = null, initial = null, ending = null, stream = null, chunk = null, ended = null, nonce = null, query = null, final = null;
   const connection2 = {
     queue: queues.closed,
     idleTimer,
@@ -1504,8 +1503,6 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function execute(q2) {
     if (terminated)
       return queryError(q2, Errors.connection("CONNECTION_DESTROYED", options));
-    if (stream)
-      return queryError(q2, Errors.generic("COPY_IN_PROGRESS", "You cannot execute queries during copy"));
     if (q2.cancelled)
       return;
     try {
@@ -1575,24 +1572,16 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     socket.destroy();
   }
   async function secure() {
-    if (sslnegotiation !== "direct") {
-      write(SSLRequest);
-      const canSSL = await new Promise((r2) => socket.once("data", (x2) => r2(x2[0] === 83)));
-      if (!canSSL && ssl === "prefer")
-        return connected();
-    }
-    const options2 = {
-      socket,
-      servername: import_net.default.isIP(socket.host) ? void 0 : socket.host
-    };
-    if (sslnegotiation === "direct")
-      options2.ALPNProtocols = ["postgresql"];
-    if (ssl === "require" || ssl === "allow" || ssl === "prefer")
-      options2.rejectUnauthorized = false;
-    else if (typeof ssl === "object")
-      Object.assign(options2, ssl);
+    write(SSLRequest);
+    const canSSL = await new Promise((r2) => socket.once("data", (x2) => r2(x2[0] === 83)));
+    if (!canSSL && ssl === "prefer")
+      return connected();
     socket.removeAllListeners();
-    socket = import_tls.default.connect(options2);
+    socket = import_tls.default.connect({
+      socket,
+      servername: import_net.default.isIP(socket.host) ? void 0 : socket.host,
+      ...ssl === "require" || ssl === "allow" || ssl === "prefer" ? { rejectUnauthorized: false } : ssl === "verify-full" ? {} : typeof ssl === "object" ? ssl : {}
+    });
     socket.on("secureConnect", connected);
     socket.on("error", error);
     socket.on("close", closed);
@@ -1646,7 +1635,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     hostIndex = (hostIndex + 1) % port.length;
   }
   function reconnect() {
-    setTimeout(connect2, closedTime ? Math.max(0, closedTime + delay - import_perf_hooks.performance.now()) : 0);
+    setTimeout(connect2, closedDate ? closedDate + delay - import_perf_hooks.performance.now() : 0);
   }
   function connected() {
     try {
@@ -1719,7 +1708,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     if (initial)
       return reconnect();
     !hadError && (query || sent.length) && error(Errors.connection("CONNECTION_CLOSED", options, socket));
-    closedTime = import_perf_hooks.performance.now();
+    closedDate = import_perf_hooks.performance.now();
     hadError && options.shared.retries++;
     delay = (typeof backoff2 === "function" ? backoff2(options.shared.retries) : backoff2) * 1e3;
     onclose(connection2, Errors.connection("CONNECTION_CLOSED", options, socket));
@@ -1824,16 +1813,8 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     }
   }
   function ReadyForQuery(x2) {
-    if (query) {
-      if (errorResponse) {
-        query.retried ? errored(query.retried) : query.prepared && retryRoutines.has(errorResponse.routine) ? retry(query, errorResponse) : errored(errorResponse);
-      } else {
-        query.resolve(results || result);
-      }
-    } else if (errorResponse) {
-      errored(errorResponse);
-    }
-    query = results = errorResponse = null;
+    query && query.options.simple && query.resolve(results || result);
+    query = results = null;
     result = new Result();
     connectTimer.cancel();
     if (initial) {
@@ -1878,6 +1859,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       result.count && query.cursorFn(result);
       write(Sync);
     }
+    query.resolve(result);
   }
   function ParseComplete() {
     query.parsing = false;
@@ -2025,12 +2007,9 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     query2.execute();
   }
   function ErrorResponse(x2) {
-    if (query) {
-      (query.cursorFn || query.describeFirst) && write(Sync);
-      errorResponse = Errors.postgres(parseError(x2));
-    } else {
-      errored(Errors.postgres(parseError(x2)));
-    }
+    query && (query.cursorFn || query.describeFirst) && write(Sync);
+    const error2 = Errors.postgres(parseError(x2));
+    query && query.retried ? errored(query.retried) : query && query.prepared && retryRoutines.has(error2.routine) ? retry(query, error2) : errored(error2);
   }
   function retry(q2, error2) {
     delete statements[q2.signature];
@@ -2075,7 +2054,6 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       final(callback) {
         socket.write(bytes_default().c().end());
         final = callback;
-        stream = null;
       }
     });
     query.resolve(stream);
@@ -2868,9 +2846,8 @@ function parseOptions(a, b4) {
   query.sslrootcert === "system" && (query.ssl = "verify-full");
   const ints = ["idle_timeout", "connect_timeout", "max_lifetime", "max_pipeline", "backoff", "keep_alive"];
   const defaults = {
-    max: globalThis.Cloudflare ? 3 : 10,
+    max: 10,
     ssl: false,
-    sslnegotiation: null,
     idle_timeout: null,
     connect_timeout: 30,
     max_lifetime,
@@ -3976,7 +3953,7 @@ var init_observeCliError = __esm({
     import_errorObservation = require("@abloatai/transaction/errorObservation");
     import_errors5 = require("@abloatai/transaction/errors");
     dsn = process.env.ABLO_CLI_SENTRY_DSN ?? "https://1ac154bff10b06836e1ea9de9e0d92f0@o4510928209772544.ingest.de.sentry.io/4511660691423312" ?? "";
-    release = process.env.ABLO_CLI_RELEASE ?? "@abloatai/cli@0.59.1";
+    release = process.env.ABLO_CLI_RELEASE ?? "@abloatai/cli@0.59.2";
     initialized = false;
     nativeProcessExit = process.exit.bind(process);
     exitBoundaryInstalled = false;
@@ -4311,7 +4288,7 @@ var init_src2 = __esm({
 
 // src/cliEnvironment.ts
 function cliVersion() {
-  return "0.59.1";
+  return "0.59.2";
 }
 function cliOs() {
   const value = (0, import_node_os.platform)();
@@ -219915,9 +219892,9 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
   }
 });
 
-// ../../node_modules/balanced-match/dist/commonjs/index.js
+// ../../node_modules/@ts-morph/common/node_modules/balanced-match/dist/commonjs/index.js
 var require_commonjs = __commonJS({
-  "../../node_modules/balanced-match/dist/commonjs/index.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/balanced-match/dist/commonjs/index.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -219978,9 +219955,9 @@ var require_commonjs = __commonJS({
   }
 });
 
-// ../../node_modules/brace-expansion/dist/commonjs/index.js
+// ../../node_modules/@ts-morph/common/node_modules/brace-expansion/dist/commonjs/index.js
 var require_commonjs2 = __commonJS({
-  "../../node_modules/brace-expansion/dist/commonjs/index.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -220074,7 +220051,7 @@ var require_commonjs2 = __commonJS({
       }
       return out;
     }
-    function expandSequence(body, isAlphaSequence, max) {
+    function expandSequence(body, isAlphaSequence, max, maxLength) {
       const n = body.split(/\.\./);
       const N2 = [];
       if (n[0] === void 0 || n[1] === void 0) {
@@ -220091,6 +220068,7 @@ var require_commonjs2 = __commonJS({
         test = gte;
       }
       const pad2 = n.some(isPadded);
+      let length = 0;
       for (let i = x2; test(i, y3) && N2.length < max; i += incr) {
         let c;
         if (isAlphaSequence) {
@@ -220112,7 +220090,10 @@ var require_commonjs2 = __commonJS({
             }
           }
         }
+        if (length + c.length > maxLength)
+          break;
         N2.push(c);
+        length += c.length;
       }
       return N2;
     }
@@ -220152,7 +220133,7 @@ var require_commonjs2 = __commonJS({
         }
         let values2;
         if (isSequence) {
-          values2 = expandSequence(m2.body, isAlphaSequence, max);
+          values2 = expandSequence(m2.body, isAlphaSequence, max, maxLength);
         } else {
           let n = parseCommaParts(m2.body);
           if (n.length === 1 && n[0] !== void 0) {
@@ -220165,9 +220146,26 @@ var require_commonjs2 = __commonJS({
               continue;
             }
           }
+          let dropsEmpties = dropEmpties && !m2.post.length && !pre;
+          for (let d3 = 0; dropsEmpties && d3 < acc.length; d3++) {
+            if (acc[d3]) {
+              dropsEmpties = false;
+            }
+          }
           values2 = [];
-          for (let j2 = 0; j2 < n.length; j2++) {
-            values2.push.apply(values2, expand_(n[j2], max, maxLength, false));
+          let valuesLength = 0;
+          outer: for (let j2 = 0; j2 < n.length; j2++) {
+            const expanded = expand_(n[j2], max, maxLength, false);
+            for (let k3 = 0; k3 < expanded.length; k3++) {
+              const v2 = expanded[k3];
+              if (dropsEmpties && !v2)
+                continue;
+              if (values2.length >= max || valuesLength + v2.length > maxLength) {
+                break outer;
+              }
+              values2.push(v2);
+              valuesLength += v2.length;
+            }
           }
         }
         acc = combine(acc, pre, values2, max, maxLength, dropEmpties && !m2.post.length);
@@ -220180,9 +220178,9 @@ var require_commonjs2 = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/assert-valid-pattern.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/assert-valid-pattern.js
 var require_assert_valid_pattern = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/assert-valid-pattern.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/assert-valid-pattern.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -220200,9 +220198,9 @@ var require_assert_valid_pattern = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/brace-expressions.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/brace-expressions.js
 var require_brace_expressions = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/brace-expressions.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/brace-expressions.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -220318,9 +220316,9 @@ var require_brace_expressions = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/unescape.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/unescape.js
 var require_unescape = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/unescape.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/unescape.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -220335,9 +220333,9 @@ var require_unescape = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/ast.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/ast.js
 var require_ast = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/ast.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/ast.js"(exports2) {
     "use strict";
     init_cjs_shims();
     var _a;
@@ -220990,9 +220988,9 @@ var require_ast = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/escape.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/escape.js
 var require_escape = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/escape.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/escape.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -221007,9 +221005,9 @@ var require_escape = __commonJS({
   }
 });
 
-// ../../node_modules/minimatch/dist/commonjs/index.js
+// ../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/index.js
 var require_commonjs3 = __commonJS({
-  "../../node_modules/minimatch/dist/commonjs/index.js"(exports2) {
+  "../../node_modules/@ts-morph/common/node_modules/minimatch/dist/commonjs/index.js"(exports2) {
     "use strict";
     init_cjs_shims();
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -222530,9 +222528,9 @@ var require_is_glob = __commonJS({
   }
 });
 
-// ../../node_modules/fast-glob/node_modules/glob-parent/index.js
+// ../../node_modules/glob-parent/index.js
 var require_glob_parent = __commonJS({
-  "../../node_modules/fast-glob/node_modules/glob-parent/index.js"(exports2, module2) {
+  "../../node_modules/glob-parent/index.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var isGlob = require_is_glob();
@@ -223652,9 +223650,9 @@ var require_braces = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/lib/constants.js
+// ../../node_modules/picomatch/lib/constants.js
 var require_constants2 = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/lib/constants.js"(exports2, module2) {
+  "../../node_modules/picomatch/lib/constants.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var path = require("path");
@@ -223854,9 +223852,9 @@ var require_constants2 = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/lib/utils.js
+// ../../node_modules/picomatch/lib/utils.js
 var require_utils2 = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/lib/utils.js"(exports2) {
+  "../../node_modules/picomatch/lib/utils.js"(exports2) {
     "use strict";
     init_cjs_shims();
     var path = require("path");
@@ -223916,9 +223914,9 @@ var require_utils2 = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/lib/scan.js
+// ../../node_modules/picomatch/lib/scan.js
 var require_scan = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/lib/scan.js"(exports2, module2) {
+  "../../node_modules/picomatch/lib/scan.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var utils = require_utils2();
@@ -224247,9 +224245,9 @@ var require_scan = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/lib/parse.js
+// ../../node_modules/picomatch/lib/parse.js
 var require_parse2 = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/lib/parse.js"(exports2, module2) {
+  "../../node_modules/picomatch/lib/parse.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var constants = require_constants2();
@@ -225250,9 +225248,9 @@ var require_parse2 = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/lib/picomatch.js
+// ../../node_modules/picomatch/lib/picomatch.js
 var require_picomatch = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/lib/picomatch.js"(exports2, module2) {
+  "../../node_modules/picomatch/lib/picomatch.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var path = require("path");
@@ -225392,9 +225390,9 @@ var require_picomatch = __commonJS({
   }
 });
 
-// ../../node_modules/micromatch/node_modules/picomatch/index.js
+// ../../node_modules/picomatch/index.js
 var require_picomatch2 = __commonJS({
-  "../../node_modules/micromatch/node_modules/picomatch/index.js"(exports2, module2) {
+  "../../node_modules/picomatch/index.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     module2.exports = require_picomatch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abloatai/cli",
-  "version": "0.59.1",
+  "version": "0.59.2",
   "description": "The ablo command line: set up Ablo, connect your database, and push your schema from the terminal.",
   "license": "Apache-2.0",
   "homepage": "https://docs.abloatai.com/cli",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@sentry/node": "^10.18.0",
-    "@abloatai/transaction": "^0.59.1",
+    "@abloatai/transaction": "^0.59.2",
     "jiti": "^2.7.0",
     "zod": "^4.4.3",
-    "@abloatai/humans": "^0.59.1"
+    "@abloatai/humans": "^0.59.2"
   },
   "devDependencies": {
     "@ablo/product-analytics": "file:../product-analytics",