@graphcommerce/next-config 8.1.0-canary.9 → 9.0.0-canary.101

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/loadConfig.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfig = void 0;
+exports.loadConfig = loadConfig;
 /* eslint-disable no-console */
 // eslint-disable-next-line import/no-extraneous-dependencies
 const cosmiconfig_1 = require("cosmiconfig");
@@ -60,4 +60,3 @@ function loadConfig(cwd) {
         throw error;
     }
 }
-exports.loadConfig = loadConfig;

package/dist/config/utils/configToImportMeta.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configToImportMeta = void 0;
+exports.configToImportMeta = configToImportMeta;
 function flattenKeys(value, initialPathPrefix, stringify) {
     // Is a scalar:
     if (value === null || value === undefined || typeof value === 'number') {
@@ -37,4 +37,3 @@ function flattenKeys(value, initialPathPrefix, stringify) {
 function configToImportMeta(config, path = 'import.meta.graphCommerce', stringify = true) {
     return flattenKeys(config, path, stringify);
 }
-exports.configToImportMeta = configToImportMeta;

package/dist/config/utils/diff.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = diff;
 function isObject(val) {
     return typeof val === 'object' && val !== null;
 }
@@ -30,4 +31,3 @@ function diff(item1, item2) {
     }
     return item2 === item1 ? undefined : item2;
 }
-exports.default = diff;

package/dist/config/utils/exportConfigToEnv.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportConfigToEnv = void 0;
+exports.exportConfigToEnv = exportConfigToEnv;
 const mergeEnvIntoConfig_1 = require("./mergeEnvIntoConfig");
 const fmt = (value) => {
     let formattedValue = value;
@@ -29,4 +29,3 @@ function exportConfigToEnv(config) {
     });
     return env;
 }
-exports.exportConfigToEnv = exportConfigToEnv;

package/dist/config/utils/mergeEnvIntoConfig.js

@@ -3,7 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatAppliedEnv = exports.mergeEnvIntoConfig = exports.filterEnv = exports.configToEnvSchema = exports.dotNotation = exports.toEnvStr = void 0;
+exports.filterEnv = exports.dotNotation = exports.toEnvStr = void 0;
+exports.configToEnvSchema = configToEnvSchema;
+exports.mergeEnvIntoConfig = mergeEnvIntoConfig;
+exports.formatAppliedEnv = formatAppliedEnv;
 /* eslint-disable import/no-extraneous-dependencies */
 const utilities_1 = require("@apollo/client/utilities");
 const chalk_1 = __importDefault(require("chalk"));
@@ -43,6 +46,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 +78,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;
@@ -97,7 +107,6 @@ function configToEnvSchema(schema) {
     walk(schema);
     return [zod_1.z.object(envSchema), envToDot];
 }
-exports.configToEnvSchema = configToEnvSchema;
 const filterEnv = (env) => Object.fromEntries(Object.entries(env).filter(([key]) => key.startsWith('GC_')));
 exports.filterEnv = filterEnv;
 function mergeEnvIntoConfig(schema, config, env) {
@@ -130,7 +139,6 @@ function mergeEnvIntoConfig(schema, config, env) {
     });
     return [newConfig, applyResult];
 }
