@trayio/tray-openapi 4.15.2-unstable → 4.16.1

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;AASvC,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAGlE,OAAO,EAEN,sBAAsB,EAMtB,MAAM,0BAA0B,CAAC;AAalC,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,sBAAsB,CAAC;IAoD/C,OAAO,CAAC,yBAAyB;IAyDjC,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;IAoCtB,OAAO,CAAC,oCAAoC;IAgF5C,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;AAGlE,OAAO,EAEN,sBAAsB,EAMtB,MAAM,0BAA0B,CAAC;AAalC,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,sBAAsB,CAAC;IAoD/C,OAAO,CAAC,yBAAyB;IAyDjC,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;IAoCtB,OAAO,CAAC,oCAAoC;IA4F5C,OAAO,CAAC,0BAA0B;IAwBlC,OAAO,CAAC,0BAA0B;CAclC"}

package/dist/OpenApiSchemaImporter.js

@@ -108,6 +108,7 @@ class OpenApiSchemaImporter {
             metadata: { name: fileName },
         }, O.none);
         const operationName = path.operationId;
+        const handleFileCreationError = (error, fileName) => (0, function_1.pipe)(writeFile('', fileName), TE.mapLeft(() => error));
         const operationFileGenerationTasks = {
             handler: (0, function_1.pipe)(TE.fromEither((0, GenerateHandler_1.generateHandler)({
                 connectorNamePascalCase: StringExtensions_1.StringExtensions.pascalCase(connectorName),
@@ -119,15 +120,15 @@ class OpenApiSchemaImporter {
                 input,
             })), 
             // TODO: Why does this throw unhelpful errors?
-            TE.chain((handlerInput) => writeFile(handlerInput, 'handler.ts'))),
+            TE.chain((handlerInput) => writeFile(handlerInput, 'handler.ts')), TE.mapLeft((error) => handleFileCreationError(error, '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, (0, lodash_1.snakeCase)(operationName), (0, lodash_1.kebabCase)(operationName), path),
+            })), TE.chain((handlerInput) => writeFile(handlerInput, 'handler.test.ts')), TE.mapLeft((error) => handleFileCreationError(error, 'handler.test.ts'))),
+            generateOutputType: (0, function_1.pipe)((0, GenerateOutput_1.generateOutputTypes)(operationName, output), TE.chain((outputType) => writeFile(outputType, 'output.ts')), TE.mapLeft((error) => handleFileCreationError(error, 'output.ts'))),
+            generateInputType: (0, function_1.pipe)((0, GenerateInputTypes_1.generateInputTypes)(operationName, input), TE.chain((inputType) => writeFile(inputType, 'input.ts')), TE.mapLeft((error) => handleFileCreationError(error, 'input.ts'))),
+            operationJson: (0, function_1.pipe)((0, GenerateOperationJson_1.generateOperationJson)((0, lodash_1.snakeCase)(operationName), (0, lodash_1.kebabCase)(operationName), path), TE.chain((operationJson) => writeFile(operationJson, 'operation.json')), TE.mapLeft((error) => handleFileCreationError(error, 'operation.json'))),
         };
         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));
     }

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

@@ -1,5 +1,4 @@
 import * as TE from 'fp-ts/TaskEither';
-import { FileStorage } from '@trayio/commons/file/File';
 import { Path } from '../OpenApiTypeDescriptors';
-export declare const generateOperationJson: (fileStorage: FileStorage, operationDirPath: string, operationNameSnakeCase: string, operationNameKebabCase: string, path: Path) => TE.TaskEither<Error, undefined>;
+export declare const generateOperationJson: (operationNameSnakeCase: string, operationNameKebabCase: string, path: Path) => TE.TaskEither<Error, string>;
 //# sourceMappingURL=GenerateOperationJson.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateOperationJson.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateOperationJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGvC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,eAAO,MAAM,qBAAqB,gBACpB,WAAW,oBACN,MAAM,0BACA,MAAM,0BACN,MAAM,QACxB,IAAI,KACR,GAAG,UAAU,CAAC,KAAK,EAAE,SAAS,CAgChC,CAAC"}
+{"version":3,"file":"GenerateOperationJson.d.ts","sourceRoot":"","sources":["../../src/file-generators/GenerateOperationJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGvC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,eAAO,MAAM,qBAAqB,2BACT,MAAM,0BACN,MAAM,QACxB,IAAI,KACR,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAsB7B,CAAC"}

package/dist/file-generators/GenerateOperationJson.js

@@ -27,17 +27,12 @@ exports.generateOperationJson = void 0;
 const TE = __importStar(require("fp-ts/TaskEither"));
 const O = __importStar(require("fp-ts/Option"));
 const function_1 = require("fp-ts/function");
-const stream_1 = require("stream");
-const generateOperationJson = (fileStorage, operationDirPath, operationNameSnakeCase, operationNameKebabCase, path) => {
+const generateOperationJson = (operationNameSnakeCase, operationNameKebabCase, path) => {
     const operationDescription = O.getOrElse(() => O.getOrElse(() => '')(path.summary))(path.description);
     return (0, function_1.pipe)(operationDescription, TE.fromPredicate((description) => description.length > 0, () => new Error('Operation description is empty')), TE.map((description) => ({
         name: operationNameSnakeCase,
         title: operationNameKebabCase,
         description,
-    })), TE.chain((operationJson) => fileStorage.write({
-        content: stream_1.Readable.from(JSON.stringify(operationJson)),
-        key: `${operationDirPath}/operation.json`,
-        metadata: { name: 'operation.json' },
-    }, O.none)), TE.mapLeft((error) => new Error(`Failed to generate operation.json for operation: ${error}`)), TE.map(() => undefined));
+    })), TE.map((operationJson) => JSON.stringify(operationJson, null, 2)), TE.mapLeft((error) => new Error(`Failed to generate operation.json for operation: ${error}`)));
 };
 exports.generateOperationJson = generateOperationJson;

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

