@ioka-technologies/asyncapi-rust-client-template 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ioka-technologies/asyncapi-rust-client-template",
-    "version": "0.0.24",
+    "version": "0.0.26",
     "description": "AsyncAPI template for generating Rust NATS clients",
     "main": "template/index.js",
     "keywords": [

package/template/Cargo.toml.js

@@ -8,7 +8,7 @@ import {
     resolveTemplateParameters
 } from './helpers/index.js';
 
-module.exports = function ({ asyncapi, params }) {
+export default function ({ asyncapi, params }) {
     const asyncApiInfo = extractAsyncApiInfo(asyncapi);
     const { title, version, description } = asyncApiInfo;
 

package/template/helpers/index.js

@@ -28,7 +28,7 @@ import {
     isTemplateVariable,
     extractAsyncApiInfo,
     resolveTemplateParameters
-} from "../dist/common/index.js";
+} from "../../dist/common/index.js";
 
 // Re-export common utilities for backward compatibility
 export {

package/template/index.js

@@ -1,7 +1,14 @@
-const { File } = require('@asyncapi/generator-react-sdk');
-const React = require('react');
-
-module.exports = function ({ asyncapi, params }) {
+import { File } from '@asyncapi/generator-react-sdk';
+import React from 'react';
+import LibRs from './src/lib.rs.js';
+import ClientRs from './src/client.rs.js';
+import ErrorsRs from './src/errors.rs.js';
+import EnvelopeRs from './src/envelope.rs.js';
+import ModelsRs from './src/models.rs.js';
+import AuthRs from './src/auth.rs.js';
+import CargoToml from './Cargo.toml.js';
+
+export default function ({ asyncapi, params }) {
     // Extract info from AsyncAPI spec
     let title, version, description;
     try {
@@ -55,15 +62,6 @@ module.exports = function ({ asyncapi, params }) {
         ? params.license
         : 'Apache-2.0';
 
-    // Import the source file generators
-    const LibRs = require('./src/lib.rs.js');
-    const ClientRs = require('./src/client.rs.js');
-    const ErrorsRs = require('./src/errors.rs.js');
-    const EnvelopeRs = require('./src/envelope.rs.js');
-    const ModelsRs = require('./src/models.rs.js');
-    const AuthRs = require('./src/auth.rs.js');
-    const CargoToml = require('./Cargo.toml.js');
-
     // Generate all files from the main index.js
     return [
         // Use the separate Cargo.toml template

package/template/src/auth.rs.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 import { File } from '@asyncapi/generator-react-sdk';
 
-module.exports = function ({ asyncapi, params }) {
+export default function ({ asyncapi, params }) {
     return (
         <File name="auth.rs">
             {`//! Authentication support for the NATS client

package/template/src/envelope.rs.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 import { File } from '@asyncapi/generator-react-sdk';
 
-module.exports = function ({ asyncapi, params }) {
+export default function ({ asyncapi, params }) {
     return (
         <File name="envelope.rs">
             {`//! Message envelope for consistent NATS message format

package/template/src/errors.rs.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 import { File } from '@asyncapi/generator-react-sdk';
 
-module.exports = function ({ asyncapi, params }) {
+export default function ({ asyncapi, params }) {
     return (
         <File name="errors.rs">
             {`//! Error types for the NATS client

package/template/src/lib.rs.js

@@ -7,7 +7,7 @@ import {
     resolveTemplateParameters
 } from '../helpers/index.js';
 
-module.exports = function ({ asyncapi, params }) {
+export default function ({ asyncapi, params }) {
     const asyncApiInfo = extractAsyncApiInfo(asyncapi);
     const { title, version, description } = asyncApiInfo;
 
@@ -22,7 +22,10 @@ module.exports = function ({ asyncapi, params }) {
 
     return (
         <File name="lib.rs">
-            {`//! ${title}
+            {`#![allow(clippy::uninlined_format_args)]
+#![allow(clippy::unnecessary_map_or)]
+#![allow(clippy::empty_line_after_doc_comments)]
+//! ${title}
 //!
 //! ${formatDescription(description)}
 //!

package/template/src/models.rs.js

@@ -8,7 +8,7 @@ import {
     toRustEnumVariantWithSerde,
     generateRustModels,
     generateMessageEnvelope
-} from '../../../common/src/index.js';
+} from "../../dist/common/index.js";
 
 export default function ModelsRs({ asyncapi }) {
     // Generate models using the common helper

package/template/src/models.rs.js.dev

@@ -0,0 +1,110 @@
+/* eslint-disable no-unused-vars */
+import { File } from '@asyncapi/generator-react-sdk';
+import {
+    toRustIdentifier,
+    toRustTypeName,
+    toRustFieldName,
+    toRustEnumVariant,
+    toRustEnumVariantWithSerde,
+    generateRustModels,
+    generateMessageEnvelope
+} from '../../../common/src/index.js';
+
+export default function ModelsRs({ asyncapi }) {
+    // Generate models using the common helper
+    const models = generateRustModels(asyncapi, {
+        toRustTypeName,
+        toRustFieldName,
+        toRustEnumVariantWithSerde,
+        includeAsyncApiTrait: false, // Client doesn't need the AsyncApiMessage trait
+        includeEnvelope: false // We'll generate the envelope separately
+    });
+
+    // Generate the unified message envelope
+    const envelopeCode = generateMessageEnvelope();
+
+    return (
+        <File name="models.rs">
+            {`//! Generated data models from AsyncAPI specification
+
+${envelopeCode}
+${models.generateComponentSchemas()}
+${models.generateNestedTypes()}
+${(() => {
+                    // Track which types have already had implementations generated
+                    const implementedTypes = new Set();
+                    const implementations = [];
+
+                    models.messageSchemas.forEach(schema => {
+                        const doc = schema.description ? `/// ${schema.description}` : `/// ${schema.name} message`;
+
+                        // Check if the message payload references a component schema
+                        let payloadRustName = null;
+                        let isComponentMessage = false;
+
+                        if (schema.rawPayload && schema.rawPayload.$ref) {
+                            const refName = schema.rawPayload.$ref.split('/').pop();
+                            payloadRustName = toRustTypeName(refName);
+                            isComponentMessage = true;
+                        } else if (schema.payload && schema.payload.$ref) {
+                            const refName = schema.payload.$ref.split('/').pop();
+                            payloadRustName = toRustTypeName(refName);
+                            isComponentMessage = true;
+                        } else if (schema.payload && schema.payload['x-parser-schema-id']) {
+                            // Handle resolved $ref references
+                            const schemaId = schema.payload['x-parser-schema-id'];
+                            if (models.schemaRegistry.has(schemaId)) {
+                                payloadRustName = toRustTypeName(schemaId);
+                                isComponentMessage = true;
+                            }
+                        }
+
+                        // For component messages, always generate the message wrapper type
+                        // even if the payload schema already exists
+                        if (isComponentMessage && payloadRustName && !implementedTypes.has(schema.rustName)) {
+                            implementedTypes.add(schema.rustName);
+                            implementations.push(`
+${doc}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ${schema.rustName} {
+    #[serde(flatten)]
+    pub payload: ${payloadRustName},
+}`);
+                        } else if (!models.generatedTypes.has(schema.rustName) && !implementedTypes.has(schema.rustName)) {
+                            // Generate both struct for inline message schemas
+                            implementedTypes.add(schema.rustName);
+                            implementations.push(`
+${doc}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ${schema.rustName} {
+${models.generateMessageStruct(schema.payload, schema.rustName)}
+}`);
+                        }
+                    });
+
+                    return implementations.join('');
+                })()}
+
+${models.messageSchemas.length === 0 && models.componentSchemas.length === 0 ? `
+/// Example message structure when no messages are defined in the spec
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ExampleMessage {
+    pub id: String,
+    pub content: String,
+    pub timestamp: chrono::DateTime<chrono::Utc>,
+}
+
+impl ExampleMessage {
+    /// Create a new instance with required fields
+    pub fn new(id: String, content: String, timestamp: chrono::DateTime<chrono::Utc>) -> Self {
+        Self {
+            id,
+            content,
+            timestamp,
+        }
+    }
+}` : ''}
+`}
+        </File>
+    );
+}