@cloudbase/cals 0.3.30-alpha.0 → 0.3.31-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 (46) hide show
  1. package/lib/parser/cals/index.d.ts +1 -2
  2. package/lib/parser/cals/index.d.ts.map +1 -1
  3. package/lib/parser/cals/index.js +21 -10
  4. package/lib/parser/cals/utils/block/index.d.ts.map +1 -1
  5. package/lib/parser/cals/utils/code/index.d.ts +31 -0
  6. package/lib/parser/cals/utils/code/index.d.ts.map +1 -0
  7. package/lib/parser/cals/utils/code/index.js +364 -0
  8. package/lib/parser/cals/utils/runtime.d.ts.map +1 -1
  9. package/lib/parser/cals/utils/runtime.js +0 -2
  10. package/lib/parser/cals/utils/spinoff/index.d.ts.map +1 -1
  11. package/lib/parser/cals/utils/style.d.ts.map +1 -1
  12. package/lib/parser/cals/utils/version/common.d.ts.map +1 -1
  13. package/lib/parser/cals/utils/version/common.js +3 -6
  14. package/lib/parser/cals/utils/version/config.d.ts.map +1 -1
  15. package/lib/parser/cals/utils/version/config.js +1 -6
  16. package/lib/parser/cals/utils/version/index.d.ts.map +1 -1
  17. package/lib/parser/cals/utils/version/parses.d.ts.map +1 -1
  18. package/lib/parser/cals/utils/version/utils.d.ts.map +1 -1
  19. package/lib/parser/cals/utils/version/utils.js +1 -3
  20. package/lib/parser/expression/index.d.ts.map +1 -1
  21. package/lib/parser/expression/index.js +2 -4
  22. package/lib/parser/index.d.ts +1 -0
  23. package/lib/parser/index.d.ts.map +1 -1
  24. package/lib/parser/index.js +7 -1
  25. package/lib/types/basic/app.d.ts.map +1 -1
  26. package/lib/types/basic/common.d.ts.map +1 -1
  27. package/lib/types/basic/component.d.ts.map +1 -1
  28. package/lib/types/basic/datasource.d.ts.map +1 -1
  29. package/lib/types/index.d.ts.map +1 -1
  30. package/lib/types/lcds.d.ts.map +1 -1
  31. package/lib/types/platform/app.d.ts +4 -0
  32. package/lib/types/platform/app.d.ts.map +1 -1
  33. package/lib/types/platform/common.d.ts +6 -6
  34. package/lib/types/platform/common.d.ts.map +1 -1
  35. package/lib/types/platform/component.d.ts.map +1 -1
  36. package/lib/types/platform/datasource.d.ts +2 -2
  37. package/lib/types/platform/datasource.d.ts.map +1 -1
  38. package/lib/types/platform/widget/form.d.ts.map +1 -1
  39. package/lib/types/platform/widget/meta.d.ts.map +1 -1
  40. package/lib/utils/build.js +8 -8
  41. package/lib/utils/index.d.ts.map +1 -1
  42. package/package.json +1 -1
  43. package/lib/parser/cals/utils/transform/index.d.ts +0 -4
  44. package/lib/parser/cals/utils/transform/index.d.ts.map +0 -1
  45. package/lib/parser/cals/utils/transform/index.js +0 -247
  46. package/lib/tsconfig.tsbuildinfo +0 -1
@@ -166,7 +166,6 @@ export declare function deserializePage(ctx: {
166
166
  };
167
167
  isCapturePhase: boolean;
168
168
  noPropagation: boolean;
169
- extra: object;
170
169
  }[];
171
170
  };
