orchid-orm 1.37.5 → 1.37.7

package/dist/migrations.js

@@ -59,13 +59,11 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
   }
 };
 const promptCreateOrRename = (kind, name, drop, verifying) => {
-  if (verifying)
-    throw new AbortSignal();
+  if (verifying) throw new AbortSignal();
   let hintPos = name.length + 4;
   for (const from of drop) {
     const value = from.length + 8 + name.length;
-    if (value > hintPos)
-      hintPos = value;
+    if (value > hintPos) hintPos = value;
   }
   let max = 0;
   const add = name.length + 3;
@@ -184,25 +182,8 @@ const renameSchemaInStructures = (items, from, to) => {
   }
 };
 
-var __defProp$9 = Object.defineProperty;
-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;
-};
 const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
-  var _a;
-  const codeExtensions = extensions == null ? void 0 : extensions.map((ext) => {
+  const codeExtensions = extensions?.map((ext) => {
     const [schema, name] = rakeDb.getSchemaAndTableFromName(ext.name);
     return { schema, name, version: ext.version };
   });
@@ -211,14 +192,13 @@ const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
       let found = false;
       for (let i = 0; i < codeExtensions.length; i++) {
         const codeExt = codeExtensions[i];
-        if (dbExt.name === codeExt.name && dbExt.schemaName === ((_a = codeExt.schema) != null ? _a : currentSchema) && (!codeExt.version || codeExt.version === dbExt.version)) {
+        if (dbExt.name === codeExt.name && dbExt.schemaName === (codeExt.schema ?? currentSchema) && (!codeExt.version || codeExt.version === dbExt.version)) {
           found = true;
           codeExtensions.splice(i, 1);
           break;
         }
       }
-      if (found)
-        continue;
+      if (found) continue;
     }
     ast.push({
       type: "extension",
@@ -228,35 +208,17 @@ const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
       version: dbExt.version
     });
   }
-  if (codeExtensions == null ? void 0 : codeExtensions.length) {
+  if (codeExtensions?.length) {
     ast.push(
-      ...codeExtensions.map((ext) => __spreadValues$9({
+      ...codeExtensions.map((ext) => ({
         type: "extension",
-        action: "create"
-      }, ext))
+        action: "create",
+        ...ext
+      }))
     );
   }
 };
 
-var __defProp$8 = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = 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$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const processColumns = async (adapter, config, structureToAstCtx, dbStructure, domainsMap, changeTableData, ast, currentSchema, compareSql, typeCastsCache, verifying) => {
   const { dbTable } = changeTableData;
   const dbColumns = Object.fromEntries(
@@ -296,7 +258,6 @@ const processColumns = async (adapter, config, structureToAstCtx, dbStructure, d
   dropColumns(changeTableData, columnsToDrop);
 };
 const groupColumns = (structureToAstCtx, dbStructure, domainsMap, dbColumns, changeTableData) => {
-  var _a;
   const columnsToAdd = [];
   const columnsToDrop = [];
   const columnsToChange = /* @__PURE__ */ new Map();
@@ -305,9 +266,8 @@ const groupColumns = (structureToAstCtx, dbStructure, domainsMap, dbColumns, cha
   const checks = rakeDb.getDbTableColumnsChecks(changeTableData.dbTableData);
   for (const key in codeTable.shape) {
     const column = codeTable.shape[key];
-    if (!column.dataType)
-      continue;
-    const name = (_a = column.data.name) != null ? _a : key;
+    if (!column.dataType) continue;
+    const name = column.data.name ?? key;
     if (dbColumns[name]) {
       columnsToChange.set(key, { key, dbName: name, column });
       columnsToChangeByDbName.set(name, true);
@@ -316,8 +276,7 @@ const groupColumns = (structureToAstCtx, dbStructure, domainsMap, dbColumns, cha
     }
   }
   for (const name in dbColumns) {
-    if (columnsToChangeByDbName.has(name))
-      continue;
+    if (columnsToChangeByDbName.has(name)) continue;
     const [key, column] = rakeDb.dbColumnToAst(
       structureToAstCtx,
       dbStructure,
@@ -341,10 +300,9 @@ const addOrRenameColumns = async (config, dbStructure, {
   schema,
   changeTableAst: { name: tableName, shape }
 }, columnsToAdd, columnsToDrop, columnsToChange, verifying) => {
-  var _a, _b, _c;
   for (const { key, column } of columnsToAdd) {
     if (columnsToDrop.length) {
-      const codeName = (_a = column.data.name) != null ? _a : key;
+      const codeName = column.data.name ?? key;
       const index = await promptCreateOrRename(
         "column",
         codeName,
@@ -354,7 +312,7 @@ const addOrRenameColumns = async (config, dbStructure, {
       if (index) {
         const drop = columnsToDrop[index - 1];
         columnsToDrop.splice(index - 1, 1);
-        const from = (_b = drop.column.data.name) != null ? _b : drop.key;
+        const from = drop.column.data.name ?? drop.key;
         columnsToChange.set(from, {
           key,
           dbName: from,
@@ -372,7 +330,7 @@ const addOrRenameColumns = async (config, dbStructure, {
           }
         }
         for (const c of dbTableData.constraints) {
-          if ((_c = c.check) == null ? void 0 : _c.columns) {
+          if (c.check?.columns) {
             renameColumn(c.check.columns, from, to);
           }
           if (c.references) {
@@ -402,7 +360,6 @@ const dropColumns = ({ changeTableAst: { shape } }, columnsToDrop) => {
   }
 };
 const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, domainsMap, ast, currentSchema, dbColumns, columnsToChange, compareSql, changeTableData, typeCastsCache, verifying) => {
-  var _a;
   for (const [
     key,
     { key: codeKey, dbName, column: codeColumn }
@@ -442,7 +399,7 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
         }
       ];
     } else if (action !== "recreate") {
-      const to = (_a = codeColumn.data.name) != null ? _a : codeKey;
+      const to = codeColumn.data.name ?? codeKey;
       if (dbName !== to) {
         changeTableData.changeTableAst.shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
           type: "rename",
@@ -453,7 +410,6 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
   }
 };
 const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
-  var _a, _b, _c, _d;
   const dbType = getColumnDbType(dbColumn, currentSchema);
   const codeType = getColumnDbType(codeColumn, currentSchema);
   if (dbColumn instanceof pqb.ArrayColumn && codeColumn instanceof pqb.ArrayColumn) {
@@ -491,12 +447,11 @@ JOIN pg_type AS t ON t.oid = casttarget`);
       }
       typeCastsCache.value = typeCasts;
     }
-    const dbBaseType = dbColumn instanceof pqb.DomainColumn ? (_a = domainsMap[dbColumn.dataType]) == null ? void 0 : _a.dataType : dbType;
-    const codeBaseType = codeColumn instanceof pqb.DomainColumn ? (_b = domainsMap[codeColumn.dataType]) == null ? void 0 : _b.dataType : codeType;
-    if (!((_c = typeCasts.get(dbBaseType)) == null ? void 0 : _c.has(codeBaseType))) {
+    const dbBaseType = dbColumn instanceof pqb.DomainColumn ? domainsMap[dbColumn.dataType]?.dataType : dbType;
+    const codeBaseType = codeColumn instanceof pqb.DomainColumn ? domainsMap[codeColumn.dataType]?.dataType : codeType;
+    if (!typeCasts.get(dbBaseType)?.has(codeBaseType)) {
       if (!(dbColumn instanceof pqb.EnumColumn) || !(codeColumn instanceof pqb.EnumColumn) || !orchidCore.deepCompare(dbColumn.options, codeColumn.options)) {
-        if (verifying)
-          throw new AbortSignal();
+        if (verifying) throw new AbortSignal();
         const tableName = rakeDb.concatSchemaAndName(changeTableData.changeTableAst);
         const abort = await rakeDb.promptSelect({
           message: `Cannot cast type of ${tableName}'s column ${key} from ${dbType} to ${codeType}`,
@@ -539,13 +494,14 @@ JOIN pg_type AS t ON t.oid = casttarget`);
   }
   if (!orchidCore.deepCompare(
     dbData.identity,
-    codeData.identity ? __spreadValues$8({
+    codeData.identity ? {
       always: false,
       start: 1,
       increment: 1,
       cache: 1,
-      cycle: false
-    }, (_d = codeData.identity) != null ? _d : {}) : void 0
+      cycle: false,
+      ...codeData.identity ?? {}
+    } : void 0
   )) {
     return "change";
   }
@@ -585,12 +541,13 @@ JOIN pg_type AS t ON t.oid = casttarget`);
 const changeColumn = (changeTableData, key, dbName, dbColumn, codeColumn) => {
   dbColumn.data.as = codeColumn.data.as = void 0;
   const simpleCodeColumn = Object.create(codeColumn);
-  simpleCodeColumn.data = __spreadProps$7(__spreadValues$8({}, codeColumn.data), {
+  simpleCodeColumn.data = {
+    ...codeColumn.data,
     primaryKey: void 0,
     indexes: void 0,
     foreignKeys: void 0,
     check: void 0
-  });
+  };
   changeTableData.changingColumns[dbName] = {
     from: dbColumn,
     to: simpleCodeColumn
@@ -726,9 +683,8 @@ const processDomains = async (ast, adapter, structureToAstCtx, domainsMap, dbStr
   }
 };
 const makeComparableDomain = (currentSchema, schemaName, name, column) => {
-  var _a;
   let arrayDims = 0;
-  const isNullable = (_a = column.data.isNullable) != null ? _a : false;
+  const isNullable = column.data.isNullable ?? false;
   let inner = column;
   while (inner instanceof pqb.ArrayColumn) {
     inner = inner.data.item;
@@ -785,24 +741,7 @@ const createAst = (codeDomain) => ({
   baseType: codeDomain.column
 });
 
-var __defProp$7 = Object.defineProperty;
-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;
-};
 const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) => {
-  var _a, _b;
   const createEnums = [];
   const dropEnums = [];
   for (const [, codeEnum] of enums) {
@@ -825,7 +764,7 @@ const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) =
       const codeEnum2 = createEnums[i];
       createEnums.splice(i, 1);
       const fromSchema = dbEnum.schemaName;
-      const toSchema = (_a = codeEnum2.schema) != null ? _a : currentSchema;
+      const toSchema = codeEnum2.schema ?? currentSchema;
       renameColumnsTypeSchema(dbStructure, fromSchema, toSchema);
       ast.push({
         type: "renameType",
@@ -853,7 +792,7 @@ const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) =
         dropEnums.splice(index - 1, 1);
         const fromSchema = dbEnum.schemaName;
         const from = dbEnum.name;
-        const toSchema = (_b = codeEnum.schema) != null ? _b : currentSchema;
+        const toSchema = codeEnum.schema ?? currentSchema;
         const to = codeEnum.name;
         if (fromSchema !== toSchema) {
           renameColumnsTypeSchema(dbStructure, fromSchema, toSchema);
@@ -877,10 +816,11 @@ const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) =
         continue;
       }
     }
-    ast.push(__spreadValues$7({
+    ast.push({
       type: "enum",
-      action: "create"
-    }, codeEnum));
+      action: "create",
+      ...codeEnum
+    });
   }
   for (const dbEnum of dropEnums) {
     ast.push({
@@ -938,33 +878,13 @@ const renameColumnsTypeSchema = (dbStructure, from, to) => {
   }
 };
 
-var __defProp$6 = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = 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$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 const processPrimaryKey = (config, changeTableData) => {
-  var _a;
   const { codeTable } = changeTableData;
   const columnsPrimaryKey = [];
   for (const key in codeTable.shape) {
     const column = codeTable.shape[key];
     if (column.data.primaryKey) {
-      columnsPrimaryKey.push({ key, name: (_a = column.data.name) != null ? _a : key });
+      columnsPrimaryKey.push({ key, name: column.data.name ?? key });
     }
   }
   changePrimaryKey(config, columnsPrimaryKey, changeTableData);
@@ -976,15 +896,14 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
   changeTableAst: { shape, add, drop },
   changingColumns
 }) => {
-  var _a, _b, _c;
   const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
   const primaryKey = [
     .../* @__PURE__ */ new Set([
       ...columnsPrimaryKey,
-      ...(_a = config.snakeCase ? tablePrimaryKey == null ? void 0 : tablePrimaryKey.columns.map((key) => ({
+      ...(config.snakeCase ? tablePrimaryKey?.columns.map((key) => ({
         key,
         name: orchidCore.toSnakeCase(key)
-      })) : tablePrimaryKey == null ? void 0 : tablePrimaryKey.columns.map((key) => ({ key, name: key }))) != null ? _a : []
+      })) : tablePrimaryKey?.columns.map((key) => ({ key, name: key }))) ?? []
     ])
   ];
   if (dbPrimaryKey && primaryKey.length === dbPrimaryKey.columns.length && !primaryKey.some(
@@ -995,14 +914,13 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
       const changes = shape[key] && orchidCore.toArray(shape[key]);
       if (changes) {
         for (const change of changes) {
-          if (change.type !== "change")
-            continue;
+          if (change.type !== "change") continue;
           if (change.from.column) {
             change.from.column.data.primaryKey = void 0;
           }
           if (change.to.column) {
             const column = Object.create(change.to.column);
-            column.data = __spreadProps$6(__spreadValues$6({}, column.data), { primaryKey: void 0 });
+            column.data = { ...column.data, primaryKey: void 0 };
             change.to.column = column;
           }
         }
@@ -1010,15 +928,15 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
     }
     return;
   }
-  const toDrop = dbPrimaryKey == null ? void 0 : dbPrimaryKey.columns.filter(
+  const toDrop = dbPrimaryKey?.columns.filter(
     (key) => !checkForColumnAddOrDrop(shape, key)
   );
-  if (toDrop == null ? void 0 : toDrop.length) {
+  if (toDrop?.length) {
     if (toDrop.length === 1 && changingColumns[toDrop[0]]) {
       const column = changingColumns[toDrop[0]];
-      column.from.data.primaryKey = (_b = dbPrimaryKey == null ? void 0 : dbPrimaryKey.name) != null ? _b : true;
+      column.from.data.primaryKey = dbPrimaryKey?.name ?? true;
     } else {
-      drop.primaryKey = { columns: toDrop, name: dbPrimaryKey == null ? void 0 : dbPrimaryKey.name };
+      drop.primaryKey = { columns: toDrop, name: dbPrimaryKey?.name };
     }
   }
   const toAdd = primaryKey.filter(
@@ -1027,11 +945,11 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
   if (toAdd.length) {
     if (toAdd.length === 1 && changingColumns[toAdd[0].name]) {
       const column = changingColumns[toAdd[0].name];
-      column.to.data.primaryKey = (_c = tablePrimaryKey == null ? void 0 : tablePrimaryKey.name) != null ? _c : true;
+      column.to.data.primaryKey = tablePrimaryKey?.name ?? true;
     } else {
       add.primaryKey = {
         columns: toAdd.map((c) => c.key),
-        name: tablePrimaryKey == null ? void 0 : tablePrimaryKey.name
+        name: tablePrimaryKey?.name
       };
     }
   }
@@ -1042,51 +960,19 @@ const renamePrimaryKey = ({
   schema,
   delayedAst
 }) => {
-  var _a, _b;
   const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
-  if (dbPrimaryKey && tablePrimaryKey && (dbPrimaryKey == null ? void 0 : dbPrimaryKey.name) !== (tablePrimaryKey == null ? void 0 : tablePrimaryKey.name)) {
+  if (dbPrimaryKey && tablePrimaryKey && dbPrimaryKey?.name !== tablePrimaryKey?.name) {
     delayedAst.push({
       type: "renameTableItem",
       kind: "CONSTRAINT",
       tableSchema: schema,
       tableName: codeTable.table,
-      from: (_a = dbPrimaryKey.name) != null ? _a : `${codeTable.table}_pkey`,
-      to: (_b = tablePrimaryKey.name) != null ? _b : `${codeTable}_pkey`
+      from: dbPrimaryKey.name ?? `${codeTable.table}_pkey`,
+      to: tablePrimaryKey.name ?? `${codeTable}_pkey`
     });
   }
 };
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = 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$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 const processIndexes = (config, changeTableData, ast, compareExpressions) => {
   const codeIndexes = collectCodeIndexes(config, changeTableData);
   const codeComparableIndexes = collectCodeComparableIndexes(
@@ -1103,8 +989,7 @@ const processIndexes = (config, changeTableData, ast, compareExpressions) => {
     const hasAddedOrDroppedColumn = dbIndex.columns.some(
       (column) => "column" in column && checkForColumnAddOrDrop(shape, column.column)
     );
-    if (hasAddedOrDroppedColumn)
-      continue;
+    if (hasAddedOrDroppedColumn) continue;
     normalizeIndex(dbIndex);
     const { found, rename, foundAndHasSql } = findMatchingIndex(
       dbIndex,
@@ -1131,8 +1016,7 @@ const processIndexes = (config, changeTableData, ast, compareExpressions) => {
     const compare = [];
     for (let i = 0; i < dbIndex.columns.length; i++) {
       const column = dbIndex.columns[i];
-      if (!("expression" in column))
-        continue;
+      if (!("expression" in column)) continue;
       compare.push({
         inDb: column.expression,
         inCode: found.map(
@@ -1183,63 +1067,60 @@ const processIndexes = (config, changeTableData, ast, compareExpressions) => {
   if (indexesToAdd.length) {
     addIndexes(
       changeTableData,
-      indexesToAdd.map((x) => __spreadProps$5(__spreadValues$5({}, x), {
+      indexesToAdd.map((x) => ({
+        ...x,
         columns: x.columnKeys,
         columnNames: x.columns,
-        options: x.options.include ? __spreadProps$5(__spreadValues$5({}, x.options), { include: x.includeKeys }) : x.options
+        options: x.options.include ? { ...x.options, include: x.includeKeys } : x.options
       }))
     );
   }
 };
 const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) => {
-  var _a;
   const codeIndexes = [];
   for (const key in codeTable.shape) {
     const column = codeTable.shape[key];
-    if (!column.data.indexes)
-      continue;
-    const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnAddOrDrop(shape, name))
-      continue;
+    if (!column.data.indexes) continue;
+    const name = column.data.name ?? key;
+    if (checkForColumnAddOrDrop(shape, name)) continue;
     codeIndexes.push(
       ...column.data.indexes.map(
-        (_b) => {
-          var _c = _b, {
-            options: _d
-          } = _c, _e = _d, { collate, opclass, order, weight } = _e, options = __objRest(_e, ["collate", "opclass", "order", "weight"]), index = __objRest(_c, [
-            "options"
-          ]);
-          return __spreadProps$5(__spreadValues$5({
-            columns: [
-              {
-                collate,
-                opclass,
-                order,
-                weight,
-                column: name
-              }
-            ]
-          }, index), {
-            options: options.include ? config.snakeCase ? __spreadProps$5(__spreadValues$5({}, options), {
-              include: orchidCore.toArray(options.include).map(orchidCore.toSnakeCase)
-            }) : options : options,
-            columnKeys: [{ collate, opclass, order, weight, column: key }],
-            includeKeys: options.include
-          });
-        }
+        ({
+          options: { collate, opclass, order, weight, ...options },
+          ...index
+        }) => ({
+          columns: [
+            {
+              collate,
+              opclass,
+              order,
+              weight,
+              column: name
+            }
+          ],
+          ...index,
+          options: options.include ? config.snakeCase ? {
+            ...options,
+            include: orchidCore.toArray(options.include).map(orchidCore.toSnakeCase)
+          } : options : options,
+          columnKeys: [{ collate, opclass, order, weight, column: key }],
+          includeKeys: options.include
+        })
       )
     );
   }
   if (codeTable.internal.tableData.indexes) {
     codeIndexes.push(
-      ...codeTable.internal.tableData.indexes.map((x) => __spreadProps$5(__spreadValues$5({}, x), {
+      ...codeTable.internal.tableData.indexes.map((x) => ({
+        ...x,
         columns: config.snakeCase ? x.columns.map(
-          (c) => "column" in c ? __spreadProps$5(__spreadValues$5({}, c), { column: orchidCore.toSnakeCase(c.column) }) : c
+          (c) => "column" in c ? { ...c, column: orchidCore.toSnakeCase(c.column) } : c
         ) : x.columns,
         columnKeys: x.columns,
-        options: x.options.include && config.snakeCase ? __spreadProps$5(__spreadValues$5({}, x.options), {
+        options: x.options.include && config.snakeCase ? {
+          ...x.options,
           include: orchidCore.toArray(x.options.include).map(orchidCore.toSnakeCase)
-        }) : x.options,
+        } : x.options,
         includeKeys: x.options.include
       }))
     );
@@ -1249,35 +1130,34 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
 const collectCodeComparableIndexes = (config, codeIndexes) => {
   return codeIndexes.map((codeIndex) => {
     normalizeIndex(codeIndex.options);
-    return indexToComparable(__spreadProps$5(__spreadValues$5({}, codeIndex.options), {
+    return indexToComparable({
+      ...codeIndex.options,
       include: codeIndex.options.include === void 0 ? void 0 : config.snakeCase ? orchidCore.toArray(codeIndex.options.include).map(orchidCore.toSnakeCase) : orchidCore.toArray(codeIndex.options.include),
       columns: codeIndex.columns,
       name: codeIndex.name,
       columnKeys: codeIndex.columnKeys,
       includeKeys: codeIndex.includeKeys
-    }));
+    });
   });
 };
 const normalizeIndex = (index) => {
-  if (index.using === "btree")
-    index.using = void 0;
-  if (!index.unique)
-    index.unique = void 0;
-  if (index.nullsNotDistinct === false)
-    index.nullsNotDistinct = void 0;
+  if (index.using === "btree") index.using = void 0;
+  if (!index.unique) index.unique = void 0;
+  if (index.nullsNotDistinct === false) index.nullsNotDistinct = void 0;
 };
 const indexToComparable = (index) => {
   let hasExpression = false;
   const columns = index.columns.map((column) => {
-    const result = __spreadProps$5(__spreadValues$5({}, column), {
+    const result = {
+      ...column,
       expression: void 0,
       hasExpression: "expression" in column
-    });
-    if (result.hasExpression)
-      hasExpression = true;
+    };
+    if (result.hasExpression) hasExpression = true;
     return result;
   });
-  return __spreadProps$5(__spreadValues$5({}, index), {
+  return {
+    ...index,
     schemaName: void 0,
     tableName: void 0,
     with: void 0,
@@ -1286,7 +1166,7 @@ const indexToComparable = (index) => {
     hasWhere: !!index.where,
     columns,
     hasExpression
-  });
+  };
 };
 const findMatchingIndex = (dbIndex, codeComparableIndexes, codeIndexes, skipCodeIndexes, tableName, config) => {
   const dbComparableIndex = indexToComparable(dbIndex);
@@ -1302,27 +1182,26 @@ const findMatchingIndex = (dbIndex, codeComparableIndexes, codeIndexes, skipCode
   return { found, rename, foundAndHasSql };
 };
 const findMatchingIndexWithoutSql = (dbIndex, codeComparableIndexes, codeIndexes, skipCodeIndexes, tableName, config) => {
-  var _c, _d;
   const found = [];
   const rename = [];
-  const _a = dbIndex, { columns: dbColumns } = _a, dbIndexWithoutColumns = __objRest(_a, ["columns"]);
+  const { columns: dbColumns, ...dbIndexWithoutColumns } = dbIndex;
   for (let i = 0; i < codeComparableIndexes.length; i++) {
-    if (skipCodeIndexes.has(i))
-      continue;
-    const _b = codeComparableIndexes[i], { columns: codeColumns } = _b, codeIndex = __objRest(_b, ["columns"]);
+    if (skipCodeIndexes.has(i)) continue;
+    const { columns: codeColumns, ...codeIndex } = codeComparableIndexes[i];
     if (dbColumns.length === codeColumns.length && !dbColumns.some((dbColumn, i2) => !orchidCore.deepCompare(dbColumn, codeColumns[i2]))) {
       let a = dbIndexWithoutColumns;
       let b = codeIndex;
-      const codeName = (_c = b.name) != null ? _c : rakeDb.getIndexName(tableName, dbColumns);
+      const codeName = b.name ?? rakeDb.getIndexName(tableName, dbColumns);
       if (a.name !== b.name) {
-        a = __spreadProps$5(__spreadValues$5({}, a), { name: void 0 });
-        b = __spreadProps$5(__spreadValues$5({}, b), {
+        a = { ...a, name: void 0 };
+        b = {
+          ...b,
           name: void 0,
           columnKeys: void 0,
           includeKeys: void 0
-        });
+        };
         if (a.language && !b.language) {
-          b.language = (_d = config.language) != null ? _d : "english";
+          b.language = config.language ?? "english";
         }
         if (orchidCore.deepCompare(a, b)) {
           found.push(codeIndexes[i]);
@@ -1331,11 +1210,12 @@ const findMatchingIndexWithoutSql = (dbIndex, codeComparableIndexes, codeIndexes
           );
         }
       } else {
-        const _e = codeIndex, codeIndexWithoutKeys = __objRest(_e, [
+        const {
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          "columnKeys",
-          "includeKeys"
-        ]);
+          columnKeys,
+          includeKeys,
+          ...codeIndexWithoutKeys
+        } = codeIndex;
         if (orchidCore.deepCompare(dbIndexWithoutColumns, codeIndexWithoutKeys)) {
           found.push(codeIndexes[i]);
           rename.push(void 0);
@@ -1356,20 +1236,20 @@ const handleIndexChange = ({
   changingColumns,
   delayedAst
 }, dbIndex, dbColumns, found, rename) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (!found) {
     const indexName = dbIndex.name === rakeDb.getIndexName(changeTableAst.name, dbColumns) ? void 0 : dbIndex.name;
     if (dbColumns.length === 1 && "column" in dbColumns[0]) {
       const column = changingColumns[dbColumns[0].column];
       if (column) {
-        ((_b = (_a = column.from.data).indexes) != null ? _b : _a.indexes = []).push({
+        ((_a = column.from.data).indexes ?? (_a.indexes = [])).push({
           options: dbIndex,
           name: indexName
         });
         return;
       }
     }
-    ((_d = (_c = changeTableAst.drop).indexes) != null ? _d : _c.indexes = []).push({
+    ((_b = changeTableAst.drop).indexes ?? (_b.indexes = [])).push({
       columns: dbColumns,
       options: dbIndex,
       name: indexName
@@ -1386,13 +1266,13 @@ const handleIndexChange = ({
   }
 };
 const addIndexes = ({ changeTableAst, changingColumns }, add) => {
-  var _a, _b, _c, _d;
-  const indexes = (_b = (_a = changeTableAst.add).indexes) != null ? _b : _a.indexes = [];
+  var _a, _b;
+  const indexes = (_a = changeTableAst.add).indexes ?? (_a.indexes = []);
   for (const index of add) {
     if (index.columns.length === 1 && "column" in index.columns[0]) {
       const column = changingColumns[(index.columnNames || index.columns)[0].column];
       if (column) {
-        ((_d = (_c = column.to.data).indexes) != null ? _d : _c.indexes = []).push(index);
+        ((_b = column.to.data).indexes ?? (_b.indexes = [])).push(index);
         continue;
       }
     }
@@ -1400,25 +1280,6 @@ const addIndexes = ({ changeTableAst, changingColumns }, add) => {
   }
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-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;
-};
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const mapMatchToDb = {
   FULL: "f",
   PARTIAL: "p",
@@ -1440,7 +1301,7 @@ for (const key in mapActionToDb) {
   mapActionToCode[mapActionToDb[key]] = key;
 }
 const processForeignKeys = (config, ast, changeTables, currentSchema, tableShapes) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b;
   for (const changeTableData of changeTables) {
     const codeForeignKeys = collectCodeFkeys(
       config,
@@ -1452,20 +1313,17 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
     let changed = false;
     for (const dbConstraint of dbTableData.constraints) {
       const { references: dbReferences } = dbConstraint;
-      if (!dbReferences)
-        continue;
+      if (!dbReferences) continue;
       const hasChangedColumn = dbReferences.columns.some(
         (column) => checkForColumnAddOrDrop(shape, column)
       );
-      if (hasChangedColumn)
-        continue;
+      if (hasChangedColumn) continue;
       const foreignShape = tableShapes[`${dbReferences.foreignSchema}.${dbReferences.foreignTable}`];
       const hasForeignChangedColumn = foreignShape && dbReferences.foreignColumns.some((column) => {
         const res = checkForColumnAddOrDrop(foreignShape, column);
         return res;
       });
-      if (hasForeignChangedColumn)
-        continue;
+      if (hasForeignChangedColumn) continue;
       let found = false;
       let rename;
       for (let i = 0; i < codeForeignKeys.length; i++) {
@@ -1474,7 +1332,7 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
         if (orchidCore.deepCompare(dbReferences, codeReferences)) {
           found = true;
           codeForeignKeys.splice(i, 1);
-          const codeName = (_a = codeForeignKey.codeConstraint.name) != null ? _a : rakeDb.getConstraintName(
+          const codeName = codeForeignKey.codeConstraint.name ?? rakeDb.getConstraintName(
             codeTable.table,
             codeForeignKey,
             config.snakeCase
@@ -1492,13 +1350,13 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
         );
         if (dbReferences.columns.length === 1 && changingColumns[dbReferences.columns[0]]) {
           const column = changingColumns[dbReferences.columns[0]];
-          ((_c = (_b = column.from.data).foreignKeys) != null ? _c : _b.foreignKeys = []).push({
+          ((_a = column.from.data).foreignKeys ?? (_a.foreignKeys = [])).push({
             fnOrTable: foreignKey.references.fnOrTable,
             foreignColumns: foreignKey.references.foreignColumns,
             options: foreignKey.references.options
           });
         } else {
-          ((_d = drop.constraints) != null ? _d : drop.constraints = []).push(foreignKey);
+          (drop.constraints ?? (drop.constraints = [])).push(foreignKey);
         }
         changed = true;
       } else if (rename) {
@@ -1513,11 +1371,11 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
       }
     }
     if (codeForeignKeys.length) {
-      const constraints = (_e = add.constraints) != null ? _e : add.constraints = [];
+      const constraints = add.constraints ?? (add.constraints = []);
       for (const { codeConstraint, references } of codeForeignKeys) {
         if (references.columns.length === 1 && changingColumns[references.columns[0]]) {
           const column = changingColumns[references.columns[0]];
-          ((_g = (_f = column.to.data).foreignKeys) != null ? _g : _f.foreignKeys = []).push({
+          ((_b = column.to.data).foreignKeys ?? (_b.foreignKeys = [])).push({
             fnOrTable: references.foreignTable,
             foreignColumns: codeConstraint.references.foreignColumns,
             options: codeConstraint.references.options
@@ -1535,24 +1393,20 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
   }
 };
 const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, currentSchema) => {
-  var _a;
   const codeForeignKeys = [];
   for (const key in codeTable.shape) {
     const column = codeTable.shape[key];
-    if (!column.data.foreignKeys)
-      continue;
-    const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnAddOrDrop(shape, name))
-      continue;
+    if (!column.data.foreignKeys) continue;
+    const name = column.data.name ?? key;
+    if (checkForColumnAddOrDrop(shape, name)) continue;
     codeForeignKeys.push(
       ...column.data.foreignKeys.map((x) => {
-        var _a2;
         const columns = [name];
         const fnOrTable = fnOrTableToString(x.fnOrTable);
         return parseForeignKey(
           config,
           {
-            name: (_a2 = x.options) == null ? void 0 : _a2.name,
+            name: x.options?.name,
             references: {
               columns: [key],
               fnOrTable,
@@ -1574,22 +1428,24 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
   if (codeTable.internal.tableData.constraints) {
     for (const tableConstraint of codeTable.internal.tableData.constraints) {
       const { references: refs } = tableConstraint;
-      if (!refs)
-        continue;
+      if (!refs) continue;
       const fnOrTable = fnOrTableToString(refs.fnOrTable);
       codeForeignKeys.push(
         parseForeignKey(
           config,
-          __spreadProps$4(__spreadValues$4({}, tableConstraint), {
-            references: __spreadProps$4(__spreadValues$4({}, refs), {
+          {
+            ...tableConstraint,
+            references: {
+              ...refs,
               fnOrTable
-            })
-          }),
-          __spreadProps$4(__spreadValues$4({}, refs), {
+            }
+          },
+          {
+            ...refs,
             fnOrTable,
             columns: config.snakeCase ? refs.columns.map(orchidCore.toSnakeCase) : refs.columns,
             foreignColumns: config.snakeCase ? refs.foreignColumns.map(orchidCore.toSnakeCase) : refs.foreignColumns
-          }),
+          },
           currentSchema
         )
       );
@@ -1609,13 +1465,13 @@ const parseForeignKey = (config, codeConstraint, references, currentSchema) => {
   const [schema, table] = rakeDb.getSchemaAndTableFromName(fnOrTable);
   return {
     references: {
-      foreignSchema: schema != null ? schema : currentSchema,
+      foreignSchema: schema ?? currentSchema,
       foreignTable: table,
       columns,
       foreignColumns: config.snakeCase ? foreignColumns.map(orchidCore.toSnakeCase) : foreignColumns,
-      match: mapMatchToDb[(options == null ? void 0 : options.match) || "SIMPLE"],
-      onUpdate: mapActionToDb[(options == null ? void 0 : options.onUpdate) || "NO ACTION"],
-      onDelete: mapActionToDb[(options == null ? void 0 : options.onDelete) || "NO ACTION"]
+      match: mapMatchToDb[options?.match || "SIMPLE"],
+      onUpdate: mapActionToDb[options?.onUpdate || "NO ACTION"],
+      onDelete: mapActionToDb[options?.onDelete || "NO ACTION"]
     },
     codeConstraint
   };
@@ -1638,27 +1494,7 @@ const dbForeignKeyToCodeForeignKey = (config, dbConstraint, dbReferences) => ({
   }
 });
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = 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$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const processChecks = (ast, changeTableData, compareExpressions) => {
-  var _a, _b;
   const codeChecks = collectCodeChecks(changeTableData);
   const {
     dbTableData,
@@ -1667,7 +1503,7 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
   const hasDbChecks = dbTableData.constraints.some((c) => c.check);
   if (!hasDbChecks) {
     if (codeChecks.length) {
-      const constraints = (_a = add.constraints) != null ? _a : add.constraints = [];
+      const constraints = add.constraints ?? (add.constraints = []);
       for (const check of codeChecks) {
         if (check.column && changeTableData.changingColumns[check.column]) {
           const column = changeTableData.changingColumns[check.column];
@@ -1683,13 +1519,11 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
   const foundCodeChecks = /* @__PURE__ */ new Set();
   for (const dbConstraint of dbTableData.constraints) {
     const { check: dbCheck, name } = dbConstraint;
-    if (!dbCheck)
-      continue;
-    const hasChangedColumn = (_b = dbCheck.columns) == null ? void 0 : _b.some(
+    if (!dbCheck) continue;
+    const hasChangedColumn = dbCheck.columns?.some(
       (column) => checkForColumnAddOrDrop(shape, column)
     );
-    if (hasChangedColumn)
-      continue;
+    if (hasChangedColumn) continue;
     if (codeChecks.length) {
       wait++;
       compareExpressions.push({
@@ -1700,13 +1534,11 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
           }
         ],
         handle(index) {
-          var _a2;
-          if (index !== void 0)
-            return;
+          if (index !== void 0) return;
           dropCheck(changeTableData, dbCheck, name);
           if (--wait === 0 && !changeTableData.pushedAst) {
             changeTableData.pushedAst = true;
-            ((_a2 = add.constraints) != null ? _a2 : add.constraints = []).push(
+            (add.constraints ?? (add.constraints = [])).push(
               ...codeChecks.filter((_, i) => !foundCodeChecks.has(i)).map((check) => ({
                 name: check.name,
                 check: check.sql
@@ -1725,18 +1557,16 @@ const collectCodeChecks = ({
   codeTable,
   changeTableAst: { shape }
 }) => {
-  var _a;
   const codeChecks = [];
   for (const key in codeTable.shape) {
     const column = codeTable.shape[key];
-    if (!column.data.check)
-      continue;
-    const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnAddOrDrop(shape, name))
-      continue;
-    codeChecks.push(__spreadProps$3(__spreadValues$3({}, column.data.check), {
+    if (!column.data.check) continue;
+    const name = column.data.name ?? key;
+    if (checkForColumnAddOrDrop(shape, name)) continue;
+    codeChecks.push({
+      ...column.data.check,
       column: name
-    }));
+    });
   }
   if (codeTable.internal.tableData.constraints) {
     for (const constraint of codeTable.internal.tableData.constraints) {
@@ -1749,12 +1579,11 @@ const collectCodeChecks = ({
   return codeChecks;
 };
 const dropCheck = ({ changeTableAst: { drop }, changingColumns }, dbCheck, name) => {
-  var _a, _b;
-  const constraints = (_a = drop.constraints) != null ? _a : drop.constraints = [];
+  const constraints = drop.constraints ?? (drop.constraints = []);
   const sql = new pqb.RawSQL([
     [dbCheck.expression]
   ]);
-  if (((_b = dbCheck.columns) == null ? void 0 : _b.length) === 1 && changingColumns[dbCheck.columns[0]]) {
+  if (dbCheck.columns?.length === 1 && changingColumns[dbCheck.columns[0]]) {
     const column = changingColumns[dbCheck.columns[0]];
     column.from.data.name = "i_d";
     column.from.data.check = {
@@ -1769,25 +1598,6 @@ const dropCheck = ({ changeTableAst: { drop }, changingColumns }, dbCheck, name)
   }
 };
 
-var __defProp$2 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = 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$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 const processTables = async (ast, structureToAstCtx, domainsMap, adapter, tables, dbStructure, currentSchema, config, generatorIgnore, verifying) => {
   const createTables = collectCreateTables(
     tables,
@@ -1841,8 +1651,7 @@ const processTables = async (ast, structureToAstCtx, domainsMap, adapter, tables
 };
 const collectCreateTables = (tables, dbStructure, currentSchema) => {
   return tables.reduce((acc, codeTable) => {
-    var _a;
-    const tableSchema = (_a = codeTable.q.schema) != null ? _a : currentSchema;
+    const tableSchema = codeTable.q.schema ?? currentSchema;
     const hasDbTable = dbStructure.tables.some(
       (t) => t.name === codeTable.table && t.schemaName === tableSchema
     );
@@ -1853,25 +1662,21 @@ const collectCreateTables = (tables, dbStructure, currentSchema) => {
   }, []);
 };
 const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema, createTables, generatorIgnore) => {
-  var _a;
   const changeTables = [];
   const changeTableSchemas = [];
   const dropTables = [];
   const tableShapes = {};
-  const ignoreTables = (_a = generatorIgnore == null ? void 0 : generatorIgnore.tables) == null ? void 0 : _a.map((name) => {
+  const ignoreTables = generatorIgnore?.tables?.map((name) => {
     const [schema = currentSchema, table] = rakeDb.getSchemaAndTableFromName(name);
     return { schema, table };
   });
   for (const dbTable of dbStructure.tables) {
-    if (dbTable.name === config.migrationsTable || (ignoreTables == null ? void 0 : ignoreTables.some(
+    if (dbTable.name === config.migrationsTable || ignoreTables?.some(
       ({ schema, table }) => table === dbTable.name && schema === dbTable.schemaName
-    )))
+    ))
       continue;
     const codeTable = tables.find(
-      (t) => {
-        var _a2;
-        return t.table === dbTable.name && ((_a2 = t.q.schema) != null ? _a2 : currentSchema) === dbTable.schemaName;
-      }
+      (t) => t.table === dbTable.name && (t.q.schema ?? currentSchema) === dbTable.schemaName
     );
     if (codeTable) {
       addChangeTable(
@@ -1896,10 +1701,9 @@ const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema,
   return { changeTables, changeTableSchemas, dropTables, tableShapes };
 };
 const applyChangeTableSchemas = (changeTableSchemas, currentSchema, ast) => {
-  var _a;
   for (const { codeTable, dbTable } of changeTableSchemas) {
     const fromSchema = dbTable.schemaName;
-    const toSchema = (_a = codeTable.q.schema) != null ? _a : currentSchema;
+    const toSchema = codeTable.q.schema ?? currentSchema;
     ast.push({
       type: "renameType",
       kind: "TABLE",
@@ -1911,7 +1715,6 @@ const applyChangeTableSchemas = (changeTableSchemas, currentSchema, ast) => {
   }
 };
 const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStructure, domainsMap, ast, currentSchema, config, compareSql, tableExpressions, verifying) => {
-  var _a;
   const compareExpressions = [];
   const typeCastsCache = {};
   for (const changeTableData of changeTables) {
@@ -1936,16 +1739,15 @@ const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStr
       const types = [];
       for (const key in codeTable.shape) {
         const column = codeTable.shape[key];
-        if (!column.dataType)
-          continue;
-        const name = (_a = column.data.name) != null ? _a : key;
+        if (!column.dataType) continue;
+        const name = column.data.name ?? key;
         names.push(name);
         types.push(getColumnDbType(column, currentSchema));
       }
       const tableName = codeTable.table;
       const source = `(VALUES (${types.map((x) => `NULL::${x}`).join(", ")})) "${tableName}"(${names.map((x) => `"${x}"`).join(", ")})`;
       tableExpressions.push(
-        ...compareExpressions.map((x) => __spreadProps$2(__spreadValues$2({}, x), { source }))
+        ...compareExpressions.map((x) => ({ ...x, source }))
       );
     }
   }
@@ -1966,7 +1768,6 @@ const applyCompareSql = async (compareSql, adapter) => {
   }
 };
 const applyCreateOrRenameTables = async (dbStructure, createTables, dropTables, changeTables, tableShapes, currentSchema, ast, verifying) => {
-  var _a;
   for (const codeTable of createTables) {
     if (dropTables.length) {
       const index = await promptCreateOrRename(
@@ -1983,7 +1784,7 @@ const applyCreateOrRenameTables = async (dbStructure, createTables, dropTables,
           kind: "TABLE",
           fromSchema: dbTable.schemaName,
           from: dbTable.name,
-          toSchema: (_a = codeTable.q.schema) != null ? _a : currentSchema,
+          toSchema: codeTable.q.schema ?? currentSchema,
           to: codeTable.table
         });
         addChangeTable(
@@ -2001,9 +1802,8 @@ const applyCreateOrRenameTables = async (dbStructure, createTables, dropTables,
   }
 };
 const addChangeTable = (dbStructure, changeTables, tableShapes, currentSchema, dbTable, codeTable) => {
-  var _a;
   const shape = {};
-  const schema = (_a = codeTable.q.schema) != null ? _a : currentSchema;
+  const schema = codeTable.q.schema ?? currentSchema;
   changeTables.push({
     codeTable,
     dbTable,
@@ -2024,15 +1824,16 @@ const addChangeTable = (dbStructure, changeTables, tableShapes, currentSchema, d
   tableShapes[`${schema}.${codeTable.table}`] = shape;
 };
 const createTableAst = (currentSchema, table) => {
-  return __spreadValues$2({
+  return {
     type: "table",
     action: "create",
     schema: table.q.schema === currentSchema ? void 0 : table.q.schema,
     comment: table.internal.comment,
     name: table.table,
     shape: makeTableShape(table),
-    noPrimaryKey: table.internal.noPrimaryKey ? "ignore" : "error"
-  }, table.internal.tableData);
+    noPrimaryKey: table.internal.noPrimaryKey ? "ignore" : "error",
+    ...table.internal.tableData
+  };
 };
 const makeTableShape = (table) => {
   const shape = {};
@@ -2150,9 +1951,7 @@ const verifyMigration = async (adapter, config, migrationCode, generateMigration
 };
 
 const report = (ast, config, currentSchema) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (!config.logger)
-    return;
+  if (!config.logger) return;
   const code = [];
   let green, red, yellow, pale;
   if (typeof config.log === "object" && config.log.colors === false) {
@@ -2166,15 +1965,15 @@ const report = (ast, config, currentSchema) => {
         let hasPrimaryKey = !!a.primaryKey;
         const counters = {
           column: 0,
-          index: (_b = (_a = a.indexes) == null ? void 0 : _a.length) != null ? _b : 0,
-          "foreign key": (_d = (_c = a.constraints) == null ? void 0 : _c.reduce(
+          index: a.indexes?.length ?? 0,
+          "foreign key": a.constraints?.reduce(
             (sum, c) => c.references ? sum + 1 : sum,
             0
-          )) != null ? _d : 0,
-          check: (_f = (_e = a.constraints) == null ? void 0 : _e.reduce(
+          ) ?? 0,
+          check: a.constraints?.reduce(
             (sum, c) => c.check ? sum + 1 : sum,
             0
-          )) != null ? _f : 0
+          ) ?? 0
         };
         for (const key in a.shape) {
           counters.column++;
@@ -2224,14 +2023,14 @@ const report = (ast, config, currentSchema) => {
               const column = change.item;
               const { primaryKey, indexes, foreignKeys, check } = column.data;
               inner.push(
-                `${change.type === "add" ? green("+ add column") : red("- drop column")} ${key} ${(_g = column.data.alias) != null ? _g : getColumnDbType(column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
+                `${change.type === "add" ? green("+ add column") : red("- drop column")} ${key} ${column.data.alias ?? getColumnDbType(column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
                   return `${fnOrTableToString(
                     fk.fnOrTable
                   )}(${fk.foreignColumns.join(", ")})`;
-                }).join(", ")}` : ""}${(indexes == null ? void 0 : indexes.length) ? indexes.length === 1 ? ", has index" : `, has ${indexes.length} indexes` : ""}${check ? `, checks ${check.sql.toSQL({ values: [] })}` : ""}`
+                }).join(", ")}` : ""}${indexes?.length ? indexes.length === 1 ? ", has index" : `, has ${indexes.length} indexes` : ""}${check ? `, checks ${check.sql.toSQL({ values: [] })}` : ""}`
               );
             } else if (change.type === "change") {
-              const name = (_i = (_h = change.from.column) == null ? void 0 : _h.data.name) != null ? _i : key;
+              const name = change.from.column?.data.name ?? key;
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
@@ -2271,8 +2070,7 @@ const report = (ast, config, currentSchema) => {
         }
         if (a.drop.constraints) {
           for (const { references } of a.drop.constraints) {
-            if (!references)
-              continue;
+            if (!references) continue;
             const [schema, name] = rakeDb.getSchemaAndTableFromName(
               references.fnOrTable
             );
@@ -2289,8 +2087,7 @@ const report = (ast, config, currentSchema) => {
             );
           }
           for (const { check } of a.drop.constraints) {
-            if (!check)
-              continue;
+            if (!check) continue;
             inner.push(`${red(`- drop check`)} ${check.toSQL({ values: [] })}`);
           }
         }
@@ -2312,8 +2109,7 @@ const report = (ast, config, currentSchema) => {
         }
         if (a.add.constraints) {
           for (const { references } of a.add.constraints) {
-            if (!references)
-              continue;
+            if (!references) continue;
             inner.push(
               `${green(`+ add foreign key`)} on (${references.columns.join(
                 ", "
@@ -2321,8 +2117,7 @@ const report = (ast, config, currentSchema) => {
             );
           }
           for (const { check } of a.add.constraints) {
-            if (!check)
-              continue;
+            if (!check) continue;
             inner.push(
               `${green(`+ add check`)} ${check.toSQL({ values: [] })}`
             );
@@ -2436,37 +2231,14 @@ const dbItemName = ({ schema, name }, currentSchema) => {
   return schema && schema !== currentSchema ? `${schema}.${name}` : name;
 };
 
-var __defProp$1 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = 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$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class AbortSignal extends Error {
 }
 const generate = async (options, config, args, afterPull) => {
-  var _a, _b, _c;
   let { dbPath } = config;
-  if (!dbPath || !config.baseTable)
-    throw invalidConfig(config);
-  if (!options.length)
-    throw new Error(`Database options must not be empty`);
-  if (!dbPath.endsWith(".ts"))
-    dbPath += ".ts";
-  let migrationName = (_a = args[0]) != null ? _a : "generated";
+  if (!dbPath || !config.baseTable) throw invalidConfig(config);
+  if (!options.length) throw new Error(`Database options must not be empty`);
+  if (!dbPath.endsWith(".ts")) dbPath += ".ts";
+  let migrationName = args[0] ?? "generated";
   let up;
   if (migrationName === "up") {
     up = true;
@@ -2480,7 +2252,7 @@ const generate = async (options, config, args, afterPull) => {
     afterPull
   );
   const [adapter] = adapters;
-  const currentSchema = (_b = adapter.schema) != null ? _b : "public";
+  const currentSchema = adapter.schema ?? "public";
   const db = await getDbFromConfig(config, dbPath);
   const { columnTypes, internal } = db.$queryBuilder;
   const codeItems = await getActualItems(
@@ -2530,18 +2302,18 @@ ${result}`}`
     }
   }
   const { logger } = config;
-  if ((!up || !migrationCode) && !afterPull)
-    await closeAdapters(adapters);
+  if ((!up || !migrationCode) && !afterPull) await closeAdapters(adapters);
   if (!migrationCode) {
-    logger == null ? void 0 : logger.log("No changes were detected");
+    logger?.log("No changes were detected");
     return;
   }
-  const version = (_c = afterPull == null ? void 0 : afterPull.version) != null ? _c : await rakeDb.makeFileVersion({}, config);
+  const version = afterPull?.version ?? await rakeDb.makeFileVersion({}, config);
   const delayLog = [];
   await rakeDb.writeMigrationFile(
-    __spreadProps$1(__spreadValues$1({}, config), {
-      logger: logger ? __spreadProps$1(__spreadValues$1({}, logger), { log: (msg) => delayLog.push(msg) }) : logger
-    }),
+    {
+      ...config,
+      logger: logger ? { ...logger, log: (msg) => delayLog.push(msg) } : logger
+    },
     version,
     migrationName,
     migrationCode
@@ -2563,14 +2335,13 @@ const invalidConfig = (config) => new Error(
   `\`${config.dbPath ? "baseTable" : "dbPath"}\` setting must be set in the migrations config for the generator to work`
 );
 const getDbFromConfig = async (config, dbPath) => {
-  var _a, _b;
   const module = await config.import(
     url.pathToFileURL(path.resolve(config.basePath, dbPath)).toString()
   );
-  const db = module[(_a = config.dbExportedAs) != null ? _a : "db"];
-  if (!(db == null ? void 0 : db.$queryBuilder)) {
+  const db = module[config.dbExportedAs ?? "db"];
+  if (!db?.$queryBuilder) {
     throw new Error(
-      `Unable to import OrchidORM instance as ${(_b = config.dbExportedAs) != null ? _b : "db"} from ${config.dbPath}`
+      `Unable to import OrchidORM instance as ${config.dbExportedAs ?? "db"} from ${config.dbPath}`
     );
   }
   return db;
@@ -2645,7 +2416,6 @@ const compareDbStructures = (a, b, i, path2) => {
   }
 };
 const getActualItems = async (db, currentSchema, internal, columnTypes) => {
-  var _a;
   const tableNames = /* @__PURE__ */ new Set();
   const habtmTables = /* @__PURE__ */ new Map();
   const codeItems = {
@@ -2656,8 +2426,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
   };
   const domains = /* @__PURE__ */ new Map();
   for (const key in db) {
-    if (key[0] === "$")
-      continue;
+    if (key[0] === "$") continue;
     const table = db[key];
     if (!table.table) {
       throw new Error(`Table ${key} is missing table property`);
@@ -2668,8 +2437,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
       throw new Error(`Table ${name} is defined more than once`);
     }
     tableNames.add(name);
-    if (schema)
-      codeItems.schemas.add(schema);
+    if (schema) codeItems.schemas.add(schema);
     codeItems.tables.push(table);
     for (const key2 in table.relations) {
       const column = table.shape[key2];
@@ -2688,7 +2456,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
         domains.set(column.dataType, {
           schemaName,
           name: name2,
-          column: (_a = column.data.as) != null ? _a : new pqb.UnknownColumn(pqb.defaultSchemaConfig)
+          column: column.data.as ?? new pqb.UnknownColumn(pqb.defaultSchemaConfig)
         });
       } else if (column.dataType === "enum") {
         processEnumColumn(column, currentSchema, codeItems);
@@ -2698,8 +2466,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
   if (internal.extensions) {
     for (const extension of internal.extensions) {
       const [schema] = rakeDb.getSchemaAndTableFromName(extension.name);
-      if (schema)
-        codeItems.schemas.add(schema);
+      if (schema) codeItems.schemas.add(schema);
     }
   }
   if (internal.domains) {
@@ -2722,22 +2489,20 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 const processEnumColumn = (column, currentSchema, codeItems) => {
   const { enumName, options } = column;
   const [schema, name] = rakeDb.getSchemaAndTableFromName(enumName);
-  const enumSchema = schema != null ? schema : currentSchema;
+  const enumSchema = schema ?? currentSchema;
   codeItems.enums.set(`${enumSchema}.${name}`, {
     schema: enumSchema,
     name,
     values: options
   });
-  if (schema)
-    codeItems.schemas.add(schema);
+  if (schema) codeItems.schemas.add(schema);
 };
 const processHasAndBelongsToManyColumn = (column, habtmTables, codeItems) => {
-  var _a, _b;
   const q = column.joinTable;
   const prev = habtmTables.get(q.table);
   if (prev) {
     for (const key in q.shape) {
-      if (q.shape[key].dataType !== ((_a = prev.shape[key]) == null ? void 0 : _a.dataType)) {
+      if (q.shape[key].dataType !== prev.shape[key]?.dataType) {
         throw new Error(
           `Column ${key} in ${q.table} in hasAndBelongsToMany relation does not match with the relation on the other side`
         );
@@ -2750,23 +2515,25 @@ const processHasAndBelongsToManyColumn = (column, habtmTables, codeItems) => {
   const shape = {};
   for (const key in joinTable.shape) {
     const column2 = Object.create(joinTable.shape[key]);
-    column2.data = __spreadProps$1(__spreadValues$1({}, column2.data), {
-      name: (_b = column2.data.name) != null ? _b : key,
+    column2.data = {
+      ...column2.data,
+      name: column2.data.name ?? key,
       identity: void 0,
       primaryKey: void 0,
       default: void 0
-    });
+    };
     shape[orchidCore.toCamelCase(key)] = column2;
   }
   joinTable.shape = shape;
-  joinTable.internal = __spreadProps$1(__spreadValues$1({}, joinTable.internal), {
+  joinTable.internal = {
+    ...joinTable.internal,
     tableData: {
       primaryKey: {
         columns: Object.keys(shape)
       }
     },
     noPrimaryKey: false
-  });
+  };
   codeItems.tables.push(joinTable);
   return;
 };
@@ -2774,28 +2541,9 @@ const closeAdapters = (adapters) => {
   return Promise.all(adapters.map((x) => x.close()));
 };
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-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;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const getTableInfosAndFKeys = (asts, config) => {
-  var _a, _b, _c;
-  const generateTableTo = (_a = config.generateTableTo) != null ? _a : (name) => `./tables/${name}.table.ts`;
+  var _a;
+  const generateTableTo = config.generateTableTo ?? ((name) => `./tables/${name}.table.ts`);
   const tableInfos = {};
   const fkeys = {};
   for (const ast of asts) {
@@ -2803,8 +2551,7 @@ const getTableInfosAndFKeys = (asts, config) => {
       const tableKey = orchidCore.toCamelCase(ast.name);
       const dbTableName = ast.schema ? `${ast.schema}.${ast.name}` : ast.name;
       let tablePath = path.resolve(config.basePath, generateTableTo(tableKey));
-      if (!tablePath.endsWith(".ts"))
-        tablePath += ".ts";
+      if (!tablePath.endsWith(".ts")) tablePath += ".ts";
       const name = orchidCore.toPascalCase(ast.name);
       const info = {
         dbTableName,
@@ -2816,9 +2563,8 @@ const getTableInfosAndFKeys = (asts, config) => {
       tableInfos[dbTableName] = info;
       if (ast.constraints) {
         for (const { references } of ast.constraints) {
-          if (!references)
-            continue;
-          ((_c = fkeys[_b = references.fnOrTable]) != null ? _c : fkeys[_b] = []).push({
+          if (!references) continue;
+          (fkeys[_a = references.fnOrTable] ?? (fkeys[_a] = [])).push({
             table: info,
             references
           });
@@ -2829,7 +2575,6 @@ const getTableInfosAndFKeys = (asts, config) => {
   return { tableInfos, fkeys };
 };
 const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs) => {
-  var _a, _b;
   const tableInfo = tableInfos[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
   const imports = {
     "orchid-orm": "Selectable, Insertable, Updatable",
@@ -2847,7 +2592,7 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
     props.push("noPrimaryKey = true;");
   }
   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 shapeCode = pqb.columnsShapeToCode({ t: "t", table: ast.name }, ast.shape);
   props.push(
@@ -2876,8 +2621,7 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   }
   if (ast.constraints) {
     for (const { references } of ast.constraints) {
-      if (!references)
-        continue;
+      if (!references) continue;
       const table = tableInfos[references.fnOrTable];
       imports[orchidCore.getImportPath(tableInfo.path, table.path)] = table.className;
       relations.push(
@@ -2904,9 +2648,10 @@ export class ${className} extends ${baseTableExportedAs} {`,
     props,
     "}\n"
   ];
-  return __spreadProps(__spreadValues({}, tableInfo), {
+  return {
+    ...tableInfo,
     content: importsCode + "\n\n" + orchidCore.codeToString(code, "", "  ")
-  });
+  };
 };
 function importsToCode(imports) {
   return Object.entries(imports).map(([from, name]) => `import { ${name} } from '${from}';`).join("\n");
@@ -2925,11 +2670,9 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
   let replacedConfig;
   if (extensions.length || domains.length) {
     let code = content.slice(config.pos, config.end).trim();
-    if (code[0] !== "{")
-      code = `{...${code}}`;
+    if (code[0] !== "{") code = `{...${code}}`;
     code = "{\n  " + code.slice(1, -1).trim();
-    if (!code.endsWith(","))
-      code += ",";
+    if (!code.endsWith(",")) code += ",";
     if (extensions.length) {
       code += `
   extensions: [${extensions.map(
@@ -2940,15 +2683,12 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
       code += `
   domains: {
     ${domains.sort((a, b) => a.name > b.name ? 1 : -1).map(
-        (ast) => {
-          var _a;
-          return `${orchidCore.quoteObjectKey(
-            ast.schema ? `${ast.schema}.${ast.name}` : ast.name
-          )}: (t) => ${ast.baseType.toCode(
-            { t: "t", table: ast.name },
-            (_a = ast.baseType.data.name) != null ? _a : ""
-          )},`;
-        }
+        (ast) => `${orchidCore.quoteObjectKey(
+          ast.schema ? `${ast.schema}.${ast.name}` : ast.name
+        )}: (t) => ${ast.baseType.toCode(
+          { t: "t", table: ast.name },
+          ast.baseType.data.name ?? ""
+        )},`
       ).join("\n    ")}
   },`;
     }
@@ -2986,19 +2726,15 @@ const getTsStatements = (content) => {
   return createSourceFile("file.ts", content, ScriptTarget.Latest, true).statements;
 };
 const getOrchidOrmImportName = (statements) => {
-  var _a, _b;
   for (const node of statements) {
-    if (node.kind !== SyntaxKind.ImportDeclaration)
-      continue;
+    if (node.kind !== SyntaxKind.ImportDeclaration) continue;
     const imp = node;
     const source = imp.moduleSpecifier.getText().slice(1, -1);
-    if (source !== "orchid-orm")
-      continue;
-    if (!imp.importClause)
-      continue;
-    const elements = (_a = imp.importClause.namedBindings) == null ? void 0 : _a.elements;
+    if (source !== "orchid-orm") continue;
+    if (!imp.importClause) continue;
+    const elements = imp.importClause.namedBindings?.elements;
     for (const element of elements) {
-      if (((_b = element.propertyName) == null ? void 0 : _b.escapedText) === "orchidORM" || element.name.escapedText === "orchidORM") {
+      if (element.propertyName?.escapedText === "orchidORM" || element.name.escapedText === "orchidORM") {
         return element.name.escapedText.toString();
       }
     }
@@ -3024,8 +2760,7 @@ ${spaces}  ${key}: ${className},`;
 ${spaces}`;
     }
   }
-  if (!imports.length)
-    return;
+  if (!imports.length) return;
   let importPos = 0;
   for (const node of statements) {
     if (node.kind === SyntaxKind.ImportDeclaration) {
@@ -3038,28 +2773,24 @@ ${spaces}`;
   };
 };
 const getTablesListSpaces = (content, object) => {
-  var _a;
   const lines = content.slice(0, object.end).split("\n");
   const last = lines[lines.length - 1];
-  return ((_a = last.match(/^\s+/)) == null ? void 0 : _a[0]) || "";
+  return last.match(/^\s+/)?.[0] || "";
 };
 const getOrchidOrmArgs = (importName, statements) => {
   for (const v of statements) {
-    if (v.kind !== SyntaxKind.VariableStatement)
-      continue;
+    if (v.kind !== SyntaxKind.VariableStatement) continue;
     for (const node of v.declarationList.declarations) {
       const call = node.initializer;
-      if ((call == null ? void 0 : call.kind) !== SyntaxKind.CallExpression)
-        continue;
-      if (call.expression.getText() !== importName)
-        continue;
+      if (call?.kind !== SyntaxKind.CallExpression) continue;
+      if (call.expression.getText() !== importName) continue;
       if (call.arguments.length !== 2) {
         throw new Error(
           "Invalid number of arguments when initializing orchid orm"
         );
       }
       const object = call.arguments[1];
-      if ((object == null ? void 0 : object.kind) !== SyntaxKind.ObjectLiteralExpression) {
+      if (object?.kind !== SyntaxKind.ObjectLiteralExpression) {
         throw new Error(
           "Second argument of orchidORM must be an object literal"
         );
@@ -3118,8 +2849,7 @@ const pull = async (options, config) => {
           baseTableExportedAs
         );
         tables[table.key] = table;
-        if (!firstTable)
-          firstTable = table;
+        if (!firstTable) firstTable = table;
         pendingFileWrites.push([
           table.path,
           table.content,
@@ -3145,24 +2875,21 @@ const pull = async (options, config) => {
     return;
   }
   let dbPath = path.resolve(config.basePath, config.dbPath);
-  if (!dbPath.endsWith(".ts"))
-    dbPath += ".ts";
+  if (!dbPath.endsWith(".ts")) dbPath += ".ts";
   const content = await appCodeGenUpdateDbFile(
     dbPath,
     tables,
     extensions,
     domains
   );
-  if (content)
-    pendingFileWrites.push([dbPath, content]);
+  if (content) pendingFileWrites.push([dbPath, content]);
   if (firstTable) {
     await fs.mkdir(path.dirname(firstTable.path), { recursive: true });
   }
   await Promise.all(
     pendingFileWrites.map(
       ([path2, content2, options2]) => fs.writeFile(path2, content2, options2).then(() => {
-        var _a;
-        (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(path2)}`);
+        config.logger?.log(`Created ${orchidCore.pathToLog(path2)}`);
       })
     )
   );