@markupai/api 0.3.0 → 1.1.0

package/dist/esm/core/fetcher/EndpointSupplier.d.mts

@@ -0,0 +1,12 @@
+import { EndpointMetadata } from "./EndpointMetadata.mjs";
+import { Supplier } from "./Supplier.mjs";
+type EndpointSupplierFn<T> = (arg: {
+    endpointMetadata: EndpointMetadata;
+}) => T | Promise<T>;
+export type EndpointSupplier<T> = Supplier<T> | EndpointSupplierFn<T>;
+export declare const EndpointSupplier: {
+    get: <T>(supplier: EndpointSupplier<T>, arg: {
+        endpointMetadata: EndpointMetadata;
+    }) => Promise<T>;
+};
+export {};

package/dist/esm/core/fetcher/EndpointSupplier.mjs

@@ -0,0 +1,19 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+export const EndpointSupplier = {
+    get: (supplier, arg) => __awaiter(void 0, void 0, void 0, function* () {
+        if (typeof supplier === "function") {
+            return supplier(arg);
+        }
+        else {
+            return supplier;
+        }
+    }),
+};

package/dist/esm/core/fetcher/Fetcher.d.mts

@@ -1,12 +1,13 @@
 import { APIResponse } from "./APIResponse.mjs";
-import { Supplier } from "./Supplier.mjs";
+import { EndpointMetadata } from "./EndpointMetadata.mjs";
+import { EndpointSupplier } from "./EndpointSupplier.mjs";
 export type FetchFunction = <R = unknown>(args: Fetcher.Args) => Promise<APIResponse<R, Fetcher.Error>>;
 export declare namespace Fetcher {
     interface Args {
         url: string;
         method: string;
         contentType?: string;
-        headers?: Record<string, string | Supplier<string | null | undefined> | null | undefined>;
+        headers?: Record<string, string | EndpointSupplier<string | null | undefined> | null | undefined>;
         queryParameters?: Record<string, unknown>;
         body?: unknown;
         timeoutMs?: number;
@@ -16,6 +17,7 @@ export declare namespace Fetcher {
         requestType?: "json" | "file" | "bytes";
         responseType?: "json" | "blob" | "sse" | "streaming" | "text" | "arrayBuffer" | "binary-response";
         duplex?: "half";
+        endpointMetadata?: EndpointMetadata;
     }
     type Error = FailedStatusCodeError | NonJsonError | TimeoutError | UnknownError;
     interface FailedStatusCodeError {

package/dist/esm/core/fetcher/Fetcher.mjs

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { toJson } from "../json.mjs";
 import { createRequestUrl } from "./createRequestUrl.mjs";
+import { EndpointSupplier } from "./EndpointSupplier.mjs";
 import { getErrorResponseBody } from "./getErrorResponseBody.mjs";
 import { getFetchFn } from "./getFetchFn.mjs";
 import { getRequestBody } from "./getRequestBody.mjs";
@@ -16,9 +17,9 @@ import { getResponseBody } from "./getResponseBody.mjs";
 import { makeRequest } from "./makeRequest.mjs";
 import { abortRawResponse, toRawResponse, unknownRawResponse } from "./RawResponse.mjs";
 import { requestWithRetries } from "./requestWithRetries.mjs";
-import { Supplier } from "./Supplier.mjs";
 function getHeaders(args) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const newHeaders = {};
         if (args.body !== undefined && args.contentType != null) {
             newHeaders["Content-Type"] = args.contentType;
@@ -27,7 +28,7 @@ function getHeaders(args) {
             return newHeaders;
         }
         for (const [key, value] of Object.entries(args.headers)) {
-            const result = yield Supplier.get(value);
+            const result = yield EndpointSupplier.get(value, { endpointMetadata: (_a = args.endpointMetadata) !== null && _a !== void 0 ? _a : {} });
             if (typeof result === "string") {
                 newHeaders[key] = result;
                 continue;

package/dist/esm/core/fetcher/index.d.mts

@@ -1,5 +1,7 @@
 export type { APIResponse } from "./APIResponse.mjs";
 export type { BinaryResponse } from "./BinaryResponse.mjs";
+export type { EndpointMetadata } from "./EndpointMetadata.mjs";
+export { EndpointSupplier } from "./EndpointSupplier.mjs";
 export type { Fetcher, FetchFunction } from "./Fetcher.mjs";
 export { fetcher } from "./Fetcher.mjs";
 export { getHeader } from "./getHeader.mjs";

package/dist/esm/core/fetcher/index.mjs

@@ -1,3 +1,4 @@
+export { EndpointSupplier } from "./EndpointSupplier.mjs";
 export { fetcher } from "./Fetcher.mjs";
 export { getHeader } from "./getHeader.mjs";
 export { HttpResponsePromise } from "./HttpResponsePromise.mjs";

package/dist/esm/core/fetcher/requestWithRetries.mjs

@@ -11,21 +11,57 @@ const INITIAL_RETRY_DELAY = 1000; // in milliseconds
 const MAX_RETRY_DELAY = 60000; // in milliseconds
 const DEFAULT_MAX_RETRIES = 2;
 const JITTER_FACTOR = 0.2; // 20% random jitter
-function addJitter(delay) {
-    // Generate a random value between -JITTER_FACTOR and +JITTER_FACTOR
-    const jitterMultiplier = 1 + (Math.random() * 2 - 1) * JITTER_FACTOR;
+function addPositiveJitter(delay) {
+    // Generate a random value between 0 and +JITTER_FACTOR
+    const jitterMultiplier = 1 + Math.random() * JITTER_FACTOR;
     return delay * jitterMultiplier;
 }
+function addSymmetricJitter(delay) {
+    // Generate a random value in a JITTER_FACTOR-sized percentage range around delay
+    const jitterMultiplier = 1 + (Math.random() - 0.5) * JITTER_FACTOR;
+    return delay * jitterMultiplier;
+}
+function getRetryDelayFromHeaders(response, retryAttempt) {
+    // Check for Retry-After header first (RFC 7231), with no jitter
+    const retryAfter = response.headers.get("Retry-After");
+    if (retryAfter) {
+        // Parse as number of seconds...
+        const retryAfterSeconds = parseInt(retryAfter, 10);
+        if (!isNaN(retryAfterSeconds) && retryAfterSeconds > 0) {
+            return Math.min(retryAfterSeconds * 1000, MAX_RETRY_DELAY);
+        }
+        // ...or as an HTTP date; both are valid
+        const retryAfterDate = new Date(retryAfter);
+        if (!isNaN(retryAfterDate.getTime())) {
+            const delay = retryAfterDate.getTime() - Date.now();
+            if (delay > 0) {
+                return Math.min(Math.max(delay, 0), MAX_RETRY_DELAY);
+            }
+        }
+    }
+    // Then check for industry-standard X-RateLimit-Reset header, with positive jitter
+    const rateLimitReset = response.headers.get("X-RateLimit-Reset");
+    if (rateLimitReset) {
+        const resetTime = parseInt(rateLimitReset, 10);
+        if (!isNaN(resetTime)) {
+            // Assume Unix timestamp in epoch seconds
+            const delay = resetTime * 1000 - Date.now();
+            if (delay > 0) {
+                return addPositiveJitter(Math.min(delay, MAX_RETRY_DELAY));
+            }
+        }
+    }
+    // Fall back to exponential backoff, with symmetric jitter
+    return addSymmetricJitter(Math.min(INITIAL_RETRY_DELAY * Math.pow(2, retryAttempt), MAX_RETRY_DELAY));
+}
 export function requestWithRetries(requestFn_1) {
     return __awaiter(this, arguments, void 0, function* (requestFn, maxRetries = DEFAULT_MAX_RETRIES) {
         let response = yield requestFn();
         for (let i = 0; i < maxRetries; ++i) {
             if ([408, 429].includes(response.status) || response.status >= 500) {
-                // Calculate base delay using exponential backoff (in milliseconds)
-                const baseDelay = Math.min(INITIAL_RETRY_DELAY * Math.pow(2, i), MAX_RETRY_DELAY);
-                // Add jitter to the delay
-                const delayWithJitter = addJitter(baseDelay);
-                yield new Promise((resolve) => setTimeout(resolve, delayWithJitter));
+                // Get delay with appropriate jitter applied
+                const delay = getRetryDelayFromHeaders(response, i);
+                yield new Promise((resolve) => setTimeout(resolve, delay));
                 response = yield requestFn();
             }
             else {

package/dist/esm/core/file/exports.d.mts

@@ -1 +1 @@
-export { Uploadable } from "./types.mjs";
+export type { Uploadable } from "./types.mjs";

package/dist/esm/core/headers.d.mts

@@ -1,3 +1,2 @@
-import * as core from "./index.mjs";
-export declare function mergeHeaders(...headersArray: (Record<string, string | core.Supplier<string | null | undefined> | null | undefined> | null | undefined)[]): Record<string, string | core.Supplier<string | null | undefined>>;
-export declare function mergeOnlyDefinedHeaders(...headersArray: (Record<string, string | core.Supplier<string | null | undefined> | null | undefined> | null | undefined)[]): Record<string, string | core.Supplier<string | null | undefined>>;
+export declare function mergeHeaders<THeaderValue>(...headersArray: (Record<string, THeaderValue> | null | undefined)[]): Record<string, string | THeaderValue>;
+export declare function mergeOnlyDefinedHeaders<THeaderValue>(...headersArray: (Record<string, THeaderValue> | null | undefined)[]): Record<string, THeaderValue>;

package/dist/esm/version.d.mts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.3.0";
+export declare const SDK_VERSION = "1.1.0";

package/dist/esm/version.mjs

@@ -1 +1 @@
-export const SDK_VERSION = "0.3.0";
+export const SDK_VERSION = "1.1.0";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@markupai/api",
-    "version": "0.3.0",
+    "version": "1.1.0",
     "private": false,
     "repository": "github:markupai/markup-ai-typescript-sdk",
     "license": "Apache-2.0",
@@ -31,23 +31,18 @@
     ],
     "scripts": {
         "format": "prettier . --write --ignore-unknown",
-        "build": "yarn build:cjs && yarn build:esm",
+        "build": "pnpm build:cjs && pnpm build:esm",
         "build:cjs": "tsc --project ./tsconfig.cjs.json",
         "build:esm": "tsc --project ./tsconfig.esm.json && node scripts/rename-to-esm-files.js dist/esm",
-        "test": "jest --config jest.config.mjs",
-        "test:unit": "jest --selectProjects unit",
-        "test:browser": "jest --selectProjects browser",
-        "test:wire": "jest --selectProjects wire"
+        "test": "vitest",
+        "test:unit": "vitest --project unit",
+        "test:wire": "vitest --project wire"
     },
     "devDependencies": {
         "webpack": "^5.97.1",
         "ts-loader": "^9.5.1",
-        "jest": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@types/jest": "^29.5.14",
-        "ts-jest": "^29.3.4",
-        "jest-environment-jsdom": "^29.7.0",
-        "msw": "^2.8.4",
+        "vitest": "^3.2.4",
+        "msw": "2.11.2",
         "@types/node": "^18.19.70",
         "prettier": "^3.4.2",
         "typescript": "~5.7.2"
@@ -58,7 +53,7 @@
         "path": false,
         "stream": false
     },
-    "packageManager": "yarn@1.22.22",
+    "packageManager": "pnpm@10.14.0",
     "engines": {
         "node": ">=18.0.0"
     },

package/reference.md

@@ -372,7 +372,7 @@ await client.styleChecks.createStyleCheck({
 <dl>
 <dd>
 
-**request:** `MarkupAI.CreateStyleCheckV1StyleChecksPostRequest`
+**request:** `MarkupAI.StyleCheckRequestBody`
 
 </dd>
 </dl>
@@ -504,7 +504,7 @@ await client.styleSuggestions.createStyleSuggestion({
 <dl>
 <dd>
 
-**request:** `MarkupAI.CreateStyleSuggestionV1StyleSuggestionsPostRequest`
+**request:** `MarkupAI.StyleSuggestionRequestBody`
 
 </dd>
 </dl>
@@ -636,7 +636,7 @@ await client.styleRewrites.createStyleRewrite({
 <dl>
 <dd>
 
-**request:** `MarkupAI.CreateStyleRewriteV1StyleRewritesPostRequest`
+**request:** `MarkupAI.StyleRewriteRequestBody`
 
 </dd>
 </dl>