@rws-framework/client 2.13.2 → 2.13.4

package/src/components/_decorator.ts

@@ -1,123 +1,123 @@
-import RWSContainer from './_container';
-import TheRWSService from '../services/_service';
-import ConfigService from '../services/ConfigService';
-import { loadRWSRichWindow } from '../types/RWSWindow';
-import RWSViewComponent, { IWithCompose } from './_component';
-import { InterfaceSymbol } from './_container';
-import { RWSInject } from './_decorators/RWSInject';
-import { ElementStyles, Observable, ViewTemplate } from '@microsoft/fast-element'; 
-import { handleExternalChange } from './_attrs/_external_handler';
-
-interface RWSDecoratorOptions {
-    template?: string,
-    styles?: string,
-    fastElementOptions?: any,
-    ignorePackaging?: boolean,
-    debugPackaging?: boolean
-    oreoMode?: boolean
-}
-
-//const _PARAMTYPES_METADATA_KEY = 'design:paramtypes';
-type HtmlBinderType = (context: RWSViewComponent) => ViewTemplate;
-
-function RWSView<Component extends RWSViewComponent>(name: string, data?: RWSDecoratorOptions | null, override?: { styles?: ElementStyles, template?: ViewTemplate, options?: any }): (type: any, args?: any) => void {
-    return (theComponent: IWithCompose<Component>, args?: any) => {
-        theComponent.definition = { name, template: null }
-
-        if(override){
-            if(override.styles){
-                theComponent.definition.styles = override.styles;
-            }
-
-            if(override.template){
-                theComponent.definition.template =  override.template;
-            }
-
-            
-            if(override.options){
-                (theComponent.definition as any).options = override.options;
-            }
-        }
-    };
-}
-
-
-function RWSIgnore(params: { mergeToApp?: boolean } | null = null): () => void {
-    return () => { };
-}
-
-function getParentConstructor(instance: any): any {
-    const proto = Object.getPrototypeOf(instance.constructor.prototype);
-    if (proto && proto.constructor) {
-        return proto.constructor;
-    }
-
-    return null;
-}
-
-
-const applyConstructor = (component: RWSViewComponent, x: boolean = false): void => {
-    const mainConstructor: any = component.constructor;
-    const parent = getParentConstructor(component);
-    
-
-    if (parent.name !== 'RWSViewComponent' ) {
-        return;
-    }    
-    
-
-    const existingInjectedDependencies = (mainConstructor as IWithCompose<RWSViewComponent>)._toInject;
-
-    const regServices = loadRWSRichWindow().RWS._registered;
-    
-
-    const depsToInject: string[] = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys[mainConstructor.name] || [];
-    const depsInInjector: string[] = Object.keys(existingInjectedDependencies);
-
-    const toInject: string[] = [...depsToInject]
-
-    type KeyType = {[key: string]: TheRWSService | string };
-
-    const _target = (component as any);
-    
-    function inject(services: KeyType){
-        for (const prop in services) {
-            const service = (typeof services[prop] === 'string' ? existingInjectedDependencies[prop] : services[prop]) as TheRWSService;      
-            _target[prop] = service;            
-        }
-    }
-
-    inject(toInject.reduce((acc: KeyType, cur) => {
-        acc[cur] = cur;
-        return acc;
-      }, {}));
-
-    const defaultDeps: [string, TheRWSService][] = Object.keys(existingInjectedDependencies)
-        .filter((depKey: string) => existingInjectedDependencies[depKey].isDefault()).map((depKey => [depKey, existingInjectedDependencies[depKey]]));
-
-    inject(defaultDeps.reduce((acc: KeyType, cur: [string, TheRWSService]) => {
-        acc[cur[0]] = cur[1];
-        return acc;
-      }, {}));    
-
-    inject({
-        config: RWSContainer().get(ConfigService)
-    })    
-
-    if(Object.keys(RWSViewComponent._externalAttrs).includes((_target.constructor as IWithCompose<any>).name)){
-        for(const exAttrKey in RWSViewComponent._externalAttrs[(_target.constructor as IWithCompose<any>).name]){  
-            const exAttr = RWSViewComponent._externalAttrs[(_target.constructor as IWithCompose<any>).name][exAttrKey];          
-            const notifier = Observable.getNotifier(_target);
-            notifier.subscribe({
-                handleChange(source, key) {                    
-                    if (key === exAttr && !_target.__exAttrLoaded.includes(exAttr)) {                        
-                        handleExternalChange(source, key);
-                        _target.__exAttrLoaded.push(key);
-                    }
-                }
-            }, exAttr);
-        }    
-    }
-};
-
+import RWSContainer from './_container';
+import TheRWSService from '../services/_service';
+import ConfigService from '../services/ConfigService';
+import { loadRWSRichWindow } from '../types/RWSWindow';
+import RWSViewComponent, { IWithCompose } from './_component';
+import { InterfaceSymbol } from './_container';
+import { RWSInject } from './_decorators/RWSInject';
+import { ElementStyles, Observable, ViewTemplate } from '@microsoft/fast-element'; 
+import { handleExternalChange } from './_attrs/_external_handler';
+
+interface RWSDecoratorOptions {
+    template?: string,
+    styles?: string,
+    fastElementOptions?: any,
+    ignorePackaging?: boolean,
+    debugPackaging?: boolean
+    oreoMode?: boolean
+}
+
+//const _PARAMTYPES_METADATA_KEY = 'design:paramtypes';
+type HtmlBinderType = (context: RWSViewComponent) => ViewTemplate;
+
+function RWSView<Component extends RWSViewComponent>(name: string, data?: RWSDecoratorOptions | null, override?: { styles?: ElementStyles, template?: ViewTemplate, options?: any }): (type: any, args?: any) => void {
+    return (theComponent: IWithCompose<Component>, args?: any) => {
+        theComponent.definition = { name, template: null }
+
+        if(override){
+            if(override.styles){
+                theComponent.definition.styles = override.styles;
+            }
+
+            if(override.template){
+                theComponent.definition.template =  override.template;
+            }
+
+            
+            if(override.options){
+                (theComponent.definition as any).options = override.options;
+            }
+        }
+    };
+}
+
+
+function RWSIgnore(params: { mergeToApp?: boolean } | null = null): () => void {
+    return () => { };
+}
+
+function getParentConstructor(instance: any): any {
+    const proto = Object.getPrototypeOf(instance.constructor.prototype);
+    if (proto && proto.constructor) {
+        return proto.constructor;
+    }
+
+    return null;
+}
+
+
+const applyConstructor = (component: RWSViewComponent, x: boolean = false): void => {
+    const mainConstructor: any = component.constructor;
+    const parent = getParentConstructor(component);
+    
+
+    if (parent.name !== 'RWSViewComponent' ) {
+        return;
+    }    
+    
+
+    const existingInjectedDependencies = (mainConstructor as IWithCompose<RWSViewComponent>)._toInject;
+
+    const regServices = loadRWSRichWindow().RWS._registered;
+    
+
+    const depsToInject: string[] = (mainConstructor as IWithCompose<RWSViewComponent>)._depKeys[mainConstructor.name] || [];
+    const depsInInjector: string[] = Object.keys(existingInjectedDependencies);
+
+    const toInject: string[] = [...depsToInject]
+
+    type KeyType = {[key: string]: TheRWSService | string };
+
+    const _target = (component as any);
+    
+    function inject(services: KeyType){
+        for (const prop in services) {
+            const service = (typeof services[prop] === 'string' ? existingInjectedDependencies[prop] : services[prop]) as TheRWSService;      
+            _target[prop] = service;            
+        }
+    }
+
+    inject(toInject.reduce((acc: KeyType, cur) => {
+        acc[cur] = cur;
+        return acc;
+      }, {}));
+
+    const defaultDeps: [string, TheRWSService][] = Object.keys(existingInjectedDependencies)
+        .filter((depKey: string) => existingInjectedDependencies[depKey].isDefault()).map((depKey => [depKey, existingInjectedDependencies[depKey]]));
+
+    inject(defaultDeps.reduce((acc: KeyType, cur: [string, TheRWSService]) => {
+        acc[cur[0]] = cur[1];
+        return acc;
+      }, {}));    
+
+    inject({
+        config: RWSContainer().get(ConfigService)
+    })    
+
+    if(Object.keys(RWSViewComponent._externalAttrs).includes((_target.constructor as IWithCompose<any>).name)){
+        for(const exAttrKey in RWSViewComponent._externalAttrs[(_target.constructor as IWithCompose<any>).name]){  
+            const exAttr = RWSViewComponent._externalAttrs[(_target.constructor as IWithCompose<any>).name][exAttrKey];          
+            const notifier = Observable.getNotifier(_target);
+            notifier.subscribe({
+                handleChange(source, key) {                    
+                    if (key === exAttr && !_target.__exAttrLoaded.includes(exAttr)) {                        
+                        handleExternalChange(source, key);
+                        _target.__exAttrLoaded.push(key);
+                    }
+                }
+            }, exAttr);
+        }    
+    }
+};
+
 export { RWSView, RWSDecoratorOptions, RWSIgnore, RWSInject, applyConstructor };

