mirror of
https://github.com/denoland/deno.git
synced 2025-01-03 12:58:54 -05:00
Split out compiler snapshot (#1566)
Speeds up startup time, reduces runtime heap size.
This commit is contained in:
parent
f7c0f49443
commit
ee9c627cc5
14 changed files with 198 additions and 254 deletions
38
BUILD.gn
38
BUILD.gn
|
@ -117,6 +117,7 @@ ts_sources = [
|
|||
group("deno_deps") {
|
||||
deps = [
|
||||
":msg_rs",
|
||||
":snapshot_compiler",
|
||||
":snapshot_deno",
|
||||
"libdeno:libdeno_static_lib",
|
||||
]
|
||||
|
@ -195,28 +196,21 @@ run_node("deno_runtime_declaration") {
|
|||
}
|
||||
}
|
||||
|
||||
run_node("bundle") {
|
||||
bundle("main_bundle") {
|
||||
out_dir = "$target_gen_dir/bundle/"
|
||||
outputs = [
|
||||
out_dir + "main.js",
|
||||
out_dir + "main.js.map",
|
||||
]
|
||||
depfile = out_dir + "main.d"
|
||||
out_name = "main"
|
||||
deps = [
|
||||
":deno_runtime_declaration",
|
||||
":msg_ts",
|
||||
]
|
||||
args = [
|
||||
rebase_path("third_party/node_modules/rollup/bin/rollup", root_build_dir),
|
||||
"-c",
|
||||
rebase_path("rollup.config.js", root_build_dir),
|
||||
"-i",
|
||||
rebase_path("js/main.ts", root_build_dir),
|
||||
"-o",
|
||||
rebase_path(out_dir + "main.js", root_build_dir),
|
||||
"--sourcemapFile",
|
||||
rebase_path("."),
|
||||
"--silent",
|
||||
}
|
||||
|
||||
bundle("compiler_bundle") {
|
||||
out_dir = "$target_gen_dir/bundle/"
|
||||
out_name = "compiler"
|
||||
deps = [
|
||||
":deno_runtime_declaration",
|
||||
":msg_ts",
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -236,6 +230,14 @@ rust_flatbuffer("msg_rs") {
|
|||
snapshot("snapshot_deno") {
|
||||
source_root = "$target_gen_dir/bundle/main.js"
|
||||
deps = [
|
||||
":bundle",
|
||||
":main_bundle",
|
||||
]
|
||||
}
|
||||
|
||||
# Generates $target_gen_dir/snapshot_compiler.bin
|
||||
snapshot("snapshot_compiler") {
|
||||
source_root = "$target_gen_dir/bundle/compiler.js"
|
||||
deps = [
|
||||
":compiler_bundle",
|
||||
]
|
||||
}
|
||||
|
|
114
js/compiler.ts
114
js/compiler.ts
|
@ -1,19 +1,28 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
import * as ts from "typescript";
|
||||
import { MediaType } from "gen/msg_generated";
|
||||
import * as msg from "gen/msg_generated";
|
||||
import { assetSourceCode } from "./assets";
|
||||
import { Console } from "./console";
|
||||
import { globalEval } from "./global_eval";
|
||||
import { libdeno } from "./libdeno";
|
||||
import * as os from "./os";
|
||||
import { clearTimer, setTimeout } from "./timers";
|
||||
import { TextDecoder, TextEncoder } from "./text_encoding";
|
||||
import { postMessage, workerClose, workerMain } from "./workers";
|
||||
import { assert, log, notImplemented } from "./util";
|
||||
|
||||
const EOL = "\n";
|
||||
const ASSETS = "$asset$";
|
||||
const LIB_RUNTIME = "lib.deno_runtime.d.ts";
|
||||
|
||||
const window = globalEval("this");
|
||||
const console = new Console(libdeno.print);
|
||||
|
||||
/** The location that a module is being loaded from. This could be a directory,
|
||||
* like `.`, or it could be a module specifier like
|
||||
* `http://gist.github.com/somefile.ts`
|
||||
*/
|
||||
export type ContainingFile = string;
|
||||
type ContainingFile = string;
|
||||
/** The internal local filename of a compiled module. It will often be something
|
||||
* like `/home/ry/.deno/gen/f7b4605dfbc4d3bb356e98fda6ceb1481e4a8df5.js`
|
||||
*/
|
||||
|
@ -25,7 +34,7 @@ type ModuleId = string;
|
|||
/** The external name of a module - could be a URL or could be a relative path.
|
||||
* Examples `http://gist.github.com/somefile.ts` or `./somefile.ts`
|
||||
*/
|
||||
export type ModuleSpecifier = string;
|
||||
type ModuleSpecifier = string;
|
||||
/** The compiled source code which is cached in `.deno/gen/` */
|
||||
type OutputCode = string;
|
||||
/** The original source code */
|
||||
|
@ -33,10 +42,16 @@ type SourceCode = string;
|
|||
/** The output source map */
|
||||
type SourceMap = string;
|
||||
|
||||
/** The format of the work message payload coming from the privilaged side */
|
||||
interface CompilerLookup {
|
||||
specifier: ModuleSpecifier;
|
||||
referrer: ContainingFile;
|
||||
}
|
||||
|
||||
/** Abstraction of the APIs required from the `os` module so they can be
|
||||
* easily mocked.
|
||||
*/
|
||||
export interface Os {
|
||||
interface Os {
|
||||
codeCache: typeof os.codeCache;
|
||||
codeFetch: typeof os.codeFetch;
|
||||
exit: typeof os.exit;
|
||||
|
@ -45,7 +60,7 @@ export interface Os {
|
|||
/** Abstraction of the APIs required from the `typescript` module so they can
|
||||
* be easily mocked.
|
||||
*/
|
||||
export interface Ts {
|
||||
interface Ts {
|
||||
createLanguageService: typeof ts.createLanguageService;
|
||||
/* tslint:disable-next-line:max-line-length */
|
||||
formatDiagnosticsWithColorAndContext: typeof ts.formatDiagnosticsWithColorAndContext;
|
||||
|
@ -56,13 +71,13 @@ export interface Ts {
|
|||
* Named `ModuleMetaData` to clarify it is just a representation of meta data of
|
||||
* the module, not the actual module instance.
|
||||
*/
|
||||
export class ModuleMetaData implements ts.IScriptSnapshot {
|
||||
class ModuleMetaData implements ts.IScriptSnapshot {
|
||||
public scriptVersion = "";
|
||||
|
||||
constructor(
|
||||
public readonly moduleId: ModuleId,
|
||||
public readonly fileName: ModuleFileName,
|
||||
public readonly mediaType: MediaType,
|
||||
public readonly mediaType: msg.MediaType,
|
||||
public readonly sourceCode: SourceCode = "",
|
||||
public outputCode: OutputCode = "",
|
||||
public sourceMap: SourceMap = ""
|
||||
|
@ -88,23 +103,23 @@ export class ModuleMetaData implements ts.IScriptSnapshot {
|
|||
|
||||
function getExtension(
|
||||
fileName: ModuleFileName,
|
||||
mediaType: MediaType
|
||||
mediaType: msg.MediaType
|
||||
): ts.Extension | undefined {
|
||||
switch (mediaType) {
|
||||
case MediaType.JavaScript:
|
||||
case msg.MediaType.JavaScript:
|
||||
return ts.Extension.Js;
|
||||
case MediaType.TypeScript:
|
||||
case msg.MediaType.TypeScript:
|
||||
return fileName.endsWith(".d.ts") ? ts.Extension.Dts : ts.Extension.Ts;
|
||||
case MediaType.Json:
|
||||
case msg.MediaType.Json:
|
||||
return ts.Extension.Json;
|
||||
case MediaType.Unknown:
|
||||
case msg.MediaType.Unknown:
|
||||
default:
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
/** Generate output code for a provided JSON string along with its source. */
|
||||
export function jsonEsmTemplate(
|
||||
function jsonEsmTemplate(
|
||||
jsonString: string,
|
||||
sourceFileName: string
|
||||
): OutputCode {
|
||||
|
@ -116,8 +131,7 @@ export function jsonEsmTemplate(
|
|||
* with Deno specific APIs to provide an interface for compiling and running
|
||||
* TypeScript and JavaScript modules.
|
||||
*/
|
||||
export class Compiler
|
||||
implements ts.LanguageServiceHost, ts.FormatDiagnosticsHost {
|
||||
class Compiler implements ts.LanguageServiceHost, ts.FormatDiagnosticsHost {
|
||||
// Modules are usually referenced by their ModuleSpecifier and ContainingFile,
|
||||
// and keeping a map of the resolved module file name allows more efficient
|
||||
// future resolution
|
||||
|
@ -212,10 +226,7 @@ export class Compiler
|
|||
innerMap.set(moduleSpecifier, fileName);
|
||||
}
|
||||
|
||||
private constructor() {
|
||||
if (Compiler._instance) {
|
||||
throw new TypeError("Attempt to create an additional compiler.");
|
||||
}
|
||||
constructor() {
|
||||
this._service = this._ts.createLanguageService(this);
|
||||
}
|
||||
|
||||
|
@ -238,12 +249,13 @@ export class Compiler
|
|||
console.warn("Compiling", moduleId);
|
||||
// Instead of using TypeScript to transpile JSON modules, we will just do
|
||||
// it directly.
|
||||
if (mediaType === MediaType.Json) {
|
||||
if (mediaType === msg.MediaType.Json) {
|
||||
moduleMetaData.outputCode = jsonEsmTemplate(sourceCode, fileName);
|
||||
} else {
|
||||
const service = this._service;
|
||||
assert(
|
||||
mediaType === MediaType.TypeScript || mediaType === MediaType.JavaScript
|
||||
mediaType === msg.MediaType.TypeScript ||
|
||||
mediaType === msg.MediaType.JavaScript
|
||||
);
|
||||
const output = service.getEmitOutput(fileName);
|
||||
|
||||
|
@ -319,7 +331,7 @@ export class Compiler
|
|||
return this._moduleMetaDataMap.get(fileName)!;
|
||||
}
|
||||
let moduleId: ModuleId | undefined;
|
||||
let mediaType = MediaType.Unknown;
|
||||
let mediaType = msg.MediaType.Unknown;
|
||||
let sourceCode: SourceCode | undefined;
|
||||
let outputCode: OutputCode | undefined;
|
||||
let sourceMap: SourceMap | undefined;
|
||||
|
@ -333,7 +345,7 @@ export class Compiler
|
|||
moduleId = moduleSpecifier.split("/").pop()!;
|
||||
const assetName = moduleId.includes(".") ? moduleId : `${moduleId}.d.ts`;
|
||||
assert(assetName in assetSourceCode, `No such asset "${assetName}"`);
|
||||
mediaType = MediaType.TypeScript;
|
||||
mediaType = msg.MediaType.TypeScript;
|
||||
sourceCode = assetSourceCode[assetName];
|
||||
fileName = `${ASSETS}/${assetName}`;
|
||||
outputCode = "";
|
||||
|
@ -353,7 +365,7 @@ export class Compiler
|
|||
assert(moduleId != null, "No module ID.");
|
||||
assert(fileName != null, "No file name.");
|
||||
assert(
|
||||
mediaType !== MediaType.Unknown,
|
||||
mediaType !== msg.MediaType.Unknown,
|
||||
`Unknown media type for: "${moduleSpecifier}" from "${containingFile}".`
|
||||
);
|
||||
this._log(
|
||||
|
@ -362,7 +374,7 @@ export class Compiler
|
|||
);
|
||||
this._log("resolveModule has outputCode:", outputCode != null);
|
||||
this._log("resolveModule has source map:", sourceMap != null);
|
||||
this._log("resolveModule has media type:", MediaType[mediaType]);
|
||||
this._log("resolveModule has media type:", msg.MediaType[mediaType]);
|
||||
// fileName is asserted above, but TypeScript does not track so not null
|
||||
this._setFileName(moduleSpecifier, containingFile, fileName!);
|
||||
if (fileName && this._moduleMetaDataMap.has(fileName)) {
|
||||
|
@ -408,11 +420,11 @@ export class Compiler
|
|||
const moduleMetaData = this._getModuleMetaData(fileName);
|
||||
if (moduleMetaData) {
|
||||
switch (moduleMetaData.mediaType) {
|
||||
case MediaType.TypeScript:
|
||||
case msg.MediaType.TypeScript:
|
||||
return ts.ScriptKind.TS;
|
||||
case MediaType.JavaScript:
|
||||
case msg.MediaType.JavaScript:
|
||||
return ts.ScriptKind.JS;
|
||||
case MediaType.Json:
|
||||
case msg.MediaType.Json:
|
||||
return ts.ScriptKind.JSON;
|
||||
default:
|
||||
return this._options.allowJs ? ts.ScriptKind.JS : ts.ScriptKind.TS;
|
||||
|
@ -495,11 +507,43 @@ export class Compiler
|
|||
};
|
||||
});
|
||||
}
|
||||
|
||||
private static _instance: Compiler | undefined;
|
||||
|
||||
/** Returns the instance of `Compiler` or creates a new instance. */
|
||||
static instance(): Compiler {
|
||||
return Compiler._instance || (Compiler._instance = new Compiler());
|
||||
}
|
||||
}
|
||||
|
||||
const compiler = new Compiler();
|
||||
|
||||
let startResMsg: msg.StartRes;
|
||||
|
||||
// set global objects for compiler web worker
|
||||
window.clearTimeout = clearTimer;
|
||||
window.console = console;
|
||||
window.postMessage = postMessage;
|
||||
window.setTimeout = setTimeout;
|
||||
window.workerMain = workerMain;
|
||||
window.close = workerClose;
|
||||
window.TextDecoder = TextDecoder;
|
||||
window.TextEncoder = TextEncoder;
|
||||
|
||||
// provide the "main" function that will be called by the privilaged side when
|
||||
// lazy instantiating the compiler web worker
|
||||
window.compilerMain = function compilerMain() {
|
||||
// workerMain should have already been called since a compiler is a worker.
|
||||
const encoder = new TextEncoder();
|
||||
const decoder = new TextDecoder();
|
||||
compiler.recompile = startResMsg.recompileFlag();
|
||||
log(`recompile ${compiler.recompile}`);
|
||||
window.onmessage = ({ data }: { data: Uint8Array }) => {
|
||||
const json = decoder.decode(data);
|
||||
const lookup = JSON.parse(json) as CompilerLookup;
|
||||
|
||||
const moduleMetaData = compiler.compile(lookup.specifier, lookup.referrer);
|
||||
|
||||
const responseJson = JSON.stringify(moduleMetaData);
|
||||
const response = encoder.encode(responseJson);
|
||||
postMessage(response);
|
||||
};
|
||||
};
|
||||
|
||||
/* tslint:disable-next-line:no-default-export */
|
||||
export default function denoMain() {
|
||||
startResMsg = os.start();
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
|
||||
// Public deno module.
|
||||
/// <amd-module name="deno"/>
|
||||
export { pid, env, exit } from "./os";
|
||||
export { chdir, cwd } from "./dir";
|
||||
export {
|
||||
|
@ -61,8 +60,3 @@ export { Console, stringifyArgs } from "./console";
|
|||
export { DomIterableMixin } from "./mixins/dom_iterable";
|
||||
// TODO Don't expose deferred.
|
||||
export { deferred } from "./util";
|
||||
|
||||
// Provide the compiler API in an obfuscated way
|
||||
import * as compiler from "./compiler";
|
||||
// @internal
|
||||
export const _compiler = compiler;
|
||||
|
|
|
@ -94,6 +94,3 @@ window.TextDecoder = textEncoding.TextDecoder;
|
|||
export type TextDecoder = textEncoding.TextDecoder;
|
||||
|
||||
window.workerMain = workers.workerMain;
|
||||
// TODO These shouldn't be available in main isolate.
|
||||
window.postMessage = workers.postMessage;
|
||||
window.close = workers.workerClose;
|
||||
|
|
83
js/main.ts
83
js/main.ts
|
@ -1,90 +1,41 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
import { window } from "./globals";
|
||||
// tslint:disable-next-line:no-reference
|
||||
/// <reference path="./plugins.d.ts" />
|
||||
|
||||
import * as flatbuffers from "./flatbuffers";
|
||||
import * as msg from "gen/msg_generated";
|
||||
import { assert, log, setLogDebug } from "./util";
|
||||
import "./globals";
|
||||
|
||||
import { log } from "./util";
|
||||
import * as os from "./os";
|
||||
import { Compiler } from "./compiler";
|
||||
import { libdeno } from "./libdeno";
|
||||
import { args } from "./deno";
|
||||
import { sendSync, handleAsyncMsgFromRust } from "./dispatch";
|
||||
import { replLoop } from "./repl";
|
||||
import { version } from "typescript";
|
||||
import { postMessage } from "./workers";
|
||||
import { TextDecoder, TextEncoder } from "./text_encoding";
|
||||
import { ModuleSpecifier, ContainingFile } from "./compiler";
|
||||
|
||||
// builtin modules
|
||||
import * as deno from "./deno";
|
||||
|
||||
type CompilerLookup = { specifier: ModuleSpecifier; referrer: ContainingFile };
|
||||
|
||||
// Global reference to StartRes so it can be shared between compilerMain and
|
||||
// denoMain.
|
||||
let startResMsg: msg.StartRes;
|
||||
|
||||
function sendStart(): void {
|
||||
const builder = flatbuffers.createBuilder();
|
||||
msg.Start.startStart(builder);
|
||||
const startOffset = msg.Start.endStart(builder);
|
||||
const baseRes = sendSync(builder, msg.Any.Start, startOffset);
|
||||
assert(baseRes != null);
|
||||
assert(msg.Any.StartRes === baseRes!.innerType());
|
||||
startResMsg = new msg.StartRes();
|
||||
assert(baseRes!.inner(startResMsg) != null);
|
||||
}
|
||||
|
||||
function compilerMain() {
|
||||
// workerMain should have already been called since a compiler is a worker.
|
||||
const compiler = Compiler.instance();
|
||||
const encoder = new TextEncoder();
|
||||
const decoder = new TextDecoder();
|
||||
compiler.recompile = startResMsg.recompileFlag();
|
||||
log(`recompile ${compiler.recompile}`);
|
||||
window.onmessage = ({ data }: { data: Uint8Array }) => {
|
||||
const json = decoder.decode(data);
|
||||
const lookup = JSON.parse(json) as CompilerLookup;
|
||||
|
||||
const moduleMetaData = compiler.compile(lookup.specifier, lookup.referrer);
|
||||
|
||||
const responseJson = JSON.stringify(moduleMetaData);
|
||||
const response = encoder.encode(responseJson);
|
||||
postMessage(response);
|
||||
};
|
||||
}
|
||||
window["compilerMain"] = compilerMain;
|
||||
// TODO(kitsonk) remove with `--types` below
|
||||
import libDts from "gen/lib/lib.deno_runtime.d.ts!string";
|
||||
|
||||
/* tslint:disable-next-line:no-default-export */
|
||||
export default function denoMain() {
|
||||
libdeno.recv(handleAsyncMsgFromRust);
|
||||
const startResMsg = os.start();
|
||||
|
||||
libdeno.builtinModules["deno"] = deno;
|
||||
// libdeno.builtinModules["typescript"] = typescript;
|
||||
Object.freeze(libdeno.builtinModules);
|
||||
|
||||
// First we send an empty "Start" message to let the privileged side know we
|
||||
// are ready. The response should be a "StartRes" message containing the CLI
|
||||
// args and other info.
|
||||
sendStart();
|
||||
|
||||
setLogDebug(startResMsg.debugFlag());
|
||||
|
||||
// handle `--types`
|
||||
// TODO(kitsonk) move to Rust fetching from compiler
|
||||
if (startResMsg.typesFlag()) {
|
||||
const compiler = Compiler.instance();
|
||||
const defaultLibFileName = compiler.getDefaultLibFileName();
|
||||
const defaultLibModule = compiler.resolveModule(defaultLibFileName, "");
|
||||
console.log(defaultLibModule.sourceCode);
|
||||
os.exit(0);
|
||||
}
|
||||
|
||||
// handle `--version`
|
||||
if (startResMsg.versionFlag()) {
|
||||
console.log("deno:", startResMsg.denoVersion());
|
||||
console.log("v8:", startResMsg.v8Version());
|
||||
console.log("typescript:", version);
|
||||
// TODO figure out a way to restore functionality
|
||||
// console.log("typescript:", version);
|
||||
os.exit(0);
|
||||
}
|
||||
|
||||
// handle `--types`
|
||||
// TODO(kitsonk) move to Rust fetching from compiler
|
||||
if (startResMsg.typesFlag()) {
|
||||
console.log(libDts);
|
||||
os.exit(0);
|
||||
}
|
||||
|
||||
|
|
34
js/os.ts
34
js/os.ts
|
@ -1,9 +1,10 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
import * as msg from "gen/msg_generated";
|
||||
import { handleAsyncMsgFromRust, sendSync } from "./dispatch";
|
||||
import * as flatbuffers from "./flatbuffers";
|
||||
import { libdeno } from "./libdeno";
|
||||
import { assert } from "./util";
|
||||
import * as util from "./util";
|
||||
import * as flatbuffers from "./flatbuffers";
|
||||
import { sendSync } from "./dispatch";
|
||||
|
||||
/** process id */
|
||||
export let pid: number;
|
||||
|
@ -142,3 +143,32 @@ export function env(): { [index: string]: string } {
|
|||
// TypeScript cannot track assertion above, therefore not null assertion
|
||||
return createEnv(res);
|
||||
}
|
||||
|
||||
/** Send to the privileged side that we have setup and are ready. */
|
||||
function sendStart(): msg.StartRes {
|
||||
const builder = flatbuffers.createBuilder();
|
||||
msg.Start.startStart(builder);
|
||||
const startOffset = msg.Start.endStart(builder);
|
||||
const baseRes = sendSync(builder, msg.Any.Start, startOffset);
|
||||
assert(baseRes != null);
|
||||
assert(msg.Any.StartRes === baseRes!.innerType());
|
||||
const startResMsg = new msg.StartRes();
|
||||
assert(baseRes!.inner(startResMsg) != null);
|
||||
return startResMsg;
|
||||
}
|
||||
|
||||
// This function bootstraps an environment within Deno, it is shared both by
|
||||
// the runtime and the compiler environments.
|
||||
// @internal
|
||||
export function start(): msg.StartRes {
|
||||
libdeno.recv(handleAsyncMsgFromRust);
|
||||
|
||||
// First we send an empty `Start` message to let the privileged side know we
|
||||
// are ready. The response should be a `StartRes` message containing the CLI
|
||||
// args and other info.
|
||||
const startResMsg = sendStart();
|
||||
|
||||
util.setLogDebug(startResMsg.debugFlag());
|
||||
|
||||
return startResMsg;
|
||||
}
|
||||
|
|
122
js/types.ts
122
js/types.ts
|
@ -1,124 +1,2 @@
|
|||
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
export type TypedArray = Uint8Array | Float32Array | Int32Array;
|
||||
|
||||
// tslint:disable:max-line-length
|
||||
// Following definitions adapted from:
|
||||
// https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/index.d.ts
|
||||
// Type definitions for Node.js 10.3.x
|
||||
// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
|
||||
// DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
|
||||
// Parambir Singh <https://github.com/parambirs>
|
||||
// Christian Vaagland Tellnes <https://github.com/tellnes>
|
||||
// Wilco Bakker <https://github.com/WilcoBakker>
|
||||
// Nicolas Voigt <https://github.com/octo-sniffle>
|
||||
// Chigozirim C. <https://github.com/smac89>
|
||||
// Flarna <https://github.com/Flarna>
|
||||
// Mariusz Wiktorczyk <https://github.com/mwiktorczyk>
|
||||
// wwwy3y3 <https://github.com/wwwy3y3>
|
||||
// Deividas Bakanas <https://github.com/DeividasBakanas>
|
||||
// Kelvin Jin <https://github.com/kjin>
|
||||
// Alvis HT Tang <https://github.com/alvis>
|
||||
// Sebastian Silbermann <https://github.com/eps1lon>
|
||||
// Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
|
||||
// Alberto Schiabel <https://github.com/jkomyno>
|
||||
// Klaus Meinhardt <https://github.com/ajafff>
|
||||
// Huw <https://github.com/hoo29>
|
||||
// Nicolas Even <https://github.com/n-e>
|
||||
// Bruno Scheufler <https://github.com/brunoscheufler>
|
||||
// Mohsen Azimi <https://github.com/mohsen1>
|
||||
// Hoàng Văn Khải <https://github.com/KSXGitHub>
|
||||
// Alexander T. <https://github.com/a-tarasyuk>
|
||||
// Lishude <https://github.com/islishude>
|
||||
// Andrew Makarov <https://github.com/r3nya>
|
||||
// tslint:enable:max-line-length
|
||||
|
||||
export interface CallSite {
|
||||
/** Value of `this` */
|
||||
// tslint:disable-next-line:no-any
|
||||
getThis(): any;
|
||||
|
||||
/** Type of `this` as a string.
|
||||
*
|
||||
* This is the name of the function stored in the constructor field of
|
||||
* `this`, if available. Otherwise the object's `[[Class]]` internal
|
||||
* property.
|
||||
*/
|
||||
getTypeName(): string | null;
|
||||
|
||||
/** Current function. */
|
||||
getFunction(): Function | undefined;
|
||||
|
||||
/** Name of the current function, typically its name property.
|
||||
*
|
||||
* If a name property is not available an attempt will be made to try
|
||||
* to infer a name from the function's context.
|
||||
*/
|
||||
getFunctionName(): string | null;
|
||||
|
||||
/** Name of the property (of `this` or one of its prototypes) that holds
|
||||
* the current function.
|
||||
*/
|
||||
getMethodName(): string | null;
|
||||
|
||||
/** Name of the script (if this function was defined in a script). */
|
||||
getFileName(): string | null;
|
||||
|
||||
/** Get the script name or source URL for the source map. */
|
||||
getScriptNameOrSourceURL(): string;
|
||||
|
||||
/** Current line number (if this function was defined in a script). */
|
||||
getLineNumber(): number | null;
|
||||
|
||||
/** Current column number (if this function was defined in a script). */
|
||||
getColumnNumber(): number | null;
|
||||
|
||||
/** A call site object representing the location where eval was called (if
|
||||
* this function was created using a call to `eval`)
|
||||
*/
|
||||
getEvalOrigin(): string | undefined;
|
||||
|
||||
/** Is this a top level invocation, that is, is `this` the global object? */
|
||||
isToplevel(): boolean;
|
||||
|
||||
/** Does this call take place in code defined by a call to `eval`? */
|
||||
isEval(): boolean;
|
||||
|
||||
/** Is this call in native V8 code? */
|
||||
isNative(): boolean;
|
||||
|
||||
/** Is this a constructor call? */
|
||||
isConstructor(): boolean;
|
||||
}
|
||||
|
||||
export interface StartOfSourceMap {
|
||||
file?: string;
|
||||
sourceRoot?: string;
|
||||
}
|
||||
|
||||
export interface RawSourceMap extends StartOfSourceMap {
|
||||
version: string;
|
||||
sources: string[];
|
||||
names: string[];
|
||||
sourcesContent?: string[];
|
||||
mappings: string;
|
||||
}
|
||||
|
||||
declare global {
|
||||
// Declare "static" methods in Error
|
||||
interface ErrorConstructor {
|
||||
/** Create `.stack` property on a target object */
|
||||
captureStackTrace(targetObject: object, constructorOpt?: Function): void;
|
||||
|
||||
// tslint:disable:max-line-length
|
||||
/**
|
||||
* Optional override for formatting stack traces
|
||||
*
|
||||
* @see https://github.com/v8/v8/wiki/Stack%20Trace%20API#customizing-stack-traces
|
||||
*/
|
||||
// tslint:enable:max-line-length
|
||||
// tslint:disable-next-line:no-any
|
||||
prepareStackTrace?: (err: Error, stackTraces: CallSite[]) => any;
|
||||
|
||||
stackTraceLimit: number;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
import "./blob_test.ts";
|
||||
import "./buffer_test.ts";
|
||||
import "./chmod_test.ts";
|
||||
import "./compiler_test.ts";
|
||||
// TODO find a way to test the compiler with split snapshots
|
||||
// import "./compiler_test.ts";
|
||||
import "./console_test.ts";
|
||||
import "./copy_file_test.ts";
|
||||
import "./custom_event_test.ts";
|
||||
|
|
|
@ -1,6 +1,31 @@
|
|||
# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
||||
import("//build/compiled_action.gni")
|
||||
|
||||
# Tempalte to generate a Rollup bundle of code.
|
||||
template("bundle") {
|
||||
action(target_name) {
|
||||
forward_variables_from(invoker, "*")
|
||||
script = "//tools/run_node.py"
|
||||
outputs = [
|
||||
out_dir + out_name + ".js",
|
||||
out_dir + out_name + ".js.map",
|
||||
]
|
||||
depfile = out_dir + out_name + ".d"
|
||||
args = [
|
||||
rebase_path("third_party/node_modules/rollup/bin/rollup", root_build_dir),
|
||||
"-c",
|
||||
rebase_path("rollup.config.js", root_build_dir),
|
||||
"-i",
|
||||
rebase_path("js/" + out_name + ".ts", root_build_dir),
|
||||
"-o",
|
||||
rebase_path(out_dir + out_name + ".js", root_build_dir),
|
||||
"--sourcemapFile",
|
||||
rebase_path("."),
|
||||
"--silent",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
template("run_node") {
|
||||
action(target_name) {
|
||||
forward_variables_from(invoker, "*")
|
||||
|
|
|
@ -355,6 +355,14 @@ fn parse_map_string(
|
|||
include_str!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/main.js.map"));
|
||||
SourceMap::from_json(s)
|
||||
}
|
||||
#[cfg(not(feature = "check-only"))]
|
||||
"gen/bundle/compiler.js" => {
|
||||
let s = include_str!(concat!(
|
||||
env!("GN_OUT_DIR"),
|
||||
"/gen/bundle/compiler.js.map"
|
||||
));
|
||||
SourceMap::from_json(s)
|
||||
}
|
||||
_ => match getter.get_source_map(script_name) {
|
||||
None => None,
|
||||
Some(raw_source_map) => SourceMap::from_json(&raw_source_map),
|
||||
|
|
|
@ -12,3 +12,15 @@ pub fn deno_snapshot() -> deno_buf {
|
|||
|
||||
unsafe { deno_buf::from_raw_parts(data.as_ptr(), data.len()) }
|
||||
}
|
||||
|
||||
pub fn compiler_snapshot() -> deno_buf {
|
||||
#[cfg(not(feature = "check-only"))]
|
||||
let data =
|
||||
include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/snapshot_compiler.bin"));
|
||||
// The snapshot blob is not available when the Rust Language Server runs
|
||||
// 'cargo check'.
|
||||
#[cfg(feature = "check-only")]
|
||||
let data = vec![];
|
||||
|
||||
unsafe { deno_buf::from_raw_parts(data.as_ptr(), data.len()) }
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ impl Worker {
|
|||
Some(internal_channels),
|
||||
));
|
||||
|
||||
let snapshot = snapshot::deno_snapshot();
|
||||
let snapshot = snapshot::compiler_snapshot();
|
||||
let isolate = Isolate::new(snapshot, state, ops::dispatch);
|
||||
|
||||
let worker = Worker { isolate };
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Compiling [WILDCARD]tests/error_004_missing_module.ts
|
||||
[WILDCARD]
|
||||
NotFound: Cannot resolve module "bad-module.ts" from "[WILDCARD]/tests/error_004_missing_module.ts"
|
||||
at DenoError ([WILDCARD]/js/errors.ts:[WILDCARD])
|
||||
at maybeError ([WILDCARD]/js/errors.ts:[WILDCARD])
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Compiling [WILDCARD]tests/error_006_import_ext_failure.ts
|
||||
[WILDCARD]
|
||||
NotFound: Cannot resolve module "./non-existent" from "[WILDCARD]/tests/error_006_import_ext_failure.ts"
|
||||
at DenoError ([WILDCARD]/js/errors.ts:[WILDCARD])
|
||||
at maybeError ([WILDCARD]/js/errors.ts:[WILDCARD])
|
||||
|
|
Loading…
Reference in a new issue