@graphcommerce/next-config 8.1.0-canary.3 → 8.1.0-canary.5

package/__tests__/interceptors/parseStructure.ts

@@ -0,0 +1,158 @@
+import { GraphCommerceConfig } from '../../src/generated/config'
+import { parseStructure } from '../../src/interceptors/parseStructure'
+import { parseSync } from '../../src/interceptors/swc'
+
+const fakeconfig = {
+  googleRecaptchaKey: '123',
+  googleAnalyticsId: '123',
+  demoMode: true,
+} as GraphCommerceConfig
+
+it("correctly parses the new PluginConfig and it's ifConfig configuration", () => {
+  const src = `
+import { getProductStaticPaths as getProductStaticPathsType } from '@graphcommerce/magento-product'
+import { PluginConfig } from '@graphcommerce/next-config'
+
+
+export const config: PluginConfig = {
+  type: 'replace',
+  module: '@graphcommerce/magento-product',
+  ifConfig: 'demoMode',
+}
+
+// eslint-disable-next-line @typescript-eslint/require-await
+export const getProductStaticPaths: typeof getProductStaticPathsType = async () => [
+  { params: { url: 'demo-product' } },
+]
+`
+  const ast = parseSync(src)
+
+  const plugins = parseStructure(ast, fakeconfig, './plugins/MyReplace')
+  expect(plugins).toHaveLength(1)
+  expect(plugins[0]).toMatchInlineSnapshot(`
+    {
+      "enabled": true,
+      "ifConfig": "demoMode",
+      "sourceExport": "getProductStaticPaths",
+      "sourceModule": "./plugins/MyReplace",
+      "targetExport": "getProductStaticPaths",
+      "targetModule": "@graphcommerce/magento-product",
+      "type": "replace",
+    }
+  `)
+})
+
+it('correctly the classic component plugin config', () => {
+  const src = `
+import type { ProdustListItemConfigurableProps } from '@graphcommerce/magento-product-configurable'
+import type { IfConfig, PluginProps } from '@graphcommerce/next-config'
+
+export const component = 'ProductListItemConfigurable'
+export const exported = '@graphcommerce/magento-product-configurable'
+export const ifConfig: IfConfig = 'demoMode'
+
+function DemoProductListItemConfigurable(props: PluginProps<ProdustListItemConfigurableProps>) {
+  const { Prev, ...rest } = props
+  return <Prev {...rest} swatchLocations={{ bottomRight: ['dominant_color'] }} />
+}
+export const Plugin = DemoProductListItemConfigurable
+`
+  const ast = parseSync(src)
+
+  const plugins = parseStructure(ast, fakeconfig, './plugins/MyComponentPlugin')
+  expect(plugins).toHaveLength(1)
+  expect(plugins[0]).toMatchInlineSnapshot(`
+    {
+      "enabled": true,
+      "ifConfig": "demoMode",
+      "sourceExport": "Plugin",
+      "sourceModule": "./plugins/MyComponentPlugin",
+      "targetExport": "ProductListItemConfigurable",
+      "targetModule": "@graphcommerce/magento-product-configurable",
+      "type": "component",
+    }
+  `)
+})
+
+it('correctly parses the classic function plugin config', () => {
+  const src = `
+import { graphqlConfig, setContext } from '@graphcommerce/graphql'
+import type { MethodPlugin } from '@graphcommerce/next-config'
+
+export const func = 'graphqlConfig'
+export const exported = '@graphcommerce/graphql'
+
+const hygraphGraphqlConfig: MethodPlugin<typeof graphqlConfig> = (prev, config) => {
+  const results = prev(config)
+
+  const locales = config.storefront.hygraphLocales
+
+  if (!locales) return prev(config)
+
+  const hygraphLink = setContext((_, context) => {
+    if (!context.headers) context.headers = {}
+    context.headers['gcms-locales'] = locales.join(',')
+    return context
+  })
+
+  return { ...results, links: [...results.links, hygraphLink] }
+}
+
+export const plugin = hygraphGraphqlConfig
+`
+  const ast = parseSync(src)
+
+  const plugins = parseStructure(ast, fakeconfig, './plugins/MyClassicFunctionPlugin')
+  expect(plugins).toHaveLength(1)
+  expect(plugins[0]).toMatchInlineSnapshot(`
+    {
+      "enabled": true,
+      "sourceExport": "plugin",
+      "sourceModule": "./plugins/MyClassicFunctionPlugin",
+      "targetExport": "graphqlConfig",
+      "targetModule": "@graphcommerce/graphql",
+      "type": "function",
+    }
+  `)
+})
+
+it('parses the correct export when both the classic and new config is present', () => {
+  const src = `import { AddProductsToCartFormProps } from '@graphcommerce/magento-product'
+import { IfConfig, PluginConfig, PluginProps } from '@graphcommerce/next-config'
+
+export const component = 'AddProductsToCartForm'
+export const exported = '@graphcommerce/magento-product'
+export const ifConfig: IfConfig = 'demoMode'
+
+export const config: PluginConfig = {
+  type: 'component',
+  module: '@graphcommerce/magento-product',
+  ifConfig: 'demoMode',
+}
+
+function EnableCrossselsPlugin(props: PluginProps<AddProductsToCartFormProps>) {
+  const { Prev, redirect = 'added', ...rest } = props
+  return <Prev {...rest} redirect={redirect} />
+}
+
+export const AddProductsToCartForm = EnableCrossselsPlugin
+`
+
+  const plugins = parseStructure(
+    parseSync(src),
+    fakeconfig,
+    './plugins/MyAddProductsToCartFormPlugin.tsx',
+  )
+  expect(plugins).toHaveLength(1)
+  expect(plugins[0]).toMatchInlineSnapshot(`
+    {
+      "enabled": true,
+      "ifConfig": "demoMode",
+      "sourceExport": "AddProductsToCartForm",
+      "sourceModule": "./plugins/MyAddProductsToCartFormPlugin.tsx",
+      "targetExport": "AddProductsToCartForm",
+      "targetModule": "@graphcommerce/magento-product",
+      "type": "component",
+    }
+  `)
+})

