anote-server-libs 0.2.3 → 0.2.7

package/models/repository/ModelDao.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelDao = exports.promiseAllStepN = void 0;
+exports.ModelDao = exports.Dao = exports.promiseAllStepN = void 0;
 function promiseAllStepN(n, list) {
     if (!list || !list.length)
         return Promise.resolve([]);
@@ -74,13 +74,6 @@ class Dao {
             return request.query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=@' + (this.nFields + 1)).then(() => instance.id);
         }
     }
-    replace(instance, client) {
-        if (instance.archivedOn)
-            return Promise.reject('Record archived!');
-        return this.create({ ...instance, replaced_id: instance.id }, client).then(id => {
-            return this.archive(instance.id, id, client).then(() => id);
-        });
-    }
     create(instance, client) {
         instance.createdOn = instance.updatedOn = new Date();
         if (this.pool) {
@@ -117,6 +110,7 @@ class Dao {
         }));
     }
 }
+exports.Dao = Dao;
 class ModelDao extends Dao {
     get(id, client, lock = true) {
         if (this.pool) {
@@ -224,6 +218,13 @@ class ModelDao extends Dao {
             return request.query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=@1 WHERE id=@2');
         }
     }
+    replace(instance, client) {
+        if (instance.archivedOn)
+            return Promise.reject('Record archived!');
+        return this.create({ ...instance, replaced_id: instance.id }, client).then(id => {
+            return this.archive(instance.id, id, client).then(() => id);
+        });
+    }
     delete(id, client) {
         if (this.pool) {
             return client.query('DELETE FROM ' + this.table + ' WHERE id=$1', [id]);

package/models/repository/ModelDao.ts

@@ -58,7 +58,7 @@ export interface ViewCount<T> {
     count: number;
 }
 
-abstract class Dao<R, T extends Model<R>> implements ModelRepr {
+export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
     constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger, public table: string, protected nFields: number,
                 protected updateDefinition: string) {
     }
@@ -96,13 +96,6 @@ abstract class Dao<R, T extends Model<R>> implements ModelRepr {
         }
     }
 
-    replace(this: ModelDao<R, T>, instance: T, client: ClientBase | Transaction): Promise<R> {
-        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
-        return this.create({...instance, replaced_id: instance.id}, client).then(id => {
-            return this.archive(instance.id, id, client).then(() => id);
-        });
-    }
-
     create(instance: T, client?: ClientBase | Transaction): Promise<R> {
         (<any>instance).createdOn = instance.updatedOn = new Date();
         if(this.pool) {
@@ -247,6 +240,13 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
         }
     }
 
+    replace(instance: T, client: ClientBase | Transaction): Promise<R> {
+        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
+        return this.create({...instance, replaced_id: instance.id}, client).then(id => {
+            return this.archive(instance.id, id, client).then(() => id);
+        });
+    }
+
     delete(id: R, client: ClientBase | Transaction): Promise<any> {
         if(this.pool) {
             return (<ClientBase>client).query('DELETE FROM ' + this.table + ' WHERE id=$1', [id]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.2.3",
+  "version": "0.2.7",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -24,10 +24,10 @@
     "pg": "8.7.3"
   },
   "peerDependencies": {
-    "express": "4.17.2",
-    "jsonschema": "1.4.0",
-    "node-forge": "1.2.1",
-    "winston": "3.5.1"
+    "express": "^4.17.3",
+    "jsonschema": "^1.4.0",
+    "node-forge": "^1.2.1",
+    "winston": "3.6.0"
   },
   "devDependencies": {
     "@types/express": "4.17.13",