orval 6.22.1 → 6.24.0

package/dist/index.js

@@ -32,7 +32,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // ../../node_modules/lodash.omit/index.js
 var require_lodash = __commonJS({
-  "../../node_modules/lodash.omit/index.js"(exports, module2) {
+  "../../node_modules/lodash.omit/index.js"(exports2, module2) {
     "use strict";
     var LARGE_ARRAY_SIZE = 200;
     var HASH_UNDEFINED = "__lodash_hash_undefined__";
@@ -374,14 +374,14 @@ var require_lodash = __commonJS({
       return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
     }
     function baseIsNative(value) {
-      if (!isObject6(value) || isMasked(value)) {
+      if (!isObject7(value) || isMasked(value)) {
         return false;
       }
       var pattern = isFunction5(value) || isHostObject(value) ? reIsNative : reIsHostCtor;
       return pattern.test(toSource(value));
     }
     function baseKeysIn(object) {
-      if (!isObject6(object)) {
+      if (!isObject7(object)) {
         return nativeKeysIn(object);
       }
       var isProto = isPrototype(object), result = [];
@@ -505,13 +505,13 @@ var require_lodash = __commonJS({
       return isObjectLike(value) && isArrayLike(value);
     }
     function isFunction5(value) {
-      var tag = isObject6(value) ? objectToString.call(value) : "";
+      var tag = isObject7(value) ? objectToString.call(value) : "";
       return tag == funcTag || tag == genTag;
     }
     function isLength(value) {
       return typeof value == "number" && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
     }
-    function isObject6(value) {
+    function isObject7(value) {
       var type2 = typeof value;
       return !!value && (type2 == "object" || type2 == "function");
     }
@@ -548,11 +548,9 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_core12 = require("@orval/core");
-var import_chalk7 = __toESM(require("chalk"));
 
 // src/generate.ts
 var import_core11 = require("@orval/core");
-var import_chalk6 = __toESM(require("chalk"));
 
 // src/import-specs.ts
 var import_swagger_parser = __toESM(require("@apidevtools/swagger-parser"));
@@ -3356,7 +3354,8 @@ var generateClientFooter = ({
   if (!footer) {
     return {
       implementation: "",
-      implementationMock: `]
+      implementationMock: `
+]
 `
     };
   }
@@ -3585,10 +3584,7 @@ var importOpenApi = async ({
       target,
       workspace,
       specs,
-      override: output.override,
-      tslint: output.tslint,
-      tsconfig: output.tsconfig,
-      packageJson: output.packageJson
+      output
     }
   });
   return {
@@ -3632,50 +3628,50 @@ var getApiSchemas = ({
   workspace,
   specs
 }) => {
-  return Object.entries(specs).reduce((acc, [specKey, spec]) => {
-    var _a, _b, _c, _d;
-    const context = {
-      specKey,
-      target,
-      workspace,
-      specs,
-      override: output.override,
-      tslint: output.tslint,
-      tsconfig: output.tsconfig,
-      packageJson: output.packageJson
-    };
-    const schemaDefinition = (0, import_core3.generateSchemasDefinition)(
-      !spec.openapi ? getAllSchemas(spec, specKey) : (_a = spec.components) == null ? void 0 : _a.schemas,
-      context,
-      output.override.components.schemas.suffix
-    );
-    const responseDefinition = (0, import_core3.generateComponentDefinition)(
-      (_b = spec.components) == null ? void 0 : _b.responses,
-      context,
-      output.override.components.responses.suffix
-    );
-    const bodyDefinition = (0, import_core3.generateComponentDefinition)(
-      (_c = spec.components) == null ? void 0 : _c.requestBodies,
-      context,
-      output.override.components.requestBodies.suffix
-    );
-    const parameters = (0, import_core3.generateParameterDefinition)(
-      (_d = spec.components) == null ? void 0 : _d.parameters,
-      context,
-      output.override.components.parameters.suffix
-    );
-    const schemas = [
-      ...schemaDefinition,
-      ...responseDefinition,
-      ...bodyDefinition,
-      ...parameters
-    ];
-    if (!schemas.length) {
+  return Object.entries(specs).reduce(
+    (acc, [specKey, spec]) => {
+      var _a, _b, _c, _d;
+      const context = {
+        specKey,
+        target,
+        workspace,
+        specs,
+        output
+      };
+      const schemaDefinition = (0, import_core3.generateSchemasDefinition)(
+        !spec.openapi ? getAllSchemas(spec, specKey) : (_a = spec.components) == null ? void 0 : _a.schemas,
+        context,
+        output.override.components.schemas.suffix
+      );
+      const responseDefinition = (0, import_core3.generateComponentDefinition)(
+        (_b = spec.components) == null ? void 0 : _b.responses,
+        context,
+        output.override.components.responses.suffix
+      );
+      const bodyDefinition = (0, import_core3.generateComponentDefinition)(
+        (_c = spec.components) == null ? void 0 : _c.requestBodies,
+        context,
+        output.override.components.requestBodies.suffix
+      );
+      const parameters = (0, import_core3.generateParameterDefinition)(
+        (_d = spec.components) == null ? void 0 : _d.parameters,
+        context,
+        output.override.components.parameters.suffix
+      );
+      const schemas = [
+        ...schemaDefinition,
+        ...responseDefinition,
+        ...bodyDefinition,
+        ...parameters
+      ];
+      if (!schemas.length) {
+        return acc;
+      }
+      acc[specKey] = schemas;
       return acc;
-    }
-    acc[specKey] = schemas;
-    return acc;
-  }, {});
+    },
+    {}
+  );
 };
 var getAllSchemas = (spec, specKey) => {
   var _a;
@@ -3744,7 +3740,7 @@ var resolveSpecs = async (path, { validate, ...options }, isUrl3, isOnlySchema)
       return data;
     }
     return Object.fromEntries(
-      Object.entries(data).map(([key, value]) => [import_core4.upath.resolve(key), value])
+      Object.entries(data).sort().map(([key, value]) => [import_core4.upath.resolve(key), value])
     );
   } catch {
     const file = await import_fs_extra.default.readFile(path, "utf8");
@@ -3793,7 +3789,7 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.22.1",
+  version: "6.24.0",
   license: "MIT",
   files: [
     "dist"
@@ -3833,8 +3829,8 @@ var package_default = {
     url: "https://github.com/anymaniax/orval"
   },
   scripts: {
-    build: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --dts",
-    dev: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --watch ./src --onSuccess 'yarn generate-api'",
+    build: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --sourcemap --dts",
+    dev: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --sourcemap --watch ./src --onSuccess 'yarn generate-api'",
     lint: "eslint src/**/*.ts",
     "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts",
     test: "tsc --noEmit && vitest --passWithNoTests"
@@ -3846,13 +3842,13 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "6.22.1",
-    "@orval/axios": "6.22.1",
-    "@orval/core": "6.22.1",
-    "@orval/mock": "6.22.1",
-    "@orval/query": "6.22.1",
-    "@orval/swr": "6.22.1",
-    "@orval/zod": "6.22.1",
+    "@orval/angular": "6.24.0",
+    "@orval/axios": "6.24.0",
+    "@orval/core": "6.24.0",
+    "@orval/mock": "6.24.0",
+    "@orval/query": "6.24.0",
+    "@orval/swr": "6.24.0",
+    "@orval/zod": "6.24.0",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
@@ -3862,8 +3858,7 @@ var package_default = {
     "find-up": "5.0.0",
     "fs-extra": "^11.2.0",
     "lodash.uniq": "^4.5.0",
-    "openapi-types": "^12.1.3",
-    "openapi3-ts": "^3.2.0",
+    "openapi3-ts": "4.2.1",
     "string-argv": "^0.3.2",
     tsconfck: "^2.0.1"
   }
@@ -4081,7 +4076,7 @@ function defineConfig(options) {
   return options;
 }
 var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOptions = {}) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra;
   const options = await ((0, import_core7.isFunction)(optionsExport) ? optionsExport() : optionsExport);
   if (!options.input) {
     (0, import_core7.createLogger)().error(import_chalk2.default.red(`Config require an input`));
@@ -4149,75 +4144,78 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
       headers: (_n = outputOptions.headers) != null ? _n : false,
       indexFiles: (_o = outputOptions.indexFiles) != null ? _o : true,
       baseUrl: outputOptions.baseUrl,
+      unionAddMissingProperties: (_p = outputOptions.unionAddMissingProperties) != null ? _p : false,
       override: {
         ...outputOptions.override,
         mock: {
-          arrayMin: (_r = (_q = (_p = outputOptions.override) == null ? void 0 : _p.mock) == null ? void 0 : _q.arrayMin) != null ? _r : 1,
-          arrayMax: (_u = (_t = (_s = outputOptions.override) == null ? void 0 : _s.mock) == null ? void 0 : _t.arrayMax) != null ? _u : 10,
-          ...(_w = (_v = outputOptions.override) == null ? void 0 : _v.mock) != null ? _w : {}
+          arrayMin: (_s = (_r = (_q = outputOptions.override) == null ? void 0 : _q.mock) == null ? void 0 : _r.arrayMin) != null ? _s : 1,
+          arrayMax: (_v = (_u = (_t = outputOptions.override) == null ? void 0 : _t.mock) == null ? void 0 : _u.arrayMax) != null ? _v : 10,
+          ...(_x = (_w = outputOptions.override) == null ? void 0 : _w.mock) != null ? _x : {}
         },
         operations: normalizeOperationsAndTags(
-          (_y = (_x = outputOptions.override) == null ? void 0 : _x.operations) != null ? _y : {},
+          (_z = (_y = outputOptions.override) == null ? void 0 : _y.operations) != null ? _z : {},
           outputWorkspace
         ),
         tags: normalizeOperationsAndTags(
-          (_A = (_z = outputOptions.override) == null ? void 0 : _z.tags) != null ? _A : {},
+          (_B = (_A = outputOptions.override) == null ? void 0 : _A.tags) != null ? _B : {},
           outputWorkspace
         ),
         mutator: normalizeMutator(
           outputWorkspace,
-          (_B = outputOptions.override) == null ? void 0 : _B.mutator
+          (_C = outputOptions.override) == null ? void 0 : _C.mutator
         ),
-        formData: (_F = !(0, import_core7.isBoolean)((_C = outputOptions.override) == null ? void 0 : _C.formData) ? normalizeMutator(
+        formData: (_G = !(0, import_core7.isBoolean)((_D = outputOptions.override) == null ? void 0 : _D.formData) ? normalizeMutator(
           outputWorkspace,
-          (_D = outputOptions.override) == null ? void 0 : _D.formData
-        ) : (_E = outputOptions.override) == null ? void 0 : _E.formData) != null ? _F : true,
-        formUrlEncoded: (_J = !(0, import_core7.isBoolean)((_G = outputOptions.override) == null ? void 0 : _G.formUrlEncoded) ? normalizeMutator(
+          (_E = outputOptions.override) == null ? void 0 : _E.formData
+        ) : (_F = outputOptions.override) == null ? void 0 : _F.formData) != null ? _G : true,
+        formUrlEncoded: (_K = !(0, import_core7.isBoolean)((_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded) ? normalizeMutator(
           outputWorkspace,
-          (_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded
-        ) : (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded) != null ? _J : true,
+          (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded
+        ) : (_J = outputOptions.override) == null ? void 0 : _J.formUrlEncoded) != null ? _K : true,
         paramsSerializer: normalizeMutator(
           outputWorkspace,
-          (_K = outputOptions.override) == null ? void 0 : _K.paramsSerializer
+          (_L = outputOptions.override) == null ? void 0 : _L.paramsSerializer
         ),
-        header: ((_L = outputOptions.override) == null ? void 0 : _L.header) === false ? false : (0, import_core7.isFunction)((_M = outputOptions.override) == null ? void 0 : _M.header) ? (_N = outputOptions.override) == null ? void 0 : _N.header : getDefaultFilesHeader,
-        requestOptions: (_P = (_O = outputOptions.override) == null ? void 0 : _O.requestOptions) != null ? _P : true,
+        header: ((_M = outputOptions.override) == null ? void 0 : _M.header) === false ? false : (0, import_core7.isFunction)((_N = outputOptions.override) == null ? void 0 : _N.header) ? (_O = outputOptions.override) == null ? void 0 : _O.header : getDefaultFilesHeader,
+        requestOptions: (_Q = (_P = outputOptions.override) == null ? void 0 : _P.requestOptions) != null ? _Q : true,
         components: {
           schemas: {
             suffix: import_core7.RefComponentSuffix.schemas,
-            ...(_S = (_R = (_Q = outputOptions.override) == null ? void 0 : _Q.components) == null ? void 0 : _R.schemas) != null ? _S : {}
+            itemSuffix: (_U = (_T = (_S = (_R = outputOptions.override) == null ? void 0 : _R.components) == null ? void 0 : _S.schemas) == null ? void 0 : _T.itemSuffix) != null ? _U : "Item",
+            ...(_X = (_W = (_V = outputOptions.override) == null ? void 0 : _V.components) == null ? void 0 : _W.schemas) != null ? _X : {}
           },
           responses: {
             suffix: import_core7.RefComponentSuffix.responses,
-            ...(_V = (_U = (_T = outputOptions.override) == null ? void 0 : _T.components) == null ? void 0 : _U.responses) != null ? _V : {}
+            ...(__ = (_Z = (_Y = outputOptions.override) == null ? void 0 : _Y.components) == null ? void 0 : _Z.responses) != null ? __ : {}
           },
           parameters: {
             suffix: import_core7.RefComponentSuffix.parameters,
-            ...(_Y = (_X = (_W = outputOptions.override) == null ? void 0 : _W.components) == null ? void 0 : _X.parameters) != null ? _Y : {}
+            ...(_ba = (_aa = (_$ = outputOptions.override) == null ? void 0 : _$.components) == null ? void 0 : _aa.parameters) != null ? _ba : {}
           },
           requestBodies: {
             suffix: import_core7.RefComponentSuffix.requestBodies,
-            ...(_$ = (__ = (_Z = outputOptions.override) == null ? void 0 : _Z.components) == null ? void 0 : __.requestBodies) != null ? _$ : {}
+            ...(_ea = (_da = (_ca = outputOptions.override) == null ? void 0 : _ca.components) == null ? void 0 : _da.requestBodies) != null ? _ea : {}
           }
         },
         query: {
           useQuery: true,
           useMutation: true,
           signal: true,
-          ...normalizeQueryOptions((_aa = outputOptions.override) == null ? void 0 : _aa.query, workspace)
+          shouldExportMutatorHooks: true,
+          ...normalizeQueryOptions((_fa = outputOptions.override) == null ? void 0 : _fa.query, workspace)
         },
         swr: {
-          ...(_ca = (_ba = outputOptions.override) == null ? void 0 : _ba.swr) != null ? _ca : {}
+          ...(_ha = (_ga = outputOptions.override) == null ? void 0 : _ga.swr) != null ? _ha : {}
         },
         angular: {
-          provideIn: (_fa = (_ea = (_da = outputOptions.override) == null ? void 0 : _da.angular) == null ? void 0 : _ea.provideIn) != null ? _fa : "root"
+          provideIn: (_ka = (_ja = (_ia = outputOptions.override) == null ? void 0 : _ia.angular) == null ? void 0 : _ja.provideIn) != null ? _ka : "root"
         },
-        useDates: ((_ga = outputOptions.override) == null ? void 0 : _ga.useDates) || false,
-        useDeprecatedOperations: (_ia = (_ha = outputOptions.override) == null ? void 0 : _ha.useDeprecatedOperations) != null ? _ia : true,
-        useNativeEnums: (_ka = (_ja = outputOptions.override) == null ? void 0 : _ja.useNativeEnums) != null ? _ka : false
+        useDates: ((_la = outputOptions.override) == null ? void 0 : _la.useDates) || false,
+        useDeprecatedOperations: (_na = (_ma = outputOptions.override) == null ? void 0 : _ma.useDeprecatedOperations) != null ? _na : true,
+        useNativeEnums: (_pa = (_oa = outputOptions.override) == null ? void 0 : _oa.useNativeEnums) != null ? _pa : false
       },
-      allParamsOptional: (_la = outputOptions.allParamsOptional) != null ? _la : false,
-      urlEncodeParameters: (_ma = outputOptions.urlEncodeParameters) != null ? _ma : false
+      allParamsOptional: (_qa = outputOptions.allParamsOptional) != null ? _qa : false,
+      urlEncodeParameters: (_ra = outputOptions.urlEncodeParameters) != null ? _ra : false
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
   };
@@ -4340,6 +4338,11 @@ var normalizeHooks = (hooks) => {
         ...acc,
         [key]: [hooks[key]]
       };
+    } else if ((0, import_core7.isObject)(hooks[key])) {
+      return {
+        ...acc,
+        [key]: [hooks[key]]
+      };
     }
     return acc;
   }, {});
@@ -4374,6 +4377,7 @@ var normalizeQueryOptions = (queryOptions = {}, outputWorkspace) => {
         queryOptions == null ? void 0 : queryOptions.mutationOptions
       )
     } : {},
+    ...!(0, import_core7.isUndefined)(queryOptions.shouldExportMutatorHooks) ? { shouldExportMutatorHooks: queryOptions.shouldExportMutatorHooks } : {},
     ...!(0, import_core7.isUndefined)(queryOptions.signal) ? { signal: queryOptions.signal } : {},
     ...!(0, import_core7.isUndefined)(queryOptions.version) ? { version: queryOptions.version } : {}
   };
@@ -4392,13 +4396,14 @@ var getDefaultFilesHeader = ({
 
 // src/utils/watcher.ts
 var import_core8 = require("@orval/core");
-var import_chalk3 = __toESM(require("chalk"));
 var startWatcher = async (watchOptions, watchFn, defaultTarget = ".") => {
   if (!watchOptions)
     return;
   const { watch } = await Promise.resolve().then(() => __toESM(require("chokidar")));
   const ignored = ["**/{.git,node_modules}/**"];
-  const watchPaths = typeof watchOptions === "boolean" ? defaultTarget : Array.isArray(watchOptions) ? watchOptions.filter((path) => typeof path === "string") : watchOptions;
+  const watchPaths = typeof watchOptions === "boolean" ? defaultTarget : Array.isArray(watchOptions) ? watchOptions.filter(
+    (path) => typeof path === "string"
+  ) : watchOptions;
   (0, import_core8.log)(
     `Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => '"' + v + '"').join(" | ") : '"' + watchPaths + '"'}`
   );
@@ -4411,38 +4416,53 @@ var startWatcher = async (watchOptions, watchFn, defaultTarget = ".") => {
     try {
       await watchFn();
     } catch (e) {
-      (0, import_core8.log)(import_chalk3.default.red(e));
+      (0, import_core8.logError)(e);
     }
   });
 };
 
 // src/write-specs.ts
 var import_core10 = require("@orval/core");
-var import_chalk5 = __toESM(require("chalk"));
+var import_chalk4 = __toESM(require("chalk"));
 var import_execa2 = __toESM(require("execa"));
 var import_fs_extra5 = __toESM(require("fs-extra"));
 var import_lodash2 = __toESM(require("lodash.uniq"));
 
 // src/utils/executeHook.ts
 var import_core9 = require("@orval/core");
-var import_chalk4 = __toESM(require("chalk"));
+var import_chalk3 = __toESM(require("chalk"));
 var import_execa = __toESM(require("execa"));
 var import_string_argv = require("string-argv");
 var executeHook = async (name, commands = [], args = []) => {
-  (0, import_core9.log)(import_chalk4.default.white(`Running ${name} hook...`));
+  (0, import_core9.log)(import_chalk3.default.white(`Running ${name} hook...`));
   for (const command of commands) {
-    if ((0, import_core9.isString)(command)) {
-      const [cmd, ..._args] = [...(0, import_string_argv.parseArgsStringToArgv)(command), ...args];
-      try {
-        await (0, import_execa.default)(cmd, _args);
-      } catch (e) {
-        (0, import_core9.log)(import_chalk4.default.red(`\u{1F6D1} Failed to run ${name} hook: ${e}`));
+    try {
+      if ((0, import_core9.isString)(command)) {
+        await executeCommand(command, args);
+      } else if ((0, import_core9.isFunction)(command)) {
+        await command(args);
+      } else if ((0, import_core9.isObject)(command)) {
+        await executeObjectCommand(command, args);
       }
-    } else if ((0, import_core9.isFunction)(command)) {
-      await command(args);
+    } catch (e) {
+      (0, import_core9.logError)(e, `Failed to run ${name} hook`);
     }
   }
 };
+async function executeCommand(command, args) {
+  const [cmd, ..._args] = [...(0, import_string_argv.parseArgsStringToArgv)(command), ...args];
+  await (0, import_execa.default)(cmd, _args);
+}
+async function executeObjectCommand(command, args) {
+  if (command.injectGeneratedDirsAndFiles === false) {
+    args = [];
+  }
+  if ((0, import_core9.isString)(command.command)) {
+    await executeCommand(command.command, args);
+  } else if ((0, import_core9.isFunction)(command.command)) {
+    await command.command();
+  }
+}
 
 // src/write-specs.ts
 var getHeader = (option, info) => {
@@ -4456,12 +4476,15 @@ var writeSpecs = async (builder, workspace, options, projectName) => {
   const { info = { title: "", version: 0 }, schemas, target } = builder;
   const { output } = options;
   const projectTitle = projectName || info.title;
-  const specsName = Object.keys(schemas).reduce((acc, specKey) => {
-    const basePath = import_core10.upath.getSpecName(specKey, target);
-    const name = basePath.slice(1).split("/").join("-");
-    acc[specKey] = name;
-    return acc;
-  }, {});
+  const specsName = Object.keys(schemas).reduce(
+    (acc, specKey) => {
+      const basePath = import_core10.upath.getSpecName(specKey, target);
+      const name = basePath.slice(1).split("/").join("-");
+      acc[specKey] = name;
+      return acc;
+    },
+    {}
+  );
   const header = getHeader(output.override.header, info);
   if (output.schemas) {
     const rootSchemaPath = output.schemas;
@@ -4542,7 +4565,7 @@ var writeSpecs = async (builder, workspace, options, projectName) => {
       await (0, import_execa2.default)("prettier", ["--write", ...paths]);
     } catch (e) {
       (0, import_core10.log)(
-        import_chalk5.default.yellow(
+        import_chalk4.default.yellow(
           `\u26A0\uFE0F  ${projectTitle ? `${projectTitle} - ` : ""}Prettier not found`
         )
       );
@@ -4592,11 +4615,11 @@ var generateSpecs = async (config, workspace, projectName) => {
       try {
         await generateSpec(workspace, options, projectName);
       } catch (e) {
-        (0, import_core11.log)(import_chalk6.default.red(`\u{1F6D1}  ${projectName ? `${projectName} - ` : ""}${e}`));
+        (0, import_core11.logError)(e, projectName);
         process.exit(1);
       }
     } else {
-      (0, import_core11.errorMessage)("Project not found");
+      (0, import_core11.logError)("Project not found");
       process.exit(1);
     }
     return;
@@ -4609,7 +4632,7 @@ var generateSpecs = async (config, workspace, projectName) => {
         acc.push(await generateSpec(workspace, options, projectName2));
       } catch (e) {
         hasErrors = true;
-        (0, import_core11.log)(import_chalk6.default.red(`\u{1F6D1}  ${projectName2 ? `${projectName2} - ` : ""}${e}`));
+        (0, import_core11.logError)(e, projectName2);
       }
       return acc;
     },
@@ -4671,11 +4694,7 @@ var generate = async (optionsExport, workspace = process.cwd(), options) => {
         try {
           await generateSpec(workspace, normalizedOptions);
         } catch (e) {
-          (0, import_core12.log)(
-            import_chalk7.default.red(
-              `\u{1F6D1}  ${(options == null ? void 0 : options.projectName) ? `${options == null ? void 0 : options.projectName} - ` : ""}${e}`
-            )
-          );
+          (0, import_core12.logError)(e, options == null ? void 0 : options.projectName);
         }
       },
       normalizedOptions.input.target
@@ -4684,11 +4703,7 @@ var generate = async (optionsExport, workspace = process.cwd(), options) => {
     try {
       return await generateSpec(workspace, normalizedOptions);
     } catch (e) {
-      (0, import_core12.log)(
-        import_chalk7.default.red(
-          `\u{1F6D1}  ${(options == null ? void 0 : options.projectName) ? `${options == null ? void 0 : options.projectName} - ` : ""}${e}`
-        )
-      );
+      (0, import_core12.logError)(e, options == null ? void 0 : options.projectName);
     }
   }
 };
@@ -4704,3 +4719,4 @@ var src_default = generate;
 js-yaml/dist/js-yaml.mjs:
   (*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT *)
 */
+//# sourceMappingURL=index.js.map