detox 20.0.4-breaking.new-global-lifecycle.0 → 20.0.7-prerelease.0

package/src/utils/errorUtils.js

@@ -16,11 +16,12 @@ function filterErrorStack(error, predicate) {
 }
 
 function replaceErrorStack(source, target) {
-  const sourceStack = source.stack || source.message;
-  const targetStack = target.stack || target.message;
+  const sourceStack = (source.stack || '');
   const sourceMessage = sourceStack.replace(CLEAN_AT, '');
-  const targetMessage = targetStack.replace(CLEAN_AT, '');
   const actualSourceStack = sourceStack.slice(sourceMessage.length);
+
+  const targetMessage = target.message || target.stack.replace(CLEAN_AT, '');
+
   target.stack = targetMessage + actualSourceStack;
   return target;
 }

package/src/utils/invocationTraceDescriptions.js

@@ -0,0 +1,43 @@
+module.exports = {
+  actionDescription: {
+    adjustSliderToPosition: (newPosition) => `adjust slider to position ${newPosition}`,
+    clearText: () => 'clear input text',
+    getAttributes: () => 'get element attributes',
+    longPress: (duration) => `long press${duration !== undefined ? ` for ${duration}ms` : ''}`,
+    longPressAndDrag: (duration, startX, startY, targetElement, endX, endY, speed, holdDuration) =>
+      `long press and drag from ${startX}, ${startY} to ${endX}, ${endY} with speed ${speed} and hold duration ${holdDuration}`,
+    multiTap: (times) => `tap ${times} times`,
+    pinch: (scale, speed, angle) => `pinch with scale ${scale}, speed ${speed}, and angle ${angle}`,
+    pinchWithAngle: (direction, speed, angle) => `pinch with direction ${direction}, speed ${speed}, and angle ${angle}`,
+    replaceText: (value) => `replace input text: "${value}"`,
+    scroll: (amount, direction, startPositionX, startPositionY) =>
+      `scroll ${amount} pixels ${direction}${startPositionX !== undefined && startPositionY !== undefined ? ` from normalized position (${startPositionX}, ${startPositionY})` : ''}`,
+    scrollTo: (edge) => `scroll to ${edge}`,
+    scrollToIndex: (index) => `scroll to index #${index}`,
+    setColumnToValue: (column, value) => `set column ${column} to value ${value}`,
+    setDatePickerDate: (dateString, dateFormat) => `set date picker date to ${dateString} using format ${dateFormat}`,
+    swipe: (direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY) =>
+      `swipe ${direction} ${speed} with offset ${normalizedSwipeOffset}
+      ${!isNaN(normalizedStartingPointX) && !isNaN(normalizedStartingPointY) ? ` from normalized position (${normalizedStartingPointX}, ${normalizedStartingPointY})` : ''}`,
+    takeScreenshot: (screenshotName) => `take screenshot${screenshotName !== undefined ? ` with name "${screenshotName}"` : ''}`,
+    tapAtPoint: (value) => `tap${value !== undefined ? ` at ${JSON.stringify(value)}` : ''}`,
+    tapBackspaceKey: () => 'tap on backspace key',
+    tapReturnKey: () => 'tap on return key',
+    typeText: (value) => `type input text: "${value}"`,
+  },
+  expectDescription: {
+    waitFor: (actionDescription) => `wait for expectation while ${actionDescription}`,
+    waitForWithTimeout: (expectDescription, timeout) => `${expectDescription} with timeout (${timeout} ms)`,
+    withTimeout: (timeout) => `wait until timeout (${timeout} ms)`,
+    toBeFocused: () => 'to be focused',
+    toBeVisible: (percent) => `to be visible${percent !== undefined ? ` ${percent}%` : ''}`,
+    toExist: () => 'to exist',
+    toHaveText: (text) => `to have text: "${text}"`,
+    toHaveLabel: (label) => `to have label: "${label}"`,
+    toHaveId: (id) => `to have id: "${id}"`,
+    toHaveValue: (value) => `to have value: "${value}"`,
+    toHaveSliderPosition: (position, tolerance) => `to have slider position: ${position}${tolerance > 0 ? ` with tolerance ${tolerance}` : ''}`,
+    toHaveToggleValue: (value) => `to have toggle value: ${value}`,
+    full: (expectDescription, notCondition) => `expect element ${notCondition ? `not ${expectDescription}` : expectDescription}`
+  }
+};

