Skip to content

Commit c23f196

Browse files
QuramyQuramy
committed
chore: Modify FragmentRegistry method name
1 parent a42a5df commit c23f196

File tree

5 files changed

+39
-55
lines changed

5 files changed

+39
-55
lines changed

‎src/analyzer/analyzer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class Analyzer {
9595
return ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node);
9696
}
9797
}) as (ts.TaggedTemplateExpression | ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[];
98-
fragmentRegistry.registerDocument(
98+
fragmentRegistry.registerDocuments(
9999
fileName,
100100
version,
101101
templateLiteralNodes.reduce(

‎src/gql-ast-util/fragment-registry.test.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ describe(FragmentRegistry, () => {
275275
describe(FragmentRegistry.prototype.getExternalFragments, () => {
276276
it('should return empty array when target document can not be parsed', () => {
277277
const registry = new FragmentRegistry();
278-
registry.registerDocument('fragments.ts', '0', [
278+
registry.registerDocuments('fragments.ts', '0', [
279279
{
280280
sourcePosition: 0,
281281
text: `
@@ -285,14 +285,14 @@ describe(FragmentRegistry, () => {
285285
`,
286286
},
287287
]);
288-
registry.registerDocument('main.ts', '0', [{ sourcePosition: 0, text: 'fragment X on Query {' }]);
288+
registry.registerDocuments('main.ts', '0', [{ sourcePosition: 0, text: 'fragment X on Query {' }]);
289289

290290
expect(registry.getExternalFragments('fragment X on Query {', 'main.ts', 0)).toEqual([]);
291291
});
292292

293293
it('should return dependent fragment definitions', () => {
294294
const registry = new FragmentRegistry();
295-
registry.registerDocument('fragments.ts', '0', [
295+
registry.registerDocuments('fragments.ts', '0', [
296296
{
297297
sourcePosition: 0,
298298
text: `
@@ -310,7 +310,7 @@ describe(FragmentRegistry, () => {
310310
`,
311311
},
312312
]);
313-
registry.registerDocument('main.ts', '0', [
313+
registry.registerDocuments('main.ts', '0', [
314314
{ sourcePosition: 0, text: 'fragment FragmentB on Query { ...FragmentA }' },
315315
]);
316316

@@ -323,7 +323,7 @@ describe(FragmentRegistry, () => {
323323
it('should not use cached value when dependent fragment changes', () => {
324324
const logger = jest.fn();
325325
const registry = new FragmentRegistry({ logger });
326-
registry.registerDocument('fragments.ts', '0', [
326+
registry.registerDocuments('fragments.ts', '0', [
327327
{
328328
sourcePosition: 0,
329329
text: `
@@ -334,13 +334,13 @@ describe(FragmentRegistry, () => {
334334
},
335335
]);
336336

337-
registry.registerDocument('main.ts', '0', [
337+
registry.registerDocuments('main.ts', '0', [
338338
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA }' },
339339
]);
340340
registry.getExternalFragments('fragment FragmentX on Query { ...FragmentA }', 'main.ts', 0);
341341
expect(logger).toBeCalledTimes(0);
342342

343-
registry.registerDocument('fragments.ts', '1', [
343+
registry.registerDocuments('fragments.ts', '1', [
344344
{
345345
sourcePosition: 0,
346346
text: `
@@ -362,7 +362,7 @@ describe(FragmentRegistry, () => {
362362
it('should not use cached value when FragmentSpread set in target documentString changes', () => {
363363
const logger = jest.fn();
364364
const registry = new FragmentRegistry({ logger });
365-
registry.registerDocument('fragments.ts', '0', [
365+
registry.registerDocuments('fragments.ts', '0', [
366366
{
367367
sourcePosition: 0,
368368
text: `
@@ -380,14 +380,14 @@ describe(FragmentRegistry, () => {
380380
`,
381381
},
382382
]);
383-
registry.registerDocument('main.ts', '0', [
383+
registry.registerDocuments('main.ts', '0', [
384384
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA }' },
385385
]);
386386

387387
registry.getExternalFragments('fragment FragmentX on Query { ...FragmentA }', 'main.ts', 0);
388388
expect(logger).toBeCalledTimes(0);
389389

390-
registry.registerDocument('main.ts', '1', [
390+
registry.registerDocuments('main.ts', '1', [
391391
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA, ...FragmentB }' },
392392
]);
393393

@@ -404,7 +404,7 @@ describe(FragmentRegistry, () => {
404404
it('should not use cached value when FragmentDefinition set in target documentString changes', () => {
405405
const logger = jest.fn();
406406
const registry = new FragmentRegistry({ logger });
407-
registry.registerDocument('fragments.ts', '0', [
407+
registry.registerDocuments('fragments.ts', '0', [
408408
{
409409
sourcePosition: 0,
410410
text: `
@@ -414,14 +414,14 @@ describe(FragmentRegistry, () => {
414414
`,
415415
},
416416
]);
417-
registry.registerDocument('main.ts', '0', [
417+
registry.registerDocuments('main.ts', '0', [
418418
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA }' },
419419
]);
420420

421421
registry.getExternalFragments('fragment FragmentX on Query { ...FragmentA }', 'main.ts', 0);
422422
expect(logger).toBeCalledTimes(0);
423423

424-
registry.registerDocument('main.ts', '1', [
424+
registry.registerDocuments('main.ts', '1', [
425425
{
426426
sourcePosition: 0,
427427
text: `
@@ -451,7 +451,7 @@ describe(FragmentRegistry, () => {
451451
it('should use cached value', () => {
452452
const logger = jest.fn();
453453
const registry = new FragmentRegistry({ logger });
454-
registry.registerDocument('fragments.ts', '0', [
454+
registry.registerDocuments('fragments.ts', '0', [
455455
{
456456
sourcePosition: 0,
457457
text: `
@@ -469,14 +469,14 @@ describe(FragmentRegistry, () => {
469469
`,
470470
},
471471
]);
472-
registry.registerDocument('main.ts', '0', [
472+
registry.registerDocuments('main.ts', '0', [
473473
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA }' },
474474
]);
475475

476476
registry.getExternalFragments('fragment FragmentX on Query { ...FragmentA }', 'main.ts', 0);
477477
expect(logger).toBeCalledTimes(0);
478478

479-
registry.registerDocument('main.ts', '1', [
479+
registry.registerDocuments('main.ts', '1', [
480480
{ sourcePosition: 0, text: 'fragment FragmentX on Query { ...FragmentA, __typename }' },
481481
]);
482482

‎src/gql-ast-util/fragment-registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ export class FragmentRegistry {
362362
return externalFragments;
363363
}
364364

365-
registerDocument(
365+
registerDocuments(
366366
fileName: string,
367367
version: string,
368368
documentStrings: { text: string; sourcePosition: number }[],

‎src/graphql-language-service-adapter/testing/adapter-fixture.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ export class AdapterFixture {
4545
}
4646

4747
addFragment(fragmentDefDoc: string, sourceFileName = this._sourceFileName) {
48-
this._fragmentRegistry.registerDocument(sourceFileName, 'v1', [{ sourcePosition: 0, text: fragmentDefDoc }]);
48+
this._fragmentRegistry.registerDocuments(sourceFileName, 'v1', [{ sourcePosition: 0, text: fragmentDefDoc }]);
4949
}
5050
}

‎src/language-service-plugin/plugin-module-factory.ts

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,54 +26,38 @@ function create(info: ts.server.PluginCreateInfo): ts.LanguageService {
2626

2727
const fragmentRegistry = new FragmentRegistry({ logger });
2828
if (enabledGlobalFragments) {
29+
const handleAcquireOrUpdate = (fileName: string, sourceFile: ts.SourceFile, version: string) => {
30+
const templateLiteralNodes = findAllNodes(sourceFile, node => {
31+
if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) {
32+
return true;
33+
} else {
34+
return ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node);
35+
}
36+
}) as (ts.TaggedTemplateExpression | ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[];
37+
fragmentRegistry.registerDocuments(
38+
fileName,
39+
version,
40+
templateLiteralNodes.reduce(
41+
(acc, node) => [...acc, getShallowText(node)],
42+
[] as { text: string; sourcePosition: number }[],
43+
),
44+
);
45+
};
46+
2947
registerDocumentChangeEvent(
3048
// Note:
3149
// documentRegistry in ts.server.Project is annotated @internal
3250
(info.project as any).documentRegistry as ts.DocumentRegistry,
3351
{
3452
onAcquire: (fileName, sourceFile, version) => {
3553
if (!isExcluded(fileName) && info.languageServiceHost.getScriptFileNames().includes(fileName)) {
36-
// TODO remove before merge
37-
logger('acquire script ' + fileName + version);
38-
39-
const templateLiteralNodes = findAllNodes(sourceFile, node => {
40-
if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) {
41-
return true;
42-
} else {
43-
return ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node);
44-
}
45-
}) as (ts.TaggedTemplateExpression | ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[];
46-
fragmentRegistry.registerDocument(
47-
fileName,
48-
version,
49-
templateLiteralNodes.reduce(
50-
(acc, node) => [...acc, getShallowText(node)],
51-
[] as { text: string; sourcePosition: number }[],
52-
),
53-
);
54+
handleAcquireOrUpdate(fileName, sourceFile, version);
5455
}
5556
},
5657
onUpdate: (fileName, sourceFile, version) => {
5758
if (!isExcluded(fileName) && info.languageServiceHost.getScriptFileNames().includes(fileName)) {
5859
if (fragmentRegistry.getFileCurrentVersion(fileName) === version) return;
59-
// TODO remove before merge
60-
logger('update script ' + fileName + version);
61-
62-
const templateLiteralNodes = findAllNodes(sourceFile, node => {
63-
if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) {
64-
return true;
65-
} else {
66-
return ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node);
67-
}
68-
}) as (ts.TaggedTemplateExpression | ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[];
69-
fragmentRegistry.registerDocument(
70-
fileName,
71-
version,
72-
templateLiteralNodes.reduce(
73-
(acc, node) => [...acc, getShallowText(node)],
74-
[] as { text: string; sourcePosition: number }[],
75-
),
76-
);
60+
handleAcquireOrUpdate(fileName, sourceFile, version);
7761
}
7862
},
7963
onRelease: fileName => {

0 commit comments

Comments
 (0)