Skip to content

Fix noResolution for named imports #636

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
Perryvw merged 4 commits into from
Jun 20, 2019
Merged

Fix noResolution for named imports #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e7eec1
Fix noResolution for named imports
hazzard993 Jun 19, 2019
0dd855d
Fix no element imports and use alternate symbol resolution solution
hazzard993 Jun 19, 2019
073592d
Use collectCustomDecorators and remove isNonNamespaceModuleDeclaration
hazzard993 Jun 19, 2019
37a6fbe
Change decorator map abbreviation
hazzard993 Jun 19, 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
18 changes: 12 additions & 6 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as path from "path";
import * as ts from "typescript";
import { CompilerOptions, LuaTarget } from "./CompilerOptions";
import { DecoratorKind } from "./Decorator";
import { Decorator, DecoratorKind } from "./Decorator";
import * as tstl from "./LuaAST";
import { LuaLibFeature } from "./LuaLib";
import { ContextType, TSHelper as tsHelper } from "./TSHelper";
Expand Down Expand Up @@ -357,11 +357,21 @@ export class LuaTransformer {
scope.importStatements = [];
}

let shouldResolve = true;
const moduleOwnerSymbol = this.checker.getSymbolAtLocation(statement.moduleSpecifier);
if (moduleOwnerSymbol) {
const decorators = new Map<DecoratorKind, Decorator>();
tsHelper.collectCustomDecorators(moduleOwnerSymbol, this.checker, decorators);
if (decorators.has(DecoratorKind.NoResolution)) {
shouldResolve = false;
}
}

const moduleSpecifier = statement.moduleSpecifier as ts.StringLiteral;
const importPath = moduleSpecifier.text.replace(new RegExp('"', "g"), "");
const requireCall = this.createModuleRequire(statement.moduleSpecifier as ts.StringLiteral, shouldResolve);

if (!statement.importClause) {
const requireCall = this.createModuleRequire(statement.moduleSpecifier as ts.StringLiteral);
result.push(tstl.createExpressionStatement(requireCall));
if (scope.importStatements) {
scope.importStatements.push(...result);
Expand All @@ -376,10 +386,6 @@ export class LuaTransformer {
throw TSTLErrors.UnsupportedImportType(statement.importClause);
}

const type = this.checker.getTypeAtLocation(imports);
const shouldResolve = !tsHelper.getCustomDecorators(type, this.checker).has(DecoratorKind.NoResolution);
const requireCall = this.createModuleRequire(statement.moduleSpecifier as ts.StringLiteral, shouldResolve);

if (ts.isNamedImports(imports)) {
const filteredElements = imports.elements.filter(e => {
const decorators = tsHelper.getCustomDecorators(this.checker.getTypeAtLocation(e), this.checker);
Expand Down
96 changes: 84 additions & 12 deletions test/unit/require.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,92 @@ test.each([
}
);

test.each([{ comment: "", expectedPath: "src.fake" }, { comment: "/** @noResolution */", expectedPath: "fake" }])(
"noResolution on ambient modules causes no path alterations (%p)",
({ comment, expectedPath }) => {
const lua = util.transpileString({
"src/main.ts": `import * as fake from "fake"; fake;`,
"module.d.ts": `${comment} declare module "fake" {}`,
});
const match = requireRegex.exec(lua);
test.each([
{
declarationStatement: `
declare module 'fake' {}
`,
mainCode: "import * as fake from 'fake'; fake;",
expectedPath: "src.fake",
},
{
declarationStatement: `
/** @noResolution */
declare module 'fake' {}
`,
mainCode: "import * as fake from 'fake'; fake;",
expectedPath: "fake",
},
{
declarationStatement: `
declare module 'fake' {
export const x: number;
}
`,
mainCode: "import { x } from 'fake'; x;",
expectedPath: "src.fake",
},
{
declarationStatement: `
/** @noResolution */
declare module 'fake' {
export const x: number;
}
`,
mainCode: "import { x } from 'fake'; x;",
expectedPath: "fake",
},
{
declarationStatement: `
/** @noResolution */
declare module 'fake' {
export const x: number;
}
declare module 'fake' {
export const y: number;
}
`,
mainCode: "import { y } from 'fake'; y;",
expectedPath: "fake",
},
{
declarationStatement: `
declare module 'fake' {
export const x: number;
}
declare module 'fake' {
export const y: number;
}
`,
mainCode: "import { y } from 'fake'; y;",
expectedPath: "src.fake",
},
{
declarationStatement: `
declare module 'fake' {}
`,
mainCode: "import 'fake';",
expectedPath: "src.fake",
},
{
declarationStatement: `
/** @noResolution */
declare module 'fake' {}
`,
mainCode: "import 'fake';",
expectedPath: "fake",
},
])("noResolution prevents any module path resolution behaviour", ({ declarationStatement, mainCode, expectedPath }) => {
const lua = util.transpileString({
"src/main.ts": mainCode,
"module.d.ts": declarationStatement,
});
const match = requireRegex.exec(lua);

if (util.expectToBeDefined(match)) {
expect(match[1]).toBe(expectedPath);
}
if (util.expectToBeDefined(match)) {
expect(match[1]).toBe(expectedPath);
}
);
});

test("ImportEquals declaration require", () => {
const input = `import foo = require("./foo/bar"); foo;`;
Expand Down