Skip to content

Commit

Permalink
lib: add primordials.SafeStringIterator
Browse files Browse the repository at this point in the history
PR-URL: #36526
Reviewed-By: Rich Trott <rtrott@gmail.com>
  • Loading branch information
aduh95 authored and targos committed Jun 11, 2021
1 parent bf0738b commit 6e3a2ff
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
8 changes: 8 additions & 0 deletions lib/internal/per_context/primordials.js
Expand Up @@ -242,6 +242,9 @@ primordials.SafeWeakSet = makeSafe(
// Refs: https://tc39.es/ecma262/#sec-%typedarray%-intrinsic-object
[
{ name: 'TypedArray', original: Reflect.getPrototypeOf(Uint8Array) },
{ name: 'StringIterator', original: {
prototype: Reflect.getPrototypeOf(String.prototype[Symbol.iterator]()),
} },
].forEach(({ name, original }) => {
primordials[name] = original;
// The static %TypedArray% methods require a valid `this`, but can't be bound,
Expand All @@ -250,5 +253,10 @@ primordials.SafeWeakSet = makeSafe(
copyPrototype(original.prototype, primordials, `${name}Prototype`);
});

primordials.SafeStringIterator = createSafeIterator(
primordials.StringPrototypeSymbolIterator,
primordials.StringIteratorPrototypeNext
);

Object.setPrototypeOf(primordials, null);
Object.freeze(primordials);
3 changes: 2 additions & 1 deletion lib/internal/repl/utils.js
Expand Up @@ -2,6 +2,7 @@

const {
MathMin,
SafeStringIterator,
Set,
Symbol,
} = primordials;
Expand Down Expand Up @@ -401,7 +402,7 @@ function setupPreview(repl, contextSymbol, bufferSymbol, active) {
getStringWidth(inspected) > maxColumns) {
maxColumns -= 4 + (repl.useColors ? 0 : 3);
let res = '';
for (const char of inspected) {
for (const char of new SafeStringIterator(inspected)) {
maxColumns -= getStringWidth(char);
if (maxColumns < 0)
break;
Expand Down
4 changes: 3 additions & 1 deletion lib/internal/source_map/prepare_stack_trace.js
Expand Up @@ -9,6 +9,7 @@ const {
StringPrototypeSlice,
StringPrototypeSplit,
StringPrototypeStartsWith,
SafeStringIterator,
} = primordials;

let debug = require('internal/util/debuglog').debuglog('source_map', (fn) => {
Expand Down Expand Up @@ -144,7 +145,8 @@ function getErrorSource(
// Display ^ in appropriate position, regardless of whether tabs or
// spaces are used:
let prefix = '';
for (const character of StringPrototypeSlice(line, 0, originalColumn + 1)) {
for (const character of new SafeStringIterator(
StringPrototypeSlice(line, 0, originalColumn + 1))) {
prefix += (character === '\t') ? '\t' :
StringPrototypeRepeat(' ', getStringWidth(character));
}
Expand Down
3 changes: 2 additions & 1 deletion lib/internal/util/inspect.js
Expand Up @@ -42,6 +42,7 @@ const {
ReflectApply,
RegExp,
RegExpPrototypeToString,
SafeStringIterator,
Set,
SetPrototypeGetSize,
SetPrototypeValues,
Expand Down Expand Up @@ -2006,7 +2007,7 @@ if (internalBinding('config').hasIntl) {
if (removeControlChars)
str = stripVTControlCharacters(str);
str = str.normalize('NFC');
for (const char of str) {
for (const char of new SafeStringIterator(str)) {
const code = char.codePointAt(0);
if (isFullWidthCodePoint(code)) {
width += 2;
Expand Down
5 changes: 3 additions & 2 deletions lib/readline.js
Expand Up @@ -59,6 +59,7 @@ const {
StringPrototypeTrim,
Symbol,
SymbolAsyncIterator,
SafeStringIterator,
} = primordials;

const {
Expand Down Expand Up @@ -752,7 +753,7 @@ Interface.prototype._getDisplayPos = function(str) {
const col = this.columns;
let rows = 0;
str = stripVTControlCharacters(str);
for (const char of str) {
for (const char of new SafeStringIterator(str)) {
if (char === '\n') {
// Rows must be incremented by 1 even if offset = 0 or col = +Infinity.
rows += MathCeil(offset / col) || 1;
Expand Down Expand Up @@ -1168,7 +1169,7 @@ function emitKeypressEvents(stream, iface = {}) {
iface.isCompletionEnabled = false;

let length = 0;
for (const character of string) {
for (const character of new SafeStringIterator(string)) {
length += character.length;
if (length === string.length) {
iface.isCompletionEnabled = true;
Expand Down

0 comments on commit 6e3a2ff

Please sign in to comment.