@trayio/tray-openapi 2.8.0 → 2.10.0

package/dist/OpenApiCodecs.d.ts

@@ -1,3 +1,5 @@
-import { OpenAPISchema } from './OpenApiTypeDescriptors';
+import { OpenAPISchema, Parameter, Path } from './OpenApiTypeDescriptors';
 export declare const openApiSpecCodec: import("commons/dist/codec/Codec").Codec<OpenAPISchema>;
+export declare const pathCodec: import("commons/dist/codec/Codec").Codec<Path>;
+export declare const parameterSchemaCodec: import("commons/dist/codec/Codec").Codec<Parameter>;
 //# sourceMappingURL=OpenApiCodecs.d.ts.map

package/dist/OpenApiCodecs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApiCodecs.d.ts","sourceRoot":"","sources":["../src/OpenApiCodecs.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EAEb,MAAM,0BAA0B,CAAC;AAElC,eAAO,MAAM,gBAAgB,yDAE5B,CAAC"}
+{"version":3,"file":"OpenApiCodecs.d.ts","sourceRoot":"","sources":["../src/OpenApiCodecs.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EACb,SAAS,EACT,IAAI,EAIJ,MAAM,0BAA0B,CAAC;AAElC,eAAO,MAAM,gBAAgB,yDAE5B,CAAC;AAEF,eAAO,MAAM,SAAS,gDAErB,CAAC;AAEF,eAAO,MAAM,oBAAoB,qDAEhC,CAAC"}

package/dist/OpenApiCodecs.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openApiSpecCodec = void 0;
+exports.parameterSchemaCodec = exports.pathCodec = exports.openApiSpecCodec = void 0;
 const TypeCodec_1 = require("@trayio/commons/codec/TypeCodec");
 const OpenApiTypeDescriptors_1 = require("./OpenApiTypeDescriptors");
 exports.openApiSpecCodec = TypeCodec_1.TypeCodec.fromDescriptor(OpenApiTypeDescriptors_1.openApiSpecTypeDescriptor);
+exports.pathCodec = TypeCodec_1.TypeCodec.fromDescriptor(OpenApiTypeDescriptors_1.openApiSpecPathTypeDescriptor);
+exports.parameterSchemaCodec = TypeCodec_1.TypeCodec.fromDescriptor(OpenApiTypeDescriptors_1.parameterSchemaTypeDescriptor);

package/dist/OpenApiSchemaImporter.d.ts

@@ -7,6 +7,7 @@ export declare class OpenApiSchemaImporter {
     constructor(generator: Generator, fileStorage: FileStorage);
     buildConnector(openApiSpecPath: string, connectorName: string): TE.TaskEither<Error, undefined>;
     private generateOperationFromPath;
+    private decodeOperation;
     private getOpenApiSpec;
     private generateHandlerFilesAndOperationJson;
     private generateConnectorDirectory;

package/dist/OpenApiSchemaImporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApiSchemaImporter.d.ts","sourceRoot":"","sources":["../src/OpenApiSchemaImporter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAQvC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAwBlE,qBAAa,qBAAqB;IACrB,OAAO,CAAC,SAAS;IAAa,OAAO,CAAC,WAAW;gBAAzC,SAAS,EAAE,SAAS,EAAU,WAAW,EAAE,WAAW;IAE1E,cAAc,CACb,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACnB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAgClC,OAAO,CAAC,yBAAyB;IAmCjC,OAAO,CAAC,cAAc;IAoCtB,OAAO,CAAC,oCAAoC;IAuE5C,OAAO,CAAC,0BAA0B;IAwBlC,OAAO,CAAC,0BAA0B;CAclC"}
+{"version":3,"file":"OpenApiSchemaImporter.d.ts","sourceRoot":"","sources":["../src/OpenApiSchemaImporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AASvC,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAyClE,qBAAa,qBAAqB;IACrB,OAAO,CAAC,SAAS;IAAa,OAAO,CAAC,WAAW;gBAAzC,SAAS,EAAE,SAAS,EAAU,WAAW,EAAE,WAAW;IAE1E,cAAc,CACb,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACnB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAiClC,OAAO,CAAC,yBAAyB;IA6CjC,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,oCAAoC;IAgF5C,OAAO,CAAC,0BAA0B;IAwBlC,OAAO,CAAC,0BAA0B;CAclC"}

package/dist/OpenApiSchemaImporter.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenApiSchemaImporter = void 0;
 const TE = __importStar(require("fp-ts/TaskEither"));
 const E = __importStar(require("fp-ts/Either"));
+const O = __importStar(require("fp-ts/Option"));
 const function_1 = require("fp-ts/function");
 const Array_1 = require("fp-ts/Array");
 const Apply_1 = require("fp-ts/Apply");
@@ -47,31 +48,39 @@ class OpenApiSchemaImporter {
         this.fileStorage = fileStorage;
     }
     buildConnector(openApiSpecPath, connectorName) {
-        return (0, function_1.pipe)(this.generateConnectorDirectory(connectorName), TE.bindTo('connectorPath'), TE.bind('openApiSpec', () => this.getOpenApiSpec(openApiSpecPath)), TE.bind('paths', ({ openApiSpec }) => TE.right(Object.keys(openApiSpec.paths).map((path) => ({
-            path,
-            routes: Object.keys(openApiSpec.paths[path]).map((route) => ({
-                method: route,
-                path: openApiSpec.paths[path][route],
-            })),
-        })))), TE.chain(({ openApiSpec, connectorPath, paths }) => (0, Array_1.traverse)(TE.ApplicativeSeq)((path) => this.generateOperationFromPath(path, connectorPath, openApiSpec.servers[0].url, connectorName))(paths)), TE.map(() => undefined));
+        return (0, function_1.pipe)(this.generateConnectorDirectory(connectorName), TE.bindTo('connectorPath'), TE.bind('openApiSpec', () => this.getOpenApiSpec(openApiSpecPath)), TE.bind('paths', ({ openApiSpec }) => {
+            if (openApiSpec.paths === undefined) {
+                return TE.left(new Error('OpenAPI spec does not contain any paths'));
+            }
+            return TE.right(Object.keys(openApiSpec.paths).map((path) => ({
+                path,
+                routes: Object.keys(openApiSpec.paths[path]).map((route) => ({
+                    method: route,
+                    path: openApiSpec.paths[path][route],
+                })),
+            })));
+        }), TE.chain(({ openApiSpec, connectorPath, paths }) => (0, Array_1.traverse)(TE.ApplicativeSeq)((path) => this.generateOperationFromPath(path, connectorPath, openApiSpec.servers[0].url, connectorName))(paths)), TE.map(() => undefined));
     }
     generateOperationFromPath(path, connectorPath, baseUrl, connectorName) {
-        return (0, function_1.pipe)((0, Array_1.traverse)(TE.ApplicativeSeq)((route) => (0, function_1.pipe)(this.generateOperationDirectory(connectorPath, route.path.operationId), TE.bind('inputs', () => TE.right((0, GenerateInputSchema_1.generateInputSchema)(route.path))), TE.bind('outputs', () => (0, GenerateOutput_1.generateOutputSchema)(route.path.responses)), TE.chain(({ inputs, outputs }) => this.generateHandlerFilesAndOperationJson(route, `${connectorPath}/src/${(0, lodash_1.kebabCase)(route.path.operationId)}`, baseUrl, path.path, connectorName, inputs, outputs))))(path.routes), TE.map(() => undefined));
+        return (0, function_1.pipe)((0, Array_1.traverse)(TE.ApplicativeSeq)((route) => (0, function_1.pipe)(this.decodeOperation(route.path, path.path, route.method), TE.bindTo('decodedPath'), TE.chain(({ decodedPath }) => (0, function_1.pipe)(this.generateOperationDirectory(connectorPath, decodedPath.operationId), TE.bind('inputs', () => TE.right((0, GenerateInputSchema_1.generateInputSchema)(decodedPath))), TE.bind('outputs', () => (0, GenerateOutput_1.generateOutputSchema)(decodedPath.responses)), TE.bind('decodedPath', () => TE.right(decodedPath)))), TE.chain(({ inputs, outputs, decodedPath }) => this.generateHandlerFilesAndOperationJson(route.method, decodedPath, `${connectorPath}/src/${(0, lodash_1.kebabCase)(decodedPath.operationId)}`, baseUrl, path.path, connectorName, inputs, outputs))))(path.routes), TE.map(() => undefined));
+    }
+    decodeOperation(path, httpPath, method) {
+        return (0, function_1.pipe)(TE.fromEither(OpenApiCodecs_1.pathCodec.decode(path)), TE.mapLeft((error) => new Error(`Failed to decode httpPath: ${httpPath} and method: ${method} : ${error}`)));
     }
     getOpenApiSpec(openApiSpecPath) {
         return (0, function_1.pipe)(this.fileStorage.read(openApiSpecPath), TE.chain((openApiSpec) => BufferExtensions_1.BufferExtensions.readableToArrayBuffer(openApiSpec.content)), TE.chain((openApiSpec) => TE.fromEither(E.tryCatch(() => JSON.parse(Buffer.from(openApiSpec).toString('utf-8')), (error) => new Error(`Failed to parse OpenAPI spec as JSON from path ${openApiSpecPath}: ${error}`)))), TE.chain((openApiSpec) => TE.tryCatch(() => {
             const resolver = new json_ref_resolver_1.Resolver({});
             const resolvedOpenApiSpec = resolver.resolve(openApiSpec, {});
             return resolvedOpenApiSpec;
-        }, (reason) => new Error(`Failed to resolve references in schema: ${reason}`))), TE.chain((openApiSpec) => TE.fromEither(OpenApiCodecs_1.openApiSpecCodec.decode(openApiSpec.result))));
+        }, (reason) => new Error(`Failed to resolve references in schema: ${reason}`))), TE.chain((openApiSpec) => TE.right(openApiSpec.result)));
     }
