@shakerquiz/utilities 0.2.14 → 0.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shakerquiz/utilities",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "author": "yurkimus <yurkimus@gmail.com>",
   "license": "ISC",
   "exports": {
@@ -16,5 +16,8 @@
     "@yurkimus/message": "0.0.14",
     "@yurkimus/response-status": "0.1.1",
     "@yurkimus/url": "0.2.8"
+  },
+  "devDependencies": {
+    "urlpattern-polyfill": "10.0.0"
   }
 }

package/source/enumerations/features.d.ts

@@ -1,61 +1,81 @@
 import { URLOptions } from '@yurkimus/url'
 
-import { Kinds } from './kinds'
-import { Networks } from './networks'
+import { Kinds } from './kinds.d.ts'
+import { Networks } from './networks.d.ts'
+import { Services } from './services.d.ts'
 
-// export let Features: {
-//   Checkin: 'Checkin'
+export let Features: {
+  Checkin: 'Checkin'
 
-//   User: 'User'
-//   Users: 'Users'
+  User: 'User'
+  Users: 'Users'
 
-//   Theme: 'Theme'
-//   Themes: 'Themes'
+  Theme: 'Theme'
+  Themes: 'Themes'
 
-//   Game: 'Game'
-//   Games: 'Games'
+  Game: 'Game'
+  Games: 'Games'
 
-//   Registration: 'Registration'
-//   Registrations: 'Registrations'
+  Registration: 'Registration'
+  Registrations: 'Registrations'
 
-//   City: 'City'
-//   Cities: 'Cities'
+  City: 'City'
+  Cities: 'Cities'
 
-//   CityPublic: 'CityPublic'
-//   CitiesPublic: 'CitiesPublic'
+  Location: 'Location'
+  Locations: 'Locations'
+}
 
-//   Location: 'Location'
-//   Locations: 'Locations'
-// }
+export let FeatureKinds: {
+  [Features.Checkin]: Kinds.Item
 
-// export let FeatureKinds: {
-//   [Features.Checkin]: Kinds.Item
+  [Features.User]: Kinds.Item
+  [Features.Users]: Kinds.List
 
-//   [Features.User]: Kinds.Item
-//   [Features.Users]: Kinds.List
+  [Features.Theme]: Kinds.Item
+  [Features.Themes]: Kinds.List
 
-//   [Features.Theme]: Kinds.Item
-//   [Features.Themes]: Kinds.List
+  [Features.Game]: Kinds.Item
+  [Features.Games]: Kinds.List
 
-//   [Features.Game]: Kinds.Item
-//   [Features.Games]: Kinds.List
+  [Features.Registration]: Kinds.Item
+  [Features.Registrations]: Kinds.List
 
-//   [Features.Registration]: Kinds.Item
-//   [Features.Registrations]: Kinds.List
+  [Features.City]: Kinds.Item
+  [Features.Cities]: Kinds.List
 
-//   [Features.City]: Kinds.Item
-//   [Features.Cities]: Kinds.List
+  [Features.Location]: Kinds.Item
+  [Features.Locations]: Kinds.List
+}
 
-//   [Features.CityPublic]: Kinds.Item
-//   [Features.CitiesPublic]: Kinds.List
+export let FeatureServices: {
+  [Features.Checkin]: Services.Users
 
-//   [Features.Location]: Kinds.Item
-//   [Features.Locations]: Kinds.List
-// }
+  [Features.User]: Services.Users
+  [Features.Users]: Services.Users
 
-export let FeatureUrls: Map<
-  keyof typeof Features,
-  Map<keyof typeof Networks, (options: URLOptions) => URL>
+  [Features.Theme]: Services.Games
+  [Features.Themes]: Services.Games
+
+  [Features.Game]: Services.Games
+  [Features.Games]: Services.Games
+
+  [Features.Registration]: Services.Games
+  [Features.Registrations]: Services.Games
+
+  [Features.City]: Services.Locations
+  [Features.Cities]: Services.Locations
+
+  [Features.Location]: Services.Locations
+  [Features.Locations]: Services.Locations
+}
+
+export let FeatureOrigins: Map<
+  keyof typeof Services,
+  Map<
+    keyof typeof Networks,
+    (pathname: string, options: URLOptions) => URL
+  >
 >
 
 type Features = typeof Features

package/source/enumerations/features.js

@@ -1,4 +1,5 @@
 import { Kinds } from './kinds.js'
