Fix after upgrade to tmp=0.2.4

1. Also upgrade the type definition
2. Adapt the tests to make it compile

Author: fflorent

app/server/lib/Requests.ts

@@ -16,7 +16,7 @@ export class DocRequests {
   // and only as long as needed to finish calculating all formulas.
   // When _numPending reaches 0 again, _cacheDir is deleted.
   private _numPending: number = 0;
-  private _cacheDir: tmp.SynchrounousResult | null = null;
+  private _cacheDir: tmp.DirResult | null = null;
 
   constructor(private readonly _activeDoc: ActiveDoc) {}
 

app/server/lib/uploads.ts

@@ -401,7 +401,7 @@ interface TmpDirResult {
  * Helper to create a temporary directory. It's a simple wrapper around tmp.dir, but replaces the
  * cleanup callback with an asynchronous version.
  */
-export async function createTmpDir(options: tmp.Options): Promise<TmpDirResult> {
+export async function createTmpDir(options: tmp.DirOptions): Promise<TmpDirResult> {
   const fullOptions = {prefix: 'grist-upload-', unsafeCleanup: true, ...options};
 
   const [tmpDir, tmpCleanup]: [string, CleanupCB] = await fromCallback(

package.json

@@ -86,7 +86,7 @@
     "@types/sinon": "17.0.3",
     "@types/sqlite3": "3.1.6",
     "@types/swagger-ui": "3.52.4",
-    "@types/tmp": "0.0.33",
+    "@types/tmp": "0.2.6",
     "@types/uuid": "10.0.0",
     "@types/webpack-dev-server": "4.7.2",
     "@types/which": "2.0.1",

test/server/lib/DocStorageManager.ts

@@ -16,12 +16,10 @@ describe('DocStorageManager', function() {
   // Set Grist home to a temporary directory, and wipe it out on exit.
   let docsRoot: string;
   let docStorageManager: DocStorageManager;
-  before(function() {
-    return tmp.dirAsync({ prefix: 'grist_test_', unsafeCleanup: true })
-    .then(tmpDir => {
-      docsRoot = fse.realpathSync(tmpDir);
-      docStorageManager = new DocStorageManager(docsRoot);
-    });
+  before(async function() {
+    const tmpDir = await tmp.dirAsync({ prefix: 'grist_test_', unsafeCleanup: true });
+    docsRoot = fse.realpathSync(tmpDir);
+    docStorageManager = new DocStorageManager(docsRoot);
   });
 
   describe('getPath', function() {
@@ -81,7 +79,7 @@ describe('DocStorageManager', function() {
       // First create a doc, one under docsRoot, one outside; and include an attachment.
       fse.writeFileSync(doc1, "this is a test");
       const doc2 = tmp.fileSync({
-        prefix: 'DeleteTest2', postfix: '.grist', unsafeCleanup: true,
+        prefix: 'DeleteTest2', postfix: '.grist',
         discardDescriptor: true
       }).name;
       // Check that items got created as we expect.

test/server/testUtils.ts

@@ -17,7 +17,7 @@ import * as path from 'path';
 import * as fse from 'fs-extra';
 import clone = require('lodash/clone');
 import * as tmp from 'tmp-promise';
-import {Options as TmpOptions} from 'tmp';
+import {FileOptions as TmpOptions} from 'tmp';
 import * as winston from 'winston';
 import { serialize } from 'winston/lib/winston/common';
 

yarn.lock

@@ -1484,10 +1484,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/tmp@0.0.33":
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz"
-  integrity sha1-EHPEvIJHVK49EM+riKsCN7qWTk0=
+"@types/tmp@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
+  integrity sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==
 
 "@types/tough-cookie@*":
   version "4.0.2"