Skip to content

Commit

Permalink
feat(cli/tools/test): imply media type from doc attribute (denoland#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
caspervonb committed Jul 26, 2021
1 parent dfba7a2 commit 2e69d21
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 10 deletions.
13 changes: 9 additions & 4 deletions cli/tests/test/doc.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Check [WILDCARD]/doc.ts$2-7
Check [WILDCARD]/doc.ts$2-5.ts
Check [WILDCARD]/doc.ts$6-9.js
Check [WILDCARD]/doc.ts$10-13.jsx
Check [WILDCARD]/doc.ts$14-17.ts
Check [WILDCARD]/doc.ts$18-21.tsx
Check [WILDCARD]/doc.ts$30-35.ts
error: TS2367 [ERROR]: This condition will always return 'false' since the types 'string' and 'number' have no overlap.
console.assert(example() == 42);
~~~~~~~~~~~~~~~
at [WILDCARD]/doc.ts$2-7.ts:3:16
console.assert(check() == 42);
~~~~~~~~~~~~~
at [WILDCARD]/doc.ts$30-35.ts:3:16
36 changes: 32 additions & 4 deletions cli/tests/test/doc.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,38 @@
/**
* ```
* import { example } from "./doc.ts";
* import * as doc from "./doc.ts";
* ```
*
* ```js
* import * as doc from "./doc.ts";
* ```
*
* ```jsx
* import * as doc from "./doc.ts";
* ```
*
* ```ts
* import * as doc from "./doc.ts";
* ```
*
* ```tsx
* import * as doc from "./doc.ts";
* ```
*
* ```text
* import * as doc from "./doc.ts";
* ```
*
* @module doc
*/

/**
* ```
* import { check } from "./doc.ts";
*
* console.assert(example() == 42);
* console.assert(check() == 42);
* ```
*/
export function example(): string {
return "example";
export function check(): string {
return "check";
}
23 changes: 21 additions & 2 deletions cli/tools/test_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,24 @@ pub async fn run_tests(
}

for block in blocks_regex.captures_iter(&comment.text) {
let maybe_attributes = block.get(1).map(|m| m.as_str().split(' '));
let media_type = if let Some(mut attributes) = maybe_attributes {
match attributes.next() {
Some("js") => MediaType::JavaScript,
Some("jsx") => MediaType::Jsx,
Some("ts") => MediaType::TypeScript,
Some("tsx") => MediaType::Tsx,
Some("") => file.media_type,
_ => MediaType::Unknown,
}
} else {
file.media_type
};

if media_type == MediaType::Unknown {
continue;
}

let body = block.get(2).unwrap();
let text = body.as_str();

Expand All @@ -425,16 +443,17 @@ pub async fn run_tests(
let location = parsed_module.get_location(&span);

let specifier = deno_core::resolve_url_or_path(&format!(
"{}${}-{}",
"{}${}-{}{}",
location.filename,
location.line,
location.line + element.as_str().split('\n').count(),
media_type.as_ts_extension(),
))?;

let file = File {
local: specifier.to_file_path().unwrap(),
maybe_types: None,
media_type: MediaType::TypeScript, // media_type.clone(),
media_type,
source: source.clone(),
specifier: specifier.clone(),
};
Expand Down

0 comments on commit 2e69d21

Please sign in to comment.