@openrewrite/recipes-nodejs 0.34.0-20251119-170415 → 0.34.0-20251120-093058

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 (21) hide show
  1. package/dist/migrate/buffer-slice.d.ts.map +1 -1
  2. package/dist/migrate/buffer-slice.js +2 -17
  3. package/dist/migrate/buffer-slice.js.map +1 -1
  4. package/dist/migrate/crypto-constructors.d.ts.map +1 -1
  5. package/dist/migrate/crypto-constructors.js +6 -6
  6. package/dist/migrate/crypto-constructors.js.map +1 -1
  7. package/dist/migrate/process-features-tls.js +4 -4
  8. package/dist/migrate/process-features-tls.js.map +1 -1
  9. package/dist/migrate/util-extend.js +1 -1
  10. package/dist/migrate/util-extend.js.map +1 -1
  11. package/dist/migrate/util-log.js +1 -1
  12. package/dist/migrate/util-log.js.map +1 -1
  13. package/dist/migrate/util-type-checking.js +15 -15
  14. package/dist/migrate/util-type-checking.js.map +1 -1
  15. package/package.json +2 -2
  16. package/src/migrate/buffer-slice.ts +4 -18
  17. package/src/migrate/crypto-constructors.ts +9 -15
  18. package/src/migrate/process-features-tls.ts +4 -4
  19. package/src/migrate/util-extend.ts +1 -1
  20. package/src/migrate/util-log.ts +1 -1
  21. package/src/migrate/util-type-checking.ts +15 -15
package/dist/migrate/buffer-slice.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buffer-slice.d.ts","sourceRoot":"","sources":["../../src/migrate/buffer-slice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAUlF,qBAAa,4BAA6B,SAAQ,MAAM;IACpD,QAAQ,CAAC,IAAI,kEAAiE;IAC9E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAkE;IAC9F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA6H;IACzJ,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAe;IAEhC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CA0B9D"}
1
+ {"version":3,"file":"buffer-slice.d.ts","sourceRoot":"","sources":["../../src/migrate/buffer-slice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAUlF,qBAAa,4BAA6B,SAAQ,MAAM;IACpD,QAAQ,CAAC,IAAI,kEAAiE;IAC9E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAkE;IAC9F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA6H;IACzJ,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAe;IAEhC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAY9D"}
package/dist/migrate/buffer-slice.js CHANGED
@@ -32,23 +32,8 @@ class ReplaceDeprecatedBufferSlice extends rewrite_1.Recipe {
32
32
  visitMethodInvocation: { get: () => super.visitMethodInvocation }
33
33
  });
