@salesforce/lds-luvio-onestore-graphql-parser 1.413.0 → 1.414.1

package/dist/main.js

@@ -3072,20 +3072,37 @@ function operationKeyBuilder(inputString) {
   return stripIgnoredCharacters(inputString);
 }
 function parseDocument(inputString) {
+  var _a;
   const operationKey = operationKeyBuilder(inputString);
   const cachedDoc = docMap.get(operationKey);
   if (cachedDoc !== void 0) {
     return cachedDoc;
   }
-  const parsedDoc = parse(inputString, { noLocation: true });
-  if (!parsedDoc || parsedDoc.kind !== "Document") {
-    if (process.env.NODE_ENV !== "production") {
-      throw new Error("Invalid graphql doc");
+  try {
+    const parsedDoc = parse(inputString, { noLocation: true });
+    const resolvedDoc = { type: "document", document: parsedDoc };
+    docMap.set(operationKey, resolvedDoc);
+    return resolvedDoc;
+  } catch (e) {
+    if (e instanceof GraphQLError) {
+      const errorDoc = {
+        errors: [
+          {
+            message: e.message || "Failed to parse GraphQL document",
+            locations: (_a = e.locations) == null ? void 0 : _a.map((loc) => ({
+              line: loc.line,
+              column: loc.column
+            })),
+            extensions: e.extensions
+          }
+        ]
+      };
+      const resolvedError = { type: "error", error: errorDoc };
+      docMap.set(operationKey, resolvedError);
+      return resolvedError;
     }
-    return null;
+    throw e;
   }
-  docMap.set(operationKey, parsedDoc);
-  return parsedDoc;
 }
 function insertFragments(doc, fragments) {
   fragments.forEach((fragment) => {
@@ -3111,15 +3128,17 @@ function processSubstitutions(inputString, substitutions) {
     if (typeof substitution === "string" || typeof substitution === "number") {
       outputString += substitution;
     } else if (typeof substitution === "object") {
-      const doc = referenceMap.get(substitution);
-      if (doc === void 0) {
+      const resolved = referenceMap.get(substitution);
+      if (resolved === void 0) {
         if (process.env.NODE_ENV !== "production") {
           throw new Error("Invalid substitution fragment");
         }
         return null;
       }
-      for (const def of doc.definitions) {
-        fragments.push(def);
+      if (resolved.type === "document") {
+        for (const def of resolved.document.definitions) {
+          fragments.push(def);
+        }
       }
     } else {
       if (process.env.NODE_ENV !== "production") {
@@ -3134,6 +3153,9 @@ function processSubstitutions(inputString, substitutions) {
   };
 }
 const astResolver = function(astReference) {
+  if (typeof astReference !== "object" || astReference === null) {
+    return void 0;
+  }
   return referenceMap.get(astReference);
 };
 function gql(literals, ...subs) {
@@ -3166,11 +3188,47 @@ function gql(literals, ...subs) {
   if (document === null) {
     return null;
   }
-  if (inputSubstitutionFragments.length === 0) {
+  if (document.type === "error") {
     return updateReferenceMapAndGetKey(document);
   }
-  return updateReferenceMapAndGetKey(insertFragments(document, inputSubstitutionFragments));
+  const docNode = document.document;
+  if (inputSubstitutionFragments.length === 0) {
+    return updateReferenceMapAndGetKey({ type: "document", document: docNode });
+  }
+  return updateReferenceMapAndGetKey({
+    type: "document",
+    document: insertFragments(docNode, inputSubstitutionFragments)
+  });
+}
+/*!
+ * Copyright (c) 2022, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+class Ok {
+  constructor(value) {
+    this.value = value;
+  }
+  isOk() {
+    return true;
+  }
+  isErr() {
+    return !this.isOk();
+  }
+}
+class Err {
+  constructor(error) {
+    this.error = error;
+  }
+  isOk() {
+    return false;
+  }
+  isErr() {
+    return !this.isOk();
+  }
 }
+const ok = (value) => new Ok(value);
+const err = (err2) => new Err(err2);
 function findExecutableOperation(document, operationName) {
   const operations = document.definitions.filter(
     (def) => def.kind === Kind.OPERATION_DEFINITION
@@ -3203,25 +3261,40 @@ function validateGraphQLOperations(config, options) {
 }
 function resolveAst(ast) {
   if (ast === null || ast === void 0) {
-    return;
+    return void 0;
   }
-  const result = astResolver(ast);
-  if (result === void 0) {
-    throw new Error("Could not resolve AST. Did you parse the query with gql?");
+  return astResolver(ast);
+}
+function resolveAndValidateGraphQLConfig(config, options) {
+  const query = config.query;
+  if (query === null || query === void 0) {
+    return void 0;
   }
-  return result;
+  const result = resolveAndValidateGraphQLDocument(query, config.operationName, options);
+  if (result.isErr()) {
+    return err(result.error);
+  }
+  return ok({
+    ...config,
+    query: result.value
+  });
 }
-function wrapConfigAndVerify(config, options) {
-  if (config == null ? void 0 : config.query) {
-    config = { ...config, query: resolveAst(config.query) };
-    if (config.query === void 0) {
-      throw new Error("Internal error in GraphQL adapter occurred: Unable to resolve query");
-    }
-    validateGraphQLOperations(config, {
-      acceptedOperations: (options == null ? void 0 : options.acceptedOperations) ?? ["query"]
-    });
+function resolveAndValidateGraphQLDocument(query, operationName, options) {
+  const resolved = resolveAst(query);
+  if (resolved === void 0) {
+    throw new Error("Could not resolve AST. Did you parse the query with gql?");
+  }
+  if (resolved.type === "error") {
+    return err(resolved.error);
   }
-  return config;
+  const document = resolved.document;
+  validateGraphQLOperations(
+    { query: document, operationName },
+    {
+      acceptedOperations: (options == null ? void 0 : options.acceptedOperations) ?? ["query"]
+    }
+  );
+  return ok(document);
 }
 
-export { Kind, astResolver, gql, parse, print, resolveAst, validateGraphQLOperations, visit, wrapConfigAndVerify };
+export { Kind, astResolver, gql, parse, print, resolveAndValidateGraphQLConfig, visit };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-luvio-onestore-graphql-parser",
-    "version": "1.413.0",
+    "version": "1.414.1",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "Re-export of the @conduit-client/graphql package for use in adapters",
     "main": "dist/main.js",
@@ -28,7 +28,7 @@
         "test:debug": "node --inspect-brk ../../node_modules/.bin/jest --runInBand"
     },
     "dependencies": {
-        "@conduit-client/onestore-graphql-parser": "3.8.0"
+        "@conduit-client/onestore-graphql-parser": "3.9.0"
     },
     "nx": {
         "targets": {