[Refactor] use CreateRegExpStringIterator from es-abstract

Technically removing the helper is a breaking change, but nobody is likely to be using it directly
ljharb · Sep 25, 2021 · 5c2cf33 · 5c2cf33
1 parent 2d26eda
commit 5c2cf33
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 129 deletions.
diff --git a/helpers/MatchAllIterator.js b/helpers/MatchAllIterator.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var CreateRegExpStringIterator = require('es-abstract/2020/CreateRegExpStringIterator');
 var Get = require('es-abstract/2020/Get');
 var IsRegExp = require('es-abstract/2020/IsRegExp');
 var Set = require('es-abstract/2020/Set');
@@ -9,7 +10,6 @@ var ToLength = require('es-abstract/2020/ToLength');
 var ToString = require('es-abstract/2020/ToString');
 var flagsGetter = require('regexp.prototype.flags');
 
-var RegExpStringIterator = require('./RegExpStringIterator');
 var OrigRegExp = RegExp;
 
 module.exports = function MatchAllIterator(R, O) {
@@ -40,5 +40,5 @@ module.exports = function MatchAllIterator(R, O) {
 			throw new TypeError('Assertion failed: newly constructed RegExp had a lastIndex !== 0. Please report this!');
 		}
 	}
-	return new RegExpStringIterator(matcher, S, global, fullUnicode);
+	return CreateRegExpStringIterator(matcher, S, global, fullUnicode);
 };
diff --git a/helpers/RegExpStringIterator.js b/helpers/RegExpStringIterator.js
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
 	"dependencies": {
 		"call-bind": "^1.0.2",
 		"define-properties": "^1.1.3",
-		"es-abstract": "^1.18.2",
+		"es-abstract": "^1.19.0",
 		"get-intrinsic": "^1.1.1",
 		"has-symbols": "^1.0.2",
 		"internal-slot": "^1.0.3",

diff --git a/regexp-matchall.js b/regexp-matchall.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // var Construct = require('es-abstract/2020/Construct');
+var CreateRegExpStringIterator = require('es-abstract/2020/CreateRegExpStringIterator');
 var Get = require('es-abstract/2020/Get');
 var Set = require('es-abstract/2020/Set');
 var SpeciesConstructor = require('es-abstract/2020/SpeciesConstructor');
@@ -9,24 +10,8 @@ var ToString = require('es-abstract/2020/ToString');
 var Type = require('es-abstract/2020/Type');
 var flagsGetter = require('regexp.prototype.flags');
 
-var RegExpStringIterator = require('./helpers/RegExpStringIterator');
 var OrigRegExp = RegExp;
 
-var CreateRegExpStringIterator = function CreateRegExpStringIterator(R, S, global, fullUnicode) {
-	if (Type(S) !== 'String') {
-		throw new TypeError('"S" value must be a String');
-	}
-	if (Type(global) !== 'Boolean') {
-		throw new TypeError('"global" value must be a Boolean');
-	}
-	if (Type(fullUnicode) !== 'Boolean') {
-		throw new TypeError('"fullUnicode" value must be a Boolean');
-	}
-
-	var iterator = new RegExpStringIterator(R, S, global, fullUnicode);
-	return iterator;
-};
-
 var supportsConstructingWithFlags = 'flags' in RegExp.prototype;
 
 var constructRegexWithFlags = function constructRegex(C, R) {