Skip to content

Improve transform module setup #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 8, 2019
Merged

Improve transform module setup #985

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f28dee
improve transform setup
MaxGraey Dec 2, 2019
967e1b5
Merge branch 'master' into improve-transform
MaxGraey Dec 5, 2019
2857135
refactor
MaxGraey Dec 5, 2019
d4f711b
Merge branch 'master' into improve-transform
MaxGraey Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions cli/asc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,13 @@ exports.main = function main(argv, options, callback) {
// Set up transforms
const transforms = [];
if (args.transform) {
let tsNodeRegistered = false;
let transformArgs = args.transform;
for (let i = 0, k = transformArgs.length; i < k; ++i) {
let filename = transformArgs[i].trim();
if (/\.ts$/.test(filename)) {
if (!tsNodeRegistered && filename.endsWith('.ts')) {
require("ts-node").register({ transpileOnly: true, skipProject: true, compilerOptions: { target: "ES2016" } });
tsNodeRegistered = true;
}
try {
const classOrModule = require(require.resolve(filename, { paths: [baseDir, process.cwd()] }));
Expand Down Expand Up @@ -370,8 +372,11 @@ exports.main = function main(argv, options, callback) {
var sourceText = null; // text reported back to the compiler
var sourcePath = null; // path reported back to the compiler

const libraryPrefix = exports.libraryPrefix;
const libraryFiles = exports.libraryFiles;

// Try file.ts, file/index.ts, file.d.ts
if (!internalPath.startsWith(exports.libraryPrefix)) {
if (!internalPath.startsWith(libraryPrefix)) {
if ((sourceText = readFile(sourcePath = internalPath + ".ts", baseDir)) == null) {
if ((sourceText = readFile(sourcePath = internalPath + "/index.ts", baseDir)) == null) {
// portable d.ts: uses the .js file next to it in JS or becomes an import in Wasm
Expand All @@ -381,22 +386,22 @@ exports.main = function main(argv, options, callback) {

// Search library in this order: stdlib, custom lib dirs, paths
} else {
const plainName = internalPath.substring(exports.libraryPrefix.length);
const plainName = internalPath.substring(libraryPrefix.length);
const indexName = plainName + "/index";
if (exports.libraryFiles.hasOwnProperty(plainName)) {
sourceText = exports.libraryFiles[plainName];
sourcePath = exports.libraryPrefix + plainName + ".ts";
} else if (exports.libraryFiles.hasOwnProperty(indexName)) {
sourceText = exports.libraryFiles[indexName];
sourcePath = exports.libraryPrefix + indexName + ".ts";
if (libraryFiles.hasOwnProperty(plainName)) {
sourceText = libraryFiles[plainName];
sourcePath = libraryPrefix + plainName + ".ts";
} else if (libraryFiles.hasOwnProperty(indexName)) {
sourceText = libraryFiles[indexName];
sourcePath = libraryPrefix + indexName + ".ts";
} else { // custom lib dirs
for (const libDir of customLibDirs) {
if ((sourceText = readFile(plainName + ".ts", libDir)) != null) {
sourcePath = exports.libraryPrefix + plainName + ".ts";
sourcePath = libraryPrefix + plainName + ".ts";
break;
} else {
if ((sourceText = readFile(indexName + ".ts", libDir)) != null) {
sourcePath = exports.libraryPrefix + indexName + ".ts";
sourcePath = libraryPrefix + indexName + ".ts";
break;
}
}
Expand All @@ -412,7 +417,7 @@ exports.main = function main(argv, options, callback) {
const absBasePath = path.isAbsolute(basePath) ? basePath : path.join(baseDir, basePath);
const paths = [];
for (let parts = absBasePath.split(SEP), i = parts.length, k = SEP == "/" ? 0 : 1; i >= k; --i) {
if (parts[i - 1] != "node_modules") paths.push(parts.slice(0, i).join(SEP) + SEP + "node_modules");
if (parts[i - 1] !== "node_modules") paths.push(parts.slice(0, i).join(SEP) + SEP + "node_modules");
}
for (const currentPath of paths.concat(...args.path).map(p => path.relative(baseDir, p))) {
if (args.traceResolution) stderr.write(" in " + path.join(currentPath, packageName) + EOL);
Expand All @@ -435,14 +440,14 @@ exports.main = function main(argv, options, callback) {
const mainDir = path.join(currentPath, packageName, mainPath);
const plainName = filePath;
if ((sourceText = readFile(path.join(mainDir, plainName + ".ts"), baseDir)) != null) {
sourcePath = exports.libraryPrefix + packageName + "/" + plainName + ".ts";
sourcePath = libraryPrefix + packageName + "/" + plainName + ".ts";
packageBases.set(sourcePath.replace(/\.ts$/, ""), path.join(currentPath, packageName));
if (args.traceResolution) stderr.write(" -> " + path.join(mainDir, plainName + ".ts") + EOL);
break;
} else if (!isPackageRoot) {
const indexName = filePath + "/index";
if ((sourceText = readFile(path.join(mainDir, indexName + ".ts"), baseDir)) !== null) {
sourcePath = exports.libraryPrefix + packageName + "/" + indexName + ".ts";
sourcePath = libraryPrefix + packageName + "/" + indexName + ".ts";
packageBases.set(sourcePath.replace(/\.ts$/, ""), path.join(currentPath, packageName));
if (args.traceResolution) stderr.write(" -> " + path.join(mainDir, indexName + ".ts") + EOL);
break;
Expand All @@ -453,10 +458,8 @@ exports.main = function main(argv, options, callback) {
}
}
}

// No such file
if (sourceText == null) return null;

return { sourceText, sourcePath };
}

Expand Down