refactor(ts): enable esModuleInterop flag

kukhariev · kukhariev · commit 4ea78b1ce6e8 · 2025-02-14T19:59:10.000+03:00
diff --git a/examples/express-basic.ts b/examples/express-basic.ts
@@ -1,5 +1,5 @@
 import { LogLevel, uploadx } from '@uploadx/core';
-import * as express from 'express';
+import express from 'express';
 
 const PORT = process.env.PORT || 3002;
 
diff --git a/examples/express-gcs.ts b/examples/express-gcs.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { GCStorage, Uploadx } from 'node-uploadx';
 
 const PORT = process.env.PORT || 3002;
diff --git a/examples/express-polling.ts b/examples/express-polling.ts
@@ -1,7 +1,7 @@
 import { DiskFile, DiskStorage, Uploadx } from '@uploadx/core';
 import { copyFile } from 'fs/promises';
-import * as express from 'express';
-import * as path from 'path';
+import express from 'express';
+import path from 'path';
 
 const PORT = process.env.PORT || 3002;
 
diff --git a/examples/express-s3.ts b/examples/express-s3.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { type LogLevel, uploadx } from '@uploadx/core';
 import { S3Storage } from '@uploadx/s3';
 
diff --git a/examples/express-tus.ts b/examples/express-tus.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { DiskFile, DiskStorageOptions, tus } from '@uploadx/core';
 
 const PORT = process.env.PORT || 3002;
diff --git a/examples/express.ts b/examples/express.ts
@@ -1,5 +1,5 @@
 import { uploadx } from '@uploadx/core';
-import * as express from 'express';
+import express from 'express';
 import { createLogger, format, transports } from 'winston';
 
 type AuthRequest = express.Request & { user?: { id: string; email: string } };
diff --git a/examples/s3-direct.ts b/examples/s3-direct.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { type LogLevel, uploadx } from '@uploadx/core';
 import { S3Storage } from '@uploadx/s3';
 
diff --git a/examples/validation.ts b/examples/validation.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { DiskFile, DiskStorage, OnComplete, uploadx, UploadxResponse } from 'node-uploadx';
 
 const PORT = process.env.PORT || 3002;
