@merkaly/nuxt 0.2.4 → 0.3.0

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "0.2.4",
+  "version": "0.3.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/auth.vue

@@ -8,6 +8,7 @@ const code = params.get("code");
 const error = params.get("error");
 const invitation = params.get("invitation");
 const organization = params.get("organization");
+const redirect = params.get("redirect");
 function handleInvite() {
   return $auth0.loginWithRedirect({ authorizationParams: { organization, invitation } });
 }
@@ -32,7 +33,9 @@ callOnce(async () => {
   if (code) {
     return handleCode();
   }
-  return $auth0.loginWithRedirect();
+  return $auth0.loginWithRedirect({
+    appState: { target: redirect || "/" }
+  });
 });
 </script>
 

package/dist/runtime/components/format/FormatAddress.d.vue.ts

@@ -60,10 +60,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     code: string;
     city: string;
     country: string;
-    line1: string;
-    line2: string;
     locality: string;
     state: string;
+    line1: string;
+    line2: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/format/FormatAddress.vue.d.ts

@@ -60,10 +60,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     code: string;
     city: string;
     country: string;
-    line1: string;
-    line2: string;
     locality: string;
     state: string;
+    line1: string;
+    line2: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/format/FormatMoney.d.vue.ts

@@ -61,10 +61,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     mode: keyof Intl.NumberFormatOptionsStyleRegistry;
     base: number;
     tag: string;
+    value: number;
     currency: string;
     hideDecimal: boolean;
     locale: string;
-    value: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/format/FormatMoney.vue.d.ts

@@ -61,10 +61,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     mode: keyof Intl.NumberFormatOptionsStyleRegistry;
     base: number;
     tag: string;
+    value: number;
     currency: string;
     hideDecimal: boolean;
     locale: string;
-    value: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

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

