@storm-software/workspace-tools 1.16.17 → 1.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.16.17",
+  "version": "1.17.0",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [
@@ -32,6 +32,7 @@
   "main": "./index",
   "typings": "./index.d.ts",
   "dependencies": {
+    "@anatine/esbuild-decorators": "^0.2.19",
     "@microsoft/api-extractor": "^7.38.3",
     "@nx/devkit": "17.0.3",
     "@nx/esbuild": "17.0.3",

package/src/executors/tsup/executor.js

@@ -578,6 +578,238 @@ var init_tslib_es6 = __esm({
   }
 });
 
+// node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/lib/strip-it.js
+var require_strip_it = __commonJS({
+  "node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/lib/strip-it.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.strip = void 0;
+    var TextNode = class {
+      constructor(node) {
+        this.type = node.type;
+        this.value = node.value;
+        this.match = node.match;
+        this.newline = node.newline || "";
+      }
+      get protected() {
+        return Boolean(this.match) && this.match[1] === "!";
+      }
+    };
+    var TextBlock = class extends TextNode {
+      constructor(node) {
+        super(node);
+        this.nodes = node.nodes || [];
+      }
+      push(node) {
+        this.nodes.push(node);
+      }
+      get protected() {
+        return this.nodes.length > 0 && this.nodes[0].protected === true;
+      }
+    };
+    var constants2 = {
+      ESCAPED_CHAR_REGEX: /^\\./,
+      QUOTED_STRING_REGEX: /^(['"`])((?:\\.|[^\1])+?)(\1)/,
+      NEWLINE_REGEX: /^\r*\n/,
+      BLOCK_OPEN_REGEX: /^\/\*\*?(!?)/,
+      BLOCK_CLOSE_REGEX: /^\*\/(\n?)/,
+      LINE_REGEX: /^\/\/(!?).*/
+    };
+    var parse = (input) => {
+      const cst = new TextBlock({ type: "root", nodes: [] });
+      const stack = [cst];
+      const { ESCAPED_CHAR_REGEX, QUOTED_STRING_REGEX, NEWLINE_REGEX, BLOCK_CLOSE_REGEX, BLOCK_OPEN_REGEX, LINE_REGEX } = constants2;
+      let block = cst;
+      let remaining = input;
+      let token;
+      let prev;
+      const consume = (value = remaining[0] || "") => {
+        remaining = remaining.slice(value.length);
+        return value;
+      };
+      const scan = (regex, type = "text") => {
+        const match2 = regex.exec(remaining);
+        if (match2) {
+          consume(match2[0]);
+          return { type, value: match2[0], match: match2 };
+        }
+      };
+      const push = (node) => {
+        if (prev && prev.type === "text" && node.type === "text") {
+          prev.value += node.value;
+          return;
+        }
+        block.push(node);
+        if (node.nodes) {
+          stack.push(node);
+          block = node;
+        }
+        prev = node;
+      };
+      const pop = () => {
+        if (block.type === "root") {
+          throw new SyntaxError("Unclosed block comment");
+        }
+        stack.pop();
+        block = stack[stack.length - 1];
+      };
+      while (remaining !== "") {
+        if (token = scan(ESCAPED_CHAR_REGEX, "text")) {
+          push(new TextNode(token));
+          continue;
+        }
+        if (block.type !== "block" && (!prev || !/\w$/.test(prev.value))) {
+          if (token = scan(QUOTED_STRING_REGEX, "line")) {
+            push(new TextNode(token));
+            continue;
+          }
+        }
+        if (token = scan(NEWLINE_REGEX, "newline")) {
+          push(new TextNode(token));
+          continue;
+        }
+        if (token = scan(BLOCK_OPEN_REGEX, "open")) {
+          push(new TextBlock({ type: "block" }));
+          push(new TextNode(token));
+          continue;
+        }
+        if (block.type === "block") {
+          if (token = scan(BLOCK_CLOSE_REGEX, "close")) {
+            token.newline = token.match[1] || "";
+            push(new TextNode(token));
+            pop();
+            continue;
+          }
+        }
+        if (block.type !== "block") {
+          if (token = scan(LINE_REGEX, "line")) {
+            push(new TextNode(token));
+            continue;
+          }
+        }
+        push(new TextNode({ type: "text", value: consume(remaining[0]) }));
+      }
+      return cst;
+    };
+    var compile = (cst) => {
+      const walk = (node) => {
+        let output = "";
+        for (const child of node.nodes) {
+          switch (child.type) {
+            case "block":
+              break;
+            case "line":
+              break;
+            case "open":
+            case "close":
+            case "text":
+            case "newline":
+            default: {
+              output += child.value || "";
+              break;
+            }
+          }
+        }
+        return output;
+      };
+      return walk(cst);
+    };
+    var strip = (input) => compile(parse(input));
+    exports.strip = strip;
+  }
+});
+
+// node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/lib/esbuild-decorators.js
+var require_esbuild_decorators = __commonJS({
+  "node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/lib/esbuild-decorators.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.esbuildDecorators = void 0;
+    var tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
+    var fs_1 = require("fs");
+    var path_1 = require("path");
+    var typescript_1 = require("typescript");
+    var util_1 = require("util");
+    var strip_it_1 = require_strip_it();
+    var { readFile } = fs_1.promises;
+    var theFinder = new RegExp(/((?<![(\s]\s*['"])@\w[.[\]\w\d]*\s*(?![;])[((?=\s)])/);
+    var findDecorators = (fileContent) => theFinder.test((0, strip_it_1.strip)(fileContent));
+    var esbuildDecorators2 = (options = {}) => ({
+      name: "tsc",
+      setup(build2) {
+        var _a, _b, _c;
+        const cwd = options.cwd || process.cwd();
+        const tsconfigPath = options.tsconfig || ((_a = build2.initialOptions) === null || _a === void 0 ? void 0 : _a.tsconfig) || (0, path_1.join)(cwd, "./tsconfig.json");
+        const forceTsc = (_b = options.force) !== null && _b !== void 0 ? _b : false;
+        const tsx = (_c = options.tsx) !== null && _c !== void 0 ? _c : true;
+        let parsedTsConfig = null;
+        build2.onLoad({ filter: tsx ? /\.tsx?$/ : /\.ts$/ }, (args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+          if (!parsedTsConfig) {
+            parsedTsConfig = parseTsConfig(tsconfigPath, cwd);
+            if (parsedTsConfig.options.sourcemap) {
+              parsedTsConfig.options.sourcemap = false;
+              parsedTsConfig.options.inlineSources = true;
+              parsedTsConfig.options.inlineSourceMap = true;
+            }
+          }
+          if (!forceTsc && (!parsedTsConfig || !parsedTsConfig.options || !parsedTsConfig.options.emitDecoratorMetadata)) {
+            return;
+          }
+          const ts2 = yield readFile(args.path, "utf8").catch((err) => printDiagnostics({ file: args.path, err }));
+          const hasDecorator = findDecorators(ts2);
+          if (!ts2 || !hasDecorator) {
+            return;
+          }
+          const program = (0, typescript_1.transpileModule)(ts2, {
+            compilerOptions: parsedTsConfig.options
+          });
+          return { contents: program.outputText };
+        }));
+      }
+    });
+    exports.esbuildDecorators = esbuildDecorators2;
+    function parseTsConfig(tsconfig, cwd = process.cwd()) {
+      const fileName = (0, typescript_1.findConfigFile)(cwd, typescript_1.sys.fileExists, tsconfig);
+      if (tsconfig !== void 0 && !fileName)
+        throw new Error(`failed to open '${fileName}'`);
+      let loadedConfig = {};
+      let baseDir = cwd;
+      if (fileName) {
+        const text = typescript_1.sys.readFile(fileName);
+        if (text === void 0)
+          throw new Error(`failed to read '${fileName}'`);
+        const result = (0, typescript_1.parseConfigFileTextToJson)(fileName, text);
+        if (result.error !== void 0) {
+          printDiagnostics(result.error);
+          throw new Error(`failed to parse '${fileName}'`);
+        }
+        loadedConfig = result.config;
+        baseDir = (0, path_1.dirname)(fileName);
+      }
+      const parsedTsConfig = (0, typescript_1.parseJsonConfigFileContent)(loadedConfig, typescript_1.sys, baseDir);
+      if (parsedTsConfig.errors[0])
+        printDiagnostics(parsedTsConfig.errors);
+      return parsedTsConfig;
+    }
+    function printDiagnostics(...args) {
+      console.log((0, util_1.inspect)(args, false, 10, true));
+    }
+  }
+});
+
+// node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/index.js
+var require_src = __commonJS({
+  "node_modules/.pnpm/@anatine+esbuild-decorators@0.2.19_esbuild@0.14.54/node_modules/@anatine/esbuild-decorators/src/index.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.esbuildDecorators = void 0;
+    var esbuild_decorators_1 = require_esbuild_decorators();
+    Object.defineProperty(exports, "esbuildDecorators", { enumerable: true, get: function() {
+      return esbuild_decorators_1.esbuildDecorators;
+    } });
+  }
+});
+
 // node_modules/.pnpm/@nx+devkit@17.0.3_nx@17.0.3/node_modules/@nx/devkit/nx.js
 var require_nx = __commonJS({
   "node_modules/.pnpm/@nx+devkit@17.0.3_nx@17.0.3/node_modules/@nx/devkit/nx.js"(exports) {
@@ -18232,9 +18464,9 @@ var require_devkit = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_esbuild@0.19_vbyowgz6rmzdfdmc4dxwplxleu/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js
+// node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_esbuild@0.14_jlzadk2xcsikuhpeek3jtu6zra/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js
 var require_get_extra_dependencies = __commonJS({
-  "node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_esbuild@0.19_vbyowgz6rmzdfdmc4dxwplxleu/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js"(exports) {
+  "node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_esbuild@0.14_jlzadk2xcsikuhpeek3jtu6zra/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getExtraDependencies = void 0;
@@ -37234,7 +37466,7 @@ var require_library = __commonJS({
 });
 
 // node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/src/index.js
-var require_src = __commonJS({
+var require_src2 = __commonJS({
   "node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.8.10_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/src/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -98354,9 +98586,10 @@ __export(executor_exports, {
   tsupExecutor: () => tsupExecutor
 });
 module.exports = __toCommonJS(executor_exports);
+var import_esbuild_decorators = __toESM(require_src());
 var import_devkit = __toESM(require_devkit());
 var import_get_extra_dependencies = __toESM(require_get_extra_dependencies());
-var import_js = __toESM(require_src());
+var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
 var import_decky = __toESM(require_decky());
@@ -105207,7 +105440,7 @@ ${externalDependencies.map((dep) => {
         files.map(
           (file) => (0, import_promises2.writeFile)(
             file,
-            `// ${options.banner}
+            `${options.banner.startsWith("//") ? options.banner : `// ${options.banner}`}
 
 ${(0, import_fs2.readFileSync)(file, "utf-8")}`,
             "utf-8"
@@ -105216,6 +105449,12 @@ ${(0, import_fs2.readFileSync)(file, "utf-8")}`,
       );
     }
     options.plugins.push(await (0, import_decky.load)());
+    options.plugins.push(
+      (0, import_esbuild_decorators.esbuildDecorators)({
+        tsconfig: options.tsConfig,
+        cwd: workspaceRoot
+      })
+    );
     const eventEmitter = new import_node_events.EventEmitter({ captureRejections: true });
     eventEmitter.on("message", (event) => {
       console.log(`\u{1F4E2}  Tsup build message: 
@@ -105241,11 +105480,14 @@ ${(0, import_fs2.readFileSync)(file, "utf-8")}`,
           context
         )
       ),
-      banner: options.banner ? { js: `// ${options.banner}
+      banner: options.banner ? {
+        js: `${options.banner.startsWith("//") ? options.banner : `// ${options.banner}`}
 
-`, css: `/* ${options.banner} */
+`,
+        css: `/* ${options.banner.startsWith("//") ? options.banner.replace("//", "") : options.banner} */
 
-` } : void 0,
+`
+      } : void 0,
       outputPath
     });
     if (typeof config === "function") {