@graphql-mesh/compose-cli 1.2.13 → 1.2.14

package/cjs/loadGraphQLHTTPSubgraph.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadGraphQLHTTPSubgraph = loadGraphQLHTTPSubgraph;
 const graphql_1 = require("graphql");
+const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
 const utils_1 = require("@graphql-mesh/utils");
 const utils_2 = require("@graphql-tools/utils");
 function fixExtends(node) {
@@ -140,6 +141,11 @@ function fixExtends(node) {
 function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGETForQueries, operationHeaders, credentials, retry, timeout, source, schemaHeaders, federation = false, transportKind = 'http', }) {
     return (ctx) => {
         let schema$;
+        const interpolationData = {
+            env: process.env,
+        };
+        const interpolatedEndpoint = string_interpolation_1.stringInterpolator.parse(endpoint, interpolationData);
+        const interpolatedSource = string_interpolation_1.stringInterpolator.parse(source, interpolationData);
         function handleFetchedSchema(schema) {
             return addAnnotations({
                 kind: transportKind,
@@ -155,15 +161,15 @@ function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGETForQuer
                 },
             }, schema);
         }
-        if (source) {
+        if (interpolatedSource) {
             let source$;
-            if ((0, utils_1.isUrl)(source)) {
-                source$ = (0, utils_2.mapMaybePromise)(ctx.fetch(source, {
+            if ((0, utils_1.isUrl)(interpolatedSource)) {
+                source$ = (0, utils_2.mapMaybePromise)(ctx.fetch(interpolatedSource, {
                     headers: schemaHeaders,
                 }), res => res.text());
             }
-            else if ((0, utils_2.isValidPath)(source)) {
-                source$ = (0, utils_1.readFile)(source, {
+            else if ((0, utils_2.isValidPath)(interpolatedSource)) {
+                source$ = (0, utils_1.readFile)(interpolatedSource, {
                     allowUnknownExtensions: true,
                     cwd: ctx.cwd,
                     fetch: ctx.fetch,
@@ -177,7 +183,7 @@ function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGETForQuer
             }));
         }
         else {
-            const fetchAsRegular = () => (0, utils_2.mapMaybePromise)(ctx.fetch(endpoint, {
+            const fetchAsRegular = () => (0, utils_2.mapMaybePromise)(ctx.fetch(interpolatedEndpoint, {
                 method: method || (useGETForQueries ? 'GET' : 'POST'),
                 headers: {
                     'Content-Type': 'application/json',
@@ -209,7 +215,7 @@ function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGETForQuer
                     return schema;
                 });
             });
-            const fetchAsFederation = () => (0, utils_2.mapMaybePromise)(ctx.fetch(endpoint, {
+            const fetchAsFederation = () => (0, utils_2.mapMaybePromise)(ctx.fetch(interpolatedEndpoint, {
                 method: method || (useGETForQueries ? 'GET' : 'POST'),
                 headers: {
                     'Content-Type': 'application/json',

package/esm/loadGraphQLHTTPSubgraph.js

@@ -1,4 +1,5 @@
 import { buildASTSchema, buildClientSchema, DirectiveLocation, getIntrospectionQuery, getNamedType, GraphQLDirective, GraphQLList, GraphQLNonNull, GraphQLScalarType, GraphQLSchema, GraphQLString, isObjectType, Kind, parse, visit, } from 'graphql';
+import { stringInterpolator } from '@graphql-mesh/string-interpolation';
 import { isUrl, readFile } from '@graphql-mesh/utils';
 import { createGraphQLError, isValidPath, mapMaybePromise, } from '@graphql-tools/utils';
 function fixExtends(node) {
@@ -104,6 +105,11 @@ function fixExtends(node) {
 export function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGETForQueries, operationHeaders, credentials, retry, timeout, source, schemaHeaders, federation = false, transportKind = 'http', }) {
     return (ctx) => {
         let schema$;
+        const interpolationData = {
+            env: process.env,
+        };
+        const interpolatedEndpoint = stringInterpolator.parse(endpoint, interpolationData);
+        const interpolatedSource = stringInterpolator.parse(source, interpolationData);
         function handleFetchedSchema(schema) {
             return addAnnotations({
                 kind: transportKind,
@@ -119,15 +125,15 @@ export function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGET
                 },
             }, schema);
         }
-        if (source) {
+        if (interpolatedSource) {
             let source$;
-            if (isUrl(source)) {
-                source$ = mapMaybePromise(ctx.fetch(source, {
+            if (isUrl(interpolatedSource)) {
+                source$ = mapMaybePromise(ctx.fetch(interpolatedSource, {
                     headers: schemaHeaders,
                 }), res => res.text());
             }
-            else if (isValidPath(source)) {
-                source$ = readFile(source, {
+            else if (isValidPath(interpolatedSource)) {
+                source$ = readFile(interpolatedSource, {
                     allowUnknownExtensions: true,
                     cwd: ctx.cwd,
                     fetch: ctx.fetch,
@@ -141,7 +147,7 @@ export function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGET
             }));
         }
         else {
-            const fetchAsRegular = () => mapMaybePromise(ctx.fetch(endpoint, {
+            const fetchAsRegular = () => mapMaybePromise(ctx.fetch(interpolatedEndpoint, {
                 method: method || (useGETForQueries ? 'GET' : 'POST'),
                 headers: {
                     'Content-Type': 'application/json',
@@ -173,7 +179,7 @@ export function loadGraphQLHTTPSubgraph(subgraphName, { endpoint, method, useGET
                     return schema;
                 });
             });
-            const fetchAsFederation = () => mapMaybePromise(ctx.fetch(endpoint, {
+            const fetchAsFederation = () => mapMaybePromise(ctx.fetch(interpolatedEndpoint, {
                 method: method || (useGETForQueries ? 'GET' : 'POST'),
                 headers: {
                     'Content-Type': 'application/json',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/compose-cli",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -9,6 +9,7 @@
     "@commander-js/extra-typings": "^12.1.0",
     "@graphql-mesh/fusion-composition": "^0.7.12",
     "@graphql-mesh/include": "^0.2.5",
+    "@graphql-mesh/string-interpolation": "^0.5.7",
     "@graphql-mesh/types": "^0.103.6",
     "@graphql-mesh/utils": "^0.103.6",
     "@graphql-tools/code-file-loader": "^8.1.7",