@rws-framework/client 2.10.5 → 2.10.8

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.10.5",
+    "version": "2.10.8",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"

package/src/client/components.ts

@@ -41,8 +41,6 @@ async function loadPartedComponents(this: RWSClientInstance): Promise<RWSInfoTyp
 function defineAllComponents() {
     const richWindowComponents: RWSWindowComponentRegister = (window as Window & RWSWindow).RWS.components;
 
-    console.log({richWindowComponents})
-
     Object.keys(richWindowComponents).map(key => richWindowComponents[key].component).forEach((el: IWithCompose<RWSViewComponent>) => {
         el.define(el as any, el.definition);
     });

package/webpack/loaders/rws_fast_ts_loader.js

@@ -109,7 +109,7 @@ let rwsTemplate: any = T.html\`${templateContent}\`;
                 this.addDependency(templatePath);
             }
         
-            const viewReg = /@RWSView\(["']([^"']+)["'].*\)\s*export\s+class\s+([a-zA-Z0-9_-]+)\s+extends\s+RWSViewComponent/gm
+            const viewReg = /@RWSView\(["']([^"']+)["'].*\)\s*(.*?\s+)?class\s+([a-zA-Z0-9_-]+)\s+extends\s+RWSViewComponent/gm
 
             let m;
             let className = null;
@@ -123,23 +123,21 @@ let rwsTemplate: any = T.html\`${templateContent}\`;
                 
                 // The result can be accessed through the `m`-variable.
                 m.forEach((match, groupIndex) => {
-                    if(groupIndex === 2){
+                    if(groupIndex === 3){
                         className = match;
                     }                    
                 });
-            }                     
+            }    
+                  
 
             if(className){                
                 const replacedViewDecoratorContent = processedContent.replace(
                     viewReg,
-                    `@RWSView('$1', null, { template: rwsTemplate, styles${addedParams.length? ', options: {' + (addedParams.join(', ')) + '}': ''} })\nclass $2 extends RWSViewComponent `
+                    `@RWSView('$1', null, { template: rwsTemplate, styles${addedParams.length? ', options: {' + (addedParams.join(', ')) + '}': ''} })\n$2class $3 extends RWSViewComponent `
                 );                            
                 processedContent = `${template}\n${styles}\n${addedParamDefs.join('\n')}\n` + replacedViewDecoratorContent;   
-            }
+            }            
             
-           
-    
-
             processedContent = `${htmlFastImports ? htmlFastImports + '\n' : ''}${processedContent}`;
         }