.

rogeralsing · rogeralsing · commit c15d3f798df9 · 2025-12-10T18:35:01.000+01:00
diff --git a/languagetests.md b/languagetests.md
@@ -1,3 +1,12 @@
+       BlockScope_shadowing
+        BlockScope_shadowing("language/block-scope/shadowing/catch-parameter-shadowing-catch-parameter.js",False)
+        BlockScope_shadowing("language/block-scope/shadowing/catch-parameter-shadowing-var-variable.js",False)
+        BlockScope_shadowing("language/block-scope/shadowing/const-declaration-shadowing-catch-parameter.js",False)
+        BlockScope_shadowing("language/block-scope/shadowing/const-declarations-shadowing-parameter-name-let-const-and-var-variables.js",False)
+        BlockScope_shadowing("language/block-scope/shadowing/parameter-name-shadowing-catch-parameter.js",False)
+       Expressions_class_decorator_syntax_classValid
+        Expressions_class_decorator_syntax_classValid("language/expressions/class/decorator/syntax/class-valid/decorator-member-expr-private-identifier.js",False)
+        Expressions_class_decorator_syntax_classValid("language/expressions/class/decorator/syntax/class-valid/decorator-member-expr-private-identifier.js",True)
        Expressions_dynamicImport
         Expressions_dynamicImport("language/expressions/dynamic-import/returns-promise.js",False)
         Expressions_dynamicImport("language/expressions/dynamic-import/returns-promise.js",True)
@@ -7,22 +16,11 @@
         Expressions_dynamicImport_assignmentExpression("language/expressions/dynamic-import/assignment-expression/import-meta.js",True)
        Expressions_function
         Expressions_function("language/expressions/function/param-dflt-yield-non-strict.js",False)
-       Expressions_generators
-        Expressions_generators("language/expressions/generators/named-no-strict-reassign-fn-name-in-body-in-arrow.js",False)
-        Expressions_generators("language/expressions/generators/named-no-strict-reassign-fn-name-in-body-in-eval.js",False)
-        Expressions_generators("language/expressions/generators/named-no-strict-reassign-fn-name-in-body.js",False)
-        Expressions_generators("language/expressions/generators/scope-name-var-open-non-strict.js",False)
        Expressions_import_meta
         Expressions_import_meta("language/expressions/import.meta/distinct-for-each-module.js",True)
         Expressions_import_meta("language/expressions/import.meta/import-meta-is-an-ordinary-object.js",True)
         Expressions_import_meta("language/expressions/import.meta/not-accessible-from-direct-eval.js",True)
         Expressions_import_meta("language/expressions/import.meta/same-object-returned.js",True)
-       Expressions_object_methodDefinition
-        Expressions_object_methodDefinition("language/expressions/object/method-definition/generator-invoke-fn-no-strict.js",False)
-        Expressions_object_methodDefinition("language/expressions/object/method-definition/generator-super-prop-param.js",False)
-        Expressions_object_methodDefinition("language/expressions/object/method-definition/generator-super-prop-param.js",True)
-        Expressions_object_methodDefinition("language/expressions/object/method-definition/name-super-prop-param.js",False)
-        Expressions_object_methodDefinition("language/expressions/object/method-definition/name-super-prop-param.js",True)
        Expressions_optionalChaining
         Expressions_optionalChaining("language/expressions/optional-chaining/eval-optional-call.js",False)
         Expressions_optionalChaining("language/expressions/optional-chaining/eval-optional-call.js",True)
@@ -35,33 +33,23 @@
         Expressions_prefixDecrement("language/expressions/prefix-decrement/eval-nostrict.js",False)
        Expressions_prefixIncrement
         Expressions_prefixIncrement("language/expressions/prefix-increment/eval-nostrict.js",False)
-       Expressions_yield
-        Expressions_yield("language/expressions/yield/star-rhs-iter-thrw-res-done-no-value.js",False)
-        Expressions_yield("language/expressions/yield/star-rhs-iter-thrw-res-done-no-value.js",True)
-        Expressions_yield("language/expressions/yield/star-rhs-iter-thrw-res-value-final.js",False)
-        Expressions_yield("language/expressions/yield/star-rhs-iter-thrw-res-value-final.js",True)
        FunctionCode
         FunctionCode("language/function-code/10.4.3-1-104.js",True)
         FunctionCode("language/function-code/10.4.3-1-106.js",True)
