@spec2ts/openapi 4.0.0 → 4.0.1

package/dist/bin/oapi2ts.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as usage, n as describe, r as handler, t as builder } from "../command-kheR7V25.mjs";
+import { i as usage, n as describe, r as handler, t as builder } from "../command-BDMCeG0A.mjs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 //#region src/bin/oapi2ts.ts

package/dist/cli/index.d.mts

@@ -1,4 +1,4 @@
-import { t as ParseOpenApiOptions } from "../openapi-parser-RoDGKcjO.mjs";
+import { t as ParseOpenApiOptions } from "../openapi-parser-BJ3RQyRq.mjs";
 import { Argv } from "yargs";
 //#region src/cli/command.d.ts
 interface BuildTsFromOpenApiOptions extends ParseOpenApiOptions {

package/dist/cli/index.mjs

@@ -1,2 +1,2 @@
-import { i as usage, n as describe, r as handler, t as builder } from "../command-kheR7V25.mjs";
+import { i as usage, n as describe, r as handler, t as builder } from "../command-BDMCeG0A.mjs";
 export { builder, describe, handler, usage };

package/dist/{command-kheR7V25.mjs → command-BDMCeG0A.mjs}

@@ -1,4 +1,4 @@
-import { n as parseOpenApiFile } from "./openapi-parser-CQvFG8Kq.mjs";
+import { n as parseOpenApiFile } from "./openapi-parser-3wx-i5_G.mjs";
 import { cli, printer } from "@spec2ts/core";
 //#region src/cli/command.ts
 const usage = "$0 <input..>";

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { _ as parseParameters, a as ParamType, c as createOpenApiResult, d as getOperationName, f as getParamType, g as parseOperation, h as getSchemaFromContent, i as OApiParserContext, l as getContentDeclaration, m as getResponseName, n as parseOpenApi, o as ParseOpenApiResult, p as getPathName, r as parseOpenApiFile, s as addToOpenApiResult, t as ParseOpenApiOptions, u as getOperationIdentifier, v as parsePathItem, y as parseReference } from "./openapi-parser-RoDGKcjO.mjs";
+import { _ as parseParameters, a as ParamType, c as createOpenApiResult, d as getOperationName, f as getParamType, g as parseOperation, h as getSchemaFromContent, i as OApiParserContext, l as getContentDeclaration, m as getResponseName, n as parseOpenApi, o as ParseOpenApiResult, p as getPathName, r as parseOpenApiFile, s as addToOpenApiResult, t as ParseOpenApiOptions, u as getOperationIdentifier, v as parsePathItem, y as parseReference } from "./openapi-parser-BJ3RQyRq.mjs";
 export { OApiParserContext, ParamType, ParseOpenApiOptions, ParseOpenApiResult, addToOpenApiResult, createOpenApiResult, getContentDeclaration, getOperationIdentifier, getOperationName, getParamType, getPathName, getResponseName, getSchemaFromContent, parseOpenApi, parseOpenApiFile, parseOperation, parseParameters, parsePathItem, parseReference };

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as getContentDeclaration, c as getParamType, d as getSchemaFromContent, f as parseOperation, h as parseReference, i as createOpenApiResult, l as getPathName, m as parsePathItem, n as parseOpenApiFile, o as getOperationIdentifier, p as parseParameters, r as addToOpenApiResult, s as getOperationName, t as parseOpenApi, u as getResponseName } from "./openapi-parser-CQvFG8Kq.mjs";
+import { a as getContentDeclaration, c as getParamType, d as getSchemaFromContent, f as parseOperation, h as parseReference, i as createOpenApiResult, l as getPathName, m as parsePathItem, n as parseOpenApiFile, o as getOperationIdentifier, p as parseParameters, r as addToOpenApiResult, s as getOperationName, t as parseOpenApi, u as getResponseName } from "./openapi-parser-3wx-i5_G.mjs";
 export { addToOpenApiResult, createOpenApiResult, getContentDeclaration, getOperationIdentifier, getOperationName, getParamType, getPathName, getResponseName, getSchemaFromContent, parseOpenApi, parseOpenApiFile, parseOperation, parseParameters, parsePathItem, parseReference };

package/dist/openapi-parser-3wx-i5_G.mjs

