@stepzen/transpiler 0.28.0 → 0.29.0-beta.1

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.
@@ -1 +1 @@
1
- {"version":3,"file":"merge-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/merge-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,aAAa,EAAQ,MAAM,SAAS,CAAA;AAgBnD,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAQ/C,CAAA;AAED,eAAO,MAAM,0BAA0B,WAAY,MAAM,QAAQ,MAAM,WAStE,CAAA;AAED,eAAO,MAAM,yBAAyB,SAC9B,MAAM,SACL,GAAG,KACT,OAcF,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,MAAM,SAAS,GAAG,KAAG,OAc3D,CAAA;AAED,eAAO,MAAM,gBAAgB,gBACd,MAAM,EAAE,WACb,OAAO,YACN,GAAG,KACX,QAAQ,MAAM,GAAG,OAAO,CA6B1B,CAAA;AAED,eAAO,MAAM,aAAa,QAAa,QAAQ,MAAM,CAuBpD,CAAA;AAED,eAAO,MAAM,SAAS,cACT,MAAM,cACL,MAAM,KACjB,QAAQ,aAAa,CAGvB,CAAA;AAED,eAAO,MAAM,4BAA4B,SAAU,GAAG,SAAS,GAAG,QAiBjE,CAAA;AAED,eAAO,MAAM,mBAAmB,SAAU,GAAG,SAAS,GAAG,QAmBxD,CAAA;AAED,eAAO,MAAM,6BAA6B,SAAU,MAAM,SAAS,GAAG,QAcrE,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,SAAS,GAAG,QAc5D,CAAA"}
1
+ {"version":3,"file":"merge-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/merge-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,aAAa,EAAc,MAAM,SAAS,CAAA;AAgBlE,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAQ/C,CAAA;AAED,eAAO,MAAM,0BAA0B,WAAY,MAAM,QAAQ,MAAM,WAStE,CAAA;AAgBD,eAAO,MAAM,yBAAyB,SAC9B,MAAM,SACL,GAAG,KACT,OAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,MAAM,SAAS,GAAG,KAAG,OAc3D,CAAA;AAED,eAAO,MAAM,gBAAgB,gBACd,MAAM,EAAE,WACb,OAAO,YACN,GAAG,KACX,QAAQ,MAAM,GAAG,OAAO,CA6B1B,CAAA;AAED,eAAO,MAAM,aAAa,QAAa,QAAQ,MAAM,CAuBpD,CAAA;AAED,eAAO,MAAM,SAAS,cACT,MAAM,cACL,MAAM,KACjB,QAAQ,aAAa,CAGvB,CAAA;AAED,eAAO,MAAM,4BAA4B,SAAU,GAAG,SAAS,GAAG,QAoBjE,CAAA;AAED,eAAO,MAAM,mBAAmB,SAAU,GAAG,SAAS,GAAG,QAmBxD,CAAA;AAED,eAAO,MAAM,6BAA6B,SAAU,MAAM,SAAS,GAAG,QAiBrE,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,SAAS,GAAG,QAc5D,CAAA"}
@@ -33,12 +33,21 @@ const findNextAvailableSubfolder = (folder, name) => {
33
33
  return subfolder;
34
34
  };
35
35
  exports.findNextAvailableSubfolder = findNextAvailableSubfolder;
