@aws-sdk/util-endpoints 3.168.0 → 3.170.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.170.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.169.0...v3.170.0) (2022-09-13)
+
+
+### Bug Fixes
+
+* **util-endpoints:** call multi-level functions from callFunction ([#3929](https://github.com/aws/aws-sdk-js-v3/issues/3929)) ([1209cb1](https://github.com/aws/aws-sdk-js-v3/commit/1209cb1613891496b3e03e6a61ff87fc721d1ccf))
+* **util-endpoints:** escape tilde when evaluating template ([#3934](https://github.com/aws/aws-sdk-js-v3/issues/3934)) ([5d7ef10](https://github.com/aws/aws-sdk-js-v3/commit/5d7ef10160456b7b872a1e7818dde7d73b4fb714))
+* **util-endpoints:** export parseArn from lib/aws ([#3931](https://github.com/aws/aws-sdk-js-v3/issues/3931)) ([1cee1f4](https://github.com/aws/aws-sdk-js-v3/commit/1cee1f4e41d1a660b4fbb7e06eecc22f2a9a82db))
+* **util-endpoints:** populate default params before checking for required values ([#3928](https://github.com/aws/aws-sdk-js-v3/issues/3928)) ([2561f60](https://github.com/aws/aws-sdk-js-v3/commit/2561f609f76b006bb39794a6cecfb6c0d68f9ef1))
+* **util-endpoints:** return null in parseArn for some empty elements ([#3935](https://github.com/aws/aws-sdk-js-v3/issues/3935)) ([f8bc8b3](https://github.com/aws/aws-sdk-js-v3/commit/f8bc8b3da798cb0c4c4d6fb21e8e88c9109e649b))
+* **util-endpoints:** skip evaluation for arg of type number ([#3936](https://github.com/aws/aws-sdk-js-v3/issues/3936)) ([aecd894](https://github.com/aws/aws-sdk-js-v3/commit/aecd89441ec92fc2be8cb4a3914ca7559e136d7d))
+
+
+
+
+
 # [3.168.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.167.0...v3.168.0) (2022-09-09)
 
 **Note:** Version bump only for package @aws-sdk/util-endpoints

package/dist-cjs/lib/aws/index.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./parseArn"), exports);
 tslib_1.__exportStar(require("./partition"), exports);

package/dist-cjs/lib/aws/parseArn.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseArn = void 0;
 const parseArn = (value) => {
     const segments = value.split(":");
-    if (segments.length < 6 || segments[0] !== "arn")
+    if (segments.length < 6)
+        return null;
+    const [arn, partition, service, region, accountId, ...resourceId] = segments;
+    if (arn !== "arn" || partition === "" || service === "" || resourceId[0] === "")
         return null;
-    const [, partition, service, region, accountId, ...resourceId] = segments;
     return {
         partition,
         service,

package/dist-cjs/lib/parseURL.js

@@ -33,6 +33,7 @@ const parseURL = (value) => {
         scheme,
         authority,
         path: pathname,
+        normalizedPath: pathname.endsWith("/") ? pathname : `${pathname}/`,
         isIp,
     };
 };

package/dist-cjs/resolveEndpoint.js

@@ -7,14 +7,6 @@ const resolveEndpoint = (ruleSetObject, options) => {
     var _a;
     const { endpointParams, logger } = options;
     const { parameters, rules } = ruleSetObject;
-    const requiredParams = Object.entries(parameters)
-        .filter(([, v]) => v.required)
-        .map(([k]) => k);
-    for (const requiredParam of requiredParams) {
-        if (endpointParams[requiredParam] == null) {
-            throw new types_1.EndpointError(`Missing required parameter: '${requiredParam}'`);
-        }
-    }
     const paramsWithDefault = Object.entries(parameters)
         .filter(([, v]) => v.default != null)
         .map(([k, v]) => [k, v.default]);
@@ -23,6 +15,14 @@ const resolveEndpoint = (ruleSetObject, options) => {
             endpointParams[paramKey] = (_a = endpointParams[paramKey]) !== null && _a !== void 0 ? _a : paramDefaultValue;
         }
     }
+    const requiredParams = Object.entries(parameters)
+        .filter(([, v]) => v.required)
+        .map(([k]) => k);
+    for (const requiredParam of requiredParams) {
+        if (endpointParams[requiredParam] == null) {
+            throw new types_1.EndpointError(`Missing required parameter: '${requiredParam}'`);
+        }
+    }
     return (0, utils_1.evaluateRules)(rules, { endpointParams, logger, referenceRecord: {} });
 };
 exports.resolveEndpoint = resolveEndpoint;

package/dist-cjs/utils/callFunction.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const lib = tslib_1.__importStar(require("../lib"));
 const evaluateExpression_1 = require("./evaluateExpression");
 const callFunction = ({ fn, argv }, options) => {
-    const argvArray = argv.map((arg) => (typeof arg === "boolean" ? arg : (0, evaluateExpression_1.evaluateExpression)(arg, "arg", options)));
-    return lib[fn](...argvArray);
+    const evaluatedArgs = argv.map((arg) => ["boolean", "number"].includes(typeof arg) ? arg : (0, evaluateExpression_1.evaluateExpression)(arg, "arg", options));
+    return fn.split(".").reduce((acc, key) => acc[key], lib)(...evaluatedArgs);
 };
 exports.callFunction = callFunction;

package/dist-cjs/utils/evaluateCondition.js

@@ -9,7 +9,7 @@ const evaluateCondition = ({ assign, ...fnArgs }, options) => {
     }
     const value = (0, callFunction_1.callFunction)(fnArgs, options);
     return {
-        result: !!value,
+        result: value === "" ? true : !!value,
         ...(assign != null && { toAssign: { name: assign, value } }),
     };
 };

package/dist-cjs/utils/evaluateTemplate.js

@@ -22,6 +22,7 @@ const evaluateTemplate = (template, options) => {
     const templateWithAttr = Object.entries(attrShortHandMap).reduce((acc, [shortHand, value]) => acc.replace(shortHand, value), templateToEvaluate);
     const templateContextNames = Object.keys(templateContext);
     const templateContextValues = Object.values(templateContext);
-    return new Function(...templateContextNames, `return \`${templateWithAttr}\``)(...templateContextValues);
+    const templateWithTildeEscaped = templateWithAttr.replace(/\`/g, "\\`");
+    return new Function(...templateContextNames, `return \`${templateWithTildeEscaped}\``)(...templateContextValues);
 };
 exports.evaluateTemplate = evaluateTemplate;

package/dist-cjs/utils/getReferenceValue.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getReferenceValue = void 0;
-const types_1 = require("../types");
 const getReferenceValue = ({ ref }, options) => {
     const referenceRecord = {
         ...options.endpointParams,
         ...options.referenceRecord,
     };
-    if (referenceRecord[ref] == undefined) {
-        throw new types_1.EndpointError(`Reference '${ref}' not defined`);
-    }
     return referenceRecord[ref];
 };
 exports.getReferenceValue = getReferenceValue;

package/dist-es/lib/aws/index.js

@@ -1 +1,2 @@
+export * from "./parseArn";
 export * from "./partition";

package/dist-es/lib/aws/parseArn.js

@@ -1,9 +1,11 @@
 import { __read } from "tslib";
 export var parseArn = function (value) {
     var segments = value.split(":");
-    if (segments.length < 6 || segments[0] !== "arn")
+    if (segments.length < 6)
+        return null;
+    var _a = __read(segments), arn = _a[0], partition = _a[1], service = _a[2], region = _a[3], accountId = _a[4], resourceId = _a.slice(5);
+    if (arn !== "arn" || partition === "" || service === "" || resourceId[0] === "")
         return null;
-    var _a = __read(segments), partition = _a[1], service = _a[2], region = _a[3], accountId = _a[4], resourceId = _a.slice(5);
     return {
         partition: partition,
         service: service,

package/dist-es/lib/parseURL.js

@@ -31,6 +31,7 @@ export var parseURL = function (value) {
         scheme: scheme,
         authority: authority,
         path: pathname,
+        normalizedPath: pathname.endsWith("/") ? pathname : "".concat(pathname, "/"),
         isIp: isIp,
     };
 };

package/dist-es/resolveEndpoint.js

@@ -6,30 +6,6 @@ export var resolveEndpoint = function (ruleSetObject, options) {
     var _c;
     var endpointParams = options.endpointParams, logger = options.logger;
     var parameters = ruleSetObject.parameters, rules = ruleSetObject.rules;
-    var requiredParams = Object.entries(parameters)
-        .filter(function (_a) {
-        var _b = __read(_a, 2), v = _b[1];
-        return v.required;
-    })
-        .map(function (_a) {
-        var _b = __read(_a, 1), k = _b[0];
-        return k;
-    });
-    try {
-        for (var requiredParams_1 = __values(requiredParams), requiredParams_1_1 = requiredParams_1.next(); !requiredParams_1_1.done; requiredParams_1_1 = requiredParams_1.next()) {
-            var requiredParam = requiredParams_1_1.value;
-            if (endpointParams[requiredParam] == null) {
-                throw new EndpointError("Missing required parameter: '".concat(requiredParam, "'"));
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (requiredParams_1_1 && !requiredParams_1_1.done && (_a = requiredParams_1.return)) _a.call(requiredParams_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
     var paramsWithDefault = Object.entries(parameters)
         .filter(function (_a) {
         var _b = __read(_a, 2), v = _b[1];
@@ -46,13 +22,37 @@ export var resolveEndpoint = function (ruleSetObject, options) {
                 endpointParams[paramKey] = (_c = endpointParams[paramKey]) !== null && _c !== void 0 ? _c : paramDefaultValue;
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (paramsWithDefault_1_1 && !paramsWithDefault_1_1.done && (_b = paramsWithDefault_1.return)) _b.call(paramsWithDefault_1);
+                if (paramsWithDefault_1_1 && !paramsWithDefault_1_1.done && (_a = paramsWithDefault_1.return)) _a.call(paramsWithDefault_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_1) throw e_1.error; }
+        }
+    }
+    var requiredParams = Object.entries(parameters)
+        .filter(function (_a) {
+        var _b = __read(_a, 2), v = _b[1];
+        return v.required;
+    })
+        .map(function (_a) {
+        var _b = __read(_a, 1), k = _b[0];
+        return k;
+    });
+    try {
+        for (var requiredParams_1 = __values(requiredParams), requiredParams_1_1 = requiredParams_1.next(); !requiredParams_1_1.done; requiredParams_1_1 = requiredParams_1.next()) {
+            var requiredParam = requiredParams_1_1.value;
+            if (endpointParams[requiredParam] == null) {
+                throw new EndpointError("Missing required parameter: '".concat(requiredParam, "'"));
+            }
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (requiredParams_1_1 && !requiredParams_1_1.done && (_b = requiredParams_1.return)) _b.call(requiredParams_1);
         }
+        finally { if (e_2) throw e_2.error; }
     }
     return evaluateRules(rules, { endpointParams: endpointParams, logger: logger, referenceRecord: {} });
 };

package/dist-es/utils/callFunction.js

@@ -3,6 +3,8 @@ import * as lib from "../lib";
 import { evaluateExpression } from "./evaluateExpression";
 export var callFunction = function (_a, options) {
     var fn = _a.fn, argv = _a.argv;
-    var argvArray = argv.map(function (arg) { return (typeof arg === "boolean" ? arg : evaluateExpression(arg, "arg", options)); });
-    return lib[fn].apply(lib, __spreadArray([], __read(argvArray), false));
+    var evaluatedArgs = argv.map(function (arg) {
+        return ["boolean", "number"].includes(typeof arg) ? arg : evaluateExpression(arg, "arg", options);
+    });
+    return fn.split(".").reduce(function (acc, key) { return acc[key]; }, lib).apply(void 0, __spreadArray([], __read(evaluatedArgs), false));
 };

package/dist-es/utils/evaluateCondition.js

@@ -7,5 +7,5 @@ export var evaluateCondition = function (_a, options) {
         throw new EndpointError("'".concat(assign, "' is already defined in Reference Record."));
     }
     var value = callFunction(fnArgs, options);
-    return __assign({ result: !!value }, (assign != null && { toAssign: { name: assign, value: value } }));
+    return __assign({ result: value === "" ? true : !!value }, (assign != null && { toAssign: { name: assign, value: value } }));
 };

package/dist-es/utils/evaluateTemplate.js

@@ -20,5 +20,6 @@ export var evaluateTemplate = function (template, options) {
     }, templateToEvaluate);
     var templateContextNames = Object.keys(templateContext);
     var templateContextValues = Object.values(templateContext);
-    return new (Function.bind.apply(Function, __spreadArray(__spreadArray([void 0], __read(templateContextNames), false), ["return `".concat(templateWithAttr, "`")], false)))().apply(void 0, __spreadArray([], __read(templateContextValues), false));
+    var templateWithTildeEscaped = templateWithAttr.replace(/\`/g, "\\`");
+    return new (Function.bind.apply(Function, __spreadArray(__spreadArray([void 0], __read(templateContextNames), false), ["return `".concat(templateWithTildeEscaped, "`")], false)))().apply(void 0, __spreadArray([], __read(templateContextValues), false));
 };

package/dist-es/utils/getReferenceValue.js

@@ -1,10 +1,6 @@
 import { __assign } from "tslib";
-import { EndpointError } from "../types";
 export var getReferenceValue = function (_a, options) {
     var ref = _a.ref;
     var referenceRecord = __assign(__assign({}, options.endpointParams), options.referenceRecord);
-    if (referenceRecord[ref] == undefined) {
-        throw new EndpointError("Reference '".concat(ref, "' not defined"));
-    }
     return referenceRecord[ref];
 };

package/dist-types/lib/aws/index.d.ts

@@ -1 +1,2 @@
+export * from "./parseArn";
 export * from "./partition";

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

@@ -1,2 +1,2 @@
-export * from "./resolveEndpoint";
-export * from "./types";
+export * from "./resolveEndpoint";
+export * from "./types";

package/dist-types/ts3.4/lib/aws/index.d.ts

@@ -1 +1,2 @@
-export * from "./partition";
+export * from "./parseArn";
+export * from "./partition";

package/dist-types/ts3.4/lib/aws/parseArn.d.ts

@@ -1,3 +1,3 @@
-import { EndpointARN } from "@aws-sdk/types";
-
-export declare const parseArn: (value: string) => EndpointARN | null;
+import { EndpointARN } from "@aws-sdk/types";
+
+export declare const parseArn: (value: string) => EndpointARN | null;

package/dist-types/ts3.4/lib/aws/partition.d.ts

@@ -1,3 +1,3 @@
-import { EndpointPartition } from "@aws-sdk/types";
-
-export declare const partition: (value: string) => EndpointPartition;
+import { EndpointPartition } from "@aws-sdk/types";
+
+export declare const partition: (value: string) => EndpointPartition;

package/dist-types/ts3.4/lib/booleanEquals.d.ts

@@ -1,2 +1,4 @@
-
-export declare const booleanEquals: (value1: boolean, value2: boolean) => boolean;
+export declare const booleanEquals: (
+  value1: boolean,
+  value2: boolean
+) => boolean;

package/dist-types/ts3.4/lib/getAttr.d.ts

@@ -1,5 +1,12 @@
-export declare type GetAttrValue = string | boolean | {
-    [key: string]: GetAttrValue;
-} | Array<GetAttrValue>;
-
-export declare const getAttr: (value: GetAttrValue, path: string) => GetAttrValue;
+export declare type GetAttrValue =
+  | string
+  | boolean
+  | {
+      [key: string]: GetAttrValue;
+    }
+  | Array<GetAttrValue>;
+
+export declare const getAttr: (
+  value: GetAttrValue,
+  path: string
+) => GetAttrValue;

package/dist-types/ts3.4/lib/getAttrPathList.d.ts

@@ -1,2 +1 @@
-
-export declare const getAttrPathList: (path: string) => Array<string>;
+export declare const getAttrPathList: (path: string) => Array<string>;

package/dist-types/ts3.4/lib/index.d.ts

@@ -1,11 +1,11 @@
-import * as aws_1 from "./aws";
-export { aws_1 as aws };
-export * from "./booleanEquals";
-export * from "./getAttr";
-export * from "./isSet";
-export * from "./isValidHostLabel";
-export * from "./not";
-export * from "./parseURL";
-export * from "./stringEquals";
-export * from "./substring";
-export * from "./uriEncode";
+import * as aws_1 from "./aws";
+export { aws_1 as aws };
+export * from "./booleanEquals";
+export * from "./getAttr";
+export * from "./isSet";
+export * from "./isValidHostLabel";
+export * from "./not";
+export * from "./parseURL";
+export * from "./stringEquals";
+export * from "./substring";
+export * from "./uriEncode";

package/dist-types/ts3.4/lib/isSet.d.ts

@@ -1,2 +1 @@
-
-export declare const isSet: (value: unknown) => boolean;
+export declare const isSet: (value: unknown) => boolean;

package/dist-types/ts3.4/lib/isValidHostLabel.d.ts

@@ -1,2 +1,4 @@
-
-export declare const isValidHostLabel: (value: string, allowSubDomains?: boolean) => boolean;
+export declare const isValidHostLabel: (
+  value: string,
+  allowSubDomains?: boolean
+) => boolean;

package/dist-types/ts3.4/lib/not.d.ts

@@ -1,2 +1 @@
-
-export declare const not: (value: boolean) => boolean;
+export declare const not: (value: boolean) => boolean;

package/dist-types/ts3.4/lib/parseURL.d.ts

@@ -1,3 +1,3 @@
-import { EndpointURL } from "@aws-sdk/types";
-
-export declare const parseURL: (value: string) => EndpointURL | null;
+import { EndpointURL } from "@aws-sdk/types";
+
+export declare const parseURL: (value: string) => EndpointURL | null;

package/dist-types/ts3.4/lib/stringEquals.d.ts

@@ -1,2 +1 @@
-
-export declare const stringEquals: (value1: string, value2: string) => boolean;
+export declare const stringEquals: (value1: string, value2: string) => boolean;

package/dist-types/ts3.4/lib/substring.d.ts

@@ -1,2 +1,6 @@
-
-export declare const substring: (input: string, start: number, stop: number, reverse: boolean) => string | null;
+export declare const substring: (
+  input: string,
+  start: number,
+  stop: number,
+  reverse: boolean
+) => string | null;

package/dist-types/ts3.4/lib/uriEncode.d.ts

@@ -1,2 +1 @@
-
-export declare const uriEncode: (value: string) => string;
+export declare const uriEncode: (value: string) => string;

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

@@ -1,4 +1,7 @@
-import { EndpointV2 } from "@aws-sdk/types";
-import { EndpointResolverOptions, RuleSetObject } from "./types";
-
-export declare const resolveEndpoint: (ruleSetObject: RuleSetObject, options: EndpointResolverOptions) => EndpointV2;
+import { EndpointV2 } from "@aws-sdk/types";
+import { EndpointResolverOptions, RuleSetObject } from "./types";
+
+export declare const resolveEndpoint: (
+  ruleSetObject: RuleSetObject,
+  options: EndpointResolverOptions
+) => EndpointV2;

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

@@ -1,3 +1,3 @@
-export declare class EndpointError extends Error {
-    constructor(message: string);
-}
+export declare class EndpointError extends Error {
+  constructor(message: string);
+}

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

@@ -1,15 +1,18 @@
-import { EndpointObjectProperty } from "@aws-sdk/types";
-import { ConditionObject, Expression } from "./shared";
-export declare type EndpointObjectProperties = Record<string, EndpointObjectProperty>;
-export declare type EndpointObjectHeaders = Record<string, Expression[]>;
-export declare type EndpointObject = {
-    url: Expression;
-    properties?: EndpointObjectProperties;
-    headers?: EndpointObjectHeaders;
-};
-export declare type EndpointRuleObject = {
-    type: "endpoint";
-    conditions?: ConditionObject[];
-    endpoint: EndpointObject;
-    documentation?: string;
-};
+import { EndpointObjectProperty } from "@aws-sdk/types";
+import { ConditionObject, Expression } from "./shared";
+export declare type EndpointObjectProperties = Record<
+  string,
+  EndpointObjectProperty
+>;
+export declare type EndpointObjectHeaders = Record<string, Expression[]>;
+export declare type EndpointObject = {
+  url: Expression;
+  properties?: EndpointObjectProperties;
+  headers?: EndpointObjectHeaders;
+};
+export declare type EndpointRuleObject = {
+  type: "endpoint";
+  conditions?: ConditionObject[];
+  endpoint: EndpointObject;
+  documentation?: string;
+};

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

@@ -1,7 +1,7 @@
-import { ConditionObject, Expression } from "./shared";
-export declare type ErrorRuleObject = {
-    type: "error";
-    conditions?: ConditionObject[];
-    error: Expression;
-    documentation?: string;
-};
+import { ConditionObject, Expression } from "./shared";
+export declare type ErrorRuleObject = {
+  type: "error";
+  conditions?: ConditionObject[];
+  error: Expression;
+  documentation?: string;
+};

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

@@ -1,18 +1,18 @@
-import { RuleSetRules } from "./TreeRuleObject";
-export declare type DeprecatedObject = {
-    message?: string;
-    since?: string;
-};
-export declare type ParameterObject = {
-    type: "string" | "boolean";
-    default?: string | boolean;
-    required?: boolean;
-    documentation?: string;
-    deprecated?: DeprecatedObject;
-};
-export declare type RuleSetObject = {
-    version: string;
-    serviceId: string;
-    parameters: Record<string, ParameterObject>;
-    rules: RuleSetRules;
-};
+import { RuleSetRules } from "./TreeRuleObject";
+export declare type DeprecatedObject = {
+  message?: string;
+  since?: string;
+};
+export declare type ParameterObject = {
+  type: "string" | "boolean";
+  default?: string | boolean;
+  required?: boolean;
+  documentation?: string;
+  deprecated?: DeprecatedObject;
+};
+export declare type RuleSetObject = {
+  version: string;
+  serviceId: string;
+  parameters: Record<string, ParameterObject>;
+  rules: RuleSetRules;
+};

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

@@ -1,10 +1,12 @@
-import { EndpointRuleObject } from "./EndpointRuleObject";
-import { ErrorRuleObject } from "./ErrorRuleObject";
-import { ConditionObject } from "./shared";
-export declare type RuleSetRules = Array<EndpointRuleObject | ErrorRuleObject | TreeRuleObject>;
-export declare type TreeRuleObject = {
-    type: "tree";
-    conditions?: ConditionObject[];
-    rules: RuleSetRules;
-    documentation?: string;
-};
+import { EndpointRuleObject } from "./EndpointRuleObject";
+import { ErrorRuleObject } from "./ErrorRuleObject";
+import { ConditionObject } from "./shared";
+export declare type RuleSetRules = Array<
+  EndpointRuleObject | ErrorRuleObject | TreeRuleObject
+>;
+export declare type TreeRuleObject = {
+  type: "tree";
+  conditions?: ConditionObject[];
+  rules: RuleSetRules;
+  documentation?: string;
+};

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

@@ -1,6 +1,6 @@
-export * from "./EndpointError";
-export * from "./EndpointRuleObject";
-export * from "./ErrorRuleObject";
-export * from "./RuleSetObject";
-export * from "./TreeRuleObject";
-export * from "./shared";
+export * from "./EndpointError";
+export * from "./EndpointRuleObject";
+export * from "./ErrorRuleObject";
+export * from "./RuleSetObject";
+export * from "./TreeRuleObject";
+export * from "./shared";

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

@@ -1,25 +1,29 @@
-import { Logger } from "@aws-sdk/types";
-export declare type ReferenceObject = {
-    ref: string;
-};
-export declare type FunctionObject = {
-    fn: string;
-    argv: FunctionArgv;
-};
-export declare type FunctionArgv = Array<string | boolean | ReferenceObject | FunctionObject>;
-export declare type FunctionReturn = string | boolean | number | {
-    [key: string]: FunctionReturn;
-};
-export declare type ConditionObject = FunctionObject & {
-    assign?: string;
-};
-export declare type Expression = string | ReferenceObject | FunctionObject;
-export declare type EndpointParams = Record<string, string | boolean>;
-export declare type EndpointResolverOptions = {
-    endpointParams: EndpointParams;
-    logger?: Logger;
-};
-export declare type ReferenceRecord = Record<string, FunctionReturn>;
-export declare type EvaluateOptions = EndpointResolverOptions & {
-    referenceRecord: ReferenceRecord;
-};
+import { Logger } from "@aws-sdk/types";
+export declare type ReferenceObject = {
+  ref: string;
+};
+export declare type FunctionObject = {
+  fn: string;
+  argv: FunctionArgv;
+};
+export declare type FunctionArgv = Array<Expression | boolean | number>;
+export declare type FunctionReturn =
+  | string
+  | boolean
+  | number
+  | {
+      [key: string]: FunctionReturn;
+    };
+export declare type ConditionObject = FunctionObject & {
+  assign?: string;
+};
+export declare type Expression = string | ReferenceObject | FunctionObject;
+export declare type EndpointParams = Record<string, string | boolean>;
+export declare type EndpointResolverOptions = {
+  endpointParams: EndpointParams;
+  logger?: Logger;
+};
+export declare type ReferenceRecord = Record<string, FunctionReturn>;
+export declare type EvaluateOptions = EndpointResolverOptions & {
+  referenceRecord: ReferenceRecord;
+};

package/dist-types/ts3.4/utils/callFunction.d.ts

@@ -1,2 +1,5 @@
-import { EvaluateOptions, FunctionObject, FunctionReturn } from "../types";
-export declare const callFunction: ({ fn, argv }: FunctionObject, options: EvaluateOptions) => FunctionReturn;
+import { EvaluateOptions, FunctionObject, FunctionReturn } from "../types";
+export declare const callFunction: (
+  { fn, argv }: FunctionObject,
+  options: EvaluateOptions
+) => FunctionReturn;

package/dist-types/ts3.4/utils/evaluateCondition.d.ts

@@ -1,8 +1,13 @@
-import { ConditionObject, EvaluateOptions } from "../types";
-export declare const evaluateCondition: ({ assign, ...fnArgs }: ConditionObject, options: EvaluateOptions) => {
-    toAssign?: {
-        name: string;
-        value: import("../types").FunctionReturn;
-    } | undefined;
-    result: boolean;
-};
+import { ConditionObject, EvaluateOptions } from "../types";
+export declare const evaluateCondition: (
+  { assign, ...fnArgs }: ConditionObject,
+  options: EvaluateOptions
+) => {
+  toAssign?:
+    | {
+        name: string;
+        value: import("../types").FunctionReturn;
+      }
+    | undefined;
+  result: boolean;
+};

package/dist-types/ts3.4/utils/evaluateConditions.d.ts

@@ -1,8 +1,13 @@
-import { ConditionObject, EvaluateOptions, FunctionReturn } from "../types";
-export declare const evaluateConditions: (conditions: ConditionObject[] | undefined, options: EvaluateOptions) => {
-    result: false;
-    referenceRecord?: undefined;
-} | {
-    result: boolean;
-    referenceRecord: Record<string, FunctionReturn>;
-};
+import { ConditionObject, EvaluateOptions, FunctionReturn } from "../types";
+export declare const evaluateConditions: (
+  conditions: ConditionObject[] | undefined,
+  options: EvaluateOptions
+) =>
+  | {
+      result: false;
+      referenceRecord?: undefined;
+    }
+  | {
+      result: boolean;
+      referenceRecord: Record<string, FunctionReturn>;
+    };

package/dist-types/ts3.4/utils/evaluateEndpointRule.d.ts

@@ -1,3 +1,6 @@
-import { EndpointV2 } from "@aws-sdk/types";
-import { EndpointRuleObject, EvaluateOptions } from "../types";
-export declare const evaluateEndpointRule: (endpointRule: EndpointRuleObject, options: EvaluateOptions) => EndpointV2 | undefined;
+import { EndpointV2 } from "@aws-sdk/types";
+import { EndpointRuleObject, EvaluateOptions } from "../types";
+export declare const evaluateEndpointRule: (
+  endpointRule: EndpointRuleObject,
+  options: EvaluateOptions
+) => EndpointV2 | undefined;

package/dist-types/ts3.4/utils/evaluateErrorRule.d.ts

@@ -1,2 +1,5 @@
-import { ErrorRuleObject, EvaluateOptions } from "../types";
-export declare const evaluateErrorRule: (errorRule: ErrorRuleObject, options: EvaluateOptions) => void;
+import { ErrorRuleObject, EvaluateOptions } from "../types";
+export declare const evaluateErrorRule: (
+  errorRule: ErrorRuleObject,
+  options: EvaluateOptions
+) => void;

package/dist-types/ts3.4/utils/evaluateExpression.d.ts

@@ -1,2 +1,6 @@
-import { EvaluateOptions, FunctionObject, ReferenceObject } from "../types";
-export declare const evaluateExpression: (obj: string | FunctionObject | ReferenceObject, keyName: string, options: EvaluateOptions) => any;
+import { EvaluateOptions, Expression } from "../types";
+export declare const evaluateExpression: (
+  obj: Expression,
+  keyName: string,
+  options: EvaluateOptions
+) => any;

package/dist-types/ts3.4/utils/evaluateRules.d.ts

@@ -1,3 +1,6 @@
-import { EndpointV2 } from "@aws-sdk/types";
-import { EvaluateOptions, RuleSetRules } from "../types";
-export declare const evaluateRules: (rules: RuleSetRules, options: EvaluateOptions) => EndpointV2;
+import { EndpointV2 } from "@aws-sdk/types";
+import { EvaluateOptions, RuleSetRules } from "../types";
+export declare const evaluateRules: (
+  rules: RuleSetRules,
+  options: EvaluateOptions
+) => EndpointV2;

package/dist-types/ts3.4/utils/evaluateTemplate.d.ts

@@ -1,2 +1,5 @@
-import { EvaluateOptions } from "../types";
-export declare const evaluateTemplate: (template: string, options: EvaluateOptions) => any;
+import { EvaluateOptions } from "../types";
+export declare const evaluateTemplate: (
+  template: string,
+  options: EvaluateOptions
+) => any;

package/dist-types/ts3.4/utils/evaluateTreeRule.d.ts

@@ -1,3 +1,6 @@
-import { EndpointV2 } from "@aws-sdk/types";
-import { EvaluateOptions, TreeRuleObject } from "../types";
-export declare const evaluateTreeRule: (treeRule: TreeRuleObject, options: EvaluateOptions) => EndpointV2 | undefined;
+import { EndpointV2 } from "@aws-sdk/types";
+import { EvaluateOptions, TreeRuleObject } from "../types";
+export declare const evaluateTreeRule: (
+  treeRule: TreeRuleObject,
+  options: EvaluateOptions
+) => EndpointV2 | undefined;

package/dist-types/ts3.4/utils/getEndpointHeaders.d.ts

@@ -1,2 +1,5 @@
-import { EndpointObjectHeaders, EvaluateOptions } from "../types";
-export declare const getEndpointHeaders: (headers: EndpointObjectHeaders, options: EvaluateOptions) => {};
+import { EndpointObjectHeaders, EvaluateOptions } from "../types";
+export declare const getEndpointHeaders: (
+  headers: EndpointObjectHeaders,
+  options: EvaluateOptions
+) => {};

package/dist-types/ts3.4/utils/getEndpointProperties.d.ts

@@ -1,2 +1,5 @@
-import { EndpointObjectProperties, EvaluateOptions } from "../types";
-export declare const getEndpointProperties: (properties: EndpointObjectProperties, options: EvaluateOptions) => {};
+import { EndpointObjectProperties, EvaluateOptions } from "../types";
+export declare const getEndpointProperties: (
+  properties: EndpointObjectProperties,
+  options: EvaluateOptions
+) => {};

package/dist-types/ts3.4/utils/getEndpointProperty.d.ts

@@ -1,3 +1,6 @@
-import { EndpointObjectProperty } from "@aws-sdk/types";
-import { EvaluateOptions } from "../types";
-export declare const getEndpointProperty: (property: EndpointObjectProperty, options: EvaluateOptions) => EndpointObjectProperty;
+import { EndpointObjectProperty } from "@aws-sdk/types";
+import { EvaluateOptions } from "../types";
+export declare const getEndpointProperty: (
+  property: EndpointObjectProperty,
+  options: EvaluateOptions
+) => EndpointObjectProperty;

package/dist-types/ts3.4/utils/getEndpointUrl.d.ts

@@ -1,2 +1,5 @@
-import { EvaluateOptions, Expression } from "../types";
-export declare const getEndpointUrl: (endpointUrl: Expression, options: EvaluateOptions) => URL;
+import { EvaluateOptions, Expression } from "../types";
+export declare const getEndpointUrl: (
+  endpointUrl: Expression,
+  options: EvaluateOptions
+) => URL;

package/dist-types/ts3.4/utils/getReferenceValue.d.ts

@@ -1,2 +1,5 @@
-import { EvaluateOptions, ReferenceObject } from "../types";
-export declare const getReferenceValue: ({ ref }: ReferenceObject, options: EvaluateOptions) => import("../types").FunctionReturn;
+import { EvaluateOptions, ReferenceObject } from "../types";
+export declare const getReferenceValue: (
+  { ref }: ReferenceObject,
+  options: EvaluateOptions
+) => import("../types").FunctionReturn;

package/dist-types/ts3.4/utils/index.d.ts

@@ -1 +1 @@
-export * from "./evaluateRules";
+export * from "./evaluateRules";

package/dist-types/types/shared.d.ts

@@ -6,7 +6,7 @@ export declare type FunctionObject = {
     fn: string;
     argv: FunctionArgv;
 };
-export declare type FunctionArgv = Array<string | boolean | ReferenceObject | FunctionObject>;
+export declare type FunctionArgv = Array<Expression | boolean | number>;
 export declare type FunctionReturn = string | boolean | number | {
     [key: string]: FunctionReturn;
 };

package/dist-types/utils/evaluateExpression.d.ts

@@ -1,2 +1,2 @@
-import { EvaluateOptions, FunctionObject, ReferenceObject } from "../types";
-export declare const evaluateExpression: (obj: string | FunctionObject | ReferenceObject, keyName: string, options: EvaluateOptions) => any;
+import { EvaluateOptions, Expression } from "../types";
+export declare const evaluateExpression: (obj: Expression, keyName: string, options: EvaluateOptions) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/util-endpoints",
-  "version": "3.168.0",
+  "version": "3.170.0",
   "description": "Utilities to help with endpoint resolution",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -21,7 +21,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "3.168.0",
+    "@aws-sdk/types": "3.170.0",
     "tslib": "^2.3.1"
   },
   "engines": {
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@tsconfig/recommended": "1.0.1",
     "concurrently": "7.0.0",
-    "downlevel-dts": "0.7.0",
+    "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",
     "typedoc": "0.19.2",
     "typescript": "~4.6.2"