@shakerquiz/utilities 0.5.220 → 0.5.222

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@shakerquiz/utilities",
-  "version": "0.5.220",
+  "version": "0.5.222",
   "author": "yurkimus <yurkimus@gmail.com>",
   "license": "ISC",
   "repository": {

package/source/enumerations/registration/lineup.js

@@ -0,0 +1,33 @@
+export const RegistrationLineup = Object.freeze({
+  'Main': 'Main',
+  'Reserve': 'Reserve',
+})
+
+/** @satisfies {Array<keyof typeof RegistrationLineup>} */
+export const RegistrationLineups = Object.freeze([
+  'Main',
+  'Reserve',
+])
+
+/** @satisfies {Record<keyof typeof RegistrationLineup, string>} */
+export const RegistrationLineupTitle = Object.freeze({
+  'Main': 'Основа',
+  'Reserve': 'Резерв',
+})
+
+/** @satisfies {Record<keyof typeof RegistrationLineup, string>} */
+export const RegistrationLineupIcon = Object.freeze({
+  'Main': 'hero/outline/user-circle',
+  'Reserve': 'hero/outline/pause-circle',
+})
+
+/** @satisfies {Record<keyof typeof RegistrationLineup, string>} */
+export const RegistrationLineupEmoji = Object.freeze({
+  'Main': '🟢',
+  'Reserve': '🟡',
+})
+
+export const inferRegistrationLineup = Object.freeze(
+  /** @returns {keyof typeof RegistrationLineup | 'Unknown'} */
+  x => RegistrationLineup[x?.lineup ?? x] ?? 'Unknown',
+)

package/source/enumerations/registration/status.js

@@ -4,59 +4,35 @@ export const RegistrationStatus = Object.freeze({
   'Cancelled': 'Cancelled',
 })
 
+/** @satisfies {Array<keyof typeof RegistrationStatus>} */
 export const RegistrationStatuses = Object.freeze([
-  RegistrationStatus['Created'],
-  RegistrationStatus['Confirmed'],
-  RegistrationStatus['Cancelled'],
+  'Created',
+  'Confirmed',
+  'Cancelled',
 ])
 
+/** @satisfies {Record<keyof typeof RegistrationStatus, string>} */
 export const RegistrationStatusTitle = Object.freeze({
-  [RegistrationStatus['Confirmed']]: 'Подтверждена',
-  [RegistrationStatus['Created']]: 'Создана',
-  [RegistrationStatus['Cancelled']]: 'Отменена',
+  'Confirmed': 'Подтверждена',
+  'Created': 'Создана',
+  'Cancelled': 'Отменена',
 })
 
+/** @satisfies {Record<keyof typeof RegistrationStatus, string>} */
 export const RegistrationStatusIcon = Object.freeze({
-  [RegistrationStatus['Confirmed']]: 'hero/outline/check-circle',
-  [RegistrationStatus['Created']]: 'hero/outline/check',
-  [RegistrationStatus['Cancelled']]: 'hero/outline/x-mark',
+  'Confirmed': 'hero/outline/check-circle',
+  'Created': 'hero/outline/check',
+  'Cancelled': 'hero/outline/x-mark',
 })
 
+/** @satisfies {Record<keyof typeof RegistrationStatus, string>} */
 export const RegistrationStatusEmoji = Object.freeze({
-  [RegistrationStatus['Confirmed']]: '✅',
-  [RegistrationStatus['Created']]: '📝',
-  [RegistrationStatus['Cancelled']]: '❌',
-})
-
-const ValueRegistrationStatus = Object.freeze({
-  'false/false': RegistrationStatus['Created'],
-  'false/true': RegistrationStatus['Confirmed'],
-  'true/false': RegistrationStatus['Cancelled'],
-})
-
-const RegistrationStatusShape = Object.freeze({
-  [RegistrationStatus['Created']]: Object.freeze({
-    is_canceled: false,
-    is_confirm: false,
-  }),
-
-  [RegistrationStatus['Confirmed']]: Object.freeze({
-    is_canceled: false,
-    is_confirm: true,
-  }),
-
-  [RegistrationStatus['Cancelled']]: Object.freeze({
-    is_canceled: true,
-    is_confirm: false,
-  }),
+  'Confirmed': '✅',
+  'Created': '📝',
+  'Cancelled': '❌',
 })
 
 export const inferRegistrationStatus = Object.freeze(
   /** @returns {keyof typeof RegistrationStatus | 'Unknown'} */
-  x => ValueRegistrationStatus[x?.is_canceled + '/' + x?.is_confirm] ?? ValueRegistrationStatus[x] ?? 'Unknown',
-)
-
-export const inferRegistrationStatusShape = Object.freeze(
-  /** @returns {typeof RegistrationStatusShape[keyof typeof RegistrationStatusShape] | { is_canceled: null, is_confirm: null }} */
-  x => RegistrationStatusShape[x] ?? { is_canceled: null, is_confirm: null },
+  x => RegistrationStatus[x?.status ?? x] ?? 'Unknown',
 )

package/source/functions/{key.js → tag.js}

@@ -8,19 +8,19 @@ export const tag = Object.freeze(
    * @template {keyof typeof import('../enumerations/route.js').Route} R
    * @template {typeof import('../enumerations/route.js').RoutePathname[R]} P
    *
-   * @param {M} m
-   * @param {R} r
-   * @param {string[]} p
+   * @param {M} method
+   * @param {R} route
+   * @param {any[]} params
    *
    * @returns {`${M}/${P}`}
    */
-  (m, r, p) => {
-    var method = inferMethod(m)
+  (method, route, params) => {
+    var method = inferMethod(method)
 
     if (method === 'Unknown')
-      throw TypeError(`Could not infer method of: '${m}'.`)
+      throw TypeError(`Could not infer method of: '${method}'.`)
 
-    return method + '/' + hydrateRoutePathname(r, p)
+    return method + '/' + hydrateRoutePathname(route, params)
   },
 )
 
@@ -29,9 +29,9 @@ export const tagexp = Object.freeze(
    * @template {keyof typeof import('../enumerations/method.js').Method} M
    * @template {keyof typeof import('../enumerations/route.js').Route} R
    *
-   * @param {M} m
-   * @param {R} r
-   * @param {string[]} p
+   * @param {M} method
+   * @param {R} route
+   * @param {any[]} params
    */
-  (m, r, p) => new RegExp(`^${tag(m, r, p)}$`),
+  (method, route, params) => new RegExp(`^${tag(method, route, params)}$`),
 )

package/source/index.js

@@ -20,7 +20,6 @@ export * from './enumerations/entities/affilation.js'
 export * from './enumerations/entities/game-status.js'
 export * from './enumerations/entities/registration-attribute.js'
 export * from './enumerations/entities/registration-channel.js'
-export * from './enumerations/entities/registration-lineup.js'
 export * from './enumerations/entities/registration-mailing.js'
 export * from './enumerations/entities/role.js'
 export * from './enumerations/entities/version.js'
@@ -30,9 +29,10 @@ export * from './enumerations/venue/status.js'
 
 export * from './enumerations/theme/status.js'
 
+export * from './enumerations/registration/lineup.js'
 export * from './enumerations/registration/status.js'
 
 export * from './functions/hydrate-route-params.js'
 export * from './functions/hydrate-route-pathname.js'
-export * from './functions/key.js'
 export * from './functions/string-tag.js'
+export * from './functions/tag.js'

package/source/enumerations/entities/registration-lineup.js

@@ -1,49 +0,0 @@
-export const RegistrationLineup = Object.freeze({
-  'Main': 'Main',
-  'Reserve': 'Reserve',
-})
-
-export const RegistrationLineups = Object.freeze([
-  RegistrationLineup['Main'],
-  RegistrationLineup['Reserve'],
-])
-
-export const RegistrationLineupTitle = Object.freeze({
-  [RegistrationLineup['Main']]: 'Основа',
-  [RegistrationLineup['Reserve']]: 'Резерв',
-})
-
-export const RegistrationLineupIcon = Object.freeze({
-  [RegistrationLineup['Main']]: 'hero/outline/user-circle',
-  [RegistrationLineup['Reserve']]: 'hero/outline/pause-circle',
-})
-
-export const RegistrationLineupEmoji = Object.freeze({
-  [RegistrationLineup['Main']]: '🟢',
-  [RegistrationLineup['Reserve']]: '🟡',
-})
-
-export const ValueRegistrationLineup = Object.freeze({
-  'false': RegistrationLineup['Main'],
-  'true': RegistrationLineup['Reserve'],
-})
-
-export const RegistrationLineupShape = Object.freeze({
-  [RegistrationLineup['Main']]: Object.freeze({
-    is_reserve: false,
-  }),
-
-  [RegistrationLineup['Reserve']]: Object.freeze({
-    is_reserve: true,
-  }),
-})
-
-export const inferRegistrationLineup = Object.freeze(
-  /** @returns {keyof typeof RegistrationLineup | 'Unknown'} */
-  x => ValueRegistrationLineup[x?.is_reserve] ?? RegistrationLineup[x] ?? 'Unknown',
-)
-
-export const inferRegistrationLineupShape = Object.freeze(
-  /** @returns {typeof RegistrationLineupShape[keyof typeof RegistrationLineupShape] | { is_reserve: null }} */
-  x => RegistrationLineupShape[x] ?? { is_reserve: null },
-)