@shwfed/nuxt 0.11.5 → 0.11.7

package/dist/module.d.mts

@@ -1,4 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
+export { FieldsInstance } from '../dist/runtime/components/fields-instance.js';
 
 type Wrap<T> = T extends object ? Readonly<{
     [P in keyof T]?: Wrap<T[P]>;
@@ -11,6 +12,12 @@ type Config = Wrap<{
          * @type DSL - Record<string, string>
          */
         header: string;
+        /**
+         * 配置 API 响应是否表示 token 已过期
+         *
+         * @type DSL - bool
+         */
+        expired: string;
     };
 }>;
 interface Env {
@@ -45,6 +52,7 @@ declare global {
         readonly NUXT_PUBLIC_TOKEN_HEADER_NAME?: string;
     }
 }
+
 declare const _default: _nuxt_schema.NuxtModule<_nuxt_schema.ModuleOptions, _nuxt_schema.ModuleOptions, false>;
 
 export { _default as default };

package/dist/module.json

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

package/dist/runtime/components/button.d.vue.ts

@@ -1,4 +1,5 @@
 import { Effect } from 'effect';
+import type { OverlayBodyRender } from '../composables/useOverlay.js';
 import type { ButtonConfigInput } from './ui/buttons/schema.js';
 export { ButtonActionC, ButtonBodyC, ButtonBodyInputC, ButtonConfigC, ButtonConfigInputC, ButtonDropdownC, ButtonGroupC, ButtonModalC, ButtonsStyleC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createButtonConfig, } from './ui/buttons/schema.js';
 export type { ButtonAction, ButtonBody, ButtonBodyInput, ButtonConfig, ButtonConfigInput, ButtonDropdown, ButtonDropdownAction, ButtonGroup, ButtonGroupItem, ButtonModal, } from './ui/buttons/schema.js';
@@ -151,7 +152,7 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
         style?: string | undefined;
     }>) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    [x: string]: ((props: any) => any) | undefined;
+    [name: string]: OverlayBodyRender;
 }>;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/button.vue

@@ -9,6 +9,7 @@ const props = defineProps({
   config: { type: null, required: false }
 });
 const emit = defineEmits(["update:config"]);
+const slots = defineSlots();
 const defaultConfig = createButtonConfig({
   gap: 12,
   groups: []
@@ -53,7 +54,7 @@ export { ButtonActionService, currentButtonAction } from "../composables/useButt
     @update:config="handleConfigUpdate"
   >
     <template
-      v-for="(_, slotName) in $slots"
+      v-for="(_, slotName) in slots"
       #[slotName]="slotProps"
     >
       <slot

package/dist/runtime/components/button.vue.d.ts

@@ -1,4 +1,5 @@
 import { Effect } from 'effect';
+import type { OverlayBodyRender } from '../composables/useOverlay.js';
 import type { ButtonConfigInput } from './ui/buttons/schema.js';
 export { ButtonActionC, ButtonBodyC, ButtonBodyInputC, ButtonConfigC, ButtonConfigInputC, ButtonDropdownC, ButtonGroupC, ButtonModalC, ButtonsStyleC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createButtonConfig, } from './ui/buttons/schema.js';
 export type { ButtonAction, ButtonBody, ButtonBodyInput, ButtonConfig, ButtonConfigInput, ButtonDropdown, ButtonDropdownAction, ButtonGroup, ButtonGroupItem, ButtonModal, } from './ui/buttons/schema.js';
@@ -151,7 +152,7 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
         style?: string | undefined;
     }>) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    [x: string]: ((props: any) => any) | undefined;
+    [name: string]: OverlayBodyRender;
 }>;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/fields-instance.d.ts

@@ -0,0 +1,3 @@
+export type FieldsInstance = {
+    valid: import('effect').Effect.Effect<boolean, never>;
+};

package/dist/runtime/components/fields.d.vue.ts

@@ -1,7 +1,8 @@
 import { Effect } from 'effect';
 import { type FieldsConfigInput } from './ui/fields/Fields.vue.js';
 export { CalendarFieldC, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, NumberFieldC, SelectFieldC, SlotFieldC, StringFieldC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createFieldsConfig, } from './ui/fields/Fields.vue.js';
