@askrjs/cli 0.0.4 → 0.0.5

package/dist/generate.js

@@ -29,10 +29,12 @@ const pascal = (name) => {
 	const result = name.replace(/(^|[^A-Za-z0-9]+)([A-Za-z0-9])/g, (_, _s, c) => c.toUpperCase()).replace(/[^A-Za-z0-9_$]/g, "");
 	return /^\d/.test(result) ? `_${result}` : result;
 };
-function schemaType(schema, at, direction = "response") {
+function schemaType(schema, at, direction = "response", references) {
 	if (schema.$ref) {
 		const name = decodeURIComponent(String(schema.$ref).split("/").at(-1));
-		return pascal(name);
+		const typeName = pascal(name);
+		references?.add(typeName);
+		return typeName;
 	}
 	if (Array.isArray(schema.type)) {
 		const includesNull = schema.type.includes("null");
@@ -40,25 +42,25 @@ function schemaType(schema, at, direction = "response") {
 			...schema,
 			type: variant,
 			nullable: false
-		}, at, direction));
+		}, at, direction, references));
 		if (includesNull) rendered.push("null");
 		if (rendered.length === 0) fail("Schema type array must not be empty", at);
 		return [...new Set(rendered)].join(" | ");
 	}
 	if (schema.const !== void 0) return JSON.stringify(schema.const);
 	if (schema.enum) return schema.enum.map((value) => JSON.stringify(value)).join(" | ") || "never";
-	if (schema.oneOf || schema.anyOf) return (schema.oneOf ?? schema.anyOf).map((item, i) => schemaType(item, `${at}/${schema.oneOf ? "oneOf" : "anyOf"}/${i}`, direction)).join(" | ");
-	if (schema.allOf) return schema.allOf.map((item, i) => schemaType(item, `${at}/allOf/${i}`, direction)).join(" & ");
+	if (schema.oneOf || schema.anyOf) return (schema.oneOf ?? schema.anyOf).map((item, i) => schemaType(item, `${at}/${schema.oneOf ? "oneOf" : "anyOf"}/${i}`, direction, references)).join(" | ");
+	if (schema.allOf) return schema.allOf.map((item, i) => schemaType(item, `${at}/allOf/${i}`, direction, references)).join(" & ");
 	let type = "never";
 	if (schema.type === "string") type = "string";
 	else if (schema.type === "number" || schema.type === "integer") type = "number";
 	else if (schema.type === "boolean") type = "boolean";
 	else if (schema.type === "null") type = "null";
-	else if (schema.type === "array" || schema.items) type = `Array<${schemaType(schema.items ?? {}, `${at}/items`, direction)}>`;
+	else if (schema.type === "array" || schema.items) type = `Array<${schemaType(schema.items ?? {}, `${at}/items`, direction, references)}>`;
 	else if (schema.type === "object" || schema.properties || schema.additionalProperties !== void 0) {
 		const required = new Set(schema.required ?? []);
-		const properties = Object.entries(schema.properties ?? {}).filter(([, value]) => !(direction === "request" ? value.readOnly : value.writeOnly)).map(([key, value]) => `  ${JSON.stringify(key)}${required.has(key) ? "" : "?"}: ${schemaType(value, `${at}/properties/${key}`, direction)};`);
-		if (schema.additionalProperties && typeof schema.additionalProperties === "object") properties.push(`  [key: string]: ${schemaType(schema.additionalProperties, `${at}/additionalProperties`, direction)};`);
+		const properties = Object.entries(schema.properties ?? {}).filter(([, value]) => !(direction === "request" ? value.readOnly : value.writeOnly)).map(([key, value]) => `  ${JSON.stringify(key)}${required.has(key) ? "" : "?"}: ${schemaType(value, `${at}/properties/${key}`, direction, references)};`);
+		if (schema.additionalProperties && typeof schema.additionalProperties === "object") properties.push(`  [key: string]: ${schemaType(schema.additionalProperties, `${at}/additionalProperties`, direction, references)};`);
 		type = `{\n${properties.join("\n")}\n}`;
 	} else if (!schema.type) fail("Unsupported schema without a type", at);
 	else fail(`Unsupported schema type ${schema.type}`, at);