172
171
  /**
@@ -237,7 +236,6 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
237
236
  };
238
237
  isCapturePhase: boolean;
239
238
  noPropagation: boolean;
240
- extra: object;
241
239
  }[];
242
240
  }[];
243
241
  lowCodes: {
@@ -293,6 +291,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
293
291
  author: string;
294
292
  description: string;
295
293
  domain?: string;
294
+ originHistoryId?: string;
296
295
  };
297
296
  dependencies: IDependencies;
298
297
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../parser/cals/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EAGd,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EACL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAc5F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,UAAU,iBAAiB;IACzB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACtB,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,YAAY,EACZ,KAAc,EACd,sBAAsB,GACvB,EAAE;IACD,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,CA6D3C;AAID,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG;;;;;;;EAwC9F;AAED,UAAU,yBAAyB;IACjC,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,yBAAyB;;EAEnE;AA6ED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAA;CAAE,EACpC,QAAQ,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;EAuClC;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,GAAG,WAAW,EAC3B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAO;;EAGlD;AAeD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,UAAU,GAAE,WAAgB,EAC5B,mBAAmB,KAAK;;EAiBzB;AAwMD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,mBAAmB;;;;;;;;EAM3F;AAsFD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,iBAAiB,GACpB,CACI;IACE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,GACD;IACE,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC,CAAC;CACrD,CACJ,EACH,SAAS,EAAE;IACT,UAAU,CAAC,EAAE;QAEX,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,MAAM,CAAC,EAAE;QACP,IAAI,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAA;SAAE,CAAC;QACxC,UAAU,CAAC,EAAE;YACX,IAAI,CAAC,EAAE,aAAa,CAAC;YACrB,KAAK,CAAC,EAAE,aAAa,CAAC;SACvB,CAAC;QACF,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC;QACX,SAAS,EAAE,aAAa,CAAC;QACzB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,EAAE,GAAG,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,uBAAuB,EAAE,MAAM,EAAE,CAAC;KACnC,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAClB,KAAK,GAAE,MAAM,GAAG,WAAoB,GACnC,eAAe,GAAG,iBAAiB,CAkGrC;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,CAAC,eAAe,GAAG,iBAAiB,CAAC,EAAE;;EAqFjH;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,iBAAiB,CAAC,EACxE,IAAI,EAAE,GAAG,GACR,cAAc,CAuDhB;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE;IACH,GAAG,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1C,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAClD,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,IAAI,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgCrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,YAAY,CA6Dd;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,wBAAwB,CAAC,EAC/E,IAAI,EAAE,GAAG,GACR,cAAc,CAmDhB;AAWD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,iBAAiB,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,EACD,SAAS,EAAE,GAAG,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B,eAAe,GAAG,iBAAiB,CAmHrC;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,GAAG,CAwBzE;AAaD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,UAAU,CAAA;KAAE,CAAC;IAC/C,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;KAAE,CAAC;CAC1C;;;;;;;mBAIY,MAAM;mBACN,MAAM;sBACH,MAAM;;;6BACwB,OAAO;;;wBACnC,MAAM;;;EA8BvB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../parser/cals/index.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,6 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
28
28
  if (dynamicValue.type && dynamicValue.type !== 'static') {
29
29
  key = `:${key}`;
30
30
  switch (dynamicValue.type) {
31
- case expression_1.PropBindType.prop:
32
31
  case expression_1.PropBindType.state:
33
32
  case expression_1.PropBindType.computed:
34
33
  case expression_1.PropBindType.dataVar:
@@ -60,6 +59,13 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
60
59
  value = exp.replace(reg, replacer);
61
60
  break;
62
61
  }
62
+ case expression_1.PropBindType.prop: {
63
+ const isNeg = dynamicValue.value.startsWith('!');
64
+ value = isNeg
65
+ ? dynamicValue.value.replace('!', '!$comp.props.data.')
66
+ : `$comp.props.data.${dynamicValue.value}`;
67
+ break;
68
+ }
63
69
  case expression_1.PropBindType.forItem: {
64
70
  value = `$for.${dynamicValue.value}`;
65
71
  break;
@@ -371,22 +377,28 @@ function deserializeDirecties(ctx, directives) {
371
377
  * heander 更新为表达式
372
378
  */
