fixes EvilBeaver#1540 Предупреждение о неявных импортах

Author: EvilBeaver

src/OneScript.Core/Compilation/Binding/IPackageSymbol.cs

@@ -0,0 +1,17 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+namespace OneScript.Compilation.Binding
+{
+    /// <summary>
+    /// Символ, который импортирован из внешнего пакета
+    /// </summary>
+    public interface IPackageSymbol
+    {
+        PackageInfo GetPackageInfo();
+    }
+}

src/OneScript.Core/Compilation/ICompileTimeDependencyResolver.cs

@@ -5,6 +5,8 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
+#nullable enable
+
 using OneScript.Execution;
 using OneScript.Sources;
 
@@ -18,6 +20,7 @@ public interface ICompileTimeDependencyResolver
         /// <param name="module">Модуль в котором объявлен импорт</param>
         /// <param name="libraryName">имя библиотеки</param>
         /// <param name="process"></param>
-        void Resolve(SourceCode module, string libraryName, IBslProcess process);
+        /// <returns>Информация о загруженном пакете или null</returns>
+        PackageInfo? Resolve(SourceCode module, string libraryName, IBslProcess process);
     }
-}
+}

src/OneScript.Core/Compilation/PackageInfo.cs

@@ -0,0 +1,31 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+namespace OneScript.Compilation
+{
+    /// <summary>
+    /// Информация о внешнем пакете (библиотеке).
+    /// </summary>
+    public sealed class PackageInfo
+    {
+        public PackageInfo(string id, string shortName)
+        {
+            Id = id;
+            ShortName = shortName;
+        }
+        
+        /// <summary>
+        /// Уникальный идентификатор пакета (обычно путь к каталогу)
+        /// </summary>
+        public string Id { get; }
+        
+        /// <summary>
+        /// Короткое имя для отображения в сообщениях
+        /// </summary>
+        public string ShortName { get; }
+    }
+}

src/OneScript.Core/Contexts/IRuntimeEnvironment.cs

@@ -6,6 +6,7 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using System.Collections.Generic;
+using OneScript.Compilation;
 using OneScript.Compilation.Binding;
 using ScriptEngine.Machine;
 
@@ -40,6 +41,14 @@ public interface IRuntimeEnvironment
         /// <param name="readOnly">Флаг доступности свойства только для чтения</param>
         void InjectGlobalProperty(IValue value, string identifier, bool readOnly);
 
+        /// <summary>
+        /// Инжект глобального свойства
+        /// </summary>
+        /// <param name="value">Значение свойства</param>
+        /// <param name="identifier">Идентификатор</param>
+        /// <param name="ownerPackage">Пакет, предоставивший это свойство</param>
+        void InjectGlobalProperty(IValue value, string identifier, PackageInfo ownerPackage);
+
         /// <summary>
         /// Инжект глобального свойства с помощью описания свойства.
         /// </summary>
@@ -71,4 +80,4 @@ public interface IRuntimeEnvironment
         /// </summary>
         IReadOnlyList<IAttachableContext> AttachedContexts { get; }
     }
-}
+}

src/OneScript.Core/Sources/FileCodeSource.cs

@@ -9,6 +9,7 @@ This Source Code Form is subject to the terms of the
 using System.Text;
 using OneScript.Commons;
 using System;
+using OneScript.Language.Sources;
 
 namespace OneScript.Sources
 {

src/OneScript.Core/Sources/StringCodeSource.cs

@@ -5,6 +5,8 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
+using OneScript.Language.Sources;
+
 namespace OneScript.Sources
 {
     public class StringCodeSource : ICodeSource

src/OneScript.Language/Sources/ICodeSource.cs

@@ -5,7 +5,7 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
-namespace OneScript.Sources
+namespace OneScript.Language.Sources
 {
     public interface ICodeSource
     {

src/OneScript.Language/Sources/SourceCode.cs

@@ -6,6 +6,7 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using OneScript.Language.LexicalAnalysis;
+using OneScript.Language.Sources;
 
 // ReSharper disable once CheckNamespace
 namespace OneScript.Sources
@@ -17,10 +18,11 @@ public class SourceCode : ISourceCodeIndexer
 
         private string _code = null;
 
-        internal SourceCode(string sourceName, ICodeSource source)
+        internal SourceCode(string sourceName, ICodeSource source, string ownerPackageId = null)
         {
             _source = source;
             Name = sourceName;
+            OwnerPackageId = ownerPackageId;
         }
 
         public SourceCodeIterator CreateIterator()
@@ -34,6 +36,11 @@ public SourceCodeIterator CreateIterator()
         public string Location => _source.Location;
 
         public string Name { get; }
+        
+        /// <summary>
+        /// Идентификатор пакета-владельца. null если модуль не принадлежит библиотеке.
+        /// </summary>
+        public string OwnerPackageId { get; }
 
         public string GetSourceCode()
         {
@@ -49,4 +56,4 @@ public string GetCodeLine(int lineNumber)
 
         public override string ToString() => Name ?? Location;
     }
-}
+}

src/OneScript.Language/Sources/SourceCodeBuilder.cs

@@ -6,6 +6,7 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using System;
+using OneScript.Language.Sources;
 
 // ReSharper disable once CheckNamespace
 namespace OneScript.Sources
@@ -14,6 +15,7 @@ public class SourceCodeBuilder
     {
         private ICodeSource _source;
         private string _moduleName;
+        private string _ownerPackageId;
 
         private SourceCodeBuilder()
         {
@@ -30,6 +32,15 @@ public SourceCodeBuilder WithName(string name)
             _moduleName = name;
             return this;
         }
+        
+        /// <summary>
+        /// Устанавливает идентификатор пакета-владельца для исходного кода.
+        /// </summary>
+        public SourceCodeBuilder WithOwnerPackage(string packageId)
+        {
+            _ownerPackageId = packageId;
+            return this;
+        }
 
         public SourceCode Build()
         {
@@ -39,9 +50,9 @@ public SourceCode Build()
             if (_moduleName == default)
                 _moduleName = _source.Location;
 
-            return new SourceCode(_moduleName, _source);
+            return new SourceCode(_moduleName, _source, _ownerPackageId);
         }
 
         public static SourceCodeBuilder Create() => new SourceCodeBuilder();
     }
-}
+}

