@shakerquiz/url 0.0.7 → 0.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@shakerquiz/url",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "author": "yurkimus <yurkimus@gmail.com>",
   "license": "ISC",
   "exports": {
@@ -23,6 +23,6 @@
     "./vkma": "./source/vkma/index.js"
   },
   "dependencies": {
-    "@shakerquiz/utilities": "0.5.145"
+    "@shakerquiz/utilities": "0.5.150"
   }
 }

package/source/checkin/index.js

@@ -1,4 +1,4 @@
-import { hydrateRoutePathname, inferKey, Network, Route, Service } from '@shakerquiz/utilities'
+import { hydrateRoutePathname, inferKey, Network, Route, RouteService, Service } from '@shakerquiz/utilities'
 
 export var ServiceNetworkOrigin = {
   [Service['Roles']]: {
@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/cities/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/files/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/games/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/hub/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/integrations/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/landing/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/locations/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/procedures/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/registrations/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/roles/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/themes/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/updates/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/users/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/venues/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch

package/source/vkma/index.js

@@ -95,11 +95,7 @@ export var ServiceNetworkOrigin = {
 /**
  * @returns {string}
  */
-export var inferOrigin = (maybeService, maybeNetwork) => {
-  var service = inferKey(Service, maybeService)
-
-  var network = inferKey(Network, maybeNetwork)
-
+export var inferOrigin = (service, network) => {
   if (!(service in ServiceNetworkOrigin))
     throw TypeError(`Service '${service}' does not exist.`)
 
@@ -112,9 +108,13 @@ export var inferOrigin = (maybeService, maybeNetwork) => {
 export var routeRequest = (maybeNetwork, maybeRoute, maybeRouteParams, maybeRouteSearch, init) => {
   var route = inferKey(Route, maybeRoute)
 
+  var routeService = inferKey(RouteService, maybeRoute)
+
+  var network = inferKey(Network, maybeNetwork)
+
   var url = new URL(
     hydrateRoutePathname(route, maybeRouteParams),
-    inferOrigin(route, maybeNetwork),
+    inferOrigin(routeService, network),
   )
 
   url.search = maybeRouteSearch