@rws-framework/client 2.20.1 → 2.20.2

package/.bin/emerge.sh

@@ -1,16 +1,16 @@
-#!/bin/bash
-
-if ! command -v emerge >/dev/null 2>&1; then
-    echo "emerge command does not exist. Installing."
-    apt-get install graphviz graphviz-dev
-    pip install emerge-viz
-fi
-
-mkdir -p ./.emerge-vis-output/rws-client
-mkdir -p ./.emerge-vis-output/fast-element
-mkdir -p ./.emerge-vis-output/fast-foundation
-
-npm install
-
-emerge -c ./.emerge-typescript-template.yaml
+#!/bin/bash
+
+if ! command -v emerge >/dev/null 2>&1; then
+    echo "emerge command does not exist. Installing."
+    apt-get install graphviz graphviz-dev
+    pip install emerge-viz
+fi
+
+mkdir -p ./.emerge-vis-output/rws-client
+mkdir -p ./.emerge-vis-output/fast-element
+mkdir -p ./.emerge-vis-output/fast-foundation
+
+npm install
+
+emerge -c ./.emerge-typescript-template.yaml
 emerge -c ./.emerge-fast.yaml

package/builder/vite/index.ts

@@ -1,5 +1,5 @@
-import { rwsViteBuilder } from './rws.vite.config';
-
-export {
-    rwsViteBuilder
+import { rwsViteBuilder } from './rws.vite.config';
+
+export {
+    rwsViteBuilder
 };

package/builder/vite/rws.vite.config.ts

@@ -1,133 +1,133 @@
-import path from 'path';
-import fs from 'fs';
-import { processEnvDefines } from '../../cfg/build_steps/vite/_env_defines';
-import { getRWSVitePlugins } from '../../cfg/build_steps/vite/_loaders';
-import { rwsPath } from '@rws-framework/console';
-import type { RWSViteConfig } from '../../cfg/build_steps/vite/types';
-import type { UserConfig } from 'vite'; // Add this import
-import { RWSScssPlugin } from './rws_scss_plugin';
-
-import { ScriptTarget } from 'typescript';
-
-interface CompilerOptionsConfig {
-    baseUrl: string;
-    experimentalDecorators: boolean;
-    emitDecoratorMetadata: boolean;
-    target: 'ES2018' | 'ES2020' | 'ESNext';
-    module: 'es2022' | 'ESNext' | 'commonjs';
-    moduleResolution: 'node' | 'bundler';
-    strict: boolean;
-    esModuleInterop: boolean;
-    resolveJsonModule: boolean;
-    outDir: string;
-    strictNullChecks: boolean;
-    skipLibCheck: boolean;
-    allowSyntheticDefaultImports: boolean;
-    sourceMap: boolean;
-    declaration: boolean;
-    lib: Array<'DOM' | 'ESNext' | 'ES2018' | 'ES2020'>; // add other lib options as needed
-  }
-
-interface TSConfig {
-    compilerOptions: CompilerOptionsConfig;
-    paths?: {[key: string]: string[] };
-    include?: string[];
-    exclude?: string[];
-  }
-
-function logError(error: any) {
-    console.error('Vite config error:', {
-      message: error.message,
-      stack: error.stack,
-      cause: error.cause
-    });
-    throw error;
-  }
-
-function loadTsConfig(tsPath: string): TSConfig | null 
-{
-    if(!fs.existsSync(tsPath)){
-        return null;
-    }
-
-    try {
-      const tsConfig = JSON.parse(fs.readFileSync(tsPath, 'utf-8'));
-      return tsConfig;
-    } catch (error) {
-      logError(error);
-      return null;
-    }
-}
-
-export const _DEFAULT_CFG: RWSViteConfig = {
-    dev: true,
-    entry: path.resolve(rwsPath.findPackageDir(process.cwd()), 'src', 'index.ts'),
-    outDir: path.resolve(rwsPath.findPackageDir(process.cwd()), 'dist'),
-    tsConfigPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'tsconfig.json'),
-    cssOutputPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'public', 'css'),
-};
-
-export function rwsViteBuilder(config: Partial<RWSViteConfig> = _DEFAULT_CFG, devDebug = false): UserConfig {
-    if(!config.tsConfigPath){
-        config.tsConfigPath = _DEFAULT_CFG.tsConfigPath;
-    }
-
-    if(!config.cssOutputPath){
-        config.cssOutputPath = _DEFAULT_CFG.cssOutputPath;
-    }
-
-    if(!config.outDir){
-        config.outDir = _DEFAULT_CFG.outDir;
-    }
-
-    const scssPlugin = new RWSScssPlugin({ autoCompile: [], dev: config.dev as boolean });
-
-
-    const theConfig: RWSViteConfig = {..._DEFAULT_CFG, ...config};
-
-    const tsConfig: TSConfig | null = loadTsConfig(theConfig.tsConfigPath);
-
-    if(!tsConfig){
-        throw new Error(`File "${theConfig.tsConfigPath}" was not found!`)
-    }
-
-    const pkgDir: string = rwsPath.findPackageDir(process.cwd());
-
-    const outFileName = theConfig.outFileName || 'client.rws.js';
-    
-    return {
-        define: processEnvDefines(theConfig, _DEFAULT_CFG, devDebug),        
-        plugins: getRWSVitePlugins({ 
-            scssPlugin,
-            packageDir: pkgDir, 
-            nodeModulesPath: `${rwsPath.findRootWorkspacePath(process.cwd())}/node_modules`, 
-            tsConfigPath: theConfig.tsConfigPath, 
-            cssOutputPath: theConfig.cssOutputPath as string,
-            dev: config.dev as boolean 
-        }),        
-        build: {
-            minify: !config.dev,
-            sourcemap: config.dev,
-            outDir: theConfig.outDir,
-            emptyOutDir: true,
-            copyPublicDir: false,
-            rollupOptions: {
-              output: {
-                entryFileNames: outFileName,
-                chunkFileNames: [...outFileName.split('.').slice(0, -1), 'chunk', outFileName.split('.').at(-1)].join('.'),
-              }
-            },
-            lib: {
-                entry: theConfig.entry,
-                formats: ['es'],
-                fileName: () => outFileName
-            }            
-        },
-        esbuild: {
-            target: tsConfig?.compilerOptions?.target?.toString().toLowerCase() || ScriptTarget.ES2022.toString().toLowerCase(),
-            tsconfigRaw: {
-                compilerOptions: tsConfig.compilerOptions
-            }
-        }
-    };
+import path from 'path';
+import fs from 'fs';
+import { processEnvDefines } from '../../cfg/build_steps/vite/_env_defines';
+import { getRWSVitePlugins } from '../../cfg/build_steps/vite/_loaders';
+import { rwsPath } from '@rws-framework/console';
+import type { RWSViteConfig } from '../../cfg/build_steps/vite/types';
+import type { UserConfig } from 'vite'; // Add this import
+import { RWSScssPlugin } from './rws_scss_plugin';
+
+import { ScriptTarget } from 'typescript';
+
+interface CompilerOptionsConfig {
+    baseUrl: string;
+    experimentalDecorators: boolean;
+    emitDecoratorMetadata: boolean;
+    target: 'ES2018' | 'ES2020' | 'ESNext';
+    module: 'es2022' | 'ESNext' | 'commonjs';
+    moduleResolution: 'node' | 'bundler';
+    strict: boolean;
+    esModuleInterop: boolean;
+    resolveJsonModule: boolean;
+    outDir: string;
+    strictNullChecks: boolean;
+    skipLibCheck: boolean;
+    allowSyntheticDefaultImports: boolean;
+    sourceMap: boolean;
+    declaration: boolean;
+    lib: Array<'DOM' | 'ESNext' | 'ES2018' | 'ES2020'>; // add other lib options as needed
+  }
+
+interface TSConfig {
+    compilerOptions: CompilerOptionsConfig;
+    paths?: {[key: string]: string[] };
+    include?: string[];
+    exclude?: string[];
+  }
+
+function logError(error: any) {
+    console.error('Vite config error:', {
+      message: error.message,
+      stack: error.stack,
+      cause: error.cause
+    });
+    throw error;
+  }
+
+function loadTsConfig(tsPath: string): TSConfig | null 
+{
+    if(!fs.existsSync(tsPath)){
+        return null;
+    }
+
+    try {
+      const tsConfig = JSON.parse(fs.readFileSync(tsPath, 'utf-8'));
+      return tsConfig;
+    } catch (error) {
+      logError(error);
+      return null;
+    }
+}
+
+export const _DEFAULT_CFG: RWSViteConfig = {
+    dev: true,
+    entry: path.resolve(rwsPath.findPackageDir(process.cwd()), 'src', 'index.ts'),
+    outDir: path.resolve(rwsPath.findPackageDir(process.cwd()), 'dist'),
+    tsConfigPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'tsconfig.json'),
+    cssOutputPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'public', 'css'),
+};
+
+export function rwsViteBuilder(config: Partial<RWSViteConfig> = _DEFAULT_CFG, devDebug = false): UserConfig {
+    if(!config.tsConfigPath){
+        config.tsConfigPath = _DEFAULT_CFG.tsConfigPath;
+    }
+
+    if(!config.cssOutputPath){
+        config.cssOutputPath = _DEFAULT_CFG.cssOutputPath;
+    }
+
+    if(!config.outDir){
+        config.outDir = _DEFAULT_CFG.outDir;
+    }
+
+    const scssPlugin = new RWSScssPlugin({ autoCompile: [], dev: config.dev as boolean });
+
+
+    const theConfig: RWSViteConfig = {..._DEFAULT_CFG, ...config};
+
+    const tsConfig: TSConfig | null = loadTsConfig(theConfig.tsConfigPath);
+
+    if(!tsConfig){
+        throw new Error(`File "${theConfig.tsConfigPath}" was not found!`)
+    }
+
+    const pkgDir: string = rwsPath.findPackageDir(process.cwd());
+
+    const outFileName = theConfig.outFileName || 'client.rws.js';
+    
+    return {
+        define: processEnvDefines(theConfig, _DEFAULT_CFG, devDebug),        
+        plugins: getRWSVitePlugins({ 
+            scssPlugin,
+            packageDir: pkgDir, 
+            nodeModulesPath: `${rwsPath.findRootWorkspacePath(process.cwd())}/node_modules`, 
+            tsConfigPath: theConfig.tsConfigPath, 
+            cssOutputPath: theConfig.cssOutputPath as string,
+            dev: config.dev as boolean 
+        }),        
+        build: {
+            minify: !config.dev,
+            sourcemap: config.dev,
+            outDir: theConfig.outDir,
+            emptyOutDir: true,
+            copyPublicDir: false,
+            rollupOptions: {
+              output: {
+                entryFileNames: outFileName,
+                chunkFileNames: [...outFileName.split('.').slice(0, -1), 'chunk', outFileName.split('.').at(-1)].join('.'),
+              }
+            },
+            lib: {
+                entry: theConfig.entry,
+                formats: ['es'],
+                fileName: () => outFileName
+            }            
+        },
+        esbuild: {
+            target: tsConfig?.compilerOptions?.target?.toString().toLowerCase() || ScriptTarget.ES2022.toString().toLowerCase(),
+            tsconfigRaw: {
+                compilerOptions: tsConfig.compilerOptions
+            }
+        }
+    };
 }

