cloesce 0.1.0 → 0.1.1

package/dist/cli.js

@@ -6,7 +6,7 @@ import path from "node:path";
 import { command, run, subcommands, flag, string, positional, option, optional, } from "cmd-ts";
 import { Project } from "ts-morph";
 import { CidlExtractor } from "./extractor/extract.js";
-import { ExtractorError, ExtractorErrorCode, getErrorInfo, } from "./extractor/err.js";
+import { ExtractorErrorCode, getErrorInfo, } from "./extractor/err.js";
 let debugPhase = "npm cloesce";
 function debug(...args) {
     console.log(`[${debugPhase}]: `, ...args);
@@ -177,7 +177,8 @@ async function extract(config, args = {}) {
     }));
     const fileCount = project.getSourceFiles().length;
     if (fileCount === 0) {
-        new ExtractorError(ExtractorErrorCode.MissingFile);
+        console.warn("No .cloesce.ts files found in the specified paths.");
+        process.exit(1);
     }
     debug(`Found ${fileCount} .cloesce.ts files`);
     try {

package/dist/extractor/err.d.ts

@@ -7,15 +7,12 @@ export declare enum ExtractorErrorCode {
     InvalidPropertyModifier = 5,
     InvalidApiMethodModifier = 6,
     InvalidSelectorSyntax = 7,
-    InvalidOneToOneSelector = 8,
-    InvalidNavigationProperty = 9,
-    TooManyWranglerEnvs = 10,
-    MissingFile = 11,
-    InvalidServiceProperty = 12,
-    InvalidTypescriptSyntax = 13,
-    MissingKValue = 14,
-    MissingR2ObjectBody = 15,
-    InvalidServiceInitializer = 16
+    InvalidNavigationProperty = 8,
+    TooManyWranglerEnvs = 9,
+    InvalidTypescriptSyntax = 10,
+    MissingKValue = 11,
+    MissingR2ObjectBody = 12,
+    InvalidServiceInitializer = 13
 }
 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,WAAW,IAAA;IACX,WAAW,IAAA;IACX,mBAAmB,IAAA;IACnB,2BAA2B,IAAA;IAC3B,uBAAuB,IAAA;IACvB,wBAAwB,IAAA;IACxB,qBAAqB,IAAA;IACrB,uBAAuB,IAAA;IACvB,yBAAyB,IAAA;IACzB,mBAAmB,KAAA;IACnB,WAAW,KAAA;IACX,sBAAsB,KAAA;IACtB,uBAAuB,KAAA;IACvB,aAAa,KAAA;IACb,mBAAmB,KAAA;IACnB,yBAAyB,KAAA;CAC1B;AAwFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,kBAAkB;iBApFpC,MAAM;gBAAc,MAAM;EAsF1C;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,uBAAuB,IAAA;IACvB,wBAAwB,IAAA;IACxB,qBAAqB,IAAA;IACrB,yBAAyB,IAAA;IACzB,mBAAmB,IAAA;IACnB,uBAAuB,KAAA;IACvB,aAAa,KAAA;IACb,mBAAmB,KAAA;IACnB,yBAAyB,KAAA;CAC1B;AAyED,wBAAgB,YAAY,CAAC,IAAI,EAAE,kBAAkB;iBArEpC,MAAM;gBAAc,MAAM;EAuE1C;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

@@ -8,15 +8,12 @@ export var ExtractorErrorCode;
     ExtractorErrorCode[ExtractorErrorCode["InvalidPropertyModifier"] = 5] = "InvalidPropertyModifier";
     ExtractorErrorCode[ExtractorErrorCode["InvalidApiMethodModifier"] = 6] = "InvalidApiMethodModifier";
     ExtractorErrorCode[ExtractorErrorCode["InvalidSelectorSyntax"] = 7] = "InvalidSelectorSyntax";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidOneToOneSelector"] = 8] = "InvalidOneToOneSelector";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidNavigationProperty"] = 9] = "InvalidNavigationProperty";
