[WIP] feat: move source files to "src" folder

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CodegenUtils.java

@@ -36,6 +36,8 @@
 @SmithyUnstableApi
 public final class CodegenUtils {
 
+    public static final String SOURCE_FOLDER = "src";
+
     private CodegenUtils() {}
 
     /**

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CodegenVisitor.java

@@ -236,7 +236,7 @@ void execute() {
             String baseName = protocol.getName().toLowerCase(Locale.US)
                     .replace("-", "_")
                     .replace(".", "_");
-            String protocolTestFileName = String.format("tests/functional/%s.spec.ts", baseName);
+            String protocolTestFileName = String.format("test/functional/%s.spec.ts", baseName);
             context.setDeferredWriter(() -> writers.checkoutFileWriter(protocolTestFileName));
             protocolGenerator.generateProtocolTests(context);
         }
@@ -373,7 +373,8 @@ public Void serviceShape(ServiceShape shape) {
 
         if (protocolGenerator != null) {
             LOGGER.info("Generating serde for protocol " + protocolGenerator.getName() + " on " + shape.getId());
-            String fileName = "protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()) + ".ts";
+            String fileName = CodegenUtils.SOURCE_FOLDER + "/protocols/"
+                    + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()) + ".ts";
             writers.useFileWriter(fileName, writer -> {
                 ProtocolGenerator.GenerationContext context = new ProtocolGenerator.GenerationContext();
                 context.setProtocolName(protocolGenerator.getName());

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CommandGenerator.java

@@ -295,7 +295,8 @@ private void writeSerdeDispatcher(boolean isInput) {
                     ? ProtocolGenerator.getSerFunctionName(symbol, protocolGenerator.getName())
                     : ProtocolGenerator.getDeserFunctionName(symbol, protocolGenerator.getName());
             writer.addImport(serdeFunctionName, serdeFunctionName,
-                             "./protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
+                "./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+                + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
             writer.write("return $L($L, context);", serdeFunctionName, isInput ? "input" : "output");
         }
     }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/HttpProtocolTestGenerator.java

@@ -89,7 +89,7 @@
 public final class HttpProtocolTestGenerator implements Runnable {
 
     private static final Logger LOGGER = Logger.getLogger(HttpProtocolTestGenerator.class.getName());
-    private static final String TEST_CASE_FILE_TEMPLATE = "tests/functional/%s.spec.ts";
+    private static final String TEST_CASE_FILE_TEMPLATE = "test/functional/%s.spec.ts";
 
     private final TypeScriptSettings settings;
     private final Model model;

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/IndexGenerator.java

@@ -61,7 +61,7 @@ static void writeIndex(
 
         // write export statement for models
         writer.write("export * from \"./models/index\";");
-        fileManifest.writeFile("index.ts", writer.toString());
+        fileManifest.writeFile(CodegenUtils.SOURCE_FOLDER + "/index.ts", writer.toString());
     }
 
     private static void writeProtocolExports(ProtocolGenerator protocolGenerator, TypeScriptWriter writer) {
@@ -115,26 +115,29 @@ private static void writeClientExports(
             writer.write("export * from \"./commands/" + symbolProvider.toSymbol(operation).getName() + "\";");
             if (operation.hasTrait(PaginatedTrait.ID)) {
                 hasPaginatedOperation = true;
-                String modulePath = PaginationGenerator.getOutputFilelocation(operation);
-                writer.write("export * from \"./$L\";", modulePath.replace(".ts", ""));
+                String modulePath = PaginationGenerator.getOutputFilelocation(operation)
+                    .replaceFirst(CodegenUtils.SOURCE_FOLDER, "");
+                writer.write("export * from \".$L\";", modulePath.replace(".ts", ""));
             }
             if (operation.hasTrait(WaitableTrait.ID)) {
                 WaitableTrait waitableTrait = operation.expectTrait(WaitableTrait.class);
                 waitableTrait.getWaiters().forEach((String waiterName, Waiter waiter) -> {
-                    String modulePath = WaiterGenerator.getOutputFileLocation(waiterName);
-                    writer.write("export * from \"./$L\";", modulePath.replace(".ts", ""));
+                    String modulePath = WaiterGenerator.getOutputFileLocation(waiterName)
+                        .replaceFirst(CodegenUtils.SOURCE_FOLDER, "");
+                    writer.write("export * from \".$L\";", modulePath.replace(".ts", ""));
                 });
             }
         }
         if (hasPaginatedOperation) {
-            String modulePath = PaginationGenerator.PAGINATION_INTERFACE_FILE;
-            writer.write("export * from \"./$L\";", modulePath.replace(".ts", ""));
+            String modulePath = PaginationGenerator.PAGINATION_INTERFACE_FILE
+                .replaceFirst(CodegenUtils.SOURCE_FOLDER, "");
+            writer.write("export * from \".$L\";", modulePath.replace(".ts", ""));
         }
 
         // Write each custom export.
         for (TypeScriptIntegration integration : integrations) {
             integration.writeAdditionalExports(settings, model, symbolProvider, writer);
         }
-        fileManifest.writeFile("index.ts", writer.toString());
+        fileManifest.writeFile(CodegenUtils.SOURCE_FOLDER + "/index.ts", writer.toString());
     }
 }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/LanguageTarget.java

@@ -68,6 +68,6 @@ String getTemplateFileName() {
     abstract String getTemplateFileName();
 
     String getTargetFilename() {
-        return getTemplateFileName().replace(".template", "");
+        return CodegenUtils.SOURCE_FOLDER + "/" + getTemplateFileName().replace(".template", "");
     }
 }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java

@@ -57,10 +57,10 @@ static void writePackageJson(
         if (settings.generateClient()) {
             // Add the Node vs Browser hook.
             node = node.withMember("browser", Node.objectNode()
-                    .withMember("./runtimeConfig", "./runtimeConfig.browser"));
+                    .withMember("./dist-es/runtimeConfig", "./dist-es/runtimeConfig.browser"));
             // Add the ReactNative hook.
             node = node.withMember("react-native", Node.objectNode()
-                    .withMember("./runtimeConfig", "./runtimeConfig.native"));
+                    .withMember("./dist-es/runtimeConfig", "./dist-es/runtimeConfig.native"));
         }
 
         // Set the package to private if required.

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PaginationGenerator.java

@@ -30,7 +30,7 @@
 @SmithyInternalApi
 final class PaginationGenerator implements Runnable {
 
-    static final String PAGINATION_INTERFACE_FILE = "pagination/Interfaces.ts";
+    static final String PAGINATION_INTERFACE_FILE = CodegenUtils.SOURCE_FOLDER + "/pagination/Interfaces.ts";
 
     private final TypeScriptWriter writer;
     private final PaginationInfo paginatedInfo;
@@ -89,9 +89,7 @@ public void run() {
                 outputSymbol.getNamespace());
         String nonModularLocation = serviceSymbol.getNamespace()
                 .replace(serviceSymbol.getName(), nonModularServiceName);
-        writer.addImport(nonModularServiceName,
-                nonModularServiceName,
-                nonModularLocation);
+        writer.addImport(nonModularServiceName, nonModularServiceName, nonModularLocation);
         writer.addImport(serviceSymbol.getName(), serviceSymbol.getName(), serviceSymbol.getNamespace());
 
         // Import Pagination types
@@ -104,7 +102,7 @@ public void run() {
     }
 
     static String getOutputFilelocation(OperationShape operation) {
-        return "pagination/" + operation.getId().getName() + "Paginator.ts";
+        return CodegenUtils.SOURCE_FOLDER + "/pagination/" + operation.getId().getName() + "Paginator.ts";
     }
 
     static void generateServicePaginationInterfaces(

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGenerator.java

@@ -179,7 +179,8 @@ final class RuntimeConfigGenerator {
     void generate(LanguageTarget target) {
         String template = TypeScriptUtils.loadResourceAsString(target.getTemplateFileName());
         String contents = template
-                .replace("${clientModuleName}", symbolProvider.toSymbol(service).getNamespace())
+                .replace("${clientModuleName}", symbolProvider.toSymbol(service).getNamespace()
+                    .replaceFirst(CodegenUtils.SOURCE_FOLDER + "/", ""))
                 .replace("${clientConfigName}", symbolProvider.toSymbol(service).getName() + "Config")
                 .replace("${apiVersion}", service.getVersion())
                 .replace("$", "$$") // sanitize template place holders.

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/ServiceGenerator.java

@@ -92,7 +92,8 @@ static String getResolvedConfigTypeName(Symbol symbol) {
     @Override
     public void run() {
         writer.addImport("Client", "__Client", "@aws-sdk/smithy-client");
-        writer.addImport("getRuntimeConfig", "__getRuntimeConfig", "./runtimeConfig");
+        writer.addImport("getRuntimeConfig", "__getRuntimeConfig",
+                "./" + CodegenUtils.SOURCE_FOLDER + "/runtimeConfig");
 
         // Normalize the input and output types of the command to account for
         // things like an operation adding input where there once wasn't any

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/SymbolVisitor.java

@@ -407,8 +407,10 @@ private Symbol.Builder createSymbolBuilder(Shape shape, String typeName, String
     }
 
     private Symbol.Builder createGeneratedSymbolBuilder(Shape shape, String typeName, String namespace) {
-        return createSymbolBuilder(shape, typeName, namespace)
-                .definitionFile(toFilename(namespace));
+        String prefixedNamespace = "./" + CodegenUtils.SOURCE_FOLDER
+            + (namespace.startsWith(".") ? namespace.substring(1) : namespace);
+        return createSymbolBuilder(shape, typeName, prefixedNamespace)
+                .definitionFile(toFilename(prefixedNamespace));
     }
 
     private String toFilename(String namespace) {
@@ -421,7 +423,7 @@ private String toFilename(String namespace) {
      */
     static final class ModuleNameDelegator {
         static final int DEFAULT_CHUNK_SIZE = 300;
-        static final String SHAPE_NAMESPACE_PREFIX = "./models/";
+        static final String SHAPE_NAMESPACE_PREFIX = "/models/";
 
         private final Map<Shape, String> visitedModels = new HashMap<>();
         private int bucketCount = 0;
@@ -442,7 +444,7 @@ public String formatModuleName(Shape shape, String name) {
                 return visitedModels.get(shape);
             }
             // Add models into buckets no bigger than chunk size.
-            String path = SHAPE_NAMESPACE_PREFIX + "models_" + bucketCount;
+            String path = "." + SHAPE_NAMESPACE_PREFIX + "models_" + bucketCount;
             visitedModels.put(shape, path);
             currentBucketSize++;
             if (currentBucketSize == chunkSize) {
@@ -454,14 +456,15 @@ public String formatModuleName(Shape shape, String name) {
 
         static void writeModelIndex(Model model, SymbolProvider symbolProvider, FileManifest fileManifest) {
             TypeScriptWriter writer = new TypeScriptWriter("");
+            String modelPrefix = "./" + CodegenUtils.SOURCE_FOLDER + SHAPE_NAMESPACE_PREFIX;
             model.shapes()
                     .map(shape -> symbolProvider.toSymbol(shape).getNamespace())
-                    .filter(namespace -> namespace.startsWith(SHAPE_NAMESPACE_PREFIX))
+                    .filter(namespace -> namespace.startsWith(modelPrefix))
                     .distinct()
                     .sorted(Comparator.naturalOrder())
                     .forEach(namespace -> writer.write(
-                        "export * from $S;", namespace.replaceFirst(SHAPE_NAMESPACE_PREFIX, "./")));
-            fileManifest.writeFile("models/index.ts", writer.toString());
+                        "export * from $S;", namespace.replaceFirst(modelPrefix, "./")));
+            fileManifest.writeFile(CodegenUtils.SOURCE_FOLDER + "/models/index.ts", writer.toString());
         }
     }
 }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDelegator.java

