Merge pull request #31 from koculu/30-bug-the-types-of-sub-namespaces-are-not-accessible

koculu · web-flow · commit 1b361083501a · 2024-05-05T19:39:04.000+02:00
Fix sub namespace resolution bug.
diff --git a/src/Topaz.Benchmark/Topaz.Benchmark.csproj b/src/Topaz.Benchmark/Topaz.Benchmark.csproj
@@ -2,8 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>Tenray.Topaz</RootNamespace>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Topaz.Test/AddNamespaceTests.cs b/src/Topaz.Test/AddNamespaceTests.cs
@@ -0,0 +1,78 @@
+﻿using NUnit.Framework;
+using System.Collections;
+using System.Text.RegularExpressions;
+using Tenray.Topaz.API;
+
+namespace Tenray.Topaz.Test;
+
+public sealed class AddNamespaceTests
+{
+    [Test]
+    public void TestAddNamespace1()
+    {
+        var engine = new TopazEngine();
+        engine.AddNamespace("System", null, true);
+        dynamic model = new JsObject();
+        engine.SetValue("model", model);
+        engine.ExecuteScript(@"
+        let sb = new System.Text.StringBuilder()
+        sb.Append('1234')
+        model.data = sb.ToString()
+");
+        Assert.That(model.data, Is.EqualTo("1234"));
+    }
+
+    [Test]
+    public void TestAddNamespace2()
+    {
+        var engine = new TopazEngine();
+        engine.AddNamespace("System.Text", null, true);
+        dynamic model = new JsObject();
+        engine.SetValue("model", model);
+
+        engine.ExecuteScript(@"
+        let sb = new System.Text.StringBuilder()
+        sb.Append('1234')
+        model.data = sb.ToString()
+        model.reg = new System.Text.RegularExpressions.Regex('\w');
+");
+        Assert.That(model.data, Is.EqualTo("1234"));
+        Assert.That(model.reg, Is.InstanceOf<Regex>());
+    }
+
+    [Test]
+    public void TestAddNamespace3()
+    {
+        var engine = new TopazEngine();
+        engine.AddNamespace("System.Text", null, false);
+        dynamic model = new JsObject();
+        engine.SetValue("model", model);
+
+        engine.ExecuteScript(@"
+        let sb = new System.Text.StringBuilder()
+        sb.Append('1234')
+        model.data = sb.ToString()
+        model.reg = System.Text.RegularExpressions.Regex;
+");
+        Assert.That(model.data, Is.EqualTo("1234"));
+        Assert.That(model.reg, Is.Null);
+    }
+
+    [Test]
+    public void TestAddNamespace4()
+    {
+        var engine = new TopazEngine();
+        engine.AddNamespace("System.Text", null, true);
+        dynamic model = new JsObject();
+        engine.SetValue("model", model);
+
+        engine.ExecuteScript(@"
+        let sb = new System.Text.StringBuilder()
+        sb.Append('1234')
+        model.data = sb.ToString()
+        model.appDomain = System.AppDomain;
+");
+        Assert.That(model.data, Is.EqualTo("1234"));
+        Assert.That(model.appDomain, Is.Null);
+    }
+}
diff --git a/src/Topaz.Test/AwaitTests.cs b/src/Topaz.Test/AwaitTests.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -187,6 +188,51 @@ public void CustomAwaitHandler2()
 ");
         Assert.That(model.result2, Is.EqualTo(33));
     }
+
+    public async Task<int> DelayedRunner(Func<TaskData, Task<int>> action, int milliseconds)
+    {
+        await Task.Delay(milliseconds);
+
+        var taskData = new TaskData();
+        var ret = await action(taskData);
+        return ret;
+    }
+
+    [Test]
+    public void AwaitChain1()
+    {
+        var engine = new TopazEngine(new TopazEngineSetup { AwaitExpressionHandler = new CustomAwaitExpressionHandler() });
+        dynamic model = new JsObject();
+        engine.SetValue("test", this);
+        engine.SetValue("model", model);
+        engine.ExecuteScriptAsync(@"
+var handler = async function(taskdata)
+{
+    return taskdata.TestMethod();
+}
+var t = await test.DelayedRunner(handler, 3);
+model.result1 = t;
+").Wait();
+        Assert.That(model.result1, Is.EqualTo(33));
+        engine.ExecuteScript(@"
+var handler = async function(taskdata)
+{
+    return taskdata.TestMethod();
+}
+var t = await test.DelayedRunner(handler, 3);
+model.result2 = await t;
+");
+        Assert.That(model.result2, Is.EqualTo(33));
+    }
+}
+
+public class TaskData
+{
+    public async Task<int> TestMethod()
+    {
+        await Task.Delay(11);
+        return 33;
+    }
 }
 
 class CustomAwaitExpressionHandler : IAwaitExpressionHandler
diff --git a/src/Topaz.Test/SwitchCaseTests.cs b/src/Topaz.Test/SwitchCaseTests.cs
@@ -54,4 +54,4 @@ function f2(key) {
         foreach (var item in (IEnumerable)(model.a))
             Assert.IsTrue((bool)item);
     }
-}
+}
diff --git a/src/Topaz.Test/Topaz.Test.csproj b/src/Topaz.Test/Topaz.Test.csproj
@@ -1,10 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <RootNamespace>Tenray.Topaz</RootNamespace>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Topaz/Directory.Build.props b/src/Topaz/Directory.Build.props
@@ -5,8 +5,8 @@
     <Authors>Ahmed Yasin Koculu</Authors>
     <PackageId>Topaz</PackageId>
     <Title>Topaz</Title>
-    <ProductVersion>1.3.9.0</ProductVersion>
-    <Version>1.3.9.0</Version>
+    <ProductVersion>1.4.0.0</ProductVersion>
+    <Version>1.4.0.0</Version>
     <Authors>Ahmed Yasin Koculu</Authors>
     <AssemblyTitle>Topaz</AssemblyTitle>
     <Description>Multithreaded Javascript Engine for .NET</Description>
diff --git a/src/Topaz/ITopazEngine.cs b/src/Topaz/ITopazEngine.cs
@@ -155,10 +155,9 @@ public interface ITopazEngine
     /// </summary>
     /// <param name="namespace">The full name of the namespace.</param>
     /// <param name="whitelist">The whitelist contains the types that are allowed.</param>
-    /// <param name="allowSubNamespaces">If true, subnamespaces will be accessible.</param>
-    /// <param name="name">The name that will be used in script to access given namespace.
+    /// <param name="allowSubNamespaces">If true, subnamespaces will be accessible.</param>    
     /// If this is not provided the script name will be equal to the namespace.</param>
-    public void AddNamespace(string @namespace, IReadOnlySet<string> whitelist, bool allowSubNamespaces = false, string name = null);
+    public void AddNamespace(string @namespace, IReadOnlySet<string> whitelist, bool allowSubNamespaces = false);
 
     /// <summary>
     /// Gets the value of the variable that is defined in the global scope.
diff --git a/src/Topaz/Interop/Impl/NamespaceProxy.cs b/src/Topaz/Interop/Impl/NamespaceProxy.cs
@@ -9,6 +9,8 @@ namespace Tenray.Topaz.Interop;
 /// </summary>
 public sealed class NamespaceProxy : ITypeProxy
 {
+    private Dictionary<string, NamespaceProxy> SubnamespaceProxies = new();
+
     /// <summary>
     /// Namespace name. 
     /// eg: System.Collections
@@ -51,6 +53,11 @@ public sealed class NamespaceProxy : ITypeProxy
     /// </summary>
     public Type ProxiedType { get; }
 
+    /// <summary>
+    /// If true, types of the current namespace are accessible.
+    /// </summary>
+    public bool EnableTypeRetrieval { get; set; }
+
     public NamespaceProxy(
         string name,
         IReadOnlySet<string> whitelist,
@@ -87,26 +94,34 @@ public bool TryGetStaticMember(
             return false;
         }
 
+        if (SubnamespaceProxies.TryGetValue(memberName, out var subProxy))
+        {
+            value = subProxy;
+            return true;
+        }
+
         var fullname = Name + "." + memberName;
         var type = FindType(fullname);
         if (type == null)
         {
             if (AllowSubNamespaces)
             {
-                value = new NamespaceProxy(fullname,
+                value = subProxy = new NamespaceProxy(fullname,
                                            Whitelist,
                                            true,
                                            ValueConverter,
                                            MemberInfoProvider,
                                            MaxGenericTypeArgumentCount,
                                            ProxyOptions);
+                subProxy.EnableTypeRetrieval = true;
+                SubnamespaceProxies.Add(memberName, subProxy);
                 return true;
             }
             value = null;
             return false;
         }
 
-        if (!type.IsPublic)
+        if (!EnableTypeRetrieval || !type.IsPublic)
         {
             value = null;
             return false;
@@ -124,15 +139,28 @@ public bool TryGetStaticMember(
         return true;
     }
 
+    static Type SearchType(string typeName)
+    {
+        var type = Type.GetType(typeName, false, false);
+        if (type != null) return type;
+        foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
+        {
+            type = a.GetType(typeName, false, false);
+            if (type != null)
+                return type;
+        }
+        return null;
+    }
+
     private Type FindType(string fullname)
     {
-        var type = Type.GetType(fullname, false, false);
+        var type = SearchType(fullname);
         if (type != null)
             return type;
         // search for generic types.
         for (var i = 1; i < MaxGenericTypeArgumentCount; ++i)
         {
-            type = Type.GetType(fullname + "`" + i, false, false);
+            type = SearchType(fullname + "`" + i);
             if (type != null)
                 return type;
         }
@@ -152,4 +180,23 @@ public override string ToString()
     {
         return Name;
     }
+
+    public void AddSubNameSpaces(Span<string> parts,
+        IReadOnlySet<string> whitelist,
+        bool allowSubNamespaces)
+    {
+        if (parts.Length == 0)
+        {
+            EnableTypeRetrieval = true;
+            return;
+        }
+        if (SubnamespaceProxies.TryGetValue(parts[0], out var proxy))
+        {
+            proxy.AddSubNameSpaces(parts.Slice(1), whitelist, allowSubNamespaces);
+            return;
+        }
+        var subProxy = new NamespaceProxy(Name + "." + parts[0], whitelist, allowSubNamespaces && parts.Length == 1, ValueConverter, MemberInfoProvider, MaxGenericTypeArgumentCount);
+        subProxy.AddSubNameSpaces(parts.Slice(1), whitelist, allowSubNamespaces);
+        SubnamespaceProxies.Add(parts[0], subProxy);
+    }
 }
diff --git a/src/Topaz/Topaz.csproj b/src/Topaz/Topaz.csproj
@@ -4,7 +4,7 @@
     <Deterministic>true</Deterministic>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/koculu/topaz</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -16,8 +16,10 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <RootNamespace>Tenray.Topaz</RootNamespace>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
+    <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
     <AnalysisMode>All</AnalysisMode>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Topaz/TopazEngine.cs b/src/Topaz/TopazEngine.cs
@@ -101,12 +101,21 @@ public void AddExtensionMethods(Type type)
         extensionMethodRegistry.AddType(type);
     }
 
-    public void AddNamespace(string @namespace, IReadOnlySet<string> whitelist = null, bool allowSubNamespaces = false, string name = null)
+    public void AddNamespace(string @namespace, IReadOnlySet<string> whitelist = null, bool allowSubNamespaces = false)
     {
+        var parts = @namespace.Split('.');
+        var rootNamespace = parts[0];
+        if (GlobalScope.GetValue(rootNamespace) is NamespaceProxy existingProxy)
+        {
+            existingProxy.AddSubNameSpaces(parts.AsSpan(1), whitelist, allowSubNamespaces);
+            return;
+        }
+        var proxy = new NamespaceProxy(rootNamespace, whitelist, allowSubNamespaces && parts.Length == 1, ValueConverter, MemberInfoProvider);
         GlobalScope.SetValueAndKind(
-            name ?? @namespace,
-            new NamespaceProxy(@namespace, whitelist, allowSubNamespaces, ValueConverter, MemberInfoProvider),
+            rootNamespace,
+            proxy,
             VariableKind.Const);
+        proxy.AddSubNameSpaces(parts.AsSpan(1), whitelist, allowSubNamespaces);
     }
 
     public object GetValue(string name)

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@ function f2(key) {`
`54`	`54`	`foreach (var item in (IEnumerable)(model.a))`
`55`	`55`	`Assert.IsTrue((bool)item);`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`