@shakerquiz/url 0.0.36 → 0.0.37

package/dprint.json

@@ -8,11 +8,9 @@
     "useBraces": "maintain",
   },
   "json": {},
-  "markdown": {},
-  "dockerfile": {},
-  "malva": {},
-  "markup": {},
-  "yaml": {},
+  "includes": [
+    "./source/**/*.js"
+  ],
   "excludes": [
     "**/node_modules",
     "**/*-lock.json"
@@ -20,10 +18,5 @@
   "plugins": [
     "https://plugins.dprint.dev/typescript-0.95.9.wasm",
     "https://plugins.dprint.dev/json-0.20.0.wasm",
-    "https://plugins.dprint.dev/markdown-0.19.0.wasm",
-    "https://plugins.dprint.dev/dockerfile-0.3.3.wasm",
-    "https://plugins.dprint.dev/g-plane/malva-v0.14.1.wasm",
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.23.1.wasm",
-    "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm"
   ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@shakerquiz/url",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "author": "yurkimus <yurkimus@gmail.com>",
   "license": "ISC",
   "repository": {
@@ -9,7 +9,7 @@
     "url": "https://github.com/shaker-quiz/url"
   },
   "scripts": {
-    "prepublishOnly": "bun ./scripts/origins.js"
+    "prepublishOnly": "bun ./scripts/codegen.js && dprint fmt"
   },
   "exports": {
     "./checkin": "./source/checkin/index.js",
@@ -31,6 +31,9 @@
     "./vkma": "./source/vkma/index.js"
   },
   "dependencies": {
-    "@shakerquiz/utilities": "0.6.18"
+    "@shakerquiz/utilities": "4.0.2"
+  },
+  "devDependencies": {
+    "dprint": "0.51.1"
   }
 }

package/scripts/{origins.js → codegen.js}

@@ -1,5 +1,6 @@
+import template from './template.js' with { type: 'text' }
+
 import { Networks, ServiceRuntime, Services } from '@shakerquiz/utilities'
-import template from './templates/origins.js' with { type: 'text' }
 
 let Service = service => `${service}: Object.freeze({/* networks */})`
 

package/scripts/template.js

@@ -0,0 +1,33 @@
+import { access, hydrateRoutePathname, Network, Route, RouteService } from '@shakerquiz/utilities'
+
+export const ServiceNetworkOrigin = Object.freeze({/* origins */})
+
+/**
+ * @param {keyof typeof import('@shakerquiz/utilities').Network} maybeNetwork
+ * @param {keyof typeof import('@shakerquiz/utilities').Route} maybeRoute
+ * @param {any[]} maybeParams
+ * @param {ConstructorParameters<typeof URLSearchParams>[0]} maybeSearch
+ * @param {Parameters<typeof fetch>[1]} [maybeInit]
+ */
+export const request = (maybeNetwork, maybeRoute, maybeParams, maybeSearch, maybeInit) => {
+  var route = access(Route, maybeRoute)
+
+  var routeService = access(RouteService, maybeRoute)
+
+  var network = access(Network, maybeNetwork)
+
+  if (!Object.hasOwn(ServiceNetworkOrigin, routeService))
+    throw TypeError(`Service '${routeService}' does not exist.`)
+
+  if (!Object.hasOwn(ServiceNetworkOrigin[routeService], network))
+    throw TypeError(`Service '${routeService}' Network '${network}' does not exist.`)
+
+  if (!URL.canParse(ServiceNetworkOrigin[routeService][network]))
+    throw TypeError(`Origin '${ServiceNetworkOrigin[routeService][network]}' cannot be parsed as URL.`)
+
+  var url = new URL(hydrateRoutePathname(route, maybeParams), ServiceNetworkOrigin[routeService][network])
+
+  url.search = new URLSearchParams(maybeSearch)
+
+  return fetch(url, maybeInit)
+}

package/source/checkin/index.js

@@ -1,89 +1,106 @@
 import { access, hydrateRoutePathname, Network, Route, RouteService } from '@shakerquiz/utilities'
 
 export const ServiceNetworkOrigin = Object.freeze({
-Users: Object.freeze({
-Docker: process.env.USERS_DOCKER_ORIGIN,
-Public: process.env.USERS_PUBLIC_ORIGIN}),
-Roles: Object.freeze({
-Docker: process.env.ROLES_DOCKER_ORIGIN,
-Public: process.env.ROLES_PUBLIC_ORIGIN}),
-Checkin: Object.freeze({
-Docker: process.env.CHECKIN_DOCKER_ORIGIN,
-Public: process.env.CHECKIN_PUBLIC_ORIGIN}),
-Locations: Object.freeze({
-Docker: process.env.LOCATIONS_DOCKER_ORIGIN,
-Public: process.env.LOCATIONS_PUBLIC_ORIGIN}),
-Cities: Object.freeze({
-Docker: process.env.CITIES_DOCKER_ORIGIN,
-Public: process.env.CITIES_PUBLIC_ORIGIN}),
-Venues: Object.freeze({
-Docker: process.env.VENUES_DOCKER_ORIGIN,
-Public: process.env.VENUES_PUBLIC_ORIGIN}),
-Themes: Object.freeze({
-Docker: process.env.THEMES_DOCKER_ORIGIN,
-Public: process.env.THEMES_PUBLIC_ORIGIN}),
-Games: Object.freeze({
-Docker: process.env.GAMES_DOCKER_ORIGIN,
-Public: process.env.GAMES_PUBLIC_ORIGIN}),
-Registrations: Object.freeze({
-Docker: process.env.REGISTRATIONS_DOCKER_ORIGIN,
-Public: process.env.REGISTRATIONS_PUBLIC_ORIGIN}),
-Files: Object.freeze({
-Docker: process.env.FILES_DOCKER_ORIGIN,
-Public: process.env.FILES_PUBLIC_ORIGIN}),
-Procedures: Object.freeze({
-Docker: process.env.PROCEDURES_DOCKER_ORIGIN,
-Public: process.env.PROCEDURES_PUBLIC_ORIGIN}),
-Integrations: Object.freeze({
-Docker: process.env.INTEGRATIONS_DOCKER_ORIGIN,
-Public: process.env.INTEGRATIONS_PUBLIC_ORIGIN}),
-Updates: Object.freeze({
-Docker: process.env.UPDATES_DOCKER_ORIGIN,
-Public: process.env.UPDATES_PUBLIC_ORIGIN}),
-Hub: Object.freeze({
-Docker: process.env.HUB_DOCKER_ORIGIN,
-Public: process.env.HUB_PUBLIC_ORIGIN}),
-Landing: Object.freeze({
-Docker: process.env.LANDING_DOCKER_ORIGIN,
-Public: process.env.LANDING_PUBLIC_ORIGIN}),
-Telegram: Object.freeze({
-Docker: process.env.TELEGRAM_DOCKER_ORIGIN,
-Public: process.env.TELEGRAM_PUBLIC_ORIGIN}),
-Vkma: Object.freeze({
-Docker: process.env.VKMA_DOCKER_ORIGIN,
-Public: process.env.VKMA_PUBLIC_ORIGIN}),
-Minio: Object.freeze({
-Docker: process.env.MINIO_DOCKER_ORIGIN,
-Public: process.env.MINIO_PUBLIC_ORIGIN})})
+  Users: Object.freeze({
+    Docker: process.env.USERS_DOCKER_ORIGIN,
+    Public: process.env.USERS_PUBLIC_ORIGIN,
+  }),
+  Roles: Object.freeze({
+    Docker: process.env.ROLES_DOCKER_ORIGIN,
+    Public: process.env.ROLES_PUBLIC_ORIGIN,
+  }),
+  Checkin: Object.freeze({
+    Docker: process.env.CHECKIN_DOCKER_ORIGIN,
+    Public: process.env.CHECKIN_PUBLIC_ORIGIN,
+  }),
+  Locations: Object.freeze({
+    Docker: process.env.LOCATIONS_DOCKER_ORIGIN,
+    Public: process.env.LOCATIONS_PUBLIC_ORIGIN,
+  }),
+  Cities: Object.freeze({
+    Docker: process.env.CITIES_DOCKER_ORIGIN,
+    Public: process.env.CITIES_PUBLIC_ORIGIN,
+  }),
+  Venues: Object.freeze({
+    Docker: process.env.VENUES_DOCKER_ORIGIN,
+    Public: process.env.VENUES_PUBLIC_ORIGIN,
+  }),
+  Themes: Object.freeze({
+    Docker: process.env.THEMES_DOCKER_ORIGIN,
+    Public: process.env.THEMES_PUBLIC_ORIGIN,
+  }),
+  Games: Object.freeze({
+    Docker: process.env.GAMES_DOCKER_ORIGIN,
+    Public: process.env.GAMES_PUBLIC_ORIGIN,
+  }),
+  Registrations: Object.freeze({
+    Docker: process.env.REGISTRATIONS_DOCKER_ORIGIN,
+    Public: process.env.REGISTRATIONS_PUBLIC_ORIGIN,
+  }),
+  Files: Object.freeze({
+    Docker: process.env.FILES_DOCKER_ORIGIN,
+    Public: process.env.FILES_PUBLIC_ORIGIN,
+  }),
+  Procedures: Object.freeze({
+    Docker: process.env.PROCEDURES_DOCKER_ORIGIN,
+    Public: process.env.PROCEDURES_PUBLIC_ORIGIN,
+  }),
+  Integrations: Object.freeze({
+    Docker: process.env.INTEGRATIONS_DOCKER_ORIGIN,
+    Public: process.env.INTEGRATIONS_PUBLIC_ORIGIN,
+  }),
+  Updates: Object.freeze({
+    Docker: process.env.UPDATES_DOCKER_ORIGIN,
+    Public: process.env.UPDATES_PUBLIC_ORIGIN,
+  }),
+  Hub: Object.freeze({
+    Docker: process.env.HUB_DOCKER_ORIGIN,
+    Public: process.env.HUB_PUBLIC_ORIGIN,
+  }),
+  Landing: Object.freeze({
+    Docker: process.env.LANDING_DOCKER_ORIGIN,
+    Public: process.env.LANDING_PUBLIC_ORIGIN,
+  }),
+  Telegram: Object.freeze({
+    Docker: process.env.TELEGRAM_DOCKER_ORIGIN,
+    Public: process.env.TELEGRAM_PUBLIC_ORIGIN,
+  }),
+  Vkma: Object.freeze({
+    Docker: process.env.VKMA_DOCKER_ORIGIN,
+    Public: process.env.VKMA_PUBLIC_ORIGIN,
+  }),
+  Minio: Object.freeze({
+    Docker: process.env.MINIO_DOCKER_ORIGIN,
+    Public: process.env.MINIO_PUBLIC_ORIGIN,
+  }),
+})
 
