@jskit-ai/http-runtime 0.1.243 → 0.1.244

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/http-runtime",
-  "version": "0.1.243",
+  "version": "0.1.244",
   "type": "module",
   "scripts": {
     "test": "node --test --test-concurrency=1"
@@ -11,10 +11,6 @@
     "./shared/validators/errorResponses": "./src/shared/validators/errorResponses.js",
     "./shared/validators/jsonApiResult": "./src/shared/validators/jsonApiResult.js",
     "./shared/validators/jsonApiRouteTransport": "./src/shared/validators/jsonApiRouteTransport.js",
-    "./shared/validators/paginationQuery": "./src/shared/validators/paginationQuery.js",
-    "./shared/validators/command": "./src/shared/validators/command.js",
-    "./shared/validators/resource": "./src/shared/validators/resource.js",
-    "./shared/validators/operationMessages": "./src/shared/validators/operationMessages.js",
     "./shared/validators/operationValidation": "./src/shared/validators/operationValidation.js"
   },
   "dependencies": {
@@ -23,36 +19,15 @@
   "jskit": {
     "kind": "runtime",
     "capabilities": {
-      "provides": [
-        "validators.http",
-        "runtime.http-client"
-      ],
+      "provides": [],
       "requires": []
     },
     "runtime": {
       "server": {
-        "providers": [
-          {
-            "entrypoint": "src/server/providers/HttpValidatorsProvider.js",
-            "export": "HttpValidatorsProvider"
-          },
-          {
-            "entrypoint": "src/server/providers/HttpClientProvider.js",
-            "export": "HttpClientProvider"
-          }
-        ]
+        "providers": []
       },
       "client": {
-        "providers": [
-          {
-            "entrypoint": "src/client/providers/HttpValidatorsClientProvider.js",
-            "export": "HttpValidatorsClientProvider"
-          },
-          {
-            "entrypoint": "src/client/providers/HttpClientRuntimeClientProvider.js",
-            "export": "HttpClientRuntimeClientProvider"
-          }
-        ]
+        "providers": []
       }
     },
     "metadata": {
@@ -60,11 +35,7 @@
         "surfaces": [
           {
             "subpath": "./client",
-            "summary": "Exports HTTP client runtime APIs (createHttpClient and transport helpers) plus client providers."
-          },
-          {
-            "subpath": "./server",
-            "summary": "Provides named HTTP validation and server-side HTTP client capabilities."
+            "summary": "Exports HTTP client runtime APIs (createHttpClient, createTransientRetryHttpClient and transport helpers)."
           },
           {
             "subpath": "./shared",
@@ -78,6 +49,6 @@
     }
   },
   "peerDependencies": {
-    "@jskit-ai/kernel": "0.1.245"
+    "@jskit-ai/kernel": "0.1.246"
   }
 }

package/src/client/index.js

@@ -7,9 +7,8 @@ export {
 } from "./validationErrors.js";
 export {
   createHttpError,
-  createNetworkError
+  createNetworkError,
+  isGenericHttpErrorMessage
 } from "../shared/clientRuntime/errors.js";
 export { DEFAULT_RETRYABLE_CSRF_ERROR_CODES, shouldRetryForCsrfFailure } from "../shared/clientRuntime/retry.js";
 export { normalizeHeaderName, hasHeader, setHeaderIfMissing } from "../shared/clientRuntime/headers.js";
-export { HttpValidatorsClientProvider } from "./providers/HttpValidatorsClientProvider.js";
-export { HttpClientRuntimeClientProvider } from "./providers/HttpClientRuntimeClientProvider.js";

package/src/shared/clientRuntime/client.js

@@ -762,67 +762,11 @@ function createHttpClient(options = {}) {
     csrfTokenCache = "";
   }
 
-  function resetForTests() {
-    csrfTokenCache = "";
-    csrfFetchPromise = null;
-  }
-
-  function get(url, requestOptions = {}) {
-    return request(url, {
-      ...requestOptions,
-      method: "GET"
-    });
-  }
-
-  function post(url, body, requestOptions = {}) {
-    return request(url, {
-      ...requestOptions,
-      method: "POST",
-      body
-    });
-  }
-
-  function put(url, body, requestOptions = {}) {
-    return request(url, {
-      ...requestOptions,
-      method: "PUT",
-      body
-    });
-  }
-
-  function patch(url, body, requestOptions = {}) {
-    return request(url, {
-      ...requestOptions,
-      method: "PATCH",
-      body
-    });
-  }
-
-  function del(url, requestOptions = {}) {
-    return request(url, {
-      ...requestOptions,
-      method: "DELETE"
-    });
-  }
-
   return {
     request,
     requestStream,
     ensureCsrfToken,
-    clearCsrfTokenCache,
-    resetForTests,
-    get,
-    post,
-    put,
-    patch,
-    delete: del,
-    __testables: {
-      fetchSessionForCsrf,
-      updateCsrfTokenFromPayload,
-      createHttpError,
-      createNetworkError,
-      readNdjsonStream
-    }
+    clearCsrfTokenCache
   };
 }
 

package/src/shared/clientRuntime/errors.js

@@ -9,6 +9,42 @@ function standardErrorMessage(payload = {}) {
   return String(payload.error || payload.message || nestedMessage || "").trim();
 }
 
+function genericHttpErrorMessage(status) {
+  return `Request failed with status ${status}.`;
+}
+
+function resolveErrorStatus(error) {
+  if (error == null || typeof error !== "object") {
+    return null;
+  }
+
+  const hasStatus = Object.prototype.hasOwnProperty.call(error, "status");
+  const hasStatusCode = Object.prototype.hasOwnProperty.call(error, "statusCode");
+  if (!hasStatus && !hasStatusCode) {
+    return null;
+  }
+
+  const status = Number(hasStatus ? error.status : error.statusCode);
+  return Number.isInteger(status) ? status : null;
+}
+
+// True when the error carries only the transport's own wording (a network
+// failure or the status-only message createHttpError falls back to), so a
+// caller's specific fallback copy is more useful than the message.
+function isGenericHttpErrorMessage(error) {
+  const normalizedMessage = String(error?.message || "").trim();
+  if (!normalizedMessage) {
+    return false;
+  }
+
+  const status = resolveErrorStatus(error);
+  if (status === 0) {
+    return true;
+  }
+
+  return status != null && status >= 400 && normalizedMessage === genericHttpErrorMessage(status);
+}
+
 function createHttpError(response, data = {}) {
   const payload = isRecord(data) ? data : {};
   const message = standardErrorMessage(payload);
@@ -17,7 +53,7 @@ function createHttpError(response, data = {}) {
     return createHttpError(response, jsonApiPayload);
   }
 
-  const error = new Error(message || `Request failed with status ${response.status}.`);
+  const error = new Error(message || genericHttpErrorMessage(response.status));
   const normalizedFieldErrors = resolveFieldErrors(payload);
   error.status = Number(response?.status || 0);
   error.code = String(payload.code || "").trim() || null;
@@ -50,5 +86,6 @@ function createNetworkError(cause) {
 
 export {
   createHttpError,
-  createNetworkError
+  createNetworkError,
+  isGenericHttpErrorMessage
 };

package/src/shared/clientRuntime/jsonApiResourceTransport.js

@@ -1,4 +1,4 @@
-import { normalizeArray, normalizeObject, normalizeText, normalizeTransactionOutcome } from "@jskit-ai/kernel/shared/support/normalize";
+import { isRecord, normalizeArray, normalizeObject, normalizeText, normalizeTransactionOutcome } from "@jskit-ai/kernel/shared/support/normalize";
 import {
   JSON_API_CONTENT_TYPE,
   createJsonApiDocument,
@@ -12,10 +12,6 @@ import {
   simplifyJsonApiResourceWithRelationshipIds
 } from "../support/jsonApiSimplify.js";
 
-function isRecord(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
 function normalizeTransportKind(transport = null) {
   return String(transport?.kind || "").trim().toLowerCase();
 }
@@ -137,25 +133,26 @@ function simplifyRelationshipResource(linkage = {}, options = {}) {
 
 function simplifyResourceObject(resource = {}, options = {}) {
   const normalizedResource = isRecord(resource) ? normalizeObject(resource) : {};
-  const simplified = simplifyJsonApiResourceWithRelationshipIds(normalizedResource, {
-    lookupFieldMap: options.lookupFieldMap || null
-  });
-  const lookupContainerKey = normalizeText(options.lookupContainerKey, {
-    fallback: "lookups"
-  });
-  const lookupFieldMap = options.lookupFieldMap || null;
-  const resourceKey = `${normalizeText(normalizedResource.type)}:${normalizeText(normalizedResource.id)}`;
-  if (resourceKey && options.inFlightKeys?.has(resourceKey)) {
-    return simplified;
-  }
+  const type = normalizeText(normalizedResource.type);
+  const id = normalizeText(normalizedResource.id);
+  const resourceKey = type && id ? `${type}:${id}` : "";
   if (resourceKey && options.resourceCache?.has(resourceKey)) {
     return options.resourceCache.get(resourceKey);
   }
 
+  const lookupFieldMap = options.lookupFieldMap || null;
+  const simplified = simplifyJsonApiResourceWithRelationshipIds(normalizedResource, { lookupFieldMap });
+  if (resourceKey && options.inFlightKeys?.has(resourceKey)) {
+    return simplified;
+  }
   if (resourceKey) {
     options.inFlightKeys?.add(resourceKey);
   }
 
+  const lookupContainerKey = normalizeText(options.lookupContainerKey, {
+    fallback: "lookups"
+  });
+
   const lookups = {};
   for (const [relationshipName, relationshipValue] of Object.entries(normalizeObject(normalizedResource.relationships))) {
     const relationshipData = relationshipValue?.data;
@@ -234,6 +231,18 @@ function decodeJsonApiResourceResponse(payload, transport = null) {
   }
 
   const document = normalizeJsonApiDocument(payload);
+  if (document.kind === "unknown") {
+    throw new Error("Expected JSON:API response document.");
+  }
+
+  if (normalizedTransport.responseKind === "meta") {
+    if (document.kind !== "meta") {
+      throw new Error("Expected JSON:API meta document.");
+    }
+
+    return isRecord(document.meta) ? document.meta : {};
+  }
+
   const simplifyOptions = {
     lookupContainerKey: normalizedTransport.lookupContainerKey,
     lookupFieldMap: normalizedTransport.lookupFieldMap,
@@ -241,9 +250,6 @@ function decodeJsonApiResourceResponse(payload, transport = null) {
     resourceCache: new Map(),
     inFlightKeys: new Set()
   };
-  if (document.kind === "unknown") {
-    throw new Error("Expected JSON:API response document.");
-  }
 
   if (normalizedTransport.responseKind === "collection") {
     if (document.kind !== "collection") {
@@ -260,26 +266,8 @@ function decodeJsonApiResourceResponse(payload, transport = null) {
     };
   }
 
-  if (normalizedTransport.responseKind === "meta") {
-    if (document.kind !== "meta") {
-      throw new Error("Expected JSON:API meta document.");
-    }
-
-    return isRecord(document.meta) ? document.meta : {};
-  }
-
-  if (normalizedTransport.responseKind === "nullable-record") {
-    if (document.kind !== "resource") {
-      throw new Error("Expected JSON:API resource document.");
-    }
-
-    if (document.data != null) {
-      assertPrimaryDataType(document.data, normalizedTransport.responseType);
-    }
-
-    return document.data == null ? null : simplifyResourceObject(document.data, simplifyOptions);
-  }
-
+  // "record" and "nullable-record" (and any other kind) decode the same resource document;
+  // the server success schema, not this decoder, is what forbids null data for "record".
   if (document.kind !== "resource") {
     throw new Error("Expected JSON:API resource document.");
   }

package/src/shared/index.js

@@ -1,4 +1,3 @@
-export { createPaginationQuerySchema } from "./validators/paginationQuery.js";
 export {
   fieldErrorsFieldDefinition,
   apiErrorDetailsSchema,
@@ -10,27 +9,9 @@ export {
   fastifyDefaultErrorTransportSchema,
   STANDARD_ERROR_STATUS_CODES,
   createTransportResponseSchema,
-  passthroughErrorResponses,
-  withStandardErrorResponses,
-  enumSchema
+  withStandardErrorResponses
 } from "./validators/errorResponses.js";
-export {
-  createCursorPagedListResponseSchema,
-  createResource
-} from "./validators/resource.js";
-export { createCommand } from "./validators/command.js";
-export {
-  resolveSchemaMessages,
-  resolveFieldSchema,
-  resolveIssueField,
-  resolveMissingRequiredFields,
-  resolveIssueMessageFromSchema,
-  mapOperationIssues
-} from "./validators/operationMessages.js";
-export {
-  validateOperationSection,
-  validateOperationInput
-} from "./validators/operationValidation.js";
+export { validateOperationSection } from "./validators/operationValidation.js";
 export {
   JSON_API_CONTENT_TYPE,
   createJsonApiDocument,

package/src/shared/validators/errorResponses.js

@@ -114,10 +114,6 @@ const sharedErrorTransportDefinitions = {
   ...embeddedApiErrorTransportSchema.definitions
 };
 
-function passthroughErrorResponses(successResponses) {
-  return successResponses;
-}
-
 function withStandardErrorResponses(successResponses, { includeValidation400 = false } = {}) {
   const responses = {
     ...successResponses
@@ -152,12 +148,6 @@ function withStandardErrorResponses(successResponses, { includeValidation400 = f
   return responses;
 }
 
-function enumSchema(values) {
-  return {
-    anyOf: values.map((value) => ({ const: value }))
-  };
-}
-
 export {
   fieldErrorsFieldDefinition,
   apiErrorDetailsSchema,
@@ -169,7 +159,5 @@ export {
   fastifyDefaultErrorTransportSchema,
   STANDARD_ERROR_STATUS_CODES,
   createTransportResponseSchema,
-  passthroughErrorResponses,
-  withStandardErrorResponses,
-  enumSchema
+  withStandardErrorResponses
 };

package/src/shared/validators/jsonApiQueryTransport.js

@@ -1,4 +1,4 @@
-import { normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { isRecord, normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import {
   normalizeJsonApiFieldList,
   normalizeJsonApiFieldsets
@@ -12,10 +12,6 @@ const JSON_API_QUERY_SORT_KEY = "sort";
 const JSON_API_FILTER_PREFIX = "filter[";
 const JSON_API_FIELDS_PREFIX = "fields[";
 
-function isRecord(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
 function normalizeQueryKey(key = "") {
   return String(key || "").trim();
 }

package/src/shared/validators/jsonApiRouteTransport.js

@@ -1,5 +1,4 @@
-import { normalizeArray } from "@jskit-ai/kernel/shared/support/normalize";
-import { normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { isRecord, normalizeArray, normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import {
   resolveSchemaTransportSchemaDefinition
 } from "@jskit-ai/kernel/shared/validators";
@@ -134,10 +133,6 @@ const JSON_API_ERROR_DOCUMENT_SCHEMA = Object.freeze({
   }
 });
 
-function isRecord(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
 function createJsonApiTransportError(statusCode, message, code) {
   const error = new Error(String(message || "JSON:API transport error."));
   error.status = Number(statusCode) || 500;
@@ -492,10 +487,7 @@ function createJsonApiResourceSuccessTransportSchema({
   );
 
   const documentProperties = {};
-  const documentDefinitions = {
-    ...resourceTransport.definitions,
-    ...embeddedResource.definitions
-  };
+  const documentDefinitions = { ...embeddedResource.definitions };
 
   if (normalizedKind === "collection") {
     documentProperties.data = {
@@ -683,6 +675,35 @@ function createJsonApiResourceRouteTransport({
     return createJsonApiResourceObject(resourceOptions);
   }
 
+  // Collections always resolve meta (falling back to the nextCursor page meta); records add
+  // meta only when the caller supplies getDocumentMeta.
+  function buildDocumentOptions(sourcePayload, context, data, { resolveMeta = null } = {}) {
+    const documentOptions = { data };
+
+    if (typeof getIncluded === "function") {
+      const included = normalizeArray(getIncluded(sourcePayload, context));
+      if (included.length > 0) {
+        documentOptions.included = included;
+      }
+    }
+
+    if (typeof getDocumentLinks === "function") {
+      const links = getDocumentLinks(sourcePayload, context);
+      if (links !== undefined) {
+        documentOptions.links = links;
+      }
+    }
+
+    if (typeof resolveMeta === "function") {
+      const meta = resolveMeta(sourcePayload, context);
+      if (meta !== undefined) {
+        documentOptions.meta = meta;
+      }
+    }
+
+    return documentOptions;
+  }
+
   return Object.freeze({
     kind: "jsonapi-resource",
     contentType: JSON_API_CONTENT_TYPE,
@@ -801,26 +822,12 @@ function createJsonApiResourceRouteTransport({
 
       if (normalizedSuccessKind === "collection") {
         const items = normalizeArray(resolveCollectionItems(sourcePayload, context));
-        const documentOptions = {
-          data: items.map((entry) => buildResourceObject(entry, context))
-        };
-
-        if (typeof getIncluded === "function") {
-          const included = normalizeArray(getIncluded(sourcePayload, context));
-          if (included.length > 0) {
-            documentOptions.included = included;
-          }
-        }
-
-        const links = typeof getDocumentLinks === "function" ? getDocumentLinks(sourcePayload, context) : undefined;
-        if (links !== undefined) {
-          documentOptions.links = links;
-        }
-
-        const meta = resolveDocumentMeta(sourcePayload, context);
-        if (meta !== undefined) {
-          documentOptions.meta = meta;
-        }
+        const documentOptions = buildDocumentOptions(
+          sourcePayload,
+          context,
+          items.map((entry) => buildResourceObject(entry, context)),
+          { resolveMeta: resolveDocumentMeta }
+        );
 
         return createJsonApiDocument(documentOptions);
       }
@@ -835,30 +842,12 @@ function createJsonApiResourceRouteTransport({
         throw createJsonApiTransportError(500, "JSON:API resource response requires a record payload.", "jsonapi_record_missing");
       }
 
-      const documentOptions = {
-        data: buildResourceObject(sourcePayload, context)
-      };
-
-      if (typeof getIncluded === "function") {
-        const included = normalizeArray(getIncluded(sourcePayload, context));
-        if (included.length > 0) {
-          documentOptions.included = included;
-        }
-      }
-
-      if (typeof getDocumentLinks === "function") {
-        const links = getDocumentLinks(sourcePayload, context);
-        if (links !== undefined) {
-          documentOptions.links = links;
-        }
-      }
-
-      if (typeof getDocumentMeta === "function") {
-        const meta = getDocumentMeta(sourcePayload, context);
-        if (meta !== undefined) {
-          documentOptions.meta = meta;
-        }
-      }
+      const documentOptions = buildDocumentOptions(
+        sourcePayload,
+        context,
+        buildResourceObject(sourcePayload, context),
+        { resolveMeta: getDocumentMeta }
+      );
 
       return createJsonApiDocument(documentOptions);
     },

package/src/shared/validators/jsonApiTransport.js

@@ -1,12 +1,8 @@
-import { normalizeArray, normalizeObject, normalizeText, normalizeTransactionOutcome } from "@jskit-ai/kernel/shared/support/normalize";
+import { isRecord, normalizeArray, normalizeObject, normalizeText, normalizeTransactionOutcome } from "@jskit-ai/kernel/shared/support/normalize";
 import { simplifyJsonApiResourceWithRelationshipIds } from "../support/jsonApiSimplify.js";
 
 const JSON_API_CONTENT_TYPE = "application/vnd.api+json";
 
-function isRecord(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
 function normalizeMediaType(contentType = "") {
   return String(contentType || "")
     .split(";")[0]

package/src/shared/validators/operationValidation.js

@@ -8,41 +8,18 @@ function resolveOperationSection(operation = {}, section = "body") {
   return operation[section] == null ? null : operation[section];
 }
 
-function buildValidationSuccessResult(value) {
-  return {
-    ok: true,
-    value,
-    normalized: value,
-    fieldErrors: {},
-    globalErrors: [],
-    issues: []
-  };
-}
-
 function isFieldValidationError(error) {
   return Boolean(error?.fieldErrors && typeof error.fieldErrors === "object");
 }
 
-function buildValidationFailureResult(error, normalized) {
-  return {
-    ok: false,
-    value: null,
-    normalized,
-    fieldErrors: error.fieldErrors,
-    globalErrors: [],
-    issues: []
-  };
-}
-
 function validateOperationSection({
   operation = {},
   section = "body",
-  value,
-  context = {}
+  value
 } = {}) {
   const sectionDefinition = resolveOperationSection(operation, section);
   if (!sectionDefinition) {
-    return buildValidationSuccessResult(value);
+    return { ok: true, value, fieldErrors: {} };
   }
 
   try {
@@ -51,78 +28,14 @@ function validateOperationSection({
       context: `operation section "${section}"`
     });
 
-    return buildValidationSuccessResult(normalized);
+    return { ok: true, value: normalized, fieldErrors: {} };
   } catch (error) {
     if (!isFieldValidationError(error)) {
       throw error;
     }
 
-    return buildValidationFailureResult(error, value);
+    return { ok: false, value: null, fieldErrors: error.fieldErrors };
   }
 }
 
-function validateOperationInput({
-  operation = {},
-  input = {},
-  context = {}
-} = {}) {
-  const source = input && typeof input === "object" && !Array.isArray(input) ? input : {};
-  const sectionResults = {
-    params: validateOperationSection({
-      operation,
-      section: "params",
-      value: source.params,
-      context
-    }),
-    query: validateOperationSection({
-      operation,
-      section: "query",
-      value: source.query,
-      context
-    }),
-    body: validateOperationSection({
-      operation,
-      section: "body",
-      value: source.body,
-      context
-    })
-  };
-
-  const fieldErrors = {
-    ...sectionResults.params.fieldErrors,
-    ...sectionResults.query.fieldErrors,
-    ...sectionResults.body.fieldErrors
-  };
-
-  const globalErrors = [
-    ...sectionResults.params.globalErrors,
-    ...sectionResults.query.globalErrors,
-    ...sectionResults.body.globalErrors
-  ];
-
-  return {
-    ok: sectionResults.params.ok && sectionResults.query.ok && sectionResults.body.ok,
-    value: {
-      params: sectionResults.params.value,
-      query: sectionResults.query.value,
-      body: sectionResults.body.value
-    },
-    normalized: {
-      params: sectionResults.params.normalized,
-      query: sectionResults.query.normalized,
-      body: sectionResults.body.normalized
-    },
-    fieldErrors,
-    globalErrors,
-    issues: [
-      ...sectionResults.params.issues,
-      ...sectionResults.query.issues,
-      ...sectionResults.body.issues
-    ]
-  };
-}
-
-export {
-  validateOperationSection,
-  validateOperationInput
-};
+export { validateOperationSection };