-    generateHandlerFilesAndOperationJson(route, operationPath, baseUrl, path, connectorName, input, output) {
-        const { method, path: { operationId: operationName, description }, } = route;
+    generateHandlerFilesAndOperationJson(method, path, operationPath, baseUrl, httpPath, connectorName, input, output) {
         const writeFile = (content, fileName) => this.fileStorage.write({
             content: stream_1.Readable.from(content),
             key: `${operationPath}/${fileName}`,
             metadata: { name: fileName },
-        });
+        }, O.none);
+        const operationName = path.operationId;
         const operationFileGenerationTasks = {
             handler: (0, function_1.pipe)(TE.fromEither((0, GenerateHandler_1.generateHandler)({
                 connectorNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(connectorName),
@@ -79,9 +88,11 @@ class OpenApiSchemaImporter {
                 operationNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(operationName),
                 httpMethod: method,
                 baseUrl,
-                path,
+                httpPath,
                 input,
-            })), TE.chain((handlerInput) => writeFile(handlerInput, 'handler.ts'))),
+            })), 
+            // TODO: Why does this throw unhelpful errors?
+            TE.chain((handlerInput) => writeFile(handlerInput, 'handler.ts'))),
             handlerTest: (0, function_1.pipe)(TE.fromEither((0, GenerateHandlerTest_1.generateHandlerTest)({
                 operationNameCamelCase: (0, lodash_1.camelCase)(operationName),
                 input,
@@ -89,9 +100,9 @@ class OpenApiSchemaImporter {
             })), TE.chain((handlerInput) => writeFile(handlerInput, 'handler.test.ts'))),
             generateOutputType: (0, function_1.pipe)((0, GenerateOutput_1.generateOutputTypes)(operationName, output), TE.chain((outputType) => writeFile(outputType, 'output.ts'))),
             generateInputType: (0, function_1.pipe)((0, GenerateInputTypes_1.generateInputTypes)(operationName, input), TE.chain((inputType) => writeFile(inputType, 'input.ts'))),
-            operationJson: (0, GenerateOperationJson_1.generateOperationJson)(this.fileStorage, operationPath, operationName, (0, lodash_1.kebabCase)(operationName), description),
+            operationJson: (0, GenerateOperationJson_1.generateOperationJson)(this.fileStorage, operationPath, operationName, (0, lodash_1.kebabCase)(operationName), path.description),
         };
