Added sql console. Cleanup.

Chriztiaan · Chriztiaan · commit 480e35b85365 · 2025-06-13T10:56:19.000+02:00
diff --git a/.github/workflows/dev-packages.yml b/.github/workflows/dev-packages.yml
@@ -1,5 +1,5 @@
 # The version is pulled from the CHANGELOG.md file of the package.
-# Add a `-dev.xxx` suffix to the version.
+# Add a `-dev.xxx` suffix to the version. Example: `0.0.1-dev.1`
 name: Create Dev Release
 
 on: workflow_dispatch
@@ -24,17 +24,25 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
       
-      - name: Extract Version from CHANGELOG.md
+      - name: Extract Common Package Version from CHANGELOG.md
         id: extract_version
         shell: bash
         run: |
-          VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.Common/CHANGELOG.md)
-          echo "Detected Version: $VERSION"
-          echo "VERSION=$VERSION" >> $GITHUB_ENV 
-
-      - name: Run Pack
-        run: dotnet pack -c Release -o ${{ github.workspace }}/output
+          COMMON_VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.Common/CHANGELOG.md)
+          echo "Detected Version: $COMMON_VERSION"
+          echo "VERSION=$COMMON_VERSION" >> $GITHUB_ENV 
+          
+      - name: Extract MAUI Package Version from CHANGELOG.md
+        id: extract_maui_version
+        shell: bash
+        run: |
+          COMMON_VERSION=$(awk '/^## [0-9]+\.[0-9]+\.[0-9]+-dev(\.[0-9]+)?$/ {print $2; exit}' PowerSync/PowerSync.MAUI/CHANGELOG.md)
+          echo "Detected Version: $COMMON_VERSION"
+          echo "VERSION=$COMMON_VERSION" >> $GITHUB_ENV 
 
-      - name: Run Push
-        run: dotnet nuget push ${{ github.workspace }}\output\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
-       
+#      - name: Run Pack
+#        run: dotnet pack -c Release -o ${{ github.workspace }}/output
+#
+#      - name: Run Push
+#        run: dotnet nuget push ${{ github.workspace }}\output\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
+#       
diff --git a/PowerSync/PowerSync.Maui/CHANGELOG.md b/PowerSync/PowerSync.Maui/CHANGELOG.md
@@ -1,7 +1,6 @@
 # PowerSync.Maui Changelog
 
-
-## 0.0.1-alpha.1
+## 0.0.1-dev.1
 
 - Introduce package. Support for iOS/Android use cases.
 
diff --git a/PowerSync/PowerSync.Maui/PowerSync.Maui.csproj b/PowerSync/PowerSync.Maui/PowerSync.Maui.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
-    <Content Include="Platforms\iOS\**\*.*">
+    <Content Include="Platforms\iOS\NativeLibs\powersync-sqlite-core.xcframework\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -52,6 +52,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
-    <None Include="Platforms\iOS\**\*.*" Pack="true" PackagePath="Platforms\iOS" />
+    <None Include="Platforms\iOS\NativeLibs\powersync-sqlite-core.xcframework\**\*.*" Pack="true" PackagePath="Platforms\iOS" />
   </ItemGroup>
 </Project>
diff --git a/Tools/Setup/Setup.cs b/Tools/Setup/Setup.cs
@@ -112,7 +112,7 @@ public async Task SetupMauiAndroid()
             var downloadUrl = $"{MAVEN_BASE_URL}/{aarFileName}";
             
             await DownloadFile(downloadUrl, aarPath);
-            await ExtractAarNativeLibraries(aarPath, nativeDir);
+            ExtractAarNativeLibraries(aarPath, nativeDir);
             
             Console.WriteLine($"✓ Android: Extracted native libraries from {aarFileName}");
         }
@@ -122,7 +122,7 @@ public async Task SetupMauiAndroid()
         }
     }
 
