@oclif/plugin-test-esbuild 0.4.11 → 0.4.12

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @oclif/plugin-test-esbuild
 $ bundle COMMAND
 running command...
 $ bundle (--version)
-@oclif/plugin-test-esbuild/0.4.11 linux-x64 node-v20.12.0
+@oclif/plugin-test-esbuild/0.4.12 linux-x64 node-v20.12.1
 $ bundle --help [COMMAND]
 USAGE
   $ bundle COMMAND

package/dist/{chunk-BYUSTTOD.js → chunk-CIX6RJY7.js}

@@ -4226,7 +4226,7 @@ var require_typescript = __commonJS({
         "src/compiler/corePublic.ts"() {
           "use strict";
           versionMajorMinor = "5.4";
-          version = "5.4.3";
+          version = "5.4.4";
           Comparison = /* @__PURE__ */ ((Comparison3) => {
             Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
             Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9877,14 +9877,17 @@ ${lanes.join("\n")}
           pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
         }
       }
-      function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
+      function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp) {
         const fileWatcherCallbacks = createMultiMap();
+        const fileTimestamps = fsWatchWithTimestamp ? /* @__PURE__ */ new Map() : void 0;
         const dirWatchers = /* @__PURE__ */ new Map();
         const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
         return nonPollingWatchFile;
         function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
           const filePath = toCanonicalName(fileName);
-          fileWatcherCallbacks.add(filePath, callback);
+          if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+            fileTimestamps.set(filePath, getModifiedTime3(fileName) || missingFileModifiedTime);
+          }
           const dirPath = getDirectoryPath(filePath) || ".";
           const watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
           watcher.referenceCount++;
@@ -9904,14 +9907,31 @@ ${lanes.join("\n")}
           const watcher = fsWatch(
             dirName,
             1,
-            (_eventName, relativeFileName, modifiedTime) => {
+            (eventName, relativeFileName) => {
               if (!isString(relativeFileName))
                 return;
               const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
-              const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+              const filePath = toCanonicalName(fileName);
+              const callbacks = fileName && fileWatcherCallbacks.get(filePath);
               if (callbacks) {
+                let currentModifiedTime;
+                let eventKind = 1;
+                if (fileTimestamps) {
+                  const existingTime = fileTimestamps.get(filePath);
+                  if (eventName === "change") {
+                    currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime;
+                    if (currentModifiedTime.getTime() === existingTime.getTime())
+                      return;
+                  }
+                  currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime);
+                  fileTimestamps.set(filePath, currentModifiedTime);
+                  if (existingTime === missingFileModifiedTime)
+                    eventKind = 0;
+                  else if (currentModifiedTime === missingFileModifiedTime)
+                    eventKind = 2;
+                }
                 for (const fileCallback of callbacks) {
-                  fileCallback(fileName, 1, modifiedTime);
+                  fileCallback(fileName, eventKind, currentModifiedTime);
                 }
               }
             },
@@ -10314,7 +10334,7 @@ ${lanes.join("\n")}
               );
             case 5:
               if (!nonPollingWatchFile) {
-                nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
+                nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp);
               }
               return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
             default:
@@ -10504,7 +10524,7 @@ ${lanes.join("\n")}
               return watchPresentFileSystemEntryWithFsWatchFile();
             }
             try {
-              const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+              const presentWatcher = (entryKind === 1 || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
                 fileOrDirectory,
                 recursive,
                 inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -53166,13 +53186,21 @@ ${lanes.join("\n")}
           }
           const nearestTargetPackageJson = getNearestAncestorDirectoryWithPackageJson(host, getDirectoryPath(modulePath));
           const nearestSourcePackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-          if (nearestSourcePackageJson !== nearestTargetPackageJson) {
+          const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+          if (!packageJsonPathsAreEqual(nearestTargetPackageJson, nearestSourcePackageJson, ignoreCase)) {
             return maybeNonRelative;
           }
           return relativePath;
         }
         return isPathRelativeToParent(maybeNonRelative) || countPathComponents(relativePath) < countPathComponents(maybeNonRelative) ? relativePath : maybeNonRelative;
       }
+      function packageJsonPathsAreEqual(a, b, ignoreCase) {
+        if (a === b)
+          return true;
+        if (a === void 0 || b === void 0)
+          return false;
+        return comparePaths(a, b, ignoreCase) === 0;
+      }
       function countPathComponents(path2) {
         let count = 0;
         for (let i = startsWith(path2, "./") ? 2 : 0; i < path2.length; i++) {
@@ -58500,15 +58528,19 @@ ${lanes.join("\n")}
             return true;
           }
         }
