orval 7.4.1 → 7.5.0

package/dist/bin/orval.js

@@ -3349,7 +3349,8 @@ var generateMock2 = (verbOption, options) => {
     return {
       implementation: {
         function: "",
-        handler: ""
+        handler: "",
+        handlerName: ""
       },
       imports: []
     };
@@ -3378,7 +3379,6 @@ var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options,
       acc[verbOption.operationId] = {
         implementation: verbOption.doc + client.implementation,
         imports: client.imports,
-        // @ts-expect-error // FIXME
         implementationMock: generatedMock.implementation,
         importsMock: generatedMock.imports,
         tags: verbOption.tags,
@@ -3468,6 +3468,10 @@ var getApiBuilder = async ({
         (_a2 = verbs.servers) != null ? _a2 : context.specs[context.specKey].servers,
         output.baseUrl
       );
+      if (!output.target) {
+        (0, import_core2.logError)("Output does not have a target");
+        process.exit(1);
+      }
       const pathOperations = await generateOperations(
         output.client,
         verbsOptions,
@@ -3477,7 +3481,6 @@ var getApiBuilder = async ({
           override: output.override,
           context: resolvedContext,
           mock: output.mock,
-          // @ts-expect-error // FIXME
           output: output.target
         },
         output
@@ -3526,7 +3529,6 @@ var importOpenApi = async ({
   const specs = await generateInputSpecs({ specs: data, input, workspace });
   const schemas = getApiSchemas({ input, output, target, workspace, specs });
   const api = await getApiBuilder({
-    // @ts-expect-error // FIXME
     input,
     output,
     context: {
@@ -3704,7 +3706,7 @@ var resolveSpecs = async (path, { validate, ...options }, isUrl3, isOnlySchema)
 };
 var importSpecs = async (workspace, options) => {
   const { input, output } = options;
-  if ((0, import_core4.isObject)(input.target)) {
+  if (!(0, import_core4.isString)(input.target)) {
     return importOpenApi({
       data: { [workspace]: input.target },
       input,
@@ -3715,7 +3717,6 @@ var importSpecs = async (workspace, options) => {
   }
   const isPathUrl = (0, import_core4.isUrl)(input.target);
   const data = await resolveSpecs(
-    // @ts-expect-error // FIXME
     input.target,
     input.parserOptions,
     isPathUrl,
@@ -3725,7 +3726,6 @@ var importSpecs = async (workspace, options) => {
     data,
     input,
     output,
-    // @ts-expect-error // FIXME
     target: input.target,
     workspace
   });
@@ -3740,12 +3740,14 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "7.4.1",
+  version: "7.5.0",
   license: "MIT",
   files: [
     "dist"
   ],
-  bin: "dist/bin/orval.js",
+  bin: {
+    orval: "dist/bin/orval.js"
+  },
   type: "commonjs",
   main: "dist/index.js",
   keywords: [
@@ -3778,7 +3780,7 @@ var package_default = {
   },
   repository: {
     type: "git",
-    url: "https://github.com/orval-labs/orval"
+    url: "git+https://github.com/orval-labs/orval.git"
   },
   scripts: {
     build: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --sourcemap --dts",
@@ -3794,19 +3796,19 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "7.4.1",
-    "@orval/axios": "7.4.1",
-    "@orval/core": "7.4.1",
-    "@orval/fetch": "7.4.1",
-    "@orval/hono": "7.4.1",
-    "@orval/mock": "7.4.1",
-    "@orval/query": "7.4.1",
-    "@orval/swr": "7.4.1",
-    "@orval/zod": "7.4.1",
+    "@orval/angular": "7.5.0",
+    "@orval/axios": "7.5.0",
+    "@orval/core": "7.5.0",
+    "@orval/fetch": "7.5.0",
+    "@orval/hono": "7.5.0",
+    "@orval/mock": "7.5.0",
+    "@orval/query": "7.5.0",
+    "@orval/swr": "7.5.0",
+    "@orval/zod": "7.5.0",
     ajv: "^8.17.1",
     cac: "^6.7.14",
     chalk: "^4.1.2",
-    chokidar: "^4.0.1",
+    chokidar: "^4.0.3",
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
@@ -4055,16 +4057,17 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     outputOptions.packageJson || globalOptions.packageJson,
     workspace
   );
-  let mock2 = (_a = outputOptions.mock) != null ? _a : globalOptions.mock;
-  if (typeof mock2 === "boolean" && mock2) {
+  const mockOption = (_a = outputOptions.mock) != null ? _a : globalOptions.mock;
+  let mock2;
+  if (typeof mockOption === "boolean" && mockOption) {
     mock2 = import_mock2.DEFAULT_MOCK_OPTIONS;
-  } else if ((0, import_core7.isFunction)(mock2)) {
-  } else if (!mock2) {
+  } else if ((0, import_core7.isFunction)(mockOption)) {
+  } else if (!mockOption) {
     mock2 = void 0;
   } else {
     mock2 = {
       ...import_mock2.DEFAULT_MOCK_OPTIONS,
-      ...mock2
+      ...mockOption
     };
   }
   const defaultFileExtension = ".ts";
@@ -4441,10 +4444,12 @@ var normalizeHooks = (hooks) => {
   }, {});
 };
 var normalizeHonoOptions = (hono2 = {}, workspace) => {
-  var _a;
+  var _a, _b;
   return {
     ...hono2.handlers ? { handlers: import_core7.upath.resolve(workspace, hono2.handlers) } : {},
-    validator: (_a = hono2.validator) != null ? _a : true
+    compositeRoute: (_a = hono2.compositeRoute) != null ? _a : "",
+    validator: (_b = hono2.validator) != null ? _b : true,
+    validatorOutputPath: hono2.validatorOutputPath ? import_core7.upath.resolve(workspace, hono2.validatorOutputPath) : ""
   };
 };
 var normalizeQueryOptions = (queryOptions = {}, outputWorkspace, globalOptions = {}) => {