cloesce 0.0.5-unstable.4 → 0.0.5-unstable.6

package/dist/ast.d.ts

@@ -1,5 +1,5 @@
 export type CrudKind = "SAVE" | "GET" | "LIST";
-export type CidlType = "Void" | "Integer" | "Real" | "Text" | "Blob" | "DateIso" | "Boolean" | "Stream" | {
+export type CidlType = "Void" | "Integer" | "Real" | "Text" | "Blob" | "DateIso" | "Boolean" | "Stream" | "JsonValue" | {
     DataSource: string;
 } | {
     Inject: string;
@@ -26,7 +26,7 @@ export interface NamedTypedValue {
     name: string;
     cidl_type: CidlType;
 }
-export interface ModelAttribute {
+export interface D1Column {
     value: NamedTypedValue;
     foreign_key_reference: string | null;
 }
@@ -51,28 +51,39 @@ export interface ApiMethod {
 }
 export type NavigationPropertyKind = {
     OneToOne: {
-        reference: string;
+        column_reference: string;
     };
 } | {
     OneToMany: {
-        reference: string;
+        column_reference: string;
     };
-} | {
-    ManyToMany: {
-        unique_id: string;
-    };
-};
+} | "ManyToMany";
 export interface NavigationProperty {
     var_name: string;
-    model_name: string;
+    model_reference: string;
     kind: NavigationPropertyKind;
 }
 export declare function getNavigationPropertyCidlType(nav: NavigationProperty): CidlType;
+export interface KeyValue {
+    format: string;
+    namespace_binding: string;
+    value: NamedTypedValue;
+    list_prefix: boolean;
+}
+export interface AstR2Object {
+    format: string;
+    bucket_binding: string;
+    var_name: string;
+    list_prefix: boolean;
+}
 export interface Model {
     name: string;
-    primary_key: NamedTypedValue;
-    attributes: ModelAttribute[];
+    primary_key: NamedTypedValue | null;
+    columns: D1Column[];
     navigation_properties: NavigationProperty[];
+    key_params: string[];
+    kv_objects: KeyValue[];
+    r2_objects: AstR2Object[];
     methods: Record<string, ApiMethod>;
     data_sources: Record<string, DataSource>;
     cruds: CrudKind[];
@@ -85,7 +96,7 @@ export interface PlainOldObject {
 }
 export interface ServiceAttribute {
     var_name: string;
-    injected: string;
+    inject_reference: string;
 }
 export interface Service {
     name: string;
@@ -104,18 +115,17 @@ export interface DataSource {
 export interface WranglerEnv {
     name: string;
     source_path: string;
-    db_binding: string;
+    d1_binding?: string;
+    kv_bindings: string[];
+    r2_bindings: string[];
     vars: Record<string, CidlType>;
 }
 export interface CloesceAst {
-    [x: string]: any;
-    version: string;
     project_name: string;
-    language: string;
     wrangler_env?: WranglerEnv;
     models: Record<string, Model>;
     poos: Record<string, PlainOldObject>;
     services: Record<string, Service>;
-    app_source: string | null;
+    main_source: string | null;
 }
 //# sourceMappingURL=ast.d.ts.map

package/dist/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":"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"}

package/dist/ast.js

@@ -23,8 +23,8 @@ export function defaultMediaType() {
     return MediaType.Json;
 }
 export function getNavigationPropertyCidlType(nav) {
-    return "OneToOne" in nav.kind
-        ? { Object: nav.model_name }
-        : { Array: { Object: nav.model_name } };
+    return typeof nav.kind !== "string" && "OneToOne" in nav.kind
+        ? { Object: nav.model_reference }
+        : { Array: { Object: nav.model_reference } };
 }
 export const NO_DATA_SOURCE = "none";

package/dist/cli.js

@@ -190,20 +190,19 @@ async function extract(config, args = {}) {
     try {
         const extractorStart = Date.now();
         debug("Extracting CIDL...");
-        const extractor = new CidlExtractor(cloesceProjectName, "v0.0.4");
-        const result = extractor.extract(project);
+        const result = CidlExtractor.extract(cloesceProjectName, project);
         if (result.isLeft()) {
             console.error(formatErr(result.value));
             process.exit(1);
         }
-        let ast = result.unwrap();
+        const ast = result.unwrap();
         if (truncate) {
             if (ast.wrangler_env) {
                 ast.wrangler_env.source_path =
                     "./" + path.basename(ast.wrangler_env.source_path);
             }
-            if (ast.app_source) {
-                ast.app_source = "./" + path.basename(ast.app_source);
+            if (ast.main_source) {
+                ast.main_source = "./" + path.basename(ast.main_source);
             }
             for (const model of Object.values(ast.models)) {
                 model.source_path = "./" + path.basename(model.source_path);

package/dist/common.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Denotes that some error occured internally in Cloesce that should not happen.
+ */
+export declare class InternalError extends Error {
+    constructor(description: string);
+}
+export declare class Either<L, R> {
+    private readonly inner;
+    private constructor();
+    get value(): L | R;
+    static left<R>(): Either<void, R>;
+    static left<L, R = never>(value: L): Either<L, R>;
+    static right<R, L = never>(value: R): Either<L, R>;
+    isLeft(): this is Either<L, never>;
+    isRight(): this is Either<never, R>;
+    unwrap(): R;
+    unwrapLeft(): L;
+    map<B>(fn: (val: R) => B): Either<L, B>;
+    mapLeft<B>(fn: (val: L) => B): Either<B, R>;
+}
+export declare function b64ToU8(b64: string): Uint8Array;
+export declare function u8ToB64(u8: Uint8Array): string;
+//# sourceMappingURL=common.d.ts.map

package/dist/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,WAAW,EAAE,MAAM;CAIhC;AAED,qBAAa,MAAM,CAAC,CAAC,EAAE,CAAC;IAEpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IADxB,OAAO;IAIP,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,CAEjB;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACjC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAMjD,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAIlD,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;IAIlC,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAInC,MAAM,IAAI,CAAC;IAOX,UAAU,IAAI,CAAC;IAOf,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAMvC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;CAK5C;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAc/C;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,CAY9C"}

package/dist/common.js

@@ -0,0 +1,78 @@
+/**
+ * Denotes that some error occured internally in Cloesce that should not happen.
+ */
+export class InternalError extends Error {
+    constructor(description) {
+        super(`An internal Cloesce error occurred: ${description}`);
+        Object.setPrototypeOf(this, InternalError.prototype);
+    }
+}
+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));
+    }
+}
+export function b64ToU8(b64) {
+    // Prefer Buffer in Node.js environments
+    if (typeof Buffer !== "undefined") {
+        const buffer = Buffer.from(b64, "base64");
+        return new Uint8Array(buffer);
+    }
+    // Use atob only in browser environments
+    const s = atob(b64);
+    const u8 = new Uint8Array(s.length);
+    for (let i = 0; i < s.length; i++) {
+        u8[i] = s.charCodeAt(i);
+    }
+    return u8;
+}
+export function u8ToB64(u8) {
+    // Prefer Buffer in Node.js environments
+    if (typeof Buffer !== "undefined") {
+        return Buffer.from(u8).toString("base64");
+    }
+    // Use btoa only in browser environments
+    let s = "";
+    for (let i = 0; i < u8.length; i++) {
+        s += String.fromCharCode(u8[i]);
+    }
+    return btoa(s);
+}

package/dist/extractor/err.d.ts

@@ -1,22 +1,21 @@
 export declare enum ExtractorErrorCode {
     MissingExport = 0,
-    AppMissingDefaultExport = 1,
+    InvalidMain = 1,
     UnknownType = 2,
     MultipleGenericType = 3,
     InvalidDataSourceDefinition = 4,
     InvalidPartialType = 5,
-    InvalidIncludeTree = 6,
-    InvalidAttributeModifier = 7,
-    InvalidApiMethodModifier = 8,
-    UnknownNavigationPropertyReference = 9,
-    InvalidNavigationPropertyReference = 10,
-    MissingNavigationPropertyReference = 11,
-    MissingManyToManyUniqueId = 12,
-    MissingPrimaryKey = 13,
-    MissingDatabaseBinding = 14,
-    TooManyWranglerEnvs = 15,
-    MissingFile = 16,
-    InvalidServiceAttribute = 17
+    InvalidPropertyModifier = 6,
+    InvalidApiMethodModifier = 7,
+    InvalidSelectorSyntax = 8,
+    InvalidOneToOneSelector = 9,
+    InvalidNavigationProperty = 10,
+    TooManyWranglerEnvs = 11,
+    MissingFile = 12,
+    InvalidServiceProperty = 13,
+    InvalidTypescriptSyntax = 14,
+    MissingKValue = 15,
+    MissingR2ObjectBody = 16
 }
 export declare function getErrorInfo(code: ExtractorErrorCode): {
     description: string;

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

@@ -1 +1 @@
-{"version":3,"file":"err.d.ts","sourceRoot":"","sources":["../../src/extractor/err.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,aAAa,IAAA;IACb,uBAAuB,IAAA;IACvB,WAAW,IAAA;IACX,mBAAmB,IAAA;IACnB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,kBAAkB,IAAA;IAClB,wBAAwB,IAAA;IACxB,wBAAwB,IAAA;IACxB,kCAAkC,IAAA;IAClC,kCAAkC,KAAA;IAClC,kCAAkC,KAAA;IAClC,yBAAyB,KAAA;IACzB,iBAAiB,KAAA;IACjB,sBAAsB,KAAA;IACtB,mBAAmB,KAAA;IACnB,WAAW,KAAA;IACX,uBAAuB,KAAA;CACxB;AA0FD,wBAAgB,YAAY,CAAC,IAAI,EAAE,kBAAkB;iBAtFpC,MAAM;gBAAc,MAAM;EAwF1C;AAED,qBAAa,cAAc;IAIN,IAAI,EAAE,kBAAkB;IAH3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;gBAEE,IAAI,EAAE,kBAAkB;IAE3C,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS;CAG/D"}
+{"version":3,"file":"err.d.ts","sourceRoot":"","sources":["../../src/extractor/err.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,aAAa,IAAA;IACb,WAAW,IAAA;IACX,WAAW,IAAA;IACX,mBAAmB,IAAA;IACnB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,uBAAuB,IAAA;IACvB,wBAAwB,IAAA;IACxB,qBAAqB,IAAA;IACrB,uBAAuB,IAAA;IACvB,yBAAyB,KAAA;IACzB,mBAAmB,KAAA;IACnB,WAAW,KAAA;IACX,sBAAsB,KAAA;IACtB,uBAAuB,KAAA;IACvB,aAAa,KAAA;IACb,mBAAmB,KAAA;CACpB;AAuFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,kBAAkB;iBAnFpC,MAAM;gBAAc,MAAM;EAqF1C;AAED,qBAAa,cAAc;IAIN,IAAI,EAAE,kBAAkB;IAH3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;gBAEE,IAAI,EAAE,kBAAkB;IAE3C,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS;CAG/D"}

package/dist/extractor/err.js

@@ -1,32 +1,31 @@
 export var ExtractorErrorCode;
 (function (ExtractorErrorCode) {
     ExtractorErrorCode[ExtractorErrorCode["MissingExport"] = 0] = "MissingExport";
-    ExtractorErrorCode[ExtractorErrorCode["AppMissingDefaultExport"] = 1] = "AppMissingDefaultExport";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidMain"] = 1] = "InvalidMain";
     ExtractorErrorCode[ExtractorErrorCode["UnknownType"] = 2] = "UnknownType";
     ExtractorErrorCode[ExtractorErrorCode["MultipleGenericType"] = 3] = "MultipleGenericType";
     ExtractorErrorCode[ExtractorErrorCode["InvalidDataSourceDefinition"] = 4] = "InvalidDataSourceDefinition";
     ExtractorErrorCode[ExtractorErrorCode["InvalidPartialType"] = 5] = "InvalidPartialType";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidIncludeTree"] = 6] = "InvalidIncludeTree";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidAttributeModifier"] = 7] = "InvalidAttributeModifier";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidApiMethodModifier"] = 8] = "InvalidApiMethodModifier";
-    ExtractorErrorCode[ExtractorErrorCode["UnknownNavigationPropertyReference"] = 9] = "UnknownNavigationPropertyReference";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidNavigationPropertyReference"] = 10] = "InvalidNavigationPropertyReference";
-    ExtractorErrorCode[ExtractorErrorCode["MissingNavigationPropertyReference"] = 11] = "MissingNavigationPropertyReference";
-    ExtractorErrorCode[ExtractorErrorCode["MissingManyToManyUniqueId"] = 12] = "MissingManyToManyUniqueId";
-    ExtractorErrorCode[ExtractorErrorCode["MissingPrimaryKey"] = 13] = "MissingPrimaryKey";
-    ExtractorErrorCode[ExtractorErrorCode["MissingDatabaseBinding"] = 14] = "MissingDatabaseBinding";
-    ExtractorErrorCode[ExtractorErrorCode["TooManyWranglerEnvs"] = 15] = "TooManyWranglerEnvs";
-    ExtractorErrorCode[ExtractorErrorCode["MissingFile"] = 16] = "MissingFile";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidServiceAttribute"] = 17] = "InvalidServiceAttribute";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidPropertyModifier"] = 6] = "InvalidPropertyModifier";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidApiMethodModifier"] = 7] = "InvalidApiMethodModifier";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidSelectorSyntax"] = 8] = "InvalidSelectorSyntax";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidOneToOneSelector"] = 9] = "InvalidOneToOneSelector";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidNavigationProperty"] = 10] = "InvalidNavigationProperty";
+    ExtractorErrorCode[ExtractorErrorCode["TooManyWranglerEnvs"] = 11] = "TooManyWranglerEnvs";
+    ExtractorErrorCode[ExtractorErrorCode["MissingFile"] = 12] = "MissingFile";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidServiceProperty"] = 13] = "InvalidServiceProperty";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidTypescriptSyntax"] = 14] = "InvalidTypescriptSyntax";
+    ExtractorErrorCode[ExtractorErrorCode["MissingKValue"] = 15] = "MissingKValue";
+    ExtractorErrorCode[ExtractorErrorCode["MissingR2ObjectBody"] = 16] = "MissingR2ObjectBody";
 })(ExtractorErrorCode || (ExtractorErrorCode = {}));
 const errorInfoMap = {
     [ExtractorErrorCode.MissingExport]: {
         description: "All Cloesce types must be exported.",
         suggestion: "Add `export` to the class definition.",
     },
-    [ExtractorErrorCode.AppMissingDefaultExport]: {
-        description: "app.cloesce.ts does not export a CloesceApp by default",
-        suggestion: "Export an instantiated CloesceApp in app.cloesce.ts",
+    [ExtractorErrorCode.InvalidMain]: {
+        description: "The main function must follow the expected signature.",
+        suggestion: "Change to: export default async function main(request: Request, env: WranglerEnv, app: CloesceApp, ctx: ExecutionContext): Promise<Response> {...}",
     },
     [ExtractorErrorCode.UnknownType]: {
         description: "Encountered an unknown or unsupported type",
@@ -44,11 +43,7 @@ const errorInfoMap = {
         description: "Data Sources must be explicitly typed as a static Include Tree",
         suggestion: "Declare your data source as `static readonly _: IncludeTree<Model>`",
     },
-    [ExtractorErrorCode.InvalidIncludeTree]: {
-        description: "Invalid Include Tree",
-        suggestion: "Include trees must only contain references to a model's navigation properties.",
-    },
-    [ExtractorErrorCode.InvalidAttributeModifier]: {
+    [ExtractorErrorCode.InvalidPropertyModifier]: {
         description: "Attributes can only be public on a Model, Plain Old Object or Wrangler Environment",
         suggestion: "Change the attribute modifier to just `public`",
     },
@@ -56,30 +51,6 @@ const errorInfoMap = {
         description: "Model methods must be public if they are decorated as GET, POST, PUT, PATCH",
         suggestion: "Change the method modifier to just `public`",
     },
-    [ExtractorErrorCode.UnknownNavigationPropertyReference]: {
-        description: "Unknown Navigation Property Reference",
-        suggestion: "Verify that the navigation property reference model exists, or create a model.",
-    },
-    [ExtractorErrorCode.InvalidNavigationPropertyReference]: {
-        description: "Invalid Navigation Property Reference",
-        suggestion: "Ensure the navigation property points to a valid model field",
-    },
-    [ExtractorErrorCode.MissingNavigationPropertyReference]: {
-        description: "Missing Navigation Property Reference",
-        suggestion: "Navigation properties require a foreign key model attribute reference",
-    },
-    [ExtractorErrorCode.MissingManyToManyUniqueId]: {
-        description: "Missing unique id on Many to Many navigation property",
-        suggestion: "Define a unique identifier field for the Many-to-Many relationship",
-    },
-    [ExtractorErrorCode.MissingPrimaryKey]: {
-        description: "Missing primary key on a model",
-        suggestion: "Add a primary key field to your model (e.g., `id: number`)",
-    },
-    [ExtractorErrorCode.MissingDatabaseBinding]: {
-        description: "Missing a database binding in the WranglerEnv definition",
-        suggestion: "Add a `D1Database` to your WranglerEnv",
-    },
     [ExtractorErrorCode.TooManyWranglerEnvs]: {
         description: "Too many wrangler environments defined in the project",
         suggestion: "Consolidate or remove unused @WranglerEnv's",
@@ -88,10 +59,34 @@ const errorInfoMap = {
         description: "A specified input file could not be found",
         suggestion: "Verify the input file path is correct",
     },
-    [ExtractorErrorCode.InvalidServiceAttribute]: {
+    [ExtractorErrorCode.InvalidServiceProperty]: {
         description: "Services must contain only dependency injected instances as attributes.",
         suggestion: "Remove the attribute.",
     },
+    [ExtractorErrorCode.InvalidTypescriptSyntax]: {
+        description: "The TypeScript syntax is invalid.",
+        suggestion: "Fix the TypeScript syntax errors.",
+    },
+    [ExtractorErrorCode.MissingKValue]: {
+        description: "All KV decorated fields must be of type KValue<T>",
+        suggestion: "Change the field type to KValue<T>.",
+    },
+    [ExtractorErrorCode.MissingR2ObjectBody]: {
+        description: "All R2 decorated fields must be of type R2ObjectBody.",
+        suggestion: "Change the field type to R2ObjectBody.",
+    },
+    [ExtractorErrorCode.InvalidSelectorSyntax]: {
+        description: "The selector syntax is invalid.",
+        suggestion: "Selectors should be of the form `N<T>(m => m.property)` where T is a model type and N is OneToOne or OneToMany.",
+    },
+    [ExtractorErrorCode.InvalidOneToOneSelector]: {
+        description: "OneToOne selectors must select a model constructor or name string.",
+        suggestion: "Ensure the selector is of the form `OneToOne<T>(...)` where T is a model type or a string representing the model name.",
+    },
+    [ExtractorErrorCode.InvalidNavigationProperty]: {
+        description: "A navigation property must be of type T, T | undefined, or T[] where T is a model type.",
+        suggestion: "Change the property type to be of the correct form.",
+    },
 };
 export function getErrorInfo(code) {
     return errorInfoMap[code];

package/dist/extractor/extract.d.ts

@@ -1,21 +1,28 @@
-import { Project, Type, SourceFile, MethodDeclaration, ClassDeclaration, Expression } from "ts-morph";
-import { CidlIncludeTree, CloesceAst, CidlType, HttpVerb, Model, ApiMethod, WranglerEnv, PlainOldObject, Service } from "../ast.js";
+import { Project, Type, SourceFile, ClassDeclaration, Decorator } from "ts-morph";
+import { CloesceAst, CidlType, WranglerEnv } from "../ast.js";
 import { ExtractorError } from "./err.js";
-import { Either } from "../ui/common.js";
+import { Either } from "../common.js";
 export declare class CidlExtractor {
-    projectName: string;
-    version: string;
-    constructor(projectName: string, version: string);
-    extract(project: Project): Either<ExtractorError, CloesceAst>;
-    static app(sourceFile: SourceFile): Either<ExtractorError, string>;
-    static model(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, Model>;
-    static modelMethod(modelName: string, method: MethodDeclaration, verb: HttpVerb): Either<ExtractorError, ApiMethod>;
-    static service(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, Service>;
-    static serviceMethod(method: MethodDeclaration, verb: HttpVerb): Either<ExtractorError, ApiMethod>;
-    static poo(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, PlainOldObject>;
+    private modelDecls;
+    private extractedPoos;
+    private constructor();
+    static extract(projectName: string, project: Project): Either<ExtractorError, CloesceAst>;
+    /**
+     * @returns An error if the main function is invalid, or the source code of the app function if valid.
+     * Undefined if no main function is defined.
+     */
+    private static main;
+    private model;
+    private service;
+    private method;
+    private poo;
     static env(classDecl: ClassDeclaration, sourceFile: SourceFile): Either<ExtractorError, WranglerEnv>;
     private static readonly primTypeMap;
     static cidlType(type: Type, inject?: boolean): Either<ExtractorError, CidlType>;
-    static includeTree(expr: Expression | undefined, currentClass: ClassDeclaration, sf: SourceFile): Either<ExtractorError, CidlIncludeTree>;
+    /**
+     * Mutates the property declaration to add inferred decorators based on naming conventions.
+     */
+    private inferModelDecorator;
 }
+export declare function getSelectorPropertyName(decorator: Decorator): Either<ExtractorError, string>;
 //# 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,EACP,IAAI,EACJ,UAAU,EAEV,iBAAiB,EAEjB,gBAAgB,EAEhB,UAAU,EAEX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,UAAU,EACV,QAAQ,EAER,QAAQ,EACR,KAAK,EAEL,SAAS,EAGT,WAAW,EACX,cAAc,EAEd,OAAO,EAER,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,cAAc,EAAsB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAuBzC,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;IA4G7D,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,WAAW,CAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,QAAQ,GACb,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;IA6EpC,MAAM,CAAC,OAAO,CACZ,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC;IA+DlC,MAAM,CAAC,aAAa,CAClB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,QAAQ,GACb,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;IAiEpC,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;IAuCtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAWjC;IAEF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IAmJnC,MAAM,CAAC,WAAW,CAChB,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,EAAE,EAAE,UAAU,GACb,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC;CAiF3C"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,IAAI,EACJ,UAAU,EAIV,gBAAgB,EAChB,SAAS,EAGV,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,UAAU,EACV,QAAQ,EAQR,WAAW,EAQZ,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,cAAc,EAAsB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAuBtC,qBAAa,aAAa;IAEtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa;IAFvB,OAAO;IAKP,MAAM,CAAC,OAAO,CACZ,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IAiHrC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,IAAI;IAuEnB,OAAO,CAAC,KAAK;IAwSb,OAAO,CAAC,OAAO;IAmEf,OAAO,CAAC,MAAM;IAuGd,OAAO,CAAC,GAAG;IAuEX,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;IAwDtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAUjC;IAGF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IA8JnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;CA0N5B;AA0GD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,GACnB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAchC"}