@hostlink/nuxt-light 0.0.60 → 0.0.62

package/dist/module.json

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

package/dist/module.mjs

@@ -42,7 +42,7 @@ const module = defineNuxtModule({
       { name: "getApiUrl", from },
       { name: "getCurrentUser", from },
       { name: "getObject", from },
-      { name: "id", from },
+      { name: "loadObject", from },
       { name: "list", from },
       { name: "listData", from },
       { name: "m", from },

package/dist/runtime/index.d.ts

@@ -7,4 +7,4 @@ interface Light {
     getVersion(): string;
 }
 export declare function useLight(): Light;
-export { notify, addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, m, q, removeObject, t, updateObject, getID, deleteObject, listObject, getApiBase } from "./lib";
+export * from "./lib";

package/dist/runtime/index.mjs

@@ -29,23 +29,4 @@ export function useLight() {
     }
   };
 }
-export {
-  notify,
-  addObject,
-  f,
-  getApiUrl,
-  getCurrentUser,
-  getObject,
-  id,
-  list,
-  listData,
-  m,
-  q,
-  removeObject,
-  t,
-  updateObject,
-  getID,
-  deleteObject,
-  listObject,
-  getApiBase
-} from "./lib/index.mjs";
+export * from "./lib/index.mjs";

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

@@ -1,5 +1,5 @@
 import { useRoute } from "vue-router";
-import listData from "./listData.mjs";
+import loadObject from "./loadObject.mjs";
 export default async function(fields = []) {
   let route = useRoute();
   if (!route.name) {
@@ -9,14 +9,8 @@ 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, {
-    filters
-  }, fields);
-  if (data.length > 0) {
-    return data[0];
-  }
-  return null;
+  return await loadObject(module, filters, fields);
 }

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

@@ -3,7 +3,6 @@ import f from "./f";
 import getApiUrl from "./getApiUrl";
 import getCurrentUser from "./getCurrentUser";
 import getObject from "./getObject";
-import id from "./id";
 import list from "./list";
 import listData from "./listData";
 import m from "./m";
@@ -13,8 +12,9 @@ import deleteObject from "./deleteObject";
 import t from "./t";
 import updateObject from "./updateObject";
 import listObject from "./listObject";
+import loadObject from "./loadObject";
 import isGranted from "./isGranted";
 declare const notify: (message: string, color?: string) => void;
 import getID from "./getID";
 declare const getApiBase: () => {};
-export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase };
+export { addObject, f, getApiUrl, getCurrentUser, getObject, list, listData, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject };

package/dist/runtime/lib/index.mjs

@@ -5,7 +5,6 @@ import f from "./f.mjs";
 import getApiUrl from "./getApiUrl.mjs";
 import getCurrentUser from "./getCurrentUser.mjs";
 import getObject from "./getObject.mjs";
-import id from "./id.mjs";
 import list from "./list.mjs";
 import listData from "./listData.mjs";
 import m from "./m.mjs";
@@ -15,6 +14,7 @@ import deleteObject from "./deleteObject.mjs";
 import t from "./t.mjs";
 import updateObject from "./updateObject.mjs";
 import listObject from "./listObject.mjs";
+import loadObject from "./loadObject.mjs";
 import isGranted from "./isGranted.mjs";
 const notify = function(message, color = "green") {
   Notify.create({
@@ -34,7 +34,6 @@ export {
   getApiUrl,
   getCurrentUser,
   getObject,
-  id,
   list,
   listData,
   m,
@@ -47,5 +46,6 @@ export {
   deleteObject,
   listObject,
   isGranted,
-  getApiBase
+  getApiBase,
+  loadObject
 };

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/loadObject.d.ts

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

package/dist/runtime/lib/loadObject.mjs

@@ -0,0 +1,10 @@
+import listData from "./listData.mjs";
+export default async function(module, filters, fields = []) {
+  let { data } = await listData(module, {
+    filters
+  }, fields);
+  if (data.length > 0) {
+    return data[0];
+  }
+  return null;
+}

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/dist/runtime/pages/User/_user_id/view.vue

@@ -1,6 +1,11 @@
 <script setup>
-import { getObject } from '../../../';
-const obj = await getObject(["username", "first_name", "last_name", "email", "phone", "roles"]);
+import { getObject, loadObject } from '../../../';
+const obj = await getObject(["user_id", "username", "first_name", "last_name", "email", "phone", "roles"]);
+
+/* const test = async () => {
+    console.log(await loadObject("User", { user_id: obj.user_id }, ["username"]));
+}
+ */
 
 </script>
 

package/package.json

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

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

@@ -1,2 +0,0 @@
-declare const _default: () => Number;
-export default _default;

package/dist/runtime/lib/id.mjs

@@ -1,12 +0,0 @@
-import { useRoute } from "vue-router";
-const route = useRoute();
-export default () => {
-  let name = route.name?.toString();
-  if (name == void 0)
-    return 0;
-  let parts = name.split("-");
-  const module = parts[0];
-  const moduleLower = module.charAt(0).toLowerCase() + module.slice(1);
-  const keyname = parts[1];
-  return parseInt(route.params[keyname]);
-};