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

package/dist-cjs/index.js

@@ -1,17 +1,73 @@
 'use strict';
 
-var os = require('os');
-var process = require('process');
+var node_os = require('node:os');
+var node_process = require('node:process');
+var promises = require('node:fs/promises');
+var node_path = require('node:path');
 var middlewareUserAgent = require('@aws-sdk/middleware-user-agent');
 
 const getRuntimeUserAgentPair = () => {
     const runtimesToCheck = ["deno", "bun", "llrt"];
     for (const runtime of runtimesToCheck) {
-        if (process.versions[runtime]) {
-            return [`md/${runtime}`, process.versions[runtime]];
+        if (node_process.versions[runtime]) {
+            return [`md/${runtime}`, node_process.versions[runtime]];
         }
     }
-    return ["md/nodejs", process.versions.node];
+    return ["md/nodejs", node_process.versions.node];
+};
+
+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");
+    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];
+    }
+    return [parentDirPath, cwdPath];
+};
+
+let tscVersion;
+const getTypeScriptUserAgentPair = async () => {
+    if (tscVersion === null) {
+        return undefined;
+    }
+    else if (typeof tscVersion === "string") {
+        return ["md/tsc", tscVersion];
+    }
+    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 = null;
+    return undefined;
 };
 
 const crtAvailability = {
@@ -31,10 +87,14 @@ const createDefaultUserAgentProvider = ({ serviceId, clientVersion }) => {
         const sections = [
             ["aws-sdk-js", clientVersion],
             ["ua", "2.1"],
-            [`os/${os.platform()}`, os.release()],
+            [`os/${node_os.platform()}`, node_os.release()],
             ["lang/js"],
             runtimeUserAgentPair,
         ];
+        const typescriptUserAgentPair = await getTypeScriptUserAgentPair();
+        if (typescriptUserAgentPair) {
+            sections.push(typescriptUserAgentPair);
+        }
         const crtAvailable = isCrtAvailable();
         if (crtAvailable) {
             sections.push(crtAvailable);
@@ -42,8 +102,8 @@ const createDefaultUserAgentProvider = ({ serviceId, clientVersion }) => {
         if (serviceId) {
             sections.push([`api/${serviceId}`, clientVersion]);
         }
-        if (process.env.AWS_EXECUTION_ENV) {
-            sections.push([`exec-env/${process.env.AWS_EXECUTION_ENV}`]);
+        if (node_process.env.AWS_EXECUTION_ENV) {
+            sections.push([`exec-env/${node_process.env.AWS_EXECUTION_ENV}`]);
         }
         const appId = await config?.userAgentAppId?.();
         const resolvedUserAgent = appId ? [...sections, [`app/${appId}`]] : [...sections];

package/dist-es/defaultUserAgent.js

@@ -1,6 +1,7 @@
-import { platform, release } from "os";
-import { env } from "process";
+import { platform, release } from "node:os";
+import { env } from "node:process";
 import { getRuntimeUserAgentPair } from "./getRuntimeUserAgentPair";
+import { getTypeScriptUserAgentPair } from "./getTypeScriptUserAgentPair";
 import { isCrtAvailable } from "./is-crt-available";
 export { crtAvailability } from "./crt-availability";
 export const createDefaultUserAgentProvider = ({ serviceId, clientVersion }) => {
@@ -13,6 +14,10 @@ export const createDefaultUserAgentProvider = ({ serviceId, clientVersion }) =>
             ["lang/js"],
             runtimeUserAgentPair,
         ];
+        const typescriptUserAgentPair = await getTypeScriptUserAgentPair();
+        if (typescriptUserAgentPair) {
+            sections.push(typescriptUserAgentPair);
+        }
         const crtAvailable = isCrtAvailable();
         if (crtAvailable) {
             sections.push(crtAvailable);

package/dist-es/getRuntimeUserAgentPair.js

@@ -1,4 +1,4 @@
-import { versions } from "process";
+import { versions } from "node:process";
 export const getRuntimeUserAgentPair = () => {
     const runtimesToCheck = ["deno", "bun", "llrt"];
     for (const runtime of runtimesToCheck) {

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

@@ -0,0 +1,29 @@
+import { readFile } from "node:fs/promises";
+import { getSanitizedTypeScriptVersion } from "./getSanitizedTypeScriptVersion";
+import { getTypeScriptPackageJsonPaths } from "./getTypeScriptPackageJsonPaths";
+let tscVersion;
+export const getTypeScriptUserAgentPair = async () => {
+    if (tscVersion === null) {
+        return undefined;
+    }
+    else if (typeof tscVersion === "string") {
+        return ["md/tsc", tscVersion];
+    }
+    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 = 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/getTypeScriptUserAgentPair.d.ts

@@ -0,0 +1,6 @@
+import type { UserAgentPair } from "@smithy/types";
+/**
+ * Returns the tyescript name and version as a user agent pair, if present.
+ * @internal
+ */
+export declare const getTypeScriptUserAgentPair: () => Promise<UserAgentPair | undefined>;

package/dist-types/is-crt-available.d.ts

@@ -1,4 +1,4 @@
-import { UserAgentPair } from "@smithy/types";
+import type { UserAgentPair } from "@smithy/types";
 /**
  * @internal
  */

package/dist-types/nodeAppIdConfigOptions.d.ts

@@ -1,4 +1,4 @@
-import { LoadedConfigSelectors } from "@smithy/node-config-provider";
+import type { LoadedConfigSelectors } from "@smithy/node-config-provider";
 /**
  * @internal
  */

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/dist-types/ts3.4/getTypeScriptUserAgentPair.d.ts

@@ -0,0 +1,4 @@
+import { UserAgentPair } from "@smithy/types";
+export declare const getTypeScriptUserAgentPair: () => Promise<
+  UserAgentPair | undefined
+>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/util-user-agent-node",
-  "version": "3.972.13",
+  "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,8 +24,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-user-agent": "^3.972.14",
-    "@aws-sdk/types": "^3.973.3",
+    "@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",
     "tslib": "^2.6.2"