src/ScriptEngine.HostedScript/FileSystemDependencyResolver.cs

@@ -33,6 +33,7 @@ private class Library
             public string id;
             public ProcessingState state;
             public LibraryLoader customLoader;
+            public PackageInfo loadingResult;
         }
 
         private enum ProcessingState
@@ -77,39 +78,38 @@ public void Initialize(ScriptingEngine engine)
             Engine = engine;
         }
 
-        public void Resolve(SourceCode module, string libraryName, IBslProcess process)
+        public PackageInfo Resolve(SourceCode module, string libraryName, IBslProcess process)
         {
             bool quoted = PrepareQuoted(ref libraryName);
-            bool loaded;
-            if (quoted)
-                loaded = LoadByRelativePath(module, libraryName, process);
-            else
-                loaded = LoadByName(libraryName, process);
 
-            if(!loaded)
-                throw new CompilerException(String.Format("Библиотека не найдена: '{0}'", libraryName));
+            var lib = quoted ?
+                LoadByRelativePath(module, libraryName, process) :
+                LoadByName(libraryName, process);
+
+            if (lib == null)
+                throw new CompilerException($"Библиотека не найдена: '{libraryName}'");
+
+            return lib;
         }
 
-        private bool LoadByName(string libraryName, IBslProcess process)
+        private PackageInfo LoadByName(string libraryName, IBslProcess process)
         {
             foreach (var path in SearchDirectories)
             {
                 if(!Directory.Exists(path))
                     continue;
 
                 var libraryPath = Path.Combine(path, libraryName);
-                if (LoadByPath(libraryPath, process))
-                    return true;
+                var loadAttempt = LoadByPath(libraryPath, process); 
+                if (loadAttempt != null)
+                    return loadAttempt;
             }
 
             var rootPath = Path.Combine(LibraryRoot, libraryName);
-            if (LoadByPath(rootPath, process))
-                return true;
-
-            return false;
+            return LoadByPath(rootPath, process);
         }
 
-        private bool LoadByRelativePath(SourceCode module, string libraryPath, IBslProcess process)
+        private PackageInfo LoadByRelativePath(SourceCode module, string libraryPath, IBslProcess process)
         {
             string realPath;
 
@@ -197,17 +197,14 @@ private bool PrepareQuoted(ref string value)
             return quoted;
         }
 
-        private bool LoadByPath(string libraryPath, IBslProcess process)
+        private PackageInfo LoadByPath(string libraryPath, IBslProcess process)
         {
-            if (Directory.Exists(libraryPath))
-            {
-                return LoadLibraryInternal(libraryPath, process);
-            }
-
-            return false;
+            return Directory.Exists(libraryPath) ? 
+                LoadLibraryInternal(libraryPath, process) :
+                null;
         }
 
-        private bool LoadLibraryInternal(string libraryPath, IBslProcess process)
+        private PackageInfo LoadLibraryInternal(string libraryPath, IBslProcess process)
         {
             var id = GetLibraryId(libraryPath);
             var existedLib = _libs.FirstOrDefault(x => x.id == id);
@@ -222,41 +219,42 @@ private bool LoadLibraryInternal(string libraryPath, IBslProcess process)
                             $"Error loading library {id}. Circular dependencies found.\n") + libStack);
                 }
 
-                return true;
+                return existedLib.loadingResult;
             }
 
             var newLib = new Library() { id = id, state = ProcessingState.Discovered };
-            bool hasFiles;
             int newLibIndex = _libs.Count;
 
             var customLoaderFile = Path.Combine(libraryPath, PREDEFINED_LOADER_FILE);
             if (File.Exists(customLoaderFile))
                 newLib.customLoader = LibraryLoader.Create(Engine, customLoaderFile, process);
 
+            PackageInfo package;
             try
             {
                 _libs.Add(newLib);
-                hasFiles = ProcessLibrary(newLib, process);
+                package = ProcessLibrary(newLib, process);
                 newLib.state = ProcessingState.Processed;
+                newLib.loadingResult = package;
             }
             catch (Exception)
             {
                 _libs.RemoveAt(newLibIndex);
                 throw;
             }
 
-            return hasFiles;
+            return package;
         }
 
-        private bool ProcessLibrary(Library lib, IBslProcess process)
+        private PackageInfo ProcessLibrary(Library lib, IBslProcess process)
         {
             LibraryLoader loader;
             if (lib.customLoader != null)
                 loader = lib.customLoader;
             else
                 loader = GetDefaultLoader(process);
 
-            return loader.ProcessLibrary(lib.id, process) != default;
+            return loader.ProcessLibrary(lib.id, process);
         }
 
         private static string ListToStringStack(IEnumerable<Library> libs, string stopToken)
@@ -285,4 +283,4 @@ private static bool PathHasInvalidChars(string path)
             return (!string.IsNullOrEmpty(path) && path.IndexOfAny(Path.GetInvalidPathChars()) >= 0);
         }
     }
-}
+}