@steambrew/ttc 1.0.0 → 1.0.1

package/Compiler.ts

@@ -66,81 +66,59 @@ function InitializePlugins() {
 	}
 }
 
+const ContructFunctions = (parts: any) => { return parts.join('\n'); }
+
 function InsertMillennium(props: TranspilerProps) 
 {
-    const ContructFunctions = (parts: any) => { return parts.join('\n'); }
-
     const generateBundle = (_: unknown, bundle: any) => {	
-
-		for (const fileName in bundle) 
-		{
-			if (bundle[fileName].type != 'chunk') {
-				continue 
-			}
+		for (const fileName in bundle) {
+			if (bundle[fileName].type != 'chunk') continue 
+			
             Logger.Info("Injecting Millennium shims into module... " + chalk.green.bold("okay"))
 
 			bundle[fileName].code = ContructFunctions([    
 				`const pluginName = "${props.strPluginInternalName}";`,
-                // insert the bootstrap function and call it
 				InitializePlugins.toString(), InitializePlugins.name + "()",
-				WrappedCallServerMethod, 
-                WrappedCallable, 
-                bundle[fileName].code,
+				WrappedCallServerMethod, WrappedCallable, bundle[fileName].code,
 				ExecutePluginModule.toString(), ExecutePluginModule.name + "()"
 			])
 		}
     }
 
-    return {
-        name: 'add-plugin-main', generateBundle
-    };
+    return { name: String(), generateBundle };
 }
 
 function InsertWebkitMillennium(props: TranspilerProps) 
 {
-    const ContructFunctions = (parts: any) => { return parts.join('\n'); }
-
     const generateBundle = (_: unknown, bundle: any) => {	
-
-		for (const fileName in bundle) 
-		{
-			if (bundle[fileName].type != 'chunk') {
-				continue 
-			}
+		for (const fileName in bundle) {
+			if (bundle[fileName].type != 'chunk') continue 
+			
             Logger.Info("Injecting Millennium shims into webkit module... " + chalk.green.bold("okay"))
 
 			bundle[fileName].code = ContructFunctions([    
-                // define the plugin name at the top of the bundle, so it can be used in wrapped functions
 				`const pluginName = "${props.strPluginInternalName}";`,
-                // insert the bootstrap function and call it
                 InitializePlugins.toString(), InitializePlugins.name + "()",
-                // TODO
 				WrappedCallServerMethod, WrappedCallable, bundle[fileName].code,
 				ExecuteWebkitModule.toString(), ExecuteWebkitModule.name + "()"
 			])
 		}
     }
 
-    return {
-        name: 'add-plugin-main', generateBundle
-    };
+    return { name: String(), generateBundle };
 }
 
 function GetPluginComponents(props: TranspilerProps) {
 	const pluginList = [
-        /**
-         * @brief resolve millennium, edit the exported bundle to work with millennium
-         */
         InsertMillennium(props),
 		typescript(), nodeResolve(), commonjs(), json(),
 		replace({
-			preventAssignment: true,
-            'process.env.NODE_ENV': JSON.stringify('production'),
-			// replace callServerMethod with wrapped replacement function. 
-			'Millennium.callServerMethod': `__call_server_method__`,
-            'client.callable': `__wrapped_callable__`,
 			delimiters: ['', ''],
-			'client.pluginSelf': 'window.PLUGIN_LIST[pluginName]',
+			preventAssignment: true,
+            'process.env.NODE_ENV'        : JSON.stringify('production'),
+			'Millennium.callServerMethod' : `__call_server_method__`,
+            'client.callable'             : `__wrapped_callable__`,
+			'client.pluginSelf'           : 'window.PLUGIN_LIST[pluginName]',
             'client.Millennium.exposeObj(': 'client.Millennium.exposeObj(exports, '
 		}),
 	]
@@ -155,28 +133,21 @@ function GetWebkitPluginComponents(props: TranspilerProps) {
 	const pluginList = [
         InsertWebkitMillennium(props), typescript(), nodeResolve(), commonjs(), json(),
         replace({
+			delimiters: ['', ''],
 			preventAssignment: true,
-			// replace callServerMethod with wrapped replacement function. 
 			'Millennium.callServerMethod': `__call_server_method__`,
-            'client.callable': `__wrapped_callable__`,
-			delimiters: ['', ''],
+            'webkit.callable': `__wrapped_callable__`,
 		}),
 	]
 	
-	if (props.bTersePlugin) {
-		pluginList.push(terser())
-	}
+    props.bTersePlugin && pluginList.push(terser())
 	return pluginList
 }
 
 const GetFrontEndDirectory = () => {
     const pluginJsonPath = './plugin.json';
-
     try {
-        const pluginJson = JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'));
-        const frontendDirectory = pluginJson?.frontend;
-
-        return frontendDirectory ? frontendDirectory : "frontend";
+        return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? "frontend";
     } 
     catch (error) {
         return "frontend";
@@ -189,13 +160,20 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
         input: `./${GetFrontEndDirectory()}/index.tsx`,
         plugins: GetPluginComponents(props),
         context: 'window',
-        external: ['react', 'react-dom', '@steambrew/client'],
+        external: (id) => { 
+            if (id === '@steambrew/webkit') {
+                Logger.Error('The @steambrew/webkit module should not be included in the frontend module, use @steambrew/client instead. Please remove it from the frontend module and try again.')
+                process.exit(1)
+            }
+
+            return id === '@steambrew/client' || id === 'react' || id === 'react-dom'
+        },
         output: {
             name: "millennium_main",
             file: ".millennium/Dist/index.js",
             globals: {
-                react: "window.SP_REACT",
-                "react-dom": "window.SP_REACTDOM",
+                "react"            : "window.SP_REACT",
+                "react-dom"        : "window.SP_REACTDOM",
                 "@steambrew/client": "window.MILLENNIUM_API"
             },
             exports: 'named',
@@ -207,34 +185,33 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
         input: `./webkit/index.ts`,
         plugins: GetWebkitPluginComponents(props),
         context: 'window',
-        external: ['@steambrew/client'],
+        external: (id) => {
+            if (id === '@steambrew/client') {
+              Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.')
+              process.exit(1)
+            }
+
+            return id === '@steambrew/webkit'
+        },
         output: {
             name: "millennium_main",
             file: ".millennium/Dist/webkit.js",
             exports: 'named',
             format: 'iife',
             globals: {
-                "@steambrew/client": "window.MILLENNIUM_API"
+                "@steambrew/webkit": "window.MILLENNIUM_API"
             },
         }
     }
 
     Logger.Info("Starting build; this may take a few moments...")
-    // Load the Rollup configuration file
+
     try {
-        const bundle = await rollup(frontendRollupConfig);
-        const outputOptions = frontendRollupConfig.output as OutputOptions;
-    
-        await bundle.write(outputOptions);
+        await (await rollup(frontendRollupConfig)).write(frontendRollupConfig.output as OutputOptions);
 
-        // check if the webkit file exists
         if (fs.existsSync(`./webkit/index.ts`)) {
             Logger.Info("Compiling webkit module...")
-
-            const bundle1 = await rollup(webkitRollupConfig);
-            const outputOptions1 = webkitRollupConfig.output as OutputOptions;
-        
-            await bundle1.write(outputOptions1);
+            await (await rollup(webkitRollupConfig)).write(webkitRollupConfig.output as OutputOptions);
         }
         
         Logger.Info('Build succeeded!', Number((performance.now() - global.PerfStartTime).toFixed(3)), 'ms elapsed.')

package/Logger.ts

@@ -3,20 +3,20 @@ import chalk from 'chalk'
 const Logger = {
 
     Info: (...LogMessage: any) => {
-        console.log(chalk.magenta.bold("[+]"), ...LogMessage)
+        console.log(chalk.magenta.bold("++"), ...LogMessage)
     },
 
     Warn: (...LogMessage: any) => {
-        console.log(chalk.yellow.bold("[*]"), ...LogMessage)
+        console.log(chalk.yellow.bold("**"), ...LogMessage)
     },
 
     Error: (...LogMessage: any) => {
-        console.log(chalk.red.bold("[-]"), ...LogMessage)
+        console.log(chalk.red.bold("!!"), ...LogMessage)
     },
 
     Tree: (strTitle: string, LogObject: any) => { 
 
-        console.log(chalk.magenta.bold("[┬]"), strTitle);
+        console.log(chalk.magenta.bold("++"), strTitle);
 
         const isLocalPath = (strTestPath: string): boolean => {
             // Regular expression to match common file path patterns
@@ -29,7 +29,7 @@ const Logger = {
 
         for (const [index, [key, value]] of entries.entries()) {
 
-            const connector = index === totalEntries - 1 ? "└" : "├"
+            const connector = index === totalEntries - 1 ? "    " : "    "
             let color = chalk.white
 
             switch (typeof value) {

package/VersionMon.ts

@@ -6,21 +6,21 @@ import { Logger } from './Logger';
 
 export const CheckForUpdates = async (): Promise<boolean> => {
     return new Promise<boolean>(async (resolve) => {
-        const packageJsonPath = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
+        const packageJsonPath = path.resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
         const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'));
     
-        fetch("https://registry.npmjs.org/millennium-lib").then(response => response.json()).then(json => {
+        fetch("https://registry.npmjs.org/@steambrew/ttc").then(response => response.json()).then(json => {
 
             if (json?.["dist-tags"]?.latest != packageJson.version) {
   
-                Logger.Tree(`millennium-lib@${packageJson.version} requires update to ${json?.["dist-tags"]?.latest}`, {
-                    cmd: "run `npm i millennium-lib` to get latest updates!"
+                Logger.Tree(`@steambrew/ttc@${packageJson.version} requires update to ${json?.["dist-tags"]?.latest}`, {
+                    cmd: `run "npm install @steambrew/ttc@${json?.["dist-tags"]?.latest}" to get latest updates!`
                 })
 
                 resolve(true)
             }
             else {
-                Logger.Info(`millennium-lib@${packageJson.version} is up-to-date!`)
+                Logger.Info(`@steambrew/ttc@${packageJson.version} is up-to-date!`)
                 resolve(false)
             }
         })

package/dist/index.js

@@ -15,16 +15,16 @@ import { performance as performance$1 } from 'perf_hooks';
 
 const Logger = {
     Info: (...LogMessage) => {
-        console.log(chalk.magenta.bold("[+]"), ...LogMessage);
+        console.log(chalk.magenta.bold("++"), ...LogMessage);
     },
     Warn: (...LogMessage) => {
-        console.log(chalk.yellow.bold("[*]"), ...LogMessage);
+        console.log(chalk.yellow.bold("**"), ...LogMessage);
     },
     Error: (...LogMessage) => {
-        console.log(chalk.red.bold("[-]"), ...LogMessage);
+        console.log(chalk.red.bold("!!"), ...LogMessage);
     },
     Tree: (strTitle, LogObject) => {
-        console.log(chalk.magenta.bold("[┬]"), strTitle);
+        console.log(chalk.magenta.bold("++"), strTitle);
         const isLocalPath = (strTestPath) => {
             // Regular expression to match common file path patterns
             const filePathRegex = /^(\/|\.\/|\.\.\/|\w:\/)?([\w-.]+\/)*[\w-.]+\.\w+$/;
@@ -33,7 +33,7 @@ const Logger = {
         const entries = Object.entries(LogObject);
         const totalEntries = entries.length;
         for (const [index, [key, value]] of entries.entries()) {
-            const connector = index === totalEntries - 1 ? "└" : "├";
+            const connector = index === totalEntries - 1 ? "    " : "    ";
             let color = chalk.white;
             switch (typeof value) {
                 case typeof String(): {
@@ -110,17 +110,17 @@ const ValidateParameters = (args) => {
 
 const CheckForUpdates = async () => {
     return new Promise(async (resolve) => {
-        const packageJsonPath = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
+        const packageJsonPath = path.resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
         const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'));
-        fetch("https://registry.npmjs.org/millennium-lib").then(response => response.json()).then(json => {
+        fetch("https://registry.npmjs.org/@steambrew/ttc").then(response => response.json()).then(json => {
             if (json?.["dist-tags"]?.latest != packageJson.version) {
-                Logger.Tree(`millennium-lib@${packageJson.version} requires update to ${json?.["dist-tags"]?.latest}`, {
-                    cmd: "run `npm i millennium-lib` to get latest updates!"
+                Logger.Tree(`@steambrew/ttc@${packageJson.version} requires update to ${json?.["dist-tags"]?.latest}`, {
+                    cmd: `run "npm install @steambrew/ttc@${json?.["dist-tags"]?.latest}" to get latest updates!`
                 });
                 resolve(true);
             }
             else {
-                Logger.Info(`millennium-lib@${packageJson.version} is up-to-date!`);
+                Logger.Info(`@steambrew/ttc@${packageJson.version} is up-to-date!`);
                 resolve(false);
             }
         });
@@ -201,66 +201,49 @@ function InitializePlugins() {
         window.PLUGIN_LIST[pluginName] = {};
     }
 }
+const ContructFunctions = (parts) => { return parts.join('\n'); };
 function InsertMillennium(props) {
-    const ContructFunctions = (parts) => { return parts.join('\n'); };
     const generateBundle = (_, bundle) => {
         for (const fileName in bundle) {
-            if (bundle[fileName].type != 'chunk') {
+            if (bundle[fileName].type != 'chunk')
                 continue;
-            }
             Logger.Info("Injecting Millennium shims into module... " + chalk.green.bold("okay"));
             bundle[fileName].code = ContructFunctions([
                 `const pluginName = "${props.strPluginInternalName}";`,
-                // insert the bootstrap function and call it
                 InitializePlugins.toString(), InitializePlugins.name + "()",
-                WrappedCallServerMethod,
-                WrappedCallable,
-                bundle[fileName].code,
+                WrappedCallServerMethod, WrappedCallable, bundle[fileName].code,
                 ExecutePluginModule.toString(), ExecutePluginModule.name + "()"
             ]);
         }
     };
-    return {
-        name: 'add-plugin-main', generateBundle
-    };
+    return { name: String(), generateBundle };
 }
 function InsertWebkitMillennium(props) {
-    const ContructFunctions = (parts) => { return parts.join('\n'); };
     const generateBundle = (_, bundle) => {
         for (const fileName in bundle) {
-            if (bundle[fileName].type != 'chunk') {
+            if (bundle[fileName].type != 'chunk')
                 continue;
-            }
             Logger.Info("Injecting Millennium shims into webkit module... " + chalk.green.bold("okay"));
             bundle[fileName].code = ContructFunctions([
-                // define the plugin name at the top of the bundle, so it can be used in wrapped functions
                 `const pluginName = "${props.strPluginInternalName}";`,
-                // insert the bootstrap function and call it
                 InitializePlugins.toString(), InitializePlugins.name + "()",
-                // TODO
                 WrappedCallServerMethod, WrappedCallable, bundle[fileName].code,
                 ExecuteWebkitModule.toString(), ExecuteWebkitModule.name + "()"
             ]);
         }
     };
-    return {
-        name: 'add-plugin-main', generateBundle
-    };
+    return { name: String(), generateBundle };
 }
 function GetPluginComponents(props) {
     const pluginList = [
-        /**
-         * @brief resolve millennium, edit the exported bundle to work with millennium
-         */
         InsertMillennium(props),
         typescript(), nodeResolve(), commonjs(), json(),
         replace({
+            delimiters: ['', ''],
             preventAssignment: true,
             'process.env.NODE_ENV': JSON.stringify('production'),
-            // replace callServerMethod with wrapped replacement function. 
             'Millennium.callServerMethod': `__call_server_method__`,
             'client.callable': `__wrapped_callable__`,
-            delimiters: ['', ''],
             'client.pluginSelf': 'window.PLUGIN_LIST[pluginName]',
             'client.Millennium.exposeObj(': 'client.Millennium.exposeObj(exports, '
         }),
@@ -274,24 +257,19 @@ function GetWebkitPluginComponents(props) {
     const pluginList = [
         InsertWebkitMillennium(props), typescript(), nodeResolve(), commonjs(), json(),
         replace({
+            delimiters: ['', ''],
             preventAssignment: true,
-            // replace callServerMethod with wrapped replacement function. 
             'Millennium.callServerMethod': `__call_server_method__`,
-            'client.callable': `__wrapped_callable__`,
-            delimiters: ['', ''],
+            'webkit.callable': `__wrapped_callable__`,
         }),
     ];
-    if (props.bTersePlugin) {
-        pluginList.push(terser());
-    }
+    props.bTersePlugin && pluginList.push(terser());
     return pluginList;
 }
 const GetFrontEndDirectory = () => {
     const pluginJsonPath = './plugin.json';
     try {
-        const pluginJson = JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'));
-        const frontendDirectory = pluginJson?.frontend;
-        return frontendDirectory ? frontendDirectory : "frontend";
+        return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? "frontend";
     }
     catch (error) {
         return "frontend";
@@ -302,12 +280,18 @@ const TranspilerPluginComponent = async (props) => {
         input: `./${GetFrontEndDirectory()}/index.tsx`,
         plugins: GetPluginComponents(props),
         context: 'window',
-        external: ['react', 'react-dom', '@steambrew/client'],
+        external: (id) => {
+            if (id === '@steambrew/webkit') {
+                Logger.Error('The @steambrew/webkit module should not be included in the frontend module, use @steambrew/client instead. Please remove it from the frontend module and try again.');
+                process.exit(1);
+            }
+            return id === '@steambrew/client' || id === 'react' || id === 'react-dom';
+        },
         output: {
             name: "millennium_main",
             file: ".millennium/Dist/index.js",
             globals: {
-                react: "window.SP_REACT",
+                "react": "window.SP_REACT",
                 "react-dom": "window.SP_REACTDOM",
                 "@steambrew/client": "window.MILLENNIUM_API"
             },
@@ -319,29 +303,29 @@ const TranspilerPluginComponent = async (props) => {
         input: `./webkit/index.ts`,
         plugins: GetWebkitPluginComponents(props),
         context: 'window',
-        external: ['@steambrew/client'],
+        external: (id) => {
+            if (id === '@steambrew/client') {
+                Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.');
+                process.exit(1);
+            }
+            return id === '@steambrew/webkit';
+        },
         output: {
             name: "millennium_main",
             file: ".millennium/Dist/webkit.js",
             exports: 'named',
             format: 'iife',
             globals: {
-                "@steambrew/client": "window.MILLENNIUM_API"
+                "@steambrew/webkit": "window.MILLENNIUM_API"
             },
         }
     };
     Logger.Info("Starting build; this may take a few moments...");
-    // Load the Rollup configuration file
     try {
-        const bundle = await rollup(frontendRollupConfig);
-        const outputOptions = frontendRollupConfig.output;
-        await bundle.write(outputOptions);
-        // check if the webkit file exists
+        await (await rollup(frontendRollupConfig)).write(frontendRollupConfig.output);
         if (fs.existsSync(`./webkit/index.ts`)) {
             Logger.Info("Compiling webkit module...");
-            const bundle1 = await rollup(webkitRollupConfig);
-            const outputOptions1 = webkitRollupConfig.output;
-            await bundle1.write(outputOptions1);
+            await (await rollup(webkitRollupConfig)).write(webkitRollupConfig.output);
         }
         Logger.Info('Build succeeded!', Number((performance.now() - global.PerfStartTime).toFixed(3)), 'ms elapsed.');
     }
@@ -361,11 +345,11 @@ const CheckModuleUpdates = async () => {
 const StartCompilerModule = () => {
     const parameters = ValidateParameters(process.argv.slice(2));
     const bTersePlugin = parameters.type == BuildType.ProdBuild;
-    Logger.Tree("Transpiler config: ", {
-        target: parameters.targetPlugin,
-        build: BuildType[parameters.type],
-        minify: bTersePlugin
-    });
+    // Logger.Tree("Transpiler config: ", {
+    //     target: parameters.targetPlugin,
+    //     build: BuildType[parameters.type],
+    //     minify: bTersePlugin
+    // })
     ValidatePlugin(parameters.targetPlugin).then((json) => {
         const props = {
             bTersePlugin: bTersePlugin,

package/index.ts

@@ -10,7 +10,7 @@ import { CheckForUpdates } from "./VersionMon"
 import { ValidatePlugin } from './Linter'
 import { TranspilerPluginComponent, TranspilerProps } from './Compiler'
 import { performance } from 'perf_hooks';
-import { Logger } from './Logger'
+// import { Logger } from './Logger'
 
 declare global {
     var PerfStartTime: number;
@@ -25,11 +25,11 @@ const StartCompilerModule = () => {
     const parameters   = ValidateParameters( process.argv.slice(2) );
     const bTersePlugin = parameters.type == BuildType.ProdBuild
 
-    Logger.Tree("Transpiler config: ", {
-        target: parameters.targetPlugin,
-        build: BuildType[parameters.type],
-        minify: bTersePlugin
-    })
+    // Logger.Tree("Transpiler config: ", {
+    //     target: parameters.targetPlugin,
+    //     build: BuildType[parameters.type],
+    //     minify: bTersePlugin
+    // })
 
     ValidatePlugin(parameters.targetPlugin).then((json: any) => {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steambrew/ttc",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",