package/src/components/_decorators/RWSFillBuild.ts

@@ -1,55 +1,55 @@
-import IRWSConfig from '../../types/IRWSConfig.js';
-
-function extractEnvVar(envVar: string){
-    const extractedVars = JSON.parse(JSON.stringify(envVar));                                  
-
-    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 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;
-            }
-        };
-    };
-}
-
+import IRWSConfig from '../../types/IRWSConfig.js';
+
+function extractEnvVar(envVar: string){
+    const extractedVars = JSON.parse(JSON.stringify(envVar));                                  
+
+    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 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 };

package/src/components/_decorators/RWSInject.ts

@@ -1,50 +1,50 @@
-import { Key } from '../_container';
-import RWSViewComponent, { IWithCompose } from '../_component';
-import { loadDep, getFunctionParamNames } from './_di';
-import TheRWSService from '../../services/_service';
-import { handleExternalChange } from '../_attrs/_external_handler';
-
-
-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;
-    }    
-}
-
-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;              
-            addToComponentInjection(targetConstructor.name, targetConstructor, key as string, dependencyClass, defaultService);
-        } else{
-
-            const targetConstructor = (target as any).prototype.constructor;    
-          
-            const paramNames = getFunctionParamNames(targetConstructor);               
-            const depKey = paramNames[parameterIndex];       
-            
-            addToComponentInjection(targetConstructor.name, targetConstructor, depKey, dependencyClass, defaultService);
-        }                        
-    };
-}
-
-export {
-    RWSInject    
+import { Key } from '../_container';
+import RWSViewComponent, { IWithCompose } from '../_component';
+import { loadDep, getFunctionParamNames } from './_di';
+import TheRWSService from '../../services/_service';
+import { handleExternalChange } from '../_attrs/_external_handler';
+
+
+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;
+    }    
+}
+
+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;              
+            addToComponentInjection(targetConstructor.name, targetConstructor, key as string, dependencyClass, defaultService);
+        } else{
+
+            const targetConstructor = (target as any).prototype.constructor;    
+          
+            const paramNames = getFunctionParamNames(targetConstructor);               
+            const depKey = paramNames[parameterIndex];       
+            
+            addToComponentInjection(targetConstructor.name, targetConstructor, depKey, dependencyClass, defaultService);
+        }                        
+    };
+}
+
+export {
+    RWSInject    
 };

