@graphcommerce/next-config 8.1.0-canary.8 → 9.0.0-canary.54

package/__tests__/interceptors/parseStructure.ts

@@ -156,3 +156,53 @@ export const AddProductsToCartForm = EnableCrossselsPlugin
     }
   `)
 })
+
+it('parses', () => {
+  const src = `
+  import {
+  PaymentMethodContextProviderProps,
+  PaymentModule,
+} from '@graphcommerce/magento-cart-payment-method'
+import type { PluginProps } from '@graphcommerce/next-config'
+import { AdyenPaymentActionCard } from '../components/AdyenPaymentActionCard/AdyenPaymentActionCard'
+import { AdyenPaymentHandler } from '../components/AdyenPaymentHandler/AdyenPaymentHandler'
+import { HppOptions } from '../components/AdyenPaymentOptionsAndPlaceOrder/AdyenPaymentOptionsAndPlaceOrder'
+import { adyenHppExpandMethods } from '../hooks/adyenHppExpandMethods'
+
+export const adyen_hpp: PaymentModule = {
+  PaymentOptions: HppOptions,
+  PaymentPlaceOrder: () => null,
+  PaymentHandler: AdyenPaymentHandler,
+  PaymentActionCard: AdyenPaymentActionCard,
+  expandMethods: adyenHppExpandMethods,
+}
+
+export const component = 'PaymentMethodContextProvider'
+export const exported = '@graphcommerce/magento-cart-payment-method'
+
+function AddAdyenMethods(props: PluginProps<PaymentMethodContextProviderProps>) {
+  const { modules, Prev, ...rest } = props
+  return <Prev {...rest} modules={{ ...modules, adyen_hpp }} />
+}
+
+export const Plugin = AddAdyenMethods
+`
+
+  const plugins = parseStructure(
+    parseSync(src),
+    fakeconfig,
+    '@graphcommerce/magento-payment-adyen/plugins/AddAdyenMethods.tsx',
+  )
+  expect(plugins).toHaveLength(1)
+  expect(plugins[0]).toMatchInlineSnapshot(`
+    {
+      "enabled": true,
+      "sourceExport": "Plugin",
+      "sourceModule": "@graphcommerce/magento-payment-adyen/plugins/AddAdyenMethods.tsx",
+      "targetExport": "PaymentMethodContextProvider",
+      "targetModule": "@graphcommerce/magento-cart-payment-method",
+      "type": "component",
+    }
+  `)
+  expect(plugins[1]).toMatchInlineSnapshot(`undefined`)
+})

package/dist/config/demoConfig.js

@@ -5,6 +5,7 @@ exports.demoConfig = {
     canonicalBaseUrl: 'https://graphcommerce.vercel.app',
     hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
     magentoEndpoint: 'https://backend.reachdigital.dev/graphql',
+    magentoVersion: 246,
     storefront: [
         { locale: 'en', magentoStoreCode: 'en_US', defaultLocale: true },
         {
@@ -35,6 +36,7 @@ exports.demoConfig = {
     ],
     productFiltersPro: true,
     productFiltersLayout: 'DEFAULT',
+    productListPaginationVariant: 'COMPACT',
     compareVariant: 'ICON',
     robotsAllow: false,
     demoMode: true,
@@ -44,4 +46,7 @@ exports.demoConfig = {
     configurableVariantForSimple: true,
     configurableVariantValues: { url: true, content: true, gallery: true },
     recentlyViewedProducts: { enabled: true, maxCount: 20 },
+    breadcrumbs: false,
+    customerDeleteEnabled: true,
+    previewSecret: 'SECRET',
 };

package/dist/config/utils/mergeEnvIntoConfig.js

@@ -43,6 +43,8 @@ function configToEnvSchema(schema) {
             node = node.unwrap();
         if (node instanceof zod_1.ZodNullable)
             node = node.unwrap();
+        if (node instanceof zod_1.ZodDefault)
+            node = node.removeDefault();
         if (node instanceof zod_1.ZodObject) {
             if (path.length > 0) {
                 envSchema[(0, exports.toEnvStr)(path)] = zod_1.z
@@ -73,7 +75,12 @@ function configToEnvSchema(schema) {
             });
             return;
         }
-        if (node instanceof zod_1.ZodString || node instanceof zod_1.ZodNumber || node instanceof zod_1.ZodEnum) {
+        if (node instanceof zod_1.ZodNumber) {
+            envSchema[(0, exports.toEnvStr)(path)] = zod_1.z.coerce.number().optional();
+            envToDot[(0, exports.toEnvStr)(path)] = (0, exports.dotNotation)(path);
+            return;
+        }
+        if (node instanceof zod_1.ZodString || node instanceof zod_1.ZodEnum) {
             envSchema[(0, exports.toEnvStr)(path)] = node.optional();
             envToDot[(0, exports.toEnvStr)(path)] = (0, exports.dotNotation)(path);
             return;

package/dist/generated/config.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SidebarGalleryConfigSchema = exports.RecentlyViewedProductsConfigSchema = exports.MagentoConfigurableVariantValuesSchema = exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = exports.DatalayerConfigSchema = exports.SidebarGalleryPaginationVariantSchema = exports.ProductFiltersLayoutSchema = exports.CompareVariantSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
+exports.SidebarGalleryConfigSchema = exports.RecentlyViewedProductsConfigSchema = exports.MagentoConfigurableVariantValuesSchema = exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = exports.DatalayerConfigSchema = exports.SidebarGalleryPaginationVariantSchema = exports.ProductFiltersLayoutSchema = exports.PaginationVariantSchema = exports.CompareVariantSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
 /* eslint-disable */
 const zod_1 = require("zod");
 const isDefinedNonNullAny = (v) => v !== undefined && v !== null;
 exports.isDefinedNonNullAny = isDefinedNonNullAny;
 exports.definedNonNullAnySchema = zod_1.z.any().refine((v) => (0, exports.isDefinedNonNullAny)(v));
 exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
+exports.PaginationVariantSchema = zod_1.z.enum(['COMPACT', 'EXTENDED']);
 exports.ProductFiltersLayoutSchema = zod_1.z.enum(['DEFAULT', 'SIDEBAR']);
 exports.SidebarGalleryPaginationVariantSchema = zod_1.z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
 function DatalayerConfigSchema() {
@@ -17,18 +18,21 @@ function DatalayerConfigSchema() {
 exports.DatalayerConfigSchema = DatalayerConfigSchema;
 function GraphCommerceConfigSchema() {
     return zod_1.z.object({
+        breadcrumbs: zod_1.z.boolean().default(false).nullish(),
         canonicalBaseUrl: zod_1.z.string().min(1),
         cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
         compare: zod_1.z.boolean().nullish(),
-        compareVariant: exports.CompareVariantSchema.nullish(),
-        configurableVariantForSimple: zod_1.z.boolean().nullish(),
+        compareVariant: exports.CompareVariantSchema.default("ICON").nullish(),
+        configurableVariantForSimple: zod_1.z.boolean().default(false).nullish(),
         configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
-        crossSellsHideCartItems: zod_1.z.boolean().nullish(),
-        crossSellsRedirectItems: zod_1.z.boolean().nullish(),
-        customerRequireEmailConfirmation: zod_1.z.boolean().nullish(),
+        crossSellsHideCartItems: zod_1.z.boolean().default(false).nullish(),
+        crossSellsRedirectItems: zod_1.z.boolean().default(false).nullish(),
+        customerAddressNoteEnable: zod_1.z.boolean().nullish(),
+        customerCompanyFieldsEnable: zod_1.z.boolean().nullish(),
+        customerDeleteEnabled: zod_1.z.boolean().nullish(),
         dataLayer: DatalayerConfigSchema().nullish(),
         debug: GraphCommerceDebugConfigSchema().nullish(),
-        demoMode: zod_1.z.boolean().nullish(),
+        demoMode: zod_1.z.boolean().default(true).nullish(),
         enableGuestCheckoutLogin: zod_1.z.boolean().nullish(),
         googleAnalyticsId: zod_1.z.string().nullish(),
         googleRecaptchaKey: zod_1.z.string().nullish(),
@@ -40,9 +44,11 @@ function GraphCommerceConfigSchema() {
         hygraphWriteAccessToken: zod_1.z.string().nullish(),
         limitSsg: zod_1.z.boolean().nullish(),
         magentoEndpoint: zod_1.z.string().min(1),
+        magentoVersion: zod_1.z.number(),
         previewSecret: zod_1.z.string().nullish(),
-        productFiltersLayout: exports.ProductFiltersLayoutSchema.nullish(),
+        productFiltersLayout: exports.ProductFiltersLayoutSchema.default("DEFAULT").nullish(),
         productFiltersPro: zod_1.z.boolean().nullish(),
+        productListPaginationVariant: exports.PaginationVariantSchema.default("COMPACT").nullish(),
         productRoute: zod_1.z.string().nullish(),
         recentlyViewedProducts: RecentlyViewedProductsConfigSchema().nullish(),
         robotsAllow: zod_1.z.boolean().nullish(),
@@ -66,6 +72,7 @@ function GraphCommerceStorefrontConfigSchema() {
     return zod_1.z.object({
         canonicalBaseUrl: zod_1.z.string().nullish(),
         cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
+        customerCompanyFieldsEnable: zod_1.z.boolean().nullish(),
         defaultLocale: zod_1.z.boolean().nullish(),
         domain: zod_1.z.string().nullish(),
         googleAnalyticsId: zod_1.z.string().nullish(),
@@ -74,7 +81,8 @@ function GraphCommerceStorefrontConfigSchema() {
         hygraphLocales: zod_1.z.array(zod_1.z.string().min(1)).nullish(),
         linguiLocale: zod_1.z.string().nullish(),
         locale: zod_1.z.string().min(1),
-        magentoStoreCode: zod_1.z.string().min(1)
+        magentoStoreCode: zod_1.z.string().min(1),
+        robotsAllow: zod_1.z.boolean().nullish()
     });
 }
 exports.GraphCommerceStorefrontConfigSchema = GraphCommerceStorefrontConfigSchema;

package/dist/interceptors/extractExports.js

@@ -87,9 +87,8 @@ function extractValue(node, path, optional = false) {
             case 'undefined':
                 return undefined;
             default:
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path);
+                return exports.RUNTIME_VALUE;
+            // throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path)
         }
     }
     else if (isArrayExpression(node)) {
@@ -100,9 +99,11 @@ function extractValue(node, path, optional = false) {
             if (elem) {
                 if (elem.spread) {
                     // e.g. [ ...a ]
-                    if (optional)
-                        return exports.RUNTIME_VALUE;
-                    throw new UnsupportedValueError('Unsupported spread operator in the Array Expression', path);
+                    return exports.RUNTIME_VALUE;
+                    // throw new UnsupportedValueError(
+                    //   'Unsupported spread operator in the Array Expression',
+                    //   path,
+                    // )
                 }
                 arr.push(extractValue(elem.expression, path && [...path, `[${i}]`], optional));
             }
@@ -120,9 +121,11 @@ function extractValue(node, path, optional = false) {
         for (const prop of node.properties) {
             if (!isKeyValueProperty(prop)) {
                 // e.g. { ...a }
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError('Unsupported spread operator in the Object Expression', path);
+                return exports.RUNTIME_VALUE;
+                // throw new UnsupportedValueError(
+                //   'Unsupported spread operator in the Object Expression',
+                //   path,
+                // )
             }
             let key;
             if (isIdentifier(prop.key)) {
@@ -134,9 +137,11 @@ function extractValue(node, path, optional = false) {
                 key = prop.key.value;
             }
             else {
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError(`Unsupported key type "${prop.key.type}" in the Object Expression`, path);
+                return exports.RUNTIME_VALUE;
+                // throw new UnsupportedValueError(
+                //   `Unsupported key type "${prop.key.type}" in the Object Expression`,
+                //   path,
+                // )
             }
             obj[key] = extractValue(prop.value, path && [...path, key]);
         }
@@ -146,9 +151,8 @@ function extractValue(node, path, optional = false) {
         // e.g. `abc`
         if (node.expressions.length !== 0) {
             // TODO: should we add support for `${'e'}d${'g'}'e'`?
-            if (optional)
-                return exports.RUNTIME_VALUE;
-            throw new UnsupportedValueError('Unsupported template literal with expressions', path);
+            return exports.RUNTIME_VALUE;
+            // throw new UnsupportedValueError('Unsupported template literal with expressions', path)
         }
         // When TemplateLiteral has 0 expressions, the length of quasis is always 1.
         // Because when parsing TemplateLiteral, the parser yields the first quasi,
@@ -163,9 +167,8 @@ function extractValue(node, path, optional = false) {
         return cooked ?? raw;
     }
     else {
-        if (optional)
-            return exports.RUNTIME_VALUE;
-        throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path);
+        return exports.RUNTIME_VALUE;
+        // throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path)
     }
 }
 function extractExports(module) {

package/dist/interceptors/findOriginalSource.js

@@ -33,6 +33,22 @@ function parseAndFindExport(resolved, findExport, resolve) {
                     break;
             }
         }
+        if (node.type === 'ExportNamedDeclaration') {
+            for (const specifier of node.specifiers) {
+                if (specifier.type === 'ExportSpecifier') {
+                    if (specifier.exported?.value === findExport)
+                        return resolved;
+                }
+                else if (specifier.type === 'ExportDefaultSpecifier') {
+                    // todo
+                }
+                else if (specifier.type === 'ExportNamespaceSpecifier') {
+                    // todo
+                }
+            }
+        }
+        // todo: if (node.type === 'ExportDefaultDeclaration') {}
+        // todo: if (node.type === 'ExportDefaultExpression') {}
     }
     const exports = ast.body
         .filter((node) => node.type === 'ExportAllDeclaration')
@@ -78,7 +94,7 @@ function findOriginalSource(plug, resolved, resolve) {
     if (!newResolved) {
         return {
             resolved: undefined,
-            error: new Error(`Can not find ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}`),
+            error: new Error(`Plugin target not found ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}#${plug.sourceExport}`),
         };
     }
     // cachedResults.set(cacheKey, newResolved)

