@sapphire-ion/framework 0.30.27 → 0.30.28

package/src/lib/index.ts

@@ -0,0 +1,175 @@
+/*
+ * Public API Surface of @sapphire-ion/framework
+ */
+
+// [ 📁 Lib ]
+//[ 📁 Classes ]
+  // [ 📁 Classes -> Comparison ]
+    export * from '../lib/classes/comparison/properties/bool-property';
+    export * from '../lib/classes/comparison/properties/date-property';
+    export * from '../lib/classes/comparison/properties/datetime-property';
+    export * from '../lib/classes/comparison/properties/decimal-property';
+    export * from '../lib/classes/comparison/properties/enum-property';
+    export * from '../lib/classes/comparison/properties/implicit-property';
+    export * from '../lib/classes/comparison/properties/int-property';
+    export * from '../lib/classes/comparison/properties/long-property';
+    export * from '../lib/classes/comparison/properties/string-property';
+    export * from '../lib/classes/comparison/properties/time-property';
+    export * from '../lib/classes/comparison/properties/bool-property';
+  export * from '../lib/classes/comparison/comparison';
+  export * from '../lib/classes/comparison/comparison-operator';
+  export * from '../lib/classes/comparison/comparison-value-type';
+  // [ 📁 Classes -> Filters ]
+  export * from '../lib/classes/filters/view-filtros';
+  // [ 📁 Classes -> Inputs ]
+  export * from '../lib/classes/inputs/table-field-form-builder';
+  export * from '../lib/classes/inputs/table-field';
+  // [ 📁 Classes -> Routes ]
+  export * from '../lib/classes/routes/default-routing-factory';
+  export * from '../lib/classes/routes/id-preloader-configuration';
+  export * from '../lib/classes/routes/route-data';
+export * from '../lib/classes/credentials';
+export * from '../lib/classes/environment';
+export * from '../lib/classes/infinite-scroll';
+export * from '../lib/classes/page-option';
+
+//[ 📁 Components ]
+  //[ 📁 Components -> Carousel ]
+    // [ 📁 Components -> Carousel -> Carrousel-Image ]
+    export * from '../lib/components/carousel/carousel-image/carousel-image.component';
+    // [ 📁 Components -> Carousel -> Carrousel-Item ]
+    export * from '../lib/components/carousel/carousel-item/carousel-item.component';
+  export * from '../lib/components/carousel/carousel.component';
+  export * from '../lib/components/carousel/carousel.module';
+  export * from '../lib/components/carousel/i-carousel-item.component';
+  // [ 📁 Components -> Content-Block ]
+  export * from '../lib/components/content-block/content-block.component';
+  // [ 📁 Components -> Default ]
+    // [ 📁 Components -> Default -> default-list ]
+      // [ 📁 Components -> Default -> default-list -> header-list ]
+      export * from '../lib/components/default/default-list/header-list/header-list.component';
+    export * from '../lib/components/default/default-list/abstract-list';
+    export * from '../lib/components/default/default-list/default-list.component';
+    export * from '../lib/components/default/default-list/list';
+    // [ 📁 Components -> Default -> default-pagination ]
+    export * from '../lib/components/default/default-pagination/default-pagination.component';
+    // [ 📁 Components -> Default -> default-table ]
+      // [ 📁 Components -> Default -> default-table -> th-filter ]
+      export * from '../lib/components/default/default-table/th-filter/th-filter.component';
+    export * from '../lib/components/default/default-table/default-table.component';
+    // [ 📁 Components -> Default -> default-view ]
+      // [ 📁 Components -> Default -> default-view -> header-view ]
+      export * from '../lib/components/default/default-view/header-view/header-view.component';
+    export * from '../lib/components/default/default-view/abstract-view';
+    export * from '../lib/components/default/default-view/default-view.component';
+    export * from '../lib/components/default/default-view/view';
+  export * from '../lib/components/default/default.module';
+  // [ 📁 Components -> default-page ]
+  export * from '../lib/components/default-page/default.page';
+  // [ 📁 Components -> drag-drop-page ]
+    // [ 📁 Components -> drag-drop-page -> drag-drop-overlay ]
+    export * from '../lib/components/drag-drop-file/drag-drop-overlay/drag-drop-overlay.component';
+  export * from '../lib/components/drag-drop-file/drag-drop-file.directive';
+  export * from '../lib/components/drag-drop-file/drag-drop-file.module';
+  // [ 📁 Components -> drawer ]
+    // [ 📁 Components -> drawer -> default-drawer-end ]
+    export * from '../lib/components/drawer/default-drawer-end/default-drawer-end.component';
+    // [ 📁 Components -> drawer -> drawer-group ]
+    export * from '../lib/components/drawer/drawer-group/drawer-group.component';
+  export * from '../lib/components/drawer/drawer.component';
+  export * from '../lib/components/drawer/menu';
+  // [ 📁 Components -> filter ]
+  export * from '../lib/components/filter/filter.component';
+  // [ 📁 Components -> http-responses-pages ]
+    // [ 📁 Components -> http-responses-pages -> forbidden-403 ]
+    export * from '../lib/components/http-responses-pages/forbidden-403/forbidden-403.component';
+  // [ 📁 Components -> image ]
+  export * from '../lib/components/image/image.component';
+  // [ 📁 Components -> info-popover ]
+  export * from '../lib/components/info-popover/info-popover.component';
+  // [ 📁 Components -> inputs ]
+    // [ 📁 Components -> inputs -> input-bool ]
+    export * from '../lib/components/inputs/input-bool/input-bool.component';
+    export * from '../lib/components/inputs/input-bool/input-bool.configuration';
+    // [ 📁 Components -> inputs -> input-color ]
+    export * from '../lib/components/inputs/input-color/input-color.component';
+    // export * from '../lib/components/inputs/input-color/input-color.configuration';
+    // [ 📁 Components -> inputs -> input-cpf-cnpj ]
+    export * from '../lib/components/inputs/input-cpf-cnpj/input-cpf-cnpj.component';
+    export * from '../lib/components/inputs/input-cpf-cnpj/input-cpf-cnpj.configuration';
+    // [ 📁 Components -> inputs -> input-date ]
+    export * from '../lib/components/inputs/input-date/input-date.component';
+    export * from '../lib/components/inputs/input-date/input-date.configuration';
+    // [ 📁 Components -> inputs -> input-decimal ]
+    export * from '../lib/components/inputs/input-decimal/input-decimal.component';
+    export * from '../lib/components/inputs/input-decimal/input-decimal.configuration';
+    // [ 📁 Components -> inputs -> input-file ]
+    export * from '../lib/components/inputs/input-file/download-button/download-button.component';
+    export * from '../lib/components/inputs/input-file/input-file.component';
+    export * from '../lib/components/inputs/input-file/input-file.configuration';
+    // [ 📁 Components -> inputs -> input-loading ]
+    export * from '../lib/components/inputs/input-loading/input-loading.component';
+    // [ 📁 Components -> inputs -> input-select ]
+    export * from '../lib/components/inputs/input-select/input-select-option/input-select-option.component';
+    export * from '../lib/components/inputs/input-select/input-select-template.directive';
+    export * from '../lib/components/inputs/input-select/input-select.component';
+    export * from '../lib/components/inputs/input-select/input.select.configuration';
+    // [ 📁 Components -> inputs -> input-string ]
+    export * from '../lib/components/inputs/input-string/input-string.component';
+    export * from '../lib/components/inputs/input-string/input-string.configuration';
+    // [ 📁 Components -> inputs -> input-textarea ]
+    export * from '../lib/components/inputs/input-textarea/input-textarea.component';
+  export * from '../lib/components/inputs/input-configuration';
+  export * from '../lib/components/inputs/input-default-configurations';
+  export * from '../lib/components/inputs/input-provider-factory';
+  export * from '../lib/components/inputs/input-type';
+  export * from '../lib/components/inputs/input-validators';
+  export * from '../lib/components/inputs/inputs.module';
+  // [ 📁 Components -> loading ]
+  export * from '../lib/components/loading/loading.component';
+  // [ 📁 Components -> login ]
+    // [ 📁 Components -> login -> login-admin ]
+    export * from '../lib/components/login/login-admin/login-admin.component';
+  export * from '../lib/components/login/login.component';
+  // [ 📁 Components -> main-content ]
+  export * from '../lib/components/main-content/main-content.component';
+  // [ 📁 Components -> stepper ]
+    // [ 📁 Components -> stepper -> step ]
+    export * from '../lib/components/stepper/step/step.component';
+  export * from '../lib/components/stepper/stepper.component';
+  export * from '../lib/components/stepper/stepper.module';
+  // [ 📁 Components -> tabs ]
+    // [ 📁 Components -> tabs -> tab ]
+    export * from '../lib/components/tabs/tab/tab.component';
+    // [ 📁 Components -> tabs -> tabs ]
+    export * from '../lib/components/tabs/tabs/tabs.component';
+  export * from '../lib/components/tabs/tabs.module';
+  // [ 📁 Components -> text-tooltip ]
+  export * from '../lib/components/text-tooltip/text-tooltip.component';
+  // [ 📁 Components -> tooltip ]
+  export * from '../lib/components/tooltip/tooltip.component';
+//[ 📁 Directives ]
+  export * from '../lib/directives/ng-var.directive';
+//[ 📁 Guards ]
+  export * from '../lib/guards/auth.guard';
+  export * from '../lib/guards/error.interceptor';
+  export * from '../lib/guards/token.interceptor';
+// [ 📁 Pipes ]
+  export * from '../lib/pipes/secure.pipe';
+// [ 📁 Services ]
+  // [ 📁 Services -> Route ]
+    export * from '../lib/services/route/route.provider.service';
+    export * from '../lib/services/route/route.cache.service';
+  // [ 📁 Services -> Web ]
+    export * from '../lib/services/web/api-url-provider.service';
+    export * from '../lib/services/web/http.ativo.service';
+    export * from '../lib/services/web/http.service';
+    export * from '../lib/services/web/storage.service';
+  export * from '../lib/services/auth.service';
+  // export * from '../lib/services/crypto.service';
+  export * from '../lib/services/environment.service';
+  export * from '../lib/services/generics.service';
+  export * from '../lib/services/usuario.service';
+  export * from '../lib/services/utils.service';
+
+export * from '../lib/core.module';

