Skip to content

Commit

Permalink
Require Node.js 4 and meta tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Jun 20, 2017
1 parent 7c908e7 commit baacbab
Show file tree
Hide file tree
Showing 9 changed files with 152 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{package.json,*.yml}]
[*.yml]
indent_style = space
indent_size = 2
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
sudo: false
language: node_js
node_js:
- '8'
- '6'
- '4'
- '0.12'
- '0.10'
56 changes: 28 additions & 28 deletions fixtures/ansi-codes.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
'use strict';

// from http://www.umich.edu/~archive/apple2/misc/programmers/vt100.codes.txt
// From http://www.umich.edu/~archive/apple2/misc/programmers/vt100.codes.txt
exports.vt52Codes = {
'A': ['Cursor up'],
'B': ['Cursor down'],
'C': ['Cursor right'],
'D': ['Cursor left'],
'H': ['Cursor to home'],
'I': ['Reverse line feed'],
'J': ['Erase to end of screen'],
'K': ['Erase to end of line'],
'Z': ['Identify'],
A: ['Cursor up'],
B: ['Cursor down'],
C: ['Cursor right'],
D: ['Cursor left'],
H: ['Cursor to home'],
I: ['Reverse line feed'],
J: ['Erase to end of screen'],
K: ['Erase to end of line'],
Z: ['Identify'],
'=': ['Enter alternate keypad mode'],
'>': ['Exit alternate keypad mode'],
'1': ['Graphics processor on'],
'2': ['Graphics processor off'],
1: ['Graphics processor on'],
2: ['Graphics processor off'],
'<': ['Enter ANSI mode']
};

