@sprucelabs/postgres-data-store 6.0.69 → 6.1.1

package/build/PostgresDatabase.d.ts

@@ -30,15 +30,13 @@ export default class PostgresDatabase implements Database {
     connect(): Promise<void>;
     getUniqueIndexes(collectionName: string): Promise<UniqueIndex[]>;
     private executeGetIndexes;
-    dropIndex(collectionName: string, fields: UniqueIndex): Promise<void>;
+    dropIndex(collectionName: string, index: UniqueIndex): Promise<void>;
     syncIndexes(collectionName: string, indexes: Index[]): Promise<void>;
     syncUniqueIndexes(collectionName: string, indexes: UniqueIndex[]): Promise<void>;
     private executeSyncIndexes;
     private areIndexesEqual;
     createUniqueIndex(collection: string, fields: UniqueIndex): Promise<void>;
     private executeCreateIndex;
-    private generateKeyExpressions;
-    private generateKeyExpression;
     private generateIndexName;
     close(): Promise<void>;
     isConnected(): boolean;

package/build/PostgresDatabase.js

@@ -1,33 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = require("crypto");
 const data_stores_1 = require("@sprucelabs/data-stores");
 const schema_1 = require("@sprucelabs/schema");
 const pg_1 = require("pg");
-const QueryBuilder_1 = __importStar(require("./QueryBuilder"));
+const indexUtils_1 = require("./indexUtils");
+const QueryBuilder_1 = __importDefault(require("./QueryBuilder"));
 class PostgresDatabase {
     constructor(connectionString) {
         this.idCount = 1;
@@ -258,8 +239,8 @@ class PostgresDatabase {
         });
         return uniqueIndexes;
     }
-    async dropIndex(collectionName, fields) {
-        const indexName = this.generateIndexName(collectionName, fields);
+    async dropIndex(collectionName, index) {
+        const indexName = this.generateIndexName(collectionName, index);
         const query = `DROP INDEX ${indexName}`;
         try {
             await this.client.query({
@@ -269,7 +250,7 @@ class PostgresDatabase {
         catch (err) {
             throw new data_stores_1.DataStoresError({
                 code: 'INDEX_NOT_FOUND',
-                missingIndex: fields,
+                missingIndex: (0, data_stores_1.normalizeIndex)(index).fields,
                 collectionName,
             });
         }
@@ -311,11 +292,9 @@ class PostgresDatabase {
         const isUnique = true;
         await this.executeCreateIndex(collection, fields, isUnique);
     }
-    async executeCreateIndex(collection, fields, isUnique) {
+    async executeCreateIndex(collection, index, isUnique) {
         var _a, _b;
-        const indexName = this.generateIndexName(collection, fields);
-        const keys = this.generateKeyExpressions(fields);
-        const query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${collection}" (${keys})`;
+        const { sql: query } = this.queries.createIndex(collection, index, isUnique);
         try {
             await this.client.query({
                 text: query,
@@ -332,20 +311,8 @@ class PostgresDatabase {
             throw err;
         }
     }
-    generateKeyExpressions(fields) {
-        return fields.map((f) => this.generateKeyExpression(f)).join(', ');
-    }
-    generateKeyExpression(field) {
-        if (field.includes('.')) {
-            const parts = field.split('.');
-            return `(${parts[0]}->>'${parts[1]}')`;
-        }
-        return (0, QueryBuilder_1.quote)(field);
-    }
-    generateIndexName(collection, fields) {
-        return `${collection}_${fields
-            .map((f) => f.toLowerCase())
-            .join('_')}${'_index'}`.replace(/\./g, '_');
+    generateIndexName(collection, index) {
+        return (0, indexUtils_1.generateIndexName)(collection, index);
     }
     async close() {
         await this.client.end();

package/build/QueryBuilder.d.ts

@@ -1,14 +1,15 @@
-import { QueryOptions } from '@sprucelabs/data-stores';
+import { QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
 import { Query } from './postgres.types';
 export default class QueryBuilder {
     private constructor();
     static Builder(): QueryBuilder;
+    createIndex(tableName: string, index: UniqueIndex, isUnique?: boolean): BuiltQuery;
     find(tableName: string, query: Query, options?: QueryOptions): BuiltQuery;
     buildTableName(tableName: string): string;
     private conditionalQuote;
     private get shouldQuote();
     private optionallyBuildWhere;
-    private buildSetClause;
+    private buildEqualityClause;
     private buildSetClausFor$Or;
     create(tableName: string, records: Record<string, any>[]): BuiltQuery;
     private log;

package/build/QueryBuilder.js

@@ -1,11 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quote = void 0;
+const data_stores_1 = require("@sprucelabs/data-stores");
+const indexUtils_1 = require("./indexUtils");
 class QueryBuilder {
     constructor() { }
     static Builder() {
         return new this();
     }
+    createIndex(tableName, index, isUnique = false) {
+        const { fields, filter } = (0, data_stores_1.normalizeIndex)(index);
+        const indexName = (0, indexUtils_1.generateIndexName)(tableName, index);
+        const keys = (0, indexUtils_1.generateKeyExpressions)(fields);
+        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${tableName}" (${keys})`;
+        if (filter) {
+            const { sql: where } = this.optionallyBuildWhere(filter);
+            debugger;
+            query += where;
+        }
+        return { sql: query, values: [] };
+    }
     find(tableName, query, options) {
         const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? options : {};
         const fields = this.buildColumnListFromIncludeFields(includeFields);
@@ -32,7 +46,7 @@ class QueryBuilder {
         const values = [];
         const queryKeys = Object.keys(query);
         if ((queryKeys !== null && queryKeys !== void 0 ? queryKeys : []).length > 0) {
-            const { set: columnSpecs, values: whereValues } = this.buildSetClause({
+            const { set: columnSpecs, values: whereValues } = this.buildEqualityClause({
                 query,
                 startingCount: startingPlaceholderCount,
                 isBuildingWhere: true,
@@ -42,7 +56,7 @@ class QueryBuilder {
         }
         return { values, sql };
     }
-    buildSetClause(options) {
+    buildEqualityClause(options) {
         const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, useIsNull = true, } = options;
         let placeholderCount = startingCount;
         const queryKeys = Object.keys(query);
@@ -58,6 +72,9 @@ class QueryBuilder {
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
+            else if (value === null || value === void 0 ? void 0 : value.$exists) {
+                set.push(`${formattedK} IS NOT NULL`);
+            }
             else if (value === null || value === void 0 ? void 0 : value.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);
@@ -89,7 +106,7 @@ class QueryBuilder {
                 values.push(...orValues);
             }
             else if (k === '$push') {
-                const sub = this.buildSetClause({
+                const sub = this.buildEqualityClause({
                     query: value,
                     startingCount: placeholderCount++,
                     placeholderTemplate: '"{{fieldName}}" || ARRAY[${{count}}]',
@@ -127,7 +144,7 @@ class QueryBuilder {
         const ors = [];
         const orValues = [];
         value.forEach((q) => {
-            const { set: where, values } = this.buildSetClause({
+            const { set: where, values } = this.buildEqualityClause({
                 query: q,
                 startingCount: placeholderCount++,
             });
@@ -232,7 +249,7 @@ class QueryBuilder {
             : includeFields.map((f) => quote(f)).join(', ');
     }
     update(tableName, query, updates, shouldReturnUpdatedRecords = true) {
-        const { set: set, values } = this.buildSetClause({
+        const { set: set, values } = this.buildEqualityClause({
             query: updates,
             startingCount: 0,
             useIsNull: false,

package/build/esm/PostgresDatabase.d.ts

@@ -30,15 +30,13 @@ export default class PostgresDatabase implements Database {
     connect(): Promise<void>;
     getUniqueIndexes(collectionName: string): Promise<UniqueIndex[]>;
     private executeGetIndexes;
-    dropIndex(collectionName: string, fields: UniqueIndex): Promise<void>;
+    dropIndex(collectionName: string, index: UniqueIndex): Promise<void>;
     syncIndexes(collectionName: string, indexes: Index[]): Promise<void>;
     syncUniqueIndexes(collectionName: string, indexes: UniqueIndex[]): Promise<void>;
     private executeSyncIndexes;
     private areIndexesEqual;
     createUniqueIndex(collection: string, fields: UniqueIndex): Promise<void>;
     private executeCreateIndex;
-    private generateKeyExpressions;
-    private generateKeyExpression;
     private generateIndexName;
     close(): Promise<void>;
     isConnected(): boolean;

package/build/esm/PostgresDatabase.js

@@ -8,10 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { randomUUID } from 'crypto';
-import { DataStoresError, } from '@sprucelabs/data-stores';
+import { DataStoresError, normalizeIndex, } from '@sprucelabs/data-stores';
 import { assertOptions } from '@sprucelabs/schema';
 import { Client } from 'pg';
-import QueryBuilder, { quote } from './QueryBuilder.js';
+import { generateIndexName } from './indexUtils.js';
+import QueryBuilder from './QueryBuilder.js';
 export default class PostgresDatabase {
     constructor(connectionString) {
         this.idCount = 1;
@@ -283,9 +284,9 @@ export default class PostgresDatabase {
             return uniqueIndexes;
         });
     }
-    dropIndex(collectionName, fields) {
+    dropIndex(collectionName, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            const indexName = this.generateIndexName(collectionName, fields);
+            const indexName = this.generateIndexName(collectionName, index);
             const query = `DROP INDEX ${indexName}`;
             try {
                 yield this.client.query({
@@ -295,7 +296,7 @@ export default class PostgresDatabase {
             catch (err) {
                 throw new DataStoresError({
                     code: 'INDEX_NOT_FOUND',
-                    missingIndex: fields,
+                    missingIndex: normalizeIndex(index).fields,
                     collectionName,
                 });
             }
@@ -346,12 +347,10 @@ export default class PostgresDatabase {
             yield this.executeCreateIndex(collection, fields, isUnique);
         });
     }
-    executeCreateIndex(collection, fields, isUnique) {
+    executeCreateIndex(collection, index, isUnique) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const indexName = this.generateIndexName(collection, fields);
-            const keys = this.generateKeyExpressions(fields);
-            const query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${collection}" (${keys})`;
+            const { sql: query } = this.queries.createIndex(collection, index, isUnique);
             try {
                 yield this.client.query({
                     text: query,
@@ -369,20 +368,8 @@ export default class PostgresDatabase {
             }
         });
     }
-    generateKeyExpressions(fields) {
-        return fields.map((f) => this.generateKeyExpression(f)).join(', ');
-    }
-    generateKeyExpression(field) {
-        if (field.includes('.')) {
-            const parts = field.split('.');
-            return `(${parts[0]}->>'${parts[1]}')`;
-        }
-        return quote(field);
-    }
-    generateIndexName(collection, fields) {
-        return `${collection}_${fields
-            .map((f) => f.toLowerCase())
-            .join('_')}${'_index'}`.replace(/\./g, '_');
+    generateIndexName(collection, index) {
+        return generateIndexName(collection, index);
     }
     close() {
         return __awaiter(this, void 0, void 0, function* () {

package/build/esm/QueryBuilder.d.ts

@@ -1,14 +1,15 @@
-import { QueryOptions } from '@sprucelabs/data-stores';
+import { QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
 import { Query } from './postgres.types';
 export default class QueryBuilder {
     private constructor();
     static Builder(): QueryBuilder;
+    createIndex(tableName: string, index: UniqueIndex, isUnique?: boolean): BuiltQuery;
     find(tableName: string, query: Query, options?: QueryOptions): BuiltQuery;
     buildTableName(tableName: string): string;
     private conditionalQuote;
     private get shouldQuote();
     private optionallyBuildWhere;
-    private buildSetClause;
+    private buildEqualityClause;
     private buildSetClausFor$Or;
     create(tableName: string, records: Record<string, any>[]): BuiltQuery;
     private log;

package/build/esm/QueryBuilder.js

@@ -1,8 +1,22 @@
+import { normalizeIndex, } from '@sprucelabs/data-stores';
+import { generateIndexName, generateKeyExpressions } from './indexUtils.js';
 export default class QueryBuilder {
     constructor() { }
     static Builder() {
         return new this();
     }
+    createIndex(tableName, index, isUnique = false) {
+        const { fields, filter } = normalizeIndex(index);
+        const indexName = generateIndexName(tableName, index);
+        const keys = generateKeyExpressions(fields);
+        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${tableName}" (${keys})`;
+        if (filter) {
+            const { sql: where } = this.optionallyBuildWhere(filter);
+            debugger;
+            query += where;
+        }
+        return { sql: query, values: [] };
+    }
     find(tableName, query, options) {
         const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? options : {};
         const fields = this.buildColumnListFromIncludeFields(includeFields);
@@ -29,7 +43,7 @@ export default class QueryBuilder {
         const values = [];
         const queryKeys = Object.keys(query);
         if ((queryKeys !== null && queryKeys !== void 0 ? queryKeys : []).length > 0) {
-            const { set: columnSpecs, values: whereValues } = this.buildSetClause({
+            const { set: columnSpecs, values: whereValues } = this.buildEqualityClause({
                 query,
                 startingCount: startingPlaceholderCount,
                 isBuildingWhere: true,
@@ -39,7 +53,7 @@ export default class QueryBuilder {
         }
         return { values, sql };
     }
-    buildSetClause(options) {
+    buildEqualityClause(options) {
         const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, useIsNull = true, } = options;
         let placeholderCount = startingCount;
         const queryKeys = Object.keys(query);
@@ -55,6 +69,9 @@ export default class QueryBuilder {
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
+            else if (value === null || value === void 0 ? void 0 : value.$exists) {
+                set.push(`${formattedK} IS NOT NULL`);
+            }
             else if (value === null || value === void 0 ? void 0 : value.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);
@@ -86,7 +103,7 @@ export default class QueryBuilder {
                 values.push(...orValues);
             }
             else if (k === '$push') {
-                const sub = this.buildSetClause({
+                const sub = this.buildEqualityClause({
                     query: value,
                     startingCount: placeholderCount++,
                     placeholderTemplate: '"{{fieldName}}" || ARRAY[${{count}}]',
@@ -124,7 +141,7 @@ export default class QueryBuilder {
         const ors = [];
         const orValues = [];
         value.forEach((q) => {
-            const { set: where, values } = this.buildSetClause({
+            const { set: where, values } = this.buildEqualityClause({
                 query: q,
                 startingCount: placeholderCount++,
             });
@@ -229,7 +246,7 @@ export default class QueryBuilder {
             : includeFields.map((f) => quote(f)).join(', ');
     }
     update(tableName, query, updates, shouldReturnUpdatedRecords = true) {
-        const { set: set, values } = this.buildSetClause({
+        const { set: set, values } = this.buildEqualityClause({
             query: updates,
             startingCount: 0,
             useIsNull: false,

package/build/esm/indexUtils.d.ts

@@ -0,0 +1,4 @@
+import { UniqueIndex } from '@sprucelabs/data-stores';
+export declare function generateKeyExpression(field: string): string;
+export declare function generateKeyExpressions(fields: string[]): string;
+export declare function generateIndexName(collection: string, index: UniqueIndex): string;

package/build/esm/indexUtils.js

@@ -0,0 +1,21 @@
+import { normalizeIndex } from '@sprucelabs/data-stores';
+import { quote } from './QueryBuilder.js';
+export function generateKeyExpression(field) {
+    let result;
+    if (field.includes('.')) {
+        const parts = field.split('.');
+        result = `(${parts[0]}->>'${parts[1]}')`;
+    }
+    else {
+        result = quote(field);
+    }
+    return result;
+}
+export function generateKeyExpressions(fields) {
+    return fields.map((f) => generateKeyExpression(f)).join(', ');
+}
+export function generateIndexName(collection, index) {
+    return `${collection}_${normalizeIndex(index)
+        .fields.map((f) => f.toLowerCase())
+        .join('_')}${'_index'}`.replace(/\./g, '_');
+}

package/build/indexUtils.d.ts

@@ -0,0 +1,4 @@
+import { UniqueIndex } from '@sprucelabs/data-stores';
+export declare function generateKeyExpression(field: string): string;
+export declare function generateKeyExpressions(fields: string[]): string;
+export declare function generateIndexName(collection: string, index: UniqueIndex): string;

package/build/indexUtils.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateIndexName = exports.generateKeyExpressions = exports.generateKeyExpression = void 0;
+const data_stores_1 = require("@sprucelabs/data-stores");
+const QueryBuilder_1 = require("./QueryBuilder");
+function generateKeyExpression(field) {
+    let result;
+    if (field.includes('.')) {
+        const parts = field.split('.');
+        result = `(${parts[0]}->>'${parts[1]}')`;
+    }
+    else {
+        result = (0, QueryBuilder_1.quote)(field);
+    }
+    return result;
+}
+exports.generateKeyExpression = generateKeyExpression;
+function generateKeyExpressions(fields) {
+    return fields.map((f) => generateKeyExpression(f)).join(', ');
+}
+exports.generateKeyExpressions = generateKeyExpressions;
+function generateIndexName(collection, index) {
+    return `${collection}_${(0, data_stores_1.normalizeIndex)(index)
+        .fields.map((f) => f.toLowerCase())
+        .join('_')}${'_index'}`.replace(/\./g, '_');
+}
+exports.generateIndexName = generateIndexName;

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@sprucelabs/postgres-data-store",
+  "version": "6.1.1",
   "description": "Postgres production and test adapters for @sprucelabs/data-stores",
   "skill": {
     "namespace": "postgres-data-store",
@@ -21,7 +22,6 @@
     "sprucebot",
     "sprucelabs"
   ],
-  "version": "6.0.69",
   "scripts": {
     "build.ci": "yarn run build.tsc && yarn run build.resolve-paths && yarn run lint",
     "build.dev": "yarn run build.tsc --sourceMap ; yarn run resolve-paths.lint",
@@ -49,22 +49,22 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^28.0.26",
-    "@sprucelabs/schema": "^30.0.61",
+    "@sprucelabs/data-stores": "^28.1.12",
+    "@sprucelabs/schema": "^30.0.66",
     "pg": "^8.11.5"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.26",
-    "@sprucelabs/jest-json-reporter": "^8.0.37",
-    "@sprucelabs/resolve-path-aliases": "^2.0.27",
+    "@sprucelabs/esm-postbuild": "^6.0.29",
+    "@sprucelabs/jest-json-reporter": "^8.0.41",
+    "@sprucelabs/resolve-path-aliases": "^2.0.29",
     "@sprucelabs/semantic-release": "^5.0.1",
-    "@sprucelabs/test": "^9.0.18",
-    "@sprucelabs/test-utils": "^5.0.50",
-    "@types/node": "^20.12.12",
+    "@sprucelabs/test": "^9.0.19",
+    "@sprucelabs/test-utils": "^5.0.55",
+    "@types/node": "^20.13.0",
     "@types/pg": "^8.11.6",
     "chokidar-cli": "^3.0.0",
-    "eslint": "^9.3.0",
-    "eslint-config-spruce": "^11.2.19",
+    "eslint": "^9.4.0",
+    "eslint-config-spruce": "^11.2.20",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.2.5",