zova-core 5.0.129 → 5.0.131

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.
@@ -1 +1 @@
1
- {"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/core/context/ssr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,wBAAwB,EAExB,UAAU,EACV,eAAe,EAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,QAAA,MAAM,8BAA8B,eAA2C,CAAC;AAChF,QAAA,MAAM,gBAAgB,eAA6B,CAAC;AACpD,QAAA,MAAM,cAAc,eAA2B,CAAC;AAChD,QAAA,MAAM,iBAAiB,eAA8B,CAAC;AACtD,QAAA,MAAM,gCAAgC,eAA6C,CAAC;AACpF,QAAA,MAAM,qBAAqB,eAAkC,CAAC;AAC9D,QAAA,MAAM,sBAAsB,eAAmC,CAAC;AAEhE,qBAAa,MAAO,SAAQ,UAAU;IACpC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAA4B;IACpE,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAa;IACvC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAkB;IAC1C,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAAsB;IACjD,OAAO,CAAC,CAAC,gCAAgC,CAAC,CAAkC;IAC5E,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAmC;IAElE,OAAO,CAAC,CAAC,sBAAsB,CAAC,CAAa;IAEtC,SAAS,EAAE,eAAe,CAAC;IAkClC,IAAI,wBAAwB,YAE3B;IAED,IAAI,wBAAwB,CAAC,KAAK,SAAA,EAEjC;IAED,IAAI,OAAO,eASV;IAED,IAAI,KAAK,oBAOR;IAED,OAAO,CAAC,YAAY;IAapB,UAAU,CAAC,EAAE,EAAE,YAAY;IAI3B,wBAAwB,CAAC,EAAE,EAAE,wBAAwB;IAIrD,wBAAwB,CAAC,EAAE,EAAE,YAAY;IAOzC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAc3C,OAAO,CAAC,gCAAgC;IA4BxC,OAAO,CAAC,SAAS;CAsDlB"}
1
+ {"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/core/context/ssr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,wBAAwB,EAExB,UAAU,EACV,eAAe,EAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,QAAA,MAAM,8BAA8B,eAA2C,CAAC;AAChF,QAAA,MAAM,gBAAgB,eAA6B,CAAC;AACpD,QAAA,MAAM,cAAc,eAA2B,CAAC;AAChD,QAAA,MAAM,iBAAiB,eAA8B,CAAC;AACtD,QAAA,MAAM,gCAAgC,eAA6C,CAAC;AACpF,QAAA,MAAM,qBAAqB,eAAkC,CAAC;AAC9D,QAAA,MAAM,sBAAsB,eAAmC,CAAC;AAEhE,qBAAa,MAAO,SAAQ,UAAU;IACpC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAA4B;IACpE,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAa;IACvC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAkB;IAC1C,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAAsB;IACjD,OAAO,CAAC,CAAC,gCAAgC,CAAC,CAAkC;IAC5E,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAmC;IAElE,OAAO,CAAC,CAAC,sBAAsB,CAAC,CAAa;IAEtC,SAAS,EAAE,eAAe,CAAC;IAkClC,IAAI,wBAAwB,YAE3B;IAED,IAAI,wBAAwB,CAAC,KAAK,SAAA,EAEjC;IAED,IAAI,OAAO,eASV;IAED,IAAI,KAAK,oBAOR;IAED,OAAO,CAAC,YAAY;IAapB,UAAU,CAAC,EAAE,EAAE,YAAY;IAI3B,wBAAwB,CAAC,EAAE,EAAE,wBAAwB;IAIrD,wBAAwB,CAAC,EAAE,EAAE,YAAY;IAOzC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAc3C,OAAO,CAAC,gCAAgC;IAiDxC,OAAO,CAAC,SAAS;CAsDlB"}
@@ -3,7 +3,7 @@ import { defu } from 'defu';
3
3
  import { BeanSimple } from '../../bean/beanSimple.js';
4
4
  import { Cast } from '../../types/utils/cast.js';
5
5
  import { CtxSSRMetaStore } from './ssrMetaStore.js';
6
- import { isString, stringifyStyle } from '@vue/shared';
6
+ import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
7
7
  const SymbolIsRuntimeSsrPreHydration = Symbol('SymbolIsRuntimeSsrPreHydration');
8
8
  const SymbolSSRContext = Symbol('SymbolSSRContext');
9
9
  const SymbolSSRState = Symbol('SymbolSSRState');
