fix: add contrib only to ory network sdk

ory · Jan 2, 2025 · 5354bc9 · 5354bc9
1 parent a0fda48
commit 5354bc9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 26 deletions.
diff --git a/config/client/typescript-client-fetch.yml b/config/client/typescript-client-fetch.yml
@@ -0,0 +1,31 @@
+npmName: "${NPM_NAME}-fetch"
+npmVersion: $VERSION
+# typescriptThreePlus: true
+supportsES6: true
+ensureUniqueParams: true
+modelPropertyNaming: original
+disallowAdditionalPropertiesIfNotPresent: false
+withInterfaces: false
+useSingleRequestParameter: true
+files:
+  contrib/fetch/src/continueWith.ts:
+    folder: src/contrib
+    destinationFilename: continueWith.ts
+  contrib/fetch/src/error.ts:
+    folder: src/contrib
+    destinationFilename: error.ts
+  contrib/fetch/src/flowTypes.ts:
+    folder: src/contrib
+    destinationFilename: flowTypes.ts
+  contrib/fetch/src/index.ts:
+    folder: src/contrib
+    destinationFilename: index.ts
+  contrib/fetch/src/ui.ts:
+    folder: src/contrib
+    destinationFilename: ui.ts
+  contrib/fetch/src/urlHelpers.ts:
+    folder: src/contrib
+    destinationFilename: urlHelpers.ts
+  contrib/fetch/src/utils.ts:
+    folder: src/contrib
+    destinationFilename: utils.ts
diff --git a/config/client/typescript-fetch.yml b/config/client/typescript-fetch.yml
@@ -7,25 +7,3 @@ modelPropertyNaming: original
 disallowAdditionalPropertiesIfNotPresent: false
 withInterfaces: false
 useSingleRequestParameter: true
-files:
-  contrib/fetch/src/continueWith.ts:
-    folder: src/contrib
-    destinationFilename: continueWith.ts
-  contrib/fetch/src/error.ts:
-    folder: src/contrib
-    destinationFilename: error.ts
-  contrib/fetch/src/flowTypes.ts:
-    folder: src/contrib
-    destinationFilename: flowTypes.ts
-  contrib/fetch/src/index.ts:
-    folder: src/contrib
-    destinationFilename: index.ts
-  contrib/fetch/src/ui.ts:
-    folder: src/contrib
-    destinationFilename: ui.ts
-  contrib/fetch/src/urlHelpers.ts:
-    folder: src/contrib
-    destinationFilename: urlHelpers.ts
-  contrib/fetch/src/utils.ts:
-    folder: src/contrib
-    destinationFilename: utils.ts
diff --git a/scripts/generate.sh b/scripts/generate.sh
@@ -66,16 +66,21 @@ typescript_fetch () {
   mkdir -p "$dir"
 
   openapi-generator-cli version-manager set 7.7.0
+
+  config_file=./config/client/typescript-fetch.yml.proc.yml
+  if [ $project == "client" ]; then
+    echo "Adding contrib files"
+    echo "export * from './contrib';" >> "${dir}/src/index.ts"
+    config_file=./config/client/typescript-client-fetch.yml.proc.yml
+  fi
+
   openapi-generator-cli generate -i "${SPEC_FILE}" \
     -g typescript-fetch \
     -o "$dir" \
     --git-user-id ory \
     --git-repo-id sdk \
     --git-host github.com \
-    -c ./config/client/typescript-fetch.yml.proc.yml
-
-  echo "Adding contrib files to barrel export..."
-  echo "export * from './contrib';" >> "${dir}/src/index.ts"
+    -c ./config/client/typescript-client-fetch.yml.proc.yml
 
   file="${dir}/package.json"
   jq -r ".author = "'"'"Ory Corp"'"'" | .license = "'"'"Apache-2.0"'"' "${file}" \