fix: convert schema glob path to posix path

This commit is contained in:
Thea Schöbl
2022-10-20 09:52:55 +00:00
committed by Rainer Killinger
parent 4be5cb2b6a
commit c3d66b36c8
4 changed files with 68 additions and 2 deletions

View File

@@ -25,7 +25,7 @@
"Jovan Krunić <jovan.krunic@gmail.com>", "Jovan Krunić <jovan.krunic@gmail.com>",
"Rainer Killinger <mail-openstapps@killinger.co>", "Rainer Killinger <mail-openstapps@killinger.co>",
"Michel Jonathan Schmitz", "Michel Jonathan Schmitz",
"Wieland Schöbl" "Thea Schöbl <dev@theaninova.de>"
], ],
"scripts": { "scripts": {
"build": "npm run lint && npm run compile", "build": "npm run lint && npm run compile",

30
src/util/posix-path.ts Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright (C) 2021 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import path from 'path';
import {PathLike} from 'fs';
/**
* Convert a path to a POSIX path
*
* Replaces the system separator with posix separators
* Replaces Windows drive letters with a root '/'
*/
export function toPosixPath(pathLike: PathLike, separator = path.sep): string {
return pathLike
.toString()
.split(separator)
.join(path.posix.sep)
.replace(/^[A-z]:\//, '/');
}

View File

@@ -24,6 +24,7 @@ import {ExpectedValidationErrors, ValidationError, ValidationResult} from './typ
import {isThingWithType} from './util/guards'; import {isThingWithType} from './util/guards';
import path from 'path'; import path from 'path';
import re2 from './types/re2'; import re2 from './types/re2';
import {toPosixPath} from './util/posix-path';
/** /**
* StAppsCore validator * StAppsCore validator
@@ -58,7 +59,7 @@ export class Validator {
* @param schemaDirectory Path to directory that contains schema files * @param schemaDirectory Path to directory that contains schema files
*/ */
public async addSchemas(schemaDirectory: PathLike): Promise<string[]> { public async addSchemas(schemaDirectory: PathLike): Promise<string[]> {
const schemaFiles = await globPromisified(path.join(schemaDirectory.toString(), '*.json')); const schemaFiles = await globPromisified(path.posix.join(toPosixPath(schemaDirectory), '*.json'));
if (schemaFiles.length === 0) { if (schemaFiles.length === 0) {
throw new Error(`No schema files in ${schemaDirectory.toString()}!`); throw new Error(`No schema files in ${schemaDirectory.toString()}!`);

35
test/posix-path.spec.ts Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {expect} from 'chai';
import {toPosixPath} from '../src/util/posix-path';
import path from 'path';
describe('posix-path', function () {
it('should convert Windows paths', function () {
expect(toPosixPath('a\\b\\c', path.win32.sep)).to.be.equal('a/b/c');
});
it('should leave POSIX paths untouched', function () {
expect(toPosixPath('a/b/c', path.posix.sep)).to.be.equal('a/b/c');
});
it('should replace Windows drive letters', function () {
expect(toPosixPath('C:\\a\\b\\c', path.win32.sep)).to.be.equal('/a/b/c');
});
it('should leave POSIX root separator untouched', function () {
expect(toPosixPath('/a/b/c', path.posix.sep)).to.be.equal('/a/b/c');
});
});