fix: resolve lint, typecheck, and prettier errors across packages

- Fix ExtractorLogLevel type in api-report config (use enum instead of string literals)
- Remove unused imports in api-report integration tests
- Add eslint-disable for intentionally unused type assertions in typecheck files
- Apply prettier formatting fixes across all affected files

Author: ryanbas21

packages/davinci-client/src/types.ts

@@ -27,7 +27,11 @@ export * from './lib/collector.types.js';
 export type { FidoClient } from './lib/fido/fido.js';
 
 // Node slice and reducer exports needed to resolve DavinciClient
-export { updateCollectorValues, nextCollectorValues, nodeCollectorReducer } from './lib/node.reducer.js';
+export {
+  updateCollectorValues,
+  nextCollectorValues,
+  nodeCollectorReducer,
+} from './lib/node.reducer.js';
 
 // Re-export the davinci function so DavinciClient type alias can be resolved
 export { davinci } from './lib/client.store.js';

packages/journey-client/package.json

@@ -35,7 +35,9 @@
     "@forgerock/sdk-utilities": "workspace:*",
     "@forgerock/storage": "workspace:*",
     "@reduxjs/toolkit": "catalog:",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "vitest": "catalog:vitest",
+    "vitest-canvas-mock": "catalog:vitest"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "catalog:vitest",

packages/journey-client/src/__tests__/types-reexport.typecheck.ts

