@cloudbase/cals 0.3.22-alpha.4 → 0.3.22

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.
Files changed (20) hide show
  1. package/lib/parser/cals/index.d.ts +67 -17
  2. package/lib/parser/cals/index.d.ts.map +1 -1
  3. package/lib/parser/cals/index.js +100 -138
  4. package/lib/parser/cals/utils/block/index.js +2 -2
  5. package/lib/parser/cals/utils/runtime.d.ts +1 -4
  6. package/lib/parser/cals/utils/runtime.d.ts.map +1 -1
  7. package/lib/parser/cals/utils/runtime.js +0 -7
  8. package/lib/parser/expression/index.d.ts +1 -8
  9. package/lib/parser/expression/index.d.ts.map +1 -1
  10. package/lib/parser/expression/index.js +1 -6
  11. package/lib/schema/platform_application.json +2177 -0
  12. package/lib/tests/common-application-specs.test.d.ts +2 -0
  13. package/lib/tests/common-application-specs.test.d.ts.map +1 -0
  14. package/lib/tests/common-application-specs.test.js +45 -0
  15. package/lib/tsconfig.tsbuildinfo +1 -1
  16. package/lib/types/platform/component.d.ts +21 -6
  17. package/lib/types/platform/component.d.ts.map +1 -1
  18. package/lib/types/platform/datasource.d.ts +20 -1
  19. package/lib/types/platform/datasource.d.ts.map +1 -1
  20. package/package.json +1 -1
package/lib/parser/cals/index.js CHANGED
@@ -33,14 +33,14 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
33
33
  case expression_1.PropBindType.computed:
34
34
  case expression_1.PropBindType.dataVar:
35
35
  case expression_1.PropBindType.stateData:
36
- case expression_1.PropBindType.params: {
36
+ case expression_1.PropBindType.paramData: {
37
37
  const TYPE_MAP = {
38
38
  [expression_1.PropBindType.prop]: 'props',
39
39
  [expression_1.PropBindType.state]: 'state',
40
40
  [expression_1.PropBindType.computed]: 'computed',
41
41
  [expression_1.PropBindType.dataVar]: 'dataVar',
42
42
  [expression_1.PropBindType.stateData]: 'dataset.state',
43
- [expression_1.PropBindType.params]: 'dataset.params',
43
+ [expression_1.PropBindType.paramData]: 'dataset.params',
44
44
  };
45
45
  let exp = dynamicValue.value;
46
46
  let reg = /^(.*?)\./;
@@ -85,13 +85,12 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
85
85
  value = undefined;
86
86
  }
87
87
  }
88
- return { key, value, extra: dynamicValue.extra };
88
+ return { key, value };
89
89
  }
90
90
  exports.serializeValue = serializeValue;