-    ExtractorErrorCode[ExtractorErrorCode["TooManyWranglerEnvs"] = 10] = "TooManyWranglerEnvs";
-    ExtractorErrorCode[ExtractorErrorCode["MissingFile"] = 11] = "MissingFile";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidServiceProperty"] = 12] = "InvalidServiceProperty";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidTypescriptSyntax"] = 13] = "InvalidTypescriptSyntax";
-    ExtractorErrorCode[ExtractorErrorCode["MissingKValue"] = 14] = "MissingKValue";
-    ExtractorErrorCode[ExtractorErrorCode["MissingR2ObjectBody"] = 15] = "MissingR2ObjectBody";
-    ExtractorErrorCode[ExtractorErrorCode["InvalidServiceInitializer"] = 16] = "InvalidServiceInitializer";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidNavigationProperty"] = 8] = "InvalidNavigationProperty";
+    ExtractorErrorCode[ExtractorErrorCode["TooManyWranglerEnvs"] = 9] = "TooManyWranglerEnvs";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidTypescriptSyntax"] = 10] = "InvalidTypescriptSyntax";
+    ExtractorErrorCode[ExtractorErrorCode["MissingKValue"] = 11] = "MissingKValue";
+    ExtractorErrorCode[ExtractorErrorCode["MissingR2ObjectBody"] = 12] = "MissingR2ObjectBody";
+    ExtractorErrorCode[ExtractorErrorCode["InvalidServiceInitializer"] = 13] = "InvalidServiceInitializer";
 })(ExtractorErrorCode || (ExtractorErrorCode = {}));
 const errorInfoMap = {
     [ExtractorErrorCode.MissingExport]: {
@@ -51,14 +48,6 @@ const errorInfoMap = {
         description: "Too many wrangler environments defined in the project",
         suggestion: "Consolidate or remove unused @WranglerEnv's",
     },
-    [ExtractorErrorCode.MissingFile]: {
-        description: "A specified input file could not be found",
-        suggestion: "Verify the input file path is correct",
-    },
-    [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.",
@@ -75,10 +64,6 @@ const errorInfoMap = {
         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.",

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

@@ -1 +1 @@
-{"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../../src/router/orm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAMnC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAU,MAAM,kBAAkB,CAAC;AAEpE,qBAAa,GAAG;IACM,OAAO,CAAC,GAAG;IAA/B,OAAO;IAEP;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG;IAOjC,OAAO,KAAK,EAAE,GAGb;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,MAAM,EACzB,IAAI,EAAE,UAAU,CAAC,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,CAAC,EAAE;IAwBN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,EAC5B,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAIrC,GACA,MAAM;IA0BT;;;;;;OAMG;IACG,OAAO,CAAC,CAAC,SAAS,MAAM,EAC5B,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAKrC,GACA,OAAO,CAAC,CAAC,CAAC;IAkNb;;;;;;;;;;;;;;;OAeG;IACG,MAAM,CAAC,CAAC,SAAS,MAAM,EAC3B,IAAI,EAAE,UAAU,CAAC,EACjB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EACxB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAqLpB;;;;;;OAMG;IACG,IAAI,CAAC,CAAC,SAAS,MAAM,EACzB,IAAI,EAAE,UAAU,CAAC,EACjB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,OAAO,CAAC,CAAC,EAAE,CAAC;IAqCf;;;;;;;;OAQG;IACG,GAAG,CAAC,CAAC,SAAS,MAAM,EACxB,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,EAAE,CAAC,EAAE,GAAG,CAAC;QACT,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAKrC,GACA,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;CA2CrB"}
+{"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../../src/router/orm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAMnC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAU,MAAM,kBAAkB,CAAC;AAEpE,qBAAa,GAAG;IACM,OAAO,CAAC,GAAG;IAA/B,OAAO;IAEP;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG;IAOjC,OAAO,KAAK,EAAE,GAGb;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,MAAM,EACzB,IAAI,EAAE,UAAU,CAAC,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,CAAC,EAAE;IAwBN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,EAC5B,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAIrC,GACA,MAAM;IA0BT;;;;;;OAMG;IACG,OAAO,CAAC,CAAC,SAAS,MAAM,EAC5B,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAKrC,GACA,OAAO,CAAC,CAAC,CAAC;IAkNb;;;;;;;;;;;;;;;OAeG;IACG,MAAM,CAAC,CAAC,SAAS,MAAM,EAC3B,IAAI,EAAE,UAAU,CAAC,EACjB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EACxB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAoLpB;;;;;;OAMG;IACG,IAAI,CAAC,CAAC,SAAS,MAAM,EACzB,IAAI,EAAE,UAAU,CAAC,EACjB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,OAAO,CAAC,CAAC,EAAE,CAAC;IAqCf;;;;;;;;OAQG;IACG,GAAG,CAAC,CAAC,SAAS,MAAM,EACxB,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,GAAE;QACJ,EAAE,CAAC,EAAE,GAAG,CAAC;QACT,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAKrC,GACA,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;CA2CrB"}

package/dist/router/orm.js

@@ -126,49 +126,6 @@ export class Orm {
         recurse(instance, model, args.includeTree ?? {});
         await Promise.all(promises);
         return instance;
-        async function hydrateKVList(namespace, key, kv, current) {
-            const res = await namespace.list({ prefix: key });
-            if (kv.value.cidl_type === "Stream") {
-                current[kv.value.name] = await Promise.all(res.keys.map(async (k) => {
-                    const stream = await namespace.get(k.name, { type: "stream" });
-                    return Object.assign(new KValue(), {
-                        key: k.name,
-                        raw: stream,
-                        metadata: null,
-                    });
-                }));
-            }
-            else {
-                current[kv.value.name] = await Promise.all(res.keys.map(async (k) => {
-                    const kvRes = await namespace.getWithMetadata(k.name, {
-                        type: "json",
-                    });
-                    return Object.assign(new KValue(), {
-                        key: k.name,
-                        raw: kvRes.value,
-                        metadata: kvRes.metadata,
-                    });
-                }));
-            }
-        }
-        async function hydrateKVSingle(namespace, key, kv, current) {
-            if (kv.value.cidl_type === "Stream") {
-                const res = await namespace.get(key, { type: "stream" });
-                current[kv.value.name] = Object.assign(new KValue(), {
-                    key,
-                    raw: res,
-                    metadata: null,
-                });
-            }
-            else {
-                const res = await namespace.getWithMetadata(key, { type: "json" });
-                current[kv.value.name] = Object.assign(new KValue(), {
-                    key,
-                    raw: res.value,
-                    metadata: res.metadata,
-                });
-            }
-        }
         function recurse(current, meta, includeTree) {
             // Hydrate navigation properties
             for (const navProp of meta.navigation_properties) {
@@ -276,6 +233,49 @@ export class Orm {
                 }
             }
         }
+        async function hydrateKVList(namespace, key, kv, current) {
+            const res = await namespace.list({ prefix: key });
+            if (kv.value.cidl_type === "Stream") {
+                current[kv.value.name] = await Promise.all(res.keys.map(async (k) => {
+                    const stream = await namespace.get(k.name, { type: "stream" });
+                    return Object.assign(new KValue(), {
+                        key: k.name,
+                        raw: stream,
+                        metadata: null,
+                    });
+                }));
+            }
+            else {
+                current[kv.value.name] = await Promise.all(res.keys.map(async (k) => {
+                    const kvRes = await namespace.getWithMetadata(k.name, {
+                        type: "json",
+                    });
+                    return Object.assign(new KValue(), {
+                        key: k.name,
+                        raw: kvRes.value,
+                        metadata: kvRes.metadata,
+                    });
+                }));
+            }
+        }
+        async function hydrateKVSingle(namespace, key, kv, current) {
+            if (kv.value.cidl_type === "Stream") {
+                const res = await namespace.get(key, { type: "stream" });
+                current[kv.value.name] = Object.assign(new KValue(), {
+                    key,
+                    raw: res,
+                    metadata: null,
+                });
+            }
+            else {
+                const res = await namespace.getWithMetadata(key, { type: "json" });
+                current[kv.value.name] = Object.assign(new KValue(), {
+                    key,
+                    raw: res.value,
+                    metadata: res.metadata,
+                });
+            }
+        }
     }
     /**
      * Given a new Model object, performs an upsert operation for D1 and KV.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloesce",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Compile simple TypeScript classes into a full stack Cloudflare project.",
   "type": "module",
   "license": "Apache-2.0",