metal-orm 1.0.83 → 1.0.85

package/dist/index.d.cts

@@ -2392,6 +2392,7 @@ declare class QueryAstService {
      * @returns Normalized ordering term
      */
     private normalizeOrderingTerm;
+    private toParamNode;
 }
 
 /**

package/dist/index.d.ts

@@ -2392,6 +2392,7 @@ declare class QueryAstService {
      * @returns Normalized ordering term
      */
     private normalizeOrderingTerm;
+    private toParamNode;
 }
 
 /**

package/dist/index.js

@@ -371,16 +371,27 @@ var operandTypes = /* @__PURE__ */ new Set([
   "BitwiseExpression",
   "Collate"
 ]);
-var hasTypeProperty = (value) => typeof value === "object" && value !== null && "type" in value;
+var getNodeType = (value) => {
+  if (typeof value !== "object" || value === null) return void 0;
+  const descriptor = Object.getOwnPropertyDescriptor(value, "type");
+  if (descriptor && typeof descriptor.value === "string") {
+    return descriptor.value;
+  }
+  if ("type" in value) {
+    const type = value.type;
+    return typeof type === "string" ? type : void 0;
+  }
+  return void 0;
+};
 var isOperandNode = (node) => {
-  if (!hasTypeProperty(node)) return false;
-  return operandTypes.has(node.type);
-};
-var isFunctionNode = (node) => isOperandNode(node) && node.type === "Function";
-var isCaseExpressionNode = (node) => isOperandNode(node) && node.type === "CaseExpression";
-var isCastExpressionNode = (node) => isOperandNode(node) && node.type === "Cast";
-var isCollateExpressionNode = (node) => isOperandNode(node) && node.type === "Collate";
-var isWindowFunctionNode = (node) => isOperandNode(node) && node.type === "WindowFunction";
+  const type = getNodeType(node);
+  return type !== void 0 && operandTypes.has(type);
+};
+var isFunctionNode = (node) => isOperandNode(node) && getNodeType(node) === "Function";
+var isCaseExpressionNode = (node) => isOperandNode(node) && getNodeType(node) === "CaseExpression";
+var isCastExpressionNode = (node) => isOperandNode(node) && getNodeType(node) === "Cast";
+var isCollateExpressionNode = (node) => isOperandNode(node) && getNodeType(node) === "Collate";
+var isWindowFunctionNode = (node) => isOperandNode(node) && getNodeType(node) === "WindowFunction";
 var isExpressionSelectionNode = (node) => isFunctionNode(node) || isCaseExpressionNode(node) || isCastExpressionNode(node) || isWindowFunctionNode(node);
 
 // src/core/ast/expression-builders.ts
