apps 0.0.1-beta.65 → 0.0.1-beta.67

package/js/openapi.js

@@ -8,7 +8,7 @@ import {
 import {
   protocolOperations,
   protocolRouter
-} from "./chunk-J2LGI2UN.js";
+} from "./chunk-6RH2UYRB.js";
 import {
   OpenapiCompileError,
   OpenapiCompileErrorCode,
@@ -29,22 +29,24 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-Z33B35HR.js";
+} from "./chunk-5EOB55ID.js";
 import {
   failOnNetworkRefusal
-} from "./chunk-PP2XV753.js";
+} from "./chunk-T3FPHPJJ.js";
 import "./chunk-XBG7HHXC.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-SKDK6FE4.js";
+} from "./chunk-X36WUWBJ.js";
 import {
   accountProviderError,
+  bodyUpstreamError,
   fromPromise,
   httpProviderError,
   method,
+  providerErrorDetail,
   toPromise
-} from "./chunk-3U3S7L4N.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   ApiErrorRecovery,
   ApiErrorResponse,
@@ -66,7 +68,7 @@ import {
 } from "./chunk-KGCTYL2S.js";
 import {
   owned
-} from "./chunk-E6XNNHQ5.js";
+} from "./chunk-3CVQ3VPP.js";
 import {
   FetchHttpClient_exports
 } from "./chunk-PD6I2SDG.js";
@@ -112,16 +114,15 @@ var responseShape = (response) => {
   };
 };
 var bodyRecovery = Schema_exports.decodeUnknownOption(Schema_exports.Struct({ recovery: ApiErrorRecovery }));
-function responseError(response, errors) {
+function errorBody(response) {
   return Effect_exports.gen(function* () {
-    const candidates = errors.filter((error) => error.status === response.status);
-    if (candidates.length === 0 || !/^application\/(?:[\w.-]+\+)?json$/i.test(
+    if (!/^application\/(?:[\w.-]+\+)?json$/i.test(
       response.headers["content-type"]?.split(";")[0]?.trim() ?? ""
     ))
       return;
     const length = response.headers["content-length"];
     if (length !== void 0 && Number(length) > defaultOpenapiErrorLimits.maxBodyBytes) return;
-    const json = yield* response.stream.pipe(
+    return yield* response.stream.pipe(
       Stream_exports.mapError(() => new OpenapiError({ reason: "request", status: response.status })),
       Stream_exports.limitBytes(
         defaultOpenapiErrorLimits.maxBodyBytes,
@@ -132,6 +133,11 @@ function responseError(response, errors) {
       Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonString(Schema_exports.Json))),
       Effect_exports.timeout(defaultOpenapiErrorLimits.readTimeoutMs)
     );
+  }).pipe(Effect_exports.catch(() => Effect_exports.succeed(void 0)));
+}
+function responseError(status, json, errors) {
+  return Effect_exports.gen(function* () {
+    const candidates = errors.filter((error) => error.status === status);
     for (const candidate of candidates) {
       const parsed = yield* Schema_exports.decodeUnknownEffect(candidate.decoder)(json).pipe(Effect_exports.option);
       if (Option_exports.isSome(parsed)) {
@@ -142,7 +148,7 @@ function responseError(response, errors) {
         const recovery = bodyRecovery(parsed.value);
         return new OpenapiResponseError({
           code: candidate.code,
-          status: response.status,
+          status,
           message: message.value.message,
           ...Option_exports.isSome(recovery) ? { recovery: recovery.value.recovery } : {}
         });
@@ -368,8 +374,10 @@ function createRequest(config) {
         if (response.status < 200 || response.status >= 300) {
           const provider = httpProviderError(response.status, response.headers);
           if (provider !== void 0 && provider.reason !== "rejected") return yield* provider;
-          const declared = yield* responseError(response, errors);
-          return yield* declared ?? provider ?? new OpenapiError({ reason: "request", operation, ...responseShape(response) });
+          const json = provider !== void 0 || errors.some((error) => error.status === response.status) ? yield* errorBody(response) : void 0;
+          const declared = json === void 0 ? void 0 : yield* responseError(response.status, json, errors);
+          const upstream = json === void 0 ? void 0 : bodyUpstreamError(json);
+          return yield* declared ?? (provider === void 0 || upstream === void 0 ? provider : providerErrorDetail(provider, { upstream })) ?? new OpenapiError({ reason: "request", operation, ...responseShape(response) });
         }
         if (response.status === 204 || prepared.method === "HEAD") return null;
         const unreadable = new OpenapiError({

package/js/skills.js

@@ -1,11 +1,11 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-IVGA4YM2.js";
+} from "./chunk-AZIV4XRH.js";
 import "./chunk-AQU56EPI.js";
 import {
   failOnNetworkRefusal
-} from "./chunk-PP2XV753.js";
+} from "./chunk-T3FPHPJJ.js";
 import {
   folderSkillsEffect,
   skillFromFiles
@@ -16,7 +16,7 @@ import {
   httpProviderError,
   method,
   toPromise
-} from "./chunk-3U3S7L4N.js";
+} from "./chunk-K2VZ3O27.js";
 import {
   NetworkRefused,
   ProviderError,
@@ -35,7 +35,7 @@ import {
 import {
   wrap
 } from "./chunk-KGCTYL2S.js";
-import "./chunk-E6XNNHQ5.js";
+import "./chunk-3CVQ3VPP.js";
 import {
   FetchHttpClient_exports
 } from "./chunk-PD6I2SDG.js";

package/js/ui/serving.js

@@ -7,7 +7,7 @@ import {
 } from "../chunk-CDXQDN7W.js";
 import {
   CurrentTelemetryConfig
-} from "../chunk-E6XNNHQ5.js";
+} from "../chunk-3CVQ3VPP.js";
 import "../chunk-PD6I2SDG.js";
 import "../chunk-5FHWNLCI.js";
 import "../chunk-H2CJWXA3.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.65",
+  "version": "0.0.1-beta.67",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,