@@ -81,8 +81,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>, {
     mode: PlaceTypes;
     disabled: boolean;
-    placeholder: string;
     countries: string[];
+    placeholder: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

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

@@ -81,8 +81,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
 }>, {
     mode: PlaceTypes;
     disabled: boolean;
-    placeholder: string;
     countries: string[];
+    placeholder: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

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

@@ -75,10 +75,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     "onUpdate:modelValue"?: ((value: Numberish) => any) | undefined;
 }>, {
     prefix: string;
-    decimal: string;
+    placeholder: string;
     max: number;
     min: number;
-    placeholder: string;
+    decimal: string;
     precision: number;
     suffix: string;
     thousands: string;

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

@@ -75,10 +75,10 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     "onUpdate:modelValue"?: ((value: Numberish) => any) | undefined;
 }>, {
     prefix: string;
-    decimal: string;
+    placeholder: string;
     max: number;
     min: number;
-    placeholder: string;
+    decimal: string;
     precision: number;
     suffix: string;
     thousands: string;

package/dist/runtime/components/table/TableDatagrid.d.vue.ts

@@ -0,0 +1,80 @@
+import type { DataGrid } from '../../composables/useDatagrid.js';
+declare const __VLS_export: <G>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<{
+        modelValue: DataGrid<G>;
+    } & import("vue").ExtractPublicPropTypes<{
+        emptyText: {
+            type: StringConstructor;
+            default: () => string;
+        };
+        hideFooter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+        hidePagination: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+        hideSelect: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+    }> & {
+        "onUpdate:modelValue"?: ((value: DataGrid<G>) => any) | undefined;
+        onFetch?: ((reason: "sort" | "filter" | "search" | "paginate" | "refresh") => any) | undefined;
+        "onToggle:item"?: ((item: G, expanded: boolean) => any) | undefined;
+    }> & (typeof globalThis extends {
+        __VLS_PROPS_FALLBACK: infer P;
+    } ? P : {});
+    expose: (exposed: {}) => void;
+    attrs: any;
+    slots: {
+        [x: `head[${string}]`]: ((props: {
+            column: import("../../composables/useDatagrid.js").ColumnDefinition<G>;
+            key: string;
+        }) => any) | undefined;
+    } & {
+        [x: `row[${string}]`]: ((props: {
+            column: import("../../composables/useDatagrid.js").ColumnDefinition<G>;
+            idx: number;
+            item: G;
+            key: string;
+        }) => any) | undefined;
+    } & {
+        search?: (props: {}) => any;
+    } & {
+        toolbar?: (props: {}) => any;
+    } & {
+        filters?: (props: {}) => any;
+    } & {
+        empty?: (props: {}) => any;
+    } & {
+        actions?: (props: {
+            index: number;
+            item: G;
+        }) => any;
+    } & {
+        details?: (props: {
+            index: number;
+            item: G;
+            toggleDetails: () => void;
+        }) => any;
+    } & {
+        tfoot?: (props: {}) => any;
+    } & {
+        footer?: (props: {}) => any;
+    };
+    emit: {
+        (e: "fetch", reason: "sort" | "filter" | "search" | "paginate" | "refresh"): void;
+        (e: "toggle:item", item: G, expanded: boolean): void;
+    } & ((evt: "update:modelValue", value: DataGrid<G>) => void);
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_PrettifyLocal<T> = (T extends any ? {
+    [K in keyof T]: T[K];
+} : {
+    [K in keyof T as K]: T[K];
+}) & {};

package/dist/runtime/components/table/TableDatagrid.vue.d.ts

@@ -0,0 +1,80 @@
+import type { DataGrid } from '../../composables/useDatagrid.js';
+declare const __VLS_export: <G>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<{
+        modelValue: DataGrid<G>;
+    } & import("vue").ExtractPublicPropTypes<{
+        emptyText: {
+            type: StringConstructor;
+            default: () => string;
+        };
+        hideFooter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+        hidePagination: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+        hideSelect: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+    }> & {
+        "onUpdate:modelValue"?: ((value: DataGrid<G>) => any) | undefined;
+        onFetch?: ((reason: "sort" | "filter" | "search" | "paginate" | "refresh") => any) | undefined;
+        "onToggle:item"?: ((item: G, expanded: boolean) => any) | undefined;
+    }> & (typeof globalThis extends {
+        __VLS_PROPS_FALLBACK: infer P;
+    } ? P : {});
+    expose: (exposed: {}) => void;
+    attrs: any;
+    slots: {
+        [x: `head[${string}]`]: ((props: {
+            column: import("../../composables/useDatagrid.js").ColumnDefinition<G>;
+            key: string;
+        }) => any) | undefined;
+    } & {
+        [x: `row[${string}]`]: ((props: {
+            column: import("../../composables/useDatagrid.js").ColumnDefinition<G>;
+            idx: number;
+            item: G;
+            key: string;
+        }) => any) | undefined;
+    } & {
+        search?: (props: {}) => any;
+    } & {
+        toolbar?: (props: {}) => any;
+    } & {
+        filters?: (props: {}) => any;
+    } & {
+        empty?: (props: {}) => any;
+    } & {
+        actions?: (props: {
+            index: number;
+            item: G;
+        }) => any;
+    } & {
+        details?: (props: {
+            index: number;
+            item: G;
+            toggleDetails: () => void;
+        }) => any;
+    } & {
+        tfoot?: (props: {}) => any;
+    } & {
+        footer?: (props: {}) => any;
+    };
+    emit: {
+        (e: "fetch", reason: "sort" | "filter" | "search" | "paginate" | "refresh"): void;
+        (e: "toggle:item", item: G, expanded: boolean): void;
+    } & ((evt: "update:modelValue", value: DataGrid<G>) => void);
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_PrettifyLocal<T> = (T extends any ? {
+    [K in keyof T]: T[K];
+} : {
+    [K in keyof T as K]: T[K];
+}) & {};

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

@@ -1,4 +1,4 @@
-interface ColumnDefinition<C = unknown> {
+export interface ColumnDefinition<C = unknown> {
     class?: string;
     getter?: (row: C) => any;
     tdClass?: string;

package/dist/runtime/middleware/auth.js

@@ -16,5 +16,7 @@ export default defineNuxtRouteMiddleware((to) => {
   if (isAuthenticated.value) {
     return;
   }
-  return navigateTo(merkaly.auth0.callbackUrl);
+  const redirect = to.fullPath;
+  const callbackUrl = redirect === "/" ? merkaly.auth0.callbackUrl : `${merkaly.auth0.callbackUrl}?redirect=${encodeURIComponent(redirect)}`;
+  return navigateTo(callbackUrl);
 });

package/dist/runtime/plugins/auth0.client.js

@@ -51,6 +51,10 @@ export default defineNuxtPlugin(async ({ callHook, hook }) => {
       return $api("/identities", { method: "POST", prefix: "/", body });
     });
   };
-  Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then(() => hook("app:created", () => callHook("merkaly:auth", user.value))).catch(() => void 0).finally(() => isLoading.value = false);
+  const isAuthCallback = window.location.pathname === $config.merkaly.auth0.callbackUrl;
+  if (!isAuthCallback) {
+    await Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then(() => hook("app:created", () => callHook("merkaly:auth", user.value))).catch(() => void 0);
+  }
+  isLoading.value = false;
   return { provide: { auth0 } };
 });

