@hostlink/nuxt-light 1.28.3 → 1.29.0

package/dist/module.json

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

package/dist/module.mjs

@@ -1,245 +1,244 @@
-import { createResolver, defineNuxtModule, installModule, addComponentsDir, addImportsDir, addImports, resolveFiles, addPlugin } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, extendPages, installModule, addComponentsDir, addImportsDir, resolveFiles, addPlugin } from '@nuxt/kit';
 
-const resolver = createResolver(import.meta.url);
 const routes = [
   {
     name: "CustomField",
     path: "/CustomField",
-    file: resolver.resolve("./runtime/pages/CustomField/index.vue")
+    file: "runtime/pages/CustomField/index.vue"
   },
   {
     name: "CustomField-custom_field_id-edit",
     path: "/CustomField/:custom_field_id/edit",
-    file: resolver.resolve("./runtime/pages/CustomField/[custom_field_id]/edit.vue")
+    file: "runtime/pages/CustomField/[custom_field_id]/edit.vue"
   },
   {
     name: "EventLog",
     path: "/EventLog",
-    file: resolver.resolve("./runtime/pages/EventLog/index.vue")
+    file: "runtime/pages/EventLog/index.vue"
   },
   {
     name: "FileManager",
     path: "/FileManager",
-    file: resolver.resolve("./runtime/pages/FileManager/index.vue")
+    file: "runtime/pages/FileManager/index.vue"
   },
   {
     name: "MailLog",
     path: "/MailLog",
-    file: resolver.resolve("./runtime/pages/MailLog/index.vue")
+    file: "runtime/pages/MailLog/index.vue"
   },
   {
     name: "Permission",
     path: "/Permission",
-    file: resolver.resolve("./runtime/pages/Permission/index.vue")
+    file: "runtime/pages/Permission/index.vue"
   },
   {
     name: "Role",
     path: "/Role",
-    file: resolver.resolve("./runtime/pages/Role/index.vue")
+    file: "runtime/pages/Role/index.vue"
   },
   {
     name: "System",
     path: "/System",
-    file: resolver.resolve("./runtime/pages/System/index.vue")
+    file: "runtime/pages/System/index.vue"
   },
   {
     name: "SystemValue",
     path: "/SystemValue",
-    file: resolver.resolve("./runtime/pages/SystemValue/index.vue")
+    file: "runtime/pages/SystemValue/index.vue"
   },
   {
     name: "Translate",
     path: "/Translate",
-    file: resolver.resolve("./runtime/pages/Translate/index.vue")
+    file: "runtime/pages/Translate/index.vue"
   },
   {
     name: "User",
     path: "/User",
-    file: resolver.resolve("./runtime/pages/User/index.vue")
+    file: "runtime/pages/User/index.vue"
   },
   {
     name: "UserLog",
     path: "/UserLog",
-    file: resolver.resolve("./runtime/pages/UserLog/index.vue")
+    file: "runtime/pages/UserLog/index.vue"
   },
   {
     name: "Permission-add",
     path: "/Permission/add",
-    file: resolver.resolve("./runtime/pages/Permission/add.vue")
+    file: "runtime/pages/Permission/add.vue"
   },
   {
     name: "Permission-all",
     path: "/Permission/all",
-    file: resolver.resolve("./runtime/pages/Permission/all.vue")
+    file: "runtime/pages/Permission/all.vue"
   },
   {
     name: "Permission-export",
     path: "/Permission/export",
-    file: resolver.resolve("./runtime/pages/Permission/export.vue")
+    file: "runtime/pages/Permission/export.vue"
   },
   {
     name: "Role-add",
     path: "/Role/add",
-    file: resolver.resolve("./runtime/pages/Role/add.vue")
+    file: "runtime/pages/Role/add.vue"
   },
   {
     name: "Role-add2",
     path: "/Role/add2",
-    file: resolver.resolve("./runtime/pages/Role/add2.vue")
+    file: "runtime/pages/Role/add2.vue"
   },
   {
     name: "System-fs",
     path: "/System/fs",
-    file: resolver.resolve("./runtime/pages/System/fs.vue")
+    file: "runtime/pages/System/fs.vue"
   },
   {
     name: "System-mailtest",
     path: "/System/mailtest",
-    file: resolver.resolve("./runtime/pages/System/mailtest.vue")
+    file: "runtime/pages/System/mailtest.vue"
   },
   {
     name: "System-package",
     path: "/System/package",
-    file: resolver.resolve("./runtime/pages/System/package.vue")
+    file: "runtime/pages/System/package.vue"
   },
   {
     name: "System-phpinfo",
     path: "/System/phpinfo",
-    file: resolver.resolve("./runtime/pages/System/phpinfo.vue")
+    file: "runtime/pages/System/phpinfo.vue"
   },
   {
     name: "System-setting",
     path: "/System/setting",
-    file: resolver.resolve("./runtime/pages/System/setting.vue")
+    file: "runtime/pages/System/setting.vue"
   },
   {
     name: "System-test",
     path: "/System/test",
-    file: resolver.resolve("./runtime/pages/System/test.vue")
+    file: "runtime/pages/System/test.vue"
   },
   {
     name: "System-view_as",
     path: "/System/view_as",
-    file: resolver.resolve("./runtime/pages/System/view_as.vue")
+    file: "runtime/pages/System/view_as.vue"
   },
   {
     name: "System-menu",
     path: "/System/menu",
-    file: resolver.resolve("./runtime/pages/System/menu/index.vue")
+    file: "runtime/pages/System/menu/index.vue"
   },
   {
     name: "SystemValue-add",
     path: "/SystemValue/add",
-    file: resolver.resolve("./runtime/pages/SystemValue/add.vue")
+    file: "runtime/pages/SystemValue/add.vue"
   },
   {
     name: "System-database-process",
     path: "/System/database/process",
-    file: resolver.resolve("./runtime/pages/System/database/process.vue")
+    file: "runtime/pages/System/database/process.vue"
   },
   {
     name: "System-database-backup",
     path: "/System/database/backup",
-    file: resolver.resolve("./runtime/pages/System/database/backup.vue")
+    file: "runtime/pages/System/database/backup.vue"
   },
   {
     name: "System-database-table",
     path: "/System/database/table",
-    file: resolver.resolve("./runtime/pages/System/database/table.vue")
+    file: "runtime/pages/System/database/table.vue"
   },
   {
     name: "EventLog-eventlog_id-view",
     path: "/EventLog/:eventlog_id/view",
-    file: resolver.resolve("./runtime/pages/EventLog/_eventlog_id/view.vue")
+    file: "runtime/pages/EventLog/_eventlog_id/view.vue"
   },
   {
     name: "Role-name-update-child",
     path: "/Role/:name/update-child",
-    file: resolver.resolve("./runtime/pages/Role/_name/update-child.vue")
+    file: "runtime/pages/Role/_name/update-child.vue"
   },
   {
     name: "SystemValue-systemvalue_id-edit",
     path: "/SystemValue/:systemvalue_id/edit",
-    file: resolver.resolve("./runtime/pages/SystemValue/_systemvalue_id/edit.vue")
+    file: "runtime/pages/SystemValue/_systemvalue_id/edit.vue"
   },
   {
     name: "User-user_id-change-password",
     path: "/User/:user_id/change-password",
-    file: resolver.resolve("./runtime/pages/User/_user_id/change-password.vue")
+    file: "runtime/pages/User/_user_id/change-password.vue"
   },
   {
     name: "User-user_id-edit",
     path: "/User/:user_id/edit",
-    file: resolver.resolve("./runtime/pages/User/_user_id/edit.vue")
+    file: "runtime/pages/User/_user_id/edit.vue"
   },
   {
     name: "User-user_id-update-role",
     path: "/User/:user_id/update-role",
-    file: resolver.resolve("./runtime/pages/User/_user_id/update-role.vue")
+    file: "runtime/pages/User/_user_id/update-role.vue"
   },
   {
     name: "User",
     path: "/User",
-    file: resolver.resolve("./runtime/pages/User/index.vue")
+    file: "runtime/pages/User/index.vue"
   },
   {
     name: "User-add",
     path: "/User/add",
-    file: resolver.resolve("./runtime/pages/User/add.vue")
+    file: "runtime/pages/User/add.vue"
   },
   {
     name: "User-user_id-view",
     path: "/User/:user_id/view",
-    file: resolver.resolve("./runtime/pages/User/_user_id/view.vue")
+    file: "runtime/pages/User/_user_id/view.vue"
   },
   {
     name: "User-profile",
     path: "/User/profile",
-    file: resolver.resolve("./runtime/pages/User/profile.vue")
+    file: "runtime/pages/User/profile.vue"
   },
   {
     path: "/User/setting",
-    file: resolver.resolve("./runtime/pages/User/setting.vue"),
+    file: "runtime/pages/User/setting.vue",
     children: [
       {
         name: "User-setting",
         path: "",
-        file: resolver.resolve("./runtime/pages/User/setting/index.vue")
+        file: "runtime/pages/User/setting/index.vue"
       },
       {
         name: "User-setting-bio-auth",
         path: "bio-auth",
-        file: resolver.resolve("./runtime/pages/User/setting/bio-auth.vue")
+        file: "runtime/pages/User/setting/bio-auth.vue"
       },
       {
         name: "User-setting-information",
         path: "information",
-        file: resolver.resolve("./runtime/pages/User/setting/information.vue")
+        file: "runtime/pages/User/setting/information.vue"
       },
       {
         name: "User-setting-my_favorite",
         path: "my_favorite",
-        file: resolver.resolve("./runtime/pages/User/setting/my_favorite.vue")
+        file: "runtime/pages/User/setting/my_favorite.vue"
       },
       {
         name: "User-setting-open_id",
         path: "open_id",
-        file: resolver.resolve("./runtime/pages/User/setting/open_id.vue")
+        file: "runtime/pages/User/setting/open_id.vue"
       },
       {
         name: "User-setting-password",
         path: "password",
-        file: resolver.resolve("./runtime/pages/User/setting/password.vue")
+        file: "runtime/pages/User/setting/password.vue"
       },
       {
         name: "User-setting-style",
         path: "style",
-        file: resolver.resolve("./runtime/pages/User/setting/style.vue")
+        file: "runtime/pages/User/setting/style.vue"
       },
       {
         name: "User-setting-two-factor-auth",
         path: "two-factor-auth",
-        file: resolver.resolve("./runtime/pages/User/setting/two-factor-auth.vue")
+        file: "runtime/pages/User/setting/two-factor-auth.vue"
       }
     ]
   }
@@ -252,12 +251,36 @@ const module = defineNuxtModule({
   },
   // Default configuration options of the Nuxt module
   defaults: {},
-  hooks: {
-    async "pages:extend"(pages) {
+  /* hooks: {
+    async 'pages:extend'(pages) {
       pages.push(...routes);
     }
-  },
+  }, */
   async setup(options, nuxt) {
+    const resolver = createResolver(import.meta.url);
+    extendPages((pages) => {
+      for (const route of routes) {
+        if (route.children) {
+          pages.unshift({
+            path: route.path,
+            file: resolver.resolve(route.file),
+            children: route.children.map((child) => {
+              return {
+                name: child.name,
+                path: child.path,
+                file: resolver.resolve(child.file)
+              };
+            })
+          });
+          continue;
+        }
+        pages.unshift({
+          name: route.name,
+          path: route.path,
+          file: resolver.resolve(route.file)
+        });
+      }
+    });
     await installModule("nuxt-quasar-ui", {
       config: {
         brand: {
@@ -303,7 +326,6 @@ const module = defineNuxtModule({
     nuxt.options.vite.optimizeDeps.include.push("axios");
     nuxt.options.vite.optimizeDeps.include.push("json-to-graphql-query");
     nuxt.options.vite.optimizeDeps.include.push("collect.js");
-    const resolver = createResolver(import.meta.url);
     nuxt.options.app.head.link = nuxt.options.app.head.link || [];
     nuxt.options.app.head.link.push({
       rel: "stylesheet",
@@ -312,39 +334,7 @@ const module = defineNuxtModule({
     await addComponentsDir({
       path: resolver.resolve("./runtime/components")
     });
-    const index = resolver.resolve("./runtime/index");
-    const SystemValue = resolver.resolve("./runtime/lib/SystemValue");
     addImportsDir(resolver.resolve("./runtime/composables"));
-    addImports([
-      { name: "api", from: index },
-      { name: "id", from: index },
-      { name: "getID", from: index },
-      { name: "addObject", from: index },
-      { name: "f", from: index },
-      { name: "getApiUrl", from: index },
-      { name: "getCurrentUser", from: index },
-      { name: "getObject", from: index },
-      { name: "list", from: index },
-      { name: "m", from: index },
-      { name: "q", from: index },
-      { name: "removeObject", from: index },
-      { name: "t", from: index },
-      { name: "useLight", from: index },
-      { name: "isGranted", from: index },
-      { name: "sv", from: index },
-      { name: "loadSV", from: SystemValue },
-      { name: "getSV", from: SystemValue },
-      { name: "getModelColumns", from: index },
-      { name: "getModelFields", from: index },
-      { name: "getModelField", from: index },
-      { name: "getGQLFields", from: index },
-      { name: "model", from: index },
-      { name: "notify", from: index },
-      { name: "defineLightModel", from: index },
-      { name: "LightModelField", from: index, type: true },
-      { name: "LightModel", from: index, type: true },
-      { name: "collect", from: index }
-    ]);
     const files = await resolveFiles(process.cwd() + "/models", ["*"]);
     nuxt.options.runtimeConfig.public.light = {
       model: []

package/dist/runtime/components/L/CustomField/Add.vue.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{}, {
-    $emit: (event: "hide" | "ok", ...args: any[]) => void;
+    $emit: (event: "ok" | "hide", ...args: any[]) => void;
     models: unknown[];
     $props: {
         readonly models?: unknown[] | undefined;

package/dist/runtime/components/L/Database/create-table-dialog.vue.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{}, {
-    $emit: (event: "hide" | "ok", ...args: any[]) => void;
+    $emit: (event: "ok" | "hide", ...args: any[]) => void;
     $props: {};
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -289,11 +289,11 @@ const onLogout = async () => {
                 <q-btn flat round dense icon="sym_o_person" class="q-mr-sm">
                     <q-menu max-width="250px">
                         <q-list>
-                            <q-item v-close-popup to="/User/profile">
+                            <q-item v-close-popup to="/User/profile" >
                                 <q-item-section avatar>
                                     <q-icon name="sym_o_person" />
                                 </q-item-section>
-                                <q-item-section>{{ $t('Profile') }}</q-item-section>
+                                <q-item-section >{{ $t('Profile') }}</q-item-section>
                             </q-item>
 
                             <q-item v-close-popup to="/User/setting">