@esmx/router-vue 3.0.0-rc.78 → 3.0.0-rc.80

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export type * from './vue2';
-export type * from './vue3';
-export { useRouter, useRoute, useProvideRouter, useLink, useRouterViewDepth, getRouterViewDepth, getRoute, getRouter } from './use';
+export { RouterPlugin } from './plugin';
 export { RouterLink } from './router-link';
 export { RouterView } from './router-view';
-export { RouterPlugin } from './plugin';
+export { getRoute, getRouter, getRouterViewDepth, useLink, useProvideRouter, useRoute, useRouter, useRouterViewDepth } from './use';
+export type * from './vue2';
+export type * from './vue3';

package/dist/index.mjs

@@ -1,13 +1,13 @@
+export { RouterPlugin } from "./plugin.mjs";
+export { RouterLink } from "./router-link.mjs";
+export { RouterView } from "./router-view.mjs";
 export {
-  useRouter,
-  useRoute,
-  useProvideRouter,
-  useLink,
-  useRouterViewDepth,
-  getRouterViewDepth,
   getRoute,
-  getRouter
+  getRouter,
+  getRouterViewDepth,
+  useLink,
+  useProvideRouter,
+  useRoute,
+  useRouter,
+  useRouterViewDepth
 } from "./use.mjs";
-export { RouterLink } from "./router-link.mjs";
-export { RouterView } from "./router-view.mjs";
-export { RouterPlugin } from "./plugin.mjs";

package/dist/index.test.mjs

