working update

Author: raju-opti

lib/core/decision_service/index.spec.ts

@@ -28,7 +28,7 @@ import { getMockLogger } from '../../tests/mock/mock_logger';
 import { getTestProjectConfig, getTestProjectConfigWithFeatures } from '../../tests/test_data';
 import { CONTROL_ATTRIBUTES, DECISION_SOURCES } from '../../utils/enums';
 import { Value } from '../../utils/promise/operation_value';
-import { bucket } from '../bucketer';
+import { bucket } from '../bucketer/index';
 import {
   AUDIENCE_EVALUATION_RESULT_COMBINED,
   EVALUATING_AUDIENCES_COMBINED,
@@ -98,11 +98,7 @@ const getDecisionService = (opt: DecisionServiceInstanceOpt = {}): DecisionServi
   };
 };
 
-const mockBucket: MockInstance<typeof bucket> = vi.hoisted(() => vi.fn());
-
-vi.mock('../bucketer', () => ({
-  bucket: mockBucket,
-}));
+vi.mock('../bucketer/index', { spy: true });
 
 const cloneDeep = (d: any) => JSON.parse(JSON.stringify(d));
 
@@ -165,6 +161,7 @@ const getHoldoutTestDatafile = () => {
 };
 
 const verifyBucketCall = (
+  mockBucket: MockInstance<typeof bucket>,
   call: number,
   projectConfig: ProjectConfig,
   experiment: Experiment,
@@ -202,6 +199,8 @@ const verifyBucketCall = (
 };
 
 describe('DecisionService', () => {
+  const mockBucket: MockInstance<typeof bucket> = bucket as any;
+
   describe('getVariation', function() {
     beforeEach(() => {
       mockBucket.mockClear();
@@ -231,7 +230,7 @@ describe('DecisionService', () => {
       expect(variation.result).toBe('control');
 
       expect(mockBucket).toHaveBeenCalledTimes(1);
-      verifyBucketCall(0, config, experiment, user);
+      verifyBucketCall(mockBucket, 0, config, experiment, user);
     });
 
     it('should use $opt_bucketing_id attribute as bucketing id if provided', () => {
@@ -261,7 +260,7 @@ describe('DecisionService', () => {
       expect(variation.result).toBe('control');
 
       expect(mockBucket).toHaveBeenCalledTimes(1);
-      verifyBucketCall(0, config, experiment, user, true);
+      verifyBucketCall(mockBucket, 0, config, experiment, user, true);
     });
 
     it('should return the whitelisted variation if the user is whitelisted', function() {
@@ -482,7 +481,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(userProfileService?.save).toHaveBeenCalledTimes(1);
         expect(userProfileService?.save).toHaveBeenCalledWith({
@@ -520,7 +519,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(userProfileService?.save).toHaveBeenCalledTimes(1);
         expect(userProfileService?.save).toHaveBeenCalledWith({
@@ -565,7 +564,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(logger?.debug).toHaveBeenCalledWith(USER_HAS_NO_FORCED_VARIATION, 'decision_service_user');
         expect(logger?.info).toHaveBeenCalledWith(SAVED_VARIATION_NOT_FOUND, 'decision_service_user', 'not valid variation', 'testExperiment');
@@ -609,7 +608,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(userProfileService?.save).toHaveBeenCalledTimes(1);
         expect(userProfileService?.save).toHaveBeenCalledWith({
@@ -650,7 +649,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(logger?.debug).toHaveBeenCalledWith(USER_HAS_NO_FORCED_VARIATION, 'decision_service_user');
         expect(logger?.error).toHaveBeenCalledWith(USER_PROFILE_LOOKUP_ERROR, 'decision_service_user', 'I am an error');
@@ -694,7 +693,7 @@ describe('DecisionService', () => {
         expect(userProfileService?.lookup).toHaveBeenCalledWith('decision_service_user');
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, experiment, user);
+        verifyBucketCall(mockBucket, 0, config, experiment, user);
 
         expect(userProfileService?.save).toHaveBeenCalledTimes(1);
         expect(userProfileService?.save).toHaveBeenCalledWith({
@@ -1080,7 +1079,7 @@ describe('DecisionService', () => {
           'sync', config, config.experimentKeyMap['exp_3'], user, expect.anything(), expect.anything());
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, config.experimentIdMap['3002'], user);
+        verifyBucketCall(mockBucket, 0, config, config.experimentIdMap['3002'], user);
       });
 
       it('should return variation from the target delivery and use $opt_bucketing_id attribute as bucketing id', () => {
@@ -1135,7 +1134,7 @@ describe('DecisionService', () => {
           'sync', config, config.experimentKeyMap['exp_3'], user, expect.anything(), expect.anything());
 
         expect(mockBucket).toHaveBeenCalledTimes(1);
-        verifyBucketCall(0, config, config.experimentIdMap['3002'], user, true);
+        verifyBucketCall(mockBucket, 0, config, config.experimentIdMap['3002'], user, true);
       });
 
       it('should skip to everyone else targeting rule if the user is not bucketed \
@@ -1190,8 +1189,8 @@ describe('DecisionService', () => {
           'sync', config, config.experimentKeyMap['exp_3'], user, expect.anything(), expect.anything());
 
         expect(mockBucket).toHaveBeenCalledTimes(2);
-        verifyBucketCall(0, config, config.experimentIdMap['3002'], user);
-        verifyBucketCall(1, config, config.experimentIdMap['default-rollout-id'], user);
+        verifyBucketCall(mockBucket, 0, config, config.experimentIdMap['3002'], user);
+        verifyBucketCall(mockBucket, 1, config, config.experimentIdMap['default-rollout-id'], user);
       });
     });
 
@@ -1289,7 +1288,7 @@ describe('DecisionService', () => {
         'sync', config, config.experimentKeyMap['exp_3'], user, expect.anything(), expect.anything());
 
       expect(mockBucket).toHaveBeenCalledTimes(1);
-      verifyBucketCall(0, config, config.experimentIdMap['default-rollout-id'], user);
+      verifyBucketCall(mockBucket, 0, config, config.experimentIdMap['default-rollout-id'], user);
     });
 
     it('should return null if no variation is found for any experiment, targeted delivery, or everyone else targeting rule', () => {
@@ -1413,7 +1412,7 @@ describe('DecisionService', () => {
         decisionSource: DECISION_SOURCES.ROLLOUT,
       });
 
-      verifyBucketCall(0, config, config.experimentKeyMap['exp_3'], user);
+      verifyBucketCall(mockBucket, 0, config, config.experimentKeyMap['exp_3'], user);
       expect(cmabService.getDecision).not.toHaveBeenCalled();
     });
 
@@ -1459,7 +1458,7 @@ describe('DecisionService', () => {
         decisionSource: DECISION_SOURCES.FEATURE_TEST,
       });
 
-      verifyBucketCall(0, config, config.experimentKeyMap['exp_3'], user);
+      verifyBucketCall(mockBucket, 0, config, config.experimentKeyMap['exp_3'], user);
 
       expect(cmabService.getDecision).toHaveBeenCalledTimes(1);
       expect(cmabService.getDecision).toHaveBeenCalledWith(
@@ -1937,11 +1936,6 @@ describe('DecisionService', () => {
 
 
     describe('holdout', () => {
-      beforeEach(async() => {
-        const actualBucketModule = (await vi.importActual('../bucketer')) as { bucket: typeof bucket };
-        mockBucket.mockImplementation(actualBucketModule.bucket);
-      });
-
       it('should return holdout variation when user is bucketed into running holdout', async () => {
         const { decisionService } = getDecisionService();
         const config = createProjectConfig(getHoldoutTestDatafile());
@@ -2332,9 +2326,9 @@ describe('DecisionService', () => {
       });
 
       expect(mockBucket).toHaveBeenCalledTimes(3);
-      verifyBucketCall(0, config, config.experimentKeyMap['exp_1'], user);
-      verifyBucketCall(1, config, config.experimentKeyMap['exp_2'], user);
-      verifyBucketCall(2, config, config.experimentKeyMap['delivery_1'], user);
+      verifyBucketCall(mockBucket, 0, config, config.experimentKeyMap['exp_1'], user);
+      verifyBucketCall(mockBucket, 1, config, config.experimentKeyMap['exp_2'], user);
+      verifyBucketCall(mockBucket, 2, config, config.experimentKeyMap['delivery_1'], user);
 
       expect(cmabService.getDecision).not.toHaveBeenCalled();
     });

lib/core/decision_service/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { LoggerFacade } from '../../logging/logger'
-import { bucket } from '../bucketer';
+import { bucket } from '../bucketer/index';
 import {
   AUDIENCE_EVALUATION_TYPES,
   CONTROL_ATTRIBUTES,

lib/logging/logger_factory.spec.ts

@@ -118,8 +118,6 @@ describe('createLogger', () => {
       logHandler: mockLogHandler,
     }));
 
-    console.log(OptimizelyLogger);
-
     expect(logger).toBe(MockedOptimizelyLogger.mock.instances[0]);
     const { name, level, infoMsgResolver, errorMsgResolver, logHandler } = MockedOptimizelyLogger.mock.calls[0][0];
     expect(name).toBe('Optimizely');

lib/project_config/project_config_manager.ts

@@ -227,7 +227,6 @@ export class ProjectConfigManagerImpl extends BaseService implements ProjectConf
     }
 
     this.datafileManager.stop();
-    console.log('stopping datafile manager', this.datafileManager.onTerminated);
 
     this.datafileManager.onTerminated().then(() => {
       this.state = ServiceState.Terminated;

package-lock.json

@@ -134,7 +134,6 @@
     "@typescript-eslint/eslint-plugin": "^5.33.0",
     "@typescript-eslint/parser": "^5.33.0",
     "@vitest/browser": "3.2.4",
-    "acorn": "^8.15.0",
     "chai": "^4.2.0",
     "coveralls-next": "^4.2.0",
     "dotenv": "^17.2.3",

package.json

@@ -18,7 +18,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const acorn = require('acorn');
+const ts = require('typescript');
 
 console.log('[VIEWPORT PATCH] Verifying @vitest/browser version...');
 
@@ -60,78 +60,68 @@ if (!fs.existsSync(backupPath)) {
 // Read the file
 const code = fs.readFileSync(vitestIndexPath, 'utf8');
 
-let ast;
-try {
-  ast = acorn.parse(code, {
-    ecmaVersion: 2022,
-    sourceType: 'module',
-  });
-} catch (error) {
-  console.error('[VIEWPORT PATCH] Failed to parse index.js:', error.message);
-  process.exit(1);
-}
+// Parse using TypeScript compiler
+const sourceFile = ts.createSourceFile(
+  'index.js',
+  code,
+  ts.ScriptTarget.ES2022,
+  true,
+  ts.ScriptKind.JS
+);
 
 // Find the viewport variable declaration
 let viewportNode = null;
 
-function walk(node, callback) {
-  callback(node);
-  for (const key in node) {
-    if (key === 'type' || key === 'loc' || key === 'range') continue;
-    const child = node[key];
-    if (Array.isArray(child)) {
-      child.forEach(c => c && typeof c === 'object' && walk(c, callback));
-    } else if (child && typeof child === 'object') {
-      walk(child, callback);
-    }
-  }
-}
-
-walk(ast, (node) => {
+function visit(node) {
   // Look for: const viewport = async (context, options) => { ... }
   if (
-    node.type === 'VariableDeclaration' &&
-    node.kind === 'const' &&
-    node.declarations &&
-    node.declarations.length > 0
+    ts.isVariableStatement(node) &&
+    node.declarationList.flags & ts.NodeFlags.Const
   ) {
-    const decl = node.declarations[0];
+    const declaration = node.declarationList.declarations[0];
     if (
-      decl.id &&
-      decl.id.type === 'Identifier' &&
-      decl.id.name === 'viewport' &&
-      decl.init &&
-      decl.init.type === 'ArrowFunctionExpression' &&
-      decl.init.async === true
+      declaration &&
+      ts.isIdentifier(declaration.name) &&
+      declaration.name.text === 'viewport' &&
+      declaration.initializer &&
+      ts.isArrowFunction(declaration.initializer) &&
+      declaration.initializer.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)
     ) {
       viewportNode = node;
+      return;
     }
   }
-});
+
+  ts.forEachChild(node, visit);
+}
+
+visit(sourceFile);
 
 if (!viewportNode) {
-  console.error('[VIEWPORT PATCH] ERROR: Could not find viewport function declaration in AST');
+  console.error('[VIEWPORT PATCH] ERROR: Could not find viewport function declaration');
   process.exit(1);
 }
 
-console.log(`[VIEWPORT PATCH] Found viewport function at position ${viewportNode.start}-${viewportNode.end}`);
+const start = viewportNode.getStart(sourceFile);
+const end = viewportNode.getEnd();
+
+console.log(`[VIEWPORT PATCH] Found viewport function at position ${start}-${end}`);
 
 // Extract the original function for logging
-const originalFunction = code.substring(viewportNode.start, viewportNode.end);
+const originalFunction = code.substring(start, end);
 console.log('[VIEWPORT PATCH] Original function:');
 console.log(originalFunction);
 
 // Create the replacement
 const replacement = `const viewport = async (context, options) => {
-	console.log('[VIEWPORT PATCH] Viewport command intercepted and ignored', options);
 	return Promise.resolve();
 };`;
 
 // Replace the function using string manipulation
 const patchedCode =
-  code.substring(0, viewportNode.start) +
+  code.substring(0, start) +
   replacement +
-  code.substring(viewportNode.end);
+  code.substring(end);
 
 // Write the patched code
 fs.writeFileSync(vitestIndexPath, patchedCode, 'utf8');

scripts/patch-vitest-viewport.js

@@ -173,7 +173,6 @@ async function runTests() {
         TEST_BROWSER_VERSION: config.browserVersion || '',
         TEST_OS_NAME: config.os,
         TEST_OS_VERSION: config.osVersion,
-        WDIO_LOG_LEVEL: 'info', // Enable WebdriverIO logging
       };