@anker-in/shopify-sdk 1.2.0-beta.8 → 1.2.0

package/dist/index.js

@@ -6,23 +6,21 @@ var shopifyCore = require('@anker-in/shopify-core');
 var SPECIAL_METAFIELD_NAMESPACES = ["__discountCodeApp", "discounts_function"];
 function constructMetafieldIdentifiersQueryParams(metafieldIdentifiers, metafieldNamespacePrefix) {
   if (!metafieldIdentifiers || Object.keys(metafieldIdentifiers).length === 0) {
-    return {
-      productMetafieldIdentifiers: [],
-      variantMetafieldIdentifiers: []
-    };
+    return {};
   }
   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 +30,7 @@ function constructMetafieldIdentifiersQueryParams(metafieldIdentifiers, metafiel
       queryInput[`${key}MetafieldIdentifiers`] = uniqueIdentifiers;
       return queryInput;
     },
-    {
-      productMetafieldIdentifiers: [],
-      variantMetafieldIdentifiers: []
-    }
+    {}
   );
   return identifiers;
 }
@@ -699,8 +694,6 @@ var articleFragment = (
       name
     }
   }
-  ${imageFragment}
-  ${seoFragment}
 `
 );
 var articleWithMetafieldsFragment = (
@@ -729,9 +722,6 @@ var articleWithMetafieldsFragment = (
       ...metafield
     }
   }
-  ${imageFragment}
-  ${seoFragment}
-  ${metafieldFragment}
 `
 );
 var blogFragment = (
@@ -745,7 +735,6 @@ var blogFragment = (
       ...seo
     }
   }
-  ${seoFragment}
 `
 );
 var blogWithMetafieldsFragment = (
@@ -762,11 +751,123 @@ var blogWithMetafieldsFragment = (
       ...metafield
     }
   }
+`
+);
+
+// src/fragments/page.ts
+var pageFragment = (
+  /* GraphQL */
+  `
+  fragment page on Page {
+    id
+    handle
+    title
+    body
+    bodySummary
+    createdAt
+    updatedAt
+    seo {
+      ...seo
+    }
+  }
+  ${seoFragment}
+`
+);
+var pageWithMetafieldsFragment = (
+  /* GraphQL */
+  `
+  fragment pageWithMetafields on Page {
+    id
+    handle
+    title
+    body
+    bodySummary
+    createdAt
+    updatedAt
+    seo {
+      ...seo
+    }
+    metafields(identifiers: $pageMetafieldIdentifiers) {
+      ...metafield
+    }
+  }
   ${seoFragment}
   ${metafieldFragment}
 `
 );
 
