cloesce 0.0.4-unstable.2 → 0.0.4-unstable.4

package/dist/extractor/extract.d.ts

@@ -1,17 +1,17 @@
-import { Project } from "ts-morph";
-import { CloesceAst, Either, ExtractorError } from "../common.js";
+import { Project, Type, SourceFile, MethodDeclaration, ClassDeclaration, Expression } from "ts-morph";
+import { CidlIncludeTree, CloesceAst, CidlType, Either, HttpVerb, Model, ModelMethod, WranglerEnv, ExtractorError, PlainOldObject } from "../common.js";
 export declare class CidlExtractor {
     projectName: string;
     version: string;
     constructor(projectName: string, version: string);
     extract(project: Project): Either<ExtractorError, CloesceAst>;
-    private static app;
-    private static model;
-    private static poo;
+    static app(sourceFile: SourceFile): Either<ExtractorError, string>;
+    static model(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, Model>;
+    static poo(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, PlainOldObject>;
+    static env(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, WranglerEnv>;
     private static readonly primTypeMap;
-    private static cidlType;
-    private static includeTree;
-    private static method;
-    private static crudMethod;
+    static cidlType(type: Type, inject?: boolean): Either<ExtractorError, CidlType>;
+    static includeTree(expr: Expression | undefined, currentClass: ClassDeclaration, sf: SourceFile): Either<ExtractorError, CidlIncludeTree>;
+    static method(modelName: string, method: MethodDeclaration, httpVerb: HttpVerb): Either<ExtractorError, ModelMethod>;
 }
 //# sourceMappingURL=extract.d.ts.map

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,EAUR,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,UAAU,EAGV,MAAM,EAUN,cAAc,EAKf,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,OAAO,CAAC,MAAM,CAAC,GAAG;IA0BlB,OAAO,CAAC,MAAM,CAAC,KAAK;IAgQpB,OAAO,CAAC,MAAM,CAAC,GAAG;IAsClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ;IAiJvB,OAAO,CAAC,MAAM,CAAC,WAAW;IAqF1B,OAAO,CAAC,MAAM,CAAC,MAAM;IAiFrB,OAAO,CAAC,MAAM,CAAC,UAAU;CAsD1B"}
+{"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"}

package/dist/extractor/extract.js

@@ -73,8 +73,6 @@ export class CidlExtractor {
                     continue;
                 }
                 if (hasDecorator(classDecl, ClassDecoratorKind.WranglerEnv)) {
-                    if (!classDecl.isExported())
-                        return notExportedErr;
                     // Error: invalid attribute modifier
                     for (const prop of classDecl.getProperties()) {
                         const modifierRes = checkAttributeModifier(prop);
@@ -82,10 +80,11 @@ export class CidlExtractor {
                             return modifierRes;
                         }
                     }
-                    wranglerEnvs.push({
-                        name: classDecl.getName(),
-                        source_path: sourceFile.getFilePath().toString(),
-                    });
+                    const result = CidlExtractor.env(classDecl, sourceFile);
+                    if (!result.ok) {
+                        return result;
+                    }
+                    wranglerEnvs.push(result.value);
                 }
             }
         }
@@ -114,13 +113,14 @@ export class CidlExtractor {
             return err(ExtractorErrorCode.AppMissingDefaultExport);
         }
         const getTypeText = () => {
+            let type = undefined;
             if (MorphNode.isExportAssignment(decl)) {
-                return decl.getExpression()?.getType().getText();
+                type = decl.getExpression()?.getType();
             }
             if (MorphNode.isVariableDeclaration(decl)) {
-                return decl.getInitializer()?.getType().getText();
+                type = decl.getInitializer()?.getType();
             }
-            return undefined;
+            return type?.getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope);
         };
         const typeText = getTypeText();
         if (typeText === CloesceApp.name) {
@@ -131,17 +131,17 @@ export class CidlExtractor {
     static model(classDecl, sourceFile) {
         const name = classDecl.getName();
         const attributes = [];
-        const navigationProperties = [];
-        const dataSources = {};
+        const navigation_properties = [];
+        const data_sources = {};
         const methods = {};
-        let cruds = [];
+        const cruds = new Set();
         let primary_key = undefined;
         // Extract crud methods
         const crudDecorator = classDecl
             .getDecorators()
             .find((d) => getDecoratorName(d) === ClassDecoratorKind.CRUD);
         if (crudDecorator) {
-            cruds = getCrudKinds(crudDecorator);
+            setCrudKinds(crudDecorator, cruds);
         }
         // Iterate attribtutes
         for (const prop of classDecl.getProperties()) {
@@ -172,15 +172,15 @@ export class CidlExtractor {
             }
             // TODO: Limiting to one decorator. Can't get too fancy on us.
             const decorator = decorators[0];
-            const name = getDecoratorName(decorator);
+            const decoratorName = getDecoratorName(decorator);
             // Error: invalid attribute modifier
             if (checkModifierRes !== undefined &&
-                name !== AttributeDecoratorKind.DataSource) {
+                decoratorName !== AttributeDecoratorKind.DataSource) {
                 return checkModifierRes;
             }
-            // Process decorators
+            // Process decorator
             const cidl_type = typeRes.value;
-            switch (name) {
+            switch (decoratorName) {
                 case AttributeDecoratorKind.PrimaryKey: {
                     primary_key = {
                         name: prop.getName(),
@@ -215,7 +215,7 @@ export class CidlExtractor {
                             e.context = prop.getName();
                         });
                     }
-                    navigationProperties.push({
+                    navigation_properties.push({
                         var_name: prop.getName(),
                         model_name,
                         kind: { OneToOne: { reference } },
@@ -239,7 +239,7 @@ export class CidlExtractor {
                             e.context = prop.getName();
                         });
                     }
-                    navigationProperties.push({
+                    navigation_properties.push({
                         var_name: prop.getName(),
                         model_name,
                         kind: { OneToMany: { reference } },
@@ -262,7 +262,7 @@ export class CidlExtractor {
                             e.context = prop.getName();
                         });
                     }
-                    navigationProperties.push({
+                    navigation_properties.push({
                         var_name: prop.getName(),
                         model_name,
                         kind: { ManyToMany: { unique_id } },
@@ -270,9 +270,12 @@ export class CidlExtractor {
                     break;
                 }
                 case AttributeDecoratorKind.DataSource: {
-                    // Error: data sources must be static
-                    if (!prop.isStatic()) {
-                        return err(ExtractorErrorCode.DataSourceMissingStatic, (e) => {
+                    const isIncludeTree = prop
+                        .getType()
+                        .getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope) === `IncludeTree<${name}>`;
+                    // Error: data sources must be static include trees
+                    if (!prop.isStatic() || !isIncludeTree) {
+                        return err(ExtractorErrorCode.InvalidDataSourceDefinition, (e) => {
                             e.snippet = prop.getText();
                             e.context = prop.getName();
                         });
@@ -284,7 +287,7 @@ export class CidlExtractor {
                         treeRes.value.snippet = prop.getText();
                         return treeRes;
                     }
-                    dataSources[prop.getName()] = {
+                    data_sources[prop.getName()] = {
                         name: prop.getName(),
                         tree: treeRes.value,
                     };
@@ -313,19 +316,14 @@ export class CidlExtractor {
             }
             methods[result.value.name] = result.value;
         }
-        // Add CRUD methods
-        for (const crud of cruds) {
-            // TODO: This overwrites any exisiting impl-- is that what we want?
-            const crudMethod = CidlExtractor.crudMethod(crud, primary_key, name);
-            methods[crudMethod.name] = crudMethod;
-        }
         return right({
             name,
             attributes,
             primary_key,
-            navigation_properties: navigationProperties,
+            navigation_properties,
             methods,
-            data_sources: dataSources,
+            data_sources,
+            cruds: Array.from(cruds).sort(),
             source_path: sourceFile.getFilePath().toString(),
         });
     }
@@ -358,6 +356,21 @@ export class CidlExtractor {
             source_path: sourceFile.getFilePath().toString(),
         });
     }
+    static env(classDecl, sourceFile) {
+        const binding = classDecl.getProperties().find((p) => {
+            return (p
+                .getType()
+                .getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope) === "D1Database");
+        });
+        if (!binding) {
+            return err(ExtractorErrorCode.MissingDatabaseBinding);
+        }
+        return right({
+            name: classDecl.getName(),
+            source_path: sourceFile.getFilePath().toString(),
+            db_binding: binding.getName(),
+        });
+    }
     static primTypeMap = {
         number: "Real",
         Number: "Real",
@@ -459,13 +472,17 @@ export class CidlExtractor {
             return right(wrapNullable(wrapper(res.value), isNullable));
         }
         function unwrapNullable(ty) {
-            if (ty.isUnion()) {
-                const nonNull = ty.getUnionTypes().filter((t) => !t.isNull());
-                if (nonNull.length === 1) {
-                    return [nonNull[0], true];
-                }
+            if (!ty.isUnion())
+                return [ty, false];
+            const unions = ty.getUnionTypes();
+            const nonNulls = unions.filter((t) => !t.isNull() && !t.isUndefined());
+            const hasNullable = nonNulls.length < unions.length;
+            // Booleans seperate into [null, true, false] from the `getUnionTypes` call
+            if (nonNulls.length === 2 &&
+                nonNulls.every((t) => t.isBooleanLiteral())) {
+                return [nonNulls[0].getApparentType(), hasNullable];
             }
-            return [ty, false];
+            return [nonNulls[0] ?? ty, hasNullable];
         }
     }
     static includeTree(expr, currentClass, sf) {
@@ -560,8 +577,7 @@ export class CidlExtractor {
                 typeRes.value.context = param.getName();
                 return typeRes;
             }
-            const rootType = getRootType(typeRes.value);
-            if (typeof rootType !== "string" && "DataSource" in rootType) {
+            if (typeof typeRes.value !== "string" && "DataSource" in typeRes.value) {
                 needsDataSource = false;
             }
             parameters.push({
@@ -590,56 +606,6 @@ export class CidlExtractor {
             parameters,
         });
     }
-    static crudMethod(crud, primaryKey, modelName) {
-        // TODO: Should this impementation be in some JSON project file s.t. other
-        // langs can use it?
-        return {
-            POST: {
-                name: "post",
-                is_static: true,
-                http_verb: HttpVerb.POST,
-                return_type: { HttpResult: { Object: modelName } },
-                parameters: [
-                    {
-                        name: "obj",
-                        cidl_type: { Partial: modelName },
-                    },
-                    {
-                        name: "dataSource",
-                        cidl_type: { DataSource: modelName },
-                    },
-                ],
-            },
-            GET: {
-                name: "get",
-                is_static: true,
-                http_verb: HttpVerb.GET,
-                return_type: { HttpResult: { Object: modelName } },
-                parameters: [
-                    {
-                        name: "id",
-                        cidl_type: primaryKey.cidl_type,
-                    },
-                    {
-                        name: "dataSource",
-                        cidl_type: { DataSource: modelName },
-                    },
-                ],
-            },
-            LIST: {
-                name: "list",
-                is_static: true,
-                http_verb: HttpVerb.GET,
-                return_type: { HttpResult: { Array: { Object: modelName } } },
-                parameters: [
-                    {
-                        name: "dataSource",
-                        cidl_type: { DataSource: modelName },
-                    },
-                ],
-            },
-        }[crud];
-    }
 }
 function err(code, fn) {
     let e = new ExtractorError(code);
@@ -684,18 +650,18 @@ function getObjectName(t) {
     }
     return undefined;
 }
-function getCrudKinds(d) {
+function setCrudKinds(d, cruds) {
     const arg = d.getArguments()[0];
-    if (!arg)
-        return [];
+    if (!arg) {
+        return;
+    }
     if (MorphNode.isArrayLiteralExpression(arg)) {
-        return arg
-            .getElements()
-            .map((e) => (MorphNode.isStringLiteral(e)
-            ? e.getLiteralValue()
-            : e.getText()));
+        for (const a of arg.getElements()) {
+            cruds.add((MorphNode.isStringLiteral(a)
+                ? a.getLiteralValue()
+                : a.getText()));
+        }
     }
-    return [];
 }
 function findPropertyByName(cls, name) {
     const exactMatch = cls.getProperties().find((p) => p.getName() === name);

package/dist/router/crud.js

@@ -24,7 +24,7 @@ export class CrudContext {
      */
     interceptCrud(methodName) {
         const map = {
-            post: this.upsert.bind(this),
+            save: this.upsert.bind(this),
             get: this.get.bind(this),
             list: this.list.bind(this),
         };

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,EAAwB,MAAM,WAAW,CAAC;AACjE,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,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"}

package/dist/router/router.js

@@ -1,5 +1,5 @@
 import { left, right, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
-import { fromSql, loadOrmWasm } from "./wasm.js";
+import { mapSql, loadOrmWasm } from "./wasm.js";
 import { CrudContext } from "./crud.js";
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
@@ -200,7 +200,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
     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 "${model.name}.${pk}" = ?`
+        ? `SELECT * FROM "${model.name}.${dataSource}" WHERE "${pk}" = ?`
         : `SELECT * FROM "${model.name}" WHERE "${pk}" = ?`;
     // Query DB
     let records;
@@ -217,7 +217,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
         return malformedQuery(e);
     }
     // Hydrate
-    const models = fromSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
+    const models = mapSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
     return right(models[0]);
 }
 /**

package/dist/router/wasm.d.ts

@@ -33,5 +33,5 @@ export declare function invokeOrmWasm<T>(fn: (...args: number[]) => boolean, arg
  * Calls `object_relational_mapping` to turn a row of SQL records into
  * an instantiated object.
  */
-export declare function fromSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree: IncludeTree<T> | CidlIncludeTree | null): Either<string, T[]>;
+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.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,OAAO,CAAC,CAAC,SAAS,MAAM,EACtC,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,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"}

package/dist/router/wasm.js

@@ -61,7 +61,7 @@ export function invokeOrmWasm(fn, args, wasm) {
  * Calls `object_relational_mapping` to turn a row of SQL records into
  * an instantiated object.
  */
-export function fromSql(ctor, records, includeTree) {
+export function mapSql(ctor, records, includeTree) {
     const { ast, constructorRegistry, wasm } = RuntimeContainer.get();
     const args = [
         WasmResource.fromString(ctor.name, wasm),