373
379
  function serializeListener(ctx, listener) {
374
- var _a;
375
- return {
380
+ const { data, extra = {} } = serializeDynamicMapWithExtra({
381
+ ctx,
382
+ map: listener.data,
383
+ }) || {};
384
+ const platfromListener = {
376
385
  id: listener.key,
377
386
  eventName: listener.trigger,
378
387
  type: listener.type,
379
388
  handler: {
380
389
  name: listener.handler.name,
381
390
  module: /^comp-\w+$/.test(listener.handler.moduleName) ? '$comp' : listener.handler.moduleName,
382
- params: (_a = serializeDynamicMapWithExtra({
383
- ctx,
384
- map: listener.data,
385
- })) === null || _a === void 0 ? void 0 : _a.data,
386
- extra: listener === null || listener === void 0 ? void 0 : listener.extra,
391
+ params: data,
387
392
  },
388
393
  isCapturePhase: listener.isCapturePhase,
389
394
  };
395
+ if (Object.keys(extra).some((key) => extra[key] !== undefined)) {
396
+ if (!platfromListener.extra) {
397
+ platfromListener.extra = {};
398
+ }
399
+ platfromListener.extra.handlerParamExtraData = extra;
400
+ }
401
+ return platfromListener;
390
402
  }
391
403
  function deserializeListener(ctx, listener) {
392
404
  var _a, _b, _c, _d;
@@ -398,11 +410,10 @@ function deserializeListener(ctx, listener) {
398
410
  name: (_a = listener.handler) === null || _a === void 0 ? void 0 : _a.name,
399
411
  moduleName: (_b = listener.handler) === null || _b === void 0 ? void 0 : _b.module,
400
412
  },
401
- data: deserializeDynamicMap(ctx, ((_c = listener.handler) === null || _c === void 0 ? void 0 : _c.params) || {}),
413
+ 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) || {}),
402
414
  isCapturePhase: !!listener.isCapturePhase,
403
415
  // TODO
404
416
  noPropagation: !!listener.noPropagation,
405
- extra: (_d = listener.handler) === null || _d === void 0 ? void 0 : _d.extra,
406
417
  };
407
418
  return processed;