@@ -89,7 +89,11 @@ List<SymbolDependency> getDependencies() {
     void useShapeWriter(Shape shape, SymbolProvider provider, Consumer<TypeScriptWriter> writerConsumer) {
         // Checkout/create the appropriate writer for the shape.
         Symbol symbol = provider.toSymbol(shape);
-        TypeScriptWriter writer = checkoutWriter(symbol.getDefinitionFile());
+        String fileName = symbol.getDefinitionFile();
+        if (!fileName.startsWith("./" + CodegenUtils.SOURCE_FOLDER)) {
+            fileName = "./" + CodegenUtils.SOURCE_FOLDER + "/" + fileName;
+        }
+        TypeScriptWriter writer = checkoutWriter(fileName);
 
         // Add any needed DECLARE symbols.
         writer.addImportReferences(symbol, SymbolReference.ContextOption.DECLARE);

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/WaiterGenerator.java

@@ -64,7 +64,7 @@ public void run() {
     }
 
     public static String getOutputFileLocation(String waiterName) {
-        return  "waiters/waitFor" + waiterName + ".ts";
+        return CodegenUtils.SOURCE_FOLDER + "/waiters/waitFor" + waiterName + ".ts";
     }
 
     private void generateWaiter() {

smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json

@@ -9,20 +9,14 @@
     "build:es": "tsc -p tsconfig.es.json",
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "yarn clean:dist && yarn clean:docs",
-    "clean:dist": "rimraf ./dist",
+    "clean:dist": "rimraf ./dist-*",
     "clean:docs": "rimraf ./docs",
-    "downlevel-dts": "downlevel-dts dist/types dist/types/ts3.4",
+    "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4",
     "test": "jest --coverage --passWithNoTests"
   },
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/types/index.d.ts",
-  "module": "./dist/es/index.js",
-  "browser": {
-    "./runtimeConfig": "./runtimeConfig.browser"
-  },
-  "react-native": {
-    "./runtimeConfig": "./runtimeConfig.native"
-  },
+  "main": "./dist-cjs/index.js",
+  "types": "./dist-types/index.d.ts",
+  "module": "./dist-es/index.js",
   "sideEffects": false,
   "dependencies": {
     "tslib": "^2.3.0"
@@ -40,7 +34,7 @@
   },
   "typesVersions": {
     "<4.0": {
-      "dist/types/*": ["dist/types/ts3.4/*"]
+      "dist-types/*": ["dist-types/ts3.4/*"]
     }
   }
 }

smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/tsconfig.es.json

@@ -12,6 +12,6 @@
       "es2015.iterable",
       "es2015.symbol.wellknown"
     ],
