@trayio/tray-openapi 2.9.0 → 2.10.0

package/dist/file-generators/GenerateHandler.test.js

@@ -24,8 +24,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const E = __importStar(require("fp-ts/Either"));
+const O = __importStar(require("fp-ts/Option"));
 const GenerateHandler_1 = require("./GenerateHandler");
-const getGenerateHandlerInput = (input) => (Object.assign({ connectorNamePascalCase: 'OpenApiTest', operationNamePascalCase: 'GetPhoto', operationNameCamelCase: 'getPhoto', httpMethod: 'get', baseUrl: 'https://jsonplaceholder.typicode.com', input: { properties: {} }, path: '/photos' }, input));
+const getGenerateHandlerInput = (input) => (Object.assign({ connectorNamePascalCase: 'OpenApiTest', operationNamePascalCase: 'GetPhoto', operationNameCamelCase: 'getPhoto', httpMethod: 'get', baseUrl: 'https://jsonplaceholder.typicode.com', input: {
+        properties: O.none,
+        additionalProperties: O.none,
+        required: O.none,
+        allOf: O.none,
+        oneOf: O.none,
+        anyOf: O.none,
+        not: O.none,
+        in: O.none,
+        type: O.none,
+    }, httpPath: '/photos' }, input));
 describe('GenerateHandler', () => {
     it('it should generate a handler with no inputs', () => {
         const payload = getGenerateHandlerInput({});
@@ -50,14 +61,31 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a path parameter', () => {
         const input = {
-            type: 'object',
-            properties: { photoId: { type: 'string', in: 'path' } },
-            required: ['photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                photoId: {
+                    type: O.some('string'),
+                    in: O.some('path'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['photoId']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({
             input,
-            path: '/photos/{photoId}',
+            httpPath: '/photos/{photoId}',
         });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
         expect(E.right(`import { OperationHandlerSetup } from "@trayio/cdk-dsl/connector/operation/OperationHandlerSetup";
@@ -80,10 +108,27 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a body input as json', () => {
         const input = {
-            type: 'object',
-            properties: { photoId: { type: 'string', in: 'body' } },
-            required: ['photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                photoId: {
+                    type: O.some('string'),
+                    in: O.some('body'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['photoId']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({ input });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
@@ -107,10 +152,27 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a query string input', () => {
         const input = {
-            type: 'object',
-            properties: { id: { type: 'string', in: 'query' } },
-            required: ['id'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                id: {
+                    type: O.some('string'),
+                    in: O.some('query'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['id']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({ input });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
@@ -134,10 +196,27 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a header input', () => {
         const input = {
-            type: 'object',
-            properties: { 'Content-Type': { type: 'string', in: 'header' } },
-            required: ['photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                'Content-Type': {
+                    type: O.some('string'),
+                    in: O.some('header'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['photoId']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({ input });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
@@ -161,10 +240,27 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler and transform number type to string for input', () => {
         const input = {
-            type: 'object',
-            properties: { 'Content-Type': { type: 'integer', in: 'header' } },
-            required: ['photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                'Content-Type': {
+                    type: O.some('integer'),
+                    in: O.some('header'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.none,
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({ input });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
@@ -188,18 +284,53 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a query string and path param input', () => {
         const input = {
-            type: 'object',
-            properties: {
-                id: { type: 'string', in: 'query' },
-                photoId: { type: 'string', in: 'path' },
-                commentId: { type: 'string', in: 'path' },
-            },
-            required: ['photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                id: {
+                    type: O.some('string'),
+                    in: O.some('query'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+                photoId: {
+                    type: O.some('string'),
+                    in: O.some('path'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+                commentId: {
+                    type: O.some('string'),
+                    in: O.some('path'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['photoId']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({
             input,
-            path: '/photos/{photoId}/{commentId}',
+            httpPath: '/photos/{photoId}/{commentId}',
         });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);
         expect(E.right(`import { OperationHandlerSetup } from "@trayio/cdk-dsl/connector/operation/OperationHandlerSetup";
@@ -222,13 +353,38 @@ describe('GenerateHandler', () => {
     });
     it('it should generate a handler with a query string and body param input', () => {
         const input = {
-            type: 'object',
-            properties: {
-                id: { type: 'string', in: 'query' },
-                photoId: { type: 'string', in: 'body' },
-            },
-            required: ['id', 'photoId'],
-            additionalProperties: false,
+            type: O.some('object'),
+            properties: O.some({
+                id: {
+                    type: O.some('string'),
+                    in: O.some('query'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+                photoId: {
+                    type: O.some('string'),
+                    in: O.some('body'),
+                    properties: O.none,
+                    additionalProperties: O.none,
+                    required: O.none,
+                    allOf: O.none,
+                    oneOf: O.none,
+                    anyOf: O.none,
+                    not: O.none,
+                },
+            }),
+            required: O.some(['id', 'photoId']),
+            additionalProperties: O.some(false),
+            allOf: O.none,
+            oneOf: O.none,
+            anyOf: O.none,
+            not: O.none,
+            in: O.none,
         };
         const payload = getGenerateHandlerInput({ input });
         const generatedHandler = (0, GenerateHandler_1.generateHandler)(payload);

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

@@ -1,9 +1,9 @@
-import { JSONSchema4 } from 'json-schema';
 import * as E from 'fp-ts/Either';
+import { SchemaObject } from '../OpenApiTypeDescriptors';
 export type GenerateHandlerTestInput = {
     operationNameCamelCase: string;
-    input: JSONSchema4;
-    output: JSONSchema4;
+    input: SchemaObject;
+    output: SchemaObject;
 };
 export declare const generateHandlerTest: ({ operationNameCamelCase, input, output, }: GenerateHandlerTestInput) => E.Either<Error, string>;
 //# sourceMappingURL=GenerateHandlerTest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateHandlerTest.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateHandlerTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAAG;IACtC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;CACpB,CAAC;AAmCF,eAAO,MAAM,mBAAmB,+CAI7B,wBAAwB,KAAG,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CA6BlD,CAAC"}
+{"version":3,"file":"GenerateHandlerTest.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateHandlerTest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,MAAM,wBAAwB,GAAG;IACtC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACrB,CAAC;AAiDF,eAAO,MAAM,mBAAmB,+CAI7B,wBAAwB,KAAG,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAqClD,CAAC"}

package/dist/file-generators/GenerateHandlerTest.js

@@ -25,23 +25,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateHandlerTest = void 0;
 const E = __importStar(require("fp-ts/Either"));
+const O = __importStar(require("fp-ts/Option"));
 const getDefaultValue = (prop) => {
-    switch (prop.type) {
-        case 'string':
-            return `'test'`;
-        case 'number':
-        case 'integer':
-            return 2;
-        case 'boolean':
-            return 'true';
-        case 'array':
-            return prop.items ? `[${getDefaultValue(prop.items)}]` : '[]';
-        case 'object':
-            return prop.properties ? handleInput(prop.properties) : '{}';
-        default:
-            return `'test_value'`;
+    if (prop.type === 'array') {
+        return prop.items ? `[${getDefaultValue(prop.items)}]` : '[]';
     }
+    return O.fold(() => `'test_value'`, (type) => {
+        switch (type) {
+            case 'string':
+                return `'test'`;
+            case 'number':
+            case 'integer':
+                return 2;
+            case 'boolean':
+                return 'true';
+            // case 'array':
+            // 	return prop.items ? `[${getDefaultValue(prop.items)}]` : '[]';
+            case 'object':
+                return O.fold(() => `{}`, (properties) => handleInput(properties))(prop.properties);
+            // return prop.properties ? handleInput(prop.properties) : '{}';
+            default:
+                return `'test_value'`;
+        }
+    })(prop.type);
 };
+// TODO: make handleInput and handleOutput accept an option and do the fold inside, will make the code cleaner in the template and switch case
 const handleInput = (inputs) => {
     const populatedTestInputs = Object.entries(inputs).map(([key, prop]) => `${key}: ${getDefaultValue(prop)}`);
     return `{ ${populatedTestInputs.join(', ')} }`;
@@ -62,15 +70,19 @@ const generateHandlerTest = ({ operationNameCamelCase, input, output, }) => E.tr
             .testCase('should ${operationNameCamelCase}', (testCase) =>
                 testCase
                     .givenNothing()
-                    .when(() => (${input.properties ? handleInput(input.properties) : `{}`}))
+                    .when(() => (${O.fold(() => `{}`, (properties) => handleInput(properties))(input.properties)}
+			))
                     .then(({ output }) => {
-                        // console.log(output);
+						// console.log(output);
                         const outputValue =
-                            OperationHandlerResult.getSuccessfulValueOrFail(output);
-                        ${handleOutput(output.properties || {})}
+						OperationHandlerResult.getSuccessfulValueOrFail(output);
+                        ${O.fold(() => `{}`, (properties) => handleOutput(properties))(output.properties)}
+                        
                     })
                     .finallyDoNothing()
-            )
-			.nothingAfterAll()
-    );`, (e) => new Error(`Failed to generate handler test: ${e}`));
+					)
+					.nothingAfterAll()
+					);`, (e) => new Error(`Failed to generate handler test: ${e}`));
 exports.generateHandlerTest = generateHandlerTest;
+// ${handleOutput(output.properties || {})}
+// .when(() => (${O.fold(input.properties ? handleInput(input.properties) : `{}`