@mnemonik/shared 7.141.3 → 7.143.0
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/ast/grammars.d.ts +1 -1
- package/dist/ast/grammars.d.ts.map +1 -1
- package/dist/ast/grammars.js +10 -1
- package/dist/ast/grammars.js.map +1 -1
- package/dist/codeScanner.d.ts +3 -0
- package/dist/codeScanner.d.ts.map +1 -1
- package/dist/codeScanner.js +5 -0
- package/dist/codeScanner.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/redactCredentials.d.ts +5 -0
- package/dist/redactCredentials.d.ts.map +1 -1
- package/dist/redactCredentials.js +22 -0
- package/dist/redactCredentials.js.map +1 -1
- package/dist/sourceRedaction.d.ts.map +1 -1
- package/dist/sourceRedaction.js +467 -3
- package/dist/sourceRedaction.js.map +1 -1
- package/package.json +1 -1
- package/queries/sql.tags.scm +5 -0
- package/queries/swift.tags.scm +11 -0
- package/scripts/jsx-bare-ampersand.patch +61 -0
- package/scripts/vendor-grammars.ts +274 -8
- package/src/ast/grammars.ts +10 -1
- package/src/codeScanner.ts +6 -0
- package/src/index.ts +2 -0
- package/src/redactCredentials.ts +23 -0
- package/src/sourceRedaction.ts +503 -3
- package/wasm/javascript.wasm +0 -0
- package/wasm/lua.LICENSE +21 -0
- package/wasm/lua.tags.scm +36 -0
- package/wasm/lua.wasm +0 -0
- package/wasm/sql.LICENSE +21 -0
- package/wasm/sql.tags.scm +5 -0
- package/wasm/sql.wasm +0 -0
- package/wasm/swift.LICENSE +21 -0
- package/wasm/swift.tags.scm +11 -0
- package/wasm/swift.wasm +0 -0
- package/wasm/tsx.wasm +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceRedaction.js","sourceRoot":"","sources":["../src/sourceRedaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sourceRedaction.js","sourceRoot":"","sources":["../src/sourceRedaction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
; Capture whole declarations and their qualified names; references are not declarations.
|
|
2
|
+
(create_table (object_reference) @name) @definition.table
|
|
3
|
+
(create_view (object_reference) @name) @definition.view
|
|
4
|
+
(create_materialized_view (object_reference) @name) @definition.view
|
|
5
|
+
(create_function (object_reference) @name) @definition.function
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
; Upstream 0.7.3 tags capture the enclosing class as a method definition.
|
|
2
|
+
; Capture each declaration itself so chunks retain its exact line range.
|
|
3
|
+
(class_declaration name: (type_identifier) @name) @definition.class
|
|
4
|
+
(protocol_declaration name: (type_identifier) @name) @definition.interface
|
|
5
|
+
(source_file (function_declaration name: (simple_identifier) @name) @definition.function)
|
|
6
|
+
(class_body (function_declaration name: (simple_identifier) @name) @definition.method)
|
|
7
|
+
(enum_class_body (function_declaration name: (simple_identifier) @name) @definition.method)
|
|
8
|
+
(protocol_body (protocol_function_declaration name: (simple_identifier) @name) @definition.method)
|
|
9
|
+
(init_declaration "init" @name) @definition.method
|
|
10
|
+
(deinit_declaration "deinit" @name) @definition.method
|
|
11
|
+
(typealias_declaration name: (type_identifier) @name) @definition.type
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
From f8637eb92272dd9c2c69ebc62e5f72c016e0b6b7
|
|
2
|
+
Subject: Accept bare ampersands in JSX text while retaining entity tokens
|
|
3
|
+
Source: https://github.com/tree-sitter/tree-sitter-typescript/pull/371
|
|
4
|
+
License: MIT (upstream tree-sitter-typescript)
|
|
5
|
+
|
|
6
|
+
--- common/scanner.h
|
|
7
|
+
+++ common/scanner.h
|
|
8
|
+
@@ -276,1 +276,30 @@
|
|
9
|
+
+// After an `&`: is what follows the rest of an HTML character reference
|
|
10
|
+
+// (`&`, `&`, `&`), as the grammar's html_character_reference
|
|
11
|
+
+// token defines it? Consumes the name or number either way.
|
|
12
|
+
+static bool scan_character_reference_tail(TSLexer *lexer) {
|
|
13
|
+
+ unsigned length = 0;
|
|
14
|
+
+ if (lexer->lookahead == '#') {
|
|
15
|
+
+ advance(lexer);
|
|
16
|
+
+ if (lexer->lookahead == 'x' || lexer->lookahead == 'X') {
|
|
17
|
+
+ advance(lexer);
|
|
18
|
+
+ while (length < 6 && iswxdigit(lexer->lookahead)) {
|
|
19
|
+
+ advance(lexer);
|
|
20
|
+
+ length++;
|
|
21
|
+
+ }
|
|
22
|
+
+ } else {
|
|
23
|
+
+ while (length < 5 && iswdigit(lexer->lookahead)) {
|
|
24
|
+
+ advance(lexer);
|
|
25
|
+
+ length++;
|
|
26
|
+
+ }
|
|
27
|
+
+ }
|
|
28
|
+
+ } else {
|
|
29
|
+
+ while (length < 30 && ((lexer->lookahead >= 'a' && lexer->lookahead <= 'z') ||
|
|
30
|
+
+ (lexer->lookahead >= 'A' && lexer->lookahead <= 'Z'))) {
|
|
31
|
+
+ advance(lexer);
|
|
32
|
+
+ length++;
|
|
33
|
+
+ }
|
|
34
|
+
+ }
|
|
35
|
+
+ return length > 0 && lexer->lookahead == ';';
|
|
36
|
+
+}
|
|
37
|
+
+
|
|
38
|
+
static bool scan_jsx_text(TSLexer *lexer) {
|
|
39
|
+
@@ -284,3 +313,17 @@
|
|
40
|
+
+ lexer->result_symbol = JSX_TEXT;
|
|
41
|
+
+
|
|
42
|
+
while (lexer->lookahead != 0 && lexer->lookahead != '<' && lexer->lookahead != '>' && lexer->lookahead != '{' &&
|
|
43
|
+
- lexer->lookahead != '}' && lexer->lookahead != '&') {
|
|
44
|
+
+ lexer->lookahead != '}') {
|
|
45
|
+
+ if (lexer->lookahead == '&') {
|
|
46
|
+
+ // A character reference is its own token: the text ends before it.
|
|
47
|
+
+ // A bare ampersand (`Shipping & Handling`) is text.
|
|
48
|
+
+ lexer->mark_end(lexer);
|
|
49
|
+
+ advance(lexer);
|
|
50
|
+
+ if (scan_character_reference_tail(lexer)) {
|
|
51
|
+
+ return saw_text;
|
|
52
|
+
+ }
|
|
53
|
+
+ saw_text = true;
|
|
54
|
+
+ at_newline = false;
|
|
55
|
+
+ continue;
|
|
56
|
+
+ }
|
|
57
|
+
bool is_wspace = iswspace(lexer->lookahead);
|
|
58
|
+
@@ -313,2 +356,2 @@
|
|
59
|
+
- lexer->result_symbol = JSX_TEXT;
|
|
60
|
+
+ lexer->mark_end(lexer);
|
|
61
|
+
return saw_text;
|
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
* nothing at runtime - which is the whole reason this plan chose WebAssembly
|
|
18
18
|
* over the native bindings.
|
|
19
19
|
*
|
|
20
|
-
* Run: npx tsx packages/shared/scripts/vendor-grammars.ts [--check]
|
|
20
|
+
* Run: npx tsx packages/shared/scripts/vendor-grammars.ts [--check | --only=<id>]
|
|
21
|
+
* JSX repair: run --only=javascript and --only=tsx; other assets stay untouched.
|
|
21
22
|
* --check verify every manifest entry is present and non-empty; write nothing.
|
|
22
23
|
* This is what CI should run to catch a grammar that silently stopped
|
|
23
24
|
* shipping an artifact.
|
|
@@ -25,6 +26,7 @@
|
|
|
25
26
|
|
|
26
27
|
import { execFileSync } from 'node:child_process';
|
|
27
28
|
import {
|
|
29
|
+
chmodSync,
|
|
28
30
|
copyFileSync,
|
|
29
31
|
existsSync,
|
|
30
32
|
mkdirSync,
|
|
@@ -42,13 +44,13 @@ import { Language, Parser, Query } from 'web-tree-sitter';
|
|
|
42
44
|
import { AST_LANGUAGE_IDS, QUERY_CHAIN, grammarArtifactBasename } from '../src/ast/grammars.js';
|
|
43
45
|
|
|
44
46
|
const WASM_DIR = fileURLToPath(new URL('../wasm/', import.meta.url));
|
|
45
|
-
/**
|
|
47
|
+
/** Local queries for missing or unsuitable upstream declaration captures. */
|
|
46
48
|
const OURS_DIR = fileURLToPath(new URL('../queries/', import.meta.url));
|
|
47
49
|
|
|
48
50
|
interface GrammarSpec {
|
|
49
51
|
/** Vendored artifact basename, and the id the registry keys on. */
|
|
50
52
|
id: string;
|
|
51
|
-
/** npm package to fetch. */
|
|
53
|
+
/** npm package or pinned source archive to fetch with npm pack. */
|
|
52
54
|
pkg: string;
|
|
53
55
|
/**
|
|
54
56
|
* `.wasm` basename inside the tarball when it differs from the package's own
|
|
@@ -59,7 +61,7 @@ interface GrammarSpec {
|
|
|
59
61
|
/**
|
|
60
62
|
* Where the tag query comes from. 'upstream' copies queries/tags.scm out of
|
|
61
63
|
* the tarball; 'ours' copies packages/shared/queries/<id>.tags.scm, which we
|
|
62
|
-
* maintain
|
|
64
|
+
* maintain when the upstream query is absent or captures unsuitable ranges.
|
|
63
65
|
*/
|
|
64
66
|
tags: 'upstream' | 'ours' | 'inherited';
|
|
65
67
|
}
|
|
@@ -80,7 +82,7 @@ interface GrammarSpec {
|
|
|
80
82
|
* predates the current wasm ABI. Presence is not loadability, which is why
|
|
81
83
|
* --check verifies both. Flutter matters, so this is worth revisiting by
|
|
82
84
|
* compiling from source with tree-sitter-cli.
|
|
83
|
-
* kotlin,
|
|
85
|
+
* kotlin, perl, zig - bundle no .wasm, so they need a build step
|
|
84
86
|
* with tree-sitter-cli. Deferred until the grammars above are proven; they
|
|
85
87
|
* keep the heuristic chunker meanwhile.
|
|
86
88
|
* markdown - keeps chunkMarkdown. Headers already are a document's semantic
|
|
@@ -99,7 +101,7 @@ const GRAMMARS: GrammarSpec[] = [
|
|
|
99
101
|
wasmFile: 'tree-sitter-tsx.wasm',
|
|
100
102
|
tags: 'inherited',
|
|
101
103
|
},
|
|
102
|
-
{ id: 'javascript', pkg: 'tree-sitter-javascript', tags: 'upstream' },
|
|
104
|
+
{ id: 'javascript', pkg: 'tree-sitter-javascript@0.25.0', tags: 'upstream' },
|
|
103
105
|
{ id: 'python', pkg: 'tree-sitter-python', tags: 'upstream' },
|
|
104
106
|
{ id: 'go', pkg: 'tree-sitter-go', tags: 'upstream' },
|
|
105
107
|
{ id: 'java', pkg: 'tree-sitter-java', tags: 'upstream' },
|
|
@@ -118,8 +120,29 @@ const GRAMMARS: GrammarSpec[] = [
|
|
|
118
120
|
{ id: 'elixir', pkg: 'tree-sitter-elixir', tags: 'upstream' },
|
|
119
121
|
{ id: 'solidity', pkg: 'tree-sitter-solidity', tags: 'upstream' },
|
|
120
122
|
{ id: 'bash', pkg: 'tree-sitter-bash', tags: 'ours' },
|
|
123
|
+
{
|
|
124
|
+
// Upstream MIT 0.4.1, gitHead 816840c592ab973500ae9750763c707b447e7fef; shipped ABI-15 WASM.
|
|
125
|
+
id: 'lua',
|
|
126
|
+
pkg: '@tree-sitter-grammars/tree-sitter-lua@0.4.1',
|
|
127
|
+
wasmFile: 'tree-sitter-lua.wasm',
|
|
128
|
+
tags: 'upstream',
|
|
129
|
+
},
|
|
121
130
|
{ id: 'groovy', pkg: 'tree-sitter-groovy', tags: 'ours' },
|
|
122
131
|
{ id: 'powershell', pkg: 'tree-sitter-powershell', tags: 'ours' },
|
|
132
|
+
{
|
|
133
|
+
id: 'swift',
|
|
134
|
+
// Upstream 0.7.3, MIT. Pin source, not an opaque workflow WASM.
|
|
135
|
+
pkg: 'https://codeload.github.com/alex-pinkus/tree-sitter-swift/tar.gz/b8b22bffbb3441780e6471665bacfb263741c86a',
|
|
136
|
+
wasmFile: 'tree-sitter-swift.wasm',
|
|
137
|
+
tags: 'ours',
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
id: 'sql',
|
|
141
|
+
// @derekstride/tree-sitter-sql 0.3.11 gitHead, MIT; source includes the external scanner.
|
|
142
|
+
pkg: 'https://codeload.github.com/derekstride/tree-sitter-sql/tar.gz/7b51ecda191d36b92f5a90a8d1bc3faef1c7b8b8',
|
|
143
|
+
wasmFile: 'tree-sitter-sql.wasm',
|
|
144
|
+
tags: 'ours',
|
|
145
|
+
},
|
|
123
146
|
];
|
|
124
147
|
|
|
125
148
|
/**
|
|
@@ -229,7 +252,7 @@ async function checkOnly(): Promise<Problem[]> {
|
|
|
229
252
|
* Source: https://github.com/tree-sitter/tree-sitter-typescript/tree/v0.23.2
|
|
230
253
|
* MIT; CLI 0.24.4 uses emscripten/emsdk:3.1.64 for the WASM build.
|
|
231
254
|
*/
|
|
232
|
-
function rebuildTypescript(dir: string, work: string): void {
|
|
255
|
+
function rebuildTypescript(dir: string, work: string, only?: string): void {
|
|
233
256
|
const grammarPath = join(dir, 'common', 'define-grammar.js');
|
|
234
257
|
let grammar = readFileSync(grammarPath, 'utf8');
|
|
235
258
|
for (const [before, after] of [
|
|
@@ -260,6 +283,12 @@ function rebuildTypescript(dir: string, work: string): void {
|
|
|
260
283
|
]);
|
|
261
284
|
const cli = join(tools, 'node_modules', '.bin', 'tree-sitter');
|
|
262
285
|
for (const dialect of ['typescript', 'tsx']) {
|
|
286
|
+
if (only && only !== dialect) continue;
|
|
287
|
+
// TypeScript has no JSX; keep its existing WASM bytes unchanged.
|
|
288
|
+
if (dialect === 'tsx') {
|
|
289
|
+
patchJsxScanner(join(dir, 'common', 'scanner.h'));
|
|
290
|
+
patchJsxAttributes(join(tools, 'node_modules', 'tree-sitter-javascript', 'grammar.js'));
|
|
291
|
+
}
|
|
263
292
|
const options = {
|
|
264
293
|
cwd: join(dir, dialect),
|
|
265
294
|
env: { ...process.env, NODE_PATH: join(tools, 'node_modules') },
|
|
@@ -273,7 +302,235 @@ function rebuildTypescript(dir: string, work: string): void {
|
|
|
273
302
|
}
|
|
274
303
|
}
|
|
275
304
|
|
|
305
|
+
/** Upstream f8637eb: preserve entity boundaries while accepting bare JSX ampersands. */
|
|
306
|
+
function patchJsxScanner(scannerPath: string): void {
|
|
307
|
+
execFileSync('patch', ['--batch', scannerPath], {
|
|
308
|
+
input: readFileSync(new URL('./jsx-bare-ampersand.patch', import.meta.url)),
|
|
309
|
+
});
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
/** Bare attribute ampersands are fragments; complete entity tokens retain precedence. */
|
|
313
|
+
function patchJsxAttributes(grammarPath: string): void {
|
|
314
|
+
let grammar = readFileSync(grammarPath, 'utf8');
|
|
315
|
+
for (const [before, after] of [
|
|
316
|
+
[
|
|
317
|
+
'alias($.unescaped_double_jsx_string_fragment, $.string_fragment),',
|
|
318
|
+
"alias($.unescaped_double_jsx_string_fragment, $.string_fragment),\n alias(token.immediate(prec(-1, '&')), $.string_fragment),",
|
|
319
|
+
],
|
|
320
|
+
[
|
|
321
|
+
'alias($.unescaped_single_jsx_string_fragment, $.string_fragment),',
|
|
322
|
+
"alias($.unescaped_single_jsx_string_fragment, $.string_fragment),\n alias(token.immediate(prec(-1, '&')), $.string_fragment),",
|
|
323
|
+
],
|
|
324
|
+
['/([^"&]|&[^#A-Za-z])+/', '/[^"&]+/'],
|
|
325
|
+
["/([^'&]|&[^#A-Za-z])+/", "/[^'&]+/"],
|
|
326
|
+
] as const) {
|
|
327
|
+
if (!grammar.includes(before)) throw new Error('JSX attribute patch no longer applies');
|
|
328
|
+
grammar = grammar.replace(before, after);
|
|
329
|
+
}
|
|
330
|
+
writeFileSync(grammarPath, grammar);
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
/** 0.25.0's reserved-word DSL needs generator 0.25.8; keep the existing WASM build tool. */
|
|
334
|
+
function rebuildJavascript(dir: string, work: string): void {
|
|
335
|
+
patchJsxScanner(join(dir, 'src', 'scanner.c'));
|
|
336
|
+
patchJsxAttributes(join(dir, 'grammar.js'));
|
|
337
|
+
const generator = join(work, 'javascript-generator');
|
|
338
|
+
execFileSync('npm', [
|
|
339
|
+
'install',
|
|
340
|
+
'--prefix',
|
|
341
|
+
generator,
|
|
342
|
+
'--no-audit',
|
|
343
|
+
'--no-fund',
|
|
344
|
+
'--no-package-lock',
|
|
345
|
+
'tree-sitter-cli@0.25.8',
|
|
346
|
+
]);
|
|
347
|
+
execFileSync(join(generator, 'node_modules', '.bin', 'tree-sitter'), ['generate'], { cwd: dir });
|
|
348
|
+
const tools = join(work, 'javascript-build');
|
|
349
|
+
execFileSync('npm', [
|
|
350
|
+
'install',
|
|
351
|
+
'--prefix',
|
|
352
|
+
tools,
|
|
353
|
+
'--no-audit',
|
|
354
|
+
'--no-fund',
|
|
355
|
+
'--no-package-lock',
|
|
356
|
+
'tree-sitter-cli@0.24.4',
|
|
357
|
+
]);
|
|
358
|
+
// CLI 0.24.4 pins emscripten/emsdk:3.1.64 for --docker.
|
|
359
|
+
execFileSync(
|
|
360
|
+
join(tools, 'node_modules', '.bin', 'tree-sitter'),
|
|
361
|
+
['build', '--wasm', '--docker', '--output', join(dir, 'tree-sitter-javascript.wasm')],
|
|
362
|
+
{ cwd: dir }
|
|
363
|
+
);
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
/** Same CLI/emsdk as the repaired TS grammars; no native binding or grammar dependency. */
|
|
367
|
+
function rebuildSwift(dir: string, work: string): void {
|
|
368
|
+
// A double optional marker must be adjacent to its type. The external ?? token
|
|
369
|
+
// skips whitespace, swallowing `as? Int ?? 0` into optional_type and rejecting 0.
|
|
370
|
+
const grammarPath = join(dir, 'grammar.js');
|
|
371
|
+
const grammar = readFileSync(grammarPath, 'utf8');
|
|
372
|
+
const before = ' alias($._nil_coalescing_operator, "??")';
|
|
373
|
+
if (!grammar.includes(before)) throw new Error('Swift optional-marker patch no longer applies');
|
|
374
|
+
writeFileSync(grammarPath, grammar.replace(before, ' token.immediate("??")'));
|
|
375
|
+
const scannerPath = join(dir, 'src', 'scanner.c');
|
|
376
|
+
const scanner = readFileSync(scannerPath, 'utf8');
|
|
377
|
+
const continuation =
|
|
378
|
+
' // Let\'s consume operators that can live after a "semicolon" style newline.';
|
|
379
|
+
if (!scanner.includes(continuation))
|
|
380
|
+
throw new Error('Swift multiplication patch no longer applies');
|
|
381
|
+
writeFileSync(
|
|
382
|
+
scannerPath,
|
|
383
|
+
scanner.replace(
|
|
384
|
+
continuation,
|
|
385
|
+
` // A whitespace-delimited multiplication operator continues the preceding expression.
|
|
386
|
+
// Keep mark_end before '*' so a non-binary spelling can still emit the newline.
|
|
387
|
+
if (ws_directive == CONTINUE_PARSING_TOKEN_FOUND && lookahead == '*') {
|
|
388
|
+
lexer->advance(lexer, false);
|
|
389
|
+
if (iswspace(lexer->lookahead)) return STOP_PARSING_NOTHING_FOUND;
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
${continuation}`
|
|
393
|
+
)
|
|
394
|
+
);
|
|
395
|
+
const tools = join(work, 'swift-build');
|
|
396
|
+
execFileSync('npm', [
|
|
397
|
+
'install',
|
|
398
|
+
'--prefix',
|
|
399
|
+
tools,
|
|
400
|
+
'--no-audit',
|
|
401
|
+
'--no-fund',
|
|
402
|
+
'--no-package-lock',
|
|
403
|
+
'tree-sitter-cli@0.24.4',
|
|
404
|
+
]);
|
|
405
|
+
const cli = join(tools, 'node_modules', '.bin', 'tree-sitter');
|
|
406
|
+
execFileSync(cli, ['generate'], { cwd: dir });
|
|
407
|
+
// CLI 0.24.4 pins emscripten/emsdk:3.1.64 for --docker.
|
|
408
|
+
execFileSync(
|
|
409
|
+
cli,
|
|
410
|
+
['build', '--wasm', '--docker', '--output', join(dir, 'tree-sitter-swift.wasm')],
|
|
411
|
+
{ cwd: dir }
|
|
412
|
+
);
|
|
413
|
+
copyFileSync(join(dir, 'LICENSE'), join(WASM_DIR, 'swift.LICENSE'));
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
/** Upstream package.json pins CLI 0.24.7. SQL function bodies only, not general PL/pgSQL. */
|
|
417
|
+
function rebuildSql(dir: string, work: string): void {
|
|
418
|
+
const grammarPath = join(dir, 'grammar.js');
|
|
419
|
+
let grammar = readFileSync(grammarPath, 'utf8');
|
|
420
|
+
const patch = (before: string, after: string): void => {
|
|
421
|
+
if (!grammar.includes(before)) throw new Error(`SQL patch no longer applies: ${before}`);
|
|
422
|
+
grammar = grammar.replace(before, after);
|
|
423
|
+
};
|
|
424
|
+
// Bounded repairs demonstrated by migrations 289/279/283 and the escaped-name regression.
|
|
425
|
+
const constraint = ` _constraint_literal: $ => seq(
|
|
426
|
+
$.keyword_constraint,
|
|
427
|
+
field('name', $.identifier),
|
|
428
|
+
choice(`;
|
|
429
|
+
patch(constraint, constraint + '\n $._key_constraint,');
|
|
430
|
+
patch('_double_quote_string: _ => /"[^"]*"/', '_double_quote_string: _ => /"([^"]|"")*"/');
|
|
431
|
+
patch(
|
|
432
|
+
'wrapped_in_parenthesis($.binary_expression)\n ),\n\n _default_expression',
|
|
433
|
+
'wrapped_in_parenthesis($._expression)\n ),\n\n _default_expression'
|
|
434
|
+
);
|
|
435
|
+
patch(
|
|
436
|
+
'field("custom_type", $.object_reference)',
|
|
437
|
+
'seq(field("custom_type", $.object_reference), optional(wrapped_in_parenthesis($._natural_number)))'
|
|
438
|
+
);
|
|
439
|
+
patch(
|
|
440
|
+
` $.keyword_conflict,
|
|
441
|
+
seq(`,
|
|
442
|
+
` $.keyword_conflict,
|
|
443
|
+
optional($._column_list),
|
|
444
|
+
seq(`
|
|
445
|
+
);
|
|
446
|
+
patch(
|
|
447
|
+
` $.keyword_brin
|
|
448
|
+
),`,
|
|
449
|
+
` $.keyword_brin,
|
|
450
|
+
$.identifier
|
|
451
|
+
),`
|
|
452
|
+
);
|
|
453
|
+
patch(
|
|
454
|
+
` $.index_fields
|
|
455
|
+
),`,
|
|
456
|
+
` $.index_fields
|
|
457
|
+
),
|
|
458
|
+
optional($.storage_parameters),`
|
|
459
|
+
);
|
|
460
|
+
patch(
|
|
461
|
+
` $.drop_function,
|
|
462
|
+
),`,
|
|
463
|
+
` $.drop_function,
|
|
464
|
+
$.drop_trigger,
|
|
465
|
+
),`
|
|
466
|
+
);
|
|
467
|
+
patch(
|
|
468
|
+
' drop_table: $ => seq(',
|
|
469
|
+
` drop_trigger: $ => seq(
|
|
470
|
+
$.keyword_drop, $.keyword_trigger, optional($._if_exists),
|
|
471
|
+
$.identifier, $.keyword_on, $.object_reference, optional($._drop_behavior),
|
|
472
|
+
),
|
|
473
|
+
|
|
474
|
+
drop_table: $ => seq(`
|
|
475
|
+
);
|
|
476
|
+
// Dollar-quoted procedural code is one literal, never a parsed SQL statement list.
|
|
477
|
+
patch(' $.reset_statement,', ' $.reset_statement,\n $.do_statement,');
|
|
478
|
+
patch(
|
|
479
|
+
' _cte: $ => seq(',
|
|
480
|
+
` do_statement: $ => seq($.keyword_do, alias($._dollar_quoted_string, $.literal)),
|
|
481
|
+
|
|
482
|
+
_cte: $ => seq(`
|
|
483
|
+
);
|
|
484
|
+
patch(' conflicts: $ => [', ' conflicts: $ => [\n [$.create_function],');
|
|
485
|
+
const functionStart = grammar.indexOf(' create_function: $ => seq(');
|
|
486
|
+
const functionEnd = grammar.indexOf(' _function_return:', functionStart);
|
|
487
|
+
if (functionStart < 0 || functionEnd < 0) throw new Error('SQL function patch no longer applies');
|
|
488
|
+
const original = grammar.slice(functionStart, functionEnd).trimEnd();
|
|
489
|
+
const languageOption = ' $.function_language,\n';
|
|
490
|
+
const optionsStart = original.indexOf(' repeat(');
|
|
491
|
+
const optionsEnd = original.indexOf(' // ensure');
|
|
492
|
+
const options = original.slice(optionsStart, optionsEnd).replace(languageOption, '');
|
|
493
|
+
// A dedicated keyword selects the opaque branch; ordinary LANGUAGE SQL keeps its AST.
|
|
494
|
+
const procedural =
|
|
495
|
+
original.slice(0, optionsStart) +
|
|
496
|
+
options +
|
|
497
|
+
` alias(seq($.keyword_language, alias(make_keyword("plpgsql"), $.identifier)), $.function_language),\n` +
|
|
498
|
+
options +
|
|
499
|
+
` alias(seq($.keyword_as, alias(choice($._dollar_quoted_string, $._single_quote_string, $._double_quote_string), $.literal)), $.function_body),\n` +
|
|
500
|
+
options +
|
|
501
|
+
' )';
|
|
502
|
+
patch(
|
|
503
|
+
original,
|
|
504
|
+
procedural.replace('create_function: $ => seq(', 'create_function: $ => choice(prec(1, seq(') +
|
|
505
|
+
'),\n' +
|
|
506
|
+
original.slice(original.indexOf('seq('), -1) +
|
|
507
|
+
'),'
|
|
508
|
+
);
|
|
509
|
+
writeFileSync(grammarPath, grammar);
|
|
510
|
+
const tools = join(work, 'sql-build');
|
|
511
|
+
execFileSync('npm', [
|
|
512
|
+
'install',
|
|
513
|
+
'--prefix',
|
|
514
|
+
tools,
|
|
515
|
+
'--no-audit',
|
|
516
|
+
'--no-fund',
|
|
517
|
+
'--no-package-lock',
|
|
518
|
+
'tree-sitter-cli@0.24.7',
|
|
519
|
+
]);
|
|
520
|
+
const cli = join(tools, 'node_modules', '.bin', 'tree-sitter');
|
|
521
|
+
execFileSync(cli, ['generate'], { cwd: dir });
|
|
522
|
+
execFileSync(
|
|
523
|
+
cli,
|
|
524
|
+
['build', '--wasm', '--docker', '--output', join(dir, 'tree-sitter-sql.wasm')],
|
|
525
|
+
{ cwd: dir }
|
|
526
|
+
);
|
|
527
|
+
copyFileSync(join(dir, 'LICENSE'), join(WASM_DIR, 'sql.LICENSE'));
|
|
528
|
+
}
|
|
529
|
+
|
|
276
530
|
function vendor(): Problem[] {
|
|
531
|
+
const only = process.argv.find((arg) => arg.startsWith('--only='))?.slice(7);
|
|
532
|
+
if (only && !GRAMMARS.some((spec) => spec.id === only))
|
|
533
|
+
throw new Error(`Unknown grammar: ${only}`);
|
|
277
534
|
mkdirSync(WASM_DIR, { recursive: true });
|
|
278
535
|
const work = mkdtempSync(join(tmpdir(), 'ts-grammars-'));
|
|
279
536
|
const problems: Problem[] = [];
|
|
@@ -283,6 +540,7 @@ function vendor(): Problem[] {
|
|
|
283
540
|
|
|
284
541
|
try {
|
|
285
542
|
for (const spec of GRAMMARS) {
|
|
543
|
+
if (only && spec.id !== only) continue;
|
|
286
544
|
let dir = extracted.get(spec.pkg);
|
|
287
545
|
if (!dir) {
|
|
288
546
|
try {
|
|
@@ -304,7 +562,10 @@ function vendor(): Problem[] {
|
|
|
304
562
|
dir,
|
|
305
563
|
'--strip-components=1',
|
|
306
564
|
]);
|
|
307
|
-
if (spec.id === 'typescript') rebuildTypescript(dir, work);
|
|
565
|
+
if (spec.id === 'typescript' || spec.id === 'tsx') rebuildTypescript(dir, work, only);
|
|
566
|
+
if (spec.id === 'javascript') rebuildJavascript(dir, work);
|
|
567
|
+
if (spec.id === 'swift') rebuildSwift(dir, work);
|
|
568
|
+
if (spec.id === 'sql') rebuildSql(dir, work);
|
|
308
569
|
extracted.set(spec.pkg, dir);
|
|
309
570
|
} catch (err) {
|
|
310
571
|
problems.push({
|
|
@@ -322,8 +583,13 @@ function vendor(): Problem[] {
|
|
|
322
583
|
problems.push({ id: spec.id, detail: `${spec.pkg} ships no ${wasmName}` });
|
|
323
584
|
} else {
|
|
324
585
|
copyFileSync(wasmSrc, join(WASM_DIR, `${spec.id}.wasm`));
|
|
586
|
+
if (spec.id === 'lua') copyFileSync(join(dir, 'LICENSE.md'), join(WASM_DIR, 'lua.LICENSE'));
|
|
587
|
+
if (spec.id === 'javascript' || spec.id === 'tsx')
|
|
588
|
+
chmodSync(join(WASM_DIR, `${spec.id}.wasm`), 0o644);
|
|
325
589
|
}
|
|
326
590
|
|
|
591
|
+
// A targeted JS scanner rebuild must retain our module-scope binding query additions.
|
|
592
|
+
if (only === 'javascript') continue;
|
|
327
593
|
if (spec.tags === 'upstream') {
|
|
328
594
|
const tagsSrc = join(dir, 'queries', 'tags.scm');
|
|
329
595
|
if (!existsSync(tagsSrc)) {
|
package/src/ast/grammars.ts
CHANGED
|
@@ -55,6 +55,9 @@ const AST_LANGUAGE_ID_LIST = [
|
|
|
55
55
|
'bash',
|
|
56
56
|
'groovy',
|
|
57
57
|
'powershell',
|
|
58
|
+
'swift',
|
|
59
|
+
'sql',
|
|
60
|
+
'lua',
|
|
58
61
|
] as const;
|
|
59
62
|
|
|
60
63
|
/** A language this build can AST-parse. Exactly the vendored set, no aspirations. */
|
|
@@ -123,6 +126,9 @@ export const QUERY_CHAIN: Readonly<Record<AstLanguageId, readonly AstLanguageId[
|
|
|
123
126
|
bash: ['bash'],
|
|
124
127
|
groovy: ['groovy'],
|
|
125
128
|
powershell: ['powershell'],
|
|
129
|
+
swift: ['swift'],
|
|
130
|
+
sql: ['sql'],
|
|
131
|
+
lua: ['lua'],
|
|
126
132
|
};
|
|
127
133
|
|
|
128
134
|
/**
|
|
@@ -144,7 +150,7 @@ const EXTENSION_GRAMMARS: Readonly<Record<string, AstLanguageId>> = {
|
|
|
144
150
|
*
|
|
145
151
|
* Absences are deliberate answers, not gaps. `markdown` is missing because
|
|
146
152
|
* headers already are a document's semantic unit and 10,483 production chunks
|
|
147
|
-
* depend on `chunkMarkdown` keeping them; `kotlin`, `
|
|
153
|
+
* depend on `chunkMarkdown` keeping them; `kotlin`, `dart` and friends
|
|
148
154
|
* are missing because no loadable grammar is vendored yet. Both resolve to
|
|
149
155
|
* `null` and the heuristic chunker takes over.
|
|
150
156
|
*/
|
|
@@ -166,6 +172,9 @@ const LANGUAGE_GRAMMARS: Readonly<Record<string, AstLanguageId>> = {
|
|
|
166
172
|
shell: 'bash',
|
|
167
173
|
groovy: 'groovy',
|
|
168
174
|
powershell: 'powershell',
|
|
175
|
+
swift: 'swift',
|
|
176
|
+
sql: 'sql',
|
|
177
|
+
lua: 'lua',
|
|
169
178
|
};
|
|
170
179
|
|
|
171
180
|
/** A loaded grammar plus its compiled query. Compiled once, reused per file. */
|
package/src/codeScanner.ts
CHANGED
|
@@ -563,6 +563,10 @@ export function languageForExtension(filePathOrExt: string): string {
|
|
|
563
563
|
const isMigrationSqlAuthorityPath = (posixRelPath: string): boolean =>
|
|
564
564
|
/^migrations\/.*\.sql$/.test(posixRelPath);
|
|
565
565
|
|
|
566
|
+
/** Content-only build authority, shared by scanner collection and server admission. */
|
|
567
|
+
export const XCODE_AUTHORITY_PATH = /(?:^|\/)[^/]+\.xcodeproj\/project\.pbxproj$|\.xcconfig$/;
|
|
568
|
+
export const isXcodeAuthorityPath = (path: string): boolean => XCODE_AUTHORITY_PATH.test(path);
|
|
569
|
+
|
|
566
570
|
/**
|
|
567
571
|
* Predicates for paths whose verbatim content is ALREADY shipped by
|
|
568
572
|
* `collectAuthorityFiles` and that carry no additional value as embedded code
|
|
@@ -582,6 +586,7 @@ const isMigrationSqlAuthorityPath = (posixRelPath: string): boolean =>
|
|
|
582
586
|
*/
|
|
583
587
|
const AUTHORITY_ONLY_PATH_PREDICATES: readonly ((posixRelPath: string) => boolean)[] = [
|
|
584
588
|
isMigrationSqlAuthorityPath,
|
|
589
|
+
isXcodeAuthorityPath,
|
|
585
590
|
];
|
|
586
591
|
|
|
587
592
|
/**
|
|
@@ -627,6 +632,7 @@ export const AUTHORITY_FILE_MATCHERS: Array<(relPath: string) => boolean> = [
|
|
|
627
632
|
// `AUTHORITY_ONLY_PATH_PREDICATES` by reference, not by a copied regex, so
|
|
628
633
|
// collection and the chunking exclusion cannot disagree.
|
|
629
634
|
isMigrationSqlAuthorityPath,
|
|
635
|
+
isXcodeAuthorityPath,
|
|
630
636
|
];
|
|
631
637
|
|
|
632
638
|
/**
|