@hostlink/nuxt-light 0.0.60 → 0.0.61

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.60"
+  "version": "0.0.61"
 }

package/dist/runtime/lib/getObject.d.ts

@@ -1 +1 @@
-export default function (fields?: Array<string>): Promise<any>;
+export default function (fields?: Array<string | Object>): Promise<any>;

package/dist/runtime/lib/getObject.mjs

@@ -9,7 +9,7 @@ export default async function(fields = []) {
   const id = parseInt(route.params[id_name]);
   const filters = {};
   filters[id_name] = id;
-  if (fields.length == 0) {
+  if (fields instanceof Array && fields.length == 0) {
     fields.push(id_name);
   }
   let { data } = await listData(module, {

package/dist/runtime/lib/listData.d.ts

@@ -1 +1 @@
-export default function listData(name: string, props?: any, fields?: Array<string>): Promise<any>;
+export default function listData(name: string, props?: any, fields?: Array<string | Object> | Object): Promise<any>;

package/dist/runtime/lib/listData.mjs

@@ -1,32 +1,48 @@
-import q from "./q.mjs";
-import f from "./f.mjs";
+import { query, toQuery } from "@hostlink/light";
 export default async function listData(name, props = {}, fields = []) {
-  let v = {};
+  let json = {};
   if (props.sort) {
-    v.sort = props.sort;
+    json.__args = json.__args || {};
+    json.__args.sort = props.sort;
   }
   if (props.filters) {
-    v.filters = props.filters;
+    json.__args = json.__args || {};
+    json.__args.filters = props.filters;
   }
-  let offset_limit = {};
+  json.data = {};
   if (props.offset) {
-    offset_limit.offset = props.offset;
+    json.data.__args = json.data.__args || {};
+    json.data.__args.offset = props.offset;
   }
   if (props.limit) {
-    offset_limit.limit = props.limit;
+    json.data.__args = json.data.__args || {};
+    json.data.__args.limit = props.limit;
   }
-  const fs = fields;
-  if (props.fields) {
-    fs.push(...props.fields);
-  }
-  let data = await q(`list${name}`, v, [f("data", offset_limit, fs), f("meta", ["total", "key", "name"])]);
-  if (props.done) {
-    props.done({
-      rows: data.data,
-      total: data.meta.total,
-      key: data.meta.key,
-      name: data.meta.name
+  if (fields instanceof Array) {
+    fields.forEach((field) => {
+      if (field instanceof Object) {
+        Object.entries(field).forEach(([key, value]) => {
+          json.data[key] = toQuery(value);
+        });
+      } else {
+        json.data[field] = true;
+      }
     });
+  } else if (fields instanceof Object) {
+    json.data = Object.assign({}, fields);
+    if (props.fields) {
+      props.fields.forEach((field) => {
+        json.data[field] = true;
+      });
+    }
   }
-  return data;
+  json.meta = {
+    total: true,
+    key: true,
+    name: true
+  };
+  const q = {};
+  q[`list${name}`] = json;
+  let data = await query(q);
+  return data[`list${name}`];
 }

package/dist/runtime/lib/q.d.ts

@@ -1 +1 @@
-export default function (operation: string | object, args: any, fields?: Array<any>): Promise<any>;
+export default function (operation: string | object, args?: any, fields?: Array<any>): Promise<any>;

package/dist/runtime/lib/q.mjs

@@ -3,7 +3,7 @@ import f from "./f.mjs";
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
 import { getApiBase } from "./index.mjs";
 import toJson from "./toJson.mjs";
-export default async function(operation, args, fields = []) {
+export default async function(operation, args = null, fields = []) {
   const service = axios.create({
     withCredentials: true
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",