@anker-in/shopify-sdk 1.2.0-beta.13 → 1.2.0-beta.15

package/dist/index.js

@@ -14,15 +14,16 @@ function constructMetafieldIdentifiersQueryParams(metafieldIdentifiers, metafiel
   const identifiers = Object.entries(metafieldIdentifiers).reduce(
     (queryInput, [key, value]) => {
       const metafieldIdentifiers2 = value;
+      const comboNamespace = `${metafieldNamespacePrefix}combo`;
       const mappedIdentifiers = metafieldIdentifiers2.map((item) => {
-        if (SPECIAL_METAFIELD_NAMESPACES.includes(item.namespace)) {
+        if (SPECIAL_METAFIELD_NAMESPACES.includes(item.namespace) || item.namespace?.startsWith(comboNamespace)) {
           return {
             namespace: item.namespace,
             key: item.key
           };
         }
         return {
-          namespace: `${metafieldNamespacePrefix}combo`,
+          namespace: comboNamespace,
           key: item.namespace
         };
       });
@@ -32,10 +33,7 @@ function constructMetafieldIdentifiersQueryParams(metafieldIdentifiers, metafiel
       queryInput[`${key}MetafieldIdentifiers`] = uniqueIdentifiers;
       return queryInput;
     },
-    {
-      productMetafieldIdentifiers: [],
-      variantMetafieldIdentifiers: []
-    }
+    {}
   );
   return identifiers;
 }
@@ -1410,11 +1408,13 @@ async function getProduct(client, options) {
   const { handle, graphqlQuery, metafieldIdentifiers } = options;
   const query = graphqlQuery || getProductQuery2;
   const variables = { handle };
-  if (metafieldIdentifiers) {
-    variables.productMetafieldIdentifiers = metafieldIdentifiers;
-    variables.variantMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data?.product) {
     return void 0;
   }
@@ -1468,7 +1468,7 @@ var getAllProductsQuery = (
   ${imageFragment}
 `
 );
-async function fetchAllPages(client, options, afterCursor) {
+async function fetchAllProducts(client, options, afterCursor) {
   const { first = 250, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
   const queryString = graphqlQuery || getAllProductsQuery;
   const variables = {
@@ -1478,26 +1478,36 @@ async function fetchAllPages(client, options, afterCursor) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.productMetafieldIdentifiers = metafieldIdentifiers;
-    variables.variantMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(queryString, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.products) {
     return [];
   }
   const products = data.products.edges.map((edge) => normalizeProduct(edge.node));
   if (data.products.pageInfo.hasNextPage) {
-    const nextProducts = await fetchAllPages(client, options, data.products.pageInfo.endCursor);
+    const nextProducts = await fetchAllProducts(client, options, data.products.pageInfo.endCursor);
     return [...products, ...nextProducts];
   }
   return products;
 }
 async function getAllProducts(client, options) {
-  return fetchAllPages(client, options);
+  return fetchAllProducts(client, options);
 }
 async function getProducts(client, options) {
-  const { first = 250, after, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
+  const {
+    first = 250,
+    after,
+    query,
+    graphqlQuery,
+    sortKey,
+    reverse,
+    metafieldIdentifiers
+  } = options;
   const queryString = graphqlQuery || getAllProductsQuery;
   const variables = {
     first,
@@ -2070,10 +2080,13 @@ async function getCollection(client, options) {
   const { handle, graphqlQuery, metafieldIdentifiers } = options;
   const query = graphqlQuery || getCollectionQuery;
   const variables = { handle };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data?.collection) {
     return void 0;
   }
@@ -2115,7 +2128,7 @@ var getAllCollectionsQuery = (
   ${imageFragment}
 `
 );
-async function fetchAllPages2(client, options, afterCursor) {
+async function fetchAllPages(client, options, afterCursor) {
   const { first = 250, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
   const queryString = graphqlQuery || getAllCollectionsQuery;
   const variables = {
@@ -2125,25 +2138,40 @@ async function fetchAllPages2(client, options, afterCursor) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(queryString, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.collections) {
     return [];
   }
   const collections = data.collections.edges.map((edge) => normalizeCollection(edge.node));
   if (data.collections.pageInfo.hasNextPage) {
-    const nextCollections = await fetchAllPages2(client, options, data.collections.pageInfo.endCursor);
+    const nextCollections = await fetchAllPages(
+      client,
+      options,
+      data.collections.pageInfo.endCursor
+    );
     return [...collections, ...nextCollections];
   }
   return collections;
 }
 async function getAllCollections(client, options) {
-  return fetchAllPages2(client, options);
+  return fetchAllPages(client, options);
 }
 async function getCollections(client, options) {
-  const { first = 250, after, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
+  const {
+    first = 250,
+    after,
+    query,
+    graphqlQuery,
+    sortKey,
+    reverse,
+    metafieldIdentifiers
+  } = options;
   const queryString = graphqlQuery || getAllCollectionsQuery;
   const variables = {
     first,
@@ -2152,10 +2180,13 @@ async function getCollections(client, options) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(queryString, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.collections) {
     return {
       collections: [],
@@ -2244,7 +2275,7 @@ function normalizeMetafields2(metafields) {
 // src/api/blog/get-blog.ts
 async function getBlog(client, options) {
   const { handle, graphqlQuery, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const hasMetafields = metafieldIdentifiers?.blog?.length;
   const fragment = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
   const defaultQuery = (
     /* GraphQL */
@@ -2262,10 +2293,13 @@ async function getBlog(client, options) {
   );
   const query = graphqlQuery || defaultQuery;
   const variables = { handle };
-  if (hasMetafields) {
-    variables.blogMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.blog) {
     return void 0;
   }
@@ -2273,9 +2307,9 @@ async function getBlog(client, options) {
 }
 
 // src/api/blog/get-all-blogs.ts
-async function fetchAllPages3(client, options, afterCursor) {
+async function fetchAllPages2(client, options, afterCursor) {
   const { first = 250, query, graphqlQuery, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const hasMetafields = !!metafieldIdentifiers?.blog?.length;
   const fragment = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
   const defaultQueryString = (
     /* GraphQL */
@@ -2310,45 +2344,49 @@ async function fetchAllPages3(client, options, afterCursor) {
   if (query) {
     variables.query = query;
   }
-  if (hasMetafields) {
-    variables.blogMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(queryString, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.blogs) {
     return [];
   }
   const blogs = data.blogs.edges?.map((edge) => normalizeBlog(edge.node)) || [];
   if (data.blogs.pageInfo.hasNextPage) {
-    const nextBlogs = await fetchAllPages3(client, options, data.blogs.pageInfo.endCursor);
+    const nextBlogs = await fetchAllPages2(client, options, data.blogs.pageInfo.endCursor);
     return [...blogs, ...nextBlogs];
   }
   return blogs;
 }
 async function getAllBlogs(client, options) {
-  return fetchAllPages3(client, options);
+  return fetchAllPages2(client, options);
 }
 
 // src/api/blog/get-article.ts
 async function getArticle(client, options) {
   const { blogHandle, articleHandle, graphqlQuery, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
-  const articleFrag = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
-  const blogFrag = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
+  const hasArticleMetafields = !!metafieldIdentifiers?.article?.length;
+  const hasBlogMetafields = !!metafieldIdentifiers?.blog?.length;
+  const articleFrag = hasArticleMetafields ? articleWithMetafieldsFragment : articleFragment;
+  const blogFrag = hasBlogMetafields ? blogWithMetafieldsFragment : blogFragment;
   const defaultQuery = (
     /* GraphQL */
     `
     query getArticle(
       $blogHandle: String!
       $articleHandle: String!
-      ${hasMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-      ${hasMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+      ${hasBlogMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+      ${hasArticleMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
     ) {
       blog(handle: $blogHandle) {
-        ...${hasMetafields ? "blogWithMetafields" : "blog"}
+        ...${hasBlogMetafields ? "blogWithMetafields" : "blog"}
         articleByHandle(handle: $articleHandle) {
-          ...${hasMetafields ? "articleWithMetafields" : "article"}
+          ...${hasArticleMetafields ? "articleWithMetafields" : "article"}
           blog {
-            ...${hasMetafields ? "blogWithMetafields" : "blog"}
+            ...${hasBlogMetafields ? "blogWithMetafields" : "blog"}
           }
         }
       }
@@ -2359,11 +2397,13 @@ async function getArticle(client, options) {
   );
   const query = graphqlQuery || defaultQuery;
   const variables = { blogHandle, articleHandle };
-  if (hasMetafields) {
-    variables.blogMetafieldIdentifiers = metafieldIdentifiers;
-    variables.articleMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.blog || !data.blog.articleByHandle) {
     return void 0;
   }
@@ -2371,7 +2411,7 @@ async function getArticle(client, options) {
 }
 
 // src/api/blog/get-articles.ts
-async function fetchAllPages4(client, options, afterCursor) {
+async function fetchAllArticles(client, options, afterCursor) {
   const {
     first = 250,
     query,
@@ -2380,7 +2420,7 @@ async function fetchAllPages4(client, options, afterCursor) {
     reverse = false,
     metafieldIdentifiers
   } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const hasMetafields = !!metafieldIdentifiers?.article?.length;
   const fragment = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
   const defaultQueryString = (
     /* GraphQL */
@@ -2424,26 +2464,29 @@ async function fetchAllPages4(client, options, afterCursor) {
   if (query) {
     variables.query = query;
   }
-  if (hasMetafields) {
-    variables.articleMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(queryString, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.articles) {
     return [];
   }
   const articles = data.articles.edges?.map((edge) => normalizeArticle(edge.node)) || [];
   if (data.articles.pageInfo.hasNextPage) {
-    const nextArticles = await fetchAllPages4(client, options, data.articles.pageInfo.endCursor);
+    const nextArticles = await fetchAllArticles(client, options, data.articles.pageInfo.endCursor);
     return [...articles, ...nextArticles];
   }
   return articles;
 }
 async function getArticles(client, options) {
-  return fetchAllPages4(client, options);
+  return fetchAllArticles(client, options);
 }
 
 // src/api/blog/get-articles-in-blog.ts
-async function fetchAllPages5(client, options, afterCursor) {
+async function fetchAllPages3(client, options, afterCursor) {
   const {
     blogHandle,
     first = 250,
@@ -2452,9 +2495,10 @@ async function fetchAllPages5(client, options, afterCursor) {
     reverse = false,
     metafieldIdentifiers
   } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
-  const articleFrag = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
-  const blogFrag = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
+  const hasArticleMetafields = !!metafieldIdentifiers?.article?.length;
+  const hasBlogMetafields = !!metafieldIdentifiers?.blog?.length;
+  const articleFrag = hasArticleMetafields ? articleWithMetafieldsFragment : articleFragment;
+  const blogFrag = hasBlogMetafields ? blogWithMetafieldsFragment : blogFragment;
   const defaultQuery = (
     /* GraphQL */
     `
@@ -2464,11 +2508,11 @@ async function fetchAllPages5(client, options, afterCursor) {
       $after: String
       $sortKey: ArticleSortKeys!
       $reverse: Boolean!
-      ${hasMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-      ${hasMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+      ${hasBlogMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+      ${hasArticleMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
     ) {
       blog(handle: $blogHandle) {
-        ...${hasMetafields ? "blogWithMetafields" : "blog"}
+        ...${hasBlogMetafields ? "blogWithMetafields" : "blog"}
         articles(
           first: $first
           after: $after
@@ -2477,7 +2521,7 @@ async function fetchAllPages5(client, options, afterCursor) {
         ) {
           edges {
             node {
-              ...${hasMetafields ? "articleWithMetafields" : "article"}
+              ...${hasArticleMetafields ? "articleWithMetafields" : "article"}
             }
           }
           pageInfo {
@@ -2499,23 +2543,25 @@ async function fetchAllPages5(client, options, afterCursor) {
     sortKey,
     reverse
   };
-  if (hasMetafields) {
-    variables.blogMetafieldIdentifiers = metafieldIdentifiers;
-    variables.articleMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.blog || !data.blog.articles) {
     return [];
   }
   const articles = data.blog.articles.edges?.map((edge) => normalizeArticle(edge.node)) || [];
   if (data.blog.articles.pageInfo.hasNextPage) {
-    const nextArticles = await fetchAllPages5(client, options, data.blog.articles.pageInfo.endCursor);
+    const nextArticles = await fetchAllPages3(client, options, data.blog.articles.pageInfo.endCursor);
     return [...articles, ...nextArticles];
   }
   return articles;
 }
 async function getArticlesInBlog(client, options) {
-  return fetchAllPages5(client, options);
+  return fetchAllPages3(client, options);
 }
 
 // src/api/page/normalize.ts
@@ -2538,7 +2584,7 @@ function normalizePage(page) {
 // src/api/page/get-page.ts
 async function getPage(client, options) {
   const { handle, graphqlQuery, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const hasMetafields = !!metafieldIdentifiers?.page?.length;
   const fragment = hasMetafields ? pageWithMetafieldsFragment : pageFragment;
   const defaultQuery = (
     /* GraphQL */
@@ -2559,7 +2605,13 @@ async function getPage(client, options) {
   if (hasMetafields) {
     variables.pageMetafieldIdentifiers = metafieldIdentifiers;
   }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.page) {
     return void 0;
   }
@@ -2580,7 +2632,7 @@ function normalizeShop(shop) {
 // src/api/shop/get-shop.ts
 async function getShop(client, options) {
   const { graphqlQuery, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const hasMetafields = !!metafieldIdentifiers?.shop?.length;
   const fragment = hasMetafields ? shopWithMetafieldsFragment : shopFragment;
   const defaultQuery = (
     /* GraphQL */
@@ -2597,10 +2649,13 @@ async function getShop(client, options) {
   );
   const query = graphqlQuery || defaultQuery;
   const variables = {};
-  if (hasMetafields) {
-    variables.shopMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.shop) {
     return void 0;
   }