@mouseless/baked 1.8.2 → 1.8.4

package/dist/module.json

@@ -1,9 +1,9 @@
 {
   "name": "@mouseless/baked",
   "configKey": "baked",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "builder": {
-    "@nuxt/module-builder": "1.0.2",
-    "unbuild": "unknown"
+    "@nuxt/module-builder": "1.0.3",
+    "unbuild": "3.6.1"
   }
 }

package/dist/module.mjs

@@ -64,9 +64,11 @@ const module$1 = defineNuxtModule({
     _nuxt.options.devtools = { enabled: false };
     _nuxt.options.experimental.payloadExtraction = false;
     _nuxt.options.features.inlineStyles = false;
+    _nuxt.options.pages = true;
     _nuxt.options.ssr = false;
     addComponentsDir({ path: resolver.metaUrl.resolve("./runtime/components") });
     addImportsDir(resolver.metaUrl.resolve("./runtime/composables"));
+    addImportsDir(resolver.metaUrl.resolve("./runtime/utils"));
     for (const plugin of app?.plugins ?? []) {
       _nuxt.options.runtimeConfig.public[plugin.name] = plugin;
       addPlugin(resolver[camelize(plugin.resolver ?? "MetaUrl")].resolve(join(plugin.basePath, plugin.name)));

package/dist/runtime/components/Bake.vue

@@ -49,6 +49,9 @@ const context = useContext();
 const dataFetcher = useDataFetcher();
 const { asClasses } = useFormat();
 const reactionHandler = useReactionHandler();
+defineOptions({
+  inheritAttrs: false
+});
 const { name, descriptor } = defineProps({
   name: { type: String, required: true },
   descriptor: { type: null, required: true }

package/dist/runtime/components/Inputs.vue

@@ -31,7 +31,7 @@ const values = computed(
 );
 context.providePath(`${parentPath}/inputs`);
 watch(values, (newValues) => {
-  if (!formMode && inputs.filter((i) => i.default || i.defaultSelfManaged).some((i) => !checkValue(newValues[i.name]))) {
+  if (!formMode && inputs.filter((i) => i.required && (i.default || i.defaultSelfManaged)).some((i) => !checkValue(newValues[i.name]))) {
     return;
   }
   emitChanged();

package/dist/runtime/components/Labeler.vue

@@ -9,6 +9,7 @@
     :pt
     :variant
     :required
+    v-bind="$attrs"
   >
     <template #default>
       <slot />
@@ -26,6 +27,9 @@ import { useContext, useLocalization } from "#imports";
 const context = useContext();
 const { localize: l } = useLocalization({});
 const { localize: lc } = useLocalization({ group: "Labeler" });
+defineOptions({
+  inheritAttrs: false
+});
 const { label } = defineProps({
   label: { type: Object, default: null },
   path: { type: String, required: true },

package/dist/runtime/components/Layout.vue

@@ -11,6 +11,7 @@
     :key="descriptor.type"
     name="root"
     :descriptor="descriptor"
+    v-bind="$attrs"
   >
     <slot />
   </Bake>

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

@@ -11,7 +11,7 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     schema: {
@@ -20,9 +20,11 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {
+    data: any;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 type __VLS_Slots = {
     content?: ((props: {}) => any) | undefined;
 };

package/dist/runtime/components/Message.vue

@@ -47,7 +47,7 @@ import { AwaitLoading, Bake } from "#components";
 const { localize: l } = useLocalization();
 const { schema, data } = defineProps({
   schema: { type: null, required: true },
-  data: { type: null, required: true }
+  data: { type: null, default: null }
 });
 const { action, icon, localizeMessage, severity = "info", size, variant = "outlined" } = schema;
 const sizeClass = computed(() => {

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

@@ -11,7 +11,7 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     schema: {
@@ -20,9 +20,11 @@ declare const __VLS_base: import("vue").DefineComponent<import("vue").ExtractPro
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {
+    data: any;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 type __VLS_Slots = {
     content?: ((props: {}) => any) | undefined;
 };

package/dist/runtime/components/MissingComponent.vue

@@ -77,6 +77,9 @@
 import { computed, ref } from "vue";
 import { Button, Dialog, Panel, Divider } from "primevue";
 import { AwaitLoading } from "#components";
+defineOptions({
+  inheritAttrs: false
+});
 const { schema, data } = defineProps({
   schema: { type: null, required: true },
   data: { type: null, required: true }

package/dist/runtime/components/SimpleForm.vue

@@ -11,7 +11,6 @@
       :header="l(title)"
       :style="{ width: 'min(700px, 90vw)' }"
       :pt="{
-        header: !dialogOptions.message && inputs.length > 0 ? 'pb-0' : '',
         content: 'flex flex-col gap-8'
       }"
       closable

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

@@ -7,7 +7,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     schema: {
@@ -16,6 +16,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {
+    data: any;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/Text.vue

@@ -15,7 +15,7 @@ import { AwaitLoading } from "#components";
 const { truncate } = useFormat();
 const { schema, data: rawData } = defineProps({
   schema: { type: null, required: true },
-  data: { type: null, required: true }
+  data: { type: null, default: null }
 });
 const { maxLength, prop } = schema;
 const data = computed(() => {

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

@@ -7,7 +7,7 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
 }>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     schema: {
@@ -16,6 +16,8 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     };
     data: {
         type: null;
-        required: true;
+        default: null;
     };
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {
+    data: any;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/Validation.vue

@@ -4,6 +4,7 @@
   </template>
   <div
     v-else
+    v-bind="$attrs"
     class="b-Validation flex flex-col gap-2"
   >
     <slot />
@@ -40,6 +41,9 @@
 import { computed } from "vue";
 import { useContext } from "#imports";
 const context = useContext();
+defineOptions({
+  inheritAttrs: false
+});
 const validationHandled = context.injectValidationHandled();
 const validation = context.injectValidation();
 const mutableValidation = context.injectMutableValidation();

package/dist/runtime/composables/useActionExecuter.js

@@ -1,5 +1,6 @@
 import { useRuntimeConfig } from "#app";
 import { useComposableResolver, useDataFetcher, usePathBuilder, useUnref } from "#imports";
+import { bfetch } from "../utils/bfetch.js";
 
 export default function() {
   const actions = {
@@ -87,7 +88,7 @@ function Remote({ actionExecuter }) {
       ? null
       : (action.body ? unref.deepUnref(await dataFetcher.fetch({ data: action.body, contextData })) : { });
 
-    const response = await $fetch(pathBuilder.build(action.path, params), {
+    const response = await bfetch(pathBuilder.build(action.path, params), {
       baseURL: apiBaseURL,
       method: action.method,
       headers: headers,

package/dist/runtime/composables/useDataFetcher.js

@@ -1,5 +1,6 @@
 import { useRuntimeConfig } from "#app";
 import { useComposableResolver, usePathBuilder, useUnref } from "#imports";
+import { bfetch } from "../utils/bfetch.js";
 
 export default function() {
   const datas = {
@@ -136,16 +137,16 @@ function Context() {
   const unref = useUnref();
 
   function get({ data, contextData }) {
-    let result = contextData[data.key];
+    let result = null;
 
-    if(!result) { return null; }
+    if(data.key in contextData) {
+      result = unref.deepUnref(contextData[data.key]);
 
-    result = unref.deepUnref(result);
-
-    if(data.prop) {
-      const path = data.prop.split(".");
-      for(const prop of path) {
-        result = result?.[prop];
+      if(data.prop) {
+        const path = data.prop.split(".");
+        for(const prop of path) {
+          result = result?.[prop];
+        }
       }
     }
 
@@ -195,7 +196,7 @@ function Remote({ parentFetch }) {
       return await fetchWithRetry(path, options, retry);
     }
 
-    return await $fetch(path, { ...options, retry: false });
+    return await bfetch(path, { ...options, retry: false });
   }
 
   async function fetchHeaders({ data, contextData }) {
@@ -226,7 +227,7 @@ function Remote({ parentFetch }) {
     let lastError = null;
     for(let i = -1; i < maxRetry; i++) { // i starts at -1 to allow for the first attempt
       try {
-        return await $fetch(url, { ...options, retry: false });
+        return await bfetch(url, { ...options, retry: false });
       } catch (error) {
         lastError = error;
 

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

@@ -1,3 +1,7 @@
 export default function _default(): {
-    build: (path: any, params: any, { forRoute }?: {}) => any;
+    build: (path: any, params: any, options: any) => any;
+    buildDetailed: (path: any, params: any, { forRoute }?: {}) => {
+        path: any;
+        usedKeys: any[];
+    };
 };

package/dist/runtime/composables/usePathBuilder.js

@@ -1,18 +1,36 @@
 export default function() {
-  function build(path, params, { forRoute } = {}) {
+  function build(path, params, options) {
+    return buildDetailed(path, params, options).path;
+  }
+
+  function buildDetailed(path, params, { forRoute } = {}) {
+    const usedKeys = [];
+
     Object.entries(params).forEach(([key, value]) => {
       // AI-GEN
       // match key ex: either {id} or {id:guid}
       // or
       // match key ex: [id]
-      const regex = forRoute ? new RegExp(`\\[${key}(?::[^\\]]*)?\\]`, "g") : new RegExp(`\\{${key}(?::[^}]*)?\\}`, "g");
-      path = path.replace(regex, value);
+      const regex = forRoute
+        ? new RegExp(`\\[${key}(?::[^\\]]*)?\\]`, "g")
+        : new RegExp(`\\{${key}(?::[^}]*)?\\}`, "g");
+
+      const replaced = path.replace(regex, value);
+      if(replaced !== path) {
+        usedKeys.push(key);
+      }
+
+      path = replaced;
     });
 
-    return path;
+    return {
+      path,
+      usedKeys
+    };
   }
 
   return {
-    build
+    build,
+    buildDetailed
   };
-}
+}

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

@@ -1,3 +1,3 @@
 export default function _default(): {
-    run: ({ route, back, expected, actual, ...params }?: {}) => Promise<void>;
+    run: ({ route, back, expected, actual, query, includeQuery, excludeQuery, ...params }?: {}) => Promise<void>;
 };

package/dist/runtime/composables/useRedirect.js

@@ -3,13 +3,29 @@ import { usePathBuilder } from "#imports";
 
 export default function() {
   const router = useRouter();
-  const { build } = usePathBuilder();
+  const { buildDetailed } = usePathBuilder();
 
-  async function run({ route, back, expected, actual, ...params } = {}) {
+  async function run({ route, back, expected, actual, query, includeQuery, excludeQuery, ...params } = {}) {
     if(expected && actual !== expected) { return; }
 
     if(route && Object.keys(params).length > 0) {
-      route = build(route, params, { forRoute: true });
+      const { path, usedKeys } = buildDetailed(route, params, { forRoute: true });
+      route = path;
+
+      if(query) {
+        const queryParams = Object.fromEntries(
+          Object.entries(params).filter(([key, value]) =>
+            shouldInclude(key, {
+              include: includeQuery,
+              exclude: [...(excludeQuery ?? []), ...usedKeys]
+            }) && value !== undefined && value !== null
+          )
+        );
+
+        if(Object.keys(queryParams).length > 0) {
+          route += `?${new URLSearchParams(queryParams)}`;
+        }
+      }
     }
 
     if(back) {
@@ -19,6 +35,12 @@ export default function() {
     }
   }
 
+  function shouldInclude(key, { include, exclude } = {}) {
+    if(include?.length) return include.includes(key);
+
+    return !exclude?.includes(key);
+  }
+
   return {
     run
   };

package/dist/runtime/composables/useToken.js

@@ -1,5 +1,6 @@
 import { useRuntimeConfig } from "#app";
 import { createError, useMutex } from "#imports";
+import { bfetch } from "../utils/bfetch.js";
 
 export default function() {
   const mutex = useMutex();
@@ -31,7 +32,7 @@ export default function() {
       const token = await current(false);
       if(!token?.accessIsExpired()) { return; }
 
-      const result = await $fetch(auth.refreshApiRoute,
+      const result = await bfetch(auth.refreshApiRoute,
         {
           baseURL: apiBaseURL,
           method: "POST",

package/dist/runtime/plugins/baked.js

@@ -33,6 +33,11 @@ export default defineNuxtPlugin({
           component: () => import("../components/Page.vue")
         });
       });
+
+      // Routes added via addRoute() are not recognized by Vue Router during the
+      // initial navigation. Replacing the current route forces Vue Router to
+      // re evaluate the path against the newly registered routes
+      app.$nuxt.$router.replace(app.$nuxt.$router.currentRoute.value.fullPath);
     }
   }
 });

package/dist/runtime/plugins/fetch.js

@@ -15,7 +15,7 @@ export default defineNuxtPlugin({
     );
 
     // wrap $fetch using interceptors to allow around interception
-    globalThis.$fetch = async(request, options) => {
+    globalThis.bfetch = async(request, options) => {
       // not all requests have headers, query, attributes objects. this might
       // cause interceptors to fail. create fresh empty objects for each request.
       return await interceptors.execute({ request, options: {

package/dist/runtime/utils/bfetch.d.ts

@@ -0,0 +1 @@
+export function bfetch(request: any, options: any): any;

package/dist/runtime/utils/bfetch.js

@@ -0,0 +1,3 @@
+export function bfetch(request, options) {
+  return globalThis.bfetch(request, options);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mouseless/baked",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "Baked is an opinionated framework for .NET and Vue. This is the UI package of Baked project.",
   "keywords": [
     "baked",
@@ -36,8 +36,9 @@
   ],
   "scripts": {
     "prepack": "nuxt-module-build build",
-    "postinstall": "nuxt prepare && nuxi prepare playground",
+    "postinstall": "nuxt prepare",
     "build": "npm run lint && nuxt-module-build build --stub && nuxt-module-build prepare",
+    "dev:prepare": "nuxi prepare playground",
     "dev": "npm run lint && nuxi dev playground --dotenv .env.development --host",
     "test": "npm run lint && playwright test",
     "lint": "eslint ."
@@ -54,13 +55,12 @@
   },
   "devDependencies": {
     "@nuxt/eslint": "1.16.0",
-    "@nuxt/module-builder": "1.0.2",
+    "@nuxt/module-builder": "1.0.3",
     "@nuxt/test-utils": "4.0.3",
     "@playwright/test": "1.61.1",
     "@types/node": "26.1.1",
     "changelogen": "0.6.2",
     "nuxt": "4.5.2",
-    "typescript": "6.0.3",
     "vitest": "4.1.10",
     "vue-tsc": "3.3.7"
   },