-        function isEntityNameVisible(entityName, enclosingDeclaration) {
+        function getMeaningOfEntityNameReference(entityName) {
           let meaning;
           if (entityName.parent.kind === 186 || entityName.parent.kind === 233 && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167) {
             meaning = 111551 | 1048576;
-          } else if (entityName.kind === 166 || entityName.kind === 211 || entityName.parent.kind === 271) {
+          } else if (entityName.kind === 166 || entityName.kind === 211 || entityName.parent.kind === 271 || entityName.parent.kind === 166 && entityName.parent.left === entityName || entityName.parent.kind === 211 && entityName.parent.expression === entityName || entityName.parent.kind === 212 && entityName.parent.expression === entityName) {
             meaning = 1920;
           } else {
             meaning = 788968;
           }
+          return meaning;
+        }
+        function isEntityNameVisible(entityName, enclosingDeclaration) {
+          const meaning = getMeaningOfEntityNameReference(entityName);
           const firstIdentifier = getFirstIdentifier(entityName);
           const symbol = resolveName(
             enclosingDeclaration,
@@ -60821,9 +60853,10 @@ ${lanes.join("\n")}
               introducesError = true;
               return { introducesError, node };
             }
+            const meaning = getMeaningOfEntityNameReference(node);
             const sym = resolveEntityName(
               leftmost,
-              -1,
+              meaning,
               /*ignoreErrors*/
               true,
               /*dontResolveAlias*/
@@ -60833,18 +60866,13 @@ ${lanes.join("\n")}
               if (isSymbolAccessible(
                 sym,
                 context.enclosingDeclaration,
-                -1,
+                meaning,
                 /*shouldComputeAliasesToMakeVisible*/
                 false
               ).accessibility !== 0) {
                 introducesError = true;
               } else {
-                context.tracker.trackSymbol(
-                  sym,
-                  context.enclosingDeclaration,
-                  -1
-                  /* All */
-                );
+                context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
                 includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
               }
               if (isIdentifier(node)) {
@@ -69334,6 +69362,9 @@ ${lanes.join("\n")}
                   /* Null */
                 );
                 result = getUnionType([getIntersectionType(typeSet), nullType], 1, aliasSymbol, aliasTypeArguments);
+              } else if (typeSet.length >= 4) {
+                const middle = Math.floor(typeSet.length / 2);
+                result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
               } else {
                 if (!checkCrossProductUnion(typeSet)) {
                   return errorType;
@@ -174082,10 +174113,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             return isJsxExpression(parent2) && !isJsxElement(parent2.parent) && !isJsxFragment(parent2.parent) ? checker.getContextualTypeForJsxAttribute(parent2.parent) : void 0;
           default:
             const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
-            return argInfo ? (
-              // At `,`, treat this as the next argument after the comma.
-              checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 28 ? 1 : 0))
-            ) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
+            return argInfo ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
               // completion at `x ===/**/` should be for the right side
               checker.getTypeAtLocation(parent2.left)
             ) : checker.getContextualType(
@@ -182959,12 +182987,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!info)
           return void 0;
         const { list, argumentIndex } = info;
-        const argumentCount = getArgumentCount(
-          list,
-          /*ignoreTrailingComma*/
-          isInString(sourceFile, position, node),
-          checker
-        );
+        const argumentCount = getArgumentCount(checker, list);
         if (argumentIndex !== 0) {
           Debug.assertLessThan(argumentIndex, argumentCount);
         }
@@ -182976,7 +182999,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
         } else {
           const list = findContainingList(node);
-          return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
+          return list && { list, argumentIndex: getArgumentIndex(checker, list, node) };
         }
       }
       function getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker) {
@@ -183109,24 +183132,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           return isFunctionTypeNode(d) ? (_a = tryCast(d.parent, canHaveSymbol)) == null ? void 0 : _a.symbol : void 0;
         }) || s : s;
       }
-      function getArgumentIndex(argumentsList, node, checker) {
-        const args = argumentsList.getChildren();
-        let argumentIndex = 0;
-        for (let pos = 0; pos < length(args); pos++) {
-          const child = args[pos];
-          if (child === node) {
-            break;
-          }
-          if (isSpreadElement(child)) {
-            argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
-          } else {
-            if (child.kind !== 28) {
-              argumentIndex++;
-            }
-          }
-        }
-        return argumentIndex;
-      }
       function getSpreadElementCount(node, checker) {
         const spreadType = checker.getTypeAtLocation(node.expression);
         if (checker.isTupleType(spreadType)) {
@@ -183139,23 +183144,48 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         }
         return 0;
       }
