@aws/nx-plugin 0.14.2 → 0.15.0

package/src/open-api/utils/codegen-data/types.d.ts

@@ -23,3 +23,28 @@ export declare const flattenModelLink: (link?: Model | Model[]) => Model;
 export declare const COMPOSED_SCHEMA_TYPES: Set<string>;
 export declare const COLLECTION_TYPES: Set<string>;
 export declare const PRIMITIVE_TYPES: Set<string>;
+/**
+ * Vendor extensions which are used to customise generated code
+ */
+export declare const VENDOR_EXTENSIONS: {
+    /**
+     * Set to 'true' to indicate this is a streaming API
+     */
+    readonly STREAMING: "x-streaming";
+    /**
+     * Set to true to indicate this is a mutation, regardless of its HTTP method
+     */
+    readonly MUTATION: "x-mutation";
+    /**
+     * Set to true to indicate this is a query, regardless of its HTTP method
+     */
+    readonly QUERY: "x-query";
+    /**
+     * Set to the name of the input property used as the cursor for pagination if
+     * the API accepts a cursor that is not named 'cursor'.
+     * This can also be set to false to override behaviour and indicate this is not
+     * a paginated API.
+     * Used for tanstack infinite query hooks.
+     */
+    readonly CURSOR: "x-cursor";
+};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRIMITIVE_TYPES = exports.COLLECTION_TYPES = exports.COMPOSED_SCHEMA_TYPES = exports.flattenModelLink = void 0;
+exports.VENDOR_EXTENSIONS = exports.PRIMITIVE_TYPES = exports.COLLECTION_TYPES = exports.COMPOSED_SCHEMA_TYPES = exports.flattenModelLink = void 0;
 const flattenModelLink = (link) => link === undefined ? undefined : Array.isArray(link) ? link[0] : link;
 exports.flattenModelLink = flattenModelLink;
 // Model types which indicate it is composed (ie inherits/mixin's another schema)
@@ -16,4 +16,29 @@ exports.PRIMITIVE_TYPES = new Set([
     'binary',
     'void',
 ]);
+/**
+ * Vendor extensions which are used to customise generated code
+ */
+exports.VENDOR_EXTENSIONS = {
+    /**
+     * Set to 'true' to indicate this is a streaming API
+     */
+    STREAMING: 'x-streaming',
+    /**
+     * Set to true to indicate this is a mutation, regardless of its HTTP method
+     */
+    MUTATION: 'x-mutation',
+    /**
+     * Set to true to indicate this is a query, regardless of its HTTP method
+     */
+    QUERY: 'x-query',
+    /**
+     * Set to the name of the input property used as the cursor for pagination if
+     * the API accepts a cursor that is not named 'cursor'.
+     * This can also be set to false to override behaviour and indicate this is not
+     * a paginated API.
+     * Used for tanstack infinite query hooks.
+     */
+    CURSOR: 'x-cursor',
+};
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/open-api/utils/codegen-data/types.ts"],"names":[],"mappings":";;;AAoBO,MAAM,gBAAgB,GAAG,CAAC,IAAsB,EAAS,EAAE,CAChE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAD3D,QAAA,gBAAgB,oBAC2C;AAExE,iFAAiF;AACpE,QAAA,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAChE,QAAA,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,IAAI,GAAG,CAAC;IACrC,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,MAAM;IACN,KAAK;IACL,QAAQ;IACR,MAAM;CACP,CAAC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/open-api/utils/codegen-data/types.ts"],"names":[],"mappings":";;;AAoBO,MAAM,gBAAgB,GAAG,CAAC,IAAsB,EAAS,EAAE,CAChE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAD3D,QAAA,gBAAgB,oBAC2C;AAExE,iFAAiF;AACpE,QAAA,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAChE,QAAA,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,IAAI,GAAG,CAAC;IACrC,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,MAAM;IACN,KAAK;IACL,QAAQ;IACR,MAAM;CACP,CAAC,CAAC;AAEH;;GAEG;AACU,QAAA,iBAAiB,GAAG;IAC/B;;OAEG;IACH,SAAS,EAAE,aAAa;IACxB;;OAEG;IACH,QAAQ,EAAE,YAAY;IACtB;;OAEG;IACH,KAAK,EAAE,SAAS;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,UAAU;CACV,CAAC"}

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

