Skip to content

Package declaration file for commonjs packages #3159

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

Closed
rbuckton wants to merge 13 commits into from
Closed

Package declaration file for commonjs packages #3159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
094afb2
Added single-file package declaration using multiple ambient modules
rbuckton May 7, 2015
03b5cc3
Updated format for submodule urls in a package
rbuckton May 8, 2015
57a81e6
Updated services and harnesses and added a test
rbuckton May 8, 2015
8a1c7c5
fixed harness to support packageDeclaration
rbuckton May 8, 2015
895a096
Cleanup, bug fixes
rbuckton May 9, 2015
28438bf
Updated test harness
rbuckton May 10, 2015
1f86bfa
Some cleanup and reorganization of code
rbuckton May 11, 2015
567b48a
Merge branch 'packageDeclaration2' of https://github.com/Microsoft/Ty…
rbuckton May 12, 2015
073da99
Added support for package paths in ImportEqualsDeclaration emit
rbuckton May 13, 2015
5f41f68
Cleaned up package parameters, added packageDir option, added path co…
rbuckton May 14, 2015
b001006
Added paramType for packageDir
rbuckton May 14, 2015
1ecd2e7
Additional compiler option cleanup
rbuckton May 14, 2015
1266290
Merged branch 'master' into packageDeclaration2
rbuckton May 14, 2015
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
Prev Previous commit
Next Next commit
Added support for package paths in ImportEqualsDeclaration emit
  • Loading branch information
@rbuckton
rbuckton committed May 13, 2015
commit 073da995ccd146a82399c9a8c6ff25c22c6ad4ac
46 changes: 25 additions & 21 deletions src/compiler/declarationEmitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ module ts {
}
else {
write("require(");
writeTextOfNode(currentSourceFile, getExternalModuleImportEqualsDeclarationExpression(node));
emitModuleSpecifier(getExternalModuleImportEqualsDeclarationExpression(node));
write(");");
}
writer.writeLine();
Expand Down Expand Up @@ -741,10 +741,30 @@ module ts {
}
write(" from ");
}
writeTextOfNode(currentSourceFile, node.moduleSpecifier);
emitModuleSpecifier(node.moduleSpecifier);
write(";");
writer.writeLine();
}

function emitModuleSpecifier(node: Expression) {
if (isPackageDeclaration) {
let moduleNameText = (<LiteralExpression>node).text;
let searchPath = getDirectoryPath(currentSourceFile.fileName);
let searchName = normalizePath(combinePaths(searchPath, moduleNameText));
if (host.getSourceFile(searchName + ".ts") || host.getSourceFile(searchName + ".d.ts")) {
let packageQualifiedPath = getPackageQualifiedPath(host, moduleNameText, searchPath);
write("\"");
write(escapeString(packageQualifiedPath));
write("\"");
}
else {
writeTextOfNode(currentSourceFile, node);
}
}
else {
writeTextOfNode(currentSourceFile, node);
}
}

function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
if (node.propertyName) {
Expand Down Expand Up @@ -777,23 +797,7 @@ module ts {
}
if (node.moduleSpecifier) {
write(" from ");
if (isPackageDeclaration) {
let moduleNameText = (<LiteralExpression>node.moduleSpecifier).text;
let searchPath = getDirectoryPath(currentSourceFile.fileName);
let searchName = normalizePath(combinePaths(searchPath, moduleNameText));
if (host.getSourceFile(searchName + ".ts") || host.getSourceFile(searchName + ".d.ts")) {
let packageQualifiedPath = getPackageQualifiedPath(host, moduleNameText, searchPath);
write("\"");
write(escapeString(packageQualifiedPath));
write("\"");
}
else {
writeTextOfNode(currentSourceFile, node.moduleSpecifier);
}
}
else {
writeTextOfNode(currentSourceFile, node.moduleSpecifier);
}
emitModuleSpecifier(node.moduleSpecifier);
}
write(";");
writer.writeLine();
Expand Down Expand Up @@ -1668,8 +1672,8 @@ module ts {
let packageMain = getPackageMain(host);
let packageAbsolutePath = getNormalizedAbsolutePath(packageRelativePath, packageRoot);

if (host.getSourceFile(packageAbsolutePath + ".ts") === packageMain ||
host.getSourceFile(packageAbsolutePath + ".d.ts") === packageMain) {
if (packageAbsolutePath + ".ts" === packageMain ||
packageAbsolutePath + ".d.ts" === packageMain) {
return compilerOptions.packageName;
}

Expand Down
14 changes: 9 additions & 5 deletions src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,12 @@ module ts {
}

export function getPackageDirectory(host: ScriptReferenceHost) {
return host.getPackageDirectory ? host.getPackageDirectory() : host.getCurrentDirectory();
let searchPath = host.getCurrentDirectory();
if (host.getPackageDirectory) {
return getNormalizedAbsolutePath(host.getPackageDirectory(), searchPath);
}

return searchPath;
}

export function getPackageDeclaration(host: ScriptReferenceHost) {
Expand All @@ -1717,16 +1722,15 @@ module ts {
let options = host.getCompilerOptions();
if (options.packageMain) {
let packageMain = getNormalizedAbsolutePath(options.packageMain, getPackageDirectory(host));
let packageFile = host.getSourceFile(packageMain);
return packageFile;
return packageMain;
}

return undefined;
}

export function isPackageMain(node: SourceFile, host: ScriptReferenceHost) {
let packageMain = getPackageMain(host);
return node === packageMain;
let packageMain = getPackageMain(host);
return node.fileName === packageMain;
}

/**
Expand Down