foxhound 1.0.41 → 2.0.0

package/gulpfile.js

@@ -0,0 +1,83 @@
+'use strict';
+
+// We aren't abstracting this yet but here's the ... "Config"
+const _CONFIG = (
+	{
+		// The input source file that should be passed to browserify:
+		// (if you need to auto-instantiate an object, for instance)
+		EntrypointInputSourceFile: `${__dirname}/source/Foxhound-Browser-Shim.js`,
+
+		// The name of the packaged object to be passed to browserify:
+		// (browserify sets this to global scope and window.SOMEOBJECTNAMEHERE where SOMEOBJECTNAMEHERE is the string below)
+		LibraryObjectName: `Foxhound`,
+
+		// The folder to write the library files and maps out to:
+		LibraryOutputFolder: `${__dirname}/dist/`,
+
+		// The name of the unminified version of the packaged library, for easy debugging:
+		LibraryUniminifiedFileName: `foxhound.js`,
+
+		// The name of the minified version of the packaged library, for production release:
+		LibraryMinifiedFileName: `foxhound.min.js`
+	});
+
+// --->  Boilerplate Browser Uglification and Packaging  <--- \\
+
+const libBrowserify = require('browserify');
+const libGulp = require('gulp');
+
+const libVinylSourceStream = require('vinyl-source-stream');
+const libVinylBuffer = require('vinyl-buffer');
+
+const libSourcemaps = require('gulp-sourcemaps');
+const libGulpUtil = require('gulp-util');
+const libBabel = require('gulp-babel');
+const libTerser = require('gulp-terser');
+
+// Build the module for the browser
+libGulp.task('minified',
+() => {
+	// set up the custom browserify instance for this task
+	var tmpBrowserify = libBrowserify(
+	{
+		entries: _CONFIG.EntrypointInputSourceFile,
+		standalone: _CONFIG.LibraryObjectName,
+		debug: true
+	});
+
+	return tmpBrowserify.bundle()
+		.pipe(libVinylSourceStream(_CONFIG.LibraryMinifiedFileName))
+		.pipe(libVinylBuffer())
+		.pipe(libSourcemaps.init({loadMaps: true}))
+				// Add transformation tasks to the pipeline here.
+				.pipe(libBabel())
+				.pipe(libTerser())
+				.on('error', libGulpUtil.log)
+		.pipe(libSourcemaps.write('./'))
+		.pipe(libGulp.dest(_CONFIG.LibraryOutputFolder));
+});
+
+// Build the module for the browser
+libGulp.task('debug',
+	() => {
+		// set up the custom browserify instance for this task
+		var tmpBrowserify = libBrowserify(
+		{
+			entries: _CONFIG.EntrypointInputSourceFile,
+			standalone: _CONFIG.LibraryObjectName,
+			debug: true
+		});
+
+		return tmpBrowserify.bundle()
+			.pipe(libVinylSourceStream(_CONFIG.LibraryUniminifiedFileName))
+			.pipe(libVinylBuffer())
+					.pipe(libBabel())
+					.on('error', libGulpUtil.log)
+			.pipe(libGulp.dest(_CONFIG.LibraryOutputFolder));
+	});
+
+libGulp.task
+(
+	'build',
+	libGulp.series('debug', 'minified')
+);

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "foxhound",
-  "version": "1.0.41",
+  "version": "2.0.0",
   "description": "A Database Query generation library.",
   "main": "source/FoxHound.js",
   "scripts": {
     "start": "node source/FoxHound.js",
-    "coverage": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
+    "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
     "test": "./node_modules/.bin/mocha -u tdd -R spec",
-    "docker-dev-build-image": "docker build ./ -t retold/foxhound:local",
+    "build": "./node_modules/.bin/gulp build",
+    "docker-dev-build-image": "docker build ./ -f Dockerfile_LUXURYCode -t retold/foxhound:local",
     "docker-dev-run": "docker run -it -d --name foxhound-dev -p 127.0.0.1:12346:8080 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/foxhound\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/foxhound:local"
   },
   "mocha": {
@@ -44,12 +45,20 @@
   },
   "homepage": "https://github.com/stevenvelozo/foxhound",
   "devDependencies": {
-    "chai": "4.3.6",
-    "istanbul": "0.4.1",
-    "mocha": "9.2.2"
+    "browserify": "^17.0.0",
+    "chai": "4.3.7",
+    "gulp": "^4.0.2",
+    "gulp-babel": "^8.0.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-terser": "^2.1.0",
+    "gulp-util": "^3.0.8",
+    "mocha": "10.2.0",
+    "nyc": "^15.1.0",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
-    "fable": "~2.0.5",
-    "underscore": "1.13.2"
+    "fable": "^3.0.2",
+    "underscore": "1.13.6"
   }
 }

package/source/Foxhound-Browser-Shim.js

@@ -0,0 +1,14 @@
+/**
+* Simple browser shim loader - assign the npm module to a window global automatically
+*
+* @license MIT
+* @author <steven@velozo.com>
+*/
+var libNPMModuleWrapper = require('./Foxhound.js');
+
+if ((typeof(window) === 'object') && !window.hasOwnProperty('Foxhound'))
+{
+	window.Foxhound = libNPMModuleWrapper;
+}
+
+module.exports = libNPMModuleWrapper;