package/src/utils/streamUtils.js

@@ -8,9 +8,7 @@ const JsonlParser = require('stream-json/jsonl/Parser');
 const stripAnsi = require('strip-ansi');
 const { AbstractEventBuilder } = require('trace-event-lib');
 
-const DetoxTracer = require('../logger/DetoxTracer');
-
-const log = require('./logger').child({ __filename });
+const log = require('./logger').child({ cat: 'logger' });
 
 function compareTimestamps(a, b) {
   return +(a.value.time > b.value.time) - +(a.value.time < b.value.time);
@@ -136,6 +134,7 @@ class JsonlStringer extends Transform {
 
 class SimpleEventBuilder extends AbstractEventBuilder {
   events = [];
+
   send(event) {
     this.events.push(event);
   }
@@ -147,8 +146,7 @@ function chromeTraceStream() {
 
   return flatMapTransform((data) => {
     // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-    const { pid, trace, msg, time, name: _name, hostname: _hostname, ...args } = data;
-    const tid = trace ? trace.tid : DetoxTracer.threadize(args.cat);
+    const { cat = 'default', msg: name, ph = 'i', pid, tid, time, name: _name, hostname: _hostname, ...args } = data;
     const ts = new Date(time).getTime() * 1E3;
 
     const builder = new SimpleEventBuilder();
@@ -159,14 +157,15 @@ function chromeTraceStream() {
 
     const tidHash = `${pid}:${tid}`;
     if (!knownTids.has(tidHash)) {
-      builder.thread_name(DetoxTracer.categorize(tid), tid, pid);
+      const primaryCategory = cat.split(',', 1)[0];
+      builder.thread_name(primaryCategory, tid, pid);
       builder.thread_sort_index(tid, tid, pid);
       knownTids.add(tidHash);
     }
 
-    const event = { ph: 'i', ...data.trace, pid, tid, ts, args };
-    if (!trace || trace.ph !== 'E') {
-      event.name = msg || '';
+    const event = { ph, name, pid, tid, cat, ts, args };
+    if (ph === 'E') {
+      delete event.name;
     }
 
     builder.events.push(event);
@@ -190,11 +189,11 @@ function preventErrorSubscriptions(emitter) {
 }
 
 function readJSONL() {
-  const readable = new PassThrough({ objectMode: true });
+  const readable = through();
   const writable = JsonlParser.make({ checkErrors: true })
     .on('error', (err) => {
       if (err instanceof SyntaxError) {
-        log.debug({ event: 'JSONL_ERROR', err });
+        log.debug({ err });
         readable.end();
       } else {
         readable.emit('error', err);

package/src/utils/trace.js

@@ -1,19 +1,3 @@
-/** @type {Detox.Tracer} */
-const trace = require('../..').trace;
-const traceCall = trace.bind(null);
+const { trace, traceCall } = require('../..');
 
-function traceMethods(obj, cat, methodNames) {
-  for (const name of methodNames) {
-    const originalMethod = obj[name];
-
-    obj[name] = function tracedMethod() {
-      return traceCall({ cat, name }, originalMethod.apply.bind(originalMethod, obj, arguments));
-    };
-  }
-}
-
-module.exports = {
-  trace,
-  traceCall,
-  traceMethods,
-};
+module.exports = { trace, traceCall };

package/src/utils/traceMethods.js

@@ -0,0 +1,15 @@
+function traceMethods(logger, obj, methodNames) {
+  for (const name of methodNames) {
+    const originalMethod = obj[name];
+
+    obj[name] = function tracedMethod(...args) {
+      return logger.trace.complete(
+        { args },
+        name,
+        originalMethod.apply.bind(originalMethod, obj, args)
+      );
+    };
+  }
+}
+
+module.exports = traceMethods;

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.md5

@@ -1 +0,0 @@
-4b124d7ab9e2288b4321b82987147ed7

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-f63f383626ed499ea635330561ee65f67926ade7

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-f73cf8db8e2a2d9f007e8f0e1b10c8a3206425ff5b48eecab8780d32adbb12fb

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-e21d314a45864e21cbea7bf17e9d23814def296e92b3b75ce64ca504f68d3b9aedc17c1beecd90407b9cb6e04803eb2d9ea4e2b9b4791ef34fc6aab597150770

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.md5

@@ -1 +0,0 @@
-4a9616f1535e129e7eeddbcc6d20b383

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha1

@@ -1 +0,0 @@
-ab806e0458f9ffdadb4b758f356e55afd5c47db2

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha256

@@ -1 +0,0 @@
-407c01beb305d15307e9defed1c41b643e01db58a1f15a4fa68b177e0ef7de49

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha512

@@ -1 +0,0 @@
-0f48a23d1840085fd5b5c044f6fd4a9e7b898f5498d4ec22b94b94d42eed3982060aea614347d73ee97e57de200d17d8100aee99c569fb8fc1d3e9c9a5fc7911

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.md5

@@ -1 +0,0 @@
-e7043eb4fd0dfa3c309fd8cd35ee68e5

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha1

@@ -1 +0,0 @@
-80bef0c22a710dabb0e72b8d15c59125db1bd58b

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha256

@@ -1 +0,0 @@
-7828ffdff493f8a856efad9b7db540e4e6b13b91260292efe98791013ba2db04

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha512

@@ -1 +0,0 @@
-a57448b5eec5edfb2b45b99b9c8a6714b3384f71ade0f25da7b453d14c29597e818690b293cefa9be9362be29efb2c420664283cb1fc994883cd143d46506a2f

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.md5

@@ -1 +0,0 @@
-7a767580cccb826b804646d27377aed1

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha1

@@ -1 +0,0 @@
-157c429db5c60554c8098801c65193871427d41d

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha256

@@ -1 +0,0 @@
-e5c436ef487d630e7685b412f6160f33be799f64b99b928cdfbaa2c41aa0561e

package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha512

@@ -1 +0,0 @@
-6894a1d7a895abc41593948227786e0a41428bcaee4f4246cb9b8b3d40dc50f6b1404d622a07adbd992397ff7687ba97f8020528666ee77cf66db9377eb4b206

package/src/logger/DetoxTraceEventBuilder.js

@@ -1,21 +0,0 @@
-const { AbstractEventBuilder } = require('trace-event-lib');
-
-class DetoxTraceEventBuilder extends AbstractEventBuilder {
-  constructor(forward) {
-    super();
-
-    this._forward = forward;
-  }
-
-  send(event) {
-    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-    const { pid, ts, name, args = {}, ...trace } = event;
-    if (trace.ph === 'E') {
-      this._forward({ ...args, trace }, `end`);
-    } else {
-      this._forward({ ...args, trace }, name);
-    }
-  }
-}
-
-module.exports = DetoxTraceEventBuilder;

package/src/logger/DetoxTracer.js

@@ -1,133 +0,0 @@
-const _ = require('lodash');
-
-const isPromise = require('../utils/isPromise');
-
-const DetoxTraceEventBuilder = require('./DetoxTraceEventBuilder');
-const TraceThreadDispatcher = require('./TraceThreadDispatcher');
-
-class DetoxTracer {
-  /**
-   * @param {object} options
-   * @param {Detox.Logger} options.logger
-   */
-  constructor({ logger }) {
-    this.logger = logger;
-    this.builder = new DetoxTraceEventBuilder(this.logger.trace);
-    this.categories = {};
-    this.defaultEventDispatcher = new TraceThreadDispatcher({
-      logger,
-      name: 'Default',
-      min: 10000,
-    });
-    this.eventDispatchers = { '': this.defaultEventDispatcher };
-  }
-
-  /**
-   * @param {Detox.TraceEvent | string} eventOrName
-   * @param {Detox.TraceEvent['args']} [args]
-   * @returns {import('trace-event-lib').EndHandle<Detox.TraceEvent>}
-   */
-  begin(eventOrName, args) {
-    const event = typeof eventOrName === 'string' ? { name: eventOrName, args } : eventOrName;
-    const mainCategory = event.cat ? event.cat.split(',', 1)[0] : '';
-    const dispatcher = this.eventDispatchers[mainCategory] || this.defaultEventDispatcher;
-    const tid = dispatcher.begin(event.id);
-
-    return this.builder.begin({
-      args: event.args,
-      cat: event.cat || '',
-      cname: event.cname,
-      name: event.name,
-      tid,
-    });
-  }
-
-  end(eventOrName, args) {
-    const event = typeof eventOrName === 'string' ? { name: eventOrName, args } : eventOrName || {};
-    const mainCategory = event.cat ? event.cat.split(',', 1)[0] : '';
-    const dispatcher = this.eventDispatchers[mainCategory] || this.defaultEventDispatcher;
-    const tid = dispatcher.end(event.id);
-
-    this.builder.end({
-      args: event.args,
-      cname: event.cname,
-      tid,
-    });
-  }
-
-  section(sectionName, func) {
-    let result;
-
-    this.begin(sectionName);
-    try {
-      result = func();
-      if (!isPromise(result)) {
-        this.end(sectionName, { success: true });
-      } else {
-        result.then(
-          () => this.end(sectionName, { success: true }),
-          (err) => this.end(sectionName, { success: false, err }),
-        );
-      }
-    } catch (err) {
-      this.end(sectionName, { success: false, err });
-      throw err;
-    }
-
-    return result;
-  }
-
-  registerThreads(event, [min, max]) {
-    this.eventDispatchers[event] = new TraceThreadDispatcher({
-      logger: this.logger,
-      name: event,
-      min,
-      max,
-    });
-
-    return this;
-  }
-
-  static default(options) {
-    const tracer = new DetoxTracer(options);
-    for (const [key, range] of Object.entries(this.CATEGORIES)) {
-      tracer.registerThreads(key, range);
-    }
-
-    return Object.assign(
-      tracer.section.bind(tracer),
-      {
-        begin: tracer.begin.bind(tracer),
-        startSection: tracer.begin.bind(tracer),
-        end: tracer.end.bind(tracer),
-        endSection: tracer.end.bind(tracer),
-      });
-  }
-
-  static categorize(tid) {
-    return _.findKey(this.CATEGORIES, ([min, max]) => min <= tid && tid <= max) || 'user';
-  }
-
-  static threadize(cat) {
-    const [mainCategory] = cat ? cat.split(',', 1) : 'user';
-    const threads = _.find(this.CATEGORIES, (_, key) => key === mainCategory);
-    return threads ? threads[0] : 10000;
-  }
-
-  /**
-   * @type {Record<string, [number, number]>}
-   */
-  static CATEGORIES = {
-    'lifecycle': [0, 0],
-    'ipc': [29, 29],
-    'ws-server': [50, 99],
-    'ws-client': [100, 149],
-    'device': [150, 159],
-    'artifacts-manager': [300, 300],
-    'artifact-plugin': [310, 349],
-    'artifact': [350, 399],
-    'child-process': [400, 499],
-  };
-}
-
-module.exports = DetoxTracer;

package/src/utils/ChromeTracingExporter.js

@@ -1,54 +0,0 @@
-const _ = require('lodash');
-
-const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
-
-class ChromeTracingExporter {
-  constructor({
-    process,
-    thread,
-  }) {
-    this._process = {
-      id: process.id,
-      name: process.name,
-    };
-    this._thread = {
-      id: thread.id,
-      name: thread.name,
-    };
-  }
-
-  export(traceEvents, append) {
-    const _events = _.flatMap(traceEvents, this._parseEvent.bind(this));
-    const json = JSON.stringify(_events);
-    const prefix = (append ? ',' : '[');
-    return `${prefix}${json.slice(1, -1)}`;
-  }
-
-  _parseEvent(event) {
-    const { name, ts, args, type } = event;
-    const tsInMicroseconds = ts * 1000;
-    switch (type) {
-      case 'start': return this._event(name, 'B', tsInMicroseconds, args);
-      case 'end': return this._event(name, 'E', tsInMicroseconds, args);
-      case 'init': return [
-          this._event('process_name', 'M', tsInMicroseconds, { name: this._process.name }),
-          this._event('thread_name', 'M', tsInMicroseconds, { name: this._thread.name }),
-        ];
-      default:
-        throw new DetoxRuntimeError({ message: `Invalid type '${type}' in event: ${event}` });
-    }
-  }
-
-  _event(name, phase, ts, args) {
-    return {
-      name,
-      pid: this._process.id,
-      tid: this._thread.id,
-      ts,
-      ph: phase,
-      args: { ...args },
-    };
-  }
-}
-
-module.exports = ChromeTracingExporter;