@cloudbase/cals 1.0.41-alpha.1 → 1.0.41

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 +0 -4
  2. package/lib/parser/cals/index.d.ts.map +1 -1
  3. package/lib/parser/cals/index.js +3 -7
  4. package/lib/parser/cals/utils/code/index.d.ts +5 -0
  5. package/lib/parser/cals/utils/code/index.d.ts.map +1 -1
  6. package/lib/parser/cals/utils/code/index.js +4 -3
  7. package/lib/parser/cals/utils/common.d.ts +2 -6
  8. package/lib/parser/cals/utils/common.d.ts.map +1 -1
  9. package/lib/parser/cals/utils/common.js +43 -87
  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 +2 -1
  13. package/lib/types/lcds.d.ts +1 -1
  14. package/lib/types/lcds.d.ts.map +1 -1
  15. package/package.json +1 -1
package/lib/parser/cals/index.d.ts CHANGED
@@ -194,7 +194,6 @@ export declare function deserializePage(ctx: {
194
194
  handler: {
195
195
  name: string;
196
196
  moduleName: string;
197
- code: string;
198
197
  };
199
198
  data: {
200
199
  [key: string]: IDynamicValue;
@@ -210,7 +209,6 @@ export declare function deserializePage(ctx: {
210
209
  handler: {
211
210
  name: string;
212
211
  moduleName: string;
213
- code: string;
214
212
  };
215
213
  data: {
216
214
  [key: string]: IDynamicValue;
@@ -286,7 +284,6 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
286
284
  handler: {
287
285
  name: string;
288
286
  moduleName: string;
289
- code: string;
290
287
  };
291
288
  data: {
292
289
  [key: string]: IDynamicValue;
@@ -302,7 +299,6 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
302
299
  handler: {
303
300
  name: string;
304
301
  moduleName: string;
305
- code: string;
306
302
  };
307
303
  data: {
308
304
  [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(DYNAMIC_KEY_REG);
183
+ let matched = processedKey.match(/^:(.*)$/);
184
184
  let originKey = processedKey;
185
185
  if (matched) {
186
186
  originKey = matched[1];
@@ -387,7 +387,6 @@ 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,
391
390
  params: mergedData,
392
391
  }, listeners: (_c = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _c === void 0 ? void 0 : _c.call(listeners, (listener) => serializeListener(ctx, listener)) });
393
392
  });
@@ -445,7 +444,6 @@ function deserializeDataset(ctx, dataset) {
445
444
  result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
446
445
  moduleName: handler === null || handler === void 0 ? void 0 : handler.module,
447
446
  name: (handler === null || handler === void 0 ? void 0 : handler.name) || '',
448
- code: handler === null || handler === void 0 ? void 0 : handler.code,
449
447
  }, 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) => {
450
448
  return deserializeListener(ctx, listener);
451
449
  }) });
@@ -559,7 +557,6 @@ function serializeListener(ctx, listener) {
559
557
  handler: {
560
558
  name: listener.handler.name,
561
559
  module: /^comp-\w+$/.test(listener.handler.moduleName) ? '$comp' : listener.handler.moduleName,
562
- code: listener.handler.code,
563
560
  params: data,
564
561
  },
565
562
  isCapturePhase: listener.isCapturePhase,
@@ -573,7 +570,7 @@ function serializeListener(ctx, listener) {
573
570
  return platfromListener;
574
571
  }
575
572
  function deserializeListener(ctx, listener) {
576
- var _a, _b, _c, _d, _e;
573
+ var _a, _b, _c, _d;
577
574
  let processed = {
578
575
  key: listener.id,
579
576
  trigger: listener.eventName,
@@ -581,9 +578,8 @@ function deserializeListener(ctx, listener) {
581
578
  handler: {
582
579
  name: (_a = listener.handler) === null || _a === void 0 ? void 0 : _a.name,
583
580
  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,
585
581
  },
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) || {}),
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) || {}),
587
583
  isCapturePhase: !!listener.isCapturePhase,
588
584
  // TODO
589
585
  noPropagation: !!listener.noPropagation,
package/lib/parser/cals/utils/code/index.d.ts CHANGED
@@ -28,4 +28,9 @@ 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
+ }[];
31
36
  //# 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"}
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"}
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.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = void 0;
10
+ exports.findAllConflicts = 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,3 +389,4 @@ 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 IUsedComponentResources = {
3
+ declare type IUsedComps = {
4
4
  [libName: string]: Set<string>;
5
5
  };
6
6
  export declare function camelcase(str: string, firstUpperCase?: boolean): string;
@@ -9,14 +9,10 @@ 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;
13
12
  /**
14
13
  * templates 按需引入
15
14
  */
16
15
  streamline: boolean;
17
- }): IUsedComponentResources | {
18
- component: IUsedComponentResources;
19
- action: Record<string, Set<string>>;
20
- };
16
+ }): IUsedComps;
21
17
  export {};
