anote-server-libs 0.6.1 → 0.6.2

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/models/ApiCall.js

@@ -4,6 +4,9 @@ exports.ApiCallRepository = void 0;
 const mssql_1 = require("mssql");
 const ModelDao_1 = require("./repository/ModelDao");
 class ApiCallRepository extends ModelDao_1.ModelDao {
+    pool;
+    poolMssql;
+    logger;
     constructor(pool, poolMssql, logger) {
         super(pool, poolMssql, logger, 'api_call', 5, pool ? 'id=$1,"updatedOn"=$2,"responseCode"=$3,"responseJson"=$4,"expiresAt"=$5' :
             'id=@1,"updatedOn"=@2,"responseCode"=@3,"responseJson"=@4,"expiresAt"=@5');

package/models/Migration.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationRepository = void 0;
 const ModelDao_1 = require("./repository/ModelDao");
 class MigrationRepository extends ModelDao_1.ModelDao {
+    pool;
+    poolMssql;
+    logger;
     constructor(pool, poolMssql, logger) {
         super(pool, poolMssql, logger, 'migration', 5, pool ? 'id=$1,hash=$2,"sqlUp"=$3,"sqlDown"=$4,state=$5' :
             'id=@1,hash=@2,"sqlUp"=@3,"sqlDown"=@4,state=@5');

package/models/repository/BaseModelRepository.js

@@ -6,6 +6,13 @@ const fs = require("fs");
 const ApiCall_1 = require("../ApiCall");
 const Migration_1 = require("../Migration");
 class BaseModelRepository {
+    db;
+    dbSpare;
+    dbMssql;
+    logger;
+    cache;
+    Migration;
+    ApiCall;
     constructor(db, dbSpare, dbMssql, logger, cache) {
         this.db = db;
         this.dbSpare = dbSpare;

package/models/repository/MemoryCache.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryCache = void 0;
 class MemoryCache {
+    localKey;
+    cache;
+    localCache = {};
     constructor(localKey, cache) {
         this.localKey = localKey;
         this.cache = cache;
-        this.localCache = {};
     }
     list() {
         if (this.cache)

package/models/repository/MemoryCache.ts

@@ -2,7 +2,7 @@ import * as Memcached from 'memcached';
 
 export class MemoryCache<T> {
 
-    private localCache = {};
+    private localCache: {[id: string]: any} = {};
 
     constructor(private localKey: string, private cache?: Memcached) {
     }

package/models/repository/ModelDao.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelDao = exports.Dao = exports.promiseAllStepN = void 0;
+exports.ModelDao = exports.Dao = void 0;
+exports.promiseAllStepN = promiseAllStepN;
 function promiseAllStepN(n, list) {
     if (!list || !list.length)
         return Promise.resolve([]);
@@ -41,9 +42,14 @@ function promiseAllStepN(n, list) {
         }
     });
 }
-exports.promiseAllStepN = promiseAllStepN;
 Promise.allConcurrent = (n) => (list) => promiseAllStepN(n, list);
 class Dao {
+    pool;
+    poolMssql;
+    logger;
+    table;
+    nFields;
+    updateDefinition;
     constructor(pool, poolMssql, logger, table, nFields, updateDefinition) {
         this.pool = pool;
         this.poolMssql = poolMssql;
@@ -100,7 +106,7 @@ class Dao {
             const request = (client || this.poolMssql).request();
             this.serialize(instance, request);
             return request.query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=@\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
-                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then(q => {
+                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then((q) => {
                 return q.recordsets[0][0].id || instance.id;
             });
         }
@@ -129,7 +135,7 @@ class ModelDao extends Dao {
         else {
             const request = (client || this.poolMssql).request();
             request.input('1', id);
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then((q) => this.buildObject(q.recordsets[0][0]));
         }
     }
     count(where, inputs = [], client) {
@@ -140,7 +146,7 @@ class ModelDao extends Dao {
             const request = (client || this.poolMssql).request();
             if (where)
                 where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then(q => q.recordsets[0][0].cnt);
+            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then((q) => q.recordsets[0][0].cnt);
         }
     }
     getList(ids, client, lock = true) {
@@ -152,7 +158,7 @@ class ModelDao extends Dao {
             const request = (client || this.poolMssql).request();
             return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id IN ('
                 + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
-                .then(q => q.recordsets[0].map((r) => this.buildObject(r)));
+                .then((q) => q.recordsets[0].map((r) => this.buildObject(r)));
         }
     }
     getAllBy(order, offset, limit, where, inputs = [], client, lock = true) {
@@ -167,7 +173,7 @@ class ModelDao extends Dao {
                 where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                 + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
-                .then(q => q.recordsets[0].map((r) => this.buildObject(r)));
+                .then((q) => q.recordsets[0].map((r) => this.buildObject(r)));
         }
     }
     getViewCountBy(order, offset, limit, where, inputs = [], client, lock = true) {

package/models/repository/ModelDao.ts

@@ -73,7 +73,7 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
     }
 
     groupResultSet(q: any[], key: string): any[][] {
-        const storage = {};
+        const storage: any = {};
         for(let i = 0; i < q.length; i++) {
             storage[q[i][key]] = storage[q[i][key]] || [];
             storage[q[i][key]].push(q[i]);
@@ -82,7 +82,7 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
     }
 
     groupResultSetBy(q: any[], key: (qs: any) => string): any[][] {
-        const storage = {};
+        const storage: any = {};
         for(let i = 0; i < q.length; i++) {
             storage[key(q[i])] = storage[key(q[i])] || [];
             storage[key(q[i])].push(q[i]);
@@ -120,7 +120,7 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             this.serialize(instance, request);
             return request.query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=@\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
-                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then(q => {
+                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then((q: any) => {
                     return q.recordsets[0][0].id || instance.id;
                 });
         }
@@ -153,7 +153,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
         } else {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             request.input('1', id);
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then((q: any) => this.buildObject(q.recordsets[0][0]));
         }
     }
 
@@ -163,7 +163,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
         } else {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then(q => q.recordsets[0][0].cnt);
+            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then((q: any) => q.recordsets[0][0].cnt);
         }
     }
 
@@ -175,7 +175,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id IN ('
                 + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
-                .then(q => q.recordsets[0].map((r: any) => this.buildObject(r)));
+                .then((q: any) => q.recordsets[0].map((r: any) => this.buildObject(r)));
         }
     }
 
@@ -189,7 +189,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                 + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
-                .then(q => q.recordsets[0].map((r: any) => this.buildObject(r)));
+                .then((q: any) => q.recordsets[0].map((r: any) => this.buildObject(r)));
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -19,10 +19,10 @@
     "@types/memcached": "2.2.10",
     "@types/mssql": "9.1.5",
     "@types/pg": "8.11.6",
-    "ajv": "8.13.0",
+    "ajv": "8.16.0",
     "memcached": "2.2.2",
-    "mssql": "10.0.2",
-    "pg": "8.11.5"
+    "mssql": "11.0.0",
+    "pg": "8.12.0"
   },
   "peerDependencies": {
     "express": "4.19.2",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.21",
-    "@types/node": "18.15.0",
-    "typescript": "5.4.5"
+    "@types/node": "20.12.2",
+    "typescript": "5.5.2"
   }
 }

package/services/WithBody.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WithBody = exports.ajv = void 0;
+exports.ajv = void 0;
+exports.WithBody = WithBody;
 const ajv_1 = require("ajv");
 exports.ajv = new ajv_1.default();
 exports.ajv.addKeyword({
@@ -60,4 +61,3 @@ function WithBody(schema) {
         return undefined;
     };
 }
-exports.WithBody = WithBody;

package/services/WithTransaction.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withTransaction = exports.withTransactionConfig = void 0;
+exports.withTransactionConfig = void 0;
+exports.withTransaction = withTransaction;
 const utils_1 = require("./utils");
 exports.withTransactionConfig = {
     timeoutMillis: 15000
@@ -136,4 +137,3 @@ function withTransaction(repo, logger, previousMethod, lock) {
         });
     };
 }
-exports.withTransaction = withTransaction;

package/services/utils.js

@@ -1,18 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.digitize = exports.fpEuros = exports.sendSelfPostableMessage = exports.idempotent = exports.jsonStringify = exports.lcm = exports.gcd = exports.utils = exports.clientErrorHandle = exports.btoa = exports.atob = void 0;
+exports.utils = void 0;
+exports.atob = atob;
+exports.btoa = btoa;
+exports.clientErrorHandle = clientErrorHandle;
+exports.gcd = gcd;
+exports.lcm = lcm;
+exports.jsonStringify = jsonStringify;
+exports.idempotent = idempotent;
+exports.sendSelfPostableMessage = sendSelfPostableMessage;
+exports.fpEuros = fpEuros;
+exports.digitize = digitize;
 function atob(str) {
     return Buffer.from(str, 'base64').toString('binary');
 }
-exports.atob = atob;
 function btoa(str) {
     return Buffer.from(str).toString('base64');
 }
-exports.btoa = btoa;
 function clientErrorHandle(err) {
     this.error('Error on DB client: %j', err);
 }
-exports.clientErrorHandle = clientErrorHandle;
 exports.utils = {
     clientErrorHandler: undefined
 };
@@ -27,7 +34,6 @@ function gcd(values) {
         result = gcdTwo(values[i], result);
     return result;
 }
-exports.gcd = gcd;
 function lcm(values) {
     let l = 1, divisor = 2;
     while (true) {
@@ -59,7 +65,6 @@ function lcm(values) {
         }
     }
 }
-exports.lcm = lcm;
 function jsonStringify(obj) {
     const cache = {};
     return JSON.stringify(obj, function (_, value) {
@@ -77,7 +82,6 @@ function jsonStringify(obj) {
         return value;
     });
 }
-exports.jsonStringify = jsonStringify;
 function idempotent(repo, debug, logger) {
     return function (req, res, next) {
         let idempotenceKey = req.header('x-idempotent-key');
@@ -138,7 +142,6 @@ function idempotent(repo, debug, logger) {
             next();
     };
 }
-exports.idempotent = idempotent;
 function sendSelfPostableMessage(res, code, messageType, err) {
     res.type('text/html').status(code).write(`
 <!DOCTYPE HTML>
@@ -159,11 +162,9 @@ function sendSelfPostableMessage(res, code, messageType, err) {
     `);
     res.end();
 }
-exports.sendSelfPostableMessage = sendSelfPostableMessage;
 function fpEuros(n) {
     return Math.round(n * 100) / 100;
 }
-exports.fpEuros = fpEuros;
 function digitize(value, opts) {
     if (value === undefined || value === null)
         return 'undefined';
@@ -194,4 +195,3 @@ function digitize(value, opts) {
     }
     return (opts && opts.currency) ? (parts[0] + '.00') : parts[0];
 }
-exports.digitize = digitize;

package/tsconfig.json

@@ -16,7 +16,7 @@
     "skipLibCheck": true,
     "suppressImplicitAnyIndexErrors": true,
     "ignoreDeprecations": "5.0",
-    "target": "es2021",
+    "target": "es2022",
     "typeRoots": [
       "node_modules/@types"
     ]