mevn-orm 2.2.9 → 2.2.13

package/initDb

@@ -1,7 +1,7 @@
 #!/bin/env node
 require('dotenv').config()
 const Knex = require('knex')
-const { development, staging, production } = require('./knexfile')
+const { development, staging, production } = require('./knexfile.cjs')
 let config
 
 switch (process.env.NODE_ENV) {

package/lib/model.js

@@ -1,5 +1,5 @@
 const knex = require('knex').knex
-const { development, staging, production } = require(process.cwd() + '/knexfile.js')
+const { development, staging, production } = require(process.cwd() + '/knexfile.cjs')
 const pluralize = require('pluralize')
 let config
 switch (process.env.NODE_ENV) {
@@ -49,7 +49,7 @@ class Model {
 			}
 			return this.stripColumns(this)
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 
@@ -67,7 +67,22 @@ class Model {
 			// console.log(fields)
 			return this.stripColumns(new this.constructor(fields))
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
+		}
+	}
+
+	/**
+	 * Delete a model
+	 * @returns this
+	 */
+	async delete() {
+		try {
+			await DB(this.table)
+				.where({ id: this.id })
+				.del()
+			return
+		} catch (error) {
+			throw new Error(error)
 		}
 	}
 
@@ -84,7 +99,7 @@ class Model {
 				return rows
 			}
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 
@@ -99,7 +114,7 @@ class Model {
 				return rows
 			}
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 
@@ -115,10 +130,12 @@ class Model {
 			const fields = await DB(table)
 				.where({ id })
 				.first(columns)
-			const model = new this(fields)
-			return model.stripColumns(model)
+			if (fields) {
+				return new this(fields)
+			}
+			return null
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 
@@ -136,7 +153,7 @@ class Model {
 			const model = new this(record)
 			return model.stripColumns(model)
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 
@@ -190,12 +207,18 @@ class Model {
 		try {
 			if (!this.currentQuery) {
 				const rows = await DB(this.table).first(columns)
-				return new this(rows)
+				if (rows) {
+					return new this(rows)
+				}
+				return null
 			}
 			const rows = await this.currentQuery.first(columns)
-			return new this(rows)
+			if (rows) {
+				return new this(rows)
+			}
+			return null
 		} catch (error) {
-			console.log(error)
+			throw new Error(error)
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mevn-orm",
-  "version": "2.2.9",
+  "version": "2.2.13",
   "description": "simple ORM for express js",
   "type": "commonjs",
   "scripts": {
@@ -11,7 +11,9 @@
     "lint": "eslint --ext .js ./"
   },
   "peerDependencies": {
-    "knex": "^0.95"
+    "dotenv": "^15.0.0",
+    "knex": "^1.0.1",
+    "mysql": "^2.18.1"
   },
   "keywords": [
     "ORM",
@@ -20,24 +22,27 @@
     "mevn"
   ],
   "author": "Stanley Masinde",
+  "contributors": [
+    "Stanley Masinde <stanmasinde@gmail.com>"
+  ],
   "license": "MIT",
   "dependencies": {
-    "dotenv": "^8.2.0",
-    "knex": "^0.95",
     "pluralize": "^8.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.13.16",
-    "@babel/core": "^7.13.16",
+    "@babel/core": "^7.15.8",
     "@babel/eslint-parser": "^7.13.14",
     "@babel/eslint-plugin": "^7.13.16",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
     "chai": "^4.2.0",
+    "dotenv": "^8.6.0",
     "eslint": "^7.25.0",
     "faker": "^5.5.3",
+    "knex": "^0.95.11",
     "mocha": "^9.1.2",
     "mysql2": "^2.3.0",
-    "sqlite3": "^5.0.0"
+    "sqlite3": "^4.2.0"
   },
   "directories": {
     "test": "test"
@@ -51,5 +56,5 @@
     "url": "https://github.com/StanleyMasinde/mevn-orm/issues"
   },
   "homepage": "https://github.com/StanleyMasinde/mevn-orm#readme",
-  "main": "dist/index.js"
+  "main": "index.js"
 }

package/test/model.test.js

@@ -57,6 +57,17 @@ describe('#Model tests', () => {
 		expect(farmer).to.an('Object')
 	})
 
+	it('#Return null when not found', async () => {
+		const farmer = await Farmer.where({ id: 'ggggggg' }).first()
+		expect(farmer).to.be.null
+	})
+
+	it('#Delete a model', async () => {
+		const farmer = await Farmer.find(1)
+		await farmer.delete()
+		expect(await Farmer.find(1)).to.be.null
+	})
+
 	it('#Has one relationship', async () => {
 		const farmer = new Farmer({
 			name: faker.name.findName(),