@trayio/tray-openapi 2.6.0 → 2.8.0

package/dist/OpenApiSchemaImporter.d.ts

@@ -1,12 +1,14 @@
 import * as TE from 'fp-ts/TaskEither';
+import { FileStorage } from '@trayio/commons/file/File';
 import { Generator } from '@trayio/generator/generator/Generator';
 export declare class OpenApiSchemaImporter {
     private generator;
-    constructor(generator: Generator);
+    private fileStorage;
+    constructor(generator: Generator, fileStorage: FileStorage);
     buildConnector(openApiSpecPath: string, connectorName: string): TE.TaskEither<Error, undefined>;
     private generateOperationFromPath;
     private getOpenApiSpec;
-    private generateHandlerFile;
+    private generateHandlerFilesAndOperationJson;
     private generateConnectorDirectory;
     private generateOperationDirectory;
 }

package/dist/OpenApiSchemaImporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApiSchemaImporter.d.ts","sourceRoot":"","sources":["../src/OpenApiSchemaImporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAQvC,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAclE,qBAAa,qBAAqB;IACrB,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC,cAAc,CACb,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACnB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAoClC,OAAO,CAAC,yBAAyB;IA+BjC,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,mBAAmB;IAoC3B,OAAO,CAAC,0BAA0B;IAwBlC,OAAO,CAAC,0BAA0B;CAalC"}
+{"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"}

package/dist/OpenApiSchemaImporter.js

@@ -27,44 +27,71 @@ exports.OpenApiSchemaImporter = void 0;
 const TE = __importStar(require("fp-ts/TaskEither"));
 const E = __importStar(require("fp-ts/Either"));
 const function_1 = require("fp-ts/function");
-const fse = __importStar(require("fs-extra"));
 const Array_1 = require("fp-ts/Array");
+const Apply_1 = require("fp-ts/Apply");
+const json_ref_resolver_1 = require("@stoplight/json-ref-resolver");
 const StringExtensions_1 = require("@trayio/commons/string/StringExtensions");
 const lodash_1 = require("lodash");
-const Task_1 = require("@trayio/commons/task/Task");
+const stream_1 = require("stream");
+const BufferExtensions_1 = require("@trayio/commons/buffer/BufferExtensions");
 const OpenApiCodecs_1 = require("./OpenApiCodecs");
-const GenerateHandler_1 = require("./GenerateHandler");
+const GenerateHandler_1 = require("./file-generators/GenerateHandler");
+const GenerateOutput_1 = require("./file-generators/types/GenerateOutput");
+const GenerateInputTypes_1 = require("./file-generators/types/GenerateInputTypes");
+const GenerateHandlerTest_1 = require("./file-generators/GenerateHandlerTest");
+const GenerateOperationJson_1 = require("./file-generators/GenerateOperationJson");
+const GenerateInputSchema_1 = require("./file-generators/types/GenerateInputSchema");
 class OpenApiSchemaImporter {
-    constructor(generator) {
+    constructor(generator, fileStorage) {
         this.generator = generator;
+        this.fileStorage = fileStorage;
     }
     buildConnector(openApiSpecPath, connectorName) {
-        return (0, function_1.pipe)(this.generateConnectorDirectory(connectorName), TE.bindTo('connectorPath'), TE.bind('openApiSpec', () => (0, Task_1.createTaskEitherFromEither)(this.getOpenApiSpec(openApiSpecPath))), TE.bind('paths', ({ openApiSpec }) => TE.right(Object.keys(openApiSpec.paths).map((path) => ({
+        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.map(({ openApiSpec, connectorPath, paths }) => (0, Array_1.traverse)(TE.ApplicativeSeq)((path) => (0, Task_1.createTaskEitherFromEither)(this.generateOperationFromPath(path, connectorPath, openApiSpec.servers[0].url, connectorName)))(paths)), TE.map(() => undefined));
+        })))), 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)(E.Applicative)((route) => (0, function_1.pipe)(this.generateOperationDirectory(connectorPath, route.path.operationId), E.chain((operationPath) => this.generateHandlerFile(operationPath, route.method, baseUrl, path.path, connectorName, route.path.operationId)), E.map(() => undefined)))(path.routes), E.map(() => undefined));
+        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));
     }
     getOpenApiSpec(openApiSpecPath) {
-        return (0, function_1.pipe)(E.tryCatch(() => fse.readFileSync(openApiSpecPath, 'utf-8'), (error) => new Error(`Failed to read OpenAPI spec from path ${openApiSpecPath}: ${error}`)), E.chain((openApiSpec) => E.tryCatch(() => JSON.parse(openApiSpec), (error) => new Error(`Failed to parse OpenAPI spec as JSON from path ${openApiSpecPath}: ${error}`))), E.chain((openApiSpec) => OpenApiCodecs_1.openApiSpecCodec.decode(openApiSpec)));
+        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))));
     }
