@abp/ng.schematics 7.3.0-rc.2 → 7.3.0-rc.3
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/package.json +1 -1
- package/utils/generics.d.ts +2 -0
- package/utils/generics.js +4 -1
- package/utils/generics.js.map +1 -1
- package/utils/rule.js +2 -1
- package/utils/rule.js.map +1 -1
- package/utils/type.js +2 -2
- package/utils/type.js.map +1 -1
package/package.json
CHANGED
package/utils/generics.d.ts
CHANGED
|
@@ -16,9 +16,11 @@ export declare function generateRefWithPlaceholders(sourceType: string): string;
|
|
|
16
16
|
export declare function extractSimpleGenerics(sourceType: string): {
|
|
17
17
|
identifier: string;
|
|
18
18
|
generics: string[];
|
|
19
|
+
array: string;
|
|
19
20
|
};
|
|
20
21
|
export declare function extractGenerics(sourceType: string): {
|
|
21
22
|
identifier: string;
|
|
22
23
|
generics: string[];
|
|
24
|
+
array: string;
|
|
23
25
|
};
|
|
24
26
|
export declare function replacePlaceholdersWithGenerics(type: string, generics: string[], genericsCollector: GenericsCollector): string;
|
package/utils/generics.js
CHANGED
|
@@ -59,19 +59,22 @@ function generateRefWithPlaceholders(sourceType) {
|
|
|
59
59
|
}
|
|
60
60
|
exports.generateRefWithPlaceholders = generateRefWithPlaceholders;
|
|
61
61
|
function extractSimpleGenerics(sourceType) {
|
|
62
|
-
const { identifier, generics } = extractGenerics(sourceType);
|
|
62
|
+
const { identifier, generics, array } = extractGenerics(sourceType);
|
|
63
63
|
return {
|
|
64
64
|
identifier: getLastSegment(identifier),
|
|
65
65
|
generics: generics.map(getLastSegment),
|
|
66
|
+
array
|
|
66
67
|
};
|
|
67
68
|
}
|
|
68
69
|
exports.extractSimpleGenerics = extractSimpleGenerics;
|
|
69
70
|
function extractGenerics(sourceType) {
|
|
71
|
+
const isArray = /\[\]$/.test(sourceType);
|
|
70
72
|
const regex = /(?<identifier>[^<]+)(<(?<generics>.+)>)?/g;
|
|
71
73
|
const { identifier = '', generics = '' } = regex.exec(sourceType)?.groups ?? {};
|
|
72
74
|
return {
|
|
73
75
|
identifier,
|
|
74
76
|
generics: generics.split(/,\s*/).filter(Boolean),
|
|
77
|
+
array: isArray ? '[]' : ''
|
|
75
78
|
};
|
|
76
79
|
}
|
|
77
80
|
exports.extractGenerics = extractGenerics;
|
package/utils/generics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generics.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/generics.ts"],"names":[],"mappings":"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"}
|
package/utils/rule.js
CHANGED
|
@@ -15,8 +15,9 @@ exports.applyWithOverwrite = applyWithOverwrite;
|
|
|
15
15
|
function mergeAndAllowDelete(host, rule) {
|
|
16
16
|
return async (tree, context) => {
|
|
17
17
|
const nextTree = await (0, schematics_1.callRule)(rule, tree, context).toPromise();
|
|
18
|
-
if (!nextTree)
|
|
18
|
+
if (!nextTree) {
|
|
19
19
|
return;
|
|
20
|
+
}
|
|
20
21
|
host.merge(nextTree, schematics_1.MergeStrategy.AllowDeleteConflict);
|
|
21
22
|
};
|
|
22
23
|
}
|
package/utils/rule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/rule.ts"],"names":[],"mappings":";;;AAAA,2DAUoC;AAGpC,SAAgB,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC9D,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAO,CAAC,CAAC,EAAE;YACjC,OAAO,CAAC,CAAC,KAAW,EAAE,IAAsB,EAAE,EAAE,CAC9C,IAAI,OAAO,CAAa,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAS,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AATD,gDASC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,IAAU;IACxD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAQ,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QACjE,IAAG,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/rule.ts"],"names":[],"mappings":";;;AAAA,2DAUoC;AAGpC,SAAgB,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC9D,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAO,CAAC,CAAC,EAAE;YACjC,OAAO,CAAC,CAAC,KAAW,EAAE,IAAsB,EAAE,EAAE,CAC9C,IAAI,OAAO,CAAa,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAS,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AATD,gDASC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,IAAU;IACxD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAQ,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QACjE,IAAG,CAAC,QAAQ,EAAE;YACZ,OAAO;SACR;QAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,0BAAa,CAAC,mBAAmB,CAAC,CAAC;IAC1D,CAAC,CAAC;AACJ,CAAC;AATD,kDASC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,OAAO,IAAA,oBAAO,EAAC,SAAS,CAAC,EAAE;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QAEnD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,sDAOC"}
|
package/utils/type.js
CHANGED
|
@@ -12,8 +12,8 @@ function createTypeSimplifier() {
|
|
|
12
12
|
const parseType = createTypeParser(t => {
|
|
13
13
|
let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => constants_1.SYSTEM_TYPES.get(match) ?? 'any');
|
|
14
14
|
type = /any</.test(type) ? 'any' : type;
|
|
15
|
-
const { identifier, generics } = (0, generics_1.extractSimpleGenerics)(type);
|
|
16
|
-
return generics.length ? `${identifier}<${generics.join(', ')}
|
|
15
|
+
const { identifier, generics, array } = (0, generics_1.extractSimpleGenerics)(type);
|
|
16
|
+
return generics.length ? `${identifier}<${generics.join(', ')}>${array}` : identifier;
|
|
17
17
|
});
|
|
18
18
|
return (type) => {
|
|
19
19
|
const parsed = parseType(type);
|
package/utils/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":";;;AAAA,4CAAwD;AACxD,oCAA0C;AAC1C,sCAAiD;AACjD,yCAAmD;AACnD,2CAA6C;AAC7C,iCAAiE;AACjE,iCAAuC;AAEvC,SAAgB,oBAAoB;IAClC,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE;QACrC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,CAClB,qCAAqC,EACrC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,wBAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAC/C,CAAC;QAEF,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":"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"}
|