-export type { EmptyField, Field, FieldsInstance, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { FieldsInstance } from './fields-instance.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

package/dist/runtime/components/fields.vue.d.ts

@@ -1,7 +1,8 @@
 import { Effect } from 'effect';
 import { type FieldsConfigInput } from './ui/fields/Fields.vue.js';
 export { CalendarFieldC, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, NumberFieldC, SelectFieldC, SlotFieldC, StringFieldC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createFieldsConfig, } from './ui/fields/Fields.vue.js';
-export type { EmptyField, Field, FieldsInstance, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { FieldsInstance } from './fields-instance.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

package/dist/runtime/components/ui/buttons/Buttons.d.vue.ts

@@ -1,4 +1,5 @@
 import { Effect } from 'effect';
+import { type OverlayBodyRender } from '../../../composables/useOverlay.js';
 import { type ButtonConfigInput } from './schema.js';
 export { ButtonActionC, ButtonConfigC, ButtonConfigInputC, ButtonDropdownC, ButtonGroupC, ButtonModalC, ButtonsStyleC } from './schema.js';
 export { ButtonBodyC, ButtonBodyInputC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createButtonConfig, } from './schema.js';
@@ -7,7 +8,7 @@ export type { ButtonAction, ButtonBody, ButtonBodyInput, ButtonConfig, ButtonCon
 export type { ButtonActionEffect, ButtonActionEffectFactory, ButtonActionRuntime } from '../../../composables/useButtonAction.js';
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: import("vue").DefineComponent<{
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
     config: Effect.Effect<ButtonConfigInput | undefined>;
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:config": (args_0: Readonly<{
@@ -151,4 +152,11 @@ declare const __VLS_export: import("vue").DefineComponent<{
         gap?: number | undefined;
         style?: string | undefined;
     }>) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
+    [name: string]: OverlayBodyRender;
+}>;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/ui/buttons/Buttons.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useNuxtApp } from "#app";
-import { useAttrs, computed, onBeforeUnmount, ref, useSlots, watch } from "vue";
+import { useAttrs, computed, onBeforeUnmount, ref, watch } from "vue";
 import { computedAsync } from "@vueuse/core";
 import { Icon } from "@iconify/vue";
 import { Effect } from "effect";
@@ -9,7 +9,10 @@ import { useCheating } from "#imports";
 import {
   ButtonActionService
 } from "../../../composables/useButtonAction";
-import { provideOverlay, useOverlay } from "../../../composables/useOverlay";
+import {
+  provideOverlay,
+  useOverlay
+} from "../../../composables/useOverlay";
 import { getLocalizedText, hasVisibleLocaleValue } from "../../../utils/coders";
 import { cn } from "../../../utils/cn";
 import ButtonConfiguratorDialog from "../button-configurator/ButtonConfiguratorDialog.vue";
@@ -35,7 +38,7 @@ const defaultConfig = createButtonConfig({
 });
 const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
 const attrs = useAttrs();
-const slots = useSlots();
+const slots = defineSlots();
 const { locale, t } = useI18n();
 const { $dsl } = useNuxtApp();
 const overlay = useOverlay();

package/dist/runtime/components/ui/buttons/Buttons.vue.d.ts

@@ -1,4 +1,5 @@
 import { Effect } from 'effect';
+import { type OverlayBodyRender } from '../../../composables/useOverlay.js';
 import { type ButtonConfigInput } from './schema.js';
 export { ButtonActionC, ButtonConfigC, ButtonConfigInputC, ButtonDropdownC, ButtonGroupC, ButtonModalC, ButtonsStyleC } from './schema.js';
 export { ButtonBodyC, ButtonBodyInputC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createButtonConfig, } from './schema.js';
@@ -7,7 +8,7 @@ export type { ButtonAction, ButtonBody, ButtonBodyInput, ButtonConfig, ButtonCon
 export type { ButtonActionEffect, ButtonActionEffectFactory, ButtonActionRuntime } from '../../../composables/useButtonAction.js';
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: import("vue").DefineComponent<{
+declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
     config: Effect.Effect<ButtonConfigInput | undefined>;
 }, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:config": (args_0: Readonly<{
@@ -151,4 +152,11 @@ declare const __VLS_export: import("vue").DefineComponent<{
         gap?: number | undefined;
         style?: string | undefined;
     }>) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
+    [name: string]: OverlayBodyRender;
+}>;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/runtime/components/ui/fields/Fields.d.vue.ts