22
18
  //# 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;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"}
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"}
package/lib/parser/cals/utils/common.js CHANGED
@@ -49,30 +49,20 @@ function isValidClassNameListBind(classNameListBind) {
49
49
  }
50
50
  exports.isValidClassNameListBind = isValidClassNameListBind;
51
51
  // 递归查询属性树所使用的组件
52
- function getUsedCompsFromProperties(properties, usedMeta) {
52
+ function getUsedCompsFromProperties(properties, usedComps) {
53
53
  for (const id in properties) {
54
- const { xComponent, properties: children, xProps = {} } = properties[id];
54
+ const { xComponent, properties: children } = properties[id];
55
55
  if (xComponent) {
56
56
  // 记录使用到的组件库和组件
57
57
  const { moduleName: libName, name: compName } = xComponent;
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);
58
+ if (!usedComps[libName]) {
59
+ usedComps[libName] = new Set();
71
60
  }
61
+ usedComps[libName].add(compName);
72
62
  }
73
63
  if (children) {
74
64
  // 遍历下一层属性树
75
- getUsedCompsFromProperties(children, usedMeta);
65
+ getUsedCompsFromProperties(children, usedComps);
76
66
  }
77
67
  }
78
68
  }
@@ -84,25 +74,10 @@ function getUsedCompsFromIPlatformComponent(comp, used, options) {
84
74
  // 非 slot
85
75
  if (comp.component) {
86
76
  const module = comp.module || utils_1.OFFICIAL_LIB_KEY;
87
- if (!used.component[module]) {
88
- used.component[module] = new Set([]);
77
+ if (!used[module]) {
78
+ used[module] = new Set([]);
89
79
  }
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
- });
80
+ used[module].add(comp.component);
106
81
  }
107
82
  (_b = (_a = comp.items) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (item) => {
108
83
  getUsedCompsFromIPlatformComponent(item, used, options);
@@ -111,22 +86,22 @@ function getUsedCompsFromIPlatformComponent(comp, used, options) {
111
86
  // 递归查询复合组件库所使用的组件
112
87
  function getUsedCompsFromCompositedLibsRecursively(
113
88
  // 已知的被使用到的组件
114
- usedMeta,
89
+ usedComps,
115
90
  // 已知的被遍历过的组件
116
91
  checkedComps,
117
92
  // 全量复合组件库
118
93
  compositedLibMap,
119
94
  // 新增的被使用到的组件
120
- addedUsedMeta) {
95
+ addedUsedComps) {
121
96
  // 开始遍历已知的被使用到的组件库
122
- Object.keys(usedMeta.component).forEach((libName) => {
97
+ Object.keys(usedComps).forEach((libName) => {
123
98
  if (!compositedLibMap.has(libName)) {
124
99
  // 不是复合组件库, 不需要继续遍历
125
100
  return;
126
101
  }
127
102
  // 遍历复合组件库
128
103
  const lib = compositedLibMap.get(libName);
129
- const cmpNames = usedMeta.component[libName];
104
+ const cmpNames = usedComps[libName];
130
105
  cmpNames.forEach((cmpName) => {
131
106
  // 找到复合组件的内容
132
107
  const cmp = lib.components.find((c) => c.name === cmpName);
@@ -141,22 +116,20 @@ addedUsedMeta) {
141
116
  }
142
117
  // 该复合组件第一次入栈, 则需要记录并继续递归它的内容
143
118
  checkedComps.push(cmp);
144
- const usedMetaOfThisComp = { component: {}, action: {} };
119
+ const usedCompsOfThisComp = {};
145
120
  // 和遍历应用内容一样, 遍历低码组件内容, 寻找出组件自身引用的所有组件
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
- });
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
+ }
157
130
  });
158
131
  // 递归遍历
159
- getUsedCompsFromCompositedLibsRecursively(usedMetaOfThisComp, checkedComps, compositedLibMap, addedUsedMeta);
132
+ getUsedCompsFromCompositedLibsRecursively(usedCompsOfThisComp, checkedComps, compositedLibMap, addedUsedComps);
160
133
  });
161
134
  });
