Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config path enhancements #182

Merged
merged 4 commits into from
Sep 6, 2024
Merged

Config path enhancements #182

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c01961
feat(#181): relative paths
jannis-baum Sep 5, 2024
bd0020c
feat(#181): globs
jannis-baum Sep 5, 2024
40abae1
docs(#181): document relative paths & globs
jannis-baum Sep 6, 2024
9721b7e
fix: path in docs
jannis-baum Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import fs from 'fs';
import { globSync } from 'glob';
import { homedir } from 'os';
import path from 'path';

Expand Down Expand Up @@ -45,11 +46,23 @@ const configPaths = [
];

// read contents of file at paths or files at paths
const getFileContents = (paths: string[] | string | undefined): string => {
const getFileContents = (
paths: string[] | string | undefined,
baseDir: string | undefined,
): string => {
if (paths === undefined) return '';

const getFileContent = (p: string): string => {
const resolved = p[0] === '~' ? path.join(homedir(), p.slice(1)) : p;
return fs.existsSync(resolved) ? fs.readFileSync(resolved, 'utf8') : '';
let resolved = p;
if (resolved[0] === '~') {
resolved = path.join(homedir(), p.slice(1));
}
if (resolved[0] !== '/' && baseDir !== undefined) {
resolved = path.join(baseDir, resolved);
}
return globSync(resolved)
.map((p) => fs.readFileSync(p, 'utf8'))
.join('\n');
};

if (Array.isArray(paths)) {
Expand All @@ -60,11 +73,13 @@ const getFileContents = (paths: string[] | string | undefined): string => {

const config = ((): Config => {
let config = undefined;
let configBaseDir = undefined;
// greedily find config
for (const cp of configPaths) {
if (!fs.existsSync(cp)) continue;
try {
config = JSON.parse(fs.readFileSync(cp, 'utf8'));
configBaseDir = path.dirname(cp);
} catch {}
break;
}
Expand All @@ -77,9 +92,9 @@ const config = ((): Config => {
}

// get styles, scripts and ignore files
config.styles = getFileContents(config.styles);
config.scripts = getFileContents(config.scripts);
config.dirListIgnore = getFileContents(config.dirListIgnore)
config.styles = getFileContents(config.styles, configBaseDir);
config.scripts = getFileContents(config.scripts, configBaseDir);
config.dirListIgnore = getFileContents(config.dirListIgnore, configBaseDir)
.split('\n')
.filter((pattern) => pattern !== '' && pattern[0] !== '#');

Expand Down