npm - @oracle/oraclejet-webdriver - Versions diffs - 16.1.4 → 17.0.0 - Mend

@oracle/oraclejet-webdriver 16.1.4 → 17.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (249) hide show

package/index.ts CHANGED Viewed

@@ -19,17 +19,19 @@ import {
   OjFetch
 } from './lib/OjFetch';
-import { OjWebElement } from './elements/OjWebElement';
 import { Expectation } from './lib/Expectation';
 import * as sm from './lib/ScreenshotManager';
-import { getBusyStates } from './lib/busy-context-utils';
+import { getBusyStates, pageReady } from './lib/busy-context-utils';
+import { assertViewModelValue } from './lib/viewmodel-utils';
+import { isNoRequireJet, setNoRequireJet } from './lib/no-require-jet';
 // Export register function before importing elements so that they can
 // call it to register themselves
 export { fetchKeyByFilter } from './lib/dataprovider-utils';
 export { DriverManager } from './lib/driver-manager';
 export { register } from './lib/driver-override';
-export { SlotProxy, slotProxy } from './lib/slot-proxy';
+export type { SlotProxy } from './lib/slot-proxy';
+export { slotProxy } from './lib/slot-proxy';
 export { sm as ScreenshotManager };
 export { Expectation };
@@ -62,99 +64,6 @@ export interface DriverLike {
   findElements(by: Locator): Promise<WebElement[]>;
 }