package/source/dialects/MySQL/FoxHound-Dialect-MySQL.js

@@ -113,12 +113,21 @@ var FoxHoundDialectMySQL = function()
 		let pFieldNames = pFieldName.split('.');
 		if (pFieldNames.length > 1)
 		{
-			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleanseQuoting(pFieldNames[1]) + "`";
+			const cleansedFieldName = cleanseQuoting(pFieldNames[1]);
+			if (cleansedFieldName === '*')
+			{
+				// do not put * as `*`
+				return "`" + cleanseQuoting(pFieldNames[0]) + "`.*";
+			}
+			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleansedFieldName + "`";
 		}
-		else
+		const cleansedFieldName = cleanseQuoting(pFieldNames[0]);
+		if (cleansedFieldName === '*')
 		{
-			return "`" + cleanseQuoting(pFieldNames[0]) + "`";
+			// do not put * as `*`
+			return '*';
 		}
+		return "`" + cleanseQuoting(pFieldNames[0]) + "`";
 	}
 
 	/**

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -10,7 +10,7 @@ var Chai = require('chai');
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({});
+var libFable = new (require('fable'))({Product:'FoxhoundTests'});
 var libFoxHound = require('../source/FoxHound.js');
 
 var _AnimalSchema = (

package/test/FoxHound-Dialect-English_tests.js

@@ -10,7 +10,7 @@ var Chai = require('chai');
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({});
+var libFable = new (require('fable'))({Product:'FoxhoundTests'});
 var libFoxHound = require('../source/FoxHound.js');
 
 suite

package/test/FoxHound-Dialect-MeadowEndpoints_tests.js

@@ -10,7 +10,7 @@ var Chai = require('chai');
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({});
+var libFable = new (require('fable'))({Product:'FoxhoundTests'});
 var libFoxHound = require('../source/FoxHound.js');
 
 var _AnimalSchema = (

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -10,7 +10,7 @@ var Chai = require('chai');
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({});
+var libFable = new (require('fable'))({Product:'FoxhoundTests'});
 var libFoxHound = require('../source/FoxHound.js');
 
 var _AnimalSchema = (
@@ -161,6 +161,28 @@ suite
 					}
 				);
 				test
+				(
+					'Complex Read Query with qualified and unqualified "SELECT *" cases',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MySQL')
+							.setScope('Animal')
+							.setCap(10)
+							.setBegin(0)
+							.setDataElements(['*', 'Name', 'Age', 'Cost', 'Animal.*'])
+							.setSort([{Column:'Age',Direction:'Ascending'}])
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						tmpQuery.addSort('Cost');
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MySQL dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT *, `Name`, `Age`, `Cost`, `Animal`.* FROM `Animal` WHERE Age = :Age_w0 ORDER BY Age, Cost LIMIT 0, 10;');
+					}
+				);
+				test
 				(
 					'Complex Read Query 2',
 					function()

package/test/FoxHound_tests.js

@@ -10,7 +10,7 @@ var Chai = require('chai');
 var Expect = Chai.expect;
 var Assert = Chai.assert;
 
-var libFable = require('fable').new({});
+var libFable = new (require('fable'))({Product:'FoxhoundTests'});
 var libFoxHound = require('../source/FoxHound.js');
 
 suite

package/Dockerfile

@@ -1,46 +0,0 @@
-# Use the codercom/code-server image
-FROM codercom/code-server:latest
-MAINTAINER steven velozo
-
-VOLUME /home/coder/.config
-VOLUME /home/coder/.vscode
-
-RUN echo "...installing debian dependencies..."
-RUN sudo apt update
-RUN sudo apt install vim curl tmux -y
-
-RUN echo "Building RETOLD development image..."
-
-
-RUN echo "...mapping library specific volumes..."
-# Volume mappings for RETOLD:Foxhound library
-VOLUME /home/coder/foxhound
-# VOLUME /home/coder/foxhound/node_modules
-
-RUN echo "...installing vscode extensions..."
-RUN code-server --install-extension hbenl.vscode-mocha-test-adapter \
-    code-server --install-extension hbenl.vscode-test-explorer \
-    code-server --install-extension hbenl.test-adapter-converter \
-    code-server --install-extension cweijan.vscode-mysql-client2 \
-    code-server --install-extension daylerees.rainglow \
-    code-server --install-extension oderwat.indent-rainbow \
-    code-server --install-extension evan-buss.font-switcher \
-    code-server --install-extension vscode-icons-team.vscode-icons \
-    code-server --install-extension bengreenier.vscode-node-readme \
-    code-server --install-extension bierner.color-info \
-    code-server --install-extension dbaeumer.vscode-eslint \
-    code-server --install-extension PKief.material-icon-theme
-
-SHELL ["/bin/bash", "-c"]
-USER coder
-
-RUN echo "...installing node version manager..."
-# Because there is a .bashrc chicken/egg problem, we will create one here to simulate logging in.  This is not great.
-RUN touch ~/.bashrc && chmod +x ~/.bashrc
-RUN curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
-
-RUN echo "...installing node version 14 as the default..."
-RUN . ~/.nvm/nvm.sh && source ~/.bashrc && nvm install 14
-RUN . ~/.nvm/nvm.sh && source ~/.bashrc && nvm alias default 14
-
-WORKDIR /home/coder/foxhound