@rws-framework/client 2.15.4 → 2.15.6

package/builder/webpack/loaders/rws_fast_scss_loader.js

@@ -9,6 +9,7 @@ module.exports = async function(content) {
     const isDev = this._compiler.options.mode === 'development';    
     const saveFile = content.indexOf('@save') > -1; 
     const plugin = new RWSScssPlugin({
+        appRootDir: this.query?.appRootDir,
         rwsWorkspaceDir: this.query?.rwsWorkspaceDir
     }); 
     let fromTs = false;    

package/builder/webpack/loaders/rws_fast_ts_loader.js

@@ -61,6 +61,7 @@ module.exports = async function(content) {
     try { 
         if(tagName){                                   
             const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, templateName, isDev);         
+
             const styles = await LoadersHelper.getStyles(filePath, this.query?.rwsWorkspaceDir, this.query?.appRootDir,this.addDependency, templateExists, stylesPath, isDev);  
 
             if(className){                
@@ -69,7 +70,7 @@ module.exports = async function(content) {
                 if(replacedViewDecoratorContent){
                     processedContent = `${template}\n${styles}\n${replacedViewDecoratorContent}`;
                 }                
-            }            
+            }
             
             processedContent = `${htmlFastImports ? htmlFastImports + '\n' : ''}${processedContent}`;
         }

package/builder/webpack/rws.webpack.config.js

@@ -68,7 +68,7 @@ const RWSWebpackWrapper = async (appRoot, rwsFrontendConfig,  _packageDir) => {
   let optimConfig = null;
   let aliases = rwsFrontendConfig.aliases || {};
 
-  aliases = { ...aliases, ...loadAliases(_packageDir, path.resolve(_MAIN_PACKAGE, 'node_modules'), executionDir) }  
+  aliases = { ...aliases, ...loadAliases(_packageDir, tsConfig,path.resolve(_MAIN_PACKAGE, 'node_modules'), executionDir) }  
 
   // #SECTION PLUGIN STARTING HOOKS
 
@@ -115,7 +115,7 @@ const RWSWebpackWrapper = async (appRoot, rwsFrontendConfig,  _packageDir) => {
   }
 
   // #SECTION RWS WEBPACK BUILD
-  const cfgExport = createWebpackConfig({
+  const cfgExport = await createWebpackConfig({
     executionDir,
     _packageDir,
     isDev,

package/builder/webpack/rws_scss_plugin.js

@@ -52,7 +52,7 @@ class RWSScssPlugin {
     scssPath = _scss_import.processImportPath(scssPath, this.getRWSWorkspaceDir(), this.getRWSRootDir(),path.dirname(scssPath))    
 
 
-    let scssCode = _scss_fs.getCodeFromFile(scssPath, this.getRWSWorkspaceDir());
+    let scssCode = _scss_fs.getCodeFromFile(scssPath, this.getRWSWorkspaceDir(), this.getRWSRootDir());
 
     return await _scss_compiler.compileScssCode(scssCode, path.dirname(scssPath), this.getRWSWorkspaceDir(), this.getRWSRootDir());
   }
@@ -70,7 +70,7 @@ class RWSScssPlugin {
   }
 
   getRWSRootDir() {
-    return this.rwsWorkspaceDir;
+    return this.appRootDir;
   }
 }
 

package/builder/webpack/scss/_import.js

@@ -13,9 +13,9 @@ function processImportPath(importPath, rwsWorkspaceDir, appRootDir, fileRootDir
     _scss_fs = _scss_fs_builder(this);
     const workspaceDir = this.getRWSWorkspaceDir ? this.getRWSWorkspaceDir() : rwsWorkspaceDir;
     const appRoot = this.getRWSWorkspaceDir ? this.getRWSRootDir() : appRootDir;
-
+  
     if (importPath.split('')[0] === '~') {
-        return fillSCSSExt(replaceWithNodeModules(importPath, appRootDir, null, true), noext);
+        return fillSCSSExt(replaceWithNodeModules(importPath, appRoot, null, true), noext);
     }
 
     if (importPath.indexOf('@rws-mixins') === 0) {
@@ -67,26 +67,6 @@ function underscorePath(path, noext = false) {
     return partSplit.join('/');
 }
 
-function fillSCSSExt(scssPath, noext = false) {
-    const underscoredPath = underscorePath(scssPath, noext);
-    if (!fs.existsSync(scssPath) && fs.existsSync(underscoredPath)) {
-        return underscoredPath;
-    }
-
-    if (noext) {
-        return scssPath;
-    }
-
-    if ((!fs.existsSync(scssPath) || (fs.existsSync(scssPath) && fs.statSync(scssPath).isDirectory())) && fs.existsSync(`${scssPath}.scss`)) {
-        return `${scssPath}.scss`;
-    }
-
-    if (fs.existsSync(`_${scssPath}.scss`)) {
-        return `${scssPath}.scss`;
-    }
-
-    return scssPath;
-}
 
 function fillSCSSExt(scssPath, noext = false) {
     const underscoredPath = underscorePath(scssPath, noext);
@@ -157,7 +137,8 @@ function detectImports(code) {
 
 function replaceWithNodeModules(input, appRootDir, fileDir = null, absolute = false, token = '~') {
     _scss_fs = _scss_fs_builder(this);
-    return input.replace(token, absolute ? `${path.resolve(appRootDir, 'node_modules')}/` : this.node_modules_dir(fileDir ? fileDir : appRootDir));
+   
+    return input.replace(token, absolute ? `${path.join(appRootDir, 'node_modules')}/` : this.node_modules_dir(fileDir ? fileDir : appRootDir));
 }
 
 function processImports(imports, fileRootDir, rwsWorkspaceDir, importStorage = {}, sub = false) {
@@ -184,8 +165,8 @@ function processImports(imports, fileRootDir, rwsWorkspaceDir, importStorage = {
         const appRoot = this.getRWSWorkspaceDir ? this.getRWSRootDir() : importData[4];
 
         let importPath = processImportPath(originalImportPath, workspaceDir, appRoot, fileRootDir);            
-
-        let replacedScssContent = getStorage(importPath, _scss_fs.getCodeFromFile(importPath, workspaceDir).replace(/\/\*[\s\S]*?\*\//g, ''));
+      
+        let replacedScssContent = getStorage(importPath, _scss_fs.getCodeFromFile(importPath, workspaceDir, appRoot).replace(/\/\*[\s\S]*?\*\//g, ''));
 
         const recursiveImports = extractScssImports(replacedScssContent, workspaceDir, appRoot, importPath)[0];
 

package/cfg/build_steps/vite/_build_config.ts

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { RWSConfigBuilder, rwsPath } from '@rws-framework/console';
-import { _DEFAULT_CONFIG } from '../../_default.cfg';
+// import { _DEFAULT_CONFIG } from '../../_default.cfg';
 
-import { IRWSPlugin } from '../../../src/types/IRWSPlugin';
+import { IPluginSpawnOption, IRWSPlugin, IStaticRWSPlugin } from '../../../src/types/IRWSPlugin';
 
 interface IRWSViteConfig {
   executionDir: string;
@@ -24,25 +24,23 @@ interface IRWSViteConfig {
   devDebug?: any,
   devRouteProxy?: any,
   tsConfigPath: string,
-  rwsPlugins?: {
-    [key: string]: IRWSPlugin
-  },
+  rwsPlugins?: IPluginSpawnOption<any>[],
   _packageDir?: string,
   BuildConfigurator: RWSConfigBuilder<any>
 }
 
-async function getBuildConfig(rwsFrontBuildConfig): Promise<IRWSViteConfig>
+async function getBuildConfig(rwsFrontBuildConfig: Partial<IRWSViteConfig>): Promise<IRWSViteConfig>
 {
-    const BuildConfigurator = new RWSConfigBuilder(rwsPath.findPackageDir(process.cwd()) + '/.rws.json', {..._DEFAULT_CONFIG, ...rwsFrontBuildConfig});
+    const BuildConfigurator = new RWSConfigBuilder(rwsPath.findPackageDir(process.cwd()) + '/.rws.json', {...rwsFrontBuildConfig});
     const _packageDir = rwsPath.findPackageDir(process.cwd());
 
     const executionDir = rwsPath.relativize(BuildConfigurator.get('executionDir') || rwsFrontBuildConfig.executionDir || process.cwd(), _packageDir);
     const isWatcher = process.argv.includes('--watch') || false;  
 
-    const isDev = isWatcher ? true : (BuildConfigurator.get('dev', rwsFrontBuildConfig.dev) || false);
-    const isHotReload = BuildConfigurator.get('hot', rwsFrontBuildConfig.hot);
-    const isReport = BuildConfigurator.get('report', rwsFrontBuildConfig.report);
-    const isParted = BuildConfigurator.get('parted', rwsFrontBuildConfig.parted || false);
+    const isDev = isWatcher ? true : (BuildConfigurator.get('dev', rwsFrontBuildConfig.isDev) || false);
+    const isHotReload = BuildConfigurator.get('isHotReload', rwsFrontBuildConfig.isHotReload);
+    const isReport = BuildConfigurator.get('isReport', rwsFrontBuildConfig.isReport);
+    const isParted = BuildConfigurator.get('isParted', rwsFrontBuildConfig.isParted || false);
 
     const partedPrefix = BuildConfigurator.get('partedPrefix', rwsFrontBuildConfig.partedPrefix);
     const partedDirUrlPrefix = BuildConfigurator.get('partedDirUrlPrefix', rwsFrontBuildConfig.partedDirUrlPrefix);
@@ -53,7 +51,7 @@ async function getBuildConfig(rwsFrontBuildConfig): Promise<IRWSViteConfig>
 
     const outputFileName = BuildConfigurator.get('outputFileName') || rwsFrontBuildConfig.outputFileName;
     const publicDir = BuildConfigurator.get('publicDir') || rwsFrontBuildConfig.publicDir;
-    const serviceWorkerPath = BuildConfigurator.get('serviceWorker') || rwsFrontBuildConfig.serviceWorker;
+    const serviceWorkerPath = BuildConfigurator.get('serviceWorkerPath') || rwsFrontBuildConfig.serviceWorkerPath;
 
     const publicIndex = BuildConfigurator.get('publicIndex') || rwsFrontBuildConfig.publicIndex;
 
@@ -68,14 +66,14 @@ async function getBuildConfig(rwsFrontBuildConfig): Promise<IRWSViteConfig>
 
     const tsConfigPath = rwsPath.relativize(BuildConfigurator.get('tsConfigPath') || rwsFrontBuildConfig.tsConfigPath, executionDir);
 
-    const rwsPlugins = {};
+    const rwsPlugins: IPluginSpawnOption<any>[] = [];
 
-    if(rwsFrontBuildConfig.rwsPlugins){
-        for(const pluginEntry of rwsFrontBuildConfig.rwsPlugins){
-          const pluginBuilder = (await import(`${pluginEntry}`)).default;      
-          rwsPlugins[pluginEntry] = new pluginBuilder(BuildConfigurator, rwsFrontBuildConfig);
-        }
-      }
+    // if(rwsFrontBuildConfig.rwsPlugins){
+    //     for(const pluginEntry of Object.values(rwsFrontBuildConfig.rwsPlugins)){
+    //       const pluginBuilder = (await import(`${pluginEntry}`)).default as IStaticRWSPlugin<any>;      
+    //       rwsPlugins[pluginEntry] = new pluginBuilder(BuildConfigurator, rwsFrontBuildConfig);
+    //     }
+    //   }
 
     return {
         executionDir,

package/cfg/build_steps/vite/index.ts

@@ -1,3 +1,3 @@
-import { createViteConfig } from './vite_config';
+import { getBuildConfig } from './_build_config';
 
-export { createViteConfig };
+export { getBuildConfig };

package/cfg/build_steps/webpack/_aliases.js

@@ -1,8 +1,18 @@
 const path = require('path');
 
-function loadAliases(packageDir, nodeModulesPath, srcDir){    
+function loadAliases(packageDir, tsConfig, nodeModulesPath, executionDir){  
+    
+    const tsPaths = {}
+
+    for(const aliasKey of Object.keys(tsConfig.config.compilerOptions.paths)){
+        const alias = tsConfig.config.compilerOptions.paths[aliasKey];
+        tsPaths[aliasKey] = path.resolve(executionDir, alias[0]);
+    }
+  
     return {        
-        '@rws-framework/foundation': path.resolve(packageDir, 'foundation', 'rws-foundation.js')
+        ...tsPaths,
+        '@rws-framework/foundation': path.resolve(packageDir, 'foundation', 'rws-foundation.js'),
+        '@rws-framework/foundation/*': path.resolve(packageDir, 'foundation', '*')
     }
 }
 

package/cfg/build_steps/webpack/_build_config.js

@@ -5,6 +5,7 @@ const { RWSConfigBuilder } = require('@rws-framework/console')
 const { rwsPath } = require('@rws-framework/console');
 const { _DEFAULT_CONFIG } = require('../../_default.cfg');
 
+
 async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
     const BuildConfigurator = new RWSConfigBuilder(path.join(rwsPath.findPackageDir(process.cwd()), '.rws.json'), {..._DEFAULT_CONFIG, ...rwsFrontBuildConfig});
     const executionDir = rwsPath.relativize(BuildConfigurator.get('executionDir') || rwsFrontBuildConfig.executionDir || process.env.RWS_APP_ROOT || process.cwd(), _packageDir);
@@ -37,7 +38,7 @@ async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
 
     const devRouteProxy = BuildConfigurator.get('devRouteProxy') || rwsFrontBuildConfig.devRouteProxy;
 
-    const tsConfig = BuildConfigurator.get('tsConfig') || rwsFrontBuildConfig.tsConfig;
+    const tsConfig = await (BuildConfigurator.get('tsConfig') || rwsFrontBuildConfig.tsConfig)(_packageDir, true, false);
 
     const rwsPlugins = {};
 

package/cfg/build_steps/webpack/_env_defines.js

@@ -10,8 +10,14 @@ function processEnvDefines(BuildConfigurator, config, devDebug) {
     const rwsDefines = BuildConfigurator.get('env') || config.env || null;
 
     if (rwsDefines) {
-        _rws_defines = { ..._rws_defines, ...rwsDefines }
+        const stringifiedDefines = Object.entries(rwsDefines).reduce((acc, [key, value]) => ({
+            ...acc,
+            [`process.env.${key}`]: JSON.stringify(value)
+        }), {});
+        _rws_defines = { ..._rws_defines, ...stringifiedDefines }
     }
+    
+    console.log({_rws_defines});
 
     return _rws_defines;
 }

package/cfg/build_steps/webpack/_info.js

@@ -17,7 +17,7 @@ module.exports = {
         plugins: rwsPlugins
         });
 
-        console.log(chalk.blue('\nTSCONFIG:'), util.inspect(tsConfig, {
+        console.log(chalk.blue('\nTSCONFIG:'), util.inspect(tsConfig.config, {
             depth: null,
             colors: true,
             maxArrayLength: null

package/cfg/build_steps/webpack/_loaders.js

@@ -10,11 +10,13 @@ const chalk = require('chalk');
 const { timingCounterStart, timingCounterStop } = require('./_timing');
 const { rwsRuntimeHelper, rwsPath } = require('@rws-framework/console');
 
-function getRWSLoaders(packageDir, executionDir, tsConfig, appRootDir, entrypoint) {
+function getRWSLoaders(packageDir, executionDir, tsConfigData, appRootDir, entrypoint) {
   const scssLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_scss_loader.js');
   const tsLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_ts_loader.js');
   const htmlLoader = path.join(packageDir, 'builder/webpack/loaders/rws_fast_html_loader.js');
 
+  const tsConfigPath = tsConfigData.path;
+
   const loaders = [
     {
       test: /\.html$/,
@@ -30,14 +32,20 @@ function getRWSLoaders(packageDir, executionDir, tsConfig, appRootDir, entrypoin
         {
           loader: 'ts-loader',
           options: {
-            ...tsConfig,
-            configFile: false,
+            configFile: tsConfigPath, 
+            compilerOptions: {
+                emitDecoratorMetadata: true,
+                experimentalDecorators: true,
+                target: "ES2018",
+                module: "commonjs"
+            },            
             transpileOnly: false, 
             logLevel: "info",
             logInfoToStdOut: true,
             context: executionDir,
             errorFormatter: (message, colors) => {
-              const messageText = message.message || message;
+              console.log({message});
+              const messageText = typeof message === 'object' ? JSON.stringify(message, null, 2) : message;
               return `\nTS Error: ${messageText}\n`;
             },         
           }
@@ -51,20 +59,25 @@ function getRWSLoaders(packageDir, executionDir, tsConfig, appRootDir, entrypoin
         }
       ],
       include: [
-        path.resolve(executionDir, 'src'),
-        path.resolve(packageDir, 'src'),
-        path.resolve(packageDir, 'foundation', 'rws-foundation.d.ts')
+        ...tsConfigData.includes.map(item => item.abs()),
+        path.resolve(packageDir, 'foundation', 'rws-foundation.d.ts')            
       ],
-      exclude: [        
-        /node_modules\/(?!\@rws-framework\/[A-Z0-9a-z])/,
+      exclude: [
+        ...tsConfigData.excludes.map(item => item.abs()),
         /\.debug\.ts$/,
         /\.d\.ts$/        
-      ],
+      ]     
     },
     {
       test: /\.scss$/i,
       use: [
-        scssLoader,
+        {
+          loader: scssLoader,
+          options: {
+            rwsWorkspaceDir: executionDir,
+            appRootDir
+          }
+        },
       ],
     },
   ];

package/cfg/build_steps/webpack/_rws_externals.js

@@ -12,7 +12,7 @@ const _defaultOpts = {
   }
 }
 
-const externals = (pkgPath, declaredCodeBase, nodeModules, automatedChunks, externalOptions = _defaultOpts) => ({context, request}, callback) => {
+const externals = (declaredCodeBase, nodeModules, automatedChunks, externalOptions = _defaultOpts) => ({context, request}, callback) => {
     let theOptions = _defaultOpts;
 
     if(externalOptions !== null){      
@@ -25,18 +25,18 @@ const externals = (pkgPath, declaredCodeBase, nodeModules, automatedChunks, exte
       // /css-loader/,
       /tslib/,
       /reflect-metadata/, 
-      /\@microsoft\/fast-foundation\/.*/     
+      /\@microsoft\/fast-foundation\/.*/
     ]
 
     const enforced = [
       /entities/,      
       /\@microsoft\/fast-foundation\/.*\/di/,
-      /\@microsoft\/fast-foundation\/.*\/foundation-element/
+      /\@microsoft\/fast-foundation\/.*\/foundation-element/,      
     ]
 
     const frontendDirs = [
       codeBase,
-      pkgPath
+      path.resolve(__dirname,'..','..','..')
     ];        
 
     const inFrontendContext = frontendDirs.some(dir => context.startsWith(dir)) || 

package/cfg/build_steps/webpack/_webpack_config.js

@@ -1,7 +1,8 @@
 const { getRWSLoaders } = require('./_loaders');
 const path = require('path');
 
-function createWebpackConfig({
+
+async function createWebpackConfig({
     executionDir,
     _packageDir,
     isDev,
@@ -20,7 +21,8 @@ function createWebpackConfig({
     devExternalsVars,
     appRootDir,
     entrypoint
-}) {
+}) { 
+
     return {
         context: executionDir,
         entry: {
@@ -39,15 +41,19 @@ function createWebpackConfig({
             modules: modules_setup,
             alias: {
                 ...aliases
+            },
+            fallback: {                
+                fs: false,
+                path: false
             }
         },
         module: {
             rules: getRWSLoaders(_packageDir, executionDir, tsConfig, appRootDir, entrypoint),
         },
         plugins: WEBPACK_PLUGINS,
-        externals: rwsExternals(_packageDir, executionDir, modules_setup, automatedChunks, {
-            _vars: devExternalsVars
-        })      
+        // externals: rwsExternals(_packageDir, executionDir, modules_setup, automatedChunks, {
+        //     _vars: devExternalsVars
+        // })      
     }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.15.4",
+    "version": "2.15.6",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -105,5 +105,6 @@
     },
     "overrides": {
         "lodash": "^4.17.21"
-    }
+    },
+    "_rws": true
 }

package/src/client/config.ts

@@ -4,6 +4,7 @@ import { RWSClientInstance } from "../client";
 import { RWSPlugin, DefaultRWSPluginOptionsType } from "../plugins/_plugin";
 import RWSWindow, {loadRWSRichWindow } from '../types/RWSWindow';
 import deepmerge from 'deepmerge';
+import { IPluginSpawnOption } from "../types/IRWSPlugin";
 
 type RWSInfoType = { components: string[] };
 
@@ -72,15 +73,12 @@ function get(this: RWSClientInstance, key: string): any | null
     return null;
 }
 
-type PluginConstructor<T extends DefaultRWSPluginOptionsType> = new (options: T) => RWSPlugin<T>;
-type RWSPluginEntry<T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType> = IStaticRWSPlugin<T>;
-
-function addPlugin<T  extends DefaultRWSPluginOptionsType>(this: RWSClientInstance, pluginEntry: RWSPluginEntry){
+function addPlugin<T  extends DefaultRWSPluginOptionsType>(this: RWSClientInstance, pluginEntry: IPluginSpawnOption<T>){
     const rwsWindow: RWSWindow = loadRWSRichWindow();
-    const pluginClass: PluginConstructor<T> = (Array.isArray(pluginEntry) ? pluginEntry[0] : pluginEntry) as unknown as PluginConstructor<T>;
+    const pluginClass: IStaticRWSPlugin<T> = pluginEntry.pluginEntry;
     const pluginOptions: T = (Array.isArray(pluginEntry) ? pluginEntry[1] : { enabled: true }) as T;
 
-    if(!Object.keys(rwsWindow.RWS.plugins).includes(pluginClass.name)){       
+    if(!Object.keys(rwsWindow.RWS.plugins).find(item => { item === pluginClass.name })){
         const pluginInstance: RWSPlugin<T> = new pluginClass(pluginOptions);
         this.plugins[pluginClass.name] = pluginInstance; 
         rwsWindow.RWS.plugins[pluginClass.name] = pluginInstance;

package/src/client.ts

@@ -1,4 +1,4 @@
-import IRWSConfig, { RWSPluginEntry } from './types/IRWSConfig';
+import IRWSConfig from './types/IRWSConfig';
 
 import RWSNotify from './types/RWSNotify';
 
@@ -74,9 +74,9 @@ class RWSClient {
         }        
     }
 
-    addPlugin<T extends DefaultRWSPluginOptionsType>(pluginEntry: IStaticRWSPlugin)
+    addPlugin<T extends DefaultRWSPluginOptionsType>(pluginEntry: IStaticRWSPlugin<T>, options?: T)
     {        
-        this.config.plugins.push(pluginEntry);
+        this.config.plugins.push({pluginEntry, options});
     }
 
     async setup(config: IRWSConfig = {}): Promise<IRWSConfig> {

package/src/components/_container.ts

@@ -1,4 +1,4 @@
-import {DI, Container, Registration } from '../../foundation/rws-foundation';
+import {DI, Container, Registration, InterfaceSymbol, Key } from '../../foundation/rws-foundation';
 import {loadRWSRichWindow} from '../types/RWSWindow';
 
 export default () => {
@@ -13,4 +13,4 @@ export default () => {
     return richWindow.RWS.container;
 };
 
-export { DI, Container, Registration }
+export { DI, Container, Registration, InterfaceSymbol, Key }

package/src/index.ts

@@ -21,9 +21,8 @@ import { RWSPlugin } from './plugins/_plugin';
 
 import type { DefaultRWSPluginOptionsType } from './plugins/_plugin';
 
-import type { IRWSPlugin, IStaticRWSPlugin } from './types/IRWSPlugin';
+import type { IRWSPlugin, IStaticRWSPlugin, IPluginSpawnOption } from './types/IRWSPlugin';
 import RWSClient, { RWSClientInstance } from './client';
-import type  { RWSPluginEntry } from './types/IRWSConfig';
 import type IRWSUser from './types/IRWSUser';
 import RWSViewComponent from './components/_component';
 import type { IAssetShowOptions } from './components/_component';
@@ -42,7 +41,7 @@ export {
     RWSClientInstance,
 
     RWSPlugin,
-    RWSPluginEntry,
+    IPluginSpawnOption,
     IRWSPlugin, IStaticRWSPlugin,
     DefaultRWSPluginOptionsType,
     

package/src/plugins/_plugin.ts

@@ -3,62 +3,59 @@ import { Container } from "../components/_container";
 import RWSWindow, {loadRWSRichWindow } from '../types/RWSWindow';
 import IRWSUser from "../types/IRWSUser";
 import { RWSInfoType } from "../client/components";
-import { IRWSPlugin } from "../types/IRWSPlugin";
+import { IRWSPlugin, IStaticRWSPlugin } from "../types/IRWSPlugin";
 
-type DefaultRWSPluginOptionsType = { enabled: boolean };
-type PluginInfoType = { name: string }
+export type DefaultRWSPluginOptionsType = { enabled?: boolean };
+type PluginInfoType = { name: string };
 type PluginConstructor<T extends DefaultRWSPluginOptionsType> = new (options: T) => RWSPlugin<T>;
-abstract class RWSPlugin<PluginOptions extends DefaultRWSPluginOptionsType> implements IRWSPlugin{
+
+abstract class RWSPlugin<T extends DefaultRWSPluginOptionsType> extends IRWSPlugin<T> {
     protected isLoaded: boolean = false;
-    protected options: PluginOptions;
-    protected container: Container;    
-    protected window: RWSWindow;
+    protected options!: T;
+    protected container!: Container;    
+    protected window!: RWSWindow;
 
     static container: Container;    
     static window: RWSWindow;
 
-    constructor(options: PluginOptions = { enabled: false } as PluginOptions){
+    constructor(options: T = { enabled: true } as T) {
+        super();
         this.isLoaded = true;
         this.container = RWSPlugin.container;
         this.window = RWSPlugin.window;
         this.options = options;
     }
 
-    async onClientStart(): Promise<void>
-    {
-        
+    async onClientStart(): Promise<void> {
+        // Implementation
     }
 
-    async onPartedComponentsLoad(componentParts: RWSInfoType): Promise<void>
-    {
-        
+    async onPartedComponentsLoad(componentParts: RWSInfoType): Promise<void> {
+        // Implementation
     }
 
-    async onComponentsDeclare(): Promise<void>
-    {
-        
+    async onComponentsDeclare(): Promise<void> {
+        // Implementation
     }
 
-    async onSetUser(user: IRWSUser): Promise<void>{
-
+    async onSetUser(user: IRWSUser): Promise<void> {
+        // Implementation
     }
-
     
-    
-    static getPlugin<Plugin extends RWSPlugin<T>, T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType>(pluginClass: PluginConstructor<T>): Plugin | null 
-    {
+    static getPlugin<P extends RWSPlugin<T>, T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType>(
+        pluginClass: IStaticRWSPlugin<T>
+    ): P | null {
         const plugin = this.window.RWS.plugins[pluginClass.name];
-        return plugin ? plugin as Plugin : null;
+        return plugin ? plugin as P : null;
     }
 
-
-    static getAllPlugins(): RWSPlugin<DefaultRWSPluginOptionsType>[]
-    {
-        return Object.keys(this.window.RWS.plugins).map((key) => this.window.RWS.plugins[key]);
+    static getAllPlugins(): Array<RWSPlugin<DefaultRWSPluginOptionsType>> {
+        return Object.keys(this.window.RWS.plugins)
+            .map((key) => this.window.RWS.plugins[key]);
     }
 }
 
 RWSPlugin.window = loadRWSRichWindow();
 RWSPlugin.container = RWSContainer();
 
-export { RWSPlugin, DefaultRWSPluginOptionsType }
+export { RWSPlugin };

package/src/services/ConfigService.ts

@@ -68,15 +68,6 @@ class ConfigService extends TheService {
     public set<V extends keyof IRWSConfig>(key: V, value: IRWSConfig[V]){
         this.data[key] = value;
     }
-  
-    public async reloadConfig(cfgString: string): Promise<ConfigService> 
-    {
-        const module = await import(/* webpackIgnore: true */ cfgString);
-        const cfg: () => IRWSConfig = module.defaults;      
-        this.data = cfg();
-  
-        return this;
-    }
 
     async waitForConfig(tagName: string): Promise<boolean>
     {        

package/src/types/IRWSConfig.ts

@@ -1,10 +1,7 @@
 import RWSViewComponent from '../components/_component';
-import { RWSPlugin, DefaultRWSPluginOptionsType } from '../plugins/_plugin';
-import { IStaticRWSPlugin } from './IRWSPlugin';
+import { IPluginSpawnOption } from './IRWSPlugin';
 
 export type IFrontRoutes = Record<string, unknown>; 
-export type RWSPluginEntry<T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType> = new (...args: any[]) => RWSPlugin<T>;
-
 export default interface IRWSConfig {
     [key: string]: any
     dev?: boolean
@@ -25,7 +22,7 @@ export default interface IRWSConfig {
     rwsDefines?: {[key: string]: any}
     partedFileDir?: string
     partedPrefix?: string
-    plugins?: IStaticRWSPlugin[]
+    plugins?: IPluginSpawnOption<any>[]
     routing_enabled?: boolean
     _noLoad?: boolean    
 }

package/src/types/IRWSPlugin.ts

@@ -1,19 +1,24 @@
-import { DefaultRWSPluginOptionsType } from "../plugins/_plugin";
+import { DefaultRWSPluginOptionsType, RWSPlugin } from "../plugins/_plugin";
 import IRWSUser from "./IRWSUser";
 import { Container } from "../components/_container";
 import RWSWindow from "./RWSWindow";
 import { RWSInfoType } from "../client/components";
 
+export abstract class IRWSPlugin<T extends DefaultRWSPluginOptionsType> {
+    abstract onClientStart(): Promise<void>;
+    abstract onPartedComponentsLoad(componentParts: RWSInfoType): Promise<void>;
+    abstract onComponentsDeclare(): Promise<void>;
+    abstract onSetUser(user: IRWSUser): Promise<void>;    
+    protected abstract options: T;
+    protected abstract container: Container;
+    protected abstract window: RWSWindow;
+}
 
-export interface IRWSPlugin {
-    onClientStart(): Promise<void>
-    onPartedComponentsLoad(componentParts: RWSInfoType): Promise<void>
-    onComponentsDeclare(): Promise<void>
-    onSetUser(user: IRWSUser): Promise<void>
+export interface IStaticRWSPlugin<T extends DefaultRWSPluginOptionsType> {    
+    new (options: T): RWSPlugin<T>;    
 }
 
-export interface IStaticRWSPlugin<PluginOptions extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType> {    
-    new (...args: any[]): IRWSPlugin;
-    container: Container;    
-    window: RWSWindow;
+export interface IPluginSpawnOption<T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType> { 
+    pluginEntry: IStaticRWSPlugin<T>;
+    options?: T;
 }