drizzle-kit 0.21.4 → 0.22.0-407e2e6

package/bin.cjs

@@ -1456,7 +1456,7 @@ var init_global = __esm({
   "src/global.ts"() {
     "use strict";
     originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "6";
+    snapshotVersion = "7";
     mapValues = (obj, map) => {
       const result = Object.keys(obj).reduce(function(result2, key) {
         result2[key] = map(obj[key]);
@@ -5658,7 +5658,7 @@ var init_mysqlSchema = __esm({
 });
 
 // src/serializer/pgSchema.ts
-var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaExternal, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
+var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, indexColumn, index2, indexV4, indexV5, indexV6, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, tableV6, tableV5, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaInternalV6, pgSchemaExternal, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashedV6, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchemaV6, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
     "use strict";
@@ -5726,10 +5726,48 @@ var init_pgSchema = __esm({
       tables: recordType(stringType(), tableV1),
       enums: recordType(stringType(), enumSchemaV1)
     }).strict();
+    indexColumn = objectType({
+      expression: stringType(),
+      isExpression: booleanType(),
+      asc: booleanType(),
+      nulls: stringType().optional(),
+      opclass: stringType().optional()
+    });
     index2 = objectType({
+      name: stringType(),
+      columns: indexColumn.array(),
+      isUnique: booleanType(),
+      with: recordType(stringType(), anyType()).optional(),
+      method: stringType().default("btree"),
+      where: stringType().optional(),
+      concurrently: booleanType().default(false)
+    }).strict();
+    indexV4 = objectType({
       name: stringType(),
       columns: stringType().array(),
-      isUnique: booleanType()
+      isUnique: booleanType(),
+      with: recordType(stringType(), stringType()).optional(),
+      method: stringType().default("btree"),
+      where: stringType().optional(),
+      concurrently: booleanType().default(false)
+    }).strict();
+    indexV5 = objectType({
+      name: stringType(),
+      columns: stringType().array(),
+      isUnique: booleanType(),
+      with: recordType(stringType(), stringType()).optional(),
+      method: stringType().default("btree"),
+      where: stringType().optional(),
+      concurrently: booleanType().default(false)
+    }).strict();
+    indexV6 = objectType({
+      name: stringType(),
+      columns: stringType().array(),
+      isUnique: booleanType(),
+      with: recordType(stringType(), stringType()).optional(),
+      method: stringType().default("btree"),
+      where: stringType().optional(),
+      concurrently: booleanType().default(false)
     }).strict();
     fk2 = objectType({
       name: stringType(),
@@ -5771,9 +5809,27 @@ var init_pgSchema = __esm({
       name: stringType(),
       schema: stringType(),
       columns: recordType(stringType(), column2),
-      indexes: recordType(stringType(), index2),
+      indexes: recordType(stringType(), indexV4),
       foreignKeys: recordType(stringType(), fk2)
     }).strict();
+    tableV6 = objectType({
+      name: stringType(),
+      schema: stringType(),
+      columns: recordType(stringType(), column2),
+      indexes: recordType(stringType(), indexV6),
+      foreignKeys: recordType(stringType(), fk2),
+      compositePrimaryKeys: recordType(stringType(), compositePK2),
+      uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+    }).strict();
+    tableV5 = objectType({
+      name: stringType(),
+      schema: stringType(),
+      columns: recordType(stringType(), column2),
+      indexes: recordType(stringType(), indexV5),
+      foreignKeys: recordType(stringType(), fk2),
+      compositePrimaryKeys: recordType(stringType(), compositePK2),
+      uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+    }).strict();
     table2 = objectType({
       name: stringType(),
       schema: stringType(),
@@ -5818,7 +5874,7 @@ var init_pgSchema = __esm({
     pgSchemaInternalV5 = objectType({
       version: literalType("5"),
       dialect: literalType("pg"),
-      tables: recordType(stringType(), table2),
+      tables: recordType(stringType(), tableV5),
       enums: recordType(stringType(), enumSchemaV1),
       schemas: recordType(stringType(), stringType()),
       _meta: objectType({
@@ -5828,6 +5884,19 @@ var init_pgSchema = __esm({
       }),
       internal: kitInternals2
     }).strict();
+    pgSchemaInternalV6 = objectType({
+      version: literalType("6"),
+      dialect: literalType("postgresql"),
+      tables: recordType(stringType(), tableV6),
+      enums: recordType(stringType(), enumSchema),
+      schemas: recordType(stringType(), stringType()),
+      _meta: objectType({
+        schemas: recordType(stringType(), stringType()),
+        tables: recordType(stringType(), stringType()),
+        columns: recordType(stringType(), stringType())
+      }),
+      internal: kitInternals2
+    }).strict();
     pgSchemaExternal = objectType({
       version: literalType("5"),
       dialect: literalType("pg"),
@@ -5841,7 +5910,7 @@ var init_pgSchema = __esm({
       })
     }).strict();
     pgSchemaInternal = objectType({
-      version: literalType("6"),
+      version: literalType("7"),
       dialect: literalType("postgresql"),
       tables: recordType(stringType(), table2),
       enums: recordType(stringType(), enumSchema),
@@ -5876,29 +5945,94 @@ var init_pgSchema = __esm({
       enums: recordType(stringType(), enumSchemaV1),
       schemas: recordType(stringType(), stringType())
     }).strict();
-    pgSchemaSquashed = objectType({
+    pgSchemaSquashedV6 = objectType({
       version: literalType("6"),
       dialect: literalType("postgresql"),
       tables: recordType(stringType(), tableSquashed2),
       enums: recordType(stringType(), enumSchema),
       schemas: recordType(stringType(), stringType())
     }).strict();
+    pgSchemaSquashed = objectType({
+      version: literalType("7"),
+      dialect: literalType("postgresql"),
+      tables: recordType(stringType(), tableSquashed2),
+      enums: recordType(stringType(), enumSchema),
+      schemas: recordType(stringType(), stringType())
+    }).strict();
     pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
     pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
     pgSchemaV5 = pgSchemaInternalV5.merge(schemaHash2);
+    pgSchemaV6 = pgSchemaInternalV6.merge(schemaHash2);
     pgSchema = pgSchemaInternal.merge(schemaHash2);
-    backwardCompatiblePgSchema = unionType([pgSchemaV5, pgSchema]);
+    backwardCompatiblePgSchema = unionType([
+      pgSchemaV5,
+      pgSchemaV6,
+      pgSchema
+    ]);
     PgSquasher = {
       squashIdx: (idx) => {
         index2.parse(idx);
-        return `${idx.name};${idx.columns.join(",")};${idx.isUnique}`;
+        return `${idx.name};${idx.columns.map(
+          (c) => `${c.expression},${c.isExpression},${c.asc},${c.nulls},${c.opclass}`
+        ).join(",,")};${idx.isUnique};${idx.concurrently};${idx.method};${idx.where};${JSON.stringify(idx.with)}`;
       },
       unsquashIdx: (input) => {
-        const [name, columnsString, isUnique] = input.split(";");
+        const [
+          name,
+          columnsString,
+          isUnique,
+          concurrently,
+          method,
+          where,
+          idxWith
+        ] = input.split(";");
+        const columnString = columnsString.split(",,");
+        const columns = [];
+        for (const column7 of columnString) {
+          const [expression, isExpression, asc, nulls, opclass] = column7.split(",");
+          columns.push({
+            nulls,
+            isExpression: isExpression === "true",
+            asc: asc === "true",
+            expression,
+            opclass: opclass === "undefined" ? void 0 : opclass
+          });
+        }
         const result = index2.parse({
           name,
-          columns: columnsString.split(","),
-          isUnique: isUnique === "true"
+          columns,
+          isUnique: isUnique === "true",
+          concurrently: concurrently === "true",
+          method,
+          where: where === "undefined" ? void 0 : where,
+          with: !idxWith || idxWith === "undefined" ? void 0 : JSON.parse(idxWith)
+        });
+        return result;
+      },
+      squashIdxPush: (idx) => {
+        index2.parse(idx);
+        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression},${c.asc},${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
+      },
+      unsquashIdxPush: (input) => {
+        const [name, columnsString, isUnique, method, idxWith] = input.split(";");
+        const columnString = columnsString.split(",,");
+        const columns = [];
+        for (const column7 of columnString) {
+          const [expression, asc, nulls, opclass] = column7.split(",");
+          columns.push({
+            nulls,
+            isExpression: expression === "",
+            asc: asc === "true",
+            expression
+          });
+        }
+        const result = index2.parse({
+          name,
+          columns,
+          isUnique: isUnique === "true",
+          concurrently: false,
+          method,
+          with: idxWith === "undefined" ? void 0 : JSON.parse(idxWith)
         });
         return result;
       },
@@ -5947,11 +6081,11 @@ var init_pgSchema = __esm({
         return result;
       }
     };
-    squashPgScheme = (json) => {
+    squashPgScheme = (json, action) => {
       const mappedTables = Object.fromEntries(
         Object.entries(json.tables).map((it) => {
           const squashedIndexes = mapValues(it[1].indexes, (index4) => {
-            return PgSquasher.squashIdx(index4);
+            return action === "push" ? PgSquasher.squashIdxPush(index4) : PgSquasher.squashIdx(index4);
           });
           const squashedFKs = mapValues(it[1].foreignKeys, (fk4) => {
             return PgSquasher.squashFK(fk4);
@@ -5980,7 +6114,7 @@ var init_pgSchema = __esm({
         })
       );
       return {
-        version: "6",
+        version: "7",
         dialect: json.dialect,
         tables: mappedTables,
         enums: json.enums,
@@ -6223,7 +6357,7 @@ var init_sqliteSchema = __esm({
 });
 
 // src/utils.ts
-var import_fs, import_path, copy, objectValues, assertV1OutFolder, dryJournal, prepareOutFolder, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
+var import_fs, import_path, import_url, copy, objectValues, assertV1OutFolder, dryJournal, prepareOutFolder, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey, normaliseSQLiteUrl;
 var init_utils = __esm({
   "src/utils.ts"() {
     "use strict";
@@ -6234,6 +6368,7 @@ var init_utils = __esm({
     init_sqliteSchema();
     init_source();
     import_path = require("path");
+    import_url = require("url");
     init_global();
     copy = (it) => {
       return JSON.parse(JSON.stringify(it));
@@ -6278,7 +6413,7 @@ var init_utils = __esm({
     validatorForDialect = (dialect7) => {
       switch (dialect7) {
         case "postgresql":
-          return { validator: backwardCompatiblePgSchema, version: 6 };
+          return { validator: backwardCompatiblePgSchema, version: 7 };
         case "sqlite":
           return { validator: backwardCompatibleSqliteSchema, version: 6 };
         case "mysql":
@@ -6396,6 +6531,29 @@ var init_utils = __esm({
       const out = schema5 ? `"${schema5}"."${table4}"."${column7}"` : `"${table4}"."${column7}"`;
       return out;
     };
+    normaliseSQLiteUrl = (it, type) => {
+      if (type === "libsql") {
+        if (it.startsWith("file:")) {
+          return it;
+        }
+        try {
+          const url = (0, import_url.parse)(it);
+          if (url.protocol === null) {
+            return `file:${it}`;
+          }
+          return it;
+        } catch (e2) {
+          return `file:${it}`;
+        }
+      }
+      if (type === "better-sqlite") {
+        if (it.startsWith("file:")) {
+          return it.substring(5);
+        }
+        return it;
+      }
+      assertUnreachable(type);
+    };
   }
 });
 
@@ -6809,7 +6967,7 @@ var require_semver = __commonJS({
 var require_parse = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/parse.js"(exports2, module2) {
     var SemVer = require_semver();
-    var parse6 = (version2, options, throwErrors = false) => {
+    var parse7 = (version2, options, throwErrors = false) => {
       if (version2 instanceof SemVer) {
         return version2;
       }
@@ -6822,16 +6980,16 @@ var require_parse = __commonJS({
         throw er3;
       }
     };
-    module2.exports = parse6;
+    module2.exports = parse7;
   }
 });
 
 // node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/valid.js
 var require_valid = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/valid.js"(exports2, module2) {
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var valid = (version2, options) => {
-      const v6 = parse6(version2, options);
+      const v6 = parse7(version2, options);
       return v6 ? v6.version : null;
     };
     module2.exports = valid;
@@ -6841,9 +6999,9 @@ var require_valid = __commonJS({
 // node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/clean.js
 var require_clean = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/clean.js"(exports2, module2) {
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var clean = (version2, options) => {
-      const s2 = parse6(version2.trim().replace(/^[=v]+/, ""), options);
+      const s2 = parse7(version2.trim().replace(/^[=v]+/, ""), options);
       return s2 ? s2.version : null;
     };
     module2.exports = clean;
@@ -6876,10 +7034,10 @@ var require_inc = __commonJS({
 // node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/diff.js
 var require_diff = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/diff.js"(exports2, module2) {
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var diff2 = (version1, version2) => {
-      const v12 = parse6(version1, null, true);
-      const v22 = parse6(version2, null, true);
+      const v12 = parse7(version1, null, true);
+      const v22 = parse7(version2, null, true);
       const comparison = v12.compare(v22);
       if (comparison === 0) {
         return null;
@@ -6947,9 +7105,9 @@ var require_patch = __commonJS({
 // node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/prerelease.js
 var require_prerelease = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/prerelease.js"(exports2, module2) {
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var prerelease = (version2, options) => {
-      const parsed = parse6(version2, options);
+      const parsed = parse7(version2, options);
       return parsed && parsed.prerelease.length ? parsed.prerelease : null;
     };
     module2.exports = prerelease;
@@ -7121,7 +7279,7 @@ var require_cmp = __commonJS({
 var require_coerce = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/coerce.js"(exports2, module2) {
     var SemVer = require_semver();
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var { safeRe: re2, t: t2 } = require_re();
     var coerce3 = (version2, options) => {
       if (version2 instanceof SemVer) {
@@ -7156,7 +7314,7 @@ var require_coerce = __commonJS({
       const patch = match2[4] || "0";
       const prerelease = options.includePrerelease && match2[5] ? `-${match2[5]}` : "";
       const build = options.includePrerelease && match2[6] ? `+${match2[6]}` : "";
-      return parse6(`${major}.${minor}.${patch}${prerelease}${build}`, options);
+      return parse7(`${major}.${minor}.${patch}${prerelease}${build}`, options);
     };
     module2.exports = coerce3;
   }
@@ -8137,7 +8295,7 @@ var require_semver2 = __commonJS({
     var constants = require_constants();
     var SemVer = require_semver();
     var identifiers = require_identifiers();
-    var parse6 = require_parse();
+    var parse7 = require_parse();
     var valid = require_valid();
     var clean = require_clean();
     var inc = require_inc();
@@ -8175,7 +8333,7 @@ var require_semver2 = __commonJS({
     var simplifyRange = require_simplify();
     var subset = require_subset();
     module2.exports = {
-      parse: parse6,
+      parse: parse7,
       valid,
       clean,
       inc,
@@ -8265,7 +8423,7 @@ var init_utils2 = __esm({
         process.exit(1);
       }
     };
-    requiredApiVersion = 6;
+    requiredApiVersion = 7;
     assertOrmCoreVersion = async () => {
       try {
         const { compatibilityVersion } = await import("drizzle-orm/version");
@@ -8829,7 +8987,7 @@ var require_ms = __commonJS({
       options = options || {};
       var type = typeof val2;
       if (type === "string" && val2.length > 0) {
-        return parse6(val2);
+        return parse7(val2);
       } else if (type === "number" && isFinite(val2)) {
         return options.long ? fmtLong(val2) : fmtShort(val2);
       }
@@ -8837,7 +8995,7 @@ var require_ms = __commonJS({
         "val is not a non-empty string or a valid number. val=" + JSON.stringify(val2)
       );
     };
-    function parse6(str) {
+    function parse7(str) {
       str = String(str);
       if (str.length > 100) {
         return;
@@ -12556,7 +12714,7 @@ var require_node2 = __commonJS({
       var token;
       var key;
       var root;
-      module22.exports = function parse6(text, reviver) {
+      module22.exports = function parse7(text, reviver) {
         source = String(text);
         parseState = "start";
         stack = [];
@@ -13604,10 +13762,10 @@ var require_node2 = __commonJS({
       };
     });
     var require_lib32 = __commonJS2((exports3, module22) => {
-      var parse6 = require_parse4();
+      var parse7 = require_parse4();
       var stringify4 = require_stringify3();
       var JSON5 = {
-        parse: parse6,
+        parse: parse7,
         stringify: stringify4
       };
       module22.exports = JSON5;
@@ -15525,6 +15683,24 @@ var init_pgImports = __esm({
   }
 });
 
+// src/extensions/vector.ts
+var vectorOps;
+var init_vector = __esm({
+  "src/extensions/vector.ts"() {
+    "use strict";
+    vectorOps = [
+      "vector_l2_ops",
+      "vector_ip_ops",
+      "vector_cosine_ops",
+      "vector_l1_ops",
+      "bit_hamming_ops",
+      "bit_jaccard_ops",
+      "halfvec_l2_ops",
+      "sparsevec_l2_ops"
+    ];
+  }
+});
+
 // src/serializer/pgSerializer.ts
 var pgSerializer_exports = {};
 __export(pgSerializer_exports, {
@@ -15542,6 +15718,7 @@ var init_pgSerializer = __esm({
     init_serializer();
     init_source();
     init_outputs();
+    init_vector();
     dialect5 = new import_pg_core2.PgDialect();
     indexName2 = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
@@ -15549,6 +15726,16 @@ var init_pgSerializer = __esm({
     generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
       const indexesInSchema = {};
+      const enumsToReturn = enums.reduce((map, obj) => {
+        const enumSchema3 = obj.schema || "public";
+        const key = `${enumSchema3}.${obj.enumName}`;
+        map[key] = {
+          name: obj.enumName,
+          schema: enumSchema3,
+          values: obj.enumValues
+        };
+        return map;
+      }, {});
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -15579,6 +15766,7 @@ var init_pgSerializer = __esm({
             typeSchema,
             primaryKey,
             notNull
+            // isenum: typeof enumsToReturn[column.getSQLType()] !== "undefined",
           };
           if (column7.isUnique) {
             const existingUnique = uniqueConstraintObject[column7.uniqueName];
@@ -15692,18 +15880,71 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
         });
         indexes.forEach((value) => {
           const columns2 = value.config.columns;
-          let name = value.config.name;
-          name = name ? name : indexName2(
-            tableName,
-            columns2.map((it) => it.name)
-          );
-          let indexColumns = columns2.map((it) => {
+          let indexColumnNames = [];
+          columns2.forEach((it) => {
             if ((0, import_drizzle_orm5.is)(it, import_drizzle_orm5.SQL)) {
-              return dialect5.sqlToQuery(it).sql;
-            } else {
-              return it.name;
+              if (typeof value.config.name === "undefined") {
+                console.log(
+                  `
+${withStyle.errorWarning(
+                    `Please specify an index name in ${(0, import_drizzle_orm5.getTableName)(
+                      value.config.table
+                    )} table that has "${dialect5.sqlToQuery(it).sql}" expression. We can generate index names for indexes on columns only; for expressions in indexes, you need to specify the name yourself.`
+                  )}`
+                );
+                process.exit(1);
+              }
+            }
+            it = it;
+            if (!(0, import_drizzle_orm5.is)(it, import_drizzle_orm5.SQL) && it.type === "PgVector" && typeof it.indexConfig.opClass === "undefined") {
+              console.log(
+                `
+${withStyle.errorWarning(
+                  `You are specifying an index on the ${source_default.blueBright(
+                    it.name
+                  )} column inside the ${source_default.blueBright(
+                    tableName
+                  )} table with the ${source_default.blueBright(
+                    "vector"
+                  )} type without specifying an operator class. Vector extension doesn't have a default operator class, so you need to specify one of the available options. Here is a list of available op classes for the vector extension: [${vectorOps.map((it2) => `${source_default.underline(`${it2}`)}`).join(
+                    ", "
+                  )}].
+
+You can specify it using current syntax: ${source_default.underline(
+                    `index("${value.config.name}").using("${value.config.method}", table.${it.name}.op("${vectorOps[0]}"))`
+                  )}
+
+You can check the "pg_vector" docs for more info: https://github.com/pgvector/pgvector?tab=readme-ov-file#indexing
+`
+                )}`
+              );
+              process.exit(1);
             }
+            indexColumnNames.push(it.name);
           });
+          const name = value.config.name ? value.config.name : indexName2(tableName, indexColumnNames);
+          let indexColumns = columns2.map(
+            (it) => {
+              var _a, _b, _c, _d, _e2;
+              if ((0, import_drizzle_orm5.is)(it, import_drizzle_orm5.SQL)) {
+                return {
+                  expression: dialect5.sqlToQuery(it, "indexes").sql,
+                  asc: true,
+                  isExpression: true,
+                  nulls: "last"
+                };
+              } else {
+                it = it;
+                return {
+                  expression: it.name,
+                  isExpression: false,
+                  asc: ((_a = it.indexConfig) == null ? void 0 : _a.order) === "asc",
+                  nulls: ((_b = it.indexConfig) == null ? void 0 : _b.nulls) ? (_c = it.indexConfig) == null ? void 0 : _c.nulls : ((_d = it.indexConfig) == null ? void 0 : _d.order) === "desc" ? "first" : "last",
+                  opclass: (_e2 = it.indexConfig) == null ? void 0 : _e2.opClass
+                };
+              }
+            }
+          );
           if (typeof indexesInSchema[schema5 ?? "public"] !== "undefined") {
             if (indexesInSchema[schema5 ?? "public"].includes(name)) {
               console.log(
@@ -15725,7 +15966,11 @@ ${withStyle.errorWarning(
           indexesObject[name] = {
             name,
             columns: indexColumns,
-            isUnique: value.config.unique ?? false
+            isUnique: value.config.unique ?? false,
+            where: value.config.where ? dialect5.sqlToQuery(value.config.where).sql : void 0,
+            concurrently: value.config.concurrently ?? false,
+            method: value.config.method ?? "btree",
+            with: value.config.with ?? {}
           };
         });
         const tableKey2 = `${schema5 ?? "public"}.${tableName}`;
@@ -15739,16 +15984,6 @@ ${withStyle.errorWarning(
           uniqueConstraints: uniqueConstraintObject
         };
       }
-      const enumsToReturn = enums.reduce((map, obj) => {
-        const enumSchema3 = obj.schema || "public";
-        const key = `${enumSchema3}.${obj.enumName}`;
-        map[key] = {
-          name: obj.enumName,
-          schema: enumSchema3,
-          values: obj.enumValues
-        };
-        return map;
-      }, {});
       const schemasObject = Object.fromEntries(
         schemas.filter((it) => {
           if (schemaFilter) {
@@ -15759,7 +15994,7 @@ ${withStyle.errorWarning(
         }).map((it) => [it.schemaName, it.schemaName])
       );
       return {
-        version: "6",
+        version: "7",
         dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
@@ -16031,7 +16266,10 @@ ${withStyle.errorWarning(
               columnTypeMapped = trimChar(columnTypeMapped, '"');
               columnToReturn[columnName] = {
                 name: columnName,
-                type: columnAdditionalDT === "USER-DEFINED" ? enumType3 : columnTypeMapped,
+                type: (
+                  // filter vectors, but in future we should filter any extension that was installed by user
+                  columnAdditionalDT === "USER-DEFINED" && enumType3 !== "vector" ? enumType3 : columnTypeMapped
+                ),
                 typeSchema: enumsToReturn[`${tableSchema}.${enumType3}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType3}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
                 // default: isSerial ? undefined : defaultValue,
@@ -16042,15 +16280,42 @@ ${withStyle.errorWarning(
               }
             }
             const dbIndexes = await db2.query(
-              `SELECT t.relname as table_name, i.relname AS index_name, ix.indisunique AS is_unique, a.attname AS column_name
-          FROM pg_class t
-          JOIN pg_index ix ON t.oid = ix.indrelid
-          JOIN pg_class i ON i.oid = ix.indexrelid
-          JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(ix.indkey)
-          JOIN pg_namespace ns ON ns.oid = t.relnamespace
-          WHERE ns.nspname = '${tableSchema}'
-            AND t.relname = '${tableName}'
-            and ix.indisprimary = false;`
+              `SELECT  DISTINCT ON (t.relname, ic.relname, k.i) t.relname as table_name, ic.relname AS indexname,
+        k.i AS index_order,
+        i.indisunique as is_unique,
+        am.amname as method,
+        ic.reloptions as with,
+        coalesce(a.attname,
+                  (('{' || pg_get_expr(
+                              i.indexprs,
+                              i.indrelid
+                          )
+                        || '}')::text[]
+                  )[k.i]
+                ) AS column_name,
+          CASE
+        WHEN pg_get_expr(i.indexprs, i.indrelid) IS NOT NULL THEN 1
+        ELSE 0
+    END AS is_expression,
+        i.indoption[k.i-1] & 1 = 1 AS descending,
+        i.indoption[k.i-1] & 2 = 2 AS nulls_first,
+        pg_get_expr(
+                              i.indpred,
+                              i.indrelid
+                          ) as where,
+         opc.opcname
+      FROM pg_class t
+          LEFT JOIN pg_index i ON t.oid = i.indrelid
+          LEFT JOIN pg_class ic ON ic.oid = i.indexrelid
+		  CROSS JOIN LATERAL (SELECT unnest(i.indkey), generate_subscripts(i.indkey, 1) + 1) AS k(attnum, i)
+          LEFT JOIN pg_attribute AS a
+            ON i.indrelid = a.attrelid AND k.attnum = a.attnum
+          JOIN pg_namespace c on c.oid = t.relnamespace
+        LEFT JOIN pg_am AS am ON ic.relam = am.oid
+        JOIN pg_opclass opc ON opc.oid = ANY(i.indclass)
+      WHERE
+      c.nspname = '${tableSchema}' AND
+      t.relname = '${tableName}';`
             );
             const dbIndexFromConstraint = await db2.query(
               `SELECT
@@ -16067,18 +16332,51 @@ ${withStyle.errorWarning(
             );
             const idxsInConsteraint = dbIndexFromConstraint.filter((it) => it.generated_by_constraint === 1).map((it) => it.index_name);
             for (const dbIndex of dbIndexes) {
-              const indexName4 = dbIndex.index_name;
+              const indexName4 = dbIndex.indexname;
               const indexColumnName = dbIndex.column_name;
               const indexIsUnique = dbIndex.is_unique;
+              const indexMethod = dbIndex.method;
+              const indexWith = dbIndex.with;
+              const indexWhere = dbIndex.where;
+              const opclass = dbIndex.opcname;
+              const isExpression = dbIndex.is_expression === 1;
+              const desc = dbIndex.descending;
+              const nullsFirst = dbIndex.nulls_first;
+              const mappedWith = {};
+              if (indexWith !== null) {
+                indexWith.forEach((it) => {
+                  const splitted = it.split("=");
+                  mappedWith[splitted[0]] = splitted[1];
+                });
+              }
               if (idxsInConsteraint.includes(indexName4))
                 continue;
               if (typeof indexToReturn[indexName4] !== "undefined") {
-                indexToReturn[indexName4].columns.push(indexColumnName);
+                indexToReturn[indexName4].columns.push({
+                  expression: indexColumnName,
+                  asc: !desc,
+                  nulls: nullsFirst ? "first" : "last",
+                  opclass,
+                  isExpression
+                });
               } else {
                 indexToReturn[indexName4] = {
                   name: indexName4,
-                  columns: [indexColumnName],
-                  isUnique: indexIsUnique
+                  columns: [
+                    {
+                      expression: indexColumnName,
+                      asc: !desc,
+                      nulls: nullsFirst ? "first" : "last",
+                      opclass,
+                      isExpression
+                    }
+                  ],
+                  isUnique: indexIsUnique,
+                  // should not be a part of diff detecs
+                  concurrently: false,
+                  method: indexMethod,
+                  where: indexWhere === null ? void 0 : indexWhere,
+                  with: mappedWith
                 };
               }
             }
@@ -16114,7 +16412,7 @@ ${withStyle.errorWarning(
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "6",
+        version: "7",
         dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
@@ -16898,7 +17196,7 @@ var init_sqlgenerator = __esm({
       if (pgNativeTypes.has(it))
         return true;
       const toCheck = it.replace(/ /g, "");
-      return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(") || toCheck.startsWith("intervalyear(") || toCheck.startsWith("intervalmonth(") || toCheck.startsWith("intervalday(") || toCheck.startsWith("intervalhour(") || toCheck.startsWith("intervalminute(") || toCheck.startsWith("intervalsecond(") || toCheck.startsWith("intervalyeartomonth(") || toCheck.startsWith("intervaldaytohour(") || toCheck.startsWith("intervaldaytominute(") || toCheck.startsWith("intervaldaytosecond(") || toCheck.startsWith("intervalhourtominute(") || toCheck.startsWith("intervalhourtosecond(") || toCheck.startsWith("intervalminutetosecond(") || /^(\w+)(\[\d*])+$/.test(it);
+      return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(") || toCheck.startsWith("intervalyear(") || toCheck.startsWith("intervalmonth(") || toCheck.startsWith("intervalday(") || toCheck.startsWith("intervalhour(") || toCheck.startsWith("intervalminute(") || toCheck.startsWith("intervalsecond(") || toCheck.startsWith("intervalyeartomonth(") || toCheck.startsWith("intervaldaytohour(") || toCheck.startsWith("intervaldaytominute(") || toCheck.startsWith("intervaldaytosecond(") || toCheck.startsWith("intervalhourtominute(") || toCheck.startsWith("intervalhourtosecond(") || toCheck.startsWith("intervalminutetosecond(") || toCheck.startsWith("vector(") || /^(\w+)(\[\d*])+$/.test(it);
     };
     Convertor = class {
     };
@@ -17860,14 +18158,34 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     CreatePgIndexConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_index" && dialect7 === "postgresql";
+        return statement.type === "create_index_pg" && dialect7 === "postgresql";
       }
       convert(statement) {
-        const { name, columns, isUnique } = PgSquasher.unsquashIdx(statement.data);
+        const {
+          name,
+          columns,
+          isUnique,
+          concurrently,
+          with: withMap,
+          method,
+          where
+        } = statement.data;
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
-        const value = columns.map((it) => `"${it}"`).join(",");
+        const value = columns.map(
+          (it) => `${it.expression}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
+        ).join(",");
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
-        return `CREATE ${indexPart} IF NOT EXISTS "${name}" ON ${tableNameWithSchema} (${value});`;
+        function reverseLogic(mappedWith) {
+          let reversedString = "";
+          for (const key in mappedWith) {
+            if (mappedWith.hasOwnProperty(key)) {
+              reversedString += `${key}=${mappedWith[key]},`;
+            }
+          }
+          reversedString = reversedString.slice(0, -1);
+          return reversedString;
+        }
+        return `CREATE ${indexPart}${concurrently ? " CONCURRENTLY" : ""} IF NOT EXISTS "${name}" ON ${tableNameWithSchema} USING ${method} (${value})${Object.keys(withMap).length !== 0 ? ` WITH (${reverseLogic(withMap)})` : ""}${where ? ` WHERE ${where}` : ""};`;
       }
     };
     CreateMySqlIndexConvertor = class extends Convertor {
@@ -18521,7 +18839,7 @@ var init_jsonDiffer = __esm({
 });
 
 // src/jsonStatements.ts
-var preparePgCreateTableJson, prepareMySqlCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareDropEnumJson, prepareMoveEnumJson, prepareRenameEnumJson, prepareCreateSchemasJson, prepareRenameSchemasJson, prepareDeleteSchemasJson, prepareRenameColumns, _prepareDropColumns, _prepareAddColumns, _prepareSqliteAddColumns, prepareAlterColumnsMysql, preparePgAlterColumns, prepareSqliteAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson, prepareAddCompositePrimaryKeySqlite, prepareDeleteCompositePrimaryKeySqlite, prepareAlterCompositePrimaryKeySqlite, prepareAddCompositePrimaryKeyPg, prepareDeleteCompositePrimaryKeyPg, prepareAlterCompositePrimaryKeyPg, prepareAddUniqueConstraintPg, prepareDeleteUniqueConstraintPg, prepareAddCompositePrimaryKeyMySql, prepareDeleteCompositePrimaryKeyMySql, prepareAlterCompositePrimaryKeyMySql;
+var preparePgCreateTableJson, prepareMySqlCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareDropEnumJson, prepareMoveEnumJson, prepareRenameEnumJson, prepareCreateSchemasJson, prepareRenameSchemasJson, prepareDeleteSchemasJson, prepareRenameColumns, _prepareDropColumns, _prepareAddColumns, _prepareSqliteAddColumns, prepareAlterColumnsMysql, preparePgAlterColumns, prepareSqliteAlterColumns, preparePgCreateIndexesJson, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson, prepareAddCompositePrimaryKeySqlite, prepareDeleteCompositePrimaryKeySqlite, prepareAlterCompositePrimaryKeySqlite, prepareAddCompositePrimaryKeyPg, prepareDeleteCompositePrimaryKeyPg, prepareAlterCompositePrimaryKeyPg, prepareAddUniqueConstraintPg, prepareDeleteUniqueConstraintPg, prepareAddCompositePrimaryKeyMySql, prepareDeleteCompositePrimaryKeyMySql, prepareAlterCompositePrimaryKeyMySql;
 var init_jsonStatements = __esm({
   "src/jsonStatements.ts"() {
     "use strict";
@@ -19286,6 +19604,28 @@ var init_jsonStatements = __esm({
       }
       return [...dropPkStatements, ...setPkStatements, ...statements];
     };
+    preparePgCreateIndexesJson = (tableName, schema5, indexes, fullSchema, action) => {
+      if (action === "push") {
+        return Object.values(indexes).map((indexData) => {
+          const unsquashedIndex = PgSquasher.unsquashIdxPush(indexData);
+          const data = fullSchema.tables[`${schema5 === "" ? "public" : schema5}.${tableName}`].indexes[unsquashedIndex.name];
+          return {
+            type: "create_index_pg",
+            tableName,
+            data,
+            schema: schema5
+          };
+        });
+      }
+      return Object.values(indexes).map((indexData) => {
+        return {
+          type: "create_index_pg",
+          tableName,
+          data: PgSquasher.unsquashIdx(indexData),
+          schema: schema5
+        };
+      });
+    };
     prepareCreateIndexesJson = (tableName, schema5, indexes) => {
       return Object.values(indexes).map((indexData) => {
         return {
@@ -19317,20 +19657,21 @@ var init_jsonStatements = __esm({
       });
     };
     prepareAlterReferencesJson = (tableName, schema5, foreignKeys) => {
-      const keys = Object.keys(foreignKeys);
       const stmts = [];
-      if (keys.length > 0) {
-        stmts.push(
-          ...prepareDropReferencesJson(tableName, schema5, {
-            [keys[0]]: foreignKeys[keys[0]].__old
-          })
-        );
-        stmts.push(
-          ...prepareCreateReferencesJson(tableName, schema5, {
-            [keys[0]]: foreignKeys[keys[0]].__new
-          })
-        );
-      }
+      Object.values(foreignKeys).map((val2) => {
+        stmts.push({
+          type: "delete_reference",
+          tableName,
+          schema: schema5,
+          data: val2.__old
+        });
+        stmts.push({
+          type: "create_reference",
+          tableName,
+          schema: schema5,
+          data: val2.__new
+        });
+      });
       return stmts;
     };
     prepareDropIndexesJson = (tableName, schema5, indexes) => {
@@ -19661,7 +20002,7 @@ var init_snapshotsDiffer = __esm({
       }
       return column7;
     };
-    applyPgSnapshotsDiff = async (json1, json2, schemasResolver2, enumsResolver2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
+    applyPgSnapshotsDiff = async (json1, json2, schemasResolver2, enumsResolver2, tablesResolver2, columnsResolver2, prevFull, curFull, action) => {
       const schemasDiff = diffSchemasOrTables(json1.schemas, json2.schemas);
       const {
         created: createdSchemas,
@@ -19823,7 +20164,13 @@ var init_snapshotsDiffer = __esm({
       const typedResult = diffResultScheme.parse(diffResult);
       const jsonStatements = [];
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
-        return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
+        return preparePgCreateIndexesJson(
+          it.name,
+          it.schema,
+          it.indexes,
+          curFull,
+          action
+        );
       }).flat();
       const jsonDropTables = deletedTables.map((it) => {
         return prepareDropTableJson(it);
@@ -19947,10 +20294,12 @@ var init_snapshotsDiffer = __esm({
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
       const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
-        return prepareCreateIndexesJson(
+        return preparePgCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull,
+          action
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = alteredTables.map((it) => {
@@ -19976,7 +20325,13 @@ var init_snapshotsDiffer = __esm({
           {}
         );
         jsonCreateIndexesFoAlteredTables.push(
-          ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
+          ...preparePgCreateIndexesJson(
+            it.name,
+            it.schema,
+            createdIndexes || {},
+            curFull,
+            action
+          )
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
@@ -22083,7 +22438,10 @@ var init_migrate = __esm({
       const schemaPath = config.schema;
       try {
         assertV1OutFolder(outFolder);
-        const { snapshots, journal } = prepareMigrationFolder(outFolder, "postgresql");
+        const { snapshots, journal } = prepareMigrationFolder(
+          outFolder,
+          "postgresql"
+        );
         const { prev, cur, custom: custom2 } = await preparePgMigrationSnapshot(
           snapshots,
           schemaPath
@@ -22134,8 +22492,8 @@ var init_migrate = __esm({
       );
       const validatedPrev = pgSchema.parse(prev);
       const validatedCur = pgSchema.parse(cur);
-      const squashedPrev = squashPgScheme(validatedPrev);
-      const squashedCur = squashPgScheme(validatedCur);
+      const squashedPrev = squashPgScheme(validatedPrev, "push");
+      const squashedCur = squashPgScheme(validatedCur, "push");
       const { sqlStatements, statements, _meta } = await applyPgSnapshotsDiff(
         squashedPrev,
         squashedCur,
@@ -22144,7 +22502,8 @@ var init_migrate = __esm({
         tablesResolver,
         columnsResolver,
         validatedPrev,
-        validatedCur
+        validatedCur,
+        "push"
       );
       return { sqlStatements, statements, squashedPrev, squashedCur };
     };
@@ -22615,7 +22974,7 @@ var require_main = __commonJS({
     var packageJson = require_package();
     var version2 = packageJson.version;
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-    function parse6(src) {
+    function parse7(src) {
       const obj = {};
       let lines = src.toString();
       lines = lines.replace(/\r\n?/mg, "\n");
@@ -22858,7 +23217,7 @@ var require_main = __commonJS({
       _parseVault,
       config,
       decrypt,
-      parse: parse6,
+      parse: parse7,
       populate
     };
     module2.exports.configDotenv = DotenvModule.configDotenv;
@@ -24271,9 +24630,9 @@ var require_glob_parent = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/utils.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js
 var require_utils2 = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/utils.js"(exports2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js"(exports2) {
     "use strict";
     exports2.isInteger = (num) => {
       if (typeof num === "number") {
@@ -24293,7 +24652,7 @@ var require_utils2 = __commonJS({
       return (Number(max) - Number(min)) / Number(step) >= limit;
     };
     exports2.escapeNode = (block, n = 0, type) => {
-      const node = block.nodes[n];
+      let node = block.nodes[n];
       if (!node)
         return;
       if (type && node.type === type || node.type === "open" || node.type === "close") {
@@ -24344,14 +24703,8 @@ var require_utils2 = __commonJS({
       const result = [];
       const flat = (arr) => {
         for (let i2 = 0; i2 < arr.length; i2++) {
-          const ele = arr[i2];
-          if (Array.isArray(ele)) {
-            flat(ele);
-            continue;
-          }
-          if (ele !== void 0) {
-            result.push(ele);
-          }
+          let ele = arr[i2];
+          Array.isArray(ele) ? flat(ele, result) : ele !== void 0 && result.push(ele);
         }
         return result;
       };
@@ -24361,15 +24714,15 @@ var require_utils2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/stringify.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/stringify.js
 var require_stringify = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/stringify.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/stringify.js"(exports2, module2) {
     "use strict";
     var utils = require_utils2();
     module2.exports = (ast, options = {}) => {
-      const stringify4 = (node, parent = {}) => {
-        const invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
-        const invalidNode = node.invalid === true && options.escapeInvalid === true;
+      let stringify4 = (node, parent = {}) => {
+        let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
+        let invalidNode = node.invalid === true && options.escapeInvalid === true;
         let output = "";
         if (node.value) {
           if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
@@ -24381,7 +24734,7 @@ var require_stringify = __commonJS({
           return node.value;
         }
         if (node.nodes) {
-          for (const child of node.nodes) {
+          for (let child of node.nodes) {
             output += stringify4(child);
           }
         }
@@ -24826,24 +25179,23 @@ var require_fill_range = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/compile.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/compile.js
 var require_compile = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/compile.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/compile.js"(exports2, module2) {
     "use strict";
     var fill = require_fill_range();
     var utils = require_utils2();
     var compile = (ast, options = {}) => {
-      const walk = (node, parent = {}) => {
-        const invalidBlock = utils.isInvalidBrace(parent);
-        const invalidNode = node.invalid === true && options.escapeInvalid === true;
-        const invalid = invalidBlock === true || invalidNode === true;
-        const prefix = options.escapeInvalid === true ? "\\" : "";
+      let walk = (node, parent = {}) => {
+        let invalidBlock = utils.isInvalidBrace(parent);
+        let invalidNode = node.invalid === true && options.escapeInvalid === true;
+        let invalid = invalidBlock === true || invalidNode === true;
+        let prefix = options.escapeInvalid === true ? "\\" : "";
         let output = "";
         if (node.isOpen === true) {
           return prefix + node.value;
         }
         if (node.isClose === true) {
-          console.log("node.isClose", prefix, node.value);
           return prefix + node.value;
         }
         if (node.type === "open") {
@@ -24859,14 +25211,14 @@ var require_compile = __commonJS({
           return node.value;
         }
         if (node.nodes && node.ranges > 0) {
-          const args = utils.reduce(node.nodes);
-          const range = fill(...args, { ...options, wrap: false, toRegex: true, strictZeros: true });
+          let args = utils.reduce(node.nodes);
+          let range = fill(...args, { ...options, wrap: false, toRegex: true });
           if (range.length !== 0) {
             return args.length > 1 && range.length > 1 ? `(${range})` : range;
           }
         }
         if (node.nodes) {
-          for (const child of node.nodes) {
+          for (let child of node.nodes) {
             output += walk(child, node);
           }
         }
@@ -24878,15 +25230,15 @@ var require_compile = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/expand.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/expand.js
 var require_expand = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/expand.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/expand.js"(exports2, module2) {
     "use strict";
     var fill = require_fill_range();
     var stringify4 = require_stringify();
     var utils = require_utils2();
     var append = (queue = "", stash = "", enclose = false) => {
-      const result = [];
+      let result = [];
       queue = [].concat(queue);
       stash = [].concat(stash);
       if (!stash.length)
@@ -24894,9 +25246,9 @@ var require_expand = __commonJS({
       if (!queue.length) {
         return enclose ? utils.flatten(stash).map((ele) => `{${ele}}`) : stash;
       }
-      for (const item of queue) {
+      for (let item of queue) {
         if (Array.isArray(item)) {
-          for (const value of item) {
+          for (let value of item) {
             result.push(append(value, stash, enclose));
           }
         } else {
@@ -24910,8 +25262,8 @@ var require_expand = __commonJS({
       return utils.flatten(result);
     };
     var expand2 = (ast, options = {}) => {
-      const rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit;
-      const walk = (node, parent = {}) => {
+      let rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit;
+      let walk = (node, parent = {}) => {
         node.queue = [];
         let p4 = parent;
         let q = parent.queue;
@@ -24928,7 +25280,7 @@ var require_expand = __commonJS({
           return;
         }
         if (node.nodes && node.ranges > 0) {
-          const args = utils.reduce(node.nodes);
+          let args = utils.reduce(node.nodes);
           if (utils.exceedsLimit(...args, options.step, rangeLimit)) {
             throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");
           }
@@ -24940,7 +25292,7 @@ var require_expand = __commonJS({
           node.nodes = [];
           return;
         }
-        const enclose = utils.encloseBrace(node);
+        let enclose = utils.encloseBrace(node);
         let queue = node.queue;
         let block = node;
         while (block.type !== "brace" && block.type !== "root" && block.parent) {
@@ -24948,7 +25300,7 @@ var require_expand = __commonJS({
           queue = block.queue;
         }
         for (let i2 = 0; i2 < node.nodes.length; i2++) {
-          const child = node.nodes[i2];
+          let child = node.nodes[i2];
           if (child.type === "comma" && node.type === "brace") {
             if (i2 === 1)
               queue.push("");
@@ -24975,12 +25327,12 @@ var require_expand = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/constants.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/constants.js
 var require_constants2 = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/constants.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/constants.js"(exports2, module2) {
     "use strict";
     module2.exports = {
-      MAX_LENGTH: 1e4,
+      MAX_LENGTH: 1024 * 64,
       // Digits
       CHAR_0: "0",
       /* 0 */
@@ -25076,9 +25428,9 @@ var require_constants2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/parse.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/parse.js
 var require_parse2 = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/parse.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/parse.js"(exports2, module2) {
     "use strict";
     var stringify4 = require_stringify();
     var {
@@ -25110,24 +25462,25 @@ var require_parse2 = __commonJS({
       CHAR_NO_BREAK_SPACE,
       CHAR_ZERO_WIDTH_NOBREAK_SPACE
     } = require_constants2();
-    var parse6 = (input, options = {}) => {
+    var parse7 = (input, options = {}) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
-      const opts = options || {};
-      const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+      let opts = options || {};
+      let max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
       if (input.length > max) {
         throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
       }
-      const ast = { type: "root", input, nodes: [] };
-      const stack = [ast];
+      let ast = { type: "root", input, nodes: [] };
+      let stack = [ast];
       let block = ast;
       let prev = ast;
       let brackets = 0;
-      const length = input.length;
+      let length = input.length;
       let index4 = 0;
       let depth = 0;
       let value;
+      let memo = {};
       const advance = () => input[index4++];
       const push = (node) => {
         if (node.type === "text" && prev.type === "dot") {
@@ -25160,6 +25513,7 @@ var require_parse2 = __commonJS({
         }
         if (value === CHAR_LEFT_SQUARE_BRACKET) {
           brackets++;
+          let closed = true;
           let next;
           while (index4 < length && (next = advance())) {
             value += next;
@@ -25198,7 +25552,7 @@ var require_parse2 = __commonJS({
           continue;
         }
         if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-          const open = value;
+          let open = value;
           let next;
           if (options.keepQuotes !== true) {
             value = "";
@@ -25220,8 +25574,8 @@ var require_parse2 = __commonJS({
         }
         if (value === CHAR_LEFT_CURLY_BRACE) {
           depth++;
-          const dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true;
-          const brace = {
+          let dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true;
+          let brace = {
             type: "brace",
             open: true,
             close: false,
@@ -25241,7 +25595,7 @@ var require_parse2 = __commonJS({
             push({ type: "text", value });
             continue;
           }
-          const type = "close";
+          let type = "close";
           block = stack.pop();
           block.close = true;
           push({ type, value });
@@ -25252,7 +25606,7 @@ var require_parse2 = __commonJS({
         if (value === CHAR_COMMA && depth > 0) {
           if (block.ranges > 0) {
             block.ranges = 0;
-            const open = block.nodes.shift();
+            let open = block.nodes.shift();
             block.nodes = [open, { type: "text", value: stringify4(block) }];
           }
           push({ type: "comma", value });
@@ -25260,7 +25614,7 @@ var require_parse2 = __commonJS({
           continue;
         }
         if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-          const siblings = block.nodes;
+          let siblings = block.nodes;
           if (depth === 0 || siblings.length === 0) {
             push({ type: "text", value });
             continue;
@@ -25281,7 +25635,7 @@ var require_parse2 = __commonJS({
           }
           if (prev.type === "range") {
             siblings.pop();
-            const before = siblings[siblings.length - 1];
+            let before = siblings[siblings.length - 1];
             before.value += prev.value + value;
             prev = before;
             block.ranges--;
@@ -25306,31 +25660,31 @@ var require_parse2 = __commonJS({
               node.invalid = true;
             }
           });
-          const parent = stack[stack.length - 1];
-          const index5 = parent.nodes.indexOf(block);
+          let parent = stack[stack.length - 1];
+          let index5 = parent.nodes.indexOf(block);
           parent.nodes.splice(index5, 1, ...block.nodes);
         }
       } while (stack.length > 0);
       push({ type: "eos" });
       return ast;
     };
-    module2.exports = parse6;
+    module2.exports = parse7;
   }
 });
 
-// node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js
+// node_modules/.pnpm/braces@3.0.2/node_modules/braces/index.js
 var require_braces = __commonJS({
-  "node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js"(exports2, module2) {
+  "node_modules/.pnpm/braces@3.0.2/node_modules/braces/index.js"(exports2, module2) {
     "use strict";
     var stringify4 = require_stringify();
     var compile = require_compile();
     var expand2 = require_expand();
-    var parse6 = require_parse2();
+    var parse7 = require_parse2();
     var braces = (input, options = {}) => {
       let output = [];
       if (Array.isArray(input)) {
-        for (const pattern of input) {
-          const result = braces.create(pattern, options);
+        for (let pattern of input) {
+          let result = braces.create(pattern, options);
           if (Array.isArray(result)) {
             output.push(...result);
           } else {
@@ -25345,7 +25699,7 @@ var require_braces = __commonJS({
       }
       return output;
     };
-    braces.parse = (input, options = {}) => parse6(input, options);
+    braces.parse = (input, options = {}) => parse7(input, options);
     braces.stringify = (input, options = {}) => {
       if (typeof input === "string") {
         return stringify4(braces.parse(input, options), options);
@@ -26003,7 +26357,7 @@ var require_parse3 = __commonJS({
     var syntaxError = (type, char) => {
       return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
     };
-    var parse6 = (input, options) => {
+    var parse7 = (input, options) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
@@ -26153,7 +26507,7 @@ var require_parse3 = __commonJS({
             output = token.close = `)$))${extglobStar}`;
           }
           if (token.inner.includes("*") && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-            const expression = parse6(rest, { ...options, fastpaths: false }).output;
+            const expression = parse7(rest, { ...options, fastpaths: false }).output;
             output = token.close = `)${expression})${extglobStar})`;
           }
           if (token.prev.type === "bos") {
@@ -26682,7 +27036,7 @@ var require_parse3 = __commonJS({
       }
       return state;
     };
-    parse6.fastpaths = (input, options) => {
+    parse7.fastpaths = (input, options) => {
       const opts = { ...options };
       const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
       const len = input.length;
@@ -26751,7 +27105,7 @@ var require_parse3 = __commonJS({
       }
       return source;
     };
-    module2.exports = parse6;
+    module2.exports = parse7;
   }
 });
 
@@ -26761,7 +27115,7 @@ var require_picomatch = __commonJS({
     "use strict";
     var path5 = require("path");
     var scan = require_scan();
-    var parse6 = require_parse3();
+    var parse7 = require_parse3();
     var utils = require_utils3();
     var constants = require_constants3();
     var isObject = (val2) => val2 && typeof val2 === "object" && !Array.isArray(val2);
@@ -26851,7 +27205,7 @@ var require_picomatch = __commonJS({
     picomatch.parse = (pattern, options) => {
       if (Array.isArray(pattern))
         return pattern.map((p4) => picomatch.parse(p4, options));
-      return parse6(pattern, { ...options, fastpaths: false });
+      return parse7(pattern, { ...options, fastpaths: false });
     };
     picomatch.scan = (input, options) => scan(input, options);
     picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
@@ -26877,10 +27231,10 @@ var require_picomatch = __commonJS({
       }
       let parsed = { negated: false, fastpaths: true };
       if (options.fastpaths !== false && (input[0] === "." || input[0] === "*")) {
-        parsed.output = parse6.fastpaths(input, options);
+        parsed.output = parse7.fastpaths(input, options);
       }
       if (!parsed.output) {
-        parsed = parse6(input, options);
+        parsed = parse7(input, options);
       }
       return picomatch.compileRe(parsed, options, returnOutput, returnState);
     };
@@ -26907,9 +27261,9 @@ var require_picomatch2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/micromatch@4.0.7/node_modules/micromatch/index.js
+// node_modules/.pnpm/micromatch@4.0.5/node_modules/micromatch/index.js
 var require_micromatch = __commonJS({
-  "node_modules/.pnpm/micromatch@4.0.7/node_modules/micromatch/index.js"(exports2, module2) {
+  "node_modules/.pnpm/micromatch@4.0.5/node_modules/micromatch/index.js"(exports2, module2) {
     "use strict";
     var util2 = require("util");
     var braces = require_braces();
@@ -41867,7 +42221,7 @@ var require_public_api = __commonJS({
       }
       return doc;
     }
-    function parse6(src, reviver, options) {
+    function parse7(src, reviver, options) {
       let _reviver = void 0;
       if (typeof reviver === "function") {
         _reviver = reviver;
@@ -41906,7 +42260,7 @@ var require_public_api = __commonJS({
       }
       return new Document.Document(value, _replacer, options).toString(options);
     }
-    exports2.parse = parse6;
+    exports2.parse = parse7;
     exports2.parseAllDocuments = parseAllDocuments;
     exports2.parseDocument = parseDocument;
     exports2.stringify = stringify4;
@@ -44332,7 +44686,7 @@ var require_extension = __commonJS({
       else
         dest[name].push(elem);
     }
-    function parse6(header) {
+    function parse7(header) {
       const offers = /* @__PURE__ */ Object.create(null);
       let params = /* @__PURE__ */ Object.create(null);
       let mustUnescape = false;
@@ -44487,7 +44841,7 @@ var require_extension = __commonJS({
         }).join(", ");
       }).join(", ");
     }
-    module2.exports = { format: format2, parse: parse6 };
+    module2.exports = { format: format2, parse: parse7 };
   }
 });
 
@@ -44519,7 +44873,7 @@ var require_websocket = __commonJS({
     var {
       EventTarget: { addEventListener: addEventListener2, removeEventListener }
     } = require_event_target();
-    var { format: format2, parse: parse6 } = require_extension();
+    var { format: format2, parse: parse7 } = require_extension();
     var { toBuffer } = require_buffer_util();
     var closeTimeout = 30 * 1e3;
     var kAborted = Symbol("kAborted");
@@ -45206,7 +45560,7 @@ var require_websocket = __commonJS({
           }
           let extensions;
           try {
-            extensions = parse6(secWebSocketExtensions);
+            extensions = parse7(secWebSocketExtensions);
           } catch (err2) {
             const message = "Invalid Sec-WebSocket-Extensions header";
             abortHandshake(websocket, socket, message);
@@ -45382,7 +45736,7 @@ var require_subprotocol = __commonJS({
   "node_modules/.pnpm/ws@8.17.0/node_modules/ws/lib/subprotocol.js"(exports2, module2) {
     "use strict";
     var { tokenChars } = require_validation();
-    function parse6(header) {
+    function parse7(header) {
       const protocols = /* @__PURE__ */ new Set();
       let start = -1;
       let end = -1;
@@ -45421,7 +45775,7 @@ var require_subprotocol = __commonJS({
       protocols.add(protocol2);
       return protocols;
     }
-    module2.exports = { parse: parse6 };
+    module2.exports = { parse: parse7 };
   }
 });
 
@@ -50251,7 +50605,7 @@ var init_v1 = __esm({
 });
 
 // node_modules/.pnpm/uuid@9.0.1/node_modules/uuid/dist/esm-node/parse.js
-function parse(uuid) {
+function parse2(uuid) {
   if (!validate_default(uuid)) {
     throw TypeError("Invalid UUID");
   }
@@ -50279,7 +50633,7 @@ var parse_default;
 var init_parse = __esm({
   "node_modules/.pnpm/uuid@9.0.1/node_modules/uuid/dist/esm-node/parse.js"() {
     init_validate();
-    parse_default = parse;
+    parse_default = parse2;
   }
 });
 
@@ -58236,7 +58590,7 @@ var require_dist_cjs39 = __commonJS({
       providerConfigFromInit: () => providerConfigFromInit
     });
     module2.exports = __toCommonJS2(src_exports2);
-    var import_url7 = require("url");
+    var import_url8 = require("url");
     var import_property_provider = require_dist_cjs12();
     var import_buffer2 = require("buffer");
     var import_http3 = require("http");
@@ -58343,7 +58697,7 @@ var require_dist_cjs39 = __commonJS({
         };
       }
       if (process.env[ENV_CMDS_FULL_URI]) {
-        const parsed = (0, import_url7.parse)(process.env[ENV_CMDS_FULL_URI]);
+        const parsed = (0, import_url8.parse)(process.env[ENV_CMDS_FULL_URI]);
         if (!parsed.hostname || !(parsed.hostname in GREENGRASS_HOSTS)) {
           throw new import_property_provider.CredentialsProviderError(
             `${parsed.hostname} is not a valid container metadata service hostname`,
@@ -65812,7 +66166,7 @@ var require_postgres_interval = __commonJS({
       if (!(this instanceof PostgresInterval)) {
         return new PostgresInterval(raw2);
       }
-      extend(this, parse6(raw2));
+      extend(this, parse7(raw2));
     }
     var properties = ["seconds", "minutes", "hours", "days", "months", "years"];
     PostgresInterval.prototype.toPostgres = function() {
@@ -65874,7 +66228,7 @@ var require_postgres_interval = __commonJS({
       var microseconds = fraction + "000000".slice(fraction.length);
       return parseInt(microseconds, 10) / 1e3;
     }
-    function parse6(interval) {
+    function parse7(interval) {
       if (!interval)
         return {};
       var matches = INTERVAL.exec(interval);
@@ -66368,13 +66722,13 @@ var require_binaryParsers = __commonJS({
           console.log("ERROR: ElementType not implemented: " + elementType2);
         }
       };
-      var parse6 = function(dimension, elementType2) {
+      var parse7 = function(dimension, elementType2) {
         var array = [];
         var i3;
         if (dimension.length > 1) {
           var count = dimension.shift();
           for (i3 = 0; i3 < count; i3++) {
-            array[i3] = parse6(dimension, elementType2);
+            array[i3] = parse7(dimension, elementType2);
           }
           dimension.unshift(count);
         } else {
@@ -66384,7 +66738,7 @@ var require_binaryParsers = __commonJS({
         }
         return array;
       };
-      return parse6(dims, elementType);
+      return parse7(dims, elementType);
     };
     var parseText = function(value) {
       return value.toString("utf8");
@@ -67032,7 +67386,7 @@ var require_type_overrides = __commonJS({
 var require_pg_connection_string = __commonJS({
   "node_modules/.pnpm/pg-connection-string@2.6.4/node_modules/pg-connection-string/index.js"(exports2, module2) {
     "use strict";
-    function parse6(str) {
+    function parse7(str) {
       if (str.charAt(0) === "/") {
         const config2 = str.split(" ");
         return { host: config2[0], database: config2[1] };
@@ -67108,8 +67462,8 @@ var require_pg_connection_string = __commonJS({
       }
       return config;
     }
-    module2.exports = parse6;
-    parse6.parse = parse6;
+    module2.exports = parse7;
+    parse7.parse = parse7;
   }
 });
 
@@ -67119,7 +67473,7 @@ var require_connection_parameters = __commonJS({
     "use strict";
     var dns = require("dns");
     var defaults3 = require_defaults();
-    var parse6 = require_pg_connection_string().parse;
+    var parse7 = require_pg_connection_string().parse;
     var val2 = function(key, config, envVar) {
       if (envVar === void 0) {
         envVar = process.env["PG" + key.toUpperCase()];
@@ -67154,9 +67508,9 @@ var require_connection_parameters = __commonJS({
     };
     var ConnectionParameters = class {
       constructor(config) {
-        config = typeof config === "string" ? parse6(config) : config || {};
+        config = typeof config === "string" ? parse7(config) : config || {};
         if (config.connectionString) {
-          config = Object.assign({}, config, parse6(config.connectionString));
+          config = Object.assign({}, config, parse7(config.connectionString));
         }
         this.user = val2("user", config);
         this.database = val2("database", config);
@@ -67827,7 +68181,7 @@ var require_serializer = __commonJS({
       );
     };
     var emptyArray = [];
-    var parse6 = (query2) => {
+    var parse7 = (query2) => {
       const name = query2.name || "";
       if (name.length > 63) {
         console.error("Warning! Postgres only supports 63 characters for query names.");
@@ -67976,7 +68330,7 @@ var require_serializer = __commonJS({
       sendSASLInitialResponseMessage,
       sendSCRAMClientFinalMessage,
       query,
-      parse: parse6,
+      parse: parse7,
       bind,
       execute,
       describe,
@@ -68354,12 +68708,12 @@ var require_dist2 = __commonJS({
       return serializer_1.serialize;
     } });
     var parser_1 = require_parser2();
-    function parse6(stream, callback) {
+    function parse7(stream, callback) {
       const parser = new parser_1.Parser();
       stream.on("data", (buffer2) => parser.parse(buffer2, callback));
       return new Promise((resolve2) => stream.on("end", () => resolve2()));
     }
-    exports2.parse = parse6;
+    exports2.parse = parse7;
   }
 });
 
@@ -68405,7 +68759,7 @@ var require_connection = __commonJS({
     "use strict";
     var net2 = require("net");
     var EventEmitter = require("events").EventEmitter;
-    var { parse: parse6, serialize: serialize3 } = require_dist2();
+    var { parse: parse7, serialize: serialize3 } = require_dist2();
     var { getStream, getSecureStream } = require_stream6();
     var flushBuffer = serialize3.flush();
     var syncBuffer = serialize3.sync();
@@ -68492,7 +68846,7 @@ var require_connection = __commonJS({
         });
       }
       attachListeners(stream) {
-        parse6(stream, (msg) => {
+        parse7(stream, (msg) => {
           var eventName = msg.name === "error" ? "errorMessage" : msg.name;
           if (this._emitMessage) {
             this.emit("message", msg);
@@ -71754,7 +72108,7 @@ function Subscribe(postgres2, options) {
     }
     function data(x4) {
       if (x4[0] === 119) {
-        parse2(x4.subarray(25), state2, sql3.options.parsers, handle, options.transform);
+        parse3(x4.subarray(25), state2, sql3.options.parsers, handle, options.transform);
       } else if (x4[0] === 107 && x4[17]) {
         state2.lsn = x4.subarray(1, 9);
         pong();
@@ -71784,7 +72138,7 @@ function Subscribe(postgres2, options) {
 function Time(x3) {
   return new Date(Date.UTC(2e3, 0, 1) + Number(x3 / BigInt(1e3)));
 }
-function parse2(x3, state, parsers2, handle, transform) {
+function parse3(x3, state, parsers2, handle, transform) {
   const char = (acc, [k2, v6]) => (acc[k2.charCodeAt(0)] = v6, acc);
   Object.entries({
     R: (x4) => {
@@ -80286,7 +80640,7 @@ var require_extension2 = __commonJS({
       else
         dest[name].push(elem);
     }
-    function parse6(header) {
+    function parse7(header) {
       const offers = /* @__PURE__ */ Object.create(null);
       let params = /* @__PURE__ */ Object.create(null);
       let mustUnescape = false;
@@ -80441,7 +80795,7 @@ var require_extension2 = __commonJS({
         }).join(", ");
       }).join(", ");
     }
-    module2.exports = { format: format2, parse: parse6 };
+    module2.exports = { format: format2, parse: parse7 };
   }
 });
 
@@ -80473,7 +80827,7 @@ var require_websocket2 = __commonJS({
     var {
       EventTarget: { addEventListener: addEventListener2, removeEventListener }
     } = require_event_target2();
-    var { format: format2, parse: parse6 } = require_extension2();
+    var { format: format2, parse: parse7 } = require_extension2();
     var { toBuffer } = require_buffer_util2();
     var closeTimeout = 30 * 1e3;
     var kAborted = Symbol("kAborted");
@@ -81153,7 +81507,7 @@ var require_websocket2 = __commonJS({
           }
           let extensions;
           try {
-            extensions = parse6(secWebSocketExtensions);
+            extensions = parse7(secWebSocketExtensions);
           } catch (err2) {
             const message = "Invalid Sec-WebSocket-Extensions header";
             abortHandshake(websocket, socket, message);
@@ -81327,7 +81681,7 @@ var require_subprotocol2 = __commonJS({
   "node_modules/.pnpm/ws@8.14.2_bufferutil@4.0.8_utf-8-validate@6.0.3/node_modules/ws/lib/subprotocol.js"(exports2, module2) {
     "use strict";
     var { tokenChars } = require_validation2();
-    function parse6(header) {
+    function parse7(header) {
       const protocols = /* @__PURE__ */ new Set();
       let start = -1;
       let end = -1;
@@ -81366,7 +81720,7 @@ var require_subprotocol2 = __commonJS({
       protocols.add(protocol2);
       return protocols;
     }
-    module2.exports = { parse: parse6 };
+    module2.exports = { parse: parse7 };
   }
 });
 
@@ -99253,7 +99607,7 @@ var require_esprima = __commonJS({
             var jsx_parser_1 = __webpack_require__2(3);
             var parser_1 = __webpack_require__2(8);
             var tokenizer_1 = __webpack_require__2(15);
-            function parse6(code, options, delegate) {
+            function parse7(code, options, delegate) {
               var commentHandler = null;
               var proxyDelegate = function(node, metadata) {
                 if (delegate) {
@@ -99298,17 +99652,17 @@ var require_esprima = __commonJS({
               }
               return ast;
             }
-            exports3.parse = parse6;
+            exports3.parse = parse7;
             function parseModule(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "module";
-              return parse6(code, parsingOptions, delegate);
+              return parse7(code, parsingOptions, delegate);
             }
             exports3.parseModule = parseModule;
             function parseScript(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "script";
-              return parse6(code, parsingOptions, delegate);
+              return parse7(code, parsingOptions, delegate);
             }
             exports3.parseScript = parseScript;
             function tokenize(code, options, delegate) {
@@ -108860,7 +109214,7 @@ var require_named_placeholders = __commonJS({
     var DQUOTE = 34;
     var SQUOTE = 39;
     var BSLASH = 92;
-    function parse6(query) {
+    function parse7(query) {
       let ppos = RE_PARAM.exec(query);
       let curpos = 0;
       let start = 0;
@@ -108975,17 +109329,17 @@ var require_named_placeholders = __commonJS({
         if (cache && (tree = cache.get(query))) {
           return toArrayParams(tree, paramsObj);
         }
-        tree = join7(parse6(query));
+        tree = join7(parse7(query));
         if (cache) {
           cache.set(query, tree);
         }
         return toArrayParams(tree, paramsObj);
       }
-      compile.parse = parse6;
+      compile.parse = parse7;
       return compile;
     }
     function toNumbered(q, params) {
-      const tree = parse6(q);
+      const tree = parse7(q);
       const paramsArr = [];
       if (tree.length == 1) {
         return [tree[0], paramsArr];
@@ -111139,7 +111493,7 @@ function parseObjectRow(fields, rawRow, cast2) {
     return acc;
   }, {});
 }
-function parse3(result, cast2, returnAs) {
+function parse4(result, cast2, returnAs) {
   const fields = result.fields ?? [];
   const rows = result.rows ?? [];
   return rows.map((row) => returnAs === "array" ? parseArrayRow(fields, row, cast2) : parseObjectRow(fields, row, cast2));
@@ -111248,7 +111602,7 @@ var init_dist2 = __esm({
           field.type || (field.type = "NULL");
         }
         const castFn = options.cast || this.config.cast || cast;
-        const rows = result ? parse3(result, castFn, options.as || "object") : [];
+        const rows = result ? parse4(result, castFn, options.as || "object") : [];
         const headers = fields.map((f3) => f3.name);
         const typeByName = (acc, { name, type }) => ({ ...acc, [name]: type });
         const types4 = fields.reduce(typeByName, {});
@@ -111291,6 +111645,7 @@ var init_connections = __esm({
     init_utils2();
     init_global();
     init_outputs();
+    init_utils();
     preparePostgresDB = async (credentials2) => {
       if ("driver" in credentials2) {
         if (credentials2.driver === "aws-data-api") {
@@ -111675,7 +112030,7 @@ var init_connections = __esm({
         const { drizzle } = await import("drizzle-orm/libsql");
         const { migrate } = await import("drizzle-orm/libsql/migrator");
         const client = createClient2({
-          url: credentials2.url
+          url: normaliseSQLiteUrl(credentials2.url, "libsql")
         });
         const drzl = drizzle(client);
         const migrateFn = async (config) => {
@@ -111710,7 +112065,7 @@ var init_connections = __esm({
         const { default: Database } = await import("better-sqlite3");
         const { drizzle } = await import("drizzle-orm/better-sqlite3");
         const { migrate } = await import("drizzle-orm/better-sqlite3/migrator");
-        const sqlite = new Database(credentials2.url);
+        const sqlite = new Database(normaliseSQLiteUrl(credentials2.url, "better-sqlite"));
         const drzl = drizzle(sqlite);
         const migrateFn = async (config) => {
           return migrate(drzl, config);
@@ -115165,6 +115520,7 @@ var init_introspect_pg = __esm({
     init_utils3();
     init_pgSerializer();
     init_global();
+    init_vector();
     pgImportsList = /* @__PURE__ */ new Set([
       "pgTable",
       "pgEnum",
@@ -115193,7 +115549,8 @@ var init_introspect_pg = __esm({
       "macaddr8",
       "bigint",
       "doublePrecision",
-      "uuid"
+      "uuid",
+      "vector"
     ]);
     objToStatement23 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
@@ -115330,6 +115687,7 @@ var init_introspect_pg = __esm({
             patched = patched.startsWith("numeric(") ? "numeric" : patched;
             patched = patched.startsWith("time(") ? "time" : patched;
             patched = patched.startsWith("timestamp(") ? "timestamp" : patched;
+            patched = patched.startsWith("vector(") ? "vector" : patched;
             return patched;
           }).filter((type) => {
             return pgImportsList.has(type);
@@ -115520,7 +115878,7 @@ var init_introspect_pg = __esm({
       }
       if (lowered === "date") {
         let out = `${withCasing2(name, casing2)}: date("${name}")`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue === "CURRENT_DATE" ? `.default(sql\`${defaultValue}\`)` : defaultValue ? `.default(${defaultValue})` : "";
         out += defaultValue;
         return out;
       }
@@ -115580,6 +115938,23 @@ var init_introspect_pg = __esm({
         out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
         return out;
       }
+      if (lowered.startsWith("vector")) {
+        const split = lowered.split(" ");
+        let out;
+        if (lowered.length !== 6) {
+          out = `${withCasing2(
+            name,
+            casing2
+          )}: vector("${name}", { dimensions: ${lowered.substring(
+            7,
+            lowered.length - 1
+          )} })`;
+        } else {
+          out = `${withCasing2(name, casing2)}: vector("${name}")`;
+        }
+        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        return out;
+      }
       if (lowered.startsWith("char")) {
         let out;
         if (lowered.length !== 4) {
@@ -115693,13 +116068,35 @@ var init_introspect_pg = __esm({
         let idxKey = it.name.startsWith(tableName) && it.name !== tableName ? it.name.slice(tableName.length + 1) : it.name;
         idxKey = idxKey.endsWith("_index") ? idxKey.slice(0, -"_index".length) + "_idx" : idxKey;
         idxKey = withCasing2(idxKey, casing2);
-        const indexGeneratedName = indexName2(tableName, it.columns);
+        const indexGeneratedName = indexName2(
+          tableName,
+          it.columns.map((it2) => it2.expression)
+        );
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
         statement += `		${idxKey}: `;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
-        statement += `.on(${it.columns.map((it2) => `table.${withCasing2(it2, casing2)}`).join(", ")}),`;
-        statement += `
+        statement += `${it.concurrently ? `.concurrently()` : ""}`;
+        statement += `.using("${it.method}", ${it.columns.map((it2) => {
+          if (it2.isExpression) {
+            return `sql\`${it2.expression}\``;
+          } else {
+            return `table.${withCasing2(it2.expression, casing2)}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
+          }
+        }).join(", ")})`;
+        statement += it.where ? `.where(sql\`${it.where}\`)` : "";
+        function reverseLogic(mappedWith) {
+          let reversedString = "{";
+          for (const key in mappedWith) {
+            if (mappedWith.hasOwnProperty(key)) {
+              reversedString += `${key}: "${mappedWith[key]}",`;
+            }
+          }
+          reversedString = reversedString.length > 1 ? reversedString.slice(0, reversedString.length - 1) : reversedString;
+          return `${reversedString}}`;
+        }
+        statement += it.with && Object.keys(it.with).length > 0 ? `.with(${reverseLogic(it.with)})` : "";
+        statement += `,
 `;
       });
       return statement;
@@ -117099,13 +117496,13 @@ var init_url = __esm({
 });
 
 // node_modules/.pnpm/hono@4.3.9/node_modules/hono/dist/utils/cookie.js
-var validCookieNameRegEx, validCookieValueRegEx, parse4;
+var validCookieNameRegEx, validCookieValueRegEx, parse5;
 var init_cookie = __esm({
   "node_modules/.pnpm/hono@4.3.9/node_modules/hono/dist/utils/cookie.js"() {
     init_url();
     validCookieNameRegEx = /^[\w!#$%&'*.^`|~+-]+$/;
     validCookieValueRegEx = /^[ !#-:<-[\]-~]*$/;
-    parse4 = (cookie, name) => {
+    parse5 = (cookie, name) => {
       const pairs = cookie.trim().split(";");
       return pairs.reduce((parsedCookie, pairStr) => {
         pairStr = pairStr.trim();
@@ -117147,13 +117544,13 @@ var init_cookie2 = __esm({
         } else if (prefix === "host") {
           finalKey = "__Host-" + key;
         }
-        const obj2 = parse4(cookie, finalKey);
+        const obj2 = parse5(cookie, finalKey);
         return obj2[finalKey];
       }
       if (!cookie) {
         return {};
       }
-      const obj = parse4(cookie);
+      const obj = parse5(cookie);
       return obj;
     };
   }
@@ -119566,7 +119963,7 @@ var init_dist6 = __esm({
 });
 
 // node_modules/.pnpm/superjson@2.2.1/node_modules/superjson/dist/index.js
-var SuperJSON, serialize2, deserialize, stringify3, parse5, registerClass, registerCustom, registerSymbol, allowErrorProps;
+var SuperJSON, serialize2, deserialize, stringify3, parse6, registerClass, registerCustom, registerSymbol, allowErrorProps;
 var init_dist7 = __esm({
   "node_modules/.pnpm/superjson@2.2.1/node_modules/superjson/dist/index.js"() {
     init_class_registry();
@@ -119651,7 +120048,7 @@ var init_dist7 = __esm({
     serialize2 = SuperJSON.serialize;
     deserialize = SuperJSON.deserialize;
     stringify3 = SuperJSON.stringify;
-    parse5 = SuperJSON.parse;
+    parse6 = SuperJSON.parse;
     registerClass = SuperJSON.registerClass;
     registerCustom = SuperJSON.registerCustom;
     registerSymbol = SuperJSON.registerSymbol;
@@ -120141,7 +120538,11 @@ var upPgHandler = (out) => {
     raw: report.rawMap[it]
   })).forEach((it) => {
     const path5 = it.path;
-    const result = updateUpToV6(it.raw);
+    let resultV6 = it.raw;
+    if (it.raw.version === "5") {
+      resultV6 = updateUpToV6(it.raw);
+    }
+    const result = updateUpToV7(resultV6);
     console.log(`[${source_default.green("\u2713")}] ${path5}`);
     (0, import_fs2.writeFileSync)(path5, JSON.stringify(result, null, 2));
   });
@@ -120177,6 +120578,36 @@ var updateUpToV6 = (json) => {
     enums
   };
 };
+var updateUpToV7 = (json) => {
+  const schema5 = pgSchemaV6.parse(json);
+  const tables = Object.fromEntries(
+    Object.entries(schema5.tables).map((it) => {
+      const table4 = it[1];
+      const mappedIndexes = Object.fromEntries(
+        Object.entries(table4.indexes).map((idx) => {
+          const { columns, ...rest } = idx[1];
+          const mappedColumns = columns.map((it2) => {
+            return {
+              expression: it2,
+              isExpression: false,
+              asc: true,
+              nulls: "last",
+              opClass: void 0
+            };
+          });
+          return [idx[0], { columns: mappedColumns, ...rest }];
+        })
+      );
+      return [it[0], { ...table4, indexes: mappedIndexes }];
+    })
+  );
+  return {
+    ...schema5,
+    version: "7",
+    dialect: "postgresql",
+    tables
+  };
+};
 
 // src/cli/commands/sqliteUp.ts
 init_source();
@@ -121342,7 +121773,7 @@ var printVersions = async () => {
 var versions = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.21.4";
+  const envVersion = "0.22.0";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions2 = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;