-    generateHandlerFile(operationPath, httpMethod, baseUrl, path, connectorName, operationName) {
-        return (0, function_1.pipe)(E.right({
-            connectorNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(connectorName),
-            operationNameCamelCase: (0, lodash_1.camelCase)(operationName),
-            operationNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(operationName),
-            httpMethod,
-            baseUrl,
-            path,
-            input: [],
-        }), E.chain((parameters) => (0, GenerateHandler_1.generateHandler)(parameters)), E.chain((handler) => E.tryCatch(() => {
-            fse.writeFileSync(`${operationPath}/handler.ts`, handler, 'utf-8');
-        }, (error) => new Error(`Failed to write handler to file system: ${error}`))), E.map(() => undefined), E.mapLeft((error) => new Error(`Failed to generate handler for operation: ${error}`)));
+    generateHandlerFilesAndOperationJson(route, operationPath, baseUrl, path, connectorName, input, output) {
+        const { method, path: { operationId: operationName, description }, } = route;
+        const writeFile = (content, fileName) => this.fileStorage.write({
+            content: stream_1.Readable.from(content),
+            key: `${operationPath}/${fileName}`,
+            metadata: { name: fileName },
+        });
+        const operationFileGenerationTasks = {
+            handler: (0, function_1.pipe)(TE.fromEither((0, GenerateHandler_1.generateHandler)({
+                connectorNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(connectorName),
+                operationNameCamelCase: (0, lodash_1.camelCase)(operationName),
+                operationNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(operationName),
+                httpMethod: method,
+                baseUrl,
+                path,
+                input,
+            })), 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,
+                output,
+            })), 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),
+        };
+        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));
     }
     generateConnectorDirectory(connectorName) {
         return (0, function_1.pipe)(TE.right({
@@ -72,10 +99,10 @@ class OpenApiSchemaImporter {
             connectorNameKebabCase: (0, lodash_1.kebabCase)(connectorName),
             connectorNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(connectorName),
             connectorNameCamelCase: (0, lodash_1.camelCase)(connectorName),
-        }), TE.chain((parameters) => this.generator.generate(`${__dirname}/templates/connector-template.zip`, `${process.cwd()}/test`, parameters)), TE.map(() => `${process.cwd()}/test/${(0, lodash_1.kebabCase)(connectorName)}`), TE.mapLeft((error) => new Error(`Failed to generate connector directory: ${error}`)));
+        }), TE.chain((parameters) => this.generator.generate(`${__dirname}/templates/connector-template.zip`, `${process.cwd()}/test`, parameters)), TE.map(() => `/test/${(0, lodash_1.kebabCase)(connectorName)}`), TE.mapLeft((error) => new Error(`Failed to generate connector directory: ${error}`)));
     }
     generateOperationDirectory(connectorPath, operationName) {
-        return (0, function_1.pipe)(E.tryCatch(() => fse.ensureDirSync(`${connectorPath}/src/${(0, lodash_1.kebabCase)(operationName)}`), (error) => new Error(`Failed to create operation directory: ${error}`)), E.map(() => `${connectorPath}/src/${(0, lodash_1.kebabCase)(operationName)}`));
+        return (0, function_1.pipe)(TE.tryCatch(this.fileStorage.createDirectory(`${connectorPath}/src/${(0, lodash_1.kebabCase)(operationName)}`), (error) => new Error(`Failed to create operation directory: ${error}`)), TE.map(() => `${connectorPath}/src/${(0, lodash_1.kebabCase)(operationName)}`));
     }
 }
 exports.OpenApiSchemaImporter = OpenApiSchemaImporter;