@@ -24,39 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const E = __importStar(require("fp-ts/Either"));
-const FakeFileStorage_1 = require("@trayio/commons/file/FakeFileStorage");
 const O = __importStar(require("fp-ts/Option"));
 const GenerateOperationJson_1 = require("./GenerateOperationJson");
 describe('generateOperationJson', () => {
-    const fileStorage = new FakeFileStorage_1.FakeFileStorage();
-    it('should generate operation.json file', async () => {
-        const writeSpy = jest.spyOn(fileStorage, 'write');
-        const operationDirPath = '/path/to/operation';
-        const operationNameSnakeCase = 'get_photo';
-        const operationNameKebabCase = 'get-photo';
-        const path = {
-            operationId: 'get_photo',
-            description: O.some('Get a photo'),
-            summary: O.none,
-            tags: O.some([]),
-            parameters: O.none,
-            requestBody: O.none,
-            responses: O.none,
-        };
-        const result = await (0, GenerateOperationJson_1.generateOperationJson)(fileStorage, operationDirPath, operationNameSnakeCase, operationNameKebabCase, path)();
-        if (E.isLeft(result)) {
-            throw new Error('expected result to be right');
-        }
-        expect(writeSpy).toHaveBeenCalledWith({
-            content: expect.anything(),
-            key: '/path/to/operation/operation.json',
-            metadata: { name: 'operation.json' },
-        }, O.none);
-        expect(result.right).toBeUndefined();
-        expect(fileStorage.files.has('/path/to/operation/operation.json')).toEqual(true);
-    });
     it('should generate correct data for operation.json', async () => {
-        const operationDirPath = '/path/to/operation';
         const operationNameSnakeCase = 'get_photo';
         const operationNameKebabCase = 'get-photo';
         const path = {
@@ -68,22 +39,17 @@ describe('generateOperationJson', () => {
             requestBody: O.none,
             responses: O.none,
         };
-        const result = await (0, GenerateOperationJson_1.generateOperationJson)(fileStorage, operationDirPath, operationNameSnakeCase, operationNameKebabCase, path)();
+        const result = await (0, GenerateOperationJson_1.generateOperationJson)(operationNameSnakeCase, operationNameKebabCase, path)();
         if (E.isLeft(result)) {
             throw new Error('expected result to be right');
         }
-        const operationJson = fileStorage.files.get('/path/to/operation/operation.json');
-        if (operationJson === undefined) {
-            throw new Error('expected operationJson to be defined');
-        }
-        expect(operationJson.content.read()).toEqual(JSON.stringify({
+        expect(result.right).toEqual(JSON.stringify({
             name: 'get_photo',
             title: 'get-photo',
             description: 'Get a photo',
-        }));
+        }, null, 2));
     });
     it('should generate operation.json with summary if description is not present', async () => {
-        const operationDirPath = '/path/to/operation';
         const operationNameSnakeCase = 'get_photo';
         const operationNameKebabCase = 'get-photo';
         const path = {
@@ -95,18 +61,14 @@ describe('generateOperationJson', () => {
             requestBody: O.none,
             responses: O.none,
         };
-        const result = await (0, GenerateOperationJson_1.generateOperationJson)(fileStorage, operationDirPath, operationNameSnakeCase, operationNameKebabCase, path)();
+        const result = await (0, GenerateOperationJson_1.generateOperationJson)(operationNameSnakeCase, operationNameKebabCase, path)();
         if (E.isLeft(result)) {
             throw new Error('expected result to be right');
         }
-        const operationJson = fileStorage.files.get('/path/to/operation/operation.json');
-        if (operationJson === undefined) {
-            throw new Error('expected operationJson to be defined');
-        }
-        expect(operationJson.content.read()).toEqual(JSON.stringify({
+        expect(result.right).toEqual(JSON.stringify({
             name: 'get_photo',
             title: 'get-photo',
             description: 'Get a photo',
-        }));
+        }, null, 2));
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/tray-openapi",
-  "version": "4.15.2-unstable",
+  "version": "4.16.1",
   "description": "Creating CDK Projects from OpenAPI 3.0 Schemas",
   "exports": {
     "./*": "./dist/*.js"