-/**
- * Create a Condition for WebDriver to wait on the page's BusyContext to be ready
- */
-function pageReady(): Condition<Promise<boolean>> {
-  return new Condition<Promise<boolean>>('for JET page to indicate ready', async (driver) => {
-    // Check that <html> element has a size after page ready
-    // Call thru executeScript to bypass WebElement overrides
-    const size = await driver.executeScript<{ width: Number; height: number }>(`
-      const html = document.querySelector('html');
-      return { width: html.clientWidth, height: html.clientHeight }
-    `);
-    if (!(size.width && size.height)) {
-      return Promise.resolve(false);
-    }
-    // Test if the page BusyContext is ready. BusyContext.whenReady() will return
-    // true; anything else (timeouts, exceptions) will return false.
-    const remoteScript = `
-    const done = arguments[0];
-    try {
-      require('ojs/ojcontext').getPageContext().getBusyContext()
-      .whenReady().then(done)
-      .catch(ex => done(false))
-    } catch (ex) {
-      done(false);
-    }
-    `;
-    return driver.executeAsyncScript<boolean>(remoteScript);
-  });
-}
-/**
- * Script executed by ojwd.assert() to run the Chai assertion on the browser
- * @private
- */
-const ASSERT_SCRIPT = `
-var viewmodelEl = arguments[0];
-var assertion = arguments[1];
-var callback = arguments[arguments.length - 1];
-require([
-  'chai',
-  'knockout',
-  'ojs/ojcspexpressionevaluator'
-], function(chai, ko, ExpressionEval) {
-  if (chai) {
-    try {
-      var viewmodel = ko.dataFor(viewmodelEl);
-      var evaluator = new ExpressionEval();
-      // Use ExpressionEval to get the value from the viewmodel
-      var value = evaluator.createEvaluator(assertion.expression).evaluate([viewmodel]);
-      function compare(value) {
-        var expect = chai.expect(value);
-        // For each chained assertion, call the assertion method with the arguments
-        assertion.chain.forEach((desc) => {
-          if (typeof desc === 'string') {
-            // Simple assertions, "is", "to", "be", etc
-            expect = expect[desc];
-          } else {
-            // Complex assertions (chained functions)
-            const name = desc.name;
-            const args = desc.args;
-            let evaluatedArgs = [];
-            if (name === 'match') {
-              args[0] = new RegExp(args[0]);
-            }
-            if (args) {
-              evaluatedArgs = args;
-            }
-            expect = expect[name](...evaluatedArgs);
-          }
-        });
-        callback(true);
-      }
-      // If "value" is a Promise
-      if (value && typeof value.then === 'function') {
-        value.then(compare).catch(function(ex) { callback(ex.message) });
-      } else {
-        compare(value);
-      }
-    } catch (ex) {
-      callback(ex.message);
-    }
-  } else {
-    callback('Chai not found');
-  }
-}, function(ex) { callback(ex.message); });
-`;
 /**
  * Check the running JET UI version against this oraclejet-webdriver package
  * version. It's expected that the JET UI is already fully loaded so that
@@ -198,6 +107,12 @@ ${mismatch}
  * ```
  */
 const ojwd = {
+  /**
+   * Flag to indicate if testing environment is running a JET application without
+   * RequireJS, such as WebPack. This property can only be set once.
+   * Defaults to false.
+   */
+  noRequireJet: false,
   /**
    * Opens a JET page and wait for the UI to be ready for testing. This method
    * should be used in place of WebDriver.get() to open a page for test. It will
@@ -371,62 +286,25 @@ const ojwd = {
     return driver.findElement(by);
   },
-  /**
-   * Assert a given expectation against a JET application's viewmodel.
-   * Assertions are [Chai](https://www.chaijs.com)-like expressions, represented
-   * by the {@link Expectation} class, and compared remotely on the test browser
-   * against the identified viewmodel and its path to the target value.
-   *
-   * The viewmodel is typically identiied by the DOM node on which Knockout's
-   * <code>ko.applyBindings</code> was called, but can also be descendants of
-   * that originial "root" node.
-   * ```javascript
-   * new Expectation(...)
-   * ```
-   *
-   * The target value within the viewmodel is identified by a dot-notated path
-   * and/or expression which yields the value. For instance, a value may be an
-   * observable, therefore, the expression must include parenthesis to unwrap
-   * the observable.
-   * ```javascript
-   * new Expecation(By.id('view-container'), 'firstName()')
-   * ```
-   *
-   * The expression to which the viewmodel value will be compared is expressed
-   * as BDD-style chains, such as
-   * ```javascript
-   * const fnExpectation = new Expectation('firstName()')
-   *   .to.equal('Joe');
-   * ```
-   *
-   * If a viewmodel value returns a Promise, the assertion will wait for it to
-   * resolve before doing the comparison.
-   *
-   * @param driver The instance of WebDriver to use in performing the expectation
-   * @param vmLocator The Locator which identifies the DOM node associated with the
-   * viewmodel on the client.
-   * @param expression The path within the viewmodel to locate the value
-   * @param expectation The Expectation object to evaluate on the client browser.
+  assertViewModelValue
+};
+Object.defineProperties(ojwd, {
+  /*
+   * Add a guard to only set the noRequireJet flag once
    */
-  async assertViewModelValue(
-    driver: WebDriver,
-    vmLocator: Locator,
-    expectation: Expectation
-  ): Promise<any> {
-    const viewmodelEl = (await driver.findElement(vmLocator)) as OjWebElement;
-    // Script executes on client to build the Chai assertion from the Expectation.
-    // Any exceptions (including failed assertions) will be returned to the test.
-    await viewmodelEl.whenBusyContextReady();
-    const result = await driver.executeAsyncScript(
-      ASSERT_SCRIPT,
-      viewmodelEl,
-      expectation.assertion
-    );
-    if (result !== true) {
-      throw Error(String(result));
-    }
-    return result;
+  noRequireJet: {
+    set: function (v) {
+      if (isNoRequireJet() === undefined) {
+        setNoRequireJet(v);
+      } else {
+        throw Error('noRequireJet cannot be set more than once');
+      }
+    },
+    get: isNoRequireJet,
+    enumerable: false,
+    configurable: false
   }
-};
+});
 export default ojwd;

package/lib/busy-context-utils.js CHANGED Viewed

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.whenBusyContextReady = exports.getBusyStates = void 0;
+exports.pageReady = exports.whenBusyContextReady = exports.getBusyStates = void 0;
 const selenium_webdriver_1 = require("selenium-webdriver");