package/dist/OpenApiSchemaImporter.test.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,12 +33,43 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const NodeFsGenerator_1 = require("@trayio/generator/generator/NodeFsGenerator");
+const FakeFileStorage_1 = require("@trayio/commons/file/FakeFileStorage");
+const stream_1 = require("stream");
+const fs = __importStar(require("fs-extra"));
 const OpenApiSchemaImporter_1 = require("./OpenApiSchemaImporter");
+const openApiSpec = __importStar(require("./single-get-openapi.json"));
 describe('openApiSchemaImporter', () => {
     const generator = new NodeFsGenerator_1.NodeFsGenerator();
-    const openApiSchemaImporter = new OpenApiSchemaImporter_1.OpenApiSchemaImporter(generator);
-    it('should decode the openApiSpec', () => __awaiter(void 0, void 0, void 0, function* () {
-        const schema = yield openApiSchemaImporter.buildConnector(`${__dirname}/single-get-openapi.json`, 'testConnector')();
-        expect(schema._tag).toEqual('Right');
+    const fileStorage = new FakeFileStorage_1.FakeFileStorage();
+    const openApiSchemaImporter = new OpenApiSchemaImporter_1.OpenApiSchemaImporter(generator, fileStorage);
+    let result;
+    beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
+        fileStorage.write({
+            key: `${__dirname}/single-get-openapi.json`,
+            metadata: { name: 'single-get-openapi.json' },
+            content: stream_1.Readable.from(Buffer.from(JSON.stringify(openApiSpec))),
+        });
+        result = yield openApiSchemaImporter.buildConnector(`${__dirname}/single-get-openapi.json`, 'testConnector')();
+    }));
+    afterAll(() => __awaiter(void 0, void 0, void 0, function* () {
+        yield fs.rm(`${process.cwd()}/test/`, { recursive: true, force: true });
     }));
+    it('should import successfully', () => {
+        expect(result._tag).toEqual('Right');
+    });
+    it('should generate a operation handler', () => {
+        expect(fileStorage.files.has(`/test/test-connector/src/get-post/handler.ts`)).toEqual(true);
+    });
+    it('should generate an operation handler test', () => {
+        expect(fileStorage.files.has(`/test/test-connector/src/get-post/handler.test.ts`)).toEqual(true);
+    });
+    it('should generate an operation.json', () => {
+        expect(fileStorage.files.has(`/test/test-connector/src/get-post/operation.json`)).toEqual(true);
+    });
+    it('should generate an output.ts', () => {
+        expect(fileStorage.files.has(`/test/test-connector/src/get-post/output.ts`)).toEqual(true);
+    });
+    it('should generate a operation directory', () => {
+        expect(fileStorage.files.has(`/test/test-connector/src/get-post`)).toEqual(true);
+    });
 });

package/dist/OpenApiTypeDescriptors.d.ts

