@rws-framework/client 2.3.1 → 2.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/client",
   "private": false,
-  "version": "2.3.1",
+  "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",

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;
@@ -46,8 +49,6 @@ const publicIndex = BuildConfigurator.get('publicIndex') || config.publicIndex;
     new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en-gb/)
   ];
 
-  console.log('PARTED', isParted);
-
   // if(isParted){
   //   WEBPACK_PLUGINS.push(new webpack.BannerPlugin({
   //     banner: `if(!window.RWS_PARTS_LOADED){         

package/src/client.ts

@@ -272,7 +272,6 @@ class RWSClient {
 
     static defineAllComponents() {
         const richWindowComponents: RWSWindowComponentRegister = (window as Window & RWSWindow).RWS.components;
-        console.log('defining', richWindowComponents)
 
         Object.keys(richWindowComponents).map(key => richWindowComponents[key].component).forEach((el: IWithCompose<RWSViewComponent>) => {
             el.define(el as any, el.definition);
@@ -282,7 +281,6 @@ class RWSClient {
     
     defineComponents(){
         const richWindowComponents: RWSWindowComponentRegister = (window as Window & RWSWindow).RWS.components;
-        console.log('defining', richWindowComponents)
 
         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,28 +46,29 @@ 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);        
+        applyConstructor(this);
+        
     }
 
     connectedCallback() {        
-        super.connectedCallback();       
+        super.connectedCallback();        
         applyConstructor(this);
      
         // console.trace(this.config);

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 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 = (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 existingInjectedDependencies = (mainConstructor as IWithCompose<RWSViewComponent>)._toInject;
+    const defaultDeps = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys['_all'] || [];
+    const depsToInject = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys[mainConstructor.name] || [];
 
-const applyProp = (component: RWSViewComponent, propName: string | symbol): any => {
-    let mainConstructor = component.constructor;
-    const parent = getParentConstructor(component);
-
-    if(!mainConstructor.length){
-        mainConstructor = parent;
-    }   
-    
-    let topConstructor = mainConstructor;
-
-    if( parent && parent.name === RWSViewComponent.name){ 
-        topConstructor = parent;
-    }
-
-    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

@@ -27,7 +27,7 @@ function extractEnvVar(envVar: string){
     return {
         extractedVars,
         extractedFrontendVars
-    }
+    };
 }
 
 function RWSFillBuild(config: Partial<IRWSConfig> = {}) {
@@ -45,7 +45,7 @@ function RWSFillBuild(config: Partial<IRWSConfig> = {}) {
                     ...extractedFrontendDefaults
                 } as IRWSConfig;        
                 
-                const extractedFrontendBuildVars = extractEnvVar(process.env._RWS_BUILD_OVERRIDE).extractedFrontendVars;;
+                const extractedFrontendBuildVars = extractEnvVar(process.env._RWS_BUILD_OVERRIDE).extractedFrontendVars;
 
                 this._BUILD_OVERRIDE = extractedFrontendBuildVars as IRWSConfig;
             }
@@ -53,4 +53,4 @@ function RWSFillBuild(config: Partial<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,7 +1,7 @@
 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')
 export class RouterComponent extends RWSViewComponent {    
@@ -13,20 +13,28 @@ 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){            
             this.handleRoute(this.routing.handleRoute(this.currentUrl));      
         }           
     }
 
     currentUrlChanged(oldValue: string, newValue: string){          
-        if(newValue){            
+        if(newValue){       
+            if(!this.routingService){
+                console.log(oldValue, newValue);
+                return;
+            }   
+
             if(!this.routing){
                 this.routing = this.routingService.apply(this);       
 

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/services/ConfigService.ts

@@ -24,7 +24,7 @@ class ConfigService extends TheService {
     {       
                 
         if(!this._DEFAULTS){
-            throw new Error('No _DEFAULTS loaded!')
+            throw new Error('No _DEFAULTS loaded!');
         }        
 
         
@@ -46,6 +46,7 @@ class ConfigService extends TheService {
             if(defaultVal && defaultVal[0] === '@'){
                 defaultVal = this.data[((defaultVal as string).slice(1)) as keyof IRWSConfig];
             }
+            
             return defaultVal;
         }
         

package/_rws_build_configurator.d.ts

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

package/_rws_build_configurator.js

@@ -1,48 +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 {        
-        ...fileConfig
-    }
-}
-
-function get(key){
-    _init();
-
-    return STORAGE.get(key);
-}
-
-function exportDefaultConfig(){
-    return _DEFAULT_CONFIG;
-}
-
-function exportBuildConfig(){
-    _init();
-
-    return STORAGE.getAll();
-}
-
-function _init(){
-    if(!STORAGE.isLoaded()){
-        STORAGE.init(readConfigFile(process.cwd() + '/.rws.json'))        
-    }
-}
-
-module.exports = {
-    readConfigFile,
-    exportDefaultConfig,
-    exportBuildConfig,
-    get,
-    _DEFAULT_CONFIG
-};