@zimic/http 0.1.0-canary.17 → 0.1.0-canary.18
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/chunk-7A4JDAZZ.mjs +63 -63
- package/dist/chunk-7A4JDAZZ.mjs.map +1 -1
- package/dist/chunk-VEQ424IU.js +63 -63
- package/dist/chunk-VEQ424IU.js.map +1 -1
- package/dist/cli.js +2 -2
- package/dist/cli.js.map +1 -1
- package/dist/cli.mjs +2 -2
- package/dist/cli.mjs.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +4 -4
- package/dist/index.mjs.map +1 -1
- package/package.json +8 -8
package/dist/chunk-VEQ424IU.js
CHANGED
|
@@ -21,7 +21,7 @@ var __name2 = /* @__PURE__ */ __name((target, value) => __defProp2(target, "name
|
|
|
21
21
|
|
|
22
22
|
// ../zimic-utils/dist/chunk-3O5CS47X.mjs
|
|
23
23
|
function isDefined(value) {
|
|
24
|
-
return value !==
|
|
24
|
+
return value !== void 0 && value !== null;
|
|
25
25
|
}
|
|
26
26
|
__name(isDefined, "isDefined");
|
|
27
27
|
__name2(isDefined, "isDefined");
|
|
@@ -47,13 +47,13 @@ function createNullType() {
|
|
|
47
47
|
}
|
|
48
48
|
__name(createNullType, "createNullType");
|
|
49
49
|
function createImportSpecifier(importName) {
|
|
50
|
-
return ts3__default.default.factory.createImportSpecifier(false,
|
|
50
|
+
return ts3__default.default.factory.createImportSpecifier(false, void 0, ts3__default.default.factory.createIdentifier(importName));
|
|
51
51
|
}
|
|
52
52
|
__name(createImportSpecifier, "createImportSpecifier");
|
|
53
53
|
function createImportDeclaration(importSpecifiers, moduleName, options) {
|
|
54
54
|
return ts3__default.default.factory.createImportDeclaration(
|
|
55
|
-
|
|
56
|
-
ts3__default.default.factory.createImportClause(options.typeOnly,
|
|
55
|
+
void 0,
|
|
56
|
+
ts3__default.default.factory.createImportClause(options.typeOnly, void 0, ts3__default.default.factory.createNamedImports(importSpecifiers)),
|
|
57
57
|
ts3__default.default.factory.createStringLiteral(moduleName)
|
|
58
58
|
);
|
|
59
59
|
}
|
|
@@ -73,11 +73,11 @@ function createOperationsIdentifier(serviceName) {
|
|
|
73
73
|
}
|
|
74
74
|
__name(createOperationsIdentifier, "createOperationsIdentifier");
|
|
75
75
|
function isOperationsDeclaration(node) {
|
|
76
|
-
return node !==
|
|
76
|
+
return node !== void 0 && ts3__default.default.isInterfaceDeclaration(node) && node.name.text === "operations";
|
|
77
77
|
}
|
|
78
78
|
__name(isOperationsDeclaration, "isOperationsDeclaration");
|
|
79
79
|
function isOperation(node) {
|
|
80
|
-
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !==
|
|
80
|
+
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !== void 0 && ts3__default.default.isTypeLiteralNode(node.type);
|
|
81
81
|
}
|
|
82
82
|
__name(isOperation, "isOperation");
|
|
83
83
|
function wrapOperationType(type, context) {
|
|
@@ -91,7 +91,7 @@ function wrapOperationType(type, context) {
|
|
|
91
91
|
__name(wrapOperationType, "wrapOperationType");
|
|
92
92
|
function normalizeOperation(operation, context) {
|
|
93
93
|
if (!isOperation(operation)) {
|
|
94
|
-
return
|
|
94
|
+
return void 0;
|
|
95
95
|
}
|
|
96
96
|
const newType = normalizeTypeLiteralMethodType(operation.type, context);
|
|
97
97
|
return ts3__default.default.factory.updatePropertySignature(
|
|
@@ -118,7 +118,7 @@ function normalizeOperations(operations, context) {
|
|
|
118
118
|
__name(normalizeOperations, "normalizeOperations");
|
|
119
119
|
function removeOperationIfUnreferenced(operation, context) {
|
|
120
120
|
if (!isOperation(operation)) {
|
|
121
|
-
return
|
|
121
|
+
return void 0;
|
|
122
122
|
}
|
|
123
123
|
const operationName = operation.name.text;
|
|
124
124
|
const isReferenced = context.referencedTypes.operations.has(operationName);
|
|
@@ -126,14 +126,14 @@ function removeOperationIfUnreferenced(operation, context) {
|
|
|
126
126
|
context.referencedTypes.operations.delete(operationName);
|
|
127
127
|
return operation;
|
|
128
128
|
}
|
|
129
|
-
return
|
|
129
|
+
return void 0;
|
|
130
130
|
}
|
|
131
131
|
__name(removeOperationIfUnreferenced, "removeOperationIfUnreferenced");
|
|
132
132
|
function removeUnreferencedOperations(operations, context) {
|
|
133
133
|
const newMembers = operations.members.map((operation) => removeOperationIfUnreferenced(operation, context)).filter(isDefined_default);
|
|
134
134
|
context.referencedTypes.operations.clear();
|
|
135
135
|
if (newMembers.length === 0) {
|
|
136
|
-
return
|
|
136
|
+
return void 0;
|
|
137
137
|
}
|
|
138
138
|
return ts3__default.default.factory.updateInterfaceDeclaration(
|
|
139
139
|
operations,
|
|
@@ -148,15 +148,15 @@ __name(removeUnreferencedOperations, "removeUnreferencedOperations");
|
|
|
148
148
|
|
|
149
149
|
// src/typegen/openapi/transform/methods.ts
|
|
150
150
|
function isMethod(node) {
|
|
151
|
-
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !==
|
|
151
|
+
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !== void 0 && (ts3__default.default.isTypeLiteralNode(node.type) || ts3__default.default.isIndexedAccessTypeNode(node.type));
|
|
152
152
|
}
|
|
153
153
|
__name(isMethod, "isMethod");
|
|
154
154
|
function isMethodMember(node) {
|
|
155
|
-
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !==
|
|
155
|
+
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !== void 0 && (ts3__default.default.isTypeLiteralNode(node.type) || ts3__default.default.isIndexedAccessTypeNode(node.type) || isNeverType(node.type));
|
|
156
156
|
}
|
|
157
157
|
__name(isMethodMember, "isMethodMember");
|
|
158
158
|
function isRequestMember(node) {
|
|
159
|
-
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !==
|
|
159
|
+
return ts3__default.default.isPropertySignature(node) && ts3__default.default.isIdentifier(node.name) && node.type !== void 0 && !isNeverType(node.type);
|
|
160
160
|
}
|
|
161
161
|
__name(isRequestMember, "isRequestMember");
|
|
162
162
|
function isRequestHeaders(node) {
|
|
@@ -164,7 +164,7 @@ function isRequestHeaders(node) {
|
|
|
164
164
|
}
|
|
165
165
|
__name(isRequestHeaders, "isRequestHeaders");
|
|
166
166
|
function isNormalizedRequestHeaders(node) {
|
|
167
|
-
return isRequestMember(node) && node.name.text === "headers" && ts3__default.default.isTypeReferenceNode(node.type) && node.type.typeArguments !==
|
|
167
|
+
return isRequestMember(node) && node.name.text === "headers" && ts3__default.default.isTypeReferenceNode(node.type) && node.type.typeArguments !== void 0 && node.type.typeArguments.length === 1 && ts3__default.default.isTypeLiteralNode(node.type.typeArguments[0]);
|
|
168
168
|
}
|
|
169
169
|
__name(isNormalizedRequestHeaders, "isNormalizedRequestHeaders");
|
|
170
170
|
function isRequestParameters(node) {
|
|
@@ -176,11 +176,11 @@ function isContentPropertySignature(node) {
|
|
|
176
176
|
}
|
|
177
177
|
__name(isContentPropertySignature, "isContentPropertySignature");
|
|
178
178
|
function isContentMember(node) {
|
|
179
|
-
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !==
|
|
179
|
+
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !== void 0 && !isNeverType(node.type);
|
|
180
180
|
}
|
|
181
181
|
__name(isContentMember, "isContentMember");
|
|
182
182
|
function isResponse(node) {
|
|
183
|
-
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name) || ts3__default.default.isNumericLiteral(node.name)) && node.type !==
|
|
183
|
+
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name) || ts3__default.default.isNumericLiteral(node.name)) && node.type !== void 0;
|
|
184
184
|
}
|
|
185
185
|
__name(isResponse, "isResponse");
|
|
186
186
|
function removeRedundantNullUnionIfNecessary(type) {
|
|
@@ -230,7 +230,7 @@ function wrapURLEncodedContentType(type, context) {
|
|
|
230
230
|
__name(wrapURLEncodedContentType, "wrapURLEncodedContentType");
|
|
231
231
|
function normalizeRequestBodyMember(requestBodyMember, context, options) {
|
|
232
232
|
if (!isContentMember(requestBodyMember)) {
|
|
233
|
-
return
|
|
233
|
+
return void 0;
|
|
234
234
|
}
|
|
235
235
|
const newIdentifier = ts3__default.default.factory.createIdentifier("body");
|
|
236
236
|
const contentType = requestBodyMember.name.text;
|
|
@@ -267,12 +267,12 @@ function normalizeHeaders(headers, context) {
|
|
|
267
267
|
return false;
|
|
268
268
|
}
|
|
269
269
|
if (ts3__default.default.isPropertySignature(header)) {
|
|
270
|
-
return header.type !==
|
|
270
|
+
return header.type !== void 0 && !isUnknownType(header.type);
|
|
271
271
|
}
|
|
272
272
|
return true;
|
|
273
273
|
});
|
|
274
274
|
if (newHeaderMembers.length === 0) {
|
|
275
|
-
return
|
|
275
|
+
return void 0;
|
|
276
276
|
}
|
|
277
277
|
const newHeaders = ts3__default.default.factory.updateTypeLiteralNode(headers, ts3__default.default.factory.createNodeArray(newHeaderMembers));
|
|
278
278
|
return wrapHeadersType(newHeaders, context);
|
|
@@ -280,11 +280,11 @@ function normalizeHeaders(headers, context) {
|
|
|
280
280
|
__name(normalizeHeaders, "normalizeHeaders");
|
|
281
281
|
function normalizeRequestHeaders(requestHeader, context) {
|
|
282
282
|
if (!isRequestHeaders(requestHeader)) {
|
|
283
|
-
return
|
|
283
|
+
return void 0;
|
|
284
284
|
}
|
|
285
285
|
const newType = normalizeHeaders(requestHeader.type, context);
|
|
286
286
|
if (!newType) {
|
|
287
|
-
return
|
|
287
|
+
return void 0;
|
|
288
288
|
}
|
|
289
289
|
return ts3__default.default.factory.updatePropertySignature(
|
|
290
290
|
requestHeader,
|
|
@@ -301,7 +301,7 @@ function createHeaderForUnionByContentType(existingHeader, contentTypeName, cont
|
|
|
301
301
|
const contentTypeValue = ts3__default.default.factory.createLiteralTypeNode(ts3__default.default.factory.createStringLiteral(contentTypeName));
|
|
302
302
|
const newHeaderType = wrapHeadersType(
|
|
303
303
|
ts3__default.default.factory.createTypeLiteralNode([
|
|
304
|
-
ts3__default.default.factory.createPropertySignature(
|
|
304
|
+
ts3__default.default.factory.createPropertySignature(void 0, contentTypeIdentifier, void 0, contentTypeValue),
|
|
305
305
|
...existingHeaderMembers
|
|
306
306
|
]),
|
|
307
307
|
context
|
|
@@ -309,7 +309,7 @@ function createHeaderForUnionByContentType(existingHeader, contentTypeName, cont
|
|
|
309
309
|
return ts3__default.default.factory.createPropertySignature(
|
|
310
310
|
existingHeader?.modifiers,
|
|
311
311
|
ts3__default.default.factory.createIdentifier("headers"),
|
|
312
|
-
|
|
312
|
+
void 0,
|
|
313
313
|
newHeaderType
|
|
314
314
|
);
|
|
315
315
|
}
|
|
@@ -350,7 +350,7 @@ function normalizeRequest(request, context) {
|
|
|
350
350
|
const referencedComponentName = request.type.indexType.literal.text;
|
|
351
351
|
context.pendingActions.components.requests.toMarkBodyAsOptional.add(referencedComponentName);
|
|
352
352
|
}
|
|
353
|
-
return ts3__default.default.factory.updatePropertySignature(request, request.modifiers, newIdentifier,
|
|
353
|
+
return ts3__default.default.factory.updatePropertySignature(request, request.modifiers, newIdentifier, void 0, newType);
|
|
354
354
|
}
|
|
355
355
|
__name(normalizeRequest, "normalizeRequest");
|
|
356
356
|
function wrapResponseType(type, context) {
|
|
@@ -382,7 +382,7 @@ var NON_NUMERIC_RESPONSE_STATUS_TO_MAPPED_TYPE = {
|
|
|
382
382
|
function normalizeResponse(response, context, options = {}) {
|
|
383
383
|
const { isComponent: isComponent2 = false } = options;
|
|
384
384
|
if (!isResponse(response)) {
|
|
385
|
-
return
|
|
385
|
+
return void 0;
|
|
386
386
|
}
|
|
387
387
|
const newType = normalizeResponseType(response.type, context, {
|
|
388
388
|
isComponent: isComponent2,
|
|
@@ -408,7 +408,7 @@ function normalizeResponse(response, context, options = {}) {
|
|
|
408
408
|
`Warning: Response has a non-standard status code: ${chalk__default.default.yellow(response.name.text)}. Consider replacing it with a number (e.g. '200'), a pattern ('1xx', '2xx', '3xx', '4xx', or '5xx'), or 'default'.`,
|
|
409
409
|
{ method: "warn" }
|
|
410
410
|
);
|
|
411
|
-
return
|
|
411
|
+
return void 0;
|
|
412
412
|
}
|
|
413
413
|
context.typeImports.http.add("HttpStatusCode");
|
|
414
414
|
const newIdentifier = ts3__default.default.factory.createIdentifier(`[StatusCode in ${mappedType}]`);
|
|
@@ -431,10 +431,10 @@ function normalizeResponse(response, context, options = {}) {
|
|
|
431
431
|
__name(normalizeResponse, "normalizeResponse");
|
|
432
432
|
function normalizeResponses(responses, context) {
|
|
433
433
|
if (isNeverType(responses.type) || !ts3__default.default.isTypeLiteralNode(responses.type)) {
|
|
434
|
-
return
|
|
434
|
+
return void 0;
|
|
435
435
|
}
|
|
436
436
|
const newIdentifier = ts3__default.default.factory.createIdentifier("response");
|
|
437
|
-
const newQuestionToken =
|
|
437
|
+
const newQuestionToken = void 0;
|
|
438
438
|
const newMembers = responses.type.members.map((response) => normalizeResponse(response, context), context).filter(isDefined_default);
|
|
439
439
|
const sortedNewMembers = Array.from(newMembers).sort((response, otherResponse) => {
|
|
440
440
|
return response.statusCode.value.localeCompare(otherResponse.statusCode.value);
|
|
@@ -487,12 +487,12 @@ function normalizeMethodMember(methodMember, context) {
|
|
|
487
487
|
}
|
|
488
488
|
return methodMember;
|
|
489
489
|
}
|
|
490
|
-
return
|
|
490
|
+
return void 0;
|
|
491
491
|
}
|
|
492
492
|
__name(normalizeMethodMember, "normalizeMethodMember");
|
|
493
493
|
function normalizeRequestQueryWithParameters(requestMember, context) {
|
|
494
494
|
const newIdentifier = ts3__default.default.factory.createIdentifier("searchParams");
|
|
495
|
-
const newQuestionToken =
|
|
495
|
+
const newQuestionToken = void 0;
|
|
496
496
|
const newType = renameComponentReferences(requestMember.type, context);
|
|
497
497
|
context.typeImports.http.add("HttpSearchParamsSerialized");
|
|
498
498
|
const serializedWrapper = ts3__default.default.factory.createIdentifier("HttpSearchParamsSerialized");
|
|
@@ -508,7 +508,7 @@ function normalizeRequestQueryWithParameters(requestMember, context) {
|
|
|
508
508
|
__name(normalizeRequestQueryWithParameters, "normalizeRequestQueryWithParameters");
|
|
509
509
|
function normalizeRequestHeadersWithParameters(requestMember, context) {
|
|
510
510
|
const newIdentifier = ts3__default.default.factory.createIdentifier("headers");
|
|
511
|
-
const newQuestionToken =
|
|
511
|
+
const newQuestionToken = void 0;
|
|
512
512
|
const newType = renameComponentReferences(requestMember.type, context);
|
|
513
513
|
context.typeImports.http.add("HttpHeadersSerialized");
|
|
514
514
|
const serializedWrapper = ts3__default.default.factory.createIdentifier("HttpHeadersSerialized");
|
|
@@ -524,7 +524,7 @@ function normalizeRequestHeadersWithParameters(requestMember, context) {
|
|
|
524
524
|
__name(normalizeRequestHeadersWithParameters, "normalizeRequestHeadersWithParameters");
|
|
525
525
|
function normalizeRequestMemberWithParameters(requestMember, context) {
|
|
526
526
|
if (!isRequestMember(requestMember) || requestMember.name.text === "path") {
|
|
527
|
-
return
|
|
527
|
+
return void 0;
|
|
528
528
|
}
|
|
529
529
|
if (requestMember.name.text === "query") {
|
|
530
530
|
return normalizeRequestQueryWithParameters(requestMember, context);
|
|
@@ -561,15 +561,15 @@ function mergeRequestHeadersMembers(members) {
|
|
|
561
561
|
if (!member || !isNormalizedRequestHeaders(member)) {
|
|
562
562
|
return member;
|
|
563
563
|
}
|
|
564
|
-
if (firstHeadersIndex ===
|
|
564
|
+
if (firstHeadersIndex === void 0 || !mergedHeaders) {
|
|
565
565
|
firstHeadersIndex = index;
|
|
566
566
|
mergedHeaders = member;
|
|
567
567
|
return member;
|
|
568
568
|
}
|
|
569
569
|
mergedHeaders = mergeRequestHeadersMember(mergedHeaders, member);
|
|
570
|
-
return
|
|
570
|
+
return void 0;
|
|
571
571
|
});
|
|
572
|
-
if (firstHeadersIndex !==
|
|
572
|
+
if (firstHeadersIndex !== void 0) {
|
|
573
573
|
mergedHeadersMembers[firstHeadersIndex] = mergedHeaders;
|
|
574
574
|
}
|
|
575
575
|
return mergedHeadersMembers.filter(isDefined_default);
|
|
@@ -585,7 +585,7 @@ function mergeRequestAndParameterTypes(requestType, methodMembers, context) {
|
|
|
585
585
|
})
|
|
586
586
|
);
|
|
587
587
|
if (newMembers.length === 0) {
|
|
588
|
-
return
|
|
588
|
+
return void 0;
|
|
589
589
|
}
|
|
590
590
|
return ts3__default.default.factory.createTypeLiteralNode(newMembers);
|
|
591
591
|
}
|
|
@@ -604,25 +604,25 @@ function normalizeRequestTypeWithParameters(requestType, methodMembers, context)
|
|
|
604
604
|
__name(normalizeRequestTypeWithParameters, "normalizeRequestTypeWithParameters");
|
|
605
605
|
function normalizeMethodMemberWithParameters(methodMember, methodMembers, context) {
|
|
606
606
|
if (!ts3__default.default.isIdentifier(methodMember.name) || !methodMember.type) {
|
|
607
|
-
return
|
|
607
|
+
return void 0;
|
|
608
608
|
}
|
|
609
609
|
if (methodMember.name.text === "request") {
|
|
610
610
|
const newType = normalizeRequestTypeWithParameters(methodMember.type, methodMembers, context);
|
|
611
611
|
if (!newType) {
|
|
612
|
-
return
|
|
612
|
+
return void 0;
|
|
613
613
|
}
|
|
614
614
|
return ts3__default.default.factory.updatePropertySignature(
|
|
615
615
|
methodMember,
|
|
616
616
|
methodMember.modifiers,
|
|
617
617
|
methodMember.name,
|
|
618
|
-
|
|
618
|
+
void 0,
|
|
619
619
|
newType
|
|
620
620
|
);
|
|
621
621
|
}
|
|
622
622
|
if (methodMember.name.text === "response") {
|
|
623
623
|
return methodMember;
|
|
624
624
|
}
|
|
625
|
-
return
|
|
625
|
+
return void 0;
|
|
626
626
|
}
|
|
627
627
|
__name(normalizeMethodMemberWithParameters, "normalizeMethodMemberWithParameters");
|
|
628
628
|
function normalizeTypeLiteralMethodType(methodType, context) {
|
|
@@ -647,17 +647,17 @@ function normalizeIndexedAccessMethodType(methodType, context) {
|
|
|
647
647
|
__name(normalizeIndexedAccessMethodType, "normalizeIndexedAccessMethodType");
|
|
648
648
|
function normalizeMethod(method, context, options) {
|
|
649
649
|
if (!isMethod(method)) {
|
|
650
|
-
return
|
|
650
|
+
return void 0;
|
|
651
651
|
}
|
|
652
652
|
const methodName = method.name.text.toUpperCase();
|
|
653
653
|
if (!HTTP_METHODS.includes(methodName)) {
|
|
654
|
-
return
|
|
654
|
+
return void 0;
|
|
655
655
|
}
|
|
656
656
|
const pathMethodCompareString = `${methodName} ${options.pathName}`;
|
|
657
657
|
const matchesPositiveFilters = context.filters.paths.positive.length === 0 || context.filters.paths.positive.some((filter) => filter.test(pathMethodCompareString));
|
|
658
658
|
const matchesNegativeFilters = context.filters.paths.negative.length > 0 && context.filters.paths.negative.some((filter) => filter.test(pathMethodCompareString));
|
|
659
659
|
if (!matchesPositiveFilters || matchesNegativeFilters) {
|
|
660
|
-
return
|
|
660
|
+
return void 0;
|
|
661
661
|
}
|
|
662
662
|
const newIdentifier = ts3__default.default.factory.createIdentifier(methodName);
|
|
663
663
|
const newType = ts3__default.default.isTypeLiteralNode(method.type) ? normalizeTypeLiteralMethodType(method.type, context) : normalizeIndexedAccessMethodType(method.type, context);
|
|
@@ -669,11 +669,11 @@ function createPathsIdentifier(serviceName) {
|
|
|
669
669
|
}
|
|
670
670
|
__name(createPathsIdentifier, "createPathsIdentifier");
|
|
671
671
|
function isPathsDeclaration(node) {
|
|
672
|
-
return node !==
|
|
672
|
+
return node !== void 0 && (ts3__default.default.isInterfaceDeclaration(node) || ts3__default.default.isTypeAliasDeclaration(node)) && node.name.text === "paths";
|
|
673
673
|
}
|
|
674
674
|
__name(isPathsDeclaration, "isPathsDeclaration");
|
|
675
675
|
function isPath(node) {
|
|
676
|
-
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !==
|
|
676
|
+
return ts3__default.default.isPropertySignature(node) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name)) && node.type !== void 0 && (ts3__default.default.isTypeLiteralNode(node.type) || ts3__default.default.isIndexedAccessTypeNode(node.type));
|
|
677
677
|
}
|
|
678
678
|
__name(isPath, "isPath");
|
|
679
679
|
function normalizePathNameWithParameters(pathName) {
|
|
@@ -692,7 +692,7 @@ __name(wrapComponentPathType, "wrapComponentPathType");
|
|
|
692
692
|
function normalizePath(path4, context, options = {}) {
|
|
693
693
|
const { isComponent: isComponent2 = false } = options;
|
|
694
694
|
if (!isPath(path4)) {
|
|
695
|
-
return
|
|
695
|
+
return void 0;
|
|
696
696
|
}
|
|
697
697
|
const newPathName = isComponent2 ? path4.name.text : normalizePathNameWithParameters(path4.name.text);
|
|
698
698
|
const newIdentifier = isComponent2 ? path4.name : ts3__default.default.factory.createStringLiteral(newPathName);
|
|
@@ -700,7 +700,7 @@ function normalizePath(path4, context, options = {}) {
|
|
|
700
700
|
if (ts3__default.default.isTypeLiteralNode(path4.type)) {
|
|
701
701
|
const newMethods = path4.type.members.map((method) => normalizeMethod(method, context, { pathName: newPathName })).filter(isDefined_default);
|
|
702
702
|
if (newMethods.length === 0) {
|
|
703
|
-
return
|
|
703
|
+
return void 0;
|
|
704
704
|
}
|
|
705
705
|
newType = ts3__default.default.factory.updateTypeLiteralNode(path4.type, ts3__default.default.factory.createNodeArray(newMethods));
|
|
706
706
|
} else {
|
|
@@ -723,7 +723,7 @@ function wrapPathsType(type, context) {
|
|
|
723
723
|
__name(wrapPathsType, "wrapPathsType");
|
|
724
724
|
function normalizePaths(pathsOrTypeAlias, context) {
|
|
725
725
|
const newIdentifier = createPathsIdentifier(context.serviceName);
|
|
726
|
-
const paths = ts3__default.default.isTypeAliasDeclaration(pathsOrTypeAlias) ? ts3__default.default.factory.createInterfaceDeclaration(pathsOrTypeAlias.modifiers, pathsOrTypeAlias.name,
|
|
726
|
+
const paths = ts3__default.default.isTypeAliasDeclaration(pathsOrTypeAlias) ? ts3__default.default.factory.createInterfaceDeclaration(pathsOrTypeAlias.modifiers, pathsOrTypeAlias.name, void 0, void 0, []) : pathsOrTypeAlias;
|
|
727
727
|
const newMembers = paths.members.map((path4) => normalizePath(path4, context)).filter(isDefined_default);
|
|
728
728
|
const newType = ts3__default.default.factory.createTypeLiteralNode(newMembers);
|
|
729
729
|
return ts3__default.default.factory.createTypeAliasDeclaration(
|
|
@@ -746,15 +746,15 @@ function createComponentsIdentifier(serviceName) {
|
|
|
746
746
|
__name(createComponentsIdentifier, "createComponentsIdentifier");
|
|
747
747
|
function isComponentsDeclaration(node, context) {
|
|
748
748
|
const componentIdentifiers = ["components", createComponentsIdentifierText(context.serviceName)];
|
|
749
|
-
return node !==
|
|
749
|
+
return node !== void 0 && ts3__default.default.isInterfaceDeclaration(node) && componentIdentifiers.includes(node.name.text);
|
|
750
750
|
}
|
|
751
751
|
__name(isComponentsDeclaration, "isComponentsDeclaration");
|
|
752
752
|
function isComponentGroup(node) {
|
|
753
|
-
return ts3__default.default.isPropertySignature(node) && node.type !==
|
|
753
|
+
return ts3__default.default.isPropertySignature(node) && node.type !== void 0 && ts3__default.default.isTypeLiteralNode(node.type) && ts3__default.default.isIdentifier(node.name);
|
|
754
754
|
}
|
|
755
755
|
__name(isComponentGroup, "isComponentGroup");
|
|
756
756
|
function isComponent(node) {
|
|
757
|
-
return ts3__default.default.isPropertySignature(node) && node.type !==
|
|
757
|
+
return ts3__default.default.isPropertySignature(node) && node.type !== void 0 && !isNeverType(node.type) && (ts3__default.default.isIdentifier(node.name) || ts3__default.default.isStringLiteral(node.name));
|
|
758
758
|
}
|
|
759
759
|
__name(isComponent, "isComponent");
|
|
760
760
|
function isRequestComponent(node) {
|
|
@@ -895,7 +895,7 @@ function wrapRequestComponentType(type, context) {
|
|
|
895
895
|
__name(wrapRequestComponentType, "wrapRequestComponentType");
|
|
896
896
|
function normalizeRequestComponent(component, context) {
|
|
897
897
|
if (!isRequestComponent(component)) {
|
|
898
|
-
return
|
|
898
|
+
return void 0;
|
|
899
899
|
}
|
|
900
900
|
const { bodyQuestionToken } = processPendingRequestComponentActions(component, context);
|
|
901
901
|
const newType = normalizeContentType(component.type, context, { bodyQuestionToken });
|
|
@@ -910,7 +910,7 @@ function normalizeRequestComponent(component, context) {
|
|
|
910
910
|
__name(normalizeRequestComponent, "normalizeRequestComponent");
|
|
911
911
|
function normalizeComponent(component, componentGroupName, context) {
|
|
912
912
|
if (!isComponent(component)) {
|
|
913
|
-
return
|
|
913
|
+
return void 0;
|
|
914
914
|
}
|
|
915
915
|
if (componentGroupName === "requests") {
|
|
916
916
|
return normalizeRequestComponent(component, context);
|
|
@@ -933,7 +933,7 @@ function normalizeComponent(component, componentGroupName, context) {
|
|
|
933
933
|
__name(normalizeComponent, "normalizeComponent");
|
|
934
934
|
function normalizeComponentGroup(componentGroup, context) {
|
|
935
935
|
if (!isComponentGroup(componentGroup)) {
|
|
936
|
-
return
|
|
936
|
+
return void 0;
|
|
937
937
|
}
|
|
938
938
|
const componentGroupName = normalizeComponentGroupName(componentGroup.name.text);
|
|
939
939
|
const newIdentifier = ts3__default.default.factory.createIdentifier(componentGroupName);
|
|
@@ -997,7 +997,7 @@ function populateReferencedComponents(components, context) {
|
|
|
997
997
|
__name(populateReferencedComponents, "populateReferencedComponents");
|
|
998
998
|
function removeComponentIfUnreferenced(component, componentGroupName, context) {
|
|
999
999
|
if (!isComponent(component)) {
|
|
1000
|
-
return
|
|
1000
|
+
return void 0;
|
|
1001
1001
|
}
|
|
1002
1002
|
const componentName = component.name.text;
|
|
1003
1003
|
const componentPath = `${componentGroupName}.${componentName}`;
|
|
@@ -1005,17 +1005,17 @@ function removeComponentIfUnreferenced(component, componentGroupName, context) {
|
|
|
1005
1005
|
context.referencedTypes.components.delete(componentPath);
|
|
1006
1006
|
return component;
|
|
1007
1007
|
}
|
|
1008
|
-
return
|
|
1008
|
+
return void 0;
|
|
1009
1009
|
}
|
|
1010
1010
|
__name(removeComponentIfUnreferenced, "removeComponentIfUnreferenced");
|
|
1011
1011
|
function removeUnreferencedComponentsInGroup(componentGroup, context) {
|
|
1012
1012
|
if (!isComponentGroup(componentGroup)) {
|
|
1013
|
-
return
|
|
1013
|
+
return void 0;
|
|
1014
1014
|
}
|
|
1015
1015
|
const componentGroupName = normalizeComponentGroupName(componentGroup.name.text);
|
|
1016
1016
|
const newComponents = componentGroup.type.members.map((component) => removeComponentIfUnreferenced(component, componentGroupName, context)).filter(isDefined_default);
|
|
1017
1017
|
if (newComponents.length === 0) {
|
|
1018
|
-
return
|
|
1018
|
+
return void 0;
|
|
1019
1019
|
}
|
|
1020
1020
|
return ts3__default.default.factory.updatePropertySignature(
|
|
1021
1021
|
componentGroup,
|
|
@@ -1030,7 +1030,7 @@ function removeUnreferencedComponents(components, context) {
|
|
|
1030
1030
|
const newComponentGroups = components.members.map((componentGroup) => removeUnreferencedComponentsInGroup(componentGroup, context)).filter(isDefined_default);
|
|
1031
1031
|
context.referencedTypes.components.clear();
|
|
1032
1032
|
if (newComponentGroups.length === 0) {
|
|
1033
|
-
return
|
|
1033
|
+
return void 0;
|
|
1034
1034
|
}
|
|
1035
1035
|
return ts3__default.default.factory.updateInterfaceDeclaration(
|
|
1036
1036
|
components,
|
|
@@ -1084,7 +1084,7 @@ function parseRawFilter(rawFilter) {
|
|
|
1084
1084
|
logWithPrefix(`Warning: Filter could not be parsed and was ignored: ${chalk__default.default.yellow(rawFilter)}`, {
|
|
1085
1085
|
method: "warn"
|
|
1086
1086
|
});
|
|
1087
|
-
return
|
|
1087
|
+
return void 0;
|
|
1088
1088
|
}
|
|
1089
1089
|
const methodFilterGroup = `(?:${filteredMethodsOrWildcard.toUpperCase().replace(/,/g, "|").replace(/\*/g, ".*")}) `;
|
|
1090
1090
|
const isNegativeMatch = filterModifier === "!";
|
|
@@ -1161,7 +1161,7 @@ __name(createImportDeclarations, "createImportDeclarations");
|
|
|
1161
1161
|
function createCachedDynamicImport(importModuleDynamically) {
|
|
1162
1162
|
let cachedImportResult;
|
|
1163
1163
|
return /* @__PURE__ */ __name2(/* @__PURE__ */ __name(async function importModuleDynamicallyWithCache() {
|
|
1164
|
-
if (cachedImportResult ===
|
|
1164
|
+
if (cachedImportResult === void 0) {
|
|
1165
1165
|
cachedImportResult = await importModuleDynamically();
|
|
1166
1166
|
}
|
|
1167
1167
|
return cachedImportResult;
|
|
@@ -1242,7 +1242,7 @@ var RESOURCES_TO_REMOVE_IF_NOT_NORMALIZED = ["paths", "webhooks", "operations",
|
|
|
1242
1242
|
function removeUnknownResources(node) {
|
|
1243
1243
|
const isUnknownResource = !node || (ts3__default.default.isTypeAliasDeclaration(node) || ts3__default.default.isInterfaceDeclaration(node)) && RESOURCES_TO_REMOVE_IF_NOT_NORMALIZED.includes(node.name.text);
|
|
1244
1244
|
if (isUnknownResource) {
|
|
1245
|
-
return
|
|
1245
|
+
return void 0;
|
|
1246
1246
|
}
|
|
1247
1247
|
return node;
|
|
1248
1248
|
}
|
|
@@ -1285,7 +1285,7 @@ async function generateTypesFromOpenAPI({
|
|
|
1285
1285
|
}
|
|
1286
1286
|
const typeOutput = await convertTypesToString(nodes, { includeComments });
|
|
1287
1287
|
const formattedOutput = prepareTypeOutputToSave(typeOutput);
|
|
1288
|
-
const shouldWriteToStdout = outputFilePath ===
|
|
1288
|
+
const shouldWriteToStdout = outputFilePath === void 0;
|
|
1289
1289
|
if (shouldWriteToStdout) {
|
|
1290
1290
|
await writeTypeOutputToStandardOutput(formattedOutput);
|
|
1291
1291
|
} else {
|