ngx-axis-appforge 0.0.91 → 0.0.92

package/core/index.d.ts

@@ -88,7 +88,6 @@ declare class ScopeDirective implements OnInit, OnDestroy {
     private readonly updateDs;
     private dynamicOptionsSubs;
     private rootSubs;
-    private injectDataSub?;
     private readonly instanceMap;
     private readonly changeSubject;
     private readonly latestUpdateOptions;

package/fesm2022/ngx-axis-appforge-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, effect, inject, input, ElementRef, isSignal, Directive, Optional, Inject, Injectable, Injector, HostBinding, untracked, model, ViewChild, output, ViewContainerRef, forwardRef, Pipe, signal, ChangeDetectionStrategy, Component, computed, ContentChild } from '@angular/core';
-import { BehaviorSubject, filter, map, catchError, of, Subject, switchMap, debounceTime, Observable, isObservable, merge, NEVER, take, zip, tap, concat, last, mergeMap, from, mergeWith } from 'rxjs';
+import { BehaviorSubject, filter, map, catchError, of, Subject, switchMap, debounceTime, isObservable, NEVER, merge, take, zip, Observable, tap, concat, last, mergeMap, from, mergeWith } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpContextToken, HttpContext, HttpRequest, HttpEventType, HttpClient } from '@angular/common/http';
 import { fromPromise } from 'rxjs/internal/observable/innerFrom';
@@ -404,7 +404,6 @@ class ScopeDirective {
     updateDs = new Map();
     dynamicOptionsSubs = [];
     rootSubs = [];
-    injectDataSub;
     instanceMap = new Map();
     changeSubject = new BehaviorSubject(void (0));
     latestUpdateOptions = new Map();
@@ -461,48 +460,38 @@ class ScopeDirective {
         this.changeSubject.next();
     }
     updateDataSource(opt) {
-        return new Observable(sub => {
-            this.latestUpdateOptions.set(opt.name, opt);
-            switch (opt.type) {
-                case 'api':
-                    if (opt.api?.url) {
-                        opt.api.context ??= this.httpContextData;
-                        this.rootSubs.push(sendApi(opt.api, this.http).subscribe({
-                            next: (res) => sub.next(res),
-                        }));
-                    }
-                    break;
-                case 'local':
-                    if (opt.data !== undefined) {
-                        sub.next(opt.data);
+        this.latestUpdateOptions.set(opt.name, opt);
+        switch (opt.type) {
+            case "api":
+                if (opt.api?.url) {
+                    opt.api.context ??= this.httpContextData;
+                    return sendApi(opt.api, this.http);
+                }
+                break;
+            case "local":
+                if (opt.data !== undefined) {
+                    return of(opt.data);
+                }
+                break;
+            case "inject":
+                if (opt.injectField && this.injectData) {
+                    if (isObservable(this.injectData)) {
+                        return this.injectData.pipe(map((data) => data[opt.injectField]));
                     }
-                    break;
-                case 'inject':
-                    if (opt.injectField) {
-                        this.injectDataSub?.unsubscribe();
-                        if (this.injectData) {
-                            if (isObservable(this.injectData)) {
-                                this.injectDataSub = this.injectData
-                                    .subscribe((injectData) => {
-                                    sub.next(injectData?.[opt.injectField]);
-                                });
-                            }
-                            else {
-                                sub.next(this.injectData?.[opt.injectField]);
-                            }
-                        }
+                    else {
+                        return of(this.injectData?.[opt.injectField]);
                     }
-                    break;
-                case 'cache':
-                    if (opt.cacheKey) {
-                        const cacheData = localStorage.getItem(opt.cacheKey);
-                        if (cacheData != null && cacheData != "undefined") {
-                            sub.next(JSON.parse(cacheData));
-                        }
+                }
+                break;
+            case "cache":
+                if (opt.cacheKey) {
+                    const cacheData = localStorage.getItem(opt.cacheKey);
+                    if (cacheData != null && cacheData != "undefined") {
+                        return of(JSON.parse(cacheData));
                     }
-                    break;
-            }
-        });
+                }
+        }
+        return NEVER;
     }
     get(name, init = true) {
         let res;