gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tools.AnsiUtil fir specific macros and project.hxp

Browse Source 
Co-Authored-By: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
This commit is contained in:
MoonDroid
2025-10-23 17:29:55 -04:00
committed by Hundrec
co-authored by Mihai Alexandru
parent 7ffa3d5bf2
commit 07b0af53f1
3 changed files with 184 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project.hxp
+23 -10
View File
@@ -9,6 +9,8 @@ import haxe.io.Bytes;
import haxe.io.Path;
import haxe.ds.Map;
import haxe.xml.Printer;
import tools.AnsiUtil;
import tools.AnsiUtil.AnsiCode;
using StringTools;
@@ -2034,7 +2036,7 @@ class Project extends HXProject
}
@SuppressWarnings('checkstyle:Dynamic')
static function checkLibraries():Void
function checkLibraries():Void
{
var outdatedLibraries:Map<String, Array<String>> = new Map<String, Array<String>>();
@@ -2077,9 +2079,9 @@ class Project extends HXProject
if (Lambda.count(outdatedLibraries) > 0)
{
Sys.println("\x1b[1;33m\nWARNING: The following haxelibs diverge from the versions set in hmm.json."
warn(AnsiUtil.apply("The following haxelibs diverge from the versions set in hmm.json."
+ "\n\nThey may be outdated, so it is recommended to abort compilation and run `hmm reinstall [library]` to update each library."
+ "\n\nYou may ignore this warning if your libraries are newer than the versions in hmm.json, or if you know what you're doing.\n\x1b[0m");
+ "\n\nYou may ignore this warning if your libraries are newer than the versions in hmm.json, or if you know what you're doing.\n", [BOLD,YELLOW]));
for (libraryName in outdatedLibraries.keys())
{
@@ -2091,9 +2093,9 @@ class Project extends HXProject
var isDev:Bool = outdatedVersion.contains("/");
Sys.println("- " + libraryName.replace(",", ".") + (isDev ? "\x1b[1;34m (Development Build)\x1b[0m" : ""));
Sys.println(" \x1b[38;5;203mCurrent version: " + outdatedVersion + "\x1b[0m");
Sys.println(" \x1b[38;5;82mExpected version: " + expectedVersion + "\x1b[0m\n");
Sys.println("- " + libraryName.replace(",", ".") + (isDev ? AnsiUtil.apply(" (Development Build)", [BLUE, BOLD]) : ""));
Sys.println(AnsiUtil.apply(" Current version: " + outdatedVersion, [RED]));
Sys.println(AnsiUtil.apply(" Expected version: " + expectedVersion, [GREEN]));
}
}
}
@@ -2203,7 +2205,7 @@ class Project extends HXProject
*/
public function error(message:String):Void
{
Sys.stderr().write(Bytes.ofString('[ERROR] ${message}'));
Sys.stderr().write(Bytes.ofString('${AnsiUtil.apply(' ERROR ', [BOLD, BG_RED])} ${message}'));
Sys.exit(1);
}
@@ -2214,7 +2216,18 @@ class Project extends HXProject
{
if (!(isDisplay() || isClean()))
{
Sys.println('[INFO] ${message}');
Sys.println('${AnsiUtil.apply(' INFO ', [BOLD, BG_BLUE])} ${message}');
}
}
/**
* Display a warning message. This should not interfere with the build process.
*/
public function warn(message:String):Void
{
if (!(isDisplay() || isClean()))
{
Sys.println('${AnsiUtil.apply(' WARNING ', [BOLD, BG_YELLOW])} ${message}');
}
}
@@ -2226,7 +2239,7 @@ class Project extends HXProject
{
if (!FileSystem.exists(file))
{
info('Environment file does not exist: ${file}');
warn('Environment file does not exist: ${file}');
return null;
}
@@ -2234,7 +2247,7 @@ class Project extends HXProject
if (envFile == null)
{
info('Failed to parse environment file: ${file}');
warn('Failed to parse environment file: ${file}');
return null;
}
source/Postbuild.hx
+3 -1
View File
@@ -2,6 +2,8 @@ package source; // Yeah, I know...
import sys.FileSystem;
import sys.io.File;
import tools.AnsiUtil;
import tools.AnsiUtil.AnsiCode;
using StringTools;
@@ -29,7 +31,7 @@ class Postbuild
sys.FileSystem.deleteFile(BUILD_TIME_FILE);
Sys.println('[INFO] Build took: ${format(end - start)}');
Sys.println('${AnsiUtil.apply(' INFO ', [BOLD, BG_BLUE])} Build took: ${format(end - start)}');
}
}
tools/AnsiUtil.hx
+158
View File
@@ -0,0 +1,158 @@
package tools;
/**
* Enum abstract representing ANSI codes for text colors, background colors, and text styles.
*/
// TODO: Add more colors maybe?
enum abstract AnsiCode(String) from String to String
{
var RESET = '\x1b[0m';
var BOLD = '\x1b[1m';
var DIM = '\x1b[2m';
var UNDERLINE = '\x1b[4m';
var BLINK = '\x1b[5m';
var INVERSE = '\x1b[7m';
var HIDDEN = '\x1b[8m';
var STRIKETHROUGH = '\x1b[9m';
var BLACK = '\x1b[30m';
var RED = '\x1b[31m';
var GREEN = '\x1b[32m';
var YELLOW = '\x1b[33m';
var BLUE = '\x1b[34m';
var MAGENTA = '\x1b[35m';
var CYAN = '\x1b[36m';
var WHITE = '\x1b[37m';
var BG_BLACK = '\x1b[40m';
var BG_RED = '\x1b[41m';
var BG_GREEN = '\x1b[42m';
var BG_YELLOW = '\x1b[43m';
var BG_BLUE = '\x1b[44m';
var BG_MAGENTA = '\x1b[45m';
var BG_CYAN = '\x1b[46m';
var BG_WHITE = '\x1b[47m';
var BG_ORANGE = '\x1b[48;5;208m';
var BRIGHT_BLACK = '\x1b[90m';
var BRIGHT_RED = '\x1b[91m';
var BRIGHT_GREEN = '\x1b[92m';
var BRIGHT_YELLOW = '\x1b[93m';
var BRIGHT_BLUE = '\x1b[94m';
var BRIGHT_MAGENTA = '\x1b[95m';
var BRIGHT_CYAN = '\x1b[96m';
var BRIGHT_WHITE = '\x1b[97m';
var BG_BRIGHT_BLACK = '\x1b[100m';
var BG_BRIGHT_RED = '\x1b[101m';
var BG_BRIGHT_GREEN = '\x1b[102m';
var BG_BRIGHT_YELLOW = '\x1b[103m';
var BG_BRIGHT_BLUE = '\x1b[104m';
var BG_BRIGHT_MAGENTA = '\x1b[105m';
var BG_BRIGHT_CYAN = '\x1b[106m';
var BG_BRIGHT_WHITE = '\x1b[107m';
}
/**
* This class provides functionality for applying ANSI codes to strings for terminal output.
*/
@:nullSafety
class AnsiUtil
{
#if sys
@:noCompletion
private static final REGEX_TEAMCITY_VERSION:EReg = ~/^9\.(0*[1-9]\d*)\.|\d{2,}\./;
@:noCompletion
private static final REGEX_TERM_256:EReg = ~/(?i)-256(color)?$/;
@:noCompletion
private static final REGEX_TERM_TYPES:EReg = ~/(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/;
#end
@:noCompletion
private static final REGEX_ANSI_CODES:EReg = ~/\x1b\[[0-9;]*m/g;
@:noCompletion
private static var codesSupported:Null<Bool> = null;
/**
* Safe wrapper for Sys.getEnv (returns null on non-sys targets).
*/
private static function getEnvSafe(name:String):Null<String>
{
#if sys
return Sys.getEnv(name);
#else
return null;
#end
}
/**
* Applies the specified ANSI codes to the input string.
*
* You can pass one or multiple ANSI codes for combining styles.
*
* @param input The input.
* @param codes The ANSI codes to apply.
*
* @return The styled string.
*/
public static function apply(input:Dynamic, codes:Array<AnsiCode>):String
{
return stripCodes(codes.join('') + input + AnsiCode.RESET);
}
@:noCompletion
private static function stripCodes(output:String):String
{
#if sys
if (codesSupported == null)
{
final term:Null<String> = getEnvSafe('TERM');
if (term == 'dumb') codesSupported = false;
else
{
if (codesSupported != true && term != null) codesSupported = REGEX_TERM_256.match(term) || REGEX_TERM_TYPES.match(term);
if (getEnvSafe('CI') != null)
{
final ciEnvNames:Array<String> = [
"GITHUB_ACTIONS", "GITEA_ACTIONS", "TRAVIS", "CIRCLECI",
"APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"
];
for (ci in ciEnvNames)
{
if (getEnvSafe(ci) != null)
{
codesSupported = true;
break;
}
}
if (codesSupported != true && getEnvSafe("CI_NAME") == "codeship") codesSupported = true;
}
final teamCity:Null<String> = getEnvSafe("TEAMCITY_VERSION");
if (codesSupported != true && teamCity != null) codesSupported = REGEX_TEAMCITY_VERSION.match(teamCity);
if (codesSupported != true)
{
codesSupported = getEnvSafe('TERM_PROGRAM') == 'iTerm.app'
|| getEnvSafe('TERM_PROGRAM') == 'Apple_Terminal'
|| getEnvSafe('COLORTERM') != null
|| getEnvSafe('ANSICON') != null
|| getEnvSafe('ConEmuANSI') != null
|| getEnvSafe('WT_SESSION') != null;
}
}
}
#else
codesSupported = false;
#end
return codesSupported == true ? output : REGEX_ANSI_CODES.replace(output, '');
}
}