-      function getArgumentCount(argumentsList, ignoreTrailingComma, checker) {
-        const listChildren = argumentsList.getChildren();
-        let argumentCount = 0;
-        for (const child of listChildren) {
+      function getArgumentIndex(checker, argumentsList, node) {
+        return getArgumentIndexOrCount(checker, argumentsList, node);
+      }
+      function getArgumentCount(checker, argumentsList) {
+        return getArgumentIndexOrCount(
+          checker,
+          argumentsList,
+          /*node*/
+          void 0
+        );
+      }
+      function getArgumentIndexOrCount(checker, argumentsList, node) {
+        const args = argumentsList.getChildren();
+        let argumentIndex = 0;
+        let skipComma = false;
+        for (const child of args) {
+          if (node && child === node) {
+            if (!skipComma && child.kind === 28) {
+              argumentIndex++;
+            }
+            return argumentIndex;
+          }
           if (isSpreadElement(child)) {
-            argumentCount = argumentCount + getSpreadElementCount(child, checker);
+            argumentIndex += getSpreadElementCount(child, checker);
+            skipComma = true;
+            continue;
           }
+          if (child.kind !== 28) {
+            argumentIndex++;
+            skipComma = true;
+            continue;
+          }
+          if (skipComma) {
+            skipComma = false;
+            continue;
+          }
+          argumentIndex++;
         }
-        argumentCount = argumentCount + countWhere(
-          listChildren,
-          (arg) => arg.kind !== 28
-          /* CommaToken */
-        );
-        if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === 28) {
-          argumentCount++;
+        if (node) {
+          return argumentIndex;
         }
-        return argumentCount;
+        return args.length && last(args).kind === 28 ? argumentIndex + 1 : argumentIndex;
       }
       function getArgumentIndexForTemplatePiece(spanIndex, node, position, sourceFile) {
         Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -194183,7 +194213,16 @@ ${options.prefix}` : "\n" : options.prefix
             recursive ? watchedDirectoriesRecursive : watchedDirectories,
             path2,
             callback,
-            (id) => ({ eventName: CreateDirectoryWatcherEvent, data: { id, path: path2, recursive: !!recursive } })
+            (id) => ({
+              eventName: CreateDirectoryWatcherEvent,
+              data: {
+                id,
+                path: path2,
+                recursive: !!recursive,
+                // Special case node_modules as we watch it for changes to closed script infos as well
+                ignoreUpdate: !path2.endsWith("/node_modules") ? true : void 0
+              }
+            })
           );
         }
         function getOrCreateFileWatcher({ pathToId, idToCallbacks }, path2, callback, event) {
@@ -194210,24 +194249,43 @@ ${options.prefix}` : "\n" : options.prefix
             }
           };
         }
-        function onWatchChange({ id, path: path2, eventType }) {
-          onFileWatcherCallback(id, path2, eventType);
-          onDirectoryWatcherCallback(watchedDirectories, id, path2, eventType);
-          onDirectoryWatcherCallback(watchedDirectoriesRecursive, id, path2, eventType);
+        function onWatchChange(args) {
+          if (isArray(args))
+            args.forEach(onWatchChangeRequestArgs);
+          else
+            onWatchChangeRequestArgs(args);
         }
-        function onFileWatcherCallback(id, eventPath, eventType) {
-          var _a;
-          (_a = watchedFiles.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-            const eventKind = eventType === "create" ? 0 : eventType === "delete" ? 2 : 1;
-            callback(eventPath, eventKind);
-          });
+        function onWatchChangeRequestArgs({ id, created, deleted, updated }) {
+          onWatchEventType(
+            id,
+            created,
+            0
+            /* Created */
+          );
+          onWatchEventType(
+            id,
+            deleted,
+            2
+            /* Deleted */
+          );
+          onWatchEventType(
+            id,
+            updated,
+            1
+            /* Changed */
+          );
         }
-        function onDirectoryWatcherCallback({ idToCallbacks }, id, eventPath, eventType) {
-          var _a;
-          if (eventType === "update")
+        function onWatchEventType(id, paths, eventKind) {
+          if (!(paths == null ? void 0 : paths.length))
             return;
-          (_a = idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-            callback(eventPath);
+          forEachCallback(watchedFiles, id, paths, (callback, eventPath) => callback(eventPath, eventKind));
+          forEachCallback(watchedDirectories, id, paths, (callback, eventPath) => callback(eventPath));
+          forEachCallback(watchedDirectoriesRecursive, id, paths, (callback, eventPath) => callback(eventPath));
+        }
+        function forEachCallback(hostWatcherMap, id, eventPaths, cb) {
+          var _a;
+          (_a = hostWatcherMap.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
+            eventPaths.forEach((eventPath) => cb(callback, normalizeSlashes(eventPath)));
           });
         }
       }

package/dist/{chunk-GD66YHG5.js → chunk-HI3G23BH.js}

@@ -2,7 +2,7 @@ import {
   __toESM,
   init_cjs_shims,
   require_lib
-} from "./chunk-BYUSTTOD.js";
+} from "./chunk-CIX6RJY7.js";
 
 // src/commands/hello/world.ts
 init_cjs_shims();

