@rws-framework/client 2.13.2 → 2.13.4

package/builder/webpack/after/copy.js

@@ -1,79 +1,79 @@
-const fs = require('fs');
-const chalk = require('chalk');
-const path = require('path');
-
-function collectFiles(dir, fileList = []) {
-  const files = fs.readdirSync(dir, { withFileTypes: true });
-  files.forEach(file => {
-    if (file.isDirectory()) {
-      collectFiles(path.join(dir, file.name), fileList);
-    } else {
-      fileList.push(path.join(dir, file.name));
-    }
-  });
-  return fileList;
-}
-
-module.exports = async (copyList = {}, pluginCfg) => {
-  const copyQueue = [];
-
-  Object.keys(copyList).forEach((targetPath) => {
-    const copyListKey = targetPath;
-
-    if (targetPath[0] === '.') {
-      targetPath = path.resolve(pluginCfg.packageDir, targetPath);
-    }
-
-    const sources = copyList[copyListKey];
-
-    sources.forEach((sourcePath) => {
-      const stat = fs.statSync(sourcePath);
-      if (stat.isDirectory()) {
-        // If sourcePath is a directory, collect all files recursively
-        const allFiles = collectFiles(sourcePath);
-        allFiles.forEach((file) => {
-          const relativePath = path.relative(sourcePath, file);
-          const targetFilePath = path.join(targetPath, relativePath);
-          const targetFileDir = path.dirname(targetFilePath);
-
-          // Ensure the target directory exists
-          if (!fs.existsSync(targetFileDir)) {
-            fs.mkdirSync(targetFileDir, { recursive: true });
-          }
-
-          // Check if the file already exists in the target location
-          if (fs.existsSync(targetFilePath)) {
-            fs.unlinkSync(targetFilePath);
-          }
-
-          // Add to copy queue
-          copyQueue.push({ from: file, to: targetFilePath });
-        });
-      } else {
-        // If sourcePath is not a directory, proceed as before
-        const fileName = path.basename(sourcePath);
-        const targetFilePath = path.join(targetPath, fileName);
-
-        // Check if the file already exists in the target location
-        if (fs.existsSync(targetFilePath)) {
-          fs.unlinkSync(targetFilePath);
-        }
-
-        // Add to copy queue
-        copyQueue.push({ from: sourcePath, to: targetFilePath });
-      }
-    });
-  });
-
-    copyQueue.forEach((copyset) => {
-        if(fs.existsSync(copyset.to)){
-            fs.unlinkSync(copyset.to);
-        }        
-
-        fs.copyFileSync(copyset.from, copyset.to);
-
-        console.log(`${chalk.yellow('[RWS]')} Copied "${chalk.blue(copyset.from)}" to "${chalk.blue(copyset.to)}"`)
-    })
-
-    return new Promise((resolve) => resolve());
+const fs = require('fs');
+const chalk = require('chalk');
+const path = require('path');
+
+function collectFiles(dir, fileList = []) {
+  const files = fs.readdirSync(dir, { withFileTypes: true });
+  files.forEach(file => {
+    if (file.isDirectory()) {
+      collectFiles(path.join(dir, file.name), fileList);
+    } else {
+      fileList.push(path.join(dir, file.name));
+    }
+  });
+  return fileList;
+}
+
+module.exports = async (copyList = {}, pluginCfg) => {
+  const copyQueue = [];
+
+  Object.keys(copyList).forEach((targetPath) => {
+    const copyListKey = targetPath;
+
+    if (targetPath[0] === '.') {
+      targetPath = path.resolve(pluginCfg.packageDir, targetPath);
+    }
+
+    const sources = copyList[copyListKey];
+
+    sources.forEach((sourcePath) => {
+      const stat = fs.statSync(sourcePath);
+      if (stat.isDirectory()) {
+        // If sourcePath is a directory, collect all files recursively
+        const allFiles = collectFiles(sourcePath);
+        allFiles.forEach((file) => {
+          const relativePath = path.relative(sourcePath, file);
+          const targetFilePath = path.join(targetPath, relativePath);
+          const targetFileDir = path.dirname(targetFilePath);
+
+          // Ensure the target directory exists
+          if (!fs.existsSync(targetFileDir)) {
+            fs.mkdirSync(targetFileDir, { recursive: true });
+          }
+
+          // Check if the file already exists in the target location
+          if (fs.existsSync(targetFilePath)) {
+            fs.unlinkSync(targetFilePath);
+          }
+
+          // Add to copy queue
+          copyQueue.push({ from: file, to: targetFilePath });
+        });
+      } else {
+        // If sourcePath is not a directory, proceed as before
+        const fileName = path.basename(sourcePath);
+        const targetFilePath = path.join(targetPath, fileName);
+
+        // Check if the file already exists in the target location
+        if (fs.existsSync(targetFilePath)) {
+          fs.unlinkSync(targetFilePath);
+        }
+
+        // Add to copy queue
+        copyQueue.push({ from: sourcePath, to: targetFilePath });
+      }
+    });
+  });
+
+    copyQueue.forEach((copyset) => {
+        if(fs.existsSync(copyset.to)){
+            fs.unlinkSync(copyset.to);
+        }        
+
+        fs.copyFileSync(copyset.from, copyset.to);
+
+        console.log(`${chalk.yellow('[RWS]')} Copied "${chalk.blue(copyset.from)}" to "${chalk.blue(copyset.to)}"`)
+    })
+
+    return new Promise((resolve) => resolve());
 }

package/builder/webpack/after/sw.js

@@ -1,14 +1,14 @@
-const fs = require('fs');
-const chalk = require('chalk');
-const path = require('path');
-const tools = require('../../_tools');
-
-module.exports = async (swPath) => {
-   const swFilePath = path.resolve(process.cwd(), swPath);
-
-   if(swPath.indexOf('.ts') === -1 || !fs.existsSync(swFilePath)){
-      throw new Error('[RWS] Service worker TS file does not exist');
-   }
-
-   await tools.runCommand(`yarn rws-client build:sw ${swPath}`);
+const fs = require('fs');
+const chalk = require('chalk');
+const path = require('path');
+const tools = require('../../_tools');
+
+module.exports = async (swPath) => {
+   const swFilePath = path.resolve(process.cwd(), swPath);
+
+   if(swPath.indexOf('.ts') === -1 || !fs.existsSync(swFilePath)){
+      throw new Error('[RWS] Service worker TS file does not exist');
+   }
+
+   await tools.runCommand(`yarn rws-client build:sw ${swPath}`);
 }

package/builder/webpack/index.js

@@ -1,11 +1,11 @@
-const scssLoader = require('./loaders/rws_fast_scss_loader');
-const htmlLoader = require('./loaders/rws_fast_html_loader');
-const tsLoader = require('./loaders/rws_fast_ts_loader');
-const { RWSWebpackWrapper  } = require('./rws.webpack.config');
-
-module.exports = {
-    RWSWebpackWrapper,    
-    scssLoader,
-    htmlLoader,
-    tsLoader
+const scssLoader = require('./loaders/rws_fast_scss_loader');
+const htmlLoader = require('./loaders/rws_fast_html_loader');
+const tsLoader = require('./loaders/rws_fast_ts_loader');
+const { RWSWebpackWrapper  } = require('./rws.webpack.config');
+
+module.exports = {
+    RWSWebpackWrapper,    
+    scssLoader,
+    htmlLoader,
+    tsLoader
 }

package/builder/webpack/loaders/rws_fast_html_loader.js

@@ -1,18 +1,18 @@
-const path = require('path');
-const fs = require('fs');
-
-module.exports = function(content){
-    const filePath = this.resourcePath;
-    const componentDir = path.dirname(filePath);
-    const componentPath = path.resolve(componentDir, 'component.ts');
-
-    if(fs.existsSync(componentPath)){
-        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
-
-        if(fileCnt){
-            fs.writeFile(componentPath, fileCnt, () => {})  
-        }    
-    }
-    
-    return '';
+const path = require('path');
+const fs = require('fs');
+
+module.exports = function(content){
+    const filePath = this.resourcePath;
+    const componentDir = path.dirname(filePath);
+    const componentPath = path.resolve(componentDir, 'component.ts');
+
+    if(fs.existsSync(componentPath)){
+        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
+
+        if(fileCnt){
+            fs.writeFile(componentPath, fileCnt, () => {})  
+        }    
+    }
+    
+    return '';
 }

package/builder/webpack/loaders/rws_fast_scss_loader.js

@@ -1,43 +1,43 @@
-const path = require('path');
-const fs = require('fs');
-const RWSScssPlugin = require('../rws_scss_plugin');
-
-module.exports = async function(content) {      
-    const filePath = this.resourcePath;
-    const componentDir = path.resolve(path.dirname(filePath), '..');
-    const componentPath = path.resolve(componentDir, 'component.ts');
-    const isDev = this._compiler.options.mode === 'development';    
-    const saveFile = content.indexOf('@save') > -1; 
-    const plugin = new RWSScssPlugin(); 
-    let fromTs = false;    
-
-    if(saveFile){
-        try {        
-            const codeData = await plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);                                
-
-            const code = codeData.code;
-            const deps = codeData.dependencies;        
-
-            for (const dependency of deps){
-                this.addDependency(dependency);
-            }
-
-            if (saveFile && code) {
-                plugin.writeCssFile(filePath, code);
-            }
-        } catch(e){
-            console.error(e);
-            return '';
-        }
-    }
-
-    if(fs.existsSync(componentPath)){
-        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
-
-        if(fileCnt){
-            fs.writeFile(componentPath, fileCnt, () => {})  
-        }        
-    }
-    
-    return '';   
-};
+const path = require('path');
+const fs = require('fs');
+const RWSScssPlugin = require('../rws_scss_plugin');
+
+module.exports = async function(content) {      
+    const filePath = this.resourcePath;
+    const componentDir = path.resolve(path.dirname(filePath), '..');
+    const componentPath = path.resolve(componentDir, 'component.ts');
+    const isDev = this._compiler.options.mode === 'development';    
+    const saveFile = content.indexOf('@save') > -1; 
+    const plugin = new RWSScssPlugin(); 
+    let fromTs = false;    
+
+    if(saveFile){
+        try {        
+            const codeData = await plugin.compileScssCode(content, path.dirname(filePath), null, filePath, !isDev);                                
+
+            const code = codeData.code;
+            const deps = codeData.dependencies;        
+
+            for (const dependency of deps){
+                this.addDependency(dependency);
+            }
+
+            if (saveFile && code) {
+                plugin.writeCssFile(filePath, code);
+            }
+        } catch(e){
+            console.error(e);
+            return '';
+        }
+    }
+
+    if(fs.existsSync(componentPath)){
+        const fileCnt = fs.readFileSync(componentPath, 'utf-8');
+
+        if(fileCnt){
+            fs.writeFile(componentPath, fileCnt, () => {})  
+        }        
+    }
+    
+    return '';   
+};

package/builder/webpack/loaders/rws_fast_ts_loader.js

@@ -1,97 +1,97 @@
-// custom-html-loader.js
-const fs = require('fs');
-const chalk = require('chalk');
-const _scss_cache = require('../../cfg/build_steps/webpack/_cache');
-const LoadersHelper = require('../../cfg/build_steps/webpack/_loaders');
-const md5 = require('md5');
-
-
-module.exports = async function(content) { 
-
-    let processedContent = content;
-    const filePath = this.resourcePath;
-    const isDev = this._compiler.options.mode === 'development';       
-    let isIgnored = false;
-    let isDebugged = false;  
-
-    // timingStart('decorator_extraction');
-    const decoratorExtract = LoadersHelper.extractRWSViewArgs(processedContent);    
-    const decoratorData = decoratorExtract ? decoratorExtract.viewDecoratorData : null;
-    
-    const cachedCode = processedContent;
-
-    const compilationVariables = this._compilation;
-    const customCompilationOptions = compilationVariables?.customOptions || null;    
-
-    const cachedTS = _scss_cache.cache(customCompilationOptions).getCachedItem(filePath, md5(cachedCode));
-    
-    if(cachedTS){
-      return cachedTS;
-    }
-
-    if(!decoratorData){
-        return content;
-    }
-
-    let templateName = null;
-    let stylesPath = null;
-    
-    if(decoratorData.decoratorArgs){
-        if(decoratorData.decoratorArgs.template){
-            templateName = decoratorData.decoratorArgs.template || null;
-        }
-
-        if(decoratorData.decoratorArgs.styles){
-            stylesPath = decoratorData.decoratorArgs.styles || null;
-        }
-        
-        if(decoratorData.decoratorArgs.ignorePackaging){
-            isIgnored = true;
-        }
-
-        if(decoratorData.decoratorArgs.debugPackaging){
-            isDebugged = true;
-        }             
-    }    
-
-    const tagName = decoratorData.tagName;
-    const className = decoratorData.className;
-    
-    // timingStop('decorator_extraction');
-
-    try { 
-        if(tagName){                                   
-            const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, templateName, isDev);         
-            const styles = await LoadersHelper.getStyles(filePath, this.addDependency, templateExists, stylesPath, isDev);  
-
-            if(className){                
-                const replacedViewDecoratorContent =  decoratorExtract.replacedDecorator;  
-
-                if(replacedViewDecoratorContent){
-                    processedContent = `${template}\n${styles}\n${replacedViewDecoratorContent}`;
-                }                
-            }            
-            
-            processedContent = `${htmlFastImports ? htmlFastImports + '\n' : ''}${processedContent}`;
-        }
-
-        const debugTsPath = filePath.replace('.ts','.debug.ts');
-
-        if(fs.existsSync(debugTsPath)){
-            fs.unlinkSync(debugTsPath);
-        }
-
-        if(isDebugged){
-            console.log(chalk.red('[RWS BUILD] Debugging into: ' + debugTsPath));
-            fs.writeFile(debugTsPath, processedContent, () => {}); //for final RWS TS preview.
-        }
-      
-        _scss_cache.cache(customCompilationOptions).cacheItem(filePath, processedContent, cachedCode);
-        return processedContent;
-    }catch(e){
-        console.log(chalk.red('RWS Typescript loader error:'));
-        console.error(e);       
-        
-        throw new Error('RWS Build failed on: ' + filePath);
-    }
+// custom-html-loader.js
+const fs = require('fs');
+const chalk = require('chalk');
+const _scss_cache = require('../../cfg/build_steps/webpack/_cache');
+const LoadersHelper = require('../../cfg/build_steps/webpack/_loaders');
+const md5 = require('md5');
+
+
+module.exports = async function(content) { 
+
+    let processedContent = content;
+    const filePath = this.resourcePath;
+    const isDev = this._compiler.options.mode === 'development';       
+    let isIgnored = false;
+    let isDebugged = false;  
+
+    // timingStart('decorator_extraction');
+    const decoratorExtract = LoadersHelper.extractRWSViewArgs(processedContent);    
+    const decoratorData = decoratorExtract ? decoratorExtract.viewDecoratorData : null;
+    
+    const cachedCode = processedContent;
+
+    const compilationVariables = this._compilation;
+    const customCompilationOptions = compilationVariables?.customOptions || null;    
+
+    const cachedTS = _scss_cache.cache(customCompilationOptions).getCachedItem(filePath, md5(cachedCode));
+    
+    if(cachedTS){
+      return cachedTS;
+    }
+
+    if(!decoratorData){
+        return content;
+    }
+
+    let templateName = null;
+    let stylesPath = null;
+    
+    if(decoratorData.decoratorArgs){
+        if(decoratorData.decoratorArgs.template){
+            templateName = decoratorData.decoratorArgs.template || null;
+        }
+
+        if(decoratorData.decoratorArgs.styles){
+            stylesPath = decoratorData.decoratorArgs.styles || null;
+        }
+        
+        if(decoratorData.decoratorArgs.ignorePackaging){
+            isIgnored = true;
+        }
+
+        if(decoratorData.decoratorArgs.debugPackaging){
+            isDebugged = true;
+        }             
+    }    
+
+    const tagName = decoratorData.tagName;
+    const className = decoratorData.className;
+    
+    // timingStop('decorator_extraction');
+
+    try { 
+        if(tagName){                                   
+            const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, templateName, isDev);         
+            const styles = await LoadersHelper.getStyles(filePath, this.addDependency, templateExists, stylesPath, isDev);  
+
+            if(className){                
+                const replacedViewDecoratorContent =  decoratorExtract.replacedDecorator;  
+
+                if(replacedViewDecoratorContent){
+                    processedContent = `${template}\n${styles}\n${replacedViewDecoratorContent}`;
+                }                
+            }            
+            
+            processedContent = `${htmlFastImports ? htmlFastImports + '\n' : ''}${processedContent}`;
+        }
+
+        const debugTsPath = filePath.replace('.ts','.debug.ts');
+
+        if(fs.existsSync(debugTsPath)){
+            fs.unlinkSync(debugTsPath);
+        }
+
+        if(isDebugged){
+            console.log(chalk.red('[RWS BUILD] Debugging into: ' + debugTsPath));
+            fs.writeFile(debugTsPath, processedContent, () => {}); //for final RWS TS preview.
+        }
+      
+        _scss_cache.cache(customCompilationOptions).cacheItem(filePath, processedContent, cachedCode);
+        return processedContent;
+    }catch(e){
+        console.log(chalk.red('RWS Typescript loader error:'));
+        console.error(e);       
+        
+        throw new Error('RWS Build failed on: ' + filePath);
+    }
 };

package/builder/webpack/loaders/ts/html_error.js

@@ -1,20 +1,20 @@
-function html_error_proof(htmlContent){
-  return `async function handleError(error: Error | any) {      
-    const errorMessage = \`RWS HTML Error:\n\${error.stack}\`;
-    console.error('RWS HTML error', errorMessage);      
-    return T.html\`<div class="rws-error"><h1>RWS HTML template error</h1>\${errorMessage}</div>\`;
-  }
-      
-  try {        
-    //@rws-template-source
-    rwsTemplate = 
-  T.html\`
-      ${htmlContent}\`;
-  } catch (error: Error | any) {
-    rwsTemplate = handleError(error);
-  }`
-}
-
-module.exports = {
-    html_error_proof
+function html_error_proof(htmlContent){
+  return `async function handleError(error: Error | any) {      
+    const errorMessage = \`RWS HTML Error:\n\${error.stack}\`;
+    console.error('RWS HTML error', errorMessage);      
+    return T.html\`<div class="rws-error"><h1>RWS HTML template error</h1>\${errorMessage}</div>\`;
+  }
+      
+  try {        
+    //@rws-template-source
+    rwsTemplate = 
+  T.html\`
+      ${htmlContent}\`;
+  } catch (error: Error | any) {
+    rwsTemplate = handleError(error);
+  }`
+}
+
+module.exports = {
+    html_error_proof
 }