Update tests

Author: leeyi45

scripts/build_sicp_package.mjs

@@ -7,6 +7,8 @@ import createContext from '../dist/createContext.js'
 import { ACORN_PARSE_OPTIONS } from '../dist/constants.js'
 import { Chapter } from '../dist/types.js'
 
+const SICP_DIR = 'sicp_publish/dist'
+
 async function recursiveDirCopy(srcPath, dstPath) {
   // Copy and keep only necessary files
   const files = await fsPromises.readdir(srcPath)
@@ -29,26 +31,26 @@ async function recursiveDirCopy(srcPath, dstPath) {
 }
 
 async function prepare() {
-  await fsPromises.rm('sicp_publish/dist', { recursive: true, force: true })
-  await fsPromises.mkdir('sicp_publish/dist', { recursive: true })
-  await recursiveDirCopy('dist', 'sicp_publish/dist')
+  await fsPromises.rm(SICP_DIR, { recursive: true, force: true })
+  await fsPromises.mkdir(SICP_DIR, { recursive: true })
+  await recursiveDirCopy('dist', SICP_DIR)
 
   // Remove unnecessary dependencies
   await Promise.all([
     'finder.js', 'index.js', 'scope-refactoring.js'
-  ].map(fileName => fsPromises.rm(`sicp_publish/dist/${fileName}`)))
+  ].map(fileName => fsPromises.rm(`${SICP_DIR}/${fileName}`)))
 }
 
 function main() {
-  const writeStream = createWriteStream('sicp_publish/dist/sicp.js', {
+  const writeStream = createWriteStream(`${SICP_DIR}/sicp.js`, {
     encoding: 'utf-8',
     flags: 'w'
   })
   writeStream.write('"use strict";\n')
   writeStream.write('Object.defineProperty(exports, "__esModule", { value: true });\n')
   writeStream.write('const createContext_1 = require("./createContext");\n')
-  writeStream.write('const dict = createContext_1.default(4).nativeStorage.builtins;')
-  writeStream.write('\n// Declare functions for prelude\n')
+  writeStream.write('const dict = createContext_1.default(4).nativeStorage.builtins;\n')
+  writeStream.write('\n// Declare builtins for prelude\n')
 
   // @ts-expect-error Something to do with weird stuff going on between cjs and esm
   const context = createContext.default(Chapter.SOURCE_4)
@@ -66,7 +68,7 @@ function main() {
 
     const prelude = parse(context.prelude, ACORN_PARSE_OPTIONS)
 
-    writeStream.write('\n // Export prelude functions\n')
+    writeStream.write('\n// Export prelude functions\n')
     for (const func of prelude.body) {
       if (func.type !== 'FunctionDeclaration') {
         throw new Error(`Expected FunctionDeclarations, got '${func.type}' instead`)

src/__tests__/environment.ts

@@ -1,5 +1,4 @@
-import { SourceLocation } from 'estree'
-import * as es from 'estree'
+import type es from 'estree'
 import { SourceMapConsumer } from 'source-map'
 
 import createContext from './createContext'
@@ -10,16 +9,16 @@ import { getAllOccurrencesInScopeHelper, getScopeHelper } from './scope-refactor
 import { setBreakpointAtLine } from './stdlib/inspector'
 import {
   Chapter,
-  Context,
-  Error as ResultError,
-  ExecutionMethod,
-  Finished,
-  ModuleContext,
-  RecursivePartial,
-  Result,
-  SourceError,
-  SVMProgram,
-  Variant
+  type Context,
+  type Error as ResultError,
+  type ExecutionMethod,
+  type Finished,
+  type ModuleContext,
+  type RecursivePartial,
+  type Result,
+  type SourceError,
+  type SVMProgram,
+  type Variant
 } from './types'
 import { assemble } from './vm/svml-assembler'
 import { compileToIns } from './vm/svml-compiler'
@@ -30,7 +29,7 @@ import { ModuleNotFoundError } from './modules/errors'
 import type { ImportOptions } from './modules/moduleTypes'
 import preprocessFileImports from './modules/preprocessor'
 import { validateFilePath } from './modules/preprocessor/filePaths'
-import { getKeywords, getProgramNames, NameDeclaration } from './name-extractor'
+import { getKeywords, getProgramNames, type NameDeclaration } from './name-extractor'
 import { htmlRunner, resolvedErrorPromise, sourceFilesRunner } from './runner'
 
 export interface IOptions {
@@ -57,7 +56,7 @@ export interface IOptions {
 
 // needed to work on browsers
 if (typeof window !== 'undefined') {
-  // @ts-ignore
+  // @ts-expect-error Initialize doesn't exist on SourceMapConsumer
   SourceMapConsumer.initialize({
     'lib/mappings.wasm': 'https://unpkg.com/[email protected]/lib/mappings.wasm'
   })
@@ -77,11 +76,13 @@ export function parseError(errors: SourceError[], verbose: boolean = verboseErro
       // TODO currently elaboration is just tagged on to a new line after the error message itself. find a better
       // way to display it.
       const elaboration = error.elaborate()
-      return line < 1
+      return typeof line === 'number' && line < 1
         ? `${filePath}${explanation}\n${elaboration}\n`
         : `${filePath}Line ${line}, Column ${column}: ${explanation}\n${elaboration}\n`
     } else {
-      return line < 1 ? explanation : `${filePath}Line ${line}: ${explanation}`
+      return typeof line === 'number' && line < 1
+        ? explanation
+        : `${filePath}Line ${line}: ${explanation}`
     }
   })
   return errorMessagesArr.join('\n')
@@ -91,7 +92,7 @@ export function findDeclaration(
   code: string,
   context: Context,
   loc: { line: number; column: number }
-): SourceLocation | null | undefined {
+): es.SourceLocation | null | undefined {
   const program = looseParse(code, context)
   if (!program) {
     return null
@@ -111,7 +112,7 @@ export function getScope(
   code: string,
   context: Context,
   loc: { line: number; column: number }
-): SourceLocation[] {
+): es.SourceLocation[] {
   const program = looseParse(code, context)
   if (!program) {
     return []
@@ -132,7 +133,7 @@ export function getAllOccurrencesInScope(
   code: string,
   context: Context,
   loc: { line: number; column: number }
-): SourceLocation[] {
+): es.SourceLocation[] {
   const program = looseParse(code, context)
   if (!program) {
     return []

src/index.ts

@@ -1,5 +1,4 @@
 import type { Program } from 'estree'
-import createContext from '../../../createContext'
 import {
   DuplicateImportNameError,
   UndefinedDefaultImportError,
@@ -53,7 +52,7 @@ describe('Test throwing import validation errors', () => {
     allowUndefinedImports: boolean,
     throwOnDuplicateNames: boolean
   ) {
-    const context = createContext(Chapter.FULL_JS)
+    const context = mockContext(Chapter.FULL_JS)
     const importGraphResult = await parseProgramsAndConstructImportGraph(
       p => Promise.resolve(files[p]),
       entrypointFilePath as string,
@@ -712,7 +711,7 @@ describe('Test throwing DuplicateImportNameErrors', () => {
       shouldThrow,
       errMsg
     ) => {
-      const context = createContext(Chapter.FULL_JS)
+      const context = mockContext(Chapter.FULL_JS)
       const [entrypointFilePath, ...topoOrder] = objectKeys(programs)
 
       await loadSourceModules(new Set(['one_module', 'another_module']), context, false)

src/modules/preprocessor/__tests__/analyzer.ts

@@ -1,5 +1,4 @@
 import type { Program } from 'estree'
-import type { MockedFunction } from 'jest-mock'
 
 import { parseError, type IOptions } from '../../..'
 import { mockContext } from '../../../utils/testing/mocks'
@@ -14,6 +13,7 @@ import {
 } from '../../../stdlib/localImport.prelude'
 import type { SourceFiles } from '../../moduleTypes'
 import { UndefinedImportError } from '../../errors'
+import { asMockedFunc } from '../../../utils/testing/misc'
 
 jest.mock('../../loader/loaders')
 
@@ -49,7 +49,7 @@ describe('preprocessFileImports', () => {
   const assertASTsAreEquivalent = (
     actualProgram: Program | undefined,
     expectedCode: string,
-    log: boolean = false
+    _log: boolean = false
   ): void => {
     if (!actualProgram) {
       throw new Error('Actual program should not be undefined!')
@@ -140,9 +140,7 @@ describe('preprocessFileImports', () => {
   })
 
   it('ignores Source module imports & removes all non-Source module import-related AST nodes in the preprocessed program', async () => {
-    const docsMocked = memoizedGetModuleDocsAsync as MockedFunction<
-      typeof memoizedGetModuleDocsAsync
-    >
+    const docsMocked = asMockedFunc(memoizedGetModuleDocsAsync)
     docsMocked.mockResolvedValueOnce({
       default: {} as any,
       a: {} as any,
@@ -195,9 +193,8 @@ describe('preprocessFileImports', () => {
   })
 
   it('collates Source module imports at the start of the top-level environment of the preprocessed program', async () => {
-    const docsMocked = memoizedGetModuleDocsAsync as MockedFunction<
-      typeof memoizedGetModuleDocsAsync
-    >
+    const docsMocked = asMockedFunc(memoizedGetModuleDocsAsync)
+
     docsMocked.mockResolvedValue({
       f: {} as any,
       g: {} as any,

src/modules/preprocessor/__tests__/preprocessor.ts

@@ -17,7 +17,7 @@ import * as create from '../utils/ast/astCreator'
 import { getFunctionDeclarationNamesInProgram } from '../utils/uniqueIds'
 import { toSourceError } from './errors'
 import { resolvedErrorPromise } from './utils'
-import { Runner } from './types'
+import type { Runner } from './types'
 
 function fullJSEval(code: string, nativeStorage: NativeStorage): any {
   if (nativeStorage.evaller) {
@@ -68,7 +68,7 @@ const fullJSRunner: Runner = async (program, context) => {
     context.nativeStorage.previousProgramsIdentifiers.add(id)
   )
   const preEvalCode: string = generate(preEvalProgram)
-  await fullJSEval(preEvalCode, context.nativeStorage)
+  fullJSEval(preEvalCode, context.nativeStorage)
 
   let transpiled
   let sourceMapJson: RawSourceMap | undefined
@@ -77,7 +77,7 @@ const fullJSRunner: Runner = async (program, context) => {
     return {
       status: 'finished',
       context,
-      value: await fullJSEval(transpiled, context.nativeStorage)
+      value: fullJSEval(transpiled, context.nativeStorage)
     }
   } catch (error) {
     context.errors.push(

src/runner/fullJSRunner.ts

@@ -35,17 +35,18 @@ const runners = {
     if (context.errors.length > 0) {
       return resolvedErrorPromise
     }
-    const redexedSteps: IStepperPropContents[] = []
-    for (const step of steps) {
+
+    const redexedSteps = steps.map((step): IStepperPropContents => {
       const redex = getRedex(step[0], step[1])
       const redexed = redexify(step[0], step[1])
-      redexedSteps.push({
+      return {
         code: redexed[0],
         redex: redexed[1],
         explanation: step[2],
         function: callee(redex, context)
-      })
-    }
+      }
+    })
+
     return Promise.resolve({
       status: 'finished',
       context,