@sprucelabs/postgres-data-store 5.1.174 → 6.0.1

package/build/PostgresDatabase.js

@@ -29,8 +29,11 @@ const schema_1 = require("@sprucelabs/schema");
 const pg_1 = require("pg");
 const QueryBuilder_1 = __importStar(require("./QueryBuilder"));
 class PostgresDatabase {
+    connectionString;
+    client;
+    idCount = 1;
+    queries;
     constructor(connectionString) {
-        this.idCount = 1;
         (0, schema_1.assertOptions)({ connectionString }, ['connectionString']);
         this.connectionString = connectionString;
         this.queries = QueryBuilder_1.default.Builder();
@@ -44,16 +47,15 @@ class PostgresDatabase {
             : `${this.idCount++}`;
     }
     async update(collection, query, updates) {
-        var _a;
         const { sql, values } = this.queries.update(collection, query, updates, false);
         const results = await this.client.query({
             text: sql,
             values,
         });
-        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
+        return results.rowCount ?? 0;
     }
     async count(collection, query) {
-        const { sql, values } = this.queries.find(collection, query !== null && query !== void 0 ? query : {}, {
+        const { sql, values } = this.queries.find(collection, query ?? {}, {
             includeFields: ['count(*) as count'],
         });
         const results = await this.client.query({
@@ -81,7 +83,7 @@ class PostgresDatabase {
         return record;
     }
     async find(collection, query, options) {
-        const { sql, values } = this.queries.find(collection, query !== null && query !== void 0 ? query : {}, options);
+        const { sql, values } = this.queries.find(collection, query ?? {}, options);
         const results = await this.client.query({
             text: sql,
             values,
@@ -95,18 +97,19 @@ class PostgresDatabase {
         return this.executeGetIndexes(collectionName, false);
     }
     async findOne(collection, query, options) {
-        var _a;
-        const results = await this.find(collection, query, Object.assign(Object.assign({}, options), { limit: 1 }));
-        return (_a = results[0]) !== null && _a !== void 0 ? _a : null;
+        const results = await this.find(collection, query, {
+            ...options,
+            limit: 1,
+        });
+        return results[0] ?? null;
     }
     async delete(collection, query) {
-        var _a;
         const { sql, values } = this.queries.delete(collection, query);
         const results = await this.client.query({
             text: sql,
             values,
         });
-        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
+        return results.rowCount ?? 0;
     }
     async dropDatabase() {
         await this.truncateTables();
@@ -148,19 +151,18 @@ class PostgresDatabase {
         }
     }
     async deleteOne(collection, query) {
-        var _a;
         if (!query.id) {
             const match = await this.findOne(collection, query, {
                 includeFields: ['id'],
             });
-            query = { id: match === null || match === void 0 ? void 0 : match.id };
+            query = { id: match?.id };
         }
         let { sql, values } = this.queries.delete(collection, query);
         const results = await this.client.query({
             text: sql,
             values,
         });
-        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
+        return results.rowCount ?? 0;
     }
     async truncateTables() {
         const res = await this.client.query(`
@@ -193,7 +195,7 @@ class PostgresDatabase {
             return results;
         }
         catch (err) {
-            const parsed = this.parseIndexViolatedForFieldsAndValues(err === null || err === void 0 ? void 0 : err.detail);
+            const parsed = this.parseIndexViolatedForFieldsAndValues(err?.detail);
             if (parsed) {
                 const { fields, values } = parsed;
                 throw new data_stores_1.DataStoresError({
@@ -208,7 +210,6 @@ class PostgresDatabase {
         }
     }
     async connect() {
-        var _a, _b, _c;
         this.client = new pg_1.Client({
             connectionString: this.connectionString,
         });
@@ -217,14 +218,14 @@ class PostgresDatabase {
         }
         catch (err) {
             const message = err.message;
-            if ((_b = ((_a = err.code) !== null && _a !== void 0 ? _a : message)) === null || _b === void 0 ? void 0 : _b.includes('ECONNREFUSED')) {
+            if ((err.code ?? message)?.includes('ECONNREFUSED')) {
                 throw new data_stores_1.DataStoresError({
                     code: 'UNABLE_TO_CONNECT_TO_DB',
                     originalError: err,
                 });
             }
-            if (message === null || message === void 0 ? void 0 : message.includes('does not exist')) {
-                const match = (_c = message.match(/"([^"]*)"/)) !== null && _c !== void 0 ? _c : ['', ''];
+            if (message?.includes('does not exist')) {
+                const match = message.match(/"([^"]*)"/) ?? ['', ''];
                 throw new data_stores_1.DataStoresError({
                     code: 'INVALID_DATABASE_NAME',
                     suppliedName: match[1],
@@ -283,12 +284,11 @@ class PostgresDatabase {
         const indexesToRemove = existingIndexes.filter((existing) => !indexes.find((index) => this.areIndexesEqual(existing, index)));
         await Promise.all([
             ...indexesToAdd.map(async (index) => {
-                var _a;
                 try {
                     await this.executeCreateIndex(collectionName, index, isUnique);
                 }
                 catch (err) {
-                    if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) !== 'INDEX_EXISTS') {
+                    if (err.options?.code !== 'INDEX_EXISTS') {
                         throw new data_stores_1.DataStoresError({
                             code: 'DUPLICATE_KEY',
                             originalError: err,
@@ -309,7 +309,6 @@ class PostgresDatabase {
         await this.executeCreateIndex(collection, fields, isUnique);
     }
     async executeCreateIndex(collection, fields, 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})`;
@@ -319,7 +318,7 @@ class PostgresDatabase {
             });
         }
         catch (err) {
-            if ((_b = (_a = err.message) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'already exists')) {
+            if (err.message?.includes?.('already exists')) {
                 throw new data_stores_1.DataStoresError({
                     code: 'INDEX_EXISTS',
                     collectionName: collection,
@@ -348,12 +347,14 @@ class PostgresDatabase {
         await this.client.end();
     }
     isConnected() {
-        //@ts-ignore
-        return this.client ? this.client._connected && !this.client._ending : false;
+        return this.client
+            ? //@ts-ignore
+                this.client._connected && !this.client._ending
+            : false;
     }
     parseIndexViolatedForFieldsAndValues(input) {
         const regex = /Key \((.*)\)=\((.*)\) already exists\./;
-        const matches = input === null || input === void 0 ? void 0 : input.match(regex);
+        const matches = input?.match(regex);
         if (!matches) {
             return null;
         }
@@ -370,12 +371,11 @@ class PostgresDatabase {
         return result;
     }
     async query(query, params) {
-        var _a;
         const results = await this.client.query({
             text: query,
             values: params,
         });
-        return (_a = results === null || results === void 0 ? void 0 : results.rows) !== null && _a !== void 0 ? _a : [];
+        return results?.rows ?? [];
     }
 }
 exports.default = PostgresDatabase;

package/build/QueryBuilder.js

@@ -7,7 +7,7 @@ class QueryBuilder {
         return new this();
     }
     find(tableName, query, options) {
-        const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? options : {};
+        const { includeFields, limit, skip, sort } = options ?? {};
         const fields = this.buildColumnListFromIncludeFields(includeFields);
         let sql = `SELECT ${fields} FROM ${this.buildTableName(tableName)}`;
         const { values, sql: where } = this.optionallyBuildWhere(query);
@@ -31,7 +31,7 @@ class QueryBuilder {
         let sql = '';
         const values = [];
         const queryKeys = Object.keys(query);
-        if ((queryKeys !== null && queryKeys !== void 0 ? queryKeys : []).length > 0) {
+        if ((queryKeys ?? []).length > 0) {
             const { set: columnSpecs, values: whereValues } = this.buildSetClause({
                 query,
                 startingCount: startingPlaceholderCount,
@@ -52,33 +52,33 @@ class QueryBuilder {
             let value = query[k];
             const isNull = value === null && useIsNull;
             const formattedK = this.conditionalQuote(k);
-            if (value === null || value === void 0 ? void 0 : value.$in) {
+            if (value?.$in) {
                 values.push(...value.$in.map((v) => this.normalizeValue(v)));
                 set.push(`${formattedK} IN (${value.$in
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
-            else if (value === null || value === void 0 ? void 0 : value.$regex) {
+            else if (value?.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);
             }
-            else if (value === null || value === void 0 ? void 0 : value.$lte) {
+            else if (value?.$lte) {
                 values.push(this.normalizeValue(value.$lte));
                 set.push(`${formattedK} <= $${++placeholderCount}`);
             }
-            else if (value === null || value === void 0 ? void 0 : value.$lt) {
+            else if (value?.$lt) {
                 values.push(this.normalizeValue(value.$lt));
                 set.push(`${formattedK} < $${++placeholderCount}`);
             }
-            else if (value === null || value === void 0 ? void 0 : value.$gte) {
+            else if (value?.$gte) {
                 values.push(this.normalizeValue(value.$gte));
                 set.push(`${formattedK} >= $${++placeholderCount}`);
             }
-            else if (value === null || value === void 0 ? void 0 : value.$gt) {
+            else if (value?.$gt) {
                 values.push(this.normalizeValue(value.$gt));
                 set.push(`${formattedK} > $${++placeholderCount}`);
             }
-            else if (typeof (value === null || value === void 0 ? void 0 : value.$ne) !== 'undefined') {
+            else if (typeof value?.$ne !== 'undefined') {
                 const v = value.$ne;
                 v !== null && values.push(this.normalizeValue(v));
                 set.push(`${formattedK} ${v === null ? 'IS NOT NULL' : `!= $${++placeholderCount}`}`);
@@ -168,7 +168,8 @@ class QueryBuilder {
             fields.forEach((f) => {
                 values.push(this.fieldValueToSqlValue(record, f));
                 let placeholder = `$${++placeholderCount}`;
-                if (this.isValueObject(record[f]) && !Array.isArray(record[f])) {
+                if (this.isValueObject(record[f]) &&
+                    !Array.isArray(record[f])) {
                     placeholder += `::json`;
                 }
                 placeholders.push(placeholder);
@@ -195,10 +196,11 @@ class QueryBuilder {
                 value = JSON.stringify(value);
             }
         }
-        return value !== null && value !== void 0 ? value : null;
+        return value ?? null;
     }
     isValueObject(value) {
-        return value !== null && (Array.isArray(value) || typeof value === 'object');
+        return (value !== null &&
+            (Array.isArray(value) || typeof value === 'object'));
     }
     buildColumnListFromAllRecords(records) {
         const fields = records.map((r) => Object.keys(r)).flat();
@@ -225,7 +227,9 @@ class QueryBuilder {
         return '';
     }
     buildColumnListFromIncludeFields(includeFields) {
-        return !includeFields ? '*' : includeFields.map((f) => quote(f)).join(', ');
+        return !includeFields
+            ? '*'
+            : includeFields.map((f) => quote(f)).join(', ');
     }
     update(tableName, query, updates, shouldReturnUpdatedRecords = true) {
         const { set: set, values } = this.buildSetClause({
@@ -248,7 +252,7 @@ class QueryBuilder {
     }
     delete(tableName, query) {
         let sql = `DELETE FROM ${this.buildTableName(tableName)}`;
-        const { values, sql: where } = this.optionallyBuildWhere(query !== null && query !== void 0 ? query : {});
+        const { values, sql: where } = this.optionallyBuildWhere(query ?? {});
         sql += where;
         this.log('delete', sql, values);
         return {
@@ -258,7 +262,7 @@ class QueryBuilder {
     }
     upsert(tableName, query, updates) {
         let { sql, values } = this.createWithoutReturning(tableName, [
-            Object.assign(Object.assign({}, query), updates),
+            { ...query, ...updates },
         ]);
         const { sql: whereSql, values: whereValues } = this.optionallyBuildWhere(query, values.length);
         const queryFields = this.buildColumnListFromAllRecords([query]);

package/build/esm/PostgresDatabase.js

@@ -390,8 +390,10 @@ export default class PostgresDatabase {
         });
     }
     isConnected() {
-        //@ts-ignore
-        return this.client ? this.client._connected && !this.client._ending : false;
+        return this.client
+            ? //@ts-ignore
+                this.client._connected && !this.client._ending
+            : false;
     }
     parseIndexViolatedForFieldsAndValues(input) {
         const regex = /Key \((.*)\)=\((.*)\) already exists\./;

package/build/esm/QueryBuilder.js

@@ -165,7 +165,8 @@ export default class QueryBuilder {
             fields.forEach((f) => {
                 values.push(this.fieldValueToSqlValue(record, f));
                 let placeholder = `$${++placeholderCount}`;
-                if (this.isValueObject(record[f]) && !Array.isArray(record[f])) {
+                if (this.isValueObject(record[f]) &&
+                    !Array.isArray(record[f])) {
                     placeholder += `::json`;
                 }
                 placeholders.push(placeholder);
@@ -195,7 +196,8 @@ export default class QueryBuilder {
         return value !== null && value !== void 0 ? value : null;
     }
     isValueObject(value) {
-        return value !== null && (Array.isArray(value) || typeof value === 'object');
+        return (value !== null &&
+            (Array.isArray(value) || typeof value === 'object'));
     }
     buildColumnListFromAllRecords(records) {
         const fields = records.map((r) => Object.keys(r)).flat();
@@ -222,7 +224,9 @@ export default class QueryBuilder {
         return '';
     }
     buildColumnListFromIncludeFields(includeFields) {
-        return !includeFields ? '*' : includeFields.map((f) => quote(f)).join(', ');
+        return !includeFields
+            ? '*'
+            : includeFields.map((f) => quote(f)).join(', ');
     }
     update(tableName, query, updates, shouldReturnUpdatedRecords = true) {
         const { set: set, values } = this.buildSetClause({

package/package.json

@@ -4,7 +4,8 @@
   "skill": {
     "namespace": "postgres-data-store",
     "upgradeIgnoreList": [
-      "@sprucelabs/spruce-core-schemas"
+      "@sprucelabs/spruce-core-schemas",
+      "@sprucelabs/spruce-test-fixtures"
     ]
   },
   "files": [
@@ -20,7 +21,7 @@
     "sprucebot",
     "sprucelabs"
   ],
-  "version": "5.1.174",
+  "version": "6.0.1",
   "scripts": {
     "build.ci": "yarn build.tsc && yarn build.resolve-paths && yarn lint",
     "build.dev": "yarn build.tsc --sourceMap ; yarn resolve-paths.lint",
@@ -34,8 +35,8 @@
     "clean.build": "rm -rf build/",
     "clean.dependencies": "rm -rf node_modules/ package-lock.json yarn.lock",
     "clean.dist": "rm -rf build/__tests__ build/esm/__tests__",
-    "fix.lint": "eslint --fix --cache '**/*.ts'",
-    "lint": "eslint --cache '**/*.ts'",
+    "fix.lint": "eslint --fix --cache",
+    "lint": "eslint --cache",
     "lint.tsc": "tsc -p . --noEmit",
     "post.watch.build": "yarn build.copy-files && yarn build.resolve-paths",
     "rebuild": "yarn clean.all && yarn && yarn build.dev",
@@ -49,30 +50,29 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^26.4.89",
-    "@sprucelabs/schema": "^29.4.60",
+    "@sprucelabs/data-stores": "^27.0.0",
+    "@sprucelabs/schema": "^30.0.0",
     "pg": "^8.11.5"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^5.0.200",
+    "@sprucelabs/esm-postbuild": "^6.0.1",
     "@sprucelabs/jest-json-reporter": "^7.0.207",
-    "@sprucelabs/resolve-path-aliases": "^1.1.304",
-    "@sprucelabs/semantic-release": "^4.0.8",
-    "@sprucelabs/spruce-test-fixtures": "^61.1.33",
-    "@sprucelabs/test": "^8.0.50",
-    "@sprucelabs/test-utils": "^4.0.157",
-    "@types/node": "^20.12.4",
-    "@types/pg": "^8.11.4",
+    "@sprucelabs/resolve-path-aliases": "^2.0.3",
+    "@sprucelabs/semantic-release": "^5.0.1",
+    "@sprucelabs/test": "^9.0.2",
+    "@sprucelabs/test-utils": "^5.0.1",
+    "@types/node": "^20.12.7",
+    "@types/pg": "^8.11.5",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.57.0",
-    "eslint-config-spruce": "^10.13.6",
+    "eslint": "^9.0.0",
+    "eslint-config-spruce": "^11.2.5",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "jest": {
     "testRunner": "jest-circus/runner",