metal-orm 1.0.62 → 1.0.63

package/dist/index.cjs

@@ -81,6 +81,7 @@ __export(index_exports, {
   aliasRef: () => aliasRef,
   and: () => and,
   arrayAppend: () => arrayAppend,
+  asType: () => asType,
   ascii: () => ascii,
   asin: () => asin,
   atan: () => atan,
@@ -146,6 +147,8 @@ __export(index_exports, {
   eq: () => eq,
   esel: () => esel,
   executeHydrated: () => executeHydrated,
+  executeHydratedPlain: () => executeHydratedPlain,
+  executeHydratedPlainWithContexts: () => executeHydratedPlainWithContexts,
   executeHydratedWithContexts: () => executeHydratedWithContexts,
   executeSchemaSql: () => executeSchemaSql,
   executeSchemaSqlFor: () => executeSchemaSqlFor,
@@ -1103,6 +1106,9 @@ var toTableRef = (table) => ({
   alias: hasAlias(table) ? table.alias : void 0
 });
 
+// src/core/ast/expression.ts
+var asType = (expr) => expr;
+
 // src/core/functions/function-registry.ts
 var FunctionRegistry = class {
   renderers = /* @__PURE__ */ new Map();
@@ -3716,10 +3722,9 @@ var HydrationPlanner = class _HydrationPlanner {
     const rootCols = new Set(currentPlan.rootColumns);
     let changed = false;
     columns.forEach((node) => {
-      if (node.type !== "Column") return;
-      if (node.table !== this.table.name) return;
-      const alias = node.alias || node.name;
-      if (isRelationAlias(alias)) return;
+      const alias = node.type === "Column" ? node.alias || node.name : node.alias;
+      if (!alias || isRelationAlias(alias)) return;
+      if (node.type === "Column" && node.table !== this.table.name) return;
       if (!rootCols.has(alias)) {
         rootCols.add(alias);
         changed = true;
@@ -6185,9 +6190,22 @@ var executeWithContexts = async (execCtx, entityCtx, qb) => {
   await loadLazyRelationsForTable(entityCtx, qb.getTable(), lazyRelations, lazyRelationOptions);
   return entities;
 };
+var executePlainWithContexts = async (execCtx, qb) => {
+  const ast = qb.getAST();
+  const compiled = execCtx.dialect.compileSelect(ast);
+  const executed = await execCtx.interceptors.run({ sql: compiled.sql, params: compiled.params }, execCtx.executor);
+  const rows = flattenResults(executed);
+  if (ast.setOps && ast.setOps.length > 0) {
+    return rows;
+  }
+  return hydrateRows(rows, qb.getHydrationPlan());
+};
 async function executeHydrated(session, qb) {
   return executeWithContexts(session.getExecutionContext(), session, qb);
 }
+async function executeHydratedPlain(session, qb) {
+  return executePlainWithContexts(session.getExecutionContext(), qb);
+}
 async function executeHydratedWithContexts(execCtx, hydCtx, qb) {
   const entityCtx = hydCtx.entityContext;
   if (!entityCtx) {
@@ -6195,6 +6213,9 @@ async function executeHydratedWithContexts(execCtx, hydCtx, qb) {
   }
   return executeWithContexts(execCtx, entityCtx, qb);
 }
+async function executeHydratedPlainWithContexts(execCtx, qb) {
+  return executePlainWithContexts(execCtx, qb);
+}
 var loadLazyRelationsForTable = async (ctx, table, lazyRelations, lazyRelationOptions) => {
   if (!lazyRelations.length) return;
   const tracked = ctx.getEntitiesForTable(table);
@@ -6328,8 +6349,11 @@ var DefaultEntityMaterializer = class {
     this.strategy = strategy;
   }
   materialize(ctor, row) {
+    if (hasEntityMeta(row)) {
+      return this.materializeEntityProxy(ctor, row);
+    }
     const instance = this.strategy.materialize(ctor, row);
-    this.materializeRelations(instance, ctor);
+    this.materializeRelations(instance);
     return instance;
   }
   materializeMany(ctor, rows) {
@@ -6338,9 +6362,9 @@ var DefaultEntityMaterializer = class {
   /**
    * Recursively materializes nested relation data.
    */
-  materializeRelations(instance, _ctor) {
+  materializeRelations(instance) {
     rebuildRegistry();
-    for (const [key, value] of Object.entries(instance)) {
+    for (const value of Object.values(instance)) {
       if (value === null || value === void 0) continue;
       if (typeof value === "object" && !Array.isArray(value)) {
         const nested = value;
@@ -6362,6 +6386,17 @@ var DefaultEntityMaterializer = class {
       (k) => k.endsWith("Id") || k === "createdAt" || k === "updatedAt"
     );
   }
+  materializeEntityProxy(ctor, row) {
+    const proxy = row;
+    const baseline = this.strategy.materialize(ctor, {});
+    for (const key of Object.keys(baseline)) {
+      if (!Object.prototype.hasOwnProperty.call(proxy, key)) {
+        proxy[key] = baseline[key];
+      }
+    }
+    Object.setPrototypeOf(proxy, ctor.prototype);
+    return proxy;
+  }
 };
 var materializeAs = (ctor, results) => {
   const materializer = new DefaultEntityMaterializer();
@@ -6871,7 +6906,9 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
   select(...args) {
     if (args.length === 1 && typeof args[0] === "object" && args[0] !== null && typeof args[0] !== "string") {
       const columns = args[0];
-      return this.clone(this.projectionFacet.select(this.context, columns));
+      return this.clone(
+        this.projectionFacet.select(this.context, columns)
+      );
     }
     const cols = args;
     const selection = {};
@@ -6882,7 +6919,9 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
       }
       selection[key] = col2;
     }
-    return this.clone(this.projectionFacet.select(this.context, selection));
+    return this.clone(
+      this.projectionFacet.select(this.context, selection)
+    );
   }
   /**
    * Selects raw column expressions
@@ -6986,7 +7025,9 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    */
   selectSubquery(alias, sub2) {
     const query = resolveSelectQuery(sub2);
-    return this.clone(this.projectionFacet.selectSubquery(this.context, alias, query));
+    return this.clone(
+      this.projectionFacet.selectSubquery(this.context, alias, query)
+    );
   }
   /**
    * Adds a JOIN against a derived table (subquery with alias)
@@ -7219,7 +7260,8 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
   ensureDefaultSelection() {
     const columns = this.context.state.ast.columns;
     if (!columns || columns.length === 0) {
-      return this.select(...Object.keys(this.env.table.columns));
+      const columnKeys = Object.keys(this.env.table.columns);
+      return this.select(...columnKeys);
     }
     return this;
   }
@@ -7255,7 +7297,8 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    */
   async executePlain(ctx) {
     const builder = this.ensureDefaultSelection();
-    return executeHydrated(ctx, builder);
+    const rows = await executeHydratedPlain(ctx, builder);
+    return rows;
   }
   /**
    * Executes the query and returns results as real class instances.
@@ -13011,6 +13054,7 @@ function createPooledExecutorFactory(opts) {
   aliasRef,
   and,
   arrayAppend,
+  asType,
   ascii,
   asin,
   atan,
@@ -13076,6 +13120,8 @@ function createPooledExecutorFactory(opts) {
   eq,
   esel,
   executeHydrated,
+  executeHydratedPlain,
+  executeHydratedPlainWithContexts,
   executeHydratedWithContexts,
   executeSchemaSql,
   executeSchemaSqlFor,