162
135
  }
@@ -166,52 +139,38 @@ function getUsedComps(
166
139
  apps,
167
140
  // 分库后的组件库 denpendienicy
168
141
  dependencies, options) {
169
- const { streamline = false, withAction = false } = options || {};
142
+ const { streamline = false } = options || {};
170
143
  const { templates = [] } = (apps === null || apps === void 0 ? void 0 : apps[0]) || {};
171
144
  const comps = streamline ? [...dependencies, (0, index_1.processTemplatesToDependiencies)(templates)] : dependencies;
172
145
  // 1. 寻找应用内容里用到的所有组件
173
146
  // 1.1 寻找主子应用各自的内容里所用到的组件
174
147
  const appUsedComps = apps.map((app) => {
175
148
  var _a, _b, _c, _d;
176
- const usedMeta = {
177
- component: {},
178
- action: {},
179
- };
149
+ const usedComps = {};
180
150
  // 主子包模式下, 可能没有应用内容
181
151
  (_b = (_a = app.items) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, (page) => {
182
152
  var _a, _b;
183
153
  (_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) => {
184
- getUsedCompsFromIPlatformComponent(comp, usedMeta, options);
154
+ getUsedCompsFromIPlatformComponent(comp, usedComps, options);
185
155
  });
186
156
  });
187
157
  if (!streamline) {
188
158
  (_d = (_c = app.templates) === null || _c === void 0 ? void 0 : _c.forEach) === null || _d === void 0 ? void 0 : _d.call(_c, (template) => {
189
159
  var _a;
190
160
  (_a = template.items) === null || _a === void 0 ? void 0 : _a.forEach((comp) => {
191
- getUsedCompsFromIPlatformComponent(comp, usedMeta, options);
161
+ getUsedCompsFromIPlatformComponent(comp, usedComps, options);
192
162
  });
193
163
  });
194
164
  }
195
- return usedMeta;
165
+ return usedComps;
196
166
  });
197
167
  // 1.2 合并主子包所有用到的组件
198
- const mergeAppUsedMeta = appUsedComps.reduce((meta, item) => {
199
- if (!meta.component) {
200
- meta.component = {};
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] || [])]);
201
171
  }
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: {} });
172
+ return comps;
173
+ }, {});
215
174
  // 2. 寻找应用内容的复合组件里嵌套的其他组件(复合组件即低码组件)
216
175
  // 2.1 过滤出复合组件库
217
176
  const compositedLibMap = new Map();
@@ -221,18 +180,15 @@ dependencies, options) {
221
180
  }
222
181
  });
223
182
  // 2.2 递归查询复合组件库所使用的组件
224
- const libUsedMeta = { component: {}, action: {} };
225
- getUsedCompsFromCompositedLibsRecursively(mergeAppUsedMeta, [], compositedLibMap, libUsedMeta);
183
+ const libUsedComps = {};
184
+ getUsedCompsFromCompositedLibsRecursively(mergeAppUsedComps, [], compositedLibMap, libUsedComps);
226
185
  // 3. 合并[应用内容用到的组件]和[复合组件库用到的组件]
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;
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;
237
193
  }
238
194
  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 } from './cals/utils/code';
4
+ export { calsToCode, codeToCals, type ICodeItem, checkForConflicts, autoResolveConflicts, findAllConflicts } 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,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"}
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"}
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.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.findAllConflicts = 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,6 +28,7 @@ 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; } });
31
32
  var block_1 = require("./cals/utils/block");
32
33
  Object.defineProperty(exports, "parseComponentCals", { enumerable: true, get: function () { return block_1.parseComponentCals; } });
33
34
  var index_1 = require("./expression/index");
package/lib/types/lcds.d.ts CHANGED
@@ -424,7 +424,7 @@ export interface IRenderMode {
424
424
  description?: string;
425
425
  }
426
426
  /** 组件/方法/属性所支持的平台 */
427
- export declare type XPlatform = 'MP' | 'WEB' | 'PCWEB' | 'MOBILEWEB';
427
+ export declare type XPlatform = 'MP' | 'WEB' | 'MOBILE' | 'PCWEB' | 'MOBILEWEB';
428
428
  /** 组件在应用编辑器/低码编辑器的生效情况*/
429
429
  export declare type VisibleItem = 'APP' | 'COMPONENT';