@@ -6,6 +6,7 @@ export type Path = {
     operationId: string;
     parameters: O.Option<Parameter[]>;
     requestBody: O.Option<RequestBody>;
+    responses: O.Option<Responses>;
 };
 export type Parameter = {
     name: string;
@@ -20,22 +21,26 @@ export type Parameter = {
 export type RequestBody = {
     content: Record<string, MediaType>;
 };
-type MediaType = {
+export type MediaType = {
     schema: ArraySchema | ObjectSchema;
 };
+export type Responses = Record<string, Response>;
+export type Response = {
+    description: string;
+    content: O.Option<Record<string, MediaType>>;
+};
 export type OpenApiHttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
 type ArraySchema = {
     type: 'array';
-    items: {
-        $ref: string;
-    };
+    items: PropertySchema;
 };
 type ObjectSchema = {
     type: 'object';
     required?: string[];
     properties: Record<string, PropertySchema>;
+    additionalProperties: O.Option<boolean>;
 };
-type PropertySchema = {
+export type PropertySchema = {
     type: string;
 } | ArraySchema | ObjectSchema;
 type ComponentSchema = {

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;CACnC,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,KAAK,SAAS,GAAG;IAChB,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CACnC,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;QACN,IAAI,EAAE,MAAM,CAAC;KACb,CAAC;CACF,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;CAC3C,CAAC;AAEF,KAAK,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,WAAW,GAAG,YAAY,CAAC;AAEpE,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;AAoEF,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":"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"}

package/dist/OpenApiTypeDescriptors.js

@@ -27,12 +27,17 @@ exports.openApiSpecTypeDescriptor = 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 openApiSpecArraySchemaTypeDescriptor = t.type({
+    type: t.literal('array'),
+    items: openApiSpecPropertySchemaTypeDescriptor,
 });
-const openApiSpecArraySchemaTypeDescriptor = t.type({ type: t.literal('array'), items: t.any });
 const openApiSpecMediaTypeTypeDescriptor = t.type({
     schema: t.union([
         openApiSpecObjectSchemaTypeDescriptor,
@@ -48,6 +53,10 @@ const openApiSpecComponentSchemaTypeDescriptor = t.type({
 const openApiSpecRequestBodyTypeDescriptor = t.type({
     content: t.record(t.string, openApiSpecMediaTypeTypeDescriptor),
 });
+const openApiSpecResponsesTypeDescriptor = t.record(t.string, t.type({
+    description: t.string,
+    content: (0, io_ts_types_1.optionFromNullable)(t.record(t.string, openApiSpecMediaTypeTypeDescriptor)),
+}));
 const openApiSpecPathTypeDescriptor = t.type({
     description: t.string,
     tags: t.array(t.string),
@@ -63,6 +72,7 @@ const openApiSpecPathTypeDescriptor = t.type({
         }),
     }))),
     requestBody: (0, io_ts_types_1.optionFromNullable)(openApiSpecRequestBodyTypeDescriptor),
+    responses: (0, io_ts_types_1.optionFromNullable)(openApiSpecResponsesTypeDescriptor),
 });
 const httpKeys = t.keyof({
     get: null,

package/dist/ResolveOptionValues.d.ts

@@ -0,0 +1,3 @@
+import * as E from 'fp-ts/Either';
+export declare const resolveOptionValues: (value: unknown) => E.Either<Error, unknown>;
+//# sourceMappingURL=ResolveOptionValues.d.ts.map

package/dist/ResolveOptionValues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResolveOptionValues.d.ts","sourceRoot":"","sources":["../src/ResolveOptionValues.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,eAAO,MAAM,mBAAmB,UAAW,OAAO,KAAG,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,CAC/B,CAAC"}

package/dist/{connector/input/TransformInput.js → ResolveOptionValues.js}

@@ -23,32 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformInput = void 0;
-const openapi_schema_to_json_schema_1 = require("@openapi-contrib/openapi-schema-to-json-schema");
+exports.resolveOptionValues = void 0;
+const Option_1 = require("fp-ts/lib/Option");
 const O = __importStar(require("fp-ts/Option"));
-const transformInput = (parameters) => {
-    const transformedParameters = {};
-    const requiredParameters = [];
-    parameters.forEach((parameter) => {
-        const paramterWithJsdocAnnotation = {
-            name: parameter.name,
-            description: `@description ${parameter.description}`,
-            required: parameter.required,
-            schema: {
-                type: parameter.schema.type,
-                format: O.toNullable(parameter.schema.format) || undefined,
-            },
-        };
-        transformedParameters[parameter.name] = (0, openapi_schema_to_json_schema_1.fromParameter)(paramterWithJsdocAnnotation);
-        if (parameter.required === true) {
-            requiredParameters.push(parameter.name);
-        }
-    });
-    return {
-        type: 'object',
-        properties: Object.assign({}, transformedParameters),
-        required: [...requiredParameters],
-        additionalProperties: false,
-    };
+const E = __importStar(require("fp-ts/Either"));
+const resolveOptionValues = (value) => E.right(resolveOptionValuesIfPresent(value));
+exports.resolveOptionValues = resolveOptionValues;
+const isObject = (value) => typeof value === 'object' && !Array.isArray(value) && value !== null;
+const isOption = (value) => (0, Option_1.isSome)(value) || (0, Option_1.isNone)(value);
+const resolveOptionValuesIfPresent = (value) => {
+    if (isOption(value)) {
+        return O.fold(() => undefined, (someValue) => someValue)(value);
+    }
+    if (isObject(value)) {
+        return resolveOptionFromObjectIfPresent(value);
+    }
+    return value;
 };
-exports.transformInput = transformInput;
+const resolveOptionFromObjectIfPresent = (value) => Object.entries(value).reduce((acc, [key, propertyValue]) => (Object.assign(Object.assign({}, acc), { [key]: resolveOptionValuesIfPresent(propertyValue) })), {});

package/dist/ResolveOptionValues.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ResolveOptionValues.test.d.ts.map

package/dist/ResolveOptionValues.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResolveOptionValues.test.d.ts","sourceRoot":"","sources":["../src/ResolveOptionValues.test.ts"],"names":[],"mappings":""}

package/dist/ResolveOptionValues.test.js

@@ -0,0 +1,91 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const O = __importStar(require("fp-ts/Option"));
+const E = __importStar(require("fp-ts/Either"));
+const ResolveOptionValues_1 = require("./ResolveOptionValues");
+describe('ResolveOptionValues', () => {
+    it('it should resolve some options to their underlying values', () => {
+        const given = O.some('some value');
+        const resolvedOptions = (0, ResolveOptionValues_1.resolveOptionValues)(given);
+        const actual = E.getOrElse((error) => {
+            throw new Error('Should have been right');
+        })(resolvedOptions);
+        const expected = 'some value';
+        expect(actual).toEqual(expected);
+    });
+    it('it should resolve none options to undefined', () => {
+        const given = O.none;
+        const resolvedOptions = (0, ResolveOptionValues_1.resolveOptionValues)(given);
+        const actual = E.getOrElse((error) => {
+            throw new Error('Should have been right');
+        })(resolvedOptions);
+        const expected = undefined;
+        expect(actual).toEqual(expected);
+    });
+    it('it should return values unaltered that are not options', () => {
+        const given = 'some value';
+        const resolvedOptions = (0, ResolveOptionValues_1.resolveOptionValues)(given);
+        const actual = E.getOrElse((error) => {
+            throw new Error('Should have been right');
+        })(resolvedOptions);
+        const expected = 'some value';
+        expect(actual).toEqual(expected);
+    });
+    it('it should return arrays unaltered that are not options', () => {
+        const given = ['some value'];
+        const resolvedOptions = (0, ResolveOptionValues_1.resolveOptionValues)(given);
+        const actual = E.getOrElse((error) => {
+            throw new Error('Should have been right');
+        })(resolvedOptions);
+        const expected = ['some value'];
+        expect(actual).toEqual(expected);
+    });
+    it('it should resolve an object with some options to their underlying values', () => {
+        const given = {
+            property: 'some property',
+            someOptionalProperty: O.some('some value'),
+            noneOptionalProperty: O.none,
+            nestedObject: {
+                someNestedOptionalProperty: O.some('some nested value'),
+                someNestedNoneOptionalProperty: O.none,
+            },
+        };
+        const resolvedOptions = (0, ResolveOptionValues_1.resolveOptionValues)(given);
+        const actual = E.getOrElse((error) => {
+            throw new Error('Should have been right');
+        })(resolvedOptions);
+        const expected = {
+            property: 'some property',
+            someOptionalProperty: 'some value',
+            noneOptionalProperty: undefined,
+            nestedObject: {
+                someNestedOptionalProperty: 'some nested value',
+                someNestedNoneOptionalProperty: undefined,
+            },
+        };
+        expect(actual).toEqual(expected);
+    });
+});

package/dist/{GenerateHandler.d.ts → file-generators/GenerateHandler.d.ts}

@@ -1,11 +1,6 @@
 import * as E from 'fp-ts/Either';
-type InputMethod = 'path' | 'query' | 'body' | 'header';
+import { JSONSchema4 } from 'json-schema';
 type HandlerHttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
-type Input = {
-    name: string;
-    type: string;
-    in: InputMethod;
-};
 export type GenerateHandlerInput = {
     connectorNamePascalCase: string;
     operationNamePascalCase: string;
@@ -13,7 +8,7 @@ export type GenerateHandlerInput = {
     httpMethod: HandlerHttpMethod;
     baseUrl: string;
     path: string;
-    input: Input[];
+    input: JSONSchema4;
 };
 export declare const generateHandler: ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, path, input, }: GenerateHandlerInput) => E.Either<Error, string>;
 export {};

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

@@ -0,0 +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"}

package/dist/{GenerateHandler.js → file-generators/GenerateHandler.js}

@@ -25,39 +25,76 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateHandler = void 0;
 const E = __importStar(require("fp-ts/Either"));
+const getInputVariable = (name, type) => {
+    if (type === undefined) {
+        return `input.${name}`;
+    }
+    switch (type) {
+        case 'integer':
+        case 'boolean':
+        case 'number':
+            return `input.${name}.toString()`;
+        default:
+            return `input.${name}`;
+    }
+};
 const handleInput = (inputs) => {
-    if (!inputs.length) {
-        return 'request';
+    if (inputs.properties === undefined ||
+        Object.keys(inputs.properties).length === 0) {
+        return 'request.withoutBody()';
     }
-    const handlerInput = inputs.map((input, index) => {
+    const inputsArray = Object.entries(inputs.properties);
+    const bodyInputs = [];
+    const handlerInput = inputsArray.map(([name, input], index) => {
         const prefix = index === 0 ? 'request.' : '';
-        let inputMapping;
+        let inputMapping = '';
         switch (input.in) {
             case 'body':
-                inputMapping = `withBodyAsJson(input)`;
+                bodyInputs.push(`${name}: input.${name}`);
                 break;
             case 'path':
-                inputMapping = `addPathParameter("${input.name}", input.${input.name})`;
+                inputMapping = `addPathParameter("${name}", ${getInputVariable(name, input.type)})`;
                 break;
             case 'query':
-                inputMapping = `addQueryString("${input.name}", input.${input.name})`;
+                inputMapping = `addQueryString("${name}", ${getInputVariable(name, input.type)})`;
                 break;
             case 'header':
-                inputMapping = `addHeader("${input.name}", input.${input.name})`;
+                inputMapping = `addHeader("${name}", ${getInputVariable(name, input.type)})`;
                 break;
         }
         return prefix + inputMapping;
     });
-    return handlerInput.join('.');
+    return generateRequestHandlerInputs(handlerInput, bodyInputs);
 };
-const generatePath = (path, inputs) => inputs.reduce((acc, input) => {
-    if (input.in === 'path') {
-        return `${acc}/:${input.name}`;
+const generateRequestHandlerInputs = (inputs, bodyInputs) => {
+    if (bodyInputs.length > 0) {
+        const constructedBodyProperty = `withBodyAsJson({ ${bodyInputs.join(',')} })`;
+        if (inputs[0] === 'request.') {
+            return inputs
+                .join('.')
+                .replace('request.', `request.${constructedBodyProperty}`);
+        }
+        inputs.push(constructedBodyProperty);
+    }
+    else {
+        inputs.push('withoutBody()');
     }
-    return acc;
-}, path);
+    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}`);
+        }
+        return acc;
+    }, path);
+};
 const generateHandler = ({ connectorNamePascalCase, operationNamePascalCase, operationNameCamelCase, httpMethod, baseUrl, path, input, }) => E.tryCatch(() => `import { OperationHandlerSetup } from "@trayio/cdk-dsl/connector/operation/OperationHandlerSetup";
-        import { ${connectorNamePascalCase} } from "../${connectorNamePascalCase}";
+        import { ${connectorNamePascalCase}Auth } from "../${connectorNamePascalCase}Auth";
         import { ${operationNamePascalCase}Input } from "./input";
         import { ${operationNamePascalCase}Output } from "./output";
 
@@ -70,7 +107,7 @@ const generateHandler = ({ connectorNamePascalCase, operationNamePascalCase, ope
             http
               .${httpMethod}("${baseUrl}${generatePath(path, input)}")
               .handleRequest((ctx, input, request) => ${handleInput(input)})
-              .handleResponse((response) => response.parseWithBodyAsJson())
+              .handleResponse((ctx, input, response) => response.parseWithBodyAsJson())
           )
         );`, (error) => new Error(`Failed to generate handler: ${error}`));
 exports.generateHandler = generateHandler;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=GenerateHandler.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GenerateHandler.test.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateHandler.test.ts"],"names":[],"mappings":""}