@abp/ng.schematics 9.0.3 → 9.0.5
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/model.js +6 -2
- package/utils/model.js.map +1 -1
- package/utils/service.js +17 -3
- package/utils/service.js.map +1 -1
- package/utils/type.d.ts +1 -0
- package/utils/type.js +5 -1
- package/utils/type.js.map +1 -1
package/package.json
CHANGED
package/utils/model.js
CHANGED
|
@@ -113,7 +113,10 @@ function createImportRefToInterfaceReducerCreator(params) {
|
|
|
113
113
|
typeDef.properties?.forEach(prop => {
|
|
114
114
|
let name = prop.jsonName || (0, text_1.camel)(prop.name);
|
|
115
115
|
name = shouldQuote(name) ? `'${name}'` : name;
|
|
116
|
-
|
|
116
|
+
let type = simplifyType(prop.typeSimple);
|
|
117
|
+
if (prop.typeSimple.includes('enum')) {
|
|
118
|
+
type = simplifyType(prop.type);
|
|
119
|
+
}
|
|
117
120
|
const refs = parseType(prop.type).reduce((acc, r) => acc.concat((0, tree_1.parseGenerics)(r).toGenerics()), []);
|
|
118
121
|
const property = new models_1.Property({ name, type, refs });
|
|
119
122
|
property.setOptional(isOptionalProperty(prop));
|
|
@@ -142,7 +145,8 @@ function createRefToImportReducerCreator(params) {
|
|
|
142
145
|
}
|
|
143
146
|
exports.createRefToImportReducerCreator = createRefToImportReducerCreator;
|
|
144
147
|
function isOptionalProperty(prop) {
|
|
145
|
-
return prop.typeSimple.endsWith('?') ||
|
|
148
|
+
return (prop.typeSimple.endsWith('?') ||
|
|
149
|
+
((prop.typeSimple === 'string' || prop.typeSimple.includes('enum')) && !prop.isRequired));
|
|
146
150
|
}
|
|
147
151
|
function parseBaseTypeWithGenericTypes(type) {
|
|
148
152
|
const parsedTypeNode = (0, tree_1.parseGenerics)(type);
|
package/utils/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/model.ts"],"names":[],"mappings":";;;AAAA,sCAAgG;AAChG,yCAKoB;AACpB,2CAA6C;AAC7C,iCAA6C;AAC7C,iCAA+B;AAC/B,iCAAiD;AACjD,iCAMgB;AAChB,4CAAkG;AAElG,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAU5C,SAAgB,8BAA8B,CAAC,MAA4B;IACzE,MAAM,4BAA4B,GAAG,wCAAwC,CAAC,MAAM,CAAC,CAAC;IACtF,MAAM,wBAAwB,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEnC,OAAO,CAAC,MAAe,EAAE,UAAoB,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAC;QAEvE,cAAc,CAAC,UAAU,CAAC,CAAC;QAE3B,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC9B,IAAI,sBAAU,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,sCAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO;YAE9F,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAE,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAChE,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC;YAC1E,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;gBACd,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAEvF,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC3C;iBAAM;gBACL,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;gBAEjC,MAAM,CAAC,IAAI,CACT,IAAI,cAAK,CAAC;oBACR,UAAU,EAAE,CAAC,UAAU,CAAC;oBACxB,SAAS;oBACT,IAAI,EAAE,IAAA,0BAAmB,EAAC,SAAS,EAAE,SAAS,CAAC;iBAChD,CAAC,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,MAAM,YAAY,GAAmB,EAAE,CAAC;YAExC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACpC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAE3C,IAAI,QAAQ,IAAI,IAAA,0BAAc,EAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,SAAS,EAAE;oBACtE,MAAM,yBAAyB,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;oBAC1E,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACpC,YAAY,CAAC,IAAI,CAAC;4BAChB,IAAI,EAAE,CAAC;4BACP,MAAM,EAAE,KAAK;yBACd,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;gBAED,CAAC,GAAG,UAAU,CAAC,UAAU,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAChE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC5B,IAAI,CAAC,QAAQ,EAAE;4BACb,OAAO;yBACR;wBAED,IAAI,QAAQ,CAAC,MAAM,EAAE;4BACnB,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;yBAChD;6BAAM,IAAI,IAAA,0BAAc,EAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,KAAK,CAAC,SAAS,EAAE;4BAC5D,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;yBACjD;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,MAAM;gBAAE,OAAO;YAEjC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACpE,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA7ED,wEA6EC;AAED,SAAS,cAAc,CAAC,UAAuB;IAC7C,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAgB,wCAAwC,CAAC,MAA4B;IACnF,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,SAAS,GAAG,IAAA,uBAAgB,EAAC,0BAAmB,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,IAAA,2BAAoB,GAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,0BAAmB,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAG,IAAI,4BAAiB,CAAC,aAAa,CAAC,CAAC;IAE/D,OAAO,sBAAsB,CAAC;IAE9B,SAAS,sBAAsB,CAAC,UAAuB,EAAE,GAAW;QAClE,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO,UAAU,CAAC;QAEhC,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEhD,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QACnD,gBAAgB,GAAG,gBAAgB,IAAI,EAAE,CAAC;QAC1C,IAAI,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACpC,UAAU,GAAG,IAAA,0CAA+B,EAAC,UAAU,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAE9F,IAAI,IAAI,EAAE;YACR,IAAI,IAAA,kBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,EAAE;gBAC1B,iBAAiB,CAAC,OAAO,CAAC,IAAA,0BAAe,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAC5E,OAAO,sBAAsB,CAAC,UAAU,EAAE,IAAA,sCAA2B,EAAC,IAAI,CAAC,CAAC,CAAC;aAC9E;iBAAM;gBACL,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;aAC5B;SACF;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,kBAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjF,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE1B,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;YACjC,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAE9C,IAAI,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAChC;YAED,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CACtC,CAAC,GAAa,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAA,oBAAa,EAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,EAC/D,EAAE,CACH,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;YAE/C,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE5B,OAAO,CAAC,GAAG,UAAU,CAAC,UAAU,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC;aACtD,MAAM,CAAW,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM;oBAAE,OAAO;gBAChC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC;oBAAE,OAAO;gBACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC;aACL,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,QAAS,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjE,MAAM,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAnED,4FAmEC;AAED,SAAgB,+BAA+B,CAAC,MAA4B;IAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC5B,OAAO,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAA,kCAA2B,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjF,CAAC;AAHD,0EAGC;AAED,SAAS,kBAAkB,CAAC,IAAiB;IAC3C,OAAO,CACL,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC7B,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACzF,CAAC;AACJ,CAAC;AAED,SAAgB,6BAA6B,CAAC,IAAY;IACxD,MAAM,cAAc,GAAG,IAAA,oBAAa,EAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,CAAC,IAAc,EAAE,MAAgB,EAAE,EAAY,EAAE;QAClE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC5B,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,UAAU,CAAC,cAAc,CAAC,CAAC;AACpC,CAAC;AAdD,sEAcC;AAED,SAAgB,kBAAkB,CAAC,MAAe;IAChD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAEtC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YAC/B,sBAAsB,CAAC,GAAG,CAAC,CAAC;YAE5B,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE;gBAC1B,MAAM,IAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjD,IAAI,IAAI,EAAE;oBACR,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,eAAM,CAAC,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;iBACjD;aACF;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAfD,gDAeC;AAED,SAAS,mBAAmB,CAAC,UAAuB;IAClD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC/B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE;YACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,sBAAU,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,0BAAc,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAEjF,IAAI,QAAQ,IAAI,SAAS,EAAE;gBACzB,IAAI,CAAC,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;aAChC;SACF;KACF;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAW;IACzC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,sBAAU,CAAC,CAAC;QAE9D,IAAI,QAAQ,EAAE;YACZ,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC;SACtC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CAAC,MAAqC;IAC3E,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACnC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO;KACR;IAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;SACf,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SACnC,OAAO,CAAC,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE;YACjC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC1B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,gBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC9E,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CACvC,IAAI,EACJ,IAAI,IAAI,CAAC,gBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACzC,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAtBD,0DAsBC"}
|
package/utils/service.js
CHANGED
|
@@ -53,7 +53,17 @@ exports.createActionToMethodMapper = createActionToMethodMapper;
|
|
|
53
53
|
function createActionToBodyMapper() {
|
|
54
54
|
const adaptType = (0, type_1.createTypeAdapter)();
|
|
55
55
|
return ({ httpMethod, parameters, returnValue, url }) => {
|
|
56
|
-
|
|
56
|
+
let responseType = adaptType(returnValue.typeSimple);
|
|
57
|
+
if (responseType.includes('enum')) {
|
|
58
|
+
const type = returnValue.typeSimple.replace('enum', returnValue.type);
|
|
59
|
+
if (responseType === 'enum') {
|
|
60
|
+
responseType = adaptType(type);
|
|
61
|
+
}
|
|
62
|
+
if (responseType === 'enum[]') {
|
|
63
|
+
const normalizedType = (0, type_1.getTypeForEnumList)(type);
|
|
64
|
+
responseType = adaptType(normalizedType);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
57
67
|
const responseTypeWithNamespace = returnValue.typeSimple;
|
|
58
68
|
const body = new models_1.Body({ method: httpMethod, responseType, url, responseTypeWithNamespace });
|
|
59
69
|
parameters.forEach(body.registerActionParameter);
|
|
@@ -78,7 +88,10 @@ function createActionToSignatureMapper() {
|
|
|
78
88
|
if (isFormData || isFormArray) {
|
|
79
89
|
return new models_1.Property({ name: p.name, type: 'FormData' });
|
|
80
90
|
}
|
|
81
|
-
|
|
91
|
+
let type = adaptType(p.typeSimple);
|
|
92
|
+
if (p.typeSimple === 'enum' || p.typeSimple === '[enum]') {
|
|
93
|
+
type = adaptType(p.type);
|
|
94
|
+
}
|
|
82
95
|
const parameter = new models_1.Property({ name: p.name, type });
|
|
83
96
|
parameter.setDefault(p.defaultValue);
|
|
84
97
|
parameter.setOptional(p.isOptional);
|
|
@@ -135,8 +148,9 @@ function createActionToImportsReducer(solution, types, namespace) {
|
|
|
135
148
|
parseType(param.type).forEach(paramType => (0, tree_1.parseGenerics)(paramType)
|
|
136
149
|
.toGenerics()
|
|
137
150
|
.forEach(type => {
|
|
138
|
-
if (types[type])
|
|
151
|
+
if (types[type]) {
|
|
139
152
|
acc.push({ type, isEnum: types[type].isEnum });
|
|
153
|
+
}
|
|
140
154
|
}));
|
|
141
155
|
return acc;
|
|
142
156
|
}, []));
|
package/utils/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":";;;AAAA,sCAYmB;AACnB,qCAAuC;AACvC,2CAA6C;AAC7C,iCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":"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"}
|
package/utils/type.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare function flattenDictionaryTypes(types: string[], type: string): s
|
|
|
6
6
|
export declare function normalizeTypeAnnotations(type: string): string;
|
|
7
7
|
export declare function removeGenerics(type: string): string;
|
|
8
8
|
export declare function removeTypeModifiers(type: string): string;
|
|
9
|
+
export declare function getTypeForEnumList(type: string): string;
|
|
9
10
|
export declare function createTypesToImportsReducer(solution: string, namespace: string): (imports: Import[], types: TypeWithEnum[]) => Import[];
|
|
10
11
|
export declare function createTypeToImportMapper(solution: string, namespace: string): (type: string, isEnum: boolean) => Import | undefined;
|
|
11
12
|
export declare function createTypeAdapter(): (type: string) => string;
|
package/utils/type.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extendsSelf = exports.createTypeAdapter = exports.createTypeToImportMapper = exports.createTypesToImportsReducer = exports.removeTypeModifiers = exports.removeGenerics = exports.normalizeTypeAnnotations = exports.flattenDictionaryTypes = exports.createTypeNormalizer = exports.createTypeParser = exports.createTypeSimplifier = void 0;
|
|
3
|
+
exports.extendsSelf = exports.createTypeAdapter = exports.createTypeToImportMapper = exports.createTypesToImportsReducer = exports.getTypeForEnumList = exports.removeTypeModifiers = exports.removeGenerics = exports.normalizeTypeAnnotations = exports.flattenDictionaryTypes = exports.createTypeNormalizer = exports.createTypeParser = exports.createTypeSimplifier = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
const enums_1 = require("../enums");
|
|
6
6
|
const models_1 = require("../models");
|
|
@@ -53,6 +53,10 @@ function removeTypeModifiers(type) {
|
|
|
53
53
|
return type.replace(/\[\]/g, '');
|
|
54
54
|
}
|
|
55
55
|
exports.removeTypeModifiers = removeTypeModifiers;
|
|
56
|
+
function getTypeForEnumList(type) {
|
|
57
|
+
return type.replace(/^.*<([^>]+)>.*$/, '[$1]');
|
|
58
|
+
}
|
|
59
|
+
exports.getTypeForEnumList = getTypeForEnumList;
|
|
56
60
|
function createTypesToImportsReducer(solution, namespace) {
|
|
57
61
|
const mapTypeToImport = createTypeToImportMapper(solution, namespace);
|
|
58
62
|
return (imports, types) => {
|
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;QACxC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAqB,EAAC,IAAI,CAAC,CAAC;QACpE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IACxF,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,EAAG,CAAC;QAC3B,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,IAAI,KAAK,MAAM,GAAG,EAAE,IAAI,CAAC,CAAC;IAClF,CAAC,CAAC;AACJ,CAAC;AAjBD,oDAiBC;AAED,SAAgB,gBAAgB,CAAC,aAAa,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEvD,OAAO,CAAC,YAAoB,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/F,CAAC;AAJD,4CAIC;AAED,SAAgB,oBAAoB,CAAC,aAAa,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;IAChE,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,OAAO,UAAU,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC;AACJ,CAAC;AAJD,oDAIC;AAED,SAAgB,sBAAsB,CAAC,KAAe,EAAE,IAAY;IAClE,IAAI;SACD,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;SACpB,KAAK,CAAC,GAAG,CAAC;SACV,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/B,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,wDAOC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC/D,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAFD,wCAEC;AAED,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAFD,kDAEC;AAED,SAAgB,2BAA2B,CAAC,QAAgB,EAAE,SAAiB;IAC7E,MAAM,eAAe,GAAG,wBAAwB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEtE,OAAO,CAAC,OAAiB,EAAE,KAAqB,EAAE,EAAE;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;YACjC,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO;aACR;YAED,
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":"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"}
|