diff --git a/.projen/tasks.json b/.projen/tasks.json index 3121e4e19..9054ba695 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -243,12 +243,6 @@ { "exec": "ln -s $PWD/packages/type-safe-api/scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code $(pnpm bin)/type-safe-api.clean-openapi-generated-code &>/dev/null; exit 0;" }, - { - "exec": "ln -s $PWD/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer $(pnpm bin)/type-safe-api.copy-async-smithy-transformer &>/dev/null; exit 0;" - }, - { - "exec": "ln -s $PWD/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper $(pnpm bin)/type-safe-api.copy-gradle-wrapper &>/dev/null; exit 0;" - }, { "exec": "ln -s $PWD/packages/type-safe-api/scripts/type-safe-api/generators/generate $(pnpm bin)/type-safe-api.generate &>/dev/null; exit 0;" } diff --git a/packages/pdk/package.json b/packages/pdk/package.json index 02995190c..8d8d92cac 100644 --- a/packages/pdk/package.json +++ b/packages/pdk/package.json @@ -9,8 +9,6 @@ "monorepo.nx-dir-hasher": "././scripts/monorepo/nx-dir-hasher.js", "type-safe-api": "./scripts/type-safe-api/run.js", "type-safe-api.clean-openapi-generated-code": "./scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "type-safe-api.copy-async-smithy-transformer": "./scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer", - "type-safe-api.copy-gradle-wrapper": "./scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", "type-safe-api.generate": "./scripts/type-safe-api/generators/generate" }, "scripts": { @@ -193,10 +191,8 @@ "./scripts/type-safe-api/generators/generate", "./scripts/type-safe-api/run.js", "./scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "./scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", "./scripts/type-safe-api/custom/gradle-wrapper/gradlew", - "./scripts/type-safe-api/custom/gradle-wrapper/gradlew.bat", - "./scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer" + "./scripts/type-safe-api/custom/gradle-wrapper/gradlew.bat" ] }, "typesVersions": { diff --git a/packages/type-safe-api/package.json b/packages/type-safe-api/package.json index 8c44e2dad..a777b95ef 100644 --- a/packages/type-safe-api/package.json +++ b/packages/type-safe-api/package.json @@ -7,8 +7,6 @@ "bin": { "type-safe-api": "scripts/type-safe-api/run.js", "type-safe-api.clean-openapi-generated-code": "scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "type-safe-api.copy-async-smithy-transformer": "scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer", - "type-safe-api.copy-gradle-wrapper": "scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", "type-safe-api.generate": "scripts/type-safe-api/generators/generate" }, "scripts": { @@ -112,10 +110,8 @@ "scripts/type-safe-api/generators/generate", "scripts/type-safe-api/run.js", "scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", "scripts/type-safe-api/custom/gradle-wrapper/gradlew", - "scripts/type-safe-api/custom/gradle-wrapper/gradlew.bat", - "scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer" + "scripts/type-safe-api/custom/gradle-wrapper/gradlew.bat" ] }, "version": "0.0.0", diff --git a/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper b/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper deleted file mode 100755 index 55b1a0dc9..000000000 --- a/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -echo "Copying Gradle Wrapper..." - -working_dir=$(pwd) -script_dir="$( cd -- "$(dirname $([ -L "${BASH_SOURCE[0]:-$0}" ] && readlink -f "${BASH_SOURCE[0]:-$0}" || echo "${BASH_SOURCE[0]:-$0}"))" >/dev/null 2>&1 ; pwd -P )"; - -# Create gradle wrapper dir -mkdir -p "$working_dir/gradle/wrapper" - -if [ ! -f "$working_dir/gradle/wrapper/gradle-wrapper.jar" ]; then - cp "$script_dir/gradle/wrapper/gradle-wrapper.jar" gradle/wrapper/gradle-wrapper.jar; -fi - -if [ ! -f "$working_dir/gradle/wrapper/gradle-wrapper.properties" ]; then - cp "$script_dir/gradle/wrapper/gradle-wrapper.properties" gradle/wrapper/gradle-wrapper.properties; -fi - -if [ ! -f "$working_dir/gradlew" ]; then - cp "$script_dir/gradlew" gradlew; -fi - -if [ ! -f "$working_dir/gradlew.bat" ]; then - cp "$script_dir/gradlew.bat" gradlew.bat; -fi - -echo "Copied Gradle Wrapper" diff --git a/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper.ts b/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper.ts new file mode 100644 index 000000000..4ca25c9e3 --- /dev/null +++ b/packages/type-safe-api/scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper.ts @@ -0,0 +1,25 @@ +/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. +SPDX-License-Identifier: Apache-2.0 */ +import * as fs from "fs"; +import * as path from "path"; + +const GRADLE_WRAPPER_DIR = "gradle/wrapper"; + +const copyFromScriptDir = (rootScriptDir: string, file: string) => { + if (!fs.existsSync(file)) { + fs.copyFileSync(path.join(rootScriptDir, "custom", "gradle-wrapper", file), file); + } +} + +export default async (_argv: string[], rootScriptDir: string) => { + // Create the gradle wrapper directory if it doesn't already exist + fs.mkdirSync(GRADLE_WRAPPER_DIR, { recursive: true }); + + // Copy the gradle wrapper files into the working directory + [ + path.join(GRADLE_WRAPPER_DIR, "gradle-wrapper.jar"), + path.join(GRADLE_WRAPPER_DIR, "gradle-wrapper.properties"), + "gradlew", + "gradlew.bat", + ].forEach((file) => copyFromScriptDir(rootScriptDir, file)); +}; diff --git a/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer b/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer deleted file mode 100755 index e9d27a994..000000000 --- a/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo "Copying Smithy Async Transformer..." - -working_dir=$(pwd) -script_dir="$( cd -- "$(dirname $([ -L "${BASH_SOURCE[0]:-$0}" ] && readlink -f "${BASH_SOURCE[0]:-$0}" || echo "${BASH_SOURCE[0]:-$0}"))" >/dev/null 2>&1 ; pwd -P )"; - -# Create smithy async transformer dir -mkdir -p "$working_dir/.smithy-async" - -if [ ! -f "$working_dir/.smithy-async/aws-pdk-smithy-async-transformer.jar" ]; then - cp "$script_dir/aws-pdk-smithy-async-transformer.jar" "$working_dir/.smithy-async/aws-pdk-smithy-async-transformer.jar"; -fi - -echo "Copied Smithy Async Transformer" diff --git a/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer.ts b/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer.ts new file mode 100644 index 000000000..a7863eaf3 --- /dev/null +++ b/packages/type-safe-api/scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer.ts @@ -0,0 +1,20 @@ +/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. +SPDX-License-Identifier: Apache-2.0 */ +import * as fs from "fs"; +import * as path from "path"; + +const SMITHY_ASYNC_DIR = ".smithy-async"; +const JAR_NAME = "aws-pdk-smithy-async-transformer.jar"; + +export default async (_argv: string[], rootScriptDir: string) => { + // Create the smithy transformer dir + fs.mkdirSync(SMITHY_ASYNC_DIR, { recursive: true }); + + // Copy the jar if it doesn't already exist + const sourceJarPath = path.join(rootScriptDir, "custom", "smithy-async-transformer", JAR_NAME); + const destinationJarPath = path.join(SMITHY_ASYNC_DIR, JAR_NAME); + + if (!fs.existsSync(destinationJarPath)) { + fs.copyFileSync(sourceJarPath, destinationJarPath); + } +}; diff --git a/packages/type-safe-api/scripts/type-safe-api/run.ts b/packages/type-safe-api/scripts/type-safe-api/run.ts index fa9f3224b..93e61bed1 100644 --- a/packages/type-safe-api/scripts/type-safe-api/run.ts +++ b/packages/type-safe-api/scripts/type-safe-api/run.ts @@ -4,6 +4,8 @@ import generateMockData from "./custom/mock-data/generate-mock-data"; import parseOpenapiSpec from "./parser/parse-openapi-spec"; import generate from "./generators/generate-next"; import generateAsyncapiSpec from "./custom/generate-asyncapi-spec/generate-asyncapi-spec"; +import copyGradleWrapper from "./custom/gradle-wrapper/copy-gradle-wrapper"; +import copyAsyncSmithyTransformer from "./custom/smithy-async-transformer/copy-transformer"; import * as path from "path"; interface SubCommandArgs { @@ -17,6 +19,8 @@ void (async () => { const argv = (subCommandArgs as any)._unknown as string[]; + const rootScriptDir = path.resolve(__dirname); + switch (subCommandArgs.command) { case "generate-mock-data": return await generateMockData(argv); @@ -25,7 +29,11 @@ void (async () => { case "generate-asyncapi-spec": return await generateAsyncapiSpec(argv); case "generate": - return await generate(argv, path.resolve(__dirname)); + return await generate(argv, rootScriptDir); + case "copy-gradle-wrapper": + return await copyGradleWrapper(argv, rootScriptDir); + case "copy-async-smithy-transformer": + return await copyAsyncSmithyTransformer(argv, rootScriptDir); default: throw new Error(`Unknown subcommand ${subCommandArgs.command}`); } diff --git a/packages/type-safe-api/src/project/codegen/components/utils.ts b/packages/type-safe-api/src/project/codegen/components/utils.ts index 434204282..edce075ba 100644 --- a/packages/type-safe-api/src/project/codegen/components/utils.ts +++ b/packages/type-safe-api/src/project/codegen/components/utils.ts @@ -43,8 +43,8 @@ export enum TypeSafeApiScript { GENERATE_NEXT = "type-safe-api generate", GENERATE_MOCK_DATA = "type-safe-api generate-mock-data", CLEAN_OPENAPI_GENERATED_CODE = "type-safe-api.clean-openapi-generated-code", - COPY_GRADLE_WRAPPER = "type-safe-api.copy-gradle-wrapper", - COPY_ASYNC_SMITHY_TRANSFORMER = "type-safe-api.copy-async-smithy-transformer", + COPY_GRADLE_WRAPPER = "type-safe-api copy-gradle-wrapper", + COPY_ASYNC_SMITHY_TRANSFORMER = "type-safe-api copy-async-smithy-transformer", GENERATE_ASYNCAPI_SPEC = "type-safe-api generate-asyncapi-spec", } diff --git a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap index 7b80c1edc..d97bd9951 100644 --- a/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap +++ b/packages/type-safe-api/test/project/__snapshots__/type-safe-api-project.test.ts.snap @@ -32089,7 +32089,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -34464,7 +34464,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -37417,7 +37417,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -43485,7 +43485,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -46145,7 +46145,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -50700,7 +50700,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -53367,7 +53367,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -57942,7 +57942,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -61216,7 +61216,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -67217,7 +67217,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -70780,7 +70780,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -76839,7 +76839,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -79518,7 +79518,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -84133,7 +84133,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -86793,7 +86793,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -91349,7 +91349,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", diff --git a/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap b/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap index 67cf50d7d..cf4a74e43 100644 --- a/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap +++ b/packages/type-safe-api/test/project/__snapshots__/type-safe-websocket-api-project.test.ts.snap @@ -8421,10 +8421,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -11498,10 +11498,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -13644,10 +13644,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -17459,10 +17459,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -20007,10 +20007,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -23842,10 +23842,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -26396,10 +26396,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -30212,10 +30212,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -32772,10 +32772,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -36647,10 +36647,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -39188,10 +39188,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -43004,10 +43004,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", diff --git a/packages/type-safe-api/test/project/model/__snapshots__/type-safe-api-model-project.test.ts.snap b/packages/type-safe-api/test/project/model/__snapshots__/type-safe-api-model-project.test.ts.snap index c86244718..4716d5bd3 100644 --- a/packages/type-safe-api/test/project/model/__snapshots__/type-safe-api-model-project.test.ts.snap +++ b/packages/type-safe-api/test/project/model/__snapshots__/type-safe-api-model-project.test.ts.snap @@ -741,7 +741,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -1158,7 +1158,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -1581,7 +1581,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -1999,7 +1999,7 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", diff --git a/packages/type-safe-api/test/project/model/__snapshots__/type-safe-websocket-api-model-project.test.ts.snap b/packages/type-safe-api/test/project/model/__snapshots__/type-safe-websocket-api-model-project.test.ts.snap index c19a78d47..5185be91f 100644 --- a/packages/type-safe-api/test/project/model/__snapshots__/type-safe-websocket-api-model-project.test.ts.snap +++ b/packages/type-safe-api/test/project/model/__snapshots__/type-safe-websocket-api-model-project.test.ts.snap @@ -673,10 +673,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", @@ -1186,10 +1186,10 @@ smithy-output "name": "generate", "steps": [ { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-async-smithy-transformer", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-async-smithy-transformer", }, { - "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api.copy-gradle-wrapper", + "exec": "npx --yes -p @aws/pdk@$AWS_PDK_VERSION type-safe-api copy-gradle-wrapper", }, { "exec": "./gradlew build", diff --git a/projenrc/projects/type-safe-api-project.ts b/projenrc/projects/type-safe-api-project.ts index 9642efd95..922ac5f2a 100644 --- a/projenrc/projects/type-safe-api-project.ts +++ b/projenrc/projects/type-safe-api-project.ts @@ -71,10 +71,8 @@ export class TypeSafeApiProject extends PDKProject { "scripts/type-safe-api/generators/generate", "scripts/type-safe-api/run.js", "scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", "scripts/type-safe-api/custom/gradle-wrapper/gradlew", "scripts/type-safe-api/custom/gradle-wrapper/gradlew.bat", - "scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer", ], }, bin: { @@ -82,10 +80,6 @@ export class TypeSafeApiProject extends PDKProject { "type-safe-api.generate": "scripts/type-safe-api/generators/generate", "type-safe-api.clean-openapi-generated-code": "scripts/type-safe-api/custom/clean-openapi-generated-code/clean-openapi-generated-code", - "type-safe-api.copy-gradle-wrapper": - "scripts/type-safe-api/custom/gradle-wrapper/copy-gradle-wrapper", - "type-safe-api.copy-async-smithy-transformer": - "scripts/type-safe-api/custom/smithy-async-transformer/copy-transformer", }, });