@hostlink/nuxt-light 1.13.4 → 1.13.5

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.13.4"
+  "version": "1.13.5"
 }

package/dist/module.mjs

@@ -248,7 +248,6 @@ const module = defineNuxtModule({
   async setup(options, nuxt) {
     const resolver = createResolver(import.meta.url);
     const { resolve: resolveQuasar } = createResolver(dirname(await resolvePath("quasar/package.json")));
-    JSON.parse(await readFile(resolveQuasar("package.json"), "utf-8"));
     const importMap = JSON.parse(await await readFile(resolveQuasar("dist/transforms/import-map.json"), "utf-8"));
     nuxt.options.css.push("quasar/dist/quasar.prod.css");
     nuxt.options.css.push("@quasar/extras/material-icons/material-icons.css");
@@ -269,6 +268,7 @@ const module = defineNuxtModule({
     const index = resolver.resolve("./runtime/index");
     const SystemValue = resolver.resolve("./runtime/lib/SystemValue");
     addImports([
+      { name: "api", from },
       { name: "id", from },
       { name: "getID", from },
       { name: "addObject", from },

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

@@ -2,13 +2,13 @@
 import { provide, ref } from 'vue'
 import { useLight, watch } from "#imports";
 import { useRuntimeConfig } from 'nuxt/app'
-import { setApiUrl } from '@hostlink/light'
+
 import { useQuasar } from 'quasar'
 import { q } from '#imports'
 import { useRoute } from "vue-router";
-const config = useRuntimeConfig();
+/* const config = useRuntimeConfig();
 setApiUrl(config?.public?.apiBase ?? '/api/');
-
+ */
 const route = useRoute();
 const light = useLight()
 const quasar = useQuasar()

package/dist/runtime/components/l-file-manager.vue

@@ -2,12 +2,7 @@
 import { useI18n } from "vue-i18n";
 import { ref, watch, computed } from 'vue';
 import { useQuasar, format } from 'quasar';
-import { q, m, useLight } from '#imports';
-import {
-  fsListFolders, fsCreateFolder, fsDeleteFolder, fsDeleteFile, fsRenameFile, fsRenameFolder, fsReadFile,
-  granted
-
-} from "@hostlink/light";
+import { q, m, useLight, api } from '#imports';
 const { humanStorageSize } = format
 
 const light = useLight();
@@ -107,7 +102,7 @@ function toggleLeftDrawer() {
 const path = ref(props.base);
 
 const onLazyLoad = async ({ node, key, done, fail }) => {
-  const data = await fsListFolders(node.path);
+  const data = await api.fs.folders.list(node.path);
   data.map((item) => {
     item.lazy = true;
     return item;
@@ -139,7 +134,7 @@ const loadItems = async () => {
 
   let folders = [];
   if (!label.value && !localSearch.value) {
-    folders = await fsListFolders(path.value);
+    folders = await api.fs.folders.list(path.value);
     folders = folders.map((item) => {
       item.type = "folder";
       item.lazy = true;
@@ -259,9 +254,9 @@ const onDeleteSelected = () => {
   }).onOk(async () => {
     for (let row of selected.value) {
       if (row.type == "folder") {
-        await fsDeleteFolder(row.path)
+        await api.fs.folders.delete(row.path)
       } else {
-        await fsDeleteFile(row.path);
+        await api.fs.files.delete(row.path)
       }
     }
     selected.value = [];
@@ -279,7 +274,7 @@ const onNewFolder = () => {
     },
     cancel: true,
   }).onOk(async (name) => {
-    await fsCreateFolder(path.value + "/" + name)
+    await api.fs.folders.create(path.value + "/" + name);
     const items = await loadItems();
     reloadTreeFolder(path.value, items.folders);
   });
@@ -292,7 +287,7 @@ const onDeleteRow = (row) => {
       message: "Are you sure you want to delete this file?",
       cancel: true,
     }).onOk(async () => {
-      await fsDeleteFile(row.path);
+      await api.fs.files.delete(row.path);
       const items = await loadItems();
       reloadTreeFolder(path.value, items.folders);
     });
@@ -302,7 +297,7 @@ const onDeleteRow = (row) => {
       message: "Are you sure you want to delete this folder?",
       cancel: true,
     }).onOk(async () => {
-      await fsDeleteFolder(row.path);
+      await api.fs.folders.delete(row.path);
       const items = await loadItems();
       reloadTreeFolder(path.value, items.folders);
     });
@@ -320,9 +315,9 @@ const onRenameRow = (row) => {
   }).onOk(async (name) => {
     try {
       if (row.type == "file") {
-        await fsRenameFile(row.path, name)
+        await api.fs.files.rename(row.path, name)
       } else {
-        await fsRenameFolder(row.path, name);
+        await api.fs.folders.rename(row.path, name)
       }
     } catch (e) {
       quasar.dialog({
@@ -433,7 +428,7 @@ const reloadStorage = async () => {
   reloadTreeFolder(path.value, items.folders);
 }
 
-const permission = await granted([
+const permission = await api.auth.granted([
   'fs.folder.create', 'fs.folder.delete', 'fs.folder.rename',
   'fs.file.delete', 'fs.file.rename', 'fs.file.upload'
 ]);
@@ -489,8 +484,8 @@ const onPreviewPDF = async (row) => {
 }
 
 const onClickInfo = async (row) => {
- rightDrawerOpen.value = true;
-  
+  rightDrawerOpen.value = true;
+
 }
 
 </script>

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

@@ -2,7 +2,7 @@
 import { ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar } from "quasar";
-import { model } from "@hostlink/light"
+import { model } from "#imports";
 
 const route = useRoute();
 const router = useRouter();

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

@@ -3,10 +3,9 @@ import { useLight } from "#imports";
 import { ref, reactive, onMounted } from 'vue'
 import { useQuasar, Dialog } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { m, notify } from '#imports';
+import { m, notify, api } from '#imports';
 
 
-import { login, webauthnLogin } from '@hostlink/light';
 
 const light = useLight();
 
@@ -27,7 +26,7 @@ const submit = async () => {
   if (await form1.value.validate()) {
 
     try {
-      await login(data.username, data.password, data.code)
+      await api.auth.login(data.username, data.password, data.code)
       window.self.location.reload();
     } catch (e) {
       notify(e.message, "negative");

package/dist/runtime/formkit/Form.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar } from "quasar";
-import { model } from "@hostlink/light"
+import { model } from "#imports"
 
 const route = useRoute();
 const router = useRouter();

package/dist/runtime/lib/defineLightModel.mjs

@@ -1,7 +1,7 @@
 import { defineNuxtPlugin } from "#app";
-import { defineModel } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default (model) => {
   return defineNuxtPlugin(() => {
-    defineModel(model.name, model.fields);
+    api.models.create(model.name, model.fields);
   });
 };

package/dist/runtime/lib/getGQLFields.mjs

@@ -1,9 +1,9 @@
 import GQLFieldBuilder from "./GQLFieldBuilder.mjs";
-import { getModelField } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default (name, fields) => {
   const builder = GQLFieldBuilder();
   fields.forEach((field) => {
-    const modelField = getModelField(name, field);
+    const modelField = api.model(name).field(field);
     if (modelField) {
       builder.add(modelField.getGQLField());
     }

package/dist/runtime/lib/getModelColumns.mjs

@@ -1,4 +1,4 @@
-import { getModelField } from "@hostlink/light";
+import { getModelField } from "./index.mjs";
 export default (model, names) => {
   let columns = [];
   for (let name of names) {

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

@@ -1,2 +1,2 @@
-import { getModelField } from "@hostlink/light";
-export default getModelField;
+declare const _default: (name: string, field: string) => import("@hostlink/light").ModelField | null;
+export default _default;

package/dist/runtime/lib/getModelField.mjs

@@ -1,2 +1,4 @@
-import { getModelField } from "@hostlink/light";
-export default getModelField;
+import { api } from "./index.mjs";
+export default (name, field) => {
+  return api.model(name).field(field);
+};

package/dist/runtime/lib/getModelFields.mjs

@@ -1,4 +1,4 @@
-import { getModelField } from "@hostlink/light";
+import { getModelField } from "./index.mjs";
 export default (model, names) => {
   let fields = [];
   for (let name of names) {

package/dist/runtime/lib/getObject.mjs

@@ -1,6 +1,6 @@
 import { useRoute } from "vue-router";
 import loadObject from "./loadObject.mjs";
-import { getModelField } from "@hostlink/light";
+import { getModelField } from "./index.mjs";
 export default async function(fields = []) {
   let route = useRoute();
   if (!route.name) {

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

@@ -1,3 +1,4 @@
+import type { LightClient } from '@hostlink/light';
 export { default as f } from "./f";
 export { default as getApiUrl } from "./getApiUrl";
 export { default as getCurrentUser } from "./getCurrentUser";
@@ -22,4 +23,5 @@ export declare const notify: (message: string, color?: string) => void;
 export { default as getID } from "./getID";
 export { default as id } from "./getID";
 export declare const getApiBase: () => {};
-export { getGQLFields } from '@hostlink/light';
+export declare const api: LightClient;
+export declare const getGQLFields: (name: string, fields: string[]) => any[];

package/dist/runtime/lib/index.mjs

@@ -1,5 +1,6 @@
 import { useRuntimeConfig } from "nuxt/app";
 import { Notify } from "quasar";
+import { createClient } from "@hostlink/light";
 export { default as f } from "./f.mjs";
 export { default as getApiUrl } from "./getApiUrl.mjs";
 export { default as getCurrentUser } from "./getCurrentUser.mjs";
@@ -32,4 +33,7 @@ export const getApiBase = () => {
   const config = useRuntimeConfig();
   return config?.public?.apiBase ?? "/api/";
 };
-export { getGQLFields } from "@hostlink/light";
+export const api = createClient("");
+export const getGQLFields = (name, fields) => {
+  return api.model(name).gqlFields(fields);
+};

package/dist/runtime/lib/list.mjs

@@ -1,4 +1,5 @@
-import { query, toQuery } from "@hostlink/light";
+import { toQuery } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default async function list(name, props = null, fields = []) {
   let q = {};
   if (props) {
@@ -31,7 +32,7 @@ export default async function list(name, props = null, fields = []) {
     key: true,
     name: true
   };
-  const resp = await query({
+  const resp = await api.query({
     [`list${name}`]: q
   });
   return resp[`list${name}`];

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

@@ -1,2 +1,2 @@
-import { Fields } from "@hostlink/light";
+import { type Fields } from "@hostlink/light";
 export default function listObject(name: string, filters: {} | undefined, sort: string, offset: number, limit: number, fields?: Fields): Promise<any>;

package/dist/runtime/lib/m.mjs

@@ -1,4 +1,4 @@
-import { mutation } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default function(operation, args, fields = []) {
-  return mutation(operation, args, fields);
+  return api.mutation(operation, args, fields);
 }

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

@@ -1,6 +1,6 @@
-import { model } from "@hostlink/light";
+import { api } from ".";
 import type { LTableColumn } from "../components/l-table.vue";
-interface LModel extends ReturnType<typeof model> {
+interface LModel extends ReturnType<typeof api.model> {
     columns(fields: string[]): Array<LTableColumn>;
 }
 declare const _default: (name: string) => LModel;

package/dist/runtime/lib/model.mjs

@@ -1,12 +1,12 @@
-import { model, getModelField } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default (name) => {
-  const m = model(name);
+  const m = api.model(name);
   return Object.assign(m, {
     columns(fields) {
       let columns = [];
       if (Array.isArray(fields)) {
         for (let f of fields) {
-          const field = getModelField(name, f);
+          const field = m.field(f);
           if (!field) continue;
           const option = field.getRaw();
           option.name = field.getName();
@@ -15,7 +15,7 @@ export default (name) => {
       } else {
         for (let f in fields) {
           if (!fields[f]) continue;
-          const field = getModelField(name, f);
+          const field = m.field(f);
           if (!field) continue;
           const option = field.getRaw();
           option.name = field.getName();

package/dist/runtime/lib/q.mjs

@@ -1,12 +1,8 @@
-import axios from "axios";
 import f from "./f.mjs";
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
-import { getApiBase } from "./index.mjs";
 import { toQuery } from "@hostlink/light";
+import { api } from "./index.mjs";
 export default async function(operation, args = null, fields = []) {
-  const service = axios.create({
-    withCredentials: true
-  });
   let query;
   if (operation instanceof Object) {
     query = jsonToGraphQLQuery(toQuery(operation));
@@ -17,7 +13,7 @@ export default async function(operation, args = null, fields = []) {
     }
     query = f(operation, args, fields);
   }
-  const resp = (await service.post(getApiBase(), {
+  const resp = (await api.axios.post("", {
     query: `{ ${query} }`
   })).data;
   if (resp.errors) {

package/dist/runtime/lib/sv.mjs

@@ -1,11 +1,11 @@
-import { query } from "@hostlink/light";
+import { api } from "./index.mjs";
 export const cache = {};
 export default (name) => {
   if (cache[name]) {
     return cache[name];
   }
   const p = new Promise(async (resolve, reject) => {
-    const resp = await query({
+    const resp = await api.query({
       systemValue: {
         __args: {
           name

package/dist/runtime/pages/Permission/all.vue

@@ -1,11 +1,10 @@
 <script setup>
 import { reactive } from 'vue'
-import { m } from '#imports'
+import { m, api } from '#imports'
 import { useI18n } from 'vue-i18n';
-import { query } from '@hostlink/light';
 const { t } = useI18n();
 
-const { app, listRole: roles } = await query({
+const { app, listRole: roles } = await api.query({
     app: {
         permissions: true
     },
@@ -78,7 +77,8 @@ const onUpdate = (value, role, permission) => {
                     </q-td>
                     <q-td v-for="role in roles">
                         <q-checkbox v-model="props.row[role.name]"
-                            @update:model-value="onUpdate($event, role.name, props.row.permission)" :color="$light.color" />
+                            @update:model-value="onUpdate($event, role.name, props.row.permission)"
+                            :color="$light.color" />
                     </q-td>
                 </q-tr>
             </template>

package/dist/runtime/pages/Permission/export.vue

@@ -1,12 +1,12 @@
 <script setup>
 import { reactive } from 'vue'
 import { utils, writeFileXLSX } from 'xlsx';
-import { query } from '@hostlink/light';
+import { api } from '#imports';
 const obj = reactive({
     roles: []
 });
 
-const { app, listRole } = await query({
+const { app, listRole } = await api.query({
     app: {
         permissions: true
     },

package/dist/runtime/pages/System/database/table.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { query } from '@hostlink/light';
+import { api } from '#imports';
 
-const { system: { database } } = await query({
+const { system: { database } } = await api.query({
     system: {
         database: {
             table: true
@@ -17,8 +17,8 @@ const { system: { database } } = await query({
             <q-list class="rounded-borders" separator bordered>
                 <q-expansion-item :label="table.name" v-for="table in database.table" dense>
                     <div class="q-ma-sm">
-                        <q-table separator="cell" dense :rows="table.columns" :rows-per-page-options="[0]" hide-pagination
-                            flat bordered></q-table>
+                        <q-table separator="cell" dense :rows="table.columns" :rows-per-page-options="[0]"
+                            hide-pagination flat bordered></q-table>
                     </div>
 
                 </q-expansion-item>

package/dist/runtime/pages/User/_user_id/view.vue

@@ -4,12 +4,6 @@ import { useRoute } from "vue-router"
 import { ref } from 'vue';
 const route = useRoute();
 
-
-console.log(route);
-
-
-
-
 const obj = await getObject(["canUpdate"]);
 
 const light = useLight();

package/dist/runtime/pages/User/setting/bio-auth.vue

@@ -1,21 +1,22 @@
 <script setup>
-import { Dialog } from "quasar";
+import { useQuasar } from "quasar";
 import { ref } from "vue"
-import { q, m, getCurrentUser } from '#imports'
+import { q, m, getCurrentUser, api } from '#imports'
 const app = await q("app", ["hasBioAuth"]);
 
-import { webauthnRegister } from "@hostlink/light"
+
+const quasar = useQuasar();
 
 const data = ref(await q("listWebAuthn", ["uuid", "ip", "user_agent", "createdTime"]));
 
 const register = async () => {
     try {
-        await webauthnRegister();
+        await api.auth.WebAuthn.register();
         data.value = await q("listWebAuthn", ["uuid", "ip", "user_agent", "createdTime"]);
         const user = await getCurrentUser();
         localStorage.setItem("username", user.username);
     } catch (e) {
-        Dialog.create({
+        quasar.dialog({
             title: "Error",
             message: e.message,
             ok: "OK"
@@ -49,7 +50,7 @@ const columns = [
 
 const deleteItem = async (uuid) => {
     //confirm
-    Dialog.create({
+    quasar.dialog({
         title: "Delete",
         color: "negative",
         message: "Are you sure you want to delete this item?",

package/dist/runtime/pages/User/setting/password.vue

@@ -2,14 +2,13 @@
 import { useI18n } from 'vue-i18n'
 import { Dialog } from 'quasar'
 import { reset } from "@formkit/core"
-import { updatePassword } from "@hostlink/light"
 import { computed } from 'vue'
-import { q } from "#imports"
+import { q, api } from "#imports"
 
 const { t } = useI18n()
 
 const onSubmit = async (data, form) => {
-    if (await updatePassword(data.old_password, data.new_password)) {
+    if (await api.auth.updatePassword(data.old_password, data.new_password)) {
         reset(form);
         await Dialog.create({
             title: "Password updated",
@@ -35,7 +34,7 @@ const policies = computed(() => {
         if (name == "length") {
             return t('Must contain at least {0} characters', [policy.split(":")[1]]);
         }
-        
+
         return t(name);
     })
 })

package/dist/runtime/pages/User/setting/two-factor-auth.vue

@@ -28,7 +28,7 @@ if (my.twoFactorEnabled) {
 
 </script>
 <template>
-    <l-form @save="save" :bordered="false" v-if="show">
+    <l-form @submit="save" :bordered="false" v-if="show">
         <div>
             <p>
                 Now download the app and scan the qrcode. Input the code to the

package/dist/runtime/pages/logout.vue

@@ -1,8 +1,8 @@
 <script setup>
 
-import { logout } from '@hostlink/light';
+import { api } from '#imports';
 
-await logout();
+await api.auth.logout();
 const href = window.self.location.href;
 
 const url = new URL(href);

package/dist/runtime/plugin.mjs

@@ -4,12 +4,12 @@ import { defineNuxtPlugin } from "#app";
 import "./assets/main.css";
 import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
-import { defineModel } from "@hostlink/light";
+import { api } from "./lib/index.mjs";
 localStorage.getItem("locale") || localStorage.setItem("locale", "en");
 import { createQuasarPlugin } from "formkit-quasar";
 import { createLightPlugin } from "./formkit/index.mjs";
 import { plugin, defaultConfig } from "@formkit/vue";
-import { useLight } from "./index.mjs";
+import { getApiBase, useLight } from "./index.mjs";
 import TypeUser from "./types/User.mjs";
 import TypeUserLog from "./types/UserLog.mjs";
 import TypeSystemValue from "./types/SystemValue.mjs";
@@ -17,11 +17,12 @@ import TypeMailLog from "./types/MailLog.mjs";
 import TypeEventLog from "./types/EventLog.mjs";
 import { zhTW } from "@formkit/i18n";
 export default defineNuxtPlugin((nuxtApp) => {
-  defineModel("User", TypeUser);
-  defineModel("UserLog", TypeUserLog);
-  defineModel("SystemValue", TypeSystemValue);
-  defineModel("MailLog", TypeMailLog);
-  defineModel("EventLog", TypeEventLog);
+  api.axios.defaults.baseURL = getApiBase();
+  api.models.create("User", TypeUser);
+  api.models.create("UserLog", TypeUserLog);
+  api.models.create("SystemValue", TypeSystemValue);
+  api.models.create("MailLog", TypeMailLog);
+  api.models.create("EventLog", TypeEventLog);
   nuxtApp.vueApp.config.globalProperties.$light = useLight();
   nuxtApp.vueApp.config.errorHandler = (error) => {
     console.log(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@formkit/drag-and-drop": "^0.0.36",
-    "@hostlink/light": "^1.2.1",
+    "@hostlink/light": "^2.0.1",
     "@nuxt/kit": "^3.7.4",
     "@nuxt/module-builder": "^0.5.2",
     "@quasar/extras": "^1.16.11",
@@ -57,4 +57,4 @@
     "eslint": "^8.46.0",
     "nuxt": "^3.7.0"
   }
-}
+}