vovk-cli 0.0.1-draft.256 → 0.0.1-draft.258

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

@@ -5,7 +5,7 @@ import type { VovkRequest, VovkStreamAsyncIterable, KnownAny } from 'vovk';
 
 export namespace Mixins {
   <% for (const segment of mixins) { %>
-    <% console.log(segment); if(segment.meta?.components?.schemas) { %>
+    <% if(segment.meta?.components?.schemas) { %>
       export namespace <%= t._.upperFirst(t._.camelCase(segment.segmentName)) %> {
         <% for (const [componentName, componentSchema] of Object.entries(segment.meta.components.schemas)) { %>
           <%- await t.compileJSONSchemaToTypeScriptType(componentSchema, componentName, segment.meta.components) %>

package/dist/getProjectInfo/getConfig/index.d.mts

@@ -81,6 +81,7 @@ export default function getConfig({ configPath, cwd }: {
                     file: string;
                 } | {
                     url: string;
+                    cache?: string;
                 } | {
                     object: import("openapi3-ts/oas31").OpenAPIObject;
                 };

package/dist/utils/compileJSONSchemaToTypeScriptType.mjs

@@ -1,7 +1,25 @@
 import { compile } from 'json-schema-to-typescript';
+function fixUnresolvedLocalRefs(schema) {
+    const schemaStr = JSON.stringify(schema);
+    const refs = schemaStr.match(/#\/\$defs\/\w+/g) || [];
+    const defs = schema.$defs || {};
+    const missingRefs = refs.map((ref) => ref.replace('#/$defs/', '')).filter((defName) => !defs[defName]);
+    // Add missing definitions
+    if (missingRefs.length > 0) {
+        schema.$defs = schema.$defs || {};
+        missingRefs.forEach((defName) => {
+            schema.$defs[defName] = { tsType: 'unknown' }; // or whatever default you want
+        });
+    }
+    return schema;
+}
 export async function compileJSONSchemaToTypeScriptType(schema, typeName, components = {}) {
     if (!schema)
         return '';
+    schema = fixUnresolvedLocalRefs(schema);
+    // tsType attribute isn't working with objects that use $ref, so we need to handle it separately
+    if ('tsType' in schema && typeof schema.tsType === 'string')
+        return `export type ${typeName} = ${schema.tsType};\n`;
     const tsType = await compile({ ...schema, components }, typeName, {
         bannerComment: schema.description ? `/**\n * ${schema.description}\n */` : '',
         style: {
@@ -12,6 +30,8 @@ export async function compileJSONSchemaToTypeScriptType(schema, typeName, compon
             tabWidth: 2,
             useTabs: false,
             trailingComma: 'all',
+            unreachableDefinitions: false,
+            declareExternallyReferenced: false,
         },
         // Don't generate separate interfaces for additionalProperties
         additionalProperties: false,
@@ -21,205 +41,3 @@ export async function compileJSONSchemaToTypeScriptType(schema, typeName, compon
     });
     return tsType;
 }
-/*
-// Extend JSONSchema to include custom x-formData property
-interface ExtendedJSONSchema extends JSONSchema {
-  'x-formData'?: boolean;
-  [key: string]: any;
-}
-
-interface OpenAPIDocument {
-  openapi: string;
-  components?: {
-    schemas?: Record<string, ExtendedJSONSchema>;
-  };
-  [key: string]: any;
-}
-
-/**
- * Converts OpenAPI 3.1 component schemas to TypeScript type definitions
- * @param oasDoc - The OpenAPI 3.1 document
- * @param options - Optional configuration for the TypeScript generation
- * @returns A string containing all TypeScript type definitions
- * /
-export async function oasToTypeScript(
-  oasDoc: OpenAPIDocument,
-  options?: {
-    bannerComment?: string;
-    style?: {
-      bracketSpacing?: boolean;
-      printWidth?: number;
-      semi?: boolean;
-      singleQuote?: boolean;
-      tabWidth?: number;
-      useTabs?: boolean;
-      trailingComma?: 'all' | 'es5' | 'none';
-    };
-  }
-): Promise<string> {
-  // Validate that this is an OAS 3.1 document
-  if (!oasDoc.openapi || !oasDoc.openapi.startsWith('3.1')) {
-    throw new Error('Document must be an OpenAPI 3.1 specification');
-  }
-
-  // Extract schemas from components
-  const schemas = oasDoc.components?.schemas || {};
-
-  if (Object.keys(schemas).length === 0) {
-    return '// No schemas found in components';
-  }
-
-  const typeDefinitions: string[] = [];
-
-  // Process each schema
-  for (const [schemaName, schema] of Object.entries(schemas)) {
-    try {
-      // Check if schema has x-formData: true
-      if (schema['x-formData'] === true) {
-        // Generate a simple type alias to FormData
-        typeDefinitions.push(`export type ${schemaName} = FormData;\n`);
-        continue;
-      }
-
-      // Handle schema references
-      const resolvedSchema = resolveSchemaReferences(schema, schemas);
-
-      // Compile to TypeScript
-      const tsType = await compile(resolvedSchema as JSONSchema, schemaName, {
-        bannerComment: options?.bannerComment || '',
-        style: options?.style || {
-          bracketSpacing: true,
-          printWidth: 80,
-          semi: true,
-          singleQuote: true,
-          tabWidth: 2,
-          useTabs: false,
-          trailingComma: 'all',
-        },
-        // Don't generate separate interfaces for additionalProperties
-        additionalProperties: false,
-        // Enable strict null checks
-        strictIndexSignatures: true,
-        // Don't add schema as comment
-        $refOptions: {
-          resolve: {
-            // Resolve internal references
-            internal: true,
-            // Add our custom resolver
-            custom: {
-              order: 1,
-              canRead: (ref: string) => ref.startsWith('#/components/schemas/'),
-            },
-          },
-        },
-      });
-
-      typeDefinitions.push(tsType);
-    } catch (error) {
-      console.error(`Error processing schema "${schemaName}":`, error);
-      typeDefinitions.push(`// Error processing schema "${schemaName}": ${error.message}`);
-    }
-  }
-
-  return typeDefinitions.join('\n');
-}
-
-/**
- * Resolves $ref references within a schema
- * /
-function resolveSchemaReferences(
-  schema: any,
-  allSchemas: Record<string, ExtendedJSONSchema>,
-  visited = new Set<string>()
-): any {
-  if (!schema || typeof schema !== 'object') {
-    return schema;
-  }
-
-  // Handle $ref
-  if (schema.$ref && typeof schema.$ref === 'string') {
-    const refPath = schema.$ref.replace('#/components/schemas/', '');
-
-    // Prevent circular references
-    if (visited.has(refPath)) {
-      return { type: 'object', additionalProperties: true };
-    }
-
-    visited.add(refPath);
-    const referencedSchema = allSchemas[refPath];
-
-    if (referencedSchema) {
-      return resolveSchemaReferences(referencedSchema, allSchemas, visited);
-    }
-
-    return schema;
-  }
-
-  // Handle arrays
-  if (Array.isArray(schema)) {
-    return schema.map((item) => resolveSchemaReferences(item, allSchemas, visited));
-  }
-
-  // Handle objects recursively
-  const resolved: any = {};
-  for (const [key, value] of Object.entries(schema)) {
-    resolved[key] = resolveSchemaReferences(value, allSchemas, visited);
-  }
-
-  return resolved;
-}
-
-// Example usage:
-/*
-const oasDoc = {
-  openapi: '3.1.0',
-  info: {
-    title: 'My API',
-    version: '1.0.0'
-  },
-  components: {
-    schemas: {
-      User: {
-        type: 'object',
-        properties: {
-          id: { type: 'integer' },
-          name: { type: 'string' },
-          email: { type: 'string', format: 'email' },
-          roles: {
-            type: 'array',
-            items: { $ref: '#/components/schemas/Role' }
-          }
-        },
-        required: ['id', 'name', 'email']
-      },
-      Role: {
-        type: 'object',
-        properties: {
-          id: { type: 'integer' },
-          name: { type: 'string' },
-          permissions: {
-            type: 'array',
-            items: { type: 'string' }
-          }
-        },
-        required: ['id', 'name']
-      },
-      UploadFileRequest: {
-        'x-formData': true,
-        type: 'object',
-        properties: {
-          file: { type: 'string', format: 'binary' },
-          description: { type: 'string' }
-        }
-      }
-    }
-  }
-};
-
-const types = await oasToTypeScript(oasDoc);
-console.log(types);
-// Output will include:
-// export interface User { ... }
-// export interface Role { ... }
-// export type UploadFileRequest = FormData;
-*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.256",
+  "version": "0.0.1-draft.258",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.292"
+    "vovk": "^3.0.0-draft.296"
   },
   "optionalDependencies": {
     "vovk-python": "^0.0.1-draft.41"