Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: jsr specifier does not support tags #390

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion src/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ use deno_semver::npm::NpmPackageReqReference;
use deno_semver::package::PackageNv;
use deno_semver::package::PackageNvReference;
use deno_semver::package::PackageReq;
use deno_semver::package::PackageReqReferenceParseError;
use deno_semver::RangeSetOrTag;
use deno_semver::Version;
use futures::future::LocalBoxFuture;
use futures::future::Shared;
Expand All @@ -62,6 +64,7 @@ use std::collections::HashSet;
use std::collections::VecDeque;
use std::fmt;
use std::sync::Arc;
use thiserror::Error;
use url::Url;

#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
Expand Down Expand Up @@ -3508,7 +3511,7 @@ impl<'a, 'graph> Builder<'a, 'graph> {
maybe_range: Option<Range>,
is_dynamic: bool,
) {
match JsrPackageReqReference::from_specifier(&specifier) {
match validate_jsr_specifier(&specifier) {
Ok(package_ref) => {
if let Some(range) = &maybe_range {
if let Some(nv) =
Expand Down Expand Up @@ -4120,6 +4123,25 @@ impl<'a, 'graph> Builder<'a, 'graph> {
}
}

#[derive(Error, Debug, Clone)]
pub enum JsrPackageFormatError {
#[error(transparent)]
JsrPackageParseError(PackageReqReferenceParseError),
#[error("Version tag not supported in jsr specifiers.")]
VersionTagNotSupported,
}

fn validate_jsr_specifier(
specifier: &Url,
) -> Result<JsrPackageReqReference, JsrPackageFormatError> {
let package_ref = JsrPackageReqReference::from_specifier(specifier)
.map_err(JsrPackageFormatError::JsrPackageParseError)?;
match package_ref.req().version_req.inner() {
RangeSetOrTag::Tag(_) => Err(JsrPackageFormatError::VersionTagNotSupported),
RangeSetOrTag::RangeSet(_) => Ok(package_ref),
}
}

fn normalize_export_name(sub_path: Option<&str>) -> Cow<str> {
let Some(sub_path) = sub_path else {
return Cow::Borrowed(".");
Expand Down Expand Up @@ -4483,6 +4505,28 @@ mod tests {
}));
}

#[test]
fn test_jsr_import_format() {
assert!(
validate_jsr_specifier(&Url::parse("jsr:@scope/mod@tag").unwrap())
.is_err(),
"jsr import specifier with tag should be an error"
);

assert!(
validate_jsr_specifier(&Url::parse("jsr:@scope/mod@").unwrap()).is_err()
);

assert!(validate_jsr_specifier(
&Url::parse("jsr:@scope/mod@1.2.3").unwrap()
)
.is_ok());

assert!(
validate_jsr_specifier(&Url::parse("jsr:@scope/mod").unwrap()).is_ok()
);
}

#[test]
fn test_module_dependency_includes() {
let specifier = ModuleSpecifier::parse("file:///a.ts").unwrap();
Expand Down
47 changes: 47 additions & 0 deletions tests/specs/graph/JsrSpecifiers_VersionTagNotSupported.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# https://jsr.io/@scope/a/meta.json
{
"versions": {
"1.0.0": {}
}
}

# mod.ts
import 'jsr:@scope/a@tag';

# output
{
"roots": [
"file:///mod.ts"
],
"modules": [
{
"kind": "esm",
"dependencies": [
{
"specifier": "jsr:@scope/a@tag",
"code": {
"specifier": "jsr:@scope/a@tag",
"span": {
"start": {
"line": 0,
"character": 7
},
"end": {
"line": 0,
"character": 25
}
}
}
}
],
"size": 27,
"mediaType": "TypeScript",
"specifier": "file:///mod.ts"
},
{
"specifier": "jsr:@scope/a@tag",
"error": "Version tag not supported in jsr specifiers."
}
],
"redirects": {}
}
Loading