Merge pull request #6 from bert-w/cleanup-deps

remove lodash + move commander to dev + default to non-console

README.md

@@ -144,7 +144,7 @@ import { Sqomplexity } from 'sqomplexity';
     ];
 
     // Construct SQompLexity (passing `score` only outputs the complexity score):
-    const command = (new Sqomplexity({ score: true }, null, false));
+    const command = new Sqomplexity({ score: true });
 
     console.log(await command.run(queries));
 

app.js

@@ -31,7 +31,7 @@ program
     .option('-p, --pretty-print', 'output JSON with indentation and newlines', false)
     .action(async(queries, options) => {
         try {
-            await (new Sqomplexity(options, process.cwd())).run(queries);
+            await (new Sqomplexity(options, process.cwd(), true)).run(queries);
         } catch (e) {
             program.addHelpText('after', '\n' + e.stack);
             program.help();

examples/index.js

@@ -8,7 +8,7 @@ import { Sqomplexity } from 'sqomplexity';
     ];
 
     // Construct SQompLexity (passing `score` only outputs the complexity score):
-    const command = (new Sqomplexity({ score: true }, null, false));
+    const command = new Sqomplexity({ score: true });
 
     console.log(await command.run(queries));
 

package.json

@@ -38,6 +38,7 @@
     },
     "devDependencies": {
         "babel-loader": "^9.1.2",
+        "commander": "^11.0.0",
         "cross-env": "^7.0.3",
         "eslint": "^8.30.0",
         "eslint-config-standard": "^17.0.0",
@@ -47,10 +48,6 @@
         "webpack": "^5.88.2",
         "webpack-cli": "^5.1.4"
     },
-    "dependencies": {
-        "commander": "^11.0.0",
-        "lodash.get": "^4.4.2"
-    },
     "engines": {
         "node": ">=16"
     }

src/calculator.js

@@ -1,5 +1,3 @@
-import _ from 'lodash.get';
-
 /**
  * Calculate a complexity score based on an AST of the SQL query and meta properties.
  */
@@ -294,7 +292,7 @@ export class Calculator {
      */
     _calculateHaving(ast) {
         let score = 0;
-        if (_(ast, 'having.type') === 'binary_expr') {
+        if (ast?.having?.type === 'binary_expr') {
             score += this._expression(ast.having, 'having');
         }
 

src/sqomplexity.js

@@ -12,9 +12,9 @@ export class Sqomplexity {
      * @param {boolean} [options.all]
      * @param {boolean} [options.prettyPrint]
      * @param {string|null} cwd Used for determining the correct path when using a file path for the weights.
-     * @param {boolean} console Pass false to return the values instead of outputting them.
+     * @param {boolean} console Pass true to echo the values instead of returning them.
      */
-    constructor(options = {}, cwd = null, console = true) {
+    constructor(options = {}, cwd = null, console = false) {
         this.options = options || {};
         this.cwd = cwd;
         this.console = console;

tests/sqomplexity.test.js

@@ -9,13 +9,13 @@ process.chdir(__dirname);
 
 describe('src/sqomplexity.js', function() {
     it('throws on passing no queries', async function() {
-        const sqomplexity = new Sqomplexity({}, null, false);
+        const sqomplexity = new Sqomplexity();
 
         await expect(sqomplexity.run([])).rejects.toThrow(Error);
     });
 
     it('accepts a single query', async function() {
-        const sqomplexity = new Sqomplexity({}, null, false);
+        const sqomplexity = new Sqomplexity();
 
         const result = await sqomplexity.run([
             'SELECT * FROM users'
@@ -26,7 +26,7 @@ describe('src/sqomplexity.js', function() {
     });
 
     it('accepts multiple queries', async function() {
-        const sqomplexity = new Sqomplexity({}, null, false);
+        const sqomplexity = new Sqomplexity();
 
         const result = (await sqomplexity.run([
             'SELECT * FROM users',
@@ -40,7 +40,7 @@ describe('src/sqomplexity.js', function() {
     it('accepts base64-encoded queries', async function() {
         const sqomplexity = new Sqomplexity({
             base64: true
-        }, null, false);
+        });
 
         expect(
             (await sqomplexity.run([btoa('SELECT * FROM users')]))[0].complexity
@@ -50,7 +50,7 @@ describe('src/sqomplexity.js', function() {
     it('outputs score only', async function() {
         const sqomplexity = new Sqomplexity({
             score: true
-        }, null, false);
+        });
 
         expect(
             (await sqomplexity.run(['SELECT * FROM users']))[0]
@@ -60,11 +60,19 @@ describe('src/sqomplexity.js', function() {
     it('can print to console', async function() {
         const sqomplexity = new Sqomplexity({
             score: true
-        });
+        }, null, true);
+
+        let result;
+
+        console.log = function(log) {
+            result = log;
+        };
 
         expect(
             (await sqomplexity.run(['SELECT * FROM users']))
         ).toBeUndefined();
+
+        expect(result).toBeDefined();
     });
 
     it('accepts custom weights', async function() {
@@ -104,7 +112,7 @@ describe('src/sqomplexity.js', function() {
                     variety: 1
                 }
             }
-        }, null, false);
+        });
 
         expect(
             (await sqomplexity.run(['SELECT * FROM users']))[0]