@@ -81,9 +81,7 @@ describe("index.ts - Package Entry Point", () => {
       ];
       expectedExports.forEach((exportName) => {
         expect(RouterVueModule).toHaveProperty(exportName);
-        expect(
-          RouterVueModule[exportName]
-        ).toBeDefined();
+        expect(Object.hasOwn(RouterVueModule, exportName)).toBe(true);
       });
     });
     it("should not export unexpected items", () => {

package/dist/plugin.test.mjs

@@ -354,15 +354,8 @@ describe("plugin.ts - RouterPlugin", () => {
       expect(routeDescriptor).toBeDefined();
       expect(typeof (routerDescriptor == null ? void 0 : routerDescriptor.get)).toBe("function");
       expect(typeof (routeDescriptor == null ? void 0 : routeDescriptor.get)).toBe("function");
-      expect(
-        Object.prototype.hasOwnProperty.call(
-          globalProperties,
-          "$router"
-        )
-      ).toBe(true);
-      expect(
-        Object.prototype.hasOwnProperty.call(globalProperties, "$route")
-      ).toBe(true);
+      expect(Object.hasOwn(globalProperties, "$router")).toBe(true);
+      expect(Object.hasOwn(globalProperties, "$route")).toBe(true);
     });
     it("should provide correct component types", () => {
       app = createApp({

package/dist/use.test.mjs

@@ -1,7 +1,12 @@
 import { Router, RouterMode } from "@esmx/router";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { nextTick } from "vue";
-import { createApp, defineComponent, getCurrentInstance, h } from "vue";
+import {
+  createApp,
+  defineComponent,
+  getCurrentInstance,
+  h,
+  nextTick
+} from "vue";
 import { RouterView } from "./router-view.mjs";
 import {
   getRouterViewDepth,

package/dist/util.mjs

@@ -28,5 +28,8 @@ export function resolveComponent(component) {
   if (isESModule(component)) {
     return component.default || component;
   }
+  if (component && typeof component === "object" && !Array.isArray(component) && "default" in component && Object.keys(component).length === 1) {
+    return component.default;
+  }
   return component;
 }

package/dist/util.test.mjs

@@ -2,8 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { computed, nextTick, ref } from "vue";
-import { version } from "vue";
+import { computed, nextTick, ref, version } from "vue";
 import {
   createDependentProxy,
   createSymbolProperty,
@@ -268,6 +267,40 @@ describe("util.ts - Utility Functions", () => {
         const classInstance = new ClassComponent();
         expect(resolveComponent(classInstance)).toBe(classInstance);
       });
+      it("should return default when object has only default key", () => {
+        const component = { default: "DefaultComponent" };
+        expect(resolveComponent(component)).toBe("DefaultComponent");
+      });
+      it("should return object when it has multiple keys including default", () => {
+        const component = {
+          default: "DefaultComponent",
+          other: "otherValue"
+        };
+        expect(resolveComponent(component)).toBe(component);
+      });
+      it("should return object when it has multiple keys without default", () => {
+        const component = {
+          prop1: "value1",
+          prop2: "value2"
+        };
+        expect(resolveComponent(component)).toBe(component);
+      });
+      it("should return object when it has single key that is not default", () => {
+        const component = { custom: "CustomComponent" };
+        expect(resolveComponent(component)).toBe(component);
+      });
+      it("should return array as is", () => {
+        const component = ["item1", "item2"];
+        expect(resolveComponent(component)).toBe(component);
+      });
+      it("should return object with single default key that is null", () => {
+        const component = { default: null };
+        expect(resolveComponent(component)).toBe(null);
+      });
+      it("should return object with single default key that is undefined", () => {
+        const component = { default: void 0 };
+        expect(resolveComponent(component)).toBe(void 0);
+      });
     });
   });
   describe("createDependentProxy", () => {

package/dist/vue2.d.ts

@@ -1,4 +1,5 @@
 import type { Route, Router } from '@esmx/router';
+import type Vue from 'vue2';
 declare module 'vue/types/vue' {
     interface Vue {
         readonly $router: Router;
@@ -11,3 +12,4 @@ declare module 'vue2/types/vue' {
         readonly $route: Route;
     }
 }
+export type { Vue };

package/package.json

@@ -50,11 +50,11 @@
         "vue": "^3.5.0 || ^2.7.0"
     },
     "dependencies": {
-        "@esmx/router": "3.0.0-rc.78"
+        "@esmx/router": "3.0.0-rc.80"
     },
     "devDependencies": {
-        "@biomejs/biome": "1.9.4",
-        "@types/node": "^24.10.0",
+        "@biomejs/biome": "2.3.7",
+        "@types/node": "^24.0.0",
         "@vitest/coverage-v8": "3.2.4",
         "typescript": "5.9.3",
         "unbuild": "3.6.1",
@@ -62,7 +62,7 @@
         "vue": "3.5.23",
         "vue2": "npm:vue@2.7.16"
     },
-    "version": "3.0.0-rc.78",
+    "version": "3.0.0-rc.80",
     "type": "module",
     "private": false,
     "exports": {
@@ -81,5 +81,5 @@
         "template",
         "public"
     ],
-    "gitHead": "aa44e33ab3e05817977c0fda6148abff8351651f"
+    "gitHead": "3fca699d5b4daa50c2c53f4adea0e8a71e14765b"
 }

package/src/index.test.ts

@@ -97,9 +97,7 @@ describe('index.ts - Package Entry Point', () => {
 
             expectedExports.forEach((exportName) => {
                 expect(RouterVueModule).toHaveProperty(exportName);
-                expect(
-                    RouterVueModule[exportName as keyof typeof RouterVueModule]
-                ).toBeDefined();
+                expect(Object.hasOwn(RouterVueModule, exportName)).toBe(true);
             });
         });
 

package/src/index.ts

@@ -1,18 +1,15 @@
-export type * from './vue2';
-export type * from './vue3';
-
+export { RouterPlugin } from './plugin';
+export { RouterLink } from './router-link';
+export { RouterView } from './router-view';
 export {
-    useRouter,
-    useRoute,
-    useProvideRouter,
-    useLink,
-    useRouterViewDepth,
-    getRouterViewDepth,
     getRoute,
-    getRouter
+    getRouter,
+    getRouterViewDepth,
+    useLink,
+    useProvideRouter,
+    useRoute,
+    useRouter,
+    useRouterViewDepth
 } from './use';
-
-export { RouterLink } from './router-link';
-export { RouterView } from './router-view';
-
-export { RouterPlugin } from './plugin';
+export type * from './vue2';
+export type * from './vue3';

package/src/plugin.test.ts

@@ -446,15 +446,8 @@ describe('plugin.ts - RouterPlugin', () => {
             expect(typeof routeDescriptor?.get).toBe('function');
 
             // Verify properties exist in global properties
-            expect(
-                Object.prototype.hasOwnProperty.call(
-                    globalProperties,
-                    '$router'
-                )
-            ).toBe(true);
-            expect(
-                Object.prototype.hasOwnProperty.call(globalProperties, '$route')
-            ).toBe(true);
+            expect(Object.hasOwn(globalProperties, '$router')).toBe(true);
+            expect(Object.hasOwn(globalProperties, '$route')).toBe(true);
         });
 
         it('should provide correct component types', () => {

package/src/router-link.ts

@@ -1,5 +1,5 @@
 import type { RouterLinkProps } from '@esmx/router';
-import { type PropType, defineComponent, h } from 'vue';
+import { defineComponent, h, type PropType } from 'vue';
 import { useLink } from './use';
 import { isVue3 } from './util';
 

package/src/use.test.ts

@@ -2,9 +2,14 @@ import { type Route, Router, RouterMode } from '@esmx/router';
 /**
  * @vitest-environment happy-dom
  */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { nextTick } from 'vue';
-import { createApp, defineComponent, getCurrentInstance, h } from 'vue';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import {
+    createApp,
+    defineComponent,
+    getCurrentInstance,
+    h,
+    nextTick
+} from 'vue';
 import { RouterView } from './router-view';
 import {
     getRouterViewDepth,

package/src/util.test.ts

@@ -2,8 +2,7 @@
  * @vitest-environment happy-dom
  */
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { computed, nextTick, ref } from 'vue';
-import { version } from 'vue';
+import { computed, nextTick, ref, version } from 'vue';
 import {
     createDependentProxy,
     createSymbolProperty,
@@ -334,6 +333,47 @@ describe('util.ts - Utility Functions', () => {
                 const classInstance = new ClassComponent();
                 expect(resolveComponent(classInstance)).toBe(classInstance);
             });
+
+            it('should return default when object has only default key', () => {
+                const component = { default: 'DefaultComponent' };
+                expect(resolveComponent(component)).toBe('DefaultComponent');
+            });
+
+            it('should return object when it has multiple keys including default', () => {
+                const component = {
+                    default: 'DefaultComponent',
+                    other: 'otherValue'
+                };
+                expect(resolveComponent(component)).toBe(component);
+            });
+
+            it('should return object when it has multiple keys without default', () => {
+                const component = {
+                    prop1: 'value1',
+                    prop2: 'value2'
+                };
+                expect(resolveComponent(component)).toBe(component);
+            });
+
+            it('should return object when it has single key that is not default', () => {
+                const component = { custom: 'CustomComponent' };
+                expect(resolveComponent(component)).toBe(component);
+            });
+
+            it('should return array as is', () => {
+                const component = ['item1', 'item2'];
+                expect(resolveComponent(component)).toBe(component);
+            });
+
+            it('should return object with single default key that is null', () => {
+                const component = { default: null };
+                expect(resolveComponent(component)).toBe(null);
+            });
+
+            it('should return object with single default key that is undefined', () => {
+                const component = { default: undefined };
+                expect(resolveComponent(component)).toBe(undefined);
+            });
         });
     });
 

package/src/util.ts

@@ -1,5 +1,5 @@
-import { version } from 'vue';
 import type { Ref } from 'vue';
+import { version } from 'vue';
 
 export const isVue3 = version.startsWith('3.');
 
@@ -41,5 +41,15 @@ export function resolveComponent(component: unknown): unknown {
         return component.default || component;
     }
 
+    if (
+        component &&
+        typeof component === 'object' &&
+        !Array.isArray(component) &&
+        'default' in component &&
+        Object.keys(component).length === 1
+    ) {
+        return component.default;
+    }
+
     return component;
 }

package/src/vue2.ts

@@ -1,7 +1,7 @@
 import type { Route, Router } from '@esmx/router';
 import type Vue from 'vue2';
 
-// @ts-ignore
+// @ts-expect-error
 declare module 'vue/types/vue' {
     interface Vue {
         readonly $router: Router;
@@ -14,3 +14,5 @@ declare module 'vue2/types/vue' {
         readonly $route: Route;
     }
 }
+
+export type { Vue };