-    "outDir": "dist/es"
+    "outDir": "dist-es"
   }
 }

smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "rootDir": "./src",
     "alwaysStrict": true,
     "target": "ES2018",
     "module": "commonjs",
@@ -11,7 +12,7 @@
     "incremental": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "outDir": "dist/cjs",
+    "outDir": "dist-cjs",
     "removeComments": true
   },
   "typedocOptions": {
@@ -33,5 +34,6 @@
     "out": "docs",
     "theme": "minimal",
     "plugin": ["@aws-sdk/client-documentation-generator"]
-  }
+  },
+  "exclude": ["test/**/*"]
 }

smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/tsconfig.types.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "removeComments": false,
     "declaration": true,
-    "declarationDir": "dist/types"
-  }
+    "declarationDir": "dist-types"
+  },
+  "exclude": ["test/**/*", "dist-types/**/*"]
 }

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/CodegenVisitorTest.java

@@ -37,15 +37,15 @@ public void generatesRuntimeConfigFiles() {
         // Did we generate the runtime config files?
         // note that asserting the contents of runtime config files is handled in its own unit tests.
         Assertions.assertTrue(manifest.hasFile("package.json"));
-        Assertions.assertTrue(manifest.hasFile("runtimeConfig.browser.ts"));
-        Assertions.assertTrue(manifest.hasFile("runtimeConfig.ts"));
-        Assertions.assertTrue(manifest.hasFile("index.ts"));
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.browser.ts"));
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/runtimeConfig.ts"));
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/index.ts"));
 
         // Does the package.json file point to the runtime config?
         String packageJsonContents = manifest.getFileString("package.json").get();
         ObjectNode packageJson = Node.parse(packageJsonContents).expectObjectNode();
-        assertThat(packageJson.expectObjectMember("browser").getStringMember("./runtimeConfig"),
-                   equalTo(Optional.of(Node.from("./runtimeConfig.browser"))));
+        assertThat(packageJson.expectObjectMember("browser").getStringMember("./dist-es/runtimeConfig"),
+                   equalTo(Optional.of(Node.from("./dist-es/runtimeConfig.browser"))));
     }
 
     @Test