package/dist/runtime/utils/withAdapter.js

@@ -4,8 +4,11 @@ export const withAdapter = (callback) => (args) => {
   return useApi((executionParams) => {
     const config = args?.(executionParams) || {};
     const { params: initialParams = {}, ...hooks } = config;
-    const mergedParams = defu(executionParams, initialParams);
+    const mergedParams = defu(executionParams, { ...initialParams });
     const adapterResult = callback(mergedParams);
+    if (adapterResult.body && typeof adapterResult.body === "object" && !(adapterResult.body instanceof FormData)) {
+      adapterResult.body = { ...adapterResult.body };
+    }
     return defu(hooks, adapterResult);
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"
@@ -27,9 +27,23 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "nuxt-module-build build",
+    "build:stub": "nuxt-module-build build --stub",
+    "dev": "pnpm dev:prepare && cd playground && pnpm storybook",
+    "dev:build": "nuxi build playground",
+    "dev:prepare": "pnpm build:stub && nuxi prepare playground",
+    "lint": "eslint .",
+    "prepack": "pnpm build",
+    "prepare": "nuxt-module-build prepare",
+    "release": "pnpm lint && pnpm test && pnpm build && changelogen --release && npm publish --access public && git push --follow-tags",
+    "test": "vitest run",
+    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
+    "test:watch": "vitest watch"
+  },
   "dependencies": {
     "@auth0/auth0-spa-js": "^2.14.0",
-    "@bootstrap-vue-next/nuxt": "^0.42.0",
+    "@bootstrap-vue-next/nuxt": "^0.43.0",
     "@nuxt/devtools": "^3.1.0",
     "@nuxt/eslint": "1.13.0",
     "@nuxt/eslint-config": "^1.13.0",
@@ -44,7 +58,7 @@
     "@vueuse/integrations": "^14.2.0",
     "@vueuse/nuxt": "^14.2.0",
     "bootstrap": "^5.3.8",
-    "bootstrap-vue-next": "^0.42.0",
+    "bootstrap-vue-next": "^0.43.0",
     "change-case": "^5",
     "eslint": "^9.39.1",
     "filesize": "^11.0.2",
@@ -72,17 +86,5 @@
   },
   "engines": {
     "node": ">=20.0.0"
-  },
-  "scripts": {
-    "build": "nuxt-module-build build",
-    "build:stub": "nuxt-module-build build --stub",
-    "dev": "pnpm dev:prepare && cd playground && pnpm storybook",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "pnpm build:stub && nuxi prepare playground",
-    "lint": "eslint .",
-    "release": "pnpm lint && pnpm test && pnpm build && changelogen --release && npm publish --access public && git push --follow-tags",
-    "test": "vitest run",
-    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
-    "test:watch": "vitest watch"
   }
-}
+}