orchid-orm 1.4.22 → 1.5.1

package/dist/index.js

@@ -1971,20 +1971,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}(`];
-      pqb.addCode(code, value);
-      pqb.addCode(code, ")");
-      changes.replace(name.pos, item.end, pqb.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,
+          pqb.codeToString(code, spaces + "  ", "  ").trim()
+        );
+        replaced[key] = true;
+        remove = false;
+      }
+    }
+    if (remove) {
       changes.remove(item.expression.expression.end, item.end);
     }
     changedProps[key] = true;
@@ -1993,12 +2005,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}(`];
-      pqb.addCode(code, value);
-      pqb.addCode(code, ")");
-      append += pqb.codeToString(code, "", "  ").trim();
+    const code = getColumnMethodArgs(to, key);
+    if (code) {
+      append += pqb.codeToString(code, spaces + "  ", "  ").trim();
     }
   }
   if (append) {
@@ -2053,15 +2062,22 @@ const getColumnMethodArgs = (to, key) => {
   const value = to[key];
   if (!value)
     return;
+  if (key === "indexes") {
+    return pqb.columnIndexesToCode(value);
+  }
+  if (key === "foreignKeys") {
+    return pqb.columnForeignKeysToCode(value);
+  }
+  const code = [`.${key}(`];
   if (key === "collate" || key === "compression") {
-    return pqb.singleQuote(value);
+    pqb.addCode(code, pqb.singleQuote(value));
   } else if (key === "default") {
-    return pqb.columnDefaultArgumentToCode(value);
-  } else if (key === "nullable" || key === "primaryKey") {
-    return "";
-  } else {
+    pqb.addCode(code, pqb.columnDefaultArgumentToCode(value));
+  } else if (key !== "nullable" && key !== "primaryKey") {
     return;
   }
+  pqb.addCode(code, ")");
+  return code;
 };
 const dropMatchingIndexes = (context, prop, i, call, items) => {
   if (!items.length)