@@ -67,7 +69,7 @@ function schemaType(schema, at, direction = "response") {
 function responseSchema(operation, at, success) {
 	return Object.entries(operation.responses ?? {}).filter(([status]) => status === "default" ? !success : success === /^2\d\d$/.test(status)).sort(([a], [b]) => a.localeCompare(b, void 0, { numeric: true }));
 }
-function pickContent(content, at, direction) {
+function pickContent(content, at, direction, references) {
 	const entries = Object.entries(content ?? {}).sort(([a], [b]) => a.localeCompare(b));
 	if (!entries.length) return {
 		type: "undefined",
@@ -76,7 +78,7 @@ function pickContent(content, at, direction) {
 	};
 	const types = entries.map(([mediaType, value]) => ({
 		mediaType,
-		type: schemaType(value.schema ?? {}, `${at}/content/${mediaType.replace(/~/g, "~0").replace(/\//g, "~1")}/schema`, direction)
+		type: schemaType(value.schema ?? {}, `${at}/content/${mediaType.replace(/~/g, "~0").replace(/\//g, "~1")}/schema`, direction, references)
 	}));
 	const union = [...new Set(types.map((v) => v.type))].join(" | ");
 	return {
@@ -229,6 +231,13 @@ function generateFiles(document) {
 		names.set(safe, name);
 	}
 	const schemaLines = [...names].map(([safe, original]) => `export type ${safe} = ${schemaType(schemas[original], pointer("components", "schemas", original))};`);
+	const operationSchemaReferences = /* @__PURE__ */ new Set();
+	const apiSchemaReferences = /* @__PURE__ */ new Set();
+	const apiOperationReferences = /* @__PURE__ */ new Set();
+	const contentSchemaReferences = { add(name) {
+		operationSchemaReferences.add(name);
+		apiSchemaReferences.add(name);
+	} };
 	const operationTypes = [];
 	const descriptors = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -271,7 +280,8 @@ function generateFiles(document) {
 			const list = byLocation[location].sort((a, b) => a.name.localeCompare(b.name));
 			if (!list.length) return void 0;
 			const name = `${prefix}${pascal(location)}`;
-			operationTypes.push(`export type ${name} = {\n${list.map((p) => `  ${JSON.stringify(p.name)}${p.required || location === "path" ? "" : "?"}: ${schemaType(p.schema ?? {}, `${at}/parameters`, "request")};`).join("\n")}\n};`);
+			apiOperationReferences.add(name);
+			operationTypes.push(`export type ${name} = {\n${list.map((p) => `  ${JSON.stringify(p.name)}${p.required || location === "path" ? "" : "?"}: ${schemaType(p.schema ?? {}, `${at}/parameters`, "request", operationSchemaReferences)};`).join("\n")}\n};`);
 			const defaultStyle = location === "query" ? "form" : "simple";
 			return {
 				name,
@@ -283,7 +293,7 @@ function generateFiles(document) {
 			};
 		};
 		const params = renderParameters("path"), query = renderParameters("query"), headers = renderParameters("header");
-		const body = operation.requestBody ? pickContent(operation.requestBody.content, `${at}/requestBody`, "request") : void 0;
+		const body = operation.requestBody ? pickContent(operation.requestBody.content, `${at}/requestBody`, "request", contentSchemaReferences) : void 0;
 		if (body) operationTypes.push(`export type ${prefix}Body = ${body.type};`);
 		const successes = responseSchema(operation, at, true);
 		if (!successes.length) fail("At least one 2xx response is required", `${at}/responses`, id);
@@ -295,7 +305,7 @@ function generateFiles(document) {
 		if (body) chain.push(`body(${body.codec})`);
 		for (const [status, response] of successes) {
 			if (response.links) fail("Response links are unsupported", `${at}/responses/${status}/links`, id);
-			const value = pickContent(response.content, `${at}/responses/${status}`, "response");
+			const value = pickContent(response.content, `${at}/responses/${status}`, "response", contentSchemaReferences);
 			const typeName = `${prefix}Response${status}`;
 			operationTypes.push(`export type ${typeName} = ${value.type};`);
 			chain.push(`returns(${status === "200" ? "" : `${status}, `}${value.codec})`);
@@ -303,7 +313,7 @@ function generateFiles(document) {
 		if (errors.length) {
 			const rendered = errors.map(([status, response]) => {
 				if (response.links) fail("Response links are unsupported", `${at}/responses/${status}/links`, id);
-				const value = pickContent(response.content, `${at}/responses/${status}`, "response");
+				const value = pickContent(response.content, `${at}/responses/${status}`, "response", contentSchemaReferences);
 				const typeName = `${prefix}Error${pascal(status)}`;
 				operationTypes.push(`export type ${typeName} = ${value.type};`);
 				return `${JSON.stringify(status)}: ${value.codec}`;
@@ -316,12 +326,12 @@ function generateFiles(document) {
 	const imports = [...new Set(descriptors.join(" ").match(/\b(get|post|put|patch|del|head|options|json|text|urlEncoded|multipart|arrayBuffer|empty|content)\b/g) ?? [])].sort();
 	const files = {
 		"schemas.ts": `${schemaLines.join("\n\n")}\n`,
-		"operations.ts": `${names.size ? `import type { ${[...names.keys()].join(", ")} } from "./schemas";\n\n` : ""}${operationTypes.join("\n\n")}\n`,
+		"operations.ts": `${operationSchemaReferences.size ? `import type { ${[...operationSchemaReferences].sort().join(", ")} } from "./schemas";\n\n` : ""}${operationTypes.join("\n\n")}\n`,
 		"api.ts": `import { ${[
 			"defineApi",
 			"createClient",
 			...imports
-		].join(", ")} } from "@askrjs/fetch";\nimport type { ClientOptions } from "@askrjs/fetch";\nimport type { ${operationTypes.map((line) => line.match(/^export type (\w+)/)?.[1]).filter(Boolean).join(", ")} } from "./operations";\n\nexport const api = defineApi({\n${descriptors.join("\n")}\n}, ${JSON.stringify({
+		].join(", ")} } from "@askrjs/fetch";\nimport type { ClientOptions } from "@askrjs/fetch";\n${apiSchemaReferences.size ? `import type { ${[...apiSchemaReferences].sort().join(", ")} } from "./schemas";\n` : ""}${apiOperationReferences.size ? `import type { ${[...apiOperationReferences].sort().join(", ")} } from "./operations";\n` : ""}\nexport const api = defineApi({\n${descriptors.join("\n")}\n}, ${JSON.stringify({
 			servers: (document.servers ?? []).map((s) => s.url),
 			securitySchemes: document.components?.securitySchemes ?? {}
 		}, null, 2)});\n\nexport const createApiClient = (options?: ClientOptions) => createClient(api, options);\n`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/cli",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Unified CLI for the Askr platform",
   "homepage": "https://github.com/askrjs/askr-cli#readme",
   "bugs": {