Fix #1013: set XLSX lib manually

AlaSQL · Aug 6, 2018 · a899ba7 · a899ba7
1 parent c1ca94c
commit a899ba7
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 23 deletions.
diff --git a/dist/alasql-worker.js b/dist/alasql-worker.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.9 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.9-develop-c1ca94ccundefined | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.9
+@version 0.4.9-develop-c1ca94ccundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

diff --git a/dist/alasql-worker.min.js b/dist/alasql-worker.min.js
diff --git a/dist/alasql.fs.js b/dist/alasql.fs.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.9 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.9-develop-c1ca94ccundefined | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.9
+@version 0.4.9-develop-c1ca94ccundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.9';
+alasql.version = '0.4.9-develop-c1ca94ccundefined';
 
 /**
 	Debug flag
@@ -4288,8 +4288,12 @@ utils.findAlaSQLPath = function() {
 };
 
 var getXLSX = function() {
-	var XLSX = null;
-	/* If require() shuold be supported else take from global scope */
+	var XLSX = alasql.private.externalXlsxLib;
+
+	if (XLSX) {
+		return XLSX;
+	}
+
 	if (utils.isNode || utils.isBrowserify || utils.isMeteorServer) {
 		//*not-for-browser/*
 		XLSX = require('xlsx') || null;
@@ -4527,6 +4531,14 @@ alasql.lastid = 0;
 
 alasql.buffer = {};
 
+alasql.private = {
+	externalXlsxLib: null,
+};
+
+alasql.setXLSX = function(XLSX) {
+	alasql.private.externalXlsxLib = XLSX;
+};
+
 /**
   Select current database
   @param {string} databaseid Selected database identificator

diff --git a/dist/alasql.js b/dist/alasql.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.9 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.9-develop-c1ca94ccundefined | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.9
+@version 0.4.9-develop-c1ca94ccundefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.9';
+alasql.version = '0.4.9-develop-c1ca94ccundefined';
 
 /**
 	Debug flag
@@ -4283,8 +4283,12 @@ utils.findAlaSQLPath = function() {
 };
 
 var getXLSX = function() {
-	var XLSX = null;
-	/* If require() shuold be supported else take from global scope */
+	var XLSX = alasql["private"].externalXlsxLib;
+
+	if (XLSX) {
+		return XLSX;
+	}
+
 	if (utils.isNode || utils.isBrowserify || utils.isMeteorServer) {
 		/*not-for-browser/*
 		XLSX = require('xlsx') || null;
@@ -4522,6 +4526,14 @@ alasql.lastid = 0;
 
 alasql.buffer = {};
 
+alasql["private"] = {
+	externalXlsxLib: null,
+};
+
+alasql.setXLSX = function(XLSX) {
+	alasql["private"].externalXlsxLib = XLSX;
+};
+
 /**
   Select current database
   @param {string} databaseid Selected database identificator

diff --git a/dist/alasql.min.js b/dist/alasql.min.js
diff --git a/src/15utility.js b/src/15utility.js
@@ -1272,8 +1272,12 @@ utils.findAlaSQLPath = function() {
 };
 
 var getXLSX = function() {
-	var XLSX = null;
-	/* If require() shuold be supported else take from global scope */
+	var XLSX = alasql.private.externalXlsxLib;
+
+	if (XLSX) {
+		return XLSX;
+	}
+
 	if (utils.isNode || utils.isBrowserify || utils.isMeteorServer) {
 		//*not-for-browser/*
 		XLSX = require('xlsx') || null;

diff --git a/src/17alasql.js b/src/17alasql.js
@@ -133,6 +133,14 @@ alasql.lastid = 0;
 
 alasql.buffer = {};
 
+alasql.private = {
+	externalXlsxLib: null,
+};
+
+alasql.setXLSX = function(XLSX) {
+	alasql.private.externalXlsxLib = XLSX;
+};
+
 /**
   Select current database
   @param {string} databaseid Selected database identificator