From 36b6dff4dba2c4754dead82baec2e41bfcf753b9 Mon Sep 17 00:00:00 2001
From: Antoine Arlaud <antoine@snyk.io>
Date: Thu, 16 Sep 2021 15:12:40 +0200
Subject: [PATCH] fix: remove qs from endpoint name and swap nolimitmode flag

---
 src/lib/generators/generate.ts   | 5 +++--
 src/lib/preprocessors/prepare.ts | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib/generators/generate.ts b/src/lib/generators/generate.ts
index 741e8b5..8cc20bc 100644
--- a/src/lib/generators/generate.ts
+++ b/src/lib/generators/generate.ts
@@ -67,6 +67,7 @@ const generateClass = (
   abstractionImportsArray.push(
     generateImportsForAbstractionMethods(classToGenerate),
   );
+  abstractionImportsArray = [...new Set(abstractionImportsArray)];
 
   if (classToGenerate) {
     if (isRootClass) {
@@ -777,7 +778,7 @@ const generatePaginationMethods = (
         method.argsList = method.argsList
           .filter((x) => !x.startsWith('perPage'))
           .filter((x) => !x.startsWith('page'));
-        method.argsList.unshift('noLimitMode: boolean = false');
+        method.argsList.push('noLimitMode: boolean = false');
 
         let qsIfStatements = '';
         qsParametersNamesList.forEach((qsParameterName) => {
@@ -1004,6 +1005,6 @@ parsedJSON.forEach((classItem) => {
   const classCode = generateClass(classItem);
   fs.writeFileSync(
     path.join('./src/lib/client/generated/' + classItem.name + '.ts'),
-    initLines + abstractionImportsArray.join(`\n`) + classCode,
+    initLines + abstractionImportsArray.join(`\n`) + '\n' + classCode,
   );
 });
diff --git a/src/lib/preprocessors/prepare.ts b/src/lib/preprocessors/prepare.ts
index e9a9905..d28bb8a 100644
--- a/src/lib/preprocessors/prepare.ts
+++ b/src/lib/preprocessors/prepare.ts
@@ -330,7 +330,10 @@ const main = (jsonPath: string) => {
   paths = consolidateReferences(paths);
   Object.keys(paths).forEach((path) => {
     const verbs = Object.keys(paths[path]);
-    const splitEndpoint = path.split('/').filter((x) => x);
+    const splitEndpoint = path
+      .split('?')[0]
+      .split('/')
+      .filter((x) => x);
     classMap = registerEndpoint(
       classMap,
       extractClassAndParamFromEndpoint(splitEndpoint, verbs, path),