feat: support org scoped npmrc

johnnyreilly · Dec 10, 2024 · b6e9cca · b6e9cca
1 parent a88fad9
commit b6e9cca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/projectNpmrcParse.test.ts b/src/projectNpmrcParse.test.ts
@@ -14,6 +14,22 @@ describe("projectNpmrcParse", () => {
 	it("outputs the expected structure on successful parse", async () => {
 		mockReadFile.mockResolvedValue(`registry=https://pkgs.dev.azure.com/johnnyreilly/_packaging/npmrc-script-organization/npm/registry/ 
                         
+always-auth=true`);
+		const result = await projectNpmrcParse({
+			npmrcPath: "/home/john/code/github/azdo-npm-auth/.npmrc",
+		});
+		expect(result).toEqual({
+			organization: "johnnyreilly",
+			urlWithoutRegistryAtEnd:
+				"//pkgs.dev.azure.com/johnnyreilly/_packaging/npmrc-script-organization/npm/",
+			urlWithoutRegistryAtStart:
+				"//pkgs.dev.azure.com/johnnyreilly/_packaging/npmrc-script-organization/npm/registry/",
+		});
+	});
+
+	it("outputs the expected structure on successful parse with org scope", async () => {
+		mockReadFile.mockResolvedValue(`@myorg:registry=https://pkgs.dev.azure.com/johnnyreilly/_packaging/npmrc-script-organization/npm/registry/ 
+                        
 always-auth=true`);
 		const result = await projectNpmrcParse({
 			npmrcPath: "/home/john/code/github/azdo-npm-auth/.npmrc",

diff --git a/src/projectNpmrcParse.ts b/src/projectNpmrcParse.ts
@@ -22,14 +22,14 @@ export async function projectNpmrcParse({
 		throw new Error(`No .npmrc found at: ${npmrcPath}`);
 	}
 
-	const regex = /^registry=.*$/gm;
-	const match = npmrcContents.match(regex);
+	const regex = /^(?:@[\w-]+:)?registry=(.*)$/m;
+	const match = regex.exec(npmrcContents);
 
 	if (!match || match.length === 0) {
 		throw new Error(`Unable to extract information from project .npmrc`);
 	}
 
-	const registry = match[0].replace("registry=", "").trim();
+	const registry = match[1].trim();
 
 	return makeFromRegistry({ registry, logger });
 }