@rws-framework/client 2.21.5 → 2.22.0

package/package.json

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

package/src/components/_component.ts

@@ -13,7 +13,6 @@ import TheRWSService from '../services/_service';
 import { handleExternalChange } from './_attrs/_external_handler';
 import { IFastDefinition, isDefined, defineComponent, getDefinition } from './_definitions';
 import { on, $emitDown, observe, sendEventToOutside } from './_event_handling';
-import { domEvents } from '../events';
 
 type ComposeMethodType<
     T extends FoundationElementDefinition,
@@ -22,8 +21,6 @@ type ComposeMethodType<
 
 type CSSInjectMode = 'adopted' | 'legacy' | 'both';
 
-const _DEFAULT_INJECT_CSS_CACHE_LIMIT_DAYS = 1;
-
 export interface IWithCompose<T extends RWSViewComponent> {
     [key: string]: any
     new(...args: any[]): T;
@@ -253,81 +250,55 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
         return RWSViewComponent.instances;
     }
 
-    protected async injectStyles(styleLinks: string[], mode: CSSInjectMode = 'adopted', maxDaysExp?: number) {
+    protected async injectStyles(styleLinks: string[], mode: CSSInjectMode = 'adopted') {
         const dbName = 'css-cache';
         const storeName = 'styles';
         const db = await this.indexedDBService.openDB(dbName, storeName);
-        const maxAgeMs = 1000 * 60 * 60 * 24; // 24h
-        const maxDaysAge = maxDaysExp ? maxDaysExp : _DEFAULT_INJECT_CSS_CACHE_LIMIT_DAYS;
-        const maxAgeDays = maxAgeMs * maxDaysAge;
 
         let adoptedSheets: CSSStyleSheet[] = [];
 
-        let doneAdded = false;
-
         for (const styleLink of styleLinks) {
-            const loadPromise = new Promise<void>(async (resolve, reject) => {
-                if (mode === 'legacy' || mode === 'both') {
-                    const link = document.createElement('link');
-                    link.rel = 'stylesheet';
-                    link.href = styleLink;
-                    this.getShadowRoot().appendChild(link);
-    
-                    link.onload = () => {
-                        doneAdded = true;
-
-                        if(mode === 'legacy'){
-                            resolve();
-                        }
-                    };
-                }
+            if (mode === 'legacy' || mode === 'both') {
+                const link = document.createElement('link');
+                link.rel = 'stylesheet';
+                link.href = styleLink;
+                this.getShadowRoot().appendChild(link);
+            }
 
-                if (mode === 'adopted' || mode === 'both') {
-                    const entry = await this.indexedDBService.getFromDB(db, storeName, styleLink);
+            if (mode === 'adopted' || mode === 'both') {
+                const entry = await this.indexedDBService.getFromDB(db, storeName, styleLink);
+                const maxAgeMs = 1000 * 60 * 60 * 24; // 24h
 
-                    let cssText: string | null = null;
+                let cssText: string | null = null;
 
-                    if (entry && typeof entry === 'object' && 'css' in entry && 'timestamp' in entry) {
-                        const expired = Date.now() - entry.timestamp > maxAgeDays;
-                        if (!expired) {
-                            cssText = entry.css;
-                        }
+                if (entry && typeof entry === 'object' && 'css' in entry && 'timestamp' in entry) {
+                    const expired = Date.now() - entry.timestamp > maxAgeMs;
+                    if (!expired) {
+                        cssText = entry.css;
                     }
+                }
 
-                    if (!cssText) {
-                        cssText = await fetch(styleLink).then(res => res.text());
-                        await this.indexedDBService.saveToDB(db, storeName, styleLink, {
-                            css: cssText,
-                            timestamp: Date.now()
-                        });
-                        console.log(`System saved stylesheet: ${styleLink} to IndexedDB`)
-                    }
-
-                    const sheet = new CSSStyleSheet();
-                    await sheet.replace(cssText);
-
-                    adoptedSheets.push(sheet);
-
-                    if(mode === 'adopted' || mode === 'both'){
-                        resolve();
-                    }
+                if (!cssText) {
+                    cssText = await fetch(styleLink).then(res => res.text());
+                    await this.indexedDBService.saveToDB(db, storeName, styleLink, {
+                        css: cssText,
+                        timestamp: Date.now()
+                    });
+                    console.log(`System saved stylesheet: ${styleLink} to IndexedDB`)
                 }
-            });
 
-            await loadPromise;
+                const sheet = new CSSStyleSheet();
+                await sheet.replace(cssText);
+
+                adoptedSheets.push(sheet);                
+            }
         }
 
-        if (adoptedSheets.length) {
-            this.getShadowRoot().adoptedStyleSheets = [
+        if(adoptedSheets.length){
+            this.getShadowRoot().adoptedStyleSheets = [                
                 ...adoptedSheets,
                 ...this.getShadowRoot().adoptedStyleSheets,
             ];
-
-            doneAdded = true;
-        }
-
-        if (doneAdded) {
-            this.$emit(domEvents.loadedLinkedStyles);
         }
     }
 }

package/src/index.ts

@@ -22,14 +22,14 @@ import {  RWSIgnore, RWSInject, RWSView } from './components/_decorator';
 import type { DefaultRWSPluginOptionsType } from './plugins/_plugin';
 import type { IRWSPlugin, IStaticRWSPlugin, IPluginSpawnOption } from './types/IRWSPlugin';
 import type IRWSUser from './types/IRWSUser';
-import type { IAssetShowOptions, IRWSViewComponent } from './components/_component';
+import type { IAssetShowOptions } from './components/_component';
 import type { RWSDecoratorOptions } from './components/_decorator';
+import type { IKDBTypeInfo, IKDBTypesResponse } from './types/IBackendCore';
 import type { DOMOutputType, TagsProcessorType } from './services/DOMService';
 import type { IBackendRoute, IHTTProute, IPrefixedHTTProutes } from './services/ApiService';
 import type IRWSConfig from './types/IRWSConfig';
 import type RWSNotify from './types/RWSNotify';
 import type { NotifyUiType, NotifyLogType }  from './types/RWSNotify';
-import * as RWSEvents from './events';
 
 export default RWSClient;
 
@@ -70,12 +70,11 @@ export {
     RWSService,
     RWSViewComponent,
 
-    RWSContainer,
-
-    RWSEvents
+    RWSContainer
 };
 
-export type {    
+export type {
+    IKDBTypeInfo, IKDBTypesResponse,
     NotifyUiType,
     NotifyLogType,
     IBackendRoute as IRWSBackendRoute,
@@ -85,6 +84,5 @@ export type {
     IAssetShowOptions as IRWSAssetShowOptions,
     IRWSConfig,
     IRWSUser,
-    TagsProcessorType,
-    IRWSViewComponent
+    TagsProcessorType
 }

package/src/services/ApiService.ts

@@ -1,4 +1,4 @@
-import { IKDBTypesResponse } from '../../../components/src/types/IBackendCore';
+import { IKDBTypesResponse } from '../types/IBackendCore';
 import TheService from './_service';
 
 //@4DI

package/src/services/DOMService.ts

@@ -83,7 +83,7 @@ class DOMService extends RWSService {
         sanitizeOptions: DOMPurify.Config = { })
     {
         const output: string = line.trim();
-        const sanitized = DOMPurify.sanitize(output, { USE_PROFILES: { html: true }, ...sanitizeOptions}) as string;
+        const sanitized = DOMPurify.sanitize(output, { USE_PROFILES: { html: true }, ...sanitizeOptions});
         return sanitized;
     }
 }

package/src/types/IBackendCore.ts

@@ -0,0 +1,12 @@
+export interface IKDBTypeInfo {
+    fieldName: string;
+    type: string;
+    boundModel?: string
+}
+
+export interface IKDBTypesResponse {
+    success: boolean;
+    data: {
+        types: IKDBTypeInfo[];
+    };
+}

package/src/types/IRWSResource.ts

@@ -0,0 +1,5 @@
+export interface IRWSResourceQuery {
+    fieldName: string,
+    type: String,
+    boundModel: string
+}

package/src/types/IRWSViewComponent.ts

@@ -1,9 +1,9 @@
-import { FASTElement, ViewTemplate } from '@microsoft/fast-element';
+import { ViewTemplate } from '@microsoft/fast-element';
 import { DOMOutputType } from '../services/DOMService';
 
 type IAssetShowOptions = Record<string, any>;
 
-interface IRWSViewComponent extends FASTElement {    
+interface IRWSViewComponent extends Node {    
     __isLoading: boolean;
     routeParams: Record<string, string>;
     trashIterator: number;

package/src/types/IReFormerField.ts

@@ -0,0 +1,5 @@
+export interface IReFormerField {
+    name: string,
+    defaultValue?: any,
+    setForm: (field: string, value: any) => Promise<void>   
+}

package/src/events.ts

@@ -1,3 +0,0 @@
-export const domEvents = {
-    loadedLinkedStyles: 'loaded:linked'
-}