package/src/lib/pipes/secure.pipe.ts

@@ -0,0 +1,39 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable, from, switchMap } from 'rxjs';
+import { Pipe, PipeTransform } from '@angular/core';
+
+import { ApiUrlProviderService } from '../services/web/api-url-provider.service';
+import { AuthService } from '../services/auth.service';
+
+@Pipe({
+  name: 'secure',
+  standalone: true,
+})
+export class SecurePipe implements PipeTransform {
+
+  constructor(
+    private http: HttpClient,
+    private auth: AuthService,
+    private apiUrlProviderService: ApiUrlProviderService
+  ) {}
+
+  transform(src: string): Observable<string> | Promise<string> {
+    if(src.startsWith(this.apiUrlProviderService.apiUrl)){
+      // Convert the Promise to an Observable and chain the HTTP request
+      return from(this.auth.LoadToken())
+      .pipe(
+        switchMap((Bearer: string) => {
+          const headers = new HttpHeaders({ 'Authorization': `Bearer ${Bearer}` });
+          return this.http.get(src, { headers, responseType: 'blob' });
+        }),
+        switchMap((blob: Blob) => {
+          const url = URL.createObjectURL(blob);
+          return from(Promise.resolve(url));
+        })
+      );
+    }
+    else{
+      return Promise.resolve(src);
+    }
+  }
+}

