storm-lua-minify 0.1.2 → 0.2.0

package/.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build-lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Check formatting
+        run: npm run format:check
+
+      - name: Test
+        run: npm test

package/.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+name: Publish to npm
+
+# NOTE: npm publish is disabled for now (see issue #10).
+# Once the repository is ready to publish (NPM_TOKEN secret configured,
+# owner sign-off), uncomment the "Publish" step below.
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          cache: "npm"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Test
+        run: npm test
+
+      # - name: Publish
+      #   run: npm publish
+      #   env:
+      #     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.prettierignore

@@ -0,0 +1,3 @@
+dist
+node_modules
+package-lock.json

package/.prettierrc.json

@@ -0,0 +1 @@
+{}

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Nona Takahara, Mathias Bynens
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Nona Takahara, Mathias Bynens
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,15 +1,37 @@
-# storm-lua-minify
-
-このプログラムは [mathiasbynens/luamin](https://github.com/mathiasbynens/luamin) をベースにした Stormworks: Build and Rescue 向けのLua minifierです。
-
-Stormworks: Build and Rescue 以外の用途にも使用可能です。
-
-# 使い方
-
-```
-npm i storm-lua-minify
-
-npx storm-lua-minify script.lua
-```
-
-- `-m`オプションを付加すると、モジュールの挙動をLuaの実際の挙動に近づけます
+# storm-lua-minify
+
+このプログラムは [mathiasbynens/luamin](https://github.com/mathiasbynens/luamin) をベースにした Stormworks: Build and Rescue 向けのLua minifierです。
+
+Stormworks: Build and Rescue 以外の用途にも使用可能です。
+
+# 使い方
+
+```
+npm i storm-lua-minify
+
+npx storm-lua-minify script.lua
+```
+
+- `-m`オプションを付加すると、モジュールの挙動をLuaの実際の挙動に近づけます
+
+# テスト
+
+```
+npm ci
+npm run build
+npm test
+```
+
+# Lint / Format
+
+```
+npm run lint          # ESLint
+npm run format:check  # Prettierのフォーマットチェック
+npm run format        # Prettierでフォーマット
+```
+
+`test/` 以下にスナップショット・ラウンドトリップパース・識別子衝突検知のテストがあります。
+既知バグ（#11, #12 など）の再現ケースは `test.todo` として登録されており、`npm test` は成功しますが、
+修正が入るまではそのテスト自体は失敗した状態のまま todo 扱いになります。
+
+スナップショットを更新する場合は `UPDATE_SNAPSHOTS=1 npm test` を実行してください。

package/dist/ast2lua.js

@@ -2,8 +2,10 @@
 // based on "luamin": Copyright Mathias Bynens <https://mathiasbynens.be/>
 // SPDX-License-Identifier: MIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MinifyFile = void 0;
+exports.MinifyFile = exports.IDENTIFIER_PARTS = void 0;
+exports.isKeyword = isKeyword;
 const source_map_1 = require("source-map");
+const linker_1 = require("./linker");
 const PRECEDENCE = {
     or: 1,
     and: 2,
@@ -13,28 +15,25 @@ const PRECEDENCE = {
     ">=": 3,
     "~=": 3,
     "==": 3,
-    "..": 5,
-    "+": 6,
-    "-": 6, // binary -
-    "*": 7,
-    "/": 7,
-    "%": 7,
-    unarynot: 8,
-    "unary#": 8,
-    "unary-": 8, // unary -
-    "^": 10,
+    "|": 4,
+    "~": 5, // binary ~ (bxor)
+    "&": 6,
+    "<<": 7,
+    ">>": 7,
+    "..": 9,
+    "+": 10,
+    "-": 10, // binary -
+    "*": 11,
+    "/": 11,
+    "//": 11,
+    "%": 11,
+    unarynot: 12,
+    "unary#": 12,
+    "unary-": 12, // unary -
+    "unary~": 12, // unary ~ (bnot)
+    "^": 14,
 };
-const IDENTIFIER_PARTS = [
-    "0",
-    "1",
-    "2",
-    "3",
-    "4",
-    "5",
-    "6",
-    "7",
-    "8",
-    "9",
+exports.IDENTIFIER_PARTS = [
     "a",
     "b",
     "c",
@@ -95,6 +94,7 @@ function wrapArray(obj) {
     }
     return [obj];
 }
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- 現時点では未参照だが、オリジナル(luamin)由来のコードのため残置
 function generateZeroes(length) {
     let zero = "0";
     let result = "";
@@ -108,7 +108,6 @@ function generateZeroes(length) {
         if (length & 1) {
             result += zero;
         }
-        // eslint-disable-next-line no-cond-assign
         if ((length >>= 1)) {
             zero += zero;
         }
@@ -206,11 +205,13 @@ function insertSeparator(a, b, separator = " ") {
 }
 class MinifyFile {
     fileName;
+    moduleName;
     ast;
     minifier;
     mode;
-    constructor(fileName, ast, minifier, mode) {
+    constructor(fileName, moduleName, ast, minifier, mode) {
         this.fileName = fileName;
+        this.moduleName = moduleName;
         this.ast = ast;
         this.minifier = minifier;
         this.mode = mode;
@@ -219,7 +220,10 @@ class MinifyFile {
         const body = this.formatStatementList(this.ast.body);
         if (!noComment && this.ast.comments) {
             const comments = this.ast.comments;
-            comments.reverse().filter(v => v.raw.includes("--#") || v.raw.includes("[[#")).forEach(comment => {
+            comments
+                .reverse()
+                .filter((v) => v.raw.includes("--#") || v.raw.includes("[[#"))
+                .forEach((comment) => {
                 body.prepend([this.sourceNodeHelper(comment, comment.raw), "\n"]);
             });
             return body;
@@ -228,11 +232,42 @@ class MinifyFile {
             return body;
         }
     }
+    /**
+     * モジュール本体の最後の文が「単一の式を返すreturn文」であるときに限り、
+     * それ以外の文と最後の式を分けて返す。requireを式（IIFE）ではなく文として
+     * 展開したい呼び出し側（#29のレビュー対応）が利用する。
+     * 該当しない場合はundefinedを返し、呼び出し側はIIFE方式へフォールバックする。
+     */
+    parseAsStatementsAndFinalExpression(noComment) {
+        const body = this.ast.body;
+        const last = body[body.length - 1];
+        if (!last ||
+            last.type !== "ReturnStatement" ||
+            last.arguments.length !== 1) {
+            return undefined;
+        }
+        const statements = this.formatStatementList(body.slice(0, -1));
+        if (!noComment && this.ast.comments) {
+            this.ast.comments
+                .slice()
+                .reverse()
+                .filter((v) => v.raw.includes("--#") || v.raw.includes("[[#"))
+                .forEach((comment) => {
+                statements.prepend([
+                    this.sourceNodeHelper(comment, comment.raw),
+                    "\n",
+                ]);
+            });
+        }
+        const finalExpression = this.formatExpression(last.arguments[0]);
+        return { statements, finalExpression };
+    }
     sourceNodeHelper(node, chuncks, name) {
         const line = node?.loc?.start.line;
         const column = node?.loc?.start.column;
-        return new source_map_1.SourceNode(line == undefined ? null : line, column == undefined ? null : column, this.fileName, // 本当に自分のファイル名でよいかは要検討
-        chuncks, name);
+        // this.fileNameは常にこのMinifyFileインスタンスが担当するモジュール自身の
+        // ファイル名（Linkパスで解決済み）なので、ここで出力するノードの由来ファイルとして正しい。
+        return new source_map_1.SourceNode(line == undefined ? null : line, column == undefined ? null : column, this.fileName, chuncks, name);
     }
     formatStatementList(body) {
         const result = this.sourceNodeHelper(undefined, []);
@@ -241,7 +276,66 @@ class MinifyFile {
         });
         return result;
     }
+    /**
+     * SLモード限定: `local x = require("m")` / `x = require("m")` の形（変数1個・
+     * 初期化式1個）を、requireを式（IIFE）として埋め込むのではなく、モジュール本体の
+     * 文をそのまま展開し最後にターゲットへ代入する「文」の並びとして出力する
+     * （#29のレビュー対応。無オプション実行時の挙動互換性のため）。
+     *
+     * モジュール本体が「単一の式を返すreturn文」で終わっていない場合や、変数・
+     * 初期化式が複数ある場合、-mモードの場合は対象外とし、undefinedを返す
+     * （呼び出し側は従来のIIFE方式にフォールバックする）。
+     */
+    trySpliceRequireStatement(statement) {
+        if (this.mode.moduleLikeLua) {
+            return undefined;
+        }
+        if (statement.variables.length !== 1 || statement.init.length !== 1) {
+            return undefined;
+        }
+        const moduleRef = this.matchModuleCallExpression(statement.init[0]);
+        if (!moduleRef || moduleRef.kind !== "require") {
+            return undefined;
+        }
+        const spliced = this.minifier.splitModuleForStatementSplice(moduleRef.moduleName);
+        if (!spliced) {
+            return undefined;
+        }
+        const isLocal = statement.type === "LocalStatement";
+        const target = statement.variables[0];
+        const targetNode = isLocal
+            ? this.generateIdentifier(target)
+            : this.formatExpression(target);
+        const result = this.sourceNodeHelper(statement, []);
+        addWithSeparator(result, spliced.statements);
+        addWithSeparator(result, isLocal ? ["local ", targetNode] : [targetNode]);
+        addWithSeparator(result, "=");
+        addWithSeparator(result, spliced.finalExpression);
+        return result;
+    }
+    /**
+     * SLモード限定: `require("m")` を戻り値を使わない単独の文として書いた場合、
+     * dofileと同じくfunctionで包まずそのまま展開する（Cプリプロセッサのincludeに
+     * 近い、LifeBoat Modeでの一般的な使い方に合わせるための対応。#29のレビュー対応）。
+     */
+    tryInlineBareRequireStatement(expr) {
+        if (this.mode.moduleLikeLua) {
+            return undefined;
+        }
+        const moduleRef = this.matchModuleCallExpression(expr);
+        if (!moduleRef || moduleRef.kind !== "require") {
+            return undefined;
+        }
+        return this.minifier.printModuleInline(moduleRef.moduleName);
+    }
     formatStatement(statement) {
+        if (statement.type == "AssignmentStatement" ||
+            statement.type == "LocalStatement") {
+            const spliced = this.trySpliceRequireStatement(statement);
+            if (spliced) {
+                return spliced;
+            }
+        }
         if (statement.type == "AssignmentStatement") {
             // left-hand side
             const variables = statement.variables
@@ -273,6 +367,10 @@ class MinifyFile {
             return result;
         }
         else if (statement.type == "CallStatement") {
+            const bareRequire = this.tryInlineBareRequireStatement(statement.expression);
+            if (bareRequire) {
+                return bareRequire;
+            }
             return this.formatExpression(statement.expression); // NOTE: もう一度囲んでもいい
         }
         else if (statement.type == "IfStatement") {
@@ -414,13 +512,7 @@ class MinifyFile {
   }*/
     formatExpression(expression, argOptions) {
         if (expression.type == "Identifier") {
-            return this.sourceNodeHelper(expression, 
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error
-            //@ts-ignore
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            expression.isLocal
-                ? this.generateIdentifier(expression, true)
-                : expression.name, expression.name);
+            return this.generateIdentifier(expression);
         }
         else if (expression.type == "StringLiteral" ||
             expression.type == "NumericLiteral" ||
@@ -500,22 +592,11 @@ class MinifyFile {
             return result;
         }
         else if (expression.type == "CallExpression") {
-            // requireの展開モードは2種類: SLモード-その場に読み込み, FLモード-require相当の関数で呼び出し
-            const callExpr = this.formatBase(expression.base).toString();
-            if ((callExpr === "require" || callExpr === "dofile") &&
-                expression?.arguments[0].type === "StringLiteral") {
-                const moduleName = expression.arguments[0].raw
-                    .replaceAll('"', "")
-                    .replaceAll("'", "");
-                const res = this.minifier.parseModule(moduleName);
-                if (this.mode.moduleLikeLua) {
-                    if (callExpr === "dofile") {
-                        return (res || this.sourceNodeHelper(undefined, ""));
-                    }
-                    // requireならスキップ
-                }
-                else {
-                    return (res || this.sourceNodeHelper(undefined, ""));
+            const moduleRef = this.matchModuleCallExpression(expression);
+            if (moduleRef) {
+                const replacement = this.formatModuleReference(expression, moduleRef);
+                if (replacement) {
+                    return replacement;
                 }
             }
             const args = expression.arguments
@@ -535,6 +616,13 @@ class MinifyFile {
             ]);
         }
         else if (expression.type == "StringCallExpression") {
+            const moduleRef = this.matchModuleCallExpression(expression);
+            if (moduleRef) {
+                const replacement = this.formatModuleReference(expression, moduleRef);
+                if (replacement) {
+                    return replacement;
+                }
+            }
             return this.sourceNodeHelper(expression, [
                 this.formatExpression(expression.base),
                 this.formatExpression(expression.argument),
@@ -637,43 +725,58 @@ class MinifyFile {
         }
         return result;
     }
-    currentIdentifier = "";
-    generateIdentifier(nameItem, nested = false) {
-        if (nameItem.name === "self") {
-            return this.sourceNodeHelper(nameItem, "self", "self");
-        }
-        const defined = this.minifier.identifierMap.get(nameItem.name);
-        if (defined) {
-            return this.sourceNodeHelper(nameItem, defined, nameItem.name); // 第3引数は要調査
-        }
-        const length = this.currentIdentifier.length;
-        let position = length - 1;
-        let character;
-        let index;
-        while (position >= 0) {
-            character = this.currentIdentifier.charAt(position);
-            index = IDENTIFIER_PARTS.indexOf(character);
-            if (index != IDENTIFIER_PARTS.length - 1) {
-                this.currentIdentifier =
-                    this.currentIdentifier.substring(0, position) +
-                        IDENTIFIER_PARTS[index + 1] +
-                        generateZeroes(length - (position + 1));
-                if (isKeyword(this.currentIdentifier) ||
-                    this.minifier.identifiersInUse.has(this.currentIdentifier)) {
-                    return this.generateIdentifier(nameItem, nested);
-                }
-                this.minifier.identifierMap.set(nameItem.name, this.currentIdentifier);
-                return this.generateIdentifier(nameItem, nested);
-            }
-            --position;
+    // require/dofileへの静的な呼び出しを検出する。実際のモジュール解決はLinkパス
+    // （Minifier.link）が事前に済ませているため、ここでは呼び出し形が
+    // require/dofile への静的文字列呼び出しかどうかを判定するだけでよい（#18）。
+    matchModuleCall(base, argument) {
+        if (base.type !== "Identifier") {
+            return undefined;
+        }
+        if (base.name !== "require" && base.name !== "dofile") {
+            return undefined;
+        }
+        const moduleName = (0, linker_1.staticStringArgument)(argument);
+        if (moduleName === undefined) {
+            return undefined;
+        }
+        return { kind: base.name, moduleName };
+    }
+    // CallExpression / StringCallExpression のどちらの構文でも呼べるmatchModuleCall
+    matchModuleCallExpression(expr) {
+        if (expr.type === "CallExpression") {
+            return this.matchModuleCall(expr.base, expr.arguments[0]);
+        }
+        if (expr.type === "StringCallExpression") {
+            return this.matchModuleCall(expr.base, expr.argument);
         }
-        this.currentIdentifier = "a" + generateZeroes(length);
-        if (this.minifier.identifiersInUse.has(this.currentIdentifier)) {
-            return this.generateIdentifier(nameItem, nested);
+        return undefined;
+    }
+    formatModuleReference(expression, ref) {
+        if (ref.kind === "dofile") {
+            // dofileは呼び出しごとに毎回展開しなおす（キャッシュしない）
+            return this.minifier.printModuleInline(ref.moduleName);
+        }
+        if (!this.mode.moduleLikeLua) {
+            // SLモード（無オプション）: requireもキャッシュせずその場展開する
+            // （挙動互換性のため、ホイストした共有ローカルへの参照にはしない）。
+            // 式の位置に置けるようにIIFEで包む。
+            const body = this.minifier.printModuleInline(ref.moduleName);
+            return this.sourceNodeHelper(expression, [
+                "(function() ",
+                body,
+                " end)()",
+            ]);
         }
-        this.minifier.identifierMap.set(nameItem.name, this.currentIdentifier);
-        return this.generateIdentifier(nameItem, nested);
-        //    return this.sourceNodeHelper(nameItem, nameItem.name, nested ? nameItem.name : undefined);
+        // -mモードのrequireはそのまま呼び出しとして出力し、実行時のrequire関数に委ねる
+        return undefined;
+    }
+    // Renameパス（#20）が解決済みシンボルテーブルをもとに割り当てた短縮名を参照する。
+    // 対応するローカルシンボルが無い場合（グローバル参照や"self"）は元の名前のまま出力する。
+    generateIdentifier(nameItem) {
+        const renamed = this.minifier
+            .getRenameResult(this.moduleName)
+            .nameOf(nameItem);
+        return this.sourceNodeHelper(nameItem, renamed ?? nameItem.name, nameItem.name);
     }
 }
 exports.MinifyFile = MinifyFile;

package/dist/cli.js

@@ -8,11 +8,15 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const commander_1 = require("commander");
 const minifier_1 = require("./minifier");
+const output_1 = require("./output");
 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に近づけます");
+    .option("-m, --module-like-lua", "require・dofileの動作を実際のLuaに近づけます")
+    .option("--no-rename", "識別子の短縮(リネーム)を無効にします（デバッグ用途）")
+    .option("--single-line-source-mapping-url", "sourceMappingURLアノテーションを単一行の--コメントで出力します（Source Map仕様の「最終行」ルールに従いますが、既定の複数行ブロックコメント形式を前提とするツールとは組み合わせられません）")
+    .option("--strict-source-mapping-url", "sourceMappingURLアノテーションをLuaコメントで一切包まず、Source Map仕様のマーカー文字列(//# sourceMappingURL=...)そのままを出力します。Luaの文法上この形式と有効なLuaコードは両立できないため、出力ファイルの最終行は有効なLua文ではなくなります");
 program.parse(process.argv);
 const luaFiles = program.args;
 const luaparseSetting = {
@@ -21,7 +25,14 @@ const luaparseSetting = {
     ranges: true,
     scope: true,
 };
-const mode = program.opts();
+const { singleLineSourceMappingUrl, strictSourceMappingUrl, ...mode } = program.opts();
+// 既定は旧バージョンと互換の複数行ブロックコメント("legacy")。
+// --strict-source-mapping-url > --single-line-source-mapping-url の優先順で上書きする。
+const sourceMappingUrlStyle = strictSourceMappingUrl
+    ? "strict"
+    : singleLineSourceMappingUrl
+        ? "line"
+        : "legacy";
 luaFiles.forEach((fileName) => {
     const parsedFileName = path_1.default.parse(fileName);
     if (fs_1.default.existsSync(fileName)) {
@@ -36,10 +47,9 @@ luaFiles.forEach((fileName) => {
             name: parsedFileName.name,
             ext: parsedFileName.ext + ".map",
         });
-        map.add("\n--[[\n//# sourceMappingURL=" + mapFileName + "\n]]");
-        const sourceAndMap = map.toStringWithSourceMap();
-        fs_1.default.writeFileSync(minFileName, sourceAndMap.code);
-        fs_1.default.writeFileSync(mapFileName, JSON.stringify(sourceAndMap.map));
+        const { code, map: mapJson } = (0, output_1.buildMinifiedOutput)(map, minFileName, mapFileName, { sourceMappingUrlStyle });
+        fs_1.default.writeFileSync(minFileName, code);
+        fs_1.default.writeFileSync(mapFileName, mapJson);
     }
     else {
         console.error("No such file: " + fileName);

package/dist/index.js

@@ -4,38 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const luaparse_1 = __importDefault(require("luaparse"));
 const node_process_1 = require("node:process");
 const ast2lua_1 = require("./ast2lua");
 const luaparseSetting = {
     locations: true,
-    luaVersion: "5.3",
+    luaVersion: '5.3',
     ranges: true,
     scope: true,
 };
 const argPath = node_process_1.argv[2];
-const includes = new Set();
-function requireHelper(fileName) {
-    const resolvePath = path_1.default.join(path_1.default.dirname(argPath), fileName.replaceAll(".", path_1.default.sep) + ".lua");
-    if (!includes.has(resolvePath) && fs_1.default.existsSync(resolvePath)) {
-        const code = fs_1.default.readFileSync(resolvePath).toString();
-        const ast = luaparse_1.default.parse(code, luaparseSetting);
-        if ("globals" in ast) {
-            return new ast2lua_1.Minifier(resolvePath, ast, requireHelper).parse();
-        }
-    }
-    else {
-        return undefined;
-    }
-    includes.add(resolvePath);
-}
 if (fs_1.default.existsSync(argPath)) {
     const code = fs_1.default.readFileSync(argPath).toString();
     const ast = luaparse_1.default.parse(code, luaparseSetting);
     if ("globals" in ast) {
-        const map = new ast2lua_1.Minifier(argPath, ast, requireHelper).parse();
-        map.add("\n--[[\n//# sourceMappingURL=" + argPath + ".map\n]]");
+        const map = (0, ast2lua_1.minify)(ast);
+        map.add("\n--[[\n//# sourceMappingURL=test.lua.map\n]]");
         console.log(map.toStringWithSourceMap().code);
         // toStringWithSourceMap().map の file に書き出したのちのファイル名を入れないとVSCode Extでは検索失敗する
         //console.log(JSON.stringify(map.toStringWithSourceMap().map));