408
419
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,eAAe,EAEhB,MAAM,mBAAmB,CAAA;AAQ1B,UAAU,aAAa;IACrB,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAA;KACX,CAAA;IACD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACrC;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,eAAe,GAAG,iBAAiB,GACxC,aAAa,CAyDf"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAqB,MAAM,mBAAmB,CAAC;AAI1F,UAAU,aAAa;IACrB,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,GAAG,iBAAiB,GAAG,aAAa,CAyD/G"}
@@ -0,0 +1,31 @@
1
+ /**
2
+ * clas 与 code 互转
3
+ * 这里的 code 是中间状态的 code,即非最终生成的可运行的项目代码
4
+ */
5
+ import { IPlatformApp } from '../../../../types';
6
+ export interface ICodeItem {
7
+ path: string;
8
+ code: string;
9
+ conflict?: boolean;
10
+ }
11
+ /**
12
+ * CALS 转成 中间状态的代码
13
+ */
14
+ export declare function calsToCode(calsJSON: IPlatformApp): ICodeItem[];
15
+ /**
16
+ * 中间状态的代码 转成 CALS
17
+ */
18
+ export declare function codeToCals(codeList: ICodeItem[]): IPlatformApp;
19
+ /**
20
+ * 指定目录下的文件转代码
21
+ */
22
+ export declare function fileToCode(dirPath: string): Promise<ICodeItem[]>;
23
+ /**
24
+ * 指定代码内容是否存在冲突未解决
25
+ */
26
+ export declare function checkForConflicts(code: string): boolean;
27
+ /**
28
+ * 以 from 为准自动解决冲突
29
+ */
30
+ export declare function autoResolveConflicts(code: string, from: 'theirs' | 'ours'): string;
31
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAiC,MAAM,mBAAmB,CAAC;AAMhF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,EAAE,CA4I9D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,YAAY,CAiI9D;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtE;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"}
@@ -0,0 +1,364 @@
1
+ "use strict";
2
+ /**
3
+ * clas 与 code 互转
4
+ * 这里的 code 是中间状态的 code,即非最终生成的可运行的项目代码
5
+ */
6
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
7
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
8
+ return new (P || (P = Promise))(function (resolve, reject) {
9
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
10
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
11
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
12
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
13
+ });
14
+ };
15
+ var __importDefault = (this && this.__importDefault) || function (mod) {
16
+ return (mod && mod.__esModule) ? mod : { "default": mod };
17
+ };
18
+ Object.defineProperty(exports, "__esModule", { value: true });
19
+ exports.autoResolveConflicts = exports.checkForConflicts = exports.fileToCode = exports.codeToCals = exports.calsToCode = void 0;
20
+ const lodash_1 = require("lodash");
21
+ const glob_1 = __importDefault(require("glob"));
22
+ const path_1 = __importDefault(require("path"));
23
+ const fs_extra_1 = __importDefault(require("fs-extra"));
24
+ /**
25
+ * CALS 转成 中间状态的代码
26
+ */
27
+ function calsToCode(calsJSON) {
28
+ // 边界处理
29
+ if (!calsJSON)
30
+ return [];
31
+ const codeList = [];
32
+ /**
33
+ * 生成 app-config.json
34
+ */
35
+ // 来自 Interface IPlatformApp
36
+ // dataSources, dataVariables 忽略,所以这里不包含
37
+ const appConfigFields = [
38
+ 'author',
39
+ 'dataset',
40
+ 'dependencies',
41
+ 'description',
42
+ 'envId',
43
+ 'extra',
44
+ 'id',
45
+ 'label',
46
+ 'main',
47
+ 'name',
48
+ 'version',
49
+ ];
50
+ const otherConfigFields = {
51
+ // 来自 Interface IPlatformAppExtra
52
+ extra: [
53
+ 'appConfig',
54
+ 'compHiddenConfig',
55
+ 'domain',
56
+ 'historyType',
57
+ 'maxID',
58
+ 'miniprogramPlugins',
59
+ 'npmDependencies',
60
+ 'plugins',
61
+ 'presetColors',
62
+ 'rootPath',
63
+ 'themeVars',
64
+ 'originHistoryId',
65
+ ],
66
+ };
67
+ genConfig(calsJSON, appConfigFields, 'app-config.json', otherConfigFields);
68
+ /**
69
+ * 生成 pages
70
+ */
71
+ calsJSON.items.forEach((pageItem) => {
72
+ const pagePath = `pages/${pageItem.id}`;
73
+ /**
74
+ * 生成 page-config.json
75
+ */
76
+ // 来自 IPageComponent
77
+ // :class, :style, component, dataVariables, directives, id, listeners, module, type 忽略,所以这里不包含
78
+ const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name'];
79
+ genConfig(pageItem, pageConfigFields, `${pagePath}/page-config.json`);
80
+ /**
81
+ * 生成 page.json
82
+ */
83
+ codeList.push({
84
+ path: `${pagePath}/page.json`,
85
+ code: JSON.stringify(pageItem.items, null, 2),
86
+ });
87
+ /**
88
+ * 生成页面代码
89
+ */
90
+ genCode(pageItem.resources, pagePath);
91
+ });
92
+ /**
93
+ * 生成全局代码
94
+ */
95
+ genCode(calsJSON.resources);
96
+ return codeList;
97
+ function genConfig(itemJSON, configFields, configPath, otherConfigFields) {
98
+ const config = (0, lodash_1.pick)(itemJSON, configFields);
99
+ if (otherConfigFields) {
100
+ Object.keys(otherConfigFields).forEach((key) => {
101
+ config[key] = (0, lodash_1.pick)(config[key], otherConfigFields[key]);
102
+ });
103
+ }
104
+ // state, computed 类型以及名称为 ____index____ 的都不生成代码
105
+ config._ignoreResources = itemJSON.resources.filter((item) => ['state', 'computed'].includes(item.codeType) || item.name === '____index____');
106
+ // 按 key 排序,这样确保每次生成都一样的顺序,减少冲突
107
+ const newConfig = {};
108
+ Object.keys(config)
109
+ .sort()
110
+ .forEach((key) => (newConfig[key] = config[key]));
111
+ codeList.push({ path: configPath, code: JSON.stringify(config, null, 2) });
112
+ }
113
+ function genCode(resources, basePath = '') {
114
+ const codeResources = (resources || []).filter((item) => item.type === 'CODE' && item.name !== '____index____');
115
+ codeResources.forEach((codeItem) => {
116
+ let codePath = '';
117
+ let realBasePath = basePath ? `${basePath}/` : basePath;
118
+ switch (codeItem.codeType) {
119
+ case 'theme':
120
+ codePath = `${realBasePath}theme.less`;
121
+ break;
122
+ case 'style':
123
+ codePath = `${realBasePath}style.less`;
124
+ break;
125
+ case 'lifecycle':
126
+ codePath = `${realBasePath}lifecycle.js`;
127
+ break;
128
+ // 这两种类型的文件现在不生成文件,需要存放在 config 中
129
+ case 'state':
130
+ // codePath = `${realBasePath}state.js`;
131
+ break;
132
+ case 'computed':
133
+ // codePath = `${realBasePath}computed.js`;
134
+ break;
135
+ case 'normal-module':
136
+ codePath = `common/${codeItem.name}.js`;
137
+ break;
138
+ case 'handler-fn':
139
+ codePath = `${realBasePath}handler/${codeItem.name}.js`;
140
+ break;
141
+ }
142
+ if (codePath) {
143
+ codeList.push({
144
+ path: codePath,
145
+ code: codeItem.code,
146
+ });
147
+ }
148
+ });
149
+ }
150
+ }
151
+ exports.calsToCode = calsToCode;
152
+ /**
153
+ * 中间状态的代码 转成 CALS
154
+ */
155
+ function codeToCals(codeList) {
156
+ // 边界处理
157
+ if (!codeList || codeList.length === 0)
158
+ return {};
159
+ // @ts-ignore
160
+ const calsJSON = {
161
+ items: [],
162
+ resources: [],
163
+ };
164
+ codeList.forEach((codeItem) => {
165
+ if (codeItem.path === 'app-config.json') {
166
+ /**
167
+ * app-config.json
168
+ */
169
+ const config = JSON.parse(codeItem.code);
170
+ Object.assign(calsJSON, (0, lodash_1.omit)(config, ['_ignoreResources']));
171
+ calsJSON.resources = (0, lodash_1.concat)(calsJSON.resources, config._ignoreResources);
172
+ }
173
+ else if (codeItem.path.indexOf('pages/') === 0) {
174
+ /**
175
+ * page
176
+ */
177
+ const [, pageId] = codeItem.path.match(/pages\/(.*?)\/.*/);
178
+ let pageItem = calsJSON.items.find((item) => item.id === pageId);
179
+ if (!pageItem) {
180
+ pageItem = {
181
+ id: pageId,
182
+ type: 'PAGE',
183
+ resources: [],
184
+ };
185
+ calsJSON.items.push(pageItem);
186
+ }
187
+ if (/pages\/.*?\/page-config.json/.test(codeItem.path)) {
188
+ /**
189
+ * page-config.json
190
+ */
191
+ const config = JSON.parse(codeItem.code);
192
+ const propsConfig = (0, lodash_1.omit)(config, ['_ignoreResources']);
193
+ Object.assign(pageItem, propsConfig);
194
+ pageItem.resources = (0, lodash_1.concat)(pageItem.resources, config._ignoreResources);
195
+ }
196
+ else if (/pages\/.*?\/page.json/.test(codeItem.path)) {
197
+ /**
198
+ * page.json
199
+ */
200
+ pageItem.items = JSON.parse(codeItem.code);
201
+ }
202
+ else {
203
+ /**
204
+ * page normal codes
205
+ */
206
+ handleNormalCodes(codeItem, pageId, pageItem.resources);
207
+ }
208
+ }
209
+ else {
210
+ /**
211
+ * global normal codes
212
+ */
213
+ handleNormalCodes(codeItem, '', calsJSON.resources);
214
+ }
215
+ });
216
+ return calsJSON;
217
+ function handleNormalCodes(codeItem, pageId, resources) {
218
+ const relativePath = !pageId ? codeItem.path : codeItem.path.replace(`pages/${pageId}/`, '');
219
+ const _pageId = !pageId ? 'global' : pageId;
220
+ const commonVal = {
221
+ code: codeItem.code,
222
+ type: 'CODE',
223
+ system: true,
224
+ };
225
+ /**
226
+ * 只处理 path 为 theme.less, style.less, lifecycle.js, common/xxx.js, handler/xxx.js
227
+ * 其它视为无效文件忽略
228
+ */
229
+ switch (relativePath) {
230
+ case 'theme.less':
231
+ calsJSON.resources.push(Object.assign({ name: 'theme', path: `${_pageId}/theme`, codeType: 'theme' }, commonVal));
232
+ break;
233
+ case 'style.less':
234
+ resources.push(Object.assign({ name: 'style', path: `${_pageId}/style`, codeType: 'style' }, commonVal));
235
+ break;
236
+ case 'lifecycle.js':
237
+ resources.push(Object.assign({ name: 'lifecycle', path: `${_pageId}/lifecycle`, codeType: 'lifecycle' }, commonVal));
238
+ break;
239
+ default:
240
+ // page handler
241
+ const handlerMatches = relativePath.match(/^handler\/([^/]*?).js$/);
242
+ if (handlerMatches) {
243
+ const [, name] = handlerMatches;
244
+ resources.push(Object.assign(Object.assign({ name, path: `${_pageId}/handler/${name}`, codeType: 'handler-fn' }, commonVal), { system: false }));
245
+ }
246
+ // globa common
247
+ const commonMatches = codeItem.path.match(/^common\/([^/]*?).js$/);
248
+ if (commonMatches) {
249
+ const [, name] = commonMatches;
250
+ calsJSON.resources.push(Object.assign({ name, path: `${_pageId}/common/${name}`, codeType: 'normal-module' }, commonVal));
251
+ }
252
+ break;
253
+ }
254
+ }
255
+ }
256
+ exports.codeToCals = codeToCals;
257
+ /**
258
+ * 指定目录下的文件转代码
259
+ */
260
+ function fileToCode(dirPath) {
261
+ return __awaiter(this, void 0, void 0, function* () {
262
+ const result = yield new Promise((resolve, reject) => {
263
+ // 只包含 js, json, less 文件,其它忽略(因为不属于 weda 的文件)
264
+ (0, glob_1.default)(path_1.default.resolve(dirPath, '**', '*.@(js|json|less)'), {}, function (err, files) {
265
+ return __awaiter(this, void 0, void 0, function* () {
266
+ if (err)
267
+ reject(err);
268
+ else {
269
+ const codeList = yield Promise.all(files.map((filePath) => __awaiter(this, void 0, void 0, function* () {
270
+ const codePath = path_1.default.relative(dirPath, filePath);
271
+ const codeContent = yield fs_extra_1.default.readFile(filePath, 'utf8');
272
+ return {
273
+ path: codePath,
274
+ code: codeContent,
275
+ };
276
+ })));
277
+ resolve(codeList);
278
+ }
279
+ });
280
+ });
281
+ });
282
+ return result;
283
+ });
284
+ }
285
+ exports.fileToCode = fileToCode;
286
+ /**
287
+ * 指定代码内容是否存在冲突未解决
288
+ */
289
+ function checkForConflicts(code) {
290
+ return findAllConflicts(code, true).length > 0;
291
+ }
292
+ exports.checkForConflicts = checkForConflicts;
293
+ /**
294
+ * 以 from 为准自动解决冲突
295
+ */
296
+ function autoResolveConflicts(code, from) {
297
+ const allConflicts = findAllConflicts(code);
298
+ const lines = code.split('\n');
299
+ const result = [];
300
+ const removeLines = [];
301
+ allConflicts.forEach((conflictItem) => {
302
+ if (from === 'theirs') {
303
+ // 删除上面的
304
+ removeLines.push([conflictItem.start, conflictItem.middle], conflictItem.end);
305
+ }
306
+ else {
307
+ // default is ours
308
+ // 删除下面的
309
+ removeLines.push(conflictItem.start, [conflictItem.middle, conflictItem.end]);
310
+ }
311
+ });
312
+ lines.forEach((line, idx) => {
313
+ const matched = removeLines.some((rmIdx) => {
314
+ if (Array.isArray(rmIdx)) {
315
+ return idx >= rmIdx[0] && idx <= rmIdx[1];
316
+ }
317
+ else {
318
+ return idx === rmIdx;
319
+ }
320
+ });
321
+ if (!matched)
322
+ result.push(line);
323
+ });
324
+ return result.join('\n');
325
+ }
326
+ exports.autoResolveConflicts = autoResolveConflicts;
327
+ function findAllConflicts(code, onlyFindFirstOne = false) {
328
+ let allConflicts = [];
329
+ const lines = code.split('\n');
330
+ let oneConflict = { start: -1, middle: -1, end: -1 };
331
+ for (let i = 0, leng = lines.length; i < leng; i++) {
332
+ const line = lines[i];
333
+ if (/^<<<<<<<$/.test(line)) {
334
+ if (oneConflict.start === -1) {
335
+ // 起点
336
+ oneConflict.start = i;
337
+ }
338
+ else {
339
+ // 非起点:一个完整的冲突还未结束,出现起点符号,下边的内容冲突全部无效
340
+ break;
341
+ }
342
+ }
343
+ else if (/^=======$/.test(line)) {
344
+ if (oneConflict.start !== -1) {
345
+ // 有 <<<<<<< 起点符号
346
+ if (oneConflict.middle === -1) {
347
+ // 未有 ======= 中间符号
348
+ oneConflict.middle = i;
349
+ }
350
+ }
351
+ }
352
+ else if (/^>>>>>>>$/.test(line)) {
353
+ if (oneConflict.start !== -1 && oneConflict.middle !== -1) {
354
+ oneConflict.end = i;
355
+ allConflicts.push(oneConflict);
356
+ // 重置
357
+ oneConflict = { start: -1, middle: -1, end: -1 };
358
+ if (onlyFindFirstOne)
359
+ break;
360
+ }
361
+ }
362
+ }
363
+ return allConflicts;
364
+ }
@@ -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,CAAC;AAK1E,wBAAgB,cAAc,CAC5B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAoB,EACpD,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CAqDR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,OAkCtC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,CA4B1E;AAED,wBAAgB,aAAa,CAAC,iBAAiB,GAAE,GAAG,EAAO,OAkB1D;AAED,wBAAgB,cAAc,CAAC,SAAS,GAAE,GAAG,EAAO,SAgBnD;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"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA2B,MAAM,kBAAkB,CAAC;AAK1E,wBAAgB,cAAc,CAC5B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAoB,EACpD,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CAqDR;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,OAkCtC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,CA4B1E;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"}
@@ -134,7 +134,6 @@ function readListeners(listenerInstances = []) {
134
134
  name: fromParts[1],
135
135
  },