diff --git a/packages/core/src/handlers/base-handler.ts b/packages/core/src/handlers/base-handler.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import * as url from 'url';
+import url from 'url';
 import {
   BaseStorage,
   DiskStorage,
diff --git a/packages/core/src/handlers/multipart.ts b/packages/core/src/handlers/multipart.ts
@@ -1,4 +1,4 @@
-import * as multiparty from 'multiparty';
+import multiparty from 'multiparty';
 import { FileInit, UploadxFile } from '../storages';
 import { IncomingMessage, ServerResponse } from '../types';
 import { setHeaders } from '../utils';
diff --git a/packages/core/src/handlers/uploadx.ts b/packages/core/src/handlers/uploadx.ts
@@ -1,4 +1,4 @@
-import * as url from 'url';
+import url from 'url';
 import { Checksum, FileInit, UploadxFile } from '../storages';
 import { Headers, IncomingMessage, ServerResponse } from '../types';
 import { ERRORS, fail, getBaseUrl, getHeader, getJsonBody, setHeaders } from '../utils';
diff --git a/packages/core/src/storages/storage.ts b/packages/core/src/storages/storage.ts
@@ -1,4 +1,4 @@
-import * as bytes from 'bytes';
+import bytes from 'bytes';
 import { setInterval } from 'timers';
 import { inspect } from 'util';
 import { IncomingMessage, UploadxResponse } from '../types';
diff --git a/packages/core/src/types/http.ts b/packages/core/src/types/http.ts
@@ -1,4 +1,4 @@
-import type * as http from 'http';
+import type http from 'http';
 
 export type IncomingMessage = http.IncomingMessage & {
   originalUrl?: string;
diff --git a/packages/core/src/utils/http.ts b/packages/core/src/utils/http.ts
@@ -1,4 +1,4 @@
-import * as http from 'http';
+import http from 'http';
 import { HttpError, HttpErrorBody } from './errors';
 import { getLastOne, isRecord } from './primitives';
 import {
diff --git a/packages/core/src/utils/primitives.ts b/packages/core/src/utils/primitives.ts
@@ -90,14 +90,14 @@ export function extendObject<T extends Record<any, any>>(target: T, ...sources:
 export function toMilliseconds(value: string | number | undefined): number | undefined {
   if (isNumber(value)) return value;
   if (!value) return undefined;
-  return duration(value);
+  return duration(value) || undefined;
 }
 /**
  * Convert a human-readable duration to seconds
  */
 export function toSeconds(value: string | number): number | undefined {
   if (isNumber(value)) return value;
-  const s = duration(value, 'sec');
+  const s = duration(value, 'sec') || undefined;
   return s ? ~~s : s;
 }
 
diff --git a/packages/s3/src/s3-storage.ts b/packages/s3/src/s3-storage.ts
@@ -1,4 +1,4 @@
-import * as bytes from 'bytes';
+import bytes from 'bytes';
 import {
   AbortMultipartUploadCommand,
   CompleteMultipartUploadCommand,
diff --git a/test/disk-storage.spec.ts b/test/disk-storage.spec.ts
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import fs from 'fs';
 import { vol } from 'memfs';
 import { DiskStorage, fsp } from '../packages/core/src';
 import {
diff --git a/test/multipart.spec.ts b/test/multipart.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { join } from 'path';
 // import { vol } from 'memfs';
-import * as request from 'supertest';
+import request from 'supertest';
 import { multipart, Multipart } from '../packages/core/src';
 import { app, cleanup, metadata, storageOptions, testfile, testRoot } from './shared';
 
diff --git a/test/shared/app.ts b/test/shared/app.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import * as express from 'express';
+import express from 'express';
 import { userId } from './config';
 import { IncomingMessage } from 'http';
 
diff --git a/test/tus.spec.ts b/test/tus.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { join } from 'path';
-import * as request from 'supertest';
+import request from 'supertest';
 import { parseMetadata, serializeMetadata, tus, Tus, TUS_RESUMABLE } from '../packages/core/src';
 import { app, cleanup, metadata, storageOptions, testfile, testRoot } from './shared';
 
diff --git a/test/uploadx.spec.ts b/test/uploadx.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import * as fs from 'fs';
+import fs from 'fs';
 import { join } from 'path';
-import * as request from 'supertest';
+import request from 'supertest';
 import { DiskStorage, uploadx, Uploadx } from '../packages/core/src';
 import { app, cleanup, metadata, storageOptions, testfile, testRoot, userId } from './shared';
 
diff --git a/test/util.spec.ts b/test/util.spec.ts
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import fs from 'fs';
 import { IncomingMessage } from 'http';
 import { join } from 'path';
 import * as utils from '../packages/core/src';
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -15,12 +15,13 @@
     "noUnusedParameters": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "allowSyntheticDefaultImports": false,
     "experimentalDecorators": true,
     "resolveJsonModule": true,
     "stripInternal": true,
     "keyofStringsOnly": false,
     "strictPropertyInitialization": true,
+    "esModuleInterop": true,
+    "lib": ["ES2020"],
     "paths": {
       "@uploadx/core": ["packages/core/src"],
       "@uploadx/gcs": ["packages/gcs/src"],

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as express from 'express';`
	`1`	`+import express from 'express';`
`2`	`2`	`import { GCStorage, Uploadx } from 'node-uploadx';`
`3`	`3`
`4`	`4`	`const PORT = process.env.PORT \|\| 3002;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as multiparty from 'multiparty';`
	`1`	`+import multiparty from 'multiparty';`
`2`	`2`	`import { FileInit, UploadxFile } from '../storages';`
`3`	`3`	`import { IncomingMessage, ServerResponse } from '../types';`
`4`	`4`	`import { setHeaders } from '../utils';`