@@ -0,0 +1,184 @@
+import * as core from "@spec2ts/core";
+import { createContext, createRefContext, getTypeFromProperties, getTypeFromSchema, pascalCase, resolveReference } from "@spec2ts/jsonschema";
+import ts from "typescript";
+import $RefParser from "@apidevtools/json-schema-ref-parser";
+import path from "node:path";
+//#region src/lib/core-parser.ts
+const VERBS = [
+	"GET",
+	"PUT",
+	"POST",
+	"DELETE",
+	"OPTIONS",
+	"HEAD",
+	"PATCH",
+	"TRACE"
+];
+function parsePathItem(path, item, context, result) {
+	const baseParams = item.parameters && parseParameters(getPathName(path, context), item.parameters, void 0, context, result);
+	Object.entries(item).filter(([verb]) => VERBS.includes(verb.toUpperCase())).forEach(([verb, entry]) => parseOperation(path, verb, entry, baseParams, context, result));
+}
+function parseOperation(path, verb, operation, baseParams, context, result) {
+	const name = getOperationName(verb, path, operation.operationId, context);
+	if (operation.parameters) parseParameters(name, operation.parameters, baseParams, context, result);
+	if (operation.requestBody) {
+		const requestBody = resolveReference(operation.requestBody, context);
+		const decla = getContentDeclaration(name + "Body", requestBody.content, context);
+		if (decla) addToOpenApiResult(result, "body", decla);
+	}
+	if (operation.responses) {
+		const responses = resolveReference(operation.responses, context);
+		Object.entries(responses).forEach(([status, responseObj]) => {
+			const response = resolveReference(responseObj, context);
+			const decla = getContentDeclaration(getResponseName(name, status, context), response.content, context);
+			if (decla) addToOpenApiResult(result, "responses", decla);
+		});
+	}
+}
+function parseParameters(baseName, data, baseParams = {}, context, result) {
+	const params = [];
+	const query = [];
+	const headers = [];
+	const cookie = [];
+	const res = {};
+	data.forEach((item) => {
+		item = resolveReference(item, context);
+		switch (item.in) {
+			case "path":
+				params.push(item);
+				break;
+			case "header":
+				headers.push(item);
+				break;
+			case "query":
+				query.push(item);
+				break;
+			case "cookie":
+				cookie.push(item);
+				break;
+		}
+	});
+	addParams(params, "params");
+	addParams(headers, "headers");
+	addParams(query, "query");
+	addParams(cookie, "cookie");
+	return res;
+	function addParams(params, paramType) {
+		if (!params.length) return;
+		const name = baseName + pascalCase(paramType);
+		const type = getParamType(paramType, params, baseParams[paramType], context);
+		addToOpenApiResult(result, paramType, core.createTypeOrInterfaceDeclaration({
+			modifiers: [core.modifier.export],
+			name,
+			type
+		}));
+		res[paramType] = ts.factory.createTypeReferenceNode(name, void 0);
+	}
+}
+function parseReference(ref, context) {
+	const type = getTypeFromSchema(ref.schema, createRefContext(ref, context));
+	context.aliases.push(core.createTypeOrInterfaceDeclaration({
+		modifiers: [core.modifier.export],
+		name: ref.name,
+		type
+	}));
+}
+function getContentDeclaration(name, content, context) {
+	if (!content) return;
+	content = resolveReference(content, context);
+	const schema = getSchemaFromContent(content);
+	if (!schema) return;
+	const type = getTypeFromSchema(schema, context);
+	return core.createTypeOrInterfaceDeclaration({
+		modifiers: [core.modifier.export],
+		name,
+		type
+	});
+}
+function getParamType(paramType, data, baseType, context) {
+	const required = [];
+	const props = {};
+	data.forEach((m) => {
+		let name = m.name;
+		if (paramType === "headers" && context.options.lowerHeaders) name = name.toLowerCase();
+		props[name] = m.schema || {};
+		if (m.required) required.push(name);
+	});
+	const type = getTypeFromProperties(props, required, false, paramType === "query" && typeof context.options.enableDateForQueryParams !== "undefined" ? {
+		...context,
+		options: {
+			...context.options,
+			enableDate: context.options.enableDateForQueryParams
+		}
+	} : context);
+	if (baseType) return ts.factory.createIntersectionTypeNode([baseType, type]);
+	return type;
+}
+function getSchemaFromContent(content) {
+	return content?.["application/json"]?.schema || content?.["application/x-www-form-urlencoded"]?.schema || content?.["multipart/form-data"]?.schema || content?.["*/*"]?.schema;
+}
+function getResponseName(operationName, statusCode, context) {
+	let name = operationName + "Response";
+	const status = parseInt(statusCode);
+	if (status >= 200 && status < 300) {
+		if ((context.names[name] = (context.names[name] || 0) + 1) > 1) name += statusCode;
+	} else if (!isNaN(status)) name += statusCode;
+	else name += pascalCase(statusCode);
+	return name;
+}
+function getOperationName(verb, path, operationId, context) {
+	const id = getOperationIdentifier(operationId);
+	if (id) return id;
+	return getPathName(`${verb} ${path}`, context);
+}
+function getPathName(path, context) {
+	path = path.replace(/\{(.+?)\}/, "by $1").replace(/\{(.+?)\}/g, "and $1");
+	let name = pascalCase(path);
+	const count = context.names[name] = (context.names[name] || 0) + 1;
+	if (count > 1) name += count;
+	return name;
+}
+function getOperationIdentifier(id) {
+	if (!id) return;
+	if (id.match(/[^\w\s]/)) return;
+	id = pascalCase(id);
+	if (core.isValidIdentifier(id)) return id;
+}
+function addToOpenApiResult(result, prop, statement) {
+	const statements = Array.isArray(statement) ? statement : [statement];
+	result[prop].push(...statements);
+	result.all.push(...statements);
+}
+function createOpenApiResult() {
+	return {
+		params: [],
+		query: [],
+		headers: [],
+		body: [],
+		responses: [],
+		models: [],
+		cookie: [],
+		import: [],
+		all: []
+	};
+}
+//#endregion
+//#region src/lib/openapi-parser.ts
+async function parseOpenApiFile(file, options = {}) {
+	return parseOpenApi(await $RefParser.parse(file), {
+		cwd: path.resolve(path.dirname(file)) + "/",
+		...options
+	});
+}
+async function parseOpenApi(spec, options = {}) {
+	if (!options.parseReference) options.parseReference = parseReference;
+	const context = await createContext(spec, options);
+	const result = createOpenApiResult();
+	Object.entries(spec.paths ?? {}).forEach(([path, item]) => {
+		parsePathItem(path, item, context, result);
+	});
+	addToOpenApiResult(result, "models", context.aliases);
+	return result;
+}
+//#endregion
+export { getContentDeclaration as a, getParamType as c, getSchemaFromContent as d, parseOperation as f, parseReference as h, createOpenApiResult as i, getPathName as l, parsePathItem as m, parseOpenApiFile as n, getOperationIdentifier as o, parseParameters as p, addToOpenApiResult as r, getOperationName as s, parseOpenApi as t, getResponseName as u };

