vovk-rust 0.0.1 → 0.0.2

package/README.md

@@ -9,6 +9,8 @@
   <br>
   <strong>Back-end Framework for Next.js App Router</strong>
   <br />
+  <em>One codebase → type-safe clients, OpenAPI, and AI tools</em>
+  <br />
   <a href="https://vovk.dev/">Documentation</a>
   &nbsp;&nbsp;
   <a href="https://vovk.dev/quick-install">Quick Start</a>

package/client-templates/rsSrc/lib.rs.ejs

@@ -30,9 +30,10 @@ vars.convertJSONSchemasToRustTypes({
         body: validation?.body,
         query: validation?.query,
         params: validation?.params,
-        output: validation?.output,
-        iteration: validation?.iteration
-    }, 
+        // Re-attach deduped $defs so Rust resolves refs as before (no-op for non-mixin).
+        output: t.reattachMixinDefs(validation?.output, segment),
+        iteration: t.reattachMixinDefs(validation?.iteration, segment)
+    },
     rootName: handlerName,
     pad: 4 
 })

package/index.js

@@ -103,7 +103,7 @@ export function resolveRef(ref, rootSchema) {
         current = current[part];
     }
     // If the resolved schema also has a $ref, resolve it recursively
-    if (current && current.$ref) {
+    if (current?.$ref) {
         return resolveRef(current.$ref, rootSchema);
     }
     processedRefs.delete(ref);
@@ -115,7 +115,7 @@ export function getModulePath(path) {
         return path[0];
     let result = '';
     for (let i = 0; i < path.length - 1; i++) {
-        result += path[i] + '_::';
+        result += `${path[i]}_::`;
     }
     result += path[path.length - 1];
     return result;
@@ -363,7 +363,7 @@ export function processObject(schema, path, level, rootSchema = schema, pad = 0)
     code += `${indentFn(level)}pub struct ${currentName} {\n`;
     // Generate struct fields
     Object.entries(schema.properties).forEach(([propName, propSchema]) => {
-        const isRequired = schema.required && schema.required.includes(propName);
+        const isRequired = schema.required?.includes(propName);
         // Handle $ref in property
         if (propSchema.$ref) {
             const resolvedSchema = resolveRef(propSchema.$ref, rootSchema);
@@ -456,11 +456,11 @@ export function processObject(schema, path, level, rootSchema = schema, pad = 0)
                 if (propSchema.items.$ref) {
                     const resolved = resolveRef(propSchema.items.$ref, rootSchema);
                     if (resolved && (resolved.type === 'object' || resolved.properties)) {
-                        code += processObject(resolved, [...path, propName + 'Item'], level + 1, rootSchema, pad);
+                        code += processObject(resolved, [...path, `${propName}Item`], level + 1, rootSchema, pad);
                     }
                 }
                 else if (propSchema.items.type === 'object' || propSchema.items.properties) {
-                    code += processObject(propSchema.items, [...path, propName + 'Item'], level + 1, rootSchema, pad);
+                    code += processObject(propSchema.items, [...path, `${propName}Item`], level + 1, rootSchema, pad);
                 }
             }
             // Handle anyOf/oneOf/allOf schemas

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-rust",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Codegen templates for Rust client library for Vovk.ts",
   "files": [
     "client-templates",