@@ -2,9 +2,7 @@ import { Effect } from 'effect';
 import type { CSSProperties } from 'vue';
 export { CalendarFieldC, CURRENT_COMPATIBILITY_DATE, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, KIND, NumberFieldC, SelectFieldC, SlotFieldC, SUPPORTED_COMPATIBILITY_DATES, StringFieldC, ValidationRuleC, createFieldsConfig, validationC, } from './schema.js';
 export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, ValidationRule, } from './schema.js';
-export type FieldsInstance = {
-    valid: import('effect').Effect.Effect<boolean, never>;
-};
+export type { FieldsInstance } from '../../fields-instance.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

package/dist/runtime/components/ui/fields/Fields.vue.d.ts

@@ -2,9 +2,7 @@ import { Effect } from 'effect';
 import type { CSSProperties } from 'vue';
 export { CalendarFieldC, CURRENT_COMPATIBILITY_DATE, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, KIND, NumberFieldC, SelectFieldC, SlotFieldC, SUPPORTED_COMPATIBILITY_DATES, StringFieldC, ValidationRuleC, createFieldsConfig, validationC, } from './schema.js';
 export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, ValidationRule, } from './schema.js';
-export type FieldsInstance = {
-    valid: import('effect').Effect.Effect<boolean, never>;
-};
+export type { FieldsInstance } from '../../fields-instance.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

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

@@ -1,6 +1,8 @@
 import { defineNuxtPlugin, useNuxtApp, useRuntimeConfig } from "#app";
 import { useNavigatorLanguage } from "@vueuse/core";
 import z from "zod";
+let isRedirectingAfterTokenExpiry = false;
+const processedResponses = /* @__PURE__ */ new WeakSet();
 export default defineNuxtPlugin({
   name: "shwfed-nuxt:api",
   dependsOn: ["shwfed-nuxt:cel"],
@@ -8,6 +10,34 @@ export default defineNuxtPlugin({
     const locale = useNavigatorLanguage();
     const config = useRuntimeConfig().public.shwfed;
     const { $dsl } = useNuxtApp();
+    function handleExpiredResponse(response) {
+      if (processedResponses.has(response)) {
+        return;
+      }
+      processedResponses.add(response);
+      if (typeof config.config?.api?.expired !== "string") {
+        return;
+      }
+      try {
+        const isExpired = z.boolean().parse($dsl.evaluate`${config.config.api.expired}`({
+          status: BigInt(response.status),
+          ok: response.ok,
+          data: response._data ?? null
+        }));
+        if (!isExpired || isRedirectingAfterTokenExpiry) {
+          return;
+        }
+        isRedirectingAfterTokenExpiry = true;
+        sessionStorage.removeItem("token");
+        if (config.api.logout) {
+          window.location.href = config.api.logout;
+          return;
+        }
+        console.warn("[shwfed-nuxt:api] token expired but no logout url configured");
+      } catch (e) {
+        console.error(e);
+      }
+    }
     const api = $fetch.create({
       baseURL: config.api.host,
       onRequest: ({
@@ -29,6 +59,12 @@ export default defineNuxtPlugin({
         }
         const name = config.headers.token || "Authorization";
         options.headers.set(name, sessionStorage.getItem("token") ?? "");
+      },
+      onResponse: ({ response }) => {
+        handleExpiredResponse(response);
+      },
+      onResponseError: ({ response }) => {
+        handleExpiredResponse(response);
       }
     });
     return {

package/dist/types.d.mts

@@ -4,6 +4,8 @@ import type { default as Module } from './module.mjs'
 
 export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>
 
+export { type FieldsInstance } from '../dist/runtime/components/fields-instance.js'
+
 export { default } from './module.mjs'
 
 export { type Env } from './module.mjs'

package/package.json

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