@contrast/assess 1.40.0 → 1.42.0

package/lib/dataflow/propagation/install/joi/expression.js

@@ -23,7 +23,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       inspect, // TODO NODE-3455: remove
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
@@ -40,7 +40,7 @@ module.exports = function(core) {
       patchType,
       usePerf: 'sync',
       post(data) {
-        if (!data.result || !getSourceContext()) return;
+        if (!data.result || !getPropagatorContext()) return;
 
         const argInfo = tracker.getData(data.args[0]);
 
@@ -82,7 +82,7 @@ module.exports = function(core) {
   core.assess.dataflow.propagation.joiInstrumentation.expression = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/index.js', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/index.js', version: '>=17 <18' },
         (joi) => {
           instrumentJoiExpression(joi, 'expression');
           instrumentJoiExpression(joi, 'x');

package/lib/dataflow/propagation/install/joi/expression.test.js

@@ -12,7 +12,7 @@ describe('assess dataflow propagation joi expression', function() {
     tracker = core.assess.dataflow.tracker;
     core.config.assess.trust_custom_validators = true;
 
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/index.js', version: '>=17.0.0' }).yields(require('joi-17/lib/index'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/index.js', version: '>=17 <18' }).yields(require('joi-17/lib/index'));
 
     require('./index')(core).install();
     joi = require('joi-17');

package/lib/dataflow/propagation/install/joi/index.js

@@ -28,7 +28,7 @@ module.exports = function(core) {
   const {
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       inspect, // TODO NODE-3455: remove
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
@@ -62,7 +62,7 @@ module.exports = function(core) {
                  return schema.$_terms?.externals?.length;
                })) ||
               !core.config.assess.trust_custom_validators ||
-              !getSourceContext()
+              !getPropagatorContext()
           )
             return;
 
@@ -111,7 +111,7 @@ module.exports = function(core) {
               (result.value === input &&
                (result.messages?.source || result.local?.error)) ||
               !core.config.assess.trust_custom_validators ||
-              !getSourceContext()
+              !getPropagatorContext()
           )
             return;
 

package/lib/dataflow/propagation/install/joi/keys.js

@@ -28,7 +28,7 @@ module.exports = function(core) {
   const {
     depHooks,
     patcher,
-    assess: { getSourceContext }
+    assess: { getPropagatorContext }
   } = core;
 
   function addMetadata(schema, refTargetPath, refPath, isInReference) {
@@ -126,7 +126,7 @@ module.exports = function(core) {
   return core.assess.dataflow.propagation.joiInstrumentation.keys = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/types/keys.js', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/types/keys.js', version: '>=17 <18' },
         (joi) => {
           patcher.patch(Object.getPrototypeOf(joi), 'keys', {
             name: 'joi.keys',
@@ -136,7 +136,7 @@ module.exports = function(core) {
               const [value] = data.args;
               const joi = data.obj.$_root;
 
-              if (!getSourceContext()) return;
+              if (!getPropagatorContext()) return;
               traverseSchemas(joi, value, value);
             },
           });

package/lib/dataflow/propagation/install/joi/number.js

@@ -25,7 +25,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       inspect, // TODO NODE-3455: remove
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
@@ -48,7 +48,7 @@ module.exports = function(core) {
         if (
           !data.result?.value ||
           data.result.errors ||
-          !getSourceContext()
+          !getPropagatorContext()
         ) return;
 
         const argInfo = tracker.getData(data.args[0]);
@@ -98,7 +98,7 @@ module.exports = function(core) {
   return core.assess.dataflow.propagation.joiInstrumentation.numberCoerce = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/types/number.js', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/types/number.js', version: '>=17 <18' },
         instrumentJoiNumber
       );
     },

package/lib/dataflow/propagation/install/joi/number.test.js

@@ -20,7 +20,7 @@ describe('assess dataflow propagation joi number', function() {
       .withArgs({
         name: 'joi',
         file: 'lib/types/number.js',
-        version: '>=17.0.0',
+        version: '>=17 <18',
       })
       .yields(require('joi-17/lib/types/number'));
 

package/lib/dataflow/propagation/install/joi/object.js

@@ -28,7 +28,7 @@ module.exports = function(core) {
   joiInstrumentation.object = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/types/object', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/types/object', version: '>=17 <18' },
         (exp) => {
           const objectTypePrototype = Object.getPrototypeOf(exp);
           const def = objectTypePrototype?._definition;

package/lib/dataflow/propagation/install/joi/object.test.js

@@ -12,7 +12,7 @@ describe('assess dataflow propagation joi object validator with custom or extern
     tracker = core.assess.dataflow.tracker;
     core.config.assess.trust_custom_validators = true;
 
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/object', version: '>=17.0.0' }).yields(require('joi-17/lib/types/object'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/object', version: '>=17 <18' }).yields(require('joi-17/lib/types/object'));
 
     require('./index')(core).install();
     joi = require('joi-17');

package/lib/dataflow/propagation/install/joi/ref.test.js

@@ -11,10 +11,10 @@ describe('assess dataflow propagation joi string and ref', function() {
     ({ core, simulateRequestScope, trackString } = initAssessFixture());
     tracker = core.assess.dataflow.tracker;
 
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/string.js', version: '>=17.0.0' }).yields(require('joi-17/lib/types/string'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/keys.js', version: '>=17.0.0' }).yields(require('joi-17/lib/types/keys'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/validator', version: '>=17.0.0' }).yields(require('joi-17/lib/validator'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/values.js', version: '>=17.0.0' }).yields(require('joi-17/lib/values'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/string.js', version: '>=17 <18' }).yields(require('joi-17/lib/types/string'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/keys.js', version: '>=17 <18' }).yields(require('joi-17/lib/types/keys'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/validator', version: '>=17 <18' }).yields(require('joi-17/lib/validator'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/values.js', version: '>=17 <18' }).yields(require('joi-17/lib/values'));
 
     require('./index')(core).install();
     joi = require('joi-17');

package/lib/dataflow/propagation/install/joi/string-schema.js

@@ -41,7 +41,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       inspect, // TODO NODE-3455: remove
       eventFactory: { createPropagationEvent },
       dataflow: {
@@ -113,7 +113,7 @@ module.exports = function(core) {
           !input ||
           (validatorName !== 'validate' && typeof data.result !== 'string') ||
           (validatorName === 'validate' && data.result) ||
-          !getSourceContext()
+          !getPropagatorContext()
         ) return;
 
         const inspectedSchema = inspect(schema);
@@ -146,7 +146,7 @@ module.exports = function(core) {
           !args[0] ||
           // currently, we are losing track of coerced isoDate only
           !args[1].schema.$_getRule('isoDate') ||
-          !getSourceContext()
+          !getPropagatorContext()
         ) return;
 
         const argInfo = tracker.getData(args[0]);
@@ -194,7 +194,7 @@ module.exports = function(core) {
   return joiInstrumentation.stringSchema = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/types/string.js', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/types/string.js', version: '>=17 <18' },
         (stringType) => {
           const stringTypePrototype = Object.getPrototypeOf(stringType);
           const definition = stringTypePrototype?._definition;

package/lib/dataflow/propagation/install/joi/string-schema.test.js

@@ -11,10 +11,10 @@ describe('assess dataflow propagation joi string', function() {
     ({ core, simulateRequestScope, trackString } = initAssessFixture());
     tracker = core.assess.dataflow.tracker;
 
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/string.js', version: '>=17.0.0' }).yields(require('joi-17/lib/types/string'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/keys.js', version: '>=17.0.0' }).yields(require('joi-17/lib/types/keys'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/validator', version: '>=17.0.0' }).yields(require('joi-17/lib/validator'));
-    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/values.js', version: '>=17.0.0' }).yields(require('joi-17/lib/values'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/string.js', version: '>=17 <18' }).yields(require('joi-17/lib/types/string'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/types/keys.js', version: '>=17 <18' }).yields(require('joi-17/lib/types/keys'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/validator', version: '>=17 <18' }).yields(require('joi-17/lib/validator'));
+    core.depHooks.resolve.withArgs({ name: 'joi', file: 'lib/values.js', version: '>=17 <18' }).yields(require('joi-17/lib/values'));
 
     require('./index')(core).install();
     strInstr = require('../string')(core);

package/lib/dataflow/propagation/install/joi/values.js

@@ -26,7 +26,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       inspect, // TODO NODE-3455: remove
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
@@ -47,7 +47,7 @@ module.exports = function(core) {
         if (
           !value ||
           !result ||
-          !getSourceContext()
+          !getPropagatorContext()
         ) return;
 
         const metadata = {
@@ -145,7 +145,7 @@ module.exports = function(core) {
   return core.assess.dataflow.propagation.joiInstrumentation.values = {
     install() {
       depHooks.resolve(
-        { name: 'joi', file: 'lib/values.js', version: '>=17.0.0' },
+        { name: 'joi', file: 'lib/values.js', version: '>=17 <18' },
         instrumentJoiValues
       );
     },

package/lib/dataflow/propagation/install/mongoose/schema-map.js

@@ -24,7 +24,7 @@ module.exports = function (core) {
     patcher,
     depHooks,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: {
         tracker,
@@ -101,7 +101,7 @@ module.exports = function (core) {
 
   schemaMap.install = function () {
     depHooks.resolve(
-      { name: 'mongoose', file: 'lib/schema/map.js', version: '>=5.0.0' },
+      { name: 'mongoose', file: 'lib/schema/map.js', version: '>=5 <9' },
       (SchemaMap) => {
         const doValidateSyncName = 'mongoose.map.prototype.doValidateSync';
         patcher.patch(SchemaMap.prototype, 'doValidateSync', {
@@ -109,7 +109,7 @@ module.exports = function (core) {
           patchType,
           usePerf: 'sync',
           post: (data) => {
-            if (!assess.trust_custom_validators || data.result || !getSourceContext()) return;
+            if (!assess.trust_custom_validators || data.result || !getPropagatorContext()) return;
 
             mapInstrumentation(data, doValidateSyncName);
           },
@@ -128,7 +128,7 @@ module.exports = function (core) {
             if (
               !value ||
               typeof cb !== 'function' ||
-              !getSourceContext()
+              !getPropagatorContext()
             ) {
               return;
             }

package/lib/dataflow/propagation/install/mongoose/schema-mixed.js

@@ -24,7 +24,7 @@ module.exports = function (core) {
     patcher,
     depHooks,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: {
         tracker,
@@ -110,7 +110,7 @@ module.exports = function (core) {
 
   schemaMixed.install = function () {
     depHooks.resolve(
-      { name: 'mongoose', file: 'lib/schema/mixed.js', version: '>=5.0.0' },
+      { name: 'mongoose', file: 'lib/schema/mixed.js', version: '>=5 <9' },
       (SchemaMixed) => {
         const doValidateSyncName = 'mongoose.mixed.prototype.doValidateSync';
         patcher.patch(SchemaMixed.prototype, 'doValidateSync', {
@@ -120,7 +120,7 @@ module.exports = function (core) {
             if (
               !assess.trust_custom_validators ||
               data.result ||
-              !getSourceContext()
+              !getPropagatorContext()
             ) {
               return;
             }
@@ -136,7 +136,7 @@ module.exports = function (core) {
           patchType,
           usePerf: 'tbd',
           pre: (data) => {
-            if (!assess.trust_custom_validators || !getSourceContext()) {
+            if (!assess.trust_custom_validators || !getPropagatorContext()) {
               return;
             }
 

package/lib/dataflow/propagation/install/mongoose/schema-string.js

@@ -29,7 +29,7 @@ module.exports = function (core) {
     patcher,
     depHooks,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
     },
@@ -43,7 +43,7 @@ module.exports = function (core) {
         post(data) {
           // if a conditional is provided as the first argument castForQuery gets
           // called subsequently with the individual value(s)
-          if (!getSourceContext() || data.args[0]) return;
+          if (!getPropagatorContext() || data.args[0]) return;
 
           const strInfo = tracker.getData(data.result);
           if (!strInfo) return;
@@ -168,7 +168,7 @@ module.exports = function (core) {
       usePerf: 'tbd',
       pre(data) {
         const [value, cb] = data.args;
-        if (!value || typeof cb !== 'function' || !getSourceContext()) return;
+        if (!value || typeof cb !== 'function' || !getPropagatorContext()) return;
 
         const hasCustomValidator = data.obj.validators.some(
           (validator) => validator.type === userDefinedType
@@ -293,7 +293,7 @@ module.exports = function (core) {
         {
           name: 'mongoose',
           file: 'lib/schema/string.js',
-          version: '>=6.0.0',
+          version: '>=6 <9',
         },
         (SchemaString, metadata) => {
           patchCastForQuery(SchemaString, metadata);

package/lib/dataflow/propagation/install/mustache-escape.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { DataflowTag: { HTML_ENCODED } } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../constants');
 const { createEscapeTagRanges } = require('../../tag-utils');
 const { patchType } = require('../common');
 
@@ -25,7 +24,7 @@ module.exports = function(core) {
     patcher,
     depHooks,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker }
     }
@@ -33,7 +32,7 @@ module.exports = function(core) {
 
   return core.assess.dataflow.propagation.mustacheEscape = {
     install() {
-      depHooks.resolve({ name: 'mustache' }, (mustache) => {
+      depHooks.resolve({ name: 'mustache', version: '<5' }, (mustache) => {
         const name = 'mustache.escape';
 
         return patcher.patch(mustache, 'escape', {
@@ -42,7 +41,7 @@ module.exports = function(core) {
           usePerf: 'sync',
           post(data) {
             const { args, result, hooked, orig } = data;
-            if (!result || !args[0] || !getSourceContext(PROPAGATOR)) return;
+            if (!result || !args[0] || !getPropagatorContext()) return;
 
             const argInfo = tracker.getData(args[0]);
 

package/lib/dataflow/propagation/install/mustache-escape.test.js

@@ -20,7 +20,7 @@ describe('assess dataflow propagation mustache.escape', function () {
 
     tracker = core.assess.dataflow.tracker;
     core.assess.dataflow.propagation.mustacheEscape.install();
-    core.depHooks.resolve.withArgs({ name: 'mustache' }).yield(mustache);
+    core.depHooks.resolve.yield(mustache);
   });
 
   afterEach(function () {

package/lib/dataflow/propagation/install/mysql-connection-escape.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { DataflowTag: { SQL_ENCODED } } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../constants');
 const { createFullLengthCopyTags } = require('../../tag-utils');
 const { patchType, createModuleLabel } = require('../common');
 
@@ -25,7 +24,7 @@ module.exports = function(core) {
     patcher,
     depHooks,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker }
     }
@@ -34,7 +33,7 @@ module.exports = function(core) {
   function createPostHook(eventName, objectValue) {
     return function(data) {
       const { args, result, hooked, orig } = data;
-      if (!result || !args[0] || !getSourceContext(PROPAGATOR)) return;
+      if (!result || !args[0] || !getPropagatorContext()) return;
 
       const argInfo = tracker.getData(args[0]);
 
@@ -87,18 +86,17 @@ module.exports = function(core) {
 
   return core.assess.dataflow.propagation.mysqlEscape = {
     install() {
-      ['mysql', 'mysql2'].forEach((lib) => {
-        depHooks.resolve({ name: lib }, (mysql, version) => {
-          patcher.patch(mysql, 'escape', {
-            name: `${lib}.escape`,
-            patchType,
-            usePerf: 'sync',
-            post: createPostHook(`${lib}.escape`, `${createModuleLabel(lib, version)}`)
-          });
+      // mysql
+      depHooks.resolve({ name: 'mysql', version: '<3' }, (mysql, version) => {
+        patcher.patch(mysql, 'escape', {
+          name: 'mysql.escape',
+          patchType,
+          usePerf: 'sync',
+          post: createPostHook('mysql.escape', `${createModuleLabel('mysql', version)}`)
         });
       });
 
-      depHooks.resolve({ name: 'mysql', file: 'lib/Connection.js' }, (mysqlConnection, version) => {
+      depHooks.resolve({ name: 'mysql', version: '<3', file: 'lib/Connection.js' }, (mysqlConnection, version) => {
         patcher.patch(mysqlConnection.prototype, 'escape', {
           name: 'mysql.Connection.prototype.escape',
           patchType,
@@ -107,9 +105,19 @@ module.exports = function(core) {
         });
       });
 
-      depHooks.resolve({ name: 'mysql2', file: 'lib/connection.js' }, (mysqlConnection, version) => {
+      // mysql2
+      depHooks.resolve({ name: 'mysql2', version: '<4' }, (mysql, version) => {
+        patcher.patch(mysql, 'escape', {
+          name: 'mysql2.escape',
+          patchType,
+          usePerf: 'sync',
+          post: createPostHook('mysql2.escape', `${createModuleLabel('mysql2', version)}`)
+        });
+      });
+
+      depHooks.resolve({ name: 'mysql2', version: '<4', file: 'lib/connection.js' }, (mysqlConnection, version) => {
         patcher.patch(mysqlConnection.prototype, 'escape', {
-          name: 'mysql.Connection.prototype.escape',
+          name: 'mysql2.Connection.prototype.escape',
           patchType,
           usePerf: 'sync',
           post: createPostHook('mysql2/lib/connection.Connection.escape', `[${createModuleLabel('mysql2', version)}].Connection`)

package/lib/dataflow/propagation/install/mysql-connection-escape.test.js

@@ -25,7 +25,7 @@ describe('assess dataflow propagation mysql.connection.escape', function () {
     mockConnection.prototype.escape = (str) => `mock-escape_${str}_mock-escape`;
     tracker = core.assess.dataflow.tracker;
     core.assess.dataflow.propagation.mysqlEscape.install();
-    core.depHooks.resolve.withArgs({ name: 'mysql', file: 'lib/Connection.js' }).yield(mockConnection);
+    core.depHooks.resolve.withArgs(sinon.match({ name: 'mysql', file: 'lib/Connection.js' })).yield(mockConnection);
   });
 
   afterEach(function () {

package/lib/dataflow/propagation/install/parse-int.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { isString } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../constants');
 const { patchType } = require('../common');
 
 module.exports = function (core) {
@@ -24,7 +23,7 @@ module.exports = function (core) {
     logger,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       dataflow: { tracker }
     }
   } = core;
@@ -43,7 +42,7 @@ module.exports = function (core) {
             isNaN(result) ||
             !value ||
             !isString(value) ||
-            !getSourceContext(PROPAGATOR) ||
+            !getPropagatorContext() ||
             !tracker.getData(value)
           ) return;
 

package/lib/dataflow/propagation/install/path/basename.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { isString, primordials: { ArrayPrototypeJoin } } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../../constants');
 const { patchType } = require('../../common');
 const { excludeExtensionDotFromTags, createBasenameTagsInResult } = require('./common');
 
@@ -25,7 +24,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
     },
@@ -33,7 +32,7 @@ module.exports = function(core) {
 
   core.assess.dataflow.propagation.pathInstrumentation.basename = {
     install() {
-      depHooks.resolve({ name: 'path' }, (path) => {
+      depHooks.resolve({ name: 'path', version: '*' }, (path) => {
         for (const os of ['posix', 'win32']) {
           const isWin32 = os === 'win32';
 
@@ -44,7 +43,7 @@ module.exports = function(core) {
             post(data) {
               const { args: origArgs, result, name, hooked, orig } = data;
 
-              if (!result || !getSourceContext(PROPAGATOR)) return;
+              if (!result || !getPropagatorContext()) return;
 
               const [pathStr, suffixStr] = origArgs;
 

package/lib/dataflow/propagation/install/path/dirname.js

@@ -15,7 +15,6 @@
 
 'use strict';
 const { isString } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../../constants');
 const { patchType } = require('../../common');
 const { createArgTagsInResult } = require('./common');
 
@@ -24,7 +23,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
     },
@@ -32,7 +31,7 @@ module.exports = function(core) {
 
   core.assess.dataflow.propagation.pathInstrumentation.dirname = {
     install() {
-      depHooks.resolve({ name: 'path' }, (path) => {
+      depHooks.resolve({ name: 'path', version: '*' }, (path) => {
         for (const os of ['posix', 'win32']) {
           const isWin32 = os === 'win32';
 
@@ -43,7 +42,7 @@ module.exports = function(core) {
             post(data) {
               const { args, result, name, hooked, orig } = data;
 
-              if (!result || !getSourceContext(PROPAGATOR)) return;
+              if (!result || !getPropagatorContext()) return;
 
               const pathStr = args[0];
 

package/lib/dataflow/propagation/install/path/extname.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { isString } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../../constants');
 const { createSubsetTags } = require('../../../tag-utils');
 const { patchType } = require('../../common');
 const { excludeExtensionDotFromTags } = require('./common');
@@ -26,7 +25,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
     },
@@ -34,7 +33,7 @@ module.exports = function(core) {
 
   core.assess.dataflow.propagation.pathInstrumentation.extname = {
     install() {
-      depHooks.resolve({ name: 'path' }, (path) => {
+      depHooks.resolve({ name: 'path', version: '*' }, (path) => {
         for (const os of ['posix', 'win32']) {
           const isWin32 = os === 'win32';
 
@@ -44,7 +43,7 @@ module.exports = function(core) {
             usePerf: 'sync',
             post(data) {
               const { args, result, name, hooked, orig } = data;
-              if (!result || !getSourceContext(PROPAGATOR)) return;
+              if (!result || !getPropagatorContext()) return;
 
               const pathStr = args[0];
 

package/lib/dataflow/propagation/install/path/format.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { primordials: { ArrayPrototypeJoin }, isString } = require('@contrast/common');
-const { InstrumentationType: { PROPAGATOR } } = require('../../../../constants');
 const { createMergedTags, getAdjustedUntrackedValue } = require('../../../tag-utils');
 const { patchType } = require('../../common');
 const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
@@ -26,7 +25,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      getSourceContext,
+      getPropagatorContext,
       eventFactory: { createPropagationEvent },
       dataflow: { tracker },
     },
@@ -34,7 +33,7 @@ module.exports = function(core) {
 
   core.assess.dataflow.propagation.pathInstrumentation.format = {
     install() {
-      depHooks.resolve({ name: 'path' }, (path) => {
+      depHooks.resolve({ name: 'path', version: '*' }, (path) => {
         for (const os of ['posix', 'win32']) {
           const isWin32 = os === 'win32';
 
@@ -44,7 +43,7 @@ module.exports = function(core) {
             usePerf: 'sync',
             post(data) {
               const { args, result, name: patchName, hooked, orig } = data;
-              if (!result || !getSourceContext(PROPAGATOR)) return;
+              if (!result || !getPropagatorContext()) return;
 
               const pathProps = [];
               const { dir, root, base, name, ext } = args[0];