-export const request = Object.freeze(
-  /**
-   * @param {keyof typeof import('@shakerquiz/utilities').Network} network
-   * @param {keyof typeof import('@shakerquiz/utilities').Route} route
-   * @param {*} params
-   * @param {*} search
-   * @param {*} init
-   */
-  (network, route, params, search, init) => {
-    var r = access(Route, route)
+/**
+ * @param {keyof typeof import('@shakerquiz/utilities').Network} maybeNetwork
+ * @param {keyof typeof import('@shakerquiz/utilities').Route} maybeRoute
+ * @param {any[]} maybeParams
+ * @param {ConstructorParameters<typeof URLSearchParams>[0]} maybeSearch
+ * @param {Parameters<typeof fetch>[1]} [maybeInit]
+ */
+export const request = (maybeNetwork, maybeRoute, maybeParams, maybeSearch, maybeInit) => {
+  var route = access(Route, maybeRoute)
 
-    var rs = access(RouteService, route)
+  var routeService = access(RouteService, maybeRoute)
 
-    var n = access(Network, network)
+  var network = access(Network, maybeNetwork)
 
-    if (!Object.hasOwn(ServiceNetworkOrigin, rs))
-      throw TypeError(`Service '${rs}' does not exist.`)
+  if (!Object.hasOwn(ServiceNetworkOrigin, routeService))
+    throw TypeError(`Service '${routeService}' does not exist.`)
 
-    if (!Object.hasOwn(ServiceNetworkOrigin[rs], n))
-      throw TypeError(`Service '${rs}' Network '${n}' does not exist.`)
+  if (!Object.hasOwn(ServiceNetworkOrigin[routeService], network))
+    throw TypeError(`Service '${routeService}' Network '${network}' does not exist.`)
 
-    if (!URL.canParse(ServiceNetworkOrigin[rs][n]))
-      throw TypeError(`Origin '${ServiceNetworkOrigin[rs][n]}' cannot be parsed as URL.`)
+  if (!URL.canParse(ServiceNetworkOrigin[routeService][network]))
+    throw TypeError(`Origin '${ServiceNetworkOrigin[routeService][network]}' cannot be parsed as URL.`)
 
-    var url = new URL(hydrateRoutePathname(r, params), ServiceNetworkOrigin[rs][n])
+  var url = new URL(hydrateRoutePathname(route, maybeParams), ServiceNetworkOrigin[routeService][network])
 
-    url.search = search
+  url.search = new URLSearchParams(maybeSearch)
 
-    return fetch(url, init)
-  },
-)
+  return fetch(url, maybeInit)
+}

