@polytric/openws-sdkgen 0.0.8 → 0.0.9

package/dist/main.cjs

@@ -390,7 +390,6 @@ async function executePlan(ctx) {
         const { getData, template, output } = step;
         if (!getData || !template) continue;
         const data = getData();
-        console.log(data);
         import_node_fs.default.mkdirSync(import_node_path2.default.dirname(output), { recursive: true });
         const rendered = renderTemplate(template, { ctx: data });
         import_node_fs.default.writeFileSync(output, await formatRenderedOutput(output, rendered));
@@ -514,7 +513,7 @@ function getNetworkOutputPaths(ctx) {
     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))];
+  return [import_node_path3.default.join(request.outputPath, kebabCase(spec.name), kebabCase(request.network))];
 }
 
 // src/main.ts
@@ -534,9 +533,7 @@ async function main() {
   }
   return ctx;
 }
-main().then((result) => {
-  console.log(JSON.stringify(result, null, 2));
-}).catch((err) => {
+main().catch((err) => {
   console.error(err);
   process.exit(1);
 });

package/dist/main.js

@@ -367,7 +367,6 @@ async function executePlan(ctx) {
         const { getData, template, output } = step;
         if (!getData || !template) continue;
         const data = getData();
-        console.log(data);
         fs.mkdirSync(path2.dirname(output), { recursive: true });
         const rendered = renderTemplate(template, { ctx: data });
         fs.writeFileSync(output, await formatRenderedOutput(output, rendered));
@@ -491,7 +490,7 @@ function getNetworkOutputPaths(ctx) {
     const networkFolder = pascalCase(request.network);
     return [path3.join(request.outputPath, assemblyName, networkFolder)];
   }
-  return [path3.join(request.outputPath, "src", kebabCase(request.network))];
+  return [path3.join(request.outputPath, kebabCase(spec.name), kebabCase(request.network))];
 }
 
 // src/main.ts
@@ -511,9 +510,7 @@ async function main() {
   }
   return ctx;
 }
-main().then((result) => {
-  console.log(JSON.stringify(result, null, 2));
-}).catch((err) => {
+main().catch((err) => {
   console.error(err);
   process.exit(1);
 });

package/dist/plans/typescript.cjs

@@ -44,9 +44,8 @@ var import_node_url = require("url");
 var __dirname = import_node_path.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
 var TEMPLATE_DIR = import_node_path.default.join(__dirname, "../templates/typescript");
 var SRC_TEMPLATE_DIR = import_node_path.default.join(TEMPLATE_DIR, "src");
-var CORE_TEMPLATE_DIR = import_node_path.default.join(SRC_TEMPLATE_DIR, "core");
-var ROLES_TEMPLATE_DIR = import_node_path.default.join(CORE_TEMPLATE_DIR, "roles");
-var MODELS_TEMPLATE_DIR = import_node_path.default.join(CORE_TEMPLATE_DIR, "models");
+var ROLES_TEMPLATE_DIR = import_node_path.default.join(SRC_TEMPLATE_DIR, "roles");
+var MODELS_TEMPLATE_DIR = import_node_path.default.join(SRC_TEMPLATE_DIR, "models");
 var SDK_TEMPLATE_DIR = import_node_path.default.join(SRC_TEMPLATE_DIR, "sdk");
 function pascalCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
@@ -65,7 +64,10 @@ function createPlan(ctx) {
   const language = Object.keys(request.target)[0];
   const isTypeScript = language === "typescript";
   const extension = isTypeScript ? "ts" : "js";
-  const packageName = `@${kebabCase(ir.package.project)}/${kebabCase(ir.package.service)}-openws-sdk`;
+  const serviceFileName = kebabCase(ir.package.service);
+  const networkFileName = kebabCase(request.network);
+  const packageOutputPath = import_node_path.default.join(request.outputPath, serviceFileName, networkFileName);
+  const packageName = `@${kebabCase(ir.package.project)}/${serviceFileName}-${networkFileName}-openws-sdk`;
   const plan = [
     {
       name: `${language} package manifest`,
@@ -74,11 +76,11 @@ function createPlan(ctx) {
         isTypeScript,
         packageName,
         description: ir.package.description,
-        version: ir.package.version ?? "0.0.0",
+        version: ir.package.version ?? "0.0.1",
         extension
       }),
       template: import_node_path.default.join(TEMPLATE_DIR, "package.json.ejs"),
-      output: import_node_path.default.join(request.outputPath, "package.json")
+      output: import_node_path.default.join(packageOutputPath, "package.json")
     }
   ];
   if (isTypeScript) {
@@ -88,26 +90,24 @@ function createPlan(ctx) {
         command: "render",
         getData: () => ({}),
         template: import_node_path.default.join(TEMPLATE_DIR, "tsconfig.json.ejs"),
-        output: import_node_path.default.join(request.outputPath, "tsconfig.json")
+        output: import_node_path.default.join(packageOutputPath, "tsconfig.json")
       },
       {
         name: `${language} tsup config`,
         command: "render",
         getData: () => ({}),
         template: import_node_path.default.join(TEMPLATE_DIR, "tsup.config.ts.ejs"),
-        output: import_node_path.default.join(request.outputPath, "tsup.config.ts")
+        output: import_node_path.default.join(packageOutputPath, "tsup.config.ts")
       }
     );
   }
-  const networkExports = [];
   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 sourceOutputPath = import_node_path.default.join(packageOutputPath, "src");
+    const sdkOutputPath = import_node_path.default.join(sourceOutputPath, "sdk");
     const allRoles = Object.values(networkSpec.roles).map(toRoleInfo);
     const rolesByName = new Map(allRoles.map((role) => [role.roleName, role]));
     const hostRoles = request.hostRoles.map((hostRole) => {
@@ -120,10 +120,6 @@ function createPlan(ctx) {
       return role;
     });
     const modelScopes = buildModelScopes(buildSpecModels(networkSpec));
-    networkExports.push({
-      exportName: camelCase(networkName),
-      fileName: networkFileName
-    });
     plan.push({
       name: `${language} network ${networkName}`,
       command: "render",
@@ -137,19 +133,8 @@ function createPlan(ctx) {
         allRoles,
         extension
       }),
-      template: import_node_path.default.join(CORE_TEMPLATE_DIR, "network.ts.ejs"),
-      output: import_node_path.default.join(networkOutputPath, `network.${extension}`)
-    });
-    plan.push({
-      name: `${language} network exports ${networkName}`,
-      command: "render",
-      getData: () => ({
-        isTypeScript,
-        extension,
-        modelScopes
-      }),
-      template: import_node_path.default.join(CORE_TEMPLATE_DIR, "index.ts.ejs"),
-      output: import_node_path.default.join(networkOutputPath, `index.${extension}`)
+      template: import_node_path.default.join(SRC_TEMPLATE_DIR, "network.ts.ejs"),
+      output: import_node_path.default.join(sourceOutputPath, `network.${extension}`)
     });
     const roleMessagesByName = /* @__PURE__ */ new Map();
     for (const role of allRoles) {
@@ -174,7 +159,7 @@ function createPlan(ctx) {
           ...role
         }),
         template: import_node_path.default.join(ROLES_TEMPLATE_DIR, "role.ts.ejs"),
-        output: import_node_path.default.join(networkOutputPath, "roles", `${role.fileName}.${extension}`)
+        output: import_node_path.default.join(sourceOutputPath, "roles", `${role.fileName}.${extension}`)
       });
     }
     plan.push({
@@ -186,7 +171,7 @@ function createPlan(ctx) {
         roles: allRoles
       }),
       template: import_node_path.default.join(ROLES_TEMPLATE_DIR, "index.ts.ejs"),
-      output: import_node_path.default.join(networkOutputPath, "roles", `index.${extension}`)
+      output: import_node_path.default.join(sourceOutputPath, "roles", `index.${extension}`)
     });
     for (const modelScope of modelScopes) {
       plan.push({
@@ -199,7 +184,7 @@ function createPlan(ctx) {
         }),
         template: import_node_path.default.join(MODELS_TEMPLATE_DIR, "index.ts.ejs"),
         output: import_node_path.default.join(
-          networkOutputPath,
+          sourceOutputPath,
           "models",
           modelScope.fileName,
           `index.${extension}`
@@ -215,7 +200,7 @@ function createPlan(ctx) {
           }),
           template: import_node_path.default.join(MODELS_TEMPLATE_DIR, "model.ts.ejs"),
           output: import_node_path.default.join(
-            networkOutputPath,
+            sourceOutputPath,
             "models",
             modelScope.fileName,
             `${model.fileName}.${extension}`
@@ -253,7 +238,6 @@ function createPlan(ctx) {
           extension,
           handlers: roleHandlers,
           networkName,
-          networkFileName,
           networkDescription: networkSpec.description,
           networkVersion: networkSpec.version,
           remoteRoles,
@@ -274,18 +258,18 @@ function createPlan(ctx) {
       template: import_node_path.default.join(SDK_TEMPLATE_DIR, "index.ts.ejs"),
       output: import_node_path.default.join(sdkOutputPath, `index.${extension}`)
     });
+    plan.push({
+      name: `${language} package exports`,
+      command: "render",
+      getData: () => ({
+        isTypeScript,
+        extension,
+        modelScopes
+      }),
+      template: import_node_path.default.join(SRC_TEMPLATE_DIR, "index.ts.ejs"),
+      output: import_node_path.default.join(sourceOutputPath, `index.${extension}`)
+    });
   }
-  plan.push({
-    name: `${language} package exports`,
-    command: "render",
-    getData: () => ({
-      isTypeScript,
-      extension,
-      networkExports
-    }),
-    template: import_node_path.default.join(SRC_TEMPLATE_DIR, "index.ts.ejs"),
-    output: import_node_path.default.join(request.outputPath, "src", `index.${extension}`)
-  });
   return {
     ...ctx,
     plan

package/dist/plans/typescript.js

@@ -4,9 +4,8 @@ import { fileURLToPath } from "url";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var TEMPLATE_DIR = path.join(__dirname, "../templates/typescript");
 var SRC_TEMPLATE_DIR = path.join(TEMPLATE_DIR, "src");
-var CORE_TEMPLATE_DIR = path.join(SRC_TEMPLATE_DIR, "core");
-var ROLES_TEMPLATE_DIR = path.join(CORE_TEMPLATE_DIR, "roles");
-var MODELS_TEMPLATE_DIR = path.join(CORE_TEMPLATE_DIR, "models");
+var ROLES_TEMPLATE_DIR = path.join(SRC_TEMPLATE_DIR, "roles");
+var MODELS_TEMPLATE_DIR = path.join(SRC_TEMPLATE_DIR, "models");
 var SDK_TEMPLATE_DIR = path.join(SRC_TEMPLATE_DIR, "sdk");
 function pascalCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
@@ -25,7 +24,10 @@ function createPlan(ctx) {
   const language = Object.keys(request.target)[0];
   const isTypeScript = language === "typescript";
   const extension = isTypeScript ? "ts" : "js";
-  const packageName = `@${kebabCase(ir.package.project)}/${kebabCase(ir.package.service)}-openws-sdk`;
+  const serviceFileName = kebabCase(ir.package.service);
+  const networkFileName = kebabCase(request.network);
+  const packageOutputPath = path.join(request.outputPath, serviceFileName, networkFileName);
+  const packageName = `@${kebabCase(ir.package.project)}/${serviceFileName}-${networkFileName}-openws-sdk`;
   const plan = [
     {
       name: `${language} package manifest`,
@@ -34,11 +36,11 @@ function createPlan(ctx) {
         isTypeScript,
         packageName,
         description: ir.package.description,
-        version: ir.package.version ?? "0.0.0",
+        version: ir.package.version ?? "0.0.1",
         extension
       }),
       template: path.join(TEMPLATE_DIR, "package.json.ejs"),
-      output: path.join(request.outputPath, "package.json")
+      output: path.join(packageOutputPath, "package.json")
     }
   ];
   if (isTypeScript) {
@@ -48,26 +50,24 @@ function createPlan(ctx) {
         command: "render",
         getData: () => ({}),
         template: path.join(TEMPLATE_DIR, "tsconfig.json.ejs"),
-        output: path.join(request.outputPath, "tsconfig.json")
+        output: path.join(packageOutputPath, "tsconfig.json")
       },
       {
         name: `${language} tsup config`,
         command: "render",
         getData: () => ({}),
         template: path.join(TEMPLATE_DIR, "tsup.config.ts.ejs"),
-        output: path.join(request.outputPath, "tsup.config.ts")
+        output: path.join(packageOutputPath, "tsup.config.ts")
       }
     );
   }
-  const networkExports = [];
   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 sourceOutputPath = path.join(packageOutputPath, "src");
+    const sdkOutputPath = path.join(sourceOutputPath, "sdk");
     const allRoles = Object.values(networkSpec.roles).map(toRoleInfo);
     const rolesByName = new Map(allRoles.map((role) => [role.roleName, role]));
     const hostRoles = request.hostRoles.map((hostRole) => {
@@ -80,10 +80,6 @@ function createPlan(ctx) {
       return role;
     });
     const modelScopes = buildModelScopes(buildSpecModels(networkSpec));
-    networkExports.push({
-      exportName: camelCase(networkName),
-      fileName: networkFileName
-    });
     plan.push({
       name: `${language} network ${networkName}`,
       command: "render",
@@ -97,19 +93,8 @@ function createPlan(ctx) {
         allRoles,
         extension
       }),
-      template: path.join(CORE_TEMPLATE_DIR, "network.ts.ejs"),
-      output: path.join(networkOutputPath, `network.${extension}`)
-    });
-    plan.push({
-      name: `${language} network exports ${networkName}`,
-      command: "render",
-      getData: () => ({
-        isTypeScript,
-        extension,
-        modelScopes
-      }),
-      template: path.join(CORE_TEMPLATE_DIR, "index.ts.ejs"),
-      output: path.join(networkOutputPath, `index.${extension}`)
+      template: path.join(SRC_TEMPLATE_DIR, "network.ts.ejs"),
+      output: path.join(sourceOutputPath, `network.${extension}`)
     });
     const roleMessagesByName = /* @__PURE__ */ new Map();
     for (const role of allRoles) {
@@ -134,7 +119,7 @@ function createPlan(ctx) {
           ...role
         }),
         template: path.join(ROLES_TEMPLATE_DIR, "role.ts.ejs"),
-        output: path.join(networkOutputPath, "roles", `${role.fileName}.${extension}`)
+        output: path.join(sourceOutputPath, "roles", `${role.fileName}.${extension}`)
       });
     }
     plan.push({
@@ -146,7 +131,7 @@ function createPlan(ctx) {
         roles: allRoles
       }),
       template: path.join(ROLES_TEMPLATE_DIR, "index.ts.ejs"),
-      output: path.join(networkOutputPath, "roles", `index.${extension}`)
+      output: path.join(sourceOutputPath, "roles", `index.${extension}`)
     });
     for (const modelScope of modelScopes) {
       plan.push({
@@ -159,7 +144,7 @@ function createPlan(ctx) {
         }),
         template: path.join(MODELS_TEMPLATE_DIR, "index.ts.ejs"),
         output: path.join(
-          networkOutputPath,
+          sourceOutputPath,
           "models",
           modelScope.fileName,
           `index.${extension}`
@@ -175,7 +160,7 @@ function createPlan(ctx) {
           }),
           template: path.join(MODELS_TEMPLATE_DIR, "model.ts.ejs"),
           output: path.join(
-            networkOutputPath,
+            sourceOutputPath,
             "models",
             modelScope.fileName,
             `${model.fileName}.${extension}`
@@ -213,7 +198,6 @@ function createPlan(ctx) {
           extension,
           handlers: roleHandlers,
           networkName,
-          networkFileName,
           networkDescription: networkSpec.description,
           networkVersion: networkSpec.version,
           remoteRoles,
@@ -234,18 +218,18 @@ function createPlan(ctx) {
       template: path.join(SDK_TEMPLATE_DIR, "index.ts.ejs"),
       output: path.join(sdkOutputPath, `index.${extension}`)
     });
+    plan.push({
+      name: `${language} package exports`,
+      command: "render",
+      getData: () => ({
+        isTypeScript,
+        extension,
+        modelScopes
+      }),
+      template: path.join(SRC_TEMPLATE_DIR, "index.ts.ejs"),
+      output: path.join(sourceOutputPath, `index.${extension}`)
+    });
   }
-  plan.push({
-    name: `${language} package exports`,
-    command: "render",
-    getData: () => ({
-      isTypeScript,
-      extension,
-      networkExports
-    }),
-    template: path.join(SRC_TEMPLATE_DIR, "index.ts.ejs"),
-    output: path.join(request.outputPath, "src", `index.${extension}`)
-  });
   return {
     ...ctx,
     plan

package/dist/templates/typescript/src/index.ts.ejs

@@ -1,4 +1,7 @@
-<% for (const network of ctx.networkExports) { -%>
-export * as <%= network.exportName %> from './<%= network.fileName %><%= ctx.isTypeScript ? '' : '/index.js' %>'
+export * from './network<%= ctx.isTypeScript ? '' : '.js' %>'
+export * from './roles<%= ctx.isTypeScript ? '' : '/index.js' %>'
+export * as roles from './roles<%= ctx.isTypeScript ? '' : '/index.js' %>'
+<% for (const modelScope of ctx.modelScopes) { -%>
+export * as <%= modelScope.varName %>Models from './models/<%= modelScope.fileName %><%= ctx.isTypeScript ? '' : '/index.js' %>'
 <% } -%>
 export * as sdk from './sdk<%= ctx.isTypeScript ? '' : '/index.js' %>'

package/dist/templates/typescript/src/sdk/role.ts.ejs

@@ -1,7 +1,6 @@
-<% const networkDir = ctx.networkFileName -%>
-<% const networkImport = ctx.isTypeScript ? `../${networkDir}/network` : `../${networkDir}/network.js` -%>
-<% const modelImportPath = ctx.isTypeScript ? `../${networkDir}/models/${ctx.fileName}` : `../${networkDir}/models/${ctx.fileName}/index.js` -%>
-<% const rolesImport = ctx.isTypeScript ? `../${networkDir}/roles` : `../${networkDir}/roles/index.js` -%>
+<% const networkImport = ctx.isTypeScript ? '../network' : '../network.js' -%>
+<% const modelImportPath = ctx.isTypeScript ? `../models/${ctx.fileName}` : `../models/${ctx.fileName}/index.js` -%>
+<% const rolesImport = ctx.isTypeScript ? '../roles' : '../roles/index.js' -%>
 <% if (ctx.isTypeScript) { -%>
 import * as WS from '@polytric/openws/class'
 import * as Fluent from '@polytric/openws/fluent'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -37,7 +37,7 @@
     "ajv": "^8.17.1",
     "ejs": "^3.1.10",
     "prettier": "^3.7.4",
-    "yargs": "^18.0.0",
+    "yargs": "^17.7.2",
     "@polytric/openws-spec": "0.0.4"
   },
   "devDependencies": {

package/dist/templates/typescript/src/core/index.ts.ejs

@@ -1,6 +0,0 @@
-export * from './network<%= ctx.isTypeScript ? '' : '.js' %>'
-export * from './roles<%= ctx.isTypeScript ? '' : '/index.js' %>'
-export * as roles from './roles<%= ctx.isTypeScript ? '' : '/index.js' %>'
-<% for (const modelScope of ctx.modelScopes) { -%>
-export * as <%= modelScope.varName %>Models from './models/<%= modelScope.fileName %><%= ctx.isTypeScript ? '' : '/index.js' %>'
-<% } -%>