Skip to content

Commit c50ad14

Browse files
hazzard993hazzard993
committed
Remove luaModuleSystem
1 parent c6447c4 commit c50ad14

6 files changed

Lines changed: 5 additions & 45 deletions

File tree

‎src/CommandLineParser.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from "path";
22
import * as ts from "typescript";
3-
import { CompilerOptions, LuaLibImportKind, LuaTarget, LuaModuleSystemKind } from "./CompilerOptions";
3+
import { CompilerOptions, LuaLibImportKind, LuaTarget } from "./CompilerOptions";
44
import * as diagnosticFactories from "./diagnostics";
55

66
export interface ParsedCommandLine extends ts.ParsedCommandLine {
@@ -31,12 +31,6 @@ const optionDeclarations: CommandLineOption[] = [
3131
type: "enum",
3232
choices: Object.values(LuaLibImportKind),
3333
},
34-
{
35-
name: "luaModuleSystem",
36-
description: "Specify the way modules are resolved on the target Lua environment.",
37-
type: "enum",
38-
choices: Object.values(LuaModuleSystemKind),
39-
},
4034
{
4135
name: "luaTarget",
4236
aliases: ["lt"],

‎src/CompilerOptions.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export interface TransformerImport {
2020
export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
2121
noImplicitSelf?: boolean;
2222
noHeader?: boolean;
23-
luaModuleSystem?: LuaModuleSystemKind;
2423
luaTarget?: LuaTarget;
2524
luaLibImport?: LuaLibImportKind;
2625
noHoisting?: boolean;
@@ -29,11 +28,6 @@ export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
2928
[option: string]: ts.CompilerOptions[string] | Array<ts.PluginImport | TransformerImport>;
3029
};
3130

32-
export enum LuaModuleSystemKind {
33-
Require = "require",
34-
None = "none",
35-
}
36-
3731
export enum LuaLibImportKind {
3832
None = "none",
3933
Always = "always",

‎src/LuaTransformer.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from "path";
22
import * as ts from "typescript";
3-
import { CompilerOptions, LuaTarget, LuaModuleSystemKind } from "./CompilerOptions";
3+
import { CompilerOptions, LuaTarget } from "./CompilerOptions";
44
import { DecoratorKind } from "./Decorator";
55
import * as tstl from "./LuaAST";
66
import { LuaLibFeature } from "./LuaLib";
@@ -546,9 +546,8 @@ export class LuaTransformer {
546546
)
547547
: moduleSpecifier.text;
548548
const modulePath = tstl.createStringLiteral(modulePathString);
549-
const requireCallString =
550-
this.options.luaModuleSystem === LuaModuleSystemKind.None ? "__TS__LuaRequire" : "require";
551-
if (this.options.luaModuleSystem === LuaModuleSystemKind.None) {
549+
const requireCallString = this.options.outFile ? "__TS__LuaRequire" : "require";
550+
if (this.options.outFile) {
552551
this.importLuaLibFeature(LuaLibFeature.LuaRequire);
553552
}
554553
return tstl.createCallExpression(tstl.createIdentifier(requireCallString), [modulePath], moduleSpecifier);

‎test/unit/luaModuleSystem.spec.ts‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎test/unit/outFile.spec.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ test.each<[string, Record<string, string>]>([
138138
])("outFile tests (%s)", (_, files) => {
139139
const testBuilder = util.testBundle`
140140
${files["main.ts"]}
141-
`
142-
.setOptions({ outFile: "main.lua", module: ts.ModuleKind.AMD })
143-
.setModuleSystem("require");
141+
`.setOptions({ outFile: "main.lua", module: ts.ModuleKind.AMD });
144142

145143
const extraFiles = Object.keys(files)
146144
.map(file => ({ fileName: file, code: files[file] }))

‎test/util.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -420,16 +420,7 @@ class AccessorTestBuilder extends TestBuilder {
420420
}
421421

422422
class BundleTestBuilder extends AccessorTestBuilder {
423-
protected moduleSystemKind: "none" | "require" = "require";
424-
public setModuleSystem(kind: "none" | "require"): this {
425-
this.moduleSystemKind = kind;
426-
return this;
427-
}
428423
public getLuaCodeWithWrapper(): string {
429-
if (this.moduleSystemKind === "require") {
430-
return super.getLuaCodeWithWrapper();
431-
}
432-
433424
const noRequire = "_G.require = nil";
434425
const noPackage = "_G.package = nil";
435426
const luaCode = super.getLuaCodeWithWrapper();

0 commit comments

Comments
 (0)