@cloudbase/cals 1.0.72-alpha.5 → 1.0.72-alpha.6
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.
- package/lib/parser/cals/index.d.ts +4 -9
- package/lib/parser/cals/index.d.ts.map +1 -1
- package/lib/parser/cals/index.js +1 -1
- package/lib/parser/cals/utils/block/index.d.ts +7 -1
- package/lib/parser/cals/utils/block/index.d.ts.map +1 -1
- package/lib/parser/cals/utils/block/index.js +3 -2
- package/lib/parser/cals/utils/getUsedReference.d.ts +3 -2
- package/lib/parser/cals/utils/getUsedReference.d.ts.map +1 -1
- package/lib/parser/cals/utils/getUsedReference.js +8 -5
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ import { IDynamicValue, PropBindType } from '../expression';
|
|
|
5
5
|
import { IEventFlow } from '../../types/platform/eventFlow';
|
|
6
6
|
import { IHandler, IPlatformSubApp, IPlatformComponentExtra } from '../../utils';
|
|
7
7
|
import { IVisitedContext } from './utils/block/helpers/remap-component-ids';
|
|
8
|
+
import { IBlockTemplate } from './utils/block/index';
|
|
8
9
|
export { getUsedComps, generateCustomLoginConfigPathname } from './utils/common';
|
|
9
10
|
export { generateDefaultCode } from './utils/template';
|
|
10
11
|
interface IDeserializeContext {
|
|
@@ -510,7 +511,7 @@ export declare function generateHandlerParamsDynamicMap(handler: IHandler): any;
|
|
|
510
511
|
*/
|
|
511
512
|
export declare function streamlineSubApp(cals: any): IPlatformSubApp;
|
|
512
513
|
export interface ICalsReferenceContext {
|
|
513
|
-
blockTemplateMap: Record<string,
|
|
514
|
+
blockTemplateMap: Record<string, IBlockTemplate>;
|
|
514
515
|
referenceMap?: Record<string, boolean>;
|
|
515
516
|
strict?: boolean;
|
|
516
517
|
visiting?: IVisitedContext;
|
|
@@ -519,19 +520,13 @@ export interface ICalsReferenceContext {
|
|
|
519
520
|
* 还原引用
|
|
520
521
|
*/
|
|
521
522
|
export declare function collapseCalsReference(cals: IPlatformApp | IPlatformSubApp, options: {
|
|
522
|
-
blockTemplates:
|
|
523
|
-
name?: string;
|
|
524
|
-
path?: string;
|
|
525
|
-
}[];
|
|
523
|
+
blockTemplates: IBlockTemplate[];
|
|
526
524
|
}): IPlatformApp | IPlatformSubApp;
|
|
527
525
|
/**
|
|
528
526
|
* 展开引用
|
|
529
527
|
*/
|
|
530
528
|
export declare function expandCalsReference(cals: IPlatformApp | IPlatformSubApp, options: {
|
|
531
|
-
blockTemplates:
|
|
532
|
-
name?: string;
|
|
533
|
-
path?: string;
|
|
534
|
-
}[];
|
|
529
|
+
blockTemplates: IBlockTemplate[];
|
|
535
530
|
strict?: boolean;
|
|
536
531
|
}): IPlatformApp | IPlatformSubApp;
|
|
537
532
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EACL,WAAW,EACX,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAElB,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAe5F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EACL,QAAQ,EACR,eAAe,EACf,uBAAuB,EAIxB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,eAAe,EAAc,MAAM,2CAA2C,CAAC;
|
|
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
|
@@ -1542,7 +1542,7 @@ function expandCalsReference(cals, options) {
|
|
|
1542
1542
|
const { refs } = (0, utils_1.getUsedReference)([cals], blockTemplates);
|
|
1543
1543
|
[cals]
|
|
1544
1544
|
.concat(Array.from(refs)
|
|
1545
|
-
.map((key) => blockTemplateMap[key])
|
|
1545
|
+
.map((key) => { var _a; return (_a = blockTemplateMap[key]) === null || _a === void 0 ? void 0 : _a.content; })
|
|
1546
1546
|
.filter((item) => !!item))
|
|
1547
1547
|
.forEach((cals, index) => {
|
|
1548
1548
|
var _a, _b;
|
|
@@ -27,10 +27,16 @@ interface IMergeCalsMeta {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
export declare function mergeCals(ctx: {
|
|
30
|
-
blockTemplateMap: Record<string,
|
|
30
|
+
blockTemplateMap: Record<string, IBlockTemplate>;
|
|
31
31
|
}, list: IMergeCalsMeta[]): IPlatformApp;
|
|
32
32
|
export declare function expandComponentReference(ctx: ICalsReferenceContext & {
|
|
33
33
|
visiting: IVisitedContext;
|
|
34
34
|
}, component: IPlatformComponent): any;
|
|
35
35
|
export declare function collapseComponentReference(ctx: ICalsReferenceContext, component: any): any;
|
|
36
|
+
export interface IBlockTemplate {
|
|
37
|
+
name: string;
|
|
38
|
+
path?: string;
|
|
39
|
+
dynamicConfig?: string;
|
|
40
|
+
content: IPlatformApp;
|
|
41
|
+
}
|
|
36
42
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAqC,MAAM,mBAAmB,CAAC;AAKxG,OAAO,EAAE,eAAe,EAAsD,MAAM,+BAA+B,CAAC;AAOpH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAqC,MAAM,mBAAmB,CAAC;AAKxG,OAAO,EAAE,eAAe,EAAsD,MAAM,+BAA+B,CAAC;AAOpH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,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,kBAAkB,GAAG,aAAa,CAyD9F;AA+GD,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,qBAAqB,GAAG;IAAE,QAAQ,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAClH,UAAU,EAAE,kBAAkB,EAAE,GAC/B,kBAAkB,EAAE,CAmBtB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;KAC5C,CAAC;CACH;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CAAE,EAAE,IAAI,EAAE,cAAc,EAAE,gBA8E1G;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,qBAAqB,GAAG;IAAE,QAAQ,EAAE,eAAe,CAAA;CAAE,EAC1D,SAAS,EAAE,kBAAkB,OA8C9B;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,qBAAqB,EAAE,SAAS,KAAA,OA2B/E;AAaD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,YAAY,CAAC;CACvB"}
|
|
@@ -26,6 +26,7 @@ const renew_id_in_resource_1 = require("./helpers/renew-id-in-resource");
|
|
|
26
26
|
const merge_resources_1 = require("./helpers/merge-resources");
|
|
27
27
|
const merge_dataset_1 = require("./helpers/merge-dataset");
|
|
28
28
|
const merge_listeners_1 = require("./helpers/merge-listeners");
|
|
29
|
+
const lodash_1 = require("lodash");
|
|
29
30
|
var renew_id_in_resource_2 = require("./helpers/renew-id-in-resource");
|
|
30
31
|
Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return renew_id_in_resource_2.renewIdInResource; } });
|
|
31
32
|
var remap_component_ids_2 = require("./helpers/remap-component-ids");
|
|
@@ -254,7 +255,7 @@ function expandComponentReference(ctx, component) {
|
|
|
254
255
|
return undefined;
|
|
255
256
|
}
|
|
256
257
|
}
|
|
257
|
-
const blockContent = (_d = regenBlockTemplateComponents(Object.assign(Object.assign({}, ctx), { referenceMap: Object.assign(Object.assign({}, ctx.referenceMap), { [ref]: true }) }), (_c = (_b = blockTemplateMap[ref].items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.items)) === null || _d === void 0 ? void 0 : _d[0];
|
|
258
|
+
const blockContent = (_d = regenBlockTemplateComponents(Object.assign(Object.assign({}, ctx), { referenceMap: Object.assign(Object.assign({}, ctx.referenceMap), { [ref]: true }) }), (0, lodash_1.cloneDeep)(((_c = (_b = blockTemplateMap[ref].content.items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.items) || []))) === null || _d === void 0 ? void 0 : _d[0];
|
|
258
259
|
const { attributes: blockAttributes = {} } = blockContent;
|
|
259
260
|
return Object.assign(Object.assign({}, blockContent), {
|
|
260
261
|
// todo: 这里合并有问题，无法简单的合并
|
|
@@ -279,7 +280,7 @@ function collapseComponentReference(ctx, component) {
|
|
|
279
280
|
const _d = extra || {}, { ref, anchored, refAttributes } = _d, restExtra = __rest(_d, ["ref", "anchored", "refAttributes"]);
|
|
280
281
|
if (ref && blockTemplateMap[ref]) {
|
|
281
282
|
const processed = {};
|
|
282
|
-
const blockContent = (_c = (_b = (_a = blockTemplateMap[ref].items) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c[0];
|
|
283
|
+
const blockContent = (_c = (_b = (_a = blockTemplateMap[ref].content.items) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c[0];
|
|
283
284
|
restExtra.ref = ref;
|
|
284
285
|
processed.attributes = filterMap(attributes, refAttributes);
|
|
285
286
|
if (styleBind !== blockContent[':style']) {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { IPlatformApp } from '../../../utils';
|
|
2
|
-
|
|
3
|
-
export declare function
|
|
2
|
+
import { IBlockTemplate } from './block';
|
|
3
|
+
export declare function generateBlockTemplateMap(blockTemplates?: IBlockTemplate[]): {};
|
|
4
|
+
export declare function getUsedReference(apps?: IPlatformApp[], templates?: IBlockTemplate[]): {
|
|
4
5
|
includes: Set<any>;
|
|
5
6
|
refs: Set<any>;
|
|
6
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUsedReference.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/getUsedReference.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"getUsedReference.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/getUsedReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAsB,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,wBAAwB,CAAC,cAAc,GAAE,cAAc,EAAO,MAU7E;AAQD,wBAAgB,gBAAgB,CAAC,IAAI,GAAE,YAAY,EAAO,EAAE,SAAS,GAAE,cAAc,EAAO;;;EAmB3F"}
|
|
@@ -14,7 +14,7 @@ function generateBlockTemplateMap(blockTemplates = []) {
|
|
|
14
14
|
}
|
|
15
15
|
exports.generateBlockTemplateMap = generateBlockTemplateMap;
|
|
16
16
|
function getUsedReference(apps = [], templates = []) {
|
|
17
|
-
const
|
|
17
|
+
const blockTemplateMap = generateBlockTemplateMap(templates);
|
|
18
18
|
const includes = new Set([]);
|
|
19
19
|
const refs = new Set([]);
|
|
20
20
|
apps.forEach((cals) => {
|
|
@@ -27,14 +27,14 @@ function getUsedReference(apps = [], templates = []) {
|
|
|
27
27
|
include.forEach((path) => {
|
|
28
28
|
includes.add(path);
|
|
29
29
|
});
|
|
30
|
-
page === null || page === void 0 ? void 0 : page.items.forEach((component) => getComponentUsedReference({ includes, refs, blockTemplateMap
|
|
30
|
+
page === null || page === void 0 ? void 0 : page.items.forEach((component) => getComponentUsedReference({ includes, refs, blockTemplateMap }, component));
|
|
31
31
|
});
|
|
32
32
|
});
|
|
33
33
|
return { includes, refs };
|
|
34
34
|
}
|
|
35
35
|
exports.getUsedReference = getUsedReference;
|
|
36
36
|
function getComponentUsedReference(ctx, component) {
|
|
37
|
-
var _a;
|
|
37
|
+
var _a, _b;
|
|
38
38
|
const { blockTemplateMap } = ctx;
|
|
39
39
|
if (!component) {
|
|
40
40
|
return;
|
|
@@ -47,10 +47,13 @@ function getComponentUsedReference(ctx, component) {
|
|
|
47
47
|
if (ref) {
|
|
48
48
|
if (!ctx.refs.has(ref) && blockTemplateMap[ref]) {
|
|
49
49
|
ctx.refs.add(ref);
|
|
50
|
-
|
|
50
|
+
const components = ((_a = blockTemplateMap[ref].content.items) === null || _a === void 0 ? void 0 : _a[0].items) || [];
|
|
51
|
+
components.forEach((component) => {
|
|
52
|
+
getComponentUsedReference(ctx, component);
|
|
53
|
+
});
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
else {
|
|
54
|
-
(
|
|
57
|
+
(_b = component.items) === null || _b === void 0 ? void 0 : _b.forEach((component) => getComponentUsedReference(ctx, component));
|
|
55
58
|
}
|
|
56
59
|
}
|