@aws-sdk/util-user-agent-node 3.973.0 → 3.973.1

package/dist-cjs/index.js

@@ -16,18 +16,31 @@ const getRuntimeUserAgentPair = () => {
     return ["md/nodejs", node_process.versions.node];
 };
 
-const getTypeScriptPackageJsonPath = (dirname = "") => {
-    let nodeModulesPath;
+const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/;
+const getSanitizedTypeScriptVersion = (version = "") => {
+    const match = version.match(SEMVER_REGEX);
+    if (!match) {
+        return undefined;
+    }
+    const [major, minor, patch, prerelease] = [match[1], match[2], match[3], match[4]];
+    return prerelease ? `${major}.${minor}.${patch}-${prerelease}` : `${major}.${minor}.${patch}`;
+};
+
+const typescriptPackageJsonPath = node_path.join("node_modules", "typescript", "package.json");
+const getTypeScriptPackageJsonPaths = (dirname) => {
+    const cwdPath = node_path.join(process.cwd(), typescriptPackageJsonPath);
+    if (!dirname) {
+        return [cwdPath];
+    }
     const normalizedPath = node_path.normalize(dirname);
     const parts = normalizedPath.split(node_path.sep);
     const nodeModulesIndex = parts.indexOf("node_modules");
-    if (nodeModulesIndex !== -1) {
-        nodeModulesPath = parts.slice(0, nodeModulesIndex).join(node_path.sep);
+    const parentDir = nodeModulesIndex !== -1 ? parts.slice(0, nodeModulesIndex).join(node_path.sep) : dirname;
+    const parentDirPath = node_path.join(parentDir, typescriptPackageJsonPath);
+    if (cwdPath === parentDirPath) {
+        return [cwdPath];
     }
-    else {
-        nodeModulesPath = dirname;
-    }
-    return node_path.join(nodeModulesPath, "node_modules", "typescript", "package.json");
+    return [parentDirPath, cwdPath];
 };
 
 let tscVersion;
@@ -38,19 +51,23 @@ const getTypeScriptUserAgentPair = async () => {
     else if (typeof tscVersion === "string") {
         return ["md/tsc", tscVersion];
     }
-    try {
-        const packageJson = await promises.readFile(getTypeScriptPackageJsonPath(__dirname), "utf-8");
-        const { version } = JSON.parse(packageJson);
-        if (typeof version !== "string") {
-            tscVersion = null;
-            return undefined;
+    const dirname = typeof __dirname !== "undefined" ? __dirname : undefined;
+    for (const typescriptPackageJsonPath of getTypeScriptPackageJsonPaths(dirname)) {
+        try {
+            const packageJson = await promises.readFile(typescriptPackageJsonPath, "utf-8");
+            const { version } = JSON.parse(packageJson);
+            const sanitizedVersion = getSanitizedTypeScriptVersion(version);
+            if (typeof sanitizedVersion !== "string") {
+                continue;
+            }
+            tscVersion = sanitizedVersion;
+            return ["md/tsc", tscVersion];
+        }
+        catch {
         }
-        tscVersion = version;
-        return ["md/tsc", tscVersion];
-    }
-    catch {
-        tscVersion = null;
     }
+    tscVersion = null;
+    return undefined;
 };
 
 const crtAvailability = {

package/dist-es/getSanitizedTypeScriptVersion.js

@@ -0,0 +1,9 @@
+const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/;
+export const getSanitizedTypeScriptVersion = (version = "") => {
+    const match = version.match(SEMVER_REGEX);
+    if (!match) {
+        return undefined;
+    }
+    const [major, minor, patch, prerelease] = [match[1], match[2], match[3], match[4]];
+    return prerelease ? `${major}.${minor}.${patch}-${prerelease}` : `${major}.${minor}.${patch}`;
+};

package/dist-es/getTypeScriptPackageJsonPaths.js

@@ -0,0 +1,17 @@
+import { join, normalize, sep } from "node:path";
+const typescriptPackageJsonPath = join("node_modules", "typescript", "package.json");
+export const getTypeScriptPackageJsonPaths = (dirname) => {
+    const cwdPath = join(process.cwd(), typescriptPackageJsonPath);
+    if (!dirname) {
+        return [cwdPath];
+    }
+    const normalizedPath = normalize(dirname);
+    const parts = normalizedPath.split(sep);
+    const nodeModulesIndex = parts.indexOf("node_modules");
+    const parentDir = nodeModulesIndex !== -1 ? parts.slice(0, nodeModulesIndex).join(sep) : dirname;
+    const parentDirPath = join(parentDir, typescriptPackageJsonPath);
+    if (cwdPath === parentDirPath) {
+        return [cwdPath];
+    }
+    return [parentDirPath, cwdPath];
+};

package/dist-es/getTypeScriptUserAgentPair.js

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
-import { getTypeScriptPackageJsonPath } from "./getTypeScriptPackageJsonPath";
+import { getSanitizedTypeScriptVersion } from "./getSanitizedTypeScriptVersion";
+import { getTypeScriptPackageJsonPaths } from "./getTypeScriptPackageJsonPaths";
 let tscVersion;
 export const getTypeScriptUserAgentPair = async () => {
     if (tscVersion === null) {
@@ -8,17 +9,21 @@ export const getTypeScriptUserAgentPair = async () => {
     else if (typeof tscVersion === "string") {
         return ["md/tsc", tscVersion];
     }
-    try {
-        const packageJson = await readFile(getTypeScriptPackageJsonPath(__dirname), "utf-8");
-        const { version } = JSON.parse(packageJson);
-        if (typeof version !== "string") {
-            tscVersion = null;
-            return undefined;
+    const dirname = typeof __dirname !== "undefined" ? __dirname : undefined;
+    for (const typescriptPackageJsonPath of getTypeScriptPackageJsonPaths(dirname)) {
+        try {
+            const packageJson = await readFile(typescriptPackageJsonPath, "utf-8");
+            const { version } = JSON.parse(packageJson);
+            const sanitizedVersion = getSanitizedTypeScriptVersion(version);
+            if (typeof sanitizedVersion !== "string") {
+                continue;
+            }
+            tscVersion = sanitizedVersion;
+            return ["md/tsc", tscVersion];
+        }
+        catch {
         }
-        tscVersion = version;
-        return ["md/tsc", tscVersion];
-    }
-    catch {
-        tscVersion = null;
     }
+    tscVersion = null;
+    return undefined;
 };

package/dist-types/getSanitizedTypeScriptVersion.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Validates a semver string (with optional pre-release and/or build metadata).
+ * If valid, returns the version string with build metadata stripped.
+ * Returns undefined if the string is not a valid semver.
+ *
+ * @internal
+ */
+export declare const getSanitizedTypeScriptVersion: (version?: string) => string | undefined;

package/dist-types/getTypeScriptPackageJsonPaths.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Returns candidate paths to the TypeScript package.json file derived from the current
+ * working directory and, if provided, from the given directory.
+ *
+ * @param dirname - Optional directory path to derive an additional candidate path from.
+ * @returns An array of unique candidate paths to the TypeScript package.json file.
+ *
+ * @internal
+ */
+export declare const getTypeScriptPackageJsonPaths: (dirname?: string) => string[];

package/dist-types/ts3.4/getSanitizedTypeScriptVersion.d.ts

@@ -0,0 +1,3 @@
+export declare const getSanitizedTypeScriptVersion: (
+  version?: string
+) => string | undefined;

package/dist-types/ts3.4/getTypeScriptPackageJsonPaths.d.ts

@@ -0,0 +1,3 @@
+export declare const getTypeScriptPackageJsonPaths: (
+  dirname?: string
+) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/util-user-agent-node",
-  "version": "3.973.0",
+  "version": "3.973.1",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline util-user-agent-node",
@@ -24,7 +24,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-user-agent": "^3.972.15",
+    "@aws-sdk/middleware-user-agent": "^3.972.16",
     "@aws-sdk/types": "^3.973.4",
     "@smithy/node-config-provider": "^4.3.10",
     "@smithy/types": "^4.13.0",

package/dist-es/getTypeScriptPackageJsonPath.js

@@ -1,14 +0,0 @@
-import { join, normalize, sep } from "node:path";
-export const getTypeScriptPackageJsonPath = (dirname = "") => {
-    let nodeModulesPath;
-    const normalizedPath = normalize(dirname);
-    const parts = normalizedPath.split(sep);
-    const nodeModulesIndex = parts.indexOf("node_modules");
-    if (nodeModulesIndex !== -1) {
-        nodeModulesPath = parts.slice(0, nodeModulesIndex).join(sep);
-    }
-    else {
-        nodeModulesPath = dirname;
-    }
-    return join(nodeModulesPath, "node_modules", "typescript", "package.json");
-};

package/dist-types/getTypeScriptPackageJsonPath.d.ts

@@ -1,9 +0,0 @@
-/**
- * Returns the path to the TypeScript package.json file relative to the given directory.
- *
- * @param dirname - The directory path to resolve from.
- * @returns The path to the TypeScript package.json file.
- *
- * @internal
- */
-export declare const getTypeScriptPackageJsonPath: (dirname?: string) => string;

package/dist-types/ts3.4/getTypeScriptPackageJsonPath.d.ts

@@ -1 +0,0 @@
-export declare const getTypeScriptPackageJsonPath: (dirname?: string) => string;