organization

Author: akrouk

index.d.ts

@@ -3,7 +3,7 @@ declare module "promisesql";
 type DataObject = Object;
 type DataArray = DataObject[];
 
-type QueryRetval = void | DataObject | DataArray | undefined;
+type QueryRetval = void | DataObject | DataArray;
 type QueryPromise = Promise<QueryRetval>;
 
 interface BaseOptions {
@@ -21,7 +21,7 @@ interface InsertOptions extends BaseOptions {
     values: string[]
 }
 
-type SelectionRetval = DataObject | DataArray | undefined;
+type SelectionRetval = DataObject | DataArray;
 type SelectionPromise = Promise<SelectionRetval>;
 
 interface SelectionOptions extends BaseOptions {

index.js

@@ -4,10 +4,10 @@ const { PromiseDB } = require('./lib/promisedb');
 module.exports = require('./lib/queries');
 module.exports.PromiseDB = PromiseDB;
 
-// Export conditions (expressions, logic operators, etc.)
+// Export conditions (expressions, operators, etc.)
 module.exports.expression = {
-    ...require('./util/expressions/boolean'),
-    ...require('./util/expressions/numeric')
+    ...require('./lib/expressions/boolean'),
+    ...require('./lib/expressions/numeric')
 };
 
-module.exports.operator = require('./util/operators/logic');
+module.exports.operator = require('./lib/operators/logic');

util/expressions/boolean.js lib/expressions/boolean.jsutil/expressions/boolean.js renamed to lib/expressions/boolean.js

@@ -1,29 +1,8 @@
 {
-  "name": "promisesql",
-  "version": "1.3.0",
-  "description": "A lightweight npm package for promised-based SQL queries.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "scripts": {
-    "test": "echo \"No test specified\""
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/akrouk/PromiseSQL.git"
-  },
-  "keywords": [
-    "SQL",
-    "promise"
-  ],
-  "author": "Adam J. Krouk",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/akrouk/PromiseSQL/issues"
-  },
-  "homepage": "https://github.com/akrouk/PromiseSQL#readme",
   "dependencies": {
-    "np": "^7.6.1",
-    "sqlite3": "^5.0.8",
+    "got": "^12.1.0",
+    "np": "^7.6.2",
+    "sqlite3": "^5.0.9",
     "synchronized-promise": "^0.3.1"
   }
 }

util/expressions/numeric.js lib/expressions/numeric.jsutil/expressions/numeric.js renamed to lib/expressions/numeric.js

@@ -1,5 +1,5 @@
 const { parseColumns, parseValues, parseClause } = require('./sqlhelp');
-const EMPTY_CLAUSE = { stmt: '', conditions: [] };
+const emptyClause = { stmt: '', conditions: new Array() };
 
 module.exports = {
     /**
@@ -30,7 +30,7 @@ module.exports = {
             throw new Error('No columns specified.');
 
         let stmt = options.all ? 'SELECT *\n' : 'SELECT ';
-        let whereClause = EMPTY_CLAUSE;
+        let whereClause = emptyClause;
 
         if (options.columns) 
             stmt += parseColumns(options.columns);
@@ -56,7 +56,7 @@ module.exports = {
         let stmt = `UPDATE ${options.table}`;
 
         let setClause = parseClause('SET', options.set, ', ');
-        let whereClause = EMPTY_CLAUSE;
+        let whereClause = emptyClause;
 
         stmt += setClause.stmt;
 
@@ -78,7 +78,7 @@ module.exports = {
             throw new Error('No table specified.');
 
         let stmt = `DELETE FROM ${options.table}`;
-        let whereClause = EMPTY_CLAUSE;
+        let whereClause = emptyClause;
 
         if (options.where)
             whereClause = parseClause('WHERE', options.where);