-       FutureReservedWords
-        FutureReservedWords("language/future-reserved-words/static.js",False)
-       GlobalCode
-        GlobalCode("language/global-code/decl-lex-restricted-global.js",True)
-        GlobalCode("language/global-code/script-decl-func-err-non-extensible.js",False)
-        GlobalCode("language/global-code/script-decl-func-err-non-extensible.js",True)
-        GlobalCode("language/global-code/script-decl-lex-var-declared-via-eval.js",False)
        ModuleCode_topLevelAwait
         ModuleCode_topLevelAwait("language/module-code/top-level-await/async-module-does-not-block-sibling-modules.js",True)
         ModuleCode_topLevelAwait("language/module-code/top-level-await/await-dynamic-import-resolution.js",True)
         ModuleCode_topLevelAwait("language/module-code/top-level-await/module-graphs-does-not-hang.js",True)
        ModuleCode_topLevelAwait_syntax
         ModuleCode_topLevelAwait_syntax("language/module-code/top-level-await/syntax/await-expr-dyn-import.js",True)
-       ReservedWords
-        ReservedWords("language/reserved-words/unreserved-words.js",False)
-        ReservedWords("language/reserved-words/unreserved-words.js",True)
        Statements_asyncGenerator
         Statements_asyncGenerator("language/statements/async-generator/yield-star-async-from-sync-iterator-inaccessible.js",False)
         Statements_asyncGenerator("language/statements/async-generator/yield-star-async-from-sync-iterator-inaccessible.js",True)
+       Statements_class
+        Statements_class("language/statements/class/static-init-scope-var-close.js",False)
+        Statements_class("language/statements/class/static-init-scope-var-close.js",True)
+        Statements_class("language/statements/class/static-init-scope-var-open.js",False)
+        Statements_class("language/statements/class/static-init-scope-var-open.js",True)
        Statements_class_definition
         Statements_class_definition("language/statements/class/definition/invalid-extends.js",True)
        Statements_class_elements_syntax_valid
@@ -74,18 +62,3 @@
         Statements_const_syntax("language/statements/const/syntax/const-invalid-assignment-next-expression-for.js",True)
        Statements_function
         Statements_function("language/statements/function/param-dflt-yield-non-strict.js",False)
-       Statements_labeled
-        Statements_labeled("language/statements/labeled/value-await-non-module.js",False)
-        Statements_labeled("language/statements/labeled/value-await-non-module.js",True)
-        Statements_labeled("language/statements/labeled/value-yield-non-strict.js",False)
-       Statements_switch
-        Statements_switch("language/statements/switch/scope-lex-async-function.js",False)
-       Statements_variable
-        Statements_variable("language/statements/variable/binding-resolution.js",False)
-       Statements_variable_dstr
-        Statements_variable_dstr("language/statements/variable/dstr/obj-ptrn-elem-id-static-init-await-valid.js",False)
-        Statements_variable_dstr("language/statements/variable/dstr/obj-ptrn-elem-id-static-init-await-valid.js",True)
-       Statements_with
-        Statements_with("language/statements/with/has-binding-call-with-proxy-env.js",False)
-        Statements_with("language/statements/with/set-mutable-binding-binding-deleted-in-get-unscopables-strict-mode.js",False)
-        Statements_with("language/statements/with/set-mutable-binding-binding-deleted-with-typed-array-in-proto-chain.js",False)
diff --git a/src/Asynkron.JsEngine/Ast/TypedAstEvaluator.AsyncGeneratorFactory.cs b/src/Asynkron.JsEngine/Ast/TypedAstEvaluator.AsyncGeneratorFactory.cs
@@ -287,17 +287,90 @@ public override string ToString()
                 : "[AsyncGeneratorFunction]";
         }
 
