Move Js* types to be directly under Jint.Native namespace (#1745)

Jint.Tests.PublicInterface/ConstraintUsageTests.cs

@@ -1,7 +1,4 @@
-using Jint.Constraints;
-using Jint.Runtime;
-
-namespace Jint.Tests.PublicInterface;
+namespace Jint.Tests.PublicInterface;
 
 [Collection("ConstraintUsageTests")]
 public class ConstraintUsageTests

Jint.Tests.PublicInterface/JavaScriptExceptionTests.cs

@@ -1,5 +1,4 @@
 using Jint.Native;
-using Jint.Native.Error;
 using Jint.Runtime;
 
 namespace Jint.Tests.PublicInterface

Jint.Tests.PublicInterface/PublicInterfaceTests.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using Jint.Native;
-using Jint.Native.Argument;
 using Jint.Native.Function;
 
 namespace Jint.Tests.PublicInterface;

Jint.Tests.Test262/Test262Test.cs

@@ -1,6 +1,5 @@
 using Esprima;
 using Jint.Native;
-using Jint.Native.ArrayBuffer;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;

Jint.Tests/Runtime/InteropTests.cs

@@ -3423,7 +3423,7 @@ public void CanSelectShadowedPropertiesBasedOnReadableAndWritable()
         }
 
         [Fact]