-    private async Task ExtractAarNativeLibraries(string aarPath, string nativeDir)
+    private void ExtractAarNativeLibraries(string aarPath, string nativeDir)
     {
         var extractedDir = Path.Combine(nativeDir, "temp_extracted");
         
diff --git a/demos/TodoSQLite/AppShell.xaml b/demos/TodoSQLite/AppShell.xaml
@@ -6,9 +6,19 @@
     xmlns:views="clr-namespace:TodoSQLite.Views"
     Shell.FlyoutBehavior="Disabled">
 
-    <ShellContent
-        Title="Todo Lists"
-        ContentTemplate="{DataTemplate views:ListsPage}"
-        Route="ListsPage" />
+    <TabBar>
+        <Tab Title="Todo Lists">
+            <ShellContent
+                Title="Todo Lists"
+                ContentTemplate="{DataTemplate views:ListsPage}"
+                Route="ListsPage" />
+        </Tab>
+        <Tab Title="SQL Console">
+            <ShellContent
+                Title="SQL Console"
+                ContentTemplate="{DataTemplate views:SqlConsolePage}"
+                Route="SqlConsolePage" />
+        </Tab>
+    </TabBar>
 
 </Shell>
diff --git a/demos/TodoSQLite/AppShell.xaml.cs b/demos/TodoSQLite/AppShell.xaml.cs
@@ -8,5 +8,6 @@ public AppShell()
 	{
 		InitializeComponent();
 		Routing.RegisterRoute(nameof(TodoListPage), typeof(TodoListPage));
+		Routing.RegisterRoute(nameof(SqlConsolePage), typeof(SqlConsolePage));
 	}
 }
diff --git a/demos/TodoSQLite/Data/NodeConnector.cs b/demos/TodoSQLite/Data/NodeConnector.cs
@@ -13,8 +13,7 @@ namespace TodoSQLite.Data;
 
 public class NodeConnector : IPowerSyncBackendConnector
 {
-    private static readonly string StorageFilePath = "user_id.txt"; // Simulating local storage
-    private readonly HttpClient _httpClient;
+    private readonly HttpClient httpClient;
 
     public string BackendUrl { get; }
     public string PowerSyncUrl { get; }
@@ -23,7 +22,7 @@ public class NodeConnector : IPowerSyncBackendConnector
 
     public NodeConnector()
     {
-        _httpClient = new HttpClient();
+        httpClient = new HttpClient();
 
         // Load or generate User ID
         UserId = LoadOrGenerateUserId();
@@ -41,10 +40,10 @@ public string LoadOrGenerateUserId()
 
     public async Task<PowerSyncCredentials?> FetchCredentials()
     {
-        string tokenEndpoint = "api/auth/token";
-        string url = $"{BackendUrl}/{tokenEndpoint}?user_id={UserId}";
+        var tokenEndpoint = "api/auth/token";
+        var url = $"{BackendUrl}/{tokenEndpoint}?user_id={UserId}";
 
-        HttpResponseMessage response = await _httpClient.GetAsync(url);
+        var response = await httpClient.GetAsync(url);
         if (!response.IsSuccessStatusCode)
         {
             throw new Exception($"Received {response.StatusCode} from {tokenEndpoint}: {await response.Content.ReadAsStringAsync()}");
@@ -99,7 +98,7 @@ public async Task UploadData(IPowerSyncDatabase database)
             var payload = JsonSerializer.Serialize(new { batch });
             var content = new StringContent(payload, Encoding.UTF8, "application/json");
 
-            HttpResponseMessage response = await _httpClient.PostAsync($"{BackendUrl}/api/data", content);
+            HttpResponseMessage response = await httpClient.PostAsync($"{BackendUrl}/api/data", content);
 
             if (!response.IsSuccessStatusCode)
             {
diff --git a/demos/TodoSQLite/Data/PowerSyncData.cs b/demos/TodoSQLite/Data/PowerSyncData.cs
@@ -17,7 +17,7 @@ public PowerSyncData()
         ILoggerFactory loggerFactory = LoggerFactory.Create(builder =>
         {
             builder.AddConsole();
-            builder.SetMinimumLevel(LogLevel.Trace);
+            builder.SetMinimumLevel(LogLevel.Error);
         });
         var logger = loggerFactory.CreateLogger("PowerSyncLogger");
 
@@ -73,7 +73,7 @@ await Db.Execute(
                 [
                     item.Description,
                     item.Completed ? 1 : 0,
-                    item.CompletedAt,
+                    item.CompletedAt!,
                     UserId,
                     item.ID
                 ]);
diff --git a/demos/TodoSQLite/MauiProgram.cs b/demos/TodoSQLite/MauiProgram.cs
@@ -22,6 +22,7 @@ public static MauiApp CreateMauiApp()
 		builder.Services.AddSingleton<PowerSyncData>();
 		builder.Services.AddTransient<ListsPage>();
 		builder.Services.AddTransient<TodoListPage>();
+		builder.Services.AddTransient<SqlConsolePage>();
 
 		return builder.Build();
 	}
diff --git a/demos/TodoSQLite/Models/TodoItem.cs b/demos/TodoSQLite/Models/TodoItem.cs
@@ -5,26 +5,25 @@ namespace TodoSQLite.Models;
 public class TodoItem
 {
     [JsonProperty("id")]
-    public string ID { get; set; } = "";
-    
-    [JsonProperty("list_id")]
-    public string ListId { get; set; }
+    public string ID { get; set; } =  null!;
+
+    [JsonProperty("list_id")] public string ListId { get; set; } = null!;
     
     [JsonProperty("created_at")]
-    public string CreatedAt { get; set; }
+    public string CreatedAt { get; set; }= null!;
     
     [JsonProperty("completed_at")]
-    public string CompletedAt { get; set; }
+    public string? CompletedAt { get; set; }
     
     [JsonProperty("description")]
-    public string Description { get; set; }
+    public string Description { get; set; }= null!;
     
     [JsonProperty("created_by")]
-    public string CreatedBy { get; set; }
+    public string CreatedBy { get; set; }= null!;
     
     [JsonProperty("completed_by")]
-    public string CompletedBy { get; set; }
+    public string CompletedBy { get; set; }= null!;
     
     [JsonProperty("completed")]
-    public bool Completed { get; set; }
+    public bool Completed { get; set; } = false;
 }
diff --git a/demos/TodoSQLite/Models/TodoList.cs b/demos/TodoSQLite/Models/TodoList.cs
@@ -5,14 +5,14 @@ namespace TodoSQLite.Models;
 public class TodoList
 {
     [JsonProperty("id")]
-    public string ID { get; set; } = "";
+    public string ID { get; set; } = null!;
     
     [JsonProperty("created_at")]
-    public string CreatedAt { get; set; }
+    public string CreatedAt { get; set; } = null!;
     
     [JsonProperty("name")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
     
     [JsonProperty("owner_id")]
-    public string OwnerId { get; set; }
+    public string OwnerId { get; set; }= null!;
 } 
diff --git a/demos/TodoSQLite/TodoSQLite.csproj b/demos/TodoSQLite/TodoSQLite.csproj
@@ -10,6 +10,7 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>TodoSQLite</ApplicationTitle>
diff --git a/demos/TodoSQLite/Views/SqlConsolePage.xaml b/demos/TodoSQLite/Views/SqlConsolePage.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="TodoSQLite.Views.SqlConsolePage"
+             Title="SQL Console">
+    <Grid RowDefinitions="Auto,*" Padding="20">
+        <VerticalStackLayout Grid.Row="0" Spacing="10">
+            <Entry x:Name="QueryEntry" 
+                   Placeholder="Enter SQL query..."
+                   Text="SELECT * FROM lists"
+                   Completed="OnQuerySubmitted"/>
+            <Button Text="Execute Query" 
+                    Clicked="OnQuerySubmitted"
+                    HorizontalOptions="Start"/>
+        </VerticalStackLayout>
+        
+        <StackLayout Grid.Row="1" Spacing="10">
+            <Label x:Name="Headers" Text="" />
+            <Label x:Name="Results" Text="" />
+        </StackLayout>
+    </Grid>
+</ContentPage> 
diff --git a/demos/TodoSQLite/Views/SqlConsolePage.xaml.cs b/demos/TodoSQLite/Views/SqlConsolePage.xaml.cs
@@ -0,0 +1,50 @@
+using System.Collections.ObjectModel;
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using TodoSQLite.Data;
+
+namespace TodoSQLite.Views;
+
+public partial class SqlConsolePage : ContentPage
+{
+    private readonly PowerSyncData database;
+    
+    public SqlConsolePage(PowerSyncData powerSyncData)
+    {
+        InitializeComponent();
+        database = powerSyncData;
+    }
+
+    private async void OnQuerySubmitted(object sender, EventArgs e)
+    {
+        Headers.Text = "";
+        Results.Text = "";  
+        try
+        {
+            var query = QueryEntry.Text;
+            if (string.IsNullOrWhiteSpace(query))
+                return;
+            
+            var results = await database.Db.GetAll<object>(query);
+            
+            var keys =  JObject.Parse(JsonConvert.SerializeObject(results[0])).Properties().Select(p => p.Name).ToList();
+            var allValues = results
+                .Select(result => JObject.Parse(JsonConvert.SerializeObject(result))
+                    .Properties()
+                    .Select(p => p.Value.ToObject<object>())
+                    .ToList())
+                .ToList();
+            
+            Console.WriteLine($"Results count: {JsonConvert.SerializeObject(keys)}");
+            Console.WriteLine($"Results count \n: {JsonConvert.SerializeObject(allValues)}");
+
+            Headers.Text = string.Join(" | ", keys);
+            Results.Text = string.Join("\n\n", allValues.Select(v => string.Join(" | ", v)));
+        }
+        catch (Exception ex)
+        {
+            await DisplayAlert("Error", ex.Message, "OK");
+        }
+    }
+} 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public async Task SetupMauiAndroid()`
`112`	`112`	`var downloadUrl = $"{MAVEN_BASE_URL}/{aarFileName}";`
`113`	`113`
`114`	`114`	`await DownloadFile(downloadUrl, aarPath);`
`115`		`- await ExtractAarNativeLibraries(aarPath, nativeDir);`
	`115`	`+ ExtractAarNativeLibraries(aarPath, nativeDir);`
`116`	`116`
`117`	`117`	`Console.WriteLine($"✓ Android: Extracted native libraries from {aarFileName}");`
`118`	`118`	`}`
`@@ -122,7 +122,7 @@ public async Task SetupMauiAndroid()`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- private async Task ExtractAarNativeLibraries(string aarPath, string nativeDir)`
	`125`	`+ private void ExtractAarNativeLibraries(string aarPath, string nativeDir)`
`126`	`126`	`{`
`127`	`127`	`var extractedDir = Path.Combine(nativeDir, "temp_extracted");`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ public AppShell()`
`8`	`8`	`{`
`9`	`9`	`InitializeComponent();`
`10`	`10`	`Routing.RegisterRoute(nameof(TodoListPage), typeof(TodoListPage));`
	`11`	`+ Routing.RegisterRoute(nameof(SqlConsolePage), typeof(SqlConsolePage));`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public static MauiApp CreateMauiApp()`
`22`	`22`	`builder.Services.AddSingleton<PowerSyncData>();`
`23`	`23`	`builder.Services.AddTransient<ListsPage>();`
`24`	`24`	`builder.Services.AddTransient<TodoListPage>();`
	`25`	`+ builder.Services.AddTransient<SqlConsolePage>();`
`25`	`26`
`26`	`27`	`return builder.Build();`
`27`	`28`	`}`