// from http://www.umich.edu/~archive/apple2/misc/programmers/vt100.codes.txt
// From http://www.umich.edu/~archive/apple2/misc/programmers/vt100.codes.txt
exports.ansiCompatible = {
'[176A': ['Cursor up Pn lines'],
'[176B': ['Cursor down Pn lines'],
Expand All @@ -27,8 +27,8 @@ exports.ansiCompatible = {
'[176;176H': ['Direct cursor addressing, where Pl is line#, Pc is column#'],
'[176;176f': ['Direct cursor addressing, where Pl is line#, Pc is column#'],

'7': ['Save cursor and attributes'],
'8': ['Restore cursor and attributes'],
7: ['Save cursor and attributes'],
8: ['Restore cursor and attributes'],

'#3': ['Change this line to double-height top half'],
'#4': ['Change this line to double-height bottom half'],
Expand All @@ -45,7 +45,7 @@ exports.ansiCompatible = {
'[J': ['Erase from cursor to end of screen'],
'[0J': ['Same'],
'[2J': ['Erase entire screen'],
'[P' : ['Delete character'],
'[P': ['Delete character'],
'[0P': ['Delete character (0P)'],
'[2P': ['Delete 2 characters'],

Expand All @@ -60,7 +60,7 @@ exports.ansiCompatible = {
'(2': ['Alternative graphic ROM (Character Set G0)'],
')2': ['Alternative graphic ROM (Character Set G1)'],

'H': ['Set tab at current column'],
H: ['Set tab at current column'],
'[g': ['Clear tab at current column'],
'[0g': ['Same'],
'[3g': ['Clear all tabs'],
Expand All @@ -72,12 +72,12 @@ exports.ansiCompatible = {
'[0c': ['(response; teminal not Ok)'],
'[?1;176c': ['response; where Ps is option present:'],

'c': ['Causes power-up reset routine to be executed'],
c: ['Causes power-up reset routine to be executed'],
'#8': ['Fill screen with "E"'],
'[2;176y': ['Invoke Test(s), where Ps is a decimal computed by adding the numbers of the desired tests to be executed']
};

// from http://ascii-table.com/ansi-escape-sequences-vt-100.php
// From http://ascii-table.com/ansi-escape-sequences-vt-100.php
exports.commonCodes = {
'[176A': ['Move cursor up n lines', 'CUU'],
'[176B': ['Move cursor down n lines', 'CUD'],
Expand Down Expand Up @@ -110,8 +110,8 @@ exports.commonCodes = {
'[?8l': ['Reset auto-repeat mode', 'DECARM'],
'[?9l': ['Reset interlacing mode', 'DECINLM'],

'N': ['Set single shift 2', 'SS2'],
'O': ['Set single shift 3', 'SS3'],
N: ['Set single shift 2', 'SS2'],
O: ['Set single shift 3', 'SS3'],

'[m': ['Turn off character attributes', 'SGR0'],
'[0m': ['Turn off character attributes', 'SGR0'],
Expand Down Expand Up @@ -151,10 +151,10 @@ exports.commonCodes = {
'[;H': ['Move cursor to upper left corner', 'cursorhome'],
'[f': ['Move cursor to upper left corner', 'hvhome'],
'[;f': ['Move cursor to upper left corner', 'hvhome'],
'M': ['Move/scroll window down one line', 'RI'],
'E': ['Move to next line', 'NEL'],
M: ['Move/scroll window down one line', 'RI'],
E: ['Move to next line', 'NEL'],

'H': ['Set a tab at the current column', 'HTS'],
H: ['Set a tab at the current column', 'HTS'],
'[g': ['Clear a tab at the current column', 'TBC'],
'[0g': ['Clear a tab at the current column', 'TBC'],
'[3g': ['Clear all tabs', 'TBC'],
Expand All @@ -170,7 +170,7 @@ exports.commonCodes = {

'[c': ['Identify what terminal type', 'DA'],
'[0c': ['Identify what terminal type (another)', 'DA'],
'c': ['Reset terminal to initial state', 'RIS'],
c: ['Reset terminal to initial state', 'RIS'],
'[2;1y': ['Confidence power up test', 'DECTST'],
'[2;2y': ['Confidence loopback test', 'DECTST'],
'[2;9y': ['Repeat power up test', 'DECTST'],
Expand All @@ -182,10 +182,10 @@ exports.commonCodes = {
'[4q': ['Turn on LED #4', 'DECLL4']
};

// from http://ascii-table.com/ansi-escape-sequences-vt-100.php
// From http://ascii-table.com/ansi-escape-sequences-vt-100.php
exports.otherCode = {
'7': ['Save cursor position and attributes', 'DECSC'],
'8': ['Restore cursor position and attributes', 'DECSC'],
7: ['Save cursor position and attributes', 'DECSC'],
8: ['Restore cursor position and attributes', 'DECSC'],

'=': ['Set alternate keypad mode', 'DECKPAM'],
'>': ['Set numeric keypad mode', 'DECKPNM'],
Expand Down
37 changes: 19 additions & 18 deletions fixtures/view-codes.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
'use strict';
var ansiRegex = require('../');
var ansiCodes = require('./ansi-codes');
var allCodes = {};
var supported = [];
var unsupported = [];
const ansiRegex = require('..');
const ansiCodes = require('./ansi-codes');

const allCodes = {};
const supported = [];
const unsupported = [];

function addCodesToTest(codes) {
for (var code in codes) {
for (const code in codes) {
allCodes[code] = codes[code];
}
}

function identifySupportedCodes() {
var codeSupport = {};
let codeSupport = {};

for (var code in allCodes) {
for (const code in allCodes) {
codeSupport = {
code: code,
matches: ('\u001b' + code).match(ansiRegex()),
code,
matches: `\u001B${code}`.match(ansiRegex()),
description: allCodes[code][0]
};

if (codeSupport.matches !== null && codeSupport.matches[0] === '\u001b' + code) {
if (codeSupport.matches !== null && codeSupport.matches[0] === `\u001B${code}`) {
supported.push(codeSupport);
} else {
unsupported.push(codeSupport);
Expand All @@ -30,21 +31,21 @@ function identifySupportedCodes() {
}

function displaySupport() {
process.stdout.write('\u001b[32m');
process.stdout.write('\u001B[32m');

console.log('SUPPORTED');
for (var i = 0; i < supported.length; i++) {
console.log(supported[i]);
for (const el of supported) {
console.log(el);
}

process.stdout.write('\u001b[31m');
process.stdout.write('\u001B[31m');
console.log('UNSUPPORTED');

for (var j = 0; j < unsupported.length; j++) {
console.log(unsupported[j]);
for (const el of unsupported) {
console.log(el);
}

process.stdout.write('\u001b[0m');
process.stdout.write('\u001B[0m');
}

addCodesToTest(ansiCodes.vt52Codes);
Expand Down
4 changes: 1 addition & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
'use strict';
module.exports = function () {
return /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]/g;
};
module.exports = () => (/[\u001B\u009B][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PRZcf-nqry=><]/g);
20 changes: 4 additions & 16 deletions license
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
The MIT License (MIT)
MIT License

Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (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:
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:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
118 changes: 56 additions & 62 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,58 @@
{
"name": "ansi-regex",
"version": "2.1.1",
"description": "Regular expression for matching ANSI escape codes",
"license": "MIT",
"repository": "chalk/ansi-regex",
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
"maintainers": [
"Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
"Joshua Appelman <jappelman@xebia.com> (jbnicolai.com)",
"JD Ballard <i.am.qix@gmail.com> (github.com/qix-)"
],
"engines": {
"node": ">=0.10.0"
},
"scripts": {
"test": "xo && ava --verbose",
"view-supported": "node fixtures/view-codes.js"
},
"files": [
"index.js"
],
"keywords": [
"ansi",
"styles",
"color",
"colour",
"colors",
"terminal",
"console",
"cli",
"string",
"tty",
"escape",
"formatting",
"rgb",
"256",
"shell",
"xterm",
"command-line",
"text",
"regex",
"regexp",
"re",
"match",
"test",
"find",
"pattern"
],
"devDependencies": {
"ava": "0.17.0",
"xo": "0.16.0"
},
"xo": {
"rules": {
"guard-for-in": 0,
"no-loop-func": 0
}
}
"name": "ansi-regex",
"version": "2.1.1",
"description": "Regular expression for matching ANSI escape codes",
"license": "MIT",
"repository": "chalk/ansi-regex",
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
"engines": {
"node": ">=4"
},
"scripts": {
"test": "xo && ava",
"view-supported": "node fixtures/view-codes.js"
},
"files": [
"index.js"
],
"keywords": [
"ansi",
"styles",
"color",
"colour",
"colors",
"terminal",
"console",
"cli",
"string",
"tty",
"escape",
"formatting",
"rgb",
"256",
"shell",
"xterm",
"command-line",
"text",
"regex",
"regexp",
"re",
"match",
"test",
"find",
"pattern"
],
"devDependencies": {
"ava": "*",
"xo": "*"
},
"xo": {
"rules": {
"guard-for-in": 0
}
}
}
Loading

0 comments on commit baacbab

Please sign in to comment.