@bungres/kit 0.7.0 → 1.0.0

package/dist/index.js

@@ -55,12 +55,12 @@ var require_src = __commonJS((exports, module) => {
         ret += `${CSI2}${y}B`;
       return ret;
     },
-    up: (count2 = 1) => `${CSI2}${count2}A`,
-    down: (count2 = 1) => `${CSI2}${count2}B`,
-    forward: (count2 = 1) => `${CSI2}${count2}C`,
-    backward: (count2 = 1) => `${CSI2}${count2}D`,
-    nextLine: (count2 = 1) => `${CSI2}E`.repeat(count2),
-    prevLine: (count2 = 1) => `${CSI2}F`.repeat(count2),
+    up: (count = 1) => `${CSI2}${count}A`,
+    down: (count = 1) => `${CSI2}${count}B`,
+    forward: (count = 1) => `${CSI2}${count}C`,
+    backward: (count = 1) => `${CSI2}${count}D`,
+    nextLine: (count = 1) => `${CSI2}E`.repeat(count),
+    prevLine: (count = 1) => `${CSI2}F`.repeat(count),
     left: `${CSI2}G`,
     hide: `${CSI2}?25l`,
     show: `${CSI2}?25h`,
@@ -68,21 +68,21 @@ var require_src = __commonJS((exports, module) => {
     restore: `${ESC2}8`
   };
   var scroll = {
-    up: (count2 = 1) => `${CSI2}S`.repeat(count2),
-    down: (count2 = 1) => `${CSI2}T`.repeat(count2)
+    up: (count = 1) => `${CSI2}S`.repeat(count),
+    down: (count = 1) => `${CSI2}T`.repeat(count)
   };
   var erase = {
     screen: `${CSI2}2J`,
-    up: (count2 = 1) => `${CSI2}1J`.repeat(count2),
-    down: (count2 = 1) => `${CSI2}J`.repeat(count2),
+    up: (count = 1) => `${CSI2}1J`.repeat(count),
+    down: (count = 1) => `${CSI2}J`.repeat(count),
     line: `${CSI2}2K`,
     lineEnd: `${CSI2}K`,
     lineStart: `${CSI2}1K`,
-    lines(count2) {
+    lines(count) {
       let clear = "";
-      for (let i = 0;i < count2; i++)
-        clear += this.line + (i < count2 - 1 ? cursor.up() : "");
-      if (count2)
+      for (let i = 0;i < count; i++)
+        clear += this.line + (i < count - 1 ? cursor.up() : "");
+      if (count)
         clear += cursor.left;
       return clear;
     }
@@ -97,16 +97,16 @@ var require_picocolors = __commonJS((exports, module) => {
   var env = p2.env || {};
   var isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p2.platform === "win32" || (p2.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
   var formatter = (open, close, replace = open) => (input) => {
-    let string = "" + input, index2 = string.indexOf(close, open.length);
-    return ~index2 ? open + replaceClose(string, close, replace, index2) + close : open + string + close;
+    let string = "" + input, index = string.indexOf(close, open.length);
+    return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
   };
-  var replaceClose = (string, close, replace, index2) => {
+  var replaceClose = (string, close, replace, index) => {
     let result = "", cursor3 = 0;
     do {
-      result += string.substring(cursor3, index2) + replace;
-      cursor3 = index2 + close.length;
-      index2 = string.indexOf(close, cursor3);
-    } while (~index2);
+      result += string.substring(cursor3, index) + replace;
+      cursor3 = index + close.length;
+      index = string.indexOf(close, cursor3);
+    } while (~index);
     return result + string.substring(cursor3);
   };
   var createColors = (enabled = isColorSupported) => {
@@ -202,7 +202,7 @@ async function loadConfig(cwd = process.cwd()) {
 // src/schema-loader.ts
 import { resolve as resolve2, join as join2 } from "path";
 
-// ../bungres-orm/src/schema/table.ts
+// ../bungres-orm/dist/index.js
 var TableConfigSymbol = Symbol.for("BungresTableConfig");
 function getTableConfig(table) {
   return table[TableConfigSymbol];
@@ -272,7 +272,6 @@ var table = createTableFactory("snake");
 var snakeCase = { table: createTableFactory("snake") };
 var camelCase = { table: createTableFactory("camel") };
 var noCasing = { table: createTableFactory("none") };
-// ../bungres-orm/src/schema/columns.ts
 function buildColumn(dataType, nameOrOpts, opts) {
   let name = "";
   let options = opts;
@@ -301,6 +300,13 @@ function buildColumn(dataType, nameOrOpts, opts) {
   return Object.assign(config, {
     as(alias) {
       return Object.assign({}, this, { alias });
+    },
+    array() {
+      return Object.assign({}, this, { dataType: `${this.dataType}[]` });
+    },
+    generatedAlwaysAs(expr) {
+      const sqlStr = typeof expr === "string" ? expr : expr.sql;
+      return Object.assign({}, this, { generatedAs: sqlStr });
     }
   });
 }
@@ -330,7 +336,6 @@ var textArray = col("text[]");
 var integerArray = col("integer[]");
 var varcharArray = col("varchar[]");
 var uuidArray = col("uuid[]");
-// ../bungres-orm/src/core/sql.ts
 function sql(strings, ...values) {
   let query = "";
   const params = [];
@@ -373,7 +378,6 @@ function colName(c) {
     return c.sql;
   return c.tableName ? `${c.tableName}."${c.name}"` : `"${c.name}"`;
 }
-// ../bungres-orm/src/core/conditions.ts
 function isColumnConfig(val) {
   return val !== null && typeof val === "object" && "name" in val && "dataType" in val;
 }
@@ -527,14 +531,13 @@ function parseOrderByObject(tableConfig, orderByObj) {
   }
   return parts;
 }
-
-// ../bungres-orm/src/builders/delete.ts
 class DeleteBuilder {
   _table;
   _executor;
   _where = [];
   _returning;
   _comment;
+  _with = [];
   constructor(table2, executor) {
     this._table = table2;
     this._executor = executor;
@@ -553,6 +556,10 @@ class DeleteBuilder {
     }
     return this;
   }
+  with(...ctes) {
+    this._with.push(...ctes);
+    return this;
+  }
   returning(...columns) {
     this._returning = columns.length > 0 ? columns : ["*"];
     return this;
@@ -562,8 +569,20 @@ class DeleteBuilder {
     return this;
   }
   toSQL() {
-    let query = `DELETE FROM ${getTableConfig(this._table).qualifiedName}`;
+    const tConfig = getTableConfig(this._table);
     const params = [];
+    let prefix = "";
+    if (this._with.length > 0) {
+      const cteStrs = [];
+      for (const cte of this._with) {
+        const chunk = cte.query.toSQL();
+        const offset = params.length;
+        params.push(...chunk.params);
+        cteStrs.push(`"${cte.alias}" AS (${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)})`);
+      }
+      prefix = `WITH ${cteStrs.join(", ")} `;
+    }
+    let query = `DELETE FROM ${tConfig.qualifiedName}`;
     if (this._where.length > 0) {
       const combined = sqlJoin(this._where, " AND ");
       query += " WHERE " + combined.sql;
@@ -575,17 +594,19 @@ class DeleteBuilder {
     if (this._comment) {
       query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
-    return { sql: query, params };
+    return { sql: prefix + query, params };
   }
 }
-// ../bungres-orm/src/builders/insert.ts
+
 class InsertBuilder {
   _table;
   _executor;
   _values = [];
   _onConflict;
+  _onConflictUpdateConfig;
   _returning;
   _comment;
+  _with = [];
   constructor(table2, executor) {
     this._table = table2;
     this._executor = executor;
@@ -612,6 +633,14 @@ class InsertBuilder {
     this._onConflict = clause;
     return this;
   }
+  onConflictDoUpdate(config) {
+    this._onConflictUpdateConfig = config;
+    return this;
+  }
+  with(...ctes) {
+    this._with.push(...ctes);
+    return this;
+  }
   returning(...columns) {
     this._returning = columns.length > 0 ? columns : ["*"];
     return this;
@@ -637,6 +666,17 @@ class InsertBuilder {
     }
     const columnsStr = keys.map((k) => `"${tConfig.columns[k]?.name ?? k}"`).join(", ");
     const params = [];
+    let prefix = "";
+    if (this._with.length > 0) {
+      const cteStrs = [];
+      for (const cte of this._with) {
+        const chunk = cte.query.toSQL();
+        const offset = params.length;
+        params.push(...chunk.params);
+        cteStrs.push(`"${cte.alias}" AS (${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)})`);
+      }
+      prefix = `WITH ${cteStrs.join(", ")} `;
+    }
     const valuesStrs = this._values.map((v) => {
       const vals = keys.map((k) => {
         const val = v[k];
@@ -680,6 +720,52 @@ class InsertBuilder {
         query += " " + this._onConflict.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`);
         params.push(...this._onConflict.params);
       }
+    } else if (this._onConflictUpdateConfig) {
+      const config = this._onConflictUpdateConfig;
+      const targets = Array.isArray(config.target) ? config.target : [config.target];
+      const targetStrs = [];
+      for (const t of targets) {
+        if (typeof t === "string") {
+          targetStrs.push(`"${tConfig.columns[t]?.name ?? t}"`);
+        } else {
+          const offset = params.length;
+          targetStrs.push(t.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`));
+          params.push(...t.params);
+        }
+      }
+      const setEntries = Object.entries(config.set);
+      if (setEntries.length === 0)
+        throw new Error("InsertBuilder: onConflictDoUpdate requires 'set' fields");
+      const setClauses = setEntries.map(([key, value]) => {
+        const dbCol = tConfig.columns[key]?.name ?? key;
+        if (value && typeof value === "object" && "sql" in value && "params" in value) {
+          const chunk = value;
+          const offset = params.length;
+          params.push(...chunk.params);
+          return `"${dbCol}" = ${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)}`;
+        }
+        if (value && typeof value === "object" && !(value instanceof Date)) {
+          const colType = tConfig.columns[key]?.dataType;
+          if (colType === "json" || colType === "jsonb") {
+            params.push(value);
+          } else if (Array.isArray(value)) {
+            const pgArray = "{" + value.map((item) => {
+              if (item === null || item === undefined)
+                return "NULL";
+              if (typeof item === "string")
+                return '"' + item.replace(/"/g, "\\\"") + '"';
+              return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
+            }).join(",") + "}";
+            params.push(pgArray);
+          } else {
+            params.push(JSON.stringify(value));
+          }
+          return `"${dbCol}" = $${params.length}`;
+        }
+        params.push(value);
+        return `"${dbCol}" = $${params.length}`;
+      });
+      query += ` ON CONFLICT (${targetStrs.join(", ")}) DO UPDATE SET ${setClauses.join(", ")}`;
     }
     if (this._returning) {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(tConfig.columns).map((c) => `"${tConfig.columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${tConfig.columns[c]?.name ?? c}" AS "${c}"`).join(", "));
@@ -687,10 +773,10 @@ class InsertBuilder {
     if (this._comment) {
       query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
-    return { sql: query, params };
+    return { sql: prefix + query, params };
   }
 }
-// ../bungres-orm/src/builders/select.ts
+
 class SelectBuilder {
   _table;
   _executor;
@@ -703,6 +789,8 @@ class SelectBuilder {
   _select;
   _selection;
   _joins = [];
+  _with = [];
+  _setOperations = [];
   _comment;
   constructor(table2, executor, selection) {
     this._table = table2;
@@ -713,12 +801,35 @@ class SelectBuilder {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
   async single() {
+    if (this._limit === undefined) {
+      this.limit(1);
+    }
     return this._executor.executeSingle(this);
   }
   select(...columns) {
     this._select = columns;
     return this;
   }
+  with(...ctes) {
+    this._with.push(...ctes);
+    return this;
+  }
+  union(other) {
+    this._setOperations.push({ type: "UNION", builder: other });
+    return this;
+  }
+  unionAll(other) {
+    this._setOperations.push({ type: "UNION ALL", builder: other });
+    return this;
+  }
+  intersect(other) {
+    this._setOperations.push({ type: "INTERSECT", builder: other });
+    return this;
+  }
+  except(other) {
+    this._setOperations.push({ type: "EXCEPT", builder: other });
+    return this;
+  }
   comment(tag) {
     this._comment = tag;
     return this;
@@ -821,7 +932,23 @@ class SelectBuilder {
       }).join(", ");
     } else {
       const qName = getTableConfig(this._table).qualifiedName;
-      cols = Object.keys(getTableConfig(this._table).columns).map((c) => `${qName}."${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ");
+      const colsKeys = Object.keys(getTableConfig(this._table).columns);
+      if (colsKeys.length === 0) {
+        cols = "*";
+      } else {
+        cols = colsKeys.map((c) => `${qName}."${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ");
+      }
+    }
+    let prefix = "";
+    if (this._with.length > 0) {
+      const cteStrs = [];
+      for (const cte of this._with) {
+        const chunk = cte.query.toSQL();
+        const offset = params.length;
+        params.push(...chunk.params);
+        cteStrs.push(`"${cte.alias}" AS (${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)})`);
+      }
+      prefix = `WITH ${cteStrs.join(", ")} `;
     }
     let query = `SELECT ${cols} FROM ${getTableConfig(this._table).qualifiedName}`;
     if (this._joins.length > 0) {
@@ -881,10 +1008,18 @@ class SelectBuilder {
       params.push(this._offset);
       query += ` OFFSET $${params.length}`;
     }
+    if (this._setOperations.length > 0) {
+      for (const op of this._setOperations) {
+        const chunk = op.builder.toSQL();
+        const offset = params.length;
+        params.push(...chunk.params);
+        query += ` ${op.type} ${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)}`;
+      }
+    }
     if (this._comment) {
       query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
-    return { sql: query, params };
+    return { sql: prefix + query, params };
   }
 }
 
@@ -899,7 +1034,7 @@ class SelectBuilderIntermediate {
     return new SelectBuilder(table2, this._executor, this._selection);
   }
 }
-// ../bungres-orm/src/builders/update.ts
+
 class UpdateBuilder {
   _table;
   _executor;
@@ -907,6 +1042,7 @@ class UpdateBuilder {
   _where = [];
   _returning;
   _comment;
+  _with = [];
   constructor(table2, executor) {
     this._table = table2;
     this._executor = executor;
@@ -929,6 +1065,10 @@ class UpdateBuilder {
     }
     return this;
   }
+  with(...ctes) {
+    this._with.push(...ctes);
+    return this;
+  }
   returning(...columns) {
     this._returning = columns.length > 0 ? columns : ["*"];
     return this;
@@ -943,6 +1083,17 @@ class UpdateBuilder {
       throw new Error("UpdateBuilder: no fields to set");
     }
     const params = [];
+    let prefix = "";
+    if (this._with.length > 0) {
+      const cteStrs = [];
+      for (const cte of this._with) {
+        const chunk = cte.query.toSQL();
+        const offset = params.length;
+        params.push(...chunk.params);
+        cteStrs.push(`"${cte.alias}" AS (${chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`)})`);
+      }
+      prefix = `WITH ${cteStrs.join(", ")} `;
+    }
     const setClauses = entries.map(([key, value]) => {
       const dbCol = getTableConfig(this._table).columns[key]?.name ?? key;
       if (value && typeof value === "object" && "sql" in value && "params" in value) {
@@ -985,10 +1136,9 @@ class UpdateBuilder {
     if (this._comment) {
       query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
-    return { sql: query, params };
+    return { sql: prefix + query, params };
   }
 }
-// ../bungres-orm/src/builders/relational.ts
 function getPkColumn(tableConfig) {
   if (tableConfig.primaryKeys?.length > 0)
     return tableConfig.primaryKeys[0];
@@ -1246,8 +1396,6 @@ class RelationalQueryBuilder {
     return { sql: sql2, params };
   }
 }
-
-// ../bungres-orm/src/core/db.ts
 function parseDBName(url) {
   try {
     return new URL(url).pathname.slice(1);
@@ -1356,6 +1504,7 @@ class BungresDB {
 
 class BungresTransaction {
   _sql;
+  _savepointCounter = 0;
   constructor(sql2) {
     this._sql = sql2;
   }
@@ -1390,6 +1539,19 @@ class BungresTransaction {
     const result = await this._sql.unsafe(query, params);
     return Array.from(result);
   }
+  async transaction(fn) {
+    this._savepointCounter++;
+    const spName = `sp_${this._savepointCounter}`;
+    await this._sql.unsafe(`SAVEPOINT ${spName}`);
+    try {
+      const result = await fn(this);
+      await this._sql.unsafe(`RELEASE SAVEPOINT ${spName}`);
+      return result;
+    } catch (e) {
+      await this._sql.unsafe(`ROLLBACK TO SAVEPOINT ${spName}`);
+      throw e;
+    }
+  }
 }
 function bungres(config) {
   const db = new BungresDB(config);
@@ -1413,7 +1575,6 @@ function bungres(config) {
   }
   return db;
 }
-// ../bungres-orm/src/ddl.ts
 function generateCreateTable(config, ifNotExists = true) {
   const tableName = config.schema ? `"${config.schema}"."${config.name}"` : `"${config.name}"`;
   const exists = ifNotExists ? " IF NOT EXISTS" : "";
@@ -1423,8 +1584,8 @@ function generateCreateTable(config, ifNotExists = true) {
     columnDefs.push(`PRIMARY KEY (${pkCols})`);
   }
   if (config.checks) {
-    for (const check of config.checks) {
-      columnDefs.push(`CHECK (${check})`);
+    for (const check2 of config.checks) {
+      columnDefs.push(`CHECK (${check2})`);
     }
   }
   let sql2 = `CREATE TABLE${exists} ${tableName} (
@@ -1462,7 +1623,9 @@ function buildColumnDDL(key, col2, tableName) {
   if (col2.unique && !col2.primaryKey) {
     parts.push("UNIQUE");
   }
-  if (col2.defaultFn) {
+  if (col2.generatedAs) {
+    parts.push(`GENERATED ALWAYS AS (${col2.generatedAs}) STORED`);
+  } else if (col2.defaultFn) {
     parts.push(`DEFAULT ${col2.defaultFn}`);
   } else if (col2.defaultValue !== undefined) {
     parts.push(`DEFAULT ${formatDefaultValue(col2.defaultValue, col2.dataType)}`);
@@ -1483,6 +1646,13 @@ function buildColumnDDL(key, col2, tableName) {
   return parts.join(" ");
 }
 function buildType(col2) {
+  if (col2.enumConfig) {
+    return `"${col2.enumConfig.enumName}"`;
+  }
+  if (col2.dataType.endsWith("[]")) {
+    const baseType = buildType({ ...col2, dataType: col2.dataType.slice(0, -2) });
+    return `${baseType}[]`;
+  }
   switch (col2.dataType) {
     case "varchar":
       return col2.length ? `VARCHAR(${col2.length})` : "VARCHAR";
@@ -1517,12 +1687,12 @@ function formatDefaultValue(value, dataType) {
 }
 function buildIndex(table2, idx) {
   const tableName = table2.schema ? `"${table2.schema}"."${table2.name}"` : `"${table2.name}"`;
-  const unique = idx.unique ? "UNIQUE " : "";
+  const unique2 = idx.unique ? "UNIQUE " : "";
   const using = idx.using ? ` USING ${idx.using.toUpperCase()}` : "";
   const cols = idx.columns.map((c) => `"${c}"`).join(", ");
   const where = idx.where ? ` WHERE ${idx.where}` : "";
   const idxName = idx.name ?? `idx_${table2.name}_${idx.columns.join("_")}`;
-  return `CREATE ${unique}INDEX IF NOT EXISTS "${idxName}" ON ${tableName}${using} (${cols})${where};`;
+  return `CREATE ${unique2}INDEX IF NOT EXISTS "${idxName}" ON ${tableName}${using} (${cols})${where};`;
 }
 function generateAddColumn(tableName, schema, key, col2) {
   const tbl = schema ? `"${schema}"."${tableName}"` : `"${tableName}"`;
@@ -1532,6 +1702,7 @@ function generateDropColumn(tableName, schema, columnName) {
   const tbl = schema ? `"${schema}"."${tableName}"` : `"${tableName}"`;
   return `ALTER TABLE ${tbl} DROP COLUMN IF EXISTS "${columnName}";`;
 }
+
 // src/schema-loader.ts
 async function loadSchemas(patterns, cwd = process.cwd()) {
   const globs = Array.isArray(patterns) ? patterns : [patterns];
@@ -1643,11 +1814,11 @@ function diffSchemas(prev, next) {
       const idxName = idx.name ?? `idx_${tableName}_${idx.columns.join("_")}`;
       if (!prevIdxNames.has(idxName)) {
         const tbl = nextConfig.schema ? `"${nextConfig.schema}"."${tableName}"` : `"${tableName}"`;
-        const unique2 = idx.unique ? "UNIQUE " : "";
+        const unique = idx.unique ? "UNIQUE " : "";
         const using = idx.using ? ` USING ${idx.using.toUpperCase()}` : "";
         const cols = idx.columns.map((c) => `"${c}"`).join(", ");
         const where = idx.where ? ` WHERE ${idx.where}` : "";
-        statements.push(`CREATE ${unique2}INDEX IF NOT EXISTS "${idxName}" ON ${tbl}${using} (${cols})${where};`);
+        statements.push(`CREATE ${unique}INDEX IF NOT EXISTS "${idxName}" ON ${tbl}${using} (${cols})${where};`);
         summary.push(`CREATE INDEX ${idxName} ON ${tableName}`);
       }
     }
@@ -1785,7 +1956,7 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
     [CJKT_WIDE_RE, WIDE_WIDTH]
   ];
   let indexPrev = 0;
-  let index2 = 0;
+  let index = 0;
   let length = input.length;
   let lengthExtra = 0;
   let truncationEnabled = false;
@@ -1797,8 +1968,8 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
   let widthExtra = 0;
   outer:
     while (true) {
-      if (unmatchedEnd > unmatchedStart || index2 >= length && index2 > indexPrev) {
-        const unmatched = input.slice(unmatchedStart, unmatchedEnd) || input.slice(indexPrev, index2);
+      if (unmatchedEnd > unmatchedStart || index >= length && index > indexPrev) {
+        const unmatched = input.slice(unmatchedStart, unmatchedEnd) || input.slice(indexPrev, index);
         lengthExtra = 0;
         for (const char of unmatched.replaceAll(MODIFIER_RE, "")) {
           const codePoint = char.codePointAt(0) || 0;
@@ -1821,17 +1992,17 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
         }
         unmatchedStart = unmatchedEnd = 0;
       }
-      if (index2 >= length) {
+      if (index >= length) {
         break outer;
       }
       for (let i = 0, l = PARSE_BLOCKS.length;i < l; i++) {
         const [BLOCK_RE, BLOCK_WIDTH] = PARSE_BLOCKS[i];
-        BLOCK_RE.lastIndex = index2;
+        BLOCK_RE.lastIndex = index;
         if (BLOCK_RE.test(input)) {
-          lengthExtra = BLOCK_RE === CJKT_WIDE_RE ? getCodePointsLength(input.slice(index2, BLOCK_RE.lastIndex)) : BLOCK_RE === EMOJI_RE ? 1 : BLOCK_RE.lastIndex - index2;
+          lengthExtra = BLOCK_RE === CJKT_WIDE_RE ? getCodePointsLength(input.slice(index, BLOCK_RE.lastIndex)) : BLOCK_RE === EMOJI_RE ? 1 : BLOCK_RE.lastIndex - index;
           widthExtra = lengthExtra * BLOCK_WIDTH;
           if (width + widthExtra > truncationLimit) {
-            truncationIndex = Math.min(truncationIndex, index2 + Math.floor((truncationLimit - width) / BLOCK_WIDTH));
+            truncationIndex = Math.min(truncationIndex, index + Math.floor((truncationLimit - width) / BLOCK_WIDTH));
           }
           if (width + widthExtra > LIMIT) {
             truncationEnabled = true;
@@ -1839,12 +2010,12 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
           }
           width += widthExtra;
           unmatchedStart = indexPrev;
-          unmatchedEnd = index2;
-          index2 = indexPrev = BLOCK_RE.lastIndex;
+          unmatchedEnd = index;
+          index = indexPrev = BLOCK_RE.lastIndex;
           continue outer;
         }
       }
-      index2 += 1;
+      index += 1;
     }
   return {
     width: truncationEnabled ? truncationLimit : width,
@@ -1903,7 +2074,7 @@ var getClosingCode = (openingCode) => {
 };
 var wrapAnsiCode = (code) => `${ESC}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`;
 var wrapAnsiHyperlink = (url) => `${ESC}${ANSI_ESCAPE_LINK}${url}${ANSI_ESCAPE_BELL}`;
-var wrapWord = (rows, word, columns2) => {
+var wrapWord = (rows, word, columns) => {
   const characters = word[Symbol.iterator]();
   let isInsideEscape = false;
   let isInsideLinkEscape = false;
@@ -1915,7 +2086,7 @@ var wrapWord = (rows, word, columns2) => {
   while (!currentCharacter.done) {
     const character = currentCharacter.value;
     const characterLength = dist_default2(character);
-    if (visible + characterLength <= columns2) {
+    if (visible + characterLength <= columns) {
       rows[rows.length - 1] += character;
     } else {
       rows.push(character);
@@ -1936,7 +2107,7 @@ var wrapWord = (rows, word, columns2) => {
       }
     } else {
       visible += characterLength;
-      if (visible === columns2 && !nextCharacter.done) {
+      if (visible === columns && !nextCharacter.done) {
         rows.push("");
         visible = 0;
       }
@@ -1964,7 +2135,7 @@ var stringVisibleTrimSpacesRight = (string) => {
   }
   return words.slice(0, last).join(" ") + words.slice(last).join("");
 };
-var exec = (string, columns2, options = {}) => {
+var exec = (string, columns, options = {}) => {
   if (options.trim !== false && string.trim() === "") {
     return "";
   }
@@ -1974,8 +2145,8 @@ var exec = (string, columns2, options = {}) => {
   const words = string.split(" ");
   let rows = [""];
   let rowLength = 0;
-  for (let index2 = 0;index2 < words.length; index2++) {
-    const word = words[index2];
+  for (let index = 0;index < words.length; index++) {
+    const word = words[index];
     if (options.trim !== false) {
       const row = rows.at(-1) ?? "";
       const trimmed = row.trimStart();
@@ -1984,8 +2155,8 @@ var exec = (string, columns2, options = {}) => {
         rowLength = dist_default2(trimmed);
       }
     }
-    if (index2 !== 0) {
-      if (rowLength >= columns2 && (options.wordWrap === false || options.trim === false)) {
+    if (index !== 0) {
+      if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
         rows.push("");
         rowLength = 0;
       }
@@ -1995,28 +2166,28 @@ var exec = (string, columns2, options = {}) => {
       }
     }
     const wordLength = dist_default2(word);
-    if (options.hard && wordLength > columns2) {
-      const remainingColumns = columns2 - rowLength;
-      const breaksStartingThisLine = 1 + Math.floor((wordLength - remainingColumns - 1) / columns2);
-      const breaksStartingNextLine = Math.floor((wordLength - 1) / columns2);
+    if (options.hard && wordLength > columns) {
+      const remainingColumns = columns - rowLength;
+      const breaksStartingThisLine = 1 + Math.floor((wordLength - remainingColumns - 1) / columns);
+      const breaksStartingNextLine = Math.floor((wordLength - 1) / columns);
       if (breaksStartingNextLine < breaksStartingThisLine) {
         rows.push("");
       }
-      wrapWord(rows, word, columns2);
+      wrapWord(rows, word, columns);
       rowLength = dist_default2(rows.at(-1) ?? "");
       continue;
     }
-    if (rowLength + wordLength > columns2 && rowLength && wordLength) {
-      if (options.wordWrap === false && rowLength < columns2) {
-        wrapWord(rows, word, columns2);
+    if (rowLength + wordLength > columns && rowLength && wordLength) {
+      if (options.wordWrap === false && rowLength < columns) {
+        wrapWord(rows, word, columns);
         rowLength = dist_default2(rows.at(-1) ?? "");
         continue;
       }
       rows.push("");
       rowLength = 0;
     }
-    if (rowLength + wordLength > columns2 && options.wordWrap === false) {
-      wrapWord(rows, word, columns2);
+    if (rowLength + wordLength > columns && options.wordWrap === false) {
+      wrapWord(rows, word, columns);
       rowLength = dist_default2(rows.at(-1) ?? "");
       continue;
     }
@@ -2073,8 +2244,8 @@ var exec = (string, columns2, options = {}) => {
   return returnValue;
 };
 var CRLF_OR_LF = /\r?\n/;
-function wrapAnsi(string, columns2, options) {
-  return String(string).normalize().split(CRLF_OR_LF).map((line) => exec(line, columns2, options)).join(`
+function wrapAnsi(string, columns, options) {
+  return String(string).normalize().split(CRLF_OR_LF).map((line) => exec(line, columns, options)).join(`
 `);
 }
 
@@ -3398,7 +3569,7 @@ ${upContent}
 // src/commands/pull.ts
 import { resolve as resolve5, join as join5 } from "path";
 async function introspectDb(sql2, dbSchema) {
-  const columns2 = await sql2.unsafe(`SELECT
+  const columns = await sql2.unsafe(`SELECT
       c.table_name,
       c.column_name,
       c.data_type,
@@ -3432,7 +3603,7 @@ async function introspectDb(sql2, dbSchema) {
   const indexes = await sql2.unsafe(`SELECT tablename, indexname, indexdef
      FROM pg_indexes
      WHERE schemaname = $1`, [dbSchema]);
-  return groupByTable(columns2, constraints, indexes);
+  return groupByTable(columns, constraints, indexes);
 }
 async function runPull(config) {
   console.log("@bungres/kit pull: introspecting database...");
@@ -3455,9 +3626,9 @@ async function runPull(config) {
     await sql2.end();
   }
 }
-function groupByTable(columns2, constraints, indexes) {
+function groupByTable(columns, constraints, indexes) {
   const map = new Map;
-  for (const col2 of columns2) {
+  for (const col2 of columns) {
     if (!map.has(col2.table_name)) {
       map.set(col2.table_name, {
         tableName: col2.table_name,