cloesce 0.0.5-unstable.3 → 0.0.5-unstable.4

package/dist/router/validator.d.ts

@@ -18,15 +18,10 @@ import { ConstructorRegistry } from "./router";
  * @returns the instantiated value (if applicable). On error, returns null.
  */
 export declare class RuntimeValidator {
-  private ast;
-  private ctorReg;
-  constructor(ast: CloesceAst, ctorReg: ConstructorRegistry);
-  static validate(
-    value: any,
-    cidlType: CidlType,
-    ast: CloesceAst,
-    ctorReg: ConstructorRegistry,
-  ): Either<null, any>;
-  private recurse;
+    private ast;
+    private ctorReg;
+    constructor(ast: CloesceAst, ctorReg: ConstructorRegistry);
+    static validate(value: any, cidlType: CidlType, ast: CloesceAst, ctorReg: ConstructorRegistry): Either<null, any>;
+    private recurse;
 }
-//# sourceMappingURL=validator.d.ts.map
+//# sourceMappingURL=validator.d.ts.map

package/dist/router/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/router/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EAIX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAW,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;gBADP,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB;IAGtC,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;IAIpB,OAAO,CAAC,OAAO;CA8KhB"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/router/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EAIX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAW,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;gBADP,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB;IAGtC,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;IAIpB,OAAO,CAAC,OAAO;CA+KhB"}

package/dist/router/validator.js

