orchid-orm 1.4.22 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # orchid-orm
 
+## 1.5.0
+
+### Minor Changes
+
+- Change index options: column or expression is required, operator renamed to opclass
+
+### Patch Changes
+
+- f1cd5db: Handle multiple indexes and foreignKeys of the column
+- Updated dependencies
+- Updated dependencies [f1cd5db]
+  - pqb@0.9.0
+
 ## 1.4.22
 
 ### Patch Changes

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, columnTypes, getClonedQueryData, singleQuote, columnsShapeToCode, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, columnDefaultArgumentToCode } from 'pqb';
+import { getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, columnTypes, getClonedQueryData, singleQuote, columnsShapeToCode, codeToString, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, columnIndexesToCode, columnForeignKeysToCode, addCode, columnDefaultArgumentToCode } from 'pqb';
 import * as path from 'path';
 import path__default from 'path';
 import fs from 'fs/promises';
@@ -1944,20 +1944,32 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
     }
   }
   const changedProps = {};
+  const replaced = {};
   for (const item of items.reverse()) {
     if (!ts.is.propertyAccess(item.expression))
       continue;
     const { name } = item.expression;
-    const key = name.escapedText.toString();
+    let key = name.escapedText.toString();
+    if (key === "index")
+      key = "indexes";
+    else if (key === "foreignKey")
+      key = "foreignKeys";
     if (!propsToChange[key])
       continue;
-    const value = getColumnMethodArgs(to, key);
-    if (value) {
-      const code = [`${key}(`];
-      addCode(code, value);
-      addCode(code, ")");
-      changes.replace(name.pos, item.end, codeToString(code, "", "  ").trim());
-    } else {
+    let remove = true;
+    if (!replaced[key]) {
+      const code = getColumnMethodArgs(to, key);
+      if (code) {
+        changes.replace(
+          item.expression.expression.end,
+          item.end,
+          codeToString(code, spaces + "  ", "  ").trim()
+        );
+        replaced[key] = true;
+        remove = false;
+      }
+    }
+    if (remove) {
       changes.remove(item.expression.expression.end, item.end);
     }
     changedProps[key] = true;
@@ -1966,12 +1978,9 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
   for (const key in propsToChange) {
     if (changedProps[key])
       continue;
-    const value = getColumnMethodArgs(to, key);
-    if (value !== void 0) {
-      const code = [`.${key}(`];
-      addCode(code, value);
-      addCode(code, ")");
-      append += codeToString(code, "", "  ").trim();
+    const code = getColumnMethodArgs(to, key);
+    if (code) {
+      append += codeToString(code, spaces + "  ", "  ").trim();
     }
   }
   if (append) {
@@ -2026,15 +2035,22 @@ const getColumnMethodArgs = (to, key) => {
   const value = to[key];
   if (!value)
     return;
+  if (key === "indexes") {
+    return columnIndexesToCode(value);
+  }
+  if (key === "foreignKeys") {
+    return columnForeignKeysToCode(value);
+  }
+  const code = [`.${key}(`];
   if (key === "collate" || key === "compression") {
-    return singleQuote(value);
+    addCode(code, singleQuote(value));
   } else if (key === "default") {
-    return columnDefaultArgumentToCode(value);
-  } else if (key === "nullable" || key === "primaryKey") {
-    return "";
-  } else {
+    addCode(code, columnDefaultArgumentToCode(value));
+  } else if (key !== "nullable" && key !== "primaryKey") {
     return;
   }
+  addCode(code, ")");
+  return code;
 };
 const dropMatchingIndexes = (context, prop, i, call, items) => {
   if (!items.length)