@rws-framework/client 2.16.2 → 2.16.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.16.2",
+    "version": "2.16.3",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -39,8 +39,7 @@
         "moment": "^2.29.4",
         "partial-json-parser": "^1.0.0",
         "reflect-metadata": "^0.2.2",
-        "resolve-url-loader": "^5.0.0",
-        "sanitize-html": "^2.14.0",
+        "resolve-url-loader": "^5.0.0",        
         "socket.io-client": "^4.7.2",
         "upload": "^1.3.2",
         "url-router": "^13.0.0",
@@ -52,8 +51,7 @@
         "@types/eslint": "^6.0.0",
         "@types/express-fileupload": "^1.4.4",
         "@types/glob": "^8.1.0",
-        "@types/he": "^1.2.3",
-        "@types/sanitize-html": "^2.11.0",
+        "@types/he": "^1.2.3",        
         "@types/uuid": "^9.0.7",
         "@typescript-eslint/parser": "^5.0.0",
         "browser-sync": "^2.29.3",

package/src/components/_attrs/sanitize-html.ts

@@ -1,81 +1,81 @@
-import { Observable } from '@microsoft/fast-element';
-import RWSViewComponent from '../_component';
-import DOMService from '../../services/DOMService';
-import RWSContainer from '../_container';
-import { IOptions } from 'sanitize-html';
+// import { Observable } from '@microsoft/fast-element';
+// import RWSViewComponent from '../_component';
+// import DOMService from '../../services/DOMService';
+// import RWSContainer from '../_container';
+// // import { IOptions } from 'sanitize-html';
 
-import * as he from 'he';
+// import * as he from 'he';
 
-type SanitizeOptions = IOptions & { fullEncode?: boolean };
+// // type SanitizeOptions = IOptions & { fullEncode?: boolean };
 
-const heOpt: he.EncodeOptions = {
-    useNamedReferences: false, 
-    encodeEverything: true,
-};
+// const heOpt: he.EncodeOptions = {
+//     useNamedReferences: false, 
+//     encodeEverything: true,
+// };
 
-function enc(html: string): string
-{
-    return he.encode(html, heOpt);
-}
+// function enc(html: string): string
+// {
+//     return he.encode(html, heOpt);
+// }
 
 
-const transformAnyTag = (tagName: string, attribs: { [key: string]: string }) => {
-    // Example: Wrap the original tag with `span` and indicate the original tag name in a data attribute
-    return {
-        tagName: 'span', // Change this to any tag you want to transform to
-        attribs: {
-            ...attribs,
-            'data-original-tag': tagName
-        }
-    };
-};
+// const transformAnyTag = (tagName: string, attribs: { [key: string]: string }) => {
+//     // Example: Wrap the original tag with `span` and indicate the original tag name in a data attribute
+//     return {
+//         tagName: 'span', // Change this to any tag you want to transform to
+//         attribs: {
+//             ...attribs,
+//             'data-original-tag': tagName
+//         }
+//     };
+// };
 
-function sanitizedAttr(configOrTarget?: SanitizeOptions | RWSViewComponent, prop?: string): void | any 
-{    
-    if (arguments.length > 1) {
-        // Decorator used directly without factory invocation
-        // Apply the decorator immediately without returning anything
-        applyDecorator(configOrTarget as RWSViewComponent, prop!);
-    } else {
-        // Decorator factory invocation
-        const config = configOrTarget as SanitizeOptions;
-        // Return a function that applies the decorator, conforming to TypeScript's expectations for decorator factories
-        return (target: RWSViewComponent, property: string) => applyDecorator(target, property, config);
-    }
-}
+// function sanitizedAttr(configOrTarget?: SanitizeOptions | RWSViewComponent, prop?: string): void | any 
+// {    
+//     if (arguments.length > 1) {
+//         // Decorator used directly without factory invocation
+//         // Apply the decorator immediately without returning anything
+//         applyDecorator(configOrTarget as RWSViewComponent, prop!);
+//     } else {
+//         // Decorator factory invocation
+//         const config = configOrTarget as SanitizeOptions;
+//         // Return a function that applies the decorator, conforming to TypeScript's expectations for decorator factories
+//         return (target: RWSViewComponent, property: string) => applyDecorator(target, property, config);
+//     }
+// }
 
