Adjust typescript module resolution settings (#767)

Author: goto-bus-stop

bin/u-wave-core.js

@@ -2,8 +2,8 @@
 
 /* eslint-disable n/no-process-exit */
 import fs from 'node:fs';
-import Ajv from 'ajv';
-import addFormats from 'ajv-formats';
+import { Ajv } from 'ajv';
+import ajvFormats from 'ajv-formats';
 import ytSource from 'u-wave-source-youtube';
 import scSource from 'u-wave-source-soundcloud';
 import announce from 'u-wave-announce';
@@ -26,7 +26,7 @@ const ajv = new Ajv({
     hexadecimal: /^[0-9a-fA-F]+$/,
   },
 });
-addFormats(ajv);
+ajvFormats.default(ajv);
 
 const envSchema = {
   type: 'object',

src/SocketServer.js

@@ -1,7 +1,7 @@
 import { promisify } from 'node:util';
 import lodash from 'lodash';
 import { WebSocketServer } from 'ws';
-import Ajv from 'ajv';
+import { Ajv } from 'ajv';
 import { stdSerializers } from 'pino';
 import { ulid, encodeTime } from 'ulid';
 import { socketVote } from './controllers/booth.js';
@@ -405,7 +405,7 @@ class SocketServer {
         const user = await users.getUser(userID);
         if (user) {
           // TODO this should not be the socket server code's responsibility
-          const userIDs = /** @type {import('./schema').UserID[] | null} */ (
+          const userIDs = /** @type {import('./schema.js').UserID[] | null} */ (
             await keyv.get(KEY_ACTIVE_SESSIONS)
           ) ?? [];
           userIDs.push(user.id);
@@ -468,7 +468,7 @@ class SocketServer {
    */
   async initLostConnections() {
     const { db, keyv } = this.#uw;
-    const userIDs = /** @type {import('./schema').UserID[] | null} */ (
+    const userIDs = /** @type {import('./schema.js').UserID[] | null} */ (
       await keyv.get(KEY_ACTIVE_SESSIONS)
     ) ?? [];
     const disconnectedIDs = userIDs.filter((userID) => !this.connection(userID));

src/config/defaultRoles.js

@@ -37,7 +37,7 @@ const manager = [
   'motd.set',
 ];
 
-/** @typedef {Record<string, import("../schema").Permission[]>} PermissionMap */
+/** @typedef {Record<string, import('../schema.js').Permission[]>} PermissionMap */
 
 export default /** @type {PermissionMap} */ (/** @type {Record<string, unknown[]>} */ ({
   admin,

src/controllers/authenticate.js

@@ -22,7 +22,7 @@ import { t } from '../locale.js';
 const { BadRequest } = httpErrors;
 
 /**
- * @typedef {import('../schema').UserID} UserID
+ * @typedef {import('../schema.js').UserID} UserID
  * @typedef {import('../schema.js').PasswordResetToken} PasswordResetToken
  */
 
@@ -65,7 +65,7 @@ async function getAuthStrategies(req) {
 
 /**
  * @param {import('../types.js').Request} req
- * @param {import('../schema').User} user
+ * @param {import('../schema.js').User} user
  * @param {AuthenticateOptions & { session: 'cookie' | 'token' }} options
  */
 async function refreshSession(req, user, options) {

src/controllers/bans.js

@@ -3,7 +3,7 @@ import getOffsetPagination from '../utils/getOffsetPagination.js';
 import toItemResponse from '../utils/toItemResponse.js';
 import toPaginatedResponse from '../utils/toPaginatedResponse.js';
 
-/** @typedef {import('../schema').UserID} UserID */
+/** @typedef {import('../schema.js').UserID} UserID */
 
 /**
  * @typedef {object} GetBansQuery

src/controllers/booth.js

@@ -13,10 +13,10 @@ import toPaginatedResponse from '../utils/toPaginatedResponse.js';
 import { Permissions } from '../plugins/acl.js';
 
 /**
- * @typedef {import('../schema').UserID} UserID
- * @typedef {import('../schema').MediaID} MediaID
- * @typedef {import('../schema').PlaylistID} PlaylistID
- * @typedef {import('../schema').HistoryEntryID} HistoryEntryID
+ * @typedef {import('../schema.js').UserID} UserID
+ * @typedef {import('../schema.js').MediaID} MediaID
+ * @typedef {import('../schema.js').PlaylistID} PlaylistID
+ * @typedef {import('../schema.js').HistoryEntryID} HistoryEntryID
  */
 
 const KEY_HISTORY_ID = 'booth:historyID';

src/controllers/chat.js

@@ -5,7 +5,7 @@ import toItemResponse from '../utils/toItemResponse.js';
 import toListResponse from '../utils/toListResponse.js';
 
 /**
- * @typedef {import('../schema').UserID} UserID
+ * @typedef {import('../schema.js').UserID} UserID
  * @typedef {import('../redisMessages.js').ServerActionParameters} ServerActionParameters
  */
 
@@ -164,7 +164,7 @@ async function getBackscroll(req) {
  */
 
 /**
- * @type {import('../types').AuthenticatedController<{}, {}, SendMessageBody>}
+ * @type {import('../types.js').AuthenticatedController<{}, {}, SendMessageBody>}
  */
 async function sendMessage(req) {
   const { user } = req;

src/controllers/playlists.js

@@ -6,20 +6,20 @@ import toListResponse from '../utils/toListResponse.js';
 import toPaginatedResponse from '../utils/toPaginatedResponse.js';
 
 /**
- * @typedef {import('../schema').PlaylistID} PlaylistID
- * @typedef {import('../schema').PlaylistItemID} PlaylistItemID
- * @typedef {import('../schema').MediaID} MediaID
+ * @typedef {import('../schema.js').PlaylistID} PlaylistID
+ * @typedef {import('../schema.js').PlaylistItemID} PlaylistItemID
+ * @typedef {import('../schema.js').MediaID} MediaID
  */
 
 /**
  * TODO move to a serializer?
  *
  * @param {Pick<
- *   import('../schema').PlaylistItem,
+ *   import('../schema.js').PlaylistItem,
  *   'id' | 'artist' | 'title' | 'start' | 'end' | 'createdAt'
  * >} playlistItem
  * @param {Pick<
- *   import('../schema').Media,
+ *   import('../schema.js').Media,
  *   'id' | 'sourceType' | 'sourceID' | 'sourceData' | 'artist' | 'title' | 'duration' | 'thumbnail'
  * >} media
  */

src/controllers/users.js

@@ -12,7 +12,7 @@ import { muteUser, unmuteUser } from './chat.js';
 import { KEY_ACTIVE_SESSIONS } from '../SocketServer.js';
 
 /**
- * @typedef {import('../schema').UserID} UserID
+ * @typedef {import('../schema.js').UserID} UserID
  */
 
 /**

src/middleware/schema.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import fs from 'node:fs';
-import Ajv from 'ajv/dist/2019.js';
-import addFormats from 'ajv-formats';
+import { Ajv2019 as Ajv } from 'ajv/dist/2019.js';
+import ajvFormats from 'ajv-formats';
 import ValidationError from '../errors/ValidationError.js';
 
 const ajv = new Ajv({
@@ -11,7 +11,7 @@ const ajv = new Ajv({
   ownProperties: true,
   allErrors: true,
 });
-addFormats(ajv);
+ajvFormats.default(ajv);
 ajv.addMetaSchema(JSON.parse(fs.readFileSync(new URL('../../node_modules/ajv/dist/refs/json-schema-draft-07.json', import.meta.url), 'utf8')));
 ajv.addSchema(JSON.parse(fs.readFileSync(new URL('../schemas/definitions.json', import.meta.url), 'utf8')));