@trayio/tray-openapi 5.33.0 → 5.35.0-unstable.fd7158a

package/dist/file-generators/types/GenerateOutput.js

@@ -1,84 +1,73 @@
 "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 });
 exports.generateOutputTypes = exports.generateOutputSchema = exports.getApplicationJsonMediaType = void 0;
+const effect_1 = require("effect");
 const json_schema_to_typescript_1 = require("json-schema-to-typescript");
-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 CompositeCodec_1 = require("@trayio/commons/codec/CompositeCodec");
 const RemoveNullValuesCodec_1 = require("@trayio/commons/codec/RemoveNullValuesCodec");
 const JsonSchemaToTypescriptOptions_1 = require("./JsonSchemaToTypescriptOptions");
 const OpenApiTypeDescriptors_1 = require("../../OpenApiTypeDescriptors");
-const get2XXResponse = (responses) => O.fold(() => TE.left(new Error('No responses found')), (someResponses) => {
-    const statusCode2XX = Object.keys(someResponses).find((statusCode) => /^2\d{2}$/.test(statusCode));
-    if (statusCode2XX) {
-        return TE.right(someResponses[statusCode2XX]);
-    }
-    const responseCodes = Object.keys(someResponses);
-    return TE.left(new Error(`Unsupported success response code: ${responseCodes}`));
-})(responses);
+const get2XXResponse = (responses) => effect_1.Option.match(responses, {
+    onNone: () => effect_1.Effect.fail(new Error('No responses found')),
+    onSome: (someResponses) => {
+        const statusCode2XX = Object.keys(someResponses).find((statusCode) => /^2\d{2}$/.test(statusCode));
+        if (statusCode2XX) {
+            return effect_1.Effect.succeed(someResponses[statusCode2XX]);
+        }
+        const responseCodes = Object.keys(someResponses);
+        return effect_1.Effect.fail(new Error(`Unsupported success response code: ${responseCodes}`));
+    },
+});
 const blankOutputSchema = () => ({
-    title: O.none,
-    type: O.none,
-    properties: O.none,
-    required: O.none,
-    additionalProperties: O.some(false),
-    allOf: O.none,
-    anyOf: O.none,
-    oneOf: O.none,
-    not: O.none,
-    in: O.none,
-    default: O.none,
-    nullable: O.none,
-    enum: O.none,
+    title: effect_1.Option.none(),
+    type: effect_1.Option.none(),
+    properties: effect_1.Option.none(),
+    required: effect_1.Option.none(),
+    additionalProperties: effect_1.Option.some(false),
+    allOf: effect_1.Option.none(),
+    anyOf: effect_1.Option.none(),
+    oneOf: effect_1.Option.none(),
+    not: effect_1.Option.none(),
+    in: effect_1.Option.none(),
+    default: effect_1.Option.none(),
+    nullable: effect_1.Option.none(),
+    enum: effect_1.Option.none(),
+});
+const getContent = (response) => effect_1.Option.match(response.content, {
+    onNone: () => ({
+        'application/json': { schema: effect_1.Option.some(blankOutputSchema()) },
+    }),
+    onSome: (content) => content,
 });
-const getContent = (response) => O.fold(() => ({ 'application/json': { schema: O.some(blankOutputSchema()) } }), (content) => content)(response.content);
 const getApplicationJsonMediaType = (content) => {
-    if (!Object.keys(content).length)
-        return E.right({ schema: O.none });
+    if (!Object.keys(content).length) {
+        return effect_1.Either.right({ schema: effect_1.Option.none() });
+    }
     const mediaTypeApplicationJson = Object.keys(content).find((mediaType) => /^application\/.*json.*$/.test(mediaType));
     if (mediaTypeApplicationJson) {
-        return E.right(content[mediaTypeApplicationJson]);
+        return effect_1.Either.right(content[mediaTypeApplicationJson]);
     }
     const mediaTypes = Object.keys(content);
-    return E.left(new Error(`Unsupported media type: ${mediaTypes}`));
+    return effect_1.Either.left(new Error(`Unsupported media type: ${mediaTypes}`));
 };
 exports.getApplicationJsonMediaType = getApplicationJsonMediaType;
