From 81d072a8650aec25474bbf894e2511887defd912 Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:07:22 +0100
Subject: [PATCH] chore(server): convert some files to typescript with minimal
 changes (#2738)

---
 ...gingHelper.spec.js => loggingHelper.spec.ts} |  4 ++--
 .../{loggingHelper.js => loggingHelper.ts}      |  8 ++------
 .../core/rest/{diffUpload.js => diffUpload.ts}  | 17 +++++++----------
 3 files changed, 11 insertions(+), 18 deletions(-)
 rename packages/server/logging/{loggingHelper.spec.js => loggingHelper.spec.ts} (95%)
 rename packages/server/logging/{loggingHelper.js => loggingHelper.ts} (85%)
 rename packages/server/modules/core/rest/{diffUpload.js => diffUpload.ts} (78%)

diff --git a/packages/server/logging/loggingHelper.spec.js b/packages/server/logging/loggingHelper.spec.ts
similarity index 95%
rename from packages/server/logging/loggingHelper.spec.js
rename to packages/server/logging/loggingHelper.spec.ts
index bd21db14b..c05ffc5de 100644
--- a/packages/server/logging/loggingHelper.spec.js
+++ b/packages/server/logging/loggingHelper.spec.ts
@@ -1,5 +1,5 @@
-const expect = require('chai').expect
-const { redactSensitiveVariables } = require('@/logging/loggingHelper')
+import { expect } from 'chai'
+import { redactSensitiveVariables } from '@/logging/loggingHelper'
 
 describe('loggingHelper', () => {
   describe('filterSensitiveVariables', () => {
diff --git a/packages/server/logging/loggingHelper.js b/packages/server/logging/loggingHelper.ts
similarity index 85%
rename from packages/server/logging/loggingHelper.js
rename to packages/server/logging/loggingHelper.ts
index 63558bf20..f980f1909 100644
--- a/packages/server/logging/loggingHelper.js
+++ b/packages/server/logging/loggingHelper.ts
@@ -1,7 +1,7 @@
 /**
  * @returns {Record<string, unknown>}
  */
-const redactSensitiveVariables = (variables) => {
+export const redactSensitiveVariables = (variables: unknown): unknown => {
   if (!variables) {
     return variables
   }
@@ -31,9 +31,5 @@ const redactSensitiveVariables = (variables) => {
 
     acc[key] = val
     return acc
-  }, {})
-}
-
-module.exports = {
-  redactSensitiveVariables
+  }, {} as Record<string, unknown>)
 }
diff --git a/packages/server/modules/core/rest/diffUpload.js b/packages/server/modules/core/rest/diffUpload.ts
similarity index 78%
rename from packages/server/modules/core/rest/diffUpload.js
rename to packages/server/modules/core/rest/diffUpload.ts
index 4e14dee2f..848f4319c 100644
--- a/packages/server/modules/core/rest/diffUpload.js
+++ b/packages/server/modules/core/rest/diffUpload.ts
@@ -1,14 +1,11 @@
-'use strict'
-const zlib = require('zlib')
-const { corsMiddleware } = require('@/modules/core/configs/cors')
+import zlib from 'zlib'
+import { corsMiddleware } from '@/modules/core/configs/cors'
+import { validatePermissionsWriteStream } from '@/modules/core/rest/authUtils'
+import { hasObjects } from '@/modules/core/services/objects'
+import { chunk } from 'lodash'
+import type { Application } from 'express'
 
-const { validatePermissionsWriteStream } = require('./authUtils')
-
-const { hasObjects } = require('../services/objects')
-
-const { chunk } = require('lodash')
-
-module.exports = (app) => {
+export default (app: Application) => {
   app.options('/api/diff/:streamId', corsMiddleware())
 
   app.post('/api/diff/:streamId', corsMiddleware(), async (req, res) => {