+// src/fragments/shop.ts
+var shopFragment = (
+  /* GraphQL */
+  `
+  fragment shop on Shop {
+    name
+    description
+    moneyFormat
+    primaryDomain {
+      host
+      url
+    }
+    paymentSettings {
+      currencyCode
+      enabledPresentmentCurrencies
+    }
+    brand {
+      logo {
+        image {
+          url
+        }
+      }
+      colors {
+        primary {
+          background
+        }
+        secondary {
+          background
+        }
+      }
+    }
+  }
+`
+);
+var shopWithMetafieldsFragment = (
+  /* GraphQL */
+  `
+  fragment shopWithMetafields on Shop {
+    name
+    description
+    moneyFormat
+    primaryDomain {
+      host
+      url
+    }
+    paymentSettings {
+      currencyCode
+      enabledPresentmentCurrencies
+    }
+    brand {
+      logo {
+        image {
+          url
+        }
+      }
+      colors {
+        primary {
+          background
+        }
+        secondary {
+          background
+        }
+      }
+    }
+    metafields(identifiers: $shopMetafieldIdentifiers) {
+      ...metafield
+    }
+  }
+  ${metafieldFragment}
+`
+);
+
 // src/queries/product/get-product.ts
 var getProductQuery = (
   /* GraphQL */
@@ -961,10 +1062,12 @@ var getCollectionsByHandlesQuery = (handles) => (
                 ...metafield
               }
               variants(first: 10) {
-                nodes {
-                  ...variant
-                  metafields(identifiers: $variantMetafieldIdentifiers) {
-                    ...metafield
+                edges {
+                  node {
+                    ...variant
+                    metafields(identifiers: $variantMetafieldIdentifiers) {
+                      ...metafield
+                    }
                   }
                 }
               }
@@ -1301,13 +1404,16 @@ var getProductQuery2 = (
 `
 );
 async function getProduct(client, options) {
-  const { handle, metafieldIdentifiers } = 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(getProductQuery2, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data?.product) {
     return void 0;
   }
@@ -1361,8 +1467,9 @@ var getAllProductsQuery = (
   ${imageFragment}
 `
 );
-async function fetchAllPages(client, options, afterCursor) {
-  const { first = 250, query, sortKey, reverse, metafieldIdentifiers } = options;
+async function fetchAllProducts(client, options, afterCursor) {
+  const { first = 250, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
+  const queryString = graphqlQuery || getAllProductsQuery;
   const variables = {
     first,
     after: afterCursor,
@@ -1370,26 +1477,37 @@ async function fetchAllPages(client, options, afterCursor) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.productMetafieldIdentifiers = metafieldIdentifiers;
-    variables.variantMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(getAllProductsQuery, 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, sortKey, reverse, metafieldIdentifiers } = options;
+  const {
+    first = 250,
+    after,
+    query,
+    graphqlQuery,
+    sortKey,
+    reverse,
+    metafieldIdentifiers
+  } = options;
+  const queryString = graphqlQuery || getAllProductsQuery;
   const variables = {
     first,
     after,
@@ -1401,7 +1519,7 @@ async function getProducts(client, options) {
     variables.productMetafieldIdentifiers = metafieldIdentifiers;
     variables.variantMetafieldIdentifiers = metafieldIdentifiers;
   }
-  const data = await client.query(getAllProductsQuery, variables);
+  const data = await client.query(queryString, variables);
   if (!data || !data.products) {
     return {
       products: [],
@@ -1451,11 +1569,11 @@ function buildProductsByHandlesQuery(handles) {
   );
 }
 async function getProductsByHandles(client, options) {
-  const { handles, metafieldIdentifiers } = options;
+  const { handles, graphqlQuery, metafieldIdentifiers } = options;
   if (!handles || handles.length === 0) {
     return [];
   }
-  const query = buildProductsByHandlesQuery(handles);
+  const query = graphqlQuery || buildProductsByHandlesQuery(handles);
   const data = await client.query(query, {
     handles,
     // 请勿删除，这个参数虽然没有在 query 中使用，但方便在 chrome dev tools 中查看请求参数
@@ -1576,7 +1694,8 @@ function normalizeCart(cart) {
 
 // src/api/cart/get-cart.ts
 async function getCart(client, options) {
-  const { id, cookieAdapter, metafieldIdentifiers } = options;
+  const { id, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || getCartQuery;
   const locale = client.getLocale();
   const cartId = id || cookieAdapter?.getCartId(locale);
   console.log("cartId", cartId);
@@ -1584,7 +1703,7 @@ async function getCart(client, options) {
     return void 0;
   }
   try {
-    const data = await client.query(getCartQuery, {
+    const data = await client.query(query, {
       cartId,
       ...constructMetafieldIdentifiersQueryParams(
         metafieldIdentifiers,
@@ -1619,12 +1738,14 @@ async function createCart(client, options = {}) {
     buyerIdentity,
     discountCodes,
     customAttributes,
+    graphqlQuery,
     metafieldIdentifiers,
     updateCookie = false
   } = options;
+  const query = graphqlQuery || createCartMutation;
   const locale = client.getLocale();
   try {
-    const data = await client.query(createCartMutation, {
+    const data = await client.query(query, {
       lines,
       buyerIdentity,
       discountCodes,
@@ -1654,7 +1775,8 @@ async function createCart(client, options = {}) {
 
 // src/api/cart/add-cart-lines.ts
 async function addCartLines(client, options) {
-  const { cartId: providedCartId, lines, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, lines, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || addCartItemsMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
@@ -1665,7 +1787,7 @@ async function addCartLines(client, options) {
     client.getConfig().getMetafieldNamespacePrefix()
   );
   try {
-    const data = await client.query(addCartItemsMutation, {
+    const data = await client.query(query, {
       cartId,
       lines,
       ...normalizedMetafieldIdentifiers
@@ -1690,7 +1812,8 @@ async function addCartLines(client, options) {
 
 // src/api/cart/update-cart-lines.ts
 async function updateCartLines(client, options) {
-  const { cartId: providedCartId, lines, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, lines, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || updateCartItemsMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
@@ -1703,7 +1826,7 @@ async function updateCartLines(client, options) {
   console.log("update-cart-lines metafieldIdentifiers:", metafieldIdentifiers);
   console.log("update-cart-lines metafieldParams:", metafieldParams);
   try {
-    const data = await client.query(updateCartItemsMutation, {
+    const data = await client.query(query, {
       cartId,
       lines,
       ...metafieldParams
@@ -1737,14 +1860,15 @@ async function updateCartLines(client, options) {
 
 // src/api/cart/remove-cart-lines.ts
 async function removeCartLines(client, options) {
-  const { cartId: providedCartId, lineIds, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, lineIds, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || removeCartItemsMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
     throw new Error("Invalid input used for this operation: Miss cartId");
   }
   try {
-    const data = await client.query(removeCartItemsMutation, {
+    const data = await client.query(query, {
       cartId,
       lineIds,
       ...constructMetafieldIdentifiersQueryParams(
@@ -1771,14 +1895,15 @@ async function removeCartLines(client, options) {
 
 // src/api/cart/update-cart-codes.ts
 async function updateCartCodes(client, options) {
-  const { cartId: providedCartId, discountCodes, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, discountCodes, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || updateCartDiscountCodeMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
     throw new Error("Invalid input used for this operation: Miss cartId");
   }
   try {
-    const data = await client.query(updateCartDiscountCodeMutation, {
+    const data = await client.query(query, {
       cartId,
       discountCodes,
       ...constructMetafieldIdentifiersQueryParams(
@@ -1802,14 +1927,15 @@ async function updateCartCodes(client, options) {
 
 // src/api/cart/update-cart-attributes.ts
 async function updateCartAttributes(client, options) {
-  const { cartId: providedCartId, attributes, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, attributes, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || updateCartAttributesMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
     throw new Error("Invalid input used for this operation: Miss cartId");
   }
   try {
-    const data = await client.query(updateCartAttributesMutation, {
+    const data = await client.query(query, {
       cartId,
       attributes,
       ...constructMetafieldIdentifiersQueryParams(
@@ -1836,14 +1962,15 @@ async function updateCartAttributes(client, options) {
 
 // src/api/cart/update-cart-delivery-options.ts
 async function updateCartDeliveryOptions(client, options) {
-  const { cartId: providedCartId, selectedDeliveryOptions, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, selectedDeliveryOptions, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || updateCartDeliveryOptionsMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
     throw new Error("Invalid input used for this operation: Miss cartId");
   }
   try {
-    const data = await client.query(updateCartDeliveryOptionsMutation, {
+    const data = await client.query(query, {
       cartId,
       selectedDeliveryOptions,
       ...constructMetafieldIdentifiersQueryParams(
@@ -1870,14 +1997,15 @@ async function updateCartDeliveryOptions(client, options) {
 
 // src/api/cart/update-buyer-identity.ts
 async function updateBuyerIdentity(client, options) {
-  const { cartId: providedCartId, buyerIdentity, cookieAdapter, metafieldIdentifiers } = options;
+  const { cartId: providedCartId, buyerIdentity, cookieAdapter, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || updateBuyerIdentityMutation;
   const locale = client.getLocale();
   const cartId = providedCartId || cookieAdapter?.getCartId(locale);
   if (!cartId) {
     throw new Error("Invalid input used for this operation: Miss cartId");
   }
   try {
-    const data = await client.query(updateBuyerIdentityMutation, {
+    const data = await client.query(query, {
       cartId,
       buyerIdentity,
       ...constructMetafieldIdentifiersQueryParams(
@@ -1948,12 +2076,16 @@ var getCollectionQuery = (
 `
 );
 async function getCollection(client, options) {
-  const { handle, metafieldIdentifiers } = options;
+  const { handle, graphqlQuery, metafieldIdentifiers } = options;
+  const query = graphqlQuery || getCollectionQuery;
   const variables = { handle };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(getCollectionQuery, variables);
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data?.collection) {
     return void 0;
   }
@@ -1995,8 +2127,9 @@ var getAllCollectionsQuery = (
   ${imageFragment}
 `
 );
-async function fetchAllPages2(client, options, afterCursor) {
-  const { first = 250, query, sortKey, reverse, metafieldIdentifiers } = options;
+async function fetchAllPages(client, options, afterCursor) {
+  const { first = 250, query, graphqlQuery, sortKey, reverse, metafieldIdentifiers } = options;
+  const queryString = graphqlQuery || getAllCollectionsQuery;
   const variables = {
     first,
     after: afterCursor,
@@ -2004,25 +2137,41 @@ async function fetchAllPages2(client, options, afterCursor) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(getAllCollectionsQuery, 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, sortKey, reverse, metafieldIdentifiers } = options;
+  const {
+    first = 250,
+    after,
+    query,
+    graphqlQuery,
+    sortKey,
+    reverse,
+    metafieldIdentifiers
+  } = options;
+  const queryString = graphqlQuery || getAllCollectionsQuery;
   const variables = {
     first,
     after,
@@ -2030,10 +2179,13 @@ async function getCollections(client, options) {
     sortKey,
     reverse
   };
-  if (metafieldIdentifiers) {
-    variables.metafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(getAllCollectionsQuery, variables);
+  const data = await client.query(queryString, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
   if (!data || !data.collections) {
     return {
       collections: [],
@@ -2051,15 +2203,12 @@ async function getCollections(client, options) {
 }
 
 // src/api/collection/get-collections-by-handles.ts
-var getCollectionsByHandles = async ({
-  client,
-  options
-}) => {
-  const { handles, metafieldIdentifiers } = options;
+async function getCollectionsByHandles(client, options) {
+  const { handles, graphqlQuery, metafieldIdentifiers } = options;
   if (handles.length === 0) {
     return [];
   }
-  const query = getCollectionsByHandlesQuery(handles);
+  const query = graphqlQuery || getCollectionsByHandlesQuery(handles);
   const data = await client.query(query, {
     handles,
     // 请勿删除，这个参数虽然没有在 query 中使用，但方便在 chrome dev tools 中查看请求参数
@@ -2078,7 +2227,7 @@ var getCollectionsByHandles = async ({
     return normalizeCollection(item);
   });
   return collections;
-};
+}
 
 // src/api/blog/normalize.ts
 function normalizeBlog(blog) {
@@ -2124,28 +2273,34 @@ function normalizeMetafields2(metafields) {
 
 // src/api/blog/get-blog.ts
 async function getBlog(client, options) {
-  const { handle, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+  const { handle, graphqlQuery, metafieldIdentifiers } = options;
+  const hasMetafields = metafieldIdentifiers?.blog?.length;
   const fragment = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
-  const query = (
+  const defaultQuery = (
     /* GraphQL */
     `
     query getBlog(
       $handle: String!
       ${hasMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
+    ) {
       blog(handle: $handle) {
         ...${hasMetafields ? "blogWithMetafields" : "blog"}
       }
     }
+    ${hasMetafields ? metafieldFragment : ""}
+    ${seoFragment}
     ${fragment}
   `
   );
+  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;
   }
@@ -2153,11 +2308,11 @@ async function getBlog(client, options) {
 }
 
 // src/api/blog/get-all-blogs.ts
-async function fetchAllPages3(client, options, afterCursor) {
-  const { first = 250, query, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+async function fetchAllPages2(client, options, afterCursor) {
+  const { first = 250, query, graphqlQuery, metafieldIdentifiers } = options;
+  const hasMetafields = !!metafieldIdentifiers?.blog?.length;
   const fragment = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
-  const queryString = (
+  const defaultQueryString = (
     /* GraphQL */
     `
     query getAllBlogs(
@@ -2165,7 +2320,7 @@ async function fetchAllPages3(client, options, afterCursor) {
       $after: String
       ${query ? "$query: String!" : ""}
       ${hasMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
+    ) {
       blogs(
         first: $first
         after: $after
@@ -2181,67 +2336,80 @@ async function fetchAllPages3(client, options, afterCursor) {
         }
       }
     }
+    ${hasMetafields ? metafieldFragment : ""}
+    ${seoFragment}
     ${fragment}
     ${pageInfoFragment}
   `
   );
+  const queryString = graphqlQuery || defaultQueryString;
   const variables = { first, after: 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, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
-  const articleFrag = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
-  const blogFrag = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
-  const query = (
+  const { blogHandle, articleHandle, graphqlQuery, metafieldIdentifiers } = options;
+  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!]!" : ""}
-    ) @inContext(language: $language) {
+      ${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"}
           }
         }
       }
     }
+    ${imageFragment}
+    ${hasArticleMetafields || hasBlogMetafields ? metafieldFragment : ""}
+    ${seoFragment}
     ${articleFrag}
     ${blogFrag}
   `
   );
+  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;
   }
@@ -2249,11 +2417,18 @@ async function getArticle(client, options) {
 }
 
 // src/api/blog/get-articles.ts
-async function fetchAllPages4(client, options, afterCursor) {
-  const { first = 250, query, sortKey = "PUBLISHED_AT", reverse = false, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
+async function fetchAllArticles(client, options, afterCursor) {
+  const {
+    first = 250,
+    query,
+    graphqlQuery,
+    sortKey = "PUBLISHED_AT",
+    reverse = false,
+    metafieldIdentifiers
+  } = options;
+  const hasMetafields = !!metafieldIdentifiers?.article?.length;
   const fragment = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
-  const queryString = (
+  const defaultQueryString = (
     /* GraphQL */
     `
     query getArticles(
@@ -2263,7 +2438,7 @@ async function fetchAllPages4(client, options, afterCursor) {
       $sortKey: ArticleSortKeys!
       $reverse: Boolean!
       ${hasMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
+    ) {
       articles(
         first: $first
         after: $after
@@ -2281,10 +2456,14 @@ async function fetchAllPages4(client, options, afterCursor) {
         }
       }
     }
+    ${imageFragment}
+    ${hasMetafields ? metafieldFragment : ""}
+    ${seoFragment}
     ${fragment}
     ${pageInfoFragment}
   `
   );
+  const queryString = graphqlQuery || defaultQueryString;
   const variables = {
     first,
     after: afterCursor,
@@ -2294,31 +2473,42 @@ 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) {
-  const { blogHandle, first = 250, sortKey = "PUBLISHED_AT", reverse = false, metafieldIdentifiers } = options;
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
-  const articleFrag = hasMetafields ? articleWithMetafieldsFragment : articleFragment;
-  const blogFrag = hasMetafields ? blogWithMetafieldsFragment : blogFragment;
-  const query = (
+async function fetchArticlesInBlog(client, options, afterCursor) {
+  const {
+    blogHandle,
+    first = 250,
+    graphqlQuery,
+    sortKey = "PUBLISHED_AT",
+    reverse = false,
+    metafieldIdentifiers
+  } = options;
+  const hasArticleMetafields = !!metafieldIdentifiers?.article?.length;
+  const hasBlogMetafields = !!metafieldIdentifiers?.blog?.length;
+  const articleFrag = hasArticleMetafields ? articleWithMetafieldsFragment : articleFragment;
+  const blogFrag = hasBlogMetafields ? blogWithMetafieldsFragment : blogFragment;
+  const defaultQuery = (
     /* GraphQL */
     `
     query getArticlesInBlog(
@@ -2327,11 +2517,11 @@ async function fetchAllPages5(client, options, afterCursor) {
       $after: String
       $sortKey: ArticleSortKeys!
       $reverse: Boolean!
-      ${hasMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-      ${hasMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
+      ${hasBlogMetafields ? "$blogMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+      ${hasArticleMetafields ? "$articleMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+    ) {
       blog(handle: $blogHandle) {
-        ...${hasMetafields ? "blogWithMetafields" : "blog"}
+        ...${hasBlogMetafields ? "blogWithMetafields" : "blog"}
         articles(
           first: $first
           after: $after
@@ -2340,7 +2530,7 @@ async function fetchAllPages5(client, options, afterCursor) {
         ) {
           edges {
             node {
-              ...${hasMetafields ? "articleWithMetafields" : "article"}
+              ...${hasArticleMetafields ? "articleWithMetafields" : "article"}
             }
           }
           pageInfo {
@@ -2349,11 +2539,15 @@ async function fetchAllPages5(client, options, afterCursor) {
         }
       }
     }
+    ${imageFragment}
+    ${hasArticleMetafields || hasBlogMetafields ? metafieldFragment : ""}
+    ${seoFragment}
     ${articleFrag}
     ${blogFrag}
     ${pageInfoFragment}
   `
   );
+  const query = graphqlQuery || defaultQuery;
   const variables = {
     blogHandle,
     first,
@@ -2361,23 +2555,129 @@ 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 fetchArticlesInBlog(
+      client,
+      options,
+      data.blog.articles.pageInfo.endCursor
+    );
     return [...articles, ...nextArticles];
   }
   return articles;
 }
 async function getArticlesInBlog(client, options) {
-  return fetchAllPages5(client, options);
+  return fetchArticlesInBlog(client, options);
+}
+
+// src/api/page/normalize.ts
+function normalizePage(page) {
+  return {
+    id: page.id,
+    handle: page.handle,
+    title: page.title,
+    body: page.body,
+    bodySummary: page.bodySummary,
+    createdAt: page.createdAt,
+    updatedAt: page.updatedAt,
+    seo: page.seo ? {
+      ...page.seo
+    } : void 0,
+    metafields: normalizeMetafields(page.metafields)
+  };
+}
+
+// src/api/page/get-page.ts
+async function getPage(client, options) {
+  const { handle, graphqlQuery, metafieldIdentifiers } = options;
+  const hasMetafields = !!metafieldIdentifiers?.page?.length;
+  const fragment = hasMetafields ? pageWithMetafieldsFragment : pageFragment;
+  const defaultQuery = (
+    /* GraphQL */
+    `
+    query getPage(
+      $handle: String!
+      ${hasMetafields ? "$pageMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+    ) {
+      page(handle: $handle) {
+        ...${hasMetafields ? "pageWithMetafields" : "page"}
+      }
+    }
+    ${fragment}
+  `
+  );
+  const query = graphqlQuery || defaultQuery;
+  const variables = { handle };
+  if (hasMetafields) {
+    variables.pageMetafieldIdentifiers = metafieldIdentifiers;
+  }
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
+  if (!data || !data.page) {
+    return void 0;
+  }
+  return normalizePage(data.page);
+}
+
+// src/api/shop/normalize.ts
+function normalizeShop(shop) {
+  return {
+    name: shop.name,
+    description: shop.description || "",
+    moneyFormat: shop.moneyFormat,
+    paymentSettings: shop.paymentSettings,
+    primaryDomain: shop.primaryDomain,
+    brand: shop.brand || void 0,
+    metafields: normalizeMetafields(shop.metafields)
+  };
+}
+
+// src/api/shop/get-shop.ts
+async function getShop(client, options) {
+  const { graphqlQuery, metafieldIdentifiers } = options;
+  const hasMetafields = !!metafieldIdentifiers?.shop?.length;
+  const fragment = hasMetafields ? shopWithMetafieldsFragment : shopFragment;
+  const defaultQuery = (
+    /* GraphQL */
+    `
+    query getShop(
+      ${hasMetafields ? "$shopMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
+    ) {
+      shop {
+        ...${hasMetafields ? "shopWithMetafields" : "shop"}
+      }
+    }
+    ${fragment}
+  `
+  );
+  const query = graphqlQuery || defaultQuery;
+  const variables = {};
+  const data = await client.query(query, {
+    ...variables,
+    ...constructMetafieldIdentifiersQueryParams(
+      metafieldIdentifiers,
+      client.getConfig().getMetafieldNamespacePrefix()
+    )
+  });
+  if (!data || !data.shop) {
+    return void 0;
+  }
+  return normalizeShop(data.shop);
 }
 
 exports.ShopifyClient = ShopifyClient;
@@ -2406,12 +2706,14 @@ exports.getCollection = getCollection;
 exports.getCollections = getCollections;
 exports.getCollectionsByHandles = getCollectionsByHandles;
 exports.getCollectionsByHandlesQuery = getCollectionsByHandlesQuery;
+exports.getPage = getPage;
 exports.getProduct = getProduct;
 exports.getProductQuery = getProductQuery;
 exports.getProducts = getProducts;
 exports.getProductsByHandles = getProductsByHandles;
 exports.getProductsByHandlesQuery = getProductsByHandlesQuery;
 exports.getProductsQuery = getProductsQuery;
+exports.getShop = getShop;
 exports.imageFragment = imageFragment;
 exports.metafieldFragment = metafieldFragment;
 exports.metafieldFragmentStr = metafieldFragmentStr;
@@ -2420,12 +2722,18 @@ exports.normalizeBlog = normalizeBlog;
 exports.normalizeCart = normalizeCart;
 exports.normalizeCollection = normalizeCollection;
 exports.normalizeLineItem = normalizeLineItem;
+exports.normalizePage = normalizePage;
 exports.normalizeProduct = normalizeProduct;
+exports.normalizeShop = normalizeShop;
+exports.pageFragment = pageFragment;
 exports.pageInfoFragment = pageInfoFragment;
+exports.pageWithMetafieldsFragment = pageWithMetafieldsFragment;
 exports.productFragment = productFragment;
 exports.removeCartItemsMutation = removeCartItemsMutation;
 exports.removeCartLines = removeCartLines;
 exports.seoFragment = seoFragment;
+exports.shopFragment = shopFragment;
+exports.shopWithMetafieldsFragment = shopWithMetafieldsFragment;
 exports.updateBuyerIdentity = updateBuyerIdentity;
 exports.updateBuyerIdentityMutation = updateBuyerIdentityMutation;
 exports.updateCartAttributes = updateCartAttributes;