@team-supercharge/oasg 4.0.0 → 4.0.2

package/.gitlab-ci.yml

@@ -1,7 +1,7 @@
 include:
   - project: team-supercharge/jarvis/jarvis
     file: jarvis.yml
-    ref: v6.0.0
+    ref: v6.3.0
 
 stages:
   - lint

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.0.2](https://gitlab.com/team-supercharge/oasg/compare/v4.0.1...v4.0.2) (2022-03-21)
+
+
+### Bug Fixes
+
+* replace references in mappings of discriminator ([1cc5b67](https://gitlab.com/team-supercharge/oasg/commit/1cc5b67003da1a937b60736f383db78d0524cdc5))
+
+### [4.0.1](https://gitlab.com/team-supercharge/oasg/compare/v4.0.0...v4.0.1) (2022-03-18)
+
+
+### Bug Fixes
+
+* add missing default generatorId mapping for feign clients ([5a8f7bf](https://gitlab.com/team-supercharge/oasg/commit/5a8f7bf57f13b666ff6cbcb652634352a4d8b96f))
+
 ## [4.0.0](https://gitlab.com/team-supercharge/oasg/oasg/compare/v3.2.0...v4.0.0) (2021-08-30)
 
 

package/bin/merger.js

@@ -64,6 +64,17 @@ function getAllReferencedFiles(document, files) {
     for (var keys in document) {
       //checking if the current value is an object itself
       if (typeof document[keys] === 'object') {
+        if (keys === "discriminator") {
+          if ("mapping" in document[keys] && typeof document[keys].mapping === 'object') {
+            for (var mappingKey in document[keys].mapping) {
+              if (document[keys].mapping[mappingKey].startsWith(".")) {
+                const externalFilePath = document[keys].mapping[mappingKey].split('#')[0];
+                files.add(externalFilePath);
+              }
+            }
+          }
+          continue;
+        }
         // if so then again calling the same function
         getAllReferencedFiles(document[keys], files)
       } else {
@@ -120,6 +131,16 @@ function updateReferences(document, oldValue, newValue) {
     for (var keys in document) {
       //checking if the current value is an object itself
       if (typeof document[keys] === 'object') {
+        if (keys === "discriminator") {
+          if ("mapping" in document[keys] && typeof document[keys].mapping === 'object') {
+            for (var mappingKey in document[keys].mapping) {
+              if (document[keys].mapping[mappingKey].includes(oldValue)) {
+                document[keys].mapping[mappingKey] = document[keys].mapping[mappingKey].replace(oldValue, newValue);
+              }
+            }
+          }
+          continue;
+        }
         // if so then again calling the same function
         updateReferences(document[keys], oldValue, newValue)
       } else {

package/bin/oasg

@@ -40,7 +40,8 @@ const DEFAULT_GENERATOR_ID_MAPPING = {
   "angular": 'typescript-angular',
   "spring": 'spring',
   "spring-kotlin": 'kotlin-spring',
-  "stubby": 'stubby'
+  "stubby": 'stubby',
+  "feign": 'spring',
 }
 
 let config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/feign/generate.sh

@@ -6,7 +6,7 @@ rm -rf out/$targetId
 mkdir -p out/$targetId
 
 java -jar $binary generate \
-  -g spring \
+  -g $generatorId \
   -i $openApiFile \
   -o out/$targetId \
   -c $(dirname "$0")/generator-config.json \