orchid-orm 1.6.24 → 1.6.29

package/dist/index.js

@@ -348,21 +348,21 @@ const hasRelationHandleUpdate = (q, ctx, set, key, primaryKey, nestedUpdate) =>
   });
 };
 
-var __defProp$6 = Object.defineProperty;
+var __defProp$7 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
 var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
 var __propIsEnum$9 = 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) => {
+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$9.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
+      __defNormalProp$7(a, prop, b[prop]);
   if (__getOwnPropSymbols$9)
     for (var prop of __getOwnPropSymbols$9(b)) {
       if (__propIsEnum$9.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
@@ -499,7 +499,7 @@ const nestedInsert$2 = ({ query, primaryKey, foreignKey }) => {
     );
     if (create.length) {
       await t._count()._createMany(
-        create.map(([selfData, item]) => __spreadValues$6({
+        create.map(([selfData, item]) => __spreadValues$7({
           [foreignKey]: selfData[primaryKey]
         }, "create" in item ? item.create : item.connectOrCreate.create))
       );
@@ -520,7 +520,7 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
     if (params.create || params.disconnect || params.set) {
       await currentRelationsQuery._update({ [foreignKey]: null });
       if (params.create) {
-        await t._count()._create(__spreadProps$5(__spreadValues$6({}, params.create), {
+        await t._count()._create(__spreadProps$5(__spreadValues$7({}, params.create), {
           [foreignKey]: data[0][primaryKey]
         }));
       }
@@ -536,7 +536,7 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
       const updatedIds = await currentRelationsQuery._pluck(foreignKey)._update(update);
       if (updatedIds.length < ids.length) {
         await t.createMany(
-          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$5(__spreadValues$6({}, create), {
+          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$5(__spreadValues$7({}, create), {
             [foreignKey]: id
           }))
         );
@@ -545,21 +545,21 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
   };
 };
 
-var __defProp$5 = Object.defineProperty;
+var __defProp$6 = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
 var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
 var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
 var __propIsEnum$8 = 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) => {
+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$8.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
+      __defNormalProp$6(a, prop, b[prop]);
   if (__getOwnPropSymbols$8)
     for (var prop of __getOwnPropSymbols$8(b)) {
       if (__propIsEnum$8.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
@@ -729,10 +729,10 @@ const nestedInsert$1 = ({ query, primaryKey, foreignKey }) => {
       await t._createMany(
         create.flatMap(([selfData, { create: create2 = [], connectOrCreate: connectOrCreate2 = [] }]) => {
           return [
-            ...create2.map((item) => __spreadValues$5({
+            ...create2.map((item) => __spreadValues$6({
               [foreignKey]: selfData[primaryKey]
             }, item)),
-            ...connectOrCreate2.filter(() => connected[connectedI++] === 0).map((item) => __spreadValues$5({
+            ...connectOrCreate2.filter(() => connected[connectedI++] === 0).map((item) => __spreadValues$6({
               [foreignKey]: selfData[primaryKey]
             }, item.create))
           ];
@@ -751,7 +751,7 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
     const t = query.transacting(q);
     if (params.create) {
       await t._count()._createMany(
-        params.create.map((create) => __spreadProps$4(__spreadValues$5({}, create), {
+        params.create.map((create) => __spreadProps$4(__spreadValues$6({}, create), {
           [foreignKey]: data[0][primaryKey]
         }))
       );
@@ -794,21 +794,21 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
   };
 };
 
-var __defProp$4 = Object.defineProperty;
+var __defProp$5 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
 var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
 var __propIsEnum$7 = 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) => {
+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$7.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
+      __defNormalProp$5(a, prop, b[prop]);
   if (__getOwnPropSymbols$7)
     for (var prop of __getOwnPropSymbols$7(b)) {
       if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
@@ -847,7 +847,7 @@ const removeColumnName = (column) => {
   if (!column.data.name)
     return column;
   const cloned = Object.create(column);
-  cloned.data = __spreadProps$3(__spreadValues$4({}, column.data), { name: void 0 });
+  cloned.data = __spreadProps$3(__spreadValues$5({}, column.data), { name: void 0 });
   return cloned;
 };
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
@@ -868,7 +868,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     [fk]: removeColumnName(table.shape[pk]),
     [afk]: removeColumnName(query.shape[apk])
   };
-  baseQuery.query = __spreadProps$3(__spreadValues$4({}, baseQuery.query), {
+  baseQuery.query = __spreadProps$3(__spreadValues$5({}, baseQuery.query), {
     shape: baseQuery.shape
   });
   const subQuery = Object.create(baseQuery);
@@ -903,7 +903,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         subQuery,
         (q) => q._on(associationForeignKeyFull, `${pqb.getQueryAs(toQuery)}.${apk}`)._on(foreignKeyFull, `${pqb.getQueryAs(fromQuery)}.${pk}`)
       );
-      join.query.joinedShapes = __spreadProps$3(__spreadValues$4({}, join.query.joinedShapes), {
+      join.query.joinedShapes = __spreadProps$3(__spreadValues$5({}, join.query.joinedShapes), {
         [fromQuery.query.as || fromQuery.table]: fromQuery.query.shape
       });
       return join;
@@ -930,7 +930,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
             }
           );
           if (createdCount === 0) {
-            throw new pqb.NotFoundError();
+            throw new pqb.NotFoundError(fromQuery);
           }
         }
       );
@@ -1316,21 +1316,21 @@ function transaction(fn) {
   });
 }
 
-var __defProp$3 = Object.defineProperty;
+var __defProp$4 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
 var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
 var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
 var __propIsEnum$6 = 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) => {
+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$6.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
+      __defNormalProp$4(a, prop, b[prop]);
   if (__getOwnPropSymbols$6)
     for (var prop of __getOwnPropSymbols$6(b)) {
       if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
@@ -1389,7 +1389,7 @@ const orchidORM = (_a, tables) => {
     }
     const table = new tables[key]();
     tableInstances[key] = table;
-    const options2 = __spreadProps$2(__spreadValues$3({}, commonOptions), {
+    const options2 = __spreadProps$2(__spreadValues$4({}, commonOptions), {
       schema: table.schema
     });
     if (table.noPrimaryKey)
@@ -1410,24 +1410,24 @@ const orchidORM = (_a, tables) => {
   return result;
 };
 
-var __defProp$2 = Object.defineProperty;
+var __defProp$3 = Object.defineProperty;
 var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
 var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
 var __propIsEnum$5 = 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) => {
+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$5.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
+      __defNormalProp$3(a, prop, b[prop]);
   if (__getOwnPropSymbols$5)
     for (var prop of __getOwnPropSymbols$5(b)) {
       if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
 const createRepo = (table, methods) => {
-  const queryMethods = __spreadValues$2(__spreadValues$2(__spreadValues$2(__spreadValues$2({}, methods.queryMethods), methods.queryOneMethods), methods.queryWithWhereMethods), methods.queryOneWithWhereMethods);
+  const queryMethods = __spreadValues$3(__spreadValues$3(__spreadValues$3(__spreadValues$3({}, methods.queryMethods), methods.queryOneMethods), methods.queryWithWhereMethods), methods.queryOneWithWhereMethods);
   const plainMethods = methods.methods;
   const repo = (q2) => {
     const proto = Object.create(q2.baseQuery);
@@ -1839,9 +1839,22 @@ const createTable = async (_a) => {
   }
 };
 
+var __defProp$2 = Object.defineProperty;
 var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
 var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
 var __propIsEnum$3 = 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$3.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
+    }
+  return a;
+};
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -1985,7 +1998,11 @@ const applySchemaChanges = (context) => {
       } else if (name === "index") {
         dropMatchingIndexes(context, prop, i, call, drop.indexes);
       } else if (name === "foreignKey") {
-        dropMatchingForeignKey(context, prop, i, call, drop.foreignKeys);
+        dropMatchingForeignKey(context, prop, i, call, drop.constraints);
+      } else if (name === "check") {
+        dropMatchingCheck(context, prop, i, call, drop.constraints);
+      } else if (name === "constraint") {
+        dropMatchingConstraint(context, prop, i, call, drop.constraints);
       }
     } else if (ts.is.propertyAssignment(prop)) {
       const name = ts.prop.getName(prop);
@@ -2111,15 +2128,19 @@ const addTableData = ({ add, changes, object, t, spaces }) => {
     changes.add(end, `  ${code.trim()}
 ${spaces}`);
   }
-  for (const item of add.indexes) {
-    const code = orchidCore.codeToString(pqb.indexToCode(item, t), spaces + "  ", "  ");
-    changes.add(end, `  ${code.trim()}
+  if (add.indexes) {
+    for (const item of add.indexes) {
+      const code = orchidCore.codeToString(pqb.indexToCode(item, t), spaces + "  ", "  ");
+      changes.add(end, `  ${code.trim()}
 ${spaces}`);
+    }
   }
-  for (const item of add.foreignKeys) {
-    const code = orchidCore.codeToString(pqb.foreignKeyToCode(item, t), spaces + "  ", "  ");
-    changes.add(end, `  ${code.trim()}
+  if (add.constraints) {
+    for (const item of add.constraints) {
+      const code = orchidCore.codeToString(pqb.constraintToCode(item, t), spaces + "  ", "  ");
+      changes.add(end, `  ${code.trim()}
 ${spaces}`);
+    }
   }
 };
 const getColumnMethodArgs = (t, to, key) => {
@@ -2147,7 +2168,7 @@ const getColumnMethodArgs = (t, to, key) => {
   return code;
 };
 const dropMatchingIndexes = (context, prop, i, call, items) => {
-  if (!items.length)
+  if (!(items == null ? void 0 : items.length))
     return;
   const [columnsNode, optionsNode] = call.arguments;
   const columns = [];
@@ -2175,9 +2196,17 @@ const dropMatchingIndexes = (context, prop, i, call, items) => {
   }
 };
 const dropMatchingForeignKey = (context, prop, i, call, items) => {
-  if (!items.length)
+  if (!(items == null ? void 0 : items.length))
+    return;
+  const existing = parseReferencesArgs(context, call.arguments);
+  if (!existing)
     return;
-  const { arguments: args } = call;
+  for (const item of items) {
+    if (compareReferences(existing, item.references))
+      removeProp(context, prop, i);
+  }
+};
+const parseReferencesArgs = (context, args) => {
   const columns = collectStringArrayFromCode(args[0]);
   if (!columns)
     return;
@@ -2194,14 +2223,83 @@ const dropMatchingForeignKey = (context, prop, i, call, items) => {
   if (!foreignColumns)
     return;
   const options = ts.is.objectLiteral(args[3]) && collectObjectFromCode(args[3]) || {};
-  for (const item of items) {
-    const itemOptions = item.options;
+  return { columns, fnOrTable, foreignColumns, options };
+};
+const compareReferences = (existing, item) => {
+  if (!item)
+    return;
+  const itemOptions = item.options ? __spreadValues$2({}, item.options) : void 0;
+  if (itemOptions) {
     delete itemOptions.dropMode;
-    if (deepCompare(columns, item.columns) && deepCompare(fnOrTable, item.fnOrTable.toString()) && deepCompare(foreignColumns, item.foreignColumns) && deepCompare(options, itemOptions)) {
+  }
+  return deepCompare(existing == null ? void 0 : existing.columns, item == null ? void 0 : item.columns) && deepCompare(existing == null ? void 0 : existing.fnOrTable, item == null ? void 0 : item.fnOrTable.toString()) && deepCompare(existing == null ? void 0 : existing.foreignColumns, item == null ? void 0 : item.foreignColumns) && deepCompare(existing == null ? void 0 : existing.options, itemOptions);
+};
+const dropMatchingCheck = (context, prop, i, call, items) => {
+  if (!(items == null ? void 0 : items.length))
+    return;
+  const sql = parseCheckArg(context, call.arguments[0]);
+  for (const item of items) {
+    const { check } = item;
+    if (!check)
+      continue;
+    if (check.__raw === sql) {
       removeProp(context, prop, i);
     }
   }
 };
+const parseCheckArg = (context, arg) => {
+  if (!arg || !ts.is.call(arg))
+    return;
+  const { expression } = arg;
+  if (!ts.is.propertyAccess(expression) || !ts.is.identifier(expression.expression) || expression.expression.escapedText !== context.t || expression.name.escapedText !== "raw")
+    return;
+  const [sqlArg] = arg.arguments;
+  if (!sqlArg || !ts.is.stringLiteral(sqlArg))
+    return;
+  return sqlArg.text;
+};
+const dropMatchingConstraint = (context, prop, i, call, items) => {
+  var _a;
+  if (!(items == null ? void 0 : items.length))
+    return;
+  const {
+    arguments: [arg]
+  } = call;
+  if (!arg || !ts.is.objectLiteral(arg))
+    return;
+  const existing = {};
+  for (const prop2 of arg.properties) {
+    if (!ts.is.propertyAssignment(prop2))
+      return;
+    const name = ts.prop.getName(prop2);
+    if (!name)
+      return;
+    const init = prop2.initializer;
+    if (name === "name") {
+      if (!ts.is.stringLiteral(init))
+        return;
+      existing.name = init.text;
+    } else if (name === "references") {
+      if (!ts.is.arrayLiteral(init))
+        return;
+      const refs = parseReferencesArgs(context, init.elements);
+      if (!refs)
+        return;
+      existing.references = refs;
+    } else if (name === "check") {
+      existing.check = parseCheckArg(context, init);
+    }
+  }
+  for (const item of items) {
+    if (existing.name !== item.name)
+      continue;
+    if (existing.check !== ((_a = item.check) == null ? void 0 : _a.__raw))
+      continue;
+    if ((existing.references || item.references) && !compareReferences(existing.references, item.references))
+      continue;
+    removeProp(context, prop, i);
+  }
+};
 const collectStringArrayFromCode = (node) => {
   if (!ts.is.arrayLiteral(node))
     return;
@@ -2228,8 +2326,15 @@ const collectObjectFromCode = (node) => {
   return object;
 };
 const deepCompare = (a, b) => {
-  if (typeof a !== typeof b)
-    return false;
+  if (typeof a !== typeof b) {
+    if (a === void 0 && typeof b === "object") {
+      a = orchidCore.emptyObject;
+    } else if (typeof a === "object" && b === void 0) {
+      b = orchidCore.emptyObject;
+    } else {
+      return false;
+    }
+  }
   if (a === b)
     return true;
   if (typeof a === "object") {
@@ -2439,6 +2544,14 @@ const appCodeUpdater = ({
 };
 const resolvePath = (basePath, filePath) => path__namespace.isAbsolute(filePath) ? filePath : path__namespace.resolve(basePath, filePath);
 
+Object.defineProperty(exports, 'OrchidOrmError', {
+  enumerable: true,
+  get: function () { return pqb.OrchidOrmError; }
+});
+Object.defineProperty(exports, 'OrchidOrmInternalError', {
+  enumerable: true,
+  get: function () { return pqb.OrchidOrmInternalError; }
+});
 Object.defineProperty(exports, 'columnTypes', {
   enumerable: true,
   get: function () { return pqb.columnTypes; }