@rws-framework/client 2.3.0 → 2.3.1

package/_rws_build_configurator.d.ts

@@ -2,11 +2,13 @@ declare const _DEFAULT_CONFIG: any;
 
 declare function readConfigFile(filePath: string): any;
 declare function get(key: string): any;
-declare function exportConfig(): any;
+declare function exportDefaultConfig(): any;
+declare function exportBuildConfig(): any;
 
 export {
     readConfigFile,
     get,
-    exportConfig,
+    exportDefaultConfig,
+    exportBuildConfig,
     _DEFAULT_CONFIG
 };

package/_rws_build_configurator.js

@@ -12,8 +12,7 @@ function readConfigFile(filePath){
 
     const fileConfig = json5.parse(fs.readFileSync(filePath, 'utf-8'));
 
-    return {
-        ..._DEFAULT_CONFIG,
+    return {        
         ...fileConfig
     }
 }
@@ -24,7 +23,11 @@ function get(key){
     return STORAGE.get(key);
 }
 
-function exportConfig(){
+function exportDefaultConfig(){
+    return _DEFAULT_CONFIG;
+}
+
+function exportBuildConfig(){
     _init();
 
     return STORAGE.getAll();
@@ -38,7 +41,8 @@ function _init(){
 
 module.exports = {
     readConfigFile,
-    exportConfig,
+    exportDefaultConfig,
+    exportBuildConfig,
     get,
     _DEFAULT_CONFIG
 };

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.3.1",
   "main": "src/index.ts",
   "scripts": {
     "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -52,7 +52,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 +67,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

@@ -40,22 +40,29 @@ 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/)
   ];
 
+  console.log('PARTED', isParted);
+
+  // 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 +132,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,18 @@ 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);
+        });
+    }
+
+    
+    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

@@ -63,7 +63,7 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
         @RWSInject(NotifyService) protected notifyService: NotifyServiceInstance
     ) {
         super();       
-        applyConstructor(this);
+        applyConstructor(this);        
     }
 
     connectedCallback() {        
@@ -71,7 +71,7 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
         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

@@ -17,7 +17,7 @@ type InjectDecoratorReturnType = (target: any, key?: string | number | undefined
 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);
+        const paramNames = getFunctionParamNames(target.prototype.constructor);        
         target.prototype.constructor._toInject[paramNames[parameterIndex]] = loadedDependency;
     };
 }
@@ -63,8 +63,8 @@ const applyConstructor = (component: RWSViewComponent): void => {
     }
     
     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;

package/src/components/_decorators/RWSFillBuild.ts

@@ -1,40 +1,53 @@
 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;
             }
         };
     };

package/src/components/router/component.ts

@@ -3,7 +3,7 @@ import { RWSRouter, _ROUTING_EVENT_NAME, RouteReturn } from '../../services/Rout
 import RWSViewComponent, { IRWSViewComponent } from '../_component';
 import {RWSView} from '../_decorator';
 
-@RWSView('rws-router', { ignorePackaging: true })
+@RWSView('rws-router')
 export class RouterComponent extends RWSViewComponent {    
     static autoLoadFastElement = false;
     private routing: RWSRouter;
@@ -15,19 +15,24 @@ export class RouterComponent extends RWSViewComponent {
 
     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.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/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,32 @@ class ConfigService extends TheService {
     }    
   
     public get(key: keyof IRWSConfig): any
-    {         
+    {       
+                
         if(!this._DEFAULTS){
             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;
         }