@shwfed/nuxt 0.11.10 → 0.11.12

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.11.10",
+  "version": "0.11.12",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/useOverlay.d.ts

@@ -1,6 +1,6 @@
 import { Context, Deferred, Effect, Option, type Scope } from 'effect';
 import { type VNode } from 'vue';
-export type OverlayResult = Option.Option<unknown>;
+export type OverlayResult<T = unknown> = Option.Option<T>;
 export type OverlayShellProps = Readonly<{
     title?: string;
     description?: string;
@@ -42,11 +42,11 @@ type OverlaySession = {
     props: Record<string, unknown>;
     deferred: Deferred.Deferred<OverlayResult, never>;
 };
-export type OverlayHandle = Readonly<{
+export type OverlayHandle<T = unknown> = Readonly<{
     sessionId: string;
     patch: (patch: OverlaySessionPatch) => Effect.Effect<void>;
     close: (...args: [value?: unknown]) => Effect.Effect<void>;
-    result: Effect.Effect<OverlayResult>;
+    result: Effect.Effect<OverlayResult<T>>;
 }>;
 export type OverlayDefinitionNotFoundError = Readonly<{
     _tag: 'OverlayDefinitionNotFoundError';
@@ -64,7 +64,7 @@ export interface OverlayRuntime {
     closeSync: (sessionId: string, ...args: [value?: unknown]) => void;
     closeTopSync: () => void;
     closeAllSync: () => void;
-    open: (definitionId: string, options?: OverlaySessionInput) => Effect.Effect<OverlayHandle, OverlayDefinitionNotFoundError, Scope.Scope>;
+    open: <T>(definitionId: string, options?: OverlaySessionInput) => Effect.Effect<OverlayHandle<T>, OverlayDefinitionNotFoundError, Scope.Scope>;
     patch: (sessionId: string, patch: OverlaySessionPatch) => Effect.Effect<void>;
     close: (sessionId: string, ...args: [value?: unknown]) => Effect.Effect<void>;
     closeTop: () => Effect.Effect<void>;
@@ -75,7 +75,7 @@ export declare class OverlayService extends OverlayService_base {
 }
 export declare function useOverlay(): OverlayRuntime;
 export declare function provideOverlay<A, E, R>(effect: Effect.Effect<A, E, R>, runtime?: OverlayRuntime): Effect.Effect<A, E, Exclude<R, OverlayService>>;
-export declare function openOverlay(definitionId: string, options?: OverlaySessionInput): Effect.Effect<OverlayHandle, OverlayDefinitionNotFoundError, OverlayService | Scope.Scope>;
+export declare function openOverlay<T>(definitionId: string, options?: OverlaySessionInput): Effect.Effect<OverlayHandle<T>, OverlayDefinitionNotFoundError, OverlayService | Scope.Scope>;
 export declare function patchOverlay(sessionId: string, patch: OverlaySessionPatch): Effect.Effect<void, never, OverlayService>;
 export declare function closeOverlay(sessionId: string, ...args: [value?: unknown]): Effect.Effect<void, never, OverlayService>;
 export declare function closeTopOverlay(): Effect.Effect<void, never, OverlayService>;

package/dist/runtime/composables/useOverlay.js

@@ -136,25 +136,8 @@ function createOverlayRuntime() {
       result: Deferred.await(session.deferred)
     };
   }
-  const runtime = {
-    get definitions() {
-      return definitions;
-    },
-    get sessions() {
-      return sessions.value;
-    },
-    get topSession() {
-      return sessions.value.at(-1);
-    },
-    registerDefinition,
-    unregisterDefinition,
-    syncDefinitions,
-    isOpen: (sessionId) => findSessionIndex(sessionId) >= 0,
-    patchSync,
-    closeSync,
-    closeTopSync,
-    closeAllSync,
-    open: (definitionId, options) => Effect.acquireRelease(
+  function open(definitionId, options) {
+    return Effect.acquireRelease(
       Effect.gen(function* () {
         const definition = getDefinition(definitionId);
         if (!definition) {
@@ -194,7 +177,27 @@ function createOverlayRuntime() {
         return createHandle(session);
       }),
       (handle) => closeInternal(handle.sessionId, Option.none())
-    ),
+    );
+  }
+  const runtime = {
+    get definitions() {
+      return definitions;
+    },
+    get sessions() {
+      return sessions.value;
+    },
+    get topSession() {
+      return sessions.value.at(-1);
+    },
+    registerDefinition,
+    unregisterDefinition,
+    syncDefinitions,
+    isOpen: (sessionId) => findSessionIndex(sessionId) >= 0,
+    patchSync,
+    closeSync,
+    closeTopSync,
+    closeAllSync,
+    open,
     patch: (sessionId, patch) => Effect.sync(() => {
       patchSync(sessionId, patch);
     }),

package/dist/runtime/plugins/api/index.d.ts

@@ -1,6 +1,17 @@
+import { Effect } from 'effect';
+type JsonQueryValue = string | number | boolean | null | undefined;
+type JsonOptions = Readonly<{
+    method?: string;
+    headers?: HeadersInit;
+    query?: Readonly<Record<string, JsonQueryValue | ReadonlyArray<JsonQueryValue>>>;
+    body?: FormData | unknown;
+    signal?: AbortSignal;
+}>;
 declare const _default: import("#app").Plugin<{
     api: import("nitropack").$Fetch<unknown, import("nitropack").NitroFetchRequest>;
+    json: <T>(input: string, options?: JsonOptions) => Effect.Effect<T, Error>;
 }> & import("#app").ObjectPlugin<{
     api: import("nitropack").$Fetch<unknown, import("nitropack").NitroFetchRequest>;
+    json: <T>(input: string, options?: JsonOptions) => Effect.Effect<T, Error>;
 }>;
 export default _default;

package/dist/runtime/plugins/api/index.js

@@ -1,5 +1,6 @@
 import { defineNuxtPlugin, useNuxtApp, useRuntimeConfig } from "#app";
 import { useNavigatorLanguage } from "@vueuse/core";
+import { Effect } from "effect";
 import z from "zod";
 let isRedirectingAfterTokenExpiry = false;
 const processedResponses = /* @__PURE__ */ new WeakSet();
@@ -22,7 +23,7 @@ export default defineNuxtPlugin({
         const isExpired = z.boolean().parse($dsl.evaluate`${config.config.api.expired}`({
           status: BigInt(response.status),
           ok: response.ok,
-          data: response._data ?? null
+          data: response.data ?? response._data ?? null
         }));
         if (!isExpired || isRedirectingAfterTokenExpiry) {
           return;
@@ -38,27 +39,82 @@ export default defineNuxtPlugin({
         console.error(e);
       }
     }
+    function applyRequestHeaders(headers) {
+      if (locale.isSupported && locale.language.value) {
+        headers.set("Accept-Language", locale.language.value);
+      }
+      if (typeof config.config?.api?.header === "string") {
+        try {
+          for (const [key, value] of Object.entries(
+            z.record(z.string(), z.string()).parse($dsl.evaluate`${config.config.api.header}`())
+          )) {
+            headers.set(key, value);
+          }
+        } catch (e) {
+          console.error(e);
+        }
+      }
+      const name = config.headers.token || "Authorization";
+      headers.set(name, sessionStorage.getItem("token") ?? "");
+    }
+    function createRequestUrl(input, query) {
+      const url = new URL(input, config.api.host || window.location.href);
+      if (!query) {
+        return url.toString();
+      }
+      for (const [key, value] of Object.entries(query)) {
+        if (value === void 0) {
+          continue;
+        }
+        if (Array.isArray(value)) {
+          for (const entry of value) {
+            if (entry !== void 0) {
+              url.searchParams.append(key, String(entry));
+            }
+          }
+          continue;
+        }
+        url.searchParams.append(key, String(value));
+      }
+      return url.toString();
+    }
+    function createRequestBody(body, headers) {
+      if (body === void 0) {
+        return void 0;
+      }
+      if (body instanceof FormData) {
+        return body;
+      }
+      if (!headers.has("Content-Type")) {
+        headers.set("Content-Type", "application/json");
+      }
+      return JSON.stringify(body);
+    }
+    function toError(error) {
+      if (error instanceof Error) {
+        return error;
+      }
+      return new Error(String(error));
+    }
+    async function handleExpiredFetchResponse(response) {
+      let data = null;
+      try {
+        data = await response.clone().json();
+      } catch {
+        data = null;
+      }
+      handleExpiredResponse({
+        status: response.status,
+        ok: response.ok,
+        data
+      });
+    }
     const api = $fetch.create({
       baseURL: config.api.host,
       onRequest: ({
         options
       }) => {
-        if (locale.isSupported && locale.language.value) {
-          options.headers.set("Accept-Language", locale.language.value);
-        }
-        if (typeof config.config?.api?.header === "string") {
-          try {
-            for (const [key, value] of Object.entries(
-              z.record(z.string(), z.string()).parse($dsl.evaluate`${config.config.api.header}`())
-            )) {
-              options.headers.set(key, value);
-            }
-          } catch (e) {
-            console.error(e);
-          }
-        }
-        const name = config.headers.token || "Authorization";
-        options.headers.set(name, sessionStorage.getItem("token") ?? "");
+        applyRequestHeaders(options.headers);
       },
       onResponse: ({ response }) => {
         handleExpiredResponse(response);
@@ -67,9 +123,34 @@ export default defineNuxtPlugin({
         handleExpiredResponse(response);
       }
     });
+    function json(input, options = {}) {
+      const headers = new Headers(options.headers);
+      applyRequestHeaders(headers);
+      return Effect.tryPromise({
+        try: (signal) => fetch(createRequestUrl(input, options.query), {
+          method: options.method,
+          headers,
+          body: createRequestBody(options.body, headers),
+          signal: options.signal ?? signal
+        }),
+        catch: toError
+      }).pipe(
+        Effect.flatMap((response) => Effect.tryPromise({
+          try: async () => {
+            await handleExpiredFetchResponse(response);
+            if (!response.ok) {
+              throw new Error(`Request failed with status ${response.status}`);
+            }
+            return await response.json();
+          },
+          catch: toError
+        }))
+      );
+    }
     return {
       provide: {
-        api
+        api,
+        json
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.11.10",
+  "version": "0.11.12",
   "description": "",
   "license": "MIT",
   "type": "module",