Merge pull request #1707 from paulvanbrenk/scopedPackages

Scoped packages

Author: paulvanbrenk

Nodejs/Product/Nodejs/NodejsConstants.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.IO;
@@ -25,6 +25,7 @@ internal static class NodejsConstants
         internal const string ProjectFileFilter = "Node.js Project File (*.njsproj)\n*.njsproj\nAll Files (*.*)\n*.*\n";
 
         internal const string NodeModulesFolder = "node_modules";
+        internal const string NodeModulesFolderWithSeparators = "\\" + NodeModulesFolder + "\\";
         internal const string NodeModulesStagingFolder = "node_modules\\.staging\\";
         internal const string BowerComponentsFolder = "bower_components";
 

Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Concurrent;
@@ -106,11 +106,23 @@ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterTe
 
             TelemetryHelper.LogSearchNpm();
 
-            var relativeUri = string.Format("/-/v1/search?text=\"{0}\"", WebUtility.UrlEncode(filterText));
-            var searchUri = new Uri(defaultRegistryUri, relativeUri);
+            if (filterText.Length == 1)
+            {
+                return await QueryNpmForSingleCharAsync(filterText);
+            }
+            else
+            {
+                return await QueryNpmAsync(filterText);
+            }
+        }
 
-            var request = WebRequest.Create(searchUri);
-            using (var response = await request.GetResponseAsync())
+        private async Task<IEnumerable<IPackage>> QueryNpmAsync(string filterText)
+        {
+            Debug.Assert(filterText.Length > 1, $"Use {nameof(QueryNpmForSingleCharAsync)} for single character queries.");
+
+            var relativeUri = $"/-/v1/search?text={WebUtility.UrlEncode(filterText)}";
+
+            using (var response = await QueryNpmRegistryAsync(relativeUri))
             {
                 /* We expect the following response:
                  {
@@ -160,7 +172,7 @@ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterTe
                     }
                 */
 
-                var reader = new StreamReader(response.GetResponseStream());
+                using (var reader = new StreamReader(response.GetResponseStream()))
                 using (var jsonReader = new JsonTextReader(reader))
                 {
                     while (jsonReader.Read())
@@ -183,6 +195,76 @@ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterTe
             throw new InvalidOperationException("Unexpected json token.");
         }
 
+        private async Task<IEnumerable<IPackage>> QueryNpmForSingleCharAsync(string filterText)
+        {
+            Debug.Assert(filterText.Length == 1, $"Use {nameof(QueryNpmAsync)} for general queries when the search query has more than 1 character.");
+
+            // Special case since the search API won't return results for 
+            // single chararacter queries.
+            var relativeUri = $"/{WebUtility.UrlEncode(filterText)}/latest";
+
+            using (var response = await QueryNpmRegistryAsync(relativeUri))
+            {
+                /* We expect the following response
+                  {
+                    "name": "express",
+                    "scope": "unscoped",
+                    "version": "4.15.2",
+                    "description": "Fast, unopinionated, minimalist web framework",
+                    "keywords": [ "express", "framework", "sinatra", "web", "rest", "restful", "router", "app", "api" ],
+                    "date": "2017-03-06T13:42:44.853Z",
+                    "links": {
+                      "npm": "https://www.npmjs.com/package/express",
+                      "homepage": "http://expressjs.com/",
+                      "repository": "https://github.com/expressjs/express",
+                      "bugs": "https://github.com/expressjs/express/issues"
+                    },
+                    "author": {
+                      "name": "TJ Holowaychuk",
+                      "email": "[email protected]"
+                    },
+                    "publisher": {
+                      "username": "dougwilson",
+                      "email": "[email protected]"
+                    },
+                    "maintainers": [
+                      {
+                        "username": "dougwilson",
+                        "email": "[email protected]"
+                      }
+                    ]
+                  }*/
+                using (var reader = new StreamReader(response.GetResponseStream()))
+                using (var jsonReader = new JsonTextReader(reader))
+                {
+                    while (jsonReader.Read())
+                    {
+                        if (jsonReader.TokenType == JsonToken.StartObject)
+                        {
+                            var token = JToken.ReadFrom(jsonReader);
+                            var package = ReadPackage(token, new NodeModuleBuilder());
+                            if (package != null)
+                            {
+                                return new[] { package };
+                            }
+                        }
+
+                        throw new InvalidOperationException($"Unexpected json token. '{jsonReader.TokenType}'");
+                    }
+                }
+            }
+
+            throw new InvalidOperationException("Unexpected json token.");
+        }
+
+        private static Task<WebResponse> QueryNpmRegistryAsync(string relativeUri)
+        {
+            var searchUri = new Uri(defaultRegistryUri, relativeUri);
+
+            var request = WebRequest.Create(searchUri);
+            return request.GetResponseAsync();
+        }
+
         private IEnumerable<IPackage> ReadPackagesFromArray(JsonTextReader jsonReader)
         {
             var pkgList = new List<IPackage>();

Nodejs/Product/Npm/SPI/RootPackage.cs

@@ -1,6 +1,8 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -47,6 +49,23 @@ public RootPackage(
             {
                 // otherwise we fail to create it completely...
             }
+
+            if (this.PackageJson != null)
+            {
+                this.Name = this.PackageJson.Name;
+            }
+            else
+            {
+                // this is the root package so the full folder name after node_nodules is the name
+                // of the package
+                var index = this.Path.IndexOf(NodejsConstants.NodeModulesFolderWithSeparators, StringComparison.OrdinalIgnoreCase);
+
+                Debug.Assert(index > -1, "Failed to find the node_modules folder.");
+
+                var name = this.Path.Substring(index + NodejsConstants.NodeModulesFolderWithSeparators.Length);
+
+                this.Name = name;
+            }
         }
 
         public IPackageJson PackageJson { get; }
@@ -55,13 +74,13 @@ public RootPackage(
 
         public string Path { get; }
 
+        public string Name { get; }
+
         public IEnumerable<string> Homepages => this.PackageJson?.Homepages ?? Enumerable.Empty<string>();
 
         public bool HasPackageJson => this.PackageJson != null;
 
-        public string Name => this.PackageJson?.Name ?? new DirectoryInfo(this.Path).Name;
-
-        public SemverVersion Version => this.PackageJson?.Version ?? new SemverVersion();
+        public SemverVersion Version => this.PackageJson?.Version ?? SemverVersion.UnknownVersion;
 
         public IPerson Author => this.PackageJson?.Author;