@hostlink/nuxt-light 1.32.4 → 1.33.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.32.4",
+  "version": "1.33.1",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/module.mjs

@@ -336,10 +336,11 @@ const module = defineNuxtModule({
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);
+    const files2 = await resolveFiles(process.cwd() + "/app/models", ["*"]);
     nuxt.options.runtimeConfig.public.light = {
       model: []
     };
-    for (const file of files) {
+    for (const file of [...files, ...files2]) {
       const n1 = "Model_" + file.match(/([a-zA-Z0-9]+)\.ts$/)?.[1];
       addPlugin({
         src: file,

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

@@ -14,6 +14,7 @@ export interface LightModelField {
     field?: (row: any) => string;
     component?: Component;
     componentProps?: any;
+    format?: (value: any) => any;
 }
 export interface LightModelFields {
     [key: string]: LightModelField;

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

@@ -0,0 +1 @@
+export default function (fields: Object): import("#app").AsyncData<void | null, import("#app").NuxtError<unknown> | null> | undefined;

package/dist/runtime/composables/useAsyncObject.js

@@ -0,0 +1,33 @@
+import { toQuery } from "@hostlink/light";
+import { useRoute } from "vue-router";
+import { default as getModelField } from "./getModelField.js";
+import { default as collect } from "./collect.js";
+import { defu } from "defu";
+import { useAsyncData } from "#app";
+export default function(fields) {
+  let route = useRoute();
+  if (!route.name) {
+    return;
+  }
+  const [module, id_name] = route.name.split("-");
+  const id = parseInt(route.params[id_name]);
+  let query = {};
+  const specialFields = {};
+  for (const [key, value] of Object.entries(fields)) {
+    const f = getModelField(module, key);
+    if (f) {
+      query = defu(query, f.getGQLField());
+      specialFields[key] = f;
+    } else {
+      query[key] = value;
+    }
+  }
+  return useAsyncData(async () => {
+    const data = await collect(module, toQuery(query)).where(id_name, id).first();
+    for (const [key, value] of Object.entries(specialFields)) {
+      if (value && typeof value === "object" && "field" in value && typeof value.field === "function") {
+        data[key] = value.field(data);
+      }
+    }
+  });
+}

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

@@ -0,0 +1 @@
+export default function (fields: Object): Promise<any>;

package/dist/runtime/composables/useObject.js

@@ -0,0 +1,22 @@
+import { toQuery } from "@hostlink/light";
+import { useRoute } from "vue-router";
+import { default as getModelField } from "./getModelField.js";
+import { default as collect } from "./collect.js";
+import { defu } from "defu";
+export default async function(fields) {
+  let route = useRoute();
+  if (!route.name) {
+    return;
+  }
+  const [module, id_name] = route.name.split("-");
+  const id = parseInt(route.params[id_name]);
+  let query = {};
+  for (const [key, value] of Object.entries(fields)) {
+    query[key] = value;
+    const f = getModelField(module, key);
+    if (f) {
+      query = defu(query, f.getGQLField());
+    }
+  }
+  return await collect(module, toQuery(query)).where(id_name, id).first();
+}

package/dist/runtime/pages/User/_user_id/view.vue

@@ -1,9 +1,9 @@
 <script setup>
-import { useLight, getObject, m } from "#imports";
+import { useLight, useAsyncObject, m } from "#imports";
 import { useRoute } from "vue-router";
 import { ref } from "vue";
 const route = useRoute();
-const obj = await getObject(["canUpdate"]);
+const { data: obj } = await useAsyncObject({ canUpdate: true, canDelete: true });
 const light = useLight();
 const tab = ref("overview");
 const id = route.params.user_id;
@@ -39,6 +39,7 @@ const reset2fa = async () => {
                 label="Change password"></l-btn>
             <l-btn to="update-role" icon="sym_o_people" permission="user.role.add" label="Update role"></l-btn>
             <l-btn label="Reset 2FA" icon="sym_o_key" permission="user.reset2fa" @click="reset2fa"></l-btn>
+
         </template>
 
         <q-card flat bordered>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.32.4",
+  "version": "1.33.1",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",