@eventra_dev/eventra-cli 2.3.1 → 2.3.2

package/dist/analysis/resolver/callResolver.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveFunctionFromCall = resolveFunctionFromCall;
 const typescript_1 = __importDefault(require("typescript"));
 const exportResolver_1 = require("./exportResolver");
+const utils_1 = require("../shared/utils");
 function isFunctionLike(node) {
     return (typescript_1.default.isFunctionDeclaration(node) || typescript_1.default.isMethodDeclaration(node) || typescript_1.default.isArrowFunction(node) || typescript_1.default.isFunctionExpression(node));
 }
@@ -44,10 +45,7 @@ function resolveReturnedFunction(call, checker, callCache, exportCache, hops) {
         return null;
     }
     for (const returned of returnedExpressions(factory)) {
-        let value = returned;
-        while (typescript_1.default.isParenthesizedExpression(value) || typescript_1.default.isAsExpression(value) || typescript_1.default.isNonNullExpression(value)) {
-            value = value.expression;
-        }
+        const value = (0, utils_1.unwrapExpression)(returned);
         if (isFunctionLike(value)) {
             return value;
         }

package/dist/analysis/shared/utils.js

@@ -4,21 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isExpressionWrapper = isExpressionWrapper;
 exports.unwrapExpression = unwrapExpression;
 exports.getPropertyName = getPropertyName;
 exports.getCallName = getCallName;
 exports.getFunctionName = getFunctionName;
 const typescript_1 = __importDefault(require("typescript"));
+/** A node that only wraps an expression without changing what it is: `(x)`, `x as T`, `<T>x`, `x!`, `x satisfies T`. */
+function isExpressionWrapper(node) {
+    return (typescript_1.default.isAsExpression(node) ||
+        typescript_1.default.isTypeAssertionExpression(node) ||
+        typescript_1.default.isNonNullExpression(node) ||
+        typescript_1.default.isParenthesizedExpression(node) ||
+        typescript_1.default.isSatisfiesExpression(node));
+}
 // track(payload?.event as string)
 // track((payload.event))
 // track(payload!.event)
 function unwrapExpression(expression) {
     let current = expression;
-    while (typescript_1.default.isAsExpression(current) ||
-        typescript_1.default.isTypeAssertionExpression(current) ||
-        typescript_1.default.isNonNullExpression(current) ||
-        typescript_1.default.isParenthesizedExpression(current) ||
-        typescript_1.default.isSatisfiesExpression(current)) {
+    while (isExpressionWrapper(current)) {
         current = current.expression;
     }
     return current;

package/dist/analysis/symbols/symbolUtils.js

@@ -8,6 +8,7 @@ exports.getFunctionSymbol = getFunctionSymbol;
 exports.isReturnedFunction = isReturnedFunction;
 exports.wrapperName = wrapperName;
 const typescript_1 = __importDefault(require("typescript"));
+const utils_1 = require("../shared/utils");
 /**
  * Symbol an identifier *refers to*. For the name in a shorthand property (`{ event }`) a plain
  * `getSymbolAtLocation` yields the property's own symbol, not the variable/parameter it reads.
@@ -63,22 +64,19 @@ function getFunctionSymbol(node, checker) {
     }
     return undefined;
 }
-/** An arrow/function expression that is the value of a `return`, or the concise body of an arrow. */
+/** An arrow/function expression that is the value of a `return`, or the concise body of an arrow, possibly in parentheses, `as` or `!`. */
 function isReturnedFunction(node) {
     if (!typescript_1.default.isArrowFunction(node) && !typescript_1.default.isFunctionExpression(node)) {
         return false;
     }
+    // `inner` is the outermost wrapper around the function, or the function itself
+    let inner = node;
     let outer = node.parent;
-    while (typescript_1.default.isParenthesizedExpression(outer)) {
+    while ((0, utils_1.isExpressionWrapper)(outer)) {
+        inner = outer;
         outer = outer.parent;
     }
-    return typescript_1.default.isReturnStatement(outer) || (typescript_1.default.isArrowFunction(outer) && unparen(outer.body) === node);
-}
-function unparen(node) {
-    while (typescript_1.default.isParenthesizedExpression(node)) {
-        node = node.expression;
-    }
-    return node;
+    return typescript_1.default.isReturnStatement(outer) || (typescript_1.default.isArrowFunction(outer) && outer.body === inner);
 }
 /**
  * The name a wrapper is reported under: its own, or for an anonymous returned function the hook that

package/dist/cli/sync.js

@@ -18,7 +18,10 @@ async function sync({ strict = false } = {}) {
     // report what was saved: with skipped files that is the union of the known and
     // the found events, not just what this scan found
     const saved = await (0, scanResults_1.persistScanResults)(config, engine, { preserveKnown: skipped.length > 0 });
-    console.log(chalk_1.default.green(`Found ${(0, skipped_1.plural)(saved.events?.length ?? 0, "event")}, ${(0, skipped_1.plural)(saved.functionWrappers?.length ?? 0, "function wrapper")}`));
+    // normalizeConfig always fills functionWrappers; the type only marks it optional
+    /* v8 ignore next */
+    const wrapperCount = saved.functionWrappers?.length ?? 0;
+    console.log(chalk_1.default.green(`Found ${(0, skipped_1.plural)(saved.events.length, "event")}, ${(0, skipped_1.plural)(wrapperCount, "function wrapper")}`));
     await plugins.runDynamicEventReporters(engine.getAllDynamicOccurrences());
     (0, skipped_1.reportSkipped)(skipped);
     (0, skipped_1.reportIgnored)(ignored);

package/dist/cli/watch.js

@@ -221,6 +221,8 @@ async function watch() {
         .on("add", schedule)
         .on("unlink", (file) => {
         const abs = normalize(file);
+        // chokidar's `ignored` already drops excluded paths, so this only guards against a stray event
+        /* v8 ignore next */
         if (filter.isExcluded(abs))
             return;
         // a file that failed to analyse is in no set but is still remembered as skipped

package/dist/plugin/builtins/consoleDynamicEventReporter.js

@@ -9,7 +9,8 @@ const path_1 = __importDefault(require("path"));
 // paths are printed relative to where the command runs, with forward slashes
 function displayPath(fileName) {
     const relative = path_1.default.relative(process.cwd(), fileName);
-    const outside = relative === ".." || relative.startsWith(`..${path_1.default.sep}`) || relative.startsWith("../");
+    // path.relative always joins with path.sep, so that is the only separator to look for
+    const outside = relative === ".." || relative.startsWith(`..${path_1.default.sep}`);
     const shown = relative && !outside && !path_1.default.isAbsolute(relative) ? relative : fileName;
     return shown.replace(/\\/g, "/");
 }

package/dist/plugin/registry.js

@@ -23,9 +23,9 @@ function templateRegionOf(content) {
 }
 // `__eventra_x_template_event__(expr)` (callText may be cut with an ellipsis)
 function templateExpression(occurrence) {
-    const open = occurrence.callText.indexOf("(");
-    let expression = open === -1 ? occurrence.callText : occurrence.callText.slice(open + 1);
-    expression = expression.endsWith(")") ? expression.slice(0, -1) : expression;
+    // no "(" gives indexOf -1, so slice(0) keeps the whole text
+    const afterOpen = occurrence.callText.slice(occurrence.callText.indexOf("(") + 1);
+    const expression = afterOpen.endsWith(")") ? afterOpen.slice(0, -1) : afterOpen;
     // Angular qualifies a bare name with `this.`; the template never writes it
     return occurrence.calleeText.includes("_angular_") ? expression.replace(/^this\./, "") : expression;
 }
@@ -86,11 +86,8 @@ class PluginRegistry {
     }
     /** Disk paths produced by the last preprocess run for a source file (for watch unlink). */
     getVirtualPathsForSource(fileName) {
-        const mapped = this.sourceToVirtuals.get(this.normalizePath(fileName));
-        if (mapped && mapped.length > 0) {
-            return mapped;
-        }
-        return [this.normalizePath(fileName)];
+        // a source is only recorded with at least one virtual file, so a hit is never empty
+        return this.sourceToVirtuals.get(this.normalizePath(fileName)) ?? [this.normalizePath(fileName)];
     }
     async preprocessFile(input) {
         const sourceKey = this.normalizePath(input.fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventra_dev/eventra-cli",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Static analytics event extraction CLI powered by the TypeScript compiler API",
   "license": "MIT",
   "author": {