Skip to content

Commit 861470a

Browse files
committed
refactor: ensure that all path.join usage is explicitly pathNode.join to disambiguate with utils.pathJoin
1 parent 6dce66a commit 861470a

8 files changed

+16
-16
lines changed

tests/EncryptedFS.concurrent.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { FdIndex } from '@/fd/types';
22
import type { INodeData } from '@/inodes/types';
33
import fs from 'fs';
44
import os from 'os';
5-
import path from 'path';
5+
import pathNode from 'path';
66
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
77
import { code as errno } from 'errno';
88
import { DB } from '@matrixai/db';
@@ -25,7 +25,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
2525
let efs: EncryptedFS;
2626
beforeEach(async () => {
2727
dataDir = await fs.promises.mkdtemp(
28-
path.join(os.tmpdir(), 'encryptedfs-test-'),
28+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2929
);
3030
db = await DB.createDB({
3131
dbPath: dataDir,

tests/EncryptedFS.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import EncryptedFS from '@/EncryptedFS';
@@ -14,7 +14,7 @@ describe(EncryptedFS.name, () => {
1414
let dataDir: string;
1515
beforeEach(async () => {
1616
dataDir = await fs.promises.mkdtemp(
17-
path.join(os.tmpdir(), 'encryptedfs-test-'),
17+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
1818
);
1919
});
2020
afterEach(async () => {

tests/fd/FileDescriptor.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import { DB } from '@matrixai/db';
@@ -22,7 +22,7 @@ describe('File Descriptor', () => {
2222
const origBuffer = Buffer.from('Test Buffer for File Descriptor');
2323
beforeEach(async () => {
2424
dataDir = await fs.promises.mkdtemp(
25-
path.join(os.tmpdir(), 'encryptedfs-test-'),
25+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2626
);
2727
db = await DB.createDB({
2828
dbPath: `${dataDir}/db`,

tests/fd/FileDescriptorManager.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import { DB } from '@matrixai/db';
@@ -21,7 +21,7 @@ describe('File Descriptor Manager', () => {
2121
const origBuffer = Buffer.from('Test Buffer for File Descriptor');
2222
beforeEach(async () => {
2323
dataDir = await fs.promises.mkdtemp(
24-
path.join(os.tmpdir(), 'encryptedfs-test-'),
24+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2525
);
2626
db = await DB.createDB({
2727
dbPath: `${dataDir}/db`,

tests/inodes/INodeManager.dir.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { INodeIndex } from '@/inodes/types';
22
import os from 'os';
3-
import path from 'path';
3+
import pathNode from 'path';
44
import fs from 'fs';
55
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
66
import { DB } from '@matrixai/db';
@@ -17,7 +17,7 @@ describe('INodeManager Directory', () => {
1717
const dbKey: Buffer = utils.generateKeySync(256);
1818
beforeEach(async () => {
1919
dataDir = await fs.promises.mkdtemp(
20-
path.join(os.tmpdir(), 'encryptedfs-test-'),
20+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2121
);
2222
db = await DB.createDB({
2323
dbPath: `${dataDir}/db`,

tests/inodes/INodeManager.file.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import { DB } from '@matrixai/db';
@@ -19,7 +19,7 @@ describe('INodeManager File', () => {
1919
const buffer = Buffer.from('Test Buffer');
2020
beforeEach(async () => {
2121
dataDir = await fs.promises.mkdtemp(
22-
path.join(os.tmpdir(), 'encryptedfs-test-'),
22+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2323
);
2424
db = await DB.createDB({
2525
dbPath: `${dataDir}/db`,

tests/inodes/INodeManager.symlink.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import { DB } from '@matrixai/db';
@@ -15,7 +15,7 @@ describe('INodeManager Symlink', () => {
1515
const dbKey: Buffer = utils.generateKeySync(256);
1616
beforeEach(async () => {
1717
dataDir = await fs.promises.mkdtemp(
18-
path.join(os.tmpdir(), 'encryptedfs-test-'),
18+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
1919
);
2020
db = await DB.createDB({
2121
dbPath: `${dataDir}/db`,

tests/inodes/INodeManager.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import os from 'os';
2-
import path from 'path';
2+
import pathNode from 'path';
33
import fs from 'fs';
44
import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
55
import { DB } from '@matrixai/db';
@@ -16,7 +16,7 @@ describe('INodeManager', () => {
1616
const dbKey: Buffer = utils.generateKeySync(256);
1717
beforeEach(async () => {
1818
dataDir = await fs.promises.mkdtemp(
19-
path.join(os.tmpdir(), 'encryptedfs-test-'),
19+
pathNode.join(os.tmpdir(), 'encryptedfs-test-'),
2020
);
2121
db = await DB.createDB({
2222
dbPath: `${dataDir}/db`,

0 commit comments

Comments
 (0)