@cloudbase/cals 1.0.41-alpha.0 → 1.0.41-alpha.1

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 (15) hide show
  1. package/lib/parser/cals/index.d.ts +4 -0
  2. package/lib/parser/cals/index.d.ts.map +1 -1
  3. package/lib/parser/cals/index.js +7 -3
  4. package/lib/parser/cals/utils/code/index.d.ts +0 -5
  5. package/lib/parser/cals/utils/code/index.d.ts.map +1 -1
  6. package/lib/parser/cals/utils/code/index.js +3 -4
  7. package/lib/parser/cals/utils/common.d.ts +6 -2
  8. package/lib/parser/cals/utils/common.d.ts.map +1 -1
  9. package/lib/parser/cals/utils/common.js +87 -43
  10. package/lib/parser/index.d.ts +1 -1
  11. package/lib/parser/index.d.ts.map +1 -1
  12. package/lib/parser/index.js +1 -2
  13. package/lib/types/basic/common.d.ts +5 -1
  14. package/lib/types/basic/common.d.ts.map +1 -1
  15. package/package.json +1 -1
package/lib/parser/cals/index.d.ts CHANGED
@@ -194,6 +194,7 @@ export declare function deserializePage(ctx: {
194
194
  handler: {
195
195
  name: string;
196
196
  moduleName: string;
197
+ code: string;
197
198
  };
198
199
  data: {
199
200
  [key: string]: IDynamicValue;
@@ -209,6 +210,7 @@ export declare function deserializePage(ctx: {
209
210
  handler: {
210
211
  name: string;
211
212
  moduleName: string;
213
+ code: string;
212
214
  };
213
215
  data: {
214
216
  [key: string]: IDynamicValue;
@@ -284,6 +286,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
284
286
  handler: {
285
287
  name: string;
286
288
  moduleName: string;
289
+ code: string;
287
290
  };
288
291
  data: {
289
292
  [key: string]: IDynamicValue;
@@ -299,6 +302,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
299
302
  handler: {
300
303
  name: string;
301
304
  moduleName: string;
305
+ code: string;
302
306
  };
303
307
  data: {
304
308
  [key: string]: IDynamicValue;
package/lib/parser/cals/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"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"}
package/lib/parser/cals/index.js CHANGED
@@ -180,7 +180,7 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
180
180
  scope,
181
181
  streamlineDefaultValue,
182
182
  });
183
- let matched = processedKey.match(/^:(.*)$/);
183
+ let matched = processedKey.match(DYNAMIC_KEY_REG);
184
184
  let originKey = processedKey;
185
185
  if (matched) {
186
186
  originKey = matched[1];
@@ -387,6 +387,7 @@ function serializeDataset(ctx, dataset) {
387
387
  result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
388
388
  module: handler === null || handler === void 0 ? void 0 : handler.moduleName,
389
389
  name: handler === null || handler === void 0 ? void 0 : handler.name,
390
+ code: handler === null || handler === void 0 ? void 0 : handler.code,
390
391
  params: mergedData,
391
392
  }, listeners: (_c = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _c === void 0 ? void 0 : _c.call(listeners, (listener) => serializeListener(ctx, listener)) });
392
393
  });
@@ -444,6 +445,7 @@ function deserializeDataset(ctx, dataset) {
444
445
  result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
445
446
  moduleName: handler === null || handler === void 0 ? void 0 : handler.module,
446
447
  name: (handler === null || handler === void 0 ? void 0 : handler.name) || '',
448
+ code: handler === null || handler === void 0 ? void 0 : handler.code,
447
449
  }, data: deserializeDynamicMap(ctx, (handler === null || handler === void 0 ? void 0 : handler.params) || {}), listeners: (_a = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _a === void 0 ? void 0 : _a.call(listeners, (listener) => {
448
450
  return deserializeListener(ctx, listener);
449
451
  }) });
@@ -557,6 +559,7 @@ function serializeListener(ctx, listener) {
557
559
  handler: {
558
560
  name: listener.handler.name,
559
561
  module: /^comp-\w+$/.test(listener.handler.moduleName) ? '$comp' : listener.handler.moduleName,
562
+ code: listener.handler.code,
560
563
  params: data,
561
564
  },
562
565
  isCapturePhase: listener.isCapturePhase,
@@ -570,7 +573,7 @@ function serializeListener(ctx, listener) {
570
573
  return platfromListener;
571
574
  }
572
575
  function deserializeListener(ctx, listener) {
573
- var _a, _b, _c, _d;
576
+ var _a, _b, _c, _d, _e;
574
577
  let processed = {
575
578
  key: listener.id,
576
579
  trigger: listener.eventName,
@@ -578,8 +581,9 @@ function deserializeListener(ctx, listener) {
578
581
  handler: {
579
582
  name: (_a = listener.handler) === null || _a === void 0 ? void 0 : _a.name,
580
583
  moduleName: (_b = listener.handler) === null || _b === void 0 ? void 0 : _b.module,
584
+ code: (_c = listener.handler) === null || _c === void 0 ? void 0 : _c.code,
581
585
  },
582
- data: deserializeDynamicMap(ctx, ((_c = listener.handler) === null || _c === void 0 ? void 0 : _c.params) || {}, ((_d = listener === null || listener === void 0 ? void 0 : listener.extra) === null || _d === void 0 ? void 0 : _d.handlerParamExtraData) || {}),
586
+ data: deserializeDynamicMap(ctx, ((_d = listener.handler) === null || _d === void 0 ? void 0 : _d.params) || {}, ((_e = listener === null || listener === void 0 ? void 0 : listener.extra) === null || _e === void 0 ? void 0 : _e.handlerParamExtraData) || {}),
583
587
  isCapturePhase: !!listener.isCapturePhase,
584
588
  // TODO
585
589
  noPropagation: !!listener.noPropagation,
package/lib/parser/cals/utils/code/index.d.ts CHANGED
@@ -28,9 +28,4 @@ export declare function checkForConflicts(code: string): boolean;
28
28
  * 以 from 为准自动解决冲突
29
29
  */
30
30
  export declare function autoResolveConflicts(code: string, from: 'theirs' | 'ours'): string;
31
- export declare function findAllConflicts(code: string, onlyFindFirstOne?: boolean): {
32
- start: number;
33
- middle: number;
34
- end: number;
35
- }[];
36
31
  //# sourceMappingURL=index.d.ts.map
package/lib/parser/cals/utils/code/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAsE,MAAM,mBAAmB,CAAC;AAKrH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAyL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,gBAAgB,GAAE,OAAe,GAChC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAoClD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAsE,MAAM,mBAAmB,CAAC;AAKrH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAyL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}
package/lib/parser/cals/utils/code/index.js CHANGED
@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
7
7
  return (mod && mod.__esModule) ? mod : { "default": mod };
8
8
  };
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
- exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = void 0;
10
+ exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = void 0;
11
11
  const types_1 = require("../../../../types");
12
12
  const pick_1 = __importDefault(require("lodash/pick"));
13
13
  const omit_1 = __importDefault(require("lodash/omit"));
@@ -357,7 +357,7 @@ function findAllConflicts(code, onlyFindFirstOne = false) {
357
357
  let oneConflict = { start: -1, middle: -1, end: -1 };
358
358
  for (let i = 0, leng = lines.length; i < leng; i++) {
359
359
  const line = lines[i];
360
- if (/^<<<<<<<.*/.test(line)) {
360
+ if (/^<<<<<<<$/.test(line)) {
361
361
  if (oneConflict.start === -1) {
362
362
  // 起点
363
363
  oneConflict.start = i;
@@ -376,7 +376,7 @@ function findAllConflicts(code, onlyFindFirstOne = false) {
376
376
  }
377
377
  }
378
378
  }
379
- else if (/^>>>>>>>.*/.test(line)) {
379
+ else if (/^>>>>>>>$/.test(line)) {
380
380
  if (oneConflict.start !== -1 && oneConflict.middle !== -1) {
381
381
  oneConflict.end = i;
382
382
  allConflicts.push(oneConflict);
@@ -389,4 +389,3 @@ function findAllConflicts(code, onlyFindFirstOne = false) {
389
389
  }
390
390
  return allConflicts;
391
391
  }
392
- exports.findAllConflicts = findAllConflicts;
package/lib/parser/cals/utils/common.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { IPlatformApp } from '../../../types';
2
2
  import { IDataBind } from '../../expression/index';
3
- declare type IUsedComps = {
3
+ declare type IUsedComponentResources = {
4
4
  [libName: string]: Set<string>;
5
5
  };
6
6
  export declare function camelcase(str: string, firstUpperCase?: boolean): string;
@@ -9,10 +9,14 @@ export declare const isEmptyObj: (obj: object) => boolean;
9
9
  export declare function isValidStyleBind(styleBind: IDataBind): boolean;
10
10
  export declare function isValidClassNameListBind(classNameListBind: IDataBind): boolean;
11
11
  export declare function getUsedComps(apps: IPlatformApp[], dependencies: any[], options?: {
12
+ withAction?: boolean;
12
13
  /**
13
14
  * templates 按需引入
14
15
  */
15
16
  streamline: boolean;
16
- }): IUsedComps;
17
+ }): IUsedComponentResources | {
18
+ component: IUsedComponentResources;
19
+ action: Record<string, Set<string>>;
20
+ };
17
21
  export {};
18
22
  //# sourceMappingURL=common.d.ts.map
package/lib/parser/cals/utils/common.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAsB,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAYnD,aAAK,UAAU,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAGrD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAQ,UAQ5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,YAUrC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AA2FD,wBAAgB,YAAY,CAE1B,IAAI,EAAE,YAAY,EAAE,EAEpB,YAAY,EAAE,GAAG,EAAE,EACnB,OAAO,CAAC,EAAE;IACR;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,cAsDF"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAsB,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAqBnD,aAAK,uBAAuB,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAOlE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAQ,UAQ5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,YAUrC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AAsHD,wBAAgB,YAAY,CAE1B,IAAI,EAAE,YAAY,EAAE,EAEpB,YAAY,EAAE,GAAG,EAAE,EACnB,OAAO,CAAC,EAAE;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,GACA,uBAAuB,GAAG;IAAE,SAAS,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CA8EvG"}
package/lib/parser/cals/utils/common.js CHANGED
@@ -49,20 +49,30 @@ function isValidClassNameListBind(classNameListBind) {
49
49
  }
50
50
  exports.isValidClassNameListBind = isValidClassNameListBind;
51
51
  // 递归查询属性树所使用的组件
52
- function getUsedCompsFromProperties(properties, usedComps) {
52
+ function getUsedCompsFromProperties(properties, usedMeta) {
53
53
  for (const id in properties) {
54
- const { xComponent, properties: children } = properties[id];
54
+ const { xComponent, properties: children, xProps = {} } = properties[id];
55
55
  if (xComponent) {
56
56
  // 记录使用到的组件库和组件
57
57
  const { moduleName: libName, name: compName } = xComponent;
58
- if (!usedComps[libName]) {
59
- usedComps[libName] = new Set();
58
+ if (!usedMeta.component[libName]) {
59
+ usedMeta.component[libName] = new Set();
60
+ }
61
+ usedMeta.component[libName].add(compName);
62
+ }
63
+ for (const listener of (xProps === null || xProps === void 0 ? void 0 : xProps.listeners) || []) {
64
+ if (listener.type === utils_1.ActionType.Material) {
65
+ const { moduleName, name } = listener.handler || {};
66
+ const libName = moduleName || utils_1.OFFICIAL_LIB_KEY;
67
+ if (!usedMeta.action[libName]) {
68
+ usedMeta.action[libName] = new Set();
69
+ }
70
+ usedMeta.action[libName].add(name);
60
71
  }
61
- usedComps[libName].add(compName);
62
72
  }
63
73
  if (children) {
64
74
  // 遍历下一层属性树
65
- getUsedCompsFromProperties(children, usedComps);
75
+ getUsedCompsFromProperties(children, usedMeta);
66
76
  }
67
77
  }
68
78
  }
@@ -74,10 +84,25 @@ function getUsedCompsFromIPlatformComponent(comp, used, options) {
74
84
  // 非 slot
75
85
  if (comp.component) {
76
86
  const module = comp.module || utils_1.OFFICIAL_LIB_KEY;
77
- if (!used[module]) {
78
- used[module] = new Set([]);
87
+ if (!used.component[module]) {
88
+ used.component[module] = new Set([]);
79
89
  }
80
- used[module].add(comp.component);
90
+ used.component[module].add(comp.component);
91
+ }
92
+ if (options === null || options === void 0 ? void 0 : options.withAction) {
93
+ const { listeners = [] } = comp;
94
+ listeners.forEach((listener) => {
95
+ var _a, _b;
96
+ if (listener.type === utils_1.ActionType.Material) {
97
+ const module = listener.handler.module || utils_1.OFFICIAL_LIB_KEY;
98
+ if (!used.action[module]) {
99
+ used.action[module] = new Set([]);
100
+ }
101
+ if ((_a = listener.handler) === null || _a === void 0 ? void 0 : _a.name) {
102
+ used.action[module].add((_b = listener.handler) === null || _b === void 0 ? void 0 : _b.name);
103
+ }
104
+ }
105
+ });
81
106
  }
82
107
  (_b = (_a = comp.items) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (item) => {
83
108
  getUsedCompsFromIPlatformComponent(item, used, options);
@@ -86,22 +111,22 @@ function getUsedCompsFromIPlatformComponent(comp, used, options) {
86
111
  // 递归查询复合组件库所使用的组件
87
112
  function getUsedCompsFromCompositedLibsRecursively(
88
113
  // 已知的被使用到的组件
89
- usedComps,
114
+ usedMeta,
90
115
  // 已知的被遍历过的组件
91
116
  checkedComps,
92
117
  // 全量复合组件库
93
118
  compositedLibMap,
94
119
  // 新增的被使用到的组件
95
- addedUsedComps) {
120
+ addedUsedMeta) {
96
121
  // 开始遍历已知的被使用到的组件库
97
- Object.keys(usedComps).forEach((libName) => {
122
+ Object.keys(usedMeta.component).forEach((libName) => {
98
123
  if (!compositedLibMap.has(libName)) {
99
124
  // 不是复合组件库, 不需要继续遍历
100
125
  return;
101
126
  }
102
127
  // 遍历复合组件库
103
128
  const lib = compositedLibMap.get(libName);
104
- const cmpNames = usedComps[libName];
129
+ const cmpNames = usedMeta.component[libName];
105
130
  cmpNames.forEach((cmpName) => {
106
131
  // 找到复合组件的内容
107
132
  const cmp = lib.components.find((c) => c.name === cmpName);
@@ -116,20 +141,22 @@ addedUsedComps) {
116
141
  }
117
142
  // 该复合组件第一次入栈, 则需要记录并继续递归它的内容
118
143
  checkedComps.push(cmp);
119
- const usedCompsOfThisComp = {};
144
+ const usedMetaOfThisComp = { component: {}, action: {} };
120
145
  // 和遍历应用内容一样, 遍历低码组件内容, 寻找出组件自身引用的所有组件
121
- getUsedCompsFromProperties(cmp.componentInstances, usedCompsOfThisComp);
122
- Object.keys(usedCompsOfThisComp).forEach((libName) => {
123
- // 开始记录新增的被使用的组件库
124
- if (!addedUsedComps[libName]) {
125
- addedUsedComps[libName] = usedCompsOfThisComp[libName];
126
- }
127
- else {
128
- usedCompsOfThisComp[libName].forEach((n) => addedUsedComps[libName].add(n));
129
- }
146
+ getUsedCompsFromProperties(cmp.componentInstances, usedMetaOfThisComp);
147
+ ['component', 'action'].forEach((type) => {
148
+ Object.keys(usedMetaOfThisComp[type]).forEach((libName) => {
149
+ // 开始记录新增的被使用的组件库
150
+ if (!addedUsedMeta[type][libName]) {
151
+ addedUsedMeta[type][libName] = usedMetaOfThisComp[type][libName];
152
+ }
153
+ else {
154
+ usedMetaOfThisComp[type][libName].forEach((n) => addedUsedMeta[type][libName].add(n));
155
+ }
156
+ });
130
157
  });
131
158
  // 递归遍历
132
- getUsedCompsFromCompositedLibsRecursively(usedCompsOfThisComp, checkedComps, compositedLibMap, addedUsedComps);
159
+ getUsedCompsFromCompositedLibsRecursively(usedMetaOfThisComp, checkedComps, compositedLibMap, addedUsedMeta);
133
160
  });
134
161
  });
135
162
  }
@@ -139,38 +166,52 @@ function getUsedComps(
139
166
  apps,
140
167
  // 分库后的组件库 denpendienicy
141
168
  dependencies, options) {
142
- const { streamline = false } = options || {};
169
+ const { streamline = false, withAction = false } = options || {};
143
170
  const { templates = [] } = (apps === null || apps === void 0 ? void 0 : apps[0]) || {};
144
171
  const comps = streamline ? [...dependencies, (0, index_1.processTemplatesToDependiencies)(templates)] : dependencies;
145
172
  // 1. 寻找应用内容里用到的所有组件
146
173
  // 1.1 寻找主子应用各自的内容里所用到的组件
147
174
  const appUsedComps = apps.map((app) => {
148
175
  var _a, _b, _c, _d;
149
- const usedComps = {};
176
+ const usedMeta = {
177
+ component: {},
178
+ action: {},
179
+ };
150
180
  // 主子包模式下, 可能没有应用内容
151
181
  (_b = (_a = app.items) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (page) => {
152
182
  var _a, _b;
153
183
  (_b = (_a = page === null || page === void 0 ? void 0 : page.items) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (comp) => {
154
- getUsedCompsFromIPlatformComponent(comp, usedComps, options);
184
+ getUsedCompsFromIPlatformComponent(comp, usedMeta, options);
155
185
  });
156
186
  });
157
187
  if (!streamline) {
158
188
  (_d = (_c = app.templates) === null || _c === void 0 ? void 0 : _c.forEach) === null || _d === void 0 ? void 0 : _d.call(_c, (template) => {
159
189
  var _a;
160
190
  (_a = template.items) === null || _a === void 0 ? void 0 : _a.forEach((comp) => {
161
- getUsedCompsFromIPlatformComponent(comp, usedComps, options);
191
+ getUsedCompsFromIPlatformComponent(comp, usedMeta, options);
162
192
  });
163
193
  });
164
194
  }
165
- return usedComps;
195
+ return usedMeta;
166
196
  });
167
197
  // 1.2 合并主子包所有用到的组件
168
- const mergeAppUsedComps = appUsedComps.reduce((comps, item) => {
169
- for (const libName in item) {
170
- comps[libName] = new Set([...Array.from(item[libName]), ...Array.from(comps[libName] || [])]);
198
+ const mergeAppUsedMeta = appUsedComps.reduce((meta, item) => {
199
+ if (!meta.component) {
200
+ meta.component = {};
171
201
  }
172
- return comps;
173
- }, {});
202
+ if (!meta.action) {
203
+ meta.action = {};
204
+ }
205
+ ['component', 'action'].forEach((type) => {
206
+ Object.entries(item[type] || {}).forEach(([libName]) => {
207
+ meta[type][libName] = new Set([
208
+ ...Array.from(item[type][libName]),
209
+ ...Array.from(meta[type][libName] || []),
210
+ ]);
211
+ });
212
+ });
213
+ return meta;
214
+ }, { component: {}, action: {} });
174
215
  // 2. 寻找应用内容的复合组件里嵌套的其他组件(复合组件即低码组件)
175
216
  // 2.1 过滤出复合组件库
176
217
  const compositedLibMap = new Map();
@@ -180,15 +221,18 @@ dependencies, options) {
180
221
  }
181
222
  });
182
223
  // 2.2 递归查询复合组件库所使用的组件
183
- const libUsedComps = {};
184
- getUsedCompsFromCompositedLibsRecursively(mergeAppUsedComps, [], compositedLibMap, libUsedComps);
224
+ const libUsedMeta = { component: {}, action: {} };
225
+ getUsedCompsFromCompositedLibsRecursively(mergeAppUsedMeta, [], compositedLibMap, libUsedMeta);
185
226
  // 3. 合并[应用内容用到的组件]和[复合组件库用到的组件]
186
- const allUsedComps = [mergeAppUsedComps, libUsedComps].reduce((comps, item) => {
187
- for (const libName in item) {
188
- comps[libName] = new Set([...Array.from(item[libName]), ...Array.from(comps[libName] || [])]);
189
- }
190
- return comps;
191
- }, {});
192
- return allUsedComps;
227
+ const allMeta = { component: {}, action: {} };
228
+ ['component', 'action'].forEach((type) => {
229
+ allMeta[type] = [mergeAppUsedMeta[type], libUsedMeta[type]].reduce((comps, item) => {
230
+ for (const libName in item) {
231
+ comps[libName] = new Set([...Array.from(item[libName]), ...Array.from(comps[libName] || [])]);
232
+ }
233
+ return comps;
234
+ }, {});
235
+ });
236
+ return withAction ? allMeta : allMeta.component;
193
237
  }
194
238
  exports.getUsedComps = getUsedComps;
package/lib/parser/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export * from './cals/index';
2
2
  export { upgrageToVersion2 } from './cals/utils/version';
3
3
  export { processComponentModule } from './cals/utils/spinoff';
4
- export { calsToCode, codeToCals, type ICodeItem, checkForConflicts, autoResolveConflicts, findAllConflicts } from './cals/utils/code';
4
+ export { calsToCode, codeToCals, type ICodeItem, checkForConflicts, autoResolveConflicts } from './cals/utils/code';
5
5
  export { parseComponentCals } from './cals/utils/block';
6
6
  export { ActionType, type IDataBind, PropBindType } from './expression/index';
7
7
  export { processCommonStyle2CSSProperties, processCSSProperties2Rem, processCSSPropertiesUnit, } from './cals/utils/style';
package/lib/parser/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACtI,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpH,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC"}
package/lib/parser/index.js CHANGED
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
17
17
  return (mod && mod.__esModule) ? mod : { "default": mod };
18
18
  };
19
19
  Object.defineProperty(exports, "__esModule", { value: true });
20
- exports.PostcssRpx2Calc = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.parseComponentCals = exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
20
+ exports.PostcssRpx2Calc = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.parseComponentCals = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
21
21
  __exportStar(require("./cals/index"), exports);
22
22
  var version_1 = require("./cals/utils/version");
23
23
  Object.defineProperty(exports, "upgrageToVersion2", { enumerable: true, get: function () { return version_1.upgrageToVersion2; } });
@@ -28,7 +28,6 @@ Object.defineProperty(exports, "calsToCode", { enumerable: true, get: function (
28
28
  Object.defineProperty(exports, "codeToCals", { enumerable: true, get: function () { return code_1.codeToCals; } });
29
29
  Object.defineProperty(exports, "checkForConflicts", { enumerable: true, get: function () { return code_1.checkForConflicts; } });
30
30
  Object.defineProperty(exports, "autoResolveConflicts", { enumerable: true, get: function () { return code_1.autoResolveConflicts; } });
31
- Object.defineProperty(exports, "findAllConflicts", { enumerable: true, get: function () { return code_1.findAllConflicts; } });
32
31
  var block_1 = require("./cals/utils/block");
33
32
  Object.defineProperty(exports, "parseComponentCals", { enumerable: true, get: function () { return block_1.parseComponentCals; } });
34
33
  var index_1 = require("./expression/index");
package/lib/types/basic/common.d.ts CHANGED
@@ -46,10 +46,14 @@ export interface IHandler {
46
46
  * 可选, 处理器所属的模块
47
47
  */
48
48
  module?: string;
49
+ /**
50
+ * 可选，handler inline 代码
51
+ */
52
+ code?: string;
49
53
  /**
50
54
  * 可选, 处理器的入参
51
55
  */
52
- params?: object;
56
+ params?: object | any[];
53
57
  }
54
58
  /** 变量 */
55
59
  export interface IDataset {
package/lib/types/basic/common.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/basic/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,CAAC,CAAC;IAC7C,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW;IACX,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU;IACV,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/basic/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;CACzB;AAED,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,CAAC,CAAC;IAC7C,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW;IACX,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU;IACV,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/cals",
3
- "version": "1.0.41-alpha.0",
3
+ "version": "1.0.41-alpha.1",
4
4
  "description": "Common application specifications",
5
5
  "main": "lib/utils/index.js",
6
6
  "source": "src/utils/index.ts",