@bagelink/sdk 1.4.22 → 1.4.28

package/src/openAPITools/utils.ts

@@ -1,4 +1,5 @@
-import type { SchemaObject } from './openApiTypes'
+import type { ReferenceObject, SchemaObject } from './types'
+import { isReferenceObject, isSchemaObject } from './types/utils'
 
 export function toCamelCase(str?: string) {
 	return str
@@ -31,7 +32,7 @@ function resolveReference(ref: string): string {
 
 function handleArrayItems(schema: SchemaObject): string {
 	// Handle array items that might be union types
-	const itemType = schemaToType(schema.items)
+	const itemType = schemaToType(schema.items as SchemaObject)
 
 	// Add parentheses around union types to ensure correct syntax
 	const needsParentheses = itemType.includes('|') || itemType.includes('&')
@@ -51,8 +52,16 @@ function handleArrayItems(schema: SchemaObject): string {
 	return res
 }
 
-export function schemaToType(schema?: SchemaObject): string {
+export function schemaToType(schema?: SchemaObject | ReferenceObject): string {
 	if (!schema) return 'any'
+	if (isReferenceObject(schema)) {
+		if (schema.$ref) return resolveReference(schema.$ref)
+	}
+	if (!isSchemaObject(schema)) {
+		console.warn('Schema is not a SchemaObject:', schema)
+		return 'any'
+	}
+
 	if (schema.anyOf) {
 		let _t = schema.anyOf
 			.map(s => schemaToType(s))
@@ -67,7 +76,7 @@ export function schemaToType(schema?: SchemaObject): string {
 			.filter(p => p !== 'any')
 			.join(' & ')
 	}
-	if (schema.$ref) return resolveReference(schema.$ref)
+	// TODO: handle Array.isArray(schema.type) case b4 switch
 	switch (schema.type) {
 		case 'object': return '{ [key: string]: any }'
 		case 'string':
@@ -86,14 +95,14 @@ export function schemaToType(schema?: SchemaObject): string {
 	}
 }
 
-export function isOptional(schema: SchemaObject) {
+export function isOptional(schema?: SchemaObject) {
 	/// / !schema?.required?.includes(schema.title || '')
 	const type = schemaToType(schema)
 	const splitType = type.split(/\s+\|\s+/)
 	const includesNull = splitType.includes('null')
 	const includesUndefined = splitType.includes('undefined')
 
-	return includesNull || includesUndefined || schema.default !== undefined
+	return includesNull || includesUndefined || schema?.default !== undefined
 }
 
 export function cleanOptionals(str: string) {
@@ -110,7 +119,7 @@ export function formatVarType({
 	defaultValue,
 }: {
 	varName: string
-	schema: SchemaObject
+	schema?: SchemaObject
 	required?: boolean
 	defaultValue?: unknown
 }) {

package/src/openAPITools/openApiTypes.ts

@@ -1,96 +0,0 @@
-export interface OpenAPIDocument {
-	openapi: string
-	info: InfoObject
-	paths: PathsObject
-	components?: ComponentsObject
-}
-
-export interface PathsObject { [path: string]: PathItemObject }
-
-export interface InfoObject {
-	title: string
-	version: string
-}
-
-export interface PathItemObject {
-	get?: OperationObject
-	put?: OperationObject
-	post?: OperationObject
-	delete?: OperationObject
-	patch?: OperationObject
-	options?: OperationObject
-	head?: OperationObject
-}
-
-export interface SchemasObject { [schema: string]: SchemaObject }
-
-export interface ComponentsObject {
-	schemas?: SchemasObject
-}
-
-export interface OperationObject {
-	summary?: string
-	description?: string
-	operationId?: string
-	parameters?: ParameterObject[]
-	requestBody?: RequestBodyObject
-	responses: ResponsesObject
-}
-
-export interface ResponsesObject { [statusCode: string]: ResponseObject }
-
-export interface SchemaObject {
-	type?: string
-	const?: string
-	format?: string
-	properties?: { [property: string]: SchemaObject }
-	prefixItems?: SchemaObject[]
-	items?: SchemaObject
-	$ref?: string
-	enum?: string[]
-	anyOf?: SchemaObject[]
-	allOf?: SchemaObject[]
-	title?: string
-	description?: string
-	default?: any
-	required?: string[]
-	additionalProperties?: boolean | SchemaObject
-}
-
-export interface ParameterObject {
-	name: string
-	in: string
-	description?: string
-	schema: SchemaObject
-	required?: boolean
-}
-
-export interface RequestBodyObject {
-	description?: string
-	content: { [mediaType: string]: MediaTypeObject }
-	required?: boolean
-}
-
-export interface ResponseObject {
-	description: string
-	content?: { [mediaType: string]: MediaTypeObject }
-}
-
-export interface MediaTypeObject {
-	schema?: SchemaObject
-	encoding?: { [key: string]: EncodingObject }
-}
-
-export interface EncodingObject {
-	contentType?: string
-	headers?: { [key: string]: HeaderObject }
-	style?: string
-	explode?: boolean
-	allowReserved?: boolean
-}
-
-export interface HeaderObject {
-	description?: string
-	required?: boolean
-	schema?: SchemaObject
-}