package/source/cities/index.js

@@ -1,89 +1,106 @@
 import { access, hydrateRoutePathname, Network, Route, RouteService } from '@shakerquiz/utilities'
 
 export const ServiceNetworkOrigin = Object.freeze({
-Users: Object.freeze({
-Docker: process.env.USERS_DOCKER_ORIGIN,
-Public: process.env.USERS_PUBLIC_ORIGIN}),
-Roles: Object.freeze({
-Docker: process.env.ROLES_DOCKER_ORIGIN,
-Public: process.env.ROLES_PUBLIC_ORIGIN}),
-Checkin: Object.freeze({
-Docker: process.env.CHECKIN_DOCKER_ORIGIN,
-Public: process.env.CHECKIN_PUBLIC_ORIGIN}),
-Locations: Object.freeze({
-Docker: process.env.LOCATIONS_DOCKER_ORIGIN,
-Public: process.env.LOCATIONS_PUBLIC_ORIGIN}),
-Cities: Object.freeze({
-Docker: process.env.CITIES_DOCKER_ORIGIN,
-Public: process.env.CITIES_PUBLIC_ORIGIN}),
-Venues: Object.freeze({
-Docker: process.env.VENUES_DOCKER_ORIGIN,
-Public: process.env.VENUES_PUBLIC_ORIGIN}),
-Themes: Object.freeze({
-Docker: process.env.THEMES_DOCKER_ORIGIN,
-Public: process.env.THEMES_PUBLIC_ORIGIN}),
-Games: Object.freeze({
-Docker: process.env.GAMES_DOCKER_ORIGIN,
-Public: process.env.GAMES_PUBLIC_ORIGIN}),
-Registrations: Object.freeze({
-Docker: process.env.REGISTRATIONS_DOCKER_ORIGIN,
-Public: process.env.REGISTRATIONS_PUBLIC_ORIGIN}),
-Files: Object.freeze({
-Docker: process.env.FILES_DOCKER_ORIGIN,
-Public: process.env.FILES_PUBLIC_ORIGIN}),
-Procedures: Object.freeze({
-Docker: process.env.PROCEDURES_DOCKER_ORIGIN,
-Public: process.env.PROCEDURES_PUBLIC_ORIGIN}),
-Integrations: Object.freeze({
-Docker: process.env.INTEGRATIONS_DOCKER_ORIGIN,
-Public: process.env.INTEGRATIONS_PUBLIC_ORIGIN}),
-Updates: Object.freeze({
-Docker: process.env.UPDATES_DOCKER_ORIGIN,
-Public: process.env.UPDATES_PUBLIC_ORIGIN}),
-Hub: Object.freeze({
-Docker: process.env.HUB_DOCKER_ORIGIN,
-Public: process.env.HUB_PUBLIC_ORIGIN}),
-Landing: Object.freeze({
-Docker: process.env.LANDING_DOCKER_ORIGIN,
-Public: process.env.LANDING_PUBLIC_ORIGIN}),
-Telegram: Object.freeze({
-Docker: process.env.TELEGRAM_DOCKER_ORIGIN,
-Public: process.env.TELEGRAM_PUBLIC_ORIGIN}),
-Vkma: Object.freeze({
-Docker: process.env.VKMA_DOCKER_ORIGIN,
-Public: process.env.VKMA_PUBLIC_ORIGIN}),
-Minio: Object.freeze({
-Docker: process.env.MINIO_DOCKER_ORIGIN,
-Public: process.env.MINIO_PUBLIC_ORIGIN})})
+  Users: Object.freeze({
+    Docker: process.env.USERS_DOCKER_ORIGIN,
+    Public: process.env.USERS_PUBLIC_ORIGIN,
+  }),
+  Roles: Object.freeze({
+    Docker: process.env.ROLES_DOCKER_ORIGIN,
+    Public: process.env.ROLES_PUBLIC_ORIGIN,
+  }),
+  Checkin: Object.freeze({
+    Docker: process.env.CHECKIN_DOCKER_ORIGIN,
+    Public: process.env.CHECKIN_PUBLIC_ORIGIN,
+  }),
+  Locations: Object.freeze({
+    Docker: process.env.LOCATIONS_DOCKER_ORIGIN,
+    Public: process.env.LOCATIONS_PUBLIC_ORIGIN,
+  }),
+  Cities: Object.freeze({
+    Docker: process.env.CITIES_DOCKER_ORIGIN,
+    Public: process.env.CITIES_PUBLIC_ORIGIN,
+  }),
+  Venues: Object.freeze({
+    Docker: process.env.VENUES_DOCKER_ORIGIN,
+    Public: process.env.VENUES_PUBLIC_ORIGIN,
+  }),
+  Themes: Object.freeze({
+    Docker: process.env.THEMES_DOCKER_ORIGIN,
+    Public: process.env.THEMES_PUBLIC_ORIGIN,
+  }),
+  Games: Object.freeze({
+    Docker: process.env.GAMES_DOCKER_ORIGIN,
+    Public: process.env.GAMES_PUBLIC_ORIGIN,
+  }),
+  Registrations: Object.freeze({
+    Docker: process.env.REGISTRATIONS_DOCKER_ORIGIN,
+    Public: process.env.REGISTRATIONS_PUBLIC_ORIGIN,
+  }),
+  Files: Object.freeze({
+    Docker: process.env.FILES_DOCKER_ORIGIN,
+    Public: process.env.FILES_PUBLIC_ORIGIN,
+  }),
+  Procedures: Object.freeze({
+    Docker: process.env.PROCEDURES_DOCKER_ORIGIN,
+    Public: process.env.PROCEDURES_PUBLIC_ORIGIN,
+  }),
+  Integrations: Object.freeze({
+    Docker: process.env.INTEGRATIONS_DOCKER_ORIGIN,
+    Public: process.env.INTEGRATIONS_PUBLIC_ORIGIN,
+  }),
+  Updates: Object.freeze({
+    Docker: process.env.UPDATES_DOCKER_ORIGIN,
+    Public: process.env.UPDATES_PUBLIC_ORIGIN,
+  }),
+  Hub: Object.freeze({
+    Docker: process.env.HUB_DOCKER_ORIGIN,
+    Public: process.env.HUB_PUBLIC_ORIGIN,
+  }),
+  Landing: Object.freeze({
+    Docker: process.env.LANDING_DOCKER_ORIGIN,
+    Public: process.env.LANDING_PUBLIC_ORIGIN,
+  }),
+  Telegram: Object.freeze({
+    Docker: process.env.TELEGRAM_DOCKER_ORIGIN,
+    Public: process.env.TELEGRAM_PUBLIC_ORIGIN,
+  }),
+  Vkma: Object.freeze({
+    Docker: process.env.VKMA_DOCKER_ORIGIN,
+    Public: process.env.VKMA_PUBLIC_ORIGIN,
+  }),
+  Minio: Object.freeze({
+    Docker: process.env.MINIO_DOCKER_ORIGIN,
+    Public: process.env.MINIO_PUBLIC_ORIGIN,
+  }),
+})
 
