rado 1.0.0-preview.2 → 1.0.0-preview.3

package/dist/core/Selection.js

@@ -3,45 +3,38 @@ import {
   getField,
   getSql,
   hasField,
-  hasSql,
   internalSql
 } from "./Internal.js";
 import { sql } from "./Sql.js";
 import { virtual } from "./Virtual.js";
-var Selection = class {
-  #input;
-  #nullable;
-  constructor(input, nullable) {
-    this.#input = input;
-    this.#nullable = nullable;
+var SqlColumn = class {
+  constructor(sql2, targetName) {
+    this.sql = sql2;
+    this.targetName = targetName;
   }
-  makeVirtual(name) {
-    return virtual(name, this.#input);
+  result(ctx) {
+    const value = ctx.values[ctx.index++];
+    if (value === null)
+      return value;
+    return this.sql.mapFromDriverValue?.(value) ?? value;
   }
-  mapRow = (values) => {
-    return this.#mapResult(this.#input, values);
-  };
-  get [internalSql]() {
-    return this.#selectionToSql(this.#input, /* @__PURE__ */ new Set());
+};
+var ObjectColumn = class {
+  constructor(nullable, entries) {
+    this.nullable = nullable;
+    this.entries = entries;
   }
-  #mapResult(input, values) {
-    const expr = this.#exprOf(input);
-    if (expr) {
-      const value = values.shift();
-      if (value !== null && expr.mapFromDriverValue)
-        return expr.mapFromDriverValue(value);
-      return value;
-    }
+  result(ctx) {
     const result = {};
-    let isNullable = this.#nullable.size > 0;
-    for (const name in input) {
-      const expr2 = input[name];
-      const value = this.#mapResult(expr2, values);
+    let isNullable = this.nullable.size > 0;
+    for (const entry of this.entries) {
+      const name = entry[0];
+      const col = entry[1];
+      const value = col.result(ctx);
       result[name] = value;
       if (isNullable) {
         if (value === null) {
-          const field = getField(expr2);
-          if (field && !this.#nullable.has(field.targetName))
+          if (col.targetName && !this.nullable.has(col.targetName))
             isNullable = false;
         } else {
           isNullable = false;
@@ -52,8 +45,37 @@ var Selection = class {
       return null;
     return result;
   }
+};
+var Selection = class {
+  #input;
+  #root;
+  constructor(input, nullable) {
+    this.#input = input;
+    this.#root = this.#defineColumn(nullable, input);
+  }
+  makeVirtual(name) {
+    return virtual(name, this.#input);
+  }
+  #defineColumn(nullable, input) {
+    const expr = getSql(input);
+    if (expr)
+      return new SqlColumn(expr, getField(input)?.targetName);
+    return new ObjectColumn(
+      nullable,
+      Object.entries(input).map(([name, value]) => [
+        name,
+        this.#defineColumn(nullable, value)
+      ])
+    );
+  }
+  mapRow = (values) => {
+    return this.#root.result({ values, index: 0 });
+  };
+  get [internalSql]() {
+    return this.#selectionToSql(this.#input, /* @__PURE__ */ new Set());
+  }
   #selectionToSql(input, names, name) {
-    const expr = this.#exprOf(input);
+    const expr = getSql(input);
     if (expr) {
       let exprName = name ?? expr.alias;
       if (exprName) {
@@ -76,9 +98,6 @@ var Selection = class {
       sql`, `
     );
   }
-  #exprOf(input) {
-    return hasSql(input) ? getSql(input) : void 0;
-  }
 };
 function selection(input, nullable = /* @__PURE__ */ new Set()) {
   return new Selection(input, nullable);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "1.0.0-preview.2",
+  "version": "1.0.0-preview.3",
   "license": "MIT",
   "type": "module",
   "scripts": {