@polytric/openws-sdkgen 0.0.4 → 0.0.5

package/dist/main.cjs

@@ -204,7 +204,11 @@ function buildIr(ctx) {
           description: handlerSpec.description
         });
         irNetwork.models.push(
-          ...buildIrModels(hostRoleSpec.name, handlerName, handlerSpec.payload)
+          ...buildIrModels(
+            hostRoleSpec.name,
+            handlerName + "Payload",
+            handlerSpec.payload
+          )
         );
       }
     }
@@ -222,7 +226,9 @@ function buildIr(ctx) {
           handlerName,
           description: handlerSpec.description
         });
-        irNetwork.models.push(...buildIrModels(roleName, handlerName, handlerSpec.payload));
+        irNetwork.models.push(
+          ...buildIrModels(roleName, handlerName + "Payload", handlerSpec.payload)
+        );
       }
     }
     ir.networks.push(irNetwork);
@@ -257,6 +263,16 @@ async function dispatchBuildPlan(ctx) {
 var import_node_path = __toESM(require("path"), 1);
 var import_node_process = __toESM(require("process"), 1);
 var import_schema2 = __toESM(require("@pocketgems/schema"), 1);
+
+// src/utils.ts
+function toCamelCase(str) {
+  return str.replace(/[-_\s]+/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/\s+/).filter(Boolean).map((word, index) => {
+    const lower = word.toLowerCase();
+    return index === 0 ? lower : lower.charAt(0).toUpperCase() + lower.slice(1);
+  }).join("");
+}
+
+// src/build-request.ts
 var validateBuildRequest = import_schema2.default.obj({
   specPath: import_schema2.default.str,
   outputPath: import_schema2.default.str,
@@ -276,12 +292,11 @@ var validateBuildRequest = import_schema2.default.obj({
 function buildRequest(ctx) {
   const { rawInput } = ctx;
   if (!rawInput) throw new Error("rawInput is required");
-  console.log("Host roles:", rawInput.hostRole);
   const request = {
     specPath: import_node_path.default.join(import_node_process.default.cwd(), rawInput.spec),
     outputPath: import_node_path.default.join(import_node_process.default.cwd(), rawInput.out),
     project: rawInput.project,
-    hostRoles: rawInput.hostRole,
+    hostRoles: rawInput.hostRole.map((r) => toCamelCase(r)),
     target: {
       [rawInput.language]: {
         environment: rawInput.environment,
@@ -341,6 +356,27 @@ function loadSpec(ctx) {
   if (!request) throw new Error("request is required");
   const { specPath } = request;
   const spec = JSON.parse(import_node_fs2.default.readFileSync(specPath, "utf8"));
+  spec.name = toCamelCase(spec.name);
+  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
+    for (const [roleName, roleSpec] of Object.entries(networkSpec.roles)) {
+      for (const [messageName, messageSpec] of Object.entries(roleSpec.messages)) {
+        delete roleSpec.messages[messageName];
+        roleSpec.messages[toCamelCase(messageName)] = {
+          ...messageSpec
+        };
+      }
+      delete spec.networks[networkName];
+      networkSpec.roles[toCamelCase(roleName)] = {
+        ...roleSpec,
+        name: toCamelCase(roleName)
+      };
+    }
+    delete spec.networks[networkName];
+    spec.networks[toCamelCase(networkName)] = {
+      ...networkSpec,
+      name: toCamelCase(networkName)
+    };
+  }
   return {
     ...ctx,
     spec

package/dist/main.js

@@ -181,7 +181,11 @@ function buildIr(ctx) {
           description: handlerSpec.description
         });
         irNetwork.models.push(
-          ...buildIrModels(hostRoleSpec.name, handlerName, handlerSpec.payload)
+          ...buildIrModels(
+            hostRoleSpec.name,
+            handlerName + "Payload",
+            handlerSpec.payload
+          )
         );
       }
     }
@@ -199,7 +203,9 @@ function buildIr(ctx) {
           handlerName,
           description: handlerSpec.description
         });
-        irNetwork.models.push(...buildIrModels(roleName, handlerName, handlerSpec.payload));
+        irNetwork.models.push(
+          ...buildIrModels(roleName, handlerName + "Payload", handlerSpec.payload)
+        );
       }
     }
     ir.networks.push(irNetwork);
@@ -234,6 +240,16 @@ async function dispatchBuildPlan(ctx) {
 import path from "path";
 import process2 from "process";
 import S2 from "@pocketgems/schema";
+
+// src/utils.ts
+function toCamelCase(str) {
+  return str.replace(/[-_\s]+/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/\s+/).filter(Boolean).map((word, index) => {
+    const lower = word.toLowerCase();
+    return index === 0 ? lower : lower.charAt(0).toUpperCase() + lower.slice(1);
+  }).join("");
+}
+
+// src/build-request.ts
 var validateBuildRequest = S2.obj({
   specPath: S2.str,
   outputPath: S2.str,
@@ -253,12 +269,11 @@ var validateBuildRequest = S2.obj({
 function buildRequest(ctx) {
   const { rawInput } = ctx;
   if (!rawInput) throw new Error("rawInput is required");
-  console.log("Host roles:", rawInput.hostRole);
   const request = {
     specPath: path.join(process2.cwd(), rawInput.spec),
     outputPath: path.join(process2.cwd(), rawInput.out),
     project: rawInput.project,
-    hostRoles: rawInput.hostRole,
+    hostRoles: rawInput.hostRole.map((r) => toCamelCase(r)),
     target: {
       [rawInput.language]: {
         environment: rawInput.environment,
@@ -318,6 +333,27 @@ function loadSpec(ctx) {
   if (!request) throw new Error("request is required");
   const { specPath } = request;
   const spec = JSON.parse(fs2.readFileSync(specPath, "utf8"));
+  spec.name = toCamelCase(spec.name);
+  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
+    for (const [roleName, roleSpec] of Object.entries(networkSpec.roles)) {
+      for (const [messageName, messageSpec] of Object.entries(roleSpec.messages)) {
+        delete roleSpec.messages[messageName];
+        roleSpec.messages[toCamelCase(messageName)] = {
+          ...messageSpec
+        };
+      }
+      delete spec.networks[networkName];
+      networkSpec.roles[toCamelCase(roleName)] = {
+        ...roleSpec,
+        name: toCamelCase(roleName)
+      };
+    }
+    delete spec.networks[networkName];
+    spec.networks[toCamelCase(networkName)] = {
+      ...networkSpec,
+      name: toCamelCase(networkName)
+    };
+  }
   return {
     ...ctx,
     spec

package/dist/plans/dotnet.cjs

@@ -132,12 +132,12 @@ function createPlan(ctx) {
       }
     }
     for (const handlerIr of networkIr.handlers) {
-      handlerIr.modelClassName = pascalCase(handlerIr.handlerName);
+      handlerIr.modelClassName = pascalCase(handlerIr.handlerName) + "Payload";
       handlerIr.messageName = handlerIr.handlerName;
       handlerIr.methodName = pascalCase(handlerIr.handlerName);
     }
     for (const messageIr of networkIr.messages) {
-      messageIr.modelClassName = pascalCase(messageIr.handlerName);
+      messageIr.modelClassName = pascalCase(messageIr.handlerName) + "Payload";
       messageIr.messageName = messageIr.handlerName;
       messageIr.methodName = pascalCase(messageIr.handlerName);
     }

package/dist/plans/dotnet.d.cts

@@ -1,8 +1,10 @@
+import { Spec, Endpoint } from '@polytric/openws-spec/types';
+
 interface PipelineContext {
     argv: string[];
     rawInput?: RawInput;
     request?: BuildRequest;
-    spec?: OpenWsSpec;
+    spec?: Spec;
     ir?: IR;
     plan?: PlanStep[];
 }
@@ -31,42 +33,6 @@ interface BuildRequest {
         };
     };
 }
-interface OpenWsSpec {
-    name: string;
-    description?: string;
-    version?: string;
-    networks: Record<string, NetworkSpec>;
-}
-interface NetworkSpec {
-    name: string;
-    description?: string;
-    version?: string;
-    roles: Record<string, RoleSpec>;
-}
-interface RoleSpec {
-    name: string;
-    description?: string;
-    endpoints?: Endpoint[];
-    messages: Record<string, MessageSpec>;
-}
-interface Endpoint {
-    scheme: 'ws' | 'wss';
-    host: string;
-    port: number;
-    path: string;
-}
-interface MessageSpec {
-    description?: string;
-    from?: string[];
-    payload: JsonSchema;
-}
-interface JsonSchema {
-    type: string;
-    description?: string;
-    properties?: Record<string, JsonSchema>;
-    items?: JsonSchema;
-    required?: string[];
-}
 interface IR {
     package: IRPackage;
     networks: IRNetwork[];

package/dist/plans/dotnet.d.ts

@@ -1,8 +1,10 @@
+import { Spec, Endpoint } from '@polytric/openws-spec/types';
+
 interface PipelineContext {
     argv: string[];
     rawInput?: RawInput;
     request?: BuildRequest;
-    spec?: OpenWsSpec;
+    spec?: Spec;
     ir?: IR;
     plan?: PlanStep[];
 }
@@ -31,42 +33,6 @@ interface BuildRequest {
         };
     };
 }
-interface OpenWsSpec {
-    name: string;
-    description?: string;
-    version?: string;
-    networks: Record<string, NetworkSpec>;
-}
-interface NetworkSpec {
-    name: string;
-    description?: string;
-    version?: string;
-    roles: Record<string, RoleSpec>;
-}
-interface RoleSpec {
-    name: string;
-    description?: string;
-    endpoints?: Endpoint[];
-    messages: Record<string, MessageSpec>;
-}
-interface Endpoint {
-    scheme: 'ws' | 'wss';
-    host: string;
-    port: number;
-    path: string;
-}
-interface MessageSpec {
-    description?: string;
-    from?: string[];
-    payload: JsonSchema;
-}
-interface JsonSchema {
-    type: string;
-    description?: string;
-    properties?: Record<string, JsonSchema>;
-    items?: JsonSchema;
-    required?: string[];
-}
 interface IR {
     package: IRPackage;
     networks: IRNetwork[];

package/dist/plans/dotnet.js

@@ -92,12 +92,12 @@ function createPlan(ctx) {
       }
     }
     for (const handlerIr of networkIr.handlers) {
-      handlerIr.modelClassName = pascalCase(handlerIr.handlerName);
+      handlerIr.modelClassName = pascalCase(handlerIr.handlerName) + "Payload";
       handlerIr.messageName = handlerIr.handlerName;
       handlerIr.methodName = pascalCase(handlerIr.handlerName);
     }
     for (const messageIr of networkIr.messages) {
-      messageIr.modelClassName = pascalCase(messageIr.handlerName);
+      messageIr.modelClassName = pascalCase(messageIr.handlerName) + "Payload";
       messageIr.messageName = messageIr.handlerName;
       messageIr.methodName = pascalCase(messageIr.handlerName);
     }

package/dist/templates/dotnet/HostRole.cs.ejs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using Polytric.OpenWs.Core;
@@ -9,24 +10,24 @@ namespace <%= ctx.namespace %>
 {
     public partial class <%= ctx.className %> : <%= ctx.baseClassName %>
     {
-        public override string Name { get; set; } = "<%= ctx.roleName %>";
-        public override string Description { get; set; } = "<%= ctx.description ?? '' %>";
+        public string Name => "<%= ctx.roleName %>";
+        public string Description => "<%= ctx.description ?? '' %>";
 
-        public override async Task HandleOpenAsync(RemoteRole remoteRole)
+        public override void HandleOpen(RemoteRole remoteRole)
         {
 <% for (const remoteRole of ctx.remoteRoles) { %>
             if (remoteRole is <%= remoteRole.className %> <%= remoteRole.varName %>)
             {
-                await HandleOpenAsync(<%= remoteRole.varName %>).ConfigureAwait(false);
+                HandleOpen(<%= remoteRole.varName %>);
             }
 <% } -%>
         }
 
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        private partial Task HandleOpenAsync(<%= remoteRole.className %> <%= remoteRole.varName %>);
+        partial void HandleOpen(<%= remoteRole.className %> <%= remoteRole.varName %>);
 <% } -%>
 
-        public override async Task HandleMessageAsync(string messageName, JToken payload, RemoteRole remoteRole)
+        public override void HandleMessage(string messageName, JToken payload, RemoteRole remoteRole)
         {
             switch (messageName)
             {
@@ -34,8 +35,15 @@ namespace <%= ctx.namespace %>
                 case "<%= handler.messageName %>":
                     {
                         var message = payload.ToObject<<%= handler.modelClassName %>>();
+                        Handle<%= handler.methodName %>(payload);
+                        Handle<%= handler.methodName %>(message);
+                        On<%= handler.methodName %>?.Invoke(message);
+
 <% for (const remoteRole of ctx.remoteRoles) { %>
-                        await HandleMessageAsync(message, remoteRole as <%= remoteRole.className %>).ConfigureAwait(false);
+                        Handle<%= handler.methodName %>(payload, remoteRole as <%= remoteRole.className %>);
+                        HandleMessage(message, remoteRole as <%= remoteRole.className %>);
+                        On<%= handler.methodName %>From<%= remoteRole.className %>?.Invoke(message, remoteRole as <%= remoteRole.className %>);
+
 <% } -%>
                         break;
                     }
@@ -44,8 +52,15 @@ namespace <%= ctx.namespace %>
         }
 
 <% for (const handler of ctx.handlers) { -%>
+        public event Action<<%= handler.modelClassName -%>> On<%= handler.methodName -%>;
+        partial void Handle<%= handler.methodName %>(JToken payload);
+        partial void Handle<%= handler.methodName %>(<%= handler.modelClassName -%> payload);
+
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        private partial Task HandleMessageAsync(<%= handler.modelClassName %> payload, <%= remoteRole.className %> <%= remoteRole.varName %>);
+        public event Action<<%= handler.modelClassName -%>, <%= remoteRole.className -%>> On<%= handler.methodName -%>From<%= remoteRole.className -%>;
+        partial void Handle<%= handler.methodName %>(JToken payload, <%= remoteRole.className -%> <%= remoteRole.varName -%>);
+        partial void HandleMessage(<%= handler.modelClassName -%> payload, <%= remoteRole.className -%> <%= remoteRole.varName -%>);
+        
 <% } -%>
 <% } -%>
     }

package/dist/templates/dotnet/Model.cs.ejs

@@ -2,7 +2,7 @@ using Newtonsoft.Json;
 
 namespace <%= ctx.namespace %>
 {
-    public class <%= ctx.className %>
+    public partial class <%= ctx.className %>
     {
 <% for (const property of ctx.properties) { -%>
         [JsonProperty("<%= property.modelName %>")]

package/dist/templates/dotnet/RemoteRole.cs.ejs

@@ -14,7 +14,7 @@ namespace <%= ctx.namespace %>
         public override string Name { get; set; } = "<%= ctx.roleName %>";
         public override string Description { get; set; } = "<%= ctx.description ?? '' %>";
 <% if (ctx.endpoints && ctx.endpoints.length > 0) { -%>
-        public override IReadOnlyList<Endpoint> Endpoints { get; set; } = new List<Endpoint>
+        public static IReadOnlyList<Endpoint> Endpoints => new List<Endpoint>
         {
 <% for (const ep of ctx.endpoints) { -%>
             new Endpoint { Scheme = "<%= ep.scheme %>", Host = "<%= ep.host %>", Port = <%= ep.port %>, Path = "<%= ep.path %>" },
@@ -25,7 +25,12 @@ namespace <%= ctx.namespace %>
 <% for (const message of ctx.messages) { -%>
         public async Task <%= message.methodName %>Async(string fromRole, <%= message.modelClassName %> message)
         {
-            await SendMessageAsync(fromRole, "<%= message.messageName %>", message).ConfigureAwait(false);
+            await InternalSendMessageAsync(fromRole, "<%= message.messageName %>", message).ConfigureAwait(false);
+        }
+
+        public void <%= message.methodName %>(string fromRole, <%= message.modelClassName %> message)
+        {
+            InternalQueueMessage(fromRole, "<%= message.messageName %>", message);
         }
 
 <% } -%>

package/dist/templates/dotnet/UserHostRole.cs.ejs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
 using Polytric.OpenWs.Core;
 <% for (const modelImport of ctx.modelImports) { -%>
 using <%= modelImport %>;
@@ -8,19 +9,40 @@ namespace <%= ctx.namespace %>
     public partial class <%= ctx.className %>
     {
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        private partial Task HandleOpenAsync(<%= remoteRole.className %> <%= remoteRole.varName %>)
+        partial void HandleOpen(<%= remoteRole.className %> <%= remoteRole.varName %>)
         {
             // TODO: Implement connection handling for <%= remoteRole.className %>
-            return Task.CompletedTask;
         }
 
 <% } -%>
 <% for (const handler of ctx.handlers) { -%>
+        partial void Handle<%= handler.methodName %>(JToken payload)
+        {
+            // TODO: Handle <%= handler.messageName %>
+            // Or implement the concrete payload method above. You only need to implement one.
+            // Removing this partial method will instruct the compiler to eliminate the call to save performance.
+        }
+
+        partial void Handle<%= handler.methodName %>(<%= handler.modelClassName %> payload)
+        {
+            // TODO: Handle <%= handler.messageName %>
+            // Or implement the JToken method above. You only need to implement one.
+            // Removing this partial method will instruct the compiler to eliminate the call to save performance.
+        }
+
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        private partial Task HandleMessageAsync(<%= handler.modelClassName %> payload, <%= remoteRole.className %> <%= remoteRole.varName %>)
+        partial void HandleMessage(<%= handler.modelClassName %> payload, <%= remoteRole.className %> <%= remoteRole.varName %>)
+        {
+            // TODO: Handle <%= handler.messageName %> from <%= remoteRole.className %>
+            // Or implement the JToken method below. You only need to implement one.
+            // Removing this partial method will instruct the compiler to eliminate the call to save performance.
+        }
+
+        partial void Handle<%= handler.methodName %>(JToken payload, <%= remoteRole.className %> <%= remoteRole.varName %>)
         {
             // TODO: Handle <%= handler.messageName %> from <%= remoteRole.className %>
-            return Task.CompletedTask;
+            // Or implement the concrete payload method above. You only need to implement one.
+            // Removing this partial method will instruct the compiler to eliminate the call to save performance.
         }
 
 <% } -%>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -34,8 +34,10 @@
   },
   "dependencies": {
     "@pocketgems/schema": "^0.1.3",
+    "ajv": "^8.17.1",
     "ejs": "^3.1.10",
-    "yargs": "^18.0.0"
+    "yargs": "^18.0.0",
+    "@polytric/openws-spec": "0.0.4"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",