@aws/nx-plugin 0.88.1 → 0.89.0

package/src/open-api/utils/codegen-data.js

@@ -19,12 +19,11 @@ const types_1 = require("./codegen-data/types");
 /**
  * Builds a data structure from an OpenAPI spec which can be used to generate code
  */
-const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+const buildOpenApiCodeGenData = async (inSpec) => {
     // Ensure spec is ready for codegen
     const spec = (0, normalise_1.normaliseOpenApiSpecForCodeGen)(inSpec);
     // Build the initial data, which we will augment with additional information
-    const data = yield buildInitialCodeGenData(spec);
+    const data = await buildInitialCodeGenData(spec);
     // Ensure the models have their links set when they are arrays/dictionaries
     ensureModelLinks(spec, data);
     // Mutate the models with enough data to render composite models in the templates
@@ -37,8 +36,8 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
         const responseModelImports = [];
         for (const op of service.operations) {
             // Extract the operation back from the openapi spec
-            const specOp = (_b = (_a = spec === null || spec === void 0 ? void 0 : spec.paths) === null || _a === void 0 ? void 0 : _a[op.path]) === null || _b === void 0 ? void 0 : _b[op.method.toLowerCase()];
-            op.name = (_c = op.id) !== null && _c !== void 0 ? _c : op.name;
+            const specOp = spec?.paths?.[op.path]?.[op.method.toLowerCase()];
+            op.name = op.id ?? op.name;
             op.uniqueName = op.name;
             if (specOp['x-aws-nx-deduplicated-op-id']) {
                 op.uniqueName = specOp['x-aws-nx-deduplicated-op-id'];
@@ -47,8 +46,8 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                 op.dotNotationName = specOp['x-aws-nx-deduplicated-dot-op-id'];
             }
             // Add vendor extensions
-            op.vendorExtensions = (_d = op.vendorExtensions) !== null && _d !== void 0 ? _d : {};
-            copyVendorExtensions(specOp !== null && specOp !== void 0 ? specOp : {}, op.vendorExtensions);
+            op.vendorExtensions = op.vendorExtensions ?? {};
+            copyVendorExtensions(specOp ?? {}, op.vendorExtensions);
             if (specOp) {
                 // Add all response models to the response model imports
                 responseModelImports.push(...op.responses
@@ -58,7 +57,7 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     // Validate that the response is not a composite schema of primitives since we cannot determine what
                     // the type of the response is (it all comes back as text!)
                     if (response.export === 'reference' &&
-                        types_1.COMPOSED_SCHEMA_TYPES.has((_e = modelsByName[response.type]) === null || _e === void 0 ? void 0 : _e.export)) {
+                        types_1.COMPOSED_SCHEMA_TYPES.has(modelsByName[response.type]?.export)) {
                         const composedPrimitives = modelsByName[response.type].composedPrimitives.filter((p) => !['array', 'dictionary'].includes(p.export));
                         if (composedPrimitives.length > 0) {
                             throw new Error(`Operation "${op.method} ${op.path}" returns a composite schema of primitives with ${(0, lodash_camelcase_1.default)(modelsByName[response.type].export)}, which cannot be distinguished at runtime`);
@@ -80,23 +79,24 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                             const mediaTypes = Object.keys(specResponse.content);
                             response.mediaTypes = mediaTypes;
                             for (const mediaType of mediaTypes) {
-                                const responseContent = (_g = (_f = specResponse.content) === null || _f === void 0 ? void 0 : _f[mediaType]) !== null && _g !== void 0 ? _g : Object.values(specResponse.content)[0];
+                                const responseContent = specResponse.content?.[mediaType] ??
+                                    Object.values(specResponse.content)[0];
                                 const responseSchema = (0, refs_1.resolveIfRef)(spec, responseContent.schema);
                                 if (responseSchema) {
-                                    yield mutateWithOpenapiSchemaProperties(spec, response, responseSchema, modelsByName);
+                                    await mutateWithOpenapiSchemaProperties(spec, response, responseSchema, modelsByName);
                                 }
                                 if (types_1.STREAMING_CONTENT_TYPES.has(mediaType) &&
                                     'itemSchema' in responseContent) {
                                     response.isJsonlStreaming = true;
                                     response.itemSchemaModel =
-                                        yield buildOrReferenceModel(spec, modelsByName, responseContent.itemSchema);
+                                        await buildOrReferenceModel(spec, modelsByName, responseContent.itemSchema);
                                 }
                             }
                         }
                     }
                 }
             }
-            const specParametersByName = Object.fromEntries(((_h = specOp === null || specOp === void 0 ? void 0 : specOp.parameters) !== null && _h !== void 0 ? _h : []).map((p) => {
+            const specParametersByName = Object.fromEntries((specOp?.parameters ?? []).map((p) => {
                 const param = (0, refs_1.resolveIfRef)(spec, p);
                 return [param.name, param];
             }));
@@ -107,9 +107,9 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     requestModelImports.push(parameter.type);
                 }
                 const specParameter = specParametersByName[parameter.prop];
-                const specParameterSchema = (0, refs_1.resolveIfRef)(spec, specParameter === null || specParameter === void 0 ? void 0 : specParameter.schema);
+                const specParameterSchema = (0, refs_1.resolveIfRef)(spec, specParameter?.schema);
                 if (specParameterSchema) {
-                    yield mutateWithOpenapiSchemaProperties(spec, parameter, specParameterSchema, modelsByName);
+                    await mutateWithOpenapiSchemaProperties(spec, parameter, specParameterSchema, modelsByName);
                 }
                 if (parameter.in === 'body') {
                     // Parameter name for the body is 'body'
@@ -117,12 +117,12 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     parameter.prop = 'body';
                     // The request body is not in the "parameters" section of the openapi spec so we won't have added the schema
                     // properties above. Find it here.
-                    const specBody = (0, refs_1.resolveIfRef)(spec, specOp === null || specOp === void 0 ? void 0 : specOp.requestBody);
+                    const specBody = (0, refs_1.resolveIfRef)(spec, specOp?.requestBody);
                     if (specBody) {
                         if (parameter.mediaType) {
-                            const bodySchema = (0, refs_1.resolveIfRef)(spec, (_k = (_j = specBody.content) === null || _j === void 0 ? void 0 : _j[parameter.mediaType]) === null || _k === void 0 ? void 0 : _k.schema);
+                            const bodySchema = (0, refs_1.resolveIfRef)(spec, specBody.content?.[parameter.mediaType]?.schema);
                             if (bodySchema) {
-                                yield mutateWithOpenapiSchemaProperties(spec, parameter, bodySchema, modelsByName);
+                                await mutateWithOpenapiSchemaProperties(spec, parameter, bodySchema, modelsByName);
                             }
                         }
                         // Track all the media types that can be accepted in the request body
@@ -133,17 +133,18 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     specParameter) {
                     // Translate style/explode to OpenAPI v2 style collectionFormat
                     // https://spec.openapis.org/oas/v3.0.3.html#style-values
-                    const style = (_l = specParameter.style) !== null && _l !== void 0 ? _l : (parameter.in === 'query' ? 'form' : 'simple');
-                    const explode = (_m = specParameter.explode) !== null && _m !== void 0 ? _m : style === 'form';
+                    const style = specParameter.style ??
+                        (parameter.in === 'query' ? 'form' : 'simple');
+                    const explode = specParameter.explode ?? style === 'form';
                     if (parameter.in === 'query') {
                         parameter.collectionFormat = explode
                             ? 'multi'
-                            : ((_o = {
+                            : ({
                                 spaceDelimited: 'ssv',
                                 pipeDelimited: 'tsv',
                                 simple: 'csv',
                                 form: 'csv',
-                            }[style]) !== null && _o !== void 0 ? _o : 'multi');
+                            }[style] ?? 'multi');
                     }
                     else {
                         // parameter.in === "header"
@@ -153,13 +154,14 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                 mutateModelWithAdditionalTypes(parameter);
             }
             // Add language types to response models
-            ((_p = op.responses) !== null && _p !== void 0 ? _p : []).forEach(mutateModelWithAdditionalTypes);
+            (op.responses ?? []).forEach(mutateModelWithAdditionalTypes);
             // Sort responses by code
             op.responses = (0, lodash_orderby_1.default)(op.responses, (r) => r.code);
             // Result is the lowest successful response, otherwise is the 2XX or default response
             const result = op.responses.find((r) => typeof r.code === 'number' && r.code >= 200 && r.code < 300);
             op.result =
-                result !== null && result !== void 0 ? result : op.responses.find((r) => r.code === '2XX' || r.code === 'default');
+                result ??
+                    op.responses.find((r) => r.code === '2XX' || r.code === 'default');
             // Add variants of operation name
             op.operationIdPascalCase = (0, names_1.pascalCase)(op.uniqueName);
             op.operationIdKebabCase = (0, names_1.kebabCase)(op.uniqueName);
@@ -167,7 +169,7 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
             // Add request type name (after operationIdPascalCase is set)
             if (op.parameters && op.parameters.length > 0) {
                 const baseRequestTypeName = `${op.operationIdPascalCase}Request`;
-                const hasConflict = !!((_r = (_q = spec.components) === null || _q === void 0 ? void 0 : _q.schemas) === null || _r === void 0 ? void 0 : _r[baseRequestTypeName]);
+                const hasConflict = !!spec.components?.schemas?.[baseRequestTypeName];
                 if (hasConflict) {
                     // Use OperationRequest suffix when there's a conflict
                     op.requestTypeName =
@@ -195,7 +197,6 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
     data.models = [
         ...data.models,
         ...allOperations.flatMap((op) => {
-            var _a;
             if (op.parameters && op.parameters.length > 0) {
                 // Build a collection of request parameter models to create based on their position (ie 'in' in the openapi spec, eg body, query, path, header, etc)
                 const parametersByPosition = {};
@@ -203,7 +204,6 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     .filter(
                 // We filter out (return false for) request bodies which we "inline" - ie we don't create a property which points to the body, the request will only be the body itself
                 (p) => {
-                    var _a, _b, _c;
                     // Always create models for non-body parameters
                     if (p.in !== 'body') {
                         return true;
@@ -214,9 +214,9 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     }
                     // We inline object bodies, so long as they aren't dictionaries (as dictionary keys could clash with other parameters),
                     // and so long as they don't have a property name that clashes with another parameter
-                    const hasClashingPropertyName = ((_b = (_a = modelsByName === null || modelsByName === void 0 ? void 0 : modelsByName[p.type]) === null || _a === void 0 ? void 0 : _a.properties) !== null && _b !== void 0 ? _b : []).some((prop) => op.parameters.some((param) => param.name === prop.name));
+                    const hasClashingPropertyName = (modelsByName?.[p.type]?.properties ?? []).some((prop) => op.parameters.some((param) => param.name === prop.name));
                     if (p.export === 'reference' &&
-                        ((_c = modelsByName === null || modelsByName === void 0 ? void 0 : modelsByName[p.type]) === null || _c === void 0 ? void 0 : _c.export) !== 'dictionary' &&
+                        modelsByName?.[p.type]?.export !== 'dictionary' &&
                         !hasClashingPropertyName) {
                         return false;
                     }
@@ -224,14 +224,13 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     return true;
                 })
                     .forEach((parameter) => {
-                    var _a;
                     parametersByPosition[parameter.in] = [
-                        ...((_a = parametersByPosition[parameter.in]) !== null && _a !== void 0 ? _a : []),
+                        ...(parametersByPosition[parameter.in] ?? []),
                         parameter,
                     ];
                 });
                 // Ensure that if we have an explicit body parameter, it's called "body"
-                const requestBodyParameter = (_a = parametersByPosition['body']) === null || _a === void 0 ? void 0 : _a[0];
+                const requestBodyParameter = parametersByPosition['body']?.[0];
                 if (requestBodyParameter) {
                     requestBodyParameter.name = 'body';
                     requestBodyParameter.prop = 'body';
@@ -267,10 +266,10 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
     for (const model of data.models) {
         // Add a snake_case name
         model.nameSnakeCase = (0, languages_1.toPythonName)('model', model.name);
-        const matchingSpecModel = (_t = (_s = spec === null || spec === void 0 ? void 0 : spec.components) === null || _s === void 0 ? void 0 : _s.schemas) === null || _t === void 0 ? void 0 : _t[model.name];
+        const matchingSpecModel = spec?.components?.schemas?.[model.name];
         if (matchingSpecModel) {
             const specModel = (0, refs_1.resolveIfRef)(spec, matchingSpecModel);
-            yield mutateWithOpenapiSchemaProperties(spec, model, specModel, modelsByName);
+            await mutateWithOpenapiSchemaProperties(spec, model, specModel, modelsByName);
             // Add unique imports
             model.uniqueImports = (0, lodash_orderby_1.default)((0, lodash_uniqby_1.default)([
                 ...model.imports,
@@ -283,10 +282,10 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
             model.deprecated = specModel.deprecated || false;
             // Augment properties with additional data
             for (const property of model.properties) {
-                const matchingSpecProperty = (_u = specModel.properties) === null || _u === void 0 ? void 0 : _u[property.name];
+                const matchingSpecProperty = specModel.properties?.[property.name];
                 if (matchingSpecProperty) {
                     const specProperty = (0, refs_1.resolveIfRef)(spec, matchingSpecProperty);
-                    yield mutateWithOpenapiSchemaProperties(spec, property, specProperty, modelsByName);
+                    await mutateWithOpenapiSchemaProperties(spec, property, specProperty, modelsByName);
                 }
             }
         }
@@ -312,8 +311,7 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
         const tags = op.tags;
         if (tags && tags.length > 0) {
             tags.map(lodash_camelcase_1.default).forEach((tag) => {
-                var _a;
-                operationsByTag[tag] = [...((_a = operationsByTag[tag]) !== null && _a !== void 0 ? _a : []), op];
+                operationsByTag[tag] = [...(operationsByTag[tag] ?? []), op];
             });
         }
         else {
@@ -322,13 +320,19 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
     });
     // Add top level vendor extensions
     const vendorExtensions = {};
-    copyVendorExtensions(spec !== null && spec !== void 0 ? spec : {}, vendorExtensions);
-    return Object.assign(Object.assign({}, data), { operationsByTag,
-        untaggedOperations, info: spec.info, allOperations,
-        vendorExtensions, className: (0, names_1.toClassName)(spec.info.title) });
-});
+    copyVendorExtensions(spec ?? {}, vendorExtensions);
+    return {
+        ...data,
+        operationsByTag,
+        untaggedOperations,
+        info: spec.info,
+        allOperations,
+        vendorExtensions,
+        className: (0, names_1.toClassName)(spec.info.title),
+    };
+};
 exports.buildOpenApiCodeGenData = buildOpenApiCodeGenData;
-const buildInitialCodeGenData = (spec) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const buildInitialCodeGenData = async (spec) => {
     let data;
     // We create a plugin which will capture the client data
     const plugin = () => ({
@@ -340,7 +344,7 @@ const buildInitialCodeGenData = (spec) => tslib_1.__awaiter(void 0, void 0, void
         },
     });
     // Use @hey-api/openapi-ts to build the initial data structure that we'll generate clients from
-    yield gen.createClient({
+    await gen.createClient({
         experimentalParser: false,
         input: {
             path: spec,
@@ -355,53 +359,54 @@ const buildInitialCodeGenData = (spec) => tslib_1.__awaiter(void 0, void 0, void
         throw new Error('Failed to build code generation data');
     }
     return data;
-});
+};
 /**
  * Build a model for a particular primitive schema.
  * Only primitives are supported since we only return one model.
  * For non-primitives, it assumes all referenced subschemas are already models
  */
-const buildModelForPrimitive = (originalSpec, schema) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const buildModelForPrimitive = async (originalSpec, schema) => {
     const targetSchemaName = '___aws_nx_plugin_openapi_tmp_schema___';
     const spec = {
         openapi: '3.1.0',
         info: { title: 'tmp', version: '1.0.0' },
         paths: {},
         components: {
-            schemas: Object.assign(Object.assign({}, (_a = originalSpec.components) === null || _a === void 0 ? void 0 : _a.schemas), { [targetSchemaName]: schema }),
+            schemas: {
+                ...originalSpec.components?.schemas,
+                [targetSchemaName]: schema,
+            },
         },
     };
-    const data = yield buildInitialCodeGenData(spec);
+    const data = await buildInitialCodeGenData(spec);
     const model = data.models.find((m) => m.name === targetSchemaName);
     if (!model) {
         throw new Error(`Failed to construct model for schema ${JSON.stringify(schema)}`);
     }
     ensureModelLinks(spec, data);
-    yield mutateWithOpenapiSchemaProperties(spec, model, schema, Object.fromEntries(data.models.map((m) => [m.name, m])));
+    await mutateWithOpenapiSchemaProperties(spec, model, schema, Object.fromEntries(data.models.map((m) => [m.name, m])));
     return model;
-});
-const buildOrReferenceModel = (spec, modelsByName, schema) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+};
+const buildOrReferenceModel = async (spec, modelsByName, schema) => {
     if ((0, refs_1.isRef)(schema)) {
         const name = (0, refs_1.splitRef)(schema.$ref)[2];
         return modelsByName[name];
     }
     // Non referenced schemas won't have a model created as they are primitives and aren't covered by @heyapi
     // So we build the model here
-    return yield buildModelForPrimitive(spec, schema);
-});
+    return await buildModelForPrimitive(spec, schema);
+};
 /**
  * Copy vendor extensions from the first parameter to the second
  */
 const copyVendorExtensions = (object, vendorExtensions) => {
-    Object.entries(object !== null && object !== void 0 ? object : {}).forEach(([key, value]) => {
+    Object.entries(object ?? {}).forEach(([key, value]) => {
         if (key.startsWith('x-')) {
             vendorExtensions[key] = value;
         }
     });
 };
-const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByName_1, ...args_1) => tslib_1.__awaiter(void 0, [spec_1, model_1, schema_1, modelsByName_1, ...args_1], void 0, function* (spec, model, schema, modelsByName, visited = new Set()) {
-    var _a, _b, _c;
+const mutateWithOpenapiSchemaProperties = async (spec, model, schema, modelsByName, visited = new Set()) => {
     model.format = schema.format;
     model.isInteger = schema.type === 'integer';
     model.isShort = schema.format === 'int32';
@@ -414,10 +419,10 @@ const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByNa
     model.vendorExtensions = {};
     copyVendorExtensions(schema, model.vendorExtensions);
     // Use our added vendor extension
-    model.isHoisted = !!((_a = model.vendorExtensions) === null || _a === void 0 ? void 0 : _a['x-aws-nx-hoisted']);
+    model.isHoisted = !!model.vendorExtensions?.['x-aws-nx-hoisted'];
     // Ensure models with additional properties are handled correctly
     if (schema.additionalProperties) {
-        const additionalPropertiesModel = yield buildOrReferenceModel(spec, modelsByName, schema.additionalProperties === true ? {} : schema.additionalProperties);
+        const additionalPropertiesModel = await buildOrReferenceModel(spec, modelsByName, schema.additionalProperties === true ? {} : schema.additionalProperties);
         // The original models treat _some_ objects with additional properties as a "dictionary", and others as an "interface"
         // For the purposes of our code generation, we define a "dictionary" to be a model with no explicit properties, only
         // additional properties. Interfaces can have a mixture of explicit properties and additional properties.
@@ -438,7 +443,7 @@ const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByNa
             model.additionalPropertiesModel = additionalPropertiesModel;
             // There's a special property named [key: string] which is the definition of the additional properties
             // We remove this so we don't render it as a regular property.
-            model.properties = ((_b = model.properties) !== null && _b !== void 0 ? _b : []).filter((p) => p.name !== '[key: string]');
+            model.properties = (model.properties ?? []).filter((p) => p.name !== '[key: string]');
         }
     }
     // Ensure models with pattern properties are handled correctly
@@ -451,7 +456,7 @@ const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByNa
             model.export = 'interface';
         }
         for (const [pattern, patternProperty] of Object.entries(patternProperties)) {
-            const patternPropertyModel = yield buildOrReferenceModel(spec, modelsByName, patternProperty);
+            const patternPropertyModel = await buildOrReferenceModel(spec, modelsByName, patternProperty);
             if (patternPropertyModel) {
                 patternPropertiesModels.push({
                     pattern,
@@ -472,7 +477,7 @@ const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByNa
         schema.items &&
         !visited.has(modelLink)) {
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.items);
-        yield mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, visited);
+        await mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, visited);
     }
     // Also apply to object properties recursively
     if (model.export === 'dictionary' &&
@@ -483,22 +488,22 @@ const mutateWithOpenapiSchemaProperties = (spec_1, model_1, schema_1, modelsByNa
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.additionalProperties);
         // Additional properties can be "true" rather than a type
         if (subSchema !== true) {
-            yield mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, visited);
+            await mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, visited);
         }
     }
-    for (const property of model.properties.filter((p) => { var _a; return !visited.has(p) && ((_a = schema.properties) === null || _a === void 0 ? void 0 : _a[(0, lodash_trim_1.default)(p.name, `"'`)]); })) {
+    for (const property of model.properties.filter((p) => !visited.has(p) && schema.properties?.[(0, lodash_trim_1.default)(p.name, `"'`)])) {
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.properties[(0, lodash_trim_1.default)(property.name, `"'`)]);
-        yield mutateWithOpenapiSchemaProperties(spec, property, subSchema, modelsByName, visited);
+        await mutateWithOpenapiSchemaProperties(spec, property, subSchema, modelsByName, visited);
     }
     if (types_1.COMPOSED_SCHEMA_TYPES.has(model.export)) {
         for (let i = 0; i < model.properties.length; i++) {
-            const subSchema = (0, refs_1.resolveIfRef)(spec, (_c = schema[(0, lodash_camelcase_1.default)(model.export)]) === null || _c === void 0 ? void 0 : _c[i]);
+            const subSchema = (0, refs_1.resolveIfRef)(spec, schema[(0, lodash_camelcase_1.default)(model.export)]?.[i]);
             if (subSchema) {
-                yield mutateWithOpenapiSchemaProperties(spec, model.properties[i], subSchema, modelsByName, visited);
+                await mutateWithOpenapiSchemaProperties(spec, model.properties[i], subSchema, modelsByName, visited);
             }
         }
     }
-});
+};
 /**
  * Ensure that the "link" property of all dictionary/array models and properties are set recursively
  */
@@ -507,8 +512,7 @@ const ensureModelLinks = (spec, data) => {
     const visited = new Set();
     // Ensure set for all models
     data.models.forEach((model) => {
-        var _a, _b;
-        const schema = (0, refs_1.resolveIfRef)(spec, (_b = (_a = spec === null || spec === void 0 ? void 0 : spec.components) === null || _a === void 0 ? void 0 : _a.schemas) === null || _b === void 0 ? void 0 : _b[model.name]);
+        const schema = (0, refs_1.resolveIfRef)(spec, spec?.components?.schemas?.[model.name]);
         if (schema) {
             // Object schemas should be typed as the model we will create
             if (schema.type === 'object' &&
@@ -521,35 +525,31 @@ const ensureModelLinks = (spec, data) => {
     // Ensure set for all parameters and responses
     data.services.forEach((service) => {
         service.operations.forEach((op) => {
-            var _a, _b, _c;
-            const specOp = (_b = (_a = spec === null || spec === void 0 ? void 0 : spec.paths) === null || _a === void 0 ? void 0 : _a[op.path]) === null || _b === void 0 ? void 0 : _b[op.method.toLowerCase()];
-            const specParametersByName = Object.fromEntries(((_c = specOp === null || specOp === void 0 ? void 0 : specOp.parameters) !== null && _c !== void 0 ? _c : []).map((p) => {
+            const specOp = spec?.paths?.[op.path]?.[op.method.toLowerCase()];
+            const specParametersByName = Object.fromEntries((specOp?.parameters ?? []).map((p) => {
                 const param = (0, refs_1.resolveIfRef)(spec, p);
                 return [param.name, param];
             }));
             op.parameters.forEach((parameter) => {
-                var _a, _b;
                 const specParameter = specParametersByName[parameter.prop];
-                const specParameterSchema = (0, refs_1.resolveIfRef)(spec, specParameter === null || specParameter === void 0 ? void 0 : specParameter.schema);
+                const specParameterSchema = (0, refs_1.resolveIfRef)(spec, specParameter?.schema);
                 if (specParameterSchema) {
                     _ensureModelLinks(spec, modelsByName, parameter, specParameterSchema, visited);
                 }
                 else if (parameter.in === 'body') {
                     // Body is not in the "parameters" section of the OpenAPI spec so we handle it in an explicit case here
-                    const specBody = (0, refs_1.resolveIfRef)(spec, specOp === null || specOp === void 0 ? void 0 : specOp.requestBody);
-                    const specBodySchema = (0, refs_1.resolveIfRef)(spec, (_b = (_a = specBody === null || specBody === void 0 ? void 0 : specBody.content) === null || _a === void 0 ? void 0 : _a[parameter.mediaType]) === null || _b === void 0 ? void 0 : _b.schema);
+                    const specBody = (0, refs_1.resolveIfRef)(spec, specOp?.requestBody);
+                    const specBodySchema = (0, refs_1.resolveIfRef)(spec, specBody?.content?.[parameter.mediaType]?.schema);
                     if (specBodySchema) {
                         _ensureModelLinks(spec, modelsByName, parameter, specBodySchema, visited);
                     }
                 }
             });
             op.responses.forEach((response) => {
-                var _a, _b;
-                const specResponse = (0, refs_1.resolveIfRef)(spec, (_a = specOp === null || specOp === void 0 ? void 0 : specOp.responses) === null || _a === void 0 ? void 0 : _a[response.code]);
-                const mediaTypes = Object.keys((_b = specResponse === null || specResponse === void 0 ? void 0 : specResponse.content) !== null && _b !== void 0 ? _b : {});
+                const specResponse = (0, refs_1.resolveIfRef)(spec, specOp?.responses?.[response.code]);
+                const mediaTypes = Object.keys(specResponse?.content ?? {});
                 mediaTypes.forEach((mediaType) => {
-                    var _a, _b;
-                    const responseSchema = (0, refs_1.resolveIfRef)(spec, (_b = (_a = specResponse === null || specResponse === void 0 ? void 0 : specResponse.content) === null || _a === void 0 ? void 0 : _a[mediaType]) === null || _b === void 0 ? void 0 : _b.schema);
+                    const responseSchema = (0, refs_1.resolveIfRef)(spec, specResponse?.content?.[mediaType]?.schema);
                     if (responseSchema) {
                         _ensureModelLinks(spec, modelsByName, response, responseSchema, visited);
                     }
@@ -588,15 +588,14 @@ const _ensureModelLinks = (spec, modelsByName, model, schema, visited) => {
         }
     }
     model.properties
-        .filter((p) => { var _a; return !visited.has(p) && ((_a = schema.properties) === null || _a === void 0 ? void 0 : _a[(0, lodash_trim_1.default)(p.name, `"'`)]); })
+        .filter((p) => !visited.has(p) && schema.properties?.[(0, lodash_trim_1.default)(p.name, `"'`)])
         .forEach((property) => {
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.properties[(0, lodash_trim_1.default)(property.name, `"'`)]);
         _ensureModelLinks(spec, modelsByName, property, subSchema, visited);
     });
     if (types_1.COMPOSED_SCHEMA_TYPES.has(model.export)) {
         model.properties.forEach((property, i) => {
-            var _a;
-            const subSchema = (0, refs_1.resolveIfRef)(spec, (_a = schema[(0, lodash_camelcase_1.default)(model.export)]) === null || _a === void 0 ? void 0 : _a[i]);
+            const subSchema = (0, refs_1.resolveIfRef)(spec, schema[(0, lodash_camelcase_1.default)(model.export)]?.[i]);
             if (subSchema) {
                 _ensureModelLinks(spec, modelsByName, property, subSchema, visited);
             }
@@ -670,10 +669,10 @@ const mutateModelWithAdditionalTypes = (model) => {
 const isOperationMutation = (op) => {
     // Let the user override whether an operation is a query or mutation using x-mutation/x-query
     const { vendorExtensions } = op;
-    if (vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.MUTATION]) {
+    if (vendorExtensions?.[types_1.VENDOR_EXTENSIONS.MUTATION]) {
         return true;
     }
-    else if (vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.QUERY]) {
+    else if (vendorExtensions?.[types_1.VENDOR_EXTENSIONS.QUERY]) {
         return false;
     }
     // Assume a restful API and treat mutative HTTP methods as mutations
@@ -709,7 +708,7 @@ const mutateOperationWithInfiniteQueryDetails = (op) => {
  */
 const getCursorOptions = (op) => {
     const { vendorExtensions } = op;
-    const cursorExtension = vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.CURSOR];
+    const cursorExtension = vendorExtensions?.[types_1.VENDOR_EXTENSIONS.CURSOR];
     // By default pagination isn't explicitly disabled and the cursor property to look for is 'cursor'
     let paginationDisabled = false;
     let cursorPropertyName = 'cursor';
@@ -720,10 +719,10 @@ const getCursorOptions = (op) => {
         cursorPropertyName = cursorExtension;
     }
     else if (typeof cursorExtension === 'object') {
-        if ((cursorExtension === null || cursorExtension === void 0 ? void 0 : cursorExtension.enabled) === false) {
+        if (cursorExtension?.enabled === false) {
             paginationDisabled = true;
         }
-        if ((cursorExtension === null || cursorExtension === void 0 ? void 0 : cursorExtension.inputToken) &&
+        if (cursorExtension?.inputToken &&
             typeof cursorExtension.inputToken === 'string') {
             cursorPropertyName = cursorExtension.inputToken;
         }
@@ -738,14 +737,13 @@ const getCursorOptions = (op) => {
  * Add additional data to an operation for code generation decisions
  */
 const mutateOperationWithAdditionalData = (op) => {
-    var _a;
     // Add mutation/query details
     const isMutation = isOperationMutation(op);
     op.isMutation = isMutation;
     op.isQuery = !isMutation;
     // Streaming responses
     op.isStreaming =
-        !!((_a = op.vendorExtensions) === null || _a === void 0 ? void 0 : _a[types_1.VENDOR_EXTENSIONS.STREAMING]) ||
+        !!op.vendorExtensions?.[types_1.VENDOR_EXTENSIONS.STREAMING] ||
             op.responses.some((res) => res.isJsonlStreaming);
     // Set the result type for the client method to the item schema so that
     // it will resolve to AsyncIterableIterator<{itemSchemaModel.name}>