@moccona/apicodegen 0.0.4 → 0.0.7

package/npm/vite/index.mjs

@@ -572,7 +572,9 @@ var Base = class Base {
 	*/
 	static camelCase(text) {
 		text = text.trim();
-		return text.split("_").filter(Boolean).map((t, index) => index === 0 ? t : Base.capitalize(t)).join("");
+		const parts = text.split("_").filter(Boolean);
+		while (parts[0]?.match(/^\d/)) parts.shift();
+		return parts.map((t, index) => index === 0 ? t : Base.capitalize(t)).join("");
 	}
 	/**
 	* Converts a string to UpperCamelCase.
@@ -801,9 +803,12 @@ var Generator = class Generator {
 	static addComments(node, comments) {
 		if (!Array.isArray(comments) || comments.filter(Boolean).length === 0) return;
 		const formatComment = (comment) => {
-			return comment.tag ? ` @${comment.tag} ${comment.comment ?? ""}` : ` ${comment.comment}`;
+			if (comment.tag === "returns") return `* @returns {${comment.type}} ${comment.comment ?? ""}`;
+			if (comment.tag === "param") return comment.comment ? `* @param ${comment.paramName} - ${comment.comment}` : `* @param ${comment.paramName}`;
+			if (comment.tag) return `* @${comment.tag} ${comment.comment ?? ""}`;
+			return `* ${comment.comment}`;
 		};
-		const formattedComments = "*\n" + comments.map(formatComment).join("\n").trim() + "\n";
+		const formattedComments = comments.map(formatComment).join("\n").trim() + "\n";
 		addSyntheticLeadingComment(node, SyntaxKind.MultiLineCommentTrivia, formattedComments, true);
 	}
 	/**
@@ -820,6 +825,53 @@ var Generator = class Generator {
 		const nonArraySchema = schema;
 		return nonArraySchema.format === "blob" || nonArraySchema.format === "binary" || nonArraySchema.type === "file";
 	}
+	static schemaToTypeString(schema) {
+		if (schema.type === "array") {
+			const arraySchema = schema;
+			return arraySchema.items ? `${Generator.schemaToTypeString(arraySchema.items)}[]` : "unknown";
+		}
+		const singleSchema = schema;
+		if (schema.type === "string") return "string";
+		if (schema.type === "number" || schema.type === "integer") return "number";
+		if (schema.type === "boolean") return "boolean";
+		if (schema.type === "object" || schema.properties) return "object";
+		if (singleSchema.format === "binary" || singleSchema.type === "file") return "Blob";
+		if (singleSchema.format === "blob") return "Blob";
+		if (singleSchema.ref) return singleSchema.ref;
+		return "unknown";
+	}
+	static generateParamTags(parameters, requestBody) {
+		const tags = [];
+		for (const p of parameters) {
+			const paramName = Base.camelCase(Base.normalize(p.name));
+			let paramType = "unknown";
+			if (p.schema) paramType = Generator.schemaToTypeString(p.schema);
+			const isOptional = p.required === false;
+			tags.push({
+				tag: "param",
+				paramName,
+				type: `${paramType}${isOptional ? " | undefined" : ""}`,
+				comment: p.description ?? ""
+			});
+		}
+		if (requestBody?.schema && "properties" in requestBody.schema) {
+			const properties = requestBody.schema.properties;
+			const required = requestBody.schema.required;
+			const requiredArray = Array.isArray(required) ? required : [];
+			for (const [key, schema] of Object.entries(properties ?? {})) {
+				const paramName = `req.${key}`;
+				const paramType = Generator.schemaToTypeString(schema);
+				const isOptional = !requiredArray.includes(key);
+				tags.push({
+					tag: "param",
+					paramName,
+					type: `${paramType}${isOptional ? " | undefined" : ""}`,
+					comment: schema.description ?? ""
+				});
+			}
+		}
+		return tags;
+	}
 	static toRequestBodyTypeNode(schema) {
 		return factory.createParameterDeclaration(void 0, void 0, factory.createIdentifier("req"), void 0, Generator.toTypeNode(schema));
 	}
@@ -898,8 +950,8 @@ var Generator = class Generator {
 				factory.createIdentifier("file"),
 				factory.createPropertyAccessExpression(factory.createAsExpression(factory.createIdentifier("file"), factory.createTypeReferenceNode(factory.createIdentifier("File"), void 0)), factory.createIdentifier("name"))
 			]))])));
-			else if (schemaByKey.required) statements.push(factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("fd"), factory.createIdentifier("append")), void 0, [factory.createStringLiteral(key), schemaByKey.type === "string" ? factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)) : factory.createCallExpression(factory.createIdentifier("String"), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))])])));
-			else statements.push(factory.createExpressionStatement(factory.createBinaryExpression(factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)), factory.createToken(SyntaxKind.AmpersandAmpersandToken), factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("fd"), factory.createIdentifier("append")), void 0, [factory.createStringLiteral(key), schemaByKey.type === "string" ? factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)) : factory.createCallExpression(factory.createIdentifier("String"), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))])]))));
+			else if (schemaByKey.required) statements.push(factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("fd"), factory.createIdentifier("append")), void 0, [factory.createStringLiteral(key), schemaByKey.type === "string" || Generator.isBinarySchema(schemaByKey) || schemaByKey.isRef ? factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)) : schemaByKey.type === "array" || schemaByKey.type === "object" ? factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("JSON"), factory.createIdentifier("stringify")), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))]) : factory.createCallExpression(factory.createIdentifier("String"), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))])])));
+			else statements.push(factory.createExpressionStatement(factory.createBinaryExpression(factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)), factory.createToken(SyntaxKind.AmpersandAmpersandToken), factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("fd"), factory.createIdentifier("append")), void 0, [factory.createStringLiteral(key), schemaByKey.type === "string" || Generator.isBinarySchema(schemaByKey) || schemaByKey.isRef ? factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key)) : schemaByKey.type === "array" || schemaByKey.type === "object" ? factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("JSON"), factory.createIdentifier("stringify")), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))]) : factory.createCallExpression(factory.createIdentifier("String"), void 0, [factory.createElementAccessExpression(factory.createIdentifier("req"), factory.createStringLiteral(key))])]))));
 		});
 		return statements;
 	}
@@ -911,7 +963,7 @@ var Generator = class Generator {
 		const parametersShouldNotPutInFormData = parameters.filter((p) => !parametersShouldPutInFormData.includes(p));
 		const isRequestBodyContainsBinary = requestBody?.schema && "properties" in requestBody.schema && Object.values(requestBody.schema?.properties ?? {}).some((p) => Generator.isBinarySchema(p));
 		const hasBinaryInParameters = parameters.some((p) => p?.schema && Generator.isBinarySchema(p.schema));
-		const shouldPutParametersOrBodyInFormData = isFormDataRequest || isRequestBodyBinary || hasBinaryInParameters || isRequestBodyContainsBinary || parametersShouldPutInFormData.length > 0;
+		const shouldPutParametersOrBodyInFormData = !!isFormDataRequest && (isRequestBodyBinary || hasBinaryInParameters || isRequestBodyContainsBinary || parametersShouldPutInFormData.length > 0);
 		return factory.createBlock([...shouldPutParametersOrBodyInFormData ? Generator.toFormDataStatement(parametersShouldPutInFormData, requestBody?.schema) : [], ...adapter.client(uri, method, parametersShouldNotPutInFormData, requestBody, response, adapter, shouldPutParametersOrBodyInFormData, shouldParseResponseToJSON)]);
 	}
 	static schemaToStatemets(parsedDoc, adaptor, options) {
@@ -938,10 +990,11 @@ var Generator = class Generator {
 				const shouldAddExtraMethodNameSuffix = requestBody.length > 1;
 				for (const req of requestBody) {
 					const statement = factory.createFunctionDeclaration([factory.createModifier(SyntaxKind.ExportKeyword), factory.createModifier(SyntaxKind.AsyncKeyword)], void 0, Base.pathToFnName(uri, method, operationId) + (shouldAddExtraMethodNameSuffix ? Base.capitalize(req.type.split("/")[1]) : ""), void 0, [...parameters.length > 0 ? Generator.toDeclarationNodes(parameters) : [], ...req?.schema ? [Generator.toRequestBodyTypeNode(req.schema)] : []].filter(Boolean), void 0, Generator.bodyBlock(options.baseURL + uri, method, parameters, req, responses[0], adaptor));
+					const mergedDescription = [description, summary].filter(Boolean).join(". ");
 					Generator.addComments(statement, [
-						description && { comment: description },
-						summary && { comment: summary },
-						deprecated && { tag: "deprecated" }
+						mergedDescription && { comment: mergedDescription },
+						deprecated && { tag: "deprecated" },
+						...Generator.generateParamTags(parameters, req)
 					].filter(Boolean));
 					statements.push(statement);
 				}
@@ -1464,7 +1517,10 @@ var V3 = class {
 					const propSchema = properties[p];
 					return {
 						...acc,
-						[p]: Base.isRef(propSchema) ? { type: Base.capitalize(Base.ref2name(propSchema.$ref, this.doc)) } : this.toBaseSchema(propSchema, enums, p, upLevelSchemaKey)
+						[p]: Base.isRef(propSchema) ? {
+							type: Base.capitalize(Base.ref2name(propSchema.$ref, this.doc)),
+							isRef: true
+						} : this.toBaseSchema(propSchema, enums, p, upLevelSchemaKey)
 					};
 				}, {})
 			};
@@ -1699,7 +1755,10 @@ var V3_1 = class {
 					const propSchema = properties[p];
 					return {
 						...acc,
-						[p]: Base.isRef(propSchema) ? { type: Base.capitalize(Base.ref2name(propSchema.$ref, this.doc)) } : this.toBaseSchema(propSchema, enums, p, upLevelSchemaKey)
+						[p]: Base.isRef(propSchema) ? {
+							type: Base.capitalize(Base.ref2name(propSchema.$ref, this.doc)),
+							isRef: true
+						} : this.toBaseSchema(propSchema, enums, p, upLevelSchemaKey)
 					};
 				}, {})
 			};