vovk-cli 0.0.1-draft.243 → 0.0.1-draft.245

package/dist/utils/convertJSONSchemaToTypeScriptDef.mjs

@@ -9,29 +9,8 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
     const escapeJSDocComment = (str) => {
         return str.replace(/\*\//g, '*\\/');
     };
-    // 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);
+    const processedSchema = schema;
     // Helper function to resolve $ref references
     const resolveRef = (ref) => {
         if (!ref.startsWith('#/'))
@@ -208,8 +187,27 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
                 return 'undefined';
         }
     };
+    // Preprocess schema to extract $defs into top level for easier reference resolution
+    function extractDefinitions(inputSchema) {
+        // Create a shallow copy to avoid modifying the original
+        const resultSchema = { ...inputSchema };
+        // Move $defs to definitions for compatibility
+        if (resultSchema.$defs && !resultSchema.definitions) {
+            resultSchema.definitions = resultSchema.$defs;
+        }
+        return resultSchema;
+    }
+    const schemaWithExtractedDefs = extractDefinitions(schema);
     // Generate the interface
-    const jsDoc = getJSDoc(schema);
-    const interfaceBody = schemaToType(processedSchema);
+    const jsDoc = getJSDoc(schemaWithExtractedDefs);
+    let interfaceBody;
+    try {
+        interfaceBody = schemaToType(schemaWithExtractedDefs);
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('Error generating TypeScript definition:', error);
+        return null;
+    }
     return `${jsDoc}\n${interfaceBody}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.243",
+  "version": "0.0.1-draft.245",
   "bin": {
     "vovk": "./dist/index.mjs"
   },