vovk-cli 0.0.1-draft.229 → 0.0.1-draft.230

package/dist/utils/convertJSONSchemaToTypeScriptDef.mjs

@@ -23,6 +23,29 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
         }
         return currentSchema || null;
     };
+    // Process schema and any nested definitions
+    const processSchema = (currentSchema) => {
+        // Merge any $defs into the main schema for reference resolution
+        if (currentSchema.$defs || currentSchema.definitions) {
+            // Create a copy to avoid modifying the original
+            const processedSchema = { ...currentSchema };
+            // Support both $defs (JSON Schema 2019-09+) and definitions (older JSON Schema)
+            if (!processedSchema.definitions) {
+                processedSchema.definitions = {};
+            }
+            // Copy $defs into definitions for consistent reference resolution
+            if (processedSchema.$defs) {
+                processedSchema.definitions = {
+                    ...processedSchema.definitions,
+                    ...processedSchema.$defs,
+                };
+            }
+            return processedSchema;
+        }
+        return currentSchema;
+    };
+    // Pre-process the schema to handle definitions
+    const processedSchema = processSchema(schema);
     // Helper function to get JSDoc from schema
     const getJSDoc = (schema, indentation = '') => {
         if (typeof schema === 'boolean') {
@@ -49,6 +72,7 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
             else {
                 // If we can't resolve the reference, use the reference name as type
                 const refName = schema.$ref.split('/').pop();
+                console.warn(`Warning: Could not resolve reference ${schema.$ref}`);
                 return refName || 'KnownAny';
             }
         }
@@ -185,6 +209,6 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
     };
     // Generate the interface
     const jsDoc = getJSDoc(schema);
-    const interfaceBody = schemaToType(schema);
+    const interfaceBody = schemaToType(processedSchema);
     return `${jsDoc}\n${interfaceBody}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.229",
+  "version": "0.0.1-draft.230",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.217"
+    "vovk": "^3.0.0-draft.218"
   },
   "optionalDependencies": {
     "vovk-python": "^0.0.1-draft.40"