-        return (0, function_1.pipe)((0, Apply_1.sequenceS)(TE.ApplicativePar)(operationFileGenerationTasks), TE.mapLeft((error) => new Error(`Failed to generate files for operation: ${error}`)), TE.map(() => undefined));
+        return (0, function_1.pipe)((0, Apply_1.sequenceS)(TE.ApplicativePar)(operationFileGenerationTasks), TE.mapLeft((error) => new Error(`Failed to generate files for operation: ${operationName}: ${error}`)), TE.map(() => undefined));
     }
     generateConnectorDirectory(connectorName) {
         return (0, function_1.pipe)(TE.right({

package/dist/OpenApiTypeDescriptors.d.ts

@@ -2,7 +2,7 @@ import * as t from 'io-ts';
 import * as O from 'fp-ts/Option';
 export type Path = {
     description: string;
-    tags: string[];
+    tags: O.Option<string[]>;
     operationId: string;
     parameters: O.Option<Parameter[]>;
     requestBody: O.Option<RequestBody>;
@@ -16,35 +16,23 @@ export type Parameter = {
     schema: {
         type: string;
         format: O.Option<string>;
+        items: O.Option<SchemaObject>;
     };
 };
 export type RequestBody = {
-    content: Record<string, MediaType>;
-};
-export type MediaType = {
-    schema: ArraySchema | ObjectSchema;
+    content: Record<string, MediaTypeObject>;
 };
+export interface MediaTypeObject {
+    schema: O.Option<SchemaObject>;
+}
 export type Responses = Record<string, Response>;
 export type Response = {
     description: string;
-    content: O.Option<Record<string, MediaType>>;
+    content: O.Option<Record<string, MediaTypeObject>>;
 };
 export type OpenApiHttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
-type ArraySchema = {
-    type: 'array';
-    items: PropertySchema;
-};
-type ObjectSchema = {
-    type: 'object';
-    required?: string[];
-    properties: Record<string, PropertySchema>;
-    additionalProperties: O.Option<boolean>;
-};
-export type PropertySchema = {
-    type: string;
-} | ArraySchema | ObjectSchema;
 type ComponentSchema = {
-    schemas: Record<string, ArraySchema | ObjectSchema>;
+    schemas: O.Option<Record<string, SchemaObject>>;
 };
 export type OpenAPISchema = {
     openapi: string;
@@ -59,6 +47,30 @@ export type OpenAPISchema = {
     paths: Record<string, Partial<Record<OpenApiHttpMethod, Path>>>;
     components: ComponentSchema;
 };
+export type SchemaObject = ArraySchemaObject | NonArraySchemaObject;
+export interface ArraySchemaObject extends BaseSchemaObject {
+    type: 'array';
+    items: SchemaObject;
+}
+export type NonArraySchemaObjectType = 'boolean' | 'object' | 'number' | 'string' | 'integer';
+export interface NonArraySchemaObject extends BaseSchemaObject {
+    type: O.Option<NonArraySchemaObjectType>;
+}
+export type BaseSchemaObject = {
+    additionalProperties: O.Option<boolean | SchemaObject>;
+    properties: O.Option<Record<string, SchemaObject>>;
+    required: O.Option<string[]>;
+    allOf: O.Option<SchemaObject[]>;
+    oneOf: O.Option<SchemaObject[]>;
+    anyOf: O.Option<SchemaObject[]>;
+    not: O.Option<SchemaObject>;
+    in: O.Option<string>;
+};
+export declare const baseSchemaObjectSchemaTypeDescriptor: t.Type<BaseSchemaObject, unknown>;
+export declare const schemaObjectTypeDescriptor: t.Type<SchemaObject, unknown>;
+export declare const schemaObjectTypeCodec: import("commons/dist/codec/Codec").Codec<SchemaObject>;
+export declare const parameterSchemaTypeDescriptor: t.Type<Parameter, unknown>;
+export declare const openApiSpecPathTypeDescriptor: t.Type<Path, unknown>;
 export declare const openApiSpecTypeDescriptor: t.Type<OpenAPISchema, unknown>;
 export {};
 //# sourceMappingURL=OpenApiTypeDescriptors.d.ts.map

package/dist/OpenApiTypeDescriptors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApiTypeDescriptors.d.ts","sourceRoot":"","sources":["../src/OpenApiTypeDescriptors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAE3B,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAGlC,MAAM,MAAM,IAAI,GAAG;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;KACzB,CAAC;CACF,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5E,KAAK,WAAW,GAAG;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,CAAC;CACtB,CAAC;AAEF,KAAK,YAAY,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC3C,oBAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,WAAW,GAAG,YAAY,CAAC;AAE3E,KAAK,eAAe,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,EAAE,eAAe,CAAC;CAC5B,CAAC;AAqFF,eAAO,MAAM,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAWpE,CAAC"}
+{"version":3,"file":"OpenApiTypeDescriptors.d.ts","sourceRoot":"","sources":["../src/OpenApiTypeDescriptors.ts"],"names":[],"mappings":"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"}

package/dist/OpenApiTypeDescriptors.js

@@ -23,54 +23,77 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openApiSpecTypeDescriptor = void 0;
+exports.openApiSpecTypeDescriptor = exports.openApiSpecPathTypeDescriptor = exports.parameterSchemaTypeDescriptor = exports.schemaObjectTypeCodec = exports.schemaObjectTypeDescriptor = exports.baseSchemaObjectSchemaTypeDescriptor = void 0;
 const t = __importStar(require("io-ts"));
 const io_ts_types_1 = require("io-ts-types");
 const TypeCodec_1 = require("@trayio/commons/codec/TypeCodec");
 // Codecs
-const openApiSpecPropertySchemaTypeDescriptor = t.type({ type: t.string });
-const openApiSpecObjectSchemaTypeDescriptor = t.type({
-    type: t.literal('object'),
-    properties: t.record(t.string, openApiSpecPropertySchemaTypeDescriptor),
-    additionalProperties: (0, io_ts_types_1.optionFromNullable)(t.boolean),
+const nonArraySchemaObjectType = t.keyof({
+    boolean: null,
+    object: null,
+    number: null,
+    string: null,
+    integer: null,
 });
-const openApiSpecArraySchemaTypeDescriptor = t.type({
-    type: t.literal('array'),
-    items: openApiSpecPropertySchemaTypeDescriptor,
-});
-const openApiSpecMediaTypeTypeDescriptor = t.type({
-    schema: t.union([
-        openApiSpecObjectSchemaTypeDescriptor,
-        openApiSpecArraySchemaTypeDescriptor,
-    ]),
+exports.baseSchemaObjectSchemaTypeDescriptor = t.recursion('baseSchema', () => t.type({
+    additionalProperties: (0, io_ts_types_1.optionFromNullable)(t.union([t.boolean, exports.schemaObjectTypeDescriptor])),
+    properties: (0, io_ts_types_1.optionFromNullable)(t.record(t.string, exports.schemaObjectTypeDescriptor)),
+    required: (0, io_ts_types_1.optionFromNullable)(t.array(t.string)),
+    allOf: (0, io_ts_types_1.optionFromNullable)(t.array(exports.schemaObjectTypeDescriptor)),
+    oneOf: (0, io_ts_types_1.optionFromNullable)(t.array(exports.schemaObjectTypeDescriptor)),
+    anyOf: (0, io_ts_types_1.optionFromNullable)(t.array(exports.schemaObjectTypeDescriptor)),
+    not: (0, io_ts_types_1.optionFromNullable)(exports.schemaObjectTypeDescriptor),
+    in: (0, io_ts_types_1.optionFromNullable)(t.string),
+}));
+const arraySchemaObjectSchemaTypeDescriptor = t.recursion('ArraySchema', () => t.intersection([
+    exports.baseSchemaObjectSchemaTypeDescriptor,
+    t.type({ type: t.literal('array'), items: exports.schemaObjectTypeDescriptor }),
+]));
+const nonArraySchemaObjectSchemaTypeDescriptor = t.recursion('nonArraySchema', () => t.intersection([
+    exports.baseSchemaObjectSchemaTypeDescriptor,
+    t.type({
+        type: (0, io_ts_types_1.optionFromNullable)(nonArraySchemaObjectType),
+    }),
+]));
+// TODO: do we need the schemaObjectTypeDescriptor AND the schemaObjectTypeCodec?
+// Added the schemaObjectTypeCodec in order to use the RemoveNullValuesCodec to remove O.none values instead of sestting them to null
+exports.schemaObjectTypeDescriptor = t.recursion('schemaObject', () => t.union([
+    arraySchemaObjectSchemaTypeDescriptor,
+    nonArraySchemaObjectSchemaTypeDescriptor,
+]));
+exports.schemaObjectTypeCodec = TypeCodec_1.TypeCodec.fromDescriptor(t.recursion('schemaObject', () => t.union([
+    arraySchemaObjectSchemaTypeDescriptor,
+    nonArraySchemaObjectSchemaTypeDescriptor,
+])));
+const componentSchemaTypeDescriptor = t.type({
+    schemas: (0, io_ts_types_1.optionFromNullable)(t.record(t.string, exports.schemaObjectTypeDescriptor)),
 });
-const openApiSpecComponentSchemaTypeDescriptor = t.type({
-    schemas: t.record(t.string, t.union([
-        openApiSpecObjectSchemaTypeDescriptor,
-        openApiSpecArraySchemaTypeDescriptor,
-    ])),
+const mediaTypeTypeDescriptor = t.type({
+    schema: (0, io_ts_types_1.optionFromNullable)(exports.schemaObjectTypeDescriptor),
 });
 const openApiSpecRequestBodyTypeDescriptor = t.type({
-    content: t.record(t.string, openApiSpecMediaTypeTypeDescriptor),
+    content: t.record(t.string, mediaTypeTypeDescriptor),
 });
 const openApiSpecResponsesTypeDescriptor = t.record(t.string, t.type({
     description: t.string,
-    content: (0, io_ts_types_1.optionFromNullable)(t.record(t.string, openApiSpecMediaTypeTypeDescriptor)),
+    content: (0, io_ts_types_1.optionFromNullable)(t.record(t.string, mediaTypeTypeDescriptor)),
 }));
-const openApiSpecPathTypeDescriptor = t.type({
+exports.parameterSchemaTypeDescriptor = t.type({
+    name: t.string,
+    in: t.string,
+    description: t.string,
+    required: t.boolean,
+    schema: t.type({
+        type: t.string,
+        format: (0, io_ts_types_1.optionFromNullable)(t.string),
+        items: (0, io_ts_types_1.optionFromNullable)(exports.schemaObjectTypeDescriptor),
+    }),
+});
+exports.openApiSpecPathTypeDescriptor = t.type({
     description: t.string,
-    tags: t.array(t.string),
+    tags: (0, io_ts_types_1.optionFromNullable)(t.array(t.string)),
     operationId: t.string,
-    parameters: (0, io_ts_types_1.optionFromNullable)(t.array(t.type({
-        name: t.string,
-        in: t.string,
-        description: t.string,
-        required: t.boolean,
-        schema: t.type({
-            type: t.string,
-            format: (0, io_ts_types_1.optionFromNullable)(t.string),
-        }),
-    }))),
+    parameters: (0, io_ts_types_1.optionFromNullable)(t.array(exports.parameterSchemaTypeDescriptor)),
     requestBody: (0, io_ts_types_1.optionFromNullable)(openApiSpecRequestBodyTypeDescriptor),
     responses: (0, io_ts_types_1.optionFromNullable)(openApiSpecResponsesTypeDescriptor),
 });
@@ -85,6 +108,6 @@ exports.openApiSpecTypeDescriptor = t.type({
     openapi: t.string,
     info: t.type({ title: t.string, description: t.string, version: t.string }),
     servers: t.array(t.type({ url: t.string })),
-    paths: t.record(t.string, TypeCodec_1.TypeCodec.partialRecord(httpKeys, openApiSpecPathTypeDescriptor)),
-    components: openApiSpecComponentSchemaTypeDescriptor,
+    paths: t.record(t.string, TypeCodec_1.TypeCodec.partialRecord(httpKeys, exports.openApiSpecPathTypeDescriptor)),
+    components: componentSchemaTypeDescriptor,
 });

package/dist/file-generators/GenerateHandler.d.ts

@@ -1,5 +1,5 @@
 import * as E from 'fp-ts/Either';
-import { JSONSchema4 } from 'json-schema';
+import { SchemaObject } from '../OpenApiTypeDescriptors';
 type HandlerHttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
 export type GenerateHandlerInput = {
     connectorNamePascalCase: string;
@@ -7,9 +7,9 @@ export type GenerateHandlerInput = {
     operationNameCamelCase: string;
     httpMethod: HandlerHttpMethod;
     baseUrl: string;
-    path: string;
-    input: JSONSchema4;
+    httpPath: string;
+    input: SchemaObject;
 };
-export declare const generateHandler: ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, path, input, }: GenerateHandlerInput) => E.Either<Error, string>;
+export declare const generateHandler: ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, httpPath, input, }: GenerateHandlerInput) => E.Either<Error, string>;
 export {};
 //# sourceMappingURL=GenerateHandler.d.ts.map

package/dist/file-generators/GenerateHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateHandler.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAC;AAE/D,KAAK,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG;IAClC,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;CACnB,CAAC;AAyGF,eAAO,MAAM,eAAe,oHAQzB,oBAAoB,KAAG,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAoB9C,CAAC"}
+{"version":3,"file":"GenerateHandler.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateHandler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAEN,YAAY,EACZ,MAAM,2BAA2B,CAAC;AAEnC,KAAK,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG;IAClC,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;CACpB,CAAC;AAsHF,eAAO,MAAM,eAAe,wHAQzB,oBAAoB,KAAG,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAoB9C,CAAC"}

package/dist/file-generators/GenerateHandler.js

@@ -24,12 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateHandler = void 0;
+const O = __importStar(require("fp-ts/Option"));
 const E = __importStar(require("fp-ts/Either"));
-const getInputVariable = (name, type) => {
-    if (type === undefined) {
-        return `input.${name}`;
-    }
-    switch (type) {
+const getInputVariable = (name, type) => O.fold(() => `input.${name}`, (inputType) => {
+    switch (inputType) {
         case 'integer':
         case 'boolean':
         case 'number':
@@ -37,40 +35,13 @@ const getInputVariable = (name, type) => {
         default:
             return `input.${name}`;
     }
-};
-const handleInput = (inputs) => {
-    if (inputs.properties === undefined ||
-        Object.keys(inputs.properties).length === 0) {
-        return 'request.withoutBody()';
-    }
-    const inputsArray = Object.entries(inputs.properties);
-    const bodyInputs = [];
-    const handlerInput = inputsArray.map(([name, input], index) => {
-        const prefix = index === 0 ? 'request.' : '';
-        let inputMapping = '';
-        switch (input.in) {
-            case 'body':
-                bodyInputs.push(`${name}: input.${name}`);
-                break;
-            case 'path':
-                inputMapping = `addPathParameter("${name}", ${getInputVariable(name, input.type)})`;
-                break;
-            case 'query':
-                inputMapping = `addQueryString("${name}", ${getInputVariable(name, input.type)})`;
-                break;
-            case 'header':
-                inputMapping = `addHeader("${name}", ${getInputVariable(name, input.type)})`;
-                break;
-        }
-        return prefix + inputMapping;
-    });
-    return generateRequestHandlerInputs(handlerInput, bodyInputs);
-};
+})(type);
 const generateRequestHandlerInputs = (inputs, bodyInputs) => {
     if (bodyInputs.length > 0) {
         const constructedBodyProperty = `withBodyAsJson({ ${bodyInputs.join(',')} })`;
         if (inputs[0] === 'request.') {
-            return inputs
+            const cleanInput = inputs.filter((item) => item !== '');
+            return cleanInput
                 .join('.')
                 .replace('request.', `request.${constructedBodyProperty}`);
         }
@@ -82,18 +53,44 @@ const generateRequestHandlerInputs = (inputs, bodyInputs) => {
     const cleanInput = inputs.filter((item) => item !== '');
     return cleanInput.join('.');
 };
-const generatePath = (path, inputs) => {
-    if (inputs.properties === undefined) {
-        return path;
-    }
-    return Object.entries(inputs.properties).reduce((acc, [name, input]) => {
-        if (input.in === 'path') {
-            return acc.replace(`{${name}}`, `:${name}`);
+const constructInputs = (properties) => {
+    const inputsArray = Object.entries(properties);
+    const bodyInputs = [];
+    const handlerInput = inputsArray.map(([name, input], index) => {
+        const prefix = index === 0 ? 'request.' : '';
+        let inputMapping = '';
+        if (input.type === 'array') {
+            // TODO: improve error message and ideally handle this more gracefully, do we expect array types at the root level?
+            throw new Error('Array type not yet supported');
         }
-        return acc;
-    }, path);
+        return O.fold(() => '', (inputIn) => {
+            switch (inputIn) {
+                case 'body':
+                    bodyInputs.push(`${name}: input.${name}`);
+                    break;
+                case 'path':
+                    inputMapping = `addPathParameter("${name}", ${getInputVariable(name, input.type)})`;
+                    break;
+                case 'query':
+                    inputMapping = `addQueryString("${name}", ${getInputVariable(name, input.type)})`;
+                    break;
+                case 'header':
+                    inputMapping = `addHeader("${name}", ${getInputVariable(name, input.type)})`;
+                    break;
+            }
+            return prefix + inputMapping;
+        })(input.in);
+    });
+    return generateRequestHandlerInputs(handlerInput, bodyInputs);
 };
-const generateHandler = ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, path, input, }) => E.tryCatch(() => `import { OperationHandlerSetup } from "@trayio/cdk-dsl/connector/operation/OperationHandlerSetup";
+const handleInput = (inputs) => O.fold(() => 'request.withoutBody()', (properties) => constructInputs(properties))(inputs.properties);
+const generatePath = (path, inputs) => O.fold(() => path, (properties) => Object.entries(properties).reduce((acc, [name, input]) => O.fold(() => acc, (inValue) => {
+    if (inValue === 'path') {
+        return acc.replace(`{${name}}`, `:${name}`);
+    }
+    return acc;
+})(input.in), path))(inputs.properties);
+const generateHandler = ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, httpPath, input, }) => E.tryCatch(() => `import { OperationHandlerSetup } from "@trayio/cdk-dsl/connector/operation/OperationHandlerSetup";
         import { ${connectorNamePascalCase}Auth } from "../${connectorNamePascalCase}Auth";
         import { ${operationNamePascalCase}Input } from "./input";
         import { ${operationNamePascalCase}Output } from "./output";
@@ -105,7 +102,7 @@ const generateHandler = ({ connectorNamePascalCase, operationNamePascalCase, ope
         >((handler) =>
           handler.usingHttp((http) =>
             http
-              .${httpMethod}("${baseUrl}${generatePath(path, input)}")
+              .${httpMethod}("${baseUrl}${generatePath(httpPath, input)}")
               .handleRequest((ctx, input, request) => ${handleInput(input)})
               .handleResponse((ctx, input, response) => response.parseWithBodyAsJson())
           )