taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

taler-util: fix config utils for ESM

Browse Source
This commit is contained in:
Florian Dold 2022-10-31 20:28:28 +01:00
parent e80e3f28fe
commit 2f6225f6e7
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 33 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
packages/taler-util/src/talerconfig.ts
View File

@ -26,50 +26,9 @@
import { AmountJson } from "./amounts.js"; import { AmountJson } from "./amounts.js";
import { Amounts } from "./amounts.js"; import { Amounts } from "./amounts.js";
const nodejs_fs = (function () { import nodejs_path from "path";
let fs: typeof import("fs"); import nodejs_os from "os";
return function () { import nodejs_fs from "fs";
if (!fs) {
/**
* need to use an expression when doing a require if we want
* webpack not to find out about the requirement
*/
const _r = "require";
fs = module[_r]("fs");
}
return fs;
};
})();
const nodejs_path = (function () {
let path: typeof import("path");
return function () {
if (!path) {
/**
* need to use an expression when doing a require if we want
* webpack not to find out about the requirement
*/
const _r = "require";
path = module[_r]("path");
}
return path;
};
})();
const nodejs_os = (function () {
let os: typeof import("os");
return function () {
if (!os) {
/**
* need to use an expression when doing a require if we want
* webpack not to find out about the requirement
*/
const _r = "require";
os = module[_r]("os");
}
return os;
};
})();
export class ConfigError extends Error { export class ConfigError extends Error {
constructor(message: string) { constructor(message: string) {
@ -138,10 +97,10 @@ export class ConfigValue<T> {
*/ */
export function expandPath(path: string): string { export function expandPath(path: string): string {
if (path[0] === "~") { if (path[0] === "~") {
path = nodejs_path().join(nodejs_os().homedir(), path.slice(1)); path = nodejs_path.join(nodejs_os.homedir(), path.slice(1));
} }
if (path[0] !== "/") { if (path[0] !== "/") {
path = nodejs_path().join(process.cwd(), path); path = nodejs_path.join(process.cwd(), path);
} }
return path; return path;
} }
@ -288,10 +247,10 @@ function normalizeInlineFilename(parentFile: string, f: string): string {
if (f[0] === "/") { if (f[0] === "/") {
return f; return f;
} }
const resolvedParentDir = nodejs_path().dirname( const resolvedParentDir = nodejs_path.dirname(
nodejs_fs().realpathSync(parentFile), nodejs_fs.realpathSync(parentFile),
); );
return nodejs_path().join(resolvedParentDir, f); return nodejs_path.join(resolvedParentDir, f);
} }
/** /**
@ -306,8 +265,8 @@ function which(name: string): string | undefined {
return undefined; return undefined;
} }
for (const path of paths) { for (const path of paths) {
const filename = nodejs_path().join(path, name); const filename = nodejs_path.join(path, name);
if (nodejs_fs().existsSync(filename)) { if (nodejs_fs.existsSync(filename)) {
return filename; return filename;
} }
} }
@ -342,7 +301,7 @@ export class Configuration {
checkCycle(); checkCycle();
const s = nodejs_fs().readFileSync(filename, "utf-8"); const s = nodejs_fs.readFileSync(filename, "utf-8");
this.loadedFiles.push({ this.loadedFiles.push({
filename: filename, filename: filename,
level: this.nestLevel, level: this.nestLevel,
@ -360,26 +319,26 @@ export class Configuration {
} }
private loadGlob(parentFilename: string, fileglob: string): void { private loadGlob(parentFilename: string, fileglob: string): void {
const resolvedParent = nodejs_fs().realpathSync(parentFilename); const resolvedParent = nodejs_fs.realpathSync(parentFilename);
const parentDir = nodejs_path().dirname(resolvedParent); const parentDir = nodejs_path.dirname(resolvedParent);
let fullFileglob: string; let fullFileglob: string;
if (fileglob.startsWith("/")) { if (fileglob.startsWith("/")) {
fullFileglob = fileglob; fullFileglob = fileglob;
} else { } else {
fullFileglob = nodejs_path().join(parentDir, fileglob); fullFileglob = nodejs_path.join(parentDir, fileglob);
} }
fullFileglob = expandPath(fullFileglob); fullFileglob = expandPath(fullFileglob);
const head = nodejs_path().dirname(fullFileglob); const head = nodejs_path.dirname(fullFileglob);
const tail = nodejs_path().basename(fullFileglob); const tail = nodejs_path.basename(fullFileglob);
const files = nodejs_fs().readdirSync(head); const files = nodejs_fs.readdirSync(head);
for (const f of files) { for (const f of files) {
if (globMatch(tail, f)) { if (globMatch(tail, f)) {
const fullPath = nodejs_path().join(head, f); const fullPath = nodejs_path.join(head, f);
this.loadFromFilename(fullPath); this.loadFromFilename(fullPath);
} }
} }
@ -390,7 +349,7 @@ export class Configuration {
sec.secretFilename = filename; sec.secretFilename = filename;
const otherCfg = new Configuration(); const otherCfg = new Configuration();
try { try {
nodejs_fs().accessSync(filename, nodejs_fs().constants.R_OK); nodejs_fs.accessSync(filename, nodejs_fs.constants.R_OK);
} catch (err) { } catch (err) {
sec.inaccessible = true; sec.inaccessible = true;
return; return;
@ -620,9 +579,9 @@ export class Configuration {
} }
loadFrom(dirname: string): void { loadFrom(dirname: string): void {
const files = nodejs_fs().readdirSync(dirname); const files = nodejs_fs.readdirSync(dirname);
for (const f of files) { for (const f of files) {
const fn = nodejs_path().join(dirname, f); const fn = nodejs_path.join(dirname, f);
this.loadFromFilename(fn); this.loadFromFilename(fn);
} }
} }
@ -634,8 +593,8 @@ export class Configuration {
* of the taler-config binary. */ * of the taler-config binary. */
const path = which("taler-config"); const path = which("taler-config");
if (path) { if (path) {
bc = nodejs_fs().realpathSync( bc = nodejs_fs.realpathSync(
nodejs_path().dirname(path) + "/../share/taler/config.d", nodejs_path.dirname(path) + "/../share/taler/config.d",
); );
} }
} }
@ -650,19 +609,19 @@ export class Configuration {
const home = process.env["HOME"]; const home = process.env["HOME"];
let fn: string | undefined; let fn: string | undefined;
if (xdg) { if (xdg) {
fn = nodejs_path().join(xdg, "taler.conf"); fn = nodejs_path.join(xdg, "taler.conf");
} else if (home) { } else if (home) {
fn = nodejs_path().join(home, ".config/taler.conf"); fn = nodejs_path.join(home, ".config/taler.conf");
} }
if (fn && nodejs_fs().existsSync(fn)) { if (fn && nodejs_fs.existsSync(fn)) {
return fn; return fn;
} }
const etc1 = "/etc/taler.conf"; const etc1 = "/etc/taler.conf";
if (nodejs_fs().existsSync(etc1)) { if (nodejs_fs.existsSync(etc1)) {
return etc1; return etc1;
} }
const etc2 = "/etc/taler/taler.conf"; const etc2 = "/etc/taler/taler.conf";
if (nodejs_fs().existsSync(etc2)) { if (nodejs_fs.existsSync(etc2)) {
return etc2; return etc2;
} }
return undefined; return undefined;
@ -718,6 +677,6 @@ export class Configuration {
} }
write(filename: string): void { write(filename: string): void {
nodejs_fs().writeFileSync(filename, this.stringify()); nodejs_fs.writeFileSync(filename, this.stringify());
} }
} }

5
packages/taler-wallet-cli/src/integrationtests/testrunner.ts
View File

@ -19,6 +19,7 @@ import * as child_process from "child_process";
import * as fs from "fs"; import * as fs from "fs";
import * as os from "os"; import * as os from "os";
import * as path from "path"; import * as path from "path";
import url from "url";
import { import {
GlobalTestState, GlobalTestState,
runTestWithState, runTestWithState,
@ -287,7 +288,9 @@ export async function runTests(spec: TestRunSpec) {
testRootDir, testRootDir,
}; };
currentChild = child_process.fork(__filename, ["__TWCLI_TESTWORKER"], { const myFilename = url.fileURLToPath(import.meta.url);
currentChild = child_process.fork(myFilename, ["__TWCLI_TESTWORKER"], {
env: { env: {
TWCLI_RUN_TEST_INSTRUCTION: JSON.stringify(testInstr), TWCLI_RUN_TEST_INSTRUCTION: JSON.stringify(testInstr),
...process.env, ...process.env,