unconventional 1.18.0 → 2.0.1

package/dist/core/abstractbase.controller.js

@@ -272,7 +272,7 @@ class AbstractBaseController {
         }
         return {
             headers: ctx.req.raw.headers,
-            waitUntil: ctx.executionCtx.waitUntil,
+            waitUntil: ctx.executionCtx?.waitUntil.bind(ctx.executionCtx),
             body: body,
             params: ctx.req.param(),
             queries: ctx.req.query(),

package/dist/core/base.model.d.ts

@@ -9,12 +9,17 @@ interface BaseModelSchema {
         updatedField: string;
     };
 }
+export declare enum IdType {
+    Number = "number",
+    UUID = "uuid"
+}
 export declare class Document {
     static schema: BaseModelSchema;
 }
 export declare class BaseModel extends Document {
     static collection: string;
     static idField: string;
+    static idType: IdType;
     static keyField?: string;
     static ownerField?: string;
     static db: DB;

package/dist/core/base.model.js

@@ -9,13 +9,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeStamped = exports.BaseModel = exports.Document = void 0;
+exports.TimeStamped = exports.BaseModel = exports.Document = exports.IdType = void 0;
 const unconventional_pg_queries_1 = require("unconventional-pg-queries");
 const prop_decorator_1 = require("../decorators/prop.decorator");
 const timestamp_decorator_1 = require("../decorators/timestamp.decorator");
 const db_types_1 = require("../types/db.types");
 const db_utils_1 = require("../utils/db.utils");
 const utils_1 = require("../utils");
+var IdType;
+(function (IdType) {
+    IdType["Number"] = "number";
+    IdType["UUID"] = "uuid";
+})(IdType || (exports.IdType = IdType = {}));
 class Document {
     static schema = { indexes: [], props: {} };
 }
@@ -23,6 +28,7 @@ exports.Document = Document;
 class BaseModel extends Document {
     static collection;
     static idField = 'id';
+    static idType = IdType.Number;
     static keyField;
     static ownerField;
     static db;
@@ -212,7 +218,7 @@ class BaseModel extends Document {
     }
     /** Gets the field name to use for the provided identifier */
     static getFieldName(identifier) {
-        return !isNaN(+identifier) || (0, utils_1.isUUID)(`${identifier}`)
+        return (this.idType === IdType.Number && !isNaN(+identifier)) || (this.idType === IdType.UUID && (0, utils_1.isUUID)(`${identifier}`))
             ? this.idField
             : this.keyField || undefined;
     }

package/dist/core/base.service.js

@@ -4,6 +4,7 @@ exports.BaseService = void 0;
 const unconventional_pg_queries_1 = require("unconventional-pg-queries");
 const api_error_1 = require("./api-error");
 const base_cache_1 = require("./base.cache");
+const base_model_1 = require("./base.model");
 const db_utils_1 = require("../utils/db.utils");
 const utils_1 = require("../utils");
 class BaseService {
@@ -61,7 +62,7 @@ class BaseService {
             entity = await base_cache_1.BaseCache.getModel(cache, this.model, identifier, modifiers);
         }
         if (!entity) {
-            if (!isNaN(+identifier) || (0, utils_1.isUUID)(`${identifier}`)) {
+            if ((this.model.idType === base_model_1.IdType.Number && !isNaN(+identifier)) || (this.model.idType === base_model_1.IdType.UUID && (0, utils_1.isUUID)(`${identifier}`))) {
                 entity = await this.model.findById(identifier, modifiers);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "1.18.0",
+  "version": "2.0.1",
   "description": "A complete server built on Cloudflare Workers/Pages",
   "keywords": [
     "cloudflare",