cloesce 0.0.4-unstable.4 → 0.0.4-unstable.6

package/dist/common.js

@@ -107,28 +107,48 @@ export class ExtractorError {
         this.context = fn(this.context ?? "");
     }
 }
-/**
- * Creates a failed `Either` result.
- *
- * Typically used to represent an error condition or unsuccessful operation.
- *
- * @param value The error or failure value to wrap.
- * @returns An `Either` with `ok: false` and the given value.
- */
-export function left(value) {
-    return { ok: false, value };
-}
-/**
- * Creates a successful `Either` result.
- *
- * Typically used to represent a successful operation while maintaining
- * a consistent `Either`-based return type.
- *
- * @param value The success value to wrap.
- * @returns An `Either` with `ok: true` and the given value.
- */
-export function right(value) {
-    return { ok: true, value };
+export class Either {
+    inner;
+    constructor(inner) {
+        this.inner = inner;
+    }
+    get value() {
+        return this.inner.ok ? this.inner.right : this.inner.left;
+    }
+    static left(value) {
+        return new Either({ ok: false, left: value });
+    }
+    static right(value) {
+        return new Either({ ok: true, right: value });
+    }
+    isLeft() {
+        return !this.inner.ok;
+    }
+    isRight() {
+        return this.inner.ok;
+    }
+    unwrap() {
+        if (!this.inner.ok) {
+            throw new Error("Tried to unwrap a Left value");
+        }
+        return this.inner.right;
+    }
+    unwrapLeft() {
+        if (this.inner.ok) {
+            throw new Error("Tried to unwrapLeft a Right value");
+        }
+        return this.inner.left;
+    }
+    map(fn) {
+        return this.inner.ok
+            ? Either.right(fn(this.inner.right))
+            : Either.left(this.inner.left);
+    }
+    mapLeft(fn) {
+        return this.inner.ok
+            ? Either.right(this.inner.right)
+            : Either.left(fn(this.inner.left));
+    }
 }
 /**
  * Represents the core middleware container for a Cloesce application.

package/dist/extractor/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,iBAAiB,EAEjB,gBAAgB,EAEhB,UAAU,EAEX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,UAAU,EACV,QAAQ,EAER,MAAM,EACN,QAAQ,EACR,KAAK,EAEL,WAAW,EAGX,WAAW,EAGX,cAAc,EAEd,cAAc,EAGf,MAAM,cAAc,CAAC;AAuBtB,qBAAa,aAAa;IAEf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,MAAM;gBADf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IA8F7D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;IA8BlE,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;IAgQhC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC;IAmCzC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;IAuBtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IAsJnC,MAAM,CAAC,WAAW,CAChB,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,EAAE,EAAE,UAAU,GACb,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC;IAiF1C,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;CA0EvC"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,iBAAiB,EAEjB,gBAAgB,EAEhB,UAAU,EAEX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,UAAU,EACV,QAAQ,EAER,MAAM,EACN,QAAQ,EACR,KAAK,EAEL,WAAW,EAGX,WAAW,EACX,cAAc,EAEd,cAAc,EAGf,MAAM,cAAc,CAAC;AAuBtB,qBAAa,aAAa;IAEf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,MAAM;gBADf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IA8F7D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;IA8BlE,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;IAgQhC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC;IAmCzC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;IAuBtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IAkJnC,MAAM,CAAC,WAAW,CAChB,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,EAAE,EAAE,UAAU,GACb,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC;IAiF1C,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;CA0EvC"}

package/dist/extractor/extract.js

@@ -1,5 +1,5 @@
 import { Node as MorphNode, SyntaxKind, Scope, } from "ts-morph";
-import { HttpVerb, left, right, ExtractorError, ExtractorErrorCode, CloesceApp, } from "../common.js";
+import { Either, HttpVerb, ExtractorError, ExtractorErrorCode, CloesceApp, } from "../common.js";
 import { TypeFormatFlags } from "typescript";
 var AttributeDecoratorKind;
 (function (AttributeDecoratorKind) {
@@ -38,10 +38,10 @@ export class CidlExtractor {
                 sourceFile.getBaseName() === "seed__app.cloesce.ts" // hardcoding for tests
             ) {
                 const app = CidlExtractor.app(sourceFile);
-                if (!app.ok) {
+                if (app.isLeft()) {
                     return app;
                 }
-                app_source = app.value;
+                app_source = app.unwrap();
             }
             for (const classDecl of sourceFile.getClasses()) {
                 const notExportedErr = err(ExtractorErrorCode.MissingExport, (e) => {
@@ -53,11 +53,11 @@ export class CidlExtractor {
                         return notExportedErr;
                     const result = CidlExtractor.model(classDecl, sourceFile);
                     // Error: propogate from models
-                    if (!result.ok) {
+                    if (result.isLeft()) {
                         result.value.addContext((prev) => `${classDecl.getName()}.${prev}`);
                         return result;
                     }
-                    models[result.value.name] = result.value;
+                    models[result.unwrap().name] = result.unwrap();
                     continue;
                 }
                 if (hasDecorator(classDecl, ClassDecoratorKind.PlainOldObject)) {
@@ -65,11 +65,11 @@ export class CidlExtractor {
                         return notExportedErr;
                     const result = CidlExtractor.poo(classDecl, sourceFile);
                     // Error: propogate from models
-                    if (!result.ok) {
+                    if (result.isLeft()) {
                         result.value.addContext((prev) => `${classDecl.getName()}.${prev}`);
                         return result;
                     }
-                    poos[result.value.name] = result.value;
+                    poos[result.unwrap().name] = result.unwrap();
                     continue;
                 }
                 if (hasDecorator(classDecl, ClassDecoratorKind.WranglerEnv)) {
@@ -81,10 +81,10 @@ export class CidlExtractor {
                         }
                     }
                     const result = CidlExtractor.env(classDecl, sourceFile);
-                    if (!result.ok) {
+                    if (result.isLeft()) {
                         return result;
                     }
-                    wranglerEnvs.push(result.value);
+                    wranglerEnvs.push(result.unwrap());
                 }
             }
         }
@@ -96,7 +96,7 @@ export class CidlExtractor {
         if (wranglerEnvs.length > 1) {
             return err(ExtractorErrorCode.TooManyWranglerEnvs, (e) => (e.context = wranglerEnvs.map((w) => w.name).toString()));
         }
-        return right({
+        return Either.right({
             version: this.version,
             project_name: this.projectName,
             language: "TypeScript",
@@ -124,7 +124,7 @@ export class CidlExtractor {
         };
         const typeText = getTypeText();
         if (typeText === CloesceApp.name) {
-            return right(sourceFile.getFilePath().toString());
+            return Either.right(sourceFile.getFilePath().toString());
         }
         return err(ExtractorErrorCode.AppMissingDefaultExport);
     }
@@ -148,7 +148,7 @@ export class CidlExtractor {
             const decorators = prop.getDecorators();
             const typeRes = CidlExtractor.cidlType(prop.getType());
             // Error: invalid property type
-            if (!typeRes.ok) {
+            if (typeRes.isLeft()) {
                 typeRes.value.context = prop.getName();
                 typeRes.value.snippet = prop.getText();
                 return typeRes;
@@ -160,7 +160,7 @@ export class CidlExtractor {
                 if (checkModifierRes !== undefined) {
                     return checkModifierRes;
                 }
-                const cidl_type = typeRes.value;
+                const cidl_type = typeRes.unwrap();
                 attributes.push({
                     foreign_key_reference: null,
                     value: {
@@ -179,7 +179,7 @@ export class CidlExtractor {
                 return checkModifierRes;
             }
             // Process decorator
-            const cidl_type = typeRes.value;
+            const cidl_type = typeRes.unwrap();
             switch (decoratorName) {
                 case AttributeDecoratorKind.PrimaryKey: {
                     primary_key = {
@@ -282,14 +282,14 @@ export class CidlExtractor {
                     }
                     const initializer = prop.getInitializer();
                     const treeRes = CidlExtractor.includeTree(initializer, classDecl, sourceFile);
-                    if (!treeRes.ok) {
+                    if (treeRes.isLeft()) {
                         treeRes.value.addContext((prev) => `${prop.getName()} ${prev}`);
                         treeRes.value.snippet = prop.getText();
                         return treeRes;
                     }
                     data_sources[prop.getName()] = {
                         name: prop.getName(),
-                        tree: treeRes.value,
+                        tree: treeRes.unwrap(),
                     };
                     break;
                 }
@@ -310,13 +310,13 @@ export class CidlExtractor {
                 continue;
             }
             const result = CidlExtractor.method(name, m, httpVerb);
-            if (!result.ok) {
+            if (result.isLeft()) {
                 result.value.addContext((prev) => `${m.getName()} ${prev}`);
-                return left(result.value);
+                return result;
             }
-            methods[result.value.name] = result.value;
+            methods[result.unwrap().name] = result.unwrap();
         }
-        return right({
+        return Either.right({
             name,
             attributes,
             primary_key,
@@ -333,7 +333,7 @@ export class CidlExtractor {
         for (const prop of classDecl.getProperties()) {
             const typeRes = CidlExtractor.cidlType(prop.getType());
             // Error: invalid property type
-            if (!typeRes.ok) {
+            if (typeRes.isLeft()) {
                 typeRes.value.context = prop.getName();
                 typeRes.value.snippet = prop.getText();
                 return typeRes;
@@ -343,14 +343,14 @@ export class CidlExtractor {
             if (modifierRes) {
                 return modifierRes;
             }
-            const cidl_type = typeRes.value;
+            const cidl_type = typeRes.unwrap();
             attributes.push({
                 name: prop.getName(),
                 cidl_type,
             });
             continue;
         }
-        return right({
+        return Either.right({
             name,
             attributes,
             source_path: sourceFile.getFilePath().toString(),
@@ -365,7 +365,7 @@ export class CidlExtractor {
         if (!binding) {
             return err(ExtractorErrorCode.MissingDatabaseBinding);
         }
-        return right({
+        return Either.right({
             name: classDecl.getName(),
             source_path: sourceFile.getFilePath().toString(),
             db_binding: binding.getName(),
@@ -384,11 +384,11 @@ export class CidlExtractor {
     static cidlType(type, inject = false) {
         // Void
         if (type.isVoid()) {
-            return right("Void");
+            return Either.right("Void");
         }
         // Null
         if (type.isNull()) {
-            return right({ Nullable: "Void" });
+            return Either.right({ Nullable: "Void" });
         }
         // Nullable via union
         const [unwrappedType, nullable] = unwrapNullable(type);
@@ -399,7 +399,7 @@ export class CidlExtractor {
         // Primitives
         const prim = this.primTypeMap[tyText];
         if (prim) {
-            return right(wrapNullable(prim, nullable));
+            return Either.right(wrapNullable(prim, nullable));
         }
         const generics = [
             ...unwrappedType.getAliasTypeArguments(),
@@ -412,14 +412,14 @@ export class CidlExtractor {
         // No generics -> inject or object
         if (generics.length === 0) {
             const base = inject ? { Inject: tyText } : { Object: tyText };
-            return right(wrapNullable(base, nullable));
+            return Either.right(wrapNullable(base, nullable));
         }
         // Single generic
         const genericTy = generics[0];
         const symbolName = unwrappedType.getSymbol()?.getName();
         const aliasName = unwrappedType.getAliasSymbol()?.getName();
         if (aliasName === "DataSourceOf") {
-            return right(wrapNullable({
+            return Either.right(wrapNullable({
                 DataSource: genericTy.getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope),
             }, nullable));
         }
@@ -435,7 +435,7 @@ export class CidlExtractor {
                 genericTyGenerics.length > 0) {
                 return err(ExtractorErrorCode.InvalidPartialType);
             }
-            return right(wrapNullable({
+            return Either.right(wrapNullable({
                 Partial: genericTy
                     .getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope)
                     .split("|")[0]
@@ -466,10 +466,7 @@ export class CidlExtractor {
         function wrapGeneric(t, isNullable, wrapper) {
             const res = CidlExtractor.cidlType(t, inject);
             // Error: propogated from `cidlType`
-            if (!res.ok) {
-                return res;
-            }
-            return right(wrapNullable(wrapper(res.value), isNullable));
+            return res.map((inner) => wrapNullable(wrapper(inner), isNullable));
         }
         function unwrapNullable(ty) {
             if (!ty.isUnion())
@@ -506,13 +503,13 @@ export class CidlExtractor {
             }
             const typeRes = CidlExtractor.cidlType(navProp.getType());
             // Error: invalid referenced nav prop type
-            if (!typeRes.ok) {
+            if (typeRes.isLeft()) {
                 typeRes.value.snippet = navProp.getText();
                 typeRes.value.context = prop.getName();
                 return typeRes;
             }
             // Error: invalid referenced nav prop type
-            const cidl_type = typeRes.value;
+            const cidl_type = typeRes.unwrap();
             if (typeof cidl_type === "string") {
                 return err(ExtractorErrorCode.InvalidNavigationPropertyReference, (e) => {
                     ((e.snippet = navProp.getText()), (e.context = prop.getName()));
@@ -532,16 +529,16 @@ export class CidlExtractor {
                 if (targetClass) {
                     const treeRes = CidlExtractor.includeTree(initializer, targetClass, sf);
                     // Error: Propogated from `includeTree`
-                    if (!treeRes.ok) {
+                    if (treeRes.isLeft()) {
                         treeRes.value.snippet = expr.getText();
                         return treeRes;
                     }
-                    nestedTree = treeRes.value;
+                    nestedTree = treeRes.unwrap();
                 }
             }
             result[navProp.getName()] = nestedTree;
         }
-        return right(result);
+        return Either.right(result);
     }
     static method(modelName, method, httpVerb) {
         // Error: invalid method scope, must be public
@@ -558,21 +555,21 @@ export class CidlExtractor {
             if (param.getDecorator(ParameterDecoratorKind.Inject)) {
                 const typeRes = CidlExtractor.cidlType(param.getType(), true);
                 // Error: invalid type
-                if (!typeRes.ok) {
+                if (typeRes.isLeft()) {
                     typeRes.value.snippet = method.getText();
                     typeRes.value.context = param.getName();
                     return typeRes;
                 }
                 parameters.push({
                     name: param.getName(),
-                    cidl_type: typeRes.value,
+                    cidl_type: typeRes.unwrap(),
                 });
                 continue;
             }
             // Handle all other params
             const typeRes = CidlExtractor.cidlType(param.getType());
             // Error: invalid type
-            if (!typeRes.ok) {
+            if (typeRes.isLeft()) {
                 typeRes.value.snippet = method.getText();
                 typeRes.value.context = param.getName();
                 return typeRes;
@@ -582,12 +579,12 @@ export class CidlExtractor {
             }
             parameters.push({
                 name: param.getName(),
-                cidl_type: typeRes.value,
+                cidl_type: typeRes.unwrap(),
             });
         }
         const typeRes = CidlExtractor.cidlType(method.getReturnType());
         // Error: invalid type
-        if (!typeRes.ok) {
+        if (typeRes.isLeft()) {
             typeRes.value.snippet = method.getText();
             return typeRes;
         }
@@ -598,11 +595,11 @@ export class CidlExtractor {
                 cidl_type: { DataSource: modelName },
             });
         }
-        return right({
+        return Either.right({
             name: method.getName(),
             is_static: method.isStatic(),
             http_verb: httpVerb,
-            return_type: typeRes.value,
+            return_type: typeRes.unwrap(),
             parameters,
         });
     }
@@ -612,7 +609,7 @@ function err(code, fn) {
     if (fn) {
         fn(e);
     }
-    return left(e);
+    return Either.left(e);
 }
 function getDecoratorName(decorator) {
     const name = decorator.getName() ?? decorator.getExpression().getText();

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

@@ -1 +1 @@
-{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../src/router/crud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAC;AAG1D;;GAEG;AACH,qBAAa,WAAW;IAEpB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IAHd,OAAO;IAMP,MAAM,CAAC,YAAY,CACjB,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,UAAU,MAAM,GACrB,WAAW;IAId,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,MAAM,GAAG,WAAW;IAIpE;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ;IAWrC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAkBrE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAS9D,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;CAQ7D"}
+{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../src/router/crud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAC;AAG1D;;GAEG;AACH,qBAAa,WAAW;IAEpB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IAHd,OAAO;IAMP,MAAM,CAAC,YAAY,CACjB,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,UAAU,MAAM,GACrB,WAAW;IAId,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,MAAM,GAAG,WAAW;IAIpE;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ;IAWrC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAiBrE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAU9D,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;CAW7D"}

package/dist/router/crud.js

@@ -32,34 +32,39 @@ export class CrudContext {
         return fn ? fn.bind(this.instance) : map[methodName];
     }
     async upsert(obj, dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
-        const includeTree = normalizedDs ? this.ctor[normalizedDs] : null;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         // Upsert
         const orm = Orm.fromD1(this.d1);
         const upsert = await orm.upsert(this.ctor, obj, includeTree);
-        if (!upsert.ok) {
+        if (upsert.isLeft()) {
             return { ok: false, status: 500, data: upsert.value }; // TODO: better status code?
         }
         // Get
-        const get = await orm.get(this.ctor, upsert.value, normalizedDs);
-        return get.ok
+        const get = await orm.get(this.ctor, upsert.value, includeTree);
+        return get.isRight()
             ? { ok: true, status: 200, data: get.value }
             : { ok: false, status: 500, data: get.value };
     }
     async get(id, dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         const orm = Orm.fromD1(this.d1);
-        const res = await orm.get(this.ctor, id, normalizedDs);
-        return res.ok
+        const res = await orm.get(this.ctor, id, includeTree);
+        return res.isRight()
             ? { ok: true, status: 200, data: res.value }
             : { ok: false, status: 500, data: res.value };
     }
     async list(dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         const orm = Orm.fromD1(this.d1);
-        const res = await orm.list(this.ctor, normalizedDs);
-        return res.ok
+        const res = await orm.list(this.ctor, {
+            includeTree,
+        });
+        return res.isRight()
             ? { ok: true, status: 200, data: res.value }
             : { ok: false, status: 500, data: res.value };
     }
 }
+function findIncludeTree(dataSource, ctor) {
+    const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+    return normalizedDs ? ctor[normalizedDs] : null;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,MAAM,EACN,WAAW,EAIX,UAAU,EAEV,KAAK,EAGL,UAAU,EACV,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAuB,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC;;;;;GAKG;AACH,KAAK,wBAAwB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,CAAC;AAE9D;;;GAGG;AACH,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE/C;;GAEG;AACH,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,qBAAa,gBAAgB;aAGT,GAAG,EAAE,UAAU;aACf,mBAAmB,EAAE,wBAAwB;aAC7C,IAAI,EAAE,cAAc;IAJtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO;WAMM,IAAI,CACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ;IAO7B,MAAM,CAAC,GAAG,IAAI,gBAAgB;CAG/B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,CAqFnB;AAED;;;;GAIG;AACH,iBAAS,UAAU,CACjB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,QAAQ,EAAE,MAAM,GACf,MAAM,CACP,UAAU,EACV;IACE,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB,CACF,CAyCA;AAED;;;;GAIG;AACH,iBAAe,eAAe,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,EAAE,EAAE,MAAM,GAAG,IAAI,GAChB,OAAO,CACR,MAAM,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAC3E,CA4DA;AA2DD;;;GAGG;AACH,iBAAe,cAAc,CAC3B,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAkD9B;AAkID;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,MAAM,EACN,WAAW,EAEX,UAAU,EAEV,KAAK,EAGL,UAAU,EACV,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAuB,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC;;;;;GAKG;AACH,KAAK,wBAAwB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,CAAC;AAE9D;;;GAGG;AACH,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE/C;;GAEG;AACH,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,qBAAa,gBAAgB;aAGT,GAAG,EAAE,UAAU;aACf,mBAAmB,EAAE,wBAAwB;aAC7C,IAAI,EAAE,cAAc;IAJtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO;WAMM,IAAI,CACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ;IAO7B,MAAM,CAAC,GAAG,IAAI,gBAAgB;CAG/B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,CAmFnB;AAED;;;;GAIG;AACH,iBAAS,UAAU,CACjB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,QAAQ,EAAE,MAAM,GACf,MAAM,CACP,UAAU,EACV;IACE,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB,CACF,CAyCA;AAED;;;;GAIG;AACH,iBAAe,eAAe,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,EAAE,EAAE,MAAM,GAAG,IAAI,GAChB,OAAO,CACR,MAAM,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAC3E,CA4DA;AAgED;;;GAGG;AACH,iBAAe,cAAc,CAC3B,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAkD9B;AAoID;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC"}

package/dist/router/router.js

@@ -1,6 +1,7 @@
-import { left, right, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
+import { Either, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
 import { mapSql, loadOrmWasm } from "./wasm.js";
 import { CrudContext } from "./crud.js";
+import { Orm } from "../ui/backend.js";
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
@@ -49,10 +50,10 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#endregion
     //#region Match the route to a model method
     const route = matchRoute(request, ast, apiRoute);
-    if (!route.ok) {
+    if (route.isLeft()) {
         return toResponse(route.value);
     }
-    const { method, model, id } = route.value;
+    const { method, model, id } = route.unwrap();
     //#endregion
     //#region Model Middleware
     for (const m of app.model.get(model.name) ?? []) {
@@ -64,10 +65,10 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#endregion
     //#region Validate request body to the model method
     const validation = await validateRequest(request, ast, model, method, id);
-    if (!validation.ok) {
+    if (validation.isLeft()) {
         return toResponse(validation.value);
     }
-    const { params, dataSource } = validation.value;
+    const { params, dataSource } = validation.unwrap();
     //#endregion
     //#region Method Middleware
     for (const m of app.method.get(model.name)?.get(method.name) ?? []) {
@@ -80,20 +81,17 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#region Instantatiate the model
     const crudCtx = await (async () => {
         if (method.is_static) {
-            return right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
+            return Either.right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
         }
         const hydratedModel = await hydrateModel(constructorRegistry, d1, model, id, // id must exist after matchRoute
         dataSource);
-        if (!hydratedModel.ok) {
-            return hydratedModel;
-        }
-        return right(CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
+        return hydratedModel.map((_) => CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
     })();
-    if (!crudCtx.ok) {
+    if (crudCtx.isLeft()) {
         return toResponse(crudCtx.value);
     }
     //#endregion
-    return toResponse(await methodDispatch(crudCtx.value, ir, method, params));
+    return toResponse(await methodDispatch(crudCtx.unwrap(), ir, method, params));
 }
 /**
  * Matches a request to a method on a model.
@@ -104,7 +102,7 @@ function matchRoute(request, ast, apiRoute) {
     const url = new URL(request.url);
     // Error state: We expect an exact request format, and expect that the model
     // and are apart of the CIDL
-    const notFound = (e) => left(errorState(404, `Path not found: ${e} ${url.pathname}`));
+    const notFound = (e) => Either.left(errorState(404, `Path not found: ${e} ${url.pathname}`));
     const routeParts = url.pathname
         .slice(apiRoute.length)
         .split("/")
@@ -127,7 +125,7 @@ function matchRoute(request, ast, apiRoute) {
     if (request.method !== method.http_verb) {
         return notFound("Unmatched HTTP method");
     }
-    return right({
+    return Either.right({
         model,
         method,
         id,
@@ -140,7 +138,7 @@ function matchRoute(request, ast, apiRoute) {
  */
 async function validateRequest(request, ast, model, method, id) {
     // Error state: any missing parameter, body, or malformed input will exit with 400.
-    const invalidRequest = (e) => left(errorState(400, `Invalid Request Body: ${e}`));
+    const invalidRequest = (e) => Either.left(errorState(400, `Invalid Request Body: ${e}`));
     if (!method.is_static && id == null) {
         return invalidRequest("Id's are required for instantiated methods.");
     }
@@ -183,7 +181,7 @@ async function validateRequest(request, ast, model, method, id) {
         !(dataSource in model.data_sources)) {
         return invalidRequest(`Unknown data source ${dataSource}`);
     }
-    return right({ params, dataSource });
+    return Either.right({ params, dataSource });
 }
 /**
  * Queries D1 for a particular model's ID, then transforms the SQL column output into
@@ -195,17 +193,19 @@ async function validateRequest(request, ast, model, method, id) {
 async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
     // Error state: If the D1 database has been tweaked outside of Cloesce
     // resulting in a malformed query, exit with a 500.
-    const malformedQuery = (e) => left(errorState(500, `Error in hydration query, is the database out of sync with the backend?: ${e instanceof Error ? e.message : String(e)}`));
+    const malformedQuery = (e) => Either.left(errorState(500, `Error in hydration query, is the database out of sync with the backend?: ${e instanceof Error ? e.message : String(e)}`));
     // Error state: If no record is found for the id, return a 404
-    const missingRecord = left(errorState(404, "Record not found"));
-    const pk = model.primary_key.name;
-    const query = dataSource !== NO_DATA_SOURCE
-        ? `SELECT * FROM "${model.name}.${dataSource}" WHERE "${pk}" = ?`
-        : `SELECT * FROM "${model.name}" WHERE "${pk}" = ?`;
+    const missingRecord = Either.left(errorState(404, "Record not found"));
     // Query DB
     let records;
     try {
-        records = await d1.prepare(query).bind(id).run();
+        let includeTree = dataSource === NO_DATA_SOURCE
+            ? null
+            : constructorRegistry[model.name][dataSource];
+        records = await d1
+            .prepare(Orm.getQuery(constructorRegistry[model.name], includeTree).unwrap())
+            .bind(id)
+            .run();
         if (!records?.results) {
             return missingRecord;
         }
@@ -218,7 +218,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
     }
     // Hydrate
     const models = mapSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
-    return right(models[0]);
+    return Either.right(models[0]);
 }
 /**
  * Calls a method on a model given a list of parameters.
@@ -326,6 +326,7 @@ function validateCidlType(ast, value, cidlType, isPartial) {
         if (!poo.attributes.every((attr) => validateCidlType(ast, valueObj[attr.name], attr.cidl_type, isPartial))) {
             return false;
         }
+        return true;
     }
     if ("Array" in cidlType) {
         const arr = cidlType.Array;

package/dist/router/wasm.d.ts

@@ -10,8 +10,9 @@ export interface OrmWasmExports {
     set_meta_ptr(ptr: number, len: number): number;
     alloc(len: number): number;
     dealloc(ptr: number, len: number): void;
-    object_relational_mapping(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;
+    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
@@ -28,7 +29,13 @@ export declare class WasmResource {
     static fromString(str: string, wasm: OrmWasmExports): WasmResource;
 }
 export declare function loadOrmWasm(ast: CloesceAst, wasm?: WebAssembly.Instance): Promise<OrmWasmExports>;
-export declare function invokeOrmWasm<T>(fn: (...args: number[]) => boolean, args: WasmResource[], wasm: OrmWasmExports): Either<string, T>;
+/**
+ * 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>;
 /**
  * Calls `object_relational_mapping` to turn a row of SQL records into
  * an instantiated object.

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

@@ -1 +1 @@
-{"version":3,"file":"wasm.d.ts","sourceRoot":"","sources":["../../src/router/wasm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,UAAU,EACV,MAAM,EAIP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAC3B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,IAAI,MAAM,CAAC;IACzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAExC,yBAAyB,CACvB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,YAAY,CACV,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;CACZ;AAED;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACL,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;gBAFV,IAAI,EAAE,cAAc,EACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM;IAEpB,IAAI;IAIJ;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,YAAY;CAQnE;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ,GAC1B,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC7B,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,EAClC,IAAI,EAAE,YAAY,EAAE,EACpB,IAAI,EAAE,cAAc,GACnB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAkBnB;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EACrC,IAAI,EAAE,UAAU,CAAC,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC9B,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,IAAI,GACnD,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CA0DrB"}
+{"version":3,"file":"wasm.d.ts","sourceRoot":"","sources":["../../src/router/wasm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAC3B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,IAAI,MAAM,CAAC;IACzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAExC,OAAO,CACL,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,YAAY,CACV,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,WAAW,CACT,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC;CACZ;AAED;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACL,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;gBAFV,IAAI,EAAE,cAAc,EACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM;IAEpB,IAAI;IAIJ;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,YAAY;CAQnE;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ,GAC1B,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,EAClC,IAAI,EAAE,YAAY,EAAE,EACpB,IAAI,EAAE,cAAc,GACnB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EACrC,IAAI,EAAE,UAAU,CAAC,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC9B,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,IAAI,GACnD,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAsDrB"}