@sebspark/openapi-typegen 1.4.0 → 1.5.0

package/dist/index.d.ts

@@ -2,5 +2,7 @@ import { OpenApiDocument } from '@sebspark/openapi-core';
 
 declare const generateTypescript: (name: string, doc: OpenApiDocument) => Promise<string>;
 declare const generate: (input: string, output?: string) => Promise<string | undefined>;
+declare const classname: (name: string) => string;
+declare const filename: (name: string) => string;
 
-export { generate, generateTypescript };
+export { classname, filename, generate, generateTypescript };

package/dist/index.js

@@ -30,6 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  classname: () => classname,
+  filename: () => filename,
   generate: () => generate2,
   generateTypescript: () => generateTypescript
 });
@@ -187,14 +189,38 @@ var generateProperty = (property) => {
 var preamble = (type) => type.name ? `${document(type)}export type ${typeName(type.name)} = ` : "";
 var rxProperVariable = /^[a-zA-Z_<>$][a-zA-Z0-9_<>$]*$/;
 var typeName = (name) => {
-  if (rxProperVariable.test(name))
+  const namingConventionRegex = /^([a-z_]\w*)(<([a-z_]\w*(,\s*)?)+>)?$/;
+  const hasCapitalLetterRegex = /[A-Z]/;
+  if (namingConventionRegex.test(name) && hasCapitalLetterRegex.test(name)) {
     return name;
-  return (0, import_change_case.pascalCase)(name);
+  }
+  if (name.includes("<")) {
+    return name.replace(
+      /<([^>]+)>/,
+      (_match, genericContent) => `<${typeName(genericContent)}>`
+    );
+  }
+  const domainStyleTransformed = name.split(".").map((part, index, array) => {
+    if (index === array.length - 1) {
+      return (0, import_change_case.pascalCase)(part);
+    }
+    return part;
+  }).join("_");
+  const prefixedIfNumberStart = domainStyleTransformed.match(/^\d/) ? `_${domainStyleTransformed}` : domainStyleTransformed;
+  const finalName = prefixedIfNumberStart.includes("_") ? prefixedIfNumberStart : (0, import_change_case.pascalCase)(prefixedIfNumberStart);
+  if (finalName.includes("_")) {
+    const lastUnderscoreIndex = finalName.lastIndexOf("_");
+    if (lastUnderscoreIndex !== -1 && lastUnderscoreIndex < finalName.length - 1) {
+      return finalName.substring(0, lastUnderscoreIndex + 1) + finalName.charAt(lastUnderscoreIndex + 1).toUpperCase() + finalName.slice(lastUnderscoreIndex + 2);
+    }
+    return finalName;
+  }
+  return finalName.charAt(0).toUpperCase() + finalName.slice(1);
 };
 var propertyName = (name) => {
-  if (rxProperVariable.test(name))
-    return name;
-  return `'${name}'`;
+  if (rxProperVariable.test(name.replace(/\./g, "_")))
+    return name.replace(/\./g, "_");
+  return `'${name.replace(/\./g, "_")}'`;
 };
 var extensions = (type) => (type.allOf || []).map(generateType).concat("").join(AND) + (type.oneOf || []).map(generateType).concat("").join(OR);
 var generatePrimitive = (parsed) => `${preamble(parsed)}${parsed.type}`;
@@ -886,7 +912,7 @@ var readDocs = async (input) => {
     }
     readFiles.push({
       doc,
-      name: formatName(name)
+      name
     });
   }
   return readFiles;
@@ -895,7 +921,7 @@ var generateDocs = async (files) => {
   const generated = [];
   for (const doc of files) {
     console.log(`Generating ${doc.name}`);
-    const ts = await generateTypescript(doc.name, doc.doc);
+    const ts = await generateTypescript(classname(doc.name), doc.doc);
     generated.push({
       ...doc,
       ts
@@ -908,18 +934,21 @@ var saveDocs = async (output, docs) => {
   const dir = stats.isDirectory() ? output : (0, import_path.parse)(output).dir;
   await (0, import_promises.mkdir)(dir, { recursive: true });
   for (const doc of docs) {
-    const path = (0, import_path.resolve)(dir, `${doc.name}.ts`);
+    const path = (0, import_path.resolve)(dir, `${filename(doc.name)}.ts`);
     console.log(`Writing ${path}`);
     await (0, import_promises.writeFile)(path, doc.ts, "utf8");
   }
 };
-var formatName = (name) => {
-  if (name[0].toUpperCase() === name[0])
-    return name;
-  return (0, import_change_case2.pascalCase)(name);
+var classname = (name) => {
+  return (0, import_change_case2.pascalCase)(name.replace(/\d+/g, ""));
+};
+var filename = (name) => {
+  return name.replace(/\./g, "_");
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  classname,
+  filename,
   generate,
   generateTypescript
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-typegen",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",