@@ -1,8 +1,4 @@
-import {
-  NO_DATA_SOURCE,
-  getNavigationPropertyCidlType,
-  isNullableType,
-} from "../ast";
+import { NO_DATA_SOURCE, getNavigationPropertyCidlType, isNullableType, } from "../ast";
 import { Either, b64ToU8 } from "../ui/common";
 /**
  * Runtime type validation, asserting that the structure of a value follows the
@@ -21,173 +17,164 @@ import { Either, b64ToU8 } from "../ui/common";
  * @returns the instantiated value (if applicable). On error, returns null.
  */
 export class RuntimeValidator {
-  ast;
-  ctorReg;
-  constructor(ast, ctorReg) {
-    this.ast = ast;
-    this.ctorReg = ctorReg;
-  }
-  static validate(value, cidlType, ast, ctorReg) {
-    return new RuntimeValidator(ast, ctorReg).recurse(value, cidlType, false);
-  }
-  recurse(value, cidlType, isPartial) {
-    isPartial ||= typeof cidlType !== "string" && "Partial" in cidlType;
-    if (value === undefined) {
-      // We will let arrays be undefined and interpret that as an empty array.
-      if (typeof cidlType !== "string" && "Array" in cidlType) {
-        return Either.right([]);
-      }
-      return rightIf(() => value, isPartial === true);
+    ast;
+    ctorReg;
+    constructor(ast, ctorReg) {
+        this.ast = ast;
+        this.ctorReg = ctorReg;
     }
-    // TODO: consequences of null checking like this? 'null' is passed in
-    // as a string for GET requests
-    const nullable = isNullableType(cidlType);
-    if (value == null || value === "null") {
-      return rightIf(() => null, nullable);
+    static validate(value, cidlType, ast, ctorReg) {
+        return new RuntimeValidator(ast, ctorReg).recurse(value, cidlType, false);
     }
-    // Unwrap nullable types
-    if (nullable) {
-      cidlType = cidlType.Nullable;
-    }
-    // Primitives
-    if (typeof cidlType === "string") {
-      switch (cidlType) {
-        case "Integer":
-          return rightIf(() => Number(value), Number.isInteger(Number(value)));
-        case "Real":
-          return rightIf(() => Number(value), !Number.isNaN(Number(value)));
-        case "Text":
-          return rightIf(() => String(value), typeof value === "string");
-        case "Boolean": {
-          if (typeof value === "boolean") return Either.right(value);
-          if (value === "true") return Either.right(true);
-          if (value === "false") return Either.right(false);
-          return Either.left(null);
+    recurse(value, cidlType, isPartial) {
+        isPartial ||= typeof cidlType !== "string" && "Partial" in cidlType;
+        if (value === undefined) {
+            // We will let arrays be undefined and interpret that as an empty array.
+            if (typeof cidlType !== "string" && "Array" in cidlType) {
+                return Either.right([]);
+            }
+            return rightIf(() => value, isPartial === true);
         }
-        case "DateIso": {
-          // Instantiate
-          const date = new Date(value);
-          return rightIf(() => date, !isNaN(date.getTime()));
+        // TODO: consequences of null checking like this? 'null' is passed in
+        // as a string for GET requests
+        const nullable = isNullableType(cidlType);
+        if (value == null || value === "null") {
+            // NOTE: Partial types are always nullable.
+            return rightIf(() => null, nullable || isPartial);
         }
-        case "Blob": {
-          // Instantiate
-          return Either.right(b64ToU8(value));
+        // Unwrap nullable types
+        if (nullable) {
+            cidlType = cidlType.Nullable;
         }
-        default:
-          return Either.left(null);
-      }
-    }
-    // Data Sources
-    if ("DataSource" in cidlType) {
-      const objectName = cidlType.DataSource;
-      return rightIf(
-        () => value,
-        typeof value === "string" &&
-          (value === NO_DATA_SOURCE ||
-            this.ast.models[objectName]?.data_sources[value] !== undefined),
-      );
-    }
-    const objName = getObjectName(cidlType);
-    // Models
-    if (objName && this.ast.models[objName]) {
-      const model = this.ast.models[objName];
-      if (!model || typeof value !== "object") return Either.left(null);
-      const valueObj = value;
-      // Validate + instantiate PK
-      {
-        const pk = model.primary_key;
-        const res = this.recurse(valueObj[pk.name], pk.cidl_type, isPartial);
-        if (res.isLeft()) {
-          return res;
+        // Primitives
+        if (typeof cidlType === "string") {
+            switch (cidlType) {
+                case "Integer":
+                    return rightIf(() => Number(value), Number.isInteger(Number(value)));
+                case "Real":
+                    return rightIf(() => Number(value), !Number.isNaN(Number(value)));
+                case "Text":
+                    return rightIf(() => String(value), typeof value === "string");
+                case "Boolean": {
+                    if (typeof value === "boolean")
+                        return Either.right(value);
+                    if (value === "true")
+                        return Either.right(true);
+                    if (value === "false")
+                        return Either.right(false);
+                    return Either.left(null);
+                }
+                case "DateIso": {
+                    // Instantiate
+                    const date = new Date(value);
+                    return rightIf(() => date, !isNaN(date.getTime()));
+                }
+                case "Blob": {
+                    // Instantiate
+                    return Either.right(b64ToU8(value));
+                }
+                default:
+                    return Either.left(null);
+            }
         }
-        value[pk.name] = res.unwrap();
-      }
-      // Validate + instantiate attributes
-      for (let i = 0; i < model.attributes.length; i++) {
-        const attr = model.attributes[i];
-        const res = this.recurse(
-          valueObj[attr.value.name],
-          attr.value.cidl_type,
-          isPartial,
-        );
-        if (res.isLeft()) {
-          return res;
+        // Data Sources
+        if ("DataSource" in cidlType) {
+            const objectName = cidlType.DataSource;
+            return rightIf(() => value, typeof value === "string" &&
+                (value === NO_DATA_SOURCE ||
+                    this.ast.models[objectName]?.data_sources[value] !== undefined));
         }
-        value[attr.value.name] = res.unwrap();
-      }
-      // Validate + instantiate navigation properties
-      for (let i = 0; i < model.navigation_properties.length; i++) {
-        const nav = model.navigation_properties[i];
-        const res = this.recurse(
-          valueObj[nav.var_name],
-          getNavigationPropertyCidlType(nav),
-          isPartial,
-        );
-        if (res.isLeft()) {
-          return res;
+        const objName = getObjectName(cidlType);
+        // Models
+        if (objName && this.ast.models[objName]) {
+            const model = this.ast.models[objName];
+            if (!model || typeof value !== "object")
+                return Either.left(null);
+            const valueObj = value;
+            // Validate + instantiate PK
+            {
+                const pk = model.primary_key;
+                const res = this.recurse(valueObj[pk.name], pk.cidl_type, isPartial);
+                if (res.isLeft()) {
+                    return res;
+                }
+                value[pk.name] = res.unwrap();
+            }
+            // Validate + instantiate attributes
+            for (let i = 0; i < model.attributes.length; i++) {
+                const attr = model.attributes[i];
+                const res = this.recurse(valueObj[attr.value.name], attr.value.cidl_type, isPartial);
+                if (res.isLeft()) {
+                    return res;
+                }
+                value[attr.value.name] = res.unwrap();
+            }
+            // Validate + instantiate navigation properties
+            for (let i = 0; i < model.navigation_properties.length; i++) {
+                const nav = model.navigation_properties[i];
+                const res = this.recurse(valueObj[nav.var_name], getNavigationPropertyCidlType(nav), isPartial);
+                if (res.isLeft()) {
+                    return res;
+                }
+                value[nav.var_name] = res.unwrap();
+            }
+            // Don't instantiate partials
+            if (isPartial) {
+                return Either.right(value);
+            }
+            // Instantiate
+            return Either.right(Object.assign(new this.ctorReg[objName](), value));
         }
-        value[nav.var_name] = res.unwrap();
-      }
-      // Don't instantiate partials
-      if (isPartial) {
-        return Either.right(value);
-      }
-      // Instantiate
-      return Either.right(Object.assign(new this.ctorReg[objName](), value));
-    }
-    // Plain old Objects
-    if (objName && this.ast.poos[objName]) {
-      const poo = this.ast.poos[objName];
-      if (!poo || typeof value !== "object") return Either.left(null);
-      const valueObj = value;
-      // Validate + instantiate attributes
-      for (let i = 0; i < poo.attributes.length; i++) {
-        const attr = poo.attributes[i];
-        const res = this.recurse(
-          valueObj[attr.name],
-          attr.cidl_type,
-          isPartial,
-        );
-        if (res.isLeft()) {
-          return res;
+        // Plain old Objects
+        if (objName && this.ast.poos[objName]) {
+            const poo = this.ast.poos[objName];
+            if (!poo || typeof value !== "object")
+                return Either.left(null);
+            const valueObj = value;
+            // Validate + instantiate attributes
+            for (let i = 0; i < poo.attributes.length; i++) {
+                const attr = poo.attributes[i];
+                const res = this.recurse(valueObj[attr.name], attr.cidl_type, isPartial);
+                if (res.isLeft()) {
+                    return res;
+                }
+                value[attr.name] = res.unwrap();
+            }
+            if (isPartial) {
+                return Either.right(value);
+            }
+            // Instantiate
+            return Either.right(Object.assign(new this.ctorReg[objName](), value));
         }
-        value[attr.name] = res.unwrap();
-      }
-      if (isPartial) {
-        return Either.right(value);
-      }
-      // Instantiate
-      return Either.right(Object.assign(new this.ctorReg[objName](), value));
-    }
-    // Arrays
-    if ("Array" in cidlType) {
-      if (!Array.isArray(value)) {
-        return Either.left(null);
-      }
-      for (let i = 0; i < value.length; i++) {
-        const res = this.recurse(value[i], cidlType.Array, isPartial);
-        if (res.isLeft()) {
-          return res;
+        // Arrays
+        if ("Array" in cidlType) {
+            if (!Array.isArray(value)) {
+                return Either.left(null);
+            }
+            for (let i = 0; i < value.length; i++) {
+                const res = this.recurse(value[i], cidlType.Array, isPartial);
+                if (res.isLeft()) {
+                    return res;
+                }
+                value[i] = res.unwrap();
+            }
+            return Either.right(value);
         }
-        value[i] = res.unwrap();
-      }
-      return Either.right(value);
+        return Either.left(null);
     }
-    return Either.left(null);
-  }
 }
 function getObjectName(ty) {
-  if (typeof ty === "string") {
+    if (typeof ty === "string") {
+        return undefined;
+    }
+    if ("Partial" in ty) {
+        return ty.Partial;
+    }
+    if ("Object" in ty) {
+        return ty.Object;
+    }
     return undefined;
-  }
-  if ("Partial" in ty) {
-    return ty.Partial;
-  }
-  if ("Object" in ty) {
-    return ty.Object;
-  }
-  return undefined;
 }
 function rightIf(value, cond) {
-  return cond ? Either.right(value()) : Either.left(null);
+    return cond ? Either.right(value()) : Either.left(null);
 }

package/dist/router/wasm.d.ts

@@ -5,75 +5,41 @@ import { Either } from "../ui/common.js";
  * WASM ABI
  */
 export interface OrmWasmExports {
-  memory: WebAssembly.Memory;
-  get_return_len(): number;
-  get_return_ptr(): number;
-  set_meta_ptr(ptr: number, len: number): number;
-  alloc(len: number): number;
-  dealloc(ptr: number, len: number): void;
-  map_sql(
-    model_name_ptr: number,
-    model_name_len: number,
-    sql_rows_ptr: number,
-    sql_rows_len: number,
-    include_tree_ptr: number,
-    include_tree_len: number,
-  ): boolean;
-  upsert_model(
-    model_name_ptr: number,
-    model_name_len: number,
-    new_model_ptr: number,
-    new_model_len: number,
-    include_tree_ptr: number,
-    include_tree_len: number,
-  ): boolean;
-  list_models(
-    model_name_ptr: number,
-    model_name_len: number,
-    include_tree_ptr: number,
-    include_tree_len: number,
-    tag_cte_ptr: number,
-    tag_cte_len: number,
-    custom_from_ptr: number,
-    custom_from_len: number,
-  ): boolean;
+    memory: WebAssembly.Memory;
+    get_return_len(): number;
+    get_return_ptr(): number;
+    set_meta_ptr(ptr: number, len: number): number;
+    alloc(len: number): number;
+    dealloc(ptr: number, len: number): void;
+    map_sql(model_name_ptr: number, model_name_len: number, sql_rows_ptr: number, sql_rows_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
+    upsert_model(model_name_ptr: number, model_name_len: number, new_model_ptr: number, new_model_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
+    list_models(model_name_ptr: number, model_name_len: number, include_tree_ptr: number, include_tree_len: number, tag_cte_ptr: number, tag_cte_len: number, custom_from_ptr: number, custom_from_len: number): boolean;
 }
 /**
  * RAII for wasm memory
  */
 export declare class WasmResource {
-  private wasm;
-  ptr: number;
-  len: number;
-  constructor(wasm: OrmWasmExports, ptr: number, len: number);
-  free(): void;
-  /**
-   * Copies a value from TS memory to WASM memory. A subsequent `free` is necessary.
-   */
-  static fromString(str: string, wasm: OrmWasmExports): WasmResource;
+    private wasm;
+    ptr: number;
+    len: number;
+    constructor(wasm: OrmWasmExports, ptr: number, len: number);
+    free(): void;
+    /**
+     * Copies a value from TS memory to WASM memory. A subsequent `free` is necessary.
+     */
+    static fromString(str: string, wasm: OrmWasmExports): WasmResource;
 }
-export declare function loadOrmWasm(
-  ast: CloesceAst,
-  wasm?: WebAssembly.Instance,
-): Promise<OrmWasmExports>;
+export declare function loadOrmWasm(ast: CloesceAst, wasm?: WebAssembly.Instance): Promise<OrmWasmExports>;
 /**
  * Invokes a WASM ORM function with the provided arguments, handling memory
  * allocation and deallocation.
  *
  * Returns an Either where Left is an error message and Right the raw string result.
  */
-export declare function invokeOrmWasm(
-  fn: (...args: number[]) => boolean,
-  args: WasmResource[],
-  wasm: OrmWasmExports,
-): Either<string, string>;
+export declare function invokeOrmWasm(fn: (...args: number[]) => boolean, args: WasmResource[], wasm: OrmWasmExports): Either<string, string>;
 /**
  * Calls the object relational mapping function to turn a row of SQL records into
  * an instantiated object.
  */
-export declare function mapSql<T extends object>(
-  ctor: new () => T,
-  records: Record<string, any>[],
-  includeTree: IncludeTree<T> | CidlIncludeTree | null,
-): Either<string, T[]>;
-//# sourceMappingURL=wasm.d.ts.map
+export declare function mapSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree: IncludeTree<T> | CidlIncludeTree | null): Either<string, T[]>;
+//# sourceMappingURL=wasm.d.ts.map

package/dist/router/wasm.js

@@ -6,42 +6,40 @@ import { Either } from "../ui/common.js";
  * RAII for wasm memory
  */
 export class WasmResource {
-  wasm;
-  ptr;
-  len;
-  constructor(wasm, ptr, len) {
-    this.wasm = wasm;
-    this.ptr = ptr;
-    this.len = len;
-  }
-  free() {
-    this.wasm.dealloc(this.ptr, this.len);
-  }
-  /**
-   * Copies a value from TS memory to WASM memory. A subsequent `free` is necessary.
-   */
-  static fromString(str, wasm) {
-    const encoder = new TextEncoder();
-    const bytes = encoder.encode(str);
-    const ptr = wasm.alloc(bytes.length);
-    const mem = new Uint8Array(wasm.memory.buffer, ptr, bytes.length);
-    mem.set(bytes);
-    return new this(wasm, ptr, bytes.length);
-  }
+    wasm;
+    ptr;
+    len;
+    constructor(wasm, ptr, len) {
+        this.wasm = wasm;
+        this.ptr = ptr;
+        this.len = len;
+    }
+    free() {
+        this.wasm.dealloc(this.ptr, this.len);
+    }
+    /**
+     * Copies a value from TS memory to WASM memory. A subsequent `free` is necessary.
+     */
+    static fromString(str, wasm) {
+        const encoder = new TextEncoder();
+        const bytes = encoder.encode(str);
+        const ptr = wasm.alloc(bytes.length);
+        const mem = new Uint8Array(wasm.memory.buffer, ptr, bytes.length);
+        mem.set(bytes);
+        return new this(wasm, ptr, bytes.length);
+    }
 }
 export async function loadOrmWasm(ast, wasm) {
-  // Load WASM
-  const wasmInstance = wasm ?? (await WebAssembly.instantiate(mod));
-  const modelMeta = WasmResource.fromString(
-    JSON.stringify(ast.models),
-    wasmInstance.exports,
-  );
-  if (wasmInstance.exports.set_meta_ptr(modelMeta.ptr, modelMeta.len) != 0) {
-    modelMeta.free();
-    throw Error("The WASM Module failed to load due to an invalid CIDL");
-  }
-  // Intentionally leak `modelMeta`, it should exist for the programs lifetime.
-  return wasmInstance.exports;
+    // Load WASM
+    const wasmInstance = (wasm ??
+        (await WebAssembly.instantiate(mod)));
+    const modelMeta = WasmResource.fromString(JSON.stringify(ast.models), wasmInstance.exports);
+    if (wasmInstance.exports.set_meta_ptr(modelMeta.ptr, modelMeta.len) != 0) {
+        modelMeta.free();
+        throw Error("The WASM Module failed to load due to an invalid CIDL");
+    }
+    // Intentionally leak `modelMeta`, it should exist for the programs lifetime.
+    return wasmInstance.exports;
 }
 /**
  * Invokes a WASM ORM function with the provided arguments, handling memory
@@ -50,69 +48,59 @@ export async function loadOrmWasm(ast, wasm) {
  * Returns an Either where Left is an error message and Right the raw string result.
  */
 export function invokeOrmWasm(fn, args, wasm) {
-  let resPtr;
-  let resLen;
-  try {
-    const failed = fn(...args.flatMap((a) => [a.ptr, a.len]));
-    resPtr = wasm.get_return_ptr();
-    resLen = wasm.get_return_len();
-    const result = new TextDecoder().decode(
-      new Uint8Array(wasm.memory.buffer, resPtr, resLen),
-    );
-    return failed ? Either.left(result) : Either.right(result);
-  } finally {
-    args.forEach((a) => a.free());
-    if (resPtr && resLen) wasm.dealloc(resPtr, resLen);
-  }
+    let resPtr;
+    let resLen;
+    try {
+        const failed = fn(...args.flatMap((a) => [a.ptr, a.len]));
+        resPtr = wasm.get_return_ptr();
+        resLen = wasm.get_return_len();
+        const result = new TextDecoder().decode(new Uint8Array(wasm.memory.buffer, resPtr, resLen));
+        return failed ? Either.left(result) : Either.right(result);
+    }
+    finally {
+        args.forEach((a) => a.free());
+        if (resPtr && resLen)
+            wasm.dealloc(resPtr, resLen);
+    }
 }
 /**
  * Calls the object relational mapping function to turn a row of SQL records into
  * an instantiated object.
  */
 export function mapSql(ctor, records, includeTree) {
-  const { ast, constructorRegistry, wasm } = RuntimeContainer.get();
-  const args = [
-    WasmResource.fromString(ctor.name, wasm),
-    WasmResource.fromString(JSON.stringify(records), wasm),
-    WasmResource.fromString(JSON.stringify(includeTree), wasm),
-  ];
-  const jsonResults = invokeOrmWasm(wasm.map_sql, args, wasm);
-  if (jsonResults.isLeft()) return jsonResults;
-  const parsed = JSON.parse(jsonResults.value);
-  return Either.right(
-    parsed.map((obj) =>
-      instantiateDepthFirst(obj, ast.models[ctor.name], includeTree),
-    ),
-  );
-  // TODO: Lazy instantiation via Proxy?
-  function instantiateDepthFirst(m, meta, includeTree) {
-    m = Object.assign(new constructorRegistry[meta.name](), m);
-    if (!includeTree) {
-      return m;
-    }
-    for (const navProp of meta.navigation_properties) {
-      const nestedIncludeTree = includeTree[navProp.var_name];
-      if (!nestedIncludeTree) continue;
-      const nestedMeta = ast.models[navProp.model_name];
-      // One to Many, Many to Many
-      if (Array.isArray(m[navProp.var_name])) {
-        for (let i = 0; i < m[navProp.var_name].length; i++) {
-          m[navProp.var_name][i] = instantiateDepthFirst(
-            m[navProp.var_name][i],
-            nestedMeta,
-            nestedIncludeTree,
-          );
+    const { ast, constructorRegistry, wasm } = RuntimeContainer.get();
+    const args = [
+        WasmResource.fromString(ctor.name, wasm),
+        WasmResource.fromString(JSON.stringify(records), wasm),
+        WasmResource.fromString(JSON.stringify(includeTree), wasm),
+    ];
+    const jsonResults = invokeOrmWasm(wasm.map_sql, args, wasm);
+    if (jsonResults.isLeft())
+        return jsonResults;
+    const parsed = JSON.parse(jsonResults.value);
+    return Either.right(parsed.map((obj) => instantiateDepthFirst(obj, ast.models[ctor.name], includeTree)));
+    // TODO: Lazy instantiation via Proxy?
+    function instantiateDepthFirst(m, meta, includeTree) {
+        m = Object.assign(new constructorRegistry[meta.name](), m);
+        if (!includeTree) {
+            return m;
+        }
+        for (const navProp of meta.navigation_properties) {
+            const nestedIncludeTree = includeTree[navProp.var_name];
+            if (!nestedIncludeTree)
+                continue;
+            const nestedMeta = ast.models[navProp.model_name];
+            // One to Many, Many to Many
+            if (Array.isArray(m[navProp.var_name])) {
+                for (let i = 0; i < m[navProp.var_name].length; i++) {
+                    m[navProp.var_name][i] = instantiateDepthFirst(m[navProp.var_name][i], nestedMeta, nestedIncludeTree);
+                }
+            }
+            // One to one
+            else if (m[navProp.var_name]) {
+                m[navProp.var_name] = instantiateDepthFirst(m[navProp.var_name], nestedMeta, nestedIncludeTree);
+            }
         }
-      }
-      // One to one
-      else if (m[navProp.var_name]) {
-        m[navProp.var_name] = instantiateDepthFirst(
-          m[navProp.var_name],
-          nestedMeta,
-          nestedIncludeTree,
-        );
-      }
+        return m;
     }
-    return m;
-  }
 }