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.
@@ -18,7 +18,6 @@ export interface ZovaConfigEnv {
18
18
  DEV_SERVER_PORT: string | undefined;
19
19
  LAYOUT_COMPONENT_EMPTY: keyof TypeComponentLayoutRecord | undefined;
20
20
  LAYOUT_COMPONENT_DEFAULT: keyof TypeComponentLayoutRecord | undefined;
21
- LAYOUT_SIDEBAR_LEFTOPENPC: string | undefined;
22
21
  STYLE_DEFAULT_THEME: string | undefined;
23
22
  SSR_API_BASE_URL: string | undefined;
24
23
  API_BASE_URL: string | undefined;
@@ -28,7 +27,10 @@ export interface ZovaConfigEnv {
28
27
  SSR_PROD_PROTOCOL: string | undefined;
29
28
  SSR_PROD_HOST: string | undefined;
30
29
  SSR_WITH_VONA: string | undefined;
31
- SSR_COOKIE: string | undefined;
30
+ SSR_PROFILE: 'public' | 'session' | undefined;
31
+ SSR_PROFILE_PUBLIC_RESPONSE_CACHE_EXPIRES: string | undefined;
32
+ SSR_PROFILE_SESSION_RESPONSE_CACHE_EXPIRES: string | undefined;
33
+ SSR_COOKIE_THEMEDARK_DEFAULT: string | undefined;
32
34
  OPENAPI_BASE_URL_DEFAULT: string | undefined;
33
35
  OPENAPI_BASE_URL_HOME_API: string | undefined;
34
36
  MOCK_ENABLED: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/types/utils/env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEzF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAEvF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,cAAc,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC;IACxB,aAAa,EAAE,eAAe,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,sBAAsB,EAAE,MAAM,yBAAyB,GAAG,SAAS,CAAC;IACpE,wBAAwB,EAAE,MAAM,yBAAyB,GAAG,SAAS,CAAC;IACtE,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAU,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC;YACvB,WAAW,EAAE,cAAc,CAAC;YAC5B,SAAS,EAAE,YAAY,CAAC;YACxB,aAAa,EAAE,eAAe,CAAC;YAG/B,GAAG,EAAE,OAAO,CAAC;YAEb,GAAG,EAAE,OAAO,CAAC;YAEb,IAAI,EAAE,OAAO,CAAC;YAId,MAAM,EAAE,OAAO,CAAC;YAEhB,MAAM,EAAE,OAAO,CAAC;SAIjB;KACF;CACF"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/types/utils/env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEzF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAEvF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,cAAc,CAAC;IAC5B,SAAS,EAAE,YAAY,CAAC;IACxB,aAAa,EAAE,eAAe,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,sBAAsB,EAAE,MAAM,yBAAyB,GAAG,SAAS,CAAC;IACpE,wBAAwB,EAAE,MAAM,yBAAyB,GAAG,SAAS,CAAC;IACtE,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAC9C,yCAAyC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9D,0CAA0C,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/D,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,yBAAyB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAU,UAAU;YAClB,QAAQ,EAAE,YAAY,CAAC;YACvB,WAAW,EAAE,cAAc,CAAC;YAC5B,SAAS,EAAE,YAAY,CAAC;YACxB,aAAa,EAAE,eAAe,CAAC;YAG/B,GAAG,EAAE,OAAO,CAAC;YAEb,GAAG,EAAE,OAAO,CAAC;YAEb,IAAI,EAAE,OAAO,CAAC;YAId,MAAM,EAAE,OAAO,CAAC;YAEhB,MAAM,EAAE,OAAO,CAAC;SAIjB;KACF;CACF"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "zova-core",
3
- "version": "5.1.82",
4
- "gitHead": "c408492ce774644ac8a2530702db916986f52151",
3
+ "version": "5.1.83",
4
+ "gitHead": "f56eaba77347037643b625c8e6c5af408ff2d495",
5
5
  "description": "A vue3 framework with ioc",
6
6
  "keywords": [
7
7
  "ioc",
@@ -61,6 +61,7 @@
61
61
  "@types/js-cookie": "^3.0.6",
62
62
  "@vue/shared": "^3.5.32",
63
63
  "deep-equal": "^2.2.3",
64
+ "ms": "^2.1.3",
64
65
  "reflect-metadata": "^0.2.2",
65
66
  "vue": "^3.5.38",
66
67
  "vue-plugin-render-freeze": "^2.0.4",
@@ -11,6 +11,7 @@ import type {
11
11
 
12
12
  import { BeanSimple } from '../../bean/beanSimple.ts';
13
13
  import { LocaleModuleNameSeparator } from '../../bean/resource/locale/type.ts';
14
+ import { cast } from '../../types/index.ts';
14
15
 
15
16
  const SymbolLocaleCurrent = Symbol('SymbolLocaleCurrent');
16
17
  const SymbolTzCurrent = Symbol('SymbolTzCurrent');
@@ -25,8 +26,9 @@ export class AppLocale extends BeanSimple {
25
26
 
26
27
  get current(): keyof ILocaleRecord {
27
28
  let locale = this[SymbolLocaleCurrent].value;
28
- if (!locale && this.sys.config.ssr.cookie)
29
+ if (!locale && this._cookieEnabled()) {
29
30
  locale = this.metaCookie.getItem(this.sys.config.locale.storeKey);
31
+ }
30
32
  if (!locale) locale = this.sys.config.locale.default;
31
33
  return locale as keyof ILocaleRecord;
32
34
  }
@@ -34,14 +36,18 @@ export class AppLocale extends BeanSimple {
34
36
  set current(value: keyof ILocaleRecord) {
35
37
  if (this[SymbolLocaleCurrent].value === value) return;
36
38
  this[SymbolLocaleCurrent].value = value;
37
- if (this.sys.config.ssr.cookie) {
39
+ if (this._cookieEnabled()) {
38
40
  this.metaCookie.setItem(this.sys.config.locale.storeKey, value);
39
41
  }
40
42
  }
41
43
 
44
+ private _cookieEnabled() {
45
+ return !process.env.SERVER || cast(this.ctx.meta).$ssr.profileOptions.useCookie;
46
+ }
47
+
42
48
  get tz(): string {
43
49
  let tz = this[SymbolTzCurrent].value;
44
- if (!tz) tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
50
+ if (!tz && this._cookieEnabled()) tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
45
51
  if (!tz) tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
46
52
  return tz;
47
53
  }
@@ -49,7 +55,7 @@ export class AppLocale extends BeanSimple {
49
55
  set tz(value: string) {
50
56
  if (this[SymbolTzCurrent].value === value) return;
51
57
  this[SymbolTzCurrent].value = value;
52
- this.metaCookie.setItem(this.sys.config.tz.storeKey, value);
58
+ if (this._cookieEnabled()) this.metaCookie.setItem(this.sys.config.tz.storeKey, value);
53
59
  }
54
60
 
55
61
  /** @internal */
@@ -1,4 +1,5 @@
1
1
  import type { ZovaConfigMeta } from '@cabloy/module-info';
2
+ import type { StringValue } from 'ms';
2
3
 
3
4
  import type {
4
5
  ILayoutRecord,
@@ -23,6 +24,15 @@ export function configDefault(env: ZovaConfigEnv): PowerPartial<ZovaConfig> {
23
24
  return config;
24
25
  }
25
26
 
27
+ export interface ZovaConfigSsrResponseCachePolicy {
28
+ expires?: number | StringValue;
29
+ }
30
+
31
+ export interface ZovaConfigSsrProfile {
32
+ useCookie: boolean;
33
+ responseCache: false | ZovaConfigSsrResponseCachePolicy;
34
+ }
35
+
26
36
  export interface ZovaConfig {
27
37
  meta: ZovaConfigMeta;
28
38
  app: {
@@ -37,10 +47,12 @@ export interface ZovaConfig {
37
47
  jwt: boolean;
38
48
  };
39
49
  ssr: {
40
- cookie: boolean;
41
50
  withVona: boolean;
42
- cookieDisabledOnServer: boolean;
43
51
  hmr: boolean;
52
+ profiles: {
53
+ public: ZovaConfigSsrProfile;
54
+ session: ZovaConfigSsrProfile;
55
+ };
44
56
  };
45
57
  ws: {
46
58
  baseURL: string;
@@ -62,10 +74,6 @@ export interface ZovaConfig {
62
74
  component: {
63
75
  [K in keyof ILayoutRecord]: keyof TypeComponentLayoutRecord;
64
76
  };
65
- sidebar: {
66
- leftOpenPC: boolean;
67
- breakpoint: number;
68
- };
69
77
  };
70
78
  routes: ZovaConfigRoutes;
71
79
  modules: IBeanScopeConfig;
@@ -20,7 +20,6 @@ export interface ZovaConfigEnv {
20
20
  DEV_SERVER_PORT: string | undefined;
21
21
  LAYOUT_COMPONENT_EMPTY: keyof TypeComponentLayoutRecord | undefined;
22
22
  LAYOUT_COMPONENT_DEFAULT: keyof TypeComponentLayoutRecord | undefined;
23
- LAYOUT_SIDEBAR_LEFTOPENPC: string | undefined;
24
23
  STYLE_DEFAULT_THEME: string | undefined;
25
24
  SSR_API_BASE_URL: string | undefined;
26
25
  API_BASE_URL: string | undefined;
@@ -30,7 +29,10 @@ export interface ZovaConfigEnv {
30
29
  SSR_PROD_PROTOCOL: string | undefined;
31
30
  SSR_PROD_HOST: string | undefined;
32
31
  SSR_WITH_VONA: string | undefined;
33
- SSR_COOKIE: string | undefined;
32
+ SSR_PROFILE: 'public' | 'session' | undefined;
33
+ SSR_PROFILE_PUBLIC_RESPONSE_CACHE_EXPIRES: string | undefined;
34
+ SSR_PROFILE_SESSION_RESPONSE_CACHE_EXPIRES: string | undefined;
35
+ SSR_COOKIE_THEMEDARK_DEFAULT: string | undefined;
34
36
  OPENAPI_BASE_URL_DEFAULT: string | undefined;
35
37
  OPENAPI_BASE_URL_HOME_API: string | undefined;
36
38
  MOCK_ENABLED: string | undefined;