chore: fix inliner

Author: kuhe

packages/karma-credential-loader/src/index.ts

@@ -1,5 +1,5 @@
 import { defaultProvider as credentialProvider } from "@aws-sdk/credential-provider-node";
-import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients";
+import { getDefaultRoleAssumer, getDefaultRoleAssumerWithWebIdentity } from "@aws-sdk/nested-clients/sts";
 
 // Preprocessor needs to be a function
 function createCredentialPreprocessor() {

packages/nested-clients/package.json

@@ -95,5 +95,21 @@
     "type": "git",
     "url": "https://github.com/aws/aws-sdk-js-v3.git",
     "directory": "packages/nested-clients"
+  },
+  "exports": {
+    "./sso-oidc": {
+      "module": "./dist-es/submodules/sso-oidc/index.js",
+      "node": "./dist-cjs/submodules/sso-oidc/index.js",
+      "import": "./dist-es/submodules/sso-oidc/index.js",
+      "require": "./dist-cjs/submodules/sso-oidc/index.js",
+      "types": "./dist-types/submodules/sso-oidc/index.d.ts"
+    },
+    "./sts": {
+      "module": "./dist-es/submodules/sts/index.js",
+      "node": "./dist-cjs/submodules/sts/index.js",
+      "import": "./dist-es/submodules/sts/index.js",
+      "require": "./dist-cjs/submodules/sts/index.js",
+      "types": "./dist-types/submodules/sts/index.d.ts"
+    }
   }
 }

scripts/compilation/Inliner.js

@@ -183,15 +183,29 @@ module.exports = class Inliner {
     if (this.hasSubmodules) {
       const submodules = fs.readdirSync(path.join(root, this.subfolder, this.package, "src", "submodules"));
       for (const submodule of submodules) {
-        fs.rmSync(path.join(path.join(root, this.subfolder, this.package, "dist-cjs", "submodules", submodule)), {
-          recursive: true,
-          force: true,
-        });
         if (
           !fs.lstatSync(path.join(root, this.subfolder, this.package, "src", "submodules", submodule)).isDirectory()
         ) {
           continue;
         }
+
+        // remove invariant files.
+        for await (const file of walk(
+          path.join(root, this.subfolder, this.package, "dist-cjs", "submodules", submodule)
+        )) {
+          const stat = fs.lstatSync(file);
+          if (this.variantExternals.find((ext) => file.endsWith(ext))) {
+            continue;
+          }
+          if (stat.isDirectory()) {
+            if (fs.readdirSync(file).length === 0) {
+              fs.rmdirSync(file);
+            }
+          } else {
+            fs.rmSync(file);
+          }
+        }
+
         await esbuild.build({
           ...buildOptions,
           entryPoints: [path.join(root, this.subfolder, this.package, "src", "submodules", submodule, "index.ts")],
@@ -272,21 +286,32 @@ module.exports = class Inliner {
       return this;
     }
     this.indexContents = fs.readFileSync(this.outfile, "utf-8");
-    for (const variant of Object.keys(this.variantMap)) {
-      const basename = path.basename(variant).replace(/.js$/, "");
-      const dirname = path.dirname(variant);
+    const fixImportsForFile = (contents, remove = "") => {
+      for (const variant of Object.keys(this.variantMap)) {
+        const basename = path.basename(variant).replace(/.js$/, "");
+        const dirname = path.dirname(variant);
 
-      const find = new RegExp(`require\\("\\.(.*?)/${basename}"\\)`, "g");
-      const replace = `require("./${dirname}/${basename}")`;
+        const find = new RegExp(`require\\("\\.(.*?)/${basename}"\\)`, "g");
+        const replace = `require("./${dirname}/${basename}")`.replace(remove, "");
 
-      this.indexContents = this.indexContents.replace(find, replace);
+        contents = contents.replace(find, replace);
 
-      if (this.verbose) {
-        console.log("Replacing", find, "with", replace);
+        if (this.verbose) {
+          console.log("Replacing", find, "with", replace, "removed=", remove);
+        }
       }
-    }
-
+      return contents;
+    };
+    this.indexContents = fixImportsForFile(this.indexContents);
     fs.writeFileSync(this.outfile, this.indexContents, "utf-8");
+    if (this.hasSubmodules) {
+      const submodules = fs.readdirSync(path.join(path.dirname(this.outfile), "submodules"));
+      for (const submodule of submodules) {
+        const submoduleIndexPath = path.join(path.dirname(this.outfile), "submodules", submodule, "index.js");
+        const submoduleIndexContents = fs.readFileSync(submoduleIndexPath, "utf-8");
+        fs.writeFileSync(submoduleIndexPath, fixImportsForFile(submoduleIndexContents, `/submodules/${submodule}`));
+      }
+    }
     return this;
   }
 
@@ -376,19 +401,34 @@ module.exports = class Inliner {
         .map((variant) => path.basename(variant).replace(/.js$/, ""))
     );
 
-    for (const line of this.indexContents.split("\n")) {
-      // we expect to see a line with require() and the variant external in it
-      if (line.includes("require(")) {
-        const checkOrder = [...externalsToCheck].sort().reverse();
-        for (const external of checkOrder) {
-          if (line.includes(external)) {
-            if (this.verbose) {
-              console.log("Inline index confirmed require() for variant external:", external);
+    const inspect = (contents) => {
+      for (const line of contents.split("\n")) {
+        // we expect to see a line with require() and the variant external in it
+        if (line.includes("require(")) {
+          const checkOrder = [...externalsToCheck].sort().reverse();
+          for (const external of checkOrder) {
+            if (line.includes(external)) {
+              if (this.verbose) {
+                console.log("Inline index confirmed require() for variant external:", external);
+              }
+              externalsToCheck.delete(external);
             }
-            externalsToCheck.delete(external);
           }
         }
       }
+    };
+
+    inspect(this.indexContents);
+
+    if (this.hasSubmodules) {
+      const submodules = fs.readdirSync(path.join(path.dirname(this.outfile), "submodules"));
+      for (const submodule of submodules) {
+        const submoduleIndexContents = fs.readFileSync(
+          path.join(path.dirname(this.outfile), "submodules", submodule, "index.js"),
+          "utf-8"
+        );
+        inspect(submoduleIndexContents);
+      }
     }
 
     if (externalsToCheck.size) {

scripts/runtime-dependency-version-check/package-json-enforcement.js

@@ -1,4 +1,3 @@
-const { error } = require("console");
 const fs = require("fs");
 
 /**
@@ -20,7 +19,7 @@ const fs = require("fs");
  * - when react-native has file replacement directives, it must include both
  *   CJS and ESM dist replacements.
  *
- * - exports must not be defined unless the package name is core.
+ * - exports must not be defined unless the package name is core or nested-clients.
  */
 module.exports = function (pkgJsonFilePath, overwrite = false) {
   const errors = [];