From 7d992798fdbd1dbba7242d83f79d7fba0499d15c Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:40:44 -0600
Subject: [PATCH] specify client specifically instead of through template

---
 .ci/azure-pipelines-api-client.yml                     |  4 ++--
 .../templates/typescript/{ => axios}/package.mustache  |  6 +++---
 apiclient/templates/typescript/{ => axios}/stable.sh   |  9 ++++-----
 apiclient/templates/typescript/axios/unstable.sh       |  9 +++++++++
 apiclient/templates/typescript/unstable.sh             | 10 ----------
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename apiclient/templates/typescript/{ => axios}/package.mustache (83%)
 rename apiclient/templates/typescript/{ => axios}/stable.sh (58%)
 create mode 100644 apiclient/templates/typescript/axios/unstable.sh
 delete mode 100644 apiclient/templates/typescript/unstable.sh

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 0c741495f7..cbedcc6079 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -38,7 +38,7 @@ jobs:
     displayName: 'Build unstable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/unstable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
 
     - task: Npm@1
     displayName: 'Publish unstable typescript axios client'
@@ -58,7 +58,7 @@ jobs:
     displayName: 'Build stable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/stable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
 
     - task: Npm@1
     displayName: 'Publish stable typescript axios client'
diff --git a/apiclient/templates/typescript/package.mustache b/apiclient/templates/typescript/axios/package.mustache
similarity index 83%
rename from apiclient/templates/typescript/package.mustache
rename to apiclient/templates/typescript/axios/package.mustache
index 251a403836..7bfab08cbb 100644
--- a/apiclient/templates/typescript/package.mustache
+++ b/apiclient/templates/typescript/axios/package.mustache
@@ -1,10 +1,10 @@
 {
-  "name": "@jellyfin/client-{{npmName}}",
+  "name": "@jellyfin/client-axios",
   "version": "10.7.0{{snapshotVersion}}",
-  "description": "Jellyfin api client using {{npmName}}",
+  "description": "Jellyfin api client using axios",
   "author": "Jellyfin Contributors",
   "keywords": [
-    "{{npmName}}",
+    "axios",
     "typescript",
     "jellyfin"
   ],
diff --git a/apiclient/templates/typescript/stable.sh b/apiclient/templates/typescript/axios/stable.sh
similarity index 58%
rename from apiclient/templates/typescript/stable.sh
rename to apiclient/templates/typescript/axios/stable.sh
index f23a85cc96..ecc55d2e79 100644
--- a/apiclient/templates/typescript/stable.sh
+++ b/apiclient/templates/typescript/axios/stable.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-CLIENT=$1
 java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}"
+    --additional-properties=useSingleRequestParameter="true",npmName="axios"
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
new file mode 100644
index 0000000000..615eb5b228
--- /dev/null
+++ b/apiclient/templates/typescript/axios/unstable.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+java -jar openapi-generator-cli.jar generate \
+    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"
diff --git a/apiclient/templates/typescript/unstable.sh b/apiclient/templates/typescript/unstable.sh
deleted file mode 100644
index 3571c8ad5c..0000000000
--- a/apiclient/templates/typescript/unstable.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-CLIENT=$1
-java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"