Skip to content

Commit 718f7c3

Browse files
authored
fix: extension entrypoints (#1219)
1 parent a54e411 commit 718f7c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+243
-213
lines changed

examples/30_gql/gql_gql-document-node.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
*/
44

55
import { parse } from 'graphql'
6-
import { Opentelemetry, Throws } from '../../src/entrypoints/extensions.js'
6+
import { Opentelemetry } from '../../src/entrypoints/extensions/opentelemetry/runtime.js'
7+
import { Throws } from '../../src/entrypoints/extensions/throws/runtime.js'
78
import { Graffle } from '../../src/entrypoints/main.js'
89
import { publicGraphQLSchemaEndpoints, show } from '../$/helpers.js'
910

examples/60_extension/extension_introspection__introspection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* This example shows how to use the Introspection extension to easily introspect your schema.
33
*/
44

5-
import { Introspection } from '../../src/entrypoints/extensions.js'
5+
import { Introspection } from '../../src/entrypoints/extensions/introspection/runtime.js'
66
import { Pokemon } from '../../tests/_/schemas/pokemon/graffle/__.js'
77
import { interceptAndShowUncaughtErrors, show } from '../$/show.js'
88

examples/60_extension/extension_opentelemetry__opentelemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'
22
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
3-
import { Opentelemetry } from '../../src/entrypoints/extensions.js'
3+
import { Opentelemetry } from '../../src/entrypoints/extensions/opentelemetry/runtime.js'
44
import { Pokemon } from '../../tests/_/schemas/pokemon/graffle/__.js'
55
import { interceptAndShowOutput, show } from '../$/helpers.js'
66

examples/60_extension/extension_throws__throws.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* This example shows how to use the Throws extension to throw errors for one-off cases.
33
*/
44

5-
import { Throws } from '../../src/entrypoints/extensions.js'
5+
import { Throws } from '../../src/entrypoints/extensions/throws/runtime.js'
66
import { Pokemon } from '../../tests/_/schemas/pokemon/graffle/__.js'
77
import { interceptAndShowUncaughtErrors, show } from '../$/show.js'
88

examples/__outputs__/10_transport-http/transport-http_extension_headers__dynamicHeaders.output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
headers: Headers {
55
accept: 'application/graphql-response+json; charset=utf-8, application/json; charset=utf-8',
66
'content-type': 'application/json',
7-
'x-sent-at-time': '1729696838476'
7+
'x-sent-at-time': '1729824583010'
88
},
99
signal: undefined,
1010
method: 'post',

examples/__outputs__/20_output/output_envelope.output.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
{ name: 'Weedle' }
1111
]
1212
},
13-
errors: undefined,
14-
extensions: undefined,
1513
response: Response {
1614
status: 200,
1715
statusText: 'OK',
1816
headers: Headers {
1917
'content-type': 'application/graphql-response+json; charset=utf-8',
2018
'content-length': '142',
21-
date: 'Wed, 23 Oct 2024 15:20:39 GMT',
19+
date: 'Fri, 25 Oct 2024 02:49:44 GMT',
2220
connection: 'keep-alive',
2321
'keep-alive': 'timeout=5'
2422
},

examples/__outputs__/60_extension/extension_opentelemetry__opentelemetry.output.txt

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
66
'telemetry.sdk.language': 'nodejs',
77
'telemetry.sdk.name': 'opentelemetry',
8-
'telemetry.sdk.version': '1.26.0'
8+
'telemetry.sdk.version': '1.27.0'
99
}
1010
},
1111
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
12-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
13-
parentId: 'fdbedbd147dc630c',
12+
traceId: '3b96fa441684458a1d46a660a7980d58',
13+
parentId: 'f1eb7799e82ca59a',
1414
traceState: undefined,
1515
name: 'encode',
16-
id: '4f8b5fccd96cc062',
16+
id: 'bb6b0c035e3cbc85',
1717
kind: 0,
18-
timestamp: 1729696839648000,
19-
duration: 1705.875,
18+
timestamp: 1729824584441000,
19+
duration: 1365.042,
2020
attributes: {},
2121
status: { code: 0 },
2222
events: [],
@@ -29,18 +29,18 @@
2929
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
3030
'telemetry.sdk.language': 'nodejs',
3131
'telemetry.sdk.name': 'opentelemetry',
32-
'telemetry.sdk.version': '1.26.0'
32+
'telemetry.sdk.version': '1.27.0'
3333
}
3434
},
3535
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
36-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
37-
parentId: 'fdbedbd147dc630c',
36+
traceId: '3b96fa441684458a1d46a660a7980d58',
37+
parentId: 'f1eb7799e82ca59a',
3838
traceState: undefined,
3939
name: 'pack',
40-
id: 'a2cb6c68bb391b81',
40+
id: '996cd2f8c264080a',
4141
kind: 0,
42-
timestamp: 1729696839652000,
43-
duration: 16711.541,
42+
timestamp: 1729824584444000,
43+
duration: 12774.667,
4444
attributes: {},
4545
status: { code: 0 },
4646
events: [],
@@ -53,18 +53,18 @@
5353
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
5454
'telemetry.sdk.language': 'nodejs',
5555
'telemetry.sdk.name': 'opentelemetry',
56-
'telemetry.sdk.version': '1.26.0'
56+
'telemetry.sdk.version': '1.27.0'
5757
}
5858
},
5959
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
60-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
61-
parentId: 'fdbedbd147dc630c',
60+
traceId: '3b96fa441684458a1d46a660a7980d58',
61+
parentId: 'f1eb7799e82ca59a',
6262
traceState: undefined,
6363
name: 'exchange',
64-
id: '95bc25186061869d',
64+
id: '3ad972c399fb8ec2',
6565
kind: 0,
66-
timestamp: 1729696839669000,
67-
duration: 21608.417,
66+
timestamp: 1729824584458000,
67+
duration: 21008.167,
6868
attributes: {},
6969
status: { code: 0 },
7070
events: [],
@@ -77,18 +77,18 @@
7777
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
7878
'telemetry.sdk.language': 'nodejs',
7979
'telemetry.sdk.name': 'opentelemetry',
80-
'telemetry.sdk.version': '1.26.0'
80+
'telemetry.sdk.version': '1.27.0'
8181
}
8282
},
8383
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
84-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
85-
parentId: 'fdbedbd147dc630c',
84+
traceId: '3b96fa441684458a1d46a660a7980d58',
85+
parentId: 'f1eb7799e82ca59a',
8686
traceState: undefined,
8787
name: 'unpack',
88-
id: 'f33a840d705729c6',
88+
id: 'bbdb7c3156b126e9',
8989
kind: 0,
90-
timestamp: 1729696839691000,
91-
duration: 1755.75,
90+
timestamp: 1729824584479000,
91+
duration: 1927.291,
9292
attributes: {},
9393
status: { code: 0 },
9494
events: [],
@@ -101,18 +101,18 @@
101101
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
102102
'telemetry.sdk.language': 'nodejs',
103103
'telemetry.sdk.name': 'opentelemetry',
104-
'telemetry.sdk.version': '1.26.0'
104+
'telemetry.sdk.version': '1.27.0'
105105
}
106106
},
107107
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
108-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
109-
parentId: 'fdbedbd147dc630c',
108+
traceId: '3b96fa441684458a1d46a660a7980d58',
109+
parentId: 'f1eb7799e82ca59a',
110110
traceState: undefined,
111111
name: 'decode',
112-
id: 'd5abeead8c05a053',
112+
id: 'e311421c9b0a3a5d',
113113
kind: 0,
114-
timestamp: 1729696839693000,
115-
duration: 313.709,
114+
timestamp: 1729824584481000,
115+
duration: 221.916,
116116
attributes: {},
117117
status: { code: 0 },
118118
events: [],
@@ -125,18 +125,18 @@
125125
'service.name': 'unknown_service:/Users/jasonkuhrt/Library/pnpm/nodejs/22.7.0/bin/node',
126126
'telemetry.sdk.language': 'nodejs',
127127
'telemetry.sdk.name': 'opentelemetry',
128-
'telemetry.sdk.version': '1.26.0'
128+
'telemetry.sdk.version': '1.27.0'
129129
}
130130
},
131131
instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
132-
traceId: '9d3e044ef7452a5b0e773ac8a7e6c8bd',
132+
traceId: '3b96fa441684458a1d46a660a7980d58',
133133
parentId: undefined,
134134
traceState: undefined,
135135
name: 'request',
136-
id: 'fdbedbd147dc630c',
136+
id: 'f1eb7799e82ca59a',
137137
kind: 0,
138-
timestamp: 1729696839647000,
139-
duration: 46403,
138+
timestamp: 1729824584440000,
139+
duration: 40916.625,
140140
attributes: {},
141141
status: { code: 0 },
142142
events: [],