package/src/lib/services/auth.service.ts

@@ -0,0 +1,150 @@
+import { Observable, firstValueFrom } from 'rxjs';
+import { NavController } from '@ionic/angular';
+import { Preferences } from '@capacitor/preferences';
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { jwtDecode } from 'jwt-decode';
+
+import { ApiUrlProviderService } from '../services/web/api-url-provider.service';
+import { EnvironmentService } from './environment.service';
+import { Utils } from './utils.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AuthService {
+
+  constructor(
+    private http: HttpClient,
+    private navController: NavController,
+    private coreService: EnvironmentService,
+    private apiUrlProviderService: ApiUrlProviderService 
+  ) {
+    this.SetToken();
+  }
+
+  private localUserKey      : string = this.coreService.environment.applicationName.toUpperCase() + "_USER_KEY";
+  private localAdminKey     : string = this.coreService.environment.applicationName.toUpperCase() + "_ADMIN_KEY";
+  public  currentToken: string | null = null;
+
+  async SetToken(): Promise<void> {
+    const Token      = await this.LoadToken();
+    const TokenAdmin = await this.LoadTokenAdmin();
+    if(this.isTokenValid(Token)){
+      this.currentToken = await this.JWToken();
+    }
+
+    if(TokenAdmin && this.isTokenValid(TokenAdmin)){
+      this._isAdmin = true;
+    }
+
+    return;
+  }
+
+  async Loggout(): Promise<void> {
+    await Preferences.remove({ key: this.localUserKey });
+    await Preferences.remove({ key: this.localAdminKey });
+    this.currentToken = null;
+    this.navController.navigateRoot("login");
+  }
+  
+  _isAdmin: boolean = false;
+  get isAdmin(){ return this._isAdmin;  }
+
+  async Login(credentials: Authentication): Promise<any> {
+    try{
+      const JWToken = await firstValueFrom(this.ApiLogin(credentials));
+      await this.SaveToken(JWToken);
+      await this.SetToken();
+      return (jwtDecode(JWToken));
+    }
+    catch (Error){
+      throw Error;
+    }
+  }
+
+  async BypassLogin(id: number): Promise<any> {
+    try{
+      const JWToken = await firstValueFrom(this.ApiBypassLogin(id));
+      await this.SaveToken(JWToken);
+      await this.SetToken();
+      return (jwtDecode(JWToken));
+    }
+    catch (Error){
+      throw Error;
+    }
+  }
+
+  ApiLogin(credentials: Authentication): Observable<string> {
+    return this.http.post<string>(this.apiUrlProviderService.apiUrl + 'auth', credentials);
+  }
+  ApiBypassLogin(id: number): Observable<string> {
+    return this.http.get<string>(this.apiUrlProviderService.apiUrl + `auth/${id}`);
+  }
+
+  async SaveToken(JWToken: string): Promise<void>{
+    if((jwtDecode(JWToken) as Token).id == 1){ 
+      await Preferences.set({ key: this.localAdminKey, value: JWToken});
+    }
+    await Preferences.set({ key: this.localUserKey, value: JWToken })
+  }
+
+  async LoadToken(): Promise<Token | null | any> {
+    const JWToken = (await Preferences.get({ key: this.localUserKey})).value;
+    if(JWToken){
+      const ParsedObject = jwtDecode(JWToken);
+      return ParsedObject;
+    }else{
+      return null;
+    }
+  }
+  async LoadTokenAdmin(): Promise<Token | null | any> {
+    const JWToken = (await Preferences.get({ key: this.localAdminKey})).value;
+    if(JWToken){
+      const ParsedObject = jwtDecode(JWToken);
+      return ParsedObject;
+    }else{
+      return null;
+    }
+  }
+
+  async JWToken(): Promise<string> {
+    const JWToken: string = (await Preferences.get({ key: this.localUserKey })).value;
+    return JWToken;
+  }
+
+  async GetBearer(): Promise<string>{
+    return `Bearer ${await this.JWToken()}`
+  }
+
+  public isTokenValid(Token: any): boolean{
+    if(!Token){ return false; }else
+    return !(Utils.UNIXToDate(Token.exp) < new Date())
+  }
+}
+
+class Authentication{
+  public Apelido: string = null;
+  public Senha  : string = null;
+}
+
+class Token {
+  [prop: string]: any;
+  Acesso   : number = 0;
+  Apelido  : string = "";
+  Nome     : string = "";
+  id       : number = 0;
+  idEmpresa: number = 0;
+  
+  constructor(){}
+  
+  patch(token: Token | any): void{
+    for(let prop of Object.getOwnPropertyNames(token)){
+      if(Number((token[prop]))){
+        this[prop] = Number(token[prop]); 
+        continue;
+      }
+      this[prop] = token[prop];
+    }
+  }
+}