package/__tests__/interceptors/writeInterceptors.ts

@@ -3,32 +3,41 @@ import { resolveDependency } from '../../src/utils/resolveDependency'
 
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 
-it('writes all interceptors to disk', () => {
+it('writes all interceptors to disk', async () => {
   const resolve = resolveDependency(projectRoot)
-  generateInterceptors(
+  await generateInterceptors(
     [
       {
-        component: 'PaymentMethodContextProvider',
-        exported: '@graphcommerce/magento-cart-payment-method',
-        plugin: '@graphcommerce/mollie-magento-payment/plugins/AddMollieMethods',
+        type: 'component',
+
+        targetExport: 'PaymentMethodContextProvider',
+        targetModule: '@graphcommerce/magento-cart-payment-method',
+        sourceExport: 'Plugin',
+        sourceModule: '@graphcommerce/mollie-magento-payment/plugins/AddMollieMethods',
         enabled: true,
       },
       {
-        component: 'PaymentMethodContextProvider',
-        exported: '@graphcommerce/magento-cart-payment-method',
-        plugin: '@graphcommerce/magento-payment-braintree/plugins/AddBraintreeMethods',
+        type: 'component',
+        sourceExport: 'Plugin',
+        targetExport: 'PaymentMethodContextProvider',
+        targetModule: '@graphcommerce/magento-cart-payment-method',
+        sourceModule: '@graphcommerce/magento-payment-braintree/plugins/AddBraintreeMethods',
         enabled: true,
       },
       {
-        component: 'PaymentMethodContextProvider',
-        exported: '@graphcommerce/magento-cart-payment-method',
-        plugin: '@graphcommerce/magento-payment-included/plugins/AddIncludedMethods',
+        type: 'component',
+        sourceExport: 'Plugin',
+        targetExport: 'PaymentMethodContextProvider',
+        targetModule: '@graphcommerce/magento-cart-payment-method',
+        sourceModule: '@graphcommerce/magento-payment-included/plugins/AddIncludedMethods',
         enabled: true,
       },
       {
-        component: 'PaymentMethodContextProvider',
-        exported: '@graphcommerce/magento-cart-payment-method',
-        plugin: '@graphcommerce/magento-payment-paypal/plugins/AddPaypalMethods',
+        type: 'component',
+        sourceExport: 'Plugin',
+        targetExport: 'PaymentMethodContextProvider',
+        targetModule: '@graphcommerce/magento-cart-payment-method',
+        sourceModule: '@graphcommerce/magento-payment-paypal/plugins/AddPaypalMethods',
         enabled: true,
       },
     ],

package/__tests__/utils/resolveDependenciesSync.ts

@@ -9,55 +9,58 @@ it('resolves dependences', () => {
     Map {
       "." => "examples/magento-graphcms",
       "@graphcommerce/cli" => "packages/cli",
-      "@graphcommerce/hygraph-cli" => "packages/hygraph-cli",
       "@graphcommerce/demo-magento-graphcommerce" => "packages/demo-magento-graphcommerce",
+      "@graphcommerce/ecommerce-ui" => "packages/ecommerce-ui",
+      "@graphcommerce/framer-next-pages" => "packages/framer-next-pages",
+      "@graphcommerce/framer-scroller" => "packages/framer-scroller",
+      "@graphcommerce/framer-utils" => "packages/framer-utils",
       "@graphcommerce/googleanalytics" => "packages/googleanalytics",
-      "@graphcommerce/magento-cart-shipping-method" => "packages/magento-cart-shipping-method",
       "@graphcommerce/googlerecaptcha" => "packages/googlerecaptcha",
       "@graphcommerce/googletagmanager" => "packages/googletagmanager",
+      "@graphcommerce/google-datalayer" => "packages/google-datalayer",
       "@graphcommerce/graphcms-ui" => "packages/hygraph-ui",
+      "@graphcommerce/graphql" => "packages/graphql",
+      "@graphcommerce/graphql-codegen-near-operation-file" => "packagesDev/graphql-codegen-near-operation-file",
+      "@graphcommerce/graphql-codegen-relay-optimizer-plugin" => "packagesDev/graphql-codegen-relay-optimizer-plugin",
+      "@graphcommerce/graphql-mesh" => "packages/graphql-mesh",
+      "@graphcommerce/hygraph-cli" => "packages/hygraph-cli",
+      "@graphcommerce/hygraph-dynamic-rows" => "packages/hygraph-dynamic-rows",
+      "@graphcommerce/image" => "packages/image",
       "@graphcommerce/lingui-next" => "packages/lingui-next",
-      "@graphcommerce/next-config" => "packagesDev/next-config",
+      "@graphcommerce/magento-cart" => "packages/magento-cart",
       "@graphcommerce/magento-cart-billing-address" => "packages/magento-cart-billing-address",
       "@graphcommerce/magento-cart-checkout" => "packages/magento-cart-checkout",
       "@graphcommerce/magento-cart-coupon" => "packages/magento-cart-coupon",
       "@graphcommerce/magento-cart-email" => "packages/magento-cart-email",
+      "@graphcommerce/magento-cart-items" => "packages/magento-cart-items",
+      "@graphcommerce/magento-cart-payment-method" => "packages/magento-cart-payment-method",
+      "@graphcommerce/magento-cart-shipping-address" => "packages/magento-cart-shipping-address",
+      "@graphcommerce/magento-cart-shipping-method" => "packages/magento-cart-shipping-method",
+      "@graphcommerce/magento-category" => "packages/magento-category",
       "@graphcommerce/magento-cms" => "packages/magento-cms",
       "@graphcommerce/magento-compare" => "packages/magento-compare",
+      "@graphcommerce/magento-customer" => "packages/magento-customer",
+      "@graphcommerce/magento-graphql" => "packages/magento-graphql",
       "@graphcommerce/magento-newsletter" => "packages/magento-newsletter",
       "@graphcommerce/magento-payment-included" => "packages/magento-payment-included",
-      "@graphcommerce/magento-cart-payment-method" => "packages/magento-cart-payment-method",
-      "@graphcommerce/magento-cart-shipping-address" => "packages/magento-cart-shipping-address",
+      "@graphcommerce/magento-product" => "packages/magento-product",
       "@graphcommerce/magento-product-bundle" => "packages/magento-product-bundle",
+      "@graphcommerce/magento-product-configurable" => "packages/magento-product-configurable",
       "@graphcommerce/magento-product-downloadable" => "packages/magento-product-downloadable",
       "@graphcommerce/magento-product-grouped" => "packages/magento-product-grouped",
+      "@graphcommerce/magento-product-simple" => "packages/magento-product-simple",
       "@graphcommerce/magento-product-virtual" => "packages/magento-product-virtual",
+      "@graphcommerce/magento-recently-viewed-products" => "packages/magento-recently-viewed-products",
       "@graphcommerce/magento-review" => "packages/magento-review",
       "@graphcommerce/magento-search" => "packages/magento-search",
-      "@graphcommerce/magento-wishlist" => "packages/magento-wishlist",
-      "@graphcommerce/magento-product-configurable" => "packages/magento-product-configurable",
-      "@graphcommerce/magento-product-simple" => "packages/magento-product-simple",
-      "@graphcommerce/magento-category" => "packages/magento-category",
-      "@graphcommerce/magento-cart-items" => "packages/magento-cart-items",
-      "@graphcommerce/magento-product" => "packages/magento-product",
-      "@graphcommerce/magento-cart" => "packages/magento-cart",
-      "@graphcommerce/magento-customer" => "packages/magento-customer",
       "@graphcommerce/magento-store" => "packages/magento-store",
-      "@graphcommerce/magento-graphql" => "packages/magento-graphql",
-      "@graphcommerce/ecommerce-ui" => "packages/ecommerce-ui",
-      "@graphcommerce/react-hook-form" => "packages/react-hook-form",
+      "@graphcommerce/magento-wishlist" => "packages/magento-wishlist",
+      "@graphcommerce/next-config" => "packagesDev/next-config",
       "@graphcommerce/next-ui" => "packages/next-ui",
-      "@graphcommerce/framer-scroller" => "packages/framer-scroller",
-      "@graphcommerce/framer-next-pages" => "packages/framer-next-pages",
-      "@graphcommerce/image" => "packages/image",
-      "@graphcommerce/framer-utils" => "packages/framer-utils",
-      "@graphcommerce/graphql-mesh" => "packages/graphql-mesh",
-      "@graphcommerce/graphql" => "packages/graphql",
-      "@graphcommerce/graphql-codegen-relay-optimizer-plugin" => "packagesDev/graphql-codegen-relay-optimizer-plugin",
-      "@graphcommerce/graphql-codegen-near-operation-file" => "packagesDev/graphql-codegen-near-operation-file",
-      "@graphcommerce/prettier-config-pwa" => "packagesDev/prettier-config",
+      "@graphcommerce/react-hook-form" => "packages/react-hook-form",
       "@graphcommerce/eslint-config-pwa" => "packagesDev/eslint-config",
       "@graphcommerce/typescript-config-pwa" => "packagesDev/typescript-config",
+      "@graphcommerce/prettier-config-pwa" => "packagesDev/prettier-config",
     }
   `)
 })

package/dist/config/commands/generateConfig.js

@@ -12,8 +12,11 @@ const packages = [...(0, resolveDependenciesSync_1.resolveDependenciesSync)().va
 const resolve = (0, resolveDependency_1.resolveDependency)();
 const schemaLocations = packages.map((p) => `${p}/**/Config.graphqls`);
 async function generateConfig() {
-    const targetTs = `${resolve('@graphcommerce/next-config').root}/src/generated/config.ts`;
-    const targetJs = `${resolve('@graphcommerce/next-config').root}/dist/generated/config.js`;
+    const resolved = resolve('@graphcommerce/next-config');
+    if (!resolved)
+        throw Error('Could not resolve @graphcommerce/next-config');
+    const targetTs = `${resolved.root}/src/generated/config.ts`;
+    const targetJs = `${resolved.root}/dist/generated/config.js`;
     await (0, cli_1.generate)({
         silent: true,
         schema: ['graphql/**/Config.graphqls', ...schemaLocations],

package/dist/config/demoConfig.js

@@ -13,10 +13,25 @@ exports.demoConfig = {
             hygraphLocales: ['nl', 'en_us'],
             cartDisplayPricesInclTax: true,
         },
-        { locale: 'fr-be', magentoStoreCode: 'fr_BE', cartDisplayPricesInclTax: true },
-        { locale: 'nl-be', magentoStoreCode: 'nl_BE', cartDisplayPricesInclTax: true },
-        { locale: 'en-gb', magentoStoreCode: 'en_GB', cartDisplayPricesInclTax: true },
-        { locale: 'en-ca', magentoStoreCode: 'en_CA' },
+        {
+            locale: 'fr-be',
+            magentoStoreCode: 'fr_BE',
+            cartDisplayPricesInclTax: true,
+            linguiLocale: 'fr',
+        },
+        {
+            locale: 'nl-be',
+            magentoStoreCode: 'nl_BE',
+            cartDisplayPricesInclTax: true,
+            linguiLocale: 'nl',
+        },
+        {
+            locale: 'en-gb',
+            magentoStoreCode: 'en_GB',
+            cartDisplayPricesInclTax: true,
+            linguiLocale: 'en',
+        },
+        { locale: 'en-ca', magentoStoreCode: 'en_CA', linguiLocale: 'en' },
     ],
     productFiltersPro: true,
     productFiltersLayout: 'DEFAULT',

package/dist/generated/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SidebarGalleryConfigSchema = exports.RecentlyViewedProductsConfigSchema = exports.MagentoConfigurableVariantValuesSchema = exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = 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.CompareVariantSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
 /* eslint-disable */
 const zod_1 = require("zod");
 const isDefinedNonNullAny = (v) => v !== undefined && v !== null;
@@ -9,6 +9,12 @@ exports.definedNonNullAnySchema = zod_1.z.any().refine((v) => (0, exports.isDefi
 exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
 exports.ProductFiltersLayoutSchema = zod_1.z.enum(['DEFAULT', 'SIDEBAR']);
 exports.SidebarGalleryPaginationVariantSchema = zod_1.z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
+function DatalayerConfigSchema() {
+    return zod_1.z.object({
+        coreWebVitals: zod_1.z.boolean().nullish()
+    });
+}
+exports.DatalayerConfigSchema = DatalayerConfigSchema;
 function GraphCommerceConfigSchema() {
     return zod_1.z.object({
         canonicalBaseUrl: zod_1.z.string().min(1),
@@ -20,6 +26,7 @@ function GraphCommerceConfigSchema() {
         crossSellsHideCartItems: zod_1.z.boolean().nullish(),
         crossSellsRedirectItems: zod_1.z.boolean().nullish(),
         customerRequireEmailConfirmation: zod_1.z.boolean().nullish(),
+        dataLayer: DatalayerConfigSchema().nullish(),
         debug: GraphCommerceDebugConfigSchema().nullish(),
         demoMode: zod_1.z.boolean().nullish(),
         enableGuestCheckoutLogin: zod_1.z.boolean().nullish(),

package/dist/interceptors/InterceptorPlugin.js

@@ -9,51 +9,96 @@ const resolveDependency_1 = require("../utils/resolveDependency");
 const findPlugins_1 = require("./findPlugins");
 const generateInterceptors_1 = require("./generateInterceptors");
 const writeInterceptors_1 = require("./writeInterceptors");
+let interceptors;
+let interceptorByDepependency;
+let generating = false;
+// let totalGenerationTime = 0
 class InterceptorPlugin {
     config;
-    interceptors;
-    interceptorByDepependency;
+    regenerate;
     resolveDependency;
-    constructor(config) {
+    constructor(config, regenerate = false) {
         this.config = config;
+        this.regenerate = regenerate;
         this.resolveDependency = (0, resolveDependency_1.resolveDependency)();
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
-        this.interceptors = (0, generateInterceptors_1.generateInterceptors)(plugins, this.resolveDependency, this.config.debug);
-        this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
-        (0, writeInterceptors_1.writeInterceptors)(this.interceptors);
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        if (regenerate)
+            this.#generateInterceptors();
     }
+    #generateInterceptors = async () => {
+        if (generating)
+            return {};
+        generating = true;
+        const start = Date.now();
+        // console.log('Generating interceptors...')
+        const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
+        // console.log(errors)
+        // const found = Date.now()
+        // console.log('Found plugins in', found - start, 'ms')
+        const generatedInterceptors = await (0, generateInterceptors_1.generateInterceptors)(plugins, this.resolveDependency, this.config.debug);
+        // const generated = Date.now()
+        // console.log('Generated interceptors in', generated - found, 'ms')
+        await (0, writeInterceptors_1.writeInterceptors)(generatedInterceptors);
+        // const wrote = Date.now()
+        // console.log('Wrote interceptors in', wrote - generated, 'ms')
+        interceptors = generatedInterceptors;
+        interceptorByDepependency = Object.fromEntries(Object.values(interceptors).map((i) => [i.dependency, i]));
+        // totalGenerationTime += Date.now() - start
+        generating = false;
+        return generatedInterceptors;
+    };
     apply(compiler) {
         const logger = compiler.getInfrastructureLogger('InterceptorPlugin');
         // After the compilation has succeeded we watch all possible plugin locations.
-        compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
-            plugins.forEach((p) => {
-                const absoluteFilePath = `${path_1.default.join(process.cwd(), this.resolveDependency(p.plugin).fromRoot)}.tsx`;
-                compilation.fileDependencies.add(absoluteFilePath);
+        if (this.regenerate) {
+            compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
+                // console.log('generate interceptors after compile')
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
+                plugins.forEach((p) => {
+                    const source = this.resolveDependency(p.sourceModule);
+                    if (source) {
+                        const absoluteFilePath = `${path_1.default.join(process.cwd(), source.fromRoot)}.tsx`;
+                        compilation.fileDependencies.add(absoluteFilePath);
+                    }
+                });
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                this.#generateInterceptors().then((i) => {
+                    Object.entries(i).forEach(([key, { sourcePath }]) => {
+                        const absoluteFilePath = path_1.default.join(process.cwd(), sourcePath);
+                        compilation.fileDependencies.add(absoluteFilePath);
+                    });
+                });
             });
-            this.interceptors = (0, generateInterceptors_1.generateInterceptors)(plugins, this.resolveDependency, this.config.debug);
-            this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
-            (0, writeInterceptors_1.writeInterceptors)(this.interceptors);
-        });
+        }
         compiler.hooks.normalModuleFactory.tap('InterceptorPlugin', (nmf) => {
             nmf.hooks.beforeResolve.tap('InterceptorPlugin', (resource) => {
                 const issuer = resource.contextInfo.issuer ?? '';
                 const requestPath = path_1.default.relative(process.cwd(), path_1.default.resolve(resource.context, resource.request));
-                if (issuer.endsWith('interceptor.tsx') && this.interceptors[requestPath]) {
+                if (!interceptors || !interceptorByDepependency) {
+                    // console.log('interceptors not ready')
+                    return;
+                }
+                const split = requestPath.split('/');
+                const targets = [
+                    `${split[split.length - 1]}.interceptor.tsx`,
+                    `${split[split.length - 1]}.interceptor.ts`,
+                ];
+                if (targets.some((target) => issuer.endsWith(target)) && interceptors[requestPath]) {
                     logger.log(`Interceptor ${issuer} is requesting the original ${requestPath}`);
                     return;
                 }
-                const interceptorForRequest = this.interceptorByDepependency[resource.request];
+                const interceptorForRequest = interceptorByDepependency[resource.request];
                 if (interceptorForRequest) {
-                    logger.log(`Intercepting dep... ${interceptorForRequest.dependency}`);
-                    resource.request = `${interceptorForRequest.denormalized}.interceptor.tsx`;
+                    const extension = interceptorForRequest.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts';
+                    resource.request = `${interceptorForRequest.denormalized}.interceptor${extension}`;
+                    logger.log(`Intercepting dep... ${interceptorForRequest.dependency}`, resource.request);
                 }
-                const interceptorForPath = this.interceptors[requestPath];
+                const interceptorForPath = interceptors[requestPath];
                 if (interceptorForPath) {
-                    logger.log(`Intercepting fromRoot... ${interceptorForPath.fromRoot}`);
-                    resource.request = `${resource.request}.interceptor.tsx`;
+                    const extension = interceptorForPath.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts';
+                    resource.request = `${resource.request}.interceptor${extension}`;
+                    logger.log(`Intercepting fromRoot... ${interceptorForPath.dependency}`, resource.request);
                 }
             });
         });

package/dist/interceptors/RenameVisitor.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenameVisitor = void 0;
+const Visitor_1 = require("./Visitor");
+class RenameVisitor extends Visitor_1.Visitor {
+    replace;
+    suffix;
+    constructor(replace, suffix) {
+        super();
+        this.replace = replace;
+        this.suffix = suffix;
+    }
+    visitIdentifier(n) {
+        if (this.replace.includes(n.value))
+            n.value = this.suffix(n.value);
+        return n;
+    }
+}
+exports.RenameVisitor = RenameVisitor;