+import { Services } from './services.js'
 
 export let Features = /** @type {const} */ ({
   Checkin: 'Checkin',
@@ -44,4 +45,26 @@ export let FeatureKinds = {
   [Features.Locations]: Kinds.List,
 }
 
-export let FeatureUrls = new Map()
+export let FeatureServices = {
+  [Features.Checkin]: Services.Users,
+
+  [Features.User]: Services.Users,
+  [Features.Users]: Services.Users,
+
+  [Features.Theme]: Services.Games,
+  [Features.Themes]: Services.Games,
+
+  [Features.Game]: Services.Games,
+  [Features.Games]: Services.Games,
+
+  [Features.Registration]: Services.Games,
+  [Features.Registrations]: Services.Games,
+
+  [Features.City]: Services.Locations,
+  [Features.Cities]: Services.Locations,
+
+  [Features.Location]: Services.Locations,
+  [Features.Locations]: Services.Locations,
+}
+
+export let FeatureOrigins = new Map()

package/source/enumerations/patterns.d.ts

@@ -1,6 +1,6 @@
 import { Features } from './features.d.ts'
 
-export let Patterns: {
+export let FeaturePatterns: {
   /**
    * Users
    */

package/source/enumerations/patterns.js

@@ -1,6 +1,6 @@
 import { Features } from './features.js'
 
-export let Patterns = {
+export let FeaturePatterns = {
   /**
    * Users
    */

package/source/enumerations/services.d.ts

@@ -0,0 +1,5 @@
+export let Services: {
+  Games: 'Games'
+  Locations: 'Locations'
+  Users: 'Users'
+}

package/source/enumerations/services.js

@@ -0,0 +1,5 @@
+export let Services = /** @type {const} */ ({
+  Games: 'Games',
+  Locations: 'Locations',
+  Users: 'Users',
+})

package/source/functions/request.js

@@ -3,8 +3,14 @@ import { MessageError } from '@yurkimus/errors'
 import * as message from '@yurkimus/message'
 import { ResponseStatus } from '@yurkimus/response-status'
 
-import { FeatureKinds, FeatureUrls } from '../enumerations/features.js'
+import { Cookies } from '../enumerations/cookies.js'
+import {
+  FeatureKinds,
+  FeatureOrigins,
+  FeatureServices,
+} from '../enumerations/features.js'
 import { Kinds } from '../enumerations/kinds.js'
+import { FeaturePatterns } from '../enumerations/patterns.js'
 
 let handleMessage = (feature, [response, body]) => {
   switch (response.status) {
@@ -54,11 +60,16 @@ let makeRequest = (feature, method, network, options, init) => {
   if (!('method' in init))
     init.method = method
 
-  let url = FeatureUrls
-    .get(feature)
+  let url = FeatureOrigins
+    .get(FeatureServices[feature])
     .get(network)
+    .call(
+      undefined,
+      FeaturePatterns[feature].pathname,
+      options,
+    )
 
-  let request = new Request(url(options), init)
+  let request = new Request(url, init)
 
   if (!request.headers.has('Content-Type'))
     request.headers.set(
@@ -69,7 +80,7 @@ let makeRequest = (feature, method, network, options, init) => {
   if ('cookie' in init)
     request.headers.set(
       'Authorization',
-      cookies.read('shaker-quiz-token', init.cookie),
+      cookies.read(Cookies.Token, init.cookie),
     )
 
   return fetch(request)
@@ -92,18 +103,27 @@ export let Extensions = new WeakMap()
  * @param {Network} network
  */
 export let useRequest = (feature, method, network) => {
-  if (
-    !FeatureUrls
-      .has(feature)
-  )
-    throw TypeError(`Feature '${feature}' must be listed in 'FeatureUrls'.`)
+  if (!(feature in FeatureServices))
+    throw TypeError(
+      `Feature '${feature}' must be listed in 'FeatureServices'.`,
+    )
 
-  if (
-    !FeatureUrls
-      .get(feature)
-      .has(network)
-  )
-    throw TypeError(`Network '${network}' must be listed in 'FeatureUrls'.`)
+  if (!(feature in FeaturePatterns))
+    throw TypeError(
+      `Feature '${feature}' must be listed in 'FeaturePatterns'.`,
+    )
+
+  if (!FeatureOrigins.has(FeatureServices[feature]))
+    throw TypeError(
+      `Service '${
+        FeatureServices[feature]
+      }' must be listed in 'FeatureOrigins'.`,
+    )
+
+  if (!FeatureOrigins.get(FeatureServices[feature]).has(network))
+    throw TypeError(
+      `Network '${network}' must be listed in '${FeatureServices[feature]}'.`,
+    )
 
   /**
    * @param {import('@yurkimus/url').URLOptions} options

package/source/index.d.ts

@@ -18,5 +18,6 @@ export * from './enumerations/patterns.js'
 export * from './enumerations/phases.js'
 export * from './enumerations/regexps.js'
 export * from './enumerations/roles.js'
+export * from './enumerations/services.js'
 
 export * from './functions/request.js'

package/source/index.js

@@ -9,4 +9,5 @@ export * from './enumerations/patterns.js'
 export * from './enumerations/phases.js'
 export * from './enumerations/regexps.js'
 export * from './enumerations/roles.js'
+export * from './enumerations/services.js'
 export * from './functions/request.js'