-exports.mergeEnvIntoConfig = mergeEnvIntoConfig;
 /**
  * Prints the applied env variables to the console
  *
@@ -176,4 +184,3 @@ function formatAppliedEnv(applyResult) {
     header += `   - Loaded GraphCommerce env variables`;
     return [header, ...lines].join('\n');
 }
-exports.formatAppliedEnv = formatAppliedEnv;

package/dist/config/utils/replaceConfigInString.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceConfigInString = void 0;
+exports.replaceConfigInString = replaceConfigInString;
 const configToImportMeta_1 = require("./configToImportMeta");
 function replaceConfigInString(str, config) {
     let result = str;
@@ -10,4 +10,3 @@ function replaceConfigInString(str, config) {
     });
     return result;
 }
-exports.replaceConfigInString = replaceConfigInString;

package/dist/config/utils/rewriteLegacyEnv.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rewriteLegacyEnv = void 0;
+exports.rewriteLegacyEnv = rewriteLegacyEnv;
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const mergeEnvIntoConfig_1 = require("./mergeEnvIntoConfig");
 function rewriteLegacyEnv(schema, env, config = {}) {
@@ -113,4 +113,3 @@ function rewriteLegacyEnv(schema, env, config = {}) {
     const [newConfig, envApplied] = (0, mergeEnvIntoConfig_1.mergeEnvIntoConfig)(schema, config, clonedEnv);
     return [newConfig, [...applied, ...envApplied]];
 }
-exports.rewriteLegacyEnv = rewriteLegacyEnv;

package/dist/generated/config.js

@@ -1,34 +1,49 @@
 "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.WebsitePermissionsSchema = exports.SidebarGalleryPaginationVariantSchema = exports.ProductFiltersLayoutSchema = exports.PaginationVariantSchema = exports.CustomerAccountPermissionsSchema = exports.CompareVariantSchema = exports.CartPermissionsSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
+exports.DatalayerConfigSchema = DatalayerConfigSchema;
+exports.GraphCommerceConfigSchema = GraphCommerceConfigSchema;
+exports.GraphCommerceDebugConfigSchema = GraphCommerceDebugConfigSchema;
+exports.GraphCommercePermissionsSchema = GraphCommercePermissionsSchema;
+exports.GraphCommerceStorefrontConfigSchema = GraphCommerceStorefrontConfigSchema;
+exports.MagentoConfigurableVariantValuesSchema = MagentoConfigurableVariantValuesSchema;
+exports.RecentlyViewedProductsConfigSchema = RecentlyViewedProductsConfigSchema;
+exports.SidebarGalleryConfigSchema = SidebarGalleryConfigSchema;
 /* 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.CartPermissionsSchema = zod_1.z.enum(['CUSTOMER_ONLY', 'DISABLED', 'ENABLED']);
 exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
+exports.CustomerAccountPermissionsSchema = zod_1.z.enum(['DISABLED', 'DISABLE_REGISTRATION', 'ENABLED']);
+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']);
+exports.WebsitePermissionsSchema = zod_1.z.enum(['ENABLED']);
 function DatalayerConfigSchema() {
     return zod_1.z.object({
         coreWebVitals: zod_1.z.boolean().nullish()
     });
 }
-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(),
+        customerXMagentoCacheIdDisable: 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(),
@@ -36,13 +51,15 @@ function GraphCommerceConfigSchema() {
         hygraphEndpoint: zod_1.z.string().min(1),
         hygraphManagementApi: zod_1.z.string().nullish(),
         hygraphProjectId: zod_1.z.string().nullish(),
-        hygraphWriteAccessEndpoint: zod_1.z.string().nullish(),
         hygraphWriteAccessToken: zod_1.z.string().nullish(),
         limitSsg: zod_1.z.boolean().nullish(),
         magentoEndpoint: zod_1.z.string().min(1),
+        magentoVersion: zod_1.z.number(),
+        permissions: GraphCommercePermissionsSchema().nullish(),
         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(),
@@ -52,7 +69,6 @@ function GraphCommerceConfigSchema() {
         wishlistShowFeedbackMessage: zod_1.z.boolean().nullish()
     });
 }
-exports.GraphCommerceConfigSchema = GraphCommerceConfigSchema;
 function GraphCommerceDebugConfigSchema() {
     return zod_1.z.object({
         pluginStatus: zod_1.z.boolean().nullish(),
@@ -61,11 +77,19 @@ function GraphCommerceDebugConfigSchema() {
         webpackDuplicatesPlugin: zod_1.z.boolean().nullish()
     });
 }
-exports.GraphCommerceDebugConfigSchema = GraphCommerceDebugConfigSchema;
+function GraphCommercePermissionsSchema() {
+    return zod_1.z.object({
+        cart: exports.CartPermissionsSchema.nullish(),
+        checkout: exports.CartPermissionsSchema.nullish(),
+        customerAccount: exports.CustomerAccountPermissionsSchema.nullish(),
+        website: exports.WebsitePermissionsSchema.nullish()
+    });
+}
 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(),
@@ -75,10 +99,10 @@ function GraphCommerceStorefrontConfigSchema() {
         linguiLocale: zod_1.z.string().nullish(),
         locale: zod_1.z.string().min(1),
         magentoStoreCode: zod_1.z.string().min(1),
+        permissions: GraphCommercePermissionsSchema().nullish(),
         robotsAllow: zod_1.z.boolean().nullish()
     });
 }
-exports.GraphCommerceStorefrontConfigSchema = GraphCommerceStorefrontConfigSchema;
 function MagentoConfigurableVariantValuesSchema() {
     return zod_1.z.object({
         content: zod_1.z.boolean().nullish(),
@@ -86,17 +110,14 @@ function MagentoConfigurableVariantValuesSchema() {
         url: zod_1.z.boolean().nullish()
     });
 }
-exports.MagentoConfigurableVariantValuesSchema = MagentoConfigurableVariantValuesSchema;
 function RecentlyViewedProductsConfigSchema() {
     return zod_1.z.object({
         enabled: zod_1.z.boolean().nullish(),
         maxCount: zod_1.z.number().nullish()
     });
 }
-exports.RecentlyViewedProductsConfigSchema = RecentlyViewedProductsConfigSchema;
 function SidebarGalleryConfigSchema() {
     return zod_1.z.object({
         paginationVariant: exports.SidebarGalleryPaginationVariantSchema.nullish()
     });
 }
-exports.SidebarGalleryConfigSchema = SidebarGalleryConfigSchema;

package/dist/interceptors/Visitor.js

@@ -517,7 +517,6 @@ class Visitor {
         return n;
     }
     visitTsPropertySignature(n) {
-        n.params = this.visitTsFnParameters(n.params);
         n.typeAnnotation = this.visitTsTypeAnnotation(n.typeAnnotation);
         return n;
     }
@@ -595,7 +594,7 @@ class Visitor {
         return n;
     }
     visitTsFnParameters(params) {
-        return params.map(this.visitTsFnParameter.bind(this));
+        return params?.map(this.visitTsFnParameter.bind(this));
     }
     visitTsFnParameter(n) {
         n.typeAnnotation = this.visitTsTypeAnnotation(n.typeAnnotation);

package/dist/interceptors/commands/codegenInterceptors.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codegenInterceptors = void 0;
+exports.codegenInterceptors = codegenInterceptors;
 const loadConfig_1 = require("../../config/loadConfig");
 const resolveDependency_1 = require("../../utils/resolveDependency");
 const findPlugins_1 = require("../findPlugins");
@@ -20,4 +20,3 @@ async function codegenInterceptors() {
     // console.log('Generated interceptors in', generated - found, 'ms')
     await (0, writeInterceptors_1.writeInterceptors)(generatedInterceptors);
 }
-exports.codegenInterceptors = codegenInterceptors;

package/dist/interceptors/extractExports.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractExports = exports.RUNTIME_VALUE = exports.UnsupportedValueError = exports.NoSuchDeclarationError = void 0;
+exports.RUNTIME_VALUE = exports.UnsupportedValueError = exports.NoSuchDeclarationError = void 0;
+exports.extractExports = extractExports;
 class NoSuchDeclarationError extends Error {
 }
 exports.NoSuchDeclarationError = NoSuchDeclarationError;
@@ -87,9 +88,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 +100,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 +122,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 +138,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 +152,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 +168,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) {
@@ -198,4 +202,3 @@ function extractExports(module) {
     }
     return [exports, errors];
 }
-exports.extractExports = extractExports;

package/dist/interceptors/findOriginalSource.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findOriginalSource = void 0;
+exports.findOriginalSource = findOriginalSource;
 const path_1 = __importDefault(require("path"));
 const swc_1 = require("./swc");
 function parseAndFindExport(resolved, findExport, resolve) {
@@ -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')
@@ -65,7 +81,7 @@ function findOriginalSource(plug, resolved, resolve) {
     if (!resolved?.source)
         return {
             resolved: undefined,
-            error: new Error(`Could not resolve ${plug.targetModule}`),
+            error: new Error(`Plugin: Can not find module ${plug.targetModule} for ${plug.sourceModule}`),
         };
     // const cacheKey = `${plug.targetModule}#${plug.targetExport}`
     // if (cachedResults.has(cacheKey)) {
@@ -78,10 +94,9 @@ 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)
     return { resolved: newResolved, error: undefined };
 }
-exports.findOriginalSource = findOriginalSource;

package/dist/interceptors/findPlugins.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findPlugins = void 0;
+exports.findPlugins = findPlugins;
 // eslint-disable-next-line import/no-extraneous-dependencies
 const core_1 = require("@swc/core");
 const chalk_1 = __importDefault(require("chalk"));
@@ -69,4 +69,3 @@ function findPlugins(config, cwd = process.cwd()) {
     }
     return [plugins, errors];
 }
-exports.findPlugins = findPlugins;

package/dist/interceptors/generateInterceptor.js

@@ -3,7 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateInterceptor = exports.moveRelativeDown = exports.SOURCE_END = exports.SOURCE_START = exports.isPluginConfig = exports.isReplacePluginConfig = exports.isMethodPluginConfig = exports.isReactPluginConfig = exports.isPluginBaseConfig = void 0;
+exports.SOURCE_END = exports.SOURCE_START = void 0;
+exports.isPluginBaseConfig = isPluginBaseConfig;
+exports.isReactPluginConfig = isReactPluginConfig;
+exports.isMethodPluginConfig = isMethodPluginConfig;
+exports.isReplacePluginConfig = isReplacePluginConfig;
+exports.isPluginConfig = isPluginConfig;
+exports.moveRelativeDown = moveRelativeDown;
+exports.generateInterceptor = generateInterceptor;
 // eslint-disable-next-line import/no-extraneous-dependencies
 const prettier_config_pwa_1 = __importDefault(require("@graphcommerce/prettier-config-pwa"));
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -16,36 +23,31 @@ function isPluginBaseConfig(plugin) {
         typeof plugin.enabled === 'boolean' &&
         typeof plugin.targetExport === 'string');
 }
-exports.isPluginBaseConfig = isPluginBaseConfig;
 function isReactPluginConfig(plugin) {
     if (!isPluginBaseConfig(plugin))
         return false;
     return plugin.type === 'component';
 }
-exports.isReactPluginConfig = isReactPluginConfig;
 function isMethodPluginConfig(plugin) {
     if (!isPluginBaseConfig(plugin))
         return false;
     return plugin.type === 'function';
 }
-exports.isMethodPluginConfig = isMethodPluginConfig;
 function isReplacePluginConfig(plugin) {
     if (!isPluginBaseConfig(plugin))
         return false;
     return plugin.type === 'replace';
 }
-exports.isReplacePluginConfig = isReplacePluginConfig;
 function isPluginConfig(plugin) {
     return isPluginBaseConfig(plugin);
 }
-exports.isPluginConfig = isPluginConfig;
 exports.SOURCE_START = '/** Original source starts here (do not modify!): **/';
 exports.SOURCE_END = '/** Original source ends here (do not modify!) **/';
 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}`;
@@ -61,7 +63,6 @@ function moveRelativeDown(plugins) {
         return 0;
     });
 }
-exports.moveRelativeDown = moveRelativeDown;
 const generateIdentifyer = (s) => Math.abs(s.split('').reduce((a, b) => {
     // eslint-disable-next-line no-param-reassign, no-bitwise
     a = (a << 5) - a + b.charCodeAt(0);
@@ -121,8 +122,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 +154,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}.`);
         }