-        public void ShouldSomethingFoo()
+        public void ShouldRespectConcreteGenericReturnTypes()
         {
             var engine = new Engine(opt =>
             {

Jint.Tests/Runtime/JsValueConversionTests.cs

@@ -1,5 +1,4 @@
 using Jint.Native;
-using Jint.Native.RegExp;
 
 namespace Jint.Tests.Runtime
 {

Jint.Tests/Runtime/PromiseTests.cs

@@ -1,6 +1,5 @@
 using Jint.Native;
 using Jint.Native.Object;
-using Jint.Native.Promise;
 using Jint.Runtime;
 
 // obsolete GetCompletionValue

Jint.Tests/Runtime/PropertyDescriptorTests.cs

@@ -1,5 +1,4 @@
 using Jint.Native;
-using Jint.Native.Argument;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Descriptors.Specialized;
 using Jint.Runtime.Interop;

Jint.Tests/Runtime/WeakSetMapTests.cs

@@ -1,6 +1,4 @@
 using Jint.Native;
-using Jint.Native.WeakMap;
-using Jint.Native.WeakSet;
 using Jint.Runtime;
 
 namespace Jint.Tests.Runtime;

Jint/Engine.cs

@@ -3,7 +3,6 @@
 using Esprima;
 using Esprima.Ast;
 using Jint.Native;
-using Jint.Native.Argument;
 using Jint.Native.Function;
 using Jint.Native.Generator;
 using Jint.Native.Object;

Jint/JsValueExtensions.cs

@@ -6,7 +6,6 @@
 using Jint.Native.Function;
 using Jint.Native.Object;
 using Jint.Native.Promise;
-using Jint.Native.RegExp;
 using Jint.Native.Symbol;
 using Jint.Native.TypedArray;
 using Jint.Runtime;

Jint/Native/Array/ArrayIteratorPrototype.cs

@@ -2,7 +2,6 @@
 using Jint.Native.Iterator;
 using Jint.Native.Object;
 using Jint.Native.Symbol;
-using Jint.Native.TypedArray;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;

Jint/Native/Array/ArrayOperations.cs

@@ -2,7 +2,6 @@
 using Jint.Native.Number;
 using Jint.Native.Object;
 using Jint.Native.String;
-using Jint.Native.TypedArray;
 using Jint.Runtime;
 
 namespace Jint.Native.Array

Jint/Native/ArrayBuffer/ArrayBufferConstructor.cs

@@ -1,9 +1,7 @@
 using Jint.Collections;
-using Jint.Native.DataView;
 using Jint.Native.Function;
 using Jint.Native.Object;
 using Jint.Native.Symbol;
-using Jint.Native.TypedArray;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;

Jint/Native/Boolean/BooleanConstructor.cs

@@ -51,7 +51,7 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
             var o = OrdinaryCreateFromConstructor(
                 newTarget,
                 static intrinsics => intrinsics.Boolean.PrototypeObject,
-                static (engine, realm, state) => new BooleanInstance(engine, (JsBoolean) state!), b);
+                static (engine, realm, state) => new BooleanInstance(engine, state!), b);
             return o;
         }
 

Jint/Native/DataView/DataViewConstructor.cs

@@ -1,7 +1,5 @@
-using Jint.Native.ArrayBuffer;
 using Jint.Native.Function;
 using Jint.Native.Object;
-using Jint.Native.TypedArray;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 

Jint/Native/Error/ErrorInstance.cs

@@ -3,13 +3,6 @@
 
 namespace Jint.Native.Error;
 
-public sealed class JsError : ErrorInstance
-{
-    internal JsError(Engine engine) : base(engine, ObjectClass.Error)
-    {
-    }
-}
-
 public class ErrorInstance : ObjectInstance
 {
     private protected ErrorInstance(Engine engine, ObjectClass objectClass)

Jint/Native/Function/Function.cs

@@ -2,7 +2,6 @@
 using System.Runtime.CompilerServices;
 using Esprima.Ast;
 using Jint.Native.Object;
-using Jint.Native.Proxy;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Environments;

Jint/Native/Argument/JsArguments.cs → Jint/Native/JsArguments.cs

@@ -7,7 +7,7 @@
 using Jint.Runtime.Environments;
 using Jint.Runtime.Interop;
 
-namespace Jint.Native.Argument
+namespace Jint.Native
 {
     /// <summary>
     /// https://tc39.es/ecma262/#sec-arguments-exotic-objects

Jint/Native/ArrayBuffer/JsArrayBuffer.cs → Jint/Native/JsArrayBuffer.cs

@@ -1,8 +1,9 @@
+using Jint.Native.ArrayBuffer;
 using Jint.Native.Object;
 using Jint.Native.TypedArray;
 using Jint.Runtime;
 
-namespace Jint.Native.ArrayBuffer;
+namespace Jint.Native;
 
 /// <summary>
 /// https://tc39.es/ecma262/#sec-arraybuffer-objects

Jint/Native/DataView/JsDataView.cs → Jint/Native/JsDataView.cs

@@ -1,7 +1,6 @@
-using Jint.Native.ArrayBuffer;
 using Jint.Native.Object;
 
-namespace Jint.Native.DataView;
+namespace Jint.Native;
 
 /// <summary>
 /// https://tc39.es/ecma262/#sec-properties-of-dataview-instances

Jint/Native/JsError.cs

@@ -0,0 +1,11 @@
+using Jint.Native.Error;
+using Jint.Native.Object;
+
+namespace Jint.Native;
+
+public sealed class JsError : ErrorInstance
+{
+    internal JsError(Engine engine) : base(engine, ObjectClass.Error)
+    {
+    }
+}

Jint/Native/Map/JsMap.cs → Jint/Native/JsMap.cs

@@ -3,7 +3,7 @@
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 
-namespace Jint.Native.Map;
+namespace Jint.Native;
 
 internal sealed class JsMap : ObjectInstance
 {

Jint/Native/Promise/JsPromise.cs → Jint/Native/JsPromise.cs

@@ -1,40 +1,10 @@
 using Jint.Native.Object;
+using Jint.Native.Promise;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;
 
-namespace Jint.Native.Promise;
-
-internal enum PromiseState
-{
-    Pending,
-    Fulfilled,
-    Rejected
-}
-
-internal enum ReactionType
-{
-    Fulfill,
-    Reject
-}
-
-internal sealed record PromiseReaction(
-    ReactionType Type,
-    PromiseCapability Capability,
-    JsValue Handler
-);
-
-internal sealed record ResolvingFunctions(
-    Function.Function Resolve,
-    Function.Function Reject
-);
-
-public sealed record ManualPromise(
-    JsValue Promise,
-    Action<JsValue> Resolve,
-    Action<JsValue> Reject
-);
-
+namespace Jint.Native;
 
 internal sealed class JsPromise : ObjectInstance
 {

Jint/Native/Proxy/JsProxy.cs → Jint/Native/JsProxy.cs

@@ -3,7 +3,7 @@
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 
-namespace Jint.Native.Proxy
+namespace Jint.Native
 {
     internal sealed class JsProxy : ObjectInstance, IConstructor, ICallable
     {

Jint/Native/RegExp/JsRegExp.cs → Jint/Native/JsRegExp.cs

@@ -1,10 +1,11 @@
 using System.Text.RegularExpressions;
 using Esprima;
 using Jint.Native.Object;
+using Jint.Native.RegExp;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 
-namespace Jint.Native.RegExp
+namespace Jint.Native
 {
     public sealed class JsRegExp : ObjectInstance
     {

Jint/Native/Set/JsSet.cs → Jint/Native/JsSet.cs

@@ -3,7 +3,7 @@
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 
-namespace Jint.Native.Set;
+namespace Jint.Native;
 
 internal sealed class JsSet : ObjectInstance
 {

Jint/Native/SharedArrayBuffer/JsSharedArrayBuffer.cs → Jint/Native/JsSharedArrayBuffer.cs

@@ -1,7 +1,6 @@
-using Jint.Native.ArrayBuffer;
 using Jint.Runtime;
 
-namespace Jint.Native.SharedArrayBuffer;
+namespace Jint.Native;
 
 /// <summary>
 /// https://tc39.es/ecma262/#sec-sharedarraybuffer-objects

Jint/Native/TypedArray/JsTypedArray.cs → Jint/Native/JsTypedArray.cs

@@ -4,10 +4,11 @@
 using Jint.Native.ArrayBuffer;
 using Jint.Native.Number;
 using Jint.Native.Object;
+using Jint.Native.TypedArray;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 
-namespace Jint.Native.TypedArray
+namespace Jint.Native
 {
     public sealed class JsTypedArray : ObjectInstance
     {

Jint/Native/WeakMap/JsWeakMap.cs → Jint/Native/JsWeakMap.cs

@@ -1,9 +1,8 @@
 using System.Runtime.CompilerServices;
-
 using Jint.Native.Object;
 using Jint.Runtime;
 
-namespace Jint.Native.WeakMap;
+namespace Jint.Native;
 
 internal sealed class JsWeakMap : ObjectInstance
 {

Jint/Native/WeakRef/JsWeakRef.cs → Jint/Native/JsWeakRef.cs

@@ -1,6 +1,6 @@
 using Jint.Native.Object;
 
-namespace Jint.Native.WeakRef;
+namespace Jint.Native;
 
 /// <summary>
 /// https://tc39.es/ecma262/#sec-properties-of-weak-ref-instances

Jint/Native/WeakSet/JsWeakSet.cs → Jint/Native/JsWeakSet.cs

@@ -1,9 +1,8 @@
 using System.Runtime.CompilerServices;
-
 using Jint.Native.Object;
 using Jint.Runtime;
 
-namespace Jint.Native.WeakSet;
+namespace Jint.Native;
 
 internal sealed class JsWeakSet : ObjectInstance
 {

Jint/Native/Json/JsonSerializer.cs

@@ -6,7 +6,6 @@
 using Jint.Native.Boolean;
 using Jint.Native.Number;
 using Jint.Native.Object;
-using Jint.Native.Proxy;
 using Jint.Native.String;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;

Jint/Native/Object/ObjectInstance.cs

@@ -7,7 +7,6 @@
 using Jint.Native.Boolean;
 using Jint.Native.Json;
 using Jint.Native.Number;
-using Jint.Native.RegExp;
 using Jint.Native.String;
 using Jint.Native.Symbol;
 using Jint.Native.TypedArray;

Jint/Native/Object/ObjectPrototype.cs

@@ -2,7 +2,6 @@
 
 using Jint.Collections;
 using Jint.Native.Array;
-using Jint.Native.Proxy;
 using Jint.Native.Symbol;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;

Jint/Native/Promise/PromiseTypes.cs

@@ -0,0 +1,31 @@
+namespace Jint.Native.Promise;
+
+internal enum PromiseState
+{
+    Pending,
+    Fulfilled,
+    Rejected
+}
+
+internal enum ReactionType
+{
+    Fulfill,
+    Reject
+}
+
+internal sealed record PromiseReaction(
+    ReactionType Type,
+    PromiseCapability Capability,
+    JsValue Handler
+);
+
+internal sealed record ResolvingFunctions(
+    Function.Function Resolve,
+    Function.Function Reject
+);
+
+public sealed record ManualPromise(
+    JsValue Promise,
+    Action<JsValue> Resolve,
+    Action<JsValue> Reject
+);

Jint/Native/SharedArrayBuffer/SharedArrayBufferConstructor.cs

@@ -1,9 +1,7 @@
 using Jint.Collections;
-using Jint.Native.DataView;
 using Jint.Native.Function;
 using Jint.Native.Object;
 using Jint.Native.Symbol;
-using Jint.Native.TypedArray;
 using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;

Jint/Pooling/ArgumentsInstancePool.cs

@@ -1,5 +1,4 @@
 using Jint.Native;
-using Jint.Native.Argument;
 using Jint.Native.Function;
 using Jint.Runtime.Environments;
 

Jint/Runtime/Interpreter/Expressions/JintAwaitExpression.cs

@@ -1,5 +1,5 @@
 using Esprima.Ast;
-using Jint.Native.Promise;
+using Jint.Native;
 
 namespace Jint.Runtime.Interpreter.Expressions;