@ng-nest/ui 21.0.2 → 21.0.4

package/fesm2022/ng-nest-ui-i18n.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Pipe, input, ElementRef, computed, effect, Directive, NgModule } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
 import { toSignal } from '@angular/core/rxjs-interop';
+import { BehaviorSubject } from 'rxjs';
 
 var zh_CN = {
     locale: 'zh_CN',
@@ -192,12 +192,11 @@ const XI18nPrefix = 'xI18n';
 const X_I18N = new InjectionToken('x-i18n');
 
 class XI18nService {
-    get localeChange() {
-        return this._change.asObservable();
-    }
     constructor() {
-        this._change = new BehaviorSubject(zh_CN);
+        this._locale = zh_CN;
+        this.localeChange = new BehaviorSubject(zh_CN);
         this.locale = inject(X_I18N, { optional: true });
+        this.L = (path, data) => this.translate(path, data);
         this.setLocale(this.locale || zh_CN);
     }
     translate(path, data) {
@@ -214,14 +213,14 @@ class XI18nService {
         return this._locale;
     }
     getLocaleId() {
-        return this._locale ? this._locale.locale : '';
+        return this._locale ? this._locale?.locale : '';
     }
     setLocale(locale, forceRefresh = false) {
-        if (!forceRefresh && this._locale && this._locale.locale === locale.locale) {
+        if (!forceRefresh && this._locale && this._locale?.locale === locale.locale) {
             return;
         }
         this._locale = locale;
-        this._change.next(locale);
+        this.localeChange.next(locale);
     }
     _getObjectPath(obj, path) {
         let res = obj;
@@ -233,10 +232,10 @@ class XI18nService {
         }
         return index === depth ? res : null;
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nService, providedIn: 'root' }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -244,22 +243,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImpor
         }], ctorParameters: () => [] });
 
 class XI18nPipe {
-    constructor(locale) {
-        this.locale = locale;
+    constructor(i18n) {
+        this.i18n = i18n;
+        this.locale = toSignal(this.i18n.localeChange);
     }
-    transform(path, keyValue) {
-        const localeId = this.locale.getLocaleId();
-        const content = this.locale.translate(path, keyValue);
-        if (this.localeId !== localeId || this.catchContent !== content) {
-            this.catchContent = content;
-            this.localeId = localeId;
+    transform(key, params) {
+        const lang = this.locale()?.locale;
+        if (key === this.lastKey && lang === this.lastLang) {
+            return this.lastValue;
         }
-        return this.catchContent;
+        this.lastKey = key;
+        this.lastLang = lang;
+        this.lastValue = this.i18n.translate(key, params);
+        return this.lastValue;
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nPipe, deps: [{ token: XI18nService }], target: i0.ɵɵFactoryTarget.Pipe }); }
-    /** @nocollapse */ static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "21.0.0", ngImport: i0, type: XI18nPipe, isStandalone: true, name: "xI18n", pure: false }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nPipe, deps: [{ token: XI18nService }], target: i0.ɵɵFactoryTarget.Pipe }); }
+    /** @nocollapse */ static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "21.0.6", ngImport: i0, type: XI18nPipe, isStandalone: true, name: "xI18n", pure: false }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nPipe, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nPipe, decorators: [{
             type: Pipe,
             args: [{
                     name: 'xI18n',
@@ -269,7 +270,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImpor
 
 class XI18nDirective {
     constructor() {
-        this.path = input('', ...(ngDevMode ? [{ debugName: "path", alias: 'x-i18n' }] : [{ alias: 'x-i18n' }]));
+        this.path = input('', { ...(ngDevMode ? { debugName: "path" } : {}), alias: 'x-i18n' });
         this.locale = inject(XI18nService);
         this.elementRef = inject((ElementRef));
         this.localeChanged = toSignal(this.locale.localeChange);
@@ -281,10 +282,10 @@ class XI18nDirective {
         }, ...(ngDevMode ? [{ debugName: "content" }] : []));
         effect(() => (this.elementRef.nativeElement.innerText = this.content()));
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
-    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.0.0", type: XI18nDirective, isStandalone: true, selector: "[x-i18n]", inputs: { path: { classPropertyName: "path", publicName: "x-i18n", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
+    /** @nocollapse */ static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.0.6", type: XI18nDirective, isStandalone: true, selector: "[x-i18n]", inputs: { path: { classPropertyName: "path", publicName: "x-i18n", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[x-i18n]'
@@ -292,11 +293,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImpor
         }], ctorParameters: () => [], propDecorators: { path: [{ type: i0.Input, args: [{ isSignal: true, alias: "x-i18n", required: false }] }] } });
 
 class XI18nModule {
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.0.0", ngImport: i0, type: XI18nModule, imports: [XI18nPipe, XI18nDirective], exports: [XI18nPipe, XI18nDirective] }); }
-    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nModule }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.0.6", ngImport: i0, type: XI18nModule, imports: [XI18nPipe, XI18nDirective], exports: [XI18nPipe, XI18nDirective] }); }
+    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nModule }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.0", ngImport: i0, type: XI18nModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: XI18nModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [XI18nPipe, XI18nDirective],