36
+ const isQueryMutationSubscription = (ancestors) => {
37
+ if (Array.isArray(ancestors[ancestors.length - 1])) {
38
+ return false;
39
+ }
40
+ const ancestor = ancestors[ancestors.length - 1];
41
+ return (ancestor.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION &&
42
+ ['Query', 'Mutation', 'Subscription'].includes(ancestor.name.value));
43
+ };
36
44
  const findQueryMutationInSchema = (name, files) => {
37
45
  for (const file of files) {
38
46
  let found = false;
39
47
  (0, graphql_1.visit)(file.ast, {
40
- FieldDefinition(node) {
41
- if (node.name.value === name) {
48
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
49
+ if (isQueryMutationSubscription(ancestors) &&
50
+ node.name.value === name) {
42
51
  found = true;
43
52
  return graphql_1.BREAK;
44
53
  }
@@ -115,8 +124,9 @@ const mergeQueryMutationIntoSchema = (type, files) => {
115
124
  return {
116
125
  ...file,
117
126
  ast: (0, graphql_1.visit)(file.ast, {
118
- FieldDefinition(node) {
119
- if (node.name.value === type.name.value) {
127
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
128
+ if (isQueryMutationSubscription(ancestors) &&
129
+ node.name.value === type.name.value) {
120
130
  const directives = (0, graphql_helpers_1.cloneDeep)(type.directives);
121
131
  const mutated = (0, graphql_helpers_1.cloneDeep)(node);
122
132
  mutated.directives = directives;
@@ -155,8 +165,9 @@ const removeQueryMutationFromSchema = (name, files) => {
155
165
  return {
156
166
  ...file,
157
167
  ast: (0, graphql_1.visit)(file.ast, {
158
- FieldDefinition(node) {
159
- if (node.name.value === name) {
168
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
169
+ if (isQueryMutationSubscription(ancestors) &&
170
+ node.name.value === name) {
160
171
  return null;
161
172
  }
162
173
  },
@@ -1 +1 @@
1
- {"version":3,"file":"merge-helpers.js","sourceRoot":"","sources":["../../src/utils/merge-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-helpers.js","sourceRoot":"","sources":["../../src/utils/merge-helpers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@stepzen/transpiler",
3
3
  "description": "The StepZen transpiler",
4
- "version": "0.28.0",
4
+ "version": "0.29.0-beta.1",
5
5
  "author": "Darren Waddell <darren@stepzen.com>",
6
6
  "license": "MIT",
7
7
  "files": [
@@ -23,7 +23,7 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@graphql-tools/merge": "^8.3.15",
26
- "@stepzen/fetch": "0.28.0",
26
+ "@stepzen/fetch": "0.29.0-beta.1",
27
27
  "debug": "^4.3.4",
28
28
  "dotenv": "^16.0.3",
29
29
  "fs-extra": "^9.1.0",
@@ -55,5 +55,5 @@
55
55
  "nyc": "^14.1.1",
56
56
  "ts-node": "^10.8.2"
57
57
  },
58
- "gitHead": "b6c6d589ede7e599ff8892ab724dc544680fb4cf"
58
+ "gitHead": "ea73e1a1145ddb5f91463414e6c6ed9946bb4f2b"
59
59
  }
@@ -1,5 +1,5 @@
1
1
  import * as debug from 'debug'
2
- import {BREAK, GraphQLSchema, visit} from 'graphql'
2
+ import {ASTNode, BREAK, GraphQLSchema, Kind, visit} from 'graphql'
3
3
  import {buildSchema} from 'graphql/utilities'
4
4
  import fetch from '@stepzen/fetch'
5
5
  import * as fsx from 'fs-extra'
@@ -36,6 +36,20 @@ export const findNextAvailableSubfolder = (folder: string, name: string) => {
36
36
  return subfolder
37
37
  }
38
38
 
39
+ const isQueryMutationSubscription = (
40
+ ancestors: readonly (ASTNode | readonly ASTNode[])[],
41
+ ) => {
42
+ if (Array.isArray(ancestors[ancestors.length - 1])) {
43
+ return false
44
+ }
45
+
46
+ const ancestor = ancestors[ancestors.length - 1] as ASTNode
47
+ return (
48
+ ancestor.kind === Kind.OBJECT_TYPE_DEFINITION &&
49
+ ['Query', 'Mutation', 'Subscription'].includes(ancestor.name.value)
50
+ )
51
+ }
52
+
39
53
  export const findQueryMutationInSchema = (
40
54
  name: string,
41
55
  files: any,
@@ -43,8 +57,11 @@ export const findQueryMutationInSchema = (
43
57
  for (const file of files) {
44
58
  let found = false
45
59
  visit(file.ast, {
46
- FieldDefinition(node) {
47
- if (node.name.value === name) {
60
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
61
+ if (
62
+ isQueryMutationSubscription(ancestors) &&
63
+ node.name.value === name
64
+ ) {
48
65
  found = true
49
66
  return BREAK
50
67
  }
@@ -144,8 +161,11 @@ export const mergeQueryMutationIntoSchema = (type: any, files: any) => {
144
161
  return {
145
162
  ...file,
146
163
  ast: visit(file.ast, {
147
- FieldDefinition(node) {
148
- if (node.name.value === type.name.value) {
164
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
165
+ if (
166
+ isQueryMutationSubscription(ancestors) &&
167
+ node.name.value === type.name.value
168
+ ) {
149
169
  const directives = cloneDeep(type.directives)
150
170
  const mutated: any = cloneDeep(node)
151
171
  mutated.directives = directives
@@ -184,8 +204,11 @@ export const removeQueryMutationFromSchema = (name: string, files: any) => {
184
204
  return {
185
205
  ...file,
186
206
  ast: visit(file.ast, {
187
- FieldDefinition(node) {
188
- if (node.name.value === name) {
207
+ FieldDefinition(node, _key, _parent, _path, ancestors) {
208
+ if (
209
+ isQueryMutationSubscription(ancestors) &&
210
+ node.name.value === name
211
+ ) {
189
212
  return null
190
213
  }
191
214
  },