jamdesk 1.1.140 → 1.1.141
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/__tests__/unit/dev-workspace-symlinks.test.d.ts +2 -0
- package/dist/__tests__/unit/dev-workspace-symlinks.test.d.ts.map +1 -0
- package/dist/__tests__/unit/dev-workspace-symlinks.test.js +112 -0
- package/dist/__tests__/unit/dev-workspace-symlinks.test.js.map +1 -0
- package/dist/__tests__/unit/language-filter.test.d.ts +2 -0
- package/dist/__tests__/unit/language-filter.test.d.ts.map +1 -0
- package/dist/__tests__/unit/language-filter.test.js +166 -0
- package/dist/__tests__/unit/language-filter.test.js.map +1 -0
- package/dist/lib/language-filter.d.ts +31 -0
- package/dist/lib/language-filter.d.ts.map +1 -0
- package/dist/lib/language-filter.js +14 -0
- package/dist/lib/language-filter.js.map +1 -0
- package/package.json +1 -1
- package/vendored/components/mdx/MermaidInner.tsx +96 -5
- package/vendored/lib/vector-store.ts +153 -69
- package/vendored/workspace-package-lock.json +12 -12
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-workspace-symlinks.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/unit/dev-workspace-symlinks.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @vitest-environment node
|
|
3
|
+
*
|
|
4
|
+
* Tests prepareProjectWorkspaceLinks — replaces the single
|
|
5
|
+
* <workspace>/projects/<name> -> <projectDir> symlink with per-entry
|
|
6
|
+
* symlinks that skip non-active language directories. This is what
|
|
7
|
+
* actually reduces Turbopack's filesystem scan from 403 MDX files to
|
|
8
|
+
* 135 on jamdesk-docs.
|
|
9
|
+
*/
|
|
10
|
+
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
11
|
+
import fs from 'fs-extra';
|
|
12
|
+
import path from 'path';
|
|
13
|
+
import { tmpdir } from 'os';
|
|
14
|
+
import { prepareProjectWorkspaceLinks } from '../../commands/dev.js';
|
|
15
|
+
import { output } from '../../lib/output.js';
|
|
16
|
+
describe('prepareProjectWorkspaceLinks', () => {
|
|
17
|
+
let tmpRoot;
|
|
18
|
+
let projectDir;
|
|
19
|
+
let workspaceProjectDir;
|
|
20
|
+
beforeEach(() => {
|
|
21
|
+
tmpRoot = fs.mkdtempSync(path.join(tmpdir(), 'jam-ws-'));
|
|
22
|
+
projectDir = path.join(tmpRoot, 'project');
|
|
23
|
+
workspaceProjectDir = path.join(tmpRoot, 'ws', 'projects', 'project');
|
|
24
|
+
// Set up a project layout that mirrors a multi-language docs project:
|
|
25
|
+
// project/
|
|
26
|
+
// ai/intro.mdx (en at root)
|
|
27
|
+
// development/foo.mdx (en at root)
|
|
28
|
+
// es/ai/intro.mdx (spanish)
|
|
29
|
+
// fr/ai/intro.mdx (french)
|
|
30
|
+
// docs.json
|
|
31
|
+
// images/logo.png
|
|
32
|
+
fs.mkdirpSync(path.join(projectDir, 'ai'));
|
|
33
|
+
fs.writeFileSync(path.join(projectDir, 'ai', 'intro.mdx'), '# en');
|
|
34
|
+
fs.mkdirpSync(path.join(projectDir, 'development'));
|
|
35
|
+
fs.writeFileSync(path.join(projectDir, 'development', 'foo.mdx'), '# en');
|
|
36
|
+
fs.mkdirpSync(path.join(projectDir, 'es', 'ai'));
|
|
37
|
+
fs.writeFileSync(path.join(projectDir, 'es', 'ai', 'intro.mdx'), '# es');
|
|
38
|
+
fs.mkdirpSync(path.join(projectDir, 'fr', 'ai'));
|
|
39
|
+
fs.writeFileSync(path.join(projectDir, 'fr', 'ai', 'intro.mdx'), '# fr');
|
|
40
|
+
fs.writeFileSync(path.join(projectDir, 'docs.json'), '{}');
|
|
41
|
+
fs.mkdirpSync(path.join(projectDir, 'images'));
|
|
42
|
+
fs.writeFileSync(path.join(projectDir, 'images', 'logo.png'), '');
|
|
43
|
+
});
|
|
44
|
+
afterEach(() => {
|
|
45
|
+
fs.removeSync(tmpRoot);
|
|
46
|
+
});
|
|
47
|
+
it('symlinks every top-level entry when skip set is empty', async () => {
|
|
48
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set());
|
|
49
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'ai', 'intro.mdx'))).toBe(true);
|
|
50
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'es', 'ai', 'intro.mdx'))).toBe(true);
|
|
51
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'fr', 'ai', 'intro.mdx'))).toBe(true);
|
|
52
|
+
});
|
|
53
|
+
it('does not symlink docs.json (caller writes a filtered copy)', async () => {
|
|
54
|
+
// docs.json must not be symlinked — the caller writes a per-language
|
|
55
|
+
// filtered copy, and fs.writeFile through a symlink would clobber the
|
|
56
|
+
// user's source docs.json.
|
|
57
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set());
|
|
58
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'docs.json'))).toBe(false);
|
|
59
|
+
});
|
|
60
|
+
it('skips entries whose names are in the skip set', async () => {
|
|
61
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set(['es', 'fr']));
|
|
62
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'ai', 'intro.mdx'))).toBe(true);
|
|
63
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'development', 'foo.mdx'))).toBe(true);
|
|
64
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'images', 'logo.png'))).toBe(true);
|
|
65
|
+
// Skipped:
|
|
66
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'es'))).toBe(false);
|
|
67
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'fr'))).toBe(false);
|
|
68
|
+
// docs.json not symlinked — caller writes a filtered copy.
|
|
69
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'docs.json'))).toBe(false);
|
|
70
|
+
});
|
|
71
|
+
it('rebuilds the workspace links from scratch on subsequent calls', async () => {
|
|
72
|
+
// First call: no skip
|
|
73
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set());
|
|
74
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'es'))).toBe(true);
|
|
75
|
+
// Second call: skip es
|
|
76
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set(['es']));
|
|
77
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'es'))).toBe(false);
|
|
78
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'fr'))).toBe(true);
|
|
79
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'ai', 'intro.mdx'))).toBe(true);
|
|
80
|
+
});
|
|
81
|
+
it('handles a pre-existing single symlink at workspaceProjectDir (legacy layout)', async () => {
|
|
82
|
+
// Pre-create the legacy single-symlink layout
|
|
83
|
+
fs.mkdirpSync(path.dirname(workspaceProjectDir));
|
|
84
|
+
fs.symlinkSync(projectDir, workspaceProjectDir, 'junction');
|
|
85
|
+
await prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set(['es', 'fr']));
|
|
86
|
+
const lstat = fs.lstatSync(workspaceProjectDir);
|
|
87
|
+
expect(lstat.isDirectory()).toBe(true);
|
|
88
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'ai', 'intro.mdx'))).toBe(true);
|
|
89
|
+
expect(fs.existsSync(path.join(workspaceProjectDir, 'es'))).toBe(false);
|
|
90
|
+
});
|
|
91
|
+
it('surfaces friendly error (not raw stack trace) when fs.rm throws ENOTEMPTY', async () => {
|
|
92
|
+
// Regression: before safeRemoveCache, fs.remove raised an unfriendly stack
|
|
93
|
+
// trace when Turbopack still held open files. Now safeRemoveCache detects
|
|
94
|
+
// the race and calls process.exit(1) with a human-readable message.
|
|
95
|
+
const rmSpy = vi.spyOn(fs, 'rm');
|
|
96
|
+
const exitSpy = vi.spyOn(process, 'exit').mockImplementation(((code) => {
|
|
97
|
+
throw new Error(`process.exit:${code}`);
|
|
98
|
+
}));
|
|
99
|
+
const errorSpy = vi.spyOn(output, 'error').mockImplementation(() => undefined);
|
|
100
|
+
const enotempty = Object.assign(new Error('ENOTEMPTY'), { code: 'ENOTEMPTY' });
|
|
101
|
+
// fs.rm will be called by safeRemoveCache; make it fail with ENOTEMPTY
|
|
102
|
+
// even after the internal maxRetries — simulate persistent race condition.
|
|
103
|
+
rmSpy.mockRejectedValue(enotempty);
|
|
104
|
+
await expect(prepareProjectWorkspaceLinks(projectDir, workspaceProjectDir, new Set())).rejects.toThrow('process.exit:1');
|
|
105
|
+
const msg = errorSpy.mock.calls[0]?.[0] ?? '';
|
|
106
|
+
expect(msg).toContain('Another `jamdesk dev` instance');
|
|
107
|
+
expect(msg).toContain('pkill -f');
|
|
108
|
+
expect(exitSpy).toHaveBeenCalledWith(1);
|
|
109
|
+
vi.restoreAllMocks();
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
//# sourceMappingURL=dev-workspace-symlinks.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-workspace-symlinks.test.js","sourceRoot":"","sources":["../../../src/__tests__/unit/dev-workspace-symlinks.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"language-filter.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/unit/language-filter.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @vitest-environment node
|
|
3
|
+
*
|
|
4
|
+
* Tests for getActiveLanguageFilter — pure helper that decides which
|
|
5
|
+
* top-level language directories to skip when symlinking project content
|
|
6
|
+
* into the dev workspace. Multi-language sites' non-default languages
|
|
7
|
+
* inflate Turbopack's filesystem scan and balloon cold compile time
|
|
8
|
+
* (jamdesk-docs: 67s with 3 langs vs. 12.5s with 1 lang).
|
|
9
|
+
*/
|
|
10
|
+
import { describe, it, expect } from 'vitest';
|
|
11
|
+
import { getActiveLanguageFilter, isPageInSkippedLanguage, filterConfigByActiveLanguage, } from '../../lib/language-filter.js';
|
|
12
|
+
const config = (langs) => ({
|
|
13
|
+
navigation: { languages: langs.map(l => ({ language: l.language, default: l.default })) },
|
|
14
|
+
});
|
|
15
|
+
describe('getActiveLanguageFilter', () => {
|
|
16
|
+
it('returns null filter when project has no languages array', () => {
|
|
17
|
+
const result = getActiveLanguageFilter({ navigation: {} }, undefined, false);
|
|
18
|
+
expect(result).toEqual({ active: null, skip: new Set() });
|
|
19
|
+
});
|
|
20
|
+
it('returns null filter when project has only one language', () => {
|
|
21
|
+
const result = getActiveLanguageFilter(config([{ language: 'en', default: true }]), undefined, false);
|
|
22
|
+
expect(result).toEqual({ active: 'en', skip: new Set() });
|
|
23
|
+
});
|
|
24
|
+
it('skips non-default languages when active is the default', () => {
|
|
25
|
+
const result = getActiveLanguageFilter(config([
|
|
26
|
+
{ language: 'en', default: true },
|
|
27
|
+
{ language: 'es' },
|
|
28
|
+
{ language: 'fr' },
|
|
29
|
+
]), undefined, false);
|
|
30
|
+
expect(result.active).toBe('en');
|
|
31
|
+
expect(result.skip).toEqual(new Set(['es', 'fr']));
|
|
32
|
+
});
|
|
33
|
+
it('falls back to first language when none is marked default', () => {
|
|
34
|
+
const result = getActiveLanguageFilter(config([{ language: 'en' }, { language: 'es' }, { language: 'fr' }]), undefined, false);
|
|
35
|
+
expect(result.active).toBe('en');
|
|
36
|
+
expect(result.skip).toEqual(new Set(['es', 'fr']));
|
|
37
|
+
});
|
|
38
|
+
it('accepts --lang matching the default language (no-op equivalence)', () => {
|
|
39
|
+
const result = getActiveLanguageFilter(config([
|
|
40
|
+
{ language: 'en', default: true },
|
|
41
|
+
{ language: 'es' },
|
|
42
|
+
]), 'en', false);
|
|
43
|
+
expect(result.active).toBe('en');
|
|
44
|
+
expect(result.skip).toEqual(new Set(['es']));
|
|
45
|
+
});
|
|
46
|
+
it('throws on --lang for a non-default language (initial release scope)', () => {
|
|
47
|
+
// Non-default-language layouts mix root-level default-lang content with
|
|
48
|
+
// <lang>/ subdirs for translations; correctly stripping the default
|
|
49
|
+
// content while keeping <lang>/ takes more work and is deferred to a
|
|
50
|
+
// follow-up. For now, surface the workaround clearly.
|
|
51
|
+
expect(() => getActiveLanguageFilter(config([
|
|
52
|
+
{ language: 'en', default: true },
|
|
53
|
+
{ language: 'es' },
|
|
54
|
+
{ language: 'fr' },
|
|
55
|
+
]), 'es', false)).toThrow(/--lang es: previewing non-default languages.*--all-langs/i);
|
|
56
|
+
});
|
|
57
|
+
it('returns empty skip set when --all-langs is set', () => {
|
|
58
|
+
const result = getActiveLanguageFilter(config([
|
|
59
|
+
{ language: 'en', default: true },
|
|
60
|
+
{ language: 'es' },
|
|
61
|
+
]), undefined, true);
|
|
62
|
+
expect(result.active).toBe('en');
|
|
63
|
+
expect(result.skip).toEqual(new Set());
|
|
64
|
+
});
|
|
65
|
+
it('throws on --lang code that does not exist in docs.json', () => {
|
|
66
|
+
expect(() => getActiveLanguageFilter(config([{ language: 'en', default: true }, { language: 'es' }]), 'de', false)).toThrow(/--lang de.*not.*docs\.json.*Available: en, es/);
|
|
67
|
+
});
|
|
68
|
+
it('handles malformed languages array (entries missing language field) by ignoring them', () => {
|
|
69
|
+
const malformed = {
|
|
70
|
+
navigation: {
|
|
71
|
+
languages: [
|
|
72
|
+
{ language: 'en', default: true },
|
|
73
|
+
{ default: false }, // missing language: ignored
|
|
74
|
+
{ language: 'es' },
|
|
75
|
+
{ language: 42 }, // wrong type: ignored
|
|
76
|
+
],
|
|
77
|
+
},
|
|
78
|
+
};
|
|
79
|
+
const result = getActiveLanguageFilter(malformed, undefined, false);
|
|
80
|
+
expect(result.active).toBe('en');
|
|
81
|
+
expect(result.skip).toEqual(new Set(['es']));
|
|
82
|
+
});
|
|
83
|
+
it('returns null active when no valid language entries exist', () => {
|
|
84
|
+
const result = getActiveLanguageFilter({ navigation: { languages: [{ default: true }] } }, undefined, false);
|
|
85
|
+
expect(result).toEqual({ active: null, skip: new Set() });
|
|
86
|
+
});
|
|
87
|
+
it('rejects empty-string --lang as an invalid code (commander passes "" through)', () => {
|
|
88
|
+
// commander.js treats `--lang ""` as a value, not as missing — so
|
|
89
|
+
// langOption is "" (defined, but empty). Empty string is never a valid
|
|
90
|
+
// language code; surface it as a clear error rather than silently
|
|
91
|
+
// falling back to the default.
|
|
92
|
+
expect(() => getActiveLanguageFilter(config([{ language: 'en', default: true }, { language: 'es' }]), '', false)).toThrow(/--lang.*not.*docs\.json/);
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
describe('isPageInSkippedLanguage', () => {
|
|
96
|
+
it('returns false when skip set is empty', () => {
|
|
97
|
+
expect(isPageInSkippedLanguage('fr/introduction', new Set())).toBe(false);
|
|
98
|
+
});
|
|
99
|
+
it('returns true when first path segment is a skipped language', () => {
|
|
100
|
+
expect(isPageInSkippedLanguage('fr/introduction', new Set(['fr']))).toBe(true);
|
|
101
|
+
});
|
|
102
|
+
it('returns true for nested paths inside a skipped language', () => {
|
|
103
|
+
expect(isPageInSkippedLanguage('fr/setup/connecting-github', new Set(['fr', 'de']))).toBe(true);
|
|
104
|
+
});
|
|
105
|
+
it('returns false when first segment is the active language', () => {
|
|
106
|
+
expect(isPageInSkippedLanguage('en/introduction', new Set(['fr']))).toBe(false);
|
|
107
|
+
});
|
|
108
|
+
it('returns false for unprefixed root pages', () => {
|
|
109
|
+
expect(isPageInSkippedLanguage('introduction', new Set(['fr']))).toBe(false);
|
|
110
|
+
});
|
|
111
|
+
it('does not match when the skip code is a prefix-substring of a different segment', () => {
|
|
112
|
+
// Guard against startsWith('fr/') matching e.g. 'fr-something/foo'
|
|
113
|
+
expect(isPageInSkippedLanguage('fr-something/foo', new Set(['fr']))).toBe(false);
|
|
114
|
+
});
|
|
115
|
+
it('returns true for a path with a fragment anchor in a skipped language', () => {
|
|
116
|
+
// Broken-anchor warnings from validate-links.cjs surface as link values
|
|
117
|
+
// like `fr/introduction#missing-section` — the fragment lives past the
|
|
118
|
+
// first segment so the language check still works.
|
|
119
|
+
expect(isPageInSkippedLanguage('fr/introduction#setup', new Set(['fr']))).toBe(true);
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
describe('filterConfigByActiveLanguage', () => {
|
|
123
|
+
it('returns the input unchanged (same reference) when skip is empty', () => {
|
|
124
|
+
const config = { name: 'foo', navigation: { languages: [{ language: 'en' }] } };
|
|
125
|
+
const result = filterConfigByActiveLanguage(config, { active: 'en', skip: new Set() });
|
|
126
|
+
expect(result).toBe(config);
|
|
127
|
+
});
|
|
128
|
+
it('drops skipped languages from navigation.languages', () => {
|
|
129
|
+
const config = {
|
|
130
|
+
name: 'jamdesk-docs',
|
|
131
|
+
navigation: {
|
|
132
|
+
languages: [
|
|
133
|
+
{ language: 'en', default: true, tabs: [{ tab: 'Guide' }] },
|
|
134
|
+
{ language: 'fr', tabs: [{ tab: 'Guide' }] },
|
|
135
|
+
{ language: 'de', tabs: [{ tab: 'Guide' }] },
|
|
136
|
+
],
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
const result = filterConfigByActiveLanguage(config, {
|
|
140
|
+
active: 'en',
|
|
141
|
+
skip: new Set(['fr', 'de']),
|
|
142
|
+
});
|
|
143
|
+
expect(result.navigation.languages).toEqual([
|
|
144
|
+
{ language: 'en', default: true, tabs: [{ tab: 'Guide' }] },
|
|
145
|
+
]);
|
|
146
|
+
// Top-level fields preserved.
|
|
147
|
+
expect(result.name).toBe('jamdesk-docs');
|
|
148
|
+
// Original config untouched.
|
|
149
|
+
expect(config.navigation.languages).toHaveLength(3);
|
|
150
|
+
});
|
|
151
|
+
it('preserves other navigation fields (tabs, global, anchors, etc.)', () => {
|
|
152
|
+
const config = {
|
|
153
|
+
navigation: {
|
|
154
|
+
languages: [{ language: 'en' }, { language: 'fr' }],
|
|
155
|
+
global: { anchors: [{ anchor: 'Support' }] },
|
|
156
|
+
},
|
|
157
|
+
};
|
|
158
|
+
const result = filterConfigByActiveLanguage(config, {
|
|
159
|
+
active: 'en',
|
|
160
|
+
skip: new Set(['fr']),
|
|
161
|
+
});
|
|
162
|
+
expect(result.navigation.global).toEqual({ anchors: [{ anchor: 'Support' }] });
|
|
163
|
+
expect(result.navigation.languages).toHaveLength(1);
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
//# sourceMappingURL=language-filter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"language-filter.test.js","sourceRoot":"","sources":["../../../src/__tests__/unit/language-filter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Picks which `<lang>/` directories under projectDir to keep as workspace
|
|
3
|
+
* symlinks and which to skip. Skipping non-active language directories
|
|
4
|
+
* shrinks Turbopack's filesystem scan and dropped cold compile from ~67s
|
|
5
|
+
* to ~12s on jamdesk-docs (commit 90d781b4).
|
|
6
|
+
*
|
|
7
|
+
* The dev server still reads content from the user's source tree via
|
|
8
|
+
* JAMDESK_PROJECTS_DIR, so the language picker keeps showing every
|
|
9
|
+
* language and clicks always 200 OK — the workspace symlinks are a
|
|
10
|
+
* Turbopack-only performance layer.
|
|
11
|
+
*
|
|
12
|
+
* Default rules:
|
|
13
|
+
* 1. Language with `default: true`
|
|
14
|
+
* 2. First language in `navigation.languages[]`
|
|
15
|
+
*/
|
|
16
|
+
export interface LanguageFilter {
|
|
17
|
+
active: string | null;
|
|
18
|
+
skip: Set<string>;
|
|
19
|
+
}
|
|
20
|
+
interface NavigationLanguageEntry {
|
|
21
|
+
language?: string;
|
|
22
|
+
default?: boolean;
|
|
23
|
+
}
|
|
24
|
+
interface MinimalConfig {
|
|
25
|
+
navigation?: {
|
|
26
|
+
languages?: NavigationLanguageEntry[];
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export declare function getActiveLanguageFilter(config: MinimalConfig): LanguageFilter;
|
|
30
|
+
export {};
|
|
31
|
+
//# sourceMappingURL=language-filter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"language-filter.d.ts","sourceRoot":"","sources":["../../src/lib/language-filter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,aAAa;IACrB,UAAU,CAAC,EAAE;QACX,SAAS,CAAC,EAAE,uBAAuB,EAAE,CAAC;KACvC,CAAC;CACH;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc,CAc7E"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export function getActiveLanguageFilter(config) {
|
|
2
|
+
const validEntries = (config.navigation?.languages ?? []).filter((l) => typeof l.language === 'string');
|
|
3
|
+
if (validEntries.length === 0) {
|
|
4
|
+
return { active: null, skip: new Set() };
|
|
5
|
+
}
|
|
6
|
+
const codes = validEntries.map((l) => l.language);
|
|
7
|
+
const active = validEntries.find((l) => l.default)?.language ?? validEntries[0].language;
|
|
8
|
+
if (codes.length === 1) {
|
|
9
|
+
return { active, skip: new Set() };
|
|
10
|
+
}
|
|
11
|
+
const skip = new Set(codes.filter((c) => c !== active));
|
|
12
|
+
return { active, skip };
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=language-filter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"language-filter.js","sourceRoot":"","sources":["../../src/lib/language-filter.ts"],"names":[],"mappings":"AA+BA,MAAM,UAAU,uBAAuB,CAAC,MAAqB;IAC3D,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAgD,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CACpF,CAAC;IACF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAG,EAAU,EAAE,CAAC;IACnD,CAAC;IACD,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACzF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAU,EAAE,CAAC;IAC7C,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;IACxD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jamdesk",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.141",
|
|
4
4
|
"description": "CLI for Jamdesk — build, preview, and deploy documentation sites from MDX. Dev server with hot reload, 50+ components, OpenAPI support, AI search, and Mintlify migration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"jamdesk",
|
|
@@ -47,8 +47,29 @@ interface ColorPalette {
|
|
|
47
47
|
ganttSections: string[];
|
|
48
48
|
ganttGridLine: string;
|
|
49
49
|
gitBranchColors: string[];
|
|
50
|
+
pieSliceStroke: string;
|
|
50
51
|
}
|
|
51
52
|
|
|
53
|
+
// Mermaid's built-in palettes (including 'neutral') color pie slices with
|
|
54
|
+
// washed-out, near-white grays: low-contrast on a light background and wiped to
|
|
55
|
+
// transparent by the dark-mode path-fill inversion below — so slices render with
|
|
56
|
+
// no visible color in either mode. We override slice + legend fills with a
|
|
57
|
+
// distinct, mid-tone palette that reads on both backgrounds, mirroring the
|
|
58
|
+
// curated colors already used for gantt bars and git branches. Every entry has at
|
|
59
|
+
// least one channel < 200, so isLightColor() never flags them.
|
|
60
|
+
const PIE_SLICE_COLORS = [
|
|
61
|
+
'#3b82f6', // blue
|
|
62
|
+
'#ef4444', // red
|
|
63
|
+
'#22c55e', // green
|
|
64
|
+
'#f59e0b', // amber
|
|
65
|
+
'#a855f7', // purple
|
|
66
|
+
'#14b8a6', // teal
|
|
67
|
+
'#ec4899', // pink
|
|
68
|
+
'#f97316', // orange
|
|
69
|
+
'#64748b', // slate
|
|
70
|
+
'#84cc16', // lime
|
|
71
|
+
];
|
|
72
|
+
|
|
52
73
|
const darkPalette: ColorPalette = {
|
|
53
74
|
text: '#e5e7eb',
|
|
54
75
|
line: '#9ca3af',
|
|
@@ -59,6 +80,7 @@ const darkPalette: ColorPalette = {
|
|
|
59
80
|
ganttSections: ['#1e1e3f', '#2d2d1e', '#1e2d1e'],
|
|
60
81
|
ganttGridLine: '#374151',
|
|
61
82
|
gitBranchColors: ['#3b82f6', '#eab308', '#22c55e', '#f97316', '#ec4899', '#a78bfa'],
|
|
83
|
+
pieSliceStroke: '#1f2937', // dark slate — crisp separation between slices on a dark bg
|
|
62
84
|
};
|
|
63
85
|
|
|
64
86
|
const lightPalette: ColorPalette = {
|
|
@@ -71,6 +93,7 @@ const lightPalette: ColorPalette = {
|
|
|
71
93
|
ganttSections: ['#f0f0ff', '#fff8e6', '#f0fff0'],
|
|
72
94
|
ganttGridLine: '#e5e7eb',
|
|
73
95
|
gitBranchColors: ['#3b82f6', '#eab308', '#22c55e', '#f97316', '#ec4899', '#8b5cf6'],
|
|
96
|
+
pieSliceStroke: '#ffffff', // white — crisp separation between slices on a light bg
|
|
74
97
|
};
|
|
75
98
|
|
|
76
99
|
// Styling helper utilities
|
|
@@ -129,7 +152,46 @@ function applyClassDiagramStyles(svgEl: SVGElement, palette: ColorPalette): void
|
|
|
129
152
|
}
|
|
130
153
|
|
|
131
154
|
function applyPieChartStyles(svgEl: SVGElement, palette: ColorPalette): void {
|
|
155
|
+
// Title and legend text follow the theme text color.
|
|
132
156
|
styleElements(svgEl, '.pieLabel, .legend text, .pieTitleText', { fill: palette.text });
|
|
157
|
+
|
|
158
|
+
const slices = svgEl.querySelectorAll<SVGPathElement>('path.pieCircle');
|
|
159
|
+
if (slices.length === 0) return; // not a pie chart
|
|
160
|
+
|
|
161
|
+
// Re-color slices and legend swatches from PIE_SLICE_COLORS. Each distinct
|
|
162
|
+
// original (washed-out) color maps to one vivid color, recorded as the slices
|
|
163
|
+
// are walked, then reused for the legend so a slice and its legend entry —
|
|
164
|
+
// which share mermaid's original ordinal color — get the same override.
|
|
165
|
+
const colorMap = new Map<string, string>();
|
|
166
|
+
let nextColor = 0;
|
|
167
|
+
const overrideFor = (rawFill: string | null | undefined): string => {
|
|
168
|
+
const key = normalizeColor(rawFill) ?? `pos-${nextColor}`;
|
|
169
|
+
let vivid = colorMap.get(key);
|
|
170
|
+
if (!vivid) {
|
|
171
|
+
vivid = PIE_SLICE_COLORS[nextColor % PIE_SLICE_COLORS.length];
|
|
172
|
+
nextColor += 1;
|
|
173
|
+
colorMap.set(key, vivid);
|
|
174
|
+
}
|
|
175
|
+
return vivid;
|
|
176
|
+
};
|
|
177
|
+
|
|
178
|
+
slices.forEach((slice) => {
|
|
179
|
+
const vivid = overrideFor(slice.style.fill || slice.getAttribute('fill'));
|
|
180
|
+
slice.style.fill = vivid;
|
|
181
|
+
slice.style.stroke = palette.pieSliceStroke;
|
|
182
|
+
slice.style.strokeWidth = '2';
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
// Legend swatches: <g class="legend"> > rect, fill set via inline style.
|
|
186
|
+
svgEl.querySelectorAll<SVGRectElement>('.legend rect').forEach((swatch) => {
|
|
187
|
+
const vivid = overrideFor(swatch.style.fill || swatch.getAttribute('fill'));
|
|
188
|
+
swatch.style.fill = vivid;
|
|
189
|
+
swatch.style.stroke = vivid;
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
// Percentage labels sit on top of the slices — white reads on every palette
|
|
193
|
+
// tone. The dark-mode text inversion spares text.slice so this survives there.
|
|
194
|
+
styleElements(svgEl, 'text.slice', { fill: '#ffffff' });
|
|
133
195
|
}
|
|
134
196
|
|
|
135
197
|
// Check if an RGB color is light (r,g,b > threshold)
|
|
@@ -147,6 +209,26 @@ function isDarkColor(rgbString: string, threshold = 150): boolean {
|
|
|
147
209
|
return r < threshold && g < threshold && b < threshold;
|
|
148
210
|
}
|
|
149
211
|
|
|
212
|
+
// Normalize a CSS color (hex or rgb()) to a canonical "r,g,b" string. A pie
|
|
213
|
+
// slice's fill arrives as a hex attribute (e.g. "#ECECFF") while its matching
|
|
214
|
+
// legend swatch's fill is an inline style the browser reports as "rgb(...)" —
|
|
215
|
+
// normalizing lets the same underlying color compare equal across both formats,
|
|
216
|
+
// so a slice and its legend entry get the same override color. Returns null when
|
|
217
|
+
// the value can't be parsed (caller falls back to a positional key).
|
|
218
|
+
function normalizeColor(value: string | null | undefined): string | null {
|
|
219
|
+
if (!value) return null;
|
|
220
|
+
const v = value.trim();
|
|
221
|
+
const rgb = v.match(/rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i);
|
|
222
|
+
if (rgb) return `${+rgb[1]},${+rgb[2]},${+rgb[3]}`;
|
|
223
|
+
let hex = v.replace(/^#/, '');
|
|
224
|
+
if (hex.length === 3) hex = hex.split('').map((c) => c + c).join('');
|
|
225
|
+
if (hex.length === 6 && /^[0-9a-f]{6}$/i.test(hex)) {
|
|
226
|
+
const n = parseInt(hex, 16);
|
|
227
|
+
return `${(n >> 16) & 255},${(n >> 8) & 255},${n & 255}`;
|
|
228
|
+
}
|
|
229
|
+
return null;
|
|
230
|
+
}
|
|
231
|
+
|
|
150
232
|
// Shared styles applied to both light and dark modes
|
|
151
233
|
function applyCommonStyles(svgEl: SVGElement, palette: ColorPalette): void {
|
|
152
234
|
// Cluster/subgraph backgrounds
|
|
@@ -174,15 +256,22 @@ function applyCommonStyles(svgEl: SVGElement, palette: ColorPalette): void {
|
|
|
174
256
|
|
|
175
257
|
// Dark mode requires additional color inversions
|
|
176
258
|
function applyDarkModeInversions(svgEl: SVGElement, palette: ColorPalette): void {
|
|
177
|
-
// Make background rects transparent
|
|
259
|
+
// Make background rects transparent. Pie legend swatches (.legend rect) are
|
|
260
|
+
// re-colored in applyPieChartStyles — leave their fills alone.
|
|
178
261
|
svgEl.querySelectorAll('rect').forEach((rect) => {
|
|
179
|
-
if (
|
|
262
|
+
if (
|
|
263
|
+
!rect.closest('.cluster') &&
|
|
264
|
+
!rect.closest('.node') &&
|
|
265
|
+
!rect.classList.contains('actor') &&
|
|
266
|
+
!rect.closest('.legend')
|
|
267
|
+
) {
|
|
180
268
|
(rect as SVGElement).style.fill = 'transparent';
|
|
181
269
|
}
|
|
182
270
|
});
|
|
183
271
|
|
|
184
|
-
// Invert text colors
|
|
185
|
-
|
|
272
|
+
// Invert text colors. text.slice (pie percentage labels) is excluded so the
|
|
273
|
+
// white set in applyPieChartStyles stays legible on the colored slices.
|
|
274
|
+
styleElements(svgEl, 'text:not(.slice), .nodeLabel, .edgeLabel, .label, tspan', { fill: palette.text });
|
|
186
275
|
styleElements(svgEl, 'text.actor, .messageText, .labelText, .loopText, .noteText', { fill: palette.text });
|
|
187
276
|
|
|
188
277
|
// Invert foreignObject text and clear light backgrounds
|
|
@@ -198,8 +287,10 @@ function applyDarkModeInversions(svgEl: SVGElement, palette: ColorPalette): void
|
|
|
198
287
|
}
|
|
199
288
|
});
|
|
200
289
|
|
|
201
|
-
// Invert lines and paths
|
|
290
|
+
// Invert lines and paths. Pie slices (path.pieCircle) carry their own colors
|
|
291
|
+
// from applyPieChartStyles — skip them so the fill isn't wiped to transparent.
|
|
202
292
|
svgEl.querySelectorAll('path, line').forEach((el) => {
|
|
293
|
+
if ((el as Element).classList.contains('pieCircle')) return;
|
|
203
294
|
const computed = window.getComputedStyle(el);
|
|
204
295
|
if (computed.stroke && computed.stroke !== 'none') {
|
|
205
296
|
(el as SVGElement).style.stroke = palette.line;
|
|
@@ -52,15 +52,88 @@ const MIN_SCORE = 0.3;
|
|
|
52
52
|
/** Max chunks per page — raised from 3 to 4 to match broader topK retrieval budget */
|
|
53
53
|
const MAX_CHUNKS_PER_PAGE = 4;
|
|
54
54
|
|
|
55
|
-
/**
|
|
56
|
-
|
|
55
|
+
/**
|
|
56
|
+
* Hard deadline for the build-time embedding write (reset + all upsert batches
|
|
57
|
+
* combined). A transient Upstash stall must fail this step FAST — it is
|
|
58
|
+
* non-fatal to the build (build.ts swallows it) — instead of hanging the single
|
|
59
|
+
* Cloud Run build instance until the 21-minute stale-build watchdog reaps it as
|
|
60
|
+
* a false "timed out" failure (kapptivate, 2026-06-11). Healthy writes finish in
|
|
61
|
+
* <15s; 90s tolerates a slow-but-alive Upstash while still failing ~14× faster
|
|
62
|
+
* than the watchdog.
|
|
63
|
+
*/
|
|
64
|
+
const UPSERT_TIMEOUT_MS = 90_000;
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Hard deadline for a live chat/search retrieval. Queries normally finish in
|
|
68
|
+
* <500ms; bound them so a stalled Upstash cannot hang the chat SSE request. The
|
|
69
|
+
* chat/search routes already treat a rejected query gracefully (rewrite path
|
|
70
|
+
* resolves to [], original-query reject → 503 chat / 502 docs-search), so a fast
|
|
71
|
+
* reject is preferable to an open-ended hang.
|
|
72
|
+
*/
|
|
73
|
+
const QUERY_TIMEOUT_MS = 10_000;
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Create a namespaced Upstash Vector index for a project.
|
|
77
|
+
*
|
|
78
|
+
* `signal` is REQUIRED on purpose: it must come from a withDeadline() wrapper.
|
|
79
|
+
* A bare getNamespace() would issue UNBOUNDED reset/upsert/query requests — the
|
|
80
|
+
* exact hang this module guards against (kapptivate, 2026-06-11) — so making the
|
|
81
|
+
* param non-optional forces every (current and future) caller through a deadline
|
|
82
|
+
* at compile time rather than by remembering a comment. The signal is forwarded
|
|
83
|
+
* to the SDK so an aborted deadline closes the underlying socket.
|
|
84
|
+
*/
|
|
85
|
+
function getNamespace(projectId: string, signal: AbortSignal) {
|
|
57
86
|
const index = new Index({
|
|
58
87
|
url: process.env.UPSTASH_VECTOR_REST_URL!,
|
|
59
88
|
token: process.env.UPSTASH_VECTOR_REST_TOKEN!,
|
|
89
|
+
signal,
|
|
60
90
|
});
|
|
61
91
|
return index.namespace(projectId);
|
|
62
92
|
}
|
|
63
93
|
|
|
94
|
+
/**
|
|
95
|
+
* Run an Upstash operation under a hard deadline.
|
|
96
|
+
*
|
|
97
|
+
* The Promise.race timer is the GUARANTEE: it rejects the caller at `ms` no
|
|
98
|
+
* matter what the SDK does. The AbortSignal handed to `op` is best-effort —
|
|
99
|
+
* @upstash/vector 1.2.3 does NOT propagate an aborted fetch as a rejection; its
|
|
100
|
+
* request loop catches the AbortError and synthesizes a 200 "success". What the
|
|
101
|
+
* signal still buys us is closing the underlying socket so a hung connection
|
|
102
|
+
* does not linger past the deadline. So: timer = correctness, signal = resource
|
|
103
|
+
* hygiene — do NOT remove the timer believing the signal suffices.
|
|
104
|
+
*
|
|
105
|
+
* On timeout this REJECTS — callers decide whether that is fatal. A genuine
|
|
106
|
+
* pre-deadline rejection (e.g. the SDK exhausting its retries on a flapping
|
|
107
|
+
* endpoint) propagates as-is so the real Upstash error is logged rather than a
|
|
108
|
+
* generic timeout.
|
|
109
|
+
*/
|
|
110
|
+
async function withDeadline<T>(
|
|
111
|
+
ms: number,
|
|
112
|
+
operation: string,
|
|
113
|
+
op: (signal: AbortSignal) => Promise<T>,
|
|
114
|
+
): Promise<T> {
|
|
115
|
+
const controller = new AbortController();
|
|
116
|
+
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
117
|
+
const deadline = new Promise<never>((_, reject) => {
|
|
118
|
+
timer = setTimeout(() => {
|
|
119
|
+
controller.abort();
|
|
120
|
+
reject(new Error(`Upstash ${operation} timed out after ${ms}ms`));
|
|
121
|
+
}, ms);
|
|
122
|
+
});
|
|
123
|
+
const work = op(controller.signal);
|
|
124
|
+
// Swallow the late settlement of the losing promise so it cannot bubble as an
|
|
125
|
+
// unhandledRejection after the deadline already won the race. (Load-bearing in
|
|
126
|
+
// prod for the genuine-error case; on an abort the SDK resolves `work` with a
|
|
127
|
+
// synthetic 200, so this no-ops.) The genuine error still reaches the caller
|
|
128
|
+
// via the race below.
|
|
129
|
+
work.catch(() => {});
|
|
130
|
+
try {
|
|
131
|
+
return await Promise.race([work, deadline]);
|
|
132
|
+
} finally {
|
|
133
|
+
clearTimeout(timer);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
64
137
|
/**
|
|
65
138
|
* Replace all vectors for a project with fresh chunks.
|
|
66
139
|
*
|
|
@@ -76,33 +149,35 @@ export async function upsertChunks(
|
|
|
76
149
|
projectId: string,
|
|
77
150
|
chunks: EmbeddingChunk[],
|
|
78
151
|
): Promise<void> {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
152
|
+
await withDeadline(UPSERT_TIMEOUT_MS, 'upsert', async signal => {
|
|
153
|
+
const ns = getNamespace(projectId, signal);
|
|
154
|
+
|
|
155
|
+
await ns.reset();
|
|
156
|
+
|
|
157
|
+
for (let i = 0; i < chunks.length; i += BATCH_SIZE) {
|
|
158
|
+
const batch = chunks.slice(i, i + BATCH_SIZE);
|
|
159
|
+
await ns.upsert(
|
|
160
|
+
batch.map(c => {
|
|
161
|
+
const metadata: ChunkMetadata = {
|
|
162
|
+
pageSlug: c.pageSlug,
|
|
163
|
+
sectionHeading: c.sectionHeading,
|
|
164
|
+
pageTitle: c.pageTitle,
|
|
165
|
+
content: c.content.length > MAX_METADATA_CONTENT_CHARS
|
|
166
|
+
? c.content.slice(0, MAX_METADATA_CONTENT_CHARS) + '...'
|
|
167
|
+
: c.content,
|
|
168
|
+
};
|
|
169
|
+
if (c.locale) metadata.locale = c.locale; // omit when null
|
|
170
|
+
return {
|
|
171
|
+
id: c.id,
|
|
172
|
+
// Prefix + body goes to Upstash for embedding/BM25; metadata.content
|
|
173
|
+
// stays prefix-free so consumers display clean body text.
|
|
174
|
+
data: c.prefix + c.content,
|
|
175
|
+
metadata,
|
|
176
|
+
};
|
|
177
|
+
}),
|
|
178
|
+
);
|
|
179
|
+
}
|
|
180
|
+
});
|
|
106
181
|
}
|
|
107
182
|
|
|
108
183
|
/**
|
|
@@ -205,48 +280,50 @@ export async function querySimilarChunks(
|
|
|
205
280
|
topK = 5,
|
|
206
281
|
options: { locale?: string } = {},
|
|
207
282
|
): Promise<Array<ChunkMetadata & { score: number }>> {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
283
|
+
return withDeadline(QUERY_TIMEOUT_MS, 'query', async signal => {
|
|
284
|
+
const ns = getNamespace(projectId, signal);
|
|
285
|
+
const locale = options.locale ? normalizeLocaleForFilter(options.locale) : undefined;
|
|
286
|
+
// Defense-in-depth: A5 rejects malformed locales at the API boundary. If a
|
|
287
|
+
// truthy locale here normalizes to empty, A5's guard was bypassed (test or
|
|
288
|
+
// internal caller) — surface it loudly rather than silently dropping the filter.
|
|
289
|
+
if (options.locale && !locale) {
|
|
290
|
+
logger.warn('vector-store: locale normalized to empty — filter skipped', { rawLocale: options.locale });
|
|
291
|
+
}
|
|
292
|
+
const filter = locale ? buildLocaleFilter(locale) : undefined;
|
|
293
|
+
// When filtering, raise effective topK by ~33% so we still get ~topK chunks
|
|
294
|
+
// back from a mixed-language namespace where filtering cuts the candidate set.
|
|
295
|
+
const effectiveTopK = filter ? Math.ceil(topK * 1.33) : topK;
|
|
296
|
+
const queryParams = { topK: effectiveTopK, includeMetadata: true as const, filter };
|
|
297
|
+
|
|
298
|
+
const topicQuery = extractTopicQuery(queryText);
|
|
299
|
+
|
|
300
|
+
// Dual-query: topic query is the PRIMARY source (better topical relevance);
|
|
301
|
+
// the full query fills remaining slots with unique results only.
|
|
302
|
+
let merged: Array<ChunkMetadata & { score: number }>;
|
|
303
|
+
if (topicQuery) {
|
|
304
|
+
const [fullResults, topicResults] = await Promise.all([
|
|
305
|
+
queryWithFallback(ns, { data: queryText, ...queryParams }),
|
|
306
|
+
queryWithFallback(ns, { data: topicQuery, ...queryParams }),
|
|
307
|
+
]);
|
|
308
|
+
merged = filterAndMerge([topicResults, fullResults], topK);
|
|
309
|
+
} else {
|
|
310
|
+
const results = await queryWithFallback(ns, { data: queryText, ...queryParams });
|
|
311
|
+
merged = filterAndMerge([results], topK);
|
|
312
|
+
}
|
|
237
313
|
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
314
|
+
// Telemetry: a filtered query that returns materially fewer chunks than
|
|
315
|
+
// requested signals the locale filter is hurting recall (project skewed away
|
|
316
|
+
// from the requested locale, or filter syntax matched a near-empty subset).
|
|
317
|
+
// Surface it so we can decide whether to widen the carve-out, increase the
|
|
318
|
+
// 1.33× boost, or rebuild the project's index.
|
|
319
|
+
if (filter && merged.length < Math.ceil(topK / 2)) {
|
|
320
|
+
logger.warn('vector-store: locale filter under-fills topK', {
|
|
321
|
+
projectId, locale, returned: merged.length, requested: topK,
|
|
322
|
+
});
|
|
323
|
+
}
|
|
248
324
|
|
|
249
|
-
|
|
325
|
+
return merged;
|
|
326
|
+
});
|
|
250
327
|
}
|
|
251
328
|
|
|
252
329
|
/**
|
|
@@ -309,6 +386,13 @@ export async function deleteProjectNamespace(slug: string): Promise<boolean> {
|
|
|
309
386
|
// Ctor failures (e.g., a future SDK adding URL-format validation) are
|
|
310
387
|
// misconfiguration, not transient errors — let them propagate so ops see
|
|
311
388
|
// a 500 instead of a silent `vector_orphan_on_delete`.
|
|
389
|
+
//
|
|
390
|
+
// Deliberately UNBOUNDED (unlike upsertChunks/querySimilarChunks, which go
|
|
391
|
+
// through withDeadline + getNamespace): this is a single best-effort delete on
|
|
392
|
+
// the request-scoped dashboard delete handler — NOT the shared Cloud Run build
|
|
393
|
+
// instance — so a stall here cannot wedge other builds or trip the stale-build
|
|
394
|
+
// watchdog. A hung delete is bounded by the platform request timeout. Don't
|
|
395
|
+
// "fix" the asymmetry by reflex; bounding it would need its own deadline wiring.
|
|
312
396
|
const index = new Index({ url, token });
|
|
313
397
|
try {
|
|
314
398
|
await index.deleteNamespace(slug);
|
|
@@ -1997,9 +1997,9 @@
|
|
|
1997
1997
|
}
|
|
1998
1998
|
},
|
|
1999
1999
|
"node_modules/acorn": {
|
|
2000
|
-
"version": "8.
|
|
2001
|
-
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.
|
|
2002
|
-
"integrity": "sha512-
|
|
2000
|
+
"version": "8.17.0",
|
|
2001
|
+
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
|
|
2002
|
+
"integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
|
|
2003
2003
|
"license": "MIT",
|
|
2004
2004
|
"bin": {
|
|
2005
2005
|
"acorn": "bin/acorn"
|
|
@@ -2145,9 +2145,9 @@
|
|
|
2145
2145
|
}
|
|
2146
2146
|
},
|
|
2147
2147
|
"node_modules/baseline-browser-mapping": {
|
|
2148
|
-
"version": "2.10.
|
|
2149
|
-
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.
|
|
2150
|
-
"integrity": "sha512-
|
|
2148
|
+
"version": "2.10.36",
|
|
2149
|
+
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.36.tgz",
|
|
2150
|
+
"integrity": "sha512-lVq/Df7LXlO79MVaaUHztSwWiG9oXoWHlgvNS51v8Dpd4+G4/VIy6qYePTw31nAVls33nUtnfezYeLkYAak9dg==",
|
|
2151
2151
|
"license": "Apache-2.0",
|
|
2152
2152
|
"bin": {
|
|
2153
2153
|
"baseline-browser-mapping": "dist/cli.cjs"
|
|
@@ -2208,9 +2208,9 @@
|
|
|
2208
2208
|
"license": "MIT"
|
|
2209
2209
|
},
|
|
2210
2210
|
"node_modules/caniuse-lite": {
|
|
2211
|
-
"version": "1.0.
|
|
2212
|
-
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.
|
|
2213
|
-
"integrity": "sha512-
|
|
2211
|
+
"version": "1.0.30001799",
|
|
2212
|
+
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
|
|
2213
|
+
"integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
|
|
2214
2214
|
"funding": [
|
|
2215
2215
|
{
|
|
2216
2216
|
"type": "opencollective",
|
|
@@ -2945,9 +2945,9 @@
|
|
|
2945
2945
|
"license": "ISC"
|
|
2946
2946
|
},
|
|
2947
2947
|
"node_modules/enhanced-resolve": {
|
|
2948
|
-
"version": "5.
|
|
2949
|
-
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.
|
|
2950
|
-
"integrity": "sha512-
|
|
2948
|
+
"version": "5.24.0",
|
|
2949
|
+
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.0.tgz",
|
|
2950
|
+
"integrity": "sha512-SkE2t82KlkkxQRVMVLAGKxLfORGQfrkx5dkj+vlgXRVNEdPc4eZcR+J/Fvj8C+yKSFH5L0q3NFlyufOVQnCcYQ==",
|
|
2951
2951
|
"license": "MIT",
|
|
2952
2952
|
"dependencies": {
|
|
2953
2953
|
"graceful-fs": "^4.2.4",
|