136
136
  data: readDynamicData(act),
137
- extra: act === null || act === void 0 ? void 0 : act.extra,
138
137
  isCapturePhase: act.isCapturePhase,
139
138
  noPropagation: act.noPropagation,
140
139
  };
@@ -151,7 +150,6 @@ function writeListeners(listeners = []) {
151
150
  type: l.type,
152
151
  data: {},
153
152
  dataBinds: [],
154
- extra: l.extra,
155
153
  handler: l.handler,
156
154
  isCapturePhase: l.isCapturePhase,
157
155
  noPropagation: l.noPropagation,
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/spinoff/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAMb,MAAM,mBAAmB,CAAA;AAwI1B;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB,GACA,YAAY,CAiCd"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/spinoff/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAMb,MAAM,mBAAmB,CAAC;AAyH3B;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,YAAY,CAqBd"}
@@ -1 +1 @@
1
- {"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/style.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CACzC,SAAS,GAAE,GAA2B,GACrC,GAAG,CAUL"}
1
+ {"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/style.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CAAC,SAAS,GAAE,GAA2B,GAAG,GAAG,CAUvF"}
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/common.ts"],"names":[],"mappings":"AAaA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAE1C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,QAczC;AAGD,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,QAOtC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QAkB3C;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,GAAG,QAsFrD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QA8C3C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QAyB3C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QAgB9C;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,QAQpD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,QAczC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,UAAU,UAAQ,QAqJnB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,QAsCvC"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/common.ts"],"names":[],"mappings":"AAaA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAE1C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,QAczC;AAGD,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,QAOtC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QAe3C;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,GAAG,QAsFrD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QA8C3C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,QAwB3C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QAgB9C;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,QAQpD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,GAAG,QAczC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,UAAQ,QAiJ/E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,QAsCvC"}
@@ -55,8 +55,7 @@ function translateListeners(comp) {
55
55
  const { listeners = [] } = xProps;
56
56
  listeners.forEach((listenerItem) => {
57
57
  const { handler } = listenerItem;
58
- if (listenerItem.trigger === 'click' ||
59
- listenerItem.trigger === '__weapps_action_trigger_click') {
58
+ if (listenerItem.trigger === 'click' || listenerItem.trigger === '__weapps_action_trigger_click') {
60
59
  listenerItem.trigger = 'tap';
61
60
  }
62
61
  if (handler.moduleName === 'gsd-kbone') {
@@ -211,8 +210,7 @@ function translateClassList(comp) {
211
210
  }
212
211
  if (xProps['classNameListBind']) {
213
212
  // @ts-ignore
214
- xProps['classListBind'] =
215
- xProps['classListBind'] || xProps.classNameListBind;
213
+ xProps['classListBind'] = xProps['classListBind'] || xProps.classNameListBind;
216
214
  // @ts-ignore
217
215
  xProps.classListBind.value = xProps.classListBind.bindDataPath;
218
216
  // @ts-ignore
@@ -355,8 +353,7 @@ function addFormItem(comp, key, parent, isOnlySlot = false) {
355
353
  }
356
354
  catch (e) { }
357
355
  if (parent) {
358
- if (!parent.xComponent ||
359
- (parent.xComponent && parent.xComponent.name !== 'FormItem')) {
356
+ if (!parent.xComponent || (parent.xComponent && parent.xComponent.name !== 'FormItem')) {
360
357
  // add FormItem
361
358
  const newFormItemId = (0, utils_1.getId)();
362
359
  // @ts-ignore
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAyKH,eAAO,MAAM,sBAAsB,UAMlC,CAAA;AAED,eAAO,MAAM,mBAAmB,UAgB/B,CAAA;AAED,eAAO,MAAM,2BAA2B,UAgDvC,CAAA;AAGD,eAAO,MAAM,mCAAmC,UAK/C,CAAA;AAGD,eAAO,MAAM,4BAA4B,QAA6B,CAAA"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAyKH,eAAO,MAAM,sBAAsB,UAMlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAgB/B,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAgDvC,CAAC;AAGF,eAAO,MAAM,mCAAmC,UAA8D,CAAC;AAG/G,eAAO,MAAM,4BAA4B,QAA6B,CAAC"}
@@ -239,11 +239,6 @@ exports.GSD_H5_REACT_COMPONENT_KEYS = [
239
239
  'Wx-page-mate',
240
240
  ];
241
241
  // 支持选区的组件白名单
242
- exports.COMPONENT_SELECTABLEBLOCK_WHITELIST = [
243
- 'modeltable',
244
- 'modelcreate',
245
- 'modelupdate',
246
- 'modeldetail',
247
- ];
242
+ exports.COMPONENT_SELECTABLEBLOCK_WHITELIST = ['modeltable', 'modelcreate', 'modelupdate', 'modeldetail'];
248
243
  // 支持选区的组件库命名正则表达式
249
244
  exports.MODULE_SELECTABLEBLOCK_REGEX = /^cloudbase_bussiness.*$/i;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/index.ts"],"names":[],"mappings":"AAOA,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,OAazC;AAgCD,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAqBzD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/index.ts"],"names":[],"mappings":"AAOA,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,OAWzC;AAgCD,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAqBzD"}
@@ -1 +1 @@
1
- {"version":3,"file":"parses.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/parses.ts"],"names":[],"mappings":"AAcA,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QAmC5C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QA4G5C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QA4B9C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAyBlE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QAuF5C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QAM9C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAc1C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAmDlE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAanE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAGnE;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAQ3E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QA6CnE;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,GAAG,QAgDnD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAwD1C;AAGD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,QAuB1D"}
1
+ {"version":3,"file":"parses.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/parses.ts"],"names":[],"mappings":"AAcA,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QAmC5C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QA4G5C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QA4B9C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAuBlE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,QAoF5C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,QAM9C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAc1C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAmDlE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAanE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAGnE;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAQ3E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QA6CnE;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,GAAG,QAgDnD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,QAwD1C;AAGD,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,QAuB1D"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/utils.ts"],"names":[],"mappings":"AASA,wBAAgB,IAAI,CAAC,IAAI,EAAE,GAAG,QA6B7B;AAED,wBAAgB,KAAK,WAEpB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAK,UAQ3C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,UAQ9C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAO,EAAE,IAAI,EAAE,GAAG,QAO/D;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,QAKzD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,OAItC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,GAAG,uBAWlD;AAED,wBAAgB,SAAS,CAAC,GAAG,SAAK,oBAEjC;AAED,wBAAgB,aAAa,CAAC,GAAG,KAAK,WAErC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,GAAG,WAoBlD;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,GAAG,EACT,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,EACnC,IAAI,SAAK,GACR,GAAG,CAmBL"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/version/utils.ts"],"names":[],"mappings":"AAKA,wBAAgB,IAAI,CAAC,IAAI,EAAE,GAAG,QA2B7B;AAED,wBAAgB,KAAK,WAEpB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,SAAK,UAQ3C;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,UAQ9C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAO,EAAE,IAAI,EAAE,GAAG,QAO/D;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,QAKzD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,OAItC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,GAAG,uBASlD;AAED,wBAAgB,SAAS,CAAC,GAAG,SAAK,oBAEjC;AAED,wBAAgB,aAAa,CAAC,GAAG,KAAK,WAErC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,GAAG,WAkBlD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,IAAI,SAAK,GAAG,GAAG,CAmBlG"}
@@ -30,9 +30,7 @@ function init(json) {
30
30
  });
31
31
  }
32
32
  }
33
- const idNums = ids
34
- .map((id) => parseInt(id.replace('id', '')))
35
- .filter((item) => !isNaN(item));
33
+ const idNums = ids.map((id) => parseInt(id.replace('id', ''))).filter((item) => !isNaN(item));
36
34
  maxId = Math.max(...idNums);
37
35
  }
38
36
  exports.init = init;