@chainlink/external-adapter-framework 2.11.1 → 2.11.3

package/generator-adapter/node_modules/wrap-ansi/index.js

@@ -1,16 +1,21 @@
-'use strict';
-const stringWidth = require('string-width');
-const stripAnsi = require('strip-ansi');
-const ansiStyles = require('ansi-styles');
+import stringWidth from 'string-width';
+import stripAnsi from 'strip-ansi';
+import ansiStyles from 'ansi-styles';
 
 const ESCAPES = new Set([
 	'\u001B',
-	'\u009B'
+	'\u009B',
 ]);
 
 const END_CODE = 39;
+const ANSI_ESCAPE_BELL = '\u0007';
+const ANSI_CSI = '[';
+const ANSI_OSC = ']';
+const ANSI_SGR_TERMINATOR = 'm';
+const ANSI_ESCAPE_LINK = `${ANSI_OSC}8;;`;
 
-const wrapAnsi = code => `${ESCAPES.values().next().value}[${code}m`;
+const wrapAnsiCode = code => `${ESCAPES.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`;
+const wrapAnsiHyperlink = url => `${ESCAPES.values().next().value}${ANSI_ESCAPE_LINK}${url}${ANSI_ESCAPE_BELL}`;
 
 // Calculate the length of words split on ' ', ignoring
 // the extra characters added by ansi escape codes
