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

package/dist-cjs/index.js

@@ -1,17 +1,56 @@
 '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 getTypeScriptPackageJsonPath = (dirname = "") => {
+    let nodeModulesPath;
+    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);
+    }
+    else {
+        nodeModulesPath = dirname;
+    }
+    return node_path.join(nodeModulesPath, "node_modules", "typescript", "package.json");
+};
+
+let tscVersion;
+const getTypeScriptUserAgentPair = async () => {
+    if (tscVersion === null) {
+        return undefined;
+    }
+    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;
+        }
+        tscVersion = version;
+        return ["md/tsc", tscVersion];
+    }
+    catch {
+        tscVersion = null;
+    }
 };
 
 const crtAvailability = {
@@ -31,10 +70,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 +85,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/getTypeScriptPackageJsonPath.js

@@ -0,0 +1,14 @@
+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-es/getTypeScriptUserAgentPair.js

@@ -0,0 +1,24 @@
+import { readFile } from "node:fs/promises";
+import { getTypeScriptPackageJsonPath } from "./getTypeScriptPackageJsonPath";
+let tscVersion;
+export const getTypeScriptUserAgentPair = async () => {
+    if (tscVersion === null) {
+        return undefined;
+    }
+    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;
+        }
+        tscVersion = version;
+        return ["md/tsc", tscVersion];
+    }
+    catch {
+        tscVersion = null;
+    }
+};

package/dist-types/getTypeScriptPackageJsonPath.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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/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/getTypeScriptPackageJsonPath.d.ts

@@ -0,0 +1 @@
+export declare const getTypeScriptPackageJsonPath: (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.12",
+  "version": "3.973.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline util-user-agent-node",
@@ -10,7 +10,9 @@
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
     "test": "yarn g:vitest run",
-    "test:watch": "yarn g:vitest watch"
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
+    "test:watch": "yarn g:vitest watch",
+    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -22,10 +24,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-user-agent": "^3.972.13",
-    "@aws-sdk/types": "^3.973.2",
-    "@smithy/node-config-provider": "^4.3.9",
-    "@smithy/types": "^4.12.1",
+    "@aws-sdk/middleware-user-agent": "^3.972.15",
+    "@aws-sdk/types": "^3.973.4",
+    "@smithy/node-config-provider": "^4.3.10",
+    "@smithy/types": "^4.13.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {