Merge branch 'main' of git.zomo.dev:zomo/browser-scripts-builder into main

lib/build.js

@@ -7,21 +7,19 @@ const esbuild_1 = require("esbuild");
 const fs_1 = require("fs");
 const paths_1 = require("./paths");
 const readmeta_1 = __importDefault(require("./readmeta"));
-async function default_1(name, watchCallback = false) {
+const prettier_1 = require("prettier");
+function default_1(name, watchCallback, PrettierConfig, CLIArgs) {
     //read meta file
     let [metaJson, metaString] = (0, readmeta_1.default)(name);
-    let outPath = (0, paths_1.DistPath)(name);
+    let pathDist = (0, paths_1.DistPath)(name);
-    let error = null;
+    let result = runEsbuild({
-    console.log('build watch?', !watchCallback ? false : 'obj');
-    try {
-        await (0, esbuild_1.build)({
         entryPoints: [(0, paths_1.ScriptPath)(name).main],
-            outfile: outPath,
+        outfile: pathDist,
         target: 'esnext',
         platform: 'node',
         format: 'esm',
         bundle: true,
-            minify: false,
+        minify: CLIArgs.minify,
         define: {
             UserScriptName: `'${metaJson.name}'`,
             UserScriptNamespace: `'${metaJson.namespace}'`,
@@ -30,23 +28,110 @@ async function default_1(name, watchCallback = false) {
             UserScriptSupportURL: `'${metaJson.supportURL}'`,
             UserScriptHomepageURL: `'${metaJson.homepageURL}'`,
         },
-        });
+    }, result => {
-    }
+        let error = runPostEsbuild(name, result, metaString, CLIArgs, PrettierConfig);
-    catch (err) {
+        watchCallback(metaJson, error);
-        console.error(name, err);
+    }, CLIArgs);
-        error = err.message;
+    let error = runPostEsbuild(name, result, metaString, CLIArgs, PrettierConfig);
-    }
-    //add UserScript header
-    if ((0, fs_1.existsSync)(outPath)) {
-        if (!error) {
-            let content = (0, fs_1.readFileSync)(outPath).toString();
-            (0, fs_1.writeFileSync)(outPath, metaString + content);
-        }
-        else {
-            (0, fs_1.unlinkSync)(outPath);
-        }
-    }
     return [metaJson, error];
 }
 exports.default = default_1;
+function doErrorFile(pathError, pathOutFile, error) {
+    if (error !== null) {
+        (0, fs_1.writeFileSync)(pathError, `${new Date().toISOString()}\n\n${error}`);
+        if ((0, fs_1.existsSync)(pathOutFile)) {
+            (0, fs_1.unlinkSync)(pathOutFile);
+        }
+    }
+    else if ((0, fs_1.existsSync)(pathError)) {
+        (0, fs_1.unlinkSync)(pathError);
+    }
+}
+function runEsbuild(opts, watchCallback, CLIArgs) {
+    opts.write = false;
+    if (CLIArgs.watch) {
+        opts.watch = {
+            onRebuild(err, res) {
+                if (err) {
+                    watchCallback({
+                        content: null,
+                        error: err.message,
+                        errorRaw: err,
+                    });
+                }
+                else if (res) {
+                    let content = '';
+                    if (res.outputFiles && res.outputFiles.length > 0) {
+                        content = res.outputFiles[0].text;
+                    }
+                    if (content === '') {
+                        watchCallback({
+                            content: null,
+                            error: 'No output',
+                        });
+                    }
+                    watchCallback({
+                        content,
+                        error: null,
+                    });
+                }
+                else {
+                    watchCallback({
+                        content: null,
+                        error: 'No result',
+                    });
+                }
+            },
+        };
+    }
+    try {
+        let res = (0, esbuild_1.buildSync)(opts);
+        let content = '';
+        if (res.outputFiles && res.outputFiles.length > 0) {
+            content = clearFilenameComments(res.outputFiles[0].text);
+        }
+        if (content === '') {
+            return {
+                content: null,
+                error: 'No output',
+            };
+        }
+        return {
+            content,
+            error: null,
+        };
+    }
+    catch (err) {
+        return {
+            content: null,
+            error: err.message,
+        };
+    }
+}
+function runPostEsbuild(name, result, metaString, CLIArgs, PrettierConfig) {
+    let error = null;
+    let path = (0, paths_1.ScriptPath)(name);
+    let pathDist = (0, paths_1.DistPath)(name);
+    if (result.error) {
+        console.error(name, result.errorRaw || result.error);
+        error = result.error;
+    }
+    else if (result.content) {
+        let content = metaString + result.content;
+        if (CLIArgs.prettier) {
+            content = (0, prettier_1.format)(content, PrettierConfig);
+        }
+        (0, fs_1.writeFileSync)(pathDist, content);
+    }
+    else {
+        console.error(name, 'No output');
+    }
+    doErrorFile(path.error, pathDist, error);
+    return error;
+}
+//remove all filename comments
+function clearFilenameComments(content) {
+    let regexp = new RegExp(`//\\s*${paths_1.ScriptBase}/.*(?:\\n|$)`, 'g');
+    return content.replace(regexp, '');
+}
 //# sourceMappingURL=build.js.map

lib/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":";;;;;AAAA,qCAA6C;AAC7C,2BAAwE;AACxE,mCAA8C;AAE9C,0DAAiC;AAElB,KAAK,oBAChB,IAAY,EACZ,gBAEc,KAAK;IAEnB,gBAAgB;IAChB,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAA;IAC3C,IAAI,OAAO,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAA;IAE5B,IAAI,KAAK,GAAkB,IAAI,CAAA;IAE/B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE3D,IAAI;QACA,MAAM,IAAA,eAAK,EAAC;YACR,WAAW,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;YACpC,OAAO,EAAE,OAAO;YAEhB,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,KAAK;YAEb,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,KAAK;YAEb,MAAM,EAAE;gBACJ,cAAc,EAAE,IAAI,QAAQ,CAAC,IAAI,GAAG;gBACpC,mBAAmB,EAAE,IAAI,QAAQ,CAAC,SAAS,GAAG;gBAC9C,iBAAiB,EAAE,IAAI,QAAQ,CAAC,OAAO,GAAG;gBAE1C,qBAAqB,EAAE,IAAI,QAAQ,CAAC,WAAW,GAAG;gBAClD,oBAAoB,EAAE,IAAI,QAAQ,CAAC,UAAU,GAAG;gBAChD,qBAAqB,EAAE,IAAI,QAAQ,CAAC,WAAW,GAAG;aACrD;SACJ,CAAC,CAAA;KACL;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACxB,KAAK,GAAI,GAAoB,CAAC,OAAO,CAAA;KACxC;IAED,uBAAuB;IACvB,IAAI,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE;QACrB,IAAI,CAAC,KAAK,EAAE;YACR,IAAI,OAAO,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;YAC9C,IAAA,kBAAa,EAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,CAAA;SAC/C;aAAM;YACH,IAAA,eAAU,EAAC,OAAO,CAAC,CAAA;SACtB;KACJ;IAED,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC5B,CAAC;AApDD,4BAoDC"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}

lib/main.js

@@ -5,11 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const command_line_args_1 = __importDefault(require("command-line-args"));
+const prettier_1 = require("prettier");
 const paths_1 = require("./paths");
 const readmefile_1 = require("./readmefile");
 const build_1 = __importDefault(require("./build"));
 const CLIArgs = (0, command_line_args_1.default)([
-    { name: 'watch', alias: 'w', type: Boolean },
+    { name: 'watch', alias: 'w', type: Boolean, defaultValue: false },
+    { name: 'minify', alias: 'm', type: Boolean, defaultValue: false },
+    { name: 'prettier', alias: 'p', type: Boolean, defaultValue: false },
 ]);
 //if package.json doesn't exist then there is no point in continuing
 if (!(0, fs_1.existsSync)('package.json') || !(0, fs_1.lstatSync)('package.json').isFile()) {
@@ -18,10 +21,18 @@ if (!(0, fs_1.existsSync)('package.json') || !(0, fs_1.lstatSync)('package.json'
 }
 //delete compiled scripts
 (0, fs_1.readdirSync)(paths_1.DistBase).forEach(file => (0, fs_1.unlinkSync)(`${paths_1.DistBase}/${file}`));
-(async () => {
+//read prettierrc file and make sure `babel` is the configured parser
-    let scripts = (0, fs_1.readdirSync)(paths_1.ScriptBase);
+const PrettierConfig = (() => {
-    let scriptMeta = [];
+    let config = prettier_1.resolveConfig.sync(process.cwd()) || {};
-    for (let name of scripts) {
+    return {
+        ...config,
+        parser: 'babel',
+    };
+})();
+//compile scripts
+let scripts = (0, fs_1.readdirSync)(paths_1.ScriptBase);
+let scriptMeta = [];
+for (let name of scripts) {
     let path = (0, paths_1.ScriptPath)(name);
     if (!name.endsWith('_') &&
         (0, fs_1.existsSync)(path.dir) &&
@@ -30,32 +41,15 @@ if (!(0, fs_1.existsSync)('package.json') || !(0, fs_1.lstatSync)('package.json'
         (0, fs_1.lstatSync)(path.main).isFile()) {
         let id = scriptMeta.length;
         function postWatchUpdate(meta, error) {
-                console.log('watch callback');
             scriptMeta[id] = { meta, error };
-                doErrorFile(path.error, (0, paths_1.DistPath)(name), error);
             console.log('WATCH', name, meta.version);
             (0, readmefile_1.updateReadmeFile)(scriptMeta);
         }
-            let [meta, error] = await (0, build_1.default)(name, CLIArgs.watch ? postWatchUpdate : false);
+        let [meta, error] = (0, build_1.default)(name, postWatchUpdate, PrettierConfig, CLIArgs);
         scriptMeta[id] = { meta, error };
         console.log(name, meta.version);
-            doErrorFile(path.error, (0, paths_1.DistPath)(name), error);
-        }
-    }
-    (0, readmefile_1.updateReadmeFile)(scriptMeta);
-    console.log('\nFinished Compiling\n');
-    if (CLIArgs.watch)
-        console.log('Listening for Changes\n');
-})();
-function doErrorFile(pathError, pathOutFile, error) {
-    if (error !== null) {
-        (0, fs_1.writeFileSync)(pathError, `${new Date().toISOString()}\n\n${error}`);
-        if ((0, fs_1.existsSync)(pathOutFile)) {
-            (0, fs_1.unlinkSync)(pathOutFile);
-        }
-    }
-    else if ((0, fs_1.existsSync)(pathError)) {
-        (0, fs_1.unlinkSync)(pathError);
     }
 }
+(0, readmefile_1.updateReadmeFile)(scriptMeta);
+console.log(`\nFinished Compiling\n${CLIArgs.watch ? 'Listening for Changes\n' : ''}`);
 //# sourceMappingURL=main.js.map

lib/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;AAAA,2BAMW;AACX,0EAA+C;AAC/C,mCAAoE;AACpE,6CAA2D;AAC3D,oDAA8B;AAG9B,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC;IAC5B,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE;CAC/C,CAEA,CAAA;AAED,oEAAoE;AACpE,IAAI,CAAC,IAAA,eAAU,EAAC,cAAc,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,cAAc,CAAC,CAAC,MAAM,EAAE,EAAE;IACpE,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAClB;AAED,yBAAyB;AACzB,IAAA,gBAAW,EAAC,gBAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,eAAU,EAAC,GAAG,gBAAQ,IAAI,IAAI,EAAE,CAAC,CAAC,CAGvE;AAAA,CAAC,KAAK,IAAI,EAAE;IACT,IAAI,OAAO,GAAG,IAAA,gBAAW,EAAC,kBAAU,CAAC,CAAA;IACrC,IAAI,UAAU,GAAiB,EAAE,CAAA;IAEjC,KAAK,IAAI,IAAI,IAAI,OAAO,EAAE;QACtB,IAAI,IAAI,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAA;QAE3B,IACI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,IAAA,eAAU,EAAC,IAAI,CAAC,GAAG,CAAC;YACpB,IAAA,cAAS,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YACjC,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC;YACrB,IAAA,cAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAC/B;YACE,IAAI,EAAE,GAAG,UAAU,CAAC,MAAM,CAAA;YAE1B,SAAS,eAAe,CACpB,IAAwB,EACxB,KAAoB;gBAEpB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;gBAC7B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;gBAChC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAA;gBAE9C,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;gBAExC,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;YAChC,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,eAAQ,EAC9B,IAAI,EACJ,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAC1C,CAAA;YACD,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;YAEhC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAE/B,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAA;SACjD;KACJ;IAED,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;IAE5B,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;IACrC,IAAI,OAAO,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;AAC7D,CAAC,CAAC,EAAE,CAAA;AAEJ,SAAS,WAAW,CAChB,SAAiB,EACjB,WAAmB,EACnB,KAAoB;IAEpB,IAAI,KAAK,KAAK,IAAI,EAAE;QAChB,IAAA,kBAAa,EAAC,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,EAAE,CAAC,CAAA;QAEnE,IAAI,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;YACzB,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;SAC1B;KACJ;SAAM,IAAI,IAAA,eAAU,EAAC,SAAS,CAAC,EAAE;QAC9B,IAAA,eAAU,EAAC,SAAS,CAAC,CAAA;KACxB;AACL,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;AAAA,2BAAmE;AACnE,0EAA+C;AAC/C,uCAAwC;AACxC,mCAA0D;AAC1D,6CAA2D;AAC3D,oDAA8B;AAS9B,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC;IAC5B,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IACjE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAClE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;CACvE,CAAY,CAAA;AAEb,oEAAoE;AACpE,IAAI,CAAC,IAAA,eAAU,EAAC,cAAc,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,cAAc,CAAC,CAAC,MAAM,EAAE,EAAE;IACpE,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAClB;AAED,yBAAyB;AACzB,IAAA,gBAAW,EAAC,gBAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,eAAU,EAAC,GAAG,gBAAQ,IAAI,IAAI,EAAE,CAAC,CAAC,CAAA;AAExE,qEAAqE;AACrE,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;IACzB,IAAI,MAAM,GAAG,wBAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;IACpD,OAAO;QACH,GAAG,MAAM;QACT,MAAM,EAAE,OAAO;KAClB,CAAA;AACL,CAAC,CAAC,EAAE,CAAA;AAEJ,iBAAiB;AACjB,IAAI,OAAO,GAAG,IAAA,gBAAW,EAAC,kBAAU,CAAC,CAAA;AACrC,IAAI,UAAU,GAAiB,EAAE,CAAA;AAEjC,KAAK,IAAI,IAAI,IAAI,OAAO,EAAE;IACtB,IAAI,IAAI,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAA;IAE3B,IACI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QACnB,IAAA,eAAU,EAAC,IAAI,CAAC,GAAG,CAAC;QACpB,IAAA,cAAS,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;QACjC,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC;QACrB,IAAA,cAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAC/B;QACE,IAAI,EAAE,GAAG,UAAU,CAAC,MAAM,CAAA;QAE1B,SAAS,eAAe,CACpB,IAAwB,EACxB,KAAoB;YAEpB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;YAChC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YACxC,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;QAChC,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAA,eAAQ,EACxB,IAAI,EACJ,eAAe,EACf,cAAc,EACd,OAAO,CACV,CAAA;QACD,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;QAEhC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;KAClC;CACJ;AAED,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;AAE5B,OAAO,CAAC,GAAG,CACP,yBAAyB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5E,CAAA"}

package.json

@@ -19,14 +19,15 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@types/command-line-args": "^5.2.0",
         "command-line-args": "^5.2.1",
         "esbuild": "^0.14.42",
-        "typescript": "^4.7.3"
+        "typescript": "^4.7.3",
+        "prettier": "^2.6.2"
     },
     "devDependencies": {
+        "@types/command-line-args": "^5.2.0",
         "@types/node": "^17.0.40",
-        "eslint": "^8.17.0",
+        "@types/prettier": "^2.6.3",
-        "prettier": "^2.6.2"
+        "eslint": "^8.17.0"
     }
 }

pnpm-lock.yaml

@@ -3,6 +3,7 @@ lockfileVersion: 5.4
 specifiers:
   '@types/command-line-args': ^5.2.0
   '@types/node': ^17.0.40
+  '@types/prettier': ^2.6.3
   command-line-args: ^5.2.1
   esbuild: ^0.14.42
   eslint: ^8.17.0
@@ -10,15 +11,16 @@ specifiers:
   typescript: ^4.7.3
 
 dependencies:
-  '@types/command-line-args': 5.2.0
   command-line-args: 5.2.1
   esbuild: 0.14.42
+  prettier: 2.6.2
   typescript: 4.7.3
 
 devDependencies:
+  '@types/command-line-args': 5.2.0
   '@types/node': 17.0.40
+  '@types/prettier': 2.6.3
   eslint: 8.17.0
-  prettier: 2.6.2
 
 packages:
 
@@ -56,12 +58,16 @@ packages:
 
   /@types/command-line-args/5.2.0:
     resolution: {integrity: sha512-UuKzKpJJ/Ief6ufIaIzr3A/0XnluX7RvFgwkV89Yzvm77wCh1kFaFmqN8XEnGcN62EuHdedQjEMb8mYxFLGPyA==}
-    dev: false
+    dev: true
 
   /@types/node/17.0.40:
     resolution: {integrity: sha512-UXdBxNGqTMtm7hCwh9HtncFVLrXoqA3oJW30j6XWp5BH/wu3mVeaxo7cq5benFdBw34HB3XDT2TRPI7rXZ+mDg==}
     dev: true
 
+  /@types/prettier/2.6.3:
+    resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
+    dev: true
+
   /acorn-jsx/5.3.2_acorn@8.7.1:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -715,7 +721,7 @@ packages:
     resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==}
     engines: {node: '>=10.13.0'}
     hasBin: true
-    dev: true
+    dev: false
 
   /punycode/2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}

readme.md

@@ -23,3 +23,27 @@ Root
 └───dist
     └───[each script folder].user.js
 ```
+
+if there is an error compiling a file, an `error.log` will be placed inside the source folder:
+
+```text
+Root
+├───<package.json/etc>
+└───scripts
+    └───[each script folder]
+        └───error.log
+```
+
+## Command Line Options
+
+```text
+--watch
+    alias: -w
+    automatically recompile on save
+--minify
+    alias: -m
+    minify output files
+--prettier
+    alias: -p
+    prettify output files
+```

src/build.ts

@@ -1,34 +1,32 @@
-import { build, BuildFailure } from 'esbuild'
+import { buildSync, BuildFailure, BuildOptions } from 'esbuild'
-import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'fs'
+import { existsSync, writeFileSync, unlinkSync } from 'fs'
-import { DistPath, ScriptPath } from './paths'
+import { DistPath, ScriptBase, ScriptPath } from './paths'
 import { UserScriptMetaFull } from './types'
 import readMeta from './readmeta'
+import { format, Options } from 'prettier'
+import { CLIArgs } from './main'
 
-export default async function (
+export default function (
     name: string,
-    watchCallback:
+    watchCallback: (meta: UserScriptMetaFull, error: string | null) => void,
-        | ((meta: UserScriptMetaFull, error: string | null) => void)
+    PrettierConfig: Options,
-        | false = false
+    CLIArgs: CLIArgs
-): Promise<[UserScriptMetaFull, string | null]> {
+): [UserScriptMetaFull, string | null] {
     //read meta file
     let [metaJson, metaString] = readMeta(name)
-    let outPath = DistPath(name)
+    let pathDist = DistPath(name)
 
-    let error: string | null = null
+    let result = runEsbuild(
-
+        {
-    console.log('build watch?', !watchCallback ? false : 'obj')
-
-    try {
-        await build({
             entryPoints: [ScriptPath(name).main],
-            outfile: outPath,
+            outfile: pathDist,
 
             target: 'esnext',
             platform: 'node',
             format: 'esm',
 
             bundle: true,
-            minify: false,
+            minify: CLIArgs.minify,
 
             define: {
                 UserScriptName: `'${metaJson.name}'`,
@@ -39,21 +37,148 @@ export default async function (
                 UserScriptSupportURL: `'${metaJson.supportURL}'`,
                 UserScriptHomepageURL: `'${metaJson.homepageURL}'`,
             },
-        })
+        },
-    } catch (err) {
+        result => {
-        console.error(name, err)
+            let error = runPostEsbuild(
-        error = (err as BuildFailure).message
+                name,
-    }
+                result,
+                metaString,
+                CLIArgs,
+                PrettierConfig
+            )
+            watchCallback(metaJson, error)
+        },
+        CLIArgs
+    )
 
-    //add UserScript header
+    let error = runPostEsbuild(
-    if (existsSync(outPath)) {
+        name,
-        if (!error) {
+        result,
-            let content = readFileSync(outPath).toString()
+        metaString,
-            writeFileSync(outPath, metaString + content)
+        CLIArgs,
-        } else {
+        PrettierConfig
-            unlinkSync(outPath)
+    )
-        }
-    }
 
     return [metaJson, error]
 }
+
+function doErrorFile(
+    pathError: string,
+    pathOutFile: string,
+    error: string | null
+) {
+    if (error !== null) {
+        writeFileSync(pathError, `${new Date().toISOString()}\n\n${error}`)
+
+        if (existsSync(pathOutFile)) {
+            unlinkSync(pathOutFile)
+        }
+    } else if (existsSync(pathError)) {
+        unlinkSync(pathError)
+    }
+}
+
+interface RunEsbuildResult {
+    content: string | null
+    error: string | null
+    errorRaw?: BuildFailure
+}
+
+function runEsbuild(
+    opts: BuildOptions,
+    watchCallback: (result: RunEsbuildResult) => void,
+    CLIArgs: CLIArgs
+): RunEsbuildResult {
+    opts.write = false
+    if (CLIArgs.watch) {
+        opts.watch = {
+            onRebuild(err, res) {
+                if (err) {
+                    watchCallback({
+                        content: null,
+                        error: (err as BuildFailure).message,
+                        errorRaw: err,
+                    })
+                } else if (res) {
+                    let content = ''
+                    if (res.outputFiles && res.outputFiles.length > 0) {
+                        content = res.outputFiles[0].text
+                    }
+                    if (content === '') {
+                        watchCallback({
+                            content: null,
+                            error: 'No output',
+                        })
+                    }
+                    watchCallback({
+                        content,
+                        error: null,
+                    })
+                } else {
+                    watchCallback({
+                        content: null,
+                        error: 'No result',
+                    })
+                }
+            },
+        }
+    }
+
+    try {
+        let res = buildSync(opts)
+        let content = ''
+        if (res.outputFiles && res.outputFiles.length > 0) {
+            content = clearFilenameComments(res.outputFiles[0].text)
+        }
+        if (content === '') {
+            return {
+                content: null,
+                error: 'No output',
+            }
+        }
+        return {
+            content,
+            error: null,
+        }
+    } catch (err) {
+        return {
+            content: null,
+            error: (err as BuildFailure).message,
+        }
+    }
+}
+
+function runPostEsbuild(
+    name: string,
+    result: RunEsbuildResult,
+    metaString: string,
+    CLIArgs: CLIArgs,
+    PrettierConfig: Options
+) {
+    let error: string | null = null
+    let path = ScriptPath(name)
+    let pathDist = DistPath(name)
+
+    if (result.error) {
+        console.error(name, result.errorRaw || result.error)
+        error = result.error
+    } else if (result.content) {
+        let content = metaString + result.content
+        if (CLIArgs.prettier) {
+            content = format(content, PrettierConfig)
+        }
+        writeFileSync(pathDist, content)
+    } else {
+        console.error(name, 'No output')
+    }
+
+    doErrorFile(path.error, pathDist, error)
+
+    return error
+}
+
+//remove all filename comments
+function clearFilenameComments(content: string): string {
+    let regexp = new RegExp(`//\\s*${ScriptBase}/.*(?:\\n|$)`, 'g')
+    return content.replace(regexp, '')
+}

src/main.ts

@@ -1,22 +1,23 @@
-import {
+import { existsSync, lstatSync, readdirSync, unlinkSync } from 'fs'
-    existsSync,
-    lstatSync,
-    readdirSync,
-    unlinkSync,
-    writeFileSync,
-} from 'fs'
 import commandLineArgs from 'command-line-args'
-import { DistBase, DistPath, ScriptBase, ScriptPath } from './paths'
+import { resolveConfig } from 'prettier'
+import { DistBase, ScriptBase, ScriptPath } from './paths'
 import { readmeData, updateReadmeFile } from './readmefile'
 import runBuild from './build'
 import { UserScriptMetaFull } from './types'
 
-const CLIArgs = commandLineArgs([
+export interface CLIArgs {
-    { name: 'watch', alias: 'w', type: Boolean },
-]) as {
     watch: boolean
+    minify: boolean
+    prettier: boolean
 }
 
+const CLIArgs = commandLineArgs([
+    { name: 'watch', alias: 'w', type: Boolean, defaultValue: false },
+    { name: 'minify', alias: 'm', type: Boolean, defaultValue: false },
+    { name: 'prettier', alias: 'p', type: Boolean, defaultValue: false },
+]) as CLIArgs
+
 //if package.json doesn't exist then there is no point in continuing
 if (!existsSync('package.json') || !lstatSync('package.json').isFile()) {
     console.error('package.json not found, unwilling to run')
@@ -26,12 +27,20 @@ if (!existsSync('package.json') || !lstatSync('package.json').isFile()) {
 //delete compiled scripts
 readdirSync(DistBase).forEach(file => unlinkSync(`${DistBase}/${file}`))
 
-//compile scripts
+//read prettierrc file and make sure `babel` is the configured parser
-;(async () => {
+const PrettierConfig = (() => {
-    let scripts = readdirSync(ScriptBase)
+    let config = resolveConfig.sync(process.cwd()) || {}
-    let scriptMeta: readmeData[] = []
+    return {
+        ...config,
+        parser: 'babel',
+    }
+})()
 
-    for (let name of scripts) {
+//compile scripts
+let scripts = readdirSync(ScriptBase)
+let scriptMeta: readmeData[] = []
+
+for (let name of scripts) {
     let path = ScriptPath(name)
 
     if (
@@ -47,45 +56,25 @@ readdirSync(DistBase).forEach(file => unlinkSync(`${DistBase}/${file}`))
             meta: UserScriptMetaFull,
             error: string | null
         ) {
-                console.log('watch callback')
             scriptMeta[id] = { meta, error }
-                doErrorFile(path.error, DistPath(name), error)
-
             console.log('WATCH', name, meta.version)
-
             updateReadmeFile(scriptMeta)
         }
 
-            let [meta, error] = await runBuild(
+        let [meta, error] = runBuild(
             name,
-                CLIArgs.watch ? postWatchUpdate : false
+            postWatchUpdate,
+            PrettierConfig,
+            CLIArgs
         )
         scriptMeta[id] = { meta, error }
 
         console.log(name, meta.version)
-
-            doErrorFile(path.error, DistPath(name), error)
-        }
-    }
-
-    updateReadmeFile(scriptMeta)
-
-    console.log('\nFinished Compiling\n')
-    if (CLIArgs.watch) console.log('Listening for Changes\n')
-})()
-
-function doErrorFile(
-    pathError: string,
-    pathOutFile: string,
-    error: string | null
-) {
-    if (error !== null) {
-        writeFileSync(pathError, `${new Date().toISOString()}\n\n${error}`)
-
-        if (existsSync(pathOutFile)) {
-            unlinkSync(pathOutFile)
-        }
-    } else if (existsSync(pathError)) {
-        unlinkSync(pathError)
     }
 }
+
+updateReadmeFile(scriptMeta)
+
+console.log(
+    `\nFinished Compiling\n${CLIArgs.watch ? 'Listening for Changes\n' : ''}`
+)