package/dist/interceptors/generateInterceptor.js

@@ -45,7 +45,7 @@ const originalSuffix = 'Original';
 const sourceSuffix = 'Plugin';
 const interceptorSuffix = 'Interceptor';
 const disabledSuffix = 'Disabled';
-const name = (plugin) => `${plugin.sourceModule
+const name = (plugin) => `${plugin.sourceExport}${plugin.sourceModule
     .split('/')[plugin.sourceModule.split('/').length - 1].replace(/[^a-zA-Z0-9]/g, '')}`;
 const fileName = (plugin) => `${plugin.sourceModule}#${plugin.sourceExport}`;
 const originalName = (n) => `${n}${originalSuffix}`;
@@ -121,8 +121,7 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
                 .join(' wrapping ');
             if (isReplacePluginConfig(p)) {
                 new RenameVisitor_1.RenameVisitor([originalName(p.targetExport)], (s) => s.replace(originalSuffix, disabledSuffix)).visitModule(ast);
-                carryProps.push(interceptorPropsName(name(p)));
-                result = `type ${interceptorPropsName(name(p))} = React.ComponentProps<typeof ${sourceName(name(p))}>`;
+                carryProps.push(`React.ComponentProps<typeof ${sourceName(name(p))}>`);
                 pluginSee.push(`@see {${sourceName(name(p))}} for replacement of the original source (original source not used)`);
             }
             if (isReactPluginConfig(p)) {
@@ -154,7 +153,7 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
         })
             .filter((v) => !!v)
             .join('\n');
