unconventional 1.0.0 → 1.0.2

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

@@ -23,7 +23,7 @@ export declare class BaseModel extends Document {
     static findMany<T extends typeof BaseModel>(this: T, config?: PageConfig & FilterConfig): Promise<Array<InstanceType<T>>>;
     static update<T extends typeof BaseModel>(this: T, id: string | number, data: Partial<InstanceType<T>>): Promise<InstanceType<T> | null>;
     static updateMany<T extends typeof BaseModel>(this: T, data: Partial<InstanceType<T>>[]): Promise<InstanceType<T>[] | null>;
-    static delete<T extends typeof BaseModel>(this: T, id: string): Promise<InstanceType<T> | null>;
+    static delete<T extends typeof BaseModel>(this: T, id: string | number): Promise<InstanceType<T> | null>;
     static deleteMany<T extends typeof BaseModel>(this: T, config?: FilterConfig): Promise<InstanceType<T>[] | null>;
     static count<T extends typeof BaseModel>(this: T): Promise<number | null>;
     static fromDatabaseJson<T extends typeof BaseModel>(this: T, json: object): InstanceType<T>;

package/dist/core/base.model.js

@@ -94,12 +94,15 @@ class BaseModel extends Document {
     }
     static async update(id, data) {
         const timestamp = this.schema.timestamped ? { updatedAt: new Date() } : {};
-        delete data[this.idField];
+        const targetField = isNaN(+id) ? this.keyField : this.idField;
+        if (!targetField)
+            return null;
+        delete data[targetField];
         const response = await this.db.fetch({
             action: db_types_1.SqlAction.Update,
             type: unconventional_pg_queries_1.OneOrMany.One,
             table: this.collection,
-            where: [{ field: this.idField, operator: unconventional_pg_queries_1.SqlWhereOperator.Eq, value: id }],
+            where: [{ field: targetField, operator: unconventional_pg_queries_1.SqlWhereOperator.Eq, value: id }],
             data: { ...data, ...timestamp }
         });
         if (!response)
@@ -120,11 +123,14 @@ class BaseModel extends Document {
         return response.map(item => this.fromDatabaseJson(item));
     }
     static async delete(id) {
+        const targetField = isNaN(+id) ? this.keyField : this.idField;
+        if (!targetField)
+            return null;
         const response = await this.db.fetch({
             action: db_types_1.SqlAction.Delete,
             type: unconventional_pg_queries_1.OneOrMany.One,
             table: this.collection,
-            where: [{ field: this.idField, operator: unconventional_pg_queries_1.SqlWhereOperator.Eq, value: id }]
+            where: [{ field: targetField, operator: unconventional_pg_queries_1.SqlWhereOperator.Eq, value: id }]
         });
         if (!response)
             return null;

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

@@ -40,7 +40,7 @@ export declare class BaseService<M extends typeof BaseModel> {
      * @param data - An object containing all the fields to be modified and their new values.
      * @returns The updated document.
      */
-    update(identifier: string, data: Partial<InstanceType<M>>, config?: ServiceConfig<M>): Promise<InstanceType<M>>;
+    update(identifier: string | number, data: Partial<InstanceType<M>>, config?: ServiceConfig<M>): Promise<InstanceType<M>>;
     /**
      * Patches all fields provided in the array of documents. Certain fields may be restricted.
      * @param data - An array of objects containing all the fields to be modified and their new values.
@@ -49,10 +49,10 @@ export declare class BaseService<M extends typeof BaseModel> {
     updateMany(data: Partial<InstanceType<M>>[], config?: ServiceConfig<M>): Promise<InstanceType<M>[]>;
     /**
      * Deletes the document with the given identifier.
-     * @param identifier - The id or key of a document. If type is a valid MongoDB ObjectID, lookup will be done with the model's idColumn. Otherwise, keyColumn is used.
+     * @param identifier - The id or key of a document. If type is number, lookup will be done with the model's idColumn. Otherwise, keyColumn is used.
      * @returns The deleted document.
      */
-    delete(identifier: string, config?: ServiceConfig<M>): Promise<InstanceType<M>>;
+    delete(identifier: string | number, config?: ServiceConfig<M>): Promise<InstanceType<M>>;
     /**
      * Deletes the documents identified by config.filter.
      * @returns An array of the deleted documents.

package/dist/core/base.service.js

@@ -138,7 +138,7 @@ class BaseService {
     }
     /**
      * Deletes the document with the given identifier.
-     * @param identifier - The id or key of a document. If type is a valid MongoDB ObjectID, lookup will be done with the model's idColumn. Otherwise, keyColumn is used.
+     * @param identifier - The id or key of a document. If type is number, lookup will be done with the model's idColumn. Otherwise, keyColumn is used.
      * @returns The deleted document.
      */
     async delete(identifier, config) {

package/dist/types/api.types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
-import { Handler, Input } from "hono";
+import { Handler, Input, Env as HonoEnv } from "hono";
 export declare enum Query {
     Expand = "expand"
 }
@@ -22,7 +22,7 @@ export type Variables = {
     [BaseEnvKey.ownerId]?: number;
     [BaseEnvKey.isPrivileged]?: boolean;
 };
-export type Env<V extends object = {}, B extends object = {}> = {
+export type Env<V extends object = {}, B extends object = {}> = HonoEnv & {
     Bindings: Bindings & B;
     Variables: Variables & V;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A complete server built on Cloudflare Pages Functions",
   "keywords": [
     "cloudflare",