@polytric/openws-sdkgen 0.0.7 → 0.0.8

package/README.md

@@ -29,7 +29,7 @@ openws-sdkgen \
   --spec ./openws-spec.json \
   --out ./generated \
   --project MyCompany \
-  --service ChatService \
+  --network core \
   --hostRole server \
   --language csharp \
   --environment unity
@@ -40,7 +40,7 @@ The CLI exposes the following options:
 - `--spec` (string): Path to the OpenWS spec JSON file.
 - `--out` (string): Output directory for generated code.
 - `--project` (string): Project/namespace prefix for generated code.
-- `--service` (string): Service name (default: `MyService`).
+- `--network` (string): Network name to generate.
 - `--hostRole` (string): Participant role name that represents the host side.
 - `--language` (string): Target language (`csharp`, `javascript`, or `typescript`).
 - `--environment` (string|array): Target environment (`unity`, `node`, `browser`).

package/dist/main.cjs

@@ -148,7 +148,11 @@ function buildIr(ctx) {
   const { request, spec } = ctx;
   if (!request) throw new Error("request is required");
   if (!spec) throw new Error("spec is required");
-  const { hostRoles } = request;
+  const { hostRoles, network } = request;
+  const selectedNetworkSpec = spec.networks[network];
+  if (!selectedNetworkSpec) {
+    throw new Error(`Network "${network}" does not exist in the spec`);
+  }
   const ir = {
     package: {
       project: request.project,
@@ -158,8 +162,16 @@ function buildIr(ctx) {
     },
     networks: []
   };
-  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
-    const hostRoleSpecs = hostRoles.map((hostRole) => networkSpec.roles[hostRole]);
+  for (const [networkName, networkSpec] of [[network, selectedNetworkSpec]]) {
+    const hostRoleSpecs = hostRoles.map((hostRole) => {
+      const hostRoleSpec = networkSpec.roles[hostRole];
+      if (!hostRoleSpec) {
+        throw new Error(
+          `Host role "${hostRole}" does not exist in network "${networkName}"`
+        );
+      }
+      return hostRoleSpec;
+    });
     const otherRoleSpecs = {};
     for (const [roleName, roleSpec] of Object.entries(networkSpec.roles)) {
       if (!hostRoles.includes(roleName)) {
@@ -285,6 +297,7 @@ var validateBuildRequest = import_schema2.default.obj({
   specPath: import_schema2.default.str,
   outputPath: import_schema2.default.str,
   project: import_schema2.default.str,
+  network: import_schema2.default.str,
   hostRoles: import_schema2.default.arr(import_schema2.default.str),
   target: import_schema2.default.obj({
     csharp: import_schema2.default.obj({
@@ -308,6 +321,7 @@ function buildRequest(ctx) {
     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,
+    network: toCamelCase(rawInput.network),
     hostRoles: rawInput.hostRole.map((r) => toCamelCase(r)),
     target: {
       [rawInput.language]: {
@@ -327,7 +341,22 @@ function buildRequest(ctx) {
 var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 var import_ejs = __toESM(require("ejs"), 1);
+var prettier = __toESM(require("prettier"), 1);
 var rendererCache = {};
+var parserByExtension = {
+  ".js": "babel",
+  ".json": "json",
+  ".ts": "typescript"
+};
+var fallbackFormatOptions = {
+  semi: false,
+  singleQuote: true,
+  tabWidth: 4,
+  trailingComma: "es5",
+  printWidth: 100,
+  arrowParens: "avoid",
+  endOfLine: "lf"
+};
 function renderTemplate(templatePath, data) {
   if (rendererCache[templatePath]) {
     return rendererCache[templatePath](data);
@@ -337,7 +366,17 @@ function renderTemplate(templatePath, data) {
   rendererCache[templatePath] = renderer;
   return renderer(data);
 }
-function executePlan(ctx) {
+async function formatRenderedOutput(output, content) {
+  const parser = parserByExtension[import_node_path2.default.extname(output)];
+  if (!parser) return content;
+  const config = await prettier.resolveConfig(output, { editorconfig: true });
+  return prettier.format(content, {
+    ...fallbackFormatOptions,
+    ...config,
+    parser
+  });
+}
+async function executePlan(ctx) {
   const { plan } = ctx;
   if (!plan) throw new Error("plan is required");
   for (const step of plan) {
@@ -353,7 +392,8 @@ function executePlan(ctx) {
         const data = getData();
         console.log(data);
         import_node_fs.default.mkdirSync(import_node_path2.default.dirname(output), { recursive: true });
-        import_node_fs.default.writeFileSync(output, renderTemplate(template, { ctx: data }));
+        const rendered = renderTemplate(template, { ctx: data });
+        import_node_fs.default.writeFileSync(output, await formatRenderedOutput(output, rendered));
         break;
       }
     }
@@ -411,6 +451,10 @@ function parseInput(ctx) {
     type: "string",
     description: "The project name",
     demandOption: true
+  }).option("network", {
+    type: "string",
+    description: "The network to be generated",
+    demandOption: true
   }).option("hostRole", {
     type: "array",
     string: true,
@@ -440,21 +484,45 @@ function parseInput(ctx) {
 
 // src/prepare-output.ts
 var import_node_fs3 = __toESM(require("fs"), 1);
+var import_node_path3 = __toESM(require("path"), 1);
+function pascalCase(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function kebabCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-|-$/g, "").toLowerCase();
+}
 function prepareOutput(ctx) {
-  const { request } = ctx;
+  const { request, spec } = ctx;
   if (!request) throw new Error("request is required");
-  const { outputPath } = request;
-  import_node_fs3.default.rmSync(outputPath, { recursive: true, force: true });
-  import_node_fs3.default.mkdirSync(outputPath, { recursive: true });
+  if (!spec) throw new Error("spec is required");
+  if (!spec.networks[request.network]) {
+    throw new Error(`Network "${request.network}" does not exist in the spec`);
+  }
+  const cleanupPaths = getNetworkOutputPaths(ctx);
+  for (const cleanupPath of cleanupPaths) {
+    import_node_fs3.default.rmSync(cleanupPath, { recursive: true, force: true });
+  }
+  import_node_fs3.default.mkdirSync(request.outputPath, { recursive: true });
   return ctx;
 }
+function getNetworkOutputPaths(ctx) {
+  const { request, spec } = ctx;
+  if (!request) throw new Error("request is required");
+  if (!spec) throw new Error("spec is required");
+  if (request.target.csharp) {
+    const assemblyName = `${pascalCase(request.project)}.${pascalCase(spec.name)}.Sdk`;
+    const networkFolder = pascalCase(request.network);
+    return [import_node_path3.default.join(request.outputPath, assemblyName, networkFolder)];
+  }
+  return [import_node_path3.default.join(request.outputPath, "src", kebabCase(request.network))];
+}
 
 // src/main.ts
 var Pipeline = [
   parseInput,
   buildRequest,
-  prepareOutput,
   loadSpec,
+  prepareOutput,
   buildIr,
   dispatchBuildPlan,
   executePlan

package/dist/main.js

@@ -125,7 +125,11 @@ function buildIr(ctx) {
   const { request, spec } = ctx;
   if (!request) throw new Error("request is required");
   if (!spec) throw new Error("spec is required");
-  const { hostRoles } = request;
+  const { hostRoles, network } = request;
+  const selectedNetworkSpec = spec.networks[network];
+  if (!selectedNetworkSpec) {
+    throw new Error(`Network "${network}" does not exist in the spec`);
+  }
   const ir = {
     package: {
       project: request.project,
@@ -135,8 +139,16 @@ function buildIr(ctx) {
     },
     networks: []
   };
-  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
-    const hostRoleSpecs = hostRoles.map((hostRole) => networkSpec.roles[hostRole]);
+  for (const [networkName, networkSpec] of [[network, selectedNetworkSpec]]) {
+    const hostRoleSpecs = hostRoles.map((hostRole) => {
+      const hostRoleSpec = networkSpec.roles[hostRole];
+      if (!hostRoleSpec) {
+        throw new Error(
+          `Host role "${hostRole}" does not exist in network "${networkName}"`
+        );
+      }
+      return hostRoleSpec;
+    });
     const otherRoleSpecs = {};
     for (const [roleName, roleSpec] of Object.entries(networkSpec.roles)) {
       if (!hostRoles.includes(roleName)) {
@@ -262,6 +274,7 @@ var validateBuildRequest = S2.obj({
   specPath: S2.str,
   outputPath: S2.str,
   project: S2.str,
+  network: S2.str,
   hostRoles: S2.arr(S2.str),
   target: S2.obj({
     csharp: S2.obj({
@@ -285,6 +298,7 @@ function buildRequest(ctx) {
     specPath: path.join(process2.cwd(), rawInput.spec),
     outputPath: path.join(process2.cwd(), rawInput.out),
     project: rawInput.project,
+    network: toCamelCase(rawInput.network),
     hostRoles: rawInput.hostRole.map((r) => toCamelCase(r)),
     target: {
       [rawInput.language]: {
@@ -304,7 +318,22 @@ function buildRequest(ctx) {
 import fs from "fs";
 import path2 from "path";
 import ejs from "ejs";
+import * as prettier from "prettier";
 var rendererCache = {};
+var parserByExtension = {
+  ".js": "babel",
+  ".json": "json",
+  ".ts": "typescript"
+};
+var fallbackFormatOptions = {
+  semi: false,
+  singleQuote: true,
+  tabWidth: 4,
+  trailingComma: "es5",
+  printWidth: 100,
+  arrowParens: "avoid",
+  endOfLine: "lf"
+};
 function renderTemplate(templatePath, data) {
   if (rendererCache[templatePath]) {
     return rendererCache[templatePath](data);
@@ -314,7 +343,17 @@ function renderTemplate(templatePath, data) {
   rendererCache[templatePath] = renderer;
   return renderer(data);
 }
-function executePlan(ctx) {
+async function formatRenderedOutput(output, content) {
+  const parser = parserByExtension[path2.extname(output)];
+  if (!parser) return content;
+  const config = await prettier.resolveConfig(output, { editorconfig: true });
+  return prettier.format(content, {
+    ...fallbackFormatOptions,
+    ...config,
+    parser
+  });
+}
+async function executePlan(ctx) {
   const { plan } = ctx;
   if (!plan) throw new Error("plan is required");
   for (const step of plan) {
@@ -330,7 +369,8 @@ function executePlan(ctx) {
         const data = getData();
         console.log(data);
         fs.mkdirSync(path2.dirname(output), { recursive: true });
-        fs.writeFileSync(output, renderTemplate(template, { ctx: data }));
+        const rendered = renderTemplate(template, { ctx: data });
+        fs.writeFileSync(output, await formatRenderedOutput(output, rendered));
         break;
       }
     }
@@ -388,6 +428,10 @@ function parseInput(ctx) {
     type: "string",
     description: "The project name",
     demandOption: true
+  }).option("network", {
+    type: "string",
+    description: "The network to be generated",
+    demandOption: true
   }).option("hostRole", {
     type: "array",
     string: true,
@@ -417,21 +461,45 @@ function parseInput(ctx) {
 
 // src/prepare-output.ts
 import fs3 from "fs";
+import path3 from "path";
+function pascalCase(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function kebabCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-|-$/g, "").toLowerCase();
+}
 function prepareOutput(ctx) {
-  const { request } = ctx;
+  const { request, spec } = ctx;
   if (!request) throw new Error("request is required");
-  const { outputPath } = request;
-  fs3.rmSync(outputPath, { recursive: true, force: true });
-  fs3.mkdirSync(outputPath, { recursive: true });
+  if (!spec) throw new Error("spec is required");
+  if (!spec.networks[request.network]) {
+    throw new Error(`Network "${request.network}" does not exist in the spec`);
+  }
+  const cleanupPaths = getNetworkOutputPaths(ctx);
+  for (const cleanupPath of cleanupPaths) {
+    fs3.rmSync(cleanupPath, { recursive: true, force: true });
+  }
+  fs3.mkdirSync(request.outputPath, { recursive: true });
   return ctx;
 }
+function getNetworkOutputPaths(ctx) {
+  const { request, spec } = ctx;
+  if (!request) throw new Error("request is required");
+  if (!spec) throw new Error("spec is required");
+  if (request.target.csharp) {
+    const assemblyName = `${pascalCase(request.project)}.${pascalCase(spec.name)}.Sdk`;
+    const networkFolder = pascalCase(request.network);
+    return [path3.join(request.outputPath, assemblyName, networkFolder)];
+  }
+  return [path3.join(request.outputPath, "src", kebabCase(request.network))];
+}
 
 // src/main.ts
 var Pipeline = [
   parseInput,
   buildRequest,
-  prepareOutput,
   loadSpec,
+  prepareOutput,
   buildIr,
   dispatchBuildPlan,
   executePlan

package/dist/plans/dotnet.d.cts

@@ -1,4 +1,4 @@
-import { P as PipelineContext } from '../types-BdZPs123.cjs';
+import { P as PipelineContext } from '../types-Bn36WAIG.cjs';
 import '@polytric/openws-spec/types';
 
 declare function createPlan(ctx: PipelineContext): PipelineContext;

package/dist/plans/dotnet.d.ts

@@ -1,4 +1,4 @@
-import { P as PipelineContext } from '../types-BdZPs123.js';
+import { P as PipelineContext } from '../types-Bn36WAIG.js';
 import '@polytric/openws-spec/types';
 
 declare function createPlan(ctx: PipelineContext): PipelineContext;

package/dist/plans/typescript.cjs

@@ -100,13 +100,25 @@ function createPlan(ctx) {
     );
   }
   const networkExports = [];
-  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
+  const selectedNetworkSpec = spec.networks[request.network];
+  if (!selectedNetworkSpec) {
+    throw new Error(`Network "${request.network}" does not exist in the spec`);
+  }
+  for (const [networkName, networkSpec] of [[request.network, selectedNetworkSpec]]) {
     const networkFileName = kebabCase(networkName);
     const networkOutputPath = import_node_path.default.join(request.outputPath, "src", networkFileName);
     const sdkOutputPath = import_node_path.default.join(request.outputPath, "src", "sdk");
     const allRoles = Object.values(networkSpec.roles).map(toRoleInfo);
     const rolesByName = new Map(allRoles.map((role) => [role.roleName, role]));
-    const hostRoles = allRoles;
+    const hostRoles = request.hostRoles.map((hostRole) => {
+      const role = rolesByName.get(hostRole);
+      if (!role) {
+        throw new Error(
+          `Host role "${hostRole}" does not exist in network "${networkName}"`
+        );
+      }
+      return role;
+    });
     const modelScopes = buildModelScopes(buildSpecModels(networkSpec));
     networkExports.push({
       exportName: camelCase(networkName),

package/dist/plans/typescript.d.cts

@@ -1,4 +1,4 @@
-import { P as PipelineContext } from '../types-BdZPs123.cjs';
+import { P as PipelineContext } from '../types-Bn36WAIG.cjs';
 import '@polytric/openws-spec/types';
 
 declare function createPlan(ctx: PipelineContext): PipelineContext;

package/dist/plans/typescript.d.ts

@@ -1,4 +1,4 @@
-import { P as PipelineContext } from '../types-BdZPs123.js';
+import { P as PipelineContext } from '../types-Bn36WAIG.js';
 import '@polytric/openws-spec/types';
 
 declare function createPlan(ctx: PipelineContext): PipelineContext;

package/dist/plans/typescript.js

@@ -60,13 +60,25 @@ function createPlan(ctx) {
     );
   }
   const networkExports = [];
-  for (const [networkName, networkSpec] of Object.entries(spec.networks)) {
+  const selectedNetworkSpec = spec.networks[request.network];
+  if (!selectedNetworkSpec) {
+    throw new Error(`Network "${request.network}" does not exist in the spec`);
+  }
+  for (const [networkName, networkSpec] of [[request.network, selectedNetworkSpec]]) {
     const networkFileName = kebabCase(networkName);
     const networkOutputPath = path.join(request.outputPath, "src", networkFileName);
     const sdkOutputPath = path.join(request.outputPath, "src", "sdk");
     const allRoles = Object.values(networkSpec.roles).map(toRoleInfo);
     const rolesByName = new Map(allRoles.map((role) => [role.roleName, role]));
-    const hostRoles = allRoles;
+    const hostRoles = request.hostRoles.map((hostRole) => {
+      const role = rolesByName.get(hostRole);
+      if (!role) {
+        throw new Error(
+          `Host role "${hostRole}" does not exist in network "${networkName}"`
+        );
+      }
+      return role;
+    });
     const modelScopes = buildModelScopes(buildSpecModels(networkSpec));
     networkExports.push({
       exportName: camelCase(networkName),

package/dist/templates/typescript/src/core/roles/role.ts.ejs

@@ -1,20 +1,13 @@
 <% const modelImportPath = ctx.isTypeScript ? `../models/${ctx.fileName}` : `../models/${ctx.fileName}/index.js` -%>
 <% if (ctx.isTypeScript) { -%>
 <% if (ctx.messages.length > 0) { -%>
-import type {
-<% for (const message of ctx.messages) { -%>
-    <%= message.payloadType %>,
-    <%= message.payloadType %>Init,
-<% } -%>
-} from '<%= modelImportPath %>'
+<% const payloadImports = ctx.messages.flatMap(message => [message.payloadType, `${message.payloadType}Init`]) -%>
+import type { <%= payloadImports.join(', ') %> } from '<%= modelImportPath %>'
 <% } -%>
 <% const importedPeerRoles = new Map(); for (const message of ctx.messages) { for (const fromRole of message.fromRoles ?? []) { if (fromRole.roleName !== ctx.roleName) importedPeerRoles.set(fromRole.roleName, fromRole) } } -%>
 <% if (importedPeerRoles.size > 0) { -%>
-import {
-<% for (const fromRole of importedPeerRoles.values()) { -%>
-    <%= fromRole.roleClassName %>,
-<% } -%>
-} from './index'
+<% const peerRoleImports = [...importedPeerRoles.values()].map(fromRole => fromRole.roleClassName) -%>
+import { <%= peerRoleImports.join(', ') %> } from './index'
 <% } -%>
 
 export interface <%= ctx.apiName %> {
@@ -30,12 +23,12 @@ export class <%= ctx.roleClassName %> {
         messages: {
 <% for (const message of ctx.messages) { -%>
             <%= message.messageName %>: {
-                payload: <%- JSON.stringify(message.schema, null, 16) %>,
+                payload: <%- JSON.stringify(message.schema) %>,
             },
 <% } -%>
         },
     }
-    static readonly endpoints = <%- JSON.stringify(ctx.endpoints, null, 4) %>
+    static readonly endpoints = <%- JSON.stringify(ctx.endpoints) %>
 }
 
 export class <%= ctx.hostRoleClassName %> {
@@ -60,11 +53,8 @@ export class <%= ctx.hostRoleClassName %> {
 <% } else { -%>
 <% const importedPeerRoles = new Map(); for (const message of ctx.messages) { for (const fromRole of message.fromRoles ?? []) { if (fromRole.roleName !== ctx.roleName) importedPeerRoles.set(fromRole.roleName, fromRole) } } -%>
 <% if (importedPeerRoles.size > 0) { -%>
-import {
-<% for (const fromRole of importedPeerRoles.values()) { -%>
-    <%= fromRole.roleClassName %>,
-<% } -%>
-} from './index.js'
+<% const peerRoleImports = [...importedPeerRoles.values()].map(fromRole => fromRole.roleClassName) -%>
+import { <%= peerRoleImports.join(', ') %> } from './index.js'
 <% } -%>
 
 export class <%= ctx.roleClassName %> {
@@ -74,12 +64,12 @@ export class <%= ctx.roleClassName %> {
         messages: {
 <% for (const message of ctx.messages) { -%>
             <%= message.messageName %>: {
-                payload: <%- JSON.stringify(message.schema, null, 16) %>,
+                payload: <%- JSON.stringify(message.schema) %>,
             },
 <% } -%>
         },
     }
-    static endpoints = <%- JSON.stringify(ctx.endpoints, null, 4) %>
+    static endpoints = <%- JSON.stringify(ctx.endpoints) %>
 }
 
 export class <%= ctx.hostRoleClassName %> {

package/dist/{types-BdZPs123.d.cts → types-Bn36WAIG.d.cts}

@@ -12,6 +12,7 @@ interface RawInput {
     spec: string;
     out: string;
     project: string;
+    network: string;
     hostRole: string[];
     language: 'csharp' | 'javascript' | 'typescript';
     environment: 'unity' | 'node' | 'browser';
@@ -21,6 +22,7 @@ interface BuildRequest {
     specPath: string;
     outputPath: string;
     project: string;
+    network: string;
     hostRoles: string[];
     target: {
         csharp?: {

package/dist/{types-BdZPs123.d.ts → types-Bn36WAIG.d.ts}

@@ -12,6 +12,7 @@ interface RawInput {
     spec: string;
     out: string;
     project: string;
+    network: string;
     hostRole: string[];
     language: 'csharp' | 'javascript' | 'typescript';
     environment: 'unity' | 'node' | 'browser';
@@ -21,6 +22,7 @@ interface BuildRequest {
     specPath: string;
     outputPath: string;
     project: string;
+    network: string;
     hostRoles: string[];
     target: {
         csharp?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "@pocketgems/schema": "^0.1.3",
     "ajv": "^8.17.1",
     "ejs": "^3.1.10",
+    "prettier": "^3.7.4",
     "yargs": "^18.0.0",
     "@polytric/openws-spec": "0.0.4"
   },
@@ -54,8 +55,8 @@
   "scripts": {
     "build": "tsup",
     "typecheck": "tsc --noEmit",
-    "test:csharp:unity": "node dist/main.cjs --spec ./test/spec.json --out ./generated/dotnet/unity --project Example --hostRole client --language csharp --environment unity",
-    "test:typescript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/typescript/node --project Example --hostRole client --language typescript --environment node",
+    "test:csharp:unity": "node dist/main.cjs --spec ./test/spec.json --out ./generated/dotnet/unity --project Example --network core --hostRole client --language csharp --environment unity",
+    "test:typescript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/typescript/node --project Example --network core --hostRole client --language typescript --environment node",
     "test:typescript:server": "tsx ./test/typescript/server.ts",
     "test:typescript:client": "tsx ./test/typescript/client.ts"
   }