@sap-cloud-sdk/generator 3.2.1-20230720014030.0 → 3.3.0
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/dist/batch/imports.js +1 -6
- package/dist/batch/imports.js.map +1 -1
- package/dist/operations/import.js +4 -16
- package/dist/operations/import.js.map +1 -1
- package/dist/operations/operation.js +3 -10
- package/dist/operations/operation.js.map +1 -1
- package/dist/operations/request-builder-arguments.d.ts +1 -1
- package/dist/operations/request-builder-arguments.js +14 -10
- package/dist/operations/request-builder-arguments.js.map +1 -1
- package/dist/operations/return-type.d.ts +1 -1
- package/dist/operations/return-type.js +2 -6
- package/dist/operations/return-type.js.map +1 -1
- package/package.json +6 -6
package/dist/batch/imports.js
CHANGED
|
@@ -17,12 +17,7 @@ function importBatchDeclarations(service) {
|
|
|
17
17
|
'GetByKeyRequestBuilder',
|
|
18
18
|
'ODataBatchRequestBuilder',
|
|
19
19
|
'UpdateRequestBuilder',
|
|
20
|
-
...(service.operations.
|
|
21
|
-
? ['FunctionImportRequestBuilder']
|
|
22
|
-
: []),
|
|
23
|
-
...(service.operations.some(op => op.type === 'action')
|
|
24
|
-
? ['ActionImportRequestBuilder']
|
|
25
|
-
: []),
|
|
20
|
+
...(service.operations.length ? ['OperationRequestBuilder'] : []),
|
|
26
21
|
'BatchChangeSet'
|
|
27
22
|
], service.oDataVersion),
|
|
28
23
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/batch/imports.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AACrE,8CAA6C;AAC7C,wCAA2D;AAG3D;;GAEG;AACH,SAAgB,uBAAuB,CACrC,OAA2B;IAE3B,OAAO;QACL,IAAA,uCAA6B,EAC3B;YACE,sBAAsB;YACtB,sBAAsB;YACtB,eAAe;YACf,sBAAsB;YACtB,wBAAwB;YACxB,0BAA0B;YAC1B,sBAAsB;YACtB,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/batch/imports.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AACrE,8CAA6C;AAC7C,wCAA2D;AAG3D;;GAEG;AACH,SAAgB,uBAAuB,CACrC,OAA2B;IAE3B,OAAO;QACL,IAAA,uCAA6B,EAC3B;YACE,sBAAsB;YACtB,sBAAsB;YACtB,eAAe;YACf,sBAAsB;YACtB,wBAAwB;YACxB,0BAA0B;YAC1B,sBAAsB;YACtB,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,gBAAgB;SACjB,EACD,OAAO,CAAC,YAAY,CACrB;QACD;YACE,IAAI,EAAE,wBAAa,CAAC,iBAAiB;YACrC,eAAe,EAAE,qBAAqB;YACtC,YAAY,EAAE,CAAC,kCAAkC,CAAC;SACnD;QACD;YACE,IAAI,EAAE,wBAAa,CAAC,iBAAiB;YACrC,eAAe,EAAE,SAAS;YAC1B,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC;SACvC;KACF,CAAC;AACJ,CAAC;AA7BD,0DA6BC;AAED,SAAS,eAAe,CAAC,OAA2B;IAClD,MAAM,iCAAiC,GAAG,OAAO,CAAC,UAAU;SACzD,MAAM,CACL,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,kBAAkB,KAAK,cAAc,CACrE;SACA,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAEzD,OAAO,IAAA,aAAM,EAAC;QACZ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzC,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;QACpD,GAAG,iCAAiC;KACrC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -64,10 +64,7 @@ function operationDeclarations({ oDataVersion, className }, operations = []) {
|
|
|
64
64
|
.length;
|
|
65
65
|
const includesUnbound = !!operations.filter(operation => !operation.isBound)
|
|
66
66
|
.length;
|
|
67
|
-
const
|
|
68
|
-
const hasActionWithParameters = operations.some(operation => operation.parameters.length && operation.type === 'action');
|
|
69
|
-
const hasFunction = operations.some(operation => operation.type === 'function');
|
|
70
|
-
const hasAction = operations.some(operation => operation.type === 'action');
|
|
67
|
+
const hasOperationWithParameters = operations.some(operation => operation.parameters.length);
|
|
71
68
|
if (includesUnbound && includesBound) {
|
|
72
69
|
throw new Error('Bound and unbound operations found in generation - this should not happen.');
|
|
73
70
|
}
|
|
@@ -90,18 +87,9 @@ function operationDeclarations({ oDataVersion, className }, operations = []) {
|
|
|
90
87
|
'DefaultDeSerializers',
|
|
91
88
|
'defaultDeSerializers',
|
|
92
89
|
...(0, imports_1.propertyTypeImportNames)(parameters),
|
|
93
|
-
...(
|
|
94
|
-
...(
|
|
95
|
-
...(
|
|
96
|
-
? ['FunctionImportRequestBuilder']
|
|
97
|
-
: []),
|
|
98
|
-
...(includesUnbound && hasAction ? ['ActionImportRequestBuilder'] : []),
|
|
99
|
-
...(includesBound && hasFunction
|
|
100
|
-
? ['BoundFunctionImportRequestBuilder']
|
|
101
|
-
: []),
|
|
102
|
-
...(includesBound && hasAction
|
|
103
|
-
? ['BoundActionImportRequestBuilder']
|
|
104
|
-
: [])
|
|
90
|
+
...(hasOperationWithParameters ? ['OperationParameter'] : []),
|
|
91
|
+
...(includesUnbound ? ['OperationRequestBuilder'] : []),
|
|
92
|
+
...(includesBound ? ['BoundOperationRequestBuilder'] : [])
|
|
105
93
|
], oDataVersion),
|
|
106
94
|
...serviceImport,
|
|
107
95
|
...returnTypeImports(returnTypes)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/operations/import.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAqE;AACrE,gDAAwB;AAMxB,wCAKoB;AACpB,kDAA0D;AAC1D,mFAAkF;AAElF,SAAS,yBAAyB,CAAC,WAAqC;IACtE,OAAO,WAAW,CAAC,IAAI,CACrB,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,KAAK,cAAc,CAC/D;QACC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QACxB,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAqC;IAC9D,OAAO,WAAW,CAAC,IAAI,CACrB,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,KAAK,UAAU,CAC3D;QACC,CAAC,CAAC,CAAC,SAAS,CAAC;QACb,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,0BAA0B,CAAC,WAAqC;IACvE,OAAO,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAClC,IAAA,0BAAiB,EAAC,UAAU,CAAC;QAC3B,CAAC,CAAC,qCAAqC;QACvC,CAAC,CAAC,IAAA,+DAA+B,EAAC,UAAU,CAAC,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,WAAqC;IAErC,OAAO,IAAA,iCAAuB,EAC5B,WAAW;SACR,MAAM,CACL,UAAU,CAAC,EAAE,CACX,UAAU,CAAC,kBAAkB,KAAK,UAAU;QAC5C,UAAU,CAAC,kBAAkB,KAAK,MAAM;QACxC,UAAU,CAAC,kBAAkB,KAAK,OAAO,CAC5C;SACA,MAAM,CACL,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC,EACtE,EAAE,CACH,CACJ,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,UAAkC;IAElC,MAAM,WAAW,GAAiC;QAChD;YACE,IAAI,EAAE,wBAAa,CAAC,iBAAiB;YACrC,YAAY,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;YACrC,eAAe,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE;SAC9C;KACF,CAAC;IACF,IAAI,UAAU,CAAC,kBAAkB,KAAK,QAAQ,EAAE;QAC9C,OAAO;YACL,GAAG,WAAW;YACd;gBACE,IAAI,EAAE,wBAAa,CAAC,iBAAiB;gBACrC,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC,UAAU,KAAK,CAAC;gBAC7C,eAAe,EAAE,KAAK,UAAU,CAAC,UAAU,KAAK;aACjD;SACF,CAAC;KACH;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CACnC,EAAE,YAAY,EAAE,SAAS,EAAsB,EAC/C,aAA6B,EAAE;IAE/B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;SACtE,MAAM,CAAC;IACV,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;SACzE,MAAM,CAAC;IACV,MAAM,
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/operations/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.operationFunction = exports.operationFunctionBase = void 0;
|
|
7
4
|
const ts_morph_1 = require("ts-morph");
|
|
8
|
-
const voca_1 = __importDefault(require("voca"));
|
|
9
5
|
const common_1 = require("../edmx-to-vdm/common");
|
|
10
6
|
const request_builder_arguments_1 = require("./request-builder-arguments");
|
|
11
7
|
const return_type_1 = require("./return-type");
|
|
@@ -62,13 +58,10 @@ function getDocDescription({ description, returnType, type }) {
|
|
|
62
58
|
: ''}`;
|
|
63
59
|
}
|
|
64
60
|
function getOperationStatements(operation, service) {
|
|
65
|
-
const requestBuilderName = `${operation.isBound ? 'Bound' : ''}
|
|
66
|
-
const paramsLines = (operation.parameters || []).map(param => `${param.parameterName}: new
|
|
61
|
+
const requestBuilderName = `${operation.isBound ? 'Bound' : ''}OperationRequestBuilder`;
|
|
62
|
+
const paramsLines = (operation.parameters || []).map(param => `${param.parameterName}: new OperationParameter('${param.originalName}', '${param.edmType}', ${parameterName}.${param.parameterName})`);
|
|
67
63
|
const params = `const params = {\n${paramsLines.join(',\n')}\n};`;
|
|
68
|
-
|
|
69
|
-
if (operation.type === 'function' && service.oDataVersion === 'v2') {
|
|
70
|
-
parameters = [`'${operation.httpMethod}'`, ...parameters];
|
|
71
|
-
}
|
|
64
|
+
const parameters = (0, request_builder_arguments_1.getRequestBuilderArguments)(operation, service);
|
|
72
65
|
const returnStatement = `return new ${requestBuilderName}(${parameters.join(', ')});`;
|
|
73
66
|
return `${params}\n\n${returnStatement}`;
|
|
74
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../src/operations/operation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../src/operations/operation.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,kDAA0D;AAE1D,2EAAyE;AACzE,+CAAoD;AAEpD,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,SAAuB,EACvB,OAA2B;IAE3B,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IAC9B,OAAO;QACL,IAAI,EAAE,OAAO;YACX,CAAC,CAAC,SAAS,CAAC,IAAI;YAChB,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,+DAA+D;QAEpF,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,GAAG,SAAS,CAAC,kBAAkB,IACnC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,gBAClB,GAAG;aACJ;YACD;gBACE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe;gBAClD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB;gBACtC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,6BAA6B;aACjE;SACF;QACD,UAAU,EAAE,IAAA,iCAAmB,EAAC,SAAS,CAAC;QAC1C,UAAU,EAAE,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC;QACtD,IAAI,EAAE;YACJ;gBACE,iBAAiB,CAAC,SAAS,CAAC;gBAC5B,gEAAgE,SAAS,CAAC,IAAI,GAAG;gBACjF,2GAA2G;aAC5G,CAAC,IAAI,CAAC,IAAI,CAAC;SACb;KACF,CAAC;AACJ,CAAC;AAjCD,sDAiCC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAC/B,SAAuB,EACvB,OAA2B;IAE3B,OAAO;QACL,IAAI,EAAE,wBAAa,CAAC,QAAQ;QAC5B,UAAU,EAAE,IAAI;QAChB,GAAG,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC;KAC7C,CAAC;AACJ,CAAC;AATD,8CASC;AAED,SAAS,iBAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAgB;IACxE,OAAO,GAAG,WAAW,IACnB,IAAA,0BAAiB,EAAC,UAAU,CAAC;QAC3B,CAAC,CAAC,gDAAgD,IAAI,2DAA2D;QACjH,CAAC,CAAC,EACN,EAAE,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAC7B,SAAuB,EACvB,OAA2B;IAE3B,MAAM,kBAAkB,GAAG,GACzB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAChC,yBAAyB,CAAC;IAC1B,MAAM,WAAW,GAAG,CAAC,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAClD,KAAK,CAAC,EAAE,CACN,GAAG,KAAK,CAAC,aAAa,6BAA6B,KAAK,CAAC,YAAY,OAAO,KAAK,CAAC,OAAO,MAAM,aAAa,IAAI,KAAK,CAAC,aAAa,GAAG,CACzI,CAAC;IACF,MAAM,MAAM,GAAG,qBAAqB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAElE,MAAM,UAAU,GAAG,IAAA,sDAA0B,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,cAAc,kBAAkB,IAAI,UAAU,CAAC,IAAI,CACzE,IAAI,CACL,IAAI,CAAC;IAEN,OAAO,GAAG,MAAM,OAAO,eAAe,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -2,4 +2,4 @@ import { VdmOperation, VdmServiceMetadata } from '../vdm-types';
|
|
|
2
2
|
/**
|
|
3
3
|
* @internal
|
|
4
4
|
*/
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function getRequestBuilderArguments(operation: VdmOperation, service: VdmServiceMetadata): string[];
|
|
@@ -1,30 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getRequestBuilderArguments = void 0;
|
|
4
4
|
const common_1 = require("../edmx-to-vdm/common");
|
|
5
5
|
const response_transformer_function_1 = require("./response-transformer-function");
|
|
6
6
|
/**
|
|
7
7
|
* @internal
|
|
8
8
|
*/
|
|
9
|
-
function
|
|
9
|
+
function getRequestBuilderArguments(operation, service) {
|
|
10
10
|
const sharedParameters = [getTransformer(operation), 'params'];
|
|
11
|
-
if (
|
|
11
|
+
if (operation.isBound) {
|
|
12
12
|
return [
|
|
13
|
-
|
|
13
|
+
'this._entityApi',
|
|
14
|
+
'this',
|
|
14
15
|
`'${operation.originalName}'`,
|
|
15
16
|
...sharedParameters,
|
|
16
|
-
'deSerializers'
|
|
17
|
+
'deSerializers || defaultDeSerializers',
|
|
18
|
+
`'${operation.type}'`
|
|
17
19
|
];
|
|
18
20
|
}
|
|
19
|
-
|
|
20
|
-
'
|
|
21
|
-
'this',
|
|
21
|
+
const params = [
|
|
22
|
+
`'${service.serviceOptions.basePath}'`,
|
|
22
23
|
`'${operation.originalName}'`,
|
|
23
24
|
...sharedParameters,
|
|
24
|
-
'deSerializers
|
|
25
|
+
'deSerializers'
|
|
25
26
|
];
|
|
27
|
+
return service.oDataVersion === 'v4'
|
|
28
|
+
? [...params, `'${operation.type}'`]
|
|
29
|
+
: [`'${operation.httpMethod}'`, ...params];
|
|
26
30
|
}
|
|
27
|
-
exports.
|
|
31
|
+
exports.getRequestBuilderArguments = getRequestBuilderArguments;
|
|
28
32
|
function getTransformer(operation) {
|
|
29
33
|
if ((0, common_1.cannotDeserialize)(operation.returnType)) {
|
|
30
34
|
return `(data) => throwErrorWhenReturnTypeIsUnionType(data, '${operation.originalName}')`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-builder-arguments.js","sourceRoot":"","sources":["../../src/operations/request-builder-arguments.ts"],"names":[],"mappings":";;;AACA,kDAA0D;AAC1D,mFAAkF;AAElF;;GAEG;AACH,SAAgB,
|
|
1
|
+
{"version":3,"file":"request-builder-arguments.js","sourceRoot":"","sources":["../../src/operations/request-builder-arguments.ts"],"names":[],"mappings":";;;AACA,kDAA0D;AAC1D,mFAAkF;AAElF;;GAEG;AACH,SAAgB,0BAA0B,CACxC,SAAuB,EACvB,OAA2B;IAE3B,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,IAAI,SAAS,CAAC,OAAO,EAAE;QACrB,OAAO;YACL,iBAAiB;YACjB,MAAM;YACN,IAAI,SAAS,CAAC,YAAY,GAAG;YAC7B,GAAG,gBAAgB;YACnB,uCAAuC;YACvC,IAAI,SAAS,CAAC,IAAI,GAAG;SACtB,CAAC;KACH;IACD,MAAM,MAAM,GAAG;QACb,IAAI,OAAO,CAAC,cAAc,CAAC,QAAQ,GAAG;QACtC,IAAI,SAAS,CAAC,YAAY,GAAG;QAC7B,GAAG,gBAAgB;QACnB,eAAe;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC,YAAY,KAAK,IAAI;QAClC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC;QACpC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,UAAU,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC/C,CAAC;AAzBD,gEAyBC;AAED,SAAS,cAAc,CAAC,SAAuB;IAC7C,IAAI,IAAA,0BAAiB,EAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QAC3C,OAAO,wDAAwD,SAAS,CAAC,YAAY,IAAI,CAAC;KAC3F;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE;QACxC,OAAO,aAAa,IAAA,+DAA+B,EACjD,SAAS,CAAC,UAAU,CACrB,UAAU,SAAS,CAAC,UAAU,CAAC,eAAe,GAAG,CAAC;KACpD;IACD,MAAM,KAAK,CACT,uCAAuC,SAAS,CAAC,YAAY,kCAAkC,SAAS,CAAC,UAAU,CAAC,eAAe,cAAc,CAClJ,CAAC;AACJ,CAAC"}
|
|
@@ -2,4 +2,4 @@ import { VdmOperation } from '../vdm-types';
|
|
|
2
2
|
/**
|
|
3
3
|
* @internal
|
|
4
4
|
*/
|
|
5
|
-
export declare function operationReturnType({ returnType, parametersTypeName,
|
|
5
|
+
export declare function operationReturnType({ returnType, parametersTypeName, isBound, name, entityClassName }: VdmOperation): string;
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.operationReturnType = void 0;
|
|
7
|
-
const voca_1 = __importDefault(require("voca"));
|
|
8
4
|
const common_1 = require("../edmx-to-vdm/common");
|
|
9
5
|
/**
|
|
10
6
|
* @internal
|
|
11
7
|
*/
|
|
12
|
-
function operationReturnType({ returnType, parametersTypeName,
|
|
8
|
+
function operationReturnType({ returnType, parametersTypeName, isBound, name, entityClassName }) {
|
|
13
9
|
let type = returnType.returnType;
|
|
14
|
-
const requestBuilderName = `${isBound ? 'Bound' : ''}
|
|
10
|
+
const requestBuilderName = `${isBound ? 'Bound' : ''}OperationRequestBuilder`;
|
|
15
11
|
if ((0, common_1.cannotDeserialize)(returnType)) {
|
|
16
12
|
type = wrapRequestBuilderAroundType(requestBuilderName, parametersTypeName, type);
|
|
17
13
|
type = `Omit<${type}, 'execute'>`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"return-type.js","sourceRoot":"","sources":["../../src/operations/return-type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"return-type.js","sourceRoot":"","sources":["../../src/operations/return-type.ts"],"names":[],"mappings":";;;AACA,kDAA0D;AAC1D;;GAEG;AACH,SAAgB,mBAAmB,CAAC,EAClC,UAAU,EACV,kBAAkB,EAClB,OAAO,EACP,IAAI,EACJ,eAAe,EACF;IACb,IAAI,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;IACjC,MAAM,kBAAkB,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,yBAAyB,CAAC;IAE9E,IAAI,IAAA,0BAAiB,EAAC,UAAU,CAAC,EAAE;QACjC,IAAI,GAAG,4BAA4B,CACjC,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,CACL,CAAC;QACF,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC;QAClC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,UAAU,CAAC,YAAY,EAAE;QAC3B,IAAI,GAAG,GAAG,IAAI,IAAI,CAAC;KACpB;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC;KACzB;IAED,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,kEAAkE,IAAI,EAAE,CACzE,CAAC;KACH;IACD,IAAI,GAAG,OAAO;QACZ,CAAC,CAAC,iCAAiC,CAC/B,eAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,CACL;QACH,CAAC,CAAC,4BAA4B,CAC1B,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,CACL,CAAC;IACN,OAAO,IAAI,CAAC;AACd,CAAC;AA9CD,kDA8CC;AAED,SAAS,4BAA4B,CACnC,kBAA0B,EAC1B,aAAqB,EACrB,IAAY;IAEZ,OAAO,GAAG,kBAAkB,oBAAoB,aAAa,qBAAqB,IAAI,GAAG,CAAC;AAC5F,CAAC;AAED,SAAS,iCAAiC,CACxC,UAAkB,EAClB,kBAA0B,EAC1B,aAAqB,EACrB,IAAY;IAEZ,OAAO,GAAG,kBAAkB,IAAI,UAAU,WAAW,aAAa,QAAQ,IAAI,GAAG,CAAC;AACpF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap-cloud-sdk/generator",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"description": "SAP Cloud SDK for JavaScript OData client generator",
|
|
5
5
|
"homepage": "https://sap.github.io/cloud-sdk/docs/js/overview",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -40,11 +40,11 @@
|
|
|
40
40
|
"readme": "ts-node ../../scripts/replace-common-readme.ts"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@sap-cloud-sdk/generator-common": "^3.
|
|
44
|
-
"@sap-cloud-sdk/odata-common": "^3.
|
|
45
|
-
"@sap-cloud-sdk/odata-v2": "^3.
|
|
46
|
-
"@sap-cloud-sdk/odata-v4": "^3.
|
|
47
|
-
"@sap-cloud-sdk/util": "^3.
|
|
43
|
+
"@sap-cloud-sdk/generator-common": "^3.3.0",
|
|
44
|
+
"@sap-cloud-sdk/odata-common": "^3.3.0",
|
|
45
|
+
"@sap-cloud-sdk/odata-v2": "^3.3.0",
|
|
46
|
+
"@sap-cloud-sdk/odata-v4": "^3.3.0",
|
|
47
|
+
"@sap-cloud-sdk/util": "^3.3.0",
|
|
48
48
|
"@types/fs-extra": "^11.0.1",
|
|
49
49
|
"fast-xml-parser": "^4.2.6",
|
|
50
50
|
"fs-extra": "^11.1.1",
|