From aaecdfa1e3ac71c3e83677068f283d47b69de167 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 12 Dec 2020 22:41:49 +0300
Subject: [PATCH] reworked module import...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Viewer/cfg/requirejs.js  | 165 ++++++++++++++++++++++++++-------------
 Viewer/doc/NOTES         |  12 +--
 Viewer/e.js              |   5 +-
 Viewer/features/cli.js   |   1 +
 Viewer/ig.js             |  13 +--
 Viewer/index.html        |   2 +-
 Viewer/package-lock.json |   6 +-
 Viewer/package.json      |   2 +-
 Viewer/ui.js             |  28 +------
 9 files changed, 129 insertions(+), 105 deletions(-)

diff --git a/Viewer/cfg/requirejs.js b/Viewer/cfg/requirejs.js
index 34ca6138..7d2d8ba4 100644
--- a/Viewer/cfg/requirejs.js
+++ b/Viewer/cfg/requirejs.js
@@ -2,74 +2,131 @@
 * 
 *
 *
+* This can be loaded from two contexts:
+*
+* 	- <script src=../>
+* 		Needs the requirejs module already loaded...
+* 		Example:
+* 			<script src="js/require.min.js"/>
+* 			<script src="cfg/requirejs.js"/>
+*
+* 	- require(..)
+* 		This needs the root require(..) function...
+* 		Example:
+* 			// in the root module...
+* 			require('./cfg/requirejs.js')(require)
+*
+*
 **********************************************************************/
 