@@ -215,4 +215,3 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
     }
     return { ...interceptor, template: templateFormatted };
 }
-exports.generateInterceptor = generateInterceptor;

package/dist/interceptors/generateInterceptors.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateInterceptors = void 0;
+exports.generateInterceptors = generateInterceptors;
 const node_path_1 = __importDefault(require("node:path"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const findOriginalSource_1 = require("./findOriginalSource");
@@ -53,4 +53,3 @@ async function generateInterceptors(plugins, resolve, config, force) {
         ];
     })));
 }
-exports.generateInterceptors = generateInterceptors;

package/dist/interceptors/parseStructure.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseStructure = void 0;
+exports.parseStructure = parseStructure;
 const get_1 = __importDefault(require("lodash/get"));
 const zod_1 = require("zod");
 const extractExports_1 = require("./extractExports");
@@ -11,7 +11,7 @@ const pluginConfigParsed = zod_1.z.object({
     type: zod_1.z.enum(['component', 'function', 'replace']),
     module: zod_1.z.string(),
     export: zod_1.z.string(),
-    ifConfig: zod_1.z.union([zod_1.z.string(), zod_1.z.tuple([zod_1.z.string(), zod_1.z.string()])]).optional(),
+    ifConfig: zod_1.z.union([zod_1.z.string(), zod_1.z.tuple([zod_1.z.string(), zod_1.z.unknown()])]).optional(),
 });
 function nonNullable(value) {
     return value !== null && value !== undefined;
@@ -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) {
@@ -50,9 +51,15 @@ function parseStructure(ast, gcConfig, sourceModule) {
         }
         let enabled = true;
         if (parsed.data.ifConfig) {
-            enabled = Array.isArray(parsed.data.ifConfig)
-                ? (0, get_1.default)(gcConfig, parsed.data.ifConfig[0]) === parsed.data.ifConfig[1]
-                : Boolean((0, get_1.default)(gcConfig, parsed.data.ifConfig));
+            if (Array.isArray(parsed.data.ifConfig)) {
+                const isBoolean = typeof parsed.data.ifConfig[1] === 'boolean';
+                let confValue = (0, get_1.default)(gcConfig, parsed.data.ifConfig[0]);
+                confValue = isBoolean ? Boolean(confValue) : confValue;
+                enabled = confValue === parsed.data.ifConfig[1];
+            }
+            else {
+                enabled = Boolean((0, get_1.default)(gcConfig, parsed.data.ifConfig));
+            }
         }
         const val = {
             targetExport: exports.component || exports.func || parsed.data.export,
@@ -67,5 +74,11 @@ 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;