+        private void EnsureAsyncGeneratorIntrinsics()
+        {
+            // %AsyncIteratorPrototype% (inherits from %Object.prototype%)
+            if (_realmState.AsyncIteratorPrototype is null)
+            {
+                var asyncIteratorProto = new JsObject();
+                if (_realmState.ObjectPrototype is not null)
+                {
+                    asyncIteratorProto.SetPrototype(_realmState.ObjectPrototype);
+                }
+
+                _realmState.AsyncIteratorPrototype = asyncIteratorProto;
+            }
+
+            // %AsyncGeneratorPrototype% (inherits from %AsyncIteratorPrototype%)
+            if (_realmState.AsyncGeneratorPrototype is null)
+            {
+                var asyncGenProto = new JsObject();
+                asyncGenProto.SetPrototype(_realmState.AsyncIteratorPrototype ?? _realmState.ObjectPrototype);
+                _realmState.AsyncGeneratorPrototype = asyncGenProto;
+            }
+
+            // %AsyncGeneratorFunction.prototype%
+            if (_realmState.AsyncGeneratorFunctionPrototype is null && _realmState.FunctionPrototype is not null)
+            {
+                var asyncGenFuncProto = new JsObject();
+                asyncGenFuncProto.SetPrototype(_realmState.FunctionPrototype);
+
+                asyncGenFuncProto.DefineProperty("prototype",
+                    new PropertyDescriptor
+                    {
+                        Value = _realmState.AsyncGeneratorPrototype,
+                        Writable = false,
+                        Enumerable = false,
+                        Configurable = true,
+                        HasValue = true,
+                        HasWritable = true,
+                        HasEnumerable = true,
+                        HasConfigurable = true
+                    });
+
+                // Minimal AsyncGeneratorFunction constructor so constructor.prototype.prototype matches spec shape
+                if (_realmState.AsyncGeneratorFunctionConstructor is null)
+                {
+                    var constructor = new HostFunction(_ => null);
+                    constructor.Properties.SetPrototype(_realmState.FunctionPrototype);
+                    constructor.SetProperty("prototype", asyncGenFuncProto);
+                    _realmState.AsyncGeneratorFunctionConstructor = constructor;
+                }
+
+                asyncGenFuncProto.DefineProperty("constructor",
+                    new PropertyDescriptor
+                    {
+                        Value = _realmState.AsyncGeneratorFunctionConstructor,
+                        Writable = false,
+                        Enumerable = false,
+                        Configurable = true,
+                        HasValue = true,
+                        HasWritable = true,
+                        HasEnumerable = true,
+                        HasConfigurable = true
+                    });
+
+                _realmState.AsyncGeneratorFunctionPrototype = asyncGenFuncProto;
+            }
+        }
+
         private void InitializeProperties()
         {
-            if (_realmState.FunctionPrototype is { } functionPrototype)
+            EnsureAsyncGeneratorIntrinsics();
+
+            if (_realmState.AsyncGeneratorFunctionPrototype is { } asyncGenFuncProto)
+            {
+                _properties.SetPrototype(asyncGenFuncProto);
+            }
+            else if (_realmState.FunctionPrototype is { } functionPrototype)
             {
                 _properties.SetPrototype(functionPrototype);
             }
 
             if (_isConstructorEnabled && _realmState.ObjectPrototype is not null)
             {
                 var generatorPrototype = new JsObject();
-                generatorPrototype.SetPrototype(_realmState.ObjectPrototype);
+                generatorPrototype.SetPrototype(_realmState.AsyncGeneratorPrototype ?? _realmState.ObjectPrototype);
                 generatorPrototype.DefineProperty("constructor",
                     new PropertyDescriptor
                     {
diff --git a/src/Asynkron.JsEngine/Ast/TypedAstEvaluator.AsyncGeneratorInstance.cs b/src/Asynkron.JsEngine/Ast/TypedAstEvaluator.AsyncGeneratorInstance.cs
@@ -183,7 +183,7 @@ private void HandlePendingStep(
                 return prototypeObject;
             }
 
-            return realmState.ObjectPrototype;
+            return realmState.AsyncGeneratorPrototype ?? realmState.ObjectPrototype;
         }
     }
 }
diff --git a/src/Asynkron.JsEngine/Ast/VariableKindExtensions.cs b/src/Asynkron.JsEngine/Ast/VariableKindExtensions.cs
@@ -20,6 +20,10 @@ private void EvaluateVariableDeclarator(VariableDeclarator declarator,
                 declarator.Initializer is not null &&
                 targetIdentifier is not null)
             {
+                // Var bindings are hoisted to the nearest function scope before evaluating
+                // the initializer so resolution targets the correct environment.
+                EnsureFunctionScopedVarBinding(environment, targetIdentifier.Name, context);
+
                 var identifierExpression = new IdentifierExpression(declarator.Source, targetIdentifier.Name);
                 preResolvedVarReference = AssignmentReferenceResolver.Resolve(
                     identifierExpression,
diff --git a/src/Asynkron.JsEngine/JsTypes/HostFunction.cs b/src/Asynkron.JsEngine/JsTypes/HostFunction.cs
@@ -443,7 +443,10 @@ private void EnsurePrototypeDataProperty()
 
     private void RemovePrototypeDataProperty()
     {
-        Properties.DeleteOwnProperty("prototype");
+        if (!Properties.DeleteOwnProperty("prototype"))
+        {
+            Properties.ForceDeleteOwnProperty("prototype");
+        }
     }
 
     private bool HasPrototypeDataProperty()
diff --git a/src/Asynkron.JsEngine/JsTypes/JsObject.cs b/src/Asynkron.JsEngine/JsTypes/JsObject.cs
@@ -999,6 +999,21 @@ public bool HasSetter(string name)
         return null;
     }
 
+    internal bool ForceDeleteOwnProperty(string name)
+    {
+        var deletedDescriptor = _descriptors.Remove(name);
+        Remove(GetterPrefix + name);
+        Remove(SetterPrefix + name);
+        var deletedValue = Remove(name);
+        if (deletedDescriptor || deletedValue)
+        {
+            RemoveFromInsertionOrder(name);
+            return true;
+        }
+
+        return false;
+    }
+
     public bool DeleteOwnProperty(string name)
     {
         if (_descriptors.TryGetValue(name, out var descriptor))
diff --git a/src/Asynkron.JsEngine/Parser/TypedAstParser.cs b/src/Asynkron.JsEngine/Parser/TypedAstParser.cs
@@ -867,7 +867,10 @@ private ClassDefinition ParseClassDefinition(Symbol? className, Token classToken
                     continue;
                 }
 
-                if (Check(TokenType.Get) || Check(TokenType.Set))
+                var isAccessorKeyword = (Check(TokenType.Get) || Check(TokenType.Set)) &&
+                                        !HasLineTerminatorAfterCurrentToken();
+
+                if (isAccessorKeyword)
                 {
                     var accessorToken = Advance();
                     var isGetter = accessorToken.Type == TokenType.Get;
@@ -4162,9 +4165,24 @@ private bool CheckAheadBindingIdentifier()
                 return false;
             }
 
-            return next.Type is TokenType.Identifier ||
-                   next.Type is TokenType.Async or TokenType.Await or TokenType.Yield ||
-                   IsContextualIdentifierToken(next);
+            if (next.Type is TokenType.Identifier ||
+                next.Type is TokenType.Async or TokenType.Await or TokenType.Yield ||
+                IsContextualIdentifierToken(next))
+            {
+                return true;
+            }
+
+            if (!InStrictContext && next.Type is TokenType.Static or TokenType.Let)
+            {
+                return true;
+            }
+
+            if (next.Type is TokenType.Using)
+            {
+                return true;
+            }
+
+            return false;
         }
 
         private Token Advance()
@@ -4365,7 +4383,7 @@ private bool CheckIdentifierLike()
                 return true;
             }
 
-            if (token.Type is TokenType.Async or TokenType.Await or TokenType.Yield ||
+            if (token.Type is TokenType.Async or TokenType.Await or TokenType.Yield or TokenType.Using ||
                 IsContextualIdentifierToken(token))
             {
                 return true;
@@ -4376,6 +4394,11 @@ private bool CheckIdentifierLike()
                 return true;
             }
 
+            if (token.Type is TokenType.Using)
+            {
+                return true;
+            }
+
             return false;
         }
 
@@ -4501,6 +4524,18 @@ private bool HasLineTerminatorBefore()
             return currentToken.Line > previousToken.Line;
         }
 
