@ominity/api-typescript 1.4.0 → 1.4.1

package/src/funcs/admins/adminsGet.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -82,7 +82,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/admins/{id}",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/commerce/customerUserInvitationsInspect.ts

@@ -2,7 +2,7 @@
  * Inspect a customer user invitation by email token.
  */
 
-import { encodeSimple } from "../../lib/encodings.js";
+import { encodePath } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
@@ -70,7 +70,7 @@ async function $do(
 
   const payload = parsed.value;
   const body = null;
-  const path = encodeSimple(
+  const path = encodePath(
     "/commerce/customer-user-invitations/{token}",
     { token: payload.token },
     { explode: false, charEncoding: "percent" },

package/src/funcs/oauth2/index.ts

@@ -3,7 +3,7 @@
  */
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
-import { encodeJSON, encodeSimple } from "../../lib/encodings.js";
+import { encodeJSON, encodePath } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
 import { baseURLWithoutAPIVersion } from "../../lib/url.js";
@@ -272,7 +272,7 @@ export async function oauth2RevokeAuthorizedToken(
     return parsed;
   }
 
-  const path = encodeSimple(
+  const path = encodePath(
     "/oauth2/tokens/{token_id}",
     { token_id: parsed.value.token_id },
     { explode: false, charEncoding: "percent" },
@@ -428,7 +428,7 @@ export async function oauth2UpdateClient(
     redirect: parsed.value.redirect,
   }, { explode: true });
 
-  const path = encodeSimple(
+  const path = encodePath(
     "/oauth2/clients/{client_id}",
     { client_id: parsed.value.client_id },
     { explode: false, charEncoding: "percent" },
@@ -483,7 +483,7 @@ export async function oauth2DeleteClient(
     return parsed;
   }
 
-  const path = encodeSimple(
+  const path = encodePath(
     "/oauth2/clients/{client_id}",
     { client_id: parsed.value.client_id },
     { explode: false, charEncoding: "percent" },
@@ -689,7 +689,7 @@ export async function oauth2DeletePersonalAccessToken(
     return parsed;
   }
 
-  const path = encodeSimple(
+  const path = encodePath(
     "/oauth2/personal-access-tokens/{token_id}",
     { token_id: parsed.value.token_id },
     { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersDisableMfa.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -82,7 +82,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods/{method}",
         { "id": payload.id, "method": payload.method },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersEnableMfa.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -82,7 +82,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods/{method}/enable",
         { "id": payload.id, "method": payload.method },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersGetMfaMethod.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -82,7 +82,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods/{method}",
         { "id": payload.id, "method": payload.method },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersIssueToken.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-  encodeSimple,
+  encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -81,7 +81,7 @@ async function $do(
   const payload = parsed.value;
   const body = null;
 
-  const path = encodeSimple(
+  const path = encodePath(
     "/users/{id}/token",
     { id: payload.id },
     { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersListCustomers.ts

@@ -5,7 +5,7 @@
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
     encodeDeepObjectQuery,
-    encodeSimple,
+    encodePath,
     encodeFormQuery,
     queryJoin,
 } from "../../lib/encodings.js";
@@ -86,7 +86,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/customers",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersListMfaMethods.ts

@@ -3,7 +3,7 @@
  */
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
-import { encodeSimple } from "../../lib/encodings.js";
+import { encodePath } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
 import { extractSecurity, resolveGlobalSecurity } from "../../lib/security.js";
@@ -80,7 +80,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersListOAuthAccounts.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
     encodeFormQuery,
     queryJoin,
 } from "../../lib/encodings.js";
@@ -85,7 +85,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/oauthaccounts",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersListRecoveryCodes.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
     encodeFormQuery,
     queryJoin,
 } from "../../lib/encodings.js";
@@ -84,7 +84,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/recovery-codes",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersRegenerateRecoveryCodes.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
     encodeJSON,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
@@ -83,7 +83,7 @@ async function $do(
     const payload = parsed.value;
     const body = encodeJSON("body", { confirm: payload.confirm }, { explode: true });
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/recovery-codes",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersSendMfa.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
 import { safeParse } from "../../lib/schemas.js";
@@ -82,7 +82,7 @@ async function $do(
     const payload = parsed.value;
     const body = null;
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods/{method}/send",
         { "id": payload.id, "method": payload.method },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersValidateMfa.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
     encodeJSON,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
@@ -83,7 +83,7 @@ async function $do(
     const payload = parsed.value;
     const body = encodeJSON("body", { code: payload.code }, { explode: true });
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/mfa-methods/{method}/validate",
         { "id": payload.id, "method": payload.method },
         { explode: false, charEncoding: "percent" },

package/src/funcs/users/usersValidateRecoveryCode.ts

@@ -4,7 +4,7 @@
 
 import { ClientSDK, RequestOptions } from "../../lib/sdks.js";
 import {
-    encodeSimple,
+    encodePath,
     encodeJSON,
 } from "../../lib/encodings.js";
 import * as M from "../../lib/matchers.js";
@@ -83,7 +83,7 @@ async function $do(
     const payload = parsed.value;
     const body = encodeJSON("body", { code: payload.code }, { explode: true });
 
-    const path = encodeSimple(
+    const path = encodePath(
         "/users/{id}/recovery-codes/validate",
         { "id": payload.id },
         { explode: false, charEncoding: "percent" },

package/src/lib/config.ts

@@ -75,7 +75,7 @@ function applyApiVersion(url: URL, apiVersion: string | undefined): URL {
   return url;
 }
 
-export const SDK_VERSION = "1.4.0";
+export const SDK_VERSION = "1.4.1";
 
 export const SDK_METADATA = {
   language: "typescript",

package/src/lib/encodings.ts

@@ -343,6 +343,35 @@ export const encodeSimple = (
   return out.slice(1);
 };
 
+/**
+ * Replaces named placeholders in an API path with URL-encoded values.
+ *
+ * OpenAPI's `simple` encoder serializes one parameter value; it does not
+ * expand a complete path template. Generated operations should use this
+ * helper for paths such as `/users/{id}/customers`.
+ */
+export function encodePath(
+  template: string,
+  parameters: Readonly<Record<string, unknown>>,
+  options?: { explode?: boolean; charEncoding?: "percent" | "none" },
+): string {
+  const encodeString = (value: string) => {
+    return options?.charEncoding === "none" ? value : encodeURIComponent(value);
+  };
+
+  return template.replace(/\{([^{}]+)\}/g, (_placeholder, name: string) => {
+    const value = parameters[name];
+    if (value == null) {
+      throw new EncodingError(`Missing value for path parameter '${name}'.`);
+    }
+    if (Array.isArray(value) || isPlainObject(value)) {
+      throw new EncodingError(`Path parameter '${name}' must be a scalar value.`);
+    }
+
+    return encodeString(serializeValue(value));
+  });
+}
+
 function explode(key: string, value: unknown): [string, unknown][] {
   if (Array.isArray(value)) {
     return value.map((v) => [key, v]);

package/src/lib/sdks.ts

@@ -121,6 +121,21 @@ export class ClientSDK {
 
   protected _propagateLanguage(_language: string | undefined): void {}
 
+  private hookContext(context: HookContext): HookContext {
+    const operationOptions = typeof context.options === "object"
+      && context.options !== null
+      ? context.options
+      : {};
+
+    return {
+      ...context,
+      options: {
+        ...this._options,
+        ...operationOptions,
+      },
+    };
+  }
+
   public _createRequest(
     context: HookContext,
     conf: RequestConfig,
@@ -212,7 +227,7 @@ export class ClientSDK {
 
     let input;
     try {
-      input = this.#hooks.beforeCreateRequest(context, {
+      input = this.#hooks.beforeCreateRequest(this.hookContext(context), {
         url: reqURL,
         options: {
           ...fetchOptions,
@@ -249,7 +264,8 @@ export class ClientSDK {
       | UnexpectedClientError
     >
   > {
-    const { context, errorCodes } = options;
+    const { errorCodes } = options;
+    const context = this.hookContext(options.context);
 
     return retry(
       async () => {