From aa32a3fb16801b06b5667637c31b09af7efe8245 Mon Sep 17 00:00:00 2001 From: Kratos2k7 Date: Wed, 8 Apr 2026 09:32:26 +0500 Subject: [PATCH] fix: workflow pipeline issue resolved --- scripts/sdk/generate-node.sh | 4 ++-- scripts/sdk/generate-php.sh | 3 ++- scripts/sdk/generate-python.sh | 3 ++- scripts/sdk/generate-ruby.sh | 3 ++- scripts/sdk/generate-typescript.sh | 4 ++-- scripts/sdk/smoke-test.sh | 6 +++--- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/sdk/generate-node.sh b/scripts/sdk/generate-node.sh index ceec34f..34dafd7 100644 --- a/scripts/sdk/generate-node.sh +++ b/scripts/sdk/generate-node.sh @@ -65,8 +65,8 @@ cat > "${OUTPUT_DIR}/tsconfig.json" << EOF { "compilerOptions": { "target": "ES2022", - "module": "nodenext", - "moduleResolution": "nodenext", + "module": "esnext", + "moduleResolution": "bundler", "declaration": true, "outDir": "./dist", "rootDir": "./src", diff --git a/scripts/sdk/generate-php.sh b/scripts/sdk/generate-php.sh index 4b4f26d..9262c5a 100644 --- a/scripts/sdk/generate-php.sh +++ b/scripts/sdk/generate-php.sh @@ -15,12 +15,13 @@ TEMPLATES_DIR="${OAS_ROOT}/templates/php" echo "Generating PHP SDK v${VERSION} from ${SPEC_FILE}..." +# cd to OAS root so config-relative paths (templateDir: templates/php) resolve +cd "${OAS_ROOT}" npx @openapitools/openapi-generator-cli generate \ -i "${SPEC_FILE}" \ -g php \ -c "${CONFIGS_DIR}/php.yaml" \ -o "${OUTPUT_DIR}" \ - --template-dir "${TEMPLATES_DIR}" \ --additional-properties=invokerPackage=Shotstack\\\\Client,licenseName="MIT",composerPackageName="shotstack/shotstack-sdk-php",srcBasePath="src",artifactVersion="${VERSION}",artifactUrl="https://shotstack.io",developerOrganization="Shotstack",developerOrganizationUrl="https://shotstack.io" echo "PHP SDK generated at ${OUTPUT_DIR}" diff --git a/scripts/sdk/generate-python.sh b/scripts/sdk/generate-python.sh index 200c7cf..d006cb2 100644 --- a/scripts/sdk/generate-python.sh +++ b/scripts/sdk/generate-python.sh @@ -24,12 +24,13 @@ echo "Using openapi-generator v${PYTHON_GENERATOR_VERSION} (Python requires lega npx @openapitools/openapi-generator-cli version-manager set "${PYTHON_GENERATOR_VERSION}" +# cd to OAS root so config-relative paths (templateDir: templates/python) resolve +cd "${OAS_ROOT}" npx @openapitools/openapi-generator-cli generate \ -i "${SPEC_FILE}" \ -g python \ -c "${CONFIGS_DIR}/python.yaml" \ -o "${OUTPUT_DIR}" \ - --template-dir "${TEMPLATES_DIR}" \ --additional-properties=packageName="shotstack_sdk",projectName="shotstack-sdk",pythonAttrNoneIfUnset=true,packageVersion="${VERSION}",packageUrl="https://shotstack.io/product/sdk/python/",infoName="Shotstack",infoEmail="pypi@shotstack.io",licenseInfo="MIT" echo "Python SDK generated at ${OUTPUT_DIR}" diff --git a/scripts/sdk/generate-ruby.sh b/scripts/sdk/generate-ruby.sh index e005079..ec71a73 100644 --- a/scripts/sdk/generate-ruby.sh +++ b/scripts/sdk/generate-ruby.sh @@ -15,12 +15,13 @@ TEMPLATES_DIR="${OAS_ROOT}/templates/ruby" echo "Generating Ruby SDK v${VERSION} from ${SPEC_FILE}..." +# cd to OAS root so config-relative paths (templateDir: templates/ruby) resolve +cd "${OAS_ROOT}" npx @openapitools/openapi-generator-cli generate \ -i "${SPEC_FILE}" \ -g ruby \ -c "${CONFIGS_DIR}/ruby.yaml" \ -o "${OUTPUT_DIR}" \ - --template-dir "${TEMPLATES_DIR}" \ --additional-properties=moduleName="Shotstack",gemAuthor="Shotstack",gemAuthorEmail="ruby@shotstack.io",gemHomepage="https://shotstack.io/product/sdk/ruby/",gemLicense="MIT",gemVersion="${VERSION}" echo "Ruby SDK generated at ${OUTPUT_DIR}" diff --git a/scripts/sdk/generate-typescript.sh b/scripts/sdk/generate-typescript.sh index 3dafbe4..789c4f1 100644 --- a/scripts/sdk/generate-typescript.sh +++ b/scripts/sdk/generate-typescript.sh @@ -60,8 +60,8 @@ cat > "${OUTPUT_DIR}/tsconfig.json" << EOF { "compilerOptions": { "target": "ES2022", - "module": "nodenext", - "moduleResolution": "nodenext", + "module": "esnext", + "moduleResolution": "bundler", "declaration": true, "outDir": "./dist", "rootDir": "./src", diff --git a/scripts/sdk/smoke-test.sh b/scripts/sdk/smoke-test.sh index 17053e4..99b799a 100644 --- a/scripts/sdk/smoke-test.sh +++ b/scripts/sdk/smoke-test.sh @@ -15,10 +15,10 @@ case "${LANGUAGE}" in echo "→ TypeScript type-check..." cd "${SDK_DIR}" npm install --ignore-scripts 2>/dev/null || true - npx tsc --noEmit --skipLibCheck + # Use npx -p typescript to ensure we get the real TypeScript compiler, not the 'tsc' npm package + npx -p typescript tsc --noEmit --skipLibCheck echo "→ Import check..." - node -e "import('./src/index.ts')" 2>/dev/null || \ - npx tsx -e "import * as sdk from './src/index'; console.log('Exports:', Object.keys(sdk).length)" + npx -p tsx tsx -e "import * as sdk from './src/index'; console.log('Exports:', Object.keys(sdk).length)" echo "✓ Node/TypeScript smoke tests passed" ;;