@@ -69,8 +69,8 @@ public void decoratesSymbolProvider() {
 
         new TypeScriptCodegenPlugin().execute(context);
 
-        Assertions.assertTrue(manifest.hasFile("Foo.ts"));
-        assertThat(manifest.getFileString("Foo.ts").get(), containsString("export class Foo"));
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/Foo.ts"));
+        assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/Foo.ts").get(), containsString("export class Foo"));
     }
 
     @Test
@@ -91,12 +91,12 @@ public void generatesServiceClients() {
                 .build();
         new TypeScriptCodegenPlugin().execute(context);
 
-        Assertions.assertTrue(manifest.hasFile("Example.ts"));
-        assertThat(manifest.getFileString("Example.ts").get(),
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/Example.ts"));
+        assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/Example.ts").get(),
                    containsString("export class Example extends ExampleClient"));
 
-        Assertions.assertTrue(manifest.hasFile("ExampleClient.ts"));
-        assertThat(manifest.getFileString("ExampleClient.ts").get(), containsString("export class ExampleClient"));
+        Assertions.assertTrue(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/ExampleClient.ts"));
+        assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/ExampleClient.ts").get(), containsString("export class ExampleClient"));
     }
 
     @Test

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/CommandGeneratorTest.java

@@ -58,7 +58,7 @@ private void testCommmandCodegen(String file, String expectedType) {
                 .build();
 
         new TypeScriptCodegenPlugin().execute(context);
-        String contents = manifest.getFileString("/commands/GetFooCommand.ts").get();
+        String contents = manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "//commands/GetFooCommand.ts").get();
 
         assertThat(contents, containsString("as __MetadataBearer"));
         assertThat(contents, containsString(expectedType));

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/IndexGeneratorTest.java

@@ -39,7 +39,7 @@ public void writeAdditionalExports(
 
         IndexGenerator.writeIndex(settings, model, symbolProvider, manifest, integrations, null);
 
-        String contents = manifest.getFileString("index.ts").get();
+        String contents = manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/index.ts").get();
         assertThat(contents, containsString("export * from \"./Example\";"));
         assertThat(contents, containsString("export * from \"./ExampleClient\";"));
         assertThat(contents, containsString("export * from \"./commands/GetFooCommand\";"));