Feature/yaml

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0;</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>

Examples/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0;</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>

Examples/Slang.Console/Features/Feature2/Feature2.cs

@@ -0,0 +1,4 @@
+namespace Slang.Console.Features.Feature2;
+
+[Translations(InputFileName = "feature2")]
+internal partial class Feature2;

Examples/Slang.Console/Features/Feature3/Feature3.cs

@@ -0,0 +1,4 @@
+namespace Slang.Console.Features.Feature3;
+
+[Translations(InputFileName = "feature3", StartCharacter = "{{", EndCharacter = "}}")]
+internal partial class Feature3;

Examples/Slang.Console/Program.cs

@@ -1,5 +1,7 @@
 using Slang.Console;
 using Slang.Console.Features.Feature1;
+using Slang.Console.Features.Feature2;
+using Slang.Console.Features.Feature3;
 
 foreach (var culture in Feature1.SupportedCultures)
 {
@@ -48,4 +50,17 @@ void ShowLocales()
     Console.WriteLine(formattingBloc.TimeSpanExample(TimeSpan.FromMinutes(13)));
     Console.WriteLine(formattingBloc.ObjectExample2("Hello World!"));
     Console.WriteLine(formattingBloc.FloatExample(123.31414f));
+
+    var formattingBloc2 = Feature2.Instance.Root.Formatting;
+
+    string price2 = formattingBloc2.DecimalExample(12.23123M);
+
+    Console.WriteLine(price2);
+    Console.WriteLine(formattingBloc2.LongExample(124214));
+    Console.WriteLine(formattingBloc2.IntExample(123));
+    Console.WriteLine(formattingBloc2.TimeSpanExample(TimeSpan.FromMinutes(13)));
+    Console.WriteLine(formattingBloc2.ObjectExample2("Hello World!"));
+    Console.WriteLine(formattingBloc2.FloatExample(123.31414f));
+
+    Console.WriteLine(Feature3.Instance.Root.SomeExt(3));
 }

Examples/Slang.Console/Slang.Console.csproj

@@ -6,8 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <AdditionalFiles Include="i18n\*.i18n.json" />
-        <AdditionalFiles Include="slang.json" />
+        <AdditionalFiles Include="i18n\*.i18n.json"/>
+        <AdditionalFiles Include="i18n\*.i18n.yaml"/>
+        <AdditionalFiles Include="slang.json"/>
     </ItemGroup>
 
     <ItemGroup>

Examples/Slang.Console/i18n/feature2_en-US.i18n.yaml

@@ -0,0 +1,82 @@
+formatting:
+  doubleExample: 'Double formatting: {value}'
+  '@doubleExample':
+    placeholders:
+      value:
+        type: double
+        format: F2
+  doubleExample2: 'Double formatting: {value:double}'
+  '@doubleExample2':
+    placeholders:
+      value:
+        format: F3
+  objectExample2: 'Object formatting: {value}'
+  '@objectExample2':
+    placeholders:
+      value:
+        format: Qwerty {0} qwerty
+  intExample: 'Int formatting: {value}'
+  '@intExample':
+    placeholders:
+      value:
+        type: int
+        format: X
+  longExample: 'Long formatting: {value}'
+  '@longExample':
+    placeholders:
+      value:
+        type: long
+        format: N
+  decimalExample: 'Decimal formatting: {value}'
+  '@decimalExample':
+    placeholders:
+      value:
+        type: decimal
+        format: C2
+  floatExample: 'Float formatting: {value}'
+  '@floatExample':
+    placeholders:
+      value:
+        type: float
+        format: F2
+  dateExample: Date {date}
+  '@dateExample':
+    placeholders:
+      date:
+        type: DateTime
+        format: dd MMMM HH:mm
+  dateOnlyExample: Date only {date}
+  '@dateOnlyExample':
+    placeholders:
+      date:
+        type: DateOnly
+        format: dd MMMM
+  timeOnlyExample: Time only {time}
+  '@timeOnlyExample':
+    placeholders:
+      time:
+        type: TimeOnly
+        format: HH:mm
+  timeSpanExample: Timespan only {time}
+  '@timeSpanExample':
+    placeholders:
+      time:
+        type: TimeSpan
+        format: t
+'@formatting':
+  description: Formatting bloc comment
+screen:
+  data: Date {date}
+  '@data':
+    description: Title of the day in the schedule of visits
+    placeholders:
+      date:
+        type: DateOnly
+        format: dd MMMM
+  test_param: 'param: {param:double}'
+profile_rating: 'My rating: {rating}'
+'@profile_rating':
+  placeholders:
+    rating:
+      type: double
+      format: F2