@@ -22,6 +22,7 @@ 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;
     // Ensure spec is ready for codegen
     const spec = (0, normalise_1.normaliseOpenApiSpecForCodeGen)(inSpec);
     // Build the initial data, which we will augment with additional information
@@ -32,12 +33,11 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
     ensureCompositeModels(data);
     const modelsByName = Object.fromEntries(data.models.map((m) => [m.name, m]));
     // Augment operations with additional data
-    data.services.forEach((service) => {
+    for (const service of data.services) {
         // Keep track of the request and response models we need the service (ie api client) to import
         const requestModelImports = [];
         const responseModelImports = [];
-        service.operations.forEach((op) => {
-            var _a, _b, _c, _d, _e, _f;
+        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;
@@ -53,12 +53,11 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                 responseModelImports.push(...op.responses
                     .filter((r) => r.export === 'reference')
                     .map((r) => r.type));
-                op.responses.forEach((response) => {
-                    var _a;
+                for (const response of op.responses) {
                     // 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((_a = modelsByName[response.type]) === null || _a === void 0 ? void 0 : _a.export)) {
+                        types_1.COMPOSED_SCHEMA_TYPES.has((_e = modelsByName[response.type]) === null || _e === void 0 ? void 0 : _e.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`);
@@ -79,25 +78,23 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                             // Add the response media types
                             const mediaTypes = Object.keys(specResponse.content);
                             response.mediaTypes = mediaTypes;
-                            mediaTypes.forEach((mediaType) => {
-                                var _a, _b;
-                                const responseContent = (_b = (_a = specResponse.content) === null || _a === void 0 ? void 0 : _a[mediaType]) !== null && _b !== void 0 ? _b : Object.values(specResponse.content)[0];
+                            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 responseSchema = (0, refs_1.resolveIfRef)(spec, responseContent.schema);
                                 if (responseSchema) {
-                                    mutateWithOpenapiSchemaProperties(spec, response, responseSchema);
+                                    yield mutateWithOpenapiSchemaProperties(spec, response, responseSchema, modelsByName);
                                 }
-                            });
+                            }
                         }
                     }
-                });
+                }
             }
-            const specParametersByName = Object.fromEntries(((_e = specOp === null || specOp === void 0 ? void 0 : specOp.parameters) !== null && _e !== void 0 ? _e : []).map((p) => {
+            const specParametersByName = Object.fromEntries(((_h = specOp === null || specOp === void 0 ? void 0 : specOp.parameters) !== null && _h !== void 0 ? _h : []).map((p) => {
                 const param = (0, refs_1.resolveIfRef)(spec, p);
                 return [param.name, param];
             }));
             // Loop through the parameters
-            op.parameters.forEach((parameter) => {
-                var _a, _b, _c, _d, _e;
+            for (const parameter of op.parameters) {
                 // Add the request model import
                 if (parameter.export === 'reference') {
                     requestModelImports.push(parameter.type);
@@ -105,7 +102,7 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                 const specParameter = specParametersByName[parameter.prop];
                 const specParameterSchema = (0, refs_1.resolveIfRef)(spec, specParameter === null || specParameter === void 0 ? void 0 : specParameter.schema);
                 if (specParameterSchema) {
-                    mutateWithOpenapiSchemaProperties(spec, parameter, specParameterSchema);
+                    yield mutateWithOpenapiSchemaProperties(spec, parameter, specParameterSchema, modelsByName);
                 }
                 if (parameter.in === 'body') {
                     // Parameter name for the body is 'body'
@@ -116,9 +113,9 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     const specBody = (0, refs_1.resolveIfRef)(spec, specOp === null || specOp === void 0 ? void 0 : specOp.requestBody);
                     if (specBody) {
                         if (parameter.mediaType) {
-                            const bodySchema = (0, refs_1.resolveIfRef)(spec, (_b = (_a = specBody.content) === null || _a === void 0 ? void 0 : _a[parameter.mediaType]) === null || _b === void 0 ? void 0 : _b.schema);
+                            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);
                             if (bodySchema) {
-                                mutateWithOpenapiSchemaProperties(spec, parameter, bodySchema);
+                                yield mutateWithOpenapiSchemaProperties(spec, parameter, bodySchema, modelsByName);
                             }
                         }
                         // Track all the media types that can be accepted in the request body
@@ -129,17 +126,17 @@ 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 = (_c = specParameter.style) !== null && _c !== void 0 ? _c : (parameter.in === 'query' ? 'form' : 'simple');
-                    const explode = (_d = specParameter.explode) !== null && _d !== void 0 ? _d : style === 'form';
+                    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';
                     if (parameter.in === 'query') {
                         parameter.collectionFormat = explode
                             ? 'multi'
-                            : ((_e = {
+                            : ((_o = {
                                 spaceDelimited: 'ssv',
                                 pipeDelimited: 'tsv',
                                 simple: 'csv',
                                 form: 'csv',
-                            }[style]) !== null && _e !== void 0 ? _e : 'multi');
+                            }[style]) !== null && _o !== void 0 ? _o : 'multi');
                     }
                     else {
                         // parameter.in === "header"
@@ -147,9 +144,9 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
                     }
                 }
                 mutateModelWithAdditionalTypes(parameter);
-            });
+            }
             // Add language types to response models
-            ((_f = op.responses) !== null && _f !== void 0 ? _f : []).forEach(mutateModelWithAdditionalTypes);
+            ((_p = op.responses) !== null && _p !== void 0 ? _p : []).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
@@ -160,7 +157,8 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
             op.operationIdPascalCase = (0, names_1.pascalCase)(op.uniqueName);
             op.operationIdKebabCase = (0, lodash_kebabcase_1.default)(op.uniqueName);
             op.operationIdSnakeCase = (0, languages_1.toPythonName)('operation', op.uniqueName);
-        });
+            mutateOperationWithAdditionalData(op);
+        }
         // Lexicographical ordering of operations
         service.operations = (0, lodash_orderby_1.default)(service.operations, (op) => op.uniqueName);
         // Add the models to import
@@ -169,7 +167,7 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
         service.className = `${service.name}Api`;
         service.classNameSnakeCase = (0, lodash_snakecase_1.default)(service.className);
         service.nameSnakeCase = (0, lodash_snakecase_1.default)(service.name);
-    });
+    }
     // All operations across all services
     const allOperations = (0, lodash_uniqby_1.default)(data.services.flatMap((s) => s.operations), (o) => o.uniqueName);
     // Add additional models for operation parameters
@@ -245,14 +243,13 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
         }),
     ];
     // Augment models with additional data
-    data.models.forEach((model) => {
-        var _a, _b;
+    for (const model of data.models) {
         // Add a snake_case name
         model.nameSnakeCase = (0, languages_1.toPythonName)('model', model.name);
-        const matchingSpecModel = (_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 matchingSpecModel = (_r = (_q = spec === null || spec === void 0 ? void 0 : spec.components) === null || _q === void 0 ? void 0 : _q.schemas) === null || _r === void 0 ? void 0 : _r[model.name];
         if (matchingSpecModel) {
             const specModel = (0, refs_1.resolveIfRef)(spec, matchingSpecModel);
-            mutateWithOpenapiSchemaProperties(spec, model, specModel);
+            yield mutateWithOpenapiSchemaProperties(spec, model, specModel, modelsByName);
             // Add unique imports
             model.uniqueImports = (0, lodash_orderby_1.default)((0, lodash_uniqby_1.default)([
                 ...model.imports,
@@ -263,26 +260,21 @@ const buildOpenApiCodeGenData = (inSpec) => tslib_1.__awaiter(void 0, void 0, vo
             ], (x) => x)).filter((modelImport) => modelImport !== model.name); // Filter out self for recursive model references
             // Add deprecated flag if present
             model.deprecated = specModel.deprecated || false;
-            // If the model has "additionalProperties" there should be a "dictionary" property
-            if (specModel.additionalProperties) {
-                model.additionalPropertiesProperty = model.properties.find((p) => !p.name && p.export === 'dictionary');
-            }
             // Augment properties with additional data
-            model.properties.forEach((property) => {
-                var _a;
-                const matchingSpecProperty = (_a = specModel.properties) === null || _a === void 0 ? void 0 : _a[property.name];
+            for (const property of model.properties) {
+                const matchingSpecProperty = (_s = specModel.properties) === null || _s === void 0 ? void 0 : _s[property.name];
                 if (matchingSpecProperty) {
                     const specProperty = (0, refs_1.resolveIfRef)(spec, matchingSpecProperty);
-                    mutateWithOpenapiSchemaProperties(spec, property, specProperty);
+                    yield mutateWithOpenapiSchemaProperties(spec, property, specProperty, modelsByName);
                 }
-            });
+            }
         }
         // Augment properties with additional data
         model.properties.forEach((property) => {
             // Add language-specific names/types
             mutateModelWithAdditionalTypes(property);
         });
-    });
+    }
     // Order models lexicographically by name
     data.models = (0, lodash_orderby_1.default)(data.models, (d) => d.name);
     // Order services so default appears first, then otherwise by name
@@ -321,35 +313,57 @@ const buildInitialCodeGenData = (spec) => tslib_1.__awaiter(void 0, void 0, void
             data = client;
         },
     });
-    // These are not likely to be set but we save them just in case
-    const prevGlobalWindow = global.window;
-    const prevGlobalLocation = global.location;
-    try {
-        // See https://github.com/hey-api/openapi-ts/issues/1730
-        global.window = {};
-        global.location = { href: 'https://localhost/' };
-        // Use @hey-api/openapi-ts to build the initial data structure that we'll generate clients from
-        yield gen.createClient({
-            experimentalParser: false,
-            input: {
-                path: spec,
-            },
-            output: 'unused',
-            plugins: [plugin()],
-            dryRun: true,
-            logs: { level: 'silent' },
-        });
-    }
-    finally {
-        global.window = prevGlobalWindow;
-        global.location = prevGlobalLocation;
-    }
+    // Use @hey-api/openapi-ts to build the initial data structure that we'll generate clients from
+    yield gen.createClient({
+        experimentalParser: false,
+        input: {
+            path: spec,
+        },
+        output: 'unused',
+        plugins: [plugin()],
+        dryRun: true,
+        logs: { level: 'silent' },
+    });
     if (!data) {
         // If this happens it indicates an update to @hey-api/openapi-ts which has removed the legacy parser
         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 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 }),
+        },
+    };
+    const data = yield 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])));
+    return model;
+});
+const buildOrReferenceModel = (spec, modelsByName, schema) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    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);
+});
 /**
  * Copy vendor extensions from the first parameter to the second
  */
@@ -360,8 +374,8 @@ const copyVendorExtensions = (object, vendorExtensions) => {
         }
     });
 };
-const mutateWithOpenapiSchemaProperties = (spec, model, schema, visited = new Set()) => {
-    var _a;
+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;
     model.format = schema.format;
     model.isInteger = schema.type === 'integer';
     model.isShort = schema.format === 'int32';
@@ -375,6 +389,53 @@ const mutateWithOpenapiSchemaProperties = (spec, model, schema, visited = new Se
     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']);
+    // Ensure models with additional properties are handled correctly
+    if (schema.additionalProperties) {
+        const additionalPropertiesModel = yield 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.
+        if (model.export === 'dictionary') {
+            // Dictionaries contain a special property which is the model itself. Other properties are explicit properties.
+            const explicitProperties = model.properties.filter((p) => !(p.export === 'dictionary' && p.name === model.name));
+            if (explicitProperties.length > 0 || schema.patternProperties) {
+                // Treat this model as an interface instead of a dictionary, since this has
+                // explicit properties
+                model.export = 'interface';
+                model.hasAdditionalProperties = true;
+                model.additionalPropertiesModel = additionalPropertiesModel;
+                model.properties = explicitProperties;
+            }
+        }
+        else {
+            model.hasAdditionalProperties = true;
+            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]');
+        }
+    }
+    // Ensure models with pattern properties are handled correctly
+    if (schema.patternProperties) {
+        const patternProperties = (0, refs_1.resolveIfRef)(spec, schema.patternProperties);
+        const patternPropertiesModels = [];
+        // When there are pattern properties, we don't want to treat models as dictionaries since there can be more than one type of "value"
+        // depending on what pattern the key matches
+        if (model.export === 'dictionary') {
+            model.export = 'interface';
+        }
+        for (const [pattern, patternProperty] of Object.entries(patternProperties)) {
+            const patternPropertyModel = yield buildOrReferenceModel(spec, modelsByName, patternProperty);
+            if (patternPropertyModel) {
+                patternPropertiesModels.push({
+                    pattern,
+                    model: patternPropertyModel,
+                });
+            }
+        }
+        model.hasPatternProperties = true;
+        model.patternPropertiesModels = patternPropertiesModels;
+    }
     mutateModelWithAdditionalTypes(model);
     visited.add(model);
     const modelLink = (0, types_1.flattenModelLink)(model.link);
@@ -385,7 +446,7 @@ const mutateWithOpenapiSchemaProperties = (spec, model, schema, visited = new Se
         schema.items &&
         !visited.has(modelLink)) {
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.items);
-        mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, visited);
+        yield mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, visited);
     }
     // Also apply to object properties recursively
     if (model.export === 'dictionary' &&
@@ -396,25 +457,22 @@ const mutateWithOpenapiSchemaProperties = (spec, model, schema, visited = new Se
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.additionalProperties);
         // Additional properties can be "true" rather than a type
         if (subSchema !== true) {
-            mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, visited);
+            yield mutateWithOpenapiSchemaProperties(spec, modelLink, subSchema, modelsByName, 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, `"'`)]); })
-        .forEach((property) => {
+    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, `"'`)]); })) {
         const subSchema = (0, refs_1.resolveIfRef)(spec, schema.properties[(0, lodash_trim_1.default)(property.name, `"'`)]);
-        mutateWithOpenapiSchemaProperties(spec, property, subSchema, visited);
-    });
+        yield mutateWithOpenapiSchemaProperties(spec, property, subSchema, modelsByName, 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]);
+        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]);
             if (subSchema) {
-                mutateWithOpenapiSchemaProperties(spec, property, subSchema, visited);
+                yield mutateWithOpenapiSchemaProperties(spec, model.properties[i], subSchema, modelsByName, visited);
             }
-        });
+        }
     }
