From 65e04996b0f96769d2779273cc33f6338b67e40c Mon Sep 17 00:00:00 2001 From: andrew Date: Sun, 30 Apr 2023 02:41:26 -0400 Subject: [PATCH 1/2] rename 'xrpc' to 'tempo' xRPC was a placeholder until a name was decided; we've gone with 'Tempo' --- Core/Generators/BaseGenerator.cs | 2 +- .../CPlusPlus/CPlusPlusGenerator.cs | 2 +- Core/Generators/CSharp/CSharpGenerator.cs | 2 +- Core/Generators/Dart/DartGenerator.cs | 2 +- Core/Generators/Rust/RustGenerator.cs | 2 +- Core/Generators/ServiceGeneratorFlags.cs | 2 +- .../TypeScript/TypeScriptGenerator.cs | 30 +++++++++---------- Repl/Properties/launchSettings.json | 6 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Core/Generators/BaseGenerator.cs b/Core/Generators/BaseGenerator.cs index ed7bfe6e..19c5da48 100644 --- a/Core/Generators/BaseGenerator.cs +++ b/Core/Generators/BaseGenerator.cs @@ -22,7 +22,7 @@ protected BaseGenerator(BebopSchema schema) /// Determines which components of a service will be generated. default to both client and server. /// Whether a generation notice should be written at the top of files. This is true by default. /// The generated code. - public abstract string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true); + public abstract string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true); /// /// Write auxiliary files to an output directory path. diff --git a/Core/Generators/CPlusPlus/CPlusPlusGenerator.cs b/Core/Generators/CPlusPlus/CPlusPlusGenerator.cs index c3e08322..4a0b2242 100644 --- a/Core/Generators/CPlusPlus/CPlusPlusGenerator.cs +++ b/Core/Generators/CPlusPlus/CPlusPlusGenerator.cs @@ -354,7 +354,7 @@ private string EmitLiteral(Literal literal) { /// Generate code for a Bebop schema. /// /// The generated code. - public override string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true) + public override string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true) { var builder = new StringBuilder(); if (writeGeneratedNotice) diff --git a/Core/Generators/CSharp/CSharpGenerator.cs b/Core/Generators/CSharp/CSharpGenerator.cs index 12dce6ba..87935d95 100644 --- a/Core/Generators/CSharp/CSharpGenerator.cs +++ b/Core/Generators/CSharp/CSharpGenerator.cs @@ -18,7 +18,7 @@ public CSharpGenerator(BebopSchema schema) : base(schema) } - public override string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true) + public override string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true) { if (languageVersion is not null) { diff --git a/Core/Generators/Dart/DartGenerator.cs b/Core/Generators/Dart/DartGenerator.cs index efb1d1b4..7773e884 100644 --- a/Core/Generators/Dart/DartGenerator.cs +++ b/Core/Generators/Dart/DartGenerator.cs @@ -296,7 +296,7 @@ private string EmitLiteral(Literal literal) { /// Generate code for a Bebop schema. /// /// The generated code. - public override string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true) + public override string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true) { var builder = new StringBuilder(); builder.AppendLine("import 'dart:typed_data';"); diff --git a/Core/Generators/Rust/RustGenerator.cs b/Core/Generators/Rust/RustGenerator.cs index d6d65d36..cca9ac09 100644 --- a/Core/Generators/Rust/RustGenerator.cs +++ b/Core/Generators/Rust/RustGenerator.cs @@ -54,7 +54,7 @@ public class RustGenerator : BaseGenerator public RustGenerator(BebopSchema schema) : base(schema) { } - public override string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true) + public override string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true) { // the main scope which is where we write the const definitions and the borrowed types (as these are the // primary way to use bebop in Rust) diff --git a/Core/Generators/ServiceGeneratorFlags.cs b/Core/Generators/ServiceGeneratorFlags.cs index fc063bf4..b2a4a1c3 100644 --- a/Core/Generators/ServiceGeneratorFlags.cs +++ b/Core/Generators/ServiceGeneratorFlags.cs @@ -4,7 +4,7 @@ namespace Core.Generators /// /// An enum that defines which parts of a service are generated /// - public enum XrpcServices + public enum TempoServices { /// /// Indicates no service code should be generated diff --git a/Core/Generators/TypeScript/TypeScriptGenerator.cs b/Core/Generators/TypeScript/TypeScriptGenerator.cs index ba19c9eb..0ba507ab 100644 --- a/Core/Generators/TypeScript/TypeScriptGenerator.cs +++ b/Core/Generators/TypeScript/TypeScriptGenerator.cs @@ -369,7 +369,7 @@ private string EmitLiteral(Literal literal) { /// Generate code for a Bebop schema. /// /// The generated code. - public override string Compile(Version? languageVersion, XrpcServices services = XrpcServices.Both, bool writeGeneratedNotice = true) + public override string Compile(Version? languageVersion, TempoServices services = TempoServices.Both, bool writeGeneratedNotice = true) { var builder = new IndentedStringBuilder(); if (writeGeneratedNotice) @@ -379,14 +379,14 @@ public override string Compile(Version? languageVersion, XrpcServices services = builder.AppendLine("import { BebopView, BebopRuntimeError, BebopRecord } from \"bebop\";"); if (Schema.Definitions.Values.OfType().Any()) { - if (services is XrpcServices.Client or XrpcServices.Both) + if (services is TempoServices.Client or TempoServices.Both) { - builder.AppendLine("import { Metadata } from \"@xrpc/common\";"); - builder.AppendLine("import { BaseClient, MethodInfo, CallOptions } from \"@xrpc/client\";"); + builder.AppendLine("import { Metadata } from \"@tempojs/common\";"); + builder.AppendLine("import { BaseClient, MethodInfo, CallOptions } from \"@tempojs/client\";"); } - if (services is XrpcServices.Server or XrpcServices.Both) + if (services is TempoServices.Server or TempoServices.Both) { - builder.AppendLine("import { ServiceRegistry, BaseService, ServerContext, BebopMethodAny, BebopMethod } from \"@xrpc/server\";"); + builder.AppendLine("import { ServiceRegistry, BaseService, ServerContext, BebopMethodAny, BebopMethod } from \"@tempojs/server\";"); } } @@ -595,9 +595,9 @@ public override string Compile(Version? languageVersion, XrpcServices services = } } var serviceDefinitions = Schema.Definitions.Values.OfType(); - if (serviceDefinitions is not null && serviceDefinitions.Any() && services is not XrpcServices.None) + if (serviceDefinitions is not null && serviceDefinitions.Any() && services is not TempoServices.None) { - if (services is XrpcServices.Server or XrpcServices.Both) + if (services is TempoServices.Server or TempoServices.Both) { foreach(var service in serviceDefinitions) { @@ -612,7 +612,7 @@ public override string Compile(Version? languageVersion, XrpcServices services = builder.AppendLine(); } - builder.CodeBlock("export class XrpcServiceRegistry extends ServiceRegistry", indentStep, () => + builder.CodeBlock("export class TempoServiceRegistry extends ServiceRegistry", indentStep, () => { builder.AppendLine("private static readonly staticServiceInstances: Map = new Map();"); builder.CodeBlock("public static register(serviceName: string)", indentStep, () => @@ -620,17 +620,17 @@ public override string Compile(Version? languageVersion, XrpcServices services = builder.CodeBlock("return (constructor: Function) =>", indentStep, () => { builder.AppendLine("const service = Reflect.construct(constructor, [undefined]);"); - builder.CodeBlock("if (XrpcServiceRegistry.staticServiceInstances.has(serviceName))", indentStep, () => + builder.CodeBlock("if (TempoServiceRegistry.staticServiceInstances.has(serviceName))", indentStep, () => { builder.AppendLine("throw new Error(`Duplicate service registered: ${serviceName}`);"); }); - builder.AppendLine("XrpcServiceRegistry.staticServiceInstances.set(serviceName, service);"); + builder.AppendLine("TempoServiceRegistry.staticServiceInstances.set(serviceName, service);"); }); }); builder.CodeBlock("public static tryGetService(serviceName: string): BaseService", indentStep, () => { - builder.AppendLine("const service = XrpcServiceRegistry.staticServiceInstances.get(serviceName);"); + builder.AppendLine("const service = TempoServiceRegistry.staticServiceInstances.get(serviceName);"); builder.CodeBlock("if (service === undefined)", indentStep, () => { builder.AppendLine("throw new Error(`Unable to retreive service '${serviceName}' - it is not registered.`);"); @@ -649,13 +649,13 @@ public override string Compile(Version? languageVersion, XrpcServices services = { builder.AppendLine($"serviceName = '{service.ClassName()}';"); - builder.AppendLine($"service = XrpcServiceRegistry.tryGetService(serviceName);"); + builder.AppendLine($"service = TempoServiceRegistry.tryGetService(serviceName);"); builder.CodeBlock($"if (!(service instanceof {service.BaseClassName()}))", indentStep, () => { builder.AppendLine("throw new Error('todo');"); }); builder.AppendLine($"service.setLogger(this.logger.clone(serviceName));"); - builder.AppendLine("XrpcServiceRegistry.staticServiceInstances.delete(serviceName);"); + builder.AppendLine("TempoServiceRegistry.staticServiceInstances.delete(serviceName);"); builder.AppendLine("this.serviceInstances.push(service);"); foreach (var method in service.Methods) { @@ -688,7 +688,7 @@ public override string Compile(Version? languageVersion, XrpcServices services = } - if (services is XrpcServices.Client or XrpcServices.Both) + if (services is TempoServices.Client or TempoServices.Both) { foreach (var service in serviceDefinitions) { diff --git a/Repl/Properties/launchSettings.json b/Repl/Properties/launchSettings.json index c4e926d3..7a10d80c 100644 --- a/Repl/Properties/launchSettings.json +++ b/Repl/Properties/launchSettings.json @@ -18,13 +18,13 @@ }, "Repl": { "commandName": "Project", - "dotnetRunMessages": "true", "launchBrowser": true, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": "true" } } -} +} \ No newline at end of file From e623f4a9aedd381af163998f86e2307cdb3537dd Mon Sep 17 00:00:00 2001 From: andrew Date: Sun, 30 Apr 2023 02:47:29 -0400 Subject: [PATCH 2/2] bump version --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 8c7a8e71..cab4a41e 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VERSION="2.5.3" +VERSION="2.5.4" MAJOR=2 MINOR=5 -PATCH=3 +PATCH=4