Examples/Slang.Console/i18n/feature2_ru-RU.i18n.yaml

@@ -0,0 +1,82 @@
+formatting:
+  doubleExample: 'Double formatting: {value}'
+  '@doubleExample':
+    placeholders:
+      value:
+        type: double
+        format: F2
+  doubleExample2: 'Double formatting: {value:double}'
+  '@doubleExample2':
+    placeholders:
+      value:
+        format: F3
+  objectExample2: 'Object formatting: {value}'
+  '@objectExample2':
+    placeholders:
+      value:
+        format: Qwerty {0} qwerty
+  intExample: 'Int formatting: {value}'
+  '@intExample':
+    placeholders:
+      value:
+        type: int
+        format: X
+  longExample: 'Long formatting: {value}'
+  '@longExample':
+    placeholders:
+      value:
+        type: long
+        format: N
+  decimalExample: 'Decimal formatting: {value}'
+  '@decimalExample':
+    placeholders:
+      value:
+        type: decimal
+        format: C2
+  floatExample: 'Float formatting: {value}'
+  '@floatExample':
+    placeholders:
+      value:
+        type: float
+        format: F2
+  dateExample: Date {date}
+  '@dateExample':
+    placeholders:
+      date:
+        type: DateTime
+        format: dd MMMM HH:mm
+  dateOnlyExample: Date only {date}
+  '@dateOnlyExample':
+    placeholders:
+      date:
+        type: DateOnly
+        format: dd MMMM
+  timeOnlyExample: Time only {time}
+  '@timeOnlyExample':
+    placeholders:
+      time:
+        type: TimeOnly
+        format: HH:mm
+  timeSpanExample: Timespan only {time}
+  '@timeSpanExample':
+    placeholders:
+      time:
+        type: TimeSpan
+        format: t
+'@formatting':
+  description: Formatting bloc comment
+screen:
+  data: Дата {date}
+  '@data':
+    description: Title of the day in the schedule of visits
+    placeholders:
+      date:
+        type: DateOnly
+        format: dd MMMM
+  test_param: 'param: {param:double}'
+profile_rating: 'Мой рейтинг: {rating}'
+'@profile_rating':
+  placeholders:
+    rating:
+      type: double
+      format: F2

Examples/Slang.Console/i18n/feature3_ru-RU.i18n.yaml

@@ -0,0 +1,2 @@
+SomeJson: '[{"aaa": "bbb"}]'
+SomeExt: 'asd {{some: int}}'

Examples/Slang.Desktop.Avalonia/Slang.Desktop.Avalonia.csproj

@@ -20,7 +20,7 @@
 
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 
-        <PackageReference Include="Slang.Net" Version="9.7.0" />
+        <PackageReference Include="Slang.Net" Version="10.0.0" />
 
     </ItemGroup>
 

Examples/Slang.WebApi/Slang.WebApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <ItemGroup>
-      <PackageReference Include="Slang.Net" Version="9.7.0" />
+      <PackageReference Include="Slang.Net" Version="10.0.0" />
     </ItemGroup>
 
     <ItemGroup>

NuGet.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="local" value="Slang.Net/bin/Debug" />
+        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>

Slang.Generator/TranslateGenerator.cs

@@ -56,7 +56,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             generationInfoWithErrors.Select(static (item, _) => item.Value)!;
 
         var jsonFiles = context.AdditionalTextsProvider
-            .Where(file => file.Path.EndsWith(Constants.AdditionalFilePattern))
+            .Where(file =>
+                file.Path.EndsWith(Constants.AdditionalFileJsonPattern) ||
+                file.Path.EndsWith(Constants.AdditionalFileYamlPattern))
             .Select((file, cancellationToken) => new
             {
                 FileName = Path.GetFileName(file.Path),
@@ -141,5 +143,6 @@ private static TranslationsParam ValidateTargetTypeAndGetInfo(AttributeData attr
 
 internal record GlobalConfigDto
 {
-    [JsonPropertyName("base_culture")] public string? BaseCulture { get; set; }
+    [JsonPropertyName("base_culture")]
+    public string? BaseCulture { get; set; }
 }

Slang.Net/Attributes.cs

@@ -25,6 +25,10 @@ class TranslationsAttribute: Attribute
         public PluralAuto PluralAuto { get; set; } = PluralAuto.Cardinal;
 
         public string? PluralParameter { get; set; }
+
+        public string StartCharacter { get; set; } = "{";
+
+        public string EndCharacter { get; set; } = "}";
     }
 
 #if SLANG_ATTRIBUTES_PACKAGE

Slang.Net/CodeBuilder/TranslationsCodeBuilder.cs

@@ -12,6 +12,7 @@ public static async Task Generate(
         RawConfig config,
         SlangFileCollection fileCollection)
     {
+        //Debugger.Launch();
         // STEP 2: scan translations
         var translationMap = await TranslationsRepository.Build(config.BaseLocale, fileCollection: fileCollection);
 

Slang.Net/Constants.cs

@@ -2,5 +2,6 @@ namespace Slang.Shared;
 
 public static class Constants
 {
-    public const string AdditionalFilePattern = ".i18n.json";
+    public const string AdditionalFileJsonPattern = ".i18n.json";
+    public const string AdditionalFileYamlPattern = ".i18n.yaml";
 }

Slang.Net/Data/ConfigRepository.cs

@@ -5,13 +5,16 @@ namespace Slang.Generator.Core.Data;
 
 public static class ConfigRepository
 {
-    public static RawConfig Create(string inputFileName,
+    public static RawConfig Create(
+        string inputFileName,
         string @namespace,
         string className,
         string baseLocale = "en",
         PluralAutoEntity pluralAutoEntity = PluralAutoEntity.Cardinal,
         string rootPropertyName = "Root",
-        string pluralParameter = "n")
+        string pluralParameter = "n",
+        string startCharacter = "{",
+        string endCharacter = "}")
     {
         return new RawConfig(
             Namespace: @namespace,
@@ -20,7 +23,9 @@ public static RawConfig Create(string inputFileName,
             InputFileName: inputFileName,
             PluralAutoEntity: pluralAutoEntity,
             PluralParameter: pluralParameter,
-            RootPropertyName: rootPropertyName
+            RootPropertyName: rootPropertyName,
+            StartCharacter: startCharacter,
+            EndCharacter: endCharacter
         );
     }
 }

Slang.Net/Data/FilesRepository.cs

@@ -13,7 +13,8 @@ public record struct SlangFileCollection(List<TranslationFile> Files);
 /// <param name="Locale">The inferred locale of this file (by file name, directory name, or config)</param>
 public record struct TranslationFile(
     Func<Task<string>> Read,
-    CultureInfo Locale
+    CultureInfo Locale,
+    string Type
 );
 
 public static class FilesRepository
@@ -54,10 +55,13 @@ public static SlangFileCollection GetFileCollection(
         return GetTranslationFile(baseCulture, fileName, () => Task.FromResult(content));
     }
 
-    internal static TranslationFile? GetTranslationFile(CultureInfo baseCulture, string fileName,
+    internal static TranslationFile? GetTranslationFile(
+        CultureInfo baseCulture,
+        string fileName,
         Func<Task<string>> contentFactory)
     {
         string fileNameNoExtension = Path.GetFileNameWithoutExtension(fileName).Split('.').First();
+        string fileNameExtension = Path.GetExtension(fileName).Split('.').Last();
 
         var baseFileMatch = Regexes.BaseFileRegex.Match(fileNameNoExtension);
 
@@ -68,7 +72,8 @@ public static SlangFileCollection GetFileCollection(
 
             return new TranslationFile(
                 Locale: baseCulture,
-                Read: contentFactory);
+                Read: contentFactory,
+                Type: fileNameExtension);
         }
 
         // secondary files (strings_x)
@@ -89,7 +94,8 @@ public static SlangFileCollection GetFileCollection(
 
             return new TranslationFile(
                 Locale: locale,
-                Read: contentFactory);
+                Read: contentFactory,
+                Type: fileNameExtension);
         }
 
         return null;