[fix] enhance behaviour of spread element

Siubaak · Feb 2, 2025 · a764bdf · a764bdf
1 parent b7ce7e6
commit a764bdf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/evaluate/expression.ts b/src/evaluate/expression.ts
@@ -36,7 +36,7 @@ export function* ObjectExpression(node: acorn.ObjectExpression, scope: Scope) {
   for (let i = 0; i < node.properties.length; i++) {
     const property = node.properties[i]
     if (property.type === 'SpreadElement') {
-      assign(object, yield* SpreadElement(property, scope))
+      assign(object, yield* SpreadElement(property, scope, { spreadProps: true }))
     } else {
       let key: string
       const propKey = property.key
@@ -542,19 +542,19 @@ export interface SuperOptions {
   getProto?: boolean
 }
 
-export function* Super(
-  node: acorn.Super,
-  scope: Scope,
-  options: SuperOptions = {},
-) {
+export function* Super(node: acorn.Super, scope: Scope, options: SuperOptions = {}) {
   const { getProto = false } = options
   const superClass = scope.find(SUPER).get()
   return getProto ? superClass.prototype: superClass
 }
 
-export function* SpreadElement(node: acorn.SpreadElement, scope: Scope) {
+export interface SpreadOptions {
+  spreadProps?: boolean
+}
+
+export function* SpreadElement(node: acorn.SpreadElement, scope: Scope, options: SpreadOptions = {}) {
   const result = yield* evaluate(node.argument, scope)
-  return typeof result === 'string' ? [...result] : result; 
+  return options.spreadProps ? result : [...result]
 }
 
 export function* ChainExpression(node: acorn.ChainExpression, scope: Scope) {

diff --git a/tests/expression.test.ts b/tests/expression.test.ts
@@ -167,18 +167,20 @@ describe('testing src/expression.ts', () => {
       const arr = [1, 2]
       exports.a = [...arr]
       exports.b = [...[1, 2, 3]]
-      
+
       f(...arr)
       function f(m, n) {
         exports.c = m
         exports.d = n
+        exports.f = [...arguments]
       }
     `)
 
     expect(interpreter.exports.a).toEqual([1, 2])
     expect(interpreter.exports.b).toEqual([1, 2, 3])
     expect(interpreter.exports.c).toBe(1)
     expect(interpreter.exports.d).toBe(2)
+    expect(interpreter.exports.f).toEqual([1, 2])
   })
 
   it('should parse regular expression normally', () => {