@@ -122,25 +122,48 @@ export class CtxSSR extends BeanSimple {
122
122
  // expected
123
123
  let ignore = false;
124
124
  let expected = undefined;
125
- if (key === 'id') {
125
+ if (key === 'class') {
126
126
  ignore = true;
127
- expected = String(clientValue);
127
+ if (clientValue !== undefined) {
128
+ expected = normalizeClass(clientValue);
129
+ el.setAttribute(key, expected);
130
+ }
128
131
  }
129
- else if (key === 'class') {
132
+ else if (key === 'style') {
130
133
  ignore = true;
131
- expected = normalizeClass(clientValue);
134
+ if (clientValue !== undefined) {
135
+ expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
136
+ el.setAttribute(key, expected);
137
+ }
132
138
  }
133
- else if (key === 'style') {
139
+ else if (key === 'id') {
134
140
  ignore = true;
135
- expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
141
+ if (clientValue !== undefined) {
142
+ expected = String(clientValue);
143
+ el.setAttribute(key, expected);
144
+ }
145
+ }
146
+ else if (isBooleanAttr(key)) {
147
+ ignore = true;
148
+ if (clientValue !== undefined) {
149
+ const expected = includeBooleanAttr(clientValue);
150
+ if (expected) {
151
+ el.setAttribute(key, '');
152
+ }
153
+ else {
154
+ el.removeAttribute(key);
155
+ }
156
+ }
136
157
  }
137
158
  else if (el.getAttribute(`data-hydrate-ignore-${key}`) !== null) {
138
159
  ignore = true;
139
- expected = String(clientValue);
160
+ if (clientValue !== undefined) {
161
+ expected = String(clientValue);
162
+ el.setAttribute(key, expected);
163
+ }
140
164
  }
141
165
  if (!ignore)
142
166
  return { clientValue };
143
- el.setAttribute(key, expected);
144
167
  return { ignore: true };
145
168
  }
146
169
  _hydrated() {
@@ -1 +1 @@
1
- {"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../../src/core/context/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,cAAc,EAAE,cAAc,EAAO,GAAG,EAAE,aAAa,EAAS,MAAM,KAAK,CAAC;AAChH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAQtD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGvD,MAAM,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAChF,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACpD,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAChD,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AACtD,MAAM,gCAAgC,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AACpF,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAC9D,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEhE,MAAM,OAAO,MAAO,SAAQ,UAAU;IAC5B,CAAC,8BAA8B,CAAC,GAAiB,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC,gBAAgB,CAAC,CAAa;IAC/B,CAAC,cAAc,CAAC,CAAkB;IAClC,CAAC,iBAAiB,CAAC,GAAmB,EAAE,CAAC;IACzC,CAAC,gCAAgC,CAAC,GAA+B,EAAE,CAAC;IACpE,CAAC,qBAAqB,CAAC,GAAgC,EAAE,CAAC;IAE1D,CAAC,sBAAsB,CAAC,GAAW,CAAC,CAAC;IAEtC,SAAS,CAAkB;IAElC,gBAAgB;IACT,UAAU;QACf,iCAAiC;QACjC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,8BAA8B,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;QACpD,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7F,IAAI,CAAC,8BAA8B,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;QACpD,CAAC;QACD,iBAAiB;QACjB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC;gBACnC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC;gBACtD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC;gBACtC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,2BAA2B;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACxD,IAAI,CAAC,wBAAwB,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACtE,OAAO,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;QACL,CAAC;QACD,YAAY;QACZ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAClE,0BAA0B;QAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC3E,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QACxC,CAAC;IACH,CAAC;IAED,IAAI,wBAAwB;QAC1B,OAAO,IAAI,CAAC,8BAA8B,CAAC,CAAC,KAAK,CAAC;IACpD,CAAC;IAED,IAAI,wBAAwB,CAAC,KAAK;QAChC,IAAI,CAAC,8BAA8B,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;IACrD,CAAC;IAED,IAAI,OAAO;QACT,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;gBACpC,IAAI,CAAC,gBAAgB,CAAC,GAAG,aAAa,EAAG,CAAC;gBAC1C,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;IAEO,YAAY;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1C,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACxC,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,EAAE;YAClB,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,sBAAsB;YACjC,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;QACH,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,EAAgB;QACzB,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,wBAAwB,CAAC,EAA4B;QACnD,IAAI,CAAC,gCAAgC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,wBAAwB,CAAC,EAAgB;QACvC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC;YACrE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAGD,QAAQ,CAAC,MAAuB,EAAE,GAAY;QAC5C,IAAI,IAAwB,CAAC;QAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,GAAG,GAAG,MAAM,CAAC;QACf,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,KAAK,EAAc,CAAC;QACtC,IAAI,IAAI,KAAK,SAAS;YAAE,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAC1C,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;QAChB,MAAM,KAAK,CAAC;IACd,CAAC;IAEO,gCAAgC,CACtC,EAAW,EACX,GAAW,EACX,WAAgB,EAChB,MAAa,EACb,SAA2C;QAE3C,WAAW;QACX,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,QAAQ,GAAuB,SAAS,CAAC;QAC7C,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/F,CAAC;aAAM,IAAI,EAAE,CAAC,YAAY,CAAC,uBAAuB,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;YAClE,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,WAAW,EAAE,CAAC;QACpC,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;QACzC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,IAAI,CAAC,wBAAwB;YAAE,OAAO;QAC3C,kBAAkB;QAClB,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC;QACtC,EAAE;QACF,IAAI,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3C,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC;QACjC,EAAE;QACF,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;QAC7B,EAAE;QACF,IAAI,CAAC,gCAAgC,CAAC,GAAG,EAAE,CAAC;IAC9C,CAAC;IAED,gBAAgB;IACT,uBAAuB,CAC5B,EAAW,EACX,GAAW,EACX,WAAgB,EAChB,KAAY,EACZ,QAA0C;QAE1C,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,gCAAgC,CAAC,EAAE,CAAC;YACxD,MAAM,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,IAAI,GAAG,CAAC,MAAM;gBAAE,OAAO,GAAG,CAAC;YAC3B,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QAChC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;IAED,gBAAgB;IACT,aAAa;QAClB,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACjC,CAAC;IAED,gBAAgB;IACT,aAAa;QAClB,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IAED,gBAAgB;IACT,wBAAwB,CAAC,QAAmC;QACjE,IAAI,IAAI,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
1
+ {"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../../src/core/context/ssr.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zova-core",
3
- "version": "5.0.129",
3
+ "version": "5.0.131",
4
4
  "description": "A vue3 framework with ioc",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -57,5 +57,5 @@
57
57
  "zod": "^3.23.8",
58
58
  "zova-shared": "^1.0.4"
59
59
  },
60
- "gitHead": "624a81d8b0a58c276dd081ab612e7dcf37bd7f71"
60
+ "gitHead": "2277fbb9916aaa152b1bd8df96cad309d77e274a"
61
61
  }
@@ -10,7 +10,7 @@ import {
10
10
  } from '../../types/interface/ssr.js';
11
11
  import { Cast } from '../../types/utils/cast.js';
12
12
  import { CtxSSRMetaStore } from './ssrMetaStore.js';
13
- import { isString, stringifyStyle } from '@vue/shared';
13
+ import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
14
14
  import { ErrorSSR } from '../../bean/index.js';
15
15
 
16
16
  const SymbolIsRuntimeSsrPreHydration = Symbol('SymbolIsRuntimeSsrPreHydration');
@@ -146,21 +146,42 @@ export class CtxSSR extends BeanSimple {
146
146
  // expected
147
147
  let ignore = false;
148
148
  let expected: string | undefined = undefined;
149
- if (key === 'id') {
149
+ if (key === 'class') {
150
150
  ignore = true;
151
- expected = String(clientValue);
152
- } else if (key === 'class') {
153
- ignore = true;
154
- expected = normalizeClass(clientValue);
151
+ if (clientValue !== undefined) {
152
+ expected = normalizeClass(clientValue);
153
+ el.setAttribute(key, expected as string);
154
+ }
155
155
  } else if (key === 'style') {
156
156
  ignore = true;
157
- expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
157
+ if (clientValue !== undefined) {
158
+ expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
159
+ el.setAttribute(key, expected as string);
160
+ }
161
+ } else if (key === 'id') {
162
+ ignore = true;
163
+ if (clientValue !== undefined) {
164
+ expected = String(clientValue);
165
+ el.setAttribute(key, expected as string);
166
+ }
167
+ } else if (isBooleanAttr(key)) {
168
+ ignore = true;
169
+ if (clientValue !== undefined) {
170
+ const expected = includeBooleanAttr(clientValue);
171
+ if (expected) {
172
+ el.setAttribute(key, '');
173
+ } else {
174
+ el.removeAttribute(key);
175
+ }
176
+ }
158
177
  } else if (el.getAttribute(`data-hydrate-ignore-${key}`) !== null) {
159
178
  ignore = true;
160
- expected = String(clientValue);
179
+ if (clientValue !== undefined) {
180
+ expected = String(clientValue);
181
+ el.setAttribute(key, expected as string);
182
+ }
161
183
  }
162
184
  if (!ignore) return { clientValue };
163
- el.setAttribute(key, expected as string);
164
185
  return { ignore: true };
165
186
  }
166
187