@peteanderson/ansi 2.3.0 → 3.0.0

package/src/sgr/combine.ts

@@ -3,4 +3,4 @@ import {State} from "../simplify/state";
 import type {Code} from "./types";
 
 export const combineCodes = (base: Code, ...codes: Code[]): Code =>
-	new State().update([base, ...codes].flat()).map(code => code === "" ? 0 : code);
+	new State().update([base, ...codes].flat());

package/src/sgr/format-builder.ts

@@ -4,10 +4,7 @@ import {lazy}         from "./lazy";
 
 import type {ChainBuilder, ChainKey, Code, Format, FormatBase, FormatBuilder} from "./types";
 
-const codeSequence = (code: Code): string | number =>
-	Array.isArray(code)
-		? code.map(c => c ? c : "").join(';')
-		: code ? code : "";
+const codeSequence = (code: Code): string | number => Array.isArray(code) ? code.join(';') : code;
 
 const chain = <Keys extends ChainKey>(
 	makeChain  : ChainBuilder,

package/src/sgr/reset.ts

@@ -1 +1 @@
-export const makeReset = (enabled = true): string => enabled ? "\x1b[0m" : "";
+export const makeReset = (enabled = true): string => enabled ? "\x1b[m" : "";

package/src/sgr/types.ts

@@ -22,7 +22,7 @@ export type ChainBuilder = <Keys extends ChainKey>(
 	baseFormat : FormatBase,
 ) => Chain<Keys>;
 
-export type Code = number | number[];
+export type Code = number | "" | ReadonlyArray<number | "">;
 
 export interface FormatBase {
 	(text: string): string;

package/src/simplify/lookup.ts

@@ -1,8 +1,9 @@
 import {buildExtendedColorAtom, buildIntensityAtom} from "./atom";
 
-import type {Atom, Attribute, AttributeMap, BuildAtom} from "./types";
+import type {Atom, Attribute, AttributeMap, BuildAtom, CodeArray} from "./types";
 
-const codeMap: Record<number, [attribute: Attribute, buildAtom?: BuildAtom]> = {
+const codeMap: Record<number | "", [attribute: Attribute, buildAtom?: BuildAtom]> = {
+	""  : ["reset"],
 	0   : ["reset"],
 	1   : ["intensity", buildIntensityAtom],
 	2   : ["intensity", buildIntensityAtom],
@@ -61,7 +62,7 @@ const codeMap: Record<number, [attribute: Attribute, buildAtom?: BuildAtom]> = {
 	107 : ["bg"],
 };
 
-export function lookUpAtom(codes: readonly number[], index: number, state: AttributeMap): Atom {
+export function lookUpAtom(codes: CodeArray, index: number, state: AttributeMap): Atom {
 	const code  = codes[index];
 	const entry = codeMap[code];
 

package/src/simplify/simplify.ts

@@ -9,12 +9,12 @@ export function simplify(text: string): string {
 	let   result = parts[0];
 
 	for (let i = 1; i < parts.length; ) {
-		let codes = parts[i++].split(";").map(Number);
-		let chunk = parts[i++];
+		const codes = parts[i++].split(";").map(s => s ? Number(s) : "");
+		let   chunk = parts[i++];
 
 		while (!chunk && i < parts.length) {
 			// Merge consecutive SGR sequences with no text between them.
-			codes.push(...parts[i++].split(";").map(Number));
+			codes.push(...parts[i++].split(";").map(s => s ? Number(s) : ""));
 			chunk = parts[i++];
 		}
 

package/src/simplify/state.ts

@@ -1,9 +1,9 @@
 import {lookUpAtom}                       from "./lookup";
 import {arraysEqual, transitionIntensity} from "./utils";
 
-import type {Attribute, AttributeMap} from "./types";
+import type {Attribute, AttributeMap, CodeArray} from "./types";
 
-const defaultCodes: Map<Attribute, readonly number[]> = new Map([
+const defaultCodes: Map<Attribute, CodeArray> = new Map([
 	["intensity",     [22]],
 	["italic",        [23]],
 	["underline",     [24]],
@@ -16,7 +16,7 @@ const defaultCodes: Map<Attribute, readonly number[]> = new Map([
 	["overline",      [55]],
 ]);
 
-export class State extends Map<Attribute, readonly number[]> implements AttributeMap {
+export class State extends Map<Attribute, CodeArray> implements AttributeMap {
 	#isDefaultState(except?: Attribute): boolean {
 		for (const [attribute, defaultCode] of defaultCodes) {
 			if (attribute === except)
@@ -29,7 +29,7 @@ export class State extends Map<Attribute, readonly number[]> implements Attribut
 		return true;
 	}
 
-	update(codes: readonly number[]): Array<number | ""> {
+	update(codes: CodeArray): CodeArray {
 		let snapshot: AttributeMap = new Map(this);
 
 		const attributes = new Set<Attribute>();

package/src/simplify/types.ts

@@ -1,3 +1,5 @@
+export type CodeArray = ReadonlyArray<number | "">;
+
 export type Attribute =
 	| "intensity"
 	| "italic"
@@ -10,19 +12,20 @@ export type Attribute =
 	| "frame"
 	| "overline"
 	| "reset"
-	| number;
+	| number
+	| "";
 
-export type AttributeMap = Map<Attribute, readonly number[]>;
+export type AttributeMap = Map<Attribute, CodeArray>;
 
 export interface Atom {
 	attribute : Attribute;
-	code      : readonly number[];
+	code      : CodeArray;
 	skip?     : number;
 }
 
 export type BuildAtom = (
 	attribute : Attribute,
-	codes     : readonly number[],
+	codes     : CodeArray,
 	index     : number,
 	state     : AttributeMap,
 ) => Atom;

package/src/simplify/utils.ts

@@ -1,3 +1,5 @@
+import type {CodeArray} from "./types";
+
 export function arraysEqual<T>(a: readonly T[] | undefined, b: readonly T[] | undefined): boolean {
 	if (a === b)
 		return true;
@@ -14,9 +16,9 @@ export function arraysEqual<T>(a: readonly T[] | undefined, b: readonly T[] | un
 }
 
 export function transitionIntensity(
-	previous : readonly number[] | undefined,
-	current  : readonly number[],
-): readonly number[] {
+	previous : CodeArray | undefined,
+	current  : CodeArray,
+): CodeArray {
 	if (!previous || previous[0] === 22 || current[0] === 22)
 		return current;
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import type {Caret}                          from "./caret";
+import type {Cursor}                         from "./cursor";
 import type {Erase}                          from "./erase";
 import type {Features}                       from "./features";
 import type {PadEnd, PadStart}               from "./pad";
@@ -10,7 +10,7 @@ import type {Sanitize, Strip, VisibleLength} from "./strip";
 import type {Terminal}                       from "./terminal";
 
 export type Ansi = SGR & {
-	caret    : Caret;
+	cursor   : Cursor;
 	erase    : Erase;
 	scroll   : Scroll;
 	terminal : Terminal;

package/src/utility-types.d.ts

@@ -15,4 +15,8 @@ type EntriesOf<T, K extends [...(keyof T)[]] = (keyof T)[]> = {
 	[P in keyof K]: K[P] extends keyof T ? EntryOf<T, K[P]> : never;
 };
 
-type SkipFirst<T> = T extends [infer First, ...infer Rest] ? Rest : [];
+type SkipFirst<T> = T extends [infer First, ...infer Rest] ? Rest : [];
+
+interface ArrayConstructor {
+	isArray(value: unknown): value is readonly unknown[];
+}

package/dist/cjs/caret.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"caret.d.ts","sourceRoot":"","sources":["../../src/caret.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,KAAK;iBAL6B,MAAM,KAAG,MAAM;mBAAf,MAAM,KAAG,MAAM;sBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;WAa/C,MAAM,KAAG,MAAM;;;;;;;iBAkBZ,MAAM,KAAK,MAAM,KAAG,MAAM;;;;;;;;;;;CAYpC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAkCjC,eAAO,MAAM,SAAS,GAAI,iBAAc,KAAG,KAAmC,CAAC"}

package/dist/cjs/caret.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"caret.js","sourceRoot":"","sources":["../../src/caret.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,KAAc,EAAU,EAAE,CACzD,QAAQ,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC;AAEjE,MAAM,IAAI,GAAG,GAAW,EAAE,CAAC,EAAE,CAAC;AAE9B,MAAM,KAAK,GAAG;IACb,EAAE,EAAS,IAAI,CAAC,GAAG,CAAC;IACpB,IAAI,EAAO,IAAI,CAAC,GAAG,CAAC;IACpB,OAAO,EAAI,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IAEpB,CAAC,EAAE,CAAC,CAAS,EAAU,EAAE,CAAC,QAAQ,CAAC,GAAG;IAEtC,4FAA4F;IAC5F,+FAA+F;IAC/F,yDAAyD;IACzD,EAAE;IACF,MAAM;IACN,sBAAsB;IACtB,sBAAsB;IACtB,MAAM;IACN,IAAI,EAAM,OAAO;IACjB,OAAO,EAAG,OAAO;IAEjB,IAAI,EAAG,WAAW;IAClB,IAAI,EAAG,WAAW;IAElB,QAAQ,EAAE;QACT,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG;KACxD;IAED,KAAK,EAAE;QACN,WAAW,EAAS,UAAU;QAC9B,SAAS,EAAW,UAAU;QAC9B,eAAe,EAAK,UAAU;QAC9B,aAAa,EAAO,UAAU;QAC9B,WAAW,EAAS,UAAU;QAC9B,iBAAiB,EAAG,UAAU;QAC9B,OAAO,EAAa,UAAU;KAC9B;CACD,CAAC;AAIF,MAAM,QAAQ,GAAU;IACvB,EAAE,EAAS,IAAI;IACf,IAAI,EAAO,IAAI;IACf,OAAO,EAAI,IAAI;IACf,QAAQ,EAAG,IAAI;IACf,QAAQ,EAAG,IAAI;IACf,QAAQ,EAAG,IAAI;IAEf,CAAC,EAAE,IAAI;IAEP,IAAI,EAAM,EAAE;IACZ,OAAO,EAAG,EAAE;IAEZ,IAAI,EAAG,EAAE;IACT,IAAI,EAAG,EAAE;IAET,QAAQ,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,IAAI;KACT;IAED,KAAK,EAAE;QACN,WAAW,EAAS,EAAE;QACtB,SAAS,EAAW,EAAE;QACtB,eAAe,EAAK,EAAE;QACtB,aAAa,EAAO,EAAE;QACtB,WAAW,EAAS,EAAE;QACtB,iBAAiB,EAAG,EAAE;QACtB,OAAO,EAAa,EAAE;KACtB;CACD,CAAC;AAEK,MAAM,SAAS,GAAG,CAAC,OAAO,GAAG,IAAI,EAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAAlE,QAAA,SAAS,aAAyD"}

package/dist/esm/caret.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"caret.d.ts","sourceRoot":"","sources":["../../src/caret.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,KAAK;iBAL6B,MAAM,KAAG,MAAM;mBAAf,MAAM,KAAG,MAAM;sBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;uBAAf,MAAM,KAAG,MAAM;WAa/C,MAAM,KAAG,MAAM;;;;;;;iBAkBZ,MAAM,KAAK,MAAM,KAAG,MAAM;;;;;;;;;;;CAYpC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAkCjC,eAAO,MAAM,SAAS,GAAI,iBAAc,KAAG,KAAmC,CAAC"}

package/dist/esm/caret.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"caret.js","sourceRoot":"","sources":["../../src/caret.ts"],"names":[],"mappings":"AAAA,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,KAAc,EAAU,EAAE,CACzD,QAAQ,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC;AAEjE,MAAM,IAAI,GAAG,GAAW,EAAE,CAAC,EAAE,CAAC;AAE9B,MAAM,KAAK,GAAG;IACb,EAAE,EAAS,IAAI,CAAC,GAAG,CAAC;IACpB,IAAI,EAAO,IAAI,CAAC,GAAG,CAAC;IACpB,OAAO,EAAI,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IACpB,QAAQ,EAAG,IAAI,CAAC,GAAG,CAAC;IAEpB,CAAC,EAAE,CAAC,CAAS,EAAU,EAAE,CAAC,QAAQ,CAAC,GAAG;IAEtC,4FAA4F;IAC5F,+FAA+F;IAC/F,yDAAyD;IACzD,EAAE;IACF,MAAM;IACN,sBAAsB;IACtB,sBAAsB;IACtB,MAAM;IACN,IAAI,EAAM,OAAO;IACjB,OAAO,EAAG,OAAO;IAEjB,IAAI,EAAG,WAAW;IAClB,IAAI,EAAG,WAAW;IAElB,QAAQ,EAAE;QACT,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG;KACxD;IAED,KAAK,EAAE;QACN,WAAW,EAAS,UAAU;QAC9B,SAAS,EAAW,UAAU;QAC9B,eAAe,EAAK,UAAU;QAC9B,aAAa,EAAO,UAAU;QAC9B,WAAW,EAAS,UAAU;QAC9B,iBAAiB,EAAG,UAAU;QAC9B,OAAO,EAAa,UAAU;KAC9B;CACD,CAAC;AAIF,MAAM,QAAQ,GAAU;IACvB,EAAE,EAAS,IAAI;IACf,IAAI,EAAO,IAAI;IACf,OAAO,EAAI,IAAI;IACf,QAAQ,EAAG,IAAI;IACf,QAAQ,EAAG,IAAI;IACf,QAAQ,EAAG,IAAI;IAEf,CAAC,EAAE,IAAI;IAEP,IAAI,EAAM,EAAE;IACZ,OAAO,EAAG,EAAE;IAEZ,IAAI,EAAG,EAAE;IACT,IAAI,EAAG,EAAE;IAET,QAAQ,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,IAAI;KACT;IAED,KAAK,EAAE;QACN,WAAW,EAAS,EAAE;QACtB,SAAS,EAAW,EAAE;QACtB,eAAe,EAAK,EAAE;QACtB,aAAa,EAAO,EAAE;QACtB,WAAW,EAAS,EAAE;QACtB,iBAAiB,EAAG,EAAE;QACtB,OAAO,EAAa,EAAE;KACtB;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAO,GAAG,IAAI,EAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC"}