@eventcatalog/generator-openapi 6.0.0 → 7.0.0

package/dist/index.mjs

@@ -279,7 +279,7 @@ var require_ansi_align = __commonJS({
 
 // src/index.ts
 import utils2 from "@eventcatalog/sdk";
-import { readFile } from "node:fs/promises";
+import { readFile } from "fs/promises";
 import chalk3 from "chalk";
 import SwaggerParser2 from "@apidevtools/swagger-parser";
 
@@ -629,7 +629,7 @@ import chalk from "chalk";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "6.0.0",
+  version: "7.0.0",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -650,6 +650,7 @@ var package_default = {
     "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.7",
     "@types/node": "^20.16.1",
+    "@types/semver": "^7.7.0",
     prettier: "^3.3.3",
     tsup: "^8.1.0",
     typescript: "^5.5.3",
@@ -669,6 +670,7 @@ var package_default = {
     chalk: "^4",
     "js-yaml": "^4.1.0",
     "openapi-types": "^12.1.3",
+    semver: "^7.7.2",
     slugify: "^1.6.6",
     "update-notifier": "^7.3.1"
   }
@@ -715,10 +717,10 @@ You are using a trial license for this plugin`));
 
 // src/index.ts
 import yaml from "js-yaml";
-import { join } from "node:path";
+import { join } from "path";
 
 // ../../node_modules/.pnpm/boxen@8.0.1/node_modules/boxen/index.js
-import process2 from "node:process";
+import process2 from "process";
 
 // ../../node_modules/.pnpm/ansi-regex@6.1.0/node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
@@ -1574,6 +1576,15 @@ Run npm i ${packageName} to update`;
   }
 }
 
+// src/utils/versions.ts
+import { satisfies } from "semver";
+var isVersionGreaterThan = (version, givenVersion) => {
+  return satisfies(version, `>${givenVersion}`);
+};
+var isVersionLessThan = (version, givenVersion) => {
+  return satisfies(version, `<${givenVersion}`);
+};
+
 // src/index.ts
 var index_default = async (_, options) => {
   if (!process.env.PROJECT_DIR) {
@@ -1607,7 +1618,7 @@ var index_default = async (_, options) => {
           path: specFile
         };
       } catch (error) {
-        console.error(chalk3.red(`Failed to parse OpenAPI file: ${serviceSpec.path}`));
+        console.error(chalk3.red(`Failed to parse OpenAPI file: ${specFile}`));
         console.error(chalk3.red(error));
         return null;
       }
@@ -1657,8 +1668,11 @@ Processing domain: ${domainName} (v${domainVersion})`));
         await addServiceToDomain(domainId, { id: service.id, version: service.version }, domainVersion);
       }
       const latestServiceInCatalog = await getService(service.id, "latest");
-      const versionTheService = latestServiceInCatalog && latestServiceInCatalog.version !== version;
+      const versionTheService = latestServiceInCatalog && isVersionGreaterThan(version, latestServiceInCatalog.version);
       console.log(chalk3.blue(`Processing service: ${document.info.title} (v${version})`));
+      if (latestServiceInCatalog && isVersionLessThan(version, latestServiceInCatalog.version)) {
+        servicePath = join(servicePath, "versioned", version);
+      }
       if (versionTheService) {
         await versionService(service.id);
         console.log(chalk3.cyan(` - Versioned previous service (v${latestServiceInCatalog.version})`));