rake-db 2.23.11 → 2.23.13

package/dist/index.js

@@ -18,10 +18,8 @@ const getFirstWordAndRest = (input) => {
 };
 const getTextAfterRegExp = (input, regex, length) => {
   let index = input.search(regex);
-  if (index === -1)
-    return;
-  if (input[index] === "-" || input[index] === "_")
-    index++;
+  if (index === -1) return;
+  if (input[index] === "-" || input[index] === "_") index++;
   index += length;
   const start = input[index] == "-" || input[index] === "_" ? index + 1 : index;
   const text = input.slice(start);
@@ -97,25 +95,6 @@ const clearChanges = () => {
 const getCurrentChanges = () => currentChanges;
 const pushChange = (fn) => currentChanges.push(fn);
 
-var __defProp$9 = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
-var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
-var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$9 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$9.call(b, prop))
-      __defNormalProp$9(a, prop, b[prop]);
-  if (__getOwnPropSymbols$9)
-    for (var prop of __getOwnPropSymbols$9(b)) {
-      if (__propIsEnum$9.call(b, prop))
-        __defNormalProp$9(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const versionToString = (config, version) => config.migrationId === "timestamp" ? `${version}` : `${version}`.padStart(config.migrationId.serial, "0");
 const columnTypeToSql = (item) => {
   return item.data.isOfCustomType ? item instanceof pqb.DomainColumn ? quoteNameFromString(item.dataType) : quoteCustomType(item.toSQL()) : item.toSQL();
@@ -124,7 +103,6 @@ const getColumnName = (item, key, snakeCase) => {
   return item.data.name || (snakeCase ? orchidCore.toSnakeCase(key) : key);
 };
 const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
-  var _a, _b;
   const line = [`"${name}" ${columnTypeToSql(item)}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
@@ -154,19 +132,19 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
     line.push(checkToSql(item.data.check.sql, values));
   }
   const def = encodeColumnDefault(item.data.default, values, item);
-  if (def !== null)
-    line.push(`DEFAULT ${def}`);
+  if (def !== null) line.push(`DEFAULT ${def}`);
   const { foreignKeys } = item.data;
   if (foreignKeys) {
     for (const foreignKey of foreignKeys) {
-      if ((_a = foreignKey.options) == null ? void 0 : _a.name) {
-        line.push(`CONSTRAINT "${(_b = foreignKey.options) == null ? void 0 : _b.name}"`);
+      if (foreignKey.options?.name) {
+        line.push(`CONSTRAINT "${foreignKey.options?.name}"`);
       }
       line.push(
         referencesToSql(
-          __spreadValues$9({
-            columns: [name]
-          }, foreignKey),
+          {
+            columns: [name],
+            ...foreignKey
+          },
           snakeCase
         )
       );
@@ -180,7 +158,7 @@ const encodeColumnDefault = (def, values, column) => {
       return def.toSQL({ values });
     } else {
       return pqb.escapeForMigration(
-        (column == null ? void 0 : column.data.encode) ? column.data.encode(def) : def
+        column?.data.encode ? column.data.encode(def) : def
       );
     }
   }
@@ -192,20 +170,13 @@ const identityToSql = (identity) => {
 };
 const sequenceOptionsToSql = (item) => {
   const line = [];
-  if (item.dataType)
-    line.push(`AS ${item.dataType}`);
-  if (item.increment !== void 0)
-    line.push(`INCREMENT BY ${item.increment}`);
-  if (item.min !== void 0)
-    line.push(`MINVALUE ${item.min}`);
-  if (item.max !== void 0)
-    line.push(`MAXVALUE ${item.max}`);
-  if (item.start !== void 0)
-    line.push(`START WITH ${item.start}`);
-  if (item.cache !== void 0)
-    line.push(`CACHE ${item.cache}`);
-  if (item.cycle)
-    line.push(`CYCLE`);
+  if (item.dataType) line.push(`AS ${item.dataType}`);
+  if (item.increment !== void 0) line.push(`INCREMENT BY ${item.increment}`);
+  if (item.min !== void 0) line.push(`MINVALUE ${item.min}`);
+  if (item.max !== void 0) line.push(`MAXVALUE ${item.max}`);
+  if (item.start !== void 0) line.push(`START WITH ${item.start}`);
+  if (item.cache !== void 0) line.push(`CACHE ${item.cache}`);
+  if (item.cycle) line.push(`CYCLE`);
   if (item.ownedBy) {
     const [schema, table] = getSchemaAndTableFromName(item.ownedBy);
     line.push(`OWNED BY ${quoteTable(schema, table)}`);
@@ -215,9 +186,10 @@ const sequenceOptionsToSql = (item) => {
 const addColumnIndex = (indexes, name, item) => {
   if (item.data.indexes) {
     indexes.push(
-      ...item.data.indexes.map((index) => __spreadValues$9({
-        columns: [__spreadProps$7(__spreadValues$9({}, index.options), { column: name })]
-      }, index))
+      ...item.data.indexes.map((index) => ({
+        columns: [{ ...index.options, column: name }],
+        ...index
+      }))
     );
   }
 };
@@ -240,10 +212,8 @@ const getConstraintName = (table, constraint, snakeCase) => {
       "_"
     )}_fkey`;
   }
-  if (constraint.check)
-    return `${table}_check`;
-  if (constraint.identity)
-    return `${table}_identity`;
+  if (constraint.check) return `${table}_check`;
+  if (constraint.identity) return `${table}_identity`;
   return `${table}_constraint`;
 };
 const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
@@ -277,14 +247,14 @@ const referencesToSql = (references, snakeCase) => {
     )})`
   ];
   const { options } = references;
-  if (options == null ? void 0 : options.match) {
-    sql.push(`MATCH ${options == null ? void 0 : options.match.toUpperCase()}`);
+  if (options?.match) {
+    sql.push(`MATCH ${options?.match.toUpperCase()}`);
   }
-  if (options == null ? void 0 : options.onDelete) {
-    sql.push(`ON DELETE ${options == null ? void 0 : options.onDelete.toUpperCase()}`);
+  if (options?.onDelete) {
+    sql.push(`ON DELETE ${options?.onDelete.toUpperCase()}`);
   }
-  if (options == null ? void 0 : options.onUpdate) {
-    sql.push(`ON UPDATE ${options == null ? void 0 : options.onUpdate.toUpperCase()}`);
+  if (options?.onUpdate) {
+    sql.push(`ON UPDATE ${options?.onUpdate.toUpperCase()}`);
   }
   return sql.join(" ");
 };
@@ -296,10 +266,9 @@ const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, lan
     let include = options.include ? orchidCore.toArray(options.include) : void 0;
     if (snakeCase) {
       columns = columns.map(
-        (c) => "column" in c ? __spreadProps$7(__spreadValues$9({}, c), { column: orchidCore.toSnakeCase(c.column) }) : c
+        (c) => "column" in c ? { ...c, column: orchidCore.toSnakeCase(c.column) } : c
       );
-      if (include)
-        include = include.map(orchidCore.toSnakeCase);
+      if (include) include = include.map(orchidCore.toSnakeCase);
     }
     const indexName = name || getIndexName(tableName, columns);
     if (!up) {
@@ -387,7 +356,7 @@ const primaryKeyToSql = (primaryKey) => {
   return `${primaryKey.name ? `CONSTRAINT "${primaryKey.name}" ` : ""}PRIMARY KEY (${joinColumns(primaryKey.columns)})`;
 };
 const interpolateSqlValues = ({ text, values }) => {
-  return (values == null ? void 0 : values.length) ? text.replace(/\$(\d+)/g, (_, n) => {
+  return values?.length ? text.replace(/\$(\d+)/g, (_, n) => {
     const i = +n - 1;
     return pqb.escapeForMigration(values[i]);
   }) : text;
@@ -409,39 +378,7 @@ class RakeDbError extends Error {
 class NoPrimaryKey extends RakeDbError {
 }
 
-var __defProp$8 = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
-var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
-var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$8 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$8.call(b, prop))
-      __defNormalProp$8(a, prop, b[prop]);
-  if (__getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(b)) {
-      if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$8(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-var __objRest$1 = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$8.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$8)
-    for (var prop of __getOwnPropSymbols$8(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$8.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 const createTable = async (migration, up, tableName, first, second, third) => {
-  var _a;
   let options;
   let fn;
   let dataFn;
@@ -467,7 +404,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     shape = pqb.getColumnTypes(
       types,
       fn,
-      (_a = migration.options.baseTable) == null ? void 0 : _a.nowSQL,
+      migration.options.baseTable?.nowSQL,
       language
     );
     tableData = pqb.parseTableData(dataFn);
@@ -484,15 +421,14 @@ const createTable = async (migration, up, tableName, first, second, third) => {
   );
   fn && validatePrimaryKey(ast);
   const queries = astToQueries$1(ast, snakeCase, language);
-  for (const _b of queries) {
-    const _c = _b, { then } = _c, query = __objRest$1(_c, ["then"]);
+  for (const { then, ...query } of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
-    then == null ? void 0 : then(result);
+    then?.(result);
   }
   let table;
   return {
     get table() {
-      return table != null ? table : table = migration(
+      return table ?? (table = migration(
         tableName,
         shape,
         void 0,
@@ -500,7 +436,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
           noPrimaryKey: options.noPrimaryKey ? "ignore" : void 0,
           snakeCase
         }
-      );
+      ));
     }
   };
 };
@@ -514,24 +450,24 @@ const makeAst$2 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   }
   const { primaryKey } = tableData;
   const [schema, table] = getSchemaAndTableFromName(tableName);
-  return __spreadProps$6(__spreadValues$8(__spreadProps$6(__spreadValues$8({
+  return {
     type: "table",
     action: up ? "create" : "drop",
     schema,
     name: table,
-    shape
-  }, tableData), {
-    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? __spreadProps$6(__spreadValues$8({}, primaryKey), {
+    shape,
+    ...tableData,
+    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? {
+      ...primaryKey,
       columns: [.../* @__PURE__ */ new Set([...shapePKeys, ...primaryKey.columns])]
-    }) : { columns: shapePKeys }
-  }), options), {
+    } : { columns: shapePKeys },
+    ...options,
     noPrimaryKey: options.noPrimaryKey ? "ignore" : noPrimaryKey || "error"
-  });
+  };
 };
 const validatePrimaryKey = (ast) => {
-  var _a, _b;
   if (ast.noPrimaryKey !== "ignore") {
-    let hasPrimaryKey = !!((_b = (_a = ast.primaryKey) == null ? void 0 : _a.columns) == null ? void 0 : _b.length);
+    let hasPrimaryKey = !!ast.primaryKey?.columns?.length;
     if (!hasPrimaryKey) {
       for (const key in ast.shape) {
         if (ast.shape[key].data.primaryKey) {
@@ -554,13 +490,11 @@ You can suppress this error by setting { noPrimaryKey: true } after a table name
   }
 };
 const astToQueries$1 = (ast, snakeCase, language) => {
-  var _a, _b;
   const queries = [];
   const { shape } = ast;
   for (const key in shape) {
     const item = shape[key];
-    if (!(item instanceof pqb.EnumColumn))
-      continue;
+    if (!(item instanceof pqb.EnumColumn)) continue;
     queries.push(makePopulateEnumQuery(item));
   }
   if (ast.action === "drop") {
@@ -594,30 +528,36 @@ const astToQueries$1 = (ast, snakeCase, language) => {
       })}`
     );
   }
-  (_a = ast.constraints) == null ? void 0 : _a.forEach((item) => {
+  ast.constraints?.forEach((item) => {
     lines.push(
       `
   ${constraintToSql(
         ast,
         true,
-        __spreadProps$6(__spreadValues$8({}, item), {
-          references: item.references ? __spreadProps$6(__spreadValues$8({}, item.references), {
+        {
+          ...item,
+          references: item.references ? {
+            ...item.references,
             columns: item.references.columns.map(
               (column) => getColumnName(shape[column], column, snakeCase)
             )
-          }) : void 0
-        }),
+          } : void 0
+        },
         values,
         snakeCase
       )}`
     );
   });
   indexes.push(
-    ...((_b = ast.indexes) == null ? void 0 : _b.map((index) => __spreadProps$6(__spreadValues$8({}, index), {
-      columns: index.columns.map((item) => __spreadValues$8(__spreadValues$8({}, item), "column" in item ? {
-        column: getColumnName(shape[item.column], item.column, snakeCase)
-      } : {}))
-    }))) || []
+    ...ast.indexes?.map((index) => ({
+      ...index,
+      columns: index.columns.map((item) => ({
+        ...item,
+        ..."column" in item ? {
+          column: getColumnName(shape[item.column], item.column, snakeCase)
+        } : {}
+      }))
+    })) || []
   );
   queries.push(
     {
@@ -638,25 +578,6 @@ const astToQueries$1 = (ast, snakeCase, language) => {
   return queries;
 };
 
-var __defProp$7 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const newChangeTableData = () => ({
   add: {},
   drop: {}
@@ -671,8 +592,7 @@ function add(item, options) {
   setName(this, item);
   if (item instanceof pqb.ColumnType) {
     const result = addOrDrop("add", item, options);
-    if (result.type === "change")
-      return result;
+    if (result.type === "change") return result;
     addOrDropChanges.push(result);
     return addOrDropChanges.length - 1;
   }
@@ -683,7 +603,7 @@ function add(item, options) {
         result[key2] = {
           type: "add",
           item: item[key2],
-          dropMode: options == null ? void 0 : options.dropMode
+          dropMode: options?.dropMode
         };
       }
       return result;
@@ -698,8 +618,7 @@ const drop = function(item, options) {
   setName(this, item);
   if (item instanceof pqb.ColumnType) {
     const result = addOrDrop("drop", item, options);
-    if (result.type === "change")
-      return result;
+    if (result.type === "change") return result;
     addOrDropChanges.push(result);
     return addOrDropChanges.length - 1;
   }
@@ -710,7 +629,7 @@ const drop = function(item, options) {
         result[key2] = {
           type: "drop",
           item: item[key2],
-          dropMode: options == null ? void 0 : options.dropMode
+          dropMode: options?.dropMode
         };
       }
       return result;
@@ -734,55 +653,53 @@ const addOrDrop = (type, item, options) => {
         check: item.data.check
       }
     });
-    return __spreadValues$7({
+    return {
       type: "change",
       from: type === "add" ? empty : add2,
-      to: type === "add" ? add2 : empty
-    }, options);
+      to: type === "add" ? add2 : empty,
+      ...options
+    };
   }
   return {
     type,
     item,
-    dropMode: options == null ? void 0 : options.dropMode
+    dropMode: options?.dropMode
   };
 };
 const columnTypeToColumnChange = (item, name) => {
   if (item instanceof pqb.ColumnType) {
     let column = item;
     const foreignKeys = column.data.foreignKeys;
-    if (foreignKeys == null ? void 0 : foreignKeys.some((it) => "fn" in it)) {
+    if (foreignKeys?.some((it) => "fn" in it)) {
       throw new Error("Callback in foreignKey is not allowed in migration");
     }
-    if (name && !column.data.name) {
-      column = Object.create(column);
-      column.data = __spreadProps$5(__spreadValues$7({}, column.data), { name });
-    }
-    return __spreadProps$5(__spreadValues$7({
+    return {
       column,
       type: column.toSQL(),
-      nullable: column.data.isNullable
-    }, column.data), {
+      nullable: column.data.isNullable,
+      ...column.data,
       primaryKey: column.data.primaryKey === void 0 ? void 0 : true,
       foreignKeys
-    });
+    };
   }
   return item.to;
 };
 const nameKey = Symbol("name");
 const setName = (self, item) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b;
   const name = self[nameKey];
-  if (!name)
-    return;
+  if (!name) return;
   if ("column" in item && item.column instanceof pqb.ColumnType) {
-    (_b = (_a = item.column.data).name) != null ? _b : _a.name = name;
+    (_a = item.column.data).name ?? (_a.name = name);
   } else if (item instanceof pqb.ColumnType) {
-    (_d = (_c = item.data).name) != null ? _d : _c.name = name;
+    (_b = item.data).name ?? (_b.name = name);
   } else {
-    (_e = item.name) != null ? _e : item.name = name;
+    item.name ?? (item.name = name);
   }
 };
-const tableChangeMethods = __spreadProps$5(__spreadValues$7(__spreadValues$7({}, tableMethods), pqb.tableDataMethods), {
+const tableChangeMethods = {
+  ...tableMethods,
+  ...pqb.tableDataMethods,
   name(name) {
     orchidCore.setCurrentColumnName(name);
     const types = Object.create(this);
@@ -848,9 +765,8 @@ const tableChangeMethods = __spreadProps$5(__spreadValues$7(__spreadValues$7({},
   rename(name) {
     return { type: "rename", name };
   }
-});
+};
 const changeTable = async (migration, up, tableName, options, fn) => {
-  var _a;
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
   const language = "language" in options ? options.language : migration.options.language;
   orchidCore.setDefaultLanguage(language);
@@ -861,12 +777,12 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   Object.assign(tableChanger, tableChangeMethods);
   tableChanger[orchidCore.snakeCaseKey] = snakeCase;
   addOrDropChanges.length = 0;
-  const changeData = (fn == null ? void 0 : fn(tableChanger)) || {};
+  const changeData = fn?.(tableChanger) || {};
   const ast = makeAst$1(up, tableName, changeData, changeTableData, options);
   const queries = astToQueries(ast, snakeCase, language);
   for (const query of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
-    (_a = query.then) == null ? void 0 : _a.call(query, result);
+    query.then?.(result);
   }
 };
 const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
@@ -886,23 +802,23 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
         shape[key] = item;
       } else {
         if (item.type === "rename") {
-          shape[item.name] = __spreadProps$5(__spreadValues$7({}, item), { name: key });
+          shape[item.name] = { ...item, name: key };
         } else {
-          shape[key] = item.type === "add" ? __spreadProps$5(__spreadValues$7({}, item), { type: "drop" }) : item.type === "drop" ? __spreadProps$5(__spreadValues$7({}, item), { type: "add" }) : item.type === "change" ? __spreadProps$5(__spreadValues$7({}, item), {
+          shape[key] = item.type === "add" ? { ...item, type: "drop" } : item.type === "drop" ? { ...item, type: "add" } : item.type === "change" ? {
+            ...item,
             from: item.to,
             to: item.from,
             using: item.using && {
               usingUp: item.using.usingDown,
               usingDown: item.using.usingUp
             }
-          }) : item;
+          } : item;
         }
       }
     }
   }
   for (let i = 0; i < addOrDropChanges.length; i++) {
-    if (consumedChanges[i])
-      continue;
+    if (consumedChanges[i]) continue;
     const change = addOrDropChanges[i];
     const name2 = change.item.data.name;
     if (!name2) {
@@ -910,21 +826,21 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
     }
     const arr = shape[name2] ? orchidCore.toArray(shape[name2]) : [];
     arr[up ? "push" : "unshift"](
-      up ? change : __spreadProps$5(__spreadValues$7({}, change), { type: change.type === "add" ? "drop" : "add" })
+      up ? change : { ...change, type: change.type === "add" ? "drop" : "add" }
     );
     shape[name2] = arr;
   }
   const [schema, table] = getSchemaAndTableFromName(name);
-  return __spreadValues$7({
+  return {
     type: "changeTable",
     schema,
     name: table,
     comment: comment ? up ? Array.isArray(comment) ? comment[1] : comment : Array.isArray(comment) ? comment[0] : null : void 0,
-    shape
-  }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
+    shape,
+    ...up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add }
+  };
 };
 const astToQueries = (ast, snakeCase, language) => {
-  var _a, _b, _c, _d;
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
@@ -980,10 +896,10 @@ const astToQueries = (ast, snakeCase, language) => {
   const alterTable = [];
   const renameItems = [];
   const values = [];
-  const addIndexes = (_a = ast.add.indexes) != null ? _a : [];
-  const dropIndexes = (_b = ast.drop.indexes) != null ? _b : [];
-  const addConstraints = (_c = ast.add.constraints) != null ? _c : [];
-  const dropConstraints = (_d = ast.drop.constraints) != null ? _d : [];
+  const addIndexes = ast.add.indexes ?? [];
+  const dropIndexes = ast.drop.indexes ?? [];
+  const addConstraints = ast.add.constraints ?? [];
+  const dropConstraints = ast.drop.constraints ?? [];
   const comments = [];
   for (const key in ast.shape) {
     const item = ast.shape[key];
@@ -1112,7 +1028,6 @@ const handlePrerequisitesForTableItem = (key, item, queries, addPrimaryKeys, dro
   }
 };
 const handleTableItemChange = (key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addConstraints, dropConstraints, comments, snakeCase) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
   if (item.type === "add") {
     const column = item.item;
     const name = getColumnName(column, key, snakeCase);
@@ -1144,7 +1059,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
       changeType = true;
       const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(to.type) : quoteCustomType(to.type) : to.type;
       alterTable.push(
-        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${((_a = item.using) == null ? void 0 : _a.usingUp) ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : ""}`
+        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${item.using?.usingUp ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : ""}`
       );
     }
     if (typeof from.identity !== typeof to.identity || !orchidCore.deepCompare(from.identity, to.identity)) {
@@ -1190,62 +1105,66 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
       }
     }
     const foreignKeysLen = Math.max(
-      ((_b = from.foreignKeys) == null ? void 0 : _b.length) || 0,
-      ((_c = to.foreignKeys) == null ? void 0 : _c.length) || 0
+      from.foreignKeys?.length || 0,
+      to.foreignKeys?.length || 0
     );
     for (let i = 0; i < foreignKeysLen; i++) {
-      const fromFkey = (_d = from.foreignKeys) == null ? void 0 : _d[i];
-      const toFkey = (_e = to.foreignKeys) == null ? void 0 : _e[i];
-      if ((fromFkey || toFkey) && (!fromFkey || !toFkey || ((_f = fromFkey.options) == null ? void 0 : _f.name) !== ((_g = toFkey.options) == null ? void 0 : _g.name) || ((_h = fromFkey.options) == null ? void 0 : _h.match) !== ((_i = toFkey.options) == null ? void 0 : _i.match) || ((_j = fromFkey.options) == null ? void 0 : _j.onUpdate) !== ((_k = toFkey.options) == null ? void 0 : _k.onUpdate) || ((_l = fromFkey.options) == null ? void 0 : _l.onDelete) !== ((_m = toFkey.options) == null ? void 0 : _m.onDelete) || ((_n = fromFkey.options) == null ? void 0 : _n.dropMode) !== ((_o = toFkey.options) == null ? void 0 : _o.dropMode) || fromFkey.fnOrTable !== toFkey.fnOrTable)) {
+      const fromFkey = from.foreignKeys?.[i];
+      const toFkey = to.foreignKeys?.[i];
+      if ((fromFkey || toFkey) && (!fromFkey || !toFkey || fromFkey.options?.name !== toFkey.options?.name || fromFkey.options?.match !== toFkey.options?.match || fromFkey.options?.onUpdate !== toFkey.options?.onUpdate || fromFkey.options?.onDelete !== toFkey.options?.onDelete || fromFkey.options?.dropMode !== toFkey.options?.dropMode || fromFkey.fnOrTable !== toFkey.fnOrTable)) {
         if (fromFkey) {
           dropConstraints.push({
-            name: (_p = fromFkey.options) == null ? void 0 : _p.name,
-            dropMode: (_q = fromFkey.options) == null ? void 0 : _q.dropMode,
-            references: __spreadProps$5(__spreadValues$7({
-              columns: [name]
-            }, fromFkey), {
+            name: fromFkey.options?.name,
+            dropMode: fromFkey.options?.dropMode,
+            references: {
+              columns: [name],
+              ...fromFkey,
               foreignColumns: snakeCase ? fromFkey.foreignColumns.map(orchidCore.toSnakeCase) : fromFkey.foreignColumns
-            })
+            }
           });
         }
         if (toFkey) {
           addConstraints.push({
-            name: (_r = toFkey.options) == null ? void 0 : _r.name,
-            dropMode: (_s = toFkey.options) == null ? void 0 : _s.dropMode,
-            references: __spreadProps$5(__spreadValues$7({
-              columns: [name]
-            }, toFkey), {
+            name: toFkey.options?.name,
+            dropMode: toFkey.options?.dropMode,
+            references: {
+              columns: [name],
+              ...toFkey,
               foreignColumns: snakeCase ? toFkey.foreignColumns.map(orchidCore.toSnakeCase) : toFkey.foreignColumns
-            })
+            }
           });
         }
       }
     }
     const indexesLen = Math.max(
-      ((_t = from.indexes) == null ? void 0 : _t.length) || 0,
-      ((_u = to.indexes) == null ? void 0 : _u.length) || 0
+      from.indexes?.length || 0,
+      to.indexes?.length || 0
     );
     for (let i = 0; i < indexesLen; i++) {
-      const fromIndex = (_v = from.indexes) == null ? void 0 : _v[i];
-      const toIndex = (_w = to.indexes) == null ? void 0 : _w[i];
+      const fromIndex = from.indexes?.[i];
+      const toIndex = to.indexes?.[i];
       if ((fromIndex || toIndex) && (!fromIndex || !toIndex || !orchidCore.deepCompare(fromIndex, toIndex))) {
         if (fromIndex) {
-          dropIndexes.push(__spreadProps$5(__spreadValues$7({}, fromIndex), {
+          dropIndexes.push({
+            ...fromIndex,
             columns: [
-              __spreadValues$7({
-                column: name
-              }, fromIndex.options)
+              {
+                column: name,
+                ...fromIndex.options
+              }
             ]
-          }));
+          });
         }
         if (toIndex) {
-          addIndexes.push(__spreadProps$5(__spreadValues$7({}, toIndex), {
+          addIndexes.push({
+            ...toIndex,
             columns: [
-              __spreadValues$7({
-                column: name
-              }, toIndex.options)
+              {
+                column: name,
+                ...toIndex.options
+              }
             ]
-          }));
+          });
         }
       }
     }
@@ -1293,36 +1212,29 @@ const astToQuery = (ast) => {
   const { options } = ast;
   if (ast.action === "create") {
     sql.push("CREATE");
-    if (options == null ? void 0 : options.createOrReplace)
-      sql.push("OR REPLACE");
-    if (options == null ? void 0 : options.temporary)
-      sql.push("TEMPORARY");
-    if (options == null ? void 0 : options.recursive)
-      sql.push("RECURSIVE");
+    if (options?.createOrReplace) sql.push("OR REPLACE");
+    if (options?.temporary) sql.push("TEMPORARY");
+    if (options?.recursive) sql.push("RECURSIVE");
     sql.push(`VIEW "${ast.name}"`);
-    if (options == null ? void 0 : options.columns) {
+    if (options?.columns) {
       sql.push(
         `(${options.columns.map((column) => `"${column}"`).join(", ")})`
       );
     }
-    if (options == null ? void 0 : options.with) {
+    if (options?.with) {
       const list = [];
       if (options.with.checkOption)
         list.push(`check_option = ${orchidCore.singleQuote(options.with.checkOption)}`);
-      if (options.with.securityBarrier)
-        list.push(`security_barrier = true`);
-      if (options.with.securityInvoker)
-        list.push(`security_invoker = true`);
+      if (options.with.securityBarrier) list.push(`security_barrier = true`);
+      if (options.with.securityInvoker) list.push(`security_invoker = true`);
       sql.push(`WITH ( ${list.join(", ")} )`);
     }
     sql.push(`AS (${ast.sql.toSQL({ values })})`);
   } else {
     sql.push("DROP VIEW");
-    if (options == null ? void 0 : options.dropIfExists)
-      sql.push(`IF EXISTS`);
+    if (options?.dropIfExists) sql.push(`IF EXISTS`);
     sql.push(`"${ast.name}"`);
-    if (options == null ? void 0 : options.dropMode)
-      sql.push(options.dropMode);
+    if (options?.dropMode) sql.push(options.dropMode);
   }
   return {
     text: sql.join(" "),
@@ -1330,33 +1242,13 @@ const astToQuery = (ast) => {
   };
 };
 
-var __defProp$6 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const createMigrationInterface = (tx, up, config) => {
-  var _a;
   const adapter = new pqb.TransactionAdapter(
     tx,
     tx.client,
     tx.types
   );
-  adapter.schema = (_a = adapter.adapter.schema) != null ? _a : "public";
+  adapter.schema = adapter.adapter.schema ?? "public";
   const { query, arrays } = adapter;
   const log = pqb.logParamToLogObject(config.logger || console, config.log);
   adapter.query = (q, types) => {
@@ -2210,7 +2102,7 @@ const wrapWithLog = async (log, query, fn) => {
   if (!log) {
     return fn();
   } else {
-    const sql = typeof query === "string" ? { text: query, values: [] } : query.values ? query : __spreadProps$4(__spreadValues$6({}, query), { values: [] });
+    const sql = typeof query === "string" ? { text: query, values: [] } : query.values ? query : { ...query, values: [] };
     const logData = log.beforeQuery(sql);
     try {
       const result = await fn();
@@ -2228,16 +2120,24 @@ const addColumn = (migration, up, tableName, columnName, fn) => {
   }));
 };
 const addIndex = (migration, up, tableName, columns, args) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.index(columns, ...args))));
+  return changeTable(migration, up, tableName, {}, (t) => ({
+    ...t.add(t.index(columns, ...args))
+  }));
 };
 const addForeignKey = (migration, up, tableName, columns, foreignTable, foreignColumns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.foreignKey(columns, foreignTable, foreignColumns, options))));
+  return changeTable(migration, up, tableName, {}, (t) => ({
+    ...t.add(t.foreignKey(columns, foreignTable, foreignColumns, options))
+  }));
 };
 const addPrimaryKey = (migration, up, tableName, columns, name) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.primaryKey(columns, name))));
+  return changeTable(migration, up, tableName, {}, (t) => ({
+    ...t.add(t.primaryKey(columns, name))
+  }));
 };
 const addCheck = (migration, up, tableName, check) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.check(check))));