-export const request = Object.freeze(
-  /**
-   * @param {keyof typeof import('@shakerquiz/utilities').Network} network
-   * @param {keyof typeof import('@shakerquiz/utilities').Route} route
-   * @param {*} params
-   * @param {*} search
-   * @param {*} init
-   */
-  (network, route, params, search, init) => {
-    var r = access(Route, route)
+/**
+ * @param {keyof typeof import('@shakerquiz/utilities').Network} maybeNetwork
+ * @param {keyof typeof import('@shakerquiz/utilities').Route} maybeRoute
+ * @param {any[]} maybeParams
+ * @param {ConstructorParameters<typeof URLSearchParams>[0]} maybeSearch
+ * @param {Parameters<typeof fetch>[1]} [maybeInit]
+ */
+export const request = (maybeNetwork, maybeRoute, maybeParams, maybeSearch, maybeInit) => {
+  var route = access(Route, maybeRoute)
 
-    var rs = access(RouteService, route)
+  var routeService = access(RouteService, maybeRoute)
 
-    var n = access(Network, network)
+  var network = access(Network, maybeNetwork)
 
-    if (!Object.hasOwn(ServiceNetworkOrigin, rs))
-      throw TypeError(`Service '${rs}' does not exist.`)
+  if (!Object.hasOwn(ServiceNetworkOrigin, routeService))
+    throw TypeError(`Service '${routeService}' does not exist.`)
 
-    if (!Object.hasOwn(ServiceNetworkOrigin[rs], n))
-      throw TypeError(`Service '${rs}' Network '${n}' does not exist.`)
+  if (!Object.hasOwn(ServiceNetworkOrigin[routeService], network))
+    throw TypeError(`Service '${routeService}' Network '${network}' does not exist.`)
 
-    if (!URL.canParse(ServiceNetworkOrigin[rs][n]))
-      throw TypeError(`Origin '${ServiceNetworkOrigin[rs][n]}' cannot be parsed as URL.`)
+  if (!URL.canParse(ServiceNetworkOrigin[routeService][network]))
+    throw TypeError(`Origin '${ServiceNetworkOrigin[routeService][network]}' cannot be parsed as URL.`)
 
-    var url = new URL(hydrateRoutePathname(r, params), ServiceNetworkOrigin[rs][n])
+  var url = new URL(hydrateRoutePathname(route, maybeParams), ServiceNetworkOrigin[routeService][network])
 
-    url.search = search
+  url.search = new URLSearchParams(maybeSearch)
 
-    return fetch(url, init)
-  },
-)
+  return fetch(url, maybeInit)
+}