@hostlink/nuxt-light 1.54.0 → 1.54.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.54.0",
+  "version": "1.54.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -366,10 +366,11 @@ const module$1 = defineNuxtModule({
       path: resolver.resolve("./runtime/components")
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
+    const files0 = await resolveFiles(resolver.resolve("./runtime/models"), ["*"]);
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);
     const files2 = await resolveFiles(process.cwd() + "/app/models", ["*"]);
     let content = "";
-    for (const file of [...files, ...files2]) {
+    for (const file of [...files0, ...files, ...files2]) {
       content += `(await import('${file}')).default();
 `;
     }
@@ -381,6 +382,7 @@ const module$1 = defineNuxtModule({
 export default defineNuxtPlugin({
   name: 'light-model-plugin',
   async setup (nuxtApp) {
+      
       ${content}
   }
 })`

package/dist/runtime/composables/defineLightModel.js

@@ -1,6 +1,7 @@
 import { getApiClient } from "@hostlink/light";
+const client = getApiClient();
 export default (model) => {
   return () => {
-    getApiClient().models.create(model.name, model.fields);
+    client.models.create(model.name, model.fields);
   };
 };

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

@@ -1,7 +1,179 @@
-import type { Model } from '@hostlink/light';
 import type { LTableColumn } from "../components/l-table.vue.js";
-interface LModel extends Model {
-    columns(fields: string[]): Array<LTableColumn>;
-}
-declare const _default: (name: string) => LModel;
+declare const _default: (name: string) => Omit<{
+    field: (f: string) => import("@hostlink/light").Field | null;
+    $fields: Record<string, import("@hostlink/light").Field>;
+    setDataPath(path: string): string;
+    getDataPath(): string;
+    gqlFields(fields: (string | object)[]): Record<string, any>;
+    update(id: number, data: Object): Promise<any>;
+    delete(id: number): Promise<any>;
+    add(data: Object): Promise<any>;
+    fields(fields: string[]): import("@hostlink/light").Field[];
+    get(filters: any, fields: import("@hostlink/light").Fields): Promise<any>;
+    list(fields: Record<string, any>): {
+        fetch(): Promise<any[]>;
+        fetchFirst(): Promise<any>;
+        first(): Promise<any>;
+        all(): Promise<any[]>;
+        fetchWithMeta(): Promise<any>;
+        dataPath(dataPath?: string): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        sort(sortStr: string): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        filters(filterObj: Record<string, any>): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        where(key: string, opOrVal?: any, maybeVal?: any): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        whereContains(field: string, val: any): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        whereIn(field: string, vals: any[]): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        whereBetween(field: string, min: any, max: any): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        limit(n: number): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        offset(n: number): {
+            first(): Promise<any>;
+            all(): Promise<any[]>;
+            fetchFirst(): Promise<any>;
+            fetchWithMeta(): Promise<any>;
+            fetch(): Promise<any[]>;
+            dataPath(dataPath?: string): any;
+            sort(sortStr: string): any;
+            filters(filterObj: Record<string, any>): any;
+            where(key: string, opOrVal?: any, maybeVal?: any): any;
+            whereContains(field: string, val: any): any;
+            whereIn(field: string, vals: any[]): any;
+            whereBetween(field: string, min: any, max: any): any;
+            limit(n: number): any;
+            offset(n: number): any;
+            toQuery(includeMeta?: boolean): any;
+        };
+        toQuery(includeMeta?: boolean): any;
+    };
+}, never> & Omit<{
+    columns(fields: string[] | {
+        [key: string]: boolean;
+    }): Array<LTableColumn>;
+}, never> & {};
 export default _default;

package/dist/runtime/composables/model.js

@@ -1,7 +1,9 @@
-import { useGlobalModel } from "@hostlink/light";
+import { getApiClient } from "@hostlink/light";
+import defu from "defu";
 export default (name) => {
-  const m = useGlobalModel().getModel(name);
-  return Object.assign(m, {
+  const client = getApiClient();
+  const m = client.model(name);
+  return defu(m, {
     columns(fields) {
       let columns = [];
       if (!Array.isArray(fields)) {

package/dist/runtime/composables/useRoles.js

@@ -1,6 +1,6 @@
 import { computed } from "vue";
 import useLight from "./useLight.js";
-import q from "./q";
+import { query } from "@hostlink/light";
 export default function useRoles() {
   const light = useLight();
   const roles = computed(() => light.myRoles || []);
@@ -19,9 +19,9 @@ export default function useRoles() {
     return wanted.every((r) => light.myRoles.includes(r));
   }
   async function reload() {
-    const data = await q({
+    const data = await query({
       my: {
-        roles
+        roles: true
       }
     });
     const newRoles = (data?.my?.roles || []).map((r) => r.role || r);

package/dist/runtime/models/CustomField.d.ts

@@ -1,26 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        model: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        type: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        validation: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/CustomField.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "CustomField",
   fields: {
     name: {
@@ -22,4 +23,4 @@ export default {
       searchable: true
     }
   }
-};
+});

package/dist/runtime/models/EventLog.d.ts

@@ -1,38 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        eventlog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            autoWidth: boolean;
-        };
-        class: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        action: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        created_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/EventLog.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "EventLog",
   fields: {
     eventlog_id: {
@@ -34,4 +35,4 @@ export default {
       searchable: true
     }
   }
-};
+});

package/dist/runtime/models/MailLog.d.ts

@@ -1,34 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        maillog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-            autoWidth: boolean;
-        };
-        from: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        to: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        subject: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        created_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/MailLog.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "MailLog",
   fields: {
     maillog_id: {
@@ -30,4 +31,4 @@ export default {
       searchType: "date"
     }
   }
-};
+});

package/dist/runtime/models/SystemValue.d.ts

@@ -1,14 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        value: {
-            label: string;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/SystemValue.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "SystemValue",
   fields: {
     name: {
@@ -10,4 +11,4 @@ export default {
       label: "Value"
     }
   }
-};
+});

package/dist/runtime/models/User.d.ts

@@ -1,71 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        Name: {
-            label: string;
-            gql: {
-                first_name: boolean;
-                last_name: boolean;
-            };
-            format: (row: any) => string;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            required: boolean;
-        };
-        first_name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        last_name: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        email: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        phone: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        join_date: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        roles: {
-            label: string;
-            format: (value: any) => any;
-        };
-        status: {
-            label: string;
-            searchable: boolean;
-            searchType: string;
-            searchOptions: {
-                label: string;
-                value: number;
-            }[];
-            format: (value: any) => string | undefined;
-        };
-        has2FA: {
-            label: string;
-            format: (value: any) => "" | "✔️";
-        };
-        _test2: {
-            label: string;
-            component: any;
-            componentProps: (a: any) => {
-                test: any;
-            };
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/User.js

@@ -1,5 +1,5 @@
-import MyTest from "../components/MyTest.vue";
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "User",
   fields: {
     Name: {
@@ -75,15 +75,6 @@ export default {
       format: (value) => {
         return value ? "\u2714\uFE0F" : "";
       }
-    },
-    _test2: {
-      label: "Test",
-      component: MyTest,
-      componentProps: (a) => {
-        return {
-          test: a.username
-        };
-      }
     }
   }
-};
+});

package/dist/runtime/models/UserLog.d.ts

@@ -1,51 +1,2 @@
-declare const _default: {
-    name: string;
-    fields: {
-        userlog_id: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            autoWidth: boolean;
-        };
-        username: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        login_dt: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-        logout_dt: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-        };
-        result: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-            searchOptions: {
-                label: string;
-                value: string;
-            }[];
-            autoWidth: boolean;
-        };
-        user_agent: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            whiteSpace: string;
-        };
-        last_access_time: {
-            label: string;
-            sortable: boolean;
-            searchable: boolean;
-            searchType: string;
-        };
-    };
-};
+declare const _default: () => void;
 export default _default;

package/dist/runtime/models/UserLog.js

@@ -1,4 +1,5 @@
-export default {
+import { defineLightModel } from "#imports";
+export default defineLightModel({
   name: "UserLog",
   fields: {
     userlog_id: {
@@ -44,7 +45,7 @@ export default {
       label: "User agent",
       sortable: true,
       searchable: true,
-      whiteSpace: "pre-line"
+      style: "white-space:pre-wrap;"
     },
     last_access_time: {
       label: "Last access time",
@@ -53,4 +54,4 @@ export default {
       searchType: "date"
     }
   }
-};
+});

package/dist/runtime/pages/User/add.vue

@@ -37,10 +37,10 @@ const options = [
   { label: "Active", value: 0 },
   { label: "Inactive", value: 1 }
 ];
-const tt = await q({
-  app: ["languages"]
+const { app } = await q({
+  app: { languages: true }
 });
-const languages = tt.app.languages.map((lang) => {
+const languages = app.languages.map((lang) => {
   return {
     label: lang.name,
     value: lang.value
@@ -50,7 +50,7 @@ const languages = tt.app.languages.map((lang) => {
 
 <template>
     <l-page>
-        
+
         <FormKit type="l-form" :value="obj">
             <l-row class="col">
                 <l-col md="6">

package/dist/runtime/plugin.js

@@ -1,6 +1,6 @@
 import QMarkdownVuePlugin from "@quasar/quasar-ui-qmarkdown";
 import "@quasar/quasar-ui-qmarkdown/dist/index.css";
-import { createClient, useGlobalModel, setApiClient } from "@hostlink/light";
+import { createClient, setApiClient } from "@hostlink/light";
 import { q } from "#imports";
 import { createI18n } from "vue-i18n";
 import createLight from "./composables/createLight.js";
@@ -14,12 +14,6 @@ import { createLightPlugin } from "./formkit/index.js";
 import { plugin, defaultConfig } from "@formkit/vue";
 import getApiBase from "./composables/getApiBase.js";
 import useLight from "./composables/useLight.js";
-import TypeUser from "./models/User.js";
-import TypeUserLog from "./models/UserLog.js";
-import TypeSystemValue from "./models/SystemValue.js";
-import TypeMailLog from "./models/MailLog.js";
-import TypeEventLog from "./models/EventLog.js";
-import TypeCustomerField from "./models/CustomField.js";
 import { zhTW } from "@formkit/i18n";
 export default defineNuxtPlugin((nuxtApp) => {
   addRouteMiddleware("auth", async (to, from) => {
@@ -44,20 +38,6 @@ export default defineNuxtPlugin((nuxtApp) => {
   }, { global: true });
   const client = createClient(getApiBase());
   setApiClient(client);
-  const models = useGlobalModel();
-  models.createModel("User", TypeUser.fields);
-  models.createModel("CustomField", TypeCustomerField.fields);
-  models.createModel("UserLog", TypeUserLog.fields);
-  models.createModel("SystemValue", TypeSystemValue.fields);
-  models.createModel("MailLog", TypeMailLog.fields);
-  models.createModel("EventLog", TypeEventLog.fields);
-  models.createModel("Permission", {});
-  models.getModel("User").setDataPath("app.listUser");
-  models.getModel("MailLog").setDataPath("app.listMailLog");
-  models.getModel("EventLog").setDataPath("app.listEventLog");
-  models.getModel("UserLog").setDataPath("app.listUserLog");
-  models.getModel("SystemValue").setDataPath("app.listSystemValue");
-  models.getModel("Permission").setDataPath("app.listPermission");
   nuxtApp.vueApp.config.errorHandler = (err, instance, info) => {
     const $route = useRoute();
     const light = useLight();

package/package.json

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