chore: revert support for nested submodules

.projenrc.ts

@@ -59,6 +59,7 @@ const project = new CdklabsConstructLibrary({
     'fs-extra',
     'got',
     'JSONStream',
+    'jsii-reflect',
     'semver',
     'spdx-license-list',
     'streamx',

src/__tests__/backend/transliterator/transliterator.ecstask.test.ts

@@ -15,6 +15,7 @@ import { MarkdownDocument } from 'jsii-docgen/lib/docgen/render/markdown-doc';
 import { MarkdownRenderer } from 'jsii-docgen/lib/docgen/render/markdown-render';
 import { Documentation } from 'jsii-docgen/lib/docgen/view/documentation';
 
+import { Submodule } from 'jsii-reflect';
 import type { TransliteratorInput } from '../../../backend/payload-schema';
 import { reset } from '../../../backend/shared/aws.lambda-shared';
 import * as constants from '../../../backend/shared/constants';
@@ -93,6 +94,10 @@ describe('VPC Endpoints', () => {
           };
         }
       }
+
+      public async listSubmodules(): Promise<Submodule[]> {
+        return [];
+      }
     }
 
     forPackage.mockImplementation(async (_: string) => {
@@ -229,6 +234,9 @@ test('corrupt assembly marker is uploaded for the necessary languages', async ()
     public async toJson() {
       throw new CorruptedAssemblyError();
     }
+    public async listSubmodules(): Promise<Submodule[]> {
+      return [];
+    }
   }
 
   forPackage.mockImplementation(async (_: string) => {
@@ -286,6 +294,9 @@ test('corrupt assembly and uninstallable markers are deleted', async () => {
     public async toJson() {
       return new MarkdownDocument();
     }
+    public async listSubmodules(): Promise<Submodule[]> {
+      return [];
+    }
   }
 
   forPackage.mockImplementation(async (_: string) => {
@@ -392,14 +403,29 @@ test('uploads a file per language (scoped package)', async () => {
 });
 
 test('uploads a file per submodule (unscoped package)', async () => {
+  // GIVEN
+  const assembly: spec.Assembly = {
+    targets: { python: {} },
+    submodules: {
+      '@scope/package-name.sub1': {},
+      '@scope/package-name.sub2': {},
+    },
+  } as any;
+
+  const submodules: Submodule[] = Object.keys(assembly.submodules ?? {}).map(
+    (sm) => ({ name: sm.substring(sm.indexOf('.') + 1) } as any)
+  );
+
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   const forPackage = require('jsii-docgen').Documentation
     .forPackage as jest.MockedFunction<typeof Documentation.forPackage>;
   forPackage.mockImplementation(async (target: string) => {
-    return new MockDocumentation(target) as unknown as Documentation;
+    return new MockDocumentation(
+      target,
+      submodules
+    ) as unknown as Documentation;
   });
 
-  // GIVEN
   const packageName = 'package-name';
   const packageVersion = '1.2.3-dev.4';
   const event: TransliteratorInput = {
@@ -415,15 +441,6 @@ test('uploads a file per submodule (unscoped package)', async () => {
     languages: { typescript: true },
   };
 
-  const assembly: spec.Assembly = {
-    targets: { python: {} },
-    submodules: {
-      '@scope/package-name.sub1': {},
-      '@scope/package-name.sub2': {},
-      '@scope/package-name.sub2.nested': {},
-    },
-  } as any;
-
   // mock the s3ObjectExists call
   mockHeadRequest('package.tgz');
 
@@ -435,24 +452,22 @@ test('uploads a file per submodule (unscoped package)', async () => {
     '/docs-typescript.md',
     '/docs-sub1-typescript.md',
     '/docs-sub2-typescript.md',
-    '/docs-sub2.nested-typescript.md',
     '/docs-typescript.json',
     '/docs-sub1-typescript.json',
-    '/docs-sub2-typescript.json',
-    '/docs-sub2.nested-typescript.json'
+    '/docs-sub2-typescript.json'
   );
 
+  // WHEN
   const { created } = await handler(event);
 
+  // THEN
   expect(created).toEqual([
     `data/${packageName}/v${packageVersion}/docs-typescript.json`,
     `data/${packageName}/v${packageVersion}/docs-typescript.md`,
     `data/${packageName}/v${packageVersion}/docs-sub1-typescript.json`,
     `data/${packageName}/v${packageVersion}/docs-sub1-typescript.md`,
     `data/${packageName}/v${packageVersion}/docs-sub2-typescript.json`,
     `data/${packageName}/v${packageVersion}/docs-sub2-typescript.md`,
-    `data/${packageName}/v${packageVersion}/docs-sub2.nested-typescript.json`,
-    `data/${packageName}/v${packageVersion}/docs-sub2.nested-typescript.md`,
   ]);
 });
 
@@ -517,6 +532,12 @@ test.each([true, false])(
 
 describe('markers for un-supported languages', () => {
   test('uploads ".not-supported" markers as relevant', async () => {
+    // GIVEN
+    const assembly: spec.Assembly = {
+      targets: { phony: {} },
+      submodules: { 'package-name.sub1': {}, 'package-name.sub2': {} },
+    } as any;
+
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const forPackage = require('jsii-docgen').Documentation
       .forPackage as jest.MockedFunction<typeof Documentation.forPackage>;
@@ -525,13 +546,17 @@ describe('markers for un-supported languages', () => {
       public async toJson() {
         throw new LanguageNotSupportedError();
       }
+      public async listSubmodules(): Promise<Submodule[]> {
+        return Object.keys(assembly.submodules ?? {}).map(
+          (sm) => ({ name: sm.substring(sm.indexOf('.') + 1) } as any)
+        );
+      }
     }
 
     forPackage.mockImplementation(async (_: string) => {
       return new MockDocumentation() as unknown as Documentation;
     });
 
-    // GIVEN
     const packageName = 'package-name';
     const packageVersion = '1.2.3-dev.4';
 
@@ -549,11 +574,6 @@ describe('markers for un-supported languages', () => {
       languages: { python: true },
     };
 
-    const assembly: spec.Assembly = {
-      targets: { phony: {} },
-      submodules: { 'package-name.sub1': {}, 'package-name.sub2': {} },
-    } as any;
-
     // mock the s3ObjectExists call
     mockHeadRequest('package.tgz');
 
@@ -584,12 +604,18 @@ describe('markers for un-supported languages', () => {
 });
 
 class MockDocumentation {
-  public constructor(private readonly target: string) {}
+  public constructor(
+    private readonly target: string,
+    private readonly submodules?: Submodule[]
+  ) {}
   public async toJson() {
     return {
       render: () => `{ "content": "docs for ${this.target}" }`,
     };
   }
+  public async listSubmodules(): Promise<Submodule[]> {
+    return this.submodules ?? [];
+  }
 }
 
 function mockFetchRequests(assembly: spec.Assembly, tarball: Buffer) {

src/backend/transliterator/transliterator.ecstask.ts

@@ -107,8 +107,7 @@ export function handler(
       assemblyResponse.Body.toString('utf-8')
     ) as Assembly;
     const submodules = Object.keys(assembly.submodules ?? {}).map(
-      // Drop the first component, which is the name of the top-level module
-      (s) => s.split('.').slice(1).join('.')
+      (s) => s.split('.')[1]
     );
     console.log(
       `Assembly ${assembly.name} has ${submodules.length} submodules.`
@@ -302,7 +301,10 @@ export function handler(
               }
             }
             await renderAndDispatch();
-            for (const submodule of submodules) {
+            const submoduleNames = (await docs.listSubmodules()).map(
+              (sm) => sm.name
+            );
+            for (const submodule of submoduleNames) {
               await renderAndDispatch(submodule);
             }
           }