@aws-amplify/graphql-api-construct 1.1.2 → 1.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (109) hide show
  1. package/.jsii +34 -34
  2. package/CHANGELOG.md +4 -0
  3. package/lib/amplify-graphql-api.d.ts +4 -0
  4. package/lib/amplify-graphql-api.js +10 -2
  5. package/lib/amplify-graphql-definition.js +1 -1
  6. package/lib/internal/authorization-modes.d.ts +5 -0
  7. package/lib/internal/authorization-modes.js +15 -2
  8. package/node_modules/@aws-amplify/backend-output-schemas/lib/graphql/index.d.ts +10 -0
  9. package/node_modules/@aws-amplify/backend-output-schemas/lib/graphql/v1.d.ts +10 -0
  10. package/node_modules/@aws-amplify/backend-output-schemas/lib/graphql/v1.js +2 -0
  11. package/node_modules/@aws-amplify/backend-output-schemas/lib/index.d.ts +50 -0
  12. package/node_modules/@aws-amplify/backend-output-schemas/lib/index.js +6 -2
  13. package/node_modules/@aws-amplify/backend-output-schemas/lib/stack/index.d.ts +23 -0
  14. package/node_modules/@aws-amplify/backend-output-schemas/lib/stack/index.js +12 -0
  15. package/node_modules/@aws-amplify/backend-output-schemas/lib/stack/v1.d.ts +22 -0
  16. package/node_modules/@aws-amplify/backend-output-schemas/lib/stack/v1.js +14 -0
  17. package/node_modules/@aws-amplify/backend-output-schemas/package.json +3 -2
  18. package/node_modules/@aws-amplify/backend-output-storage/lib/stack_metadata_output_storage_strategy.d.ts +0 -4
  19. package/node_modules/@aws-amplify/backend-output-storage/lib/stack_metadata_output_storage_strategy.js +1 -13
  20. package/node_modules/@aws-amplify/backend-output-storage/package.json +3 -2
  21. package/node_modules/@aws-amplify/graphql-auth-transformer/API.md +2 -4
  22. package/node_modules/@aws-amplify/graphql-auth-transformer/CHANGELOG.md +6 -0
  23. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/field.d.ts.map +1 -1
  24. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/field.js +1 -1
  25. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/field.js.map +1 -1
  26. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/helpers.d.ts +3 -3
  27. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/helpers.d.ts.map +1 -1
  28. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/helpers.js +8 -9
  29. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/helpers.js.map +1 -1
  30. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.create.d.ts.map +1 -1
  31. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.create.js +5 -5
  32. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.create.js.map +1 -1
  33. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.delete.d.ts.map +1 -1
  34. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.delete.js +4 -4
  35. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.delete.js.map +1 -1
  36. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.update.d.ts.map +1 -1
  37. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.update.js +5 -5
  38. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/mutation.update.js.map +1 -1
  39. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/query.d.ts.map +1 -1
  40. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/query.js +2 -2
  41. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/query.js.map +1 -1
  42. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/search.d.ts.map +1 -1
  43. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/search.js +4 -4
  44. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/search.js.map +1 -1
  45. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/subscriptions.js +1 -1
  46. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/resolvers/subscriptions.js.map +1 -1
  47. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/definitions.d.ts +1 -2
  48. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/definitions.d.ts.map +1 -1
  49. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/definitions.js.map +1 -1
  50. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/index.d.ts.map +1 -1
  51. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/index.js +1 -2
  52. package/node_modules/@aws-amplify/graphql-auth-transformer/lib/utils/index.js.map +1 -1
  53. package/node_modules/@aws-amplify/graphql-auth-transformer/package.json +9 -9
  54. package/node_modules/@aws-amplify/graphql-default-value-transformer/CHANGELOG.md +4 -0
  55. package/node_modules/@aws-amplify/graphql-default-value-transformer/LICENSE +201 -0
  56. package/node_modules/@aws-amplify/graphql-default-value-transformer/package.json +7 -6
  57. package/node_modules/@aws-amplify/graphql-function-transformer/CHANGELOG.md +4 -0
  58. package/node_modules/@aws-amplify/graphql-function-transformer/LICENSE +201 -0
  59. package/node_modules/@aws-amplify/graphql-function-transformer/package.json +6 -5
  60. package/node_modules/@aws-amplify/graphql-http-transformer/CHANGELOG.md +4 -0
  61. package/node_modules/@aws-amplify/graphql-http-transformer/LICENSE +201 -0
  62. package/node_modules/@aws-amplify/graphql-http-transformer/package.json +6 -5
  63. package/node_modules/@aws-amplify/graphql-index-transformer/CHANGELOG.md +4 -0
  64. package/node_modules/@aws-amplify/graphql-index-transformer/LICENSE +201 -0
  65. package/node_modules/@aws-amplify/graphql-index-transformer/package.json +7 -6
  66. package/node_modules/@aws-amplify/graphql-maps-to-transformer/CHANGELOG.md +4 -0
  67. package/node_modules/@aws-amplify/graphql-maps-to-transformer/LICENSE +201 -0
  68. package/node_modules/@aws-amplify/graphql-maps-to-transformer/lib/assets/mapping-lambda.zip +0 -0
  69. package/node_modules/@aws-amplify/graphql-maps-to-transformer/package.json +10 -9
  70. package/node_modules/@aws-amplify/graphql-model-transformer/CHANGELOG.md +4 -0
  71. package/node_modules/@aws-amplify/graphql-model-transformer/LICENSE +201 -0
  72. package/node_modules/@aws-amplify/graphql-model-transformer/lib/rds-lambda.zip +0 -0
  73. package/node_modules/@aws-amplify/graphql-model-transformer/lib/rds-notification-lambda.zip +0 -0
  74. package/node_modules/@aws-amplify/graphql-model-transformer/lib/rds-patching-lambda.zip +0 -0
  75. package/node_modules/@aws-amplify/graphql-model-transformer/package.json +6 -5
  76. package/node_modules/@aws-amplify/graphql-predictions-transformer/CHANGELOG.md +4 -0
  77. package/node_modules/@aws-amplify/graphql-predictions-transformer/LICENSE +201 -0
  78. package/node_modules/@aws-amplify/graphql-predictions-transformer/lib/predictionsLambdaFunction.zip +0 -0
  79. package/node_modules/@aws-amplify/graphql-predictions-transformer/package.json +6 -5
  80. package/node_modules/@aws-amplify/graphql-relational-transformer/CHANGELOG.md +4 -0
  81. package/node_modules/@aws-amplify/graphql-relational-transformer/LICENSE +201 -0
  82. package/node_modules/@aws-amplify/graphql-relational-transformer/package.json +8 -7
  83. package/node_modules/@aws-amplify/graphql-searchable-transformer/CHANGELOG.md +6 -0
  84. package/node_modules/@aws-amplify/graphql-searchable-transformer/LICENSE +201 -0
  85. package/node_modules/@aws-amplify/graphql-searchable-transformer/lib/streaming-lambda.zip +0 -0
  86. package/node_modules/@aws-amplify/graphql-searchable-transformer/package.json +7 -6
  87. package/node_modules/@aws-amplify/graphql-transformer/CHANGELOG.md +6 -0
  88. package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.d.ts.map +1 -1
  89. package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.js +10 -5
  90. package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.js.map +1 -1
  91. package/node_modules/@aws-amplify/graphql-transformer/package.json +14 -14
  92. package/node_modules/@aws-amplify/graphql-transformer/src/graphql-transformer.ts +9 -2
  93. package/node_modules/@aws-amplify/graphql-transformer-core/CHANGELOG.md +6 -0
  94. package/node_modules/@aws-amplify/graphql-transformer-core/LICENSE +201 -0
  95. package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/resolver.d.ts.map +1 -1
  96. package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/resolver.js +19 -7
  97. package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/resolver.js.map +1 -1
  98. package/node_modules/@aws-amplify/graphql-transformer-core/package.json +4 -3
  99. package/node_modules/@aws-amplify/graphql-transformer-interfaces/API.md +2 -0
  100. package/node_modules/@aws-amplify/graphql-transformer-interfaces/CHANGELOG.md +6 -0
  101. package/node_modules/@aws-amplify/graphql-transformer-interfaces/LICENSE +201 -0
  102. package/node_modules/@aws-amplify/graphql-transformer-interfaces/lib/transformer-context/synth-parameters.d.ts +2 -0
  103. package/node_modules/@aws-amplify/graphql-transformer-interfaces/lib/transformer-context/synth-parameters.d.ts.map +1 -1
  104. package/node_modules/@aws-amplify/graphql-transformer-interfaces/package.json +3 -2
  105. package/node_modules/@aws-amplify/graphql-transformer-interfaces/src/transformer-context/synth-parameters.ts +2 -0
  106. package/node_modules/@aws-amplify/graphql-transformer-interfaces/tsconfig.tsbuildinfo +1 -1
  107. package/package.json +17 -17
  108. package/src/amplify-graphql-api.ts +17 -0
  109. package/src/internal/authorization-modes.ts +18 -0
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2017 - 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-searchable-transformer",
3
- "version": "2.2.1",
3
+ "version": "2.2.2",
4
4
  "description": "Amplfy GraphQL @searchable transformer",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,9 +28,9 @@