package/dist/{openapi-parser-RoDGKcjO.d.mts → openapi-parser-BJ3RQyRq.d.mts}

@@ -1,5 +1,5 @@
 import { ParsedReference, ParserContext, ParserOptions } from "@spec2ts/jsonschema";
-import * as ts from "typescript";
+import ts from "typescript";
 import { ContentObject, OpenAPIObject, OperationObject, ParameterObject, PathItemObject, ReferenceObject, SchemaObject } from "openapi3-ts/oas31";
 //#region src/lib/core-parser.d.ts
 interface ParseOpenApiResult {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spec2ts/openapi",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Utility to convert OpenAPI v3 specifications to Typescript using TypeScript native compiler",
   "keywords": [
     "ast",
@@ -67,8 +67,9 @@
     "prepublishOnly": "npm run test:prepublish && npm run build"
   },
   "dependencies": {
-    "@spec2ts/core": "^4.0.0",
-    "@spec2ts/jsonschema": "^4.0.0",
+    "@apidevtools/json-schema-ref-parser": "^10.1.0",
+    "@spec2ts/core": "^4.0.1",
+    "@spec2ts/jsonschema": "^4.0.1",
     "openapi3-ts": "^4.6.0",
     "typescript": "^6.0.0",
     "yargs": "^18.0.0"