unconventional 1.3.1 → 1.4.0

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

@@ -27,7 +27,7 @@ export declare class BaseService<M extends typeof BaseModel> {
     /**
      * Gets all instances of the document
      * @param config - An object containing pagination and sorting options.
-     * @param config.limit - The maximum number of documents to return.
+     * @param config.limit - The maximum number of documents to return. Default 12. Negative limits return all documents.
      * @param config.cursor - The id of the document to start the query from.
      * @param config.sort - An object containing the fields to sort by and their sort order.
      * @param config.filters - A string containing the fields to filter by and their values.

package/dist/core/base.service.js

@@ -79,7 +79,7 @@ class BaseService {
     /**
      * Gets all instances of the document
      * @param config - An object containing pagination and sorting options.
-     * @param config.limit - The maximum number of documents to return.
+     * @param config.limit - The maximum number of documents to return. Default 12. Negative limits return all documents.
      * @param config.cursor - The id of the document to start the query from.
      * @param config.sort - An object containing the fields to sort by and their sort order.
      * @param config.filters - A string containing the fields to filter by and their values.
@@ -92,7 +92,7 @@ class BaseService {
             page = await base_cache_1.BaseCache.getPage(cache, this.model, modifiers);
         }
         if (!page) {
-            const limit = modifiers.limit || 12;
+            const limit = modifiers.limit ? (modifiers.limit > 0 ? modifiers.limit : undefined) : 12;
             page = await this.model.findMany({ limit, ...modifiers });
             if (cache) {
                 await base_cache_1.BaseCache.setPage(cache, page, modifiers, cacheTTL);

package/dist/types/decorator.types.d.ts

@@ -39,7 +39,7 @@ export interface Relation<Target extends typeof BaseModel = any, Source extends
     /** The type of relation */
     type: RelationType;
     /** The model to relate to */
-    model: Target;
+    model: Target | (() => Target);
     /** The field on this model to use for the relation */
     from: keyof InstanceType<Source>;
     /** The field on the related model to use for the relation */

package/dist/utils/db.utils.js

@@ -19,16 +19,17 @@ function getExpand(model, expand) {
         const relation = propSummary[parent]?.relation;
         if (!relation)
             throw api_error_1.APIError.errInvalidQueryParameter(`Invalid expansion: ${parent}`);
+        const relationModel = (relation.model.toString().startsWith('class')) ? relation.model : relation.model();
         expansions[parent] = {
             type: [decorator_types_1.RelationType.HasOne, decorator_types_1.RelationType.BelongsTo].includes(relation.type) ? unconventional_pg_queries_1.OneOrMany.One : unconventional_pg_queries_1.OneOrMany.Many,
             fromTable: model.collection,
             fromField: relation.from.toString(),
-            toTable: relation.model.collection,
+            toTable: relationModel.collection,
             toField: relation.to.toString(),
             throughTable: relation.through?.model.collection,
             throughFromField: relation.through?.from.toString(),
             throughToField: relation.through?.to.toString(),
-            expand: children ? getExpand(relation.model, children) : undefined
+            expand: children ? getExpand(relationModel, children) : undefined
         };
     });
     return expansions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A complete server built on Cloudflare Workers/Pages",
   "keywords": [
     "cloudflare",
@@ -38,7 +38,10 @@
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
-    "docs:serve": "vitepress serve docs"
+    "docs:serve": "vitepress serve docs",
+    "release:major": "changelog -M && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version major && git push origin && git push origin --tags",
+    "release:minor": "changelog -m && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version minor && git push origin && git push origin --tags",
+    "release:patch": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version patch && git push origin && git push origin --tags"
   },
   "peerDependencies": {
     "hono": "^4",