-const generateOutputSchema = (responses) => (0, function_1.pipe)(get2XXResponse(responses), TE.chain((successResponse) => TE.fromEither((0, exports.getApplicationJsonMediaType)(getContent(successResponse)))), TE.map((mediaType) => O.fold(() => blankOutputSchema(), (schema) => schema)(mediaType.schema)), TE.mapLeft((error) => new Error(`Failed to generate output schema: ${error}`)));
+const generateOutputSchema = (responses) => (0, effect_1.pipe)(get2XXResponse(responses), effect_1.Effect.flatMap((successResponse) => (0, exports.getApplicationJsonMediaType)(getContent(successResponse))), effect_1.Effect.map((mediaType) => effect_1.Option.match(mediaType.schema, {
+    onNone: () => blankOutputSchema(),
+    onSome: (schema) => schema,
+})), effect_1.Effect.mapError((error) => new Error(`Failed to generate output schema: ${error}`)));
 exports.generateOutputSchema = generateOutputSchema;
 const encodeOutputSchema = (outputSchema) => {
     const codecWithNullValueRemoval = CompositeCodec_1.CompositeCodec.fromCodecs(OpenApiTypeDescriptors_1.schemaObjectTypeCodec, RemoveNullValuesCodec_1.RemoveNullValuesCodec.instance);
     return codecWithNullValueRemoval.encode(outputSchema);
 };
 const generateOutputTypes = (operationNameCamelCase, outputSchema) => {
-    if (O.isSome(outputSchema.title)) {
-        outputSchema.title = O.none;
+    if (effect_1.Option.isSome(outputSchema.title)) {
+        outputSchema.title = effect_1.Option.none();
     }
     const resolvedOutputSchema = encodeOutputSchema(outputSchema);
-    return TE.tryCatch(() => (0, json_schema_to_typescript_1.compile)(resolvedOutputSchema, `${operationNameCamelCase}Output`, JsonSchemaToTypescriptOptions_1.JsonSchemaToTypescriptOptions), (error) => new Error(`Failed to generate output types: ${error}`));
+    return effect_1.Effect.tryPromise({
+        try: () => (0, json_schema_to_typescript_1.compile)(resolvedOutputSchema, `${operationNameCamelCase}Output`, JsonSchemaToTypescriptOptions_1.JsonSchemaToTypescriptOptions),
+        catch: (error) => new Error(`Failed to generate output types: ${error}`),
+    });
 };
 exports.generateOutputTypes = generateOutputTypes;

package/dist/file-generators/types/GenerateOutput.test.js

@@ -1,74 +1,47 @@
 "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 TE = __importStar(require("fp-ts/TaskEither"));
-const E = __importStar(require("fp-ts/Either"));
-const O = __importStar(require("fp-ts/Option"));
+const effect_1 = require("effect");
 const GenerateOutput_1 = require("./GenerateOutput");
 const SchemaGenerator_1 = require("../SchemaGenerator");
 const generateOutputFileContents = async (responses) => {
     const operationNameCamelCase = 'CreatePost';
-    const generatedOutputSchema = await (0, GenerateOutput_1.generateOutputSchema)(responses)();
-    if (E.isLeft(generatedOutputSchema)) {
+    const generatedOutputSchema = await effect_1.Effect.runPromise(effect_1.Effect.either((0, GenerateOutput_1.generateOutputSchema)(responses)));
+    if (effect_1.Either.isLeft(generatedOutputSchema)) {
         throw new Error('Should have been right');
     }
     const generatedOutputTypes = (0, GenerateOutput_1.generateOutputTypes)(operationNameCamelCase, generatedOutputSchema.right);
-    return TE.getOrElse((error) => {
-        throw new Error('Should have been right');
-    })(generatedOutputTypes)();
+    return effect_1.Effect.runPromise(generatedOutputTypes);
 };
 describe('Generate output: ', () => {
     it('it should generate output.ts file contents for a response code 200 content json', async () => {
-        const responses = O.some({
+        const responses = effect_1.Option.some({
             '200': {
                 description: 'A post was created',
-                content: O.some({
+                content: effect_1.Option.some({
                     'application/json': {
-                        schema: O.some((0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                            title: O.some('Post'),
-                            type: O.some('object'),
-                            required: O.some(['id', 'userId', 'title', 'body']),
-                            properties: O.some({
+                        schema: effect_1.Option.some((0, SchemaGenerator_1.generateNonArraySchemaObject)({
+                            title: effect_1.Option.some('Post'),
+                            type: effect_1.Option.some('object'),
+                            required: effect_1.Option.some(['id', 'userId', 'title', 'body']),
+                            properties: effect_1.Option.some({
                                 id: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('integer'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('integer'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 userId: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('integer'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('integer'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 title: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('string'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('string'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 body: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('string'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('string'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                             }),
-                            additionalProperties: O.some(false),
+                            additionalProperties: effect_1.Option.some(false),
                         })),
                     },
                 }),
@@ -85,33 +58,33 @@ describe('Generate output: ', () => {
         expect(generatedOutputFileContents).toEqual(expectedOutputFileContents);
     });
     it('it should generate output.ts file contents for a response code 201 content json', async () => {
-        const responses = O.some({
+        const responses = effect_1.Option.some({
             '201': {
                 description: 'A post was created',
-                content: O.some({
+                content: effect_1.Option.some({
                     'application/json': {
-                        schema: O.some((0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                            type: O.some('object'),
-                            required: O.some(['id', 'userId', 'title', 'body']),
-                            properties: O.some({
+                        schema: effect_1.Option.some((0, SchemaGenerator_1.generateNonArraySchemaObject)({
+                            type: effect_1.Option.some('object'),
+                            required: effect_1.Option.some(['id', 'userId', 'title', 'body']),
+                            properties: effect_1.Option.some({
                                 id: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('integer'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('integer'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 userId: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('integer'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('integer'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 title: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('string'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('string'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                                 body: (0, SchemaGenerator_1.generateNonArraySchemaObject)({
-                                    type: O.some('string'),
-                                    additionalProperties: O.some(false),
+                                    type: effect_1.Option.some('string'),
+                                    additionalProperties: effect_1.Option.some(false),
                                 }),
                             }),
-                            additionalProperties: O.some(false),
+                            additionalProperties: effect_1.Option.some(false),
                         })),
                     },
                 }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/tray-openapi",
-  "version": "5.33.0",
+  "version": "5.35.0-unstable.fd7158a",
   "description": "Creating CDK Projects from OpenAPI 3.0 Schemas",
   "exports": {
     "./*": "./dist/*.js"
@@ -24,14 +24,12 @@
   "dependencies": {
     "@openapi-contrib/openapi-schema-to-json-schema": "5.1.0",
     "@stoplight/json-ref-resolver": "3.1.6",
-    "@trayio/cdk-dsl": "5.33.0",
-    "@trayio/cdk-runtime": "5.33.0",
-    "@trayio/commons": "5.33.0",
-    "@trayio/generator": "5.33.0",
+    "@trayio/cdk-dsl": "5.35.0-unstable.fd7158a",
+    "@trayio/cdk-runtime": "5.35.0-unstable.fd7158a",
+    "@trayio/commons": "5.35.0-unstable.fd7158a",
+    "@trayio/generator": "5.35.0-unstable.fd7158a",
     "@types/json-schema": "7.0.15",
-    "fp-ts": "2.12.3",
-    "io-ts": "2.2.20",
-    "io-ts-types": "0.5.19",
+    "effect": "3.22.2",
     "json-schema-to-typescript": "13.1.1",
     "json-to-typescript": "1.0.1",
     "lodash": "4.18.1"