+const oj_module_proxy_1 = require("./oj-module-proxy");
 /**
  * Get open busy state descriptions from the page context
  * @private
  * @param driver
  * @returns an array of strings of busy state descriptions
  */
-const getBusyStates = (driver) => {
-    return driver
-        .executeScript(`
-return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
-.map((state) => state.description)
-`)
-        .catch((ex) => ex.message);
+const getBusyStates = async (driver) => {
+    const hasProxy = await driver.executeScript(`return '${oj_module_proxy_1.TEST_OBJ_NAME}' in window`);
+    if (hasProxy) {
+        return (0, oj_module_proxy_1.executeWithModules)(driver, ['BusyContext'], [], '(BusyContext) => BusyContext.getBusyStates().map((state) => state.description)').catch((ex) => ex.message);
+    }
+    return '';
 };
 exports.getBusyStates = getBusyStates;
 /**
@@ -27,52 +27,34 @@ exports.getBusyStates = getBusyStates;
  * page's busy state is ready or to false when it is not a JET page.
  */
 const whenBusyContextReady = async (driver) => {
-    const remoteScript = `
-      const done = arguments[0];
-      function waitOn(Context) {
-        if (Context) {
-          Context.getPageContext().getBusyContext()
-          .whenReady().then(() => done())
-          .catch(ex => done(ex.message))
-        } else {
-          notFound();
-        }
-      }
-      function notFound() {
-        done('ojs/ojcontext module not found')
-      }
-      if (typeof require === 'function') {
-        let Context;
-        // Try sync require first
-        try {
-          Context = require('ojs/ojcontext');
-        } catch (ex) {
-          require(['ojs/ojcontext'], waitOn, notFound);
-          return;
-        }
-        waitOn(Context);
-      } else {
-        done('RequireJS not found')
-      }
-    `;
-    const ret = await driver.executeAsyncScript(remoteScript).catch(async (ex) => {
+    return (0, oj_module_proxy_1.executeWithModules)(driver, ['BusyContext'], [], '(BusyContext) => BusyContext.whenReady()').catch(async (ex) => {
         if (ex instanceof selenium_webdriver_1.error.TimeoutError || ex instanceof selenium_webdriver_1.error.ScriptTimeoutError) {
             const openStates = await (0, exports.getBusyStates)(driver);
             throw Error(`BusyContext.whenReady() timed out: ${ex.message}\nBusy states: ${openStates}`);
         }
         else {
             // unexpected error which is just reported as a warning below
-            return ex.message;
+            return false;
         }
     });
-    if (ret) {
-        // If error during require call, log warning
-        console.warn(`Cannot wait on BusyContext: ${ret}`);
-        // return false - not a JET page
-        return false;
-    }
-    // return true - a JET page
-    return true;
 };
 exports.whenBusyContextReady = whenBusyContextReady;
+/**
+ * Create a Condition for WebDriver to wait on the page's BusyContext to be ready
+ */
+function pageReady() {
+    return new selenium_webdriver_1.Condition('for JET page to indicate ready', async (driver) => {
+        // Check that <html> element has a size after page ready
+        // Call thru executeScript to bypass WebElement overrides
+        const size = await driver.executeScript(`
+      const html = document.querySelector('html');
+      return { width: html.clientWidth, height: html.clientHeight }
+    `);
+        if (!(size.width && size.height)) {
+            return Promise.resolve(false);
+        }
+        return (0, exports.whenBusyContextReady)(driver);
+    });
+}
+exports.pageReady = pageReady;
 //# sourceMappingURL=busy-context-utils.js.map

package/lib/busy-context-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"busy-context-utils.js","sourceRoot":"","sources":["../../lib/busy-context-utils.ts"],"names":[],"mappings":";;;AAAA,~~2DAAsD~~;~~AAEtD~~;;;;;GAKG;AACI,MAAM,aAAa,GAAG,~~CAAC~~,MAAiB,EAAmB,EAAE;~~IAClE~~,~~OAAO~~,MAAM~~;SACV~~,aAAa,~~CACZ;;;CAGL~~,~~CACI~~;~~SACA~~,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;~~AAC/B~~,CAAC,CAAC;~~AATW~~,QAAA,aAAa,~~iBASxB~~;AAEF;;;;;;;;GAQG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,MAAiB,EAAoB,EAAE;IAChF,~~MAAM~~,~~YAAY~~,~~GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BlB~~,~~CAAC;IACJ~~,MAAM,~~GAAG~~,~~GAAG~~,~~MAAM~~,~~MAAM,~~CAAC,~~kBAAkB~~,~~CAAC~~,~~YAAY~~,~~CAAC~~,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;~~QAC3E~~,IAAI,EAAE,YAAY,0BAAK,CAAC,YAAY,IAAI,EAAE,YAAY,0BAAK,CAAC,kBAAkB,EAAE,CAAC;YAC/E,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,sCAAsC,EAAE,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAAC,CAAC;QAC9F,CAAC;aAAM,CAAC;YACN,6DAA6D;YAC7D,OAAO,~~EAAE~~,CAAC~~,OAAO,CAAC~~;~~QACpB~~,CAAC;IACH,CAAC,CAAC,CAAC;~~IACH~~,IAAI,~~GAAG~~,EAAE,~~CAAC~~;~~QACR~~,~~4CAA4C~~;~~QAC5C~~,~~OAAO~~,~~CAAC~~,IAAI,CAAC~~,+BAA+B~~,~~GAAG~~,~~EAAE~~,CAAC,CAAC;~~QACnD~~,~~gCAAgC~~;~~QAChC~~,OAAO,KAAK,CAAC~~;IACf~~,CAAC;~~IACD~~,~~2BAA2B~~;~~IAC3B~~,OAAO,~~IAAI~~,CAAC;~~AACd~~,CAAC,CAAC;~~AA9CW~~,~~QAAA~~,~~oBAAoB,wBA8C/B~~"}
1	+ {"version":3,"file":"busy-context-utils.js","sourceRoot":"","sources":["../../lib/busy-context-utils.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,uDAAsE;AAEtE;;;;;GAKG;AACI,MAAM,aAAa,GAAG,KAAK,EAAE,MAAiB,EAAmB,EAAE;IACxE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,aAAa,CAAU,WAAW,+BAAa,aAAa,CAAC,CAAC;IAC5F,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,IAAA,oCAAkB,EACvB,MAAM,EACN,CAAC,aAAa,CAAC,EACf,EAAE,EACF,gFAAgF,CACjF,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAXW,QAAA,aAAa,iBAWxB;AAEF;;;;;;;;GAQG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,MAAiB,EAAoB,EAAE;IAChF,OAAO,IAAA,oCAAkB,EACvB,MAAM,EACN,CAAC,aAAa,CAAC,EACf,EAAE,EACF,0CAA0C,CAC3C,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACnB,IAAI,EAAE,YAAY,0BAAK,CAAC,YAAY,IAAI,EAAE,YAAY,0BAAK,CAAC,kBAAkB,EAAE,CAAC;YAC/E,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,sCAAsC,EAAE,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAAC,CAAC;QAC9F,CAAC;aAAM,CAAC;YACN,6DAA6D;YAC7D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B;AAEF;;GAEG;AACH,SAAgB,SAAS;IACvB,OAAO,IAAI,8BAAS,CAAmB,gCAAgC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxF,wDAAwD;QACxD,yDAAyD;QACzD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,aAAa,CAAoC;;;KAG1E,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,8BAcC"}

package/lib/busy-context-utils.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { WebDriver, error } from 'selenium-webdriver';
+import { Condition, WebDriver, error } from 'selenium-webdriver';
+import { executeWithModules, TEST_OBJ_NAME } from './oj-module-proxy';
 /**
  * Get open busy state descriptions from the page context
@@ -6,15 +7,17 @@ import { WebDriver, error } from 'selenium-webdriver';
  * @param driver
  * @returns an array of strings of busy state descriptions
  */
-export const getBusyStates = (driver: WebDriver): Promise<string> => {
-  return driver
-    .executeScript<string[]>(
-      `
-return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
-.map((state) => state.description)
-`
-    )
-    .catch((ex) => ex.message);
+export const getBusyStates = async (driver: WebDriver): Promise<string> => {
+  const hasProxy = await driver.executeScript<boolean>(`return '${TEST_OBJ_NAME}' in window`);
+  if (hasProxy) {
+    return executeWithModules<string>(
+      driver,
+      ['BusyContext'],
+      [],
+      '(BusyContext) => BusyContext.getBusyStates().map((state) => state.description)'
+    ).catch((ex) => ex.message);
+  }
+  return '';
 };
 /**
@@ -27,49 +30,37 @@ return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates(
  * page's busy state is ready or to false when it is not a JET page.
  */
 export const whenBusyContextReady = async (driver: WebDriver): Promise<boolean> => {
-  const remoteScript = `
-      const done = arguments[0];
-      function waitOn(Context) {
-        if (Context) {
-          Context.getPageContext().getBusyContext()
-          .whenReady().then(() => done())
-          .catch(ex => done(ex.message))
-        } else {
-          notFound();
-        }
-      }
-      function notFound() {
-        done('ojs/ojcontext module not found')
-      }
-      if (typeof require === 'function') {
-        let Context;
-        // Try sync require first
-        try {
-          Context = require('ojs/ojcontext');
-        } catch (ex) {
-          require(['ojs/ojcontext'], waitOn, notFound);
-          return;
-        }
-        waitOn(Context);
-      } else {
-        done('RequireJS not found')
-      }
-    `;
-  const ret = await driver.executeAsyncScript(remoteScript).catch(async (ex) => {
+  return executeWithModules<boolean>(
+    driver,
+    ['BusyContext'],
+    [],
+    '(BusyContext) => BusyContext.whenReady()'
+  ).catch(async (ex) => {
     if (ex instanceof error.TimeoutError || ex instanceof error.ScriptTimeoutError) {
       const openStates = await getBusyStates(driver);
       throw Error(`BusyContext.whenReady() timed out: ${ex.message}\nBusy states: ${openStates}`);
     } else {
       // unexpected error which is just reported as a warning below
-      return ex.message;
+      return false;
     }
   });
-  if (ret) {
-    // If error during require call, log warning
-    console.warn(`Cannot wait on BusyContext: ${ret}`);
-    // return false - not a JET page
-    return false;
-  }
-  // return true - a JET page
-  return true;
 };
+/**
+ * Create a Condition for WebDriver to wait on the page's BusyContext to be ready
+ */
+export function pageReady(): Condition<Promise<boolean>> {
+  return new Condition<Promise<boolean>>('for JET page to indicate ready', async (driver) => {
+    // Check that <html> element has a size after page ready
+    // Call thru executeScript to bypass WebElement overrides
+    const size = await driver.executeScript<{ width: number; height: number }>(`
+      const html = document.querySelector('html');
+      return { width: html.clientWidth, height: html.clientHeight }
+    `);
+    if (!(size.width && size.height)) {
+      return Promise.resolve(false);
+    }
+    return whenBusyContextReady(driver);
+  });
+}

package/lib/dataprovider-utils.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchKeyByFilter = void 0;
+const oj_module_proxy_1 = require("./oj-module-proxy");
 /**
  * Get the key for the record filtered by filterDef. If exactly one record is
  * found after filtering is applied, the key of that record is returned.
@@ -33,40 +34,35 @@ exports.fetchKeyByFilter = void 0;
  * ```
  */
 async function fetchKeyByFilter(el, dataProviderProp, filterDef) {
-    const driver = el.getDriver();
     await el.whenBusyContextReady();
-    return driver.executeScript(`
-  const comp = arguments[0];
-  const propName = arguments[1];
-  const filterDef = arguments[2];
+    return (0, oj_module_proxy_1.executeWithModules)(el.getDriver(), ['CustomElementUtils'], [el, dataProviderProp, filterDef], `
+    (({ getElementProperty }, comp, dataProviderProp, filterDef) => {
+      return new Promise((resolve, reject) => {
-  return new Promise((resolve, reject) => {
-    require(['ojs/ojcustomelement-utils', 'ojs/ojdataprovider'], (utils, DataProvider) => {
-      const dp = utils.CustomElementUtils.getElementProperty(comp, propName) ;
-      if (!(dp && typeof dp.fetchFirst === 'function')) {
-        reject('Property "'+propName+'" does not reference a supported DataProvider');
-      }
+        const dp = getElementProperty(comp, dataProviderProp);
+        if (!(dp && typeof dp.fetchFirst === 'function')) {
+          reject('Property "${dataProviderProp}" does not reference a supported DataProvider');
+        }
-      const iter = dp.fetchFirst({
-        filterCriterion: DataProvider.FilterFactory.getFilter({ filterDef })
-      })[Symbol.asyncIterator]();
+        const iter = dp.fetchFirst({
+          filterCriterion: filterDef
+        })[Symbol.asyncIterator]();
-      iter.next().then(res => {
-        if (res.value.metadata.length === 1) {
-          resolve(res.value.metadata[0].key);
-        }
-        else if (res.value.metadata.length > 1) {
-          reject('Filter returned too many keys: ' + res.value.metadata.map(r => r.key));
-        }
-        else {
-          reject('Filter returned no keys');
-        }
+        iter.next().then(res => {
+          if (res.value.metadata.length === 1) {
+            resolve(res.value.metadata[0].key);
+          }
+          else if (res.value.metadata.length > 1) {
+            reject('Filter returned too many keys: ' + res.value.metadata.map(r => r.key));
+          }
+          else {
+            reject('Filter returned no keys');
+          }
+        });
       });
-    });
-  });
-  `, el, dataProviderProp, filterDef);
+    })
+  `);
 }
 exports.fetchKeyByFilter = fetchKeyByFilter;
 //# sourceMappingURL=dataprovider-utils.js.map

package/lib/dataprovider-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dataprovider-utils.js","sourceRoot":"","sources":["../../lib/dataprovider-utils.ts"],"names":[],"mappings":";;;~~AAWA~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACI,KAAK,UAAU,gBAAgB,CAKpC,EAAgB,EAChB,gBAAmC,EACnC,SAAoC;IAEpC,MAAM,~~MAAM,GAAG,~~EAAE,CAAC,~~SAAS~~,EAAE,CAAC;~~IAC9B~~,~~MAAM~~,EAAE,CAAC,~~oBAAoB~~,EAAE,CAAC~~;IAChC~~,~~OAAO~~,~~MAAM,~~CAAC,~~aAAa~~,~~CACzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BD~~,~~EACC~~,EAAE,~~EACF,~~gBAAgB,~~EAChB~~,SAAS,~~CACV~~,CAAC;AACJ,CAAC;~~AAhDD~~,~~4CAgDC~~"}
1	+ {"version":3,"file":"dataprovider-utils.js","sourceRoot":"","sources":["../../lib/dataprovider-utils.ts"],"names":[],"mappings":";;;AAEA,uDAAuD;AAUvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACI,KAAK,UAAU,gBAAgB,CAKpC,EAAgB,EAChB,gBAAmC,EACnC,SAAoC;IAEpC,MAAM,EAAE,CAAC,oBAAoB,EAAE,CAAC;IAEhC,OAAO,IAAA,oCAAkB,EACvB,EAAE,CAAC,SAAS,EAAE,EACd,CAAC,oBAAoB,CAAC,EACtB,CAAC,EAAE,EAAE,gBAAgB,EAAE,SAAS,CAAC,EACjC;;;;;;8BAM0B,gBAAgB;;;;;;;;;;;;;;;;;;;;;GAqB3C,CACA,CAAC;AACJ,CAAC;AA5CD,4CA4CC"}

package/lib/dataprovider-utils.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { DataProvider, DataFilter } from '@oracle/oraclejet/ojdataprovider';
 import { OjWebElement } from '../elements';
+import { executeWithModules } from './oj-module-proxy';
 type FilterFlags<Base, Condition> = {
   [Key in keyof Base]: Base[Key] extends Condition ? Key : never;
@@ -49,43 +50,39 @@ export async function fetchKeyByFilter<
   dataProviderProp: DataProviderProps,
   filterDef: DataFilter.FilterDef<any>
 ): Promise<K> {
-  const driver = el.getDriver();
   await el.whenBusyContextReady();
-  return driver.executeScript<K>(
-    `
-  const comp = arguments[0];
-  const propName = arguments[1];
-  const filterDef = arguments[2];
-  return new Promise((resolve, reject) => {
+  return executeWithModules(
+    el.getDriver(),
+    ['CustomElementUtils'],
+    [el, dataProviderProp, filterDef],
+    `
+    (({ getElementProperty }, comp, dataProviderProp, filterDef) => {
+      return new Promise((resolve, reject) => {
-    require(['ojs/ojcustomelement-utils', 'ojs/ojdataprovider'], (utils, DataProvider) => {
-      const dp = utils.CustomElementUtils.getElementProperty(comp, propName) ;
-      if (!(dp && typeof dp.fetchFirst === 'function')) {
-        reject('Property "'+propName+'" does not reference a supported DataProvider');
-      }
+        const dp = getElementProperty(comp, dataProviderProp);
+        if (!(dp && typeof dp.fetchFirst === 'function')) {
+          reject('Property "${dataProviderProp}" does not reference a supported DataProvider');
+        }
-      const iter = dp.fetchFirst({
-        filterCriterion: DataProvider.FilterFactory.getFilter({ filterDef })
-      })[Symbol.asyncIterator]();
+        const iter = dp.fetchFirst({
+          filterCriterion: filterDef
+        })[Symbol.asyncIterator]();
-      iter.next().then(res => {
-        if (res.value.metadata.length === 1) {
-          resolve(res.value.metadata[0].key);
-        }
-        else if (res.value.metadata.length > 1) {
-          reject('Filter returned too many keys: ' + res.value.metadata.map(r => r.key));
-        }
-        else {
-          reject('Filter returned no keys');
-        }
+        iter.next().then(res => {
+          if (res.value.metadata.length === 1) {
+            resolve(res.value.metadata[0].key);
+          }
+          else if (res.value.metadata.length > 1) {
+            reject('Filter returned too many keys: ' + res.value.metadata.map(r => r.key));
+          }
+          else {
+            reject('Filter returned no keys');
+          }
+        });
       });
-    });
-  });
-  `,
-    el,
-    dataProviderProp,
-    filterDef
+    })
+  `
   );
 }

package/lib/no-require-jet.js ADDED Viewed

@@ -0,0 +1,12 @@
+"use strict";
+/**
+ * Module to hold the noRequireJet flag
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNoRequireJet = exports.setNoRequireJet = void 0;
+let noRequireJet;
+const setNoRequireJet = (v) => (noRequireJet = v);
+exports.setNoRequireJet = setNoRequireJet;
+const isNoRequireJet = () => noRequireJet;
+exports.isNoRequireJet = isNoRequireJet;
+//# sourceMappingURL=no-require-jet.js.map

package/lib/no-require-jet.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"no-require-jet.js","sourceRoot":"","sources":["../../lib/no-require-jet.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,IAAI,YAAiC,CAAC;AAE/B,MAAM,eAAe,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;AAArD,QAAA,eAAe,mBAAsC;AAC3D,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC;AAApC,QAAA,cAAc,kBAAsB"}

package/lib/no-require-jet.ts ADDED Viewed

@@ -0,0 +1,8 @@
+/**
+ * Module to hold the noRequireJet flag
+ */
+let noRequireJet: boolean | undefined;
+export const setNoRequireJet = (v: boolean) => (noRequireJet = v);
+export const isNoRequireJet = () => noRequireJet;