@thymian/core 0.2.0 → 0.2.1-canary.20260826-6fe84ef
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/load-user-module.d.ts +46 -0
- package/dist/load-user-module.d.ts.map +1 -0
- package/dist/load-user-module.js +303 -0
- package/dist/load-user-module.js.map +1 -0
- package/dist/rules/rule-loader.d.ts.map +1 -1
- package/dist/rules/rule-loader.js +31 -25
- package/dist/rules/rule-loader.js.map +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
export type UserModuleResolution = {
|
|
2
|
+
ok: true;
|
|
3
|
+
path: string;
|
|
4
|
+
} | {
|
|
5
|
+
ok: false;
|
|
6
|
+
reason?: string;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* The shared loadable-extension / declaration-file predicate. Returns a
|
|
10
|
+
* framed reason string when `filePath` is not a loadable kind, or `undefined`
|
|
11
|
+
* when it is. Operates on the path string alone (no filesystem access), so it
|
|
12
|
+
* is reused by both halves of this module: `resolveLocal` guards the requested
|
|
13
|
+
* path AND its realpath with it, and `loadUserModule` re-applies it so a
|
|
14
|
+
* direct call cannot bypass the resolve half's decisions.
|
|
15
|
+
*
|
|
16
|
+
* Exported for the later consumers that will share this exact check rather
|
|
17
|
+
* than hand-copying it — the rule-set glob filter and the plugin loader —
|
|
18
|
+
* neither of which is wired up in this change yet.
|
|
19
|
+
*/
|
|
20
|
+
export declare function unloadableReason(filePath: string): string | undefined;
|
|
21
|
+
/**
|
|
22
|
+
* Extension casing is case-sensitive against the on-disk (realpath) casing.
|
|
23
|
+
* On a case-preserving-but-insensitive filesystem, `realpathSync.native`
|
|
24
|
+
* silently corrects a mis-cased request to the real on-disk name; this
|
|
25
|
+
* catches that correction so a mis-cased module is declined with a framed
|
|
26
|
+
* reason instead of silently loading (or silently skipping, for the glob
|
|
27
|
+
* filter).
|
|
28
|
+
*/
|
|
29
|
+
export declare function miscasedExtension(requestedPath: string, canonicalPath: string): string | undefined;
|
|
30
|
+
/**
|
|
31
|
+
* Resolves a user-supplied rule/rule-set/plugin specifier to an absolute,
|
|
32
|
+
* canonical filesystem path — or declines it with a reason. Never throws:
|
|
33
|
+
* every internal fs/URL error is caught and mapped to `{ ok: false, reason }`.
|
|
34
|
+
*/
|
|
35
|
+
export declare function resolveUserModule(specifier: string, options: {
|
|
36
|
+
cwd: string;
|
|
37
|
+
}): UserModuleResolution;
|
|
38
|
+
/**
|
|
39
|
+
* Loads an already-resolved, canonical module path. Re-runs the shared
|
|
40
|
+
* guard (`unloadableReason`) so a direct call cannot bypass the resolve
|
|
41
|
+
* half's decisions — it still yields a framed error, never a raw
|
|
42
|
+
* "does not use default export" surprise.
|
|
43
|
+
*/
|
|
44
|
+
export declare function loadUserModule(canonicalPath: string): Promise<unknown>;
|
|
45
|
+
export declare function _resetUserModuleLoaderStateForTests(): void;
|
|
46
|
+
//# sourceMappingURL=load-user-module.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"load-user-module.d.ts","sourceRoot":"","sources":["../src/load-user-module.ts"],"names":[],"mappings":"AAsBA,MAAM,MAAM,oBAAoB,GAC9B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAK9D;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAoBrE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAYpB;AA4LD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACvB,oBAAoB,CAQtB;AAmDD;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkC5E;AAKD,wBAAgB,mCAAmC,IAAI,IAAI,CAG1D"}
|
|
@@ -0,0 +1,303 @@
|
|
|
1
|
+
import { realpathSync, statSync } from 'node:fs';
|
|
2
|
+
import { createRequire } from 'node:module';
|
|
3
|
+
import { homedir } from 'node:os';
|
|
4
|
+
import * as path from 'node:path';
|
|
5
|
+
import { pathToFileURL } from 'node:url';
|
|
6
|
+
import { ThymianBaseError } from './thymian.error.js';
|
|
7
|
+
const JS_EXTENSIONS = new Set(['.js', '.mjs', '.cjs']);
|
|
8
|
+
const LOADABLE_EXTENSIONS = new Set(['.ts', ...JS_EXTENSIONS]);
|
|
9
|
+
/**
|
|
10
|
+
* The shared loadable-extension / declaration-file predicate. Returns a
|
|
11
|
+
* framed reason string when `filePath` is not a loadable kind, or `undefined`
|
|
12
|
+
* when it is. Operates on the path string alone (no filesystem access), so it
|
|
13
|
+
* is reused by both halves of this module: `resolveLocal` guards the requested
|
|
14
|
+
* path AND its realpath with it, and `loadUserModule` re-applies it so a
|
|
15
|
+
* direct call cannot bypass the resolve half's decisions.
|
|
16
|
+
*
|
|
17
|
+
* Exported for the later consumers that will share this exact check rather
|
|
18
|
+
* than hand-copying it — the rule-set glob filter and the plugin loader —
|
|
19
|
+
* neither of which is wired up in this change yet.
|
|
20
|
+
*/
|
|
21
|
+
export function unloadableReason(filePath) {
|
|
22
|
+
const base = path.basename(filePath);
|
|
23
|
+
if (base.endsWith('.d.ts')) {
|
|
24
|
+
return `"${base}" is a TypeScript declaration file (.d.ts) — declaration files are never loadable, regardless of contents.`;
|
|
25
|
+
}
|
|
26
|
+
const ext = path.extname(filePath);
|
|
27
|
+
if (ext === '.mts' || ext === '.cts') {
|
|
28
|
+
return `"${ext}" is not a loadable extension — .mts/.cts are not supported for rules, rule sets, or plugins; use .ts instead.`;
|
|
29
|
+
}
|
|
30
|
+
if (!LOADABLE_EXTENSIONS.has(ext)) {
|
|
31
|
+
return `"${base}" does not have a loadable extension — expected one of .ts, .js, .mjs, .cjs${ext ? ` (found "${ext}")` : ' (no extension)'}.`;
|
|
32
|
+
}
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Extension casing is case-sensitive against the on-disk (realpath) casing.
|
|
37
|
+
* On a case-preserving-but-insensitive filesystem, `realpathSync.native`
|
|
38
|
+
* silently corrects a mis-cased request to the real on-disk name; this
|
|
39
|
+
* catches that correction so a mis-cased module is declined with a framed
|
|
40
|
+
* reason instead of silently loading (or silently skipping, for the glob
|
|
41
|
+
* filter).
|
|
42
|
+
*/
|
|
43
|
+
export function miscasedExtension(requestedPath, canonicalPath) {
|
|
44
|
+
const requestedExt = path.extname(requestedPath);
|
|
45
|
+
const canonicalExt = path.extname(canonicalPath);
|
|
46
|
+
if (requestedExt !== canonicalExt &&
|
|
47
|
+
requestedExt.toLowerCase() === canonicalExt.toLowerCase()) {
|
|
48
|
+
return `"${requestedExt}" does not match the on-disk casing "${canonicalExt}" for "${path.basename(canonicalPath)}" — extension casing is case-sensitive.`;
|
|
49
|
+
}
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
function isLocalSpecifier(specifier) {
|
|
53
|
+
return (
|
|
54
|
+
// The bare directory references `.` / `..` are local, not package names
|
|
55
|
+
// (they would otherwise resolve the cwd's or parent's own package.json).
|
|
56
|
+
specifier === '.' ||
|
|
57
|
+
specifier === '..' ||
|
|
58
|
+
specifier.startsWith('./') ||
|
|
59
|
+
specifier.startsWith('../') ||
|
|
60
|
+
// Windows-native relative spellings (`.\x`, `..\x`). Forward slashes are
|
|
61
|
+
// the cross-platform norm and what the generator emits, but a hand-written
|
|
62
|
+
// backslash path must not be mistaken for a package name.
|
|
63
|
+
specifier.startsWith('.\\') ||
|
|
64
|
+
specifier.startsWith('..\\') ||
|
|
65
|
+
path.isAbsolute(specifier));
|
|
66
|
+
}
|
|
67
|
+
function resolveLocal(specifier, cwd) {
|
|
68
|
+
const requestedAbsolute = path.isAbsolute(specifier)
|
|
69
|
+
? specifier
|
|
70
|
+
: path.resolve(cwd, specifier);
|
|
71
|
+
// Guard the requested path: local specifiers must carry an explicit,
|
|
72
|
+
// loadable extension (no extensionless / index / directory guessing).
|
|
73
|
+
const requestedReason = unloadableReason(requestedAbsolute);
|
|
74
|
+
if (requestedReason) {
|
|
75
|
+
return { ok: false, reason: requestedReason };
|
|
76
|
+
}
|
|
77
|
+
let canonical;
|
|
78
|
+
try {
|
|
79
|
+
canonical = realpathSync.native(requestedAbsolute);
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
// Does not exist (or is unreachable) — an ordinary "not found", which
|
|
83
|
+
// the caller can phrase itself; no reason needed here.
|
|
84
|
+
return { ok: false };
|
|
85
|
+
}
|
|
86
|
+
// Guard the RESOLVED target too: a symlink may point at an unloadable kind
|
|
87
|
+
// (e.g. `./alias.ts` -> `real.d.ts` / `real.mts`), which must be declined
|
|
88
|
+
// here — not surface later as a differently-framed load error.
|
|
89
|
+
const canonicalReason = unloadableReason(canonical);
|
|
90
|
+
if (canonicalReason) {
|
|
91
|
+
return { ok: false, reason: canonicalReason };
|
|
92
|
+
}
|
|
93
|
+
const casingReason = miscasedExtension(requestedAbsolute, canonical);
|
|
94
|
+
if (casingReason) {
|
|
95
|
+
return { ok: false, reason: casingReason };
|
|
96
|
+
}
|
|
97
|
+
// Reject a directory whose name merely ends in a loadable extension (e.g. a
|
|
98
|
+
// directory literally named `x.js`) — the extension check alone would pass
|
|
99
|
+
// it, and it would then surface a raw ERR_UNSUPPORTED_DIR_IMPORT downstream.
|
|
100
|
+
let stats;
|
|
101
|
+
try {
|
|
102
|
+
stats = statSync(canonical);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
return { ok: false };
|
|
106
|
+
}
|
|
107
|
+
if (!stats.isFile()) {
|
|
108
|
+
return {
|
|
109
|
+
ok: false,
|
|
110
|
+
reason: `"${specifier}" resolves to "${path.basename(canonical)}", which is not a regular file.`,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
return { ok: true, path: canonical };
|
|
114
|
+
}
|
|
115
|
+
// One `createRequire` anchor per normalised cwd, memoised. Normalising the
|
|
116
|
+
// key deduplicates spellings of the same cwd — the raw-cwd cache mis-answered
|
|
117
|
+
// after `process.chdir`. It does NOT bound the number of *distinct*
|
|
118
|
+
// cwds: the map grows one entry per project the process ever loads from. That
|
|
119
|
+
// is harmless for the CLI (a single, fixed cwd per invocation); a long-lived
|
|
120
|
+
// multi-project consumer should add LRU eviction here and to `moduleCache`.
|
|
121
|
+
const userRequireByCwd = new Map();
|
|
122
|
+
function getUserRequire(cwd) {
|
|
123
|
+
const normalisedCwd = path.resolve(cwd);
|
|
124
|
+
let anchoredRequire = userRequireByCwd.get(normalisedCwd);
|
|
125
|
+
if (!anchoredRequire) {
|
|
126
|
+
anchoredRequire = createRequire(path.join(normalisedCwd, 'noop.cjs'));
|
|
127
|
+
userRequireByCwd.set(normalisedCwd, anchoredRequire);
|
|
128
|
+
}
|
|
129
|
+
return anchoredRequire;
|
|
130
|
+
}
|
|
131
|
+
// Core's own install directory — the second bare-specifier anchor.
|
|
132
|
+
const coreRequire = createRequire(import.meta.url);
|
|
133
|
+
// Resolves a bare specifier (an installed package) with Node's OWN resolver,
|
|
134
|
+
// `require.resolve`, from two anchors in order: the user's project, then
|
|
135
|
+
// core's install dir. Using the native resolver — rather than reimplementing
|
|
136
|
+
// package resolution — means `exports`/`main`/legacy-`index`/deep subpaths,
|
|
137
|
+
// and resolver hooks such as Yarn PnP, all behave exactly as Node does
|
|
138
|
+
// elsewhere. We only add the loadable-set policy on top: the resolved file
|
|
139
|
+
// must be built JavaScript (.js/.mjs/.cjs); a package shipping unbuilt .ts
|
|
140
|
+
// source is declined. (A bare specifier is loaded with native `import()`, so
|
|
141
|
+
// jiti is never reached for it.)
|
|
142
|
+
function resolveBare(specifier, cwd) {
|
|
143
|
+
const anchors = [getUserRequire(cwd), coreRequire];
|
|
144
|
+
let resolved;
|
|
145
|
+
let installedButUnresolvable;
|
|
146
|
+
for (const anchoredRequire of anchors) {
|
|
147
|
+
try {
|
|
148
|
+
resolved = anchoredRequire.resolve(specifier);
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
151
|
+
catch (error) {
|
|
152
|
+
if (isModuleNotFound(error)) {
|
|
153
|
+
// Not installed under this anchor — try the next one.
|
|
154
|
+
continue;
|
|
155
|
+
}
|
|
156
|
+
// Installed, but Node's resolver refused it (e.g. its `exports` map
|
|
157
|
+
// provides no Node/CJS entry, or its package.json is invalid). Report
|
|
158
|
+
// that rather than silently treating it as "not found".
|
|
159
|
+
installedButUnresolvable ??= `"${specifier}" is installed but could not be resolved: ${describeUnexpectedError(error)}`;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
if (resolved === undefined) {
|
|
163
|
+
return installedButUnresolvable
|
|
164
|
+
? { ok: false, reason: installedButUnresolvable }
|
|
165
|
+
: { ok: false };
|
|
166
|
+
}
|
|
167
|
+
// `require.resolve` returns a bare id (not an absolute path) for a Node
|
|
168
|
+
// builtin — builtins are not loadable user modules.
|
|
169
|
+
if (!path.isAbsolute(resolved)) {
|
|
170
|
+
return {
|
|
171
|
+
ok: false,
|
|
172
|
+
reason: `"${specifier}" is a Node.js builtin module — builtins are not loadable user modules.`,
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
let canonical;
|
|
176
|
+
try {
|
|
177
|
+
canonical = realpathSync.native(resolved);
|
|
178
|
+
}
|
|
179
|
+
catch {
|
|
180
|
+
return {
|
|
181
|
+
ok: false,
|
|
182
|
+
reason: `"${specifier}" resolved to "${resolved}", which does not exist on disk.`,
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
const ext = path.extname(canonical);
|
|
186
|
+
if (ext === '.ts' || ext === '.mts' || ext === '.cts') {
|
|
187
|
+
return {
|
|
188
|
+
ok: false,
|
|
189
|
+
reason: `"${specifier}" ships unbuilt TypeScript source (${path.basename(canonical)}); publish built JavaScript.`,
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
if (!JS_EXTENSIONS.has(ext)) {
|
|
193
|
+
return {
|
|
194
|
+
ok: false,
|
|
195
|
+
reason: `"${specifier}" resolved to "${path.basename(canonical)}", which is not a loadable JavaScript file (expected .js, .mjs, or .cjs).`,
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
return { ok: true, path: canonical };
|
|
199
|
+
}
|
|
200
|
+
function isModuleNotFound(error) {
|
|
201
|
+
return (error instanceof Error &&
|
|
202
|
+
error.code === 'MODULE_NOT_FOUND');
|
|
203
|
+
}
|
|
204
|
+
function describeUnexpectedError(error) {
|
|
205
|
+
return error instanceof Error ? error.message : String(error);
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* Resolves a user-supplied rule/rule-set/plugin specifier to an absolute,
|
|
209
|
+
* canonical filesystem path — or declines it with a reason. Never throws:
|
|
210
|
+
* every internal fs/URL error is caught and mapped to `{ ok: false, reason }`.
|
|
211
|
+
*/
|
|
212
|
+
export function resolveUserModule(specifier, options) {
|
|
213
|
+
try {
|
|
214
|
+
return isLocalSpecifier(specifier)
|
|
215
|
+
? resolveLocal(specifier, options.cwd)
|
|
216
|
+
: resolveBare(specifier, options.cwd);
|
|
217
|
+
}
|
|
218
|
+
catch (error) {
|
|
219
|
+
return { ok: false, reason: describeUnexpectedError(error) };
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
// jiti transpile-cache location — pinned deliberately. It is placed under the
|
|
223
|
+
// current user's home cache directory rather than the OS tmp dir. A fixed path
|
|
224
|
+
// in the shared OS tmp dir (e.g. `/tmp/...` on Linux) is world-writable, so a
|
|
225
|
+
// local attacker who knows a rule's path and public source can pre-seed a
|
|
226
|
+
// poisoned cache entry that the victim then executes — jiti reads a cache file
|
|
227
|
+
// back whenever its trailing version/source hash matches. A per-user location
|
|
228
|
+
// under `homedir()` keeps the cache predictable (the reason for pinning it)
|
|
229
|
+
// while staying inside the user's own permission domain, where other users
|
|
230
|
+
// cannot plant entries.
|
|
231
|
+
const JITI_FS_CACHE_DIR = path.join(homedir(), '.cache', 'thymian', 'jiti');
|
|
232
|
+
let jitiPromise;
|
|
233
|
+
function getJiti() {
|
|
234
|
+
// Lazily, dynamically imported — and memoised — so a JS-only run never
|
|
235
|
+
// instantiates jiti at all: the JS path never pays for it. On
|
|
236
|
+
// failure the memo is cleared so a later `.ts` load can re-attempt, rather
|
|
237
|
+
// than pinning a transient `import('jiti')`/createJiti error forever.
|
|
238
|
+
jitiPromise ??= import('jiti')
|
|
239
|
+
.then(({ createJiti }) => createJiti(import.meta.url, { fsCache: JITI_FS_CACHE_DIR }))
|
|
240
|
+
.catch((error) => {
|
|
241
|
+
jitiPromise = undefined;
|
|
242
|
+
throw error;
|
|
243
|
+
});
|
|
244
|
+
return jitiPromise;
|
|
245
|
+
}
|
|
246
|
+
// Keyed by canonical (realpath) path. A *successful* load is pinned for the
|
|
247
|
+
// process lifetime: this is both the concurrent in-flight dedupe AND the
|
|
248
|
+
// exactly-once execution guarantee across every path spelling. A
|
|
249
|
+
// *rejected* load is evicted (see below) so a transient failure can be
|
|
250
|
+
// retried instead of being pinned forever. No bespoke cycle-detection
|
|
251
|
+
// machinery — ordinary module-graph import cycles are jiti/Node's concern,
|
|
252
|
+
// handled natively.
|
|
253
|
+
const moduleCache = new Map();
|
|
254
|
+
async function importByExtension(canonicalPath) {
|
|
255
|
+
if (path.extname(canonicalPath) === '.ts') {
|
|
256
|
+
const jiti = await getJiti();
|
|
257
|
+
return jiti.import(canonicalPath);
|
|
258
|
+
}
|
|
259
|
+
return import(pathToFileURL(canonicalPath).href);
|
|
260
|
+
}
|
|
261
|
+
/**
|
|
262
|
+
* Loads an already-resolved, canonical module path. Re-runs the shared
|
|
263
|
+
* guard (`unloadableReason`) so a direct call cannot bypass the resolve
|
|
264
|
+
* half's decisions — it still yields a framed error, never a raw
|
|
265
|
+
* "does not use default export" surprise.
|
|
266
|
+
*/
|
|
267
|
+
export async function loadUserModule(canonicalPath) {
|
|
268
|
+
const reason = unloadableReason(canonicalPath);
|
|
269
|
+
if (reason) {
|
|
270
|
+
throw new ThymianBaseError(reason, {
|
|
271
|
+
name: 'UserModuleLoadError',
|
|
272
|
+
suggestions: [
|
|
273
|
+
'Rules, rule sets, and plugins must be a .ts, .js, .mjs, or .cjs file — not .d.ts, .mts, or .cts.',
|
|
274
|
+
],
|
|
275
|
+
// Reuses the existing rule-load-error reference page; a dedicated
|
|
276
|
+
// user-module-load-error page ships with the docs work.
|
|
277
|
+
ref: 'https://thymian.dev/references/errors/rule-load-error/',
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
const cached = moduleCache.get(canonicalPath);
|
|
281
|
+
if (cached) {
|
|
282
|
+
return cached;
|
|
283
|
+
}
|
|
284
|
+
// Evict on rejection so only successful loads are pinned; a transient
|
|
285
|
+
// failure (a file that briefly vanished, a one-off jiti/transpile error)
|
|
286
|
+
// can then be retried rather than returning the same rejection forever.
|
|
287
|
+
// Concurrency stays safe: the `.catch` runs only after the in-flight
|
|
288
|
+
// promise settles, and concurrent callers share this one promise.
|
|
289
|
+
const promise = importByExtension(canonicalPath).catch((error) => {
|
|
290
|
+
moduleCache.delete(canonicalPath);
|
|
291
|
+
throw error;
|
|
292
|
+
});
|
|
293
|
+
moduleCache.set(canonicalPath, promise);
|
|
294
|
+
return promise;
|
|
295
|
+
}
|
|
296
|
+
// Exposed for tests only (module-level singletons make cross-test isolation
|
|
297
|
+
// otherwise impossible): resets the exactly-once module cache and the
|
|
298
|
+
// lazily-instantiated jiti singleton.
|
|
299
|
+
export function _resetUserModuleLoaderStateForTests() {
|
|
300
|
+
moduleCache.clear();
|
|
301
|
+
jitiPromise = undefined;
|
|
302
|
+
}
|
|
303
|
+
//# sourceMappingURL=load-user-module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"load-user-module.js","sourceRoot":"","sources":["../src/load-user-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-loader.d.ts","sourceRoot":"","sources":["../../src/rules/rule-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rule-loader.d.ts","sourceRoot":"","sources":["../../src/rules/rule-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAQlE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA2B7C,wBAAgB,MAAM,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,IAAI,CAMlD;AA2GD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,OAAO,CAU9D;AAkGD,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,UAAU,GAAE,UAAuB,EACnC,OAAO,GAAE,kBAAuB,EAChC,GAAG,GAAE,MAAsB,EAC3B,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAIzC,aAAa,GAAE,kBAAuB,GACrC,OAAO,CAAC,IAAI,EAAE,CAAC,CAoGjB"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
import { existsSync } from 'node:fs';
|
|
2
|
-
import { createRequire } from 'node:module';
|
|
3
1
|
import * as path from 'node:path';
|
|
4
|
-
import { pathToFileURL } from 'node:url';
|
|
5
2
|
import { glob } from 'tinyglobby';
|
|
3
|
+
import { loadUserModule, resolveUserModule } from '../load-user-module.js';
|
|
6
4
|
import { ThymianBaseError } from '../thymian.error.js';
|
|
7
5
|
import { isRecord } from '../utils.js';
|
|
8
6
|
import { validate } from './ajv-validate.js';
|
|
9
7
|
import { checkRuleExecutionInvariant, checkRuleTypeDeclaration, describeRuleExecutionInvariantViolation, ruleFnPropertyByType, } from './rule-execution-invariant.js';
|
|
10
8
|
import { isRuleSeverityLevel } from './rule-severity.js';
|
|
11
|
-
const require = createRequire(import.meta.url);
|
|
12
9
|
const ruleFunctionProperties = Object.values(ruleFnPropertyByType);
|
|
13
10
|
function areFunctionPropertiesIfDefined(obj) {
|
|
14
11
|
return ruleFunctionProperties.every((property) => {
|
|
@@ -164,26 +161,35 @@ profileConfig = {}) {
|
|
|
164
161
|
return [];
|
|
165
162
|
}
|
|
166
163
|
if (Array.isArray(input)) {
|
|
167
|
-
return (await Promise.all(input.map((entry) => loadRules(entry, ruleFilter, options, cwd, ruleProfiles)))).flat();
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
164
|
+
return (await Promise.all(input.map((entry) => loadRules(entry, ruleFilter, options, cwd, ruleProfiles, profileConfig)))).flat();
|
|
165
|
+
}
|
|
166
|
+
const resolution = resolveUserModule(input, { cwd });
|
|
167
|
+
if (!resolution.ok) {
|
|
168
|
+
throw resolution.reason
|
|
169
|
+
? new ThymianBaseError(
|
|
170
|
+
// The seam's reason is a complete sentence that already ends in a
|
|
171
|
+
// period; strip a trailing one before adding ours so the message
|
|
172
|
+
// never doubles up ("...JavaScript..").
|
|
173
|
+
`Cannot load rule source ${input}: ${resolution.reason.replace(/\.$/, '')}.`, {
|
|
174
|
+
suggestions: [
|
|
175
|
+
'Reference a built .js/.mjs/.cjs file or a local .ts file with an explicit extension. Installed packages must ship built JavaScript.',
|
|
176
|
+
],
|
|
177
|
+
name: 'RuleLoadError',
|
|
178
|
+
ref: 'https://thymian.dev/references/errors/rule-load-error/',
|
|
179
|
+
})
|
|
180
|
+
: new ThymianBaseError(`Cannot resolve rule source ${input}.`, {
|
|
181
|
+
suggestions: [
|
|
182
|
+
'For a local rule, use a relative path with an explicit extension (e.g. ./my.rule.ts). For an installed package, check that it is installed.',
|
|
183
|
+
],
|
|
184
|
+
name: 'RuleLoadError',
|
|
185
|
+
ref: 'https://thymian.dev/references/errors/rule-load-error/',
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
const resolved = resolution.path;
|
|
189
|
+
const rawModule = await loadUserModule(resolved);
|
|
190
|
+
const module = isRecord(rawModule) ? rawModule : {};
|
|
185
191
|
if (!('default' in module)) {
|
|
186
|
-
throw new ThymianBaseError(`Rule or rule set at ${
|
|
192
|
+
throw new ThymianBaseError(`Rule or rule set at ${resolved} does not use default export.`, {
|
|
187
193
|
suggestions: [
|
|
188
194
|
'Use "export default" or "module.exports =" to export your rule (set).',
|
|
189
195
|
],
|
|
@@ -194,11 +200,11 @@ profileConfig = {}) {
|
|
|
194
200
|
const ruleOrRuleSet = module.default;
|
|
195
201
|
if (isRule(ruleOrRuleSet)) {
|
|
196
202
|
const rule = applyProfileThenConfig(ruleOrRuleSet, profileConfig, options);
|
|
197
|
-
assertRuleTypeDeclaration(rule,
|
|
203
|
+
assertRuleTypeDeclaration(rule, resolved);
|
|
198
204
|
if (!ruleFilter(rule)) {
|
|
199
205
|
return [];
|
|
200
206
|
}
|
|
201
|
-
assertRuleExecutionInvariant(rule,
|
|
207
|
+
assertRuleExecutionInvariant(rule, resolved, typeOverrideSuggestions(rule, options));
|
|
202
208
|
return [rule];
|
|
203
209
|
}
|
|
204
210
|
if (isRuleSet(ruleOrRuleSet)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-loader.js","sourceRoot":"","sources":["../../src/rules/rule-loader.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"rule-loader.js","sourceRoot":"","sources":["../../src/rules/rule-loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thymian/core",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.1-canary.20260826-6fe84ef",
|
|
4
4
|
"description": "Core library with the plugin system, rule engine, and HTTP primitives for Thymian",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"bugs": {
|
|
@@ -54,6 +54,7 @@
|
|
|
54
54
|
"ajv-formats": "^3.0.1",
|
|
55
55
|
"chalk": "^5.4.1",
|
|
56
56
|
"graphology": "^0.26.0",
|
|
57
|
+
"jiti": "^2.6.1",
|
|
57
58
|
"path-to-regexp": "^8.4.0",
|
|
58
59
|
"rxjs": "^7.8.2",
|
|
59
60
|
"safe-stable-stringify": "^2.5.0",
|