@hostlink/nuxt-light 1.48.2 → 1.48.3

package/dist/module.json

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

package/dist/runtime/components/l-table.d.vue.ts

@@ -6,6 +6,10 @@ export interface LTableColumn extends QTableColumn {
     searchOptions?: Array<any> | Function;
     searchMultiple?: boolean;
     searchIndex?: string;
+    gql?: Record<string, any>;
+    /**
+     * @deprecated use gql instead
+     */
     gqlField?: string | Array<string> | Object;
     backgroundColor?: string | Function;
     searchMethod?: string;

package/dist/runtime/components/l-table.vue

@@ -194,6 +194,10 @@ const onLocalRequest = async (p) => {
     });
   }
   props.columns?.forEach((col) => {
+    if (col.gql) {
+      localFields = defu(localFields, col.gql);
+      return;
+    }
     if (col.gqlField) {
       localFields = defu(localFields, col.gqlField);
       return;

package/dist/runtime/components/l-table.vue.d.ts

@@ -6,6 +6,10 @@ export interface LTableColumn extends QTableColumn {
     searchOptions?: Array<any> | Function;
     searchMultiple?: boolean;
     searchIndex?: string;
+    gql?: Record<string, any>;
+    /**
+     * @deprecated use gql instead
+     */
     gqlField?: string | Array<string> | Object;
     backgroundColor?: string | Function;
     searchMethod?: string;

package/dist/runtime/composables/collect.js

@@ -1,17 +1,4 @@
 import { default as api } from "./api.js";
-import { default as model } from "./model.js";
-import { defu } from "defu";
 export default (name, fields) => {
   return api.collect(name, fields);
-  const m = model(name);
-  let f = {};
-  Object.entries(fields).forEach(([key, value]) => {
-    const field = m.field(key);
-    if (field && field.getGQLField() && value === true) {
-      f = defu(f, field.getGQLField());
-    } else {
-      f[key] = value;
-    }
-  });
-  return api.collect(name, f);
 };

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

@@ -1,8 +1,5 @@
 import type { Component } from "vue";
 import { type Field } from "@hostlink/light";
-export interface LightModelGqlField {
-    [key: string]: string | LightModelGqlField | boolean;
-}
 export interface LightModelField extends Field {
     label: string;
     sortable?: boolean;
@@ -10,22 +7,22 @@ export interface LightModelField extends Field {
     autoWidth?: boolean;
     searchType?: "date" | "text" | "number" | "select";
     name?: string;
-    gqlField?: LightModelGqlField;
+    /**
+     * @deprecated use gql instead
+     */
+    gqlField?: Record<string, any>;
     to?: (row: any) => string;
     field?: (row: any) => string;
     component?: Component;
     componentProps?: any;
-    format?: (value: any) => any;
+    format?: (value: any, row: object) => any;
     style?: any;
     align?: "left" | "center" | "right";
     searchOptions?: Record<string, any>[];
 }
-export interface LightModelFields {
-    [key: string]: LightModelField;
-}
 export interface LightModel {
     name: string;
-    fields: LightModelFields;
+    fields: Record<string, LightModelField>;
 }
 declare const _default: (model: LightModel) => import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/composables/getObject.js

@@ -19,11 +19,13 @@ export default async function(fields = []) {
     if (typeof field == "string") {
       const f = getModelField(module, field);
       if (f) {
+        if (f.gql) {
+          return f.gql;
+        }
         if (f.gqlField) {
           return f.gqlField;
-        } else {
-          return field;
         }
+        return field;
       }
     }
     return field;

package/dist/runtime/composables/useObject.js

@@ -18,7 +18,7 @@ export default async function(fields) {
   for (const [key, value] of Object.entries(fields)) {
     const f = getModelField(module, key);
     if (f) {
-      const gqlField = f.getGQLField();
+      const gqlField = f.gqlField || f.gql;
       if (typeof gqlField === "string") {
         query[gqlField] = value;
       } else {

package/package.json

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