-function applyDecorator(target: RWSViewComponent, prop: string, config: SanitizeOptions = null): void 
-{    
-    if(config.fullEncode){
-        const encAllOpts = {transformTags: { '*' : transformAnyTag }, textFilter: function(text: string, tagName?: string) { return tagName ? `${enc('<')}${tagName}${enc('>')}${text}${enc('</')}${tagName}${enc('>')}` : text; }};
-        config = {...config, ...encAllOpts};
-        delete config.fullEncode;
-    }
+// function applyDecorator(target: RWSViewComponent, prop: string, config: SanitizeOptions = null): void 
+// {    
+//     if(config.fullEncode){
+//         const encAllOpts = {transformTags: { '*' : transformAnyTag }, textFilter: function(text: string, tagName?: string) { return tagName ? `${enc('<')}${tagName}${enc('>')}${text}${enc('</')}${tagName}${enc('>')}` : text; }};
+//         config = {...config, ...encAllOpts};
+//         delete config.fullEncode;
+//     }
 
-    modifyPropertyDescriptor(target, prop, config as IOptions);
-}
+//     modifyPropertyDescriptor(target, prop, config as IOptions);
+// }
 
-function modifyPropertyDescriptor(target: any, propertyKey: string, config: IOptions = null): void {
-    const privatePropName = `_${String(propertyKey)}`;
-    Object.defineProperty(target, privatePropName, {
-        writable: true,
-        value: target[propertyKey],
-    });
+// function modifyPropertyDescriptor(target: any, propertyKey: string, config: IOptions = null): void {
+//     const privatePropName = `_${String(propertyKey)}`;
+//     Object.defineProperty(target, privatePropName, {
+//         writable: true,
+//         value: target[propertyKey],
+//     });
 
-    Object.defineProperty(target, propertyKey, {
-        get() {
-            return this[privatePropName];                             
-        },
-        set(value: any) {                
-            if (typeof value === 'string') {                                    
-                this[privatePropName] = RWSContainer().get(DOMService).sanitizeHTML(value, null, config);                
-            } else {
-                this[privatePropName] = null;
-            }
-            Observable.notify(this, propertyKey);
-        },
-    });
-}
+//     Object.defineProperty(target, propertyKey, {
+//         get() {
+//             return this[privatePropName];                             
+//         },
+//         set(value: any) {                
+//             if (typeof value === 'string') {                                    
+//                 this[privatePropName] = RWSContainer().get(DOMService).sanitizeHTML(value, null, config);                
+//             } else {
+//                 this[privatePropName] = null;
+//             }
+//             Observable.notify(this, propertyKey);
+//         },
+//     });
+// }
   
 
-export { sanitizedAttr };
+// export { sanitizedAttr };

package/src/index.ts

@@ -13,7 +13,7 @@ import type { IBackendRoute, IHTTProute, IPrefixedHTTProutes } from './services/
 
 import UtilsService, {UtilsServiceInstance} from './services/UtilsService';
 import ServiceWorkerService, { ServiceWorkerServiceInstance } from './services/ServiceWorkerService';
-import { sanitizedAttr } from './components/_attrs/sanitize-html';
+// import { sanitizedAttr } from './components/_attrs/sanitize-html';
 import { ngAttr } from './components/_attrs/angular-attr';
 import { externalObservable } from './components/_attrs/external-observable';
 import { externalAttr } from './components/_attrs/external-attr';
@@ -80,7 +80,7 @@ export {
     RWSNotify,
 
     RWSView,
-    sanitizedAttr,
+    // sanitizedAttr,
     RWSIgnore,
     RWSInject,    
     observable,

package/src/services/DOMService.ts

@@ -1,6 +1,6 @@
 import RWSService from './_service';
 import { DOM } from '@microsoft/fast-element';
-import htmlSanitizer, { Transformer, IOptions } from 'sanitize-html';
+// import htmlSanitizer, { Transformer, IOptions } from 'sanitize-html';
 
 type TagsProcessorType = { [tagName: string]: string | Transformer };
 type DOMOutputType<T extends Element> = NodeListOf<T> | T | null;
@@ -67,23 +67,7 @@ class DOMService extends RWSService {
         });
 
         return sanitizedText;
-    }
-
-    sanitizeHTML(
-        line: string, 
-        allowedHTMLTags: string[] = null,         
-        sanitizeOptions: IOptions = {})
-    {
-        const output: string = line.trim(); 
-        
-        if(allowedHTMLTags){
-            sanitizeOptions.allowedTags = allowedHTMLTags;
-        }     
-
-        const sanitized = htmlSanitizer(output, sanitizeOptions);
-
-        return sanitized;
-    }
+    }   
 
     async onDOMLoad(): Promise<void>
     {