@rws-framework/client 2.21.0 → 2.21.2

package/builder/webpack/loaders/rws_fast_ts_loader.js

@@ -37,8 +37,8 @@ module.exports = async function(content) {
     let templateName = null;
     let stylesPath = null;
     
-    if(decoratorData.decoratorArgs){        
-        const decoratorArgs = json5.parse(decoratorData.decoratorArgs)
+    if(decoratorData.decoratorArgs){                     
+        const decoratorArgs = decoratorData.decoratorArgs
 
         if(decoratorArgs.template){
             templateName = decoratorData.decoratorArgs.template || null;

package/cfg/build_steps/webpack/_loaders.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const json5 = require('json5');
 const fs = require('fs');
 const os = require('os');
 
@@ -191,14 +192,22 @@ function extractRWSViewArgs(content, noReplace = false) {
 
   let fastOptions = _defaultRWSLoaderOptions.fastOptions;
 
+  if(decoratorArgs && decoratorArgs !== ''){
+    try {
+      decoratorArgs = json5.parse(decoratorArgs);
+    }catch(e){
+
+    }
+  }
+
   if (decoratorArgs && decoratorArgs.fastElementOptions) {
     fastOptions = decoratorArgs.fastElementOptions;
   }
  
   let replacedDecorator = null;
 
-  if(!noReplace){
-    const [addedParamDefs, addedParams] = _extractRWSViewDefs(fastOptions, decoratorArgs);
+  if(!noReplace){    
+    const [addedParamDefs, addedParams] = _extractRWSViewDefs(fastOptions, decoratorArgs);    
     const replacedViewDecoratorContent = processedContent.replace(
       viewReg,
       `@RWSView('$1', null, { template: rwsTemplate, styles${addedParams.length ? ', options: {' + (addedParams.join(', ')) + '}' : ''} })\n$3class $4 extends RWSViewComponent `

package/package.json

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

package/src/client.ts

@@ -15,7 +15,6 @@ import RWSWindow, { RWSWindowComponentRegister, loadRWSRichWindow } from './type
 
 import { DI, Container, Registration } from './components/_container';
 
-import { declareRWSComponents } from './components/index';
 import RWSContainer from './components/_container';
 import TheRWSService from './services/_service';
 
@@ -206,4 +205,4 @@ class RWSClient {
 }
 
 export default DI.createInterface<RWSClient>(x => x.singleton(RWSClient));
-export {  RWSClient as RWSClientInstance, declareRWSComponents };
+export {  RWSClient as RWSClientInstance };

package/src/components/_decorator.ts

@@ -11,7 +11,9 @@ import { handleExternalChange } from './_attrs/_external_handler';
 interface RWSDecoratorOptions {
     template?: string,
     styles?: string,
-    fastElementOptions?: any,
+    fastElementOptions?: {
+        shadowOptions?: ShadowRootInit
+    },
     ignorePackaging?: boolean,
     debugPackaging?: boolean
     oreoMode?: boolean