Allow repository shorthand with nested path

bluwy · Oct 24, 2024 · 4525806 · 4525806
1 parent 13ab98c
commit 4525806
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 1 deletion.
diff --git a/pkg/src/utils.js b/pkg/src/utils.js
@@ -91,7 +91,7 @@ export function isDeprecatedGitHubGitUrl(url) {
 
 // Reference: https://docs.npmjs.com/cli/v10/configuring-npm/package-json#repository
 const SHORTHAND_REPOSITORY_URL_RE =
-  /^(?:(?:github|bitbucket|gitlab):[\w\-]+\/[\w\-]+|gist:\w+|[\w\-]+\/[\w\-]+)$/
+  /^(?:(?:github|bitbucket|gitlab):[\w\-]+\/[\w\-/]+|gist:\w+|[\w\-]+\/[\w\-]+)$/
 /**
  * @param {string} url
  */

diff --git a/pkg/tests/fixtures/invalid-repository-value-object-deprecated/package.json b/pkg/tests/fixtures/invalid-repository-value-object-deprecated/package.json
@@ -1,6 +1,7 @@
 {
     "name": "publint-invalid-repository-value-object-deprecatec",
     "version": "0.0.1",
+    "private": true,
     "type": "commonjs",
     "repository": {
       "type": "git",

diff --git a/pkg/tests/fixtures/invalid-repository-value-object-not-git-url/package.json b/pkg/tests/fixtures/invalid-repository-value-object-not-git-url/package.json
@@ -1,6 +1,7 @@
 {
     "name": "publint-invalid-repository-value-object-not-git-url",
     "version": "0.0.1",
+    "private": true,
     "type": "commonjs",
     "repository": {
       "type": "git",

diff --git a/pkg/tests/fixtures/invalid-repository-value-object-shorthand-site/package.json b/pkg/tests/fixtures/invalid-repository-value-object-shorthand-site/package.json
@@ -1,6 +1,7 @@
 {
     "name": "publint-invalid-repository-value-object-shorthand-site",
     "version": "0.0.1",
+    "private": true,
     "type": "commonjs",
     "repository": {
       "type": "git",

diff --git a/pkg/tests/fixtures/invalid-repository-value-shorthand-nested/package.json b/pkg/tests/fixtures/invalid-repository-value-shorthand-nested/package.json
@@ -0,0 +1,7 @@
+{
+    "name": "publint-invalid-repository-value-shorthand-nested",
+    "version": "0.0.1",
+    "private": true,
+    "type": "commonjs",
+    "repository": "gitlab:org/user/repo"
+  }
diff --git a/pkg/tests/fixtures/invalid-repository-value-shorthand/package.json b/pkg/tests/fixtures/invalid-repository-value-shorthand/package.json
@@ -1,6 +1,7 @@
 {
     "name": "publint-invalid-repository-value-shorthand",
     "version": "0.0.1",
+    "private": true,
     "type": "commonjs",
     "repository": "npm/npm"
   }
diff --git a/pkg/tests/fixtures/invalid-repository-value-string-not-url/package.json b/pkg/tests/fixtures/invalid-repository-value-string-not-url/package.json
@@ -1,6 +1,7 @@
 {
     "name": "publint-invalid-repository-value-string-not-url",
     "version": "0.0.1",
+    "private": true,
     "type": "commonjs",
     "repository": "not_an_url"
   }
diff --git a/pkg/tests/playground.js b/pkg/tests/playground.js
@@ -5,6 +5,8 @@ import { equal } from 'uvu/assert'
 import { publint } from '../lib/node.js'
 import { formatMessage } from '../lib/utils-node.js'
 
+// TODO: migrate these to fs-fixture
+
 testFixture('exports-browser-conflict', [
   'EXPORTS_VALUE_CONFLICTS_WITH_BROWSER',
   'USE_EXPORTS_OR_IMPORTS_BROWSER'
@@ -154,6 +156,8 @@ testFixture('invalid-repository-value-string-not-url', [
 
 testFixture('invalid-repository-value-shorthand', [])
 
+testFixture('invalid-repository-value-shorthand-nested', [])
+
 testFixture('invalid-repository-value-object-not-git-url', [
   {
     code: 'INVALID_REPOSITORY_VALUE',