-};
+});
 /**
  * Ensure that the "link" property of all dictionary/array models and properties are set recursively
  */
@@ -427,7 +485,8 @@ const ensureModelLinks = (spec, data) => {
         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]);
         if (schema) {
             // Object schemas should be typed as the model we will create
-            if (schema.type === 'object' && schema.properties) {
+            if (schema.type === 'object' &&
+                (schema.properties || schema.patternProperties)) {
                 model.type = model.name;
             }
             _ensureModelLinks(spec, modelsByName, model, schema, visited);
@@ -579,4 +638,53 @@ const mutateModelWithAdditionalTypes = (model) => {
             !types_1.COMPOSED_SCHEMA_TYPES.has(model.export) &&
             !types_1.COLLECTION_TYPES.has(model.export);
 };
+/**
+ * Determine whether or not an operation is a mutation
+ */
+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]) {
+        return true;
+    }
+    else if (vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.QUERY]) {
+        return false;
+    }
+    // Assume a restful API and treat mutative HTTP methods as mutations
+    return ['PATCH', 'POST', 'PUT', 'DELETE'].includes(op.method);
+};
+/**
+ * Add infinite query details to the operation
+ */
+const mutateOperationWithInfiniteQueryDetails = (op) => {
+    var _a;
+    const { vendorExtensions } = op;
+    // Allow users to customise the "cursor" property used for paginated requests
+    const cursorPropertyName = (_a = vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.CURSOR]) !== null && _a !== void 0 ? _a : 'cursor';
+    const cursorProperty = op.parameters.find((p) => p.name === cursorPropertyName);
+    // The operation is an infinite query if:
+    // - x-cursor is not set to 'false' (this allows users to disable infinite queries for operations that accept a 'cursor')
+    // - the operation accepts a parameter named 'cursor', or a parameter named as the user specified with x-cursor
+    op.isInfiniteQuery =
+        (vendorExtensions === null || vendorExtensions === void 0 ? void 0 : vendorExtensions[types_1.VENDOR_EXTENSIONS.CURSOR]) !== false && !!cursorProperty;
+    if (op.isInfiniteQuery) {
+        op.infiniteQueryCursorProperty = cursorProperty;
+    }
+};
+/**
+ * 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]);
+    // Add infinite query details if applicable
+    if (!isMutation) {
+        mutateOperationWithInfiniteQueryDetails(op);
+    }
+};
 //# sourceMappingURL=codegen-data.js.map