storm-lua-minify 0.1.2 → 0.1.3

package/dist/cli.js

@@ -10,7 +10,7 @@ const commander_1 = require("commander");
 const minifier_1 = require("./minifier");
 const program = new commander_1.Command();
 program
-    .version("0.1.2")
+    .version("0.1.3")
     .description("A Lua minifier also outputs source map")
     .option("-m, --module-like-lua", "require・dofileの動作を実際のLuaに近づけます");
 program.parse(process.argv);
@@ -36,7 +36,7 @@ luaFiles.forEach((fileName) => {
             name: parsedFileName.name,
             ext: parsedFileName.ext + ".map",
         });
-        map.add("\n--[[\n//# sourceMappingURL=" + mapFileName + "\n]]");
+        map.add("\n--[[\n//# sourceMappingURL=" + path_1.default.basename(mapFileName) + "\n]]");
         const sourceAndMap = map.toStringWithSourceMap();
         fs_1.default.writeFileSync(minFileName, sourceAndMap.code);
         fs_1.default.writeFileSync(mapFileName, JSON.stringify(sourceAndMap.map));

package/dist/minifier.js

@@ -15,6 +15,7 @@ class Minifier {
     moduleSourceText;
     moduleSourceNode;
     moduleAST;
+    moduleNameAndFileName;
     dir;
     entryModule;
     mode;
@@ -25,6 +26,7 @@ class Minifier {
         this.moduleSourceText = new Map();
         this.moduleSourceNode = new Map();
         this.moduleAST = new Map();
+        this.moduleNameAndFileName = new Map();
         this.luaParseSettings = luaParseSettings;
         this.mode = mode;
         const pn = path_1.default.parse(entryFilePath);
@@ -65,6 +67,7 @@ class Minifier {
                 ]);
             });
         }
+        this.moduleSourceText.forEach((v, k) => { const fileName = this.moduleNameAndFileName.get(k); fileName && sn.setSourceContent(fileName, v); });
         return sn;
     }
     parseModule(moduleName) {
@@ -81,10 +84,11 @@ class Minifier {
             const ast = luaparse_1.default.parse(code, this.luaParseSettings);
             if ("globals" in ast) {
                 ast.globals?.map((v) => this.identifiersInUse.add(v.name));
-                const sourceNode = new ast2lua_1.MinifyFile(resolvePath, ast, this, this.mode).parse(resolvePath === this.entryModule);
+                const sourceNode = new ast2lua_1.MinifyFile(resolvePath, ast, this, this.mode).parse(moduleName === this.entryModule);
                 this.moduleSourceText.set(moduleName, code);
                 this.moduleAST.set(moduleName, ast);
                 this.moduleSourceNode.set(moduleName, sourceNode);
+                this.moduleNameAndFileName.set(moduleName, resolvePath);
                 return sourceNode;
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "storm-lua-minify",
   "description": "A Lua minifier also outputs source map",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "dependencies": {
     "commander": "^12.1.0",
     "luamin": "^1.0.4",

package/src/cli.ts

@@ -9,7 +9,7 @@ import { Minifier, MinifierMode } from "./minifier";
 const program = new Command();
 
 program
-  .version("0.1.2")
+  .version("0.1.3")
   .description("A Lua minifier also outputs source map")
   .option(
     "-m, --module-like-lua",
@@ -44,7 +44,7 @@ luaFiles.forEach((fileName) => {
       name: parsedFileName.name,
       ext: parsedFileName.ext + ".map",
     });
-    map.add("\n--[[\n//# sourceMappingURL=" + mapFileName + "\n]]");
+    map.add("\n--[[\n//# sourceMappingURL=" + path.basename(mapFileName) + "\n]]");
 
     const sourceAndMap = map.toStringWithSourceMap();
 

package/src/minifier.ts

@@ -14,6 +14,7 @@ export class Minifier {
   readonly moduleSourceText: Map<string, string>;
   readonly moduleSourceNode: Map<string, SourceNode>;
   readonly moduleAST: Map<string, Chunk>;
+  readonly moduleNameAndFileName: Map<string, string>;
   readonly dir: string;
   readonly entryModule: string;
   readonly mode: MinifierMode;
@@ -29,6 +30,7 @@ export class Minifier {
     this.moduleSourceText = new Map<string, string>();
     this.moduleSourceNode = new Map<string, SourceNode>();
     this.moduleAST = new Map<string, Chunk>();
+    this.moduleNameAndFileName = new Map<string, string>();
     this.luaParseSettings = luaParseSettings;
     this.mode = mode;
     const pn = path.parse(entryFilePath);
@@ -78,6 +80,7 @@ export class Minifier {
         });
     }
 
+    this.moduleSourceText.forEach((v, k) => { const fileName = this.moduleNameAndFileName.get(k); fileName && sn.setSourceContent(fileName, v) });
     return sn;
   }
 
@@ -101,11 +104,12 @@ export class Minifier {
           ast,
           this,
           this.mode
-        ).parse(resolvePath === this.entryModule);
+        ).parse(moduleName === this.entryModule);
 
         this.moduleSourceText.set(moduleName, code);
         this.moduleAST.set(moduleName, ast);
         this.moduleSourceNode.set(moduleName, sourceNode);
+        this.moduleNameAndFileName.set(moduleName, resolvePath);
         return sourceNode;
       }
     }