package/src/lib/services/crypto.service.ts

@@ -0,0 +1,164 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CryptoService {
+
+  key: CryptoKey;
+
+  constructor(
+  ) { }
+
+  Initialize(){
+
+  }
+}
+
+
+//[ Array Buffer ]
+
+/**
+ * Converts a string to an ArrayBuffer using UTF-8 encoding
+ * @param str - The string to convert
+ * @returns An ArrayBuffer containing the UTF-8 encoded string
+ */
+function StringToArrayBuffer(str: string): ArrayBuffer {
+  const encoder = new TextEncoder()
+  return encoder.encode(str).buffer as ArrayBuffer
+}
+
+/**
+ * Converts an ArrayBuffer to a string using UTF-8 encoding
+ * @param buffer - The ArrayBuffer to convert
+ * @returns A decoded string
+ */
+function ArrayBufferToString(buffer: ArrayBuffer): string {
+  const decoder = new TextDecoder()
+  return decoder.decode(buffer)
+}
+
+//------------------------------------------------------------
+
+// More compact base64 encoding (URL-safe with no padding)
+
+const iterations: number = 10;
+
+// More compact base64 encoding (URL-safe with no padding)
+function toBase64Url(buffer: ArrayBuffer): string {
+  let binary = ""
+  const bytes = new Uint8Array(buffer)
+  for (let i = 0; i < bytes.byteLength; i++) {
+    binary += String.fromCharCode(bytes[i])
+  }
+  // Standard base64 encoding
+  const base64 = btoa(binary)
+  // Make URL safe and remove padding
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")
+}
+
+// Decode the compact base64 encoding
+function fromBase64Url(base64url: string): ArrayBuffer {
+  // Add padding if needed
+  let base64 = base64url
+  if (base64.length % 4 !== 0) {
+    base64 += "=".repeat(4 - (base64.length % 4))
+  }
+  // Convert back to standard base64
+  base64 = base64.replace(/-/g, "+").replace(/_/g, "/")
+
+  const binaryString = atob(base64)
+  const bytes = new Uint8Array(binaryString.length)
+  for (let i = 0; i < binaryString.length; i++) {
+    bytes[i] = binaryString.charCodeAt(i)
+  }
+  return bytes.buffer
+}
+
+async function CreateKey(passwordBuffer: Uint8Array, salt: Uint8Array, iv: Uint8Array){
+  try {
+    // Import the password as a key
+    const importedKey    = await window.crypto.subtle.importKey("raw", passwordBuffer, { name: "PBKDF2" }, false, ["deriveKey",])
+
+    // Derive the actual encryption key
+    const key = await window.crypto.subtle.deriveKey(
+      { name: "PBKDF2", salt, iterations: iterations, hash: "SHA-128" }, 
+      importedKey,
+      { name: "AES-GCM", length: 128 },
+      false,
+      ["encrypt"],
+    )
+
+    // Use the more compact base64url encoding
+    return key;
+
+  } catch (error) {
+    console.error("Encryption error:", error)
+    throw error
+  }
+}
+
+// Encrypt a string with a key
+async function EncryptString(plaintext: string, passwordBuffer: Uint8Array, salt: Uint8Array, iv: Uint8Array): Promise<string> {
+  try {
+    // Import the password as a key
+    const importedKey    = await window.crypto.subtle.importKey("raw", passwordBuffer, { name: "PBKDF2" }, false, ["deriveKey",])
+
+    // Derive the actual encryption key
+    const key = await window.crypto.subtle.deriveKey(
+      { name: "PBKDF2", salt, iterations: iterations, hash: "SHA-256" }, 
+      importedKey,
+      { name: "AES-GCM", length: 256 },
+      false,
+      ["encrypt"],
+    )
+
+    // Encrypt the data
+    const encryptedData = await window.crypto.subtle.encrypt({ name: "AES-GCM", iv }, key, StringToArrayBuffer(plaintext))
+
+    // Use the more compact base64url encoding
+    return toBase64Url(encryptedData)
+  } catch (error) {
+    console.error("Encryption error:", error)
+    throw error
+  }
+}
+
+async function decryptString(encryptedBase64Url: string, password: string, salt: Uint8Array, iv: Uint8Array): Promise<string> {
+  try {
+    // Import the password as a key
+    const passwordBuffer = StringToArrayBuffer(password)
+    const importedKey = await window.crypto.subtle.importKey("raw", passwordBuffer, { name: "PBKDF2" }, false, [
+      "deriveKey",
+    ])
+
+    // Derive the same key using the fixed salt
+    const key = await window.crypto.subtle.deriveKey(
+      {
+        name: "PBKDF2",
+        salt,
+        iterations: iterations,
+        hash: "SHA-256",
+      },
+      importedKey,
+      { name: "AES-GCM", length: 256 },
+      false,
+      ["decrypt"],
+    )
+
+    // Decrypt the data
+    const decryptedData = await window.crypto.subtle.decrypt(
+      {
+        name: "AES-GCM",
+        iv,
+      },
+      key,
+      fromBase64Url(encryptedBase64Url),
+    )
+
+    return ArrayBufferToString(decryptedData)
+  } catch (error) {
+    console.error("Decryption error:", error)
+    throw error
+  }
+}

package/src/lib/services/environment.service.ts

@@ -0,0 +1,17 @@
+import { Inject, Injectable } from "@angular/core";
+import { EnvironmentInjectionToken } from "../core.module";
+import { Environment } from "../classes/environment";
+
+@Injectable({
+    providedIn: 'root'
+})
+export class EnvironmentService {
+    constructor(@Inject(EnvironmentInjectionToken) private config: Environment) {
+        this._environment = this.config;
+    }
+
+    private _environment: Environment
+    get environment(): Environment{
+        return this._environment;
+    }
+}

package/src/lib/services/generics.service.ts

@@ -0,0 +1,85 @@
+import { Injectable } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Title } from '@angular/platform-browser';
+import { AlertButton, AlertController, ToastController } from "@ionic/angular";
+
+import { EnvironmentService } from './environment.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+
+export class GenericService{
+  constructor(
+    private toastController: ToastController,
+    private alertController: AlertController,
+    private titleController: Title,
+    private coreService: EnvironmentService,
+  ){}
+
+  public async PresentToast(message: string, icon = 'alert-circle') {
+    const toast = await this.toastController.create({
+      message: message,
+      duration: 1750,
+      icon: icon,
+      position: 'bottom',
+      translucent: false, 
+    });
+
+    await toast.present();
+  }
+  
+  public async PresentToastSuccess(message: string = "Salvo com sucesso!") {
+    const toast = await this.toastController.create({
+      message: message,
+      duration: 1750,
+      icon: 'checkmark-circle',
+      position: 'bottom',
+      translucent: false,
+    });
+
+    await toast.present();
+    return toast.onDidDismiss();
+  }
+
+  public static CancelButton: AlertButton = {
+    text: 'Cancelar',
+    role: 'cancel',
+  }
+  public static ConfirmButton : AlertButton = {
+    text: 'OK',
+    role: 'confirm',
+  }
+  static defaultAlertButtons: AlertButton[] = [GenericService.ConfirmButton];
+
+  public async PresentAlert(header: string, message: string, buttons: AlertButton[] = GenericService.defaultAlertButtons) {
+    const alert = await this.alertController.create({
+      header:  header,
+      message: message,
+      buttons: buttons,
+    });
+    await alert.present();
+    return alert.onDidDismiss();
+  }
+
+  public SetTitle(title: string){
+    this.titleController.setTitle(this.coreService.environment.applicationName + " | " + title)
+  }
+
+  public GetId(activatedRoute: ActivatedRoute, depth: number = 2): number | null{
+    try{
+      var Route = activatedRoute;
+      for(let i = 0; i < depth; i++){
+        Route = Route.parent;
+      }
+      if(Route.snapshot.paramMap.has('id')){
+        return Number(Route.snapshot.paramMap.get('id'));
+      }
+      else{
+        return 0;
+      }
+    }catch{
+      return null;
+    }
+  }
+}

package/src/lib/services/route/route.cache.service.ts

@@ -0,0 +1,17 @@
+import { Menu } from "../../components/drawer/menu";
+
+export class RouteCacheService {
+  private cachedData: Menu[] | null = null;
+
+  getCachedData(): Menu[] {
+    return this.cachedData;
+  }
+
+  setCachedData(data: Menu[]): void {
+    this.cachedData = data;
+  }
+
+  isDataCached(): boolean {
+    return this.cachedData != null;
+  }
+}