@@ -765,17 +776,26 @@ var clearExpressionDispatchers = () => {
 var clearOperandDispatchers = () => {
   operandRegistry = operandRegistry.clear();
 };
-var getNodeType = (node) => typeof node === "object" && node !== null && typeof node.type === "string" ? node.type : void 0;
+var getNodeType2 = (node) => {
+  if (typeof node !== "object" || node === null) return void 0;
+  const descriptor = Object.getOwnPropertyDescriptor(node, "type");
+  if (descriptor && typeof descriptor.value === "string") {
+    return descriptor.value;
+  }
+  const type = node.type;
+  return typeof type === "string" ? type : void 0;
+};
 var unsupportedExpression = (node) => {
-  throw new Error(`Unsupported expression type "${getNodeType(node) ?? "unknown"}"`);
+  throw new Error(`Unsupported expression type "${getNodeType2(node) ?? "unknown"}"`);
 };
 var unsupportedOperand = (node) => {
-  throw new Error(`Unsupported operand type "${getNodeType(node) ?? "unknown"}"`);
+  throw new Error(`Unsupported operand type "${getNodeType2(node) ?? "unknown"}"`);
 };
 var visitExpression = (node, visitor) => {
-  const dynamic = expressionRegistry.get(node.type);
+  const type = getNodeType2(node);
+  const dynamic = type ? expressionRegistry.get(type) : void 0;
   if (dynamic) return dynamic(node, visitor);
-  switch (node.type) {
+  switch (type) {
     case "BinaryExpression":
       if (visitor.visitBinaryExpression) return visitor.visitBinaryExpression(node);
       break;
@@ -807,9 +827,10 @@ var visitExpression = (node, visitor) => {
   return unsupportedExpression(node);
 };
 var visitOperand = (node, visitor) => {
-  const dynamic = operandRegistry.get(node.type);
+  const type = getNodeType2(node);
+  const dynamic = type ? operandRegistry.get(type) : void 0;
   if (dynamic) return dynamic(node, visitor);
-  switch (node.type) {
+  switch (type) {
     case "Column":
       if (visitor.visitColumn) return visitor.visitColumn(node);
       break;
@@ -1538,9 +1559,11 @@ var Dialect = class _Dialect {
    * @returns Compiled SQL operand
    */
   compileOperand(node, ctx) {
-    const compiler = this.operandCompilers.get(node.type);
+    const descriptor = Object.getOwnPropertyDescriptor(node, "type");
+    const nodeType = typeof descriptor?.value === "string" ? descriptor.value : typeof node.type === "string" ? node.type : void 0;
+    const compiler = nodeType ? this.operandCompilers.get(nodeType) : void 0;
     if (!compiler) {
-      throw new Error(`Unsupported operand node type "${node.type}" for ${this.constructor.name}`);
+      throw new Error(`Unsupported operand node type "${nodeType ?? "unknown"}" for ${this.constructor.name}`);
     }
     return compiler(node, ctx);
   }
@@ -3861,6 +3884,10 @@ var QueryAstService = class {
    * @returns Normalized ordering term
    */
   normalizeOrderingTerm(term) {
+    const paramNode = this.toParamNode(term);
+    if (paramNode) {
+      return paramNode;
+    }
     const from = this.state.ast.from;
     const tableRef2 = from.type === "Table" && from.alias ? { ...this.table, alias: from.alias } : this.table;
     const termType = term.type;
@@ -3878,6 +3905,14 @@ var QueryAstService = class {
     }
     return buildColumnNode(tableRef2, term);
   }
+  toParamNode(value) {
+    if (typeof value !== "object" || value === null) return void 0;
+    const type = Object.getOwnPropertyDescriptor(value, "type")?.value;
+    if (type !== "Param") return void 0;
+    const name = Object.getOwnPropertyDescriptor(value, "name")?.value;
+    if (typeof name !== "string") return void 0;
+    return { type: "Param", name };
+  }
 };
 
 // src/query-builder/relation-projection-helper.ts
@@ -7332,7 +7367,7 @@ var collectFilterColumns = (expr, table, rootTables) => {
       columns.add(node.name);
     }
   };
-  const visitOrderingTerm = (term) => {
+  const visitOrderingTerm2 = (term) => {
     if (!term || typeof term !== "object") return;
     if (isOperandNode(term)) {
       visitOperand2(term);
@@ -7344,7 +7379,7 @@ var collectFilterColumns = (expr, table, rootTables) => {
   };
   const visitOrderBy = (orderBy) => {
     if (!orderBy) return;
-    orderBy.forEach((node) => visitOrderingTerm(node.term));
+    orderBy.forEach((node) => visitOrderingTerm2(node.term));
   };
   const visitOperand2 = (node) => {
     switch (node.type) {
@@ -7483,225 +7518,196 @@ var buildFilterParameters = (table, where, from, options = {}) => {
   }];
 };
 
-// src/core/ast/ast-validation.ts
-var hasParamOperandsInExpression = (expr) => {
-  let hasParams = false;
-  visitExpression(expr, {
-    visitBinaryExpression: (node) => {
-      visitOperand(node.left, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-      visitOperand(node.right, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
+// src/core/ast/query-visitor.ts
+var getNodeType3 = (value) => {
+  if (typeof value !== "object" || value === null) return void 0;
+  const descriptor = Object.getOwnPropertyDescriptor(value, "type");
+  if (descriptor && typeof descriptor.value === "string") {
+    return descriptor.value;
+  }
+  if ("type" in value) {
+    const type = value.type;
+    return typeof type === "string" ? type : void 0;
+  }
+  return void 0;
+};
+var visitOrderingTerm = (term, visitor) => {
+  if (isOperandNode(term)) {
+    visitOperandNode(term, visitor);
+    return;
+  }
+  visitExpressionNode(term, visitor);
+};
+var visitOrderByNode = (node, visitor) => {
+  visitor.visitOrderBy?.(node);
+  visitOrderingTerm(node.term, visitor);
+};
+var visitTableSource = (source, visitor) => {
+  visitor.visitTableSource?.(source);
+  if (source.type === "DerivedTable") {
+    visitor.visitDerivedTable?.(source);
+    visitSelectQuery(source.query, visitor);
+    return;
+  }
+  if (source.type === "FunctionTable") {
+    visitor.visitFunctionTable?.(source);
+    source.args?.forEach((arg) => visitOperandNode(arg, visitor));
+  }
+};
+var visitExpressionNode = (node, visitor) => {
+  visitor.visitExpression?.(node);
+  const type = getNodeType3(node);
+  if (!type) return;
+  switch (type) {
+    case "BinaryExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.right, visitor);
       if (node.escape) {
-        visitOperand(node.escape, {
-          visitParam: () => {
-            hasParams = true;
-          },
-          otherwise: () => {
-          }
-        });
+        visitOperandNode(node.escape, visitor);
       }
-    },
-    visitLogicalExpression: (node) => {
-      node.operands.forEach((operand) => {
-        if (hasParamOperandsInExpression(operand)) {
-          hasParams = true;
-        }
-      });
-    },
-    visitNullExpression: () => {
-    },
-    visitInExpression: (node) => {
-      visitOperand(node.left, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
+      return;
+    case "LogicalExpression":
+      node.operands.forEach((operand) => visitExpressionNode(operand, visitor));
+      return;
+    case "NullExpression":
+      visitOperandNode(node.left, visitor);
+      return;
+    case "InExpression":
+      visitOperandNode(node.left, visitor);
       if (Array.isArray(node.right)) {
-        node.right.forEach((operand) => visitOperand(operand, {
-          visitParam: () => {
-            hasParams = true;
-          },
-          otherwise: () => {
-          }
-        }));
+        node.right.forEach((operand) => visitOperandNode(operand, visitor));
+      } else {
+        visitOperandNode(node.right, visitor);
       }
-    },
-    visitExistsExpression: () => {
-    },
-    visitBetweenExpression: (node) => {
-      visitOperand(node.left, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-      visitOperand(node.lower, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-      visitOperand(node.upper, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-    },
-    visitArithmeticExpression: (node) => {
-      visitOperand(node.left, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-      visitOperand(node.right, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-    },
-    visitBitwiseExpression: (node) => {
-      visitOperand(node.left, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-      visitOperand(node.right, {
-        visitParam: () => {
-          hasParams = true;
-        },
-        otherwise: () => {
-        }
-      });
-    },
-    otherwise: () => {
+      return;
+    case "ExistsExpression":
+      visitSelectQuery(node.subquery, visitor);
+      return;
+    case "BetweenExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.lower, visitor);
+      visitOperandNode(node.upper, visitor);
+      return;
+    case "ArithmeticExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.right, visitor);
+      return;
+    case "BitwiseExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.right, visitor);
+      return;
+    default: {
+      return;
     }
-  });
-  return hasParams;
+  }
 };
-var hasParamOperandsInOperand = (operand) => {
-  let hasParams = false;
-  visitOperand(operand, {
-    visitColumn: () => {
-    },
-    visitLiteral: () => {
-    },
-    visitParam: () => {
-      hasParams = true;
-    },
-    visitFunction: (node) => {
-      node.args?.forEach((arg) => {
-        if (hasParamOperandsInOperand(arg)) {
-          hasParams = true;
-        }
-      });
-    },
-    visitJsonPath: () => {
-    },
-    visitScalarSubquery: () => {
-    },
-    visitCaseExpression: (node) => {
-      node.conditions.forEach((cond) => {
-        if (hasParamOperandsInExpression(cond.when)) {
-          hasParams = true;
-        }
-        if (hasParamOperandsInOperand(cond.then)) {
-          hasParams = true;
-        }
-      });
-      if (node.else && hasParamOperandsInOperand(node.else)) {
-        hasParams = true;
-      }
-    },
-    visitCast: (node) => {
-      if (hasParamOperandsInOperand(node.expression)) {
-        hasParams = true;
+var visitOperandNode = (node, visitor) => {
+  visitor.visitOperand?.(node);
+  const type = getNodeType3(node);
+  if (type === "Param") {
+    visitor.visitParam?.(node);
+  }
+  if (!type) return;
+  switch (type) {
+    case "Column":
+    case "Literal":
+    case "Param":
+    case "AliasRef":
+      return;
+    case "Function":
+      node.args?.forEach((arg) => visitOperandNode(arg, visitor));
+      node.orderBy?.forEach((order) => visitOrderByNode(order, visitor));
+      if (node.separator) {
+        visitOperandNode(node.separator, visitor);
       }
-    },
-    visitWindowFunction: (node) => {
-      node.args?.forEach((arg) => {
-        if (hasParamOperandsInOperand(arg)) {
-          hasParams = true;
-        }
-      });
-      node.orderBy?.forEach((ord) => {
-        if (ord.term) {
-          if (hasParamOperandsInOperand(ord.term)) {
-            hasParams = true;
-          }
-        }
+      return;
+    case "JsonPath":
+      visitOperandNode(node.column, visitor);
+      return;
+    case "ScalarSubquery":
+      visitSelectQuery(node.query, visitor);
+      return;
+    case "CaseExpression":
+      node.conditions.forEach((cond) => {
+        visitExpressionNode(cond.when, visitor);
+        visitOperandNode(cond.then, visitor);
       });
-    },
-    visitCollate: (node) => {
-      if (hasParamOperandsInOperand(node.expression)) {
-        hasParams = true;
+      if (node.else) {
+        visitOperandNode(node.else, visitor);
       }
-    },
-    visitAliasRef: () => {
-    },
-    otherwise: () => {
+      return;
+    case "Cast":
+      visitOperandNode(node.expression, visitor);
+      return;
+    case "WindowFunction":
+      node.args?.forEach((arg) => visitOperandNode(arg, visitor));
+      node.partitionBy?.forEach((term) => visitOperandNode(term, visitor));
+      node.orderBy?.forEach((order) => visitOrderByNode(order, visitor));
+      return;
+    case "ArithmeticExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.right, visitor);
+      return;
+    case "BitwiseExpression":
+      visitOperandNode(node.left, visitor);
+      visitOperandNode(node.right, visitor);
+      return;
+    case "Collate":
+      visitOperandNode(node.expression, visitor);
+      return;
+    default: {
+      const _exhaustive = node;
+      return _exhaustive;
     }
-  });
-  return hasParams;
-};
-var hasParamOperandsInQuery = (ast) => {
-  if (ast.where && hasParamOperandsInExpression(ast.where)) {
-    return true;
   }
-  if (ast.having && hasParamOperandsInExpression(ast.having)) {
-    return true;
+};
+var visitSelectQuery = (ast, visitor) => {
+  visitor.visitSelectQuery?.(ast);
+  if (ast.ctes) {
+    for (const cte of ast.ctes) {
+      visitor.visitCte?.(cte);
+      visitSelectQuery(cte.query, visitor);
+    }
   }
+  visitTableSource(ast.from, visitor);
   ast.columns?.forEach((col2) => {
-    if (typeof col2 === "object" && col2 !== null && "type" in col2) {
-      if (hasParamOperandsInOperand(col2)) {
-        return true;
-      }
-    }
+    visitOperandNode(col2, visitor);
   });
-  ast.orderBy?.forEach((ord) => {
-    if (ord.term) {
-      if (hasParamOperandsInOperand(ord.term)) {
-        return true;
-      }
-    }
+  ast.joins?.forEach((join) => {
+    visitor.visitJoin?.(join);
+    visitTableSource(join.table, visitor);
+    visitExpressionNode(join.condition, visitor);
   });
-  if (ast.ctes) {
-    for (const cte of ast.ctes) {
-      if (cte.query.where && hasParamOperandsInExpression(cte.query.where)) {
-        return true;
-      }
-    }
+  if (ast.where) {
+    visitExpressionNode(ast.where, visitor);
   }
-  if (ast.setOps) {
-    for (const op of ast.setOps) {
-      if (hasParamOperandsInQuery(op.query)) {
-        return true;
-      }
-    }
+  ast.groupBy?.forEach((term) => {
+    visitOrderingTerm(term, visitor);
+  });
+  if (ast.having) {
+    visitExpressionNode(ast.having, visitor);
   }
-  return false;
+  ast.orderBy?.forEach((order) => {
+    visitOrderByNode(order, visitor);
+  });
+  ast.distinct?.forEach((col2) => {
+    visitOperandNode(col2, visitor);
+  });
+  ast.setOps?.forEach((op) => {
+    visitor.visitSetOperation?.(op);
+    visitSelectQuery(op.query, visitor);
+  });
+};
+
+// src/core/ast/ast-validation.ts
+var hasParamOperandsInQuery = (ast) => {
+  let hasParams = false;
+  visitSelectQuery(ast, {
+    visitParam: () => {
+      hasParams = true;
+    }
+  });
+  return hasParams;
 };
 
 // src/query-builder/select.ts