fix(captcha providers): remove barrel files and fix exports

Author: madblex

injected/src/features/broker-protection/actions/captcha-deprecated.js

@@ -1,5 +1,5 @@
 import { captchaCallback } from './captcha-callback.js';
-import { getElement } from '../utils';
+import { getElement } from '../utils/utils.js';
 import { ErrorResponse, SuccessResponse } from '../types.js';
 
 /**

injected/src/features/broker-protection/actions/click.js

@@ -1,4 +1,4 @@
-import { getElements } from '../utils';
+import { getElements } from '../utils/utils.js';
 import { ErrorResponse, SuccessResponse } from '../types.js';
 import { extractProfiles } from './extract.js';
 import { processTemplateStringWithUserData } from './build-url-transforms.js';

injected/src/features/broker-protection/actions/expectation.js

@@ -1,4 +1,4 @@
-import { getElement } from '../utils';
+import { getElement } from '../utils/utils.js';
 import { ErrorResponse, SuccessResponse } from '../types.js';
 
 /**

injected/src/features/broker-protection/actions/extract.js

@@ -1,4 +1,4 @@
-import { cleanArray, getElement, getElementMatches, getElements, sortAddressesByStateAndCity } from '../utils'; // Assuming you have imported the address comparison function
+import { cleanArray, getElement, getElementMatches, getElements, sortAddressesByStateAndCity } from '../utils/utils.js'; // Assuming you have imported the address comparison function
 import { ErrorResponse, ProfileResult, SuccessResponse } from '../types.js';
 import { isSameAge } from '../comparisons/is-same-age.js';
 import { isSameName } from '../comparisons/is-same-name.js';

injected/src/features/broker-protection/actions/fill-form.js

@@ -1,4 +1,4 @@
-import { getElement, generateRandomInt } from '../utils';
+import { getElement, generateRandomInt } from '../utils/utils.js';
 import { ErrorResponse, SuccessResponse } from '../types.js';
 import { generatePhoneNumber, generateZipCode, generateStreetAddress } from './generators.js';
 

injected/src/features/broker-protection/actions/generators.js

@@ -1,4 +1,4 @@
-import { generateRandomInt } from '../utils';
+import { generateRandomInt } from '../utils/utils.js';
 
 export function generatePhoneNumber() {
     /**

injected/src/features/broker-protection/actions/index.js

@@ -1,10 +1,10 @@
-import { extract } from './extract.js';
-import { fillForm } from './fill-form.js';
-import { click } from './click.js';
-import { expectation } from './expectation.js';
+import { extract } from './extract';
+import { fillForm } from './fill-form';
+import { click } from './click';
+import { expectation } from './expectation';
 import { navigate } from './navigate';
 import { buildUrl } from './build-url';
-import * as captchaHandlers from '../captcha-services';
+import * as captchaHandlers from '../captcha-services/captcha.service';
 import * as deprecatedCaptchaHandlers from './captcha-deprecated';
 
 /**

injected/src/features/broker-protection/actions/navigate.js

@@ -1,4 +1,4 @@
-import { getSupportingCodeToInject } from '../captcha-services';
+import { getSupportingCodeToInject } from '../captcha-services/captcha.service';
 import { ErrorResponse, SuccessResponse } from '../types';
 import { buildUrl } from './build-url';
 

injected/src/features/broker-protection/captcha-services/captcha.service.js

@@ -1,7 +1,8 @@
-import { getElement, removeUrlQueryParams } from '../utils';
+import { getElement } from '../utils/utils.js';
+import { removeUrlQueryParams } from '../utils/url.js';
 import { ErrorResponse, SuccessResponse } from '../types';
 import { getCaptchaProvider, getCaptchaSolveProvider } from './get-captcha-provider';
-import { captchaFactory } from './providers';
+import { captchaFactory } from './providers/registry.js';
 
 /**
  * Returns the supporting code to inject for the given captcha type

injected/src/features/broker-protection/captcha-services/get-captcha-provider.js

@@ -1,4 +1,4 @@
-import { captchaFactory } from './providers';
+import { captchaFactory } from './providers/registry';
 
 /**
  * Gets the captcha provider for the getCaptchaInfo action

injected/src/features/broker-protection/captcha-services/index.js

@@ -1,6 +1,8 @@
+import { getUrlHashParameter, getUrlParameter } from '../../utils/url';
+import { getElementByName, getElementWithSrcStart } from '../../utils/utils';
+import { stringifyFunction } from '../utils/stringify-function';
+import { injectTokenIntoElement } from '../utils/token';
 import { CaptchaProvider } from './provider.interface';
-import { injectTokenIntoElement, stringifyFunction } from '../utils';
-import { getUrlParameter, getUrlHashParameter, getElementByName, getElementWithSrcStart } from '../../utils';
 
 /**
  * Provider for hCaptcha

injected/src/features/broker-protection/captcha-services/providers/hcaptcha.js

@@ -1,6 +1,8 @@
 import { CaptchaProvider } from './provider.interface';
-import { getElementByName, getElementWithSrcStart } from '../../utils';
-import { injectTokenIntoElement, getSiteKeyFromSearchParam, stringifyFunction } from '../utils';
+import { getElementByName, getElementWithSrcStart } from '../../utils/utils';
+import { getSiteKeyFromSearchParam } from '../utils/sitekey';
+import { stringifyFunction } from '../utils/stringify-function';
+import { injectTokenIntoElement } from '../utils/token';
 // TODO move on the same folder level once we deprecate the existing captcha scripts
 import { captchaCallback } from '../../actions/captcha-callback';
 

injected/src/features/broker-protection/captcha-services/providers/recaptcha-v2.js

@@ -1,4 +1,4 @@
-import { getUrlParameter } from '../../utils';
+import { getUrlParameter } from '../../utils/url';
 
 /**
  * Extracts a site key from a captcha element's URL search parameters.

injected/src/features/broker-protection/captcha-services/providers/index.js renamed to injected/src/features/broker-protection/captcha-services/providers/registry.js

@@ -1,4 +1,4 @@
-import { safeCall } from '../../utils';
+import { safeCall } from '../../utils/safe-call';
 
 /**
  * @param {Object} params

injected/src/features/broker-protection/captcha-services/utils/index.js

@@ -1,4 +1,5 @@
-import { getElementByName, safeCall } from '../../utils';
+import { safeCall } from '../../utils/safe-call';
+import { getElementByName } from '../../utils/utils';
 
 /**
  * Inject a token into a named element

injected/src/features/broker-protection/captcha-services/utils/sitekey.js

@@ -1,5 +1,5 @@
 import { states } from './constants.js';
-import { matchingPair } from '../utils';
+import { matchingPair } from '../utils/utils.js';
 
 /**
  * @param {{city: string; state: string | null}[]} userAddresses

injected/src/features/broker-protection/captcha-services/utils/stringify-function.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { AsyncProfileTransform, Extractor } from '../types.js';
-import { hashObject } from '../utils';
+import { hashObject } from '../utils/utils.js';
 
 /**
  * @implements {Extractor<{profileUrl: string; identifier: string} | null>}

injected/src/features/broker-protection/captcha-services/utils/token.js

@@ -1,5 +1,5 @@
 import { aggregateFields, createProfile, stringValuesFromElements } from '../src/features/broker-protection/actions/extract.js';
-import { cleanArray } from '../src/features/broker-protection/utils';
+import { cleanArray } from '../src/features/broker-protection/utils/utils.js';
 
 describe('create profiles from extracted data', () => {
     describe('cleanArray', () => {

injected/src/features/broker-protection/comparisons/address.js

@@ -1,5 +1,5 @@
 import fc from 'fast-check';
-import { cleanArray } from '../src/features/broker-protection/utils';
+import { cleanArray } from '../src/features/broker-protection/utils/utils.js';
 import { PhoneExtractor } from '../src/features/broker-protection/extractors/phone.js';
 import { ProfileUrlExtractor } from '../src/features/broker-protection/extractors/profile-url.js';
 

injected/src/features/broker-protection/extractors/profile-url.js

@@ -6,7 +6,7 @@ import { addressMatch } from '../src/features/broker-protection/comparisons/addr
 import { replaceTemplatedUrl } from '../src/features/broker-protection/actions/build-url.js';
 import { processTemplateStringWithUserData } from '../src/features/broker-protection/actions/build-url-transforms.js';
 import { names } from '../src/features/broker-protection/comparisons/constants.js';
-import { generateRandomInt, hashObject, sortAddressesByStateAndCity } from '../src/features/broker-protection/utils';
+import { generateRandomInt, hashObject, sortAddressesByStateAndCity } from '../src/features/broker-protection/utils/utils.js';
 import { generatePhoneNumber, generateZipCode, generateStreetAddress } from '../src/features/broker-protection/actions/generators.js';
 import { CityStateExtractor } from '../src/features/broker-protection/extractors/address.js';
 import { ProfileHashTransformer } from '../src/features/broker-protection/extractors/profile-url.js';