@eventcatalog/generator-openapi 6.0.0 → 7.0.0

package/dist/index.js

@@ -640,7 +640,7 @@ var import_chalk = __toESM(require("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",
@@ -661,6 +661,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",
@@ -680,6 +681,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"
   }
@@ -1585,6 +1587,15 @@ Run npm i ${packageName} to update`;
   }
 }
 
+// src/utils/versions.ts
+var import_semver = require("semver");
+var isVersionGreaterThan = (version, givenVersion) => {
+  return (0, import_semver.satisfies)(version, `>${givenVersion}`);
+};
+var isVersionLessThan = (version, givenVersion) => {
+  return (0, import_semver.satisfies)(version, `<${givenVersion}`);
+};
+
 // src/index.ts
 var index_default = async (_, options) => {
   if (!process.env.PROJECT_DIR) {
@@ -1618,7 +1629,7 @@ var index_default = async (_, options) => {
           path: specFile
         };
       } catch (error) {
-        console.error(import_chalk3.default.red(`Failed to parse OpenAPI file: ${serviceSpec.path}`));
+        console.error(import_chalk3.default.red(`Failed to parse OpenAPI file: ${specFile}`));
         console.error(import_chalk3.default.red(error));
         return null;
       }
@@ -1668,8 +1679,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(import_chalk3.default.blue(`Processing service: ${document.info.title} (v${version})`));
+      if (latestServiceInCatalog && isVersionLessThan(version, latestServiceInCatalog.version)) {
+        servicePath = (0, import_node_path.join)(servicePath, "versioned", version);
+      }
       if (versionTheService) {
         await versionService(service.id);
         console.log(import_chalk3.default.cyan(` - Versioned previous service (v${latestServiceInCatalog.version})`));