-var requirejs_cfg = {
-	// NOTE: this is really odd: running electron as a packed binary breaks
-	// 		requirejs' paths...
-	baseUrl: typeof(process) != 'undefined' 
-				&& process.versions.electron ?
-			(require.main ?
-				require.main.filename.split(/[\\\/]/g).slice(0, -1).join('/')
-				: document.baseURI
-					.replace(/^[a-zA-Z]+:\/\/\/?/, '')
-					.split(/[#&]/)[0].split(/[\\\/]/g).slice(0, -1).join('/'))
-		:  '.',
+var _requirejs = typeof(requirejs) != 'undefined' && requirejs
 
-	// XXX this does not work on direct filesystem access...
-	//urlArgs: 'bust='+Date.now(),
-	
-	paths: {
-		text: 'node_modules/requirejs-plugins/lib/text',
-		json: 'node_modules/requirejs-plugins/src/json',
+
+var setup = function(require){
+	var res = {}
+	var requirejs = _requirejs
+
+	var requirejs_cfg = {
+		// NOTE: this is really odd: running electron as a packed binary breaks
+		// 		requirejs' paths...
+		baseUrl: typeof(process) != 'undefined' 
+					&& process.versions.electron ?
+				(require.main ?
+					require.main.filename.split(/[\\\/]/g).slice(0, -1).join('/')
+					: document.baseURI
+						.replace(/^[a-zA-Z]+:\/\/\/?/, '')
+						.split(/[#&]/)[0].split(/[\\\/]/g).slice(0, -1).join('/'))
+			:  '.',
+
+		// XXX this does not work on direct filesystem access...
+		//urlArgs: 'bust='+Date.now(),
 		
-		//react: 'node_modules/react/dist/react-with-addons.min.js',
-		//'react-dom': 'node_modules/react-dom/dist/react-dom.min.js',
-		//'ext-lib/preact': './node_modules/preact/dist/preact.dev',
+		paths: {
+			text: 'node_modules/requirejs-plugins/lib/text',
+			json: 'node_modules/requirejs-plugins/src/json',
+			
+			//react: 'node_modules/react/dist/react-with-addons.min.js',
+			//'react-dom': 'node_modules/react-dom/dist/react-dom.min.js',
+			//'ext-lib/preact': './node_modules/preact/dist/preact.dev',
 
-		'lib/object': 'node_modules/ig-object/object',
-		'lib/types': 'node_modules/ig-types/',
-		'lib/actions': 'node_modules/ig-actions/actions',
-		'lib/features': 'node_modules/ig-features/features',
-		//'lib/keyboard': './node_modules/ig-keyboard/keyboard',
-		'object-run': 'node_modules/object-run/run',
-		
-		'lib/argv': 'node_modules/ig-argv/argv',
-		'lib/walk': 'node_modules/generic-walk/walk',
-	},	
-	map: {
-		'*': {
-			// back-refs
-			// ...these enable the npm modules reference each other in 
-			// a cross-platform manner....
-			'ig-object': 'lib/object',
-			'ig-types': 'lib/types',
-			'ig-actions': 'lib/actions',
-			'ig-features': 'lib/features',
+			'lib/object': 'node_modules/ig-object/object',
+			'lib/types': 'node_modules/ig-types/',
+			'lib/actions': 'node_modules/ig-actions/actions',
+			'lib/features': 'node_modules/ig-features/features',
+			//'lib/keyboard': './node_modules/ig-keyboard/keyboard',
+			'object-run': 'node_modules/object-run/run',
+			
+			'lib/argv': 'node_modules/ig-argv/argv',
+			'lib/walk': 'node_modules/generic-walk/walk',
+		},	
+		map: {
+			'*': {
+				// back-refs
+				// ...these enable the npm modules reference each other in 
+				// a cross-platform manner....
+				'ig-object': 'lib/object',
+				'ig-types': 'lib/types',
+				'ig-actions': 'lib/actions',
+				'ig-features': 'lib/features',
 
-			//'ig-keyboard': 'lib/keyboard',
+				//'ig-keyboard': 'lib/keyboard',
 
-			'ig-argv': 'lib/argv',
-			'generic-walk': 'lib/walk',
+				'ig-argv': 'lib/argv',
+				'generic-walk': 'lib/walk',
+			},
 		},
-	},
-	packages: [
-		'lib/types',
-	],
-}
+		packages: [
+			'lib/types',
+		],
+	}
 
 
-if(typeof(require) != 'undefined'){
-	requirejs_cfg.nodeRequire = require }
+	// node contexts...
+	if(typeof(process) != 'undefined'){
+		var nodeRequire = 
+		requirejs_cfg.nodeRequire = 
+			global.nodeRequire 
+				|| global.require
+				|| require
+
+		require('app-module-path')
+			.addPath('.')
+
+		requirejs = 
+		global.requirejs = 
+		res.requirejs =
+			global.requirejs 
+				|| require('requirejs') 
+
+		global.nodeRequire = 
+		res.nodeRequire =
+			nodeRequire }
 
 
-// XXX revise...
-if(typeof(require) != 'undefined' && typeof(global) != 'undefined'){
-	global.nodeRequire = require
-	global.requirejs = global.requirejs || require('requirejs') }
+	// browser contexts...
+	if(typeof(window) != 'undefined'){
+		window.nodeRequire = 
+			window.nodeRequire 
+				|| (typeof(require) != 'undefined' 
+					&& require !== requirejs
+					&& require) 
+		window.requirejs = requirejs }
+
+	requirejs.config(requirejs_cfg)
+
+	return res }
 
 
-requirejs.config(requirejs_cfg)
+
+//---------------------------------------------------------------------
+// Run/export the setup...
+//
+// we can get here from two contexts...
+typeof(process) == 'undefined' ?
+	// browser's <script src="..">...
+	setup(require)
+	// node's require(..)
+	: (module.exports = setup)
 
 
 
diff --git a/Viewer/doc/NOTES b/Viewer/doc/NOTES
index 7372c899..dbc2b219 100755
--- a/Viewer/doc/NOTES
+++ b/Viewer/doc/NOTES
@@ -40,18 +40,18 @@ revised.
 Entry points
 ============
 
-The current state of things is far from optimal -- we have "three" 
-"different" entry points:
+We have two entry points here for a reason, e.js is tuned to be as 
+light/fast as possible for the general case, i.e. when run without 
+arguments combining it with ig.js would make things much-much slower...
 
 	- index.html			- Browser
-	- e.js				- electron
-		-> electron.html	- electron-specific html
+	- electron e.js				- electron
+		<-> ig.js		- parse args if given and optionally 
+					  return control back to e.js...
 	- ig.js				- node
 		-> e.js			- node can spawn an electron app
 
 
-The goal is to simplify this by merging the electron/node entry points 
-and merging the html files into one.
 
 
 
diff --git a/Viewer/e.js b/Viewer/e.js
index ca3b803d..e3c6dfa7 100644
--- a/Viewer/e.js
+++ b/Viewer/e.js
@@ -11,7 +11,6 @@
 //require('v8-compile-cache')
 
 var electron = require('electron')
-
 var path = require('path')
 var url = require('url')
 
@@ -106,9 +105,8 @@ function createWindow(){
 	WIN.setMenu(null)
 	WIN.loadURL(url.format({
 		pathname: path.join(__dirname, 'index.html'),
-		//pathname: path.join(__dirname, 'electron.html'),
 		protocol: 'file:',
-		slashes: true
+		slashes: true,
 	}))
 	// XXX HACK: pass this in a formal way... (???)
 	WIN.once('ready-to-show', 
@@ -164,7 +162,6 @@ var argv1 = process.argv[1]
 ;(process.argv.length > 2
 			|| (argv1 && argv1 != require.main.filename)) ?
 	// got some arguments -- trigger ig.js...
-	// XXX BUG: when running in a built app this will break with a require error...
 	(require('./ig') 
 		&& global.START_GUI 
 		&& start())
diff --git a/Viewer/features/cli.js b/Viewer/features/cli.js
index e220fb78..1ca92dcd 100755
--- a/Viewer/features/cli.js
+++ b/Viewer/features/cli.js
@@ -474,6 +474,7 @@ module.CLI = core.ImageGridFeatures.Feature({
 
 				argv.Parser({
 						context: this,
+						script: nodeRequire.main.filename,
 
 						// XXX argv.js is not picking these up because 
 						// 		of the require(..) mixup...
diff --git a/Viewer/ig.js b/Viewer/ig.js
index 589b9189..d9763f23 100755
--- a/Viewer/ig.js
+++ b/Viewer/ig.js
@@ -12,16 +12,9 @@ require('v8-compile-cache')
 // NOTE: this fixes several issues with lib/util conflicting with stuff...
 require('repl')
 
-require('./cfg/requirejs')
-
-nodeRequire =
-global.nodeRequire = 
-	require
-
-require = 
-requirejs = 
-global.requirejs = 
-	require('requirejs')
+// setup module loaders...
+require = require('./cfg/requirejs')(require).requirejs
+require.main = {filename: (nodeRequire.main || {}).filename}
 
 
 
diff --git a/Viewer/index.html b/Viewer/index.html
index 79f56ea1..a7fc27c0 100755
--- a/Viewer/index.html
+++ b/Viewer/index.html
@@ -79,7 +79,7 @@ if(window.require){
 // NOTE: we need to load the electron way first because the other way 
 //		around requirejs messes things up...
 if(typeof(process) != 'undefined'){
-	require('./cfg/requirejs')
+	require('./cfg/requirejs')(require)
 	requirejs('ui') }
 </script>
 <script src="node_modules/requirejs/require.js"></script>
diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json
index 9ef6169c..f34a663c 100755
--- a/Viewer/package-lock.json
+++ b/Viewer/package-lock.json
@@ -1127,9 +1127,9 @@
       }
     },
     "ig-argv": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/ig-argv/-/ig-argv-2.16.1.tgz",
-      "integrity": "sha512-fSgX86zTSRuMFaxGvbHK97/ASWgrYAnqLK/q32skXuZ8eDM2ZyM84kHbdgMqd3FrZS4DoyY5fA2TXD9AfWcE/w==",
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/ig-argv/-/ig-argv-2.16.2.tgz",
+      "integrity": "sha512-bSOslxGN9XqJ+IVba/XC0h9p1r/z/25wmJ2ik2xCNlMU07WI/K2ensIFR93I0aVfLHxsV37G5CdlP8xmiRIcLg==",
       "requires": {
         "ig-object": "^5.2.6"
       }
diff --git a/Viewer/package.json b/Viewer/package.json
index 769b6beb..0bb6225e 100755
--- a/Viewer/package.json
+++ b/Viewer/package.json
@@ -31,7 +31,7 @@
     "glob": "^7.1.6",
     "guarantee-events": "^1.0.0",
     "ig-actions": "^3.24.22",
-    "ig-argv": "^2.16.1",
+    "ig-argv": "^2.16.2",
     "ig-features": "^3.4.2",
     "ig-object": "^5.4.12",
     "ig-types": "^5.0.40",
diff --git a/Viewer/ui.js b/Viewer/ui.js
index bcd3e0f9..b58ffad8 100755
--- a/Viewer/ui.js
+++ b/Viewer/ui.js
@@ -5,38 +5,14 @@
 **********************************************************************/
 // Pre-setup...
 
-// Add node_modules path outside of the packed nwjs code...
+// nw.js: add node_modules path outside of the packed nwjs code...
 //
 // This keeps the large node module set outside the zip thus speeding
 // up the loading process significantly...
 if((typeof(process) != 'undefined' ? process : {}).__nwjs){
 	var path = require('path')
 	require('app-module-path')
-		.addPath(path.dirname(process.execPath) + '/node_modules/')
-}
-
-
-// Setup requirejs if we are in node/nw...
-//
-// NOTE: no need to do this in browser...
-if(typeof(process) != 'undefined'){
-	//require('v8-compile-cache')
-
-	requirejs = 
-	global.requirejs = 
-	window.requirejs = 
-		// XXX for some reason we can't just use the browser requirejs 
-		// 		even if we pass it nodeRequire, it still can't pass the
-		// 		node stuff to node...
-		require('requirejs')
-
-	nodeRequire =
-	global.nodeRequire = 
-	window.nodeRequire =
-		require
-}
-
-
+		.addPath(path.dirname(process.execPath) + '/node_modules/') }