orval 7.4.0 → 7.5.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { ConfigExternal, OptionsExport, GlobalOptions } from '@orval/core';
+export * from '@orval/core';
 export { Options } from '@orval/core';
 
 /**

package/dist/index.js

@@ -20,6 +20,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -3360,7 +3361,8 @@ var generateMock2 = (verbOption, options) => {
     return {
       implementation: {
         function: "",
-        handler: ""
+        handler: "",
+        handlerName: ""
       },
       imports: []
     };
@@ -3389,7 +3391,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,
@@ -3479,6 +3480,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,
@@ -3488,7 +3493,6 @@ var getApiBuilder = async ({
           override: output.override,
           context: resolvedContext,
           mock: output.mock,
-          // @ts-expect-error // FIXME
           output: output.target
         },
         output
@@ -3537,7 +3541,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: {
@@ -3715,7 +3718,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,
@@ -3726,7 +3729,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,
@@ -3736,7 +3738,6 @@ var importSpecs = async (workspace, options) => {
     data,
     input,
     output,
-    // @ts-expect-error // FIXME
     target: input.target,
     workspace
   });
@@ -3751,12 +3752,14 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "7.4.0",
+  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: [
@@ -3789,7 +3792,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",
@@ -3805,19 +3808,19 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "7.4.0",
-    "@orval/axios": "7.4.0",
-    "@orval/core": "7.4.0",
-    "@orval/fetch": "7.4.0",
-    "@orval/hono": "7.4.0",
-    "@orval/mock": "7.4.0",
-    "@orval/query": "7.4.0",
-    "@orval/swr": "7.4.0",
-    "@orval/zod": "7.4.0",
+    "@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",
@@ -4069,16 +4072,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";
@@ -4455,10 +4459,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 = {}) => {
@@ -4872,6 +4878,7 @@ var generateConfig = async (configFile, options) => {
 };
 
 // src/index.ts
+__reExport(src_exports, require("@orval/core"), module.exports);
 var generate = async (optionsExport, workspace = process.cwd(), options) => {
   if (!optionsExport || (0, import_core12.isString)(optionsExport)) {
     return generateConfig(optionsExport, options);
@@ -4906,7 +4913,8 @@ var src_default = generate;
 0 && (module.exports = {
   Options,
   defineConfig,
-  generate
+  generate,
+  ...require("@orval/core")
 });
 /*! Bundled license information: