fixup! Fix build and runtime issues in rush-sdk.

Author: iclanton

libraries/rush-sdk/package.json

@@ -29,6 +29,9 @@
     "*": {
       "loader": [
         "./dist/loader.d.ts"
+      ],
+      "lib/*": [
+        "lib-dts/*"
       ]
     }
   },

libraries/rush-sdk/src/generate-stubs.ts

@@ -1,69 +1,79 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
+import path from 'node:path';
+import type { IRunScriptOptions } from '@rushstack/heft';
 
-import { FileSystem, Import, Path } from '@rushstack/node-core-library';
+import { Async, AsyncQueue, FileSystem, type FolderItem, Import, Path } from '@rushstack/node-core-library';
 
-function generateLibFilesRecursively(options: {
-  parentSourcePath: string;
-  parentTargetPath: string;
-  parentSrcImportPathWithSlash: string;
-  libShimIndexPath: string;
-}): void {
-  for (const folderItem of FileSystem.readFolderItems(options.parentSourcePath)) {
-    const sourcePath: string = path.join(options.parentSourcePath, folderItem.name);
-    const targetPath: string = path.join(options.parentTargetPath, folderItem.name);
+const JS_FILE_EXTENSION: '.js' = '.js';
 
-    if (folderItem.isDirectory()) {
-      // create destination folder
-      FileSystem.ensureEmptyFolder(targetPath);
-      generateLibFilesRecursively({
-        parentSourcePath: sourcePath,
-        parentTargetPath: targetPath,
-        parentSrcImportPathWithSlash: options.parentSrcImportPathWithSlash + folderItem.name + '/',
-        libShimIndexPath: options.libShimIndexPath
-      });
-    } else {
-      if (folderItem.name.endsWith('.d.ts')) {
-        FileSystem.copyFile({
-          sourcePath: sourcePath,
-          destinationPath: targetPath
-        });
-      } else if (folderItem.name.endsWith('.js')) {
-        const srcImportPath: string = options.parentSrcImportPathWithSlash + path.parse(folderItem.name).name;
-        const shimPath: string = path.relative(options.parentTargetPath, options.libShimIndexPath);
-        const shimPathLiteral: string = JSON.stringify(Path.convertToSlashes(shimPath));
-        const srcImportPathLiteral: string = JSON.stringify(srcImportPath);
-
-        FileSystem.writeFile(
-          targetPath,
-          // Example:
-          // module.exports = require("../../../lib-shim/index")._rushSdk_loadInternalModule("logic/policy/GitEmailPolicy");
-          `module.exports = require(${shimPathLiteral})._rushSdk_loadInternalModule(${srcImportPathLiteral});`
-        );
-      }
+// Entry point invoked by "runScript" action from config/heft.json
+export async function runAsync(options: IRunScriptOptions): Promise<void> {
+  const {
+    heftConfiguration: { buildFolderPath },
+    heftTaskSession: {
+      logger: { terminal }
     }
-  }
-}
+  } = options;
 
-// Entry point invoked by "runScript" action from config/heft.json
-export async function runAsync(): Promise<void> {
   const rushLibFolder: string = Import.resolvePackage({
-    baseFolderPath: __dirname,
+    baseFolderPath: buildFolderPath,
     packageName: '@microsoft/rush-lib',
     useNodeJSResolver: true
   });
 
-  const stubsTargetPath: string = path.resolve(__dirname, '../lib');
-  // eslint-disable-next-line no-console
-  console.log('generate-stubs: Generating stub files under: ' + stubsTargetPath);
-  generateLibFilesRecursively({
-    parentSourcePath: path.join(rushLibFolder, 'lib'),
-    parentTargetPath: stubsTargetPath,
-    parentSrcImportPathWithSlash: '',
-    libShimIndexPath: path.join(__dirname, '../lib-shim/index')
-  });
-  // eslint-disable-next-line no-console
-  console.log('generate-stubs: Completed successfully.');
+  const inFolderPath: string = `${rushLibFolder}/lib-esm`;
+  const stubsTargetPath: string = `${buildFolderPath}/lib`;
+  const libShimsIndexPath: string = `${buildFolderPath}/lib-shim/index`;
+
+  terminal.writeLine(' Generating stub files under: ' + stubsTargetPath);
+
+  const folderPathQueue: AsyncQueue<string | undefined> = new AsyncQueue([undefined]);
+  await Async.forEachAsync(
+    folderPathQueue,
+    async ([relativeFolderPath, callback]) => {
+      let folderPath: string;
+      let targetFolderPath: string;
+      if (relativeFolderPath) {
+        folderPath = `${inFolderPath}/${relativeFolderPath}`;
+        targetFolderPath = `${stubsTargetPath}/${relativeFolderPath}`;
+      } else {
+        folderPath = inFolderPath;
+        targetFolderPath = stubsTargetPath;
+      }
+
+      const folderItems: FolderItem[] = await FileSystem.readFolderItemsAsync(folderPath);
+      for (const folderItem of folderItems) {
+        const itemName: string = folderItem.name;
+
+        if (folderItem.isDirectory()) {
+          const relativeItemPath: string = relativeFolderPath
+            ? `${relativeFolderPath}/${itemName}`
+            : itemName;
+          folderPathQueue.push(relativeItemPath);
+        } else if (folderItem.isFile() && itemName.endsWith(JS_FILE_EXTENSION)) {
+          const fileBaseName: string = path.parse(itemName).name;
+          const srcImportPath: string = relativeFolderPath
+            ? `${relativeFolderPath}/${fileBaseName}`
+            : fileBaseName;
+          const shimImportPath: string = path.relative(folderPath, libShimsIndexPath);
+
+          const shimPathLiteral: string = JSON.stringify(Path.convertToSlashes(shimImportPath));
+          const srcImportPathLiteral: string = JSON.stringify(srcImportPath);
+
+          FileSystem.writeFile(
+            `${targetFolderPath}/${itemName}`,
+            // Example:
+            // module.exports = require("../../../lib-shim/index")._rushSdk_loadInternalModule("logic/policy/GitEmailPolicy");
+            `module.exports = require(${shimPathLiteral})._rushSdk_loadInternalModule(${srcImportPathLiteral});`
+          );
+        }
+      }
+      callback();
+    },
+    { concurrency: 10 }
+  );
+
+  terminal.writeLine('Completed successfully.');
 }