+  return changeTable(migration, up, tableName, {}, (t) => ({
+    ...t.add(t.check(check))
+  }));
 };
 const createSchema = async (migration, up, name) => {
   const ast = {
@@ -2251,12 +2151,13 @@ const createSchema = async (migration, up, name) => {
 };
 const createExtension = async (migration, up, fullName, options) => {
   const [schema, name] = getSchemaAndTableFromName(fullName);
-  const ast = __spreadValues$6({
+  const ast = {
     type: "extension",
     action: up ? "create" : "drop",
     schema,
-    name
-  }, options);
+    name,
+    ...options
+  };
   let query;
   if (ast.action === "drop") {
     query = `DROP EXTENSION${ast.dropIfExists ? " IF EXISTS" : ""} "${ast.name}"${ast.cascade ? " CASCADE" : ""}`;
@@ -2267,13 +2168,14 @@ const createExtension = async (migration, up, fullName, options) => {
 };
 const createEnum = async (migration, up, name, values, options = {}) => {
   const [schema, enumName] = getSchemaAndTableFromName(name);
-  const ast = __spreadValues$6({
+  const ast = {
     type: "enum",
     action: up ? "create" : "drop",
     schema,
     name: enumName,
-    values
-  }, options);
+    values,
+    ...options
+  };
   let query;
   const quotedName = quoteWithSchema(ast);
   if (ast.action === "create") {
@@ -2315,12 +2217,13 @@ DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data
 };
 const createCollation = async (migration, up, name, options) => {
   const [schema, collationName] = getSchemaAndTableFromName(name);
-  const ast = __spreadValues$6({
+  const ast = {
     type: "collation",
     action: up ? "create" : "drop",
     schema,
-    name: collationName
-  }, options);
+    name: collationName,
+    ...options
+  };
   let query;
   const quotedName = quoteWithSchema(ast);
   if (ast.action === "create") {
@@ -2329,18 +2232,13 @@ const createCollation = async (migration, up, name, options) => {
       query += `FROM ${quoteNameFromString(ast.fromExisting)}`;
     } else {
       const config = [];
-      if (ast.locale)
-        config.push(`locale = '${ast.locale}'`);
-      if (ast.lcCollate)
-        config.push(`lc_collate = '${ast.lcCollate}'`);
-      if (ast.lcCType)
-        config.push(`lc_ctype = '${ast.lcCType}'`);
-      if (ast.provider)
-        config.push(`provider = ${ast.provider}`);
+      if (ast.locale) config.push(`locale = '${ast.locale}'`);
+      if (ast.lcCollate) config.push(`lc_collate = '${ast.lcCollate}'`);
+      if (ast.lcCType) config.push(`lc_ctype = '${ast.lcCType}'`);
+      if (ast.provider) config.push(`provider = ${ast.provider}`);
       if (ast.deterministic !== void 0)
         config.push(`deterministic = ${ast.deterministic}`);
-      if (ast.version)
-        config.push(`version = '${ast.version}'`);
+      if (ast.version) config.push(`version = '${ast.version}'`);
       query += `(
   ${config.join(",\n  ")}
 )`;
@@ -2354,7 +2252,6 @@ const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 const renameType = async (migration, from, to, kind) => {
-  var _a;
   const [fromSchema, f] = getSchemaAndTableFromName(migration.up ? from : to);
   const [toSchema, t] = getSchemaAndTableFromName(migration.up ? to : from);
   const ast = {
@@ -2372,7 +2269,7 @@ const renameType = async (migration, from, to, kind) => {
   }
   if (ast.fromSchema !== ast.toSchema) {
     await migration.adapter.query(
-      `ALTER ${ast.kind} ${quoteTable(ast.fromSchema, ast.to)} SET SCHEMA "${(_a = ast.toSchema) != null ? _a : migration.adapter.schema}"`
+      `ALTER ${ast.kind} ${quoteTable(ast.fromSchema, ast.to)} SET SCHEMA "${ast.toSchema ?? migration.adapter.schema}"`
     );
   }
 };
@@ -2387,7 +2284,6 @@ const renameTableItem = async (migration, tableName, from, to, kind) => {
   );
 };
 const addOrDropEnumValues = async (migration, up, enumName, values, options) => {
-  var _a;
   const [schema, name] = getSchemaAndTableFromName(enumName);
   const quotedName = quoteTable(schema, name);
   const ast = {
@@ -2396,9 +2292,9 @@ const addOrDropEnumValues = async (migration, up, enumName, values, options) =>
     schema,
     name,
     values,
-    place: (options == null ? void 0 : options.before) ? "before" : (options == null ? void 0 : options.after) ? "after" : void 0,
-    relativeTo: (_a = options == null ? void 0 : options.before) != null ? _a : options == null ? void 0 : options.after,
-    ifNotExists: options == null ? void 0 : options.ifNotExists
+    place: options?.before ? "before" : options?.after ? "after" : void 0,
+    relativeTo: options?.before ?? options?.after,
+    ifNotExists: options?.ifNotExists
   };
   if (ast.action === "add") {
     await Promise.all(
@@ -2458,7 +2354,7 @@ JOIN pg_catalog.pg_namespace n ON n.oid = relnamespace
 JOIN pg_attribute a ON a.attrelid = c.oid
 JOIN pg_type t ON a.atttypid = t.oid AND t.typname = ${orchidCore.singleQuote(name)}
 JOIN pg_namespace tn ON tn.oid = t.typnamespace AND tn.nspname = ${orchidCore.singleQuote(
-      schema != null ? schema : defaultSchema
+      schema ?? defaultSchema
     )}
 GROUP BY n.nspname, c.relname`
   );
@@ -2490,7 +2386,6 @@ GROUP BY n.nspname, c.relname`
 };
 
 const writeMigrationFile = async (config, version, name, migrationCode) => {
-  var _a;
   await fs.mkdir(config.migrationsPath, { recursive: true });
   const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
   const importPath = orchidCore.getImportPath(
@@ -2502,11 +2397,10 @@ const writeMigrationFile = async (config, version, name, migrationCode) => {
     `import { change } from '${importPath}';
 ${migrationCode}`
   );
-  (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(filePath)}`);
+  config.logger?.log(`Created ${orchidCore.pathToLog(filePath)}`);
 };
 const newMigration = async (config, [name]) => {
-  if (!name)
-    throw new Error("Migration name is missing");
+  if (!name) throw new Error("Migration name is missing");
   const version = await makeFileVersion({}, config);
   await writeMigrationFile(config, version, name, makeContent(name));
 };
@@ -2565,15 +2459,13 @@ const fileNamesToChangeMigrationIdMap = Object.fromEntries(
   Object.entries(fileNamesToChangeMigrationId).map(([_, name]) => [name, true])
 );
 const changeIds = async (options, config, [arg, digitsArg]) => {
-  var _a, _b, _c, _d;
   if (arg !== "serial" && arg !== "timestamp") {
     throw new Error(
       `Pass "serial" or "timestamp" argument to the "change-ids" command`
     );
   }
   let digits = digitsArg && parseInt(digitsArg);
-  if (!digits || isNaN(digits))
-    digits = 4;
+  if (!digits || isNaN(digits)) digits = 4;
   const data = await getMigrations({}, config, true, false, (_, filePath) => {
     const fileName = path.basename(filePath);
     const match = fileName.match(/^(\d+)\D/);
@@ -2586,7 +2478,7 @@ const changeIds = async (options, config, [arg, digitsArg]) => {
   });
   if (data.renameTo) {
     if (arg === "serial" && typeof data.renameTo.to === "object" && digits === data.renameTo.to.serial || arg === "timestamp" && data.renameTo.to === "timestamp") {
-      (_a = config.logger) == null ? void 0 : _a.log(
+      config.logger?.log(
         config.migrations ? "`renameMigrations` setting is already set" : `${fileNamesToChangeMigrationId[arg]} already exists`
       );
       return;
@@ -2606,7 +2498,7 @@ const changeIds = async (options, config, [arg, digitsArg]) => {
   );
   if (config.migrations) {
     const to = arg === "timestamp" ? `'${arg}'` : `{ serial: ${digits} }`;
-    (_b = config.logger) == null ? void 0 : _b.log(
+    config.logger?.log(
       `Save the following settings into your rake-db config under the \`migrations\` setting, it will instruct rake-db to rename migration entries during the next deploy:
 ${arg !== "serial" || digits !== 4 ? `
 migrationId: ${to},` : ""}
@@ -2624,16 +2516,14 @@ renameMigrations: {
   const values = data.migrations.map(
     (item, i) => {
       let newVersion = String(version + i);
-      if (arg === "serial")
-        newVersion = newVersion.padStart(digits, "0");
+      if (arg === "serial") newVersion = newVersion.padStart(digits, "0");
       const name = path.basename(item.path).slice(item.version.length + 1);
       return [item.version, name, newVersion];
     }
   );
-  if (!values.length)
-    return;
+  if (!values.length) return;
   if (config.migrations) {
-    (_c = config.logger) == null ? void 0 : _c.log(
+    config.logger?.log(
       `If your migrations are stored in files, navigate to migrations directory and run the following commands to rename them:
 
 ${values.map(
@@ -2661,7 +2551,7 @@ After setting \`renameMigrations\` (see above) and renaming the files, run the d
       () => adapter.close()
     );
   });
-  (_d = config.logger) == null ? void 0 : _d.log(
+  config.logger?.log(
     `Migration files were renamed, a config file ${fileNamesToChangeMigrationId[arg]} for renaming migrations after deploy was created, and migrations in local db were renamed successfully.
 
 ${arg === "timestamp" || digits !== 4 ? `Set \`migrationId\`: ${arg === "timestamp" ? `'timestamp'` : `{ serial: ${digits} }`}` : `Remove \`migrationId\``} setting in the rake-db config`
@@ -2678,32 +2568,12 @@ const renameMigrationVersionsInDb = async (config, adapter, values) => {
   });
 };
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const getMigrations = async (ctx, config, up, allowDuplicates, getVersion = getMigrationVersionOrThrow) => {
-  var _a;
-  return ((_a = ctx.migrationsPromise) != null ? _a : ctx.migrationsPromise = config.migrations ? getMigrationsFromConfig(
-    __spreadProps$3(__spreadValues$5({}, config), { migrations: config.migrations }),
+  return (ctx.migrationsPromise ?? (ctx.migrationsPromise = config.migrations ? getMigrationsFromConfig(
+    { ...config, migrations: config.migrations },
     allowDuplicates,
     getVersion
-  ) : getMigrationsFromFiles(config, allowDuplicates, getVersion)).then(
+  ) : getMigrationsFromFiles(config, allowDuplicates, getVersion))).then(
     (data) => up ? data : {
       renameTo: data.renameTo,
       migrations: [...data.migrations].reverse()
@@ -2743,8 +2613,7 @@ async function getMigrationsFromFiles(config, allowDuplicates, getVersion = getM
   const versions = {};
   const result = entries.reduce(
     (data, file) => {
-      if (!file.isFile())
-        return data;
+      if (!file.isFile()) return data;
       if (fileNamesToChangeMigrationIdMap[file.name]) {
         if (data.renameTo) {
           throw new Error(
@@ -2827,8 +2696,7 @@ function checkExt(filePath) {
 function getMigrationVersionOrThrow(config, filePath) {
   const name = path.basename(filePath);
   const value = getMigrationVersion(config, name);
-  if (value)
-    return value;
+  if (value) return value;
   if (config.migrationId === "timestamp") {
     throw new Error(
       `Migration file name should start with 14 digit timestamp, received ${name}`
@@ -2842,12 +2710,10 @@ To keep using timestamp ids, set \`migrationId\` option of rake-db to 'timestamp
   }
 }
 function getMigrationVersion(config, name) {
-  var _a;
-  return (_a = config.migrationId === "timestamp" ? name.match(/^(\d{14})(_|\b)/) : name.match(/^(\d{4})(_|\b)/)) == null ? void 0 : _a[1];
+  return (config.migrationId === "timestamp" ? name.match(/^(\d{14})(_|\b)/) : name.match(/^(\d{4})(_|\b)/))?.[1];
 }
 function getDigitsPrefix(name) {
-  var _a;
-  const value = (_a = name.match(/^(\d+)\D/)) == null ? void 0 : _a[1];
+  const value = name.match(/^(\d+)\D/)?.[1];
   if (!value) {
     throw new Error(
       `Migration file should be prefixed with a serial number, received ${name}`
@@ -2928,8 +2794,7 @@ async function renameMigrations(config, trx, versions, renameTo) {
     first = version;
     break;
   }
-  if (!first || getMigrationVersion(config, first))
-    return versions;
+  if (!first || getMigrationVersion(config, first)) return versions;
   const values = [];
   const updatedVersions = {};
   const data = await renameTo.map();
@@ -2953,12 +2818,11 @@ async function renameMigrations(config, trx, versions, renameTo) {
 }
 
 const createMigrationsTable = async (db, config) => {
-  var _a, _b, _c;
   const { schema } = db;
   if (schema && schema !== "public") {
     try {
       await db.query(`CREATE SCHEMA "${schema}"`);
-      (_a = config.logger) == null ? void 0 : _a.log(`Created schema ${schema}`);
+      config.logger?.log(`Created schema ${schema}`);
     } catch (err) {
       if (err.code !== "42P06") {
         throw err;
@@ -2969,10 +2833,10 @@ const createMigrationsTable = async (db, config) => {
     await db.query(
       `CREATE TABLE "${config.migrationsTable}" ( version TEXT NOT NULL, name TEXT NOT NULL )`
     );
-    (_b = config.logger) == null ? void 0 : _b.log("Created versions table");
+    config.logger?.log("Created versions table");
   } catch (err) {
     if (err.code === "42P07") {
-      (_c = config.logger) == null ? void 0 : _c.log("Versions table exists");
+      config.logger?.log("Versions table exists");
     } else {
       throw err;
     }
@@ -2982,7 +2846,6 @@ const createMigrationsTable = async (db, config) => {
 const RAKE_DB_LOCK_KEY = "8582141715823621641";
 function makeMigrateFn(defaultCount, up, fn) {
   return async (ctx, options, config, args = [], adapters = options.map((opts) => new pqb.Adapter(opts)), dontClose) => {
-    var _a;
     const set = await getMigrations(ctx, config, up);
     const arg = args[0];
     let force = arg === "force";
@@ -3013,7 +2876,7 @@ function makeMigrateFn(defaultCount, up, fn) {
             conf,
             set,
             versions,
-            count != null ? count : defaultCount,
+            count ?? defaultCount,
             force
           );
         });
@@ -3033,7 +2896,7 @@ function makeMigrateFn(defaultCount, up, fn) {
               config2,
               set,
               versions,
-              count != null ? count : defaultCount,
+              count ?? defaultCount,
               force
             );
           });
@@ -3041,10 +2904,9 @@ function makeMigrateFn(defaultCount, up, fn) {
           throw err;
         }
       } finally {
-        if (!dontClose)
-          await adapter.close();
+        if (!dontClose) await adapter.close();
       }
-      (_a = config.afterChangeCommit) == null ? void 0 : _a.call(config, {
+      config.afterChangeCommit?.({
         options: opts,
         up,
         migrations
@@ -3085,7 +2947,6 @@ const redo = makeMigrateFn(
 );
 const getDb = (adapter) => pqb.createDb({ adapter });
 const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, force, skipLock) => {
-  var _a, _b, _c, _d;
   const { sequence, map: versionsMap } = versions;
   if (up) {
     const rollbackTo = checkMigrationOrder(config, set, versions, force);
@@ -3097,8 +2958,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
           break;
         }
       }
-      if (i < 0)
-        i = 0;
+      if (i < 0) i = 0;
       set.migrations.reverse();
       await migrateOrRollback(
         trx,
@@ -3112,15 +2972,14 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
       set.migrations.reverse();
     }
   }
-  if (!skipLock)
-    await queryLock(trx);
+  if (!skipLock) await queryLock(trx);
   let db;
   const beforeMigrate = config[up ? "beforeMigrate" : "beforeRollback"];
   if (beforeMigrate || config.beforeChange) {
-    db != null ? db : db = getDb(trx);
+    db ?? (db = getDb(trx));
     const { migrations: migrations2 } = set;
-    await (beforeMigrate == null ? void 0 : beforeMigrate({ db, migrations: migrations2 }));
-    await ((_a = config.beforeChange) == null ? void 0 : _a.call(config, { db, migrations: migrations2, up, redo: redo2 }));
+    await beforeMigrate?.({ db, migrations: migrations2 });
+    await config.beforeChange?.({ db, migrations: migrations2, up, redo: redo2 });
   }
   let loggedAboutStarting = false;
   let migrations;
@@ -3128,17 +2987,16 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
     if (up && versionsMap[file.version] || !up && !versionsMap[file.version]) {
       continue;
     }
-    if (count-- <= 0)
-      break;
+    if (count-- <= 0) break;
     if (!loggedAboutStarting && (!redo2 || !up)) {
       loggedAboutStarting = true;
-      (_b = config.logger) == null ? void 0 : _b.log(
+      config.logger?.log(
         `${redo2 ? "Reapplying migrations for" : up ? "Migrating" : "Rolling back"} database ${trx.config.connectionString ? new URL(trx.config.connectionString).pathname.slice(1) : trx.config.database}
 `
       );
     }
     await runMigration(trx, up, file, config);
-    (migrations != null ? migrations : migrations = []).push(file);
+    (migrations ?? (migrations = [])).push(file);
     if (up) {
       const name = path.basename(file.path);
       versionsMap[file.version] = name;
@@ -3147,17 +3005,17 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
       versionsMap[file.version] = void 0;
       sequence.pop();
     }
-    (_c = config.logger) == null ? void 0 : _c.log(
+    config.logger?.log(
       `${up ? "Migrated" : "Rolled back"} ${orchidCore.pathToLog(file.path)}
 `
     );
   }
-  migrations != null ? migrations : migrations = orchidCore.emptyArray;
+  migrations ?? (migrations = orchidCore.emptyArray);
   const afterMigrate = config[up ? "afterMigrate" : "afterRollback"];
   if (config.afterChange || afterMigrate) {
-    db != null ? db : db = getDb(trx);
-    await ((_d = config.afterChange) == null ? void 0 : _d.call(config, { db, up, redo: redo2, migrations }));
-    await (afterMigrate == null ? void 0 : afterMigrate({ db, migrations }));
+    db ?? (db = getDb(trx));
+    await config.afterChange?.({ db, up, redo: redo2, migrations });
+    await afterMigrate?.({ db, migrations });
   }
   return migrations;
 };
@@ -3166,8 +3024,7 @@ const checkMigrationOrder = (config, set, { sequence, map }, force) => {
   if (last) {
     for (const file of set.migrations) {
       const version = +file.version;
-      if (version > last || map[file.version])
-        continue;
+      if (version > last || map[file.version]) continue;
       if (!force) {
         throw new Error(
           `Cannot migrate ${path.basename(
@@ -3187,7 +3044,7 @@ const runMigration = async (trx, up, file, config) => {
   let changes = changeCache[file.path];
   if (!changes) {
     const module = await file.load();
-    const exported = (module == null ? void 0 : module.default) && orchidCore.toArray(module.default);
+    const exported = module?.default && orchidCore.toArray(module.default);
     if (config.forceDefaultExports && !exported) {
       throw new RakeDbError(
         `Missing a default export in ${file.path} migration`
@@ -3213,22 +3070,6 @@ const runMigration = async (trx, up, file, config) => {
   );
 };
 
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
-    }
-  return a;
-};
 const migrationConfigDefaults = {
   schemaConfig: pqb.defaultSchemaConfig,
   migrationsPath: path.join("src", "db", "migrations"),
@@ -3243,8 +3084,7 @@ const migrationConfigDefaults = {
   }
 };
 const processRakeDbConfig = (config) => {
-  var _a;
-  const result = __spreadValues$4(__spreadValues$4({}, migrationConfigDefaults), config);
+  const result = { ...migrationConfigDefaults, ...config };
   if (!result.recurrentPath) {
     result.recurrentPath = path.join(result.migrationsPath, "recurrent");
   }
@@ -3252,7 +3092,7 @@ const processRakeDbConfig = (config) => {
     delete result.logger;
   }
   if (!result.basePath || !result.dbScript) {
-    let filePath = (_a = orchidCore.getStackTrace()) == null ? void 0 : _a[3].getFileName();
+    let filePath = orchidCore.getStackTrace()?.[3].getFileName();
     if (!filePath) {
       throw new Error(
         "Failed to determine path to db script. Please set basePath option of rakeDb"
@@ -3282,10 +3122,8 @@ const processRakeDbConfig = (config) => {
   if ("baseTable" in config && config.baseTable) {
     const { types, snakeCase, language } = config.baseTable.prototype;
     result.columnTypes = types || pqb.makeColumnTypes(pqb.defaultSchemaConfig);
-    if (snakeCase)
-      result.snakeCase = true;
-    if (language)
-      result.language = language;
+    if (snakeCase) result.snakeCase = true;
+    if (language) result.language = language;
   } else {
     const ct = "columnTypes" in config && config.columnTypes;
     result.columnTypes = (typeof ct === "function" ? ct(
@@ -3356,11 +3194,9 @@ const prompt = async ({
   cursor: showCursor
 }) => {
   stdin.resume();
-  if (stdin.isTTY)
-    stdin.setRawMode(true);
+  if (stdin.isTTY) stdin.setRawMode(true);
   stdin.setEncoding("utf-8");
-  if (!showCursor)
-    stdout.write(cursorHide);
+  if (!showCursor) stdout.write(cursorHide);
   return new Promise((res) => {
     let prevText;
     const ctx = {
@@ -3368,16 +3204,13 @@ const prompt = async ({
       submitted: false,
       render() {
         let text = (ctx.submitted ? colors.greenBold("\u2714") : colors.yellowBold("?")) + " " + render(ctx);
-        if (ctx.submitted)
-          text += "\n";
+        if (ctx.submitted) text += "\n";
         stdout.write(prevText ? clear(prevText) + "\r" + text : text);
         prevText = text;
       },
       submit(value2) {
-        if (value2 !== void 0)
-          ctx.value = value2;
-        if (ctx.value === void 0 || validate && !(validate == null ? void 0 : validate(ctx)))
-          return;
+        if (value2 !== void 0) ctx.value = value2;
+        if (ctx.value === void 0 || validate && !validate?.(ctx)) return;
         ctx.submitted = true;
         ctx.render();
         close();
@@ -3385,16 +3218,14 @@ const prompt = async ({
       }
     };
     const close = () => {
-      if (!showCursor)
-        stdout.write(cursorShow);
-      if (stdin.isTTY)
-        stdin.setRawMode(false);
+      if (!showCursor) stdout.write(cursorShow);
+      if (stdin.isTTY) stdin.setRawMode(false);
       stdin.off("data", keypress);
       stdin.pause();
     };
     const keypress = (s) => {
       if (s === "" || s === "") {
-        close == null ? void 0 : close();
+        close?.();
         process.exit(0);
       }
       if (s === "\r" || s === "\n" || s === "\r\n") {
@@ -3442,10 +3273,8 @@ ${ctx.submitted ? `> ${ctx.value ? colors.greenBold("Yes") : colors.yellowBold("
   },
   onKeyPress(ctx, s) {
     let ok;
-    if (s === "y" || s === "Y")
-      ok = true;
-    else if (s === "n" || s === "N")
-      ok = false;
+    if (s === "y" || s === "Y") ok = true;
+    else if (s === "n" || s === "N") ok = false;
     if (ok !== void 0) {
       ctx.submit(ok);
     }
@@ -3467,8 +3296,7 @@ const promptText = ({
     render(ctx) {
       let text = `${colors.bright(message)}
 > ${ctx.submitted ? renderValue(ctx) : showDefault ? colors.pale(def) + "\b".repeat(def.length) : ctx.value}`;
-      if (ctx.submitted)
-        text += "\n";
+      if (ctx.submitted) text += "\n";
       return text;
     },
     onKeyPress(ctx, s) {
@@ -3480,8 +3308,7 @@ const promptText = ({
         stdout.write(value[x]);
         x++;
       }
-      if (s !== "\x7F" && s !== "\x1B[3~" && !visibleChars(s))
-        return;
+      if (s !== "\x7F" && s !== "\x1B[3~" && !visibleChars(s)) return;
       if (showDefault) {
         showDefault = false;
         stdout.write(" ".repeat(def.length) + "\b".repeat(def.length));
@@ -3510,25 +3337,6 @@ const promptText = ({
   });
 };
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 const setAdapterOptions = (options, set) => {
   if (options.databaseURL) {
     const url = new URL(options.databaseURL);
@@ -3541,9 +3349,12 @@ const setAdapterOptions = (options, set) => {
     if (set.password !== void 0) {
       url.password = set.password;
     }
-    return __spreadProps$2(__spreadValues$3({}, options), { databaseURL: url.toString() });
+    return { ...options, databaseURL: url.toString() };
   } else {
-    return __spreadValues$3(__spreadValues$3({}, options), set);
+    return {
+      ...options,
+      ...set
+    };
   }
 };
 const setAdminCredentialsToOptions = async (options, create) => {
@@ -3590,18 +3401,17 @@ const execute = async (options, sql) => {
   }
 };
 const createOrDrop = async (options, adminOptions, config, args) => {
-  var _a, _b, _c, _d;
   const params = getDatabaseAndUserFromOptions(options);
   const result = await execute(
     setAdapterOptions(adminOptions, { database: "postgres" }),
     args.sql(params)
   );
   if (result === "ok") {
-    (_a = config.logger) == null ? void 0 : _a.log(args.successMessage(params));
+    config.logger?.log(args.successMessage(params));
   } else if (result === "already") {
-    (_b = config.logger) == null ? void 0 : _b.log(args.alreadyMessage(params));
+    config.logger?.log(args.alreadyMessage(params));
   } else if (result === "ssl required") {
-    (_c = config.logger) == null ? void 0 : _c.log(
+    config.logger?.log(
       "SSL is required: append ?ssl=true to the database url string"
     );
     return;
@@ -3613,20 +3423,18 @@ const createOrDrop = async (options, adminOptions, config, args) => {
       message += `
 Don't use this command for database service providers, only for a local db.`;
     }
-    (_d = config.logger) == null ? void 0 : _d.log(message);
+    config.logger?.log(message);
     const updatedOptions = await setAdminCredentialsToOptions(
       options,
       args.create
     );
-    if (!updatedOptions)
-      return;
+    if (!updatedOptions) return;
     await createOrDrop(options, updatedOptions, config, args);
     return;
   } else {
     throw result.error;
   }
-  if (!args.create)
-    return;
+  if (!args.create) return;
   const db = new pqb.Adapter(options);
   await createMigrationsTable(db, config);
   await db.close();
@@ -4048,7 +3856,6 @@ const sql = `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
   "collations"
 )}`;
 async function introspectDbSchema(db) {
-  var _a;
   const data = await db.query(sql);
   const result = data.rows[0];
   for (const domain of result.domains) {
@@ -4057,8 +3864,7 @@ async function introspectDbSchema(db) {
   for (const table of result.tables) {
     for (const column of table.columns) {
       nullsToUndefined(column);
-      if (column.identity)
-        nullsToUndefined(column.identity);
+      if (column.identity) nullsToUndefined(column.identity);
       if (column.compression) {
         column.compression = column.compression === "p" ? "pglz" : "lz4";
       }
@@ -4067,8 +3873,7 @@ async function introspectDbSchema(db) {
   for (const index of result.indexes) {
     nullsToUndefined(index);
     for (const column of index.columns) {
-      if (!("expression" in column))
-        continue;
+      if (!("expression" in column)) continue;
       const s = column.expression;
       const columnR = `"?\\w+"?`;
       const langR = `(${columnR}|'\\w+'::regconfig)`;
@@ -4083,16 +3888,15 @@ async function introspectDbSchema(db) {
       const match = s.match(
         new RegExp(`^([\\(]*${setWeightOrTsVectorR}[\\)]*( ${concatR} )?)+$`)
       );
-      if (!match)
-        continue;
+      if (!match) continue;
       let language;
       let languageColumn;
-      const tokens = (_a = match[0].match(
+      const tokens = match[0].match(
         new RegExp(
           `setweight\\(|to_tsvector\\(${langR}|[:']?${columnR}\\(?`,
           "g"
         )
-      )) == null ? void 0 : _a.reduce((acc, token) => {
+      )?.reduce((acc, token) => {
         if (token === "setweight(" || token === "COALESCE(" || token[0] === ":")
           return acc;
         if (token.startsWith("to_tsvector(")) {
@@ -4104,14 +3908,12 @@ async function introspectDbSchema(db) {
         } else if (token[0] === "'") {
           acc.push({ kind: "weight", value: token[1] });
         } else {
-          if (token[0] === '"')
-            token = token.slice(1, -1);
+          if (token[0] === '"') token = token.slice(1, -1);
           acc.push({ kind: "column", value: token });
         }
         return acc;
       }, []);
-      if (!tokens)
-        continue;
+      if (!tokens) continue;
       index.language = language;
       index.languageColumn = languageColumn;
       index.tsVector = true;
@@ -4136,37 +3938,6 @@ const nullsToUndefined = (obj) => {
   }
 };
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 const matchMap = {
   s: void 0,
   f: "FULL",
@@ -4191,8 +3962,7 @@ const structureToAst = async (ctx, adapter, config) => {
   const ast = [];
   const data = await introspectDbSchema(adapter);
   for (const name of data.schemas) {
-    if (name === "public")
-      continue;
+    if (name === "public") continue;
     ast.push({
       type: "schema",
       action: "create",
@@ -4200,17 +3970,16 @@ const structureToAst = async (ctx, adapter, config) => {
     });
   }
   for (const it of data.collations) {
-    ast.push(__spreadProps$1(__spreadValues$2({
+    ast.push({
       type: "collation",
-      action: "create"
-    }, it), {
+      action: "create",
+      ...it,
       schema: it.schemaName === ctx.currentSchema ? void 0 : it.schemaName
-    }));
+    });
   }
   const domains = makeDomainsMap(ctx, data);
   for (const table of data.tables) {
-    if (table.name === config.migrationsTable)
-      continue;
+    if (table.name === config.migrationsTable) continue;
     ast.push(tableToAst(ctx, data, table, "create", domains));
   }
   for (const it of data.extensions) {
@@ -4243,12 +4012,13 @@ const structureToAst = async (ctx, adapter, config) => {
   for (const table of data.tables) {
     for (const fkey of data.constraints) {
       if (fkey.references && fkey.tableName === table.name && fkey.schemaName === table.schemaName && checkIfIsOuterRecursiveFkey(data, table, fkey.references)) {
-        ast.push(__spreadProps$1(__spreadValues$2({}, constraintToAst(ctx, fkey)), {
+        ast.push({
+          ...constraintToAst(ctx, fkey),
           type: "constraint",
           action: "create",
           tableSchema: table.schemaName === ctx.currentSchema ? void 0 : table.schemaName,
           tableName: fkey.tableName
-        }));
+        });
       }
     }
   }
@@ -4292,10 +4062,10 @@ const getDbColumnIsSerial = (item) => {
   return false;
 };
 const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
-  var _a, _b, _c;
+  var _a, _b;
   const isSerial = getDbColumnIsSerial(dbColumn);
   if (isSerial) {
-    dbColumn = __spreadProps$1(__spreadValues$2({}, dbColumn), { default: void 0 });
+    dbColumn = { ...dbColumn, default: void 0 };
   }
   let column;
   const col = instantiateColumnByDbType(ctx, dbColumn.type, isSerial, dbColumn);
@@ -4328,15 +4098,14 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
           typeId,
           dbColumn.extension
         );
-        ((_c = (_a = ctx.unsupportedTypes)[_b = dbColumn.type]) != null ? _c : _a[_b] = []).push(
+        ((_a = ctx.unsupportedTypes)[_b = dbColumn.type] ?? (_a[_b] = [])).push(
           `${dbColumn.schemaName}${dbColumn.tableName ? `.${dbColumn.tableName}` : ""}.${dbColumn.name}`
         );
       }
     }
   }
   column.data.name = void 0;
-  if (!column.data.isNullable)
-    column.data.isNullable = void 0;
+  if (!column.data.isNullable) column.data.isNullable = void 0;
   if (dbColumn.arrayDims) {
     const arr = new pqb.ArrayColumn(
       ctx.columnSchemaConfig,
@@ -4368,28 +4137,28 @@ const tableToAst = (ctx, data, table, action, domains) => {
     name: tableName,
     shape: makeDbStructureColumnsShape(ctx, data, domains, table, tableData),
     noPrimaryKey: tableData.primaryKey ? "error" : "ignore",
-    primaryKey: primaryKey && primaryKey.columns.length > 1 ? __spreadProps$1(__spreadValues$2({}, primaryKey), { columns: primaryKey.columns.map(orchidCore.toCamelCase) }) : void 0,
+    primaryKey: primaryKey && primaryKey.columns.length > 1 ? { ...primaryKey, columns: primaryKey.columns.map(orchidCore.toCamelCase) } : void 0,
     indexes: indexes.reduce((acc, index) => {
-      var _b;
       if (index.columns.length > 1 || index.columns.some((it) => "expression" in it)) {
-        const _a = makeIndexOptions(tableName, index), { name } = _a, options = __objRest(_a, ["name"]);
+        const { name, ...options } = makeIndexOptions(tableName, index);
         acc.push({
-          columns: index.columns.map((it) => __spreadProps$1(__spreadValues$2({}, "column" in it ? { column: orchidCore.toCamelCase(it.column) } : { expression: it.expression }), {
+          columns: index.columns.map((it) => ({
+            ..."column" in it ? { column: orchidCore.toCamelCase(it.column) } : { expression: it.expression },
             collate: it.collate,
             opclass: it.opclass,
             order: it.order
           })),
-          options: __spreadProps$1(__spreadValues$2({}, options), {
-            include: (_b = index.include) == null ? void 0 : _b.map(orchidCore.toCamelCase)
-          }),
+          options: {
+            ...options,
+            include: index.include?.map(orchidCore.toCamelCase)
+          },
           name
         });
       }
       return acc;
     }, []),
     constraints: constraints.reduce((acc, it) => {
-      var _a;
-      if (it.check && it.references || it.check && ((_a = it.check.columns) == null ? void 0 : _a.length) !== 1 || it.references && it.references.columns.length !== 1 && !checkIfIsOuterRecursiveFkey(data, table, it.references)) {
+      if (it.check && it.references || it.check && it.check.columns?.length !== 1 || it.references && it.references.columns.length !== 1 && !checkIfIsOuterRecursiveFkey(data, table, it.references)) {
         acc.push(dbConstraintToTableConstraint(ctx, table, it));
       }
       return acc;
@@ -4402,7 +4171,7 @@ const getDbStructureTableData = (data, { name, schemaName }) => {
   );
   const primaryKey = constraints.find((c) => c.primaryKey);
   return {
-    primaryKey: (primaryKey == null ? void 0 : primaryKey.primaryKey) ? {
+    primaryKey: primaryKey?.primaryKey ? {
       columns: primaryKey.primaryKey,
       name: primaryKey.name === `${name}_pkey` ? void 0 : primaryKey.name
     } : void 0,
@@ -4413,7 +4182,6 @@ const getDbStructureTableData = (data, { name, schemaName }) => {
   };
 };
 const constraintToAst = (ctx, item) => {
-  var _a;
   const result = {};
   const { references, check } = item;
   if (references) {
@@ -4425,21 +4193,18 @@ const constraintToAst = (ctx, item) => {
       options
     };
     const match = matchMap[references.match];
-    if (match)
-      options.match = match;
+    if (match) options.match = match;
     const onUpdate = fkeyActionMap[references.onUpdate];
-    if (onUpdate)
-      options.onUpdate = onUpdate;
+    if (onUpdate) options.onUpdate = onUpdate;
     const onDelete = fkeyActionMap[references.onDelete];
-    if (onDelete)
-      options.onDelete = onDelete;
+    if (onDelete) options.onDelete = onDelete;
   }
   if (check) {
     result.check = pqb.raw({ raw: check.expression });
   }
   if (item.name && item.name !== getConstraintName(item.tableName, result, ctx.snakeCase)) {
     result.name = item.name;
-    if ((_a = result.references) == null ? void 0 : _a.options) {
+    if (result.references?.options) {
       result.references.options.name = item.name;
     }
   }
@@ -4449,14 +4214,12 @@ const getReferencesTable = (ctx, references) => {
   return references.foreignSchema !== ctx.currentSchema ? `${references.foreignSchema}.${references.foreignTable}` : references.foreignTable;
 };
 const isColumnCheck = (it) => {
-  var _a, _b;
-  return !it.references && ((_b = (_a = it.check) == null ? void 0 : _a.columns) == null ? void 0 : _b.length) === 1;
+  return !it.references && it.check?.columns?.length === 1;
 };
 const viewToAst = (ctx, data, domains, view) => {
   const shape = makeDbStructureColumnsShape(ctx, data, domains, view);
   const options = {};
-  if (view.isRecursive)
-    options.recursive = true;
+  if (view.isRecursive) options.recursive = true;
   if (view.with) {
     const withOptions = {};
     options.with = withOptions;
@@ -4501,48 +4264,48 @@ const getDbTableColumnsChecks = (tableData) => tableData.constraints.reduce((acc
   return acc;
 }, {});
 const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, checks) => {
-  var _a, _b, _c, _d, _f, _g, _h, _i, _j;
+  var _a;
   let column = instantiateDbColumn(ctx, data, domains, item);
   column.data.name = item.name;
   if (item.identity) {
     column.data.identity = item.identity;
-    if (!item.identity.always)
-      (_a = column.data.identity) == null ? true : delete _a.always;
+    if (!item.identity.always) delete column.data.identity?.always;
   }
-  if (((_c = (_b = tableData == null ? void 0 : tableData.primaryKey) == null ? void 0 : _b.columns) == null ? void 0 : _c.length) === 1 && ((_d = tableData == null ? void 0 : tableData.primaryKey) == null ? void 0 : _d.columns[0]) === item.name) {
+  if (tableData?.primaryKey?.columns?.length === 1 && tableData?.primaryKey?.columns[0] === item.name) {
     column = column.primaryKey();
   }
-  if (tableData == null ? void 0 : tableData.indexes) {
-    const columnIndexes = tableData == null ? void 0 : tableData.indexes.filter(
+  if (tableData?.indexes) {
+    const columnIndexes = tableData?.indexes.filter(
       (it) => it.columns.length === 1 && "column" in it.columns[0] && it.columns[0].column === item.name
     );
     for (const index of columnIndexes) {
       const columnOptions = index.columns[0];
-      const _e = makeIndexOptions(tableName, index), { name } = _e, indexOptions = __objRest(_e, ["name"]);
-      ((_g = (_f = column.data).indexes) != null ? _g : _f.indexes = []).push({
-        options: __spreadValues$2({
+      const { name, ...indexOptions } = makeIndexOptions(tableName, index);
+      ((_a = column.data).indexes ?? (_a.indexes = [])).push({
+        options: {
           collate: columnOptions.collate,
           opclass: columnOptions.opclass,
-          order: columnOptions.order
-        }, indexOptions),
+          order: columnOptions.order,
+          ...indexOptions
+        },
         name
       });
     }
   }
   if (table) {
     for (const it of data.constraints) {
-      if (it.tableName !== table.name || it.schemaName !== table.schemaName || it.check || ((_h = it.references) == null ? void 0 : _h.columns.length) !== 1 || it.references.columns[0] !== item.name || checkIfIsOuterRecursiveFkey(data, table, it.references)) {
+      if (it.tableName !== table.name || it.schemaName !== table.schemaName || it.check || it.references?.columns.length !== 1 || it.references.columns[0] !== item.name || checkIfIsOuterRecursiveFkey(data, table, it.references)) {
         continue;
       }
       const c = dbConstraintToTableConstraint(ctx, table, it);
       column = column.foreignKey(
-        (_i = c.references) == null ? void 0 : _i.fnOrTable,
+        c.references?.fnOrTable,
         it.references.foreignColumns[0],
-        (_j = c.references) == null ? void 0 : _j.options
+        c.references?.options
       );
     }
   }
-  const check = checks == null ? void 0 : checks[item.name];
+  const check = checks?.[item.name];
   if (check) {
     column.data.check = {
       sql: new pqb.RawSQL([[check]])
@@ -4551,15 +4314,13 @@ const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, ch
   const camelCaseName = orchidCore.toCamelCase(item.name);
   if (ctx.snakeCase) {
     const snakeCaseName = orchidCore.toSnakeCase(camelCaseName);
-    if (snakeCaseName !== item.name)
-      column.data.name = item.name;
+    if (snakeCaseName !== item.name) column.data.name = item.name;
   } else if (camelCaseName !== item.name) {
     column.data.name = item.name;
   }
   return [camelCaseName, column];
 };
 const dbConstraintToTableConstraint = (ctx, table, item) => {
-  var _a;
   const { references, check } = item;
   const constraint = {
     references: references ? {
@@ -4577,7 +4338,7 @@ const dbConstraintToTableConstraint = (ctx, table, item) => {
   const name = item.name && item.name !== getConstraintName(table.name, constraint, ctx.snakeCase) ? item.name : void 0;
   if (name) {
     constraint.name = name;
-    if ((_a = constraint.references) == null ? void 0 : _a.options) {
+    if (constraint.references?.options) {
       constraint.references.options.name = name;
     }
   }
@@ -4596,14 +4357,13 @@ const makeIndexOptions = (tableName, index) => {
   };
 };
 const checkIfIsOuterRecursiveFkey = (data, table, references) => {
-  var _a;
   const referencesId = `${references.foreignSchema}.${references.foreignTable}`;
   const tableId = `${table.schemaName}.${table.name}`;
   for (const other of data.tables) {
     const id = `${other.schemaName}.${other.name}`;
     if (referencesId === id) {
       for (const c of data.constraints) {
-        if (c.tableName === other.name && c.schemaName === other.schemaName && ((_a = c.references) == null ? void 0 : _a.foreignTable) === table.name && c.references.foreignSchema === table.schemaName && tableId < id) {
+        if (c.tableName === other.name && c.schemaName === other.schemaName && c.references?.foreignTable === table.name && c.references.foreignSchema === table.schemaName && tableId < id) {
           return true;
         }
       }
@@ -4617,7 +4377,6 @@ const astToGenerateItems = (config, asts, currentSchema) => {
   return asts.map((ast) => astToGenerateItem(config, ast, currentSchema));
 };
 const astToGenerateItem = (config, ast, currentSchema) => {
-  var _a, _b, _c, _d, _e;
   const add = [];
   const drop = [];
   const deps = [];
@@ -4635,7 +4394,7 @@ const astToGenerateItem = (config, ast, currentSchema) => {
     case "table":
     case "changeTable":
     case "view": {
-      const schema = (_a = ast.schema) != null ? _a : currentSchema;
+      const schema = ast.schema ?? currentSchema;
       const table = `${schema}.${ast.name}`;
       if (ast.type === "table" || ast.type === "view") {
         const keys = ast.action === "create" ? add : drop;
@@ -4733,7 +4492,7 @@ const astToGenerateItem = (config, ast, currentSchema) => {
     case "enum":
     case "collation":
     case "extension": {
-      const schema = (_b = ast.schema) != null ? _b : currentSchema;
+      const schema = ast.schema ?? currentSchema;
       (ast.action === "create" ? add : drop).push(`${schema}.${ast.name}`);
       deps.push(schema);
       break;
@@ -4741,22 +4500,21 @@ const astToGenerateItem = (config, ast, currentSchema) => {
     case "enumValues":
     case "renameEnumValues":
     case "changeEnumValues": {
-      const schema = (_c = ast.schema) != null ? _c : currentSchema;
+      const schema = ast.schema ?? currentSchema;
       deps.push(schema, `${schema}.${ast.name}`);
       break;
     }
     case "domain": {
-      const schema = (_d = ast.schema) != null ? _d : currentSchema;
+      const schema = ast.schema ?? currentSchema;
       (ast.action === "create" ? add : drop).push(`${schema}.${ast.name}`);
       const column = ast.baseType;
       deps.push(schema, resolveType(column.dataType));
-      if (column.data.collate)
-        deps.push(column.data.collate);
+      if (column.data.collate) deps.push(column.data.collate);
       break;
     }
     case "constraint": {
       const { tableSchema = currentSchema, tableName } = ast;
-      const name = `${tableSchema}.${(_e = ast.name) != null ? _e : getConstraintName(tableName, ast, config.snakeCase)}`;
+      const name = `${tableSchema}.${ast.name ?? getConstraintName(tableName, ast, config.snakeCase)}`;
       (ast.action === "create" ? add : drop).push(name);
       deps.push(tableSchema, `${tableSchema}.${tableName}`);
       break;
@@ -4779,7 +4537,6 @@ const astToGenerateItem = (config, ast, currentSchema) => {
   };
 };
 const analyzeTableColumns = (config, currentSchema, schema, table, deps, resolveType, columns) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   for (const [keys, name, change] of columns) {
     const { column } = change;
     if (column) {
@@ -4797,31 +4554,30 @@ const analyzeTableColumns = (config, currentSchema, schema, table, deps, resolve
     } else if (change.type) {
       deps.push(resolveType(change.type));
     }
-    const collate = (_b = (_a = change.column) == null ? void 0 : _a.data.collate) != null ? _b : change.collate;
-    if (collate)
-      deps.push(collate);
-    const primaryKey = change.primaryKey || ((_c = change.column) == null ? void 0 : _c.data.primaryKey);
+    const collate = change.column?.data.collate ?? change.collate;
+    if (collate) deps.push(collate);
+    const primaryKey = change.primaryKey || change.column?.data.primaryKey;
     if (primaryKey) {
       keys.push(`${table}_pkey`);
     }
-    const indexes = change.indexes || ((_d = change.column) == null ? void 0 : _d.data.indexes);
+    const indexes = change.indexes || change.column?.data.indexes;
     if (indexes) {
       for (const index of indexes) {
         keys.push(
           index.name ? `${schema}.${index.name}` : getIndexName(table, [
-            { column: (_f = (_e = change.column) == null ? void 0 : _e.data.name) != null ? _f : name }
+            { column: change.column?.data.name ?? name }
           ])
         );
       }
     }
-    const foreignKeys = change.foreignKeys || ((_g = change.column) == null ? void 0 : _g.data.foreignKeys);
+    const foreignKeys = change.foreignKeys || change.column?.data.foreignKeys;
     if (foreignKeys) {
       for (const fkey of foreignKeys) {
         keys.push(
-          ((_h = fkey.options) == null ? void 0 : _h.name) ? `${schema}.${fkey.options.name}` : getConstraintName(
+          fkey.options?.name ? `${schema}.${fkey.options.name}` : getConstraintName(
             table,
             {
-              references: { columns: [(_j = (_i = change.column) == null ? void 0 : _i.data.name) != null ? _j : name] }
+              references: { columns: [change.column?.data.name ?? name] }
             },
             config.snakeCase
           )
@@ -4860,7 +4616,6 @@ const analyzeTableData = (config, currentSchema, schema, table, keys, deps, data
 };
 
 const astToMigration = (currentSchema, config, asts) => {
-  var _a, _b, _c;
   const items = astToGenerateItems(config, asts, currentSchema);
   const toBeAdded = /* @__PURE__ */ new Set();
   const toBeDropped = /* @__PURE__ */ new Set();
@@ -4881,12 +4636,11 @@ const astToMigration = (currentSchema, config, asts) => {
       }
     }
     for (const dep of item.deps) {
-      remainingDeps.set(dep, ((_a = remainingDeps.get(dep)) != null ? _a : 0) + 1);
+      remainingDeps.set(dep, (remainingDeps.get(dep) ?? 0) + 1);
     }
   }
   let len = items.length;
-  if (!len)
-    return;
+  if (!len) return;
   for (; ; ) {
     for (let i = 0; i < items.length; i++) {
       const item = items[i];
@@ -4921,7 +4675,7 @@ const astToMigration = (currentSchema, config, asts) => {
           cycleDrop.add(key);
         }
         for (const key of item.deps) {
-          cycleDeps.set(key, ((_b = cycleDeps.get(key)) != null ? _b : 0) + 1);
+          cycleDeps.set(key, (cycleDeps.get(key) ?? 0) + 1);
         }
         items.splice(i, 1);
         i--;
@@ -4951,19 +4705,15 @@ const astToMigration = (currentSchema, config, asts) => {
       dropped.add(drop);
     }
     for (const [key, num] of cycleDeps) {
-      const set = ((_c = remainingDeps.get(key)) != null ? _c : num) - num;
-      if (set)
-        remainingDeps.set(key, set);
-      else
-        remainingDeps.delete(key);
+      const set = (remainingDeps.get(key) ?? num) - num;
+      if (set) remainingDeps.set(key, set);
+      else remainingDeps.delete(key);
     }
     len = items.length;
-    if (!len)
-      break;
+    if (!len) break;
     groups.push([]);
   }
-  if (!groups[0].length)
-    return;
+  if (!groups[0].length) return;
   let code = "";
   for (const group of groups) {
     code += `
@@ -4982,12 +4732,11 @@ ${group.map(
 };
 const astEncoders = {
   table(ast, config) {
-    var _a, _b;
     let code = [];
     const result = code;
     const hasOptions = Boolean(ast.comment || ast.noPrimaryKey === "ignore");
     const hasTableData = Boolean(
-      ast.primaryKey || ((_a = ast.indexes) == null ? void 0 : _a.length) || ((_b = ast.constraints) == null ? void 0 : _b.length)
+      ast.primaryKey || ast.indexes?.length || ast.constraints?.length
     );
     const isShifted = hasOptions || hasTableData;
     if (isShifted) {
@@ -4999,8 +4748,7 @@ const astEncoders = {
         const options = [];
         if (ast.comment)
           options.push(`comment: ${JSON.stringify(ast.comment)},`);
-        if (ast.noPrimaryKey === "ignore")
-          options.push(`noPrimaryKey: true,`);
+        if (ast.noPrimaryKey === "ignore") options.push(`noPrimaryKey: true,`);
         code.push("{", options, "},");
       }
       code.push("(t) => ({");
@@ -5036,8 +4784,7 @@ const astEncoders = {
     }
     if (isShifted) {
       orchidCore.addCode(code, "}),");
-      if (hasTableData)
-        pqb.pushTableDataCode(code, ast);
+      if (hasTableData) pqb.pushTableDataCode(code, ast);
       orchidCore.addCode(result, ");");
     } else {
       orchidCore.addCode(result, "}));");
@@ -5045,7 +4792,6 @@ const astEncoders = {
     return result;
   },
   changeTable(ast, config, currentSchema) {
-    var _a;
     let code = [];
     const result = code;
     const schemaTable = quoteSchemaTable({
@@ -5066,13 +4812,10 @@ const astEncoders = {
       orchidCore.addCode(code, `await db.changeTable(${schemaTable}, (t) => ({`);
     }
     const [addTimestamps, dropTimestamps] = ["add", "drop"].map(
-      (type) => {
-        var _a2, _b;
-        return getHasTimestamps(
-          ast.shape.createdAt && "type" in ast.shape.createdAt && ((_a2 = ast.shape.createdAt) == null ? void 0 : _a2.type) === type ? ast.shape.createdAt.item : void 0,
-          ast.shape.updatedAt && "type" in ast.shape.updatedAt && ((_b = ast.shape.updatedAt) == null ? void 0 : _b.type) === type ? ast.shape.updatedAt.item : void 0
-        );
-      }
+      (type) => getHasTimestamps(
+        ast.shape.createdAt && "type" in ast.shape.createdAt && ast.shape.createdAt?.type === type ? ast.shape.createdAt.item : void 0,
+        ast.shape.updatedAt && "type" in ast.shape.updatedAt && ast.shape.updatedAt?.type === type ? ast.shape.updatedAt.item : void 0
+      )
     );
     const toCodeCtx = {
       t: "t",
@@ -5089,21 +4832,19 @@ const astEncoders = {
           const recreate = changes.length > 1;
           const line = [
             recreate ? `...t.${change.type}(t.name(${orchidCore.singleQuote(
-              (_a = change.item.data.name) != null ? _a : key
+              change.item.data.name ?? key
             )})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
           ];
           const columnCode = change.item.toCode(toCodeCtx, key);
           for (let i = 0; i < columnCode.length; i++) {
             let part = columnCode[i];
-            if (recreate && !i)
-              part = part.slice(1);
+            if (recreate && !i) part = part.slice(1);
             orchidCore.addCode(line, part);
           }
           orchidCore.addCode(line, "),");
           code.push(line);
         } else if (change.type === "change") {
-          if (!change.from.column || !change.to.column)
-            continue;
+          if (!change.from.column || !change.to.column) continue;
           const line = [
             `${orchidCore.quoteObjectKey(key)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
           ];
@@ -5182,15 +4923,14 @@ const astEncoders = {
     return result;
   },
   renameType(ast, _, currentSchema) {
-    var _a, _b;
     const code = [];
     const kind = ast.kind === "TABLE" ? "Table" : "Type";
     if (ast.from === ast.to) {
       orchidCore.addCode(
         code,
         `await db.change${kind}Schema(${orchidCore.singleQuote(ast.to)}, ${orchidCore.singleQuote(
-          (_a = ast.fromSchema) != null ? _a : currentSchema
-        )}, ${orchidCore.singleQuote((_b = ast.toSchema) != null ? _b : currentSchema)});`
+          ast.fromSchema ?? currentSchema
+        )}, ${orchidCore.singleQuote(ast.toSchema ?? currentSchema)});`
       );
     } else {
       orchidCore.addCode(
@@ -5244,28 +4984,21 @@ const astEncoders = {
     )}, [${ast.fromValues.map(orchidCore.singleQuote).join(", ")}], [${ast.toValues.map(orchidCore.singleQuote).join(", ")}]);`;
   },
   domain(ast) {
-    var _a;
     return `await db.${ast.action}Domain(${quoteSchemaTable(
       ast
     )}, (t) => ${ast.baseType.toCode(
       { t: "t", table: ast.name },
-      (_a = ast.baseType.data.name) != null ? _a : ""
+      ast.baseType.data.name ?? ""
     )});`;
   },
   collation(ast) {
     const params = [];
-    if (ast.locale)
-      params.push(`locale: '${ast.locale}',`);
-    if (ast.lcCollate)
-      params.push(`lcCollate: '${ast.lcCollate}',`);
-    if (ast.lcCType)
-      params.push(`lcCType: '${ast.lcCType}',`);
-    if (ast.provider)
-      params.push(`provider: '${ast.provider}',`);
-    if (ast.deterministic)
-      params.push(`deterministic: ${ast.deterministic},`);
-    if (ast.version)
-      params.push(`version: '${ast.version}',`);
+    if (ast.locale) params.push(`locale: '${ast.locale}',`);
+    if (ast.lcCollate) params.push(`lcCollate: '${ast.lcCollate}',`);
+    if (ast.lcCType) params.push(`lcCType: '${ast.lcCType}',`);
+    if (ast.provider) params.push(`provider: '${ast.provider}',`);
+    if (ast.deterministic) params.push(`deterministic: ${ast.deterministic},`);
+    if (ast.version) params.push(`version: '${ast.version}',`);
     return [
       `await db.createCollation(${quoteSchemaTable(ast)}, {`,
       params,
@@ -5300,14 +5033,12 @@ const astEncoders = {
   view(ast) {
     const code = [`await db.createView(${quoteSchemaTable(ast)}`];
     const options = [];
-    if (ast.options.recursive)
-      options.push("recursive: true,");
+    if (ast.options.recursive) options.push("recursive: true,");
     const w = ast.options.with;
-    if (w == null ? void 0 : w.checkOption)
-      options.push(`checkOption: '${w.checkOption}',`);
-    if (w == null ? void 0 : w.securityBarrier)
+    if (w?.checkOption) options.push(`checkOption: '${w.checkOption}',`);
+    if (w?.securityBarrier)
       options.push(`securityBarrier: ${w.securityBarrier},`);
-    if (w == null ? void 0 : w.securityInvoker)
+    if (w?.securityInvoker)
       options.push(`securityInvoker: ${w.securityInvoker},`);
     if (options.length) {
       orchidCore.addCode(code, ", {");
@@ -5337,8 +5068,7 @@ const astEncoders = {
   }
 };
 const isTimestamp = (column, type) => {
-  if (!column)
-    return false;
+  if (!column) return false;
   const { default: def } = column.data;
   return Boolean(
     column instanceof type && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRawSQL(def) && (typeof def._sql === "object" ? def._sql[0][0] : def._sql) === "now()"
@@ -5357,7 +5087,7 @@ const getHasTimestamps = (createdAt, updatedAt) => {
   };
 };
 const getTimestampsInfo = (createdAt, updatedAt, type) => {
-  return isTimestamp(createdAt, type) && isTimestamp(updatedAt, type) && (!(createdAt == null ? void 0 : createdAt.data.name) || (createdAt == null ? void 0 : createdAt.data.name) === "created_at") && (!(updatedAt == null ? void 0 : updatedAt.data.name) || (updatedAt == null ? void 0 : updatedAt.data.name) === "updated_at");
+  return isTimestamp(createdAt, type) && isTimestamp(updatedAt, type) && (!createdAt?.data.name || createdAt?.data.name === "created_at") && (!updatedAt?.data.name || updatedAt?.data.name === "updated_at");
 };
 const timestampsToCode = ({ hasTZTimestamps }) => {
   const key = hasTZTimestamps ? "timestamps" : "timestampsNoTZ";
@@ -5365,15 +5095,13 @@ const timestampsToCode = ({ hasTZTimestamps }) => {
 };
 
 const pullDbStructure = async (options, config) => {
-  var _a, _b;
   const adapter = new pqb.Adapter(options);
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
   const ast = await structureToAst(ctx, adapter, config);
   await adapter.close();
   const result = astToMigration(currentSchema, config, ast);
-  if (!result)
-    return;
+  if (!result) return;
   const version = await makeFileVersion({}, config);
   await writeMigrationFile(config, version, "pull", result);
   const silentQueries = Object.assign(adapter, {
@@ -5385,7 +5113,7 @@ const pullDbStructure = async (options, config) => {
   const len = unsupportedEntries.length;
   if (len) {
     let count = 0;
-    (_a = config.logger) == null ? void 0 : _a.warn(
+    config.logger?.warn(
       `Found unsupported types:
 ${unsupportedEntries.map(([type, columns]) => {
         count += columns.length;
@@ -5394,17 +5122,16 @@ ${unsupportedEntries.map(([type, columns]) => {
 Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count > 1 ? "s" : ""} to treat ${count > 1 ? "them" : "it"} as other column type`
     );
   }
-  (_b = config.logger) == null ? void 0 : _b.log("Database pulled successfully");
+  config.logger?.log("Database pulled successfully");
   adapter.close();
 };
 
 const runRecurrentMigrations = async (options, config) => {
-  var _a;
   let dbs;
   let files = 0;
   await readdirRecursive(config.recurrentPath, async (path) => {
     files++;
-    dbs != null ? dbs : dbs = options.map((opts) => pqb.createDb({ adapter: new pqb.Adapter(opts) }));
+    dbs ?? (dbs = options.map((opts) => pqb.createDb({ adapter: new pqb.Adapter(opts) })));
     const sql = await fs.readFile(path, "utf-8");
     await Promise.all(
       dbs.map(async (db) => {
@@ -5415,7 +5142,7 @@ const runRecurrentMigrations = async (options, config) => {
   if (dbs) {
     await Promise.all(dbs.map((db) => db.close()));
     if (files > 0) {
-      (_a = config.logger) == null ? void 0 : _a.log(
+      config.logger?.log(
         `Applied ${files} recurrent migration file${files > 1 ? "s" : ""}`
       );
     }
@@ -5423,12 +5150,10 @@ const runRecurrentMigrations = async (options, config) => {
 };
 const readdirRecursive = async (dirPath, cb) => {
   const list = await fs.readdir(dirPath).catch((err) => {
-    if (err.code !== "ENOENT")
-      throw err;
+    if (err.code !== "ENOENT") throw err;
     return;
   });
-  if (!list)
-    return;
+  if (!list) return;
   await Promise.all(
     list.map(async (item) => {
       const path$1 = path.join(dirPath, item);
@@ -5443,7 +5168,6 @@ const readdirRecursive = async (dirPath, cb) => {
 };
 
 const listMigrationsStatuses = async (options, config, args) => {
-  var _a;
   const adapters = options.map((opts) => new pqb.Adapter(opts));
   const ctx = {};
   const [{ migrations }, ...migrated] = await Promise.all([
@@ -5524,7 +5248,7 @@ ${migration.url}
     return log2 += showUrl ? lineSeparator : `
 ${lineSeparator}`;
   }).join("\n\n");
-  ((_a = config.logger) != null ? _a : console).log(log);
+  (config.logger ?? console).log(log);
   await Promise.all(adapters.map((adapter) => adapter.close()));
 };
 const makeChars = (count, char) => {
@@ -5535,27 +5259,7 @@ const makeChars = (count, char) => {
   return chars;
 };
 
-var __defProp$1 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const rebase = async (options, config) => {
-  var _a, _b;
   if (config.migrations) {
     throw new Error("Cannot rebase migrations defined in the config");
   }
@@ -5571,24 +5275,23 @@ const rebase = async (options, config) => {
     ...adapters.map((adapter) => getMigratedVersionsMap(ctx, adapter, config))
   ]);
   await Promise.all(adapters.map((adapter) => adapter.close()));
-  const files = set.migrations.map((file) => __spreadProps(__spreadValues$1({}, file), {
+  const files = set.migrations.map((file) => ({
+    ...file,
     name: path.basename(file.path),
     serial: +file.version
   }));
-  if (!files.length)
-    return;
+  if (!files.length) return;
   const start = files.findIndex(
     (file, i) => i !== 0 && file.serial === files[i - 1].serial
   );
-  if (start === -1)
-    return;
+  if (start === -1) return;
   const combinedVersionsMap = {};
   for (const versions of versionMaps) {
     Object.assign(combinedVersionsMap, versions.map);
   }
   const renames = [];
   const renamesMap = {};
-  let minVersionToMigrate = (_b = (_a = files.find((file) => !combinedVersionsMap[file.version])) == null ? void 0 : _a.serial) != null ? _b : Infinity;
+  let minVersionToMigrate = files.find((file) => !combinedVersionsMap[file.version])?.serial ?? Infinity;
   const migratedFiles = [];
   let maxNewVersion = 0;
   let move = 0;
@@ -5623,11 +5326,9 @@ const rebase = async (options, config) => {
     let newVersion = file.serial;
     if (move) {
       newVersion += move;
-      if (moveFile === prev && !renamesMap[prev.path])
-        newVersion--;
+      if (moveFile === prev && !renamesMap[prev.path]) newVersion--;
       if (file.serial !== newVersion) {
-        if (newVersion < minVersionToMigrate)
-          minVersionToMigrate = newVersion;
+        if (newVersion < minVersionToMigrate) minVersionToMigrate = newVersion;
         const values = [file.path, newVersion];
         renames.push(values);
         renamesMap[file.path] = values;
@@ -5643,8 +5344,7 @@ const rebase = async (options, config) => {
             const rename = renames[i2];
             rename[1]--;
             renames[i2] = item;
-            if (rename[0] === prev.path)
-              break;
+            if (rename[0] === prev.path) break;
             renamesMap[item[0]] = item;
             item = rename;
           }
@@ -5658,8 +5358,7 @@ const rebase = async (options, config) => {
       maxNewVersion = newVersion;
     }
   }
-  if (!renames.length && !migratedFiles.length)
-    return;
+  if (!renames.length && !migratedFiles.length) return;
   maxNewVersion++;
   renames.push(
     ...migratedFiles.map((file, i) => {
@@ -5668,8 +5367,7 @@ const rebase = async (options, config) => {
       return rename;
     })
   );
-  if (!renames.length)
-    return;
+  if (!renames.length) return;
   const migrationsDown = files.filter(
     (file) => combinedVersionsMap[file.version] === file.name && file.serial >= minVersionToMigrate
   );
@@ -5677,13 +5375,14 @@ const rebase = async (options, config) => {
     const rename = renamesMap[file.path];
     if (rename) {
       const version = String(rename[1]).padStart(4, "0");
-      files2.push(__spreadProps(__spreadValues$1({}, file), {
+      files2.push({
+        ...file,
         path: path.join(
           path.dirname(rename[0]),
           version + path.basename(rename[0]).slice(version.length)
         ),
         version
-      }));
+      });
     } else if (!combinedVersionsMap[file.version] || file.serial >= minVersionToMigrate) {
       files2.push(file);
     }
@@ -5693,14 +5392,15 @@ const rebase = async (options, config) => {
   await redo(
     ctx,
     options,
-    __spreadProps(__spreadValues$1({}, config), {
+    {
+      ...config,
       async afterRollback() {
         set.migrations = migrationsUp;
       },
       async afterMigrate() {
         set.migrations = migrationsDown;
       }
-    }),
+    },
     ["all"]
   );
   for (let i = renames.length - 1; i >= 0; i--) {
@@ -5716,22 +5416,6 @@ const rebase = async (options, config) => {
   }
 };
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 const rakeDb = (options, partialConfig, args = process.argv.slice(2)) => {
   const config = processRakeDbConfig(partialConfig);
   const promise = runCommand(
@@ -5739,9 +5423,8 @@ const rakeDb = (options, partialConfig, args = process.argv.slice(2)) => {
     config,
     args
   ).catch((err) => {
-    var _a;
     if (err instanceof RakeDbError) {
-      (_a = config.logger) == null ? void 0 : _a.error(err.message);
+      config.logger?.error(err.message);
       process.exit(1);
     }
     throw err;
@@ -5755,7 +5438,7 @@ rakeDb.lazy = (options, partialConfig) => {
   return {
     change,
     run(args, conf) {
-      return runCommand(options, conf ? __spreadValues(__spreadValues({}, config), conf) : config, args);
+      return runCommand(options, conf ? { ...config, ...conf } : config, args);
     }
   };
 };
@@ -5770,15 +5453,14 @@ const rakeDbAliases = {
   rec: "recurrent"
 };
 const runCommand = async (opts, config, args = process.argv.slice(2)) => {
-  var _a, _b, _c;
-  let arg = (_a = args[0]) == null ? void 0 : _a.split(":")[0];
+  let arg = args[0]?.split(":")[0];
   if (rakeDbAliases[arg]) {
     args = [...args];
     arg = args[0] = rakeDbAliases[arg];
   }
   const options = orchidCore.toArray(opts);
   args.shift();
-  const command = (_c = (_b = rakeDbCommands[arg]) == null ? void 0 : _b.run) != null ? _c : config.commands[arg];
+  const command = rakeDbCommands[arg]?.run ?? config.commands[arg];
   if (command) {
     await command(options, config, args);
   } else if (config.logger) {
@@ -5789,12 +5471,9 @@ const runCommand = async (opts, config, args = process.argv.slice(2)) => {
     for (let key in rakeDbCommands) {
       const command2 = rakeDbCommands[key];
       const added = addedCommands.get(command2);
-      if (added)
-        key = added[0] += `, ${key}`;
-      if (key.length > max)
-        max = key.length;
-      if (added)
-        continue;
+      if (added) key = added[0] += `, ${key}`;
+      if (key.length > max) max = key.length;
+      if (added) continue;
       if (command2.helpArguments) {
         maxArgs = Math.max(
           maxArgs,