@merkaly/nuxt 0.13.0 → 0.13.2

package/README.md

@@ -67,7 +67,7 @@ export default defineNuxtPlugin(() => {
 });
 ```
 
-A loader returns an adapter (`withAdapter()` result, preferably with `immediate: false`, the bootstrap runs it), a promise or a plain value. An adapter with an api error, or a rejected promise, fails the stage. Every stage is optional: an app without loaders skips it.
+A loader returns an adapter (`withAdapter()` result, preferably with `immediate: false`, the bootstrap runs it), a promise or a plain value. An adapter with an api error, an empty `data`, or a rejected promise, fails the stage. The adapter `data` may be typed `T | undefined` (the usual `default: () => undefined`). Every stage is optional: an app without loaders skips it.
 
 Two composables hold the state, shared by the whole app:
 

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.14.0"
   },
-  "version": "0.13.0",
+  "version": "0.13.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/input/InputDropzone.d.vue.ts

@@ -101,10 +101,10 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
 }>, {
     title: string;
     disabled: boolean;
+    multiple: boolean;
     accept: string[];
     hint: string;
     maxSize: number;
-    multiple: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/input/InputDropzone.vue.d.ts

@@ -101,10 +101,10 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
 }>, {
     title: string;
     disabled: boolean;
+    multiple: boolean;
     accept: string[];
     hint: string;
     maxSize: number;
-    multiple: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/input/InputSearch.d.vue.ts

@@ -7,8 +7,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         type: import("vue").PropType<string>;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:modelValue": (value: string) => any;
     change: () => any;
+    "update:modelValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     debounce: {
         type: NumberConstructor;
@@ -18,8 +18,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         type: import("vue").PropType<string>;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: string) => any) | undefined;
     onChange?: (() => any) | undefined;
+    "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
     debounce: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/input/InputSearch.vue.d.ts

@@ -7,8 +7,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         type: import("vue").PropType<string>;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:modelValue": (value: string) => any;
     change: () => any;
+    "update:modelValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     debounce: {
         type: NumberConstructor;
@@ -18,8 +18,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
         type: import("vue").PropType<string>;
     };
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: string) => any) | undefined;
     onChange?: (() => any) | undefined;
+    "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
     debounce: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/internal/bootstrap.js

@@ -1,10 +1,10 @@
 import { useAuth } from "../composables/useAuth.js";
 import { inApp, runBootstrapStage, useBootstrapState } from "./state.js";
 export const runBootstrap = async (nuxtApp) => {
-  const { error, fail, isAuthenticated, token } = inApp(nuxtApp, useAuth);
+  const { error, fail, isAuthenticated, token } = await inApp(nuxtApp, useAuth);
   if (error.value || nuxtApp.payload.error) return;
-  const failStage = (stage) => {
-    const reason = inApp(nuxtApp, () => useBootstrapState(stage)).error.value;
+  const failStage = async (stage) => {
+    const reason = (await inApp(nuxtApp, () => useBootstrapState(stage))).error.value;
     return fail({ message: reason?.message || `${stage} failed`, stage, status: reason?.status });
   };
   if (!await runBootstrapStage(nuxtApp, "organization")) return failStage("organization");

package/dist/runtime/internal/state.d.ts

@@ -11,10 +11,14 @@ export interface BootstrapError {
     status?: number;
 }
 interface AdapterLike<T> {
-    data: Ref<T>;
-    error: Ref<unknown>;
+    readonly data: {
+        readonly value: T | null | undefined;
+    };
+    readonly error: {
+        readonly value: unknown;
+    };
     execute: () => Promise<void>;
-    loading: Ref<boolean>;
+    readonly loading: Ref<boolean>;
 }
 export type BootstrapLoader<T = unknown> = () => T | Promise<T> | AdapterLike<T>;
 export interface BootstrapLoaders {
@@ -25,7 +29,7 @@ interface StageData {
     organization: MerkalyOrganization;
     user: MerkalyUser;
 }
-export declare const inApp: <T>(nuxtApp: NuxtApp, fn: () => T) => T;
+export declare const inApp: <T>(nuxtApp: NuxtApp, fn: () => T) => Promise<T>;
 export declare const registerBootstrapLoaders: (nuxtApp: NuxtApp, loaders: BootstrapLoaders) => void;
 export declare const useBootstrapState: <S extends BootstrapStage>(stage: S) => {
     data: Ref<StageData[S] | undefined, StageData[S] | undefined>;

package/dist/runtime/internal/state.js

@@ -1,6 +1,6 @@
 import { computed, useState } from "#imports";
 import { until } from "@vueuse/core";
-export const inApp = (nuxtApp, fn) => nuxtApp.runWithContext(fn);
+export const inApp = async (nuxtApp, fn) => await nuxtApp.runWithContext(fn);
 const registry = /* @__PURE__ */ new WeakMap();
 export const registerBootstrapLoaders = (nuxtApp, loaders) => {
   registry.set(nuxtApp, { ...registry.get(nuxtApp), ...loaders });
@@ -24,13 +24,14 @@ const resolveLoader = async (nuxtApp, loader) => {
   if (result.loading.value) await until(result.loading).toBe(false);
   else await result.execute();
   if (result.error.value) throw result.error.value;
+  if (result.data.value == null) throw new Error("Empty response");
   return result.data.value;
 };
-export const runBootstrapStage = (nuxtApp, stage, { force = false } = {}) => {
+export const runBootstrapStage = async (nuxtApp, stage, { force = false } = {}) => {
   const loader = registry.get(nuxtApp)?.[stage];
-  const { data, error, status } = inApp(nuxtApp, () => useBootstrapState(stage));
-  if (!loader) return Promise.resolve(true);
-  if (status.value === "success" && !force) return Promise.resolve(true);
+  const { data, error, status } = await inApp(nuxtApp, () => useBootstrapState(stage));
+  if (!loader) return true;
+  if (status.value === "success" && !force) return true;
   status.value = "pending";
   error.value = void 0;
   return resolveLoader(nuxtApp, loader).then((value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"