package.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,34 @@
1818
"default": "./build/entrypoints/generator.js"
1919
}
2020
},
21-
"./extensions": {
21+
"./extensions/upload": {
2222
"import": {
23-
"default": "./build/entrypoints/extensions.js"
23+
"default": "./build/entrypoints/extensions/upload/runtime.js"
24+
}
25+
},
26+
"./extensions/throws": {
27+
"import": {
28+
"default": "./build/entrypoints/extensions/throws/runtime.js"
29+
}
30+
},
31+
"./extensions/opentelemetry": {
32+
"import": {
33+
"default": "./build/entrypoints/extensions/opentelemetry/runtime.js"
34+
}
35+
},
36+
"./extensions/introspection": {
37+
"import": {
38+
"default": "./build/entrypoints/extensions/introspection/runtime.js"
39+
}
40+
},
41+
"./extensions/schema-errors": {
42+
"import": {
43+
"default": "./build/entrypoints/extensions/schema-errors/runtime.js"
44+
}
45+
},
46+
"./extensions/schema-errors/generator": {
47+
"import": {
48+
"default": "./build/entrypoints/extensions/schema-errors/gentime.js"
2449
}
2550
},
2651
"./client": {

scripts/generate-examples-derivatives/generate-docs.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ const generateExampleLinksSnippets = async (examplesTransformed: ExampleTransfor
131131
const transformRewriteGraffleImports = (example: Example) => {
132132
const newContent = example.file.content
133133
.replaceAll(/from '.+\/tests\/_\/schemas\/(.*)\/graffle\/(.+)\.js'/g, `from './$1/$2.js'`)
134+
.replaceAll(
135+
/from '.*entrypoints\/extensions\/(.*?)\/runtime.js'/g,
136+
`from 'graffle/extensions/$1'`,
137+
)
138+
.replaceAll(
139+
/from '.*entrypoints\/extensions\/(.*?)\/gentime.js'/g,
140+
`from 'graffle/extensions/$1/generator'`,
141+
)
134142
.replaceAll(
135143
/from '.*entrypoints\/main.js'/g,
136144
`from 'graffle'`,

src/entrypoints/extensions.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)