@@ -22,7 +27,8 @@ const wrapWord = (rows, word, columns) => {
 	const characters = [...word];
 
 	let isInsideEscape = false;
-	let visible = stringWidth(stripAnsi(rows[rows.length - 1]));
+	let isInsideLinkEscape = false;
+	let visible = stringWidth(stripAnsi(rows.at(-1)));
 
 	for (const [index, character] of characters.entries()) {
 		const characterLength = stringWidth(character);
@@ -36,12 +42,21 @@ const wrapWord = (rows, word, columns) => {
 
 		if (ESCAPES.has(character)) {
 			isInsideEscape = true;
-		} else if (isInsideEscape && character === 'm') {
-			isInsideEscape = false;
-			continue;
+
+			const ansiEscapeLinkCandidate = characters.slice(index + 1, index + 1 + ANSI_ESCAPE_LINK.length).join('');
+			isInsideLinkEscape = ansiEscapeLinkCandidate === ANSI_ESCAPE_LINK;
 		}
 
 		if (isInsideEscape) {
+			if (isInsideLinkEscape) {
+				if (character === ANSI_ESCAPE_BELL) {
+					isInsideEscape = false;
+					isInsideLinkEscape = false;
+				}
+			} else if (character === ANSI_SGR_TERMINATOR) {
+				isInsideEscape = false;
+			}
+
 			continue;
 		}
 
@@ -55,14 +70,14 @@ const wrapWord = (rows, word, columns) => {
 
 	// It's possible that the last row we copy over is only
 	// ansi escape characters, handle this edge-case
-	if (!visible && rows[rows.length - 1].length > 0 && rows.length > 1) {
+	if (!visible && rows.at(-1).length > 0 && rows.length > 1) {
 		rows[rows.length - 2] += rows.pop();
 	}
 };
 
 // Trims spaces from a string ignoring invisible sequences
-const stringVisibleTrimSpacesRight = str => {
-	const words = str.split(' ');
+const stringVisibleTrimSpacesRight = string => {
+	const words = string.split(' ');
 	let last = words.length;
 
 	while (last > 0) {
@@ -74,35 +89,35 @@ const stringVisibleTrimSpacesRight = str => {
 	}
 
 	if (last === words.length) {
-		return str;
+		return string;
 	}
 
 	return words.slice(0, last).join(' ') + words.slice(last).join('');
 };
 
-// The wrap-ansi module can be invoked in either 'hard' or 'soft' wrap mode
+// The wrap-ansi module can be invoked in either 'hard' or 'soft' wrap mode.
 //
-// 'hard' will never allow a string to take up more than columns characters
+// 'hard' will never allow a string to take up more than columns characters.
 //
-// 'soft' allows long words to expand past the column length
+// 'soft' allows long words to expand past the column length.
 const exec = (string, columns, options = {}) => {
 	if (options.trim !== false && string.trim() === '') {
 		return '';
 	}
 
-	let pre = '';
-	let ret = '';
+	let returnValue = '';
 	let escapeCode;
+	let escapeUrl;
 
 	const lengths = wordLengths(string);
 	let rows = [''];
 
 	for (const [index, word] of string.split(' ').entries()) {
 		if (options.trim !== false) {
-			rows[rows.length - 1] = rows[rows.length - 1].trimLeft();
+			rows[rows.length - 1] = rows.at(-1).trimStart();
 		}
 
-		let rowLength = stringWidth(rows[rows.length - 1]);
+		let rowLength = stringWidth(rows.at(-1));
 
 		if (index !== 0) {
 			if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
@@ -148,39 +163,60 @@ const exec = (string, columns, options = {}) => {
 	}
 
 	if (options.trim !== false) {
-		rows = rows.map(stringVisibleTrimSpacesRight);
+		rows = rows.map(row => stringVisibleTrimSpacesRight(row));
 	}
 
-	pre = rows.join('\n');
+	const preString = rows.join('\n');
+	const pre = [...preString];
 
-	for (const [index, character] of [...pre].entries()) {
-		ret += character;
+	// We need to keep a separate index as `String#slice()` works on Unicode code units, while `pre` is an array of codepoints.
+	let preStringIndex = 0;
+
+	for (const [index, character] of pre.entries()) {
+		returnValue += character;
 
 		if (ESCAPES.has(character)) {
-			const code = parseFloat(/\d[^m]*/.exec(pre.slice(index, index + 4)));
-			escapeCode = code === END_CODE ? null : code;
+			const {groups} = new RegExp(`(?:\\${ANSI_CSI}(?<code>\\d+)m|\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`).exec(preString.slice(preStringIndex)) || {groups: {}};
+			if (groups.code !== undefined) {
+				const code = Number.parseFloat(groups.code);
+				escapeCode = code === END_CODE ? undefined : code;
+			} else if (groups.uri !== undefined) {
+				escapeUrl = groups.uri.length === 0 ? undefined : groups.uri;
+			}
 		}
 
 		const code = ansiStyles.codes.get(Number(escapeCode));
 
-		if (escapeCode && code) {
-			if (pre[index + 1] === '\n') {
-				ret += wrapAnsi(code);
-			} else if (character === '\n') {
-				ret += wrapAnsi(escapeCode);
+		if (pre[index + 1] === '\n') {
+			if (escapeUrl) {
+				returnValue += wrapAnsiHyperlink('');
+			}
+
+			if (escapeCode && code) {
+				returnValue += wrapAnsiCode(code);
+			}
+		} else if (character === '\n') {
+			if (escapeCode && code) {
+				returnValue += wrapAnsiCode(escapeCode);
+			}
+
+			if (escapeUrl) {
+				returnValue += wrapAnsiHyperlink(escapeUrl);
 			}
 		}
+
+		preStringIndex += character.length;
 	}
 
-	return ret;
+	return returnValue;
 };
 
 // For each newline, invoke the method separately
-module.exports = (string, columns, options) => {
+export default function wrapAnsi(string, columns, options) {
 	return String(string)
 		.normalize()
-		.replace(/\r\n/g, '\n')
+		.replaceAll('\r\n', '\n')
 		.split('\n')
 		.map(line => exec(line, columns, options))
 		.join('\n');
-};
+}

package/generator-adapter/node_modules/wrap-ansi/license

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/generator-adapter/node_modules/wrap-ansi/node_modules/string-width/index.d.ts

@@ -1,29 +1,39 @@
-declare const stringWidth: {
+export type Options = {
 	/**
-	Get the visual width of a string - the number of columns required to display it.
+	Count [ambiguous width characters](https://www.unicode.org/reports/tr11/#Ambiguous) as having narrow width (count of 1) instead of wide width (count of 2).
 
-	Some Unicode characters are [fullwidth](https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms) and use double the normal width. [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) are stripped and doesn't affect the width.
+	@default true
 
-	@example
-	```
-	import stringWidth = require('string-width');
-
-	stringWidth('a');
-	//=> 1
+	> Ambiguous characters behave like wide or narrow characters depending on the context (language tag, script identification, associated font, source of data, or explicit markup; all can provide the context). __If the context cannot be established reliably, they should be treated as narrow characters by default.__
+	> - http://www.unicode.org/reports/tr11/
+	*/
+	readonly ambiguousIsNarrow?: boolean;
 
-	stringWidth('古');
-	//=> 2
+	/**
+	Whether [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) should be counted.
 
-	stringWidth('\u001B[1m古\u001B[22m');
-	//=> 2
-	```
+	@default false
 	*/
-	(string: string): number;
+	readonly countAnsiEscapeCodes?: boolean;
+};
+
+/**
+Get the visual width of a string - the number of columns required to display it.
+
+Some Unicode characters are [fullwidth](https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms) and use double the normal width. [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) are stripped and doesn't affect the width.
+
+@example
+```
+import stringWidth from 'string-width';
+
+stringWidth('a');
+//=> 1
 
-	// TODO: remove this in the next major version, refactor the whole definition to:
-	// declare function stringWidth(string: string): number;
-	// export = stringWidth;
-	default: typeof stringWidth;
-}
+stringWidth('古');
+//=> 2
 
-export = stringWidth;
+stringWidth('\u001B[1m古\u001B[22m');
+//=> 2
+```
+*/
+export default function stringWidth(string: string, options?: Options): number;

package/generator-adapter/node_modules/wrap-ansi/node_modules/string-width/index.js

@@ -1,47 +1,82 @@
-'use strict';
-const stripAnsi = require('strip-ansi');
-const isFullwidthCodePoint = require('is-fullwidth-code-point');
-const emojiRegex = require('emoji-regex');
+import stripAnsi from 'strip-ansi';
+import {eastAsianWidth} from 'get-east-asian-width';
+import emojiRegex from 'emoji-regex';
 
-const stringWidth = string => {
+const segmenter = new Intl.Segmenter();
+
+const defaultIgnorableCodePointRegex = /^\p{Default_Ignorable_Code_Point}$/u;
+
+export default function stringWidth(string, options = {}) {
 	if (typeof string !== 'string' || string.length === 0) {
 		return 0;
 	}
 
-	string = stripAnsi(string);
+	const {
+		ambiguousIsNarrow = true,
+		countAnsiEscapeCodes = false,
+	} = options;
+
+	if (!countAnsiEscapeCodes) {
+		string = stripAnsi(string);
+	}
 
 	if (string.length === 0) {
 		return 0;
 	}
 
-	string = string.replace(emojiRegex(), '  ');
-
 	let width = 0;
+	const eastAsianWidthOptions = {ambiguousAsWide: !ambiguousIsNarrow};
 
-	for (let i = 0; i < string.length; i++) {
-		const code = string.codePointAt(i);
+	for (const {segment: character} of segmenter.segment(string)) {
+		const codePoint = character.codePointAt(0);
 
 		// Ignore control characters
-		if (code <= 0x1F || (code >= 0x7F && code <= 0x9F)) {
+		if (codePoint <= 0x1F || (codePoint >= 0x7F && codePoint <= 0x9F)) {
+			continue;
+		}
+
+		// Ignore zero-width characters
+		if (
+			(codePoint >= 0x20_0B && codePoint <= 0x20_0F) // Zero-width space, non-joiner, joiner, left-to-right mark, right-to-left mark
+			|| codePoint === 0xFE_FF // Zero-width no-break space
+		) {
 			continue;
 		}
 
 		// Ignore combining characters
-		if (code >= 0x300 && code <= 0x36F) {
+		if (
+			(codePoint >= 0x3_00 && codePoint <= 0x3_6F) // Combining diacritical marks
+			|| (codePoint >= 0x1A_B0 && codePoint <= 0x1A_FF) // Combining diacritical marks extended
+			|| (codePoint >= 0x1D_C0 && codePoint <= 0x1D_FF) // Combining diacritical marks supplement
+			|| (codePoint >= 0x20_D0 && codePoint <= 0x20_FF) // Combining diacritical marks for symbols
+			|| (codePoint >= 0xFE_20 && codePoint <= 0xFE_2F) // Combining half marks
+		) {
 			continue;
 		}
 
-		// Surrogates
-		if (code > 0xFFFF) {
-			i++;
+		// Ignore surrogate pairs
+		if (codePoint >= 0xD8_00 && codePoint <= 0xDF_FF) {
+			continue;
 		}
 
-		width += isFullwidthCodePoint(code) ? 2 : 1;
+		// Ignore variation selectors
+		if (codePoint >= 0xFE_00 && codePoint <= 0xFE_0F) {
+			continue;
+		}
+
+		// This covers some of the above cases, but we still keep them for performance reasons.
+		if (defaultIgnorableCodePointRegex.test(character)) {
+			continue;
+		}
+
+		// TODO: Use `/\p{RGI_Emoji}/v` when targeting Node.js 20.
+		if (emojiRegex().test(character)) {
+			width += 2;
+			continue;
+		}
+
+		width += eastAsianWidth(codePoint, eastAsianWidthOptions);
 	}
 
 	return width;
-};
-
-module.exports = stringWidth;
-// TODO: remove this in the next major version
-module.exports.default = stringWidth;
+}

package/generator-adapter/node_modules/wrap-ansi/node_modules/string-width/license

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/generator-adapter/node_modules/wrap-ansi/node_modules/string-width/package.json

@@ -1,16 +1,23 @@
 {
 	"name": "string-width",
-	"version": "4.2.3",
+	"version": "7.2.0",
 	"description": "Get the visual width of a string - the number of columns required to display it",
 	"license": "MIT",
 	"repository": "sindresorhus/string-width",
+	"funding": "https://github.com/sponsors/sindresorhus",
 	"author": {
 		"name": "Sindre Sorhus",
 		"email": "sindresorhus@gmail.com",
-		"url": "sindresorhus.com"
+		"url": "https://sindresorhus.com"
 	},
+	"type": "module",
+	"exports": {
+		"types": "./index.d.ts",
+		"default": "./index.js"
+	},
+	"sideEffects": false,
 	"engines": {
-		"node": ">=8"
+		"node": ">=18"
 	},
 	"scripts": {
 		"test": "xo && ava && tsd"
@@ -41,16 +48,17 @@
 		"chinese",
 		"japanese",
 		"korean",
-		"fixed-width"
+		"fixed-width",
+		"east-asian-width"
 	],
 	"dependencies": {
-		"emoji-regex": "^8.0.0",
-		"is-fullwidth-code-point": "^3.0.0",
-		"strip-ansi": "^6.0.1"
+		"emoji-regex": "^10.3.0",
+		"get-east-asian-width": "^1.0.0",
+		"strip-ansi": "^7.1.0"
 	},
 	"devDependencies": {
-		"ava": "^1.4.1",
-		"tsd": "^0.7.1",
-		"xo": "^0.24.0"
+		"ava": "^5.3.1",
+		"tsd": "^0.29.0",
+		"xo": "^0.56.0"
 	}
 }

package/generator-adapter/node_modules/wrap-ansi/node_modules/string-width/readme.md

@@ -6,18 +6,16 @@ Some Unicode characters are [fullwidth](https://en.wikipedia.org/wiki/Halfwidth_
 
 Useful to be able to measure the actual width of command-line output.
 
-
 ## Install
 
+```sh
+npm install string-width
 ```
-$ npm install string-width
-```
-
 
 ## Usage
 
 ```js
-const stringWidth = require('string-width');
+import stringWidth from 'string-width';
 
 stringWidth('a');
 //=> 1
@@ -29,22 +27,40 @@ stringWidth('\u001B[1m古\u001B[22m');
 //=> 2
 ```
 
+## API
+
+### stringWidth(string, options?)
+
+#### string
+
+Type: `string`
+
+The string to be counted.
+
+#### options
+
+Type: `object`
+
+##### ambiguousIsNarrow
+
+Type: `boolean`\
+Default: `true`
+
+Count [ambiguous width characters](https://www.unicode.org/reports/tr11/#Ambiguous) as having narrow width (count of 1) instead of wide width (count of 2).
+
+> Ambiguous characters behave like wide or narrow characters depending on the context (language tag, script identification, associated font, source of data, or explicit markup; all can provide the context). **If the context cannot be established reliably, they should be treated as narrow characters by default.**
+> - http://www.unicode.org/reports/tr11/
+
+##### countAnsiEscapeCodes
+
+Type: `boolean`\
+Default: `false`
+
+Whether [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) should be counted.
 
 ## Related
 
 - [string-width-cli](https://github.com/sindresorhus/string-width-cli) - CLI for this module
 - [string-length](https://github.com/sindresorhus/string-length) - Get the real length of a string
 - [widest-line](https://github.com/sindresorhus/widest-line) - Get the visual width of the widest line in a string
-
-
----
-
-<div align="center">
-	<b>
-		<a href="https://tidelift.com/subscription/pkg/npm-string-width?utm_source=npm-string-width&utm_medium=referral&utm_campaign=readme">Get professional support for this package with a Tidelift subscription</a>
-	</b>
-	<br>
-	<sub>
-		Tidelift helps make open source sustainable for maintainers while giving companies<br>assurances about security, maintenance, and licensing for their dependencies.
-	</sub>
-</div>
+- [get-east-asian-width](https://github.com/sindresorhus/get-east-asian-width) - Determine the East Asian Width of a Unicode character

package/generator-adapter/node_modules/wrap-ansi/package.json

@@ -1,22 +1,29 @@
 {
 	"name": "wrap-ansi",
-	"version": "6.2.0",
+	"version": "9.0.2",
 	"description": "Wordwrap a string with ANSI escape codes",
 	"license": "MIT",
 	"repository": "chalk/wrap-ansi",
+	"funding": "https://github.com/chalk/wrap-ansi?sponsor=1",
 	"author": {
 		"name": "Sindre Sorhus",
 		"email": "sindresorhus@gmail.com",
-		"url": "sindresorhus.com"
+		"url": "https://sindresorhus.com"
+	},
+	"type": "module",
+	"exports": {
+		"types": "./index.d.ts",
+		"default": "./index.js"
 	},
 	"engines": {
-		"node": ">=8"
+		"node": ">=18"
 	},
 	"scripts": {
-		"test": "xo && nyc ava"
+		"test": "xo && nyc ava && tsd"
 	},
 	"files": [
-		"index.js"
+		"index.js",
+		"index.d.ts"
 	],
 	"keywords": [
 		"wrap",
@@ -46,16 +53,17 @@
 		"text"
 	],
 	"dependencies": {
-		"ansi-styles": "^4.0.0",
-		"string-width": "^4.1.0",
-		"strip-ansi": "^6.0.0"
+		"ansi-styles": "^6.2.1",
+		"string-width": "^7.0.0",
+		"strip-ansi": "^7.1.0"
 	},
 	"devDependencies": {
-		"ava": "^2.1.0",
-		"chalk": "^2.4.2",
-		"coveralls": "^3.0.3",
-		"has-ansi": "^3.0.0",
-		"nyc": "^14.1.1",
-		"xo": "^0.24.0"
+		"ava": "^5.3.1",
+		"chalk": "^5.3.0",
+		"coveralls": "^3.1.1",
+		"has-ansi": "^5.0.1",
+		"nyc": "^15.1.0",
+		"tsd": "^0.29.0",
+		"xo": "^0.56.0"
 	}
 }