@@ -25,11 +25,23 @@ import type {
 // PolicyKey is a value (enum), verify it is available from main index
 import { PolicyKey } from '../index.js';
 
-// Use each type to prevent unused import errors
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type _TypeAssert = [
-  Step, Callback, CallbackType, StepType, GenericError,
-  PolicyRequirement, FailedPolicyRequirement, LogLevel, CustomLogger,
-  RequestMiddleware, ActionTypes, NameValue, StepDetail, AuthResponse,
+  Step,
+  Callback,
+  CallbackType,
+  StepType,
+  GenericError,
+  PolicyRequirement,
+  FailedPolicyRequirement,
+  LogLevel,
+  CustomLogger,
+  RequestMiddleware,
+  ActionTypes,
+  NameValue,
+  StepDetail,
+  AuthResponse,
   FailureDetail,
 ];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const _pk: typeof PolicyKey = PolicyKey;

packages/oidc-client/src/__tests__/types-reexport.typecheck.ts

@@ -16,7 +16,15 @@ import type {
   ResponseType,
 } from '../types.js';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type _Assert = [
-  GenericError, GetAuthorizationUrlOptions, WellknownResponse, StorageConfig,
-  ActionTypes, RequestMiddleware, CustomLogger, LogLevel, ResponseType,
+  GenericError,
+  GetAuthorizationUrlOptions,
+  WellknownResponse,
+  StorageConfig,
+  ActionTypes,
+  RequestMiddleware,
+  CustomLogger,
+  LogLevel,
+  ResponseType,
 ];

tools/api-report/src/config.spec.ts

@@ -3,9 +3,7 @@ import { buildReportFileName } from './config.js';
 
 describe('buildReportFileName', () => {
   it('should produce base name for root entry "."', () => {
-    expect(buildReportFileName('@forgerock/journey-client', '.')).toBe(
-      'journey-client.api.md',
-    );
+    expect(buildReportFileName('@forgerock/journey-client', '.')).toBe('journey-client.api.md');
   });
 
   it('should append subpath for sub-entries', () => {
@@ -21,8 +19,6 @@ describe('buildReportFileName', () => {
   });
 
   it('should handle different scoped package names', () => {
-    expect(buildReportFileName('@forgerock/oidc-client', '.')).toBe(
-      'oidc-client.api.md',
-    );
+    expect(buildReportFileName('@forgerock/oidc-client', '.')).toBe('oidc-client.api.md');
   });
 });

tools/api-report/src/config.ts

@@ -1,13 +1,10 @@
-import { ExtractorConfig } from '@microsoft/api-extractor';
+import { ExtractorConfig, ExtractorLogLevel } from '@microsoft/api-extractor';
 import { resolve } from 'node:path';
 import type { EntryPoint } from './resolve-entries.js';
 
 const WORKSPACE_ROOT = resolve(import.meta.dirname, '../../..');
 
-export function buildReportFileName(
-  packageName: string,
-  subpath: string,
-): string {
+export function buildReportFileName(packageName: string, subpath: string): string {
   const baseName = packageName.replace(/^@forgerock\//, '');
   const suffix = subpath === '.' ? '' : '.' + subpath.replace('./', '');
   return baseName + suffix + '.api.md';
@@ -39,8 +36,8 @@ export function buildExtractorConfig(options: ConfigOptions): ExtractorConfig {
       tsdocMetadata: { enabled: false },
       messages: {
         extractorMessageReporting: {
-          'ae-forgotten-export': { logLevel: 'error' as const },
-          'ae-missing-release-tag': { logLevel: 'none' as const },
+          'ae-forgotten-export': { logLevel: ExtractorLogLevel.Error },
+          'ae-missing-release-tag': { logLevel: ExtractorLogLevel.None },
         },
       },
     },

tools/api-report/src/fixer.spec.ts

@@ -11,8 +11,7 @@ import {
 
 describe('parseForgottenExportMessage', () => {
   it('should extract symbol name from ae-forgotten-export message', () => {
-    const text =
-      'The symbol "GenericError" needs to be exported by the entry point index.d.ts';
+    const text = 'The symbol "GenericError" needs to be exported by the entry point index.d.ts';
     const result = parseForgottenExportMessage(text);
     expect(result).toBe('GenericError');
   });
@@ -23,16 +22,14 @@ describe('parseForgottenExportMessage', () => {
   });
 
   it('should handle symbols with underscores and numbers', () => {
-    const text =
-      'The symbol "OAuth2_Config3" needs to be exported by the entry point index.d.ts';
+    const text = 'The symbol "OAuth2_Config3" needs to be exported by the entry point index.d.ts';
     expect(parseForgottenExportMessage(text)).toBe('OAuth2_Config3');
   });
 });
 
 describe('resolveSourcePackage', () => {
   it('should resolve @forgerock scoped package from source path', () => {
-    const sourcePath =
-      '/workspace/packages/sdk-types/src/lib/error.types.ts';
+    const sourcePath = '/workspace/packages/sdk-types/src/lib/error.types.ts';
     const result = resolveSourcePackage(sourcePath, '/workspace');
     expect(result).toBe('@forgerock/sdk-types');
   });
@@ -49,8 +46,7 @@ describe('resolveSourcePackage', () => {
   });
 
   it('should fall back to directory name for sdk-effects when package.json unreadable', () => {
-    const sourcePath =
-      '/fake-workspace/packages/sdk-effects/logger/src/lib/logger.types.ts';
+    const sourcePath = '/fake-workspace/packages/sdk-effects/logger/src/lib/logger.types.ts';
     const result = resolveSourcePackage(sourcePath, '/fake-workspace');
     expect(result).toBe('@forgerock/sdk-effects/logger');
   });
@@ -69,8 +65,7 @@ describe('resolveSourcePackage', () => {
   });
 
   it('should handle dist paths within packages', () => {
-    const sourcePath =
-      '/workspace/packages/sdk-types/dist/src/lib/error.types.d.ts';
+    const sourcePath = '/workspace/packages/sdk-types/dist/src/lib/error.types.d.ts';
     const result = resolveSourcePackage(sourcePath, '/workspace');
     expect(result).toBe('@forgerock/sdk-types');
   });
@@ -183,11 +178,11 @@ describe('buildReExportStatement', () => {
 describe('insertReExport', () => {
   it('should append to existing re-export block for same package', () => {
     const content = [
-      "export type {",
-      "  Step,",
-      "  Callback,",
+      'export type {',
+      '  Step,',
+      '  Callback,',
       "} from '@forgerock/sdk-types';",
-      "",
+      '',
       "export * from './lib/client.types.js';",
     ].join('\n');
 
@@ -202,7 +197,7 @@ describe('insertReExport', () => {
   it('should add new re-export statement when no existing block matches', () => {
     const content = [
       "export type { Step } from '@forgerock/sdk-types';",
-      "",
+      '',
       "export * from './lib/client.types.js';",
     ].join('\n');
 
@@ -213,9 +208,9 @@ describe('insertReExport', () => {
 
   it('should not duplicate if symbol already exported', () => {
     const content = [
-      "export type {",
-      "  Step,",
-      "  GenericError,",
+      'export type {',
+      '  Step,',
+      '  GenericError,',
       "} from '@forgerock/sdk-types';",
     ].join('\n');
 
@@ -227,12 +222,12 @@ describe('insertReExport', () => {
 
   it('should append to existing multi-line type block for same package', () => {
     const content = [
-      "export type {",
-      "  Step,",
-      "  Callback,",
-      "  CallbackType,",
-      "  StepType,",
-      "  GenericError,",
+      'export type {',
+      '  Step,',
+      '  Callback,',
+      '  CallbackType,',
+      '  StepType,',
+      '  GenericError,',
       "} from '@forgerock/sdk-types';",
     ].join('\n');
 
@@ -249,7 +244,7 @@ describe('insertReExport', () => {
   it('should handle value re-exports alongside type re-exports', () => {
     const content = [
       "export type { Step } from '@forgerock/sdk-types';",
-      "",
+      '',
       "export { callbackType } from '@forgerock/sdk-types';",
     ].join('\n');
 

tools/api-report/src/fixer.ts

@@ -14,10 +14,7 @@ export function parseForgottenExportMessage(text: string): string | null {
  * Resolves which @forgerock/* package a source file belongs to.
  * Handles both workspace source paths and node_modules paths.
  */
-export function resolveSourcePackage(
-  sourceFilePath: string,
-  workspaceRoot: string,
-): string | null {
+export function resolveSourcePackage(sourceFilePath: string, workspaceRoot: string): string | null {
   // Check node_modules path: ...node_modules/@forgerock/package-name/...
   const nodeModulesMatch = /@forgerock\/([^/]+)/.exec(sourceFilePath);
   if (nodeModulesMatch && sourceFilePath.includes('node_modules')) {
@@ -52,14 +49,13 @@ export function resolveSourcePackage(
  * Finds the module specifier for a symbol's import in a .d.ts file.
  * Given `import { ForgottenType } from '@forgerock/sdk-types'`, returns '@forgerock/sdk-types'.
  */
-export function findImportModuleForSymbol(
-  fileContent: string,
-  symbolName: string,
-): string | null {
+export function findImportModuleForSymbol(fileContent: string, symbolName: string): string | null {
   // Match: import [type] { ..., symbolName, ... } from 'module'
   // Handle both single-line and multi-line imports, with optional 'type' keyword
   const regex = new RegExp(
-    "import\\s+(?:type\\s+)?\\{[^}]*\\b" + escapeRegex(symbolName) + "\\b[^}]*\\}\\s*from\\s*['\"]([^'\"]+)['\"]",
+    'import\\s+(?:type\\s+)?\\{[^}]*\\b' +
+      escapeRegex(symbolName) +
+      '\\b[^}]*\\}\\s*from\\s*[\'"]([^\'"]+)[\'"]',
     's',
   );
   const match = regex.exec(fileContent);
@@ -71,10 +67,7 @@ export function findImportModuleForSymbol(
  * (class/enum/const/function) by scanning the source file content.
  * Defaults to 'type' when uncertain.
  */
-export function determineExportKind(
-  sourceContent: string,
-  symbolName: string,
-): 'type' | 'value' {
+export function determineExportKind(sourceContent: string, symbolName: string): 'type' | 'value' {
   // Check for value patterns first (more specific)
   // Handle optional 'export' and 'declare' keywords in .d.ts files
   const valuePatterns = [
@@ -111,7 +104,7 @@ export function buildReExportStatement(
   kind: 'type' | 'value',
 ): string {
   const keyword = kind === 'type' ? 'export type' : 'export';
-  return keyword + " { " + symbolName + " } from '" + sourcePackage + "';";
+  return keyword + ' { ' + symbolName + " } from '" + sourcePackage + "';";
 }
 
 function escapeRegex(str: string): string {
@@ -131,12 +124,12 @@ export function insertReExport(
   kind: 'type' | 'value',
 ): string {
   // Check if already exported (handle multi-line blocks where symbol and 'from' are on different lines)
-  const hasSymbolInPackageBlock = new RegExp(
-    '\\b' + escapeRegex(symbolName) + '\\b',
-  );
+  const hasSymbolInPackageBlock = new RegExp('\\b' + escapeRegex(symbolName) + '\\b');
   // Find all export blocks for this package and check if symbol is in any of them
   const blockRegex = new RegExp(
-    '(?:export(?:\\s+type)?)\\s*\\{([^}]*)\\}\\s*from\\s*[\'"]' + escapeRegex(sourcePackage) + '[\'"]',
+    '(?:export(?:\\s+type)?)\\s*\\{([^}]*)\\}\\s*from\\s*[\'"]' +
+      escapeRegex(sourcePackage) +
+      '[\'"]',
     'gs',
   );
   let blockMatch;
@@ -147,14 +140,16 @@ export function insertReExport(
   const keyword = kind === 'type' ? 'export type' : 'export';
 
   // For value exports, avoid matching 'export type {' blocks
-  const keywordPattern = kind === 'value'
-    ? 'export\\s+(?!type\\s)'
-    : escapeRegex(keyword) + '\\s*';
+  const keywordPattern = kind === 'value' ? 'export\\s+(?!type\\s)' : escapeRegex(keyword) + '\\s*';
 
   // Try single-line block first: export { Foo, Bar } from 'package';
   // (no newlines between { and })
   const singleLineRegex = new RegExp(
-    '(' + keywordPattern + '\\{\\s*)([^}\\n]+)(\\s*\\}\\s*from\\s*[\'"]' + escapeRegex(sourcePackage) + '[\'"];)',
+    '(' +
+      keywordPattern +
+      '\\{\\s*)([^}\\n]+)(\\s*\\}\\s*from\\s*[\'"]' +
+      escapeRegex(sourcePackage) +
+      '[\'"];)',
   );
   const singleLineMatch = singleLineRegex.exec(content);
   if (singleLineMatch) {
@@ -169,7 +164,11 @@ export function insertReExport(
 
   // Try multi-line block: export type {\n  Foo,\n  Bar,\n} from 'package';
   const multiLineBlockRegex = new RegExp(
-    '(' + keywordPattern + '\\{[^}]*)(\\}\\s*from\\s*[\'"]' + escapeRegex(sourcePackage) + '[\'"];)',
+    '(' +
+      keywordPattern +
+      '\\{[^}]*)(\\}\\s*from\\s*[\'"]' +
+      escapeRegex(sourcePackage) +
+      '[\'"];)',
     's',
   );
   const multiLineMatch = multiLineBlockRegex.exec(content);
@@ -258,7 +257,13 @@ export function applyFixes(
 
     // Determine type vs value from the definition file (or fall back to usage site)
     const definitionContent = definitionFilePath
-      ? (() => { try { return readFileSync(definitionFilePath, 'utf-8'); } catch { return usageSiteContent; } })()
+      ? (() => {
+          try {
+            return readFileSync(definitionFilePath, 'utf-8');
+          } catch {
+            return usageSiteContent;
+          }
+        })()
       : usageSiteContent;
 
     const kind = determineExportKind(definitionContent, fe.symbolName);

tools/api-report/src/integration.spec.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { mkdirSync, writeFileSync, readFileSync, rmSync, mkdtempSync } from 'node:fs';
 import { resolve, join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { analyzePackage, resolvePackageInfo, type PackageInfo } from './main.js';
+import { analyzePackage, type PackageInfo } from './main.js';
 import { applyFixes } from './fixer.js';
 
 let FIXTURE_ROOT: string;
@@ -49,11 +49,7 @@ function createFixture() {
   // Internal package.json (mimics @forgerock/sdk-types)
   writeFileSync(
     resolve(INTERNAL_DIR, 'package.json'),
-    JSON.stringify(
-      { name: '@forgerock/test-internal', version: '0.0.0', type: 'module' },
-      null,
-      2,
-    ),
+    JSON.stringify({ name: '@forgerock/test-internal', version: '0.0.0', type: 'module' }, null, 2),
   );
 
   // Client tsconfig.json — use paths to resolve @forgerock/test-internal
@@ -236,10 +232,7 @@ describe('integration: forgotten export detection and fix', () => {
     const { forgottenExports } = analyzePackage(makeInfo());
     const typesFilePath = resolve(CLIENT_DIR, 'src/types.ts');
     applyFixes(forgottenExports, typesFilePath, FIXTURE_ROOT);
-    writeFileSync(
-      resolve(CLIENT_DIR, 'dist/src/types.d.ts'),
-      readFileSync(typesFilePath, 'utf-8'),
-    );
+    writeFileSync(resolve(CLIENT_DIR, 'dist/src/types.d.ts'), readFileSync(typesFilePath, 'utf-8'));
 
     // Snapshot the clean types.ts
     const cleanContent = readFileSync(typesFilePath, 'utf-8');
@@ -248,7 +241,7 @@ describe('integration: forgotten export detection and fix', () => {
     const recheck = analyzePackage(makeInfo());
     expect(recheck.forgottenExports).toHaveLength(0);
 
-    const { fixed, skipped } = applyFixes(recheck.forgottenExports, typesFilePath, FIXTURE_ROOT);
+    const { fixed } = applyFixes(recheck.forgottenExports, typesFilePath, FIXTURE_ROOT);
     expect(fixed).toHaveLength(0);
 
     // types.ts should be unchanged