unconventional 2.1.0 → 2.3.0

package/dist/core/base.model.js

@@ -42,7 +42,7 @@ class BaseModel extends Document {
             action: db_types_1.SqlAction.Insert,
             type: unconventional_pg_queries_1.OneOrMany.One,
             table: this.collection,
-            conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint),
+            conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint, upsertConfig?.where),
             data: this.prepareData({ ...data, ...timestamp })
         });
         if (!response)
@@ -59,7 +59,7 @@ class BaseModel extends Document {
             action: db_types_1.SqlAction.Insert,
             type: unconventional_pg_queries_1.OneOrMany.Many,
             table: this.collection,
-            conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint),
+            conflict: (0, db_utils_1.getConflict)(this, upsertConfig?.action || unconventional_pg_queries_1.ConflictResolution.doUpdate, upsertConfig?.constraint, upsertConfig?.where),
             data: data.map(item => this.prepareData({ ...item, ...timestamp }))
         });
         if (!response)

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

@@ -18,6 +18,7 @@ interface DownloadResponse {
 export interface UpsertConfig<M extends typeof BaseModel> {
     constraint?: Array<keyof InstanceType<M>>;
     action?: ConflictResolution;
+    where?: string;
 }
 export interface ServiceConfig<M extends typeof BaseModel> {
     cache?: KVNamespace;

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

@@ -7,6 +7,7 @@ export type IndexDefinition<T> = {
 /** Options to pass to MongoDB when creating an Index */
 export interface IndexOptions {
     unique?: boolean;
+    where?: string;
 }
 /**
  * Type for the Values stored in the Reflection for Indexes

package/dist/utils/db.utils.d.ts

@@ -9,7 +9,7 @@ export declare function getOrder<T extends typeof BaseModel>(model: T, sort?: st
 export declare function getPage<T extends typeof BaseModel>(model: T, cursor?: string | number): SqlPaginate | undefined;
 /** Retrieves all non-relational fields from a model for the 'returning' clause of a SQL call */
 export declare function getReturn<T extends typeof BaseModel>(model: T): string[];
-export declare function getConflict<T extends typeof BaseModel>(model: T, action: ConflictResolution, constraint?: Array<keyof InstanceType<T>>): SqlConflict | undefined;
+export declare function getConflict<T extends typeof BaseModel>(model: T, action: ConflictResolution, constraint?: Array<keyof InstanceType<T>>, where?: string): SqlConflict | undefined;
 /** A type-safe way to build filter strings */
 export declare function buildFilter<T>(field: keyof T, operator: SqlWhereOperator, value?: any): string;
 /** Creates expansions for relational filters */

package/dist/utils/db.utils.js

@@ -213,27 +213,32 @@ function getReturn(model) {
     return fields;
 }
 exports.getReturn = getReturn;
-function getConflict(model, action, constraint) {
+function getConflict(model, action, constraint, where) {
     if (!constraint)
         return undefined;
     const indexes = model.schema.indexes;
     for (const index of indexes) {
         const keys = Object.keys(index.definition);
-        if ((0, array_utils_1.equalArrays)(keys, constraint))
-            return { action, constraint: keys };
+        if ((0, array_utils_1.equalArrays)(keys, constraint)) {
+            return { action, constraint: keys, where: where ?? index.options?.where };
+        }
     }
     return undefined;
 }
 exports.getConflict = getConflict;
 /** A type-safe way to build filter strings */
 function buildFilter(field, operator, value) {
+    const quote = (item) => `'${item.replace(/'/g, "''")}'`;
     let formatted = `${value}`;
-    if (typeof value === 'string')
-        formatted = `'${value}'`;
-    else if (Array.isArray(value))
-        formatted = (typeof value[0] === 'string') ? `('${value.join("','")}')` : `(${value.join()})`;
-    else if (value == null || db_types_1.NullSqlOperators.includes(operator))
+    if (value == null || db_types_1.NullSqlOperators.includes(operator)) {
         formatted = '';
+    }
+    else if (typeof value === 'string') {
+        formatted = quote(value);
+    }
+    else if (Array.isArray(value)) {
+        formatted = `(${value.map(item => typeof item === 'string' ? quote(item) : `${item}`).join(',')})`;
+    }
     return `${field} ${operator} ${formatted}`;
 }
 exports.buildFilter = buildFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "A complete server built on Cloudflare Workers/Pages",
   "keywords": [
     "cloudflare",
@@ -46,15 +46,16 @@
   },
   "peerDependencies": {
     "hono": "^4",
-    "unconventional-pg-queries": "^1.7.0"
+    "unconventional-pg-queries": "^2.0.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231121.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
+    "generate-changelog": "^1.8.0",
     "hono": "^4",
     "tsx": "^4.20.6",
     "typescript": "^5.3.3",
-    "unconventional-pg-queries": "^1.7.0"
+    "unconventional-pg-queries": "^2.0.0"
   }
 }