fix handling of minified from typescript (use the TS source)

Author: sdetweil

scripts/dumpdefaults.js

@@ -18,9 +18,19 @@ if (process.argv.length > 3 && process.argv[3] === "debug") debug = true;
 let filelines = getFileContents(process.argv[2]);
 if (debug) console.log("there are " + filelines.length + " lines");
 
-let defines = process_main(filelines, path.parse(process.argv[2]).name);
+
+let modulename = path.parse(process.argv[2]).name
+if(modulename.startsWith("Frontend")){   // built fron typescript
+  if(process.argv.length > 3 && process.argv[3] !== "debug"){ // if the actual module name was specified
+    modulename = process.argv[3]  // use the passed in Module name
+  }
+}
+
+let defines = process_main(filelines, modulename);
 if (debug) console.log("defines=" + JSON.stringify(defines, " ", 2));
 
+
+
 if(defines.length==0){
   dummy.forEach((l,i)=>{
     if(i==0){

test_convert.cmd

@@ -217,8 +217,13 @@ Setlocal EnableDelayedExpansion
 		)
 		rem if the module js exists
 		IF EXIST "..\%mf%\%m%\%m%.js" (
-			rem dump it to defauls
-			node %d%scripts\dumpdefaults.js "..\%mf%\%m%\%m%.js" >>%2
+			rem dump it to defaults
+			IF EXIST "..\%mf%\%m%\src\frontend\Frontend.ts" (
+				node %d%scripts\dumpdefaults.js "..\%mf%\%m%\src\frontend\Frontend.ts" %m% >>%2
+			)
+			ELSE (
+				node %d%scripts\dumpdefaults.js "..\%mf%\%m%\%m%.js" >>%2
+			)
 			rem check for any extensions
 			dir /b "..\%mf%\%m%\MMM-Config_extension.*" 2>nul >>"extension_list"
 		)

test_convert.sh

@@ -91,8 +91,12 @@ if [ "$mod_lastsaved". != "$mod_lastchange". -o $schema_file_exists -eq 0 ]; the
 
 		#echo looking for "$nm.js"
 		if [ -e "$module/$nm".js ]; then
-		   node $d/scripts/dumpdefaults.js "$module/$nm.js" >>$defaults_file
-		   ls $module/MMM-Config_extension.* 2>/dev/null >>extension_list
+		  if [ -e "$module/src/frontend/Frontend.ts" ]; then
+		  	node $d/scripts/dumpdefaults.js "$module/src/frontend/Frontend.ts" $nm >>$defaults_file
+		  else
+		      node $d/scripts/dumpdefaults.js "$module/$nm.js" >>$defaults_file
+		  fi
+		  ls $module/MMM-Config_extension.* 2>/dev/null >>extension_list
 		else
 			#echo "// file "$nm.js" does NOT exist"
 			: