@ontrails/source 1.0.0-beta.46 → 1.0.0-beta.47

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/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @ontrails/source
2
2
 
3
+ ## 1.0.0-beta.47
4
+
5
+ ### Minor Changes
6
+
7
+ - [`90d394c`](https://github.com/outfitter-dev/trails/commit/90d394c005fdf6b898ba7052d0b56755af0f4954): Derive nested worktree, repository, and submodule collection boundaries in the
8
+ shared Source walker. Regrade and Warden now observe one directly targeted
9
+ working tree per run, and Regrade audit summaries expose boundary skip counts.
10
+
3
11
  ## 1.0.0-beta.46
4
12
 
5
13
  ### Minor Changes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ontrails/source",
3
- "version": "1.0.0-beta.46",
3
+ "version": "1.0.0-beta.47",
4
4
  "description": "Shared source-code AST parsing, walking, location, edit, literal, and Trails syntax helpers.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -0,0 +1,312 @@
1
+ import { spawnSync } from 'node:child_process';
2
+ import { lstatSync, readFileSync, readdirSync, statSync } from 'node:fs';
3
+ import type { Dirent } from 'node:fs';
4
+ import { join, posix, relative, resolve, sep } from 'node:path';
5
+
6
+ /** Git-derived reasons a nested directory is outside the current observation tree. */
7
+ export type SourceCollectionBoundaryReason =
8
+ | 'nested-repository'
9
+ | 'nested-worktree'
10
+ | 'submodule-boundary';
11
+
12
+ /** Filesystem entry kinds exposed to a source-collection policy. */
13
+ export type SourceCollectionEntryKind = 'directory' | 'file' | 'other';
14
+
15
+ /** A root-relative filesystem entry offered to a source-collection policy. */
16
+ export interface SourceCollectionEntry {
17
+ readonly kind: SourceCollectionEntryKind;
18
+ readonly name: string;
19
+ readonly path: string;
20
+ }
21
+
22
+ /** The action a source-collection policy chooses for one entry. */
23
+ export type SourceCollectionDecision =
24
+ | { readonly action: 'collect' }
25
+ | { readonly action: 'recurse' }
26
+ | { readonly action: 'skip'; readonly reason: string };
27
+
28
+ /** One collected file, with both absolute and root-relative identities. */
29
+ export interface CollectedSourceFile {
30
+ readonly absolutePath: string;
31
+ readonly path: string;
32
+ }
33
+
34
+ /** One visible collection skip. */
35
+ export interface SkippedSourceEntry {
36
+ readonly path: string;
37
+ readonly reason: string;
38
+ }
39
+
40
+ /** Deterministic result of observing one source tree. */
41
+ export interface SourceTreeCollection {
42
+ readonly files: readonly CollectedSourceFile[];
43
+ readonly root: string;
44
+ readonly skipped: readonly SkippedSourceEntry[];
45
+ }
46
+
47
+ /** Consumer policy for ordinary entries after Git boundaries are derived. */
48
+ export interface CollectSourceTreeOptions {
49
+ readonly classify?: (
50
+ entry: SourceCollectionEntry
51
+ ) => SourceCollectionDecision;
52
+ }
53
+
54
+ const toPosixRelative = (root: string, absolutePath: string): string => {
55
+ const path = relative(root, absolutePath);
56
+ return sep === posix.sep ? path : path.split(sep).join(posix.sep);
57
+ };
58
+
59
+ const entryKind = (entry: {
60
+ isDirectory(): boolean;
61
+ isFile(): boolean;
62
+ }): SourceCollectionEntryKind => {
63
+ if (entry.isDirectory()) {
64
+ return 'directory';
65
+ }
66
+ return entry.isFile() ? 'file' : 'other';
67
+ };
68
+
69
+ const defaultDecision = (
70
+ entry: SourceCollectionEntry
71
+ ): SourceCollectionDecision => {
72
+ if (entry.kind === 'directory') {
73
+ return { action: 'recurse' };
74
+ }
75
+ return entry.kind === 'file'
76
+ ? { action: 'collect' }
77
+ : { action: 'skip', reason: 'unsupported-entry' };
78
+ };
79
+
80
+ interface SubmodulePathSnapshot {
81
+ readonly paths: ReadonlySet<string>;
82
+ readonly readable: boolean;
83
+ }
84
+
85
+ const readSubmodulePaths = (root: string): SubmodulePathSnapshot => {
86
+ const gitmodulesPath = join(root, '.gitmodules');
87
+ let metadataStats: ReturnType<typeof lstatSync>;
88
+ try {
89
+ metadataStats = lstatSync(gitmodulesPath);
90
+ } catch (error) {
91
+ return (error as NodeJS.ErrnoException).code === 'ENOENT'
92
+ ? { paths: new Set(), readable: true }
93
+ : { paths: new Set(), readable: false };
94
+ }
95
+ if (!metadataStats.isFile()) {
96
+ return { paths: new Set(), readable: false };
97
+ }
98
+
99
+ let source: string;
100
+ try {
101
+ source = readFileSync(gitmodulesPath, 'utf8');
102
+ } catch {
103
+ return { paths: new Set(), readable: false };
104
+ }
105
+ const parsed = spawnSync(
106
+ 'git',
107
+ ['config', '--file', '-', '--null', '--get-regexp', '^submodule\\.'],
108
+ { encoding: 'utf8', input: source }
109
+ );
110
+ if (parsed.status === 1) {
111
+ const hasOnlyComments = source
112
+ .split(/\r?\n/)
113
+ .every((line) => !line.trim() || /^[#;]/.test(line.trim()));
114
+ return {
115
+ paths: new Set(),
116
+ readable: hasOnlyComments,
117
+ };
118
+ }
119
+ if (parsed.status !== 0) {
120
+ return { paths: new Set(), readable: false };
121
+ }
122
+
123
+ const paths = new Set<string>();
124
+ const owners = new Set<string>();
125
+ const ownersWithPaths = new Set<string>();
126
+ const authoredSubmodules = new Set(
127
+ [
128
+ ...source.matchAll(
129
+ /^\s*\[\s*submodule(?:\s+"((?:[^"\\]|\\.)*)"|\.([^\]]+?))\s*\]/gim
130
+ ),
131
+ ].map((match) => match[1] ?? match[2]?.trim())
132
+ );
133
+ for (const record of parsed.stdout.split('\0').filter(Boolean)) {
134
+ const separator = record.indexOf('\n');
135
+ if (separator === -1) {
136
+ return { paths: new Set(), readable: false };
137
+ }
138
+ const key = record.slice(0, separator);
139
+ const fieldSeparator = key.lastIndexOf('.');
140
+ if (fieldSeparator <= 'submodule.'.length) {
141
+ return { paths: new Set(), readable: false };
142
+ }
143
+ const owner = key.slice('submodule.'.length, fieldSeparator);
144
+ owners.add(owner);
145
+ if (key.slice(fieldSeparator + 1).toLowerCase() !== 'path') {
146
+ continue;
147
+ }
148
+ const value = record.slice(separator + 1);
149
+ if (!value) {
150
+ return { paths: new Set(), readable: false };
151
+ }
152
+ ownersWithPaths.add(owner);
153
+ paths.add(posix.normalize(value.replaceAll('\\', '/')).replace(/\/+$/, ''));
154
+ }
155
+ return owners.size === ownersWithPaths.size &&
156
+ authoredSubmodules.size === ownersWithPaths.size
157
+ ? { paths, readable: true }
158
+ : { paths: new Set(), readable: false };
159
+ };
160
+
161
+ const boundaryReason = (
162
+ absoluteDirectory: string,
163
+ path: string,
164
+ submodules: SubmodulePathSnapshot
165
+ ): SourceCollectionBoundaryReason | 'unreadable-git-boundary' | undefined => {
166
+ if (!submodules.readable) {
167
+ return 'unreadable-git-boundary';
168
+ }
169
+ if (submodules.paths.has(path)) {
170
+ return 'submodule-boundary';
171
+ }
172
+
173
+ const marker = join(absoluteDirectory, '.git');
174
+ let markerStats: ReturnType<typeof lstatSync>;
175
+ try {
176
+ markerStats = lstatSync(marker);
177
+ } catch (error) {
178
+ return (error as NodeJS.ErrnoException).code === 'ENOENT'
179
+ ? undefined
180
+ : 'unreadable-git-boundary';
181
+ }
182
+
183
+ try {
184
+ if (markerStats.isDirectory()) {
185
+ return statSync(join(marker, 'HEAD')).isFile() &&
186
+ statSync(join(marker, 'objects')).isDirectory()
187
+ ? 'nested-repository'
188
+ : 'unreadable-git-boundary';
189
+ }
190
+ if (!markerStats.isFile()) {
191
+ return 'unreadable-git-boundary';
192
+ }
193
+
194
+ const pointer = readFileSync(marker, 'utf8').match(/^gitdir:\s*(.+?)\s*$/);
195
+ const gitDirectory = pointer?.[1];
196
+ if (!gitDirectory) {
197
+ return 'unreadable-git-boundary';
198
+ }
199
+ const resolvedGitDirectory = resolve(absoluteDirectory, gitDirectory);
200
+ return statSync(resolvedGitDirectory).isDirectory() &&
201
+ statSync(join(resolvedGitDirectory, 'HEAD')).isFile()
202
+ ? 'nested-worktree'
203
+ : 'unreadable-git-boundary';
204
+ } catch {
205
+ return 'unreadable-git-boundary';
206
+ }
207
+ };
208
+
209
+ const comparePath = (
210
+ left: { readonly path: string },
211
+ right: {
212
+ readonly path: string;
213
+ }
214
+ ): number => {
215
+ if (left.path < right.path) {
216
+ return -1;
217
+ }
218
+ return left.path > right.path ? 1 : 0;
219
+ };
220
+
221
+ /**
222
+ * Collect files from exactly one working tree, pruning nested Git observations.
223
+ *
224
+ * Git boundaries take precedence over consumer policy so a tool cannot scan a
225
+ * nested checkout and hide that fact behind an authored exclude. The supplied
226
+ * root remains first-class: only directories encountered beneath it are
227
+ * classified as boundaries.
228
+ *
229
+ * @example
230
+ * ```ts
231
+ * const result = collectSourceTree(process.cwd(), {
232
+ * classify: (entry) =>
233
+ * entry.kind === 'file' && entry.path.endsWith('.ts')
234
+ * ? { action: 'collect' }
235
+ * : entry.kind === 'directory'
236
+ * ? { action: 'recurse' }
237
+ * : { action: 'skip', reason: 'unsupported-extension' },
238
+ * });
239
+ * ```
240
+ */
241
+ export const collectSourceTree = (
242
+ root: string,
243
+ options: CollectSourceTreeOptions = {}
244
+ ): SourceTreeCollection | null => {
245
+ const absoluteRoot = resolve(root);
246
+ let rootEntries: readonly Dirent<string>[];
247
+ try {
248
+ rootEntries = readdirSync(absoluteRoot, { withFileTypes: true });
249
+ } catch {
250
+ return null;
251
+ }
252
+
253
+ const classify = options.classify ?? defaultDecision;
254
+ const submodules = readSubmodulePaths(absoluteRoot);
255
+ const files: CollectedSourceFile[] = [];
256
+ const skipped: SkippedSourceEntry[] = submodules.readable
257
+ ? []
258
+ : [{ path: '.gitmodules', reason: 'unreadable-git-metadata' }];
259
+ const queue: {
260
+ readonly absolutePath: string;
261
+ readonly entries?: readonly Dirent<string>[];
262
+ }[] = [{ absolutePath: absoluteRoot, entries: rootEntries }];
263
+
264
+ while (queue.length > 0) {
265
+ const current = queue.shift() as (typeof queue)[number];
266
+ let { entries } = current;
267
+ if (!entries) {
268
+ try {
269
+ entries = readdirSync(current.absolutePath, { withFileTypes: true });
270
+ } catch {
271
+ skipped.push({
272
+ path: toPosixRelative(absoluteRoot, current.absolutePath),
273
+ reason: 'unreadable-directory',
274
+ });
275
+ continue;
276
+ }
277
+ }
278
+
279
+ for (const entry of entries) {
280
+ const absolutePath = join(current.absolutePath, entry.name);
281
+ const path = toPosixRelative(absoluteRoot, absolutePath);
282
+ const kind = entryKind(entry);
283
+ if (path === '.gitmodules' && !submodules.readable) {
284
+ continue;
285
+ }
286
+ if (kind === 'directory') {
287
+ const reason = boundaryReason(absolutePath, path, submodules);
288
+ if (reason) {
289
+ skipped.push({ path, reason });
290
+ continue;
291
+ }
292
+ }
293
+ if (entry.name === '.git') {
294
+ skipped.push({ path, reason: 'ignored-directory' });
295
+ continue;
296
+ }
297
+
298
+ const decision = classify({ kind, name: entry.name, path });
299
+ if (decision.action === 'collect') {
300
+ files.push({ absolutePath, path });
301
+ } else if (decision.action === 'recurse') {
302
+ queue.push({ absolutePath });
303
+ } else {
304
+ skipped.push({ path, reason: decision.reason });
305
+ }
306
+ }
307
+ }
308
+
309
+ files.sort(comparePath);
310
+ skipped.sort(comparePath);
311
+ return { files, root: absoluteRoot, skipped };
312
+ };
package/src/index.ts CHANGED
@@ -5,6 +5,7 @@ export * from './scopes.js';
5
5
  export * from './locations.js';
6
6
  export * from './edits.js';
7
7
  export * from './literals.js';
8
+ export * from './collection.js';
8
9
  export type {
9
10
  EntityDefinition,
10
11
  FindEntityDefinitionsOptions,