eco-vue-js 0.11.41 → 0.11.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/composables/useOptionalRouter.d.ts.map +1 -1
  2. package/dist/composables/useOptionalRouter.js +12 -3
  3. package/package.json +1 -1
package/dist/composables/useOptionalRouter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useOptionalRouter.d.ts","sourceRoot":"","sources":["../../../src/composables/useOptionalRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAyB,QAAQ,EAAE,SAAS,EAAC,MAAM,YAAY,CAAA;AAoB3G,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;AAE1C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IACpB,OAAO,CAAC,EAAE,EAAE,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAA;IACpK,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;IAC1B,QAAQ,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAC5B,CAAA;AAkCD,eAAO,MAAM,iBAAiB,QAAO,cAcpC,CAAA;AAED,KAAK,KAAK,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAA;AAExC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,aAAa,CAAA;IACpB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACnB,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC3B,QAAQ,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAC5B,CAAA;AAID,eAAO,MAAM,gBAAgB,QAAO,aAsBnC,CAAA"}
1
+ {"version":3,"file":"useOptionalRouter.d.ts","sourceRoot":"","sources":["../../../src/composables/useOptionalRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAyB,QAAQ,EAAE,SAAS,EAAC,MAAM,YAAY,CAAA;AAoB3G,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;AAE1C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IACpB,OAAO,CAAC,EAAE,EAAE,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAA;IACpK,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;IAC1B,QAAQ,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAC5B,CAAA;AAkCD,eAAO,MAAM,iBAAiB,QAAO,cAcpC,CAAA;AAED,KAAK,KAAK,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAA;AAExC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,aAAa,CAAA;IACpB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACnB,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC3B,QAAQ,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAC5B,CAAA;AAQD,eAAO,MAAM,gBAAgB,QAAO,aA+BnC,CAAA"}
package/dist/composables/useOptionalRouter.js CHANGED
@@ -51,14 +51,23 @@ const useOptionalRouter = () => {
51
51
  }
52
52
  return fallbackRouter;
53
53
  };
54
- const SYMBOL_ROUTE = "Symbol(route location)";
54
+ const isRouteLocation = (value) => {
55
+ return value instanceof Object && "hash" in value && typeof value.hash === "string" && "fullPath" in value && typeof value.fullPath === "string";
56
+ };
55
57
  const useOptionalRoute = () => {
56
58
  const hasRouter = isRouterAvailable();
57
59
  if (hasRouter) {
58
60
  const instance = getCurrentInstance();
59
61
  if (instance) {
60
- const injectionKey = Object.getOwnPropertySymbols(instance.appContext.provides).find((item) => item.toString() === SYMBOL_ROUTE);
61
- if (injectionKey) return inject(injectionKey);
62
+ let injected = null;
63
+ for (const item of Object.getOwnPropertySymbols(instance.appContext.provides)) {
64
+ const value = inject(item);
65
+ if (isRouteLocation(value)) {
66
+ injected = value;
67
+ break;
68
+ }
69
+ }
70
+ if (injected) return injected;
62
71
  }
63
72
  }
64
73
  const url = new URL(window.location.href);
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "type": "git",
5
5
  "url": "https://github.com/rsmple/eco-vue-js.git"
6
6
  },
7
- "version": "0.11.41",
7
+ "version": "0.11.42",
8
8
  "dependencies": {
9
9
  "@stylistic/eslint-plugin": "5.2.3",
10
10
  "@tanstack/eslint-plugin-query": "5.83.1",