package/builder/vite/rws_scss_plugin.ts

@@ -1,61 +1,61 @@
-import path from 'path';
-import { rwsPath } from '@rws-framework/console';
-
-import _scss_compiler_builder from './scss/_compiler';
-import _scss_import_builder from './scss/_import';
-
-import _scss_fs_builder from './scss/_fs';
-
-type PluginParams = { autoCompile: string[], dev: boolean };
-
-class RWSScssPlugin {
-  protected autoCompile: string[] = [];
-  protected node_modules_dir: (fileDir: string) => void;
-
-  private _scss_import: any;    
-  private _scss_fs: any;
-  private _scss_compiler: any;
-  private dev
-
-  constructor(params: PluginParams = { autoCompile: [], dev: true }) {
-    this.node_modules_dir = (fileDir) => path.relative(fileDir, rwsPath.findRootWorkspacePath(process.cwd())) + '/node_modules/'
-    this._scss_import = _scss_import_builder(this);    
-    this._scss_fs = _scss_fs_builder(this);
-    this._scss_compiler = _scss_compiler_builder(this);
-
-    if (!!params.autoCompile && params.autoCompile.length > 0) {
-      this.autoCompile = params.autoCompile;
-    }
-
-    for (let index in this.autoCompile) {
-      const sassFile = this.autoCompile[index];
-      this.compileFile(sassFile);
-    }
-  }
-
-  
-  apply(compiler) {
-    const _self = this;
-
-    return;
-  }
-
-  async compileFile(scssPath): Promise<{ code: string, dependencies: string[]}>
-  {    
-      scssPath = this._scss_import.processImportPath(scssPath, path.dirname(scssPath))    
-      let scssCode = this._scss_fs.getCodeFromFile(scssPath);
-      return await this._scss_compiler.compileScssCode(scssCode, path.dirname(scssPath), null, scssPath);
-  }
-
-  async compileScssCode(scssCode: string, scssPath: string): Promise<{ code: string, dependencies: string[]}>
-  {             
-      return await this._scss_compiler.compileScssCode(scssCode, scssPath, this.dev);
-  }
-  
-  writeCssFile(scssFilePath: string, cssContent: string): string
-  {
-    return this._scss_fs.writeCssFile(scssFilePath, cssContent);
-  }
-}
-
-export {RWSScssPlugin};
+import path from 'path';
+import { rwsPath } from '@rws-framework/console';
+
+import _scss_compiler_builder from './scss/_compiler';
+import _scss_import_builder from './scss/_import';
+
+import _scss_fs_builder from './scss/_fs';
+
+type PluginParams = { autoCompile: string[], dev: boolean };
+
+class RWSScssPlugin {
+  protected autoCompile: string[] = [];
+  protected node_modules_dir: (fileDir: string) => void;
+
+  private _scss_import: any;    
+  private _scss_fs: any;
+  private _scss_compiler: any;
+  private dev
+
+  constructor(params: PluginParams = { autoCompile: [], dev: true }) {
+    this.node_modules_dir = (fileDir) => path.relative(fileDir, rwsPath.findRootWorkspacePath(process.cwd())) + '/node_modules/'
+    this._scss_import = _scss_import_builder(this);    
+    this._scss_fs = _scss_fs_builder(this);
+    this._scss_compiler = _scss_compiler_builder(this);
+
+    if (!!params.autoCompile && params.autoCompile.length > 0) {
+      this.autoCompile = params.autoCompile;
+    }
+
+    for (let index in this.autoCompile) {
+      const sassFile = this.autoCompile[index];
+      this.compileFile(sassFile);
+    }
+  }
+
+  
+  apply(compiler) {
+    const _self = this;
+
+    return;
+  }
+
+  async compileFile(scssPath): Promise<{ code: string, dependencies: string[]}>
+  {    
+      scssPath = this._scss_import.processImportPath(scssPath, path.dirname(scssPath))    
+      let scssCode = this._scss_fs.getCodeFromFile(scssPath);
+      return await this._scss_compiler.compileScssCode(scssCode, path.dirname(scssPath), null, scssPath);
+  }
+
+  async compileScssCode(scssCode: string, scssPath: string): Promise<{ code: string, dependencies: string[]}>
+  {             
+      return await this._scss_compiler.compileScssCode(scssCode, scssPath, this.dev);
+  }
+  
+  writeCssFile(scssFilePath: string, cssContent: string): string
+  {
+    return this._scss_fs.writeCssFile(scssFilePath, cssContent);
+  }
+}
+
+export {RWSScssPlugin};

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
 }