summaryrefslogtreecommitdiff
path: root/tools/ts_library_builder/test.ts
diff options
context:
space:
mode:
authorandy finch <andyfinch7@gmail.com>2019-04-01 15:09:59 -0400
committerRyan Dahl <ry@tinyclouds.org>2019-04-01 15:09:59 -0400
commitb0a23beb8fae964be3cdd8c23c38af66257d34c7 (patch)
tree8f7875c8ca059dfb0a3ade4da7bfb94e57d6e1aa /tools/ts_library_builder/test.ts
parent659acadf77fdbeef8579a37839a464feb408437a (diff)
Add web worker JS API (#1993)
* Refactored the way worker polling is scheduled and errors are handled. * Share the worker future as a Shared
Diffstat (limited to 'tools/ts_library_builder/test.ts')
-rw-r--r--tools/ts_library_builder/test.ts17
1 files changed, 12 insertions, 5 deletions
diff --git a/tools/ts_library_builder/test.ts b/tools/ts_library_builder/test.ts
index 5aeb8d611..2b6abe714 100644
--- a/tools/ts_library_builder/test.ts
+++ b/tools/ts_library_builder/test.ts
@@ -5,7 +5,7 @@
import * as assert from "assert";
import { Project, ts } from "ts-morph";
-import { flatten, mergeGlobal } from "./build_library";
+import { flatten, mergeGlobals, prepareFileForMerge } from "./build_library";
import { inlineFiles, loadDtsFiles } from "./ast_util";
const { ModuleKind, ModuleResolutionKind, ScriptTarget } = ts;
@@ -146,15 +146,22 @@ function buildLibraryMerge(): void {
outputSourceFile: targetSourceFile
} = setupFixtures();
- mergeGlobal({
+ const prepareForMergeOpts = {
+ globalVarName: "foobarbaz",
+ interfaceName: "FooBar",
+ targetSourceFile
+ };
+
+ const prepareReturn = prepareFileForMerge(prepareForMergeOpts);
+
+ mergeGlobals({
basePath,
declarationProject,
debug,
- globalVarName: "foobarbaz",
filePath: `${buildPath}/globals.ts`,
inputProject,
- interfaceName: "FooBar",
- targetSourceFile
+ ...prepareForMergeOpts,
+ prepareReturn
});
assert(targetSourceFile.getNamespace("moduleC") != null);