Use package.path instead of modules table

hazzard993 · hazzard993 · commit f47a06ecb948 · 2019-07-01T10:47:07.000+10:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -142,23 +142,14 @@ export class LuaTransformer {
                 );
 
                 if (this.options.outFile) {
-                    // module = module or {}
-                    statements.unshift(
-                        tstl.createAssignmentStatement(
-                            this.createModulesIdentifier(),
-                            tstl.createBinaryExpression(
-                                this.createModulesIdentifier(),
-                                tstl.createTableExpression(),
-                                tstl.SyntaxKind.OrOperator
-                            )
-                        )
-                    );
-
-                    // module["sourceFile"] = exports
+                    // package.loaded["sourceFile"] = exports
                     statements.push(
                         tstl.createAssignmentStatement(
                             tstl.createTableIndexExpression(
-                                this.createModulesIdentifier(),
+                                tstl.createTableIndexExpression(
+                                    tstl.createIdentifier("package"),
+                                    tstl.createStringLiteral("loaded")
+                                ),
                                 tstl.createStringLiteral(this.getExportPath(this.currentSourceFile))
                             ),
                             this.createExportsIdentifier()
@@ -493,11 +484,7 @@ export class LuaTransformer {
             : moduleSpecifier.text;
         const modulePath = tstl.createStringLiteral(modulePathString);
 
-        if (this.options.outFile) {
-            return tstl.createTableIndexExpression(this.createModulesIdentifier(), modulePath);
-        } else {
-            return tstl.createCallExpression(tstl.createIdentifier("require"), [modulePath], moduleSpecifier);
-        }
+        return tstl.createCallExpression(tstl.createIdentifier("require"), [modulePath], moduleSpecifier);
     }
 
     protected validateClassElement(element: ts.ClassElement): void {
@@ -5009,10 +4996,6 @@ export class LuaTransformer {
         return tstl.createIdentifier("____exports");
     }
 
-    protected createModulesIdentifier(): tstl.Identifier {
-        return tstl.createIdentifier("____modules");
-    }
-
     protected createLocalOrExportedOrGlobalDeclaration(
         lhs: tstl.Identifier | tstl.Identifier[],
         rhs?: tstl.Expression | tstl.Expression[],
diff --git a/src/Transpile.ts b/src/Transpile.ts
@@ -151,10 +151,13 @@ export function transpile({
             }
             return luaCode;
         }, "");
+        const declarationFile = transpiledFiles.find(transpiledFile => transpiledFile.declaration);
         transpiledFiles = [
             {
                 fileName: options.outFile,
                 lua,
+                declaration: declarationFile ? declarationFile.declaration : undefined,
+                declarationMap: declarationFile ? declarationFile.declarationMap : undefined,
             },
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,13 @@ export function transpile({`
`151`	`151`	`}`
`152`	`152`	`return luaCode;`
`153`	`153`	`}, "");`
	`154`	`+ const declarationFile = transpiledFiles.find(transpiledFile => transpiledFile.declaration);`
`154`	`155`	`transpiledFiles = [`
`155`	`156`	`{`
`156`	`157`	`fileName: options.outFile,`
`157`	`158`	`lua,`
	`159`	`+ declaration: declarationFile ? declarationFile.declaration : undefined,`
	`160`	`+ declarationMap: declarationFile ? declarationFile.declarationMap : undefined,`
`158`	`161`	`},`
`159`	`162`	`];`
`160`	`163`	`}`