mirror of
https://github.com/denoland/deno.git
synced 2024-12-27 09:39:08 -05:00
a1f0796fcc
This commit adds proper support for import assertions and JSON modules. Implementation of "core/modules.rs" was changed to account for multiple possible module types, instead of always assuming that the code is an "ES module". In effect "ModuleMap" now has knowledge about each modules' type (stored via "ModuleType" enum). Module loading pipeline now stores information about expected module type for each request and validates that expected type matches discovered module type based on file's "MediaType". Relevant tests were added to "core/modules.rs" and integration tests, additionally multiple WPT tests were enabled. There are still some rough edges in the implementation and not all WPT were enabled, due to: a) unclear BOM handling in source code by "FileFetcher" b) design limitation of Deno's "FileFetcher" that doesn't download the same module multiple times in a single run Co-authored-by: Kitson Kelly <me@kitsonkelly.com>
132 lines
3.9 KiB
Rust
132 lines
3.9 KiB
Rust
// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
|
|
mod async_cancel;
|
|
mod async_cell;
|
|
mod bindings;
|
|
pub mod error;
|
|
mod error_codes;
|
|
mod extensions;
|
|
mod flags;
|
|
mod gotham_state;
|
|
mod inspector;
|
|
mod module_specifier;
|
|
mod modules;
|
|
mod normalize_path;
|
|
mod ops;
|
|
mod ops_builtin;
|
|
mod ops_json;
|
|
mod ops_metrics;
|
|
mod resources;
|
|
mod runtime;
|
|
|
|
// Re-exports
|
|
pub use anyhow;
|
|
pub use futures;
|
|
pub use parking_lot;
|
|
pub use serde;
|
|
pub use serde_json;
|
|
pub use serde_v8;
|
|
pub use serde_v8::Buffer as ZeroCopyBuf;
|
|
pub use serde_v8::ByteString;
|
|
pub use serde_v8::StringOrBuffer;
|
|
pub use url;
|
|
pub use v8;
|
|
|
|
pub use crate::async_cancel::CancelFuture;
|
|
pub use crate::async_cancel::CancelHandle;
|
|
pub use crate::async_cancel::CancelTryFuture;
|
|
pub use crate::async_cancel::Cancelable;
|
|
pub use crate::async_cancel::Canceled;
|
|
pub use crate::async_cancel::TryCancelable;
|
|
pub use crate::async_cell::AsyncMut;
|
|
pub use crate::async_cell::AsyncMutFuture;
|
|
pub use crate::async_cell::AsyncRef;
|
|
pub use crate::async_cell::AsyncRefCell;
|
|
pub use crate::async_cell::AsyncRefFuture;
|
|
pub use crate::async_cell::RcLike;
|
|
pub use crate::async_cell::RcRef;
|
|
pub use crate::flags::v8_set_flags;
|
|
pub use crate::inspector::InspectorSessionProxy;
|
|
pub use crate::inspector::JsRuntimeInspector;
|
|
pub use crate::inspector::LocalInspectorSession;
|
|
pub use crate::module_specifier::resolve_import;
|
|
pub use crate::module_specifier::resolve_path;
|
|
pub use crate::module_specifier::resolve_url;
|
|
pub use crate::module_specifier::resolve_url_or_path;
|
|
pub use crate::module_specifier::ModuleResolutionError;
|
|
pub use crate::module_specifier::ModuleSpecifier;
|
|
pub use crate::module_specifier::DUMMY_SPECIFIER;
|
|
pub use crate::modules::FsModuleLoader;
|
|
pub use crate::modules::ModuleId;
|
|
pub use crate::modules::ModuleLoadId;
|
|
pub use crate::modules::ModuleLoader;
|
|
pub use crate::modules::ModuleSource;
|
|
pub use crate::modules::ModuleSourceFuture;
|
|
pub use crate::modules::ModuleType;
|
|
pub use crate::modules::NoopModuleLoader;
|
|
pub use crate::runtime::CompiledWasmModuleStore;
|
|
pub use crate::runtime::SharedArrayBufferStore;
|
|
// TODO(bartlomieju): this struct should be implementation
|
|
// detail nad not be public
|
|
pub use crate::modules::RecursiveModuleLoad;
|
|
pub use crate::normalize_path::normalize_path;
|
|
pub use crate::ops::serialize_op_result;
|
|
pub use crate::ops::Op;
|
|
pub use crate::ops::OpAsyncFuture;
|
|
pub use crate::ops::OpCall;
|
|
pub use crate::ops::OpFn;
|
|
pub use crate::ops::OpId;
|
|
pub use crate::ops::OpPayload;
|
|
pub use crate::ops::OpResult;
|
|
pub use crate::ops::OpState;
|
|
pub use crate::ops::OpTable;
|
|
pub use crate::ops::PromiseId;
|
|
pub use crate::ops_builtin::op_close;
|
|
pub use crate::ops_builtin::op_print;
|
|
pub use crate::ops_builtin::op_resources;
|
|
pub use crate::ops_json::op_async;
|
|
pub use crate::ops_json::op_sync;
|
|
pub use crate::ops_json::void_op_async;
|
|
pub use crate::ops_json::void_op_sync;
|
|
pub use crate::resources::AsyncResult;
|
|
pub use crate::resources::Resource;
|
|
pub use crate::resources::ResourceId;
|
|
pub use crate::resources::ResourceTable;
|
|
pub use crate::runtime::GetErrorClassFn;
|
|
pub use crate::runtime::JsErrorCreateFn;
|
|
pub use crate::runtime::JsRuntime;
|
|
pub use crate::runtime::RuntimeOptions;
|
|
pub use crate::runtime::Snapshot;
|
|
// pub use crate::runtime_modules::include_js_files!;
|
|
pub use crate::extensions::Extension;
|
|
pub use crate::extensions::OpMiddlewareFn;
|
|
pub use crate::extensions::OpPair;
|
|
|
|
pub fn v8_version() -> &'static str {
|
|
v8::V8::get_version()
|
|
}
|
|
|
|
/// A helper macro that will return a call site in Rust code. Should be
|
|
/// used when executing internal one-line scripts for JsRuntime lifecycle.
|
|
///
|
|
/// Returns a string in form of: "`[deno:<filename>:<line>:<column>]`"
|
|
#[macro_export]
|
|
macro_rules! located_script_name {
|
|
() => {
|
|
format!(
|
|
"[deno:{}:{}:{}]",
|
|
std::file!(),
|
|
std::line!(),
|
|
std::column!()
|
|
);
|
|
};
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_v8_version() {
|
|
assert!(v8_version().len() > 3);
|
|
}
|
|
}
|