From b489d69badf5bc560d9d60b544cf47be45fbe8bf Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Tue, 18 Aug 2020 14:34:32 +0200 Subject: [PATCH] fix: Use posix path library to be OS independent --- src/storage/FileResourceStore.ts | 4 +++- test/unit/storage/FileResourceStore.test.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/storage/FileResourceStore.ts b/src/storage/FileResourceStore.ts index 91d672be9..4df3b8543 100644 --- a/src/storage/FileResourceStore.ts +++ b/src/storage/FileResourceStore.ts @@ -5,6 +5,7 @@ import { InteractionController } from '../util/InteractionController'; import { MetadataController } from '../util/MetadataController'; import { MethodNotAllowedHttpError } from '../util/errors/MethodNotAllowedHttpError'; import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; +import { posix } from 'path'; import { Quad } from 'rdf-js'; import { Readable } from 'stream'; import { Representation } from '../ldp/representation/Representation'; @@ -16,7 +17,8 @@ import { UnsupportedMediaTypeHttpError } from '../util/errors/UnsupportedMediaTy import { CONTENT_TYPE_QUADS, DATA_TYPE_BINARY, DATA_TYPE_QUAD } from '../util/ContentTypes'; import { createReadStream, createWriteStream, promises as fsPromises, Stats } from 'fs'; import { ensureTrailingSlash, trimTrailingSlashes } from '../util/Util'; -import { extname, join as joinPath, normalize as normalizePath } from 'path'; + +const { extname, join: joinPath, normalize: normalizePath } = posix; /** * Resource store storing its data in the file system backend. diff --git a/test/unit/storage/FileResourceStore.test.ts b/test/unit/storage/FileResourceStore.test.ts index 9d7dc0f86..d88128cbe 100644 --- a/test/unit/storage/FileResourceStore.test.ts +++ b/test/unit/storage/FileResourceStore.test.ts @@ -4,10 +4,10 @@ import { ConflictHttpError } from '../../../src/util/errors/ConflictHttpError'; import { DataFactory } from 'n3'; import { FileResourceStore } from '../../../src/storage/FileResourceStore'; import { InteractionController } from '../../../src/util/InteractionController'; -import { join as joinPath } from 'path'; import { MetadataController } from '../../../src/util/MetadataController'; import { MethodNotAllowedHttpError } from '../../../src/util/errors/MethodNotAllowedHttpError'; import { NotFoundHttpError } from '../../../src/util/errors/NotFoundHttpError'; +import { posix } from 'path'; import { Readable } from 'stream'; import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata'; import streamifyArray from 'streamify-array'; @@ -18,6 +18,8 @@ import { LDP, RDF, STAT, TERMS, XML } from '../../../src/util/Prefixes'; import { LINK_TYPE_LDP_BC, LINK_TYPE_LDPR } from '../../../src/util/LinkTypes'; import { literal, namedNode, quad as quadRDF, triple } from '@rdfjs/data-model'; +const { join: joinPath } = posix; + const base = 'http://test.com/'; const root = '/Users/default/home/public/';