chore: revert unnecessary changes

Author: barjin

src/utils.ts

@@ -21,7 +21,6 @@ const MIN_GZIP_BYTES = 1024;
  * @template R - The type of the data property
  */
 export interface MaybeData<R> {
-    [key: string]: any;
     data?: R;
 }
 

test/_helper.ts

@@ -90,7 +90,7 @@ export const validateRequest = ({
     };
     const request = mockServer.getLastRequest();
     if (endpointId) {
-        expect(request?.endpointId).toEqual(endpointId);
+        expect((request as any)?.endpointId).toEqual(endpointId);
     }
 
     const expectedQuery = getExpectedQuery(query);

test/mock_server/routes/actors.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const actorRouter = express.Router();
+export const actors = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'list-actors', method: 'GET', path: '/' },
@@ -39,4 +39,4 @@ const ROUTES: MockServerRoute[] = [
     { id: 'list-webhooks', method: 'GET', path: '/:actorId/webhooks' },
 ];
 
-addRoutes(actorRouter, ROUTES);
+addRoutes(actors, ROUTES);

test/mock_server/routes/builds.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const buildRouter = express.Router();
+export const builds = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'list-builds', method: 'GET', path: '/' },
@@ -12,4 +12,4 @@ const ROUTES: MockServerRoute[] = [
     { id: 'build-openapi', method: 'GET', path: '/:buildId/openapi.json', type: 'responseJsonMock' },
 ];
 
-addRoutes(buildRouter, ROUTES);
+addRoutes(builds, ROUTES);

test/mock_server/routes/datasets.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const datasetRouter = express.Router();
+export const datasets = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'get-or-create-dataset', method: 'POST', path: '/' },
@@ -14,7 +14,7 @@ const ROUTES: MockServerRoute[] = [
     { id: 'get-statistics', method: 'GET', path: '/:datasetId/statistics' },
 ];
 
-addRoutes(datasetRouter, ROUTES);
+addRoutes(datasets, ROUTES);
 
 /**
  * GET /datasets/:datasetId
@@ -23,7 +23,7 @@ addRoutes(datasetRouter, ROUTES);
  * If the dataset ID is '404', it returns a 404 error with a RECORD_NOT_FOUND type.
  * Otherwise, it returns a dataset with an ID of 'get-dataset' (default).
  */
-datasetRouter.get('/:datasetId', (req, res) => {
+datasets.get('/:datasetId', (req, res) => {
     const { datasetId } = req.params;
     (req as any).endpointId = 'get-dataset';
 

test/mock_server/routes/logs.ts

@@ -2,8 +2,8 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const logRouter = express.Router();
+export const logs = express.Router();
 
 const ROUTES: MockServerRoute[] = [{ id: 'get-log', method: 'GET', path: '/:logId', type: 'text' }];
 
-addRoutes(logRouter, ROUTES);
+addRoutes(logs, ROUTES);

test/mock_server/routes/runs.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const runRouter = express.Router();
+export const runs = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'list-runs', method: 'GET', path: '/' },
@@ -18,4 +18,4 @@ const ROUTES: MockServerRoute[] = [
     { id: 'run-charge', method: 'POST', path: '/:runId/charge' },
 ];
 
-addRoutes(runRouter, ROUTES);
+addRoutes(runs, ROUTES);

test/mock_server/routes/tasks.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const taskRouter = express.Router();
+export const tasks = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'list-tasks', method: 'GET', path: '/' },
@@ -17,4 +17,4 @@ const ROUTES: MockServerRoute[] = [
     { id: 'update-input', method: 'PUT', path: '/:taskId/input' },
 ];
 
-addRoutes(taskRouter, ROUTES);
+addRoutes(tasks, ROUTES);

test/mock_server/routes/users.ts

@@ -2,7 +2,7 @@ import express from 'express';
 
 import { addRoutes, type MockServerRoute } from './add_routes';
 
-export const userRouter = express.Router();
+export const users = express.Router();
 
 const ROUTES: MockServerRoute[] = [
     { id: 'get-user', method: 'GET', path: '/:userId' },
@@ -11,4 +11,4 @@ const ROUTES: MockServerRoute[] = [
     { id: 'update-limits', method: 'PUT', path: '/:userId/limits' },
 ];
 
-addRoutes(userRouter, ROUTES);
+addRoutes(users, ROUTES);

test/mock_server/server.ts

@@ -8,18 +8,18 @@ import compression from 'compression';
 import express from 'express';
 
 // Routers
-import { actorRouter } from './routes/actors';
-import { buildRouter } from './routes/builds';
-import { datasetRouter } from './routes/datasets';
+import { actors } from './routes/actors';
+import { builds } from './routes/builds';
+import { datasets } from './routes/datasets';
 import { external } from './routes/external';
 import { keyValueStores } from './routes/key_value_stores';
-import { logRouter } from './routes/logs';
+import { logs } from './routes/logs';
 import { requestQueues } from './routes/request_queues';
-import { runRouter } from './routes/runs';
+import { runs } from './routes/runs';
 import { schedules } from './routes/schedules';
 import { store } from './routes/store';
-import { taskRouter } from './routes/tasks';
-import { userRouter } from './routes/users';
+import { tasks } from './routes/tasks';
+import { users } from './routes/users';
 import { webhookDispatches } from './routes/webhook_dispatches';
 import { webhooks } from './routes/webhooks';
 // Consts
@@ -99,19 +99,19 @@ export function createDefaultApp(v2Router = express.Router()) {
     v2Router.use('/acts/redirect-actor-id', async (_, res) => {
         res.json({ data: { name: 'redirect-actor-name', id: 'redirect-run-id' } });
     });
-    v2Router.use('/acts', actorRouter);
-    v2Router.use('/actor-builds', buildRouter);
+    v2Router.use('/acts', actors);
+    v2Router.use('/actor-builds', builds);
     v2Router.use('/actor-runs/redirect-run-id/log', streamLogChunks);
     v2Router.use('/actor-runs/redirect-run-id', async (_, res) => {
         res.json({ data: { id: 'redirect-run-id', actId: 'redirect-actor-id', status: 'SUCCEEDED' } });
     });
 
-    v2Router.use('/actor-runs', runRouter);
-    v2Router.use('/actor-tasks', taskRouter);
-    v2Router.use('/users', userRouter);
+    v2Router.use('/actor-runs', runs);
+    v2Router.use('/actor-tasks', tasks);
+    v2Router.use('/users', users);
     v2Router.use('/logs/redirect-log-id', streamLogChunks);
-    v2Router.use('/logs', logRouter);
-    v2Router.use('/datasets', datasetRouter);
+    v2Router.use('/logs', logs);
+    v2Router.use('/datasets', datasets);
     v2Router.use('/key-value-stores', keyValueStores);
     v2Router.use('/request-queues', requestQueues);
     v2Router.use('/webhooks', webhooks);