fix(qmd): resolve hoisted dependencies from package context
CI / CI configuration security checks (push) Successful in 3s
CI / Capabilities and shell quality (push) Successful in 15s
CI / Python tests and compilation (push) Successful in 23s
CI / QMD unit tests (push) Failing after 11s
CI / Build and inspect generated packages (push) Successful in 17s
CI / PowerShell tests on Ubuntu (push) Successful in 1m2s
CI / Installed client configuration smoke tests (push) Successful in 1m7s
CI / Bash integration and installation guards (push) Successful in 1m17s

This commit is contained in:
Julian lechner committed 2026-10-08 15:25:33 +02:00
1 parent 88f7c9984b
commit 7f441d388d
5 files changed
+40 -14

No files matched your search

+3 -5
View File
@@ -1,7 +1,5 @@
// Loads QMD's bundled yaml package for tests.
import { qmdPackageDir } from '../../../shared/qmd/qmd-lib.mjs';
import { pathToFileURL } from 'node:url';
import { join } from 'node:path';
const YAML = await import(pathToFileURL(join(qmdPackageDir(), 'node_modules', 'yaml', 'dist', 'index.js')).href);
// Loads QMD's yaml dependency for tests, including hoisted installations.
import { importQmdDependency } from '../../../shared/qmd/qmd-lib.mjs';
const YAML = await importQmdDependency('yaml');
export const parseDocument = YAML.parseDocument;
export default YAML;
+25 -3
View File
@@ -1,12 +1,34 @@
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { mkdirSync, mkdtempSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
import { cpSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
import { execFileSync } from 'node:child_process';
import { createRequire } from 'node:module';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { dirname, join } from 'node:path';
import { fileURLToPath } from 'node:url';
import * as YAML from './fixtures/yaml-shim.mjs';
import { collectionName, deviceEnv, idleMinutes, qmdConfigPath, writePrivateJson, writeTextAtomic, readJson, runQmdCli, MODELS } from '../../shared/qmd/qmd-lib.mjs';
import { collectionName, deviceEnv, idleMinutes, qmdConfigPath, qmdPackageDir, writePrivateJson, writeTextAtomic, readJson, runQmdCli, MODELS } from '../../shared/qmd/qmd-lib.mjs';
import { setModels, unsetModels, previousModels, restoreModels, setCollectionIgnore } from '../../shared/qmd/qmd-config.mjs';
for (const layout of ['nested', 'hoisted']) {
test(`config CLI and YAML shim load ${layout} dependencies`, (t) => {
const root = mkdtempSync(join(tmpdir(), 'qmd dependencies '));
t.after(() => rmSync(root, { recursive: true, force: true }));
const pkg = join(root, 'node_modules', '@tobilu', 'qmd');
mkdirSync(pkg, { recursive: true });
const require = createRequire(join(qmdPackageDir(), 'package.json'));
const source = dirname(require.resolve('yaml/package.json'));
cpSync(source, join(layout === 'nested' ? pkg : root, 'node_modules', 'yaml'), { recursive: true });
const env = { ...process.env, QMD_PACKAGE_DIR: pkg, QMD_CONFIG_DIR: join(root, 'config') };
const output = execFileSync(process.execPath, [fileURLToPath(new URL('../../shared/qmd/qmd-config.mjs', import.meta.url)), 'set-models'], { env, encoding: 'utf8' });
assert.deepEqual(JSON.parse(output), { previous: null });
assert.deepEqual(YAML.default.parse(readFileSync(join(env.QMD_CONFIG_DIR, 'index.yml'), 'utf8')).models, MODELS);
const shim = new URL('./fixtures/yaml-shim.mjs', import.meta.url).href;
const parsed = execFileSync(process.execPath, ['--input-type=module', '-e', `import YAML from ${JSON.stringify(shim)}; console.log(JSON.stringify(YAML.parse('answer: 42')));`], { env, encoding: 'utf8' });
assert.deepEqual(JSON.parse(parsed), { answer: 42 });
});
}
test('collection name is stable, prefixed, and path-safe', () => {
const a = collectionName('/tmp/My Repo/ü');
assert.match(a, /^repo-[0-9a-f]{12}$/);