-        const isComponent = plugins.every((p) => isReplacePluginConfig(p) || isReactPluginConfig(p));
+        const isComponent = plugins.every((p) => isReactPluginConfig(p));
         if (isComponent && plugins.some((p) => isMethodPluginConfig(p))) {
             throw new Error(`Cannot mix React and Method plugins for ${base} in ${dependency}.`);
         }

package/dist/interceptors/parseStructure.js

@@ -27,7 +27,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
         exportVals.push('Plugin');
     if (func && !moduleConfig)
         exportVals.push('plugin');
-    return exportVals
+    const pluginConfigs = exportVals
         .map((exportVal) => {
         let config = isObject(moduleConfig) ? moduleConfig : {};
         if (!moduleConfig && component) {
@@ -41,6 +41,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
         }
         else {
             console.error(`Plugin configuration invalid! See ${sourceModule}`);
+            return null;
         }
         const parsed = pluginConfigParsed.safeParse(config);
         if (!parsed.success) {
@@ -67,5 +68,12 @@ function parseStructure(ast, gcConfig, sourceModule) {
         return val;
     })
         .filter(nonNullable);
+    const newPluginConfigs = pluginConfigs.reduce((acc, pluginConfig) => {
+        if (!acc.find((accPluginConfig) => accPluginConfig.sourceExport === pluginConfig.sourceExport)) {
+            acc.push(pluginConfig);
+        }
+        return acc;
+    }, []);
+    return newPluginConfigs;
 }
 exports.parseStructure = parseStructure;

package/dist/interceptors/writeInterceptors.js

@@ -17,19 +17,19 @@ function checkFileExists(file) {
 }
 async function writeInterceptors(interceptors, cwd = process.cwd()) {
     const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
-    const existing = [];
+    const existing = new Set();
     dependencies.forEach((dependency) => {
         const files = (0, glob_1.sync)([`${dependency}/**/*.interceptor.tsx`, `${dependency}/**/*.interceptor.ts`], { cwd });
-        existing.push(...files);
+        files.forEach((file) => existing.add(file));
     });
     const written = Object.entries(interceptors).map(async ([, plugin]) => {
         const extension = plugin.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts';
         const relativeFile = `${plugin.fromRoot}.interceptor${extension}`;
-        if (existing.includes(relativeFile)) {
-            delete existing[existing.indexOf(relativeFile)];
+        if (existing.has(relativeFile)) {
+            existing.delete(relativeFile);
         }
-        if (existing.includes(`./${relativeFile}`)) {
-            delete existing[existing.indexOf(`./${relativeFile}`)];
+        if (existing.has(`./${relativeFile}`)) {
+            existing.delete(`./${relativeFile}`);
         }
         const fileToWrite = path_1.default.join(cwd, relativeFile);
         const isSame = (await checkFileExists(fileToWrite)) &&
@@ -38,7 +38,7 @@ async function writeInterceptors(interceptors, cwd = process.cwd()) {
             await promises_1.default.writeFile(fileToWrite, plugin.template);
     });
     // Cleanup unused interceptors
-    const cleaned = existing.map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
+    const cleaned = [...existing].map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
     await Promise.all(written);
     await Promise.all(cleaned);
 }

package/dist/withGraphCommerce.js

@@ -94,8 +94,19 @@ function withGraphCommerce(nextConfig, cwd) {
         },
         transpilePackages,
         webpack: (config, options) => {
-            // Allow importing yml/yaml files for graphql-mesh
-            config.module?.rules?.push({ test: /\.ya?ml$/, use: 'js-yaml-loader' });
+            if (!config.module)
+                config.module = { rules: [] };
+            config.module = {
+                ...config.module,
+                rules: [
+                    ...(config.module.rules ?? []),
+                    // Allow importing yml/yaml files for graphql-mesh
+                    { test: /\.ya?ml$/, use: 'js-yaml-loader' },
+                    // @lingui .po file support
+                    { test: /\.po/, use: '@lingui/loader' },
+                ],
+                exprContextCritical: false,
+            };
             if (!config.plugins)
                 config.plugins = [];
             // Make import.meta.graphCommerce available for usage.
@@ -122,8 +133,6 @@ function withGraphCommerce(nextConfig, cwd) {
                     }));
                 }
             }
-            // @lingui .po file support
-            config.module?.rules?.push({ test: /\.po/, use: '@lingui/loader' });
             config.snapshot = {
                 ...(config.snapshot ?? {}),
                 managedPaths: [

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.8",
+  "version": "9.0.0-canary.54",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/config/demoConfig.ts

@@ -7,6 +7,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   canonicalBaseUrl: 'https://graphcommerce.vercel.app',
   hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
   magentoEndpoint: 'https://backend.reachdigital.dev/graphql',
+  magentoVersion: 246,
   storefront: [
     { locale: 'en', magentoStoreCode: 'en_US', defaultLocale: true },
     {
@@ -37,6 +38,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   ],
   productFiltersPro: true,
   productFiltersLayout: 'DEFAULT',
+  productListPaginationVariant: 'COMPACT',
   compareVariant: 'ICON',
   robotsAllow: false,
 
@@ -47,4 +49,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   configurableVariantForSimple: true,
   configurableVariantValues: { url: true, content: true, gallery: true },
   recentlyViewedProducts: { enabled: true, maxCount: 20 },
+  breadcrumbs: false,
+  customerDeleteEnabled: true,
+  previewSecret: 'SECRET',
 }

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -17,6 +17,7 @@ import {
   ZodEnum,
   ZodTypeAny,
   ZodAny,
+  ZodDefault,
 } from 'zod'
 import diff from './diff'
 
@@ -61,6 +62,7 @@ export function configToEnvSchema(schema: ZodNode) {
     if (node instanceof ZodEffects) node = node.innerType()
     if (node instanceof ZodOptional) node = node.unwrap()
     if (node instanceof ZodNullable) node = node.unwrap()
+    if (node instanceof ZodDefault) node = node.removeDefault()
 
     if (node instanceof ZodObject) {
       if (path.length > 0) {
@@ -99,7 +101,13 @@ export function configToEnvSchema(schema: ZodNode) {
       return
     }
 
-    if (node instanceof ZodString || node instanceof ZodNumber || node instanceof ZodEnum) {
+    if (node instanceof ZodNumber) {
+      envSchema[toEnvStr(path)] = z.coerce.number().optional()
+      envToDot[toEnvStr(path)] = dotNotation(path)
+      return
+    }
+
+    if (node instanceof ZodString || node instanceof ZodEnum) {
       envSchema[toEnvStr(path)] = node.optional()
       envToDot[toEnvStr(path)] = dotNotation(path)
       return

package/src/generated/config.ts

@@ -104,6 +104,8 @@ export type DatalayerConfig = {
  * Below is a list of all possible configurations that can be set by GraphCommerce.
  */
 export type GraphCommerceConfig = {
+  /** Configuration for the SidebarGallery component */
+  breadcrumbs?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * The canonical base URL is used for SEO purposes.
    *
@@ -157,14 +159,17 @@ export type GraphCommerceConfig = {
    * Default: 'false'
    */
   crossSellsRedirectItems?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enables the shipping notes field in the checkout */
+  customerAddressNoteEnable?: InputMaybe<Scalars['Boolean']['input']>;
   /**
-   * Due to a limitation in the GraphQL API of Magento 2, we need to know if the
-   * customer requires email confirmation.
-   *
-   * This value should match Magento 2's configuration value for
-   * `customer/create_account/confirm` and should be removed once we can query
+   * Enables company fields inside the checkout:
+   * - Company name
+   * - VAT ID
    */
-  customerRequireEmailConfirmation?: InputMaybe<Scalars['Boolean']['input']>;
+  customerCompanyFieldsEnable?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enable customer account deletion through the account section */
+  customerDeleteEnabled?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Datalayer config */
   dataLayer?: InputMaybe<DatalayerConfig>;
   /** Debug configuration for GraphCommerce */
   debug?: InputMaybe<GraphCommerceDebugConfig>;
@@ -275,6 +280,12 @@ export type GraphCommerceConfig = {
    * - https://magento2.test/graphql
    */
   magentoEndpoint: Scalars['String']['input'];
+  /**
+   * Version of the Magento backend.
+   *
+   * Values: 245, 246, 247 for Magento 2.4.5, 2.4.6, 2.4.7 respectively.
+   */
+  magentoVersion: Scalars['Int']['input'];
   /** To enable next.js' preview mode, configure the secret you'd like to use. */
   previewSecret?: InputMaybe<Scalars['String']['input']>;
   /**
@@ -285,6 +296,13 @@ export type GraphCommerceConfig = {
   productFiltersLayout?: InputMaybe<ProductFiltersLayout>;
   /** Product filters with better UI for mobile and desktop. */
   productFiltersPro?: InputMaybe<Scalars['Boolean']['input']>;
+  /**
+   * Pagination variant for the product listings.
+   *
+   * COMPACT means: "< Page X of Y >"
+   * EXTENDED means: "< 1 2 ... 4 [5] 6 ... 10 11 >"
+   */
+  productListPaginationVariant?: InputMaybe<PaginationVariant>;
   /**
    * By default we route products to /p/[url] but you can change this to /product/[url] if you wish.
    *
@@ -345,6 +363,12 @@ export type GraphCommerceStorefrontConfig = {
   canonicalBaseUrl?: InputMaybe<Scalars['String']['input']>;
   /** Due to a limitation of the GraphQL API it is not possible to determine if a cart should be displayed including or excluding tax. */
   cartDisplayPricesInclTax?: InputMaybe<Scalars['Boolean']['input']>;
+  /**
+   * Enables company fields inside the checkout:
+   * - Company name
+   * - VAT ID
+   */
+  customerCompanyFieldsEnable?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * There can only be one entry with defaultLocale set to true.
    * - If there are more, the first one is used.
@@ -384,6 +408,11 @@ export type GraphCommerceStorefrontConfig = {
    * - b2b-us
    */
   magentoStoreCode: Scalars['String']['input'];
+  /**
+   * Allow the site to be indexed by search engines.
+   * If false, the robots.txt file will be set to disallow all.
+   */
+  robotsAllow?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /** Options to configure which values will be replaced when a variant is selected on the product page. */
@@ -403,6 +432,10 @@ export type MagentoConfigurableVariantValues = {
   url?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
+export type PaginationVariant =
+  | 'COMPACT'
+  | 'EXTENDED';
+
 export type ProductFiltersLayout =
   | 'DEFAULT'
   | 'SIDEBAR';
@@ -439,6 +472,8 @@ export const definedNonNullAnySchema = z.any().refine((v) => isDefinedNonNullAny
 
 export const CompareVariantSchema = z.enum(['CHECKBOX', 'ICON']);
 
+export const PaginationVariantSchema = z.enum(['COMPACT', 'EXTENDED']);
+
 export const ProductFiltersLayoutSchema = z.enum(['DEFAULT', 'SIDEBAR']);
 
 export const SidebarGalleryPaginationVariantSchema = z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
@@ -451,18 +486,21 @@ export function DatalayerConfigSchema(): z.ZodObject<Properties<DatalayerConfig>
 
 export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerceConfig>> {
   return z.object({
+    breadcrumbs: z.boolean().default(false).nullish(),
     canonicalBaseUrl: z.string().min(1),
     cartDisplayPricesInclTax: z.boolean().nullish(),
     compare: z.boolean().nullish(),
-    compareVariant: CompareVariantSchema.nullish(),
-    configurableVariantForSimple: z.boolean().nullish(),
+    compareVariant: CompareVariantSchema.default("ICON").nullish(),
+    configurableVariantForSimple: z.boolean().default(false).nullish(),
     configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
-    crossSellsHideCartItems: z.boolean().nullish(),
-    crossSellsRedirectItems: z.boolean().nullish(),
-    customerRequireEmailConfirmation: z.boolean().nullish(),
+    crossSellsHideCartItems: z.boolean().default(false).nullish(),
+    crossSellsRedirectItems: z.boolean().default(false).nullish(),
+    customerAddressNoteEnable: z.boolean().nullish(),
+    customerCompanyFieldsEnable: z.boolean().nullish(),
+    customerDeleteEnabled: z.boolean().nullish(),
     dataLayer: DatalayerConfigSchema().nullish(),
     debug: GraphCommerceDebugConfigSchema().nullish(),
-    demoMode: z.boolean().nullish(),
+    demoMode: z.boolean().default(true).nullish(),
     enableGuestCheckoutLogin: z.boolean().nullish(),
     googleAnalyticsId: z.string().nullish(),
     googleRecaptchaKey: z.string().nullish(),
@@ -474,9 +512,11 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
     hygraphWriteAccessToken: z.string().nullish(),
     limitSsg: z.boolean().nullish(),
     magentoEndpoint: z.string().min(1),
+    magentoVersion: z.number(),
     previewSecret: z.string().nullish(),
-    productFiltersLayout: ProductFiltersLayoutSchema.nullish(),
+    productFiltersLayout: ProductFiltersLayoutSchema.default("DEFAULT").nullish(),
     productFiltersPro: z.boolean().nullish(),
+    productListPaginationVariant: PaginationVariantSchema.default("COMPACT").nullish(),
     productRoute: z.string().nullish(),
     recentlyViewedProducts: RecentlyViewedProductsConfigSchema().nullish(),
     robotsAllow: z.boolean().nullish(),
@@ -500,6 +540,7 @@ export function GraphCommerceStorefrontConfigSchema(): z.ZodObject<Properties<Gr
   return z.object({
     canonicalBaseUrl: z.string().nullish(),
     cartDisplayPricesInclTax: z.boolean().nullish(),
+    customerCompanyFieldsEnable: z.boolean().nullish(),
     defaultLocale: z.boolean().nullish(),
     domain: z.string().nullish(),
     googleAnalyticsId: z.string().nullish(),
@@ -508,7 +549,8 @@ export function GraphCommerceStorefrontConfigSchema(): z.ZodObject<Properties<Gr
     hygraphLocales: z.array(z.string().min(1)).nullish(),
     linguiLocale: z.string().nullish(),
     locale: z.string().min(1),
-    magentoStoreCode: z.string().min(1)
+    magentoStoreCode: z.string().min(1),
+    robotsAllow: z.boolean().nullish()
   })
 }