@rws-framework/client 2.3.0 → 2.4.0

package/cfg/_default.cfg.js

@@ -6,7 +6,7 @@ const _DEFAULT_CONFIG_VARS = {
     publicDir: './public',
     publicIndex: 'index.html',      
     outputFileName: 'client.rws.js',
-    outputDir: './build',
+    outputDir: process.cwd() + '/build',
     //Frontend RWS client configs  
     backendUrl: null,
     wsUrl: null,
@@ -15,7 +15,7 @@ const _DEFAULT_CONFIG_VARS = {
     pubUrlFilePrefix: '/',
     //Universal configs
     transports: ['websocket'],    
-    parted: true,        
+    parted: false,        
 }
 
 const _DEFAULT_CONFIG = Object.freeze(_DEFAULT_CONFIG_VARS);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/client",
   "private": false,
-  "version": "2.3.0",
+  "version": "2.4.0",
   "main": "src/index.ts",
   "scripts": {
     "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -26,6 +26,7 @@
   },
   "homepage": "https://github.com/papablack/rws-client#readme",
   "dependencies": {
+    "@rws-framework/console": "^0.2.0",
     "@microsoft/fast-element": "^1.12.0",
     "@microsoft/fast-foundation": "^2.46.2",
     "@types/moment": "^2.13.0",
@@ -52,7 +53,7 @@
     "@open-wc/dev-server-hmr": "^0.1.2-next.0",
     "@types/dragula": "^3.7.4",
     "@types/express-fileupload": "^1.4.4",
-    "@types/he": "^1.2.3",
+    "@types/he": "^1.2.3",        
     "@types/json5": "^2.2.0",
     "@types/sanitize-html": "^2.11.0",
     "@types/socket.io-client": "^3.0.0",
@@ -67,7 +68,7 @@
     "eslint-plugin-unused-imports": "^3.1.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.3",
-    "loader-utils": "^3.2.1",
+    "loader-utils": "^3.2.1",  
     "mini-css-extract-plugin": "^2.7.6",
     "node-sass": "^9.0.0",
     "sass-loader": "^13.3.2",

package/rws.webpack.config.js

@@ -7,7 +7,8 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 const RWSAfterPlugin = require('./webpack/rws_after_plugin');
 const tools = require('./_tools');
-const BuildConfigurator = require('./_rws_build_configurator');
+const { _DEFAULT_CONFIG } = require('./cfg/_default.cfg');
+const RWSConfigBuilder = require('@rws-framework/console').RWSConfigBuilder;
 
 const TerserPlugin = require('terser-webpack-plugin');
 const HtmlMinifier = require('html-minifier').minify;
@@ -20,6 +21,8 @@ const json5 = require('json5');
 const RWSWebpackWrapper = (config) => {
 const executionDir = config.executionDir || process.cwd();
 
+const BuildConfigurator = new RWSConfigBuilder(executionDir + '/.rws.json', _DEFAULT_CONFIG);
+
 const isDev = BuildConfigurator.get('dev') || config.dev;
 const isHotReload = BuildConfigurator.get('hot') || config.hot;
 const isReport = BuildConfigurator.get('report') || config.report;
@@ -40,22 +43,27 @@ const publicIndex = BuildConfigurator.get('publicIndex') || config.publicIndex;
 
   let WEBPACK_PLUGINS = [
     new webpack.DefinePlugin({
-      'process.env._RWS_DEFAULTS': JSON.stringify(BuildConfigurator.exportConfig())
-    }),
-    new webpack.BannerPlugin({
-      banner: `if(!window.RWS){         
-        const script = document.createElement('script');
-        script.src = '${partedDirUrlPrefix}/${partedPrefix}.vendors.js';        
-        script.type = 'text/javascript';
-        document.body.appendChild(script);
-      }`.replace('\n', ''),
-      raw: true,
-      entryOnly: true,
-      // include: 'client'
+      'process.env._RWS_DEFAULTS': JSON.stringify(BuildConfigurator.exportDefaultConfig()),
+      'process.env._RWS_BUILD_OVERRIDE': JSON.stringify(BuildConfigurator.exportBuildConfig())
     }),
     new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en-gb/)
   ];
 
+  // if(isParted){
+  //   WEBPACK_PLUGINS.push(new webpack.BannerPlugin({
+  //     banner: `if(!window.RWS_PARTS_LOADED){         
+  //       const script = document.createElement('script');
+  //       script.src = '${partedDirUrlPrefix}/${partedPrefix}.vendors.js';        
+  //       script.type = 'text/javascript';
+  //       document.body.appendChild(script);
+  //       window.RWS_PARTS_LOADED = true;
+  //     }`.replace('\n', ''),
+  //     raw: true,
+  //     entryOnly: true,
+  //     // include: 'client'
+  //   }));
+  // }
+
   const WEBPACK_AFTER_ACTIONS = config.actions || [];
 
   const aliases = config.aliases = {};
@@ -125,7 +133,18 @@ const publicIndex = BuildConfigurator.get('publicIndex') || config.publicIndex;
 
   const optimConfig = {
     minimize: true,
-    minimizer: isDev ? [] : [
+    minimizer: isDev ? [
+      new TerserPlugin({   
+        terserOptions: {      
+          mangle: false, //@error breaks FAST view stuff if enabled for all assets             
+          output: {
+            comments: false
+          },          
+        },
+        extractComments: false,
+        parallel: true,
+      })
+    ] : [
       new TerserPlugin({   
         terserOptions: {
           keep_classnames: true, // Prevent mangling of class names

package/src/client.ts

@@ -39,7 +39,7 @@ class RWSClient {
     private _container: Container;
     private user: IRWSUser = null;
 
-    private config: IRWSConfig = { backendUrl: '', routes: {}, partedFileDir: '/', partedPrefix: 'rws' };
+    private config: IRWSConfig = {};
     protected initCallback: () => Promise<void> = async () => { };
 
     private isSetup = false;
@@ -112,11 +112,9 @@ class RWSClient {
             this.pushUserToServiceWorker(this.user);
         }
 
-        await startClient(this.appConfig, this.wsService, this.notifyService, this.routingService);
+        await startClient(this.appConfig, this.wsService, this.notifyService, this.routingService);        
 
-        RWSClient.defineAllComponents();
-
-        await this.initCallback();
+        await this.initCallback();        
 
         return this;
     }
@@ -226,13 +224,15 @@ class RWSClient {
         const componentParts: string[] = await this.apiService.get<string[]>(this.appConfig.get('partedDirUrlPrefix') + '/rws_chunks_info.json');        
 
         componentParts.forEach((componentName: string, key: number) => {
+            const partUrl = `${this.appConfig.get('partedDirUrlPrefix')}/${this.appConfig.get('partedPrefix')}.${componentName}.js`;
+
             const script: HTMLScriptElement = document.createElement('script');
-            script.src = `${this.appConfig.get('partedDirUrlPrefix')}/${this.appConfig.get('partedPrefix')}.${componentName}.js`;
+            script.src = partUrl;
             script.async = true;
             script.type = 'text/javascript';
             document.body.appendChild(script);
 
-            console.log(`Appended ${componentParts[key]} component`);
+            console.log(`Appended ${componentParts[key]} component (${partUrl})`);
         });        
     }   
     
@@ -272,7 +272,16 @@ class RWSClient {
 
     static defineAllComponents() {
         const richWindowComponents: RWSWindowComponentRegister = (window as Window & RWSWindow).RWS.components;
-        
+
+        Object.keys(richWindowComponents).map(key => richWindowComponents[key].component).forEach((el: IWithCompose<RWSViewComponent>) => {
+            el.define(el as any, el.definition);
+        });
+    }
+
+    
+    defineComponents(){
+        const richWindowComponents: RWSWindowComponentRegister = (window as Window & RWSWindow).RWS.components;
+
         Object.keys(richWindowComponents).map(key => richWindowComponents[key].component).forEach((el: IWithCompose<RWSViewComponent>) => {
             el.define(el as any, el.definition);
         });

package/src/components/_component.ts

@@ -5,11 +5,10 @@ import UtilsService, { UtilsServiceInstance } from '../services/UtilsService';
 import DOMService, { DOMServiceInstance, DOMOutputType } from '../services/DOMService';
 import ApiService, { ApiServiceInstance } from '../services/ApiService';
 import NotifyService, { NotifyServiceInstance } from '../services/NotifyService';
-import RoutingService, { RoutingServiceInstance } from '../services/RoutingService';
 import WSService, { WSServiceInstance } from '../services/WSService';
 import { IRWSViewComponent, IAssetShowOptions } from '../interfaces/IRWSViewComponent';
 import RWSWindow, { RWSWindowComponentInterface, loadRWSRichWindow } from '../interfaces/RWSWindow';
-import {RWSInject, applyConstructor} from './_decorator';
+import { applyConstructor, RWSInject } from './_decorator';
 
 import 'reflect-metadata';
 
@@ -34,6 +33,7 @@ export interface IWithCompose<T extends RWSViewComponent> {
     define<TType extends (...params: any[]) => any>(type: TType, nameOrDef?: string | PartialFASTElementDefinition | undefined): TType;
     _verbose: boolean;
     _toInject: {[key: string]: any};
+    _depKeys: {[key: string]: string[]};
 }
 
 abstract class RWSViewComponent extends FoundationElement implements IRWSViewComponent {
@@ -46,32 +46,33 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
     static autoLoadFastElement = true;
     static _defined: { [key: string]: boolean } = {};
     static _toInject: any[] = [];
+    static _depKeys: {[key: string]: string[]} = {_all: []};
     static _verbose: boolean = false;
 
+    @RWSInject(ConfigService, true) protected config: ConfigServiceInstance;    
+    @RWSInject(DOMService, true) protected domService: DOMServiceInstance;
+    @RWSInject(UtilsService, true) protected utilsService: UtilsServiceInstance;
+    @RWSInject(ApiService, true) protected apiService: ApiServiceInstance;
+    @RWSInject(WSService, true) protected wsService: WSServiceInstance;
+    @RWSInject(NotifyService, true) protected notifyService: NotifyServiceInstance;
+
     @observable trashIterator: number = 0;
     @observable fileAssets: {
         [key: string]: ViewTemplate
     } = {};    
 
-    constructor(
-        @RWSInject(ConfigService) protected config: ConfigServiceInstance,
-        @RWSInject(RoutingService) protected routingService: RoutingServiceInstance,
-        @RWSInject(DOMService) protected domService: DOMServiceInstance,
-        @RWSInject(UtilsService) protected utilsService: UtilsServiceInstance,
-        @RWSInject(ApiService) protected apiService: ApiServiceInstance,
-        @RWSInject(WSService) protected wsService: WSServiceInstance,
-        @RWSInject(NotifyService) protected notifyService: NotifyServiceInstance
-    ) {
+    constructor() {
         super();       
         applyConstructor(this);
+        
     }
 
     connectedCallback() {        
-        super.connectedCallback();       
+        super.connectedCallback();        
         applyConstructor(this);
      
         // console.trace(this.config);
-
+        // console.log(this.routingService);
         if (!(this.constructor as IWithCompose<this>).definition && (this.constructor as IWithCompose<this>).autoLoadFastElement) {
             throw new Error('RWS component is not named. Add `static definition = {name, template};`');
         }

package/src/components/_decorator.ts

@@ -1,6 +1,6 @@
-import { Key } from '@microsoft/fast-foundation';
 import RWSViewComponent, { IWithCompose } from './_component';
-import RWSContainer from './_container';
+import { RWSInject } from './_decorators/RWSInject';
+
 import 'reflect-metadata';
 
 interface RWSDecoratorOptions {
@@ -10,18 +10,8 @@ interface RWSDecoratorOptions {
     ignorePackaging?: boolean
 }
 
-type InjectDecoratorReturnType = (target: any, key?: string | number | undefined, parameterIndex?: number) => void;
-
 //const _PARAMTYPES_METADATA_KEY = 'design:paramtypes';
 
-function RWSInject<T extends RWSViewComponent>(dependencyClass: Key): InjectDecoratorReturnType {
-    return (target: IWithCompose<T>, key?: keyof IWithCompose<T>, parameterIndex?: number) => {
-        const loadedDependency = RWSContainer().get(dependencyClass);    
-        const paramNames = getFunctionParamNames(target.prototype.constructor);
-        target.prototype.constructor._toInject[paramNames[parameterIndex]] = loadedDependency;
-    };
-}
-
 function RWSView<T extends RWSViewComponent>(name: string, data?: RWSDecoratorOptions): (type: any) => void {
     return (constructor: T) => {
     };
@@ -31,15 +21,7 @@ function RWSIgnore(params: { mergeToApp?: boolean } = null): () => void {
     return () => { };
 }
 
-function getFunctionParamNames(func: () => any): string[] {
-    // Convert the function to its string form and extract the parameter names
-    const funcStr = func.toString().replace(/((\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s))/mg, '');  
-    return funcStr.slice(funcStr.indexOf('(')+1, funcStr.indexOf(')')).split(',');
-}
-
-
-function getParentConstructor(instance: any): any 
-{
+function getParentConstructor(instance: any): any {
     const proto = Object.getPrototypeOf(instance.constructor.prototype);
     if (proto && proto.constructor) {
         return proto.constructor;
@@ -48,63 +30,34 @@ function getParentConstructor(instance: any): any
     return null;
 }
 
-const applyConstructor = (component: RWSViewComponent): void => {
-    let mainConstructor = component.constructor;
-    const parent = getParentConstructor(component);
-
-    if(!mainConstructor.length){
-        mainConstructor = parent;
-    }   
-    
-    let topConstructor = mainConstructor;
-
-    if( parent && parent.name === RWSViewComponent.name){ 
-        topConstructor = parent;
-    }
-    
-    const existingInjectedDependencies = (topConstructor as IWithCompose<RWSViewComponent>)._toInject;
-
-    Object.keys(existingInjectedDependencies).forEach((depKey: string) => {
-        const loadedDependency = existingInjectedDependencies[depKey];
-        if(!(component as any)[depKey]){
-            (component as any)[depKey] = loadedDependency;
-        }        
-    });    
-};
-
-const applyProp = (component: RWSViewComponent, propName: string | symbol): any => {
-    let mainConstructor = component.constructor;
+const applyConstructor = (component: RWSViewComponent, x: boolean = false): void => {
+    const mainConstructor: any = component.constructor;
     const parent = getParentConstructor(component);
 
-    if(!mainConstructor.length){
-        mainConstructor = parent;
-    }   
-    
-    let topConstructor = mainConstructor;
+    if (parent.name !== 'RWSViewComponent' ) {
+        return;
+    }    
 
-    if( parent && parent.name === RWSViewComponent.name){ 
-        topConstructor = parent;
-    }
+    const existingInjectedDependencies = (mainConstructor as IWithCompose<RWSViewComponent>)._toInject;
+    const defaultDeps = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys['_all'] || [];
+    const depsToInject = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys[mainConstructor.name] || [];
 
-    if(typeof propName !== 'string'){
-        propName = propName.toString();
+    if (x) {
+        console.log({            
+            mainConstructor: mainConstructor.name,            
+            deps: existingInjectedDependencies
+        });
     }
-    
-    const existingInjectedDependencies = (topConstructor as IWithCompose<RWSViewComponent>)._toInject;
 
-    // console.log(propName);
-    if(!Object.keys(existingInjectedDependencies).includes(propName)){
-        return null;
-    }
-
-    const loadedDependency = existingInjectedDependencies[propName];
+    Object.keys(existingInjectedDependencies).forEach((depKey: string) => {        
+        // console.log(`Checking "${mainConstructor.name}" for "${depKey}"`, [...defaultDeps, ...depsToInject]);
 
-    if(!(component as any)[propName]){
-        (component as any)[propName] = loadedDependency;
-    }
-    
-
-    return loadedDependency;
+        if ([...defaultDeps, ...depsToInject].includes(depKey)) {
+            const loadedDependency = existingInjectedDependencies[depKey];     
+            (component as any)[depKey] = loadedDependency;
+            console.log(`Assigned service to "${mainConstructor.name}(${depKey})":`, loadedDependency);
+        }
+    });
 };
 
-export { RWSView, RWSDecoratorOptions, RWSIgnore, RWSInject, applyConstructor, applyProp };
+export { RWSView, RWSDecoratorOptions, RWSIgnore, RWSInject, applyConstructor };

package/src/components/_decorators/RWSFillBuild.ts

@@ -1,43 +1,56 @@
 import 'reflect-metadata';
 import IRWSConfig from '../../interfaces/IRWSConfig.js';
 
+function extractEnvVar(envVar: string){
+    const extractedVars = JSON.parse(JSON.stringify(envVar));                                  
 
-function RWSFillBuild(config?: Partial<IRWSConfig>) {
+    const {   
+        backendUrl,
+        wsUrl,
+        partedDirUrlPrefix,
+        partedPrefix,
+        pubUrlFilePrefix,
+        transports,    
+        parted        
+    } = extractedVars;
+
+    const extractedFrontendVars = {
+        backendUrl,
+        wsUrl,
+        partedDirUrlPrefix,
+        partedPrefix,
+        pubUrlFilePrefix,
+        transports,    
+        parted
+    };
+
+    return {
+        extractedVars,
+        extractedFrontendVars
+    };
+}
+
+function RWSFillBuild(config: Partial<IRWSConfig> = {}) {
     return function <T extends { new(...args: any[]): {} }>(constructor: T) {
         return class extends constructor {
             _DEFAULTS: IRWSConfig;
+            _BUILD_OVERRIDE: IRWSConfig;
             constructor(...args: any[]) {
                 super(...args);
 
-                const extractedDefaults = JSON.parse(JSON.stringify(process.env._RWS_DEFAULTS));                                  
-
-                const {   
-                    backendUrl,
-                    wsUrl,
-                    partedDirUrlPrefix,
-                    partedPrefix,
-                    pubUrlFilePrefix,
-                    transports,    
-                    parted        
-                } = extractedDefaults;
-
-                const extractedFrontendDefaults = {
-                    backendUrl,
-                    wsUrl,
-                    partedDirUrlPrefix,
-                    partedPrefix,
-                    pubUrlFilePrefix,
-                    transports,    
-                    parted
-                };
+                const extractedFrontendDefaults = extractEnvVar(process.env._RWS_DEFAULTS).extractedFrontendVars;
 
                 this._DEFAULTS = {
                     ...config,
                     ...extractedFrontendDefaults
-                };             
+                } as IRWSConfig;        
+                
+                const extractedFrontendBuildVars = extractEnvVar(process.env._RWS_BUILD_OVERRIDE).extractedFrontendVars;
+
+                this._BUILD_OVERRIDE = extractedFrontendBuildVars as IRWSConfig;
             }
         };
     };
 }
 
-export { RWSFillBuild }
+export { RWSFillBuild };

package/src/components/_decorators/RWSInject.ts

@@ -0,0 +1,50 @@
+import { Key } from '@microsoft/fast-foundation';
+import RWSViewComponent, { IWithCompose } from '../_component';
+import { loadDep, getFunctionParamNames } from './_di';
+import TheRWSService from '../../services/_service';
+
+
+type InjectDecoratorReturnType = (target: any, key?: string | number | undefined, parameterIndex?: number) => void;
+type TargetType = any;
+
+function addToComponentInjection(targetComponentName: string, constructor: any, depKey: string, dependencyClass: Key, isDefaultService: boolean = false){
+
+    if(isDefaultService){
+        targetComponentName = '_all';
+    }
+
+    if(!Object.keys(constructor._depKeys).includes(targetComponentName)){
+        constructor._depKeys = { [targetComponentName]: [] };
+    }
+
+    if(!constructor._depKeys[targetComponentName].includes(depKey)){
+        constructor._depKeys[targetComponentName].push(depKey);
+    }
+
+    if(!Object.keys(constructor._toInject).includes(depKey)){           
+        const loadedDependency = loadDep<TheRWSService>(dependencyClass);
+        constructor._toInject[depKey] = loadedDependency;
+    }
+
+    console.log(targetComponentName);
+}
+
+function RWSInject<T extends RWSViewComponent>(dependencyClass: Key, defaultService: boolean = false): InjectDecoratorReturnType {
+    return (target: IWithCompose<T>, key?: keyof IWithCompose<T>, parameterIndex?: number) => {   
+        if(key){
+            const targetConstructor = typeof target === 'function' ? target : (target as any).constructor;  
+            console.log('propt', target.name);
+            addToComponentInjection(target.name, targetConstructor, key as string, dependencyClass, defaultService);
+        } else{
+            const targetConstructor = (target as any).prototype.constructor;    
+            const paramNames = getFunctionParamNames(targetConstructor);               
+            const depKey = paramNames[parameterIndex];
+    
+            addToComponentInjection(target.name, targetConstructor, depKey, dependencyClass, defaultService);
+        }        
+    };
+}
+
+export {
+    RWSInject    
+};

package/src/components/_decorators/RWSService.ts

@@ -0,0 +1,12 @@
+import RWSViewComponent from '../_component';
+
+interface RWSServiceDecoratorOptions {
+    _vars?: any
+}
+
+function RWSService<T extends RWSViewComponent>(options?: RWSServiceDecoratorOptions): (type: any) => void {
+    return (constructor: T) => {
+    };
+}
+
+export { RWSService };

package/src/components/_decorators/_di.ts

@@ -0,0 +1,15 @@
+import { Key } from '@microsoft/fast-foundation';
+import RWSContainer from '../_container';
+
+function getFunctionParamNames(func: () => any): string[] {
+    // Convert the function to its string form and extract the parameter names
+    const funcStr = func.toString().replace(/((\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s))/mg, '');  
+    return funcStr.slice(funcStr.indexOf('(')+1, funcStr.indexOf(')')).split(',');
+}
+
+function loadDep<T>(dependencyKeyClass: Key): T
+{    
+    return RWSContainer().get(dependencyKeyClass) as T;
+}
+
+export { loadDep, getFunctionParamNames };

package/src/components/router/component.ts

@@ -1,9 +1,9 @@
 import { observable  } from '@microsoft/fast-element';
-import { RWSRouter, _ROUTING_EVENT_NAME, RouteReturn } from '../../services/RoutingService';
+import RoutingService, { RWSRouter, _ROUTING_EVENT_NAME, RouteReturn, RoutingServiceInstance } from '../../services/RoutingService';
 import RWSViewComponent, { IRWSViewComponent } from '../_component';
-import {RWSView} from '../_decorator';
+import {RWSInject, RWSView} from '../_decorator';
 
-@RWSView('rws-router', { ignorePackaging: true })
+@RWSView('rws-router')
 export class RouterComponent extends RWSViewComponent {    
     static autoLoadFastElement = false;
     private routing: RWSRouter;
@@ -13,21 +13,34 @@ export class RouterComponent extends RWSViewComponent {
     @observable childComponents: HTMLElement[] = [];    
     slotEl: HTMLElement = null;
 
+    constructor(@RWSInject(RoutingService) protected routingService: RoutingServiceInstance){
+        super();
+    }
+
     connectedCallback() {
         super.connectedCallback();   
+        
+       
         this.routing = this.routingService.apply(this);   
-            
-        if(this.currentUrl){
+                
+        if(this.currentUrl){            
             this.handleRoute(this.routing.handleRoute(this.currentUrl));      
         }           
     }
 
-    currentUrlChanged(oldValue: string, newValue: string){  
-        if(!this.routing){
-            this.routing = this.routingService.apply(this);       
+    currentUrlChanged(oldValue: string, newValue: string){          
+        if(newValue){       
+            if(!this.routingService){
+                console.log(oldValue, newValue);
+                return;
+            }   
+
+            if(!this.routing){
+                this.routing = this.routingService.apply(this);       
 
-        }     
-        this.handleRoute(this.routing.handleRoute(newValue));
+            }     
+            this.handleRoute(this.routing.handleRoute(newValue));
+        }
     }
 
     private handleRoute(route: RouteReturn){

package/src/components/router/template.html

@@ -0,0 +1 @@
+<div class="router"></div>

package/src/index.ts

@@ -27,7 +27,7 @@ import {
 } from './services/RoutingService';
 
 
-import { RWSDecoratorOptions, RWSIgnore, RWSView, RWSInject } from './components/_decorator';
+import { RWSDecoratorOptions, RWSIgnore, RWSInject, RWSView } from './components/_decorator';
 
 import { declareRWSComponents } from './components';
 

package/src/routing/_router.ts

@@ -28,13 +28,15 @@ class RWSRouter {
     }
 
     public fireHandler(route: IRWSRouteResult): RouteReturn
-    {     const handler = route.handler();
+    {     
+        const handler = route.handler();
         return [handler[0], handler[1], this.utilsService.mergeDeep(route.params, handler[2])];
     }
 
     public handleRoute(url: string): RouteReturn
     {
         const currentRoute = this.find(url);    
+        console.log('CR', currentRoute);
 
         if (history.pushState) {
             window.history.pushState({ path: url }, '', url);

package/src/services/ConfigService.ts

@@ -7,15 +7,13 @@ import { RWSFillBuild } from '../components/_decorators/RWSFillBuild';
 
 const __SENT_TO_COMPONENTS: string[] = [];
 
-@RWSFillBuild({
-    pubUrlFilePrefix: '/',
-    pubUrl: window.origin,
-    partedFileDir: '/',
-    partedPrefix: 'rws',
-})
+@RWSFillBuild()
 class ConfigService extends TheService {  
     static isLoaded: boolean = false;
-    _DEFAULTS: any = null;
+    
+    _DEFAULTS: Partial<IRWSConfig> = {};
+    _BUILD_OVERRIDE: IRWSConfig = {};
+
     private data: IRWSConfig = {};    
   
     constructor() {
@@ -23,24 +21,33 @@ class ConfigService extends TheService {
     }    
   
     public get(key: keyof IRWSConfig): any
-    {         
+    {       
+                
         if(!this._DEFAULTS){
-            throw new Error('No _DEFAULTS loaded!')
+            throw new Error('No _DEFAULTS loaded!');
         }        
 
-        const isInData: boolean = Object.keys(this.data).includes(key);
+        
         const isInDefaults: boolean = Object.keys(this._DEFAULTS).includes(key);
+        const isInData: boolean = Object.keys(this.data).includes(key);
+        const isInBuildVars: boolean = Object.keys(this._BUILD_OVERRIDE).includes(key);
+
+        if(!isInData){        
+            let defaultVal = null;
 
-        if(!isInData && isInDefaults){
-            let defaultVal = this._DEFAULTS[key];        
-            console.log(key, 'kk')
+            if(isInDefaults){
+                defaultVal = this._DEFAULTS[key];                   
+            }            
+            
+            if(isInBuildVars && !!this._BUILD_OVERRIDE[key]){
+                defaultVal = this._BUILD_OVERRIDE[key];
+            }
+                        
             if(defaultVal && defaultVal[0] === '@'){
                 defaultVal = this.data[((defaultVal as string).slice(1)) as keyof IRWSConfig];
             }
-
+            
             return defaultVal;
-        } else if(!isInData && !isInDefaults) {
-            return null;
         }
         
 

package/_rws_build_configurator.d.ts

@@ -1,12 +0,0 @@
-declare const _DEFAULT_CONFIG: any;
-
-declare function readConfigFile(filePath: string): any;
-declare function get(key: string): any;
-declare function exportConfig(): any;
-
-export {
-    readConfigFile,
-    get,
-    exportConfig,
-    _DEFAULT_CONFIG
-};

package/_rws_build_configurator.js

@@ -1,44 +0,0 @@
-const fs = require('fs');
-const json5 = require('json5');
-
-const _DEFAULT_CONFIG = require('./cfg/_default.cfg')._DEFAULT_CONFIG;
-const STORAGE = require('./cfg/_storage');
-
-
-function readConfigFile(filePath){
-    if(!fs.existsSync(filePath)){
-        return _DEFAULT_CONFIG;
-    }
-
-    const fileConfig = json5.parse(fs.readFileSync(filePath, 'utf-8'));
-
-    return {
-        ..._DEFAULT_CONFIG,
-        ...fileConfig
-    }
-}
-
-function get(key){
-    _init();
-
-    return STORAGE.get(key);
-}
-
-function exportConfig(){
-    _init();
-
-    return STORAGE.getAll();
-}
-
-function _init(){
-    if(!STORAGE.isLoaded()){
-        STORAGE.init(readConfigFile(process.cwd() + '/.rws.json'))        
-    }
-}
-
-module.exports = {
-    readConfigFile,
-    exportConfig,
-    get,
-    _DEFAULT_CONFIG
-};