@hostlink/nuxt-light 1.42.1 → 1.43.0

package/dist/module.json

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

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

@@ -3,10 +3,9 @@ import { useQuasar, QTable, Dialog } from "quasar";
 import { defu } from "defu";
 import { ref, computed, onMounted, useSlots, watch, reactive } from "vue";
 import useLight from "../composables/useLight";
-import GQLFieldBuilder from "../composables/GQLFieldBuilder";
 import model from "../composables/model";
 import { toQuery } from "@hostlink/light";
-import { collect } from "#imports";
+import { list } from "#imports";
 import { useI18n } from "vue-i18n";
 const $q = useQuasar();
 const { t } = useI18n();
@@ -180,37 +179,39 @@ const validateData = () => {
 };
 const onLocalRequest = async (p) => {
   if (!isServerSide) return;
+  let localFields = {};
   let sort = "";
   if (p.pagination.sortBy) {
     sort = p.pagination.sortBy + ":" + (p.pagination.descending ? "desc" : "asc");
   }
-  const builder = GQLFieldBuilder();
   if (props.rowKey) {
-    builder.add(props.rowKey);
+    localFields = defu(localFields, {
+      [props.rowKey]: true
+    });
   }
   props.columns?.forEach((col) => {
     if (col.gqlField) {
-      builder.add(col.gqlField);
+      localFields = defu(localFields, col.gqlField);
       return;
     }
     if (!col.name) return;
     if (col.name.startsWith("_")) {
       return;
     }
-    builder.add(col.name);
+    localFields = defu(localFields, { [col.name]: true });
   });
   if (actionView) {
-    builder.add("canView");
+    localFields = defu(localFields, { canView: true });
   }
   if (actionDelete) {
-    builder.add("canDelete");
+    localFields = defu(localFields, { canDelete: true });
   }
   if (activeEdit) {
-    builder.add("canUpdate");
+    localFields = defu(localFields, { canUpdate: true });
   }
   const callback = {
     sort,
-    fields: builder.get(),
+    fields: localFields,
     offset: (p.pagination.page - 1) * p.pagination.rowsPerPage,
     limit: p.pagination.rowsPerPage,
     gql: {
@@ -223,7 +224,7 @@ const onLocalRequest = async (p) => {
           limit: p.pagination.rowsPerPage,
           offset: (p.pagination.page - 1) * p.pagination.rowsPerPage
         },
-        ...toQuery(builder.get())
+        ...toQuery(localFields)
       },
       meta: {
         total: true,
@@ -257,48 +258,30 @@ const onLocalRequest = async (p) => {
           p.pagination.rowsPerPage = saved;
         }
       }
-      builder.add(fields);
+      if (Array.isArray(fields)) {
+        fields.forEach((f) => {
+          localFields = defu(localFields, { [f]: true });
+        });
+      } else {
+        localFields = defu(localFields, fields);
+      }
       let localFilters = getFilterValue();
       if (filters2) {
-        localFilters = {
-          ...localFilters,
-          ...filters2
-        };
+        localFilters = defu(localFilters, filters2);
       }
       loading.value = true;
       try {
-        let c = collect(model2, builder.get());
-        if (localFilters) {
-          for (let [key, value] of Object.entries(localFilters)) {
-            if (typeof value == "object" && value !== null) {
-              const filterValue = value;
-              if (filterValue.contains) {
-                c = c.whereContains(key, filterValue.contains);
-              }
-              if (filterValue.between) {
-                c = c.whereBetween(key, filterValue.between);
-              }
-            } else {
-              c = c.where(key, value);
-            }
-          }
-        }
+        let l = list(model2, localFields);
+        l = l.filters(localFilters);
         if (sort) {
-          if (sort.split(":")[1] == "asc") {
-            c = c.sortBy(sort.split(":")[0]);
-          } else {
-            c = c.sortByDesc(sort.split(":")[0]);
-          }
+          l = l.sort(sort);
         }
         if (p.pagination.rowsPerPage != 0) {
-          c = c.forPage(p.pagination.page, p.pagination.rowsPerPage);
+          l = l.limit(p.pagination.rowsPerPage);
+          l = l.offset((p.pagination.page - 1) * p.pagination.rowsPerPage);
         }
-        const data = await c.all();
-        const allData = {
-          data,
-          meta: c.meta
-        };
-        this.setData(allData);
+        const data = await l.fetchWithMeta();
+        this.setData(data);
       } catch (e) {
         quasar.dialog({
           message: e,

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

@@ -24,7 +24,7 @@ export type LTableProps = QTableProps & {
 };
 export interface LTableRequest {
     sort: string;
-    fields: Array<string>;
+    fields: Array<any> | Object;
     gql: {
         __args: {
             filters: any;

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

@@ -1,7 +1,3 @@
-import { type Fields } from "@hostlink/light";
-export default function list(name: string, props?: {
-    sort?: string;
-    filters?: object;
-    offset?: number;
-    limit?: number;
-} | null, fields?: Fields): Promise<any>;
+import { default as api } from "./api.js";
+declare const _default: (name: string, fields: Object) => ReturnType<typeof api.list>;
+export default _default;

package/dist/runtime/composables/list.js

@@ -1,39 +1,4 @@
-import { toQuery } from "@hostlink/light";
 import { default as api } from "./api.js";
-export default async function list(name, props = null, fields = []) {
-  let q = {};
-  if (props) {
-    if (props.sort) {
-      q.__args = q.__args || {};
-      q.__args.sort = props.sort;
-    }
-    if (props.filters) {
-      q.__args = q.__args || {};
-      q.__args.filters = props.filters;
-    }
-  }
-  q.data = {};
-  if (props) {
-    if (props.offset) {
-      q.data.__args = q.data.__args || {};
-      q.data.__args.offset = props.offset;
-    }
-    if (props.limit) {
-      q.data.__args = q.data.__args || {};
-      q.data.__args.limit = props.limit;
-    }
-  }
-  q.data = {
-    ...q.data,
-    ...toQuery(fields)
-  };
-  q.meta = {
-    total: true,
-    key: true,
-    name: true
-  };
-  const resp = await api.query({
-    [`list${name}`]: q
-  });
-  return resp[`list${name}`];
-}
+export default (name, fields) => {
+  return api.list(name, fields);
+};

package/dist/runtime/formkit/Repeater.vue

@@ -61,36 +61,40 @@ const cursor = ref("cursor-grab");
 </style>
 
 <template>
-    <FormKit type="list" v-model="localValue" dynamic #default="{ items, node }" :name="node.name">
-        <q-list bordered separator ref="parent">
-            <FormKit type="group" v-for="(item, index) in items" :index="index" :key="item" #default="{ node }">
-                <q-item class="q-pa-xs">
-                    <q-item-section avatar class="">
-                        <div class="l-repeater-handle" v-if="sortable" :class="cursor" @mousedown="cursor = 'cursor-grabbing'"
-                            @mouseup="cursor = 'cursor-grab'" @mouseleave="cursor = 'cursor-grab'">
-                            <q-icon name="sym_o_drag_indicator" :color="$light.color" size="sm" />
-                        </div>
-                    </q-item-section>
+    <div class="col col-12 ">
+        <FormKit type="list" v-model="localValue" dynamic #default="{ items, node }" :name="node.name">
+            <q-list bordered separator ref="parent">
+                <FormKit type="group" v-for="(item, index) in items" :index="index" :key="item" #default="{ node }">
+                    <q-item class="q-pa-xs">
+                        <q-item-section avatar class="">
+                            <div class="l-repeater-handle" v-if="sortable" :class="cursor"
+                                @mousedown="cursor = 'cursor-grabbing'" @mouseup="cursor = 'cursor-grab'"
+                                @mouseleave="cursor = 'cursor-grab'">
+                                <q-icon name="sym_o_drag_indicator" :color="$light.color" size="sm" />
+                            </div>
+                        </q-item-section>
 
-                    <q-item-section>
-                        <slot v-bind="{ value: localValue[index], index: index, node: node }"></slot>
-                    </q-item-section>
+                        <q-item-section>
+                            <slot v-bind="{ value: localValue[index], index: index, node: node }"></slot>
+                        </q-item-section>
 
-                    <q-item-section side>
-                        <!-- up -->
-                        <q-btn type="button" @click="onMoveUp(index)" icon="sym_o_arrow_upward" :color="$light.color"
-                            dense flat :disable="!isAllowMoveUp(index)" />
+                        <q-item-section side>
+                            <!-- up -->
+                            <q-btn type="button" @click="onMoveUp(index)" icon="sym_o_arrow_upward"
+                                :color="$light.color" dense flat :disable="!isAllowMoveUp(index)" />
 
-                        <q-btn type="button" @click="onRemove(index)" icon="sym_o_delete" :color="$light.color" dense
-                            :disable="!isAllowRemove" flat />
-                        <!-- down -->
-                        <q-btn type="button" @click="onMoveDown(index)" icon="sym_o_arrow_downward"
-                            :color="$light.color" dense flat :disable="!isAllowMoveDown(index)" />
+                            <q-btn type="button" @click="onRemove(index)" icon="sym_o_delete" :color="$light.color"
+                                dense :disable="!isAllowRemove" flat />
+                            <!-- down -->
+                            <q-btn type="button" @click="onMoveDown(index)" icon="sym_o_arrow_downward"
+                                :color="$light.color" dense flat :disable="!isAllowMoveDown(index)" />
 
-                    </q-item-section>
-                </q-item>
-            </FormKit>
-        </q-list>
-        <q-btn @click="onAdd" :label="addLabel" icon="sym_o_add" :color="$light.color" outline />
-    </FormKit>
+                        </q-item-section>
+                    </q-item>
+                </FormKit>
+            </q-list>
+            <q-btn @click="onAdd" :label="addLabel" icon="sym_o_add" :color="$light.color" outline class="q-mt-sm"
+                :disable="localValue.length >= max" />
+        </FormKit>
+    </div>
 </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.42.1",
+  "version": "1.43.0",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@azure/msal-browser": "^3.26.1",
     "@formkit/drag-and-drop": "^0.5.3",
-    "@hostlink/light": "^2.9.0",
+    "@hostlink/light": "^2.11.0",
     "@nuxt/module-builder": "^1.0.1",
     "@quasar/extras": "^1.17.0",
     "@quasar/quasar-ui-qmarkdown": "^2.0.5",

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

@@ -1 +0,0 @@
-export default function (): any;

package/dist/runtime/composables/GQLFieldBuilder.js

@@ -1,28 +0,0 @@
-import { toQuery } from "@hostlink/light";
-import { defu } from "defu";
-export default function() {
-  let fields = {};
-  return {
-    //deep merge
-    merge: defu,
-    add: (f) => {
-      if (typeof f === "string") {
-        fields = defu(fields, { [f]: true });
-        return;
-      }
-      if (Array.isArray(f)) {
-        f.forEach((item) => {
-          fields = defu(fields, { [item]: true });
-        });
-        return;
-      }
-      if (typeof f === "object") {
-        fields = defu(fields, toQuery(f));
-        return;
-      }
-    },
-    get() {
-      return fields;
-    }
-  };
-}