34
34
  return __awaiter(this, void 0, void 0, function* () {
35
- if (this.sliceMatcher.matches(method.methodType)) {
36
- if (method.select) {
37
- const selectExpr = method.select.element;
38
- const args = method.arguments.elements;
39
- if (args.length === 0) {
40
- return yield (0, javascript_1.template) `${selectExpr}.subarray()`.apply(this.cursor, method);
41
- }
42
- else if (args.length === 1) {
43
- const arg0 = args[0].element;
44
- return yield (0, javascript_1.template) `${selectExpr}.subarray(${arg0})`.apply(this.cursor, method);
45
- }
46
- else if (args.length >= 2) {
47
- const arg0 = args[0].element;
48
- const arg1 = args[1].element;
49
- return yield (0, javascript_1.template) `${selectExpr}.subarray(${arg0}, ${arg1})`.apply(this.cursor, method);
50
- }
51
- }
35
+ if (method.select && this.sliceMatcher.matches(method.methodType)) {
36
+ return (0, javascript_1.template) `${method.select}.subarray(${method.arguments})`.apply(method, this.cursor);
52
37
  }
53
38
  return _super.visitMethodInvocation.call(this, method, p);
54
39
  });
package/dist/migrate/buffer-slice.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buffer-slice.js","sourceRoot":"","sources":["../../src/migrate/buffer-slice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAAuG;AASvG,MAAa,4BAA6B,SAAQ,gBAAM;IAAxD;;QACa,SAAI,GAAG,8DAA8D,CAAA;QACrE,gBAAW,GAAW,8DAA8D,CAAC;QACrF,gBAAW,GAAW,yHAAyH,CAAC;QAChJ,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IA4B1C,CAAC;IA1BS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,kBAAkB,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBAC7C,iBAAY,GAAG,IAAI,0BAAa,CAAC,kBAAkB,CAAC,CAAC;gBAsBzD,CAAC;gBApBmB,qBAAqB,CAAC,MAA0B,EAAE,CAAmB;;;;;wBACjF,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BAC/C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gCAChB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;gCACzC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;gCAEvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oCACpB,OAAO,MAAM,IAAA,qBAAQ,EAAA,GAAG,UAAU,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gCAC/E,CAAC;qCAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oCAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oCAC7B,OAAO,MAAM,IAAA,qBAAQ,EAAA,GAAG,UAAU,aAAa,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gCACtF,CAAC;qCAAM,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oCAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oCAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oCAC7B,OAAO,MAAM,IAAA,qBAAQ,EAAA,GAAG,UAAU,aAAa,IAAI,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gCAC/F,CAAC;4BACL,CAAC;wBACL,CAAC;wBACD,OAAO,OAAM,qBAAqB,YAAC,MAAM,EAAE,CAAC,EAAE;oBAClD,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAhCD,oEAgCC"}
1
+ {"version":3,"file":"buffer-slice.js","sourceRoot":"","sources":["../../src/migrate/buffer-slice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAAuG;AASvG,MAAa,4BAA6B,SAAQ,gBAAM;IAAxD;;QACa,SAAI,GAAG,8DAA8D,CAAA;QACrE,gBAAW,GAAW,8DAA8D,CAAC;QACrF,gBAAW,GAAW,yHAAyH,CAAC;QAChJ,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAc1C,CAAC;IAZS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,kBAAkB,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBAC7C,iBAAY,GAAG,IAAI,0BAAa,CAAC,kBAAkB,CAAC,CAAC;gBAQzD,CAAC;gBANkB,qBAAqB,CAAC,MAA0B,EAAE,CAAmB;;;;;wBAChF,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BAChE,OAAO,IAAA,qBAAQ,EAAA,GAAG,MAAM,CAAC,MAAM,aAAa,MAAM,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC/F,CAAC;wBACD,OAAO,OAAM,qBAAqB,YAAC,MAAM,EAAE,CAAC,EAAE;oBAClD,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAlBD,oEAkBC"}
package/dist/migrate/crypto-constructors.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crypto-constructors.d.ts","sourceRoot":"","sources":["../../src/migrate/crypto-constructors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAUlF,qBAAa,yBAA0B,SAAQ,MAAM;IACjD,QAAQ,CAAC,IAAI,kEAAiE;IAC9E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAyF;IACrH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA2M;IACvO,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAA0B;IAE3C,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAsD9D"}
1
+ {"version":3,"file":"crypto-constructors.d.ts","sourceRoot":"","sources":["../../src/migrate/crypto-constructors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAI3E,qBAAa,yBAA0B,SAAQ,MAAM;IACjD,QAAQ,CAAC,IAAI,kEAAiE;IAC9E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAyF;IACrH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA2M;IACvO,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAA0B;IAE3C,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAsD9D"}
package/dist/migrate/crypto-constructors.js CHANGED
@@ -44,11 +44,11 @@ class ReplaceCryptoConstructors extends rewrite_1.Recipe {
44
44
  const fullyQualifiedName = clazz.type.fullyQualifiedName;
45
45
  const cryptoIdentifier = target;
46
46
  if (fullyQualifiedName == "crypto.Hash" && args.length === 1) {
47
- return yield (0, javascript_1.template) `${cryptoIdentifier}.createHash(${firstArg})`.apply(this.cursor, newClass);
47
+ return yield (0, javascript_1.template) `${cryptoIdentifier}.createHash(${firstArg})`.apply(newClass, this.cursor);
48
48
  }
49
49
  else if (fullyQualifiedName == "crypto.Hmac" && args.length === 2) {
50
50
  const secondArg = args[1].element;
51
- return yield (0, javascript_1.template) `${cryptoIdentifier}.createHmac(${firstArg}, ${secondArg})`.apply(this.cursor, newClass);
51
+ return yield (0, javascript_1.template) `${cryptoIdentifier}.createHmac(${firstArg}, ${secondArg})`.apply(newClass, this.cursor);
52
52
  }
53
53
  }
54
54
  }
@@ -57,15 +57,15 @@ class ReplaceCryptoConstructors extends rewrite_1.Recipe {
57
57
  if ((constructorType === null || constructorType === void 0 ? void 0 : constructorType.declaringType.kind) == java_1.Type.Kind.Class
58
58
  && constructorType.declaringType.fullyQualifiedName == "crypto") {
59
59
  if (constructorType.name == "Hash" && args.length === 1) {
60
- (0, javascript_1.maybeAddImport)(this, { target: "crypto", member: "createHash", onlyIfReferenced: false });
60
+ (0, javascript_1.maybeAddImport)(this, { module: "crypto", member: "createHash", onlyIfReferenced: false });
61
61
  (0, javascript_1.maybeRemoveImport)(this, "crypto", "Hash");
62
- return yield (0, javascript_1.template) `createHash(${firstArg})`.apply(this.cursor, newClass);
62
+ return yield (0, javascript_1.template) `createHash(${firstArg})`.apply(newClass, this.cursor);
63
63
  }
64
64
  else if (constructorType.name == "Hmac" && args.length === 2) {
65
65
  const secondArg = args[1].element;
66
- (0, javascript_1.maybeAddImport)(this, { target: "crypto", member: "createHmac", onlyIfReferenced: false });
66
+ (0, javascript_1.maybeAddImport)(this, { module: "crypto", member: "createHmac", onlyIfReferenced: false });
67
67
  (0, javascript_1.maybeRemoveImport)(this, "crypto", "Hmac");
68
- return yield (0, javascript_1.template) `createHmac(${firstArg}, ${secondArg})`.apply(this.cursor, newClass);
68
+ return yield (0, javascript_1.template) `createHmac(${firstArg}, ${secondArg})`.apply(newClass, this.cursor);
69
69
  }
70
70
  }
71
71
  }
package/dist/migrate/crypto-constructors.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crypto-constructors.js","sourceRoot":"","sources":["../../src/migrate/crypto-constructors.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crypto-constructors.js","sourceRoot":"","sources":["../../src/migrate/crypto-constructors.ts"],"names":[],"mappings":"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"}
package/dist/migrate/process-features-tls.js CHANGED
@@ -29,10 +29,10 @@ class RemoveUsageOfProcessFeaturesTlsConstants extends rewrite_1.Recipe {
29
29
  });
30
30
  return __awaiter(this, void 0, void 0, function* () {
31
31
  const ret = yield _super.visitExpression.call(this, expression, p);
32
- if ((yield (0, javascript_1.pattern) `process.features.tls_alpn`.match(ret))
33
- || (yield (0, javascript_1.pattern) `process.features.tls_ocsp`.match(ret))
34
- || (yield (0, javascript_1.pattern) `process.features.tls_sni`.match(ret))) {
35
- return yield (0, javascript_1.template) `process.features.tls`.apply(this.cursor, ret);
32
+ if ((yield (0, javascript_1.pattern) `process.features.tls_alpn`.match(ret, this.cursor))
33
+ || (yield (0, javascript_1.pattern) `process.features.tls_ocsp`.match(ret, this.cursor))
34
+ || (yield (0, javascript_1.pattern) `process.features.tls_sni`.match(ret, this.cursor))) {
35
+ return yield (0, javascript_1.template) `process.features.tls`.apply(ret, this.cursor);
36
36
  }
37
37
  return ret;
38
38
  });
package/dist/migrate/process-features-tls.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process-features-tls.js","sourceRoot":"","sources":["../../src/migrate/process-features-tls.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAAiG;AAMjG,MAAa,wCAAyC,SAAQ,gBAAM;IAApE;;QACa,SAAI,GAAG,wFAAwF,CAAA;QAC/F,gBAAW,GAAW,gEAAgE,CAAC;QACvF,gBAAW,GAAW,2GAA2G,CAAC;QAClI,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAe1C,CAAC;IAbS,MAAM;;YACR,OAAO,IAAI,KAAM,SAAQ,8BAAmC;gBACxC,eAAe,CAAC,UAAsB,EAAE,CAAmB;;;;;wBACvE,MAAM,GAAG,GAAG,MAAM,OAAM,eAAe,YAAC,UAAU,EAAE,CAAC,CAAe,CAAC;wBACrE,IAAI,CAAA,MAAM,IAAA,oBAAO,EAAA,2BAA2B,CAAC,KAAK,CAAC,GAAG,CAAC;gCAChD,MAAM,IAAA,oBAAO,EAAA,2BAA2B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gCACnD,MAAM,IAAA,oBAAO,EAAA,0BAA0B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA,EAAE,CAAC;4BACxD,OAAO,MAAM,IAAA,qBAAQ,EAAA,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;wBACxE,CAAC;wBACD,OAAO,GAAG,CAAC;oBACf,CAAC;iBAAA;aACJ,CAAA;QACL,CAAC;KAAA;CACJ;AAnBD,4FAmBC"}
1
+ {"version":3,"file":"process-features-tls.js","sourceRoot":"","sources":["../../src/migrate/process-features-tls.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAAiG;AAMjG,MAAa,wCAAyC,SAAQ,gBAAM;IAApE;;QACa,SAAI,GAAG,wFAAwF,CAAA;QAC/F,gBAAW,GAAW,gEAAgE,CAAC;QACvF,gBAAW,GAAW,2GAA2G,CAAC;QAClI,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAe1C,CAAC;IAbS,MAAM;;YACR,OAAO,IAAI,KAAM,SAAQ,8BAAmC;gBACxC,eAAe,CAAC,UAAsB,EAAE,CAAmB;;;;;wBACvE,MAAM,GAAG,GAAG,MAAM,OAAM,eAAe,YAAC,UAAU,EAAE,CAAC,CAAe,CAAC;wBACrE,IAAI,CAAA,MAAM,IAAA,oBAAO,EAAA,2BAA2B,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;gCAC7D,MAAM,IAAA,oBAAO,EAAA,2BAA2B,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;gCAChE,MAAM,IAAA,oBAAO,EAAA,0BAA0B,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA,EAAE,CAAC;4BACrE,OAAO,MAAM,IAAA,qBAAQ,EAAA,sBAAsB,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBACxE,CAAC;wBACD,OAAO,GAAG,CAAC;oBACf,CAAC;iBAAA;aACJ,CAAA;QACL,CAAC;KAAA;CACJ;AAnBD,4FAmBC"}
package/dist/migrate/util-extend.js CHANGED
@@ -40,7 +40,7 @@ class ReplaceUtilExtend extends rewrite_1.Recipe {
40
40
  if (args.length === 2) {
41
41
  const target = args[0].element;
42
42
  const source = args[1].element;
43
- return yield (0, javascript_1.template) `Object.assign(${target}, ${source})`.apply(this.cursor, method);
43
+ return yield (0, javascript_1.template) `Object.assign(${target}, ${source})`.apply(method, this.cursor);
44
44
  }
45
45
  }
46
46
  return method;
package/dist/migrate/util-extend.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util-extend.js","sourceRoot":"","sources":["../../src/migrate/util-extend.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAMyC;AAMzC,MAAa,iBAAkB,SAAQ,gBAAM;IAA7C;;QACa,SAAI,GAAG,uDAAuD,CAAA;QAC9D,gBAAW,GAAW,4DAA4D,CAAC;QACnF,gBAAW,GAAW,qIAAqI,CAAC;QAC5J,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAyB1C,CAAC;IAvBS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,kBAAkB,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBAC7C,sBAAiB,GAAG,IAAI,0BAAa,CAAC,kBAAkB,CAAC,CAAC;gBAmB9D,CAAC;gBAjBmB,qBAAqB,CAAC,CAAqB,EAAE,CAAmB;;;;;wBAC5E,MAAM,MAAM,GAAG,MAAM,OAAM,qBAAqB,YAAC,CAAC,EAAE,CAAC,CAAuB,CAAC;wBAC7E,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BACpD,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;4BAChC,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;4BAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;4BAGvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCACpB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gCAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gCAC/B,OAAO,MAAM,IAAA,qBAAQ,EAAA,iBAAiB,MAAM,KAAK,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;4BAC1F,CAAC;wBACL,CAAC;wBACD,OAAO,MAAM,CAAC;oBAClB,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AA7BD,8CA6BC"}
1
+ {"version":3,"file":"util-extend.js","sourceRoot":"","sources":["../../src/migrate/util-extend.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAMyC;AAMzC,MAAa,iBAAkB,SAAQ,gBAAM;IAA7C;;QACa,SAAI,GAAG,uDAAuD,CAAA;QAC9D,gBAAW,GAAW,4DAA4D,CAAC;QACnF,gBAAW,GAAW,qIAAqI,CAAC;QAC5J,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAyB1C,CAAC;IAvBS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,kBAAkB,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBAC7C,sBAAiB,GAAG,IAAI,0BAAa,CAAC,kBAAkB,CAAC,CAAC;gBAmB9D,CAAC;gBAjBmB,qBAAqB,CAAC,CAAqB,EAAE,CAAmB;;;;;wBAC5E,MAAM,MAAM,GAAG,MAAM,OAAM,qBAAqB,YAAC,CAAC,EAAE,CAAC,CAAuB,CAAC;wBAC7E,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BACpD,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;4BAChC,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;4BAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;4BAGvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCACpB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gCAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gCAC/B,OAAO,MAAM,IAAA,qBAAQ,EAAA,iBAAiB,MAAM,KAAK,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;4BAC1F,CAAC;wBACL,CAAC;wBACD,OAAO,MAAM,CAAC;oBAClB,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AA7BD,8CA6BC"}
package/dist/migrate/util-log.js CHANGED
@@ -37,7 +37,7 @@ class ReplaceUtilLog extends rewrite_1.Recipe {
37
37
  (0, javascript_1.maybeRemoveImport)(this, "util");
38
38
  (0, javascript_1.maybeRemoveImport)(this, "util", "log");
39
39
  const args = method.arguments.elements;
40
- return yield (0, javascript_1.template) `console.log(${args})`.apply(this.cursor, method);
40
+ return yield (0, javascript_1.template) `console.log(${args})`.apply(method, this.cursor);
41
41
  }
42
42
  return method;
43
43
  });
package/dist/migrate/util-log.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util-log.js","sourceRoot":"","sources":["../../src/migrate/util-log.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAOyC;AAMzC,MAAa,cAAe,SAAQ,gBAAM;IAA1C;;QACa,SAAI,GAAG,oDAAoD,CAAA;QAC3D,gBAAW,GAAW,sDAAsD,CAAC;QAC7E,gBAAW,GAAW,mIAAmI,CAAC;QAC1J,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAoB1C,CAAC;IAhBS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,cAAc,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBACzC,mBAAc,GAAG,IAAI,0BAAa,CAAC,cAAc,CAAC,CAAC;gBAYvD,CAAC;gBAVmB,qBAAqB,CAAC,CAAqB,EAAE,CAAmB;;;;;wBAC5E,MAAM,MAAM,GAAG,MAAM,OAAM,qBAAqB,YAAC,CAAC,EAAE,CAAC,CAAuB,CAAC;wBAC7E,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BACjD,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;4BAChC,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;4BACvC,OAAO,MAAM,IAAA,qBAAQ,EAAA,eAAe,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;wBAC3E,CAAC;wBACD,OAAO,MAAM,CAAC;oBAClB,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAxBD,wCAwBC"}
1
+ {"version":3,"file":"util-log.js","sourceRoot":"","sources":["../../src/migrate/util-log.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAkF;AAClF,gEAOyC;AAMzC,MAAa,cAAe,SAAQ,gBAAM;IAA1C;;QACa,SAAI,GAAG,oDAAoD,CAAA;QAC3D,gBAAW,GAAW,sDAAsD,CAAC;QAC7E,gBAAW,GAAW,mIAAmI,CAAC;QAC1J,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;IAoB1C,CAAC;IAhBS,MAAM;;YACR,OAAO,IAAA,eAAK,EAAC,IAAA,uBAAU,EAAC,cAAc,CAAC,EAAE,IAAI,KAAM,SAAQ,8BAAmC;gBAAjD;;oBACzC,mBAAc,GAAG,IAAI,0BAAa,CAAC,cAAc,CAAC,CAAC;gBAYvD,CAAC;gBAVmB,qBAAqB,CAAC,CAAqB,EAAE,CAAmB;;;;;wBAC5E,MAAM,MAAM,GAAG,MAAM,OAAM,qBAAqB,YAAC,CAAC,EAAE,CAAC,CAAuB,CAAC;wBAC7E,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;4BACjD,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;4BAChC,IAAA,8BAAiB,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;4BACvC,OAAO,MAAM,IAAA,qBAAQ,EAAA,eAAe,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC3E,CAAC;wBACD,OAAO,MAAM,CAAC;oBAClB,CAAC;iBAAA;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAxBD,wCAwBC"}
package/dist/migrate/util-type-checking.js CHANGED
@@ -86,63 +86,63 @@ class UseNativeTypeCheckingMethods extends rewrite_1.Recipe {
86
86
  (0, javascript_1.maybeRemoveImport)(this, "util");
87
87
  if (this.isArray.matches(method.methodType)) {
88
88
  (0, javascript_1.maybeRemoveImport)(this, "util", "isArray");
89
- return yield (0, javascript_1.template) `Array.isArray(${arg})`.apply(this.cursor, method);
89
+ return yield (0, javascript_1.template) `Array.isArray(${arg})`.apply(method, this.cursor);
90
90
  }
91
91
  else if (this.isBoolean.matches(method.methodType)) {
92
92
  (0, javascript_1.maybeRemoveImport)(this, "util", "isBoolean");
93
- return yield (0, javascript_1.template) `typeof ${arg} === 'boolean'`.apply(this.cursor, method);
93
+ return yield (0, javascript_1.template) `typeof ${arg} === 'boolean'`.apply(method, this.cursor);
94
94
  }
95
95
  else if (this.isBuffer.matches(method.methodType)) {
96
96
  (0, javascript_1.maybeRemoveImport)(this, "util", "isBuffer");
97
- return yield (0, javascript_1.template) `Buffer.isBuffer(${arg})`.apply(this.cursor, method);
97
+ return yield (0, javascript_1.template) `Buffer.isBuffer(${arg})`.apply(method, this.cursor);
98
98
  }
99
99
  else if (this.isDate.matches(method.methodType)) {
100
100
  (0, javascript_1.maybeRemoveImport)(this, "util", "isDate");
101
- return yield (0, javascript_1.template) `${arg} instanceof Date`.apply(this.cursor, method);
101
+ return yield (0, javascript_1.template) `${arg} instanceof Date`.apply(method, this.cursor);
102
102
  }
103
103
  else if (this.isError.matches(method.methodType)) {
104
104
  (0, javascript_1.maybeRemoveImport)(this, "util", "isError");
105
- return yield (0, javascript_1.template) `${arg} instanceof Error`.apply(this.cursor, method);
105
+ return yield (0, javascript_1.template) `${arg} instanceof Error`.apply(method, this.cursor);
106
106
  }
107
107
  else if (this.isFunction.matches(method.methodType)) {
108
108
  (0, javascript_1.maybeRemoveImport)(this, "util", "isFunction");
109
- return yield (0, javascript_1.template) `typeof (${arg}) === 'function'`.apply(this.cursor, method);
109
+ return yield (0, javascript_1.template) `typeof (${arg}) === 'function'`.apply(method, this.cursor);
110
110
  }
111
111
  else if (this.isNull.matches(method.methodType)) {
112
112
  (0, javascript_1.maybeRemoveImport)(this, "util", "isNull");
113
- return yield (0, javascript_1.template) `${arg} === null`.apply(this.cursor, method);
113
+ return yield (0, javascript_1.template) `${arg} === null`.apply(method, this.cursor);
114
114
  }
115
115
  else if (this.isNullOrUndefined.matches(method.methodType)) {
116
116
  (0, javascript_1.maybeRemoveImport)(this, "util", "isNullOrUndefined");
117
- return yield (0, javascript_1.template) `${arg} == null`.apply(this.cursor, method);
117
+ return yield (0, javascript_1.template) `${arg} == null`.apply(method, this.cursor);
118
118
  }
119
119
  else if (this.isNumber.matches(method.methodType)) {
120
120
  (0, javascript_1.maybeRemoveImport)(this, "util", "isNumber");
121
- return yield (0, javascript_1.template) `typeof ${arg} === 'number'`.apply(this.cursor, method);
121
+ return yield (0, javascript_1.template) `typeof ${arg} === 'number'`.apply(method, this.cursor);
122
122
  }
123
123
  else if (this.isObject.matches(method.methodType)) {
124
124
  (0, javascript_1.maybeRemoveImport)(this, "util", "isObject");
125
- return yield (0, javascript_1.template) `typeof ${arg} === 'object' && ${arg} !== null`.apply(this.cursor, method);
125
+ return yield (0, javascript_1.template) `typeof ${arg} === 'object' && ${arg} !== null`.apply(method, this.cursor);
126
126
  }
127
127
  else if (this.isPrimitive.matches(method.methodType)) {
128
128
  (0, javascript_1.maybeRemoveImport)(this, "util", "isPrimitive");
129
- return yield (0, javascript_1.template) `${arg} !== Object(${arg})`.apply(this.cursor, method);
129
+ return yield (0, javascript_1.template) `${arg} !== Object(${arg})`.apply(method, this.cursor);
130
130
  }
131
131
  else if (this.isRegExp.matches(method.methodType)) {
132
132
  (0, javascript_1.maybeRemoveImport)(this, "util", "isRegExp");
133
- return yield (0, javascript_1.template) `${arg} instanceof RegExp`.apply(this.cursor, method);
133
+ return yield (0, javascript_1.template) `${arg} instanceof RegExp`.apply(method, this.cursor);
134
134
  }
135
135
  else if (this.isString.matches(method.methodType)) {
136
136
  (0, javascript_1.maybeRemoveImport)(this, "util", "isString");
137
- return yield (0, javascript_1.template) `typeof ${arg} === 'string'`.apply(this.cursor, method);
137
+ return yield (0, javascript_1.template) `typeof ${arg} === 'string'`.apply(method, this.cursor);
138
138
  }
139
139
  else if (this.isSymbol.matches(method.methodType)) {
140
140
  (0, javascript_1.maybeRemoveImport)(this, "util", "isSymbol");
141
- return yield (0, javascript_1.template) `typeof ${arg} === 'symbol'`.apply(this.cursor, method);
141
+ return yield (0, javascript_1.template) `typeof ${arg} === 'symbol'`.apply(method, this.cursor);
142
142
  }
143
143
  else if (this.isUndefined.matches(method.methodType)) {
144
144
  (0, javascript_1.maybeRemoveImport)(this, "util", "isUndefined");
145
- return yield (0, javascript_1.template) `${arg} === undefined`.apply(this.cursor, method);
145
+ return yield (0, javascript_1.template) `${arg} === undefined`.apply(method, this.cursor);
146
146
  }
147
147
  }
148
148
  return _super.visitMethodInvocation.call(this, method, p);
package/dist/migrate/util-type-checking.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util-type-checking.js","sourceRoot":"","sources":["../../src/migrate/util-type-checking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util-type-checking.js","sourceRoot":"","sources":["../../src/migrate/util-type-checking.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openrewrite/recipes-nodejs",
3
- "version": "0.34.0-20251119-170415",
3
+ "version": "0.34.0-20251120-093058",
4
4
  "license": "Moderne Source Available License",
5
5
  "description": "OpenRewrite recipes for Node.js library migrations.",
6
6
  "homepage": "https://github.com/moderneinc/rewrite-node",
@@ -23,7 +23,7 @@
23
23
  "ci:test": "jest"
24
24
  },
25
25
  "dependencies": {
26
- "@openrewrite/rewrite": "^8.66.2"
26
+ "@openrewrite/rewrite": "next"
27
27
  },
28
28
  "devDependencies": {
29
29
  "@types/jest": "^29.5.13",
package/src/migrate/buffer-slice.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import {check, ExecutionContext, Recipe, TreeVisitor} from "@openrewrite/rewrite";
2
2
  import {JavaScriptVisitor, MethodMatcher, template, usesMethod} from "@openrewrite/rewrite/javascript";
3
- import {J, TypedTree} from "@openrewrite/rewrite/java";
3
+ import {J} from "@openrewrite/rewrite/java";
4
4
 
5
5
  /**
6
6
  * Replace deprecated Buffer.slice() with Buffer.subarray()
@@ -18,23 +18,9 @@ export class ReplaceDeprecatedBufferSlice extends Recipe {
18
18
  return check(usesMethod("Buffer slice(..)"), new class extends JavaScriptVisitor<ExecutionContext> {
19
19
  sliceMatcher = new MethodMatcher("Buffer slice(..)");
20
20
 
21
- protected async visitMethodInvocation(method: J.MethodInvocation, p: ExecutionContext): Promise<J | undefined> {
22
- if (this.sliceMatcher.matches(method.methodType)) {
23
- if (method.select) {
24
- const selectExpr = method.select.element;
25
- const args = method.arguments.elements;
26
-
27
- if (args.length === 0) {
28
- return await template`${selectExpr}.subarray()`.apply(this.cursor, method);
29
- } else if (args.length === 1) {
30
- const arg0 = args[0].element;
31
- return await template`${selectExpr}.subarray(${arg0})`.apply(this.cursor, method);
32
- } else if (args.length >= 2) {
33
- const arg0 = args[0].element;
34
- const arg1 = args[1].element;
35
- return await template`${selectExpr}.subarray(${arg0}, ${arg1})`.apply(this.cursor, method);
36
- }
37
- }
21
+ override async visitMethodInvocation(method: J.MethodInvocation, p: ExecutionContext): Promise<J | undefined> {
22
+ if (method.select && this.sliceMatcher.matches(method.methodType)) {
23
+ return template`${method.select}.subarray(${method.arguments})`.apply(method, this.cursor);
38
24
  }
39
25
  return super.visitMethodInvocation(method, p);
40
26
  }
package/src/migrate/crypto-constructors.ts CHANGED
@@ -1,12 +1,6 @@
1
- import {check, ExecutionContext, Recipe, TreeVisitor} from "@openrewrite/rewrite";
2
- import {
3
- JavaScriptVisitor,
4
- maybeAddImport,
5
- maybeRemoveImport,
6
- template,
7
- usesType
8
- } from "@openrewrite/rewrite/javascript";
9
- import {Expression, J, Type} from "@openrewrite/rewrite/java";
1
+ import {ExecutionContext, Recipe, TreeVisitor} from "@openrewrite/rewrite";
2
+ import {JavaScriptVisitor, maybeAddImport, maybeRemoveImport, template} from "@openrewrite/rewrite/javascript";
3
+ import {J, Type} from "@openrewrite/rewrite/java";
10
4
 
11
5
  export class ReplaceCryptoConstructors extends Recipe {
12
6
  readonly name = "org.openrewrite.node.migrate.crypto.replace-hash-constructor"
@@ -37,10 +31,10 @@ export class ReplaceCryptoConstructors extends Recipe {
37
31
  const cryptoIdentifier = target as J.Identifier;
38
32
 
39
33
  if (fullyQualifiedName == "crypto.Hash" && args.length === 1) {
40
- return await template`${cryptoIdentifier}.createHash(${firstArg})`.apply(this.cursor, newClass);
34
+ return await template`${cryptoIdentifier}.createHash(${firstArg})`.apply(newClass, this.cursor);
41
35
  } else if (fullyQualifiedName == "crypto.Hmac" && args.length === 2) {
42
36
  const secondArg = args[1].element;
43
- return await template`${cryptoIdentifier}.createHmac(${firstArg}, ${secondArg})`.apply(this.cursor, newClass);
37
+ return await template`${cryptoIdentifier}.createHmac(${firstArg}, ${secondArg})`.apply(newClass, this.cursor);
44
38
  }
45
39
  }
46
40
  }
@@ -52,14 +46,14 @@ export class ReplaceCryptoConstructors extends Recipe {
52
46
  && (constructorType.declaringType as Type.Class).fullyQualifiedName == "crypto") {
53
47
 
54
48
  if (constructorType.name == "Hash" && args.length === 1) {
55
- maybeAddImport(this, {target: "crypto", member: "createHash", onlyIfReferenced: false});
49
+ maybeAddImport(this, {module: "crypto", member: "createHash", onlyIfReferenced: false});
56
50
  maybeRemoveImport(this, "crypto", "Hash");
57
- return await template`createHash(${firstArg})`.apply(this.cursor, newClass);
51
+ return await template`createHash(${firstArg})`.apply(newClass, this.cursor);
58
52
  } else if (constructorType.name == "Hmac" && args.length === 2) {
59
53
  const secondArg = args[1].element;
60
- maybeAddImport(this, {target: "crypto", member: "createHmac", onlyIfReferenced: false});
54
+ maybeAddImport(this, {module: "crypto", member: "createHmac", onlyIfReferenced: false});
61
55
  maybeRemoveImport(this, "crypto", "Hmac");
62
- return await template`createHmac(${firstArg}, ${secondArg})`.apply(this.cursor, newClass);
56
+ return await template`createHmac(${firstArg}, ${secondArg})`.apply(newClass, this.cursor);
63
57
  }
64
58
  }
65
59
  }
package/src/migrate/process-features-tls.ts CHANGED
@@ -15,10 +15,10 @@ export class RemoveUsageOfProcessFeaturesTlsConstants extends Recipe {
15
15
  return new class extends JavaScriptVisitor<ExecutionContext> {
16
16
  protected async visitExpression(expression: Expression, p: ExecutionContext): Promise<J | undefined> {
17
17
  const ret = await super.visitExpression(expression, p) as Expression;
18
- if (await pattern`process.features.tls_alpn`.match(ret)
19
- || await pattern`process.features.tls_ocsp`.match(ret)
20
- || await pattern`process.features.tls_sni`.match(ret)) {
21
- return await template`process.features.tls`.apply(this.cursor, ret);
18
+ if (await pattern`process.features.tls_alpn`.match(ret, this.cursor)
19
+ || await pattern`process.features.tls_ocsp`.match(ret, this.cursor)
20
+ || await pattern`process.features.tls_sni`.match(ret, this.cursor)) {
21
+ return await template`process.features.tls`.apply(ret, this.cursor);
22
22
  }
23
23
  return ret;
24
24
  }
package/src/migrate/util-extend.ts CHANGED
@@ -33,7 +33,7 @@ export class ReplaceUtilExtend extends Recipe {
33
33
  if (args.length === 2) {
34
34
  const target = args[0].element;
35
35
  const source = args[1].element;
36
- return await template`Object.assign(${target}, ${source})`.apply(this.cursor, method);
36
+ return await template`Object.assign(${target}, ${source})`.apply(method, this.cursor);
37
37
  }
38
38
  }
39
39
  return method;
package/src/migrate/util-log.ts CHANGED
@@ -30,7 +30,7 @@ export class ReplaceUtilLog extends Recipe {
30
30
  maybeRemoveImport(this, "util");
31
31
  maybeRemoveImport(this, "util", "log");
32
32
  const args = method.arguments.elements;
33
- return await template`console.log(${args})`.apply(this.cursor, method);
33
+ return await template`console.log(${args})`.apply(method, this.cursor);
34
34
  }
35
35
  return method;
36
36
  }
package/src/migrate/util-type-checking.ts CHANGED
@@ -91,49 +91,49 @@ export class UseNativeTypeCheckingMethods extends Recipe {
91
91
  maybeRemoveImport(this, "util");
92
92
  if (this.isArray.matches(method.methodType)) {
93
93
  maybeRemoveImport(this, "util", "isArray");
94
- return await template`Array.isArray(${arg})`.apply(this.cursor, method);
94
+ return await template`Array.isArray(${arg})`.apply(method, this.cursor);
95
95
  } else if (this.isBoolean.matches(method.methodType)) {
96
96
  maybeRemoveImport(this, "util", "isBoolean");
97
- return await template`typeof ${arg} === 'boolean'`.apply(this.cursor, method);
97
+ return await template`typeof ${arg} === 'boolean'`.apply(method, this.cursor);
98
98
  } else if (this.isBuffer.matches(method.methodType)) {
99
99
  maybeRemoveImport(this, "util", "isBuffer");
100
- return await template`Buffer.isBuffer(${arg})`.apply(this.cursor, method);
100
+ return await template`Buffer.isBuffer(${arg})`.apply(method, this.cursor);
101
101
  } else if (this.isDate.matches(method.methodType)) {
102
102
  maybeRemoveImport(this, "util", "isDate");
103
- return await template`${arg} instanceof Date`.apply(this.cursor, method);
103
+ return await template`${arg} instanceof Date`.apply(method, this.cursor);
104
104
  } else if (this.isError.matches(method.methodType)) {
105
105
  maybeRemoveImport(this, "util", "isError");
106
- return await template`${arg} instanceof Error`.apply(this.cursor, method);
106
+ return await template`${arg} instanceof Error`.apply(method, this.cursor);
107
107
  } else if (this.isFunction.matches(method.methodType)) {
108
108
  maybeRemoveImport(this, "util", "isFunction");
109
- return await template`typeof (${arg}) === 'function'`.apply(this.cursor, method);
109
+ return await template`typeof (${arg}) === 'function'`.apply(method, this.cursor);
110
110
  } else if (this.isNull.matches(method.methodType)) {
111
111
  maybeRemoveImport(this, "util", "isNull");
112
- return await template`${arg} === null`.apply(this.cursor, method);
112
+ return await template`${arg} === null`.apply(method, this.cursor);
113
113
  } else if (this.isNullOrUndefined.matches(method.methodType)) {
114
114
  maybeRemoveImport(this, "util", "isNullOrUndefined");
115
- return await template`${arg} == null`.apply(this.cursor, method);
115
+ return await template`${arg} == null`.apply(method, this.cursor);
116
116
  } else if (this.isNumber.matches(method.methodType)) {
117
117
  maybeRemoveImport(this, "util", "isNumber");
118
- return await template`typeof ${arg} === 'number'`.apply(this.cursor, method);
118
+ return await template`typeof ${arg} === 'number'`.apply(method, this.cursor);
119
119
  } else if (this.isObject.matches(method.methodType)) {
120
120
  maybeRemoveImport(this, "util", "isObject");
121
- return await template`typeof ${arg} === 'object' && ${arg} !== null`.apply(this.cursor, method);
121
+ return await template`typeof ${arg} === 'object' && ${arg} !== null`.apply(method, this.cursor);
122
122
  } else if (this.isPrimitive.matches(method.methodType)) {
123
123
  maybeRemoveImport(this, "util", "isPrimitive");
124
- return await template`${arg} !== Object(${arg})`.apply(this.cursor, method);
124
+ return await template`${arg} !== Object(${arg})`.apply(method, this.cursor);
125
125
  } else if (this.isRegExp.matches(method.methodType)) {
126
126
  maybeRemoveImport(this, "util", "isRegExp");
127
- return await template`${arg} instanceof RegExp`.apply(this.cursor, method);
127
+ return await template`${arg} instanceof RegExp`.apply(method, this.cursor);
128
128
  } else if (this.isString.matches(method.methodType)) {
129
129
  maybeRemoveImport(this, "util", "isString");
130
- return await template`typeof ${arg} === 'string'`.apply(this.cursor, method);
130
+ return await template`typeof ${arg} === 'string'`.apply(method, this.cursor);
131
131
  } else if (this.isSymbol.matches(method.methodType)) {
132
132
  maybeRemoveImport(this, "util", "isSymbol");
133
- return await template`typeof ${arg} === 'symbol'`.apply(this.cursor, method);
133
+ return await template`typeof ${arg} === 'symbol'`.apply(method, this.cursor);
134
134
  } else if (this.isUndefined.matches(method.methodType)) {
135
135
  maybeRemoveImport(this, "util", "isUndefined");
136
- return await template`${arg} === undefined`.apply(this.cursor, method);
136
+ return await template`${arg} === undefined`.apply(method, this.cursor);
137
137
  }
138
138
  }
139
139
  return super.visitMethodInvocation(method, p);