small adjustments in syntax highlighting -> v0.1.0

Author: smackem

.gitignore

@@ -353,4 +353,5 @@ MigrationBackup/
 .idea
 
 dump.rdb
-publish*
+publish-*
+*.zip

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <VersionPrefix>0.1.0</VersionPrefix>
-        <VersionSuffix>snapshot</VersionSuffix>
+<!--        <VersionSuffix>snapshot</VersionSuffix>-->
     </PropertyGroup>
 
     <PropertyGroup>

README.md

@@ -52,7 +52,7 @@ let openSessionCount =
     select sessionKey 
     |> count()
 where openSessionCount > 0
-let userJson = GET(userKey) 
+let userJson = get(userKey) 
 select (key: userKey, name: userJson[".name"]);
 ```
 Response:
@@ -378,6 +378,8 @@ json["$.answer"];
 42
 ```
 
+Values extracted from JSON are translated to their corresponding RedisQL types, so a JSON integer values becomes a RedisQL integer, a JSON array becomes a RedisQL list etc.
+
 ## Bindings
 Bind values anytime in the REPL's top most scope using the `let` statement:
 ```csharp

publish.sh

@@ -0,0 +1,18 @@
+VERSION=0.1.0
+
+rm -Rf publish-*
+
+# OSX
+dotnet publish src/RedisQ.Cli -r osx-x64 -o publish-osx -p:PublishTrimmed=true -c Release --self-contained
+mv publish-osx/RedisQ.Cli publish-osx/redis-q
+zip -r redis-q.$VERSION.osx-x64.zip publish-osx/*
+
+# Linux
+dotnet publish src/RedisQ.Cli -r linux-x64 -o publish-linux -p:PublishTrimmed=true -c Release --self-contained
+mv publish-linux/RedisQ.Cli publish-linux/redis-q
+zip -r redis-q.$VERSION.linux-x64.zip publish-linux/*
+
+# Windows
+dotnet publish src/RedisQ.Cli -r win-x64 -o publish-win -p:PublishTrimmed=true -c Release --self-contained
+mv publish-win/RedisQ.Cli.exe publish-win/redis-q.exe
+zip -r redis-q.$VERSION.win-x64.zip publish-win/*

src/RedisQ.Cli/IRepl.cs

@@ -45,17 +45,23 @@ internal class PrettyRepl : IRepl
     public PrettyRepl(char terminator, Compiler compiler)
     {
         var promptStr = new FormattedString("> ", new FormatSpan(0, 2, AnsiColor.BrightBlack));
+        var historyPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".redis-q-history");
         _prompt = new Prompt(
             configuration: new PromptConfiguration(prompt: promptStr),
-            callbacks: new LocalPromptCallbacks(compiler, terminator));
+            callbacks: new LocalPromptCallbacks(compiler, terminator),
+            persistentHistoryFilepath: historyPath);
     }
 
     public async Task<string> ReadSource()
     {
-        var response = await _prompt.ReadLineAsync();
-        return response.IsSuccess
-            ? response.Text
-            : string.Empty;
+        var response = await _prompt.ReadLineAsync().ConfigureAwait(false);
+        if (!response.IsSuccess) return string.Empty;
+        if (response is KeyPressCallbackResult callbackOutput)
+        {
+            Console.WriteLine(Environment.NewLine + callbackOutput.Output);
+            return string.Empty;
+        }
+        return response.Text;
     }
 
     private class LocalPromptCallbacks : PromptCallbacks
@@ -122,7 +128,7 @@ protected override Task<KeyPress> TransformKeyPressAsync(string text, int caret,
 
         protected override Task<IReadOnlyCollection<FormatSpan>> HighlightCallbackAsync(string text, CancellationToken cancellationToken)
         {
-            if (text.StartsWith("#")) return Task.FromResult(new[] { new FormatSpan(0, text.Length, AnsiColor.Green) } as IReadOnlyCollection<FormatSpan>);
+            if (text.StartsWith("#")) return Task.FromResult(new[] { new FormatSpan(0, text.Length, AnsiColor.Magenta) } as IReadOnlyCollection<FormatSpan>);
             var tokens = _compiler.Lex(text);
             var spans = tokens
                 .Where(token => token.StartIndex >= 0 && token.StopIndex >= token.StartIndex)
@@ -133,13 +139,12 @@ protected override Task<IReadOnlyCollection<FormatSpan>> HighlightCallbackAsync(
                     Length = token.StopIndex - token.StartIndex + 1,
                 }).Select(t => t switch
                 {
-                    _ when Keywords.Contains(t.Type) => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightMagenta),
-                    _ when Operators.Contains(t.Type) => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightMagenta),
+                    _ when Keywords.Contains(t.Type) => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightCyan),
+                    //_ when Operators.Contains(t.Type) => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightCyan),
                     _ => t.Type switch
                     {
-                        Tokens.Comment => new FormatSpan(t.StartIndex, t.Length, AnsiColor.Green),
                         Tokens.Integer or RedisQLLexer.Real => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightYellow),
-                        Tokens.SingleQuotedString or RedisQLLexer.DoubleQuotedString => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightCyan),
+                        Tokens.SingleQuotedString or RedisQLLexer.DoubleQuotedString => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightGreen),
                         _ => new FormatSpan(t.StartIndex, t.Length, AnsiColor.BrightWhite),
                     },
                 });

src/RedisQ.Cli/Program.cs

@@ -50,7 +50,8 @@ private static void PrintBanner(Options options)
         Console.WriteLine($"***** redis-q v{version}");
         Console.WriteLine($"redis @ {options.ConnectionString}");
         Console.WriteLine("terminate expressions with ;");
-        Console.WriteLine("enter #q; to exit...");
+        Console.WriteLine("enter #q; to quit...");
+        Console.WriteLine();
     }
 
     private static async Task<Value?> Interpret(Compiler compiler, string source, Context ctx, Options options)

src/RedisQ.Cli/ValuePrinter.cs

@@ -55,6 +55,7 @@ private async Task PrintEnumerable(IAsyncEnumerable<Value> values, TextWriter wr
                     {
                         await Print(v, writer, indent + "  ");
                     }
+                    await writer.WriteLineAsync();
                 }
             }
             catch (RuntimeException e)

src/RedisQ.Core/RedisQ.Core.csproj

@@ -8,8 +8,9 @@
       disabled warnings (produced by antlr generated source):
       CS2002 source file specified multiple times;
       CS3021 ClsCompliant class in assembly that is not ClsCompliant;
+      NU1605 package downgrade produced by netstandard 1.3 references (ANTLR)
     -->
-    <NoWarn>CS2002;CS3021</NoWarn>
+    <NoWarn>CS2002;CS3021;NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>