91
- const DYNAMIC_KEY_REG = /^:(.*)$/;
92
- function deserializeValue(ctx, key, value, extra) {
91
+ function deserializeValue(ctx, key, value) {
93
92
  var _a;
94
- let matched = key.match(DYNAMIC_KEY_REG);
93
+ let matched = key.match(/^:(.*)$/);
95
94
  if (matched) {
96
95
  let key = matched[1];
97
96
  let type = expression_1.PropBindType.expression;
@@ -119,7 +118,7 @@ function deserializeValue(ctx, key, value, extra) {
119
118
  }
120
119
  return {
121
120
  key,
122
- value: { type, value, extra },
121
+ value: { type, value },
123
122
  };
124
123
  }
125
124
  else {
@@ -130,19 +129,13 @@ function deserializeValue(ctx, key, value, extra) {
130
129
  : {
131
130
  type: undefined /*'static'*/,
132
131
  value,
133
- extra,
134
132
  },
135
133
  };
136
134
  }
137
135
  }
138
136
  exports.deserializeValue = deserializeValue;
139
- function serializeDynamicMap(props) {
140
- return serializeDynamicMapWithExtra(props).data;
141
- }
142
- exports.serializeDynamicMap = serializeDynamicMap;
143
- function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlineDefaultValue, }) {
137
+ function serializeDynamicMap({ ctx, map = {}, scope = 'page', streamlineDefaultValue, }) {
144
138
  let data = {};
145
- let extra = {};
146
139
  Object.keys(map)
147
140
  .sort((a, b) => {
148
141
  const aPath = a.split('.');
@@ -157,7 +150,7 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
157
150
  }
158
151
  })
159
152
  .forEach((key) => {
160
- let { key: processedKey, value: processedValue, extra: processedExtra, } = serializeValue({
153
+ let { key: processedKey, value: processedValue } = serializeValue({
161
154
  ctx,
162
155
  key,
163
156
  dynamicValue: map[key],
@@ -165,17 +158,17 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
165
158
  streamlineDefaultValue,
166
159
  });
167
160
  let matched = processedKey.match(/^:(.*)$/);
168
- let originKey = processedKey;
169
161
  if (matched) {
170
- originKey = matched[1];
171
- (0, lodash_1.unset)(data, originKey);
162
+ const originValue = matched[1];
163
+ (0, lodash_1.unset)(data, originValue);
172
164
  }
173
165
  if ((0, lodash_1.get)(data, processedKey) == undefined) {
166
+ let ValueTmp = processedValue;
174
167
  /* 选区结构处理 [formily] to [CALS] */
175
- if (Array.isArray(processedValue) &&
176
- (processedValue === null || processedValue === void 0 ? void 0 : processedValue.some((item) => item && item.selectableBlock))) {
177
- let valueTmp = (0, lodash_1.cloneDeep)(processedValue);
178
- valueTmp === null || valueTmp === void 0 ? void 0 : valueTmp.map((_value) => {
168
+ if (Array.isArray(ValueTmp) &&
169
+ (ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.some((item) => item && item.selectableBlock))) {
170
+ ValueTmp = (0, lodash_1.cloneDeep)(processedValue);
171
+ ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.map((_value) => {
179
172
  var _a, _b, _c;
180
173
  const xProp = (_a = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props'];
181
174
  const xComponent = (_c = (_b = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _b === void 0 ? void 0 : _b['x-component']) === null || _c === void 0 ? void 0 : _c.toLowerCase();
@@ -189,24 +182,24 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
189
182
  return _value;
190
183
  });
191
184
  }
192
- data[processedKey] = processedValue;
185
+ data[processedKey] = ValueTmp;
193
186
  }
194
- extra[originKey] = processedExtra;
195
187
  });
196
- return { data, extra };
188
+ return data;
197
189
  }
198
- function deserializeDynamicMap(ctx, map, extraMap) {
190
+ exports.serializeDynamicMap = serializeDynamicMap;
191
+ function deserializeDynamicMap(ctx, map) {
199
192
  var _a, _b, _c;
200
193
  let data = {};
201
194
  for (let key in map || {}) {
202
195
  let value = (_a = map) === null || _a === void 0 ? void 0 : _a[key];
203
- let matched = key.match(DYNAMIC_KEY_REG);
204
- let { key: processedKey, value: processedValue } = deserializeValue(ctx, key, value, extraMap === null || extraMap === void 0 ? void 0 : extraMap[matched ? matched[1] : key]);
196
+ let { key: processedKey, value: processedValue } = deserializeValue(ctx, key, value);
197
+ let ValueTmp = processedValue;
205
198
  /* 选区结构处理 [CALS] to [formily] */
206
199
  if (Array.isArray(processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) &&
207
200
  ((_b = processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) === null || _b === void 0 ? void 0 : _b.some((item) => item && item.selectableBlock))) {
208
- let valueTmp = (0, lodash_1.cloneDeep)(processedValue);
209
- (_c = valueTmp === null || valueTmp === void 0 ? void 0 : valueTmp.value) === null || _c === void 0 ? void 0 : _c.forEach((_value) => {
201
+ ValueTmp = (0, lodash_1.cloneDeep)(processedValue);
202
+ (_c = ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.value) === null || _c === void 0 ? void 0 : _c.map((_value) => {
210
203
  var _a, _b, _c, _d;
211
204
  const module = (_b = (_a = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _a === void 0 ? void 0 : _a.module) === null || _b === void 0 ? void 0 : _b.toLowerCase();
212
205
  const component = (_d = (_c = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _c === void 0 ? void 0 : _c.component) === null || _d === void 0 ? void 0 : _d.toLowerCase();
@@ -218,25 +211,21 @@ function deserializeDynamicMap(ctx, map, extraMap) {
218
211
  return _value;
219
212
  });
220
213
  }
221
- data[processedKey] = processedValue;
214
+ data[processedKey] = ValueTmp;
222
215
  }
223
216
  return data;
224
217
  }
225
218
  exports.deserializeDynamicMap = deserializeDynamicMap;
226
219
  function serializeAttributes(ctx, scope, attributes = {}) {
227
- var _a;
228
- return (_a = serializeAttributesWithExtra(ctx, scope, attributes)) === null || _a === void 0 ? void 0 : _a.data;
229
- }
230
- exports.serializeAttributes = serializeAttributes;
231
- function serializeAttributesWithExtra(ctx, scope, attributes = {}) {
232
- return serializeDynamicMapWithExtra({
220
+ return serializeDynamicMap({
233
221
  ctx,
234
222
  scope,
235
223
  map: attributes,
236
224
  streamlineDefaultValue: ctx.streamlineDefaultValue,
237
225
  });
238
226
  }
239
- function deserializeAttributes(ctx, attributes = {}, attributesExtraData = {}) {
227
+ exports.serializeAttributes = serializeAttributes;
228
+ function deserializeAttributes(ctx, attributes = {}) {
240
229
  const reservedAttributes = ['style', 'commonStyle', 'class'];
241
230
  const reservedAttributesMap = reservedAttributes.reduce((map, key) => {
242
231
  map[key] = true;
@@ -252,7 +241,7 @@ function deserializeAttributes(ctx, attributes = {}, attributesExtraData = {}) {
252
241
  restAttributes[key] = attributes[key];
253
242
  }
254
243
  }
255
- return deserializeDynamicMap(ctx, restAttributes, attributesExtraData);
244
+ return deserializeDynamicMap(ctx, restAttributes);
256
245
  }
257
246
  exports.deserializeAttributes = deserializeAttributes;
258
247
  /**
@@ -264,20 +253,20 @@ function serializeDataset(ctx, dataset) {
264
253
  return dataset;
265
254
  const result = JSON.parse(JSON.stringify(dataset));
266
255
  Object.values(result.state).forEach((state) => {
267
- var _a, _b, _c, _d;
256
+ var _a, _b;
268
257
  if (state.varType !== 'datasource')
269
258
  return;
270
259
  if ((_a = state.initMethod) === null || _a === void 0 ? void 0 : _a.params) {
271
- state.initMethod.params = (_b = serializeDynamicMapWithExtra({
260
+ state.initMethod.params = serializeDynamicMap({
272
261
  ctx,
273
262
  map: state.initMethod.params,
274
- })) === null || _b === void 0 ? void 0 : _b.data;
263
+ });
275
264
  }
276
- if ((_c = state.updateMethod) === null || _c === void 0 ? void 0 : _c.params) {
277
- state.updateMethod.params = (_d = serializeDynamicMapWithExtra({
265
+ if ((_b = state.updateMethod) === null || _b === void 0 ? void 0 : _b.params) {
266
+ state.updateMethod.params = serializeDynamicMap({
278
267
  ctx,
279
268
  map: state.updateMethod.params,
280
- })) === null || _d === void 0 ? void 0 : _d.data;
269
+ });
281
270
  }
282
271
  });
283
272
  return result;
@@ -387,10 +376,10 @@ function serializeListener(ctx, listener) {
387
376
  module: /^comp\-\w+$/.test(listener.handler.moduleName)
388
377
  ? '$comp'
389
378
  : listener.handler.moduleName,
390
- params: serializeDynamicMapWithExtra({
379
+ params: serializeDynamicMap({
391
380
  ctx,
392
381
  map: listener.data,
393
- }).data,
382
+ }),
394
383
  },
395
384
  isCapturePhase: listener.isCapturePhase,
396
385
  };
@@ -490,7 +479,7 @@ function deserializeModuleName(ctx, componentName, moduleName) {
490
479
  return moduleName;
491
480
  }
492
481
  function serializeComponent(ctx, component, scope = 'page') {
493
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
482
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
494
483
  // const scope = ctx.component?.id ? 'component' : 'page'
495
484
  const moduleName = (_a = component.xComponent) === null || _a === void 0 ? void 0 : _a.moduleName;
496
485
  const componentName = ((_b = component.xComponent) === null || _b === void 0 ? void 0 : _b.name) || '';
@@ -502,60 +491,45 @@ function serializeComponent(ctx, component, scope = 'page') {
502
491
  if (componentCtx.dependencies && !componentCtx.dependenciesMap) {
503
492
  componentCtx.dependenciesMap = processDependenciesMap(componentCtx.dependencies || []);
504
493
  }
505
- let attributeMeta = serializeAttributesWithExtra(componentCtx, scope, (((_d = component === null || component === void 0 ? void 0 : component.xProps) === null || _d === void 0 ? void 0 : _d.data) || {})) || {};
506
- const { data: attributes = {}, extra: attributeExtraData = {}, } = attributeMeta;
507
- let classListBindData = null;
508
- let styleBindData = null;
509
- if ((_e = component === null || component === void 0 ? void 0 : component.xProps) === null || _e === void 0 ? void 0 : _e.classListBind) {
510
- classListBindData = serializeValue({
511
- ctx: componentCtx,
512
- key: 'classListBind',
513
- dynamicValue: (_f = component === null || component === void 0 ? void 0 : component.xProps) === null || _f === void 0 ? void 0 : _f.classListBind,
514
- scope,
515
- });
516
- if (classListBindData.extra) {
517
- attributeExtraData['class'] = classListBindData.extra;
518
- }
519
- }
520
- if ((_g = component === null || component === void 0 ? void 0 : component.xProps) === null || _g === void 0 ? void 0 : _g.styleBind) {
521
- styleBindData = serializeValue({
522
- ctx: componentCtx,
523
- key: 'styleBind',
524
- dynamicValue: (_h = component === null || component === void 0 ? void 0 : component.xProps) === null || _h === void 0 ? void 0 : _h.styleBind,
525
- });
526
- if (styleBindData.extra) {
527
- attributeExtraData['style'] = styleBindData.extra;
528
- }
529
- }
530
494
  return {
531
495
  id: component.id,
532
496
  type: undefined,
533
497
  module: serializeModuleName(componentCtx, moduleName, componentName),
534
498
  component: componentName,
535
499
  attributes: (0, runtime_1.getValidValue)(component.xProps
536
- ? Object.assign(Object.assign({}, attributes), { style: (_j = component.xProps) === null || _j === void 0 ? void 0 : _j.style, class: (_l = (_k = component.xProps) === null || _k === void 0 ? void 0 : _k.classList) === null || _l === void 0 ? void 0 : _l.join(' ') }) : undefined),
500
+ ? Object.assign(Object.assign({}, serializeAttributes(componentCtx, scope, (component.xProps.data || {}))), { style: (_d = component.xProps) === null || _d === void 0 ? void 0 : _d.style, class: (_f = (_e = component.xProps) === null || _e === void 0 ? void 0 : _e.classList) === null || _f === void 0 ? void 0 : _f.join(' ') }) : undefined),
537
501
  items: component.properties
538
502
  ? Object.keys(component.properties).map((key) => {
539
503
  var _a;
540
504
  return serializeComponent(componentCtx, Object.assign({ id: key }, (_a = component.properties) === null || _a === void 0 ? void 0 : _a[key]), scope);
541
505
  })
542
506
  : undefined,
543
- listeners: (0, runtime_1.getValidValue)((_o = (_m = component.xProps) === null || _m === void 0 ? void 0 : _m.listeners) === null || _o === void 0 ? void 0 : _o.map((listener) => {
507
+ listeners: (0, runtime_1.getValidValue)((_h = (_g = component.xProps) === null || _g === void 0 ? void 0 : _g.listeners) === null || _h === void 0 ? void 0 : _h.map((listener) => {
544
508
  return serializeListener(componentCtx, listener);
545
509
  })),
546
- directives: serializeDirecties(componentCtx, (((_p = component.xProps) === null || _p === void 0 ? void 0 : _p.directives) || {}), scope) || {
510
+ directives: serializeDirecties(componentCtx, (((_j = component.xProps) === null || _j === void 0 ? void 0 : _j.directives) || {}), scope) || {
547
511
  ':if': true,
548
512
  },
549
- ':class': classListBindData ? classListBindData.value : undefined,
550
- ':style': styleBindData ? styleBindData.value : undefined,
513
+ ':class': ((_k = component === null || component === void 0 ? void 0 : component.xProps) === null || _k === void 0 ? void 0 : _k.classListBind)
514
+ ? serializeValue({
515
+ ctx: componentCtx,
516
+ key: 'classListBind',
517
+ dynamicValue: (_l = component === null || component === void 0 ? void 0 : component.xProps) === null || _l === void 0 ? void 0 : _l.classListBind,
518
+ scope,
519
+ }).value
520
+ : undefined,
521
+ ':style': ((_m = component === null || component === void 0 ? void 0 : component.xProps) === null || _m === void 0 ? void 0 : _m.styleBind)
522
+ ? serializeValue({
523
+ ctx: componentCtx,
524
+ key: 'styleBind',
525
+ dynamicValue: (_o = component === null || component === void 0 ? void 0 : component.xProps) === null || _o === void 0 ? void 0 : _o.styleBind,
526
+ }).value
527
+ : undefined,
551
528
  extra: {
552
- commonStyle: (_q = component.xProps) === null || _q === void 0 ? void 0 : _q.commonStyle,
529
+ commonStyle: (_p = component.xProps) === null || _p === void 0 ? void 0 : _p.commonStyle,
553
530
  xIndex: component.xIndex,
554
- styleBindPath: (_r = component === null || component === void 0 ? void 0 : component.xProps) === null || _r === void 0 ? void 0 : _r.styleBindPath,
555
- staticResourceAttribute: (_s = component === null || component === void 0 ? void 0 : component.xProps) === null || _s === void 0 ? void 0 : _s.staticResourceAttribute,
556
- attributeExtraData: (0, common_3.isEmptyObj)(attributeExtraData)
557
- ? undefined
558
- : attributeExtraData,
531
+ styleBindPath: (_q = component === null || component === void 0 ? void 0 : component.xProps) === null || _q === void 0 ? void 0 : _q.styleBindPath,
532
+ staticResourceAttribute: (_r = component === null || component === void 0 ? void 0 : component.xProps) === null || _r === void 0 ? void 0 : _r.staticResourceAttribute,
559
533
  },
560
534
  };
561
535
  }
@@ -563,14 +537,11 @@ exports.serializeComponent = serializeComponent;
563
537
  function deserializeComponent(ctx, components) {
564
538
  let componentMap = components.reduce((map, item) => {
565
539
  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
566
- const { attributeExtraData = {} } = item.extra || {};
567
540
  let dynamicStyle = item[':style']
568
- ? deserializeValue(ctx, ':style', item[':style'], attributeExtraData['style'] // 此处就是 style，取的是原始的属性
569
- ).value
541
+ ? deserializeValue(ctx, ':style', item[':style']).value
570
542
  : undefined;
571
543
  let dynamicClassList = item[':class']
572
- ? deserializeValue(ctx, ':class', item[':class'], attributeExtraData['class'] // 此处就是 class，取的是原始的属性
573
- ).value
544
+ ? deserializeValue(ctx, ':class', item[':class']).value
574
545
  : undefined;
575
546
  const xComponent = {
576
547
  moduleName: item.module,
@@ -582,7 +553,7 @@ function deserializeComponent(ctx, components) {
582
553
  xComponent.moduleName;
583
554
  }
584
555
  const xProps = {
585
- data: deserializeAttributes(ctx, item.attributes, attributeExtraData),
556
+ data: deserializeAttributes(ctx, item.attributes),
586
557
  directives: deserializeDirecties(ctx, item.directives || {}),
587
558
  style: (_a = item.attributes) === null || _a === void 0 ? void 0 : _a.style,
588
559
  styleBind: dynamicStyle
@@ -591,6 +562,9 @@ function deserializeComponent(ctx, components) {
591
562
  value: dynamicStyle.value,
592
563
  }
593
564
  : undefined,
565
+ // styleBindPath: item.styleBindPath
566
+ // ? deserializeValue('styleBindPath', item.styleBindPath).value
567
+ // : undefined, // 含义未知
594
568
  commonStyle: (_b = item === null || item === void 0 ? void 0 : item.extra) === null || _b === void 0 ? void 0 : _b.commonStyle,
595
569
  staticResourceAttribute: (_c = item === null || item === void 0 ? void 0 : item.extra) === null || _c === void 0 ? void 0 : _c.staticResourceAttribute,
596
570
  classList: (_f = (_e = (_d = item.attributes) === null || _d === void 0 ? void 0 : _d.class) === null || _e === void 0 ? void 0 : _e.split(/\s/g)) === null || _f === void 0 ? void 0 : _f.filter((className) => !!className),
@@ -633,7 +607,7 @@ function deserializeComponent(ctx, components) {
633
607
  }
634
608
  exports.deserializeComponent = deserializeComponent;
635
609
  function serializePage(ctx, page) {
636
- var _a, _b, _c, _d, _e;
610
+ var _a, _b, _c, _d;
637
611
  const pageCtx = Object.assign(Object.assign({}, ctx), { page });
638
612
  if (pageCtx.dependencies && !pageCtx.dependenciesMap) {
639
613
  pageCtx.dependenciesMap = processDependenciesMap(pageCtx.dependencies || []);
@@ -642,20 +616,21 @@ function serializePage(ctx, page) {
642
616
  id: page.id,
643
617
  type: 'PAGE',
644
618
  component: 'Page',
645
- attributes: (0, runtime_1.getValidValue)((_a = serializeAttributesWithExtra(pageCtx, 'page', page.data)) === null || _a === void 0 ? void 0 : _a.data),
619
+ attributes: (0, runtime_1.getValidValue)(serializeAttributes(pageCtx, 'page', page.data)),
646
620
  items: Object.keys(page.componentInstances || {}).map((id) => {
647
621
  return serializeComponent(pageCtx, Object.assign({ id }, page.componentInstances[id]));
648
622
  }),
649
623
  directives: {
650
624
  ':if': true,
651
625
  },
652
- resources: (_b = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _b === void 0 ? void 0 : _b.map((item) => serializeCodeSource(pageCtx, item)),
626
+ resources: (_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.map((item) => serializeCodeSource(pageCtx, item)),
653
627
  dataset: serializeDataset(ctx, page === null || page === void 0 ? void 0 : page.dataset),
654
- dataVariables: (0, runtime_1.getValidValue)((_d = (_c = page === null || page === void 0 ? void 0 : page.vars) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.map((item) => serializeDataVariables(pageCtx, item))),
655
- listeners: (0, runtime_1.getValidValue)((_e = page === null || page === void 0 ? void 0 : page.listeners) === null || _e === void 0 ? void 0 : _e.map((item) => {
628
+ dataVariables: (0, runtime_1.getValidValue)((_c = (_b = page === null || page === void 0 ? void 0 : page.vars) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.map((item) => serializeDataVariables(pageCtx, item))),
629
+ listeners: (0, runtime_1.getValidValue)((_d = page === null || page === void 0 ? void 0 : page.listeners) === null || _d === void 0 ? void 0 : _d.map((item) => {
656
630
  return serializeListener(pageCtx, item);
657
631
  })),
658
632
  extra: {
633
+ pluginInstances: page === null || page === void 0 ? void 0 : page.pluginInstances,
659
634
  commonStyle: page === null || page === void 0 ? void 0 : page.commonStyle,
660
635
  xIndex: page.xIndex,
661
636
  staticResourceAttribute: page === null || page === void 0 ? void 0 : page.staticResourceAttribute,
@@ -691,8 +666,9 @@ function deserializePage(ctx, page) {
691
666
  return deserializeDataVariables(pageCtx, item);
692
667
  })) || [],
693
668
  },
694
- data: deserializeAttributes(pageCtx, page.attributes, (_b = page === null || page === void 0 ? void 0 : page.extra) === null || _b === void 0 ? void 0 : _b.attributeExtraData),
669
+ data: deserializeAttributes(pageCtx, page.attributes),
695
670
  componentInstances: deserializeComponent(pageCtx, page.items || []),
671
+ pluginInstances: (_b = page.extra) === null || _b === void 0 ? void 0 : _b.pluginInstances,
696
672
  commonStyle: (_c = page === null || page === void 0 ? void 0 : page.extra) === null || _c === void 0 ? void 0 : _c.commonStyle,
697
673
  staticResourceAttribute: (_d = page === null || page === void 0 ? void 0 : page.extra) === null || _d === void 0 ? void 0 : _d.staticResourceAttribute,
698
674
  hideAdminPortalMenu: (_e = page === null || page === void 0 ? void 0 : page.extra) === null || _e === void 0 ? void 0 : _e.hideAdminPortalMenu,
@@ -800,28 +776,29 @@ exports.deserializePlatformApp = deserializePlatformApp;
800
776
  */
801
777
  function serializeRuntimePage(ctx, page //IPageInstance
802
778
  ) {
803
- var _a, _b, _c, _d, _e, _f;
779
+ var _a, _b, _c, _d, _e;
804
780
  const pageCtx = Object.assign(Object.assign({}, ctx), { dependenciesMap: processDependenciesMap(ctx.dependencies || []), page: { id: page.id } });
805
781
  let processedPage = {
806
782
  id: page.id,
807
783
  type: 'PAGE',
808
784
  component: 'Page',
809
- attributes: (_a = serializeAttributesWithExtra(pageCtx, 'page', (0, runtime_1.readDynamicData)(page))) === null || _a === void 0 ? void 0 : _a.data,
810
- items: (0, runtime_1.getValidValue)(Object.keys(((_b = page.componentSchemaJson) === null || _b === void 0 ? void 0 : _b.properties) || {}).map((id) => {
785
+ attributes: serializeAttributes(pageCtx, 'page', (0, runtime_1.readDynamicData)(page)),
786
+ items: (0, runtime_1.getValidValue)(Object.keys(((_a = page.componentSchemaJson) === null || _a === void 0 ? void 0 : _a.properties) || {}).map((id) => {
811
787
  var _a;
812
788
  return serializeRuntimeComponent(pageCtx, Object.assign({ id }, (_a = page.componentSchemaJson) === null || _a === void 0 ? void 0 : _a.properties[id]));
813
789
  })),
814
- resources: (_c = page === null || page === void 0 ? void 0 : page.codeModules) === null || _c === void 0 ? void 0 : _c.map((item) => serializeCodeSource(pageCtx, item)),
790
+ resources: (_b = page === null || page === void 0 ? void 0 : page.codeModules) === null || _b === void 0 ? void 0 : _b.map((item) => serializeCodeSource(pageCtx, item)),
815
791
  dataset: page === null || page === void 0 ? void 0 : page.dataset,
816
- dataVariables: (0, runtime_1.getValidValue)((_e = (_d = page === null || page === void 0 ? void 0 : page.vars) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.map((item) => serializeDataVariables(pageCtx, item))),
792
+ dataVariables: (0, runtime_1.getValidValue)((_d = (_c = page === null || page === void 0 ? void 0 : page.vars) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.map((item) => serializeDataVariables(pageCtx, item))),
817
793
  listeners: (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(page.listenerInstances || []).map((item) => {
818
794
  return serializeListener(pageCtx, item);
819
795
  })),
820
796
  extra: {
797
+ pluginInstances: (0, runtime_1.getValidValue)(page === null || page === void 0 ? void 0 : page.pluginInstances),
821
798
  commonStyle: (0, runtime_1.getValidValue)((0, style_1.removeInvalidStyleFormValue)(page.style)),
822
799
  styleBindPath: (0, runtime_1.getValidValue)(page.styleBindPath),
823
800
  xIndex: page.xIndex,
824
- children: (0, runtime_1.getValidValue)((_f = page.children) === null || _f === void 0 ? void 0 : _f.map((child) => serializeRuntimePage(ctx, child))),
801
+ children: (0, runtime_1.getValidValue)((_e = page.children) === null || _e === void 0 ? void 0 : _e.map((child) => serializeRuntimePage(ctx, child))),
825
802
  },
826
803
  };
827
804
  if ((0, common_3.isValidStyleBind)(page.styleBind) && (0, runtime_1.getValidValue)(page.styleBind)) {
@@ -877,48 +854,33 @@ function serializeRuntimeComponent(ctx, component //IComponentSchemaJson
877
854
  .filter((dataType) => dataType.type !== 'slot')
878
855
  .map((dataType) => dataType.propertyPath);
879
856
  let properties = component.properties || {};
880
- const { data: attributes = {}, extra: attributeExtraData = {} } = serializeAttributesWithExtra(componentCtx, 'page', (0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)(props)) || {}) || {};
881
- let styleBindData = null;
882
- let classListBindData = null;
883
- if ((_a = props === null || props === void 0 ? void 0 : props.styleBind) === null || _a === void 0 ? void 0 : _a.bindDataPath) {
884
- styleBindData = serializeValue({
885
- ctx: componentCtx,
886
- key: 'styleBind',
887
- dynamicValue: {
888
- type: props.styleBind.type,
889
- value: props.styleBind.bindDataPath,
890
- extra: props.styleBind.extra,
891
- },
892
- });
893
- if (styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.extra) {
894
- attributeExtraData.style = styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.extra;
895
- }
896
- }
897
- if ((0, common_3.isValidClassNameListBind)(props.classNameListBind)) {
898
- classListBindData = serializeValue({
899
- ctx: componentCtx,
900
- key: 'classListBind',
901
- dynamicValue: (0, runtime_1.getValidValue)({
902
- type: props.classNameListBind.type,
903
- value: props.classNameListBind.bindDataPath,
904
- }),
905
- });
906
- if (classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.extra) {
907
- attributeExtraData.class = classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.extra;
908
- }
909
- }
910
- processed = Object.assign(Object.assign({}, processed), { module: serializeModuleName(componentCtx, moduleName, name), component: name, attributes: Object.assign(Object.assign({}, attributes), { style: (0, runtime_1.getValidValue)(props.style), class: (_b = (0, runtime_1.getValidValue)(props.classNameList)) === null || _b === void 0 ? void 0 : _b.join(' ') }), items: (0, runtime_1.getValidValue)(Object.keys(properties)
857
+ processed = Object.assign(Object.assign({}, processed), { module: serializeModuleName(componentCtx, moduleName, name), component: name, attributes: Object.assign(Object.assign({}, serializeAttributes(componentCtx, 'page', ((0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)(props)) || {}))), { style: (0, runtime_1.getValidValue)(props.style), class: (_a = (0, runtime_1.getValidValue)(props.classNameList)) === null || _a === void 0 ? void 0 : _a.join(' ') }), items: (0, runtime_1.getValidValue)(Object.keys(properties)
911
858
  .filter((key) => !excludeKeys.includes(key))
912
- .map((key) => serializeRuntimeComponent(ctx, Object.assign({ id: key }, properties[key])))), listeners: (_c = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(props.listenerInstances))) === null || _c === void 0 ? void 0 : _c.map((listener /* IEventListener */) => {
859
+ .map((key) => serializeRuntimeComponent(ctx, Object.assign({ id: key }, properties[key])))), listeners: (_b = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(props.listenerInstances))) === null || _b === void 0 ? void 0 : _b.map((listener /* IEventListener */) => {
913
860
  return serializeListener(componentCtx, listener);
914
- }), directives: serializeDirecties(componentCtx, ((0, runtime_1.getValidValue)((0, runtime_1.readDirectives)(props)) || {})) || undefined, ':class': (classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.value) || undefined, ':style': (styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.value) || undefined, extra: {
861
+ }), directives: serializeDirecties(componentCtx, ((0, runtime_1.getValidValue)((0, runtime_1.readDirectives)(props)) || {})) || undefined, ':class': (0, common_3.isValidClassNameListBind)(props.classNameListBind)
862
+ ? serializeValue({
863
+ ctx: componentCtx,
864
+ key: 'classListBind',
865
+ dynamicValue: (0, runtime_1.getValidValue)({
866
+ type: props.classNameListBind.type,
867
+ value: props.classNameListBind.bindDataPath,
868
+ }),
869
+ }).value
870
+ : undefined, ':style': ((_c = props === null || props === void 0 ? void 0 : props.styleBind) === null || _c === void 0 ? void 0 : _c.bindDataPath)
871
+ ? serializeValue({
872
+ ctx: componentCtx,
873
+ key: 'styleBind',
874
+ dynamicValue: {
875
+ type: props.styleBind.type,
876
+ value: props.styleBind.bindDataPath,
877
+ },
878
+ }).value
879
+ : undefined, extra: {
915
880
  commonStyle: (0, runtime_1.getValidValue)((0, style_1.removeInvalidStyleFormValue)(props.commonStyle)),
916
881
  xIndex: (0, runtime_1.getValidValue)(component['x-index']),
917
882
  styleBindPath: (0, runtime_1.getValidValue)(props.styleBindPath),
918
883
  staticResourceAttribute: (0, runtime_1.getValidValue)(props.staticResourceAttribute),
919
- attributeExtraData: (0, common_3.isEmptyObj)(attributeExtraData)
920
- ? undefined
921
- : attributeExtraData,
922
884
  } });
923
885
  }
924
886
  else {
package/lib/parser/cals/utils/block/index.js CHANGED
@@ -108,10 +108,10 @@ function parseValueCals(ctx, value) {
108
108
  let parser = new expression_1.DynamicValueParser(value, { pageId: '$page' });
109
109
  let res = parser.parse();
110
110
  switch (res.type) {
111
- case expression_1.PropBindType.params:
111
+ case expression_1.PropBindType.paramData:
112
112
  case expression_1.PropBindType.stateData: {
113
113
  const TYPE_MAP = {
114
- [expression_1.PropBindType.params]: 'params',
114
+ [expression_1.PropBindType.paramData]: 'params',
115
115
  [expression_1.PropBindType.stateData]: 'state',
116
116
  };
117
117
  const type = TYPE_MAP[res.type];
package/lib/parser/cals/utils/runtime.d.ts CHANGED
@@ -1,11 +1,8 @@
1
- import { IDynamicValue } from '../../expression';
2
1
  export declare function readComponents(properties?: {
3
2
  [key: string]: any;
4
3
  }, excludeKeys?: string[]): Object;
5
4
  export declare function readDirectives(cmp: any): any;
6
- export declare function readDynamicData(cmp: any): {
7
- [key: string]: IDynamicValue;
8
- };
5
+ export declare function readDynamicData(cmp: any): any;
9
6
  export declare function readListeners(listenerInstances?: any[]): any;
10
7
  export declare function writeListeners(listeners?: any[]): any[];
11
8
  export declare function writeDynamicData(from: any, to: any, properties: any): any;
package/lib/parser/cals/utils/runtime.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA2B,MAAM,kBAAkB,CAAA;AAUzE,wBAAgB,cAAc,CAC5B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAmB,EACnD,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CAiER;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,OAwCtC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,CA+B1E;AAED,wBAAgB,aAAa,CAAC,iBAAiB,GAAE,GAAG,EAAO,OAiB1D;AAED,wBAAgB,cAAc,CAAC,SAAS,GAAE,GAAG,EAAO,SAenD;AAGD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,OAkExE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,QAKjE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,OAWvC"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/runtime.ts"],"names":[],"mappings":"AAUA,wBAAgB,cAAc,CAC5B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAmB,EACnD,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CA+DR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,OAuCtC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,OA8BvC;AAED,wBAAgB,aAAa,CAAC,iBAAiB,GAAE,GAAG,EAAO,OAiB1D;AAED,wBAAgB,cAAc,CAAC,SAAS,GAAE,GAAG,EAAO,SAenD;AAGD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,OAgExE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,QAKjE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,OAWvC"}
package/lib/parser/cals/utils/runtime.js CHANGED
@@ -31,7 +31,6 @@ function readComponents(properties = {}, excludeKeys = []) {
31
31
  componentXProps.styleBind = {
32
32
  type: srcProps.styleBind.type,
33
33
  value: srcProps.styleBind.bindDataPath,
34
- extra: srcProps.styleBind.extra,
35
34
  };
36
35
  }
37
36
  if ((0, common_1.isValidClassNameListBind)(srcProps.classNameListBind)) {
@@ -39,7 +38,6 @@ function readComponents(properties = {}, excludeKeys = []) {
39
38
  setValidValue(componentXProps, 'classListBind', {
40
39
  type: classList.type,
41
40
  value: classList.bindDataPath,
42
- extra: classList.extra,
43
41
  });
44
42
  }
45
43
  if (srcProps.classNameList) {
@@ -75,7 +73,6 @@ function readDirectives(cmp) {
75
73
  directives.waIf = {
76
74
  type: bind.type || expression_1.PropBindType.state,
77
75
  value: bind.bindDataPath,
78
- extra: bind.extra,
79
76
  };
80
77
  }
81
78
  }
@@ -84,7 +81,6 @@ function readDirectives(cmp) {
84
81
  directives.waFor = {
85
82
  type: forBind.type || expression_1.PropBindType.state,
86
83
  value: forBind.bindDataPath,
87
- extra: forBind.extra,
88
84
  };
89
85
  }
90
86
  }
@@ -113,7 +109,6 @@ function readDynamicData(cmp) {
113
109
  data[bind.propertyPath] = {
114
110
  type: bind.type || expression_1.PropBindType.state,
115
111
  value: bind.bindDataPath,
116
- extra: bind.extra,
117
112
  };
118
113
  }
119
114
  });
@@ -183,7 +178,6 @@ function writeDynamicData(from = {}, to, properties) {
183
178
  propertyPath: prop,
184
179
  bindDataPath: dv.value,
185
180
  type: dv.type,
186
- extra: dv.extra,
187
181
  });
188
182
  }
189
183
  else {
@@ -200,7 +194,6 @@ function writeDynamicData(from = {}, to, properties) {
200
194
  propertyPath: prop,
201
195
  bindDataPath: fixedValue,
202
196
  type: expression_1.PropBindType.expression,
203
- extra: dv.extra,
204
197
  });
205
198
  }
206
199
  act.dataTypes.push({
package/lib/parser/expression/index.d.ts CHANGED
@@ -25,12 +25,7 @@ export declare enum PropBindType {
25
25
  slot = "slot",
26
26
  dataVar = "dataVar",
27
27
  stateData = "state",
28
- /**
29
- * @deprecated
30
- */
31
- paramData = "params",
32
- params = "params",
33
- scope = "scope"
28
+ paramData = "params"
34
29
  }
35
30
  export declare enum ActionType {
36
31
  Rematch = "rematch",
@@ -46,13 +41,11 @@ export declare enum ActionType {
46
41
  export interface IDynamicValue {
47
42
  type: PropBindType;
48
43
  value: any;
49
- extra?: any;
50
44
  }
51
45
  export interface IDataBind {
52
46
  propertyPath: string;
53
47
  bindDataPath: string;
54
48
  type?: PropBindType;
55
- extra?: any;
56
49
  }
57
50
  interface NodeEx extends Node {
58
51
  $parent: NodeEx;
package/lib/parser/expression/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../parser/expression/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../parser/expression/index.ts"],"names":[],"mappings":"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"}
package/lib/parser/expression/index.js CHANGED
@@ -36,12 +36,7 @@ var PropBindType;
36
36
  PropBindType["slot"] = "slot";
37
37
  PropBindType["dataVar"] = "dataVar";
38
38
  PropBindType["stateData"] = "state";
39
- /**
40
- * @deprecated
41
- */
42
39
  PropBindType["paramData"] = "params";
43
- PropBindType["params"] = "params";
44
- PropBindType["scope"] = "scope";
45
40
  })(PropBindType = exports.PropBindType || (exports.PropBindType = {}));
46
41
  var ActionType;
47
42
  (function (ActionType) {
@@ -303,7 +298,7 @@ class DynamicValueParser {
303
298
  options.value = this._replaceExpression(Object.assign(Object.assign({}, meta), { index: meta.index + 1 }));
304
299
  break;
305
300
  case 'params':
306
- options.type = PropBindType.params;
301
+ options.type = PropBindType.paramData;
307
302
  options.value = this._replaceExpression(Object.assign(Object.assign({}, meta), { index: meta.index + 1 }));
308
303
  break;
309
304
  default: