@keltoi/hydra 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keltoi/hydra",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Boilerplate to start your API from zero using Repository Pattern",
   "main": "index.js",
   "scripts": {

package/src/handler/index.js

@@ -1,3 +1,4 @@
+import AppError from "../model/error";
 import Context from "../repository/db/context";
 
 export default class Handler {
@@ -12,6 +13,6 @@ export default class Handler {
 
     handle(){}
     handleError({ code, message }) {
-        return Promise.reject({ code, message });
+        return Promise.reject(new AppError({ code, message }));
     }
 }

package/src/index.js

@@ -1,3 +1,4 @@
+import AppError from './model/error.js'
 import Traced from './model/traced.js'
 import Logged from './model/logged.js'
 import Model from './model/index.js'
@@ -18,6 +19,7 @@ import runWhenTrue from './helper/runWhenTrue.js'
 import runWhenFalse from './helper/runWhenFalse.js'
 
 export {
+    AppError,
     Model,
     Thing,
     Traced,

package/src/model/error.js

@@ -0,0 +1,23 @@
+class AppError {
+    #code
+    #message
+
+    constructor({ code=0, message='' }) {
+        this.#code = code
+        this.#message = message
+    }
+
+    get view() {
+        return {
+            code: this.code,
+            message: this.message
+        }
+    }
+
+    get code() { return this.#code }
+    get message() { return this.#message }
+
+
+}
+
+export default AppError

package/src/model/logged.js

@@ -1,7 +1,5 @@
-import knex, { Knex, TableBuilder } from "knex"
+import knex, { TableBuilder } from "knex"
 import Model from "./index.js"
-import createTableIfNotExists from "../helper/runWhenTrue.js"
-import runWhenTrue from "../helper/runWhenTrue.js"
 import runWhenFalse from "../helper/runWhenFalse.js"
 
 export default class Logged extends Model{

package/src/model/status.js

@@ -1,6 +1,5 @@
 import knex, { TableBuilder } from "knex"
 import Model from "."
-import runWhenTrue from "../helper/runWhenTrue"
 import runWhenFalse from "../helper/runWhenFalse"
 
 export default class Status extends Model{

package/src/model/thing.js

@@ -1,7 +1,6 @@
 import knex, { TableBuilder } from "knex";
 import Model from "./index.js";
 import runWhenFalse from "../helper/runWhenFalse.js";
-import runWhenTrue from "../helper/runWhenTrue.js";
 
 
 export default class Thing extends Model{

package/src/repository/db/context.js

@@ -29,8 +29,6 @@ export default class Context{
     async terraform(models=[]){
         const promises = models.map(async model=>model.makeMe(this.#db))
 
-        console.log('Terraforming...')
-
         await Promise.all(promises)
     }
 }

package/src/repository/db/index.js

@@ -1,6 +1,7 @@
 import knex from "knex";
 import Model from "../../model/index.js";
 import Context from "./context.js";
+import AppError from "../../model/error.js";
 
 
 export default class Repository{
@@ -13,7 +14,7 @@ export default class Repository{
     static anyOrError(model,err={code:0,message:''}){
         if (!!model) return model
 
-        throw err;
+        throw new AppError(err);
     }
 
     static setOrEmpty(array=[],modeling=(e)=>e){
@@ -67,11 +68,15 @@ export default class Repository{
         this.myContext()
             .where(model.key)
             .first()
-            .then(model=>Repository.anyOrError(model,{code:404,message:'Not found'}))
+            .then(model=>Repository
+                .anyOrError(model,{code:404,message:'Not found'})
+            )
             .then(this.Entity.build) 
 
     list = ()=>
         this.myContext()
             .select()
-            .then(result=>Repository.setOrEmpty(result,this.Entity.build))
+            .then(result=>Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 }

package/src/repository/db/linked.js

@@ -12,7 +12,6 @@ export default class DbLinked {
         this.#name  = link.name
         this.myContext = () => context.db(this.#name)
         this.#linking = link
-        
     }
 
     createBatch = (linkings=[ new Linking() ])=>

package/src/repository/db/loggedRepository.js

@@ -1,3 +1,4 @@
+import AbstractError from '../../model/error.js';
 import Logged from '../../model/logged.js';
 import Context from './context.js';
 import Repository from './index.js';
@@ -7,34 +8,34 @@ export default class LoggedRepository extends Repository{
         super(model,context)
     }
 
-    get = (logged = new Logged())=>
+    get = (logged = new Logged()) =>
         this.myContext()
             .where({...logged.key})
             .first()
             .then(model => Repository.anyOrError(model,{code:404,message:'Not found'}))
             .then(this.Entity.build)
 
-    before = (date = new Date(), order = 'asc')=>
+    before = (date = new Date(), order = 'asc') =>
         this.myContext()
             .where('createdAt','<',date.toISOString())
             .select()
             .orderBy('createdAt',order)
             .then(result => Repository.setOrEmpty(result,this.Entity.build))
 
-    after = (date = new Date(), order = 'asc')=>
+    after = (date = new Date(), order = 'asc') =>
         this.myContext()
             .where('createdAt','>',date.toISOString())
             .select()
             .orderBy('createdAt',order)
             .then(result => Repository.setOrEmpty(result,this.Entity.build))
 
-    list = (order='asc')=>
+    list = (order='asc') =>
         this.myContext()
             .select()
             .orderBy('createdAt',order)
             .then(result => Repository.setOrEmpty(result,this.Entity.build))
 
-    insert = (logged = new Logged())=>
+    insert = (logged = new Logged()) =>
         this.myContext()
             .insert({
                 ...logged.entity,
@@ -43,7 +44,7 @@ export default class LoggedRepository extends Repository{
             .then(ids => logged.key = ids[0])
             .then(() => logged)
 
-    create = (logged = new Logged())=>
+    create = (logged = new Logged()) =>
         this.myContext()
             .insert({
                 ...logged.entity,
@@ -51,8 +52,8 @@ export default class LoggedRepository extends Repository{
             })
             .then(() => logged)
 
-    update = ()=> Promise.reject(new Error('Cannot update a logged object'))
+    update = () => Promise.reject(new AbstractError({code:400,message:'Cannot update a logged object'}))
 
-    delete = ()=> Promise.reject(new Error('Cannot delete a logged object'))
+    delete = () => Promise.reject(new AbstractError({code:400,message:'Cannot delete a logged object'}))
     
 }

package/src/repository/db/thingRepository.js

@@ -7,9 +7,11 @@ export default class ThingRepository extends Repository{
         super(model,context)
     }
 
-    getByName=(name='')=>
+    getByName = (name='') =>
         this.myContext()
             .where({name})
             .select()
-            .then(result=>Repository.setOrEmpty(result,this.Entity.build))
+            .then(result=>Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 }

package/src/repository/db/tracedRepository.js

@@ -7,51 +7,63 @@ export default class TracedRepository extends Repository{
         super(model,context)
     }
 
-    deceased = (order = 'asc')=>
+    deceased = (order = 'asc') =>
         this.myContext()
             .where({active:false})
             .select()
             .orderBy(['createdAt','updatedAt'],order)
-            .then(result => Repository.setOrEmpty(result,this.Entity.build))
+            .then(result => Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 
-    before = (date = new Date(), order = 'asc')=>
+    before = (date = new Date(), order = 'asc') =>
         this.myContext()
             .where('createdAt','<',date.toISOString())
             .where({active:true})
             .select()
             .orderBy(['createdAt','updatedAt'],order)
-            .then(result => Repository.setOrEmpty(result,this.Entity.build))
+            .then(result => Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 
-    after = (date=new Date(), order = 'asc')=>
+    after = (date=new Date(), order = 'asc') =>
         this.myContext()
             .where('createdAt','>',date.toISOString())
             .where({active:true})
             .select()
             .orderBy(['createdAt','updatedAt'],order)
-            .then(result => Repository.setOrEmpty(result,this.Entity.build))
+            .then(result => Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 
-    list = (order = 'asc')=>
+    list = (order = 'asc') =>
         this.myContext()
             .where({active:true})
             .select()
             .orderBy(['createdAt','updatedAt'],order)
-            .then(result => Repository.setOrEmpty(result,this.Entity.build))
+            .then(result => Repository
+                .setOrEmpty(result,this.Entity.build)
+            )
 
-    last = ()=>
+    last = () =>
         this.myContext()
             .where({active:true})
             .first()
             .orderBy('createdAt',"desc")
-            .then(result => Repository.anyOrError(result,{code:404,message:'Not found'}))
+            .then(result => Repository
+                .anyOrError(result,{code:404,message:'Not found'})
+            )
 
-    first = ()=>
+    first = () =>
         this.myContext()
             .where({active:true})
             .first()
             .orderBy('createdAt',"asc")
-            .then(result => Repository.anyOrError(result,{code:404,message:'Not found'}))
+            .then(result => Repository
+                .anyOrError(result,{code:404,message:'Not found'})
+            )
 
-    insert = (traced=new Traced())=>
+    insert = (traced=new Traced()) =>
         this.myContext()
             .insert({ 
                 ...traced.entity, 

package/src/service/index.js

@@ -1,3 +1,4 @@
+import AppError from "../model/error"
 import Context from "../repository/db/context"
 
 export default class Service {
@@ -8,6 +9,6 @@ export default class Service {
 
     get context(){return this.#context}    
 
-    handleError = (code,message)=>Promise.reject({code,message})
+    handleError = (code,message)=>Promise.reject(new AppError({code,message}))
     handleFailure = (err)=> this.handleError({code:500,message:err.message})
 }