+        private bool HasLineTerminatorAfterCurrentToken()
+        {
+            if (_current < 0 || _current + 1 >= _tokens.Count)
+            {
+                return false;
+            }
+
+            var currentToken = _tokens[_current];
+            var nextToken = _tokens[_current + 1];
+            return nextToken.Line > currentToken.Line;
+        }
+
         private bool IsAsyncToken()
         {
             var token = Peek();
diff --git a/src/Asynkron.JsEngine/Runtime/RealmState.cs b/src/Asynkron.JsEngine/Runtime/RealmState.cs
@@ -51,6 +51,8 @@ public sealed class RealmState
     public HostFunction? GeneratorFunctionConstructor { get; set; }
     public JsObject? AsyncGeneratorFunctionPrototype { get; set; }
     public JsObject? AsyncGeneratorPrototype { get; set; }
+    public JsObject? AsyncIteratorPrototype { get; set; }
+    public HostFunction? AsyncGeneratorFunctionConstructor { get; set; }
     public IJsCallable? PromiseConstructor { get; set; }
 
     // Internal flags to avoid re-attaching built-in surfaces per instance
diff --git a/src/Asynkron.JsEngine/StdLib/StandardLibrary.Math.cs b/src/Asynkron.JsEngine/StdLib/StandardLibrary.Math.cs

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ private void HandlePendingStep(`
`183`	`183`	`return prototypeObject;`
`184`	`184`	`}`
`185`	`185`
`186`		`- return realmState.ObjectPrototype;`
	`186`	`+ return realmState.AsyncGeneratorPrototype ?? realmState.ObjectPrototype;`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,10 @@ private void EnsurePrototypeDataProperty()`
`443`	`443`
`444`	`444`	`private void RemovePrototypeDataProperty()`
`445`	`445`	`{`
`446`		`- Properties.DeleteOwnProperty("prototype");`
	`446`	`+ if (!Properties.DeleteOwnProperty("prototype"))`
	`447`	`+ {`
	`448`	`+ Properties.ForceDeleteOwnProperty("prototype");`
	`449`	`+ }`
`447`	`450`	`}`
`448`	`451`
`449`	`452`	`private bool HasPrototypeDataProperty()`