@tsed/cli-core 6.4.4 → 6.6.0

package/lib/esm/services/NpmRegistryClient.js

@@ -2,9 +2,9 @@ var NpmRegistryClient_1;
 import { __decorate } from "tslib";
 import url from "node:url";
 import { inject, Injectable } from "@tsed/di";
+import registry_auth_token from "registry-auth-token";
 import registry_url from "registry-url";
 import { CliHttpClient } from "./CliHttpClient.js";
-const HOST = registry_url();
 const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/;
 const REGEX_REGISTRY_PREFIX = /^(https?:)?\/\//i;
 export function addSuffix(pattern, suffix) {
@@ -17,18 +17,22 @@ export const SCOPE_SEPARATOR = "%2f";
 let NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
     constructor() {
         this.httpClient = inject(CliHttpClient);
+        this.host = registry_url();
     }
     static escapeName(name) {
         // scoped packages contain slashes and the npm registry expects them to be escaped
         return name.replace("/", SCOPE_SEPARATOR);
     }
     async request(pathname, opts = {}) {
-        const registry = opts.registry || HOST;
+        const registry = opts.registry || this.host;
         const requestUrl = this.getRequestUrl(registry, pathname);
         const headers = {
             Accept: opts.unfiltered ? "application/json" : "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*",
             ...opts.headers
         };
+        if (!headers.Authorization) {
+            this.addAuthorization(registry, headers);
+        }
         try {
             return await this.httpClient.get(requestUrl, {
                 ...opts,
@@ -108,6 +112,12 @@ let NpmRegistryClient = NpmRegistryClient_1 = class NpmRegistryClient {
             }
         };
     }
+    addAuthorization(registry, headers) {
+        const authInfo = registry_auth_token(registry, { recursive: true });
+        if (authInfo) {
+            headers.Authorization = `${authInfo.type} ${authInfo.token}`;
+        }
+    }
 };
 NpmRegistryClient = NpmRegistryClient_1 = __decorate([
     Injectable()

package/lib/esm/services/ProjectPackageJson.js

@@ -243,7 +243,12 @@ let ProjectPackageJson = class ProjectPackageJson {
         const name = constant("name");
         const pkgPath = join(String(cwd), "package.json");
         const fileExists = this.fs.exists(pkgPath);
-        if (!disableReadUpPkg && !fileExists) {
+        if (fileExists) {
+            const pkg = this.fs.readJsonSync(pkgPath, { encoding: "utf8" });
+            configuration().set("project.root", pkgPath);
+            return { ...this.getEmptyPackageJson(name), ...pkg };
+        }
+        if (!disableReadUpPkg) {
             const result = readPackageUpSync({
                 cwd
             });
@@ -254,11 +259,6 @@ let ProjectPackageJson = class ProjectPackageJson {
                 return { ...this.getEmptyPackageJson(name), ...pkg };
             }
         }
-        if (disableReadUpPkg && fileExists) {
-            const pkg = this.fs.readJsonSync(pkgPath, { encoding: "utf8" });
-            configuration().set("project.root", pkgPath);
-            return { ...this.getEmptyPackageJson(name), ...pkg };
-        }
         return this.getEmptyPackageJson(name);
     }
     getEmptyPackageJson(name) {

package/lib/types/services/NpmRegistryClient.d.ts

@@ -3,6 +3,7 @@ export declare function addSuffix(pattern: string, suffix: string): string;
 export declare const SCOPE_SEPARATOR = "%2f";
 export declare class NpmRegistryClient {
     private httpClient;
+    private host;
     static escapeName(name: string): string;
     request(pathname: string, opts?: any): Promise<any>;
     getRequestUrl(registry: string, pathname: string): string;
@@ -20,4 +21,5 @@ export declare class NpmRegistryClient {
     }): Promise<any>;
     info(packageName: string, retry?: number): Promise<PackageInfo>;
     private fallback;
+    private addAuthorization;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "6.4.4",
+  "version": "6.6.0",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -50,6 +50,7 @@
     "js-yaml": "^4.1.0",
     "listr2": "^8.2.4",
     "read-pkg-up": "^11.0.0",
+    "registry-auth-token": "^5.1.0",
     "registry-url": "^6.0.1",
     "rxjs": "^7.8.1",
     "semver": "^7.6.3",
@@ -61,7 +62,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.4.4",
+    "@tsed/typescript": "6.6.0",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",
@@ -75,7 +76,7 @@
     "cross-env": "7.0.3",
     "deps": "^1.0.0",
     "typescript": "5.6.2",
-    "vitest": "3.0.9"
+    "vitest": "3.2.4"
   },
   "peerDependencies": {
     "@tsed/core": ">=8.3.1",