28
28
  "extract-api": "ts-node ../../scripts/extract-api.ts"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-model-transformer": "2.2.1",
32
- "@aws-amplify/graphql-transformer-core": "2.2.1",
33
- "@aws-amplify/graphql-transformer-interfaces": "3.2.0",
31
+ "@aws-amplify/graphql-model-transformer": "2.2.2",
32
+ "@aws-amplify/graphql-transformer-core": "2.2.2",
33
+ "@aws-amplify/graphql-transformer-interfaces": "3.2.1",
34
34
  "graphql": "^15.5.0",
35
35
  "graphql-mapping-template": "4.20.12",
36
36
  "graphql-transformer-common": "4.25.1"
@@ -40,7 +40,7 @@
40
40
  "constructs": "^10.0.5"
41
41
  },
42
42
  "devDependencies": {
43
- "@aws-amplify/graphql-transformer-test-utils": "0.2.4",
43
+ "@aws-amplify/graphql-transformer-test-utils": "0.2.5",
44
44
  "@types/node": "^12.12.6"
45
45
  },
46
46
  "jest": {
@@ -68,5 +68,6 @@
68
68
  "modulePathIgnorePatterns": [
69
69
  "overrides"
70
70
  ]
71
- }
71
+ },
72
+ "gitHead": "58c67c5534f7838371ef64b5ee23f2f406817f70"
72
73
  }
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.2.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.2...@aws-amplify/graphql-transformer@1.2.3) (2023-10-05)
7
+
8
+ ### Bug Fixes
9
+
10
+ - iam auth values can be passed as cdk tokens ([#1919](https://github.com/aws-amplify/amplify-category-api/issues/1919)) ([9297fa5](https://github.com/aws-amplify/amplify-category-api/commit/9297fa5cda87697645ad0c78b84c3004b32ac319))
11
+
6
12
  ## [1.2.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.1...@aws-amplify/graphql-transformer@1.2.2) (2023-10-03)
7
13
 
8
14
  **Note:** Version bump only for package @aws-amplify/graphql-transformer
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA0BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAwB5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,kCAAkC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACvE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IAkCjE,CAAC"}
1
+ {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA0BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAwB5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,kCAAkC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACvE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IAyCjE,CAAC"}
@@ -14,10 +14,10 @@ const graphql_searchable_transformer_1 = require("@aws-amplify/graphql-searchabl
14
14
  const graphql_transformer_interfaces_1 = require("@aws-amplify/graphql-transformer-interfaces");
15
15
  const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
16
16
  const constructTransformerChain = (options) => {
17
- var _a, _b;
17
+ var _a;
18
18
  const modelTransformer = new graphql_model_transformer_1.ModelTransformer();
19
19
  const authTransformer = new graphql_auth_transformer_1.AuthTransformer({
20
- adminRoles: (_a = options === null || options === void 0 ? void 0 : options.adminRoles) !== null && _a !== void 0 ? _a : [],
20
+ adminRoles: options === null || options === void 0 ? void 0 : options.adminRoles,
21
21
  identityPoolId: options === null || options === void 0 ? void 0 : options.identityPoolId,
22
22
  });
23
23
  const indexTransformer = new graphql_index_transformer_1.IndexTransformer();
@@ -37,7 +37,7 @@ const constructTransformerChain = (options) => {
37
37
  authTransformer,
38
38
  new graphql_maps_to_transformer_1.MapsToTransformer(),
39
39
  new graphql_searchable_transformer_1.SearchableModelTransformer(),
40
- ...((_b = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _b !== void 0 ? _b : []),
40
+ ...((_a = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _a !== void 0 ? _a : []),
41
41
  ];
42
42
  };
43
43
  exports.constructTransformerChain = constructTransformerChain;
@@ -76,7 +76,12 @@ const defaultPrintTransformerLog = (log) => {
76
76
  };
77
77
  exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
78
78
  const executeTransform = (config) => {
79
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, parameterProvider, } = config;
79
+ const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, parameterProvider, transformersFactoryArgs, } = config;
80
+ const mergedSynthParameters = {
81
+ ...synthParameters,
82
+ ...(transformersFactoryArgs.adminRoles ? { adminRoles: transformersFactoryArgs.adminRoles } : {}),
83
+ ...(transformersFactoryArgs.identityPoolId ? { identityPoolId: transformersFactoryArgs.identityPoolId } : {}),
84
+ };
80
85
  const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
81
86
  const transform = (0, exports.constructTransform)(config);
82
87
  try {
@@ -85,7 +90,7 @@ const executeTransform = (config) => {
85
90
  nestedStackProvider,
86
91
  parameterProvider,
87
92
  assetProvider,
88
- synthParameters,
93
+ synthParameters: mergedSynthParameters,
89
94
  schema,
90
95
  datasourceConfig: {
91
96
  modelToDatasourceMap,
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":";;;AAAA,oFAAwE;AACxE,sGAAyF;AACzF,4FAAgF;AAChF,oFAAwE;AACxE,sFAAiG;AACjG,0FAA6E;AAC7E,sFAA0E;AAC1E,kGAAsF;AACtF,gGAKqD;AACrD,gGAAyF;AACzF,gGAWqD;AAErD,oFAM+C;AA+BxC,MAAM,yBAAyB,GAAG,CAAC,OAAgC,EAA+B,EAAE;;IACzG,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,0CAAe,CAAC;QAC1C,UAAU,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,mCAAI,EAAE;QACrC,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;KACxC,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAI,kDAAiB,EAAE,CAAC;IAElD,OAAO;QACL,gBAAgB;QAChB,IAAI,kDAAmB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,CAAC;QACjD,IAAI,0CAAe,EAAE;QACrB,IAAI,wDAAsB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;QAClD,IAAI,iDAAqB,EAAE;QAC3B,gBAAgB;QAChB,IAAI,mDAAkB,EAAE;QACxB,iBAAiB;QACjB,IAAI,sDAAqB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,CAAC;QACjG,IAAI,qDAAoB,EAAE;QAC1B,IAAI,2DAAuB,EAAE;QAC7B,eAAe;QACf,IAAI,+CAAiB,EAAE;QACvB,IAAI,2DAA0B,EAAE;QAChC,GAAG,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,mCAAI,EAAE,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,yBAAyB,6BA0BpC;AAOK,MAAM,kBAAkB,GAAG,CAAC,MAAuB,EAAoB,EAAE;IAC9E,MAAM,EACJ,uBAAuB,EACvB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,GAAG,MAAM,CAAC;IAEX,MAAM,YAAY,GAAG,IAAA,iCAAyB,EAAC,uBAAuB,CAAC,CAAC;IAExE,OAAO,IAAI,2CAAgB,CAAC;QAC1B,YAAY;QACZ,YAAY;QACZ,UAAU;QACV,mBAAmB;QACnB,gBAAgB;QAChB,cAAc;QACd,kBAAkB;QAClB,eAAe;KAChB,CAAC,CAAC;AACL,CAAC,CAAC;AAxBW,QAAA,kBAAkB,sBAwB7B;AAoBK,MAAM,0BAA0B,GAAG,CAAC,GAAmB,EAAQ,EAAE;IACtE,QAAQ,GAAG,CAAC,KAAK,EAAE;QACjB,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR;YACE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC9B;AACH,CAAC,CAAC;AAjBW,QAAA,0BAA0B,8BAiBrC;AAOK,MAAM,gBAAgB,GAAG,CAAC,MAA8B,EAAQ,EAAE;IACvE,MAAM,EACJ,MAAM,EACN,oBAAoB,EACpB,kCAAkC,EAClC,mBAAmB,EACnB,eAAe,EACf,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,GAClB,GAAG,MAAM,CAAC;IAEX,MAAM,QAAQ,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,kCAA0B,CAAC;IACnE,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IAE7C,IAAI;QACF,SAAS,CAAC,SAAS,CAAC;YAClB,KAAK;YACL,mBAAmB;YACnB,iBAAiB;YACjB,aAAa;YACb,eAAe;YACf,MAAM;YACN,gBAAgB,EAAE;gBAChB,oBAAoB;gBACpB,kCAAkC;gBAClC,eAAe;aAChB;SACF,CAAC,CAAC;KACJ;YAAS;QACR,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AAlCW,QAAA,gBAAgB,oBAkC3B"}
1
+ {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-transformer",
3
- "version": "1.2.2",
3
+ "version": "1.2.3",
4
4
  "description": "Amplify GraphQL Transformer Root Package",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,18 +28,18 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-auth-transformer": "3.1.6",
32
- "@aws-amplify/graphql-default-value-transformer": "2.1.5",
33
- "@aws-amplify/graphql-function-transformer": "2.1.4",
34
- "@aws-amplify/graphql-http-transformer": "2.1.4",
35
- "@aws-amplify/graphql-index-transformer": "2.1.5",
36
- "@aws-amplify/graphql-maps-to-transformer": "3.2.2",
37
- "@aws-amplify/graphql-model-transformer": "2.2.1",
38
- "@aws-amplify/graphql-predictions-transformer": "2.1.4",
39
- "@aws-amplify/graphql-relational-transformer": "2.1.5",
40
- "@aws-amplify/graphql-searchable-transformer": "2.2.1",
41
- "@aws-amplify/graphql-transformer-core": "2.2.1",
42
- "@aws-amplify/graphql-transformer-interfaces": "3.2.0"
31
+ "@aws-amplify/graphql-auth-transformer": "3.1.7",
32
+ "@aws-amplify/graphql-default-value-transformer": "2.1.6",
33
+ "@aws-amplify/graphql-function-transformer": "2.1.5",
34
+ "@aws-amplify/graphql-http-transformer": "2.1.5",
35
+ "@aws-amplify/graphql-index-transformer": "2.1.6",
36
+ "@aws-amplify/graphql-maps-to-transformer": "3.2.3",
37
+ "@aws-amplify/graphql-model-transformer": "2.2.2",
38
+ "@aws-amplify/graphql-predictions-transformer": "2.1.5",
39
+ "@aws-amplify/graphql-relational-transformer": "2.1.6",
40
+ "@aws-amplify/graphql-searchable-transformer": "2.2.2",
41
+ "@aws-amplify/graphql-transformer-core": "2.2.2",
42
+ "@aws-amplify/graphql-transformer-interfaces": "3.2.1"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@types/node": "^12.12.6",
@@ -74,5 +74,5 @@
74
74
  }
75
75
  }
76
76
  },
77
- "gitHead": "185090987e9c49db5e59aa4476dad7e17e9d2067"
77
+ "gitHead": "58c67c5534f7838371ef64b5ee23f2f406817f70"
78
78
  }
@@ -66,7 +66,7 @@ export type TransformConfig = {
66
66
  export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
67
67
  const modelTransformer = new ModelTransformer();
68
68
  const authTransformer = new AuthTransformer({
69
- adminRoles: options?.adminRoles ?? [],
69
+ adminRoles: options?.adminRoles,
70
70
  identityPoolId: options?.identityPoolId,
71
71
  });
72
72
  const indexTransformer = new IndexTransformer();
@@ -176,8 +176,15 @@ export const executeTransform = (config: ExecuteTransformConfig): void => {
176
176
  assetProvider,
177
177
  synthParameters,
178
178
  parameterProvider,
179
+ transformersFactoryArgs,
179
180
  } = config;
180
181
 
182
+ const mergedSynthParameters = {
183
+ ...synthParameters,
184
+ ...(transformersFactoryArgs.adminRoles ? { adminRoles: transformersFactoryArgs.adminRoles } : {}),
185
+ ...(transformersFactoryArgs.identityPoolId ? { identityPoolId: transformersFactoryArgs.identityPoolId } : {}),
186
+ };
187
+
181
188
  const printLog = printTransformerLog ?? defaultPrintTransformerLog;
182
189
  const transform = constructTransform(config);
183
190
 
@@ -187,7 +194,7 @@ export const executeTransform = (config: ExecuteTransformConfig): void => {
187
194
  nestedStackProvider,
188
195
  parameterProvider,
189
196
  assetProvider,
190
- synthParameters,
197
+ synthParameters: mergedSynthParameters,
191
198
  schema,
192
199
  datasourceConfig: {
193
200
  modelToDatasourceMap,
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.2.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer-core@2.2.1...@aws-amplify/graphql-transformer-core@2.2.2) (2023-10-05)
7
+
8
+ ### Bug Fixes
9
+
10
+ - iam auth values can be passed as cdk tokens ([#1919](https://github.com/aws-amplify/amplify-category-api/issues/1919)) ([9297fa5](https://github.com/aws-amplify/amplify-category-api/commit/9297fa5cda87697645ad0c78b84c3004b32ac319))
11
+
6
12
  ## [2.2.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer-core@2.2.0...@aws-amplify/graphql-transformer-core@2.2.1) (2023-10-02)
7
13
 
8
14
  ### Bug Fixes
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright 2017 - 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
@@ -1 +1 @@
1
- {"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/transformer-context/resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,EAC1B,2BAA2B,EAC3B,mCAAmC,EACpC,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAA4B,KAAK,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAMvC,KAAK,IAAI,GAAG;IACV,sBAAsB,CAAC,EAAE,uBAAuB,CAAC;IACjD,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAQF,qBAAa,eAAgB,YAAW,mCAAmC;IACzE,OAAO,CAAC,SAAS,CAAuD;IAExE,qBAAqB,aACT,MAAM,aACL,MAAM,qBACE,MAAM,cACb,kBAAkB,0BACN,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CAUlB;IAEJ,wBAAwB,aACZ,MAAM,aACL,MAAM,qBACE,MAAM,cACb,kBAAkB,0BACN,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CAUlB;IAEJ,4BAA4B,aAChB,MAAM,aACL,MAAM,qBACE,MAAM,0BACD,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CASlB;IAEJ,WAAW,aAAc,MAAM,aAAa,MAAM,YAAY,2BAA2B,KAAG,2BAA2B,CAOrH;IAGF,WAAW,aAAc,MAAM,aAAa,MAAM,KAAG,2BAA2B,GAAG,SAAS,CAK1F;IAEF,WAAW,aAAc,MAAM,aAAa,MAAM,KAAG,OAAO,CAG1D;IAEF,cAAc,aAAc,MAAM,aAAa,MAAM,KAAG,2BAA2B,CAQjF;IAEF,gBAAgB,QAAO,IAAI,MAAM,EAAE,2BAA2B,CAAC,CAAsC;CACtG;AAID,qBAAa,mBAAoB,YAAW,2BAA2B;IAQnE,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,UAAU,CAAC;IAdrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAE1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IAExC,OAAO,CAAC,KAAK,CAAC,CAAY;gBAGhB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,uBAAuB,EAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,CAAC,gCAAoB;IAyBzC,UAAU,UAAW,KAAK,KAAG,IAAI,CAE/B;IAEF,QAAQ,UAAW,SAAS,KAAG,IAAI,CAEjC;IAEF,SAAS,aACG,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,eACpC,kBAAkB,KAC9B,IAAI,CAqBL;IAEF,UAAU,aACE,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,OAAO,CAA2F;IAErG,QAAQ,aACI,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,IAAI,GAAG,SAAS,CAgCjB;IAEF,UAAU,aACE,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,IAAI,CAML;IAEF,UAAU,YAAa,0BAA0B,OAAO,kBAAkB,KAAG,IAAI,CA4I/E;IAEF,mBAAmB,UAAW,SAAS,OAAO,kBAAkB,cAAc,MAAM,EAAE,KAAG,oCAAoC,EAAE,CA2B7H;IAKF,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;CAQ7B"}
1
+ {"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/transformer-context/resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,EAC1B,2BAA2B,EAC3B,mCAAmC,EACpC,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAA4B,KAAK,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAMvC,KAAK,IAAI,GAAG;IACV,sBAAsB,CAAC,EAAE,uBAAuB,CAAC;IACjD,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAQF,qBAAa,eAAgB,YAAW,mCAAmC;IACzE,OAAO,CAAC,SAAS,CAAuD;IAExE,qBAAqB,aACT,MAAM,aACL,MAAM,qBACE,MAAM,cACb,kBAAkB,0BACN,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CAUlB;IAEJ,wBAAwB,aACZ,MAAM,aACL,MAAM,qBACE,MAAM,cACb,kBAAkB,0BACN,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CAUlB;IAEJ,4BAA4B,aAChB,MAAM,aACL,MAAM,qBACE,MAAM,0BACD,uBAAuB,2BACtB,uBAAuB,KAC/C,mBAAmB,CASlB;IAEJ,WAAW,aAAc,MAAM,aAAa,MAAM,YAAY,2BAA2B,KAAG,2BAA2B,CAOrH;IAGF,WAAW,aAAc,MAAM,aAAa,MAAM,KAAG,2BAA2B,GAAG,SAAS,CAK1F;IAEF,WAAW,aAAc,MAAM,aAAa,MAAM,KAAG,OAAO,CAG1D;IAEF,cAAc,aAAc,MAAM,aAAa,MAAM,KAAG,2BAA2B,CAQjF;IAEF,gBAAgB,QAAO,IAAI,MAAM,EAAE,2BAA2B,CAAC,CAAsC;CACtG;AAID,qBAAa,mBAAoB,YAAW,2BAA2B;IAQnE,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,UAAU,CAAC;IAdrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAE1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IAExC,OAAO,CAAC,KAAK,CAAC,CAAY;gBAGhB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,uBAAuB,EAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,CAAC,gCAAoB;IAyBzC,UAAU,UAAW,KAAK,KAAG,IAAI,CAE/B;IAEF,QAAQ,UAAW,SAAS,KAAG,IAAI,CAEjC;IAEF,SAAS,aACG,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,eACpC,kBAAkB,KAC9B,IAAI,CAqBL;IAEF,UAAU,aACE,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,OAAO,CAA2F;IAErG,QAAQ,aACI,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,IAAI,GAAG,SAAS,CAgCjB;IAEF,UAAU,aACE,MAAM,2BACS,uBAAuB,4BACtB,uBAAuB,KAChD,IAAI,CAML;IAEF,UAAU,YAAa,0BAA0B,OAAO,kBAAkB,KAAG,IAAI,CAqJ/E;IAEF,mBAAmB,UAAW,SAAS,OAAO,kBAAkB,cAAc,MAAM,EAAE,KAAG,oCAAoC,EAAE,CA2B7H;IAKF,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;CAQ7B"}