Import path fix & Circular zod type todo comment

Author: monikaboz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"

src/generators/templates/models.hbs

@@ -10,6 +10,7 @@ export namespace {{namespace}} {
 {{/if}}
 {{#each zodSchemasData as | zodSchema |}}
 {{! Zod schema export }}
+{{#if zodSchema.isCircular}}// TODO: Fix type inference {{/if}}
 export const {{@key}}{{#if zodSchema.isCircular}}: z.ZodType<unknown>{{/if}} = {{{zodSchema.code}}};
 {{! Zod schema infered type export }}
 export type {{zodInferedType @key}} = z.infer<typeof {{@key}}>;

src/generators/utils/generate/generate.imports.utils.test.ts

@@ -15,7 +15,7 @@ describe("Utils: generate imports", () => {
     expect(getImportPath({ output: "src/data/auto-gen", importPath: "ts" })).toEqual("@/data/auto-gen/");
     expect(getImportPath({ output: "src/data/auto-gen", importPath: "relative" })).toEqual("../");
     expect(getImportPath({ output: "src/data/auto-gen", importPath: "absolute" })).toEqual("src/data/auto-gen/");
-    expect(getImportPath({ output: "frontend/src/data/auto-gen", importPath: "ts" })).toEqual("@/data/");
+    expect(getImportPath({ output: "frontend/src/data/auto-gen", importPath: "ts" })).toEqual("@/data/auto-gen/");
     expect(getImportPath({ output: "frontend/src/data/auto-gen", importPath: "relative" })).toEqual("../");
     expect(getImportPath({ output: "frontend/src/data/auto-gen", importPath: "absolute" })).toEqual(
       "frontend/src/data/auto-gen/",

src/generators/utils/generate/generate.imports.utils.ts

@@ -65,13 +65,12 @@ export function getEndpointsImports({
 
 export function getImportPath(options: Pick<GenerateOptions, "output" | "importPath">) {
   let importPath = DATA_TS_PATH;
-  const regex = new RegExp(`^${DATA_FILE_PATH}`, "g");
   if (options.importPath === "relative") {
     importPath = "../";
   } else if (options.importPath === "absolute") {
     importPath = options.output;
-  } else if (regex.test(options.output)) {
-    importPath = options.output.replace(regex, DATA_TS_PATH);
+  } else if (new RegExp(`${DATA_FILE_PATH}`, "g").test(options.output)) {
+    importPath = options.output.replace(new RegExp(`.*${DATA_FILE_PATH}`, "g"), DATA_TS_PATH);
   }
   return `${importPath}/`.replace(/\/\//g, "/");
 }