typescript-to-lua 1.1.0 → 1.1.1

package/dist/cli/parse.d.ts

@@ -13,7 +13,7 @@ interface CommandLineOptionOfEnum extends CommandLineOptionBase {
     choices: string[];
 }
 interface CommandLineOptionOfPrimitive extends CommandLineOptionBase {
-    type: "boolean" | "string" | "object";
+    type: "boolean" | "string" | "object" | "array";
 }
 declare type CommandLineOption = CommandLineOptionOfEnum | CommandLineOptionOfPrimitive;
 export declare const optionDeclarations: CommandLineOption[];

package/dist/cli/parse.js

@@ -59,6 +59,11 @@ exports.optionDeclarations = [
         description: "Provide verbose output useful for diagnosing problems.",
         type: "boolean",
     },
+    {
+        name: "noResolvePaths",
+        description: "An array of paths that tstl should not resolve and keep as-is.",
+        type: "array",
+    },
 ];
 function updateParsedConfigFile(parsedConfigFile) {
     let hasRootLevelOptions = false;
@@ -162,6 +167,15 @@ function readValue(option, value) {
             }
             return { value };
         }
+        case "array": {
+            if (!Array.isArray(value)) {
+                return {
+                    value: undefined,
+                    error: cliDiagnostics.compilerOptionRequiresAValueOfType(option.name, option.type),
+                };
+            }
+            return { value };
+        }
         case "enum": {
             if (typeof value !== "string") {
                 return {

package/dist/transformation/utils/export.d.ts

@@ -2,8 +2,8 @@ import * as ts from "typescript";
 import * as lua from "../../LuaAST";
 import { TransformationContext } from "../context";
 export declare function hasDefaultExportModifier(node: ts.Node): boolean;
-export declare const createDefaultExportIdentifier: (original: ts.Node) => lua.Identifier;
-export declare const createDefaultExportStringLiteral: (original: ts.Node) => lua.StringLiteral;
+export declare function hasExportModifier(node: ts.Node): boolean;
+export declare const createDefaultExportStringLiteral: (original?: ts.Node | undefined) => lua.StringLiteral;
 export declare function getExportedSymbolDeclaration(symbol: ts.Symbol): ts.Declaration | undefined;
 export declare function getSymbolFromIdentifier(context: TransformationContext, identifier: lua.Identifier): ts.Symbol | undefined;
 export declare function getIdentifierExportScope(context: TransformationContext, identifier: lua.Identifier): ts.SourceFile | ts.ModuleDeclaration | undefined;
@@ -14,3 +14,4 @@ export declare function isSymbolExported(context: TransformationContext, symbol:
 export declare function isSymbolExportedFromScope(context: TransformationContext, symbol: ts.Symbol, scope: ts.SourceFile | ts.ModuleDeclaration): boolean;
 export declare function addExportToIdentifier(context: TransformationContext, identifier: lua.Identifier): lua.AssignmentLeftHandSideExpression;
 export declare function createExportedIdentifier(context: TransformationContext, identifier: lua.Identifier, exportScope?: ts.SourceFile | ts.ModuleDeclaration): lua.AssignmentLeftHandSideExpression;
+export declare function createDefaultExportExpression(node: ts.Node): lua.AssignmentLeftHandSideExpression;

package/dist/transformation/utils/export.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExportedIdentifier = exports.addExportToIdentifier = exports.isSymbolExportedFromScope = exports.isSymbolExported = exports.getDependenciesOfSymbol = exports.getExportedSymbolsFromScope = exports.getSymbolExportScope = exports.getIdentifierExportScope = exports.getSymbolFromIdentifier = exports.getExportedSymbolDeclaration = exports.createDefaultExportStringLiteral = exports.createDefaultExportIdentifier = exports.hasDefaultExportModifier = void 0;
+exports.createDefaultExportExpression = exports.createExportedIdentifier = exports.addExportToIdentifier = exports.isSymbolExportedFromScope = exports.isSymbolExported = exports.getDependenciesOfSymbol = exports.getExportedSymbolsFromScope = exports.getSymbolExportScope = exports.getIdentifierExportScope = exports.getSymbolFromIdentifier = exports.getExportedSymbolDeclaration = exports.createDefaultExportStringLiteral = exports.hasExportModifier = exports.hasDefaultExportModifier = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const namespace_1 = require("../visitors/namespace");
@@ -12,8 +12,11 @@ function hasDefaultExportModifier(node) {
     return ((_a = node.modifiers) !== null && _a !== void 0 ? _a : []).some(modifier => modifier.kind === ts.SyntaxKind.DefaultKeyword);
 }
 exports.hasDefaultExportModifier = hasDefaultExportModifier;
-const createDefaultExportIdentifier = (original) => lua.createIdentifier("default", original);
-exports.createDefaultExportIdentifier = createDefaultExportIdentifier;
+function hasExportModifier(node) {
+    var _a;
+    return ((_a = node.modifiers) !== null && _a !== void 0 ? _a : []).some(modifier => modifier.kind === ts.SyntaxKind.ExportKeyword);
+}
+exports.hasExportModifier = hasExportModifier;
 const createDefaultExportStringLiteral = (original) => lua.createStringLiteral("default", original);
 exports.createDefaultExportStringLiteral = createDefaultExportStringLiteral;
 function getExportedSymbolDeclaration(symbol) {
@@ -103,4 +106,8 @@ function createExportedIdentifier(context, identifier, exportScope) {
     return lua.createTableIndexExpression(exportTable, lua.createStringLiteral(identifier.text));
 }
 exports.createExportedIdentifier = createExportedIdentifier;
+function createDefaultExportExpression(node) {
+    return lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), (0, exports.createDefaultExportStringLiteral)(node), node);
+}
+exports.createDefaultExportExpression = createDefaultExportExpression;
 //# sourceMappingURL=export.js.map

package/dist/transformation/visitors/class/index.js

@@ -22,7 +22,7 @@ const utils_2 = require("./utils");
 const transformClassDeclaration = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
     if ((0, export_1.hasDefaultExportModifier)(declaration)) {
-        const left = (0, export_1.createExportedIdentifier)(context, (0, export_1.createDefaultExportIdentifier)(declaration));
+        const left = (0, export_1.createDefaultExportExpression)(declaration);
         const right = transformClassAsExpression(declaration, context);
         return [lua.createAssignmentStatement(left, right, declaration)];
     }
@@ -152,6 +152,13 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         const decoratingExpression = (0, decorators_1.createDecoratingExpression)(context, classDeclaration.kind, classDeclaration.decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), localClassName);
         const decoratingStatement = lua.createAssignmentStatement(localClassName, decoratingExpression);
         result.push(decoratingStatement);
+        if ((0, export_1.hasExportModifier)(classDeclaration)) {
+            const exportExpression = (0, export_1.hasDefaultExportModifier)(classDeclaration)
+                ? (0, export_1.createDefaultExportExpression)(classDeclaration)
+                : (0, export_1.createExportedIdentifier)(context, className);
+            const classAssignment = lua.createAssignmentStatement(exportExpression, localClassName);
+            result.push(classAssignment);
+        }
     }
     superInfo.pop();
     return { statements: result, name: className };

package/dist/transformation/visitors/modules/export.js

@@ -72,10 +72,9 @@ function transformExportSpecifier(context, node) {
     const exportedIdentifier = node.propertyName ? node.propertyName : node.name;
     const exportedExpression = (0, literal_1.createShorthandIdentifier)(context, exportedSymbol, exportedIdentifier);
     const isDefault = isDefaultExportSpecifier(node);
-    const identifierToExport = isDefault
-        ? (0, export_1.createDefaultExportIdentifier)(node)
-        : (0, identifier_1.transformIdentifier)(context, node.name);
-    const exportAssignmentLeftHandSide = (0, export_1.createExportedIdentifier)(context, identifierToExport);
+    const exportAssignmentLeftHandSide = isDefault
+        ? (0, export_1.createDefaultExportExpression)(node)
+        : (0, export_1.createExportedIdentifier)(context, (0, identifier_1.transformIdentifier)(context, node.name));
     return lua.createAssignmentStatement(exportAssignmentLeftHandSide, exportedExpression, node);
 }
 function transformExportSpecifiersFrom(context, statement, moduleSpecifier, exportSpecifiers) {

package/dist/transpilation/resolve.js

@@ -244,7 +244,7 @@ function isBuildModeLibrary(program) {
 function findRequiredPaths(code) {
     // Find all require("<path>") paths in a lua code string
     const paths = [];
-    const pattern = /(^|\s|;|=)require\("(.+)"\)/g;
+    const pattern = /(^|\s|;|=)require\("(.+?)"\)/g;
     // eslint-disable-next-line @typescript-eslint/ban-types
     let match;
     while ((match = pattern.exec(code))) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",