@sprucelabs/postgres-data-store 6.0.8 → 6.0.10

package/build/PostgresDatabase.js

@@ -29,11 +29,8 @@ 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();
@@ -47,15 +44,16 @@ 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 results.rowCount ?? 0;
+        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
     }
     async count(collection, query) {
-        const { sql, values } = this.queries.find(collection, query ?? {}, {
+        const { sql, values } = this.queries.find(collection, query !== null && query !== void 0 ? query : {}, {
             includeFields: ['count(*) as count'],
         });
         const results = await this.client.query({
@@ -83,7 +81,7 @@ class PostgresDatabase {
         return record;
     }
     async find(collection, query, options) {
-        const { sql, values } = this.queries.find(collection, query ?? {}, options);
+        const { sql, values } = this.queries.find(collection, query !== null && query !== void 0 ? query : {}, options);
         const results = await this.client.query({
             text: sql,
             values,
@@ -97,19 +95,21 @@ class PostgresDatabase {
         return this.executeGetIndexes(collectionName, false);
     }
     async findOne(collection, query, options) {
+        var _a;
         const results = await this.find(collection, query, {
             ...options,
             limit: 1,
         });
-        return results[0] ?? null;
+        return (_a = results[0]) !== null && _a !== void 0 ? _a : 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 results.rowCount ?? 0;
+        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
     }
     async dropDatabase() {
         await this.truncateTables();
@@ -151,18 +151,19 @@ class PostgresDatabase {
         }
     }
     async deleteOne(collection, query) {
+        var _a;
         if (!query.id) {
             const match = await this.findOne(collection, query, {
                 includeFields: ['id'],
             });
-            query = { id: match?.id };
+            query = { id: match === null || match === void 0 ? void 0 : match.id };
         }
         let { sql, values } = this.queries.delete(collection, query);
         const results = await this.client.query({
             text: sql,
             values,
         });
-        return results.rowCount ?? 0;
+        return (_a = results.rowCount) !== null && _a !== void 0 ? _a : 0;
     }
     async truncateTables() {
         const res = await this.client.query(`
@@ -195,7 +196,7 @@ class PostgresDatabase {
             return results;
         }
         catch (err) {
-            const parsed = this.parseIndexViolatedForFieldsAndValues(err?.detail);
+            const parsed = this.parseIndexViolatedForFieldsAndValues(err === null || err === void 0 ? void 0 : err.detail);
             if (parsed) {
                 const { fields, values } = parsed;
                 throw new data_stores_1.DataStoresError({
@@ -210,6 +211,7 @@ class PostgresDatabase {
         }
     }
     async connect() {
+        var _a, _b, _c;
         this.client = new pg_1.Client({
             connectionString: this.connectionString,
         });
@@ -218,14 +220,14 @@ class PostgresDatabase {
         }
         catch (err) {
             const message = err.message;
-            if ((err.code ?? message)?.includes('ECONNREFUSED')) {
+            if ((_b = ((_a = err.code) !== null && _a !== void 0 ? _a : message)) === null || _b === void 0 ? void 0 : _b.includes('ECONNREFUSED')) {
                 throw new data_stores_1.DataStoresError({
                     code: 'UNABLE_TO_CONNECT_TO_DB',
                     originalError: err,
                 });
             }
-            if (message?.includes('does not exist')) {
-                const match = message.match(/"([^"]*)"/) ?? ['', ''];
+            if (message === null || message === void 0 ? void 0 : message.includes('does not exist')) {
+                const match = (_c = message.match(/"([^"]*)"/)) !== null && _c !== void 0 ? _c : ['', ''];
                 throw new data_stores_1.DataStoresError({
                     code: 'INVALID_DATABASE_NAME',
                     suppliedName: match[1],
@@ -284,11 +286,12 @@ 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 (err.options?.code !== 'INDEX_EXISTS') {
+                    if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) !== 'INDEX_EXISTS') {
                         throw new data_stores_1.DataStoresError({
                             code: 'DUPLICATE_KEY',
                             originalError: err,
@@ -309,6 +312,7 @@ 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})`;
@@ -318,7 +322,7 @@ class PostgresDatabase {
             });
         }
         catch (err) {
-            if (err.message?.includes?.('already exists')) {
+            if ((_b = (_a = err.message) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'already exists')) {
                 throw new data_stores_1.DataStoresError({
                     code: 'INDEX_EXISTS',
                     collectionName: collection,
@@ -354,7 +358,7 @@ class PostgresDatabase {
     }
     parseIndexViolatedForFieldsAndValues(input) {
         const regex = /Key \((.*)\)=\((.*)\) already exists\./;
-        const matches = input?.match(regex);
+        const matches = input === null || input === void 0 ? void 0 : input.match(regex);
         if (!matches) {
             return null;
         }
@@ -371,11 +375,12 @@ class PostgresDatabase {
         return result;
     }
     async query(query, params) {
+        var _a;
         const results = await this.client.query({
             text: query,
             values: params,
         });
-        return results?.rows ?? [];
+        return (_a = results === null || results === void 0 ? void 0 : results.rows) !== null && _a !== void 0 ? _a : [];
     }
 }
 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 ?? {};
+        const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? 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 ?? []).length > 0) {
+        if ((queryKeys !== null && queryKeys !== void 0 ? 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?.$in) {
+            if (value === null || value === void 0 ? void 0 : value.$in) {
                 values.push(...value.$in.map((v) => this.normalizeValue(v)));
                 set.push(`${formattedK} IN (${value.$in
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
-            else if (value?.$regex) {
+            else if (value === null || value === void 0 ? void 0 : value.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);
             }
-            else if (value?.$lte) {
+            else if (value === null || value === void 0 ? void 0 : value.$lte) {
                 values.push(this.normalizeValue(value.$lte));
                 set.push(`${formattedK} <= $${++placeholderCount}`);
             }
-            else if (value?.$lt) {
+            else if (value === null || value === void 0 ? void 0 : value.$lt) {
                 values.push(this.normalizeValue(value.$lt));
                 set.push(`${formattedK} < $${++placeholderCount}`);
             }
-            else if (value?.$gte) {
+            else if (value === null || value === void 0 ? void 0 : value.$gte) {
                 values.push(this.normalizeValue(value.$gte));
                 set.push(`${formattedK} >= $${++placeholderCount}`);
             }
-            else if (value?.$gt) {
+            else if (value === null || value === void 0 ? void 0 : value.$gt) {
                 values.push(this.normalizeValue(value.$gt));
                 set.push(`${formattedK} > $${++placeholderCount}`);
             }
-            else if (typeof value?.$ne !== 'undefined') {
+            else if (typeof (value === null || value === void 0 ? void 0 : value.$ne) !== 'undefined') {
                 const v = value.$ne;
                 v !== null && values.push(this.normalizeValue(v));
                 set.push(`${formattedK} ${v === null ? 'IS NOT NULL' : `!= $${++placeholderCount}`}`);
@@ -196,7 +196,7 @@ class QueryBuilder {
                 value = JSON.stringify(value);
             }
         }
-        return value ?? null;
+        return value !== null && value !== void 0 ? value : null;
     }
     isValueObject(value) {
         return (value !== null &&
@@ -252,7 +252,7 @@ class QueryBuilder {
     }
     delete(tableName, query) {
         let sql = `DELETE FROM ${this.buildTableName(tableName)}`;
-        const { values, sql: where } = this.optionallyBuildWhere(query ?? {});
+        const { values, sql: where } = this.optionallyBuildWhere(query !== null && query !== void 0 ? query : {});
         sql += where;
         this.log('delete', sql, values);
         return {

package/package.json

@@ -21,7 +21,7 @@
     "sprucebot",
     "sprucelabs"
   ],
-  "version": "6.0.8",
+  "version": "6.0.10",
   "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",
@@ -50,17 +50,17 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^27.0.7",
-    "@sprucelabs/schema": "^30.0.10",
+    "@sprucelabs/data-stores": "^27.0.8",
+    "@sprucelabs/schema": "^30.0.12",
     "pg": "^8.11.5"
   },
   "devDependencies": {
     "@sprucelabs/esm-postbuild": "^6.0.8",
-    "@sprucelabs/jest-json-reporter": "^8.0.6",
+    "@sprucelabs/jest-json-reporter": "^8.0.7",
     "@sprucelabs/resolve-path-aliases": "^2.0.10",
     "@sprucelabs/semantic-release": "^5.0.1",
     "@sprucelabs/test": "^9.0.6",
-    "@sprucelabs/test-utils": "^5.0.8",
+    "@sprucelabs/test-utils": "^5.0.9",
     "@types/node": "^20.12.7",
     "@types/pg": "^8.11.5",
     "chokidar-cli": "^3.0.0",