package/dist/{chunk-BJAVUDKI.js → chunk-J4F6MRFC.js}

@@ -2,7 +2,7 @@ import {
   __toESM,
   init_cjs_shims,
   require_lib
-} from "./chunk-BYUSTTOD.js";
+} from "./chunk-CIX6RJY7.js";
 
 // src/hooks/init/init.ts
 init_cjs_shims();

package/dist/{chunk-63CAATEE.js → chunk-OLLTA5OL.js}

@@ -2,7 +2,7 @@ import {
   __toESM,
   init_cjs_shims,
   require_lib
-} from "./chunk-BYUSTTOD.js";
+} from "./chunk-CIX6RJY7.js";
 
 // src/commands/hello/index.ts
 init_cjs_shims();

package/dist/{chunk-FIWLG4UA.js → chunk-PCDHMGQT.js}

@@ -2,7 +2,7 @@ import {
   __toESM,
   init_cjs_shims,
   require_lib
-} from "./chunk-BYUSTTOD.js";
+} from "./chunk-CIX6RJY7.js";
 
 // src/commands/esbuild.ts
 init_cjs_shims();

package/dist/commands/esbuild.js

@@ -1,7 +1,7 @@
 import {
   ESBuild
-} from "../chunk-FIWLG4UA.js";
-import "../chunk-BYUSTTOD.js";
+} from "../chunk-PCDHMGQT.js";
+import "../chunk-CIX6RJY7.js";
 export {
   ESBuild as default
 };

package/dist/commands/hello/index.js

@@ -1,7 +1,7 @@
 import {
   Hello
-} from "../../chunk-63CAATEE.js";
-import "../../chunk-BYUSTTOD.js";
+} from "../../chunk-OLLTA5OL.js";
+import "../../chunk-CIX6RJY7.js";
 export {
   Hello as default
 };

package/dist/commands/hello/world.js

@@ -1,7 +1,7 @@
 import {
   World
-} from "../../chunk-GD66YHG5.js";
-import "../../chunk-BYUSTTOD.js";
+} from "../../chunk-HI3G23BH.js";
+import "../../chunk-CIX6RJY7.js";
 export {
   World as default
 };

package/dist/hooks/init/init.js

@@ -1,7 +1,7 @@
 import {
   init_default
-} from "../../chunk-BJAVUDKI.js";
-import "../../chunk-BYUSTTOD.js";
+} from "../../chunk-J4F6MRFC.js";
+import "../../chunk-CIX6RJY7.js";
 export {
   init_default as default
 };

package/dist/index.js

@@ -1,22 +1,22 @@
 import {
   ESBuild
-} from "./chunk-FIWLG4UA.js";
+} from "./chunk-PCDHMGQT.js";
 import {
   Hello
-} from "./chunk-63CAATEE.js";
+} from "./chunk-OLLTA5OL.js";
 import {
   World
-} from "./chunk-GD66YHG5.js";
+} from "./chunk-HI3G23BH.js";
 import {
   init_default
-} from "./chunk-BJAVUDKI.js";
+} from "./chunk-J4F6MRFC.js";
 import {
   __commonJS,
   __toESM,
   init_cjs_shims,
   require_lib,
   require_src
-} from "./chunk-BYUSTTOD.js";
+} from "./chunk-CIX6RJY7.js";
 
 // node_modules/semver/internal/constants.js
 var require_constants = __commonJS({

package/oclif.manifest.json

@@ -467,5 +467,5 @@
       "enableJsonFlag": false
     }
   },
-  "version": "0.4.11"
+  "version": "0.4.12"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oclif/plugin-test-esbuild",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "Bundled plugin for testing",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-test-esbuild/issues",