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

package/client-templates/extensions/extensions.d.ts.ejs

@@ -4,7 +4,7 @@ export type Controllers = {
   <% Object.values(t.schema.segments.extensions.controllers).forEach((controllerSchema) => { %>
     <%= controllerSchema.rpcModuleName %>: {
     <% Object.entries(controllerSchema.handlers).forEach(([handlerName, handler]) => { %>
-      <%= handlerName %>: (req: VovkRequest<<%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.body) ?? 'null' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.query) ?? 'undefined' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.params ?? 'undefined') %>>) => <%- handler.validation?.output ? `Promise<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.body)}>` : handler.validation?.iteration ? `Promise<VovkStreamAsyncIterable<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.iteration)}>>` : 'Promise<KnownAny>' %>,
+      <%= handlerName %>: (req: VovkRequest<<%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.body) ?? 'null' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.query) ?? 'undefined' %>, <%- t.convertJSONSchemaToTypeScriptDef(handler.validation?.params ?? 'undefined') %>>) => <%- handler.validation?.output ? `Promise<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.output)}>` : handler.validation?.iteration ? `Promise<VovkStreamAsyncIterable<${t.convertJSONSchemaToTypeScriptDef(handler.validation?.iteration)}>>` : 'Promise<KnownAny>' %>,
     <% }) %>
     };
   <% }) %>

package/dist/utils/convertJSONSchemaToTypeScriptDef.mjs

@@ -9,14 +9,74 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
     const escapeJSDocComment = (str) => {
         return str.replace(/\*\//g, '*\\/');
     };
-    // Pre-process the schema to handle definitions
-    const processedSchema = schema;
+    // Helper function to check if a property name is a valid JavaScript identifier
+    const isValidIdentifier = (name) => {
+        // Check if it matches valid JavaScript identifier pattern and is not a reserved word
+        return (/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) &&
+            ![
+                'break',
+                'case',
+                'catch',
+                'class',
+                'const',
+                'continue',
+                'debugger',
+                'default',
+                'delete',
+                'do',
+                'else',
+                'export',
+                'extends',
+                'false',
+                'finally',
+                'for',
+                'function',
+                'if',
+                'import',
+                'in',
+                'instanceof',
+                'new',
+                'null',
+                'return',
+                'super',
+                'switch',
+                'this',
+                'throw',
+                'true',
+                'try',
+                'typeof',
+                'var',
+                'void',
+                'while',
+                'with',
+                'let',
+                'static',
+                'yield',
+                'enum',
+                'await',
+                'implements',
+                'interface',
+                'package',
+                'private',
+                'protected',
+                'public',
+            ].includes(name));
+    };
+    // Helper function to format property name (with quotes if needed)
+    const formatPropertyName = (name) => {
+        if (isValidIdentifier(name)) {
+            return name;
+        }
+        else {
+            return `'${escapeStringLiteral(name)}'`;
+        }
+    };
     // Helper function to resolve $ref references
     const resolveRef = (ref) => {
         if (!ref.startsWith('#/'))
             return null;
         const path = ref.substring(2).split('/');
-        let currentSchema = processedSchema; // Use processedSchema instead of schema
+        let currentSchema = schema;
         for (const segment of path) {
             if (!currentSchema || typeof currentSchema !== 'object') {
                 return null;
@@ -114,13 +174,16 @@ export function convertJSONSchemaToTypeScriptDef(schema) {
                     const type = propSchema ? 'KnownAny' : 'never';
                     const isOptional = !required.includes(propName);
                     const jsDoc = getJSDoc(propSchema, indentation);
-                    return `${jsDoc}\n${indentation}${propName}${isOptional ? '?' : ''}: ${type};`;
+                    return `${jsDoc}\n${indentation}${formatPropertyName(propName)}${isOptional ? '?' : ''}: ${type};`;
                 }
                 const isOptional = !required.includes(propName);
                 const defaultValue = propSchema.default !== undefined ? ` // default: ${JSON.stringify(propSchema.default)}` : '';
                 const jsDoc = getJSDoc(propSchema, indentation);
                 const propType = schemaToType(propSchema, indentation + '  ');
-                return [`${jsDoc}`, `${indentation}${propName}${isOptional ? '?' : ''}: ${propType};${defaultValue}`]
+                return [
+                    `${jsDoc}`,
+                    `${indentation}${formatPropertyName(propName)}${isOptional ? '?' : ''}: ${propType};${defaultValue}`,
+                ]
                     .filter(Boolean)
                     .join('\n');
             })
@@ -187,27 +250,8 @@ 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(schemaWithExtractedDefs);
-    let interfaceBody;
-    try {
-        interfaceBody = schemaToType(schemaWithExtractedDefs);
-    }
-    catch (error) {
-        // eslint-disable-next-line no-console
-        console.error('Error generating TypeScript definition:', error);
-        return null;
-    }
+    const jsDoc = getJSDoc(schema);
+    const interfaceBody = schemaToType(schema);
     return `${jsDoc}\n${interfaceBody}`;
 }

package/package.json

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