430
430
  /** 组件模板配置 */
package/lib/types/lcds.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lcds.d.ts","sourceRoot":"","sources":["../../src/types/lcds.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lcds.d.ts","sourceRoot":"","sources":["../../src/types/lcds.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;;OAGG;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAErB;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;IAErB;;OAEG;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE;QACX;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAErB;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;WAKG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;WAEG;QACH,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;QACvB;;;WAGG;QACH,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;QACxB;;;WAGG;QACH,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;QAExB;;;WAGG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;QAErB;;;WAGG;QACH,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;QAE3B;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,QAAQ,CAAC,EAAE,SAAS,CAAC;QAErB;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtC;;;WAGG;QACH,kBAAkB,CAAC,EAAE;YACnB;;eAEG;YACH,aAAa,CAAC,EAAE;gBACd;;mBAEG;gBACH,aAAa,EAAE,MAAM,CAAC;gBACtB;;mBAEG;gBACH,SAAS,CAAC,EAAE,OAAO,CAAC;gBAEpB;;mBAEG;gBACH,GAAG,CAAC,EAAE,MAAM,CAAC;aACd,EAAE,CAAC;YACJ;;eAEG;YACH,WAAW,CAAC,EAAE;gBACZ;;mBAEG;gBACH,aAAa,EAAE,MAAM,CAAC;gBACtB;;mBAEG;gBACH,SAAS,EAAE,OAAO,CAAC;gBACnB;;mBAEG;gBACH,GAAG,CAAC,EAAE,MAAM,CAAC;aACd,EAAE,CAAC;SACL,CAAC;QACF;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAEpB;;;WAGG;QACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAE3B;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAE5B;;;WAGG;QACH,QAAQ,CAAC,EAAE;YACT;;eAEG;YACH,IAAI,EAAE,MAAM,CAAC;YAEb,OAAO,CAAC,EAAE;gBACR;;mBAEG;gBACH,KAAK,EAAE,MAAM,CAAC;gBACd;;mBAEG;gBACH,WAAW,EAAE,MAAM,CAAC;gBACpB;;mBAEG;gBACH,IAAI,EAAE,MAAM,CAAC;gBACb;;mBAEG;gBACH,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd;;mBAEG;gBACH,KAAK,CAAC,EAAE,MAAM,CAAC;gBACf;;mBAEG;gBACH,OAAO,CAAC,EAAE,MAAM,CAAC;gBACjB;;mBAEG;gBACH,OAAO,CAAC,EAAE,MAAM,CAAC;gBACjB;;mBAEG;gBACH,YAAY,CAAC,EAAE,OAAO,CAAC;gBACvB;;mBAEG;gBACH,uBAAuB,CAAC,EAAE,CAAC,IAAI,GAAG,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC;gBAC1D;;mBAEG;gBACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC;gBAC7D;;mBAEG;gBACH,KAAK,CAAC,EAAE,GAAG,CAAC;gBAEZ,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACjC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;aACtB,CAAC;SACH,EAAE,CAAC;QAEJ;;;WAGG;QACH,eAAe,CAAC,EACZ;YACE,CAAC,GAAG,EAAE,MAAM,GAAG;gBACb,OAAO,EAAE,OAAO,CAAC;aAClB,CAAC;SACH,GACD;YAAE,WAAW,EAAE,IAAI,CAAA;SAAE,CAAC;QAE1B;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC/D;;WAEG;QACH,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC;IAEZ;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,aAAa,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAChD;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,EAAE,GAAG,kBAAkB,EAAE,CAAC;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,GAAG,CAAC;IACb;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACH,KAAK,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAEnC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAqB;AACrB,oBAAY,SAAS,GAAG,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC;AAExE,yBAAyB;AACzB,oBAAY,WAAW,GAAG,KAAK,GAAG,WAAW,CAAC;AAE9C,aAAa;AACb,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,EAAE,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC1B;;;OAGG;IACH,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC5B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,cAAc,CAAC,EAAE,WAAW,MAAM,EAAE,CAAC;CACtC;AAED,eAAe;AACf,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CACZ,MAAM,EACN;QACE,aAAa,EAAE,WAAW,CAAC;QAC3B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CACF,CAAC;CACH;AAED,eAAe;AACf,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,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.1",
3
+ "version": "1.0.41",
4
4
  "description": "Common application specifications",
5
5
  "main": "lib/utils/index.js",
6
6
  "source": "src/utils/index.ts",