Support named imports/exports for subset of properties in JSON modules (#3210)

This commit is contained in:
Kevin (Kun) "Kassimo" Qian 2019-10-26 18:04:34 -07:00 committed by Ry Dahl
parent c5fe657dd3
commit 6869bfa4c6
6 changed files with 58 additions and 4 deletions

View file

@ -3,8 +3,13 @@ use crate::compilers::CompiledModule;
use crate::compilers::CompiledModuleFuture;
use crate::file_fetcher::SourceFile;
use crate::state::ThreadSafeState;
use deno::ErrBox;
use regex::Regex;
use std::str;
// From https://github.com/mathiasbynens/mothereff.in/blob/master/js-variables/eff.js
static JS_RESERVED_WORDS: &str = r"^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|await|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$";
pub struct JsonCompiler {}
impl JsonCompiler {
@ -13,11 +18,37 @@ impl JsonCompiler {
_state: ThreadSafeState,
source_file: &SourceFile,
) -> Box<CompiledModuleFuture> {
let maybe_json_value: serde_json::Result<serde_json::Value> =
serde_json::from_str(&str::from_utf8(&source_file.source_code).unwrap());
if let Err(err) = maybe_json_value {
return Box::new(futures::future::err(ErrBox::from(err)));
}
let mut code = format!(
"export default {};\n",
str::from_utf8(&source_file.source_code).unwrap()
);
if let serde_json::Value::Object(m) = maybe_json_value.unwrap() {
// Best effort variable name exports
// Actual all allowed JS variable names are way tricker.
// We only handle a subset of alphanumeric names.
let js_var_regex = Regex::new(r"^[a-zA-Z_$][0-9a-zA-Z_$]*$").unwrap();
// Also avoid collision with reserved words.
let reserved_words = Regex::new(JS_RESERVED_WORDS).unwrap();
for (key, value) in m.iter() {
if js_var_regex.is_match(&key) && !reserved_words.is_match(&key) {
code.push_str(&format!(
"export const {} = {};\n",
key,
value.to_string()
));
}
}
}
let module = CompiledModule {
code: format!(
"export default {};",
str::from_utf8(&source_file.source_code).unwrap()
),
code,
name: source_file.url.to_string(),
};

View file

@ -0,0 +1,7 @@
import j1, { $var } from "./subdir/json_1.json";
import j2 from "./subdir/json_2.json";
console.log($var);
console.log($var.a);
console.log(j1);
console.log(j1["with space"]);
console.log(j2);

View file

@ -0,0 +1,5 @@
{ a: 123, b: [ 1, 2, 3 ], c: null }
123
{ $var: { a: 123, b: [ 1, 2, 3 ], c: null }, with space: "invalid variable name", function: "reserved word" }
invalid variable name
just a string

View file

@ -343,6 +343,11 @@ itest!(_049_info_flag_script_jsx {
http_server: true,
});
itest!(_050_more_jsons {
args: "run --reload 050_more_jsons.ts",
output: "050_more_jsons.ts.out",
});
itest!(async_error {
exit_code: 1,
args: "run --reload async_error.ts",

View file

@ -0,0 +1,5 @@
{
"$var": { "a": 123, "b": [1, 2, 3], "c": null },
"with space": "invalid variable name",
"function": "reserved word"
}

View file

@ -0,0 +1 @@
"just a string"