refactor: reorder and consolidate imports

Also use `node:` prefix for core node libraries.

Author: dhensby

lib/main/index.js

@@ -1,5 +1,5 @@
-import { createHash } from 'crypto';
-import { createReadStream } from 'fs';
+import { createHash } from 'node:crypto';
+import { createReadStream } from 'node:fs';
 
 /**
  * Generate a sha256 hash of a file from its path.

src/crypto.ts

@@ -1,6 +1,6 @@
-import os from 'os';
-import { basename, dirname, join as joinPaths } from 'path';
-import { readFile } from 'fs/promises';
+import os from 'node:os';
+import { basename, dirname, join as joinPaths } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as tc from '@actions/tool-cache';

src/install.ts

@@ -1,6 +1,6 @@
+import { basename, dirname, extname, join as joinPaths } from 'node:path';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
-import { basename, dirname, extname, join as joinPaths } from 'path';
 import * as io from '@actions/io';
 
 export interface InstallerConfig {

src/installers/installer.ts

@@ -1,8 +1,8 @@
+import { join as joinPaths } from 'node:path';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
-import { Installer, InstallerConfig } from './installer';
-import { join as joinPaths } from 'path';
 import * as exec from '@actions/exec';
+import { Installer, InstallerConfig } from './installer';
 
 export interface Urls {
     x64?: string;

src/installers/msi-installer.ts

@@ -1,5 +1,5 @@
-import install from './install';
 import * as core from '@actions/core';
+import install from './install';
 
 (() => install().catch((e) => {
     core.setFailed(e as Error);

src/main.ts

@@ -1,4 +1,4 @@
-import fs, { ReadStream } from 'fs';
+import fs, { ReadStream } from 'node:fs';
 import { restore, SinonStubbedInstance, SinonStubbedMember, stub } from 'sinon';
 import { expect } from 'chai';
 import { generateFileHash } from '../src/crypto';

test/crypto.ts

@@ -3,9 +3,9 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as exec from '@actions/exec';
 import * as io from '@actions/io';
-import installNativeClient from '../src/install-native-client';
 import { expect, use } from 'chai';
 import sinonChai from 'sinon-chai';
+import installNativeClient from '../src/install-native-client';
 use(sinonChai);
 
 describe('install-native-client', () => {

test/install-native-client.ts

@@ -3,9 +3,9 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as exec from '@actions/exec';
 import * as io from '@actions/io';
-import installOdbc from '../src/install-odbc';
 import { expect, use } from 'chai';
 import sinonChai from 'sinon-chai';
+import installOdbc from '../src/install-odbc';
 use(sinonChai);
 
 describe('install-odbc', () => {

test/install-odbc.ts

@@ -1,22 +1,21 @@
-import os from 'os';
-import fs from 'fs/promises';
+import os from 'node:os';
+import fs from 'node:fs/promises';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as exec from '@actions/exec';
+import { match, restore, SinonStubbedInstance, stub, useFakeTimers } from 'sinon';
+import { expect, use } from 'chai';
+import sinonChai from 'sinon-chai';
 import * as versions from '../src/versions';
 import * as nativeClient from '../src/install-native-client';
 import * as odbcDriver from '../src/install-odbc';
-import { match, restore, SinonStubbedInstance, stub, useFakeTimers } from 'sinon';
 import * as utils from '../src/utils';
 import install from '../src/install';
-import { expect, use } from 'chai';
-import sinonChai from 'sinon-chai';
-import { VersionConfig } from '../src/versions';
 use(sinonChai);
 
 describe('install', () => {
     let reverts: (() => void)[] = [];
-    let versionStub: SinonStubbedInstance<Map<string, VersionConfig>>;
+    let versionStub: SinonStubbedInstance<Map<string, versions.VersionConfig>>;
     let osStub: SinonStubbedInstance<typeof os>;
     let coreStub: SinonStubbedInstance<typeof core>;
     let utilsStub: SinonStubbedInstance<typeof utils>;

test/install.ts

@@ -1,10 +1,10 @@
-import { Installer } from '../../src/installers/installer';
+import { randomUUID } from 'node:crypto';
 import { expect } from 'chai';
 import { stub, restore, SinonStubbedInstance } from 'sinon';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as io from '@actions/io';
-import { randomUUID } from 'crypto';
+import { Installer } from '../../src/installers/installer';
 
 class TestInstaller extends Installer {
     install(): Promise<void> {

test/installers/installer.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { expect, use } from 'chai';
 import sinonChai from 'sinon-chai';
 import { stub, restore, SinonStubbedInstance } from 'sinon';
@@ -6,7 +7,6 @@ import * as tc from '@actions/tool-cache';
 import * as io from '@actions/io';
 import * as exec from '@actions/exec';
 import { MsiInstaller } from '../../src/installers';
-import { randomUUID } from 'crypto';
 use(sinonChai);
 
 describe('Installer', () => {

test/installers/msi-installer.ts

@@ -1,18 +1,17 @@
-import * as utils from '../src/utils';
+import { randomBytes, randomUUID } from 'node:crypto';
+import { IncomingMessage } from 'node:http';
 import * as exec from '@actions/exec';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as io from '@actions/io';
 import * as glob from '@actions/glob';
 import * as http from '@actions/http-client';
+import { Globber } from '@actions/glob';
 import { stub, restore, SinonStubbedMember, SinonStubbedInstance, SinonStub, createStubInstance } from 'sinon';
 import { expect, use } from 'chai';
 import sinonChai from 'sinon-chai';
-import { randomBytes, randomUUID } from 'crypto';
+import * as utils from '../src/utils';
 import * as crypto from '../src/crypto';
-import { Globber } from '@actions/glob';
-import { gatherSummaryFiles } from '../src/utils';
-import { IncomingMessage } from 'node:http';
 use(sinonChai);
 
 const windows2022 = `
@@ -476,25 +475,25 @@ describe('utils', () => {
             } as unknown as Globber);
         });
         it('returns empty array if no files matched', async () => {
-            const res = await gatherSummaryFiles();
+            const res = await utils.gatherSummaryFiles();
             expect(res).to.deep.equal([]);
         });
         it('returns found files', async () => {
             globFunc.onFirstCall().resolves(['C:/tmp/summary.txt']);
-            const res = await gatherSummaryFiles();
+            const res = await utils.gatherSummaryFiles();
             expect(res).to.deep.equal(['C:/tmp/summary.txt']);
             expect(glob.create).to.have.callCount(1);
         });
         it('tries to find details files', async () => {
             globFunc.onFirstCall().resolves(['C:/tmp/summary.txt']);
-            const res = await gatherSummaryFiles(true);
+            const res = await utils.gatherSummaryFiles(true);
             expect(res).to.deep.equal(['C:/tmp/summary.txt']);
             expect(glob.create).to.have.callCount(2);
         });
         it('finds detail file', async () => {
             globFunc.onFirstCall().resolves(['C:/tmp/summary.txt']);
             globFunc.onSecondCall().resolves(['C:/tmp/2021/details.txt', 'C:/tmp/2022/details.txt']);
-            const res = await gatherSummaryFiles(true);
+            const res = await utils.gatherSummaryFiles(true);
             expect(res).to.deep.equal(['C:/tmp/summary.txt', 'C:/tmp/2022/details.txt']);
             expect(glob.create).to.have.callCount(2);
         });

test/utils.ts

@@ -1,5 +1,5 @@
+import * as assert from 'node:assert';
 import * as versions from '../src/versions';
-import * as assert from 'assert';
 
 describe('versions', () => {
     describe('VERSIONS', () => {