package/src/components/_decorators/RWSService.ts

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

@@ -1,15 +1,15 @@
-
-import RWSContainer, { Key } from '../_container';
-
-function getFunctionParamNames(func: () => any): string[] {
-    const constructorMatch = func.toString().match(/constructor\s*\(([^)]*)\)/);
-    if (!constructorMatch) return null;
-    return constructorMatch[1].split(',').map(param => param.trim());
-}
-
-function loadDep<T>(dependencyKeyClass: Key): T
-{    
-    return RWSContainer().get(dependencyKeyClass) as T;
-}
-
-export { loadDep, getFunctionParamNames };
+
+import RWSContainer, { Key } from '../_container';
+
+function getFunctionParamNames(func: () => any): string[] {
+    const constructorMatch = func.toString().match(/constructor\s*\(([^)]*)\)/);
+    if (!constructorMatch) return null;
+    return constructorMatch[1].split(',').map(param => param.trim());
+}
+
+function loadDep<T>(dependencyKeyClass: Key): T
+{    
+    return RWSContainer().get(dependencyKeyClass) as T;
+}
+
+export { loadDep, getFunctionParamNames };

package/src/components/_definitions.ts

@@ -1,65 +1,65 @@
-import RWSViewComponent, { IWithCompose } from './_component';
-import RWSWindow, { RWSWindowComponentInterface, loadRWSRichWindow } from '../types/RWSWindow';
-import { ElementStyles, ViewTemplate } from '@microsoft/fast-element';
-
-export interface IFastDefinition {
-    name: string;
-    template: ViewTemplate;
-    styles?: ElementStyles;
-}
-
-export function isDefined<T extends RWSViewComponent>(element: IWithCompose<T>): boolean {
-    const richWindow: RWSWindow = loadRWSRichWindow();
-
-    if (!element.definition) {
-        return false;
-    }
-
-    return Object.keys(richWindow.RWS.components).includes(element.definition.name);
-}
-
-export function defineComponent<T extends RWSViewComponent>(element: IWithCompose<T>): void {
-    if (element.isDefined()) {
-        if (element._verbose) {
-            console.warn(`Component ${element.name} is already declared`);
-        }
-
-        return;
-    }
-
-    const richWindow = loadRWSRichWindow();
-
-    if (!element.definition) {
-        throw new Error('RWS component is not named. Add `static definition = {name, template};`');
-    }
-
-    const composedComp = element.compose({
-        baseName: element.definition.name,
-        template: element.definition.template,
-        styles: element.definition.styles
-    }) as RWSWindowComponentInterface;
-
-    if (!richWindow.RWS) {
-        throw new Error('RWS client not initialized');
-    }
-
-    element.sendEventToOutside<string>(element._EVENTS.component_define, element.definition.name);
-
-    richWindow.RWS.components[element.definition.name] = {
-        interface: composedComp,
-        component: element
-    };
-}
-
-export function getDefinition(tagName: string, htmlTemplate: ViewTemplate, styles: ElementStyles = null) {
-    const def: IFastDefinition = {
-        name: tagName,
-        template: htmlTemplate
-    };
-
-    if (styles) {
-        def.styles = styles;
-    }
-
-    return def;
+import RWSViewComponent, { IWithCompose } from './_component';
+import RWSWindow, { RWSWindowComponentInterface, loadRWSRichWindow } from '../types/RWSWindow';
+import { ElementStyles, ViewTemplate } from '@microsoft/fast-element';
+
+export interface IFastDefinition {
+    name: string;
+    template: ViewTemplate;
+    styles?: ElementStyles;
+}
+
+export function isDefined<T extends RWSViewComponent>(element: IWithCompose<T>): boolean {
+    const richWindow: RWSWindow = loadRWSRichWindow();
+
+    if (!element.definition) {
+        return false;
+    }
+
+    return Object.keys(richWindow.RWS.components).includes(element.definition.name);
+}
+
+export function defineComponent<T extends RWSViewComponent>(element: IWithCompose<T>): void {
+    if (element.isDefined()) {
+        if (element._verbose) {
+            console.warn(`Component ${element.name} is already declared`);
+        }
+
+        return;
+    }
+
+    const richWindow = loadRWSRichWindow();
+
+    if (!element.definition) {
+        throw new Error('RWS component is not named. Add `static definition = {name, template};`');
+    }
+
+    const composedComp = element.compose({
+        baseName: element.definition.name,
+        template: element.definition.template,
+        styles: element.definition.styles
+    }) as RWSWindowComponentInterface;
+
+    if (!richWindow.RWS) {
+        throw new Error('RWS client not initialized');
+    }
+
+    element.sendEventToOutside<string>(element._EVENTS.component_define, element.definition.name);
+
+    richWindow.RWS.components[element.definition.name] = {
+        interface: composedComp,
+        component: element
+    };
+}
+
+export function getDefinition(tagName: string, htmlTemplate: ViewTemplate, styles: ElementStyles = null) {
+    const def: IFastDefinition = {
+        name: tagName,
+        template: htmlTemplate
+    };
+
+    if (styles) {
+        def.styles = styles;
+    }
+
+    return def;
 }