Skip to content

Commit ca187be

Browse files
PerryvwPerryvw
committed
Remove lualibimport always option
1 parent c4796a6 commit ca187be

6 files changed

Lines changed: 4 additions & 28 deletions

File tree

‎src/CompilerOptions.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
3939

4040
export enum LuaLibImportKind {
4141
None = "none",
42-
Always = "always",
4342
Inline = "inline",
4443
Require = "require",
4544
}

‎src/LuaLib.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ export function loadInlineLualibFeatures(features: Iterable<LuaLibFeature>, emit
165165
return result;
166166
}
167167

168-
export function loadImportedLualibFeatures(
169-
features: Iterable<LuaLibFeature>,
170-
emitHost: EmitHost,
171-
alwaysRequire = false
172-
): lua.Statement[] {
168+
export function loadImportedLualibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): lua.Statement[] {
173169
const luaLibModuleInfo = getLuaLibModulesInfo(emitHost);
174170

175171
const imports = Array.from(features).flatMap(feature => luaLibModuleInfo[feature].exports);
@@ -178,9 +174,6 @@ export function loadImportedLualibFeatures(
178174
lua.createStringLiteral("lualib_bundle"),
179175
]);
180176
if (imports.length === 0) {
181-
if (alwaysRequire) {
182-
return [lua.createExpressionStatement(requireCall)];
183-
}
184177
return [];
185178
}
186179

‎src/LuaPrinter.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,9 @@ export class LuaPrinter {
235235
let statements = file.statements;
236236

237237
const luaLibImport = this.options.luaLibImport ?? LuaLibImportKind.Require;
238-
if (
239-
luaLibImport === LuaLibImportKind.Always ||
240-
(luaLibImport === LuaLibImportKind.Require && file.luaLibFeatures.size > 0)
241-
) {
238+
if (luaLibImport === LuaLibImportKind.Require && file.luaLibFeatures.size > 0) {
242239
// Import lualib features
243-
const importStatements = loadImportedLualibFeatures(
244-
file.luaLibFeatures,
245-
this.emitHost,
246-
luaLibImport === LuaLibImportKind.Always
247-
);
240+
const importStatements = loadImportedLualibFeatures(file.luaLibFeatures, this.emitHost);
248241

249242
statements = importStatements.concat(statements);
250243
} else if (luaLibImport === LuaLibImportKind.Inline && file.luaLibFeatures.size > 0) {

‎test/cli/parse.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ describe("command line", () => {
111111
["buildMode", "library", { buildMode: tstl.BuildMode.Library }],
112112

113113
["luaLibImport", "none", { luaLibImport: tstl.LuaLibImportKind.None }],
114-
["luaLibImport", "always", { luaLibImport: tstl.LuaLibImportKind.Always }],
115114
["luaLibImport", "inline", { luaLibImport: tstl.LuaLibImportKind.Inline }],
116115
["luaLibImport", "require", { luaLibImport: tstl.LuaLibImportKind.Require }],
117116

@@ -222,7 +221,6 @@ describe("tsconfig", () => {
222221
["buildMode", "library", { buildMode: tstl.BuildMode.Library }],
223222

224223
["luaLibImport", "none", { luaLibImport: tstl.LuaLibImportKind.None }],
225-
["luaLibImport", "always", { luaLibImport: tstl.LuaLibImportKind.Always }],
226224
["luaLibImport", "inline", { luaLibImport: tstl.LuaLibImportKind.Inline }],
227225
["luaLibImport", "require", { luaLibImport: tstl.LuaLibImportKind.Require }],
228226

‎test/transpile/directories.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test.each<DirectoryTestCase>([
1919

2020
const config = {
2121
compilerOptions: { ...compilerOptions, types: [], skipLibCheck: true },
22-
tstl: { luaTarget: tstl.LuaTarget.LuaJIT, luaLibImport: tstl.LuaLibImportKind.Always },
22+
tstl: { luaTarget: tstl.LuaTarget.LuaJIT },
2323
};
2424

2525
const { fileNames, options } = tstl.updateParsedConfigFile(

‎test/unit/builtins/loading.spec.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ describe("luaLibImport", () => {
1616
.tap(builder => expect(builder.getMainLuaCodeChunk()).toContain('require("lualib_bundle")'))
1717
.expectToMatchJsResult();
1818
});
19-
20-
test("always", () => {
21-
util.testModule``
22-
.setOptions({ luaLibImport: tstl.LuaLibImportKind.Always })
23-
.tap(builder => expect(builder.getMainLuaCodeChunk()).toContain('require("lualib_bundle")'))
24-
.expectToEqual(undefined);
25-
});
2619
});
2720

2821
test.each([tstl.LuaLibImportKind.Inline, tstl.LuaLibImportKind.None, tstl.LuaLibImportKind.Require])(

0 commit comments

Comments
 (0)