zova-core 5.1.82 → 5.1.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/component/locale.d.ts +1 -0
- package/dist/core/component/locale.d.ts.map +1 -1
- package/dist/core/sys/config.d.ts +12 -6
- package/dist/core/sys/config.d.ts.map +1 -1
- package/dist/index.js +9 -4
- package/dist/index.js.map +1 -1
- package/dist/types/utils/env.d.ts +4 -2
- package/dist/types/utils/env.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/core/component/locale.ts +10 -4
- package/src/core/sys/config.ts +14 -6
- package/src/types/utils/env.ts +4 -2
|
@@ -8,6 +8,7 @@ export declare class AppLocale extends BeanSimple {
|
|
|
8
8
|
get metaCookie(): import("./cookie.ts").AppCookie;
|
|
9
9
|
get current(): keyof ILocaleRecord;
|
|
10
10
|
set current(value: keyof ILocaleRecord);
|
|
11
|
+
private _cookieEnabled;
|
|
11
12
|
get tz(): string;
|
|
12
13
|
set tz(value: string);
|
|
13
14
|
getText<T extends keyof ILocaleRecord>(supportCustomMessage: boolean, moduleScope: string | undefined, locale: T | undefined, key: string, ...args: any[]): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locale.d.ts","sourceRoot":"","sources":["../../../src/core/component/locale.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"locale.d.ts","sourceRoot":"","sources":["../../../src/core/component/locale.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAItD,QAAA,MAAM,mBAAmB,eAAgC,CAAC;AAC1D,QAAA,MAAM,eAAe,eAA4B,CAAC;AAElD,qBAAa,SAAU,SAAQ,UAAU;IACvC,OAAO,CAAC,CAAC,mBAAmB,CAAC,CAAkC;IAC/D,OAAO,CAAC,CAAC,eAAe,CAAC,CAAkC;IAE3D,IAAI,UAAU,oCAEb;IAED,IAAI,OAAO,IAAI,MAAM,aAAa,CAOjC;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,aAAa,EAMrC;IAED,OAAO,CAAC,cAAc;IAItB,IAAI,EAAE,IAAI,MAAM,CAKf;IAED,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAInB;IAoCM,OAAO,CAAC,CAAC,SAAS,MAAM,aAAa,EAC1C,oBAAoB,EAAE,OAAO,EAC7B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,CAAC,GAAG,SAAS,EACrB,GAAG,EAAE,MAAM,EACX,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,MAAM;CAiBV"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ZovaConfigMeta } from '@cabloy/module-info';
|
|
2
|
+
import type { StringValue } from 'ms';
|
|
2
3
|
import type { ILayoutRecord, TypeComponentAppRecord, TypeComponentLayoutRecord } from '../../bean/resource/component/type.ts';
|
|
3
4
|
import type { ILocaleRecord } from '../../bean/resource/locale/type.ts';
|
|
4
5
|
import type { ZovaConfigRoutes } from '../../bean/resource/page/type.ts';
|
|
@@ -7,6 +8,13 @@ import type { ZovaConfigEnv } from '../../types/utils/env.ts';
|
|
|
7
8
|
import type { PowerPartial } from '../../types/utils/powerPartial.ts';
|
|
8
9
|
import type { ConfigLogger } from '../logger/types.ts';
|
|
9
10
|
export declare function configDefault(env: ZovaConfigEnv): PowerPartial<ZovaConfig>;
|
|
11
|
+
export interface ZovaConfigSsrResponseCachePolicy {
|
|
12
|
+
expires?: number | StringValue;
|
|
13
|
+
}
|
|
14
|
+
export interface ZovaConfigSsrProfile {
|
|
15
|
+
useCookie: boolean;
|
|
16
|
+
responseCache: false | ZovaConfigSsrResponseCachePolicy;
|
|
17
|
+
}
|
|
10
18
|
export interface ZovaConfig {
|
|
11
19
|
meta: ZovaConfigMeta;
|
|
12
20
|
app: {
|
|
@@ -21,10 +29,12 @@ export interface ZovaConfig {
|
|
|
21
29
|
jwt: boolean;
|
|
22
30
|
};
|
|
23
31
|
ssr: {
|
|
24
|
-
cookie: boolean;
|
|
25
32
|
withVona: boolean;
|
|
26
|
-
cookieDisabledOnServer: boolean;
|
|
27
33
|
hmr: boolean;
|
|
34
|
+
profiles: {
|
|
35
|
+
public: ZovaConfigSsrProfile;
|
|
36
|
+
session: ZovaConfigSsrProfile;
|
|
37
|
+
};
|
|
28
38
|
};
|
|
29
39
|
ws: {
|
|
30
40
|
baseURL: string;
|
|
@@ -46,10 +56,6 @@ export interface ZovaConfig {
|
|
|
46
56
|
component: {
|
|
47
57
|
[K in keyof ILayoutRecord]: keyof TypeComponentLayoutRecord;
|
|
48
58
|
};
|
|
49
|
-
sidebar: {
|
|
50
|
-
leftOpenPC: boolean;
|
|
51
|
-
breakpoint: number;
|
|
52
|
-
};
|
|
53
59
|
};
|
|
54
60
|
routes: ZovaConfigRoutes;
|
|
55
61
|
modules: IBeanScopeConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/sys/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/sys/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAEtC,OAAO,KAAK,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,CAS1E;AAED,MAAM,WAAW,gCAAgC;IAC/C,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,KAAK,GAAG,gCAAgC,CAAC;CACzD;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,GAAG,EAAE;QACH,QAAQ,EAAE,OAAO,CAAC;QAClB,GAAG,EAAE,OAAO,CAAC;QACb,QAAQ,EAAE;YACR,MAAM,EAAE,oBAAoB,CAAC;YAC7B,OAAO,EAAE,oBAAoB,CAAC;SAC/B,CAAC;KACH,CAAC;IACF,EAAE,EAAE;QACF,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,aAAa,CAAC;QAC7B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,aAAa,EAAE,MAAM,CAAC,CAAC;KAC5C,CAAC;IACF,EAAE,EAAE;QACF,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,EAAE;QACN,GAAG,EAAE;YACH,SAAS,EAAE,MAAM,sBAAsB,CAAC;SACzC,CAAC;QACF,SAAS,EAAE;aACR,CAAC,IAAI,MAAM,aAAa,GAAG,MAAM,yBAAyB;SAC5D,CAAC;KACH,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -2797,27 +2797,32 @@ class AppLocale extends BeanSimple {
|
|
|
2797
2797
|
}
|
|
2798
2798
|
get current() {
|
|
2799
2799
|
let locale = this[SymbolLocaleCurrent].value;
|
|
2800
|
-
if (!locale && this.
|
|
2800
|
+
if (!locale && this._cookieEnabled()) {
|
|
2801
|
+
locale = this.metaCookie.getItem(this.sys.config.locale.storeKey);
|
|
2802
|
+
}
|
|
2801
2803
|
if (!locale) locale = this.sys.config.locale.default;
|
|
2802
2804
|
return locale;
|
|
2803
2805
|
}
|
|
2804
2806
|
set current(value) {
|
|
2805
2807
|
if (this[SymbolLocaleCurrent].value === value) return;
|
|
2806
2808
|
this[SymbolLocaleCurrent].value = value;
|
|
2807
|
-
if (this.
|
|
2809
|
+
if (this._cookieEnabled()) {
|
|
2808
2810
|
this.metaCookie.setItem(this.sys.config.locale.storeKey, value);
|
|
2809
2811
|
}
|
|
2810
2812
|
}
|
|
2813
|
+
_cookieEnabled() {
|
|
2814
|
+
return !process.env.SERVER || cast(this.ctx.meta).$ssr.profileOptions.useCookie;
|
|
2815
|
+
}
|
|
2811
2816
|
get tz() {
|
|
2812
2817
|
let tz = this[SymbolTzCurrent].value;
|
|
2813
|
-
if (!tz) tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
|
|
2818
|
+
if (!tz && this._cookieEnabled()) tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
|
|
2814
2819
|
if (!tz) tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
|
2815
2820
|
return tz;
|
|
2816
2821
|
}
|
|
2817
2822
|
set tz(value) {
|
|
2818
2823
|
if (this[SymbolTzCurrent].value === value) return;
|
|
2819
2824
|
this[SymbolTzCurrent].value = value;
|
|
2820
|
-
this.metaCookie.setItem(this.sys.config.tz.storeKey, value);
|
|
2825
|
+
if (this._cookieEnabled()) this.metaCookie.setItem(this.sys.config.tz.storeKey, value);
|
|
2821
2826
|
}
|
|
2822
2827
|
|
|
2823
2828
|
/** @internal */
|