@penkov/swagger-code-gen 1.16.0 → 1.16.1

package/dist/cli.mjs

@@ -12,6 +12,7 @@ program
     .option('--includeTags <tags...>', 'Space-separated list of tags of paths to be included. Path is included if it contains any of specified tag')
     .option('--excludeTags <tags...>', 'Space-separated list of tags of paths to be excluded. Path is excluded if it contains any of specified tag')
     .option('--onlyUsedSchemas', 'Generate only schemas reachable from filtered methods', false)
+    .option('--includeSchemasByMask <masks...>', 'Space-separated list of schema name masks to force-include with dependencies (supports * and ? wildcards)')
     .option('--enableScats', 'Generate scats', false)
     .option('--targetNode', 'Add imports for node-fetch into generated code', false)
     .option('--user <username>', 'If swagger requires authorisation')
@@ -30,6 +31,7 @@ const outputFile = program.args[0];
 const includeTags = HashSet.from(program.opts().includeTags || []);
 const excludeTags = HashSet.from(program.opts().excludeTags || []);
 const onlyUsedSchemas = program.opts().onlyUsedSchemas;
+const includeSchemasByMask = HashSet.from(program.opts().includeSchemasByMask || []);
 main(url, enableScats, targetNode, outputFile, ignoreSSLErrors, option(user).flatMap(u => option(password).map(p => ({
     user: u,
     password: p
@@ -37,6 +39,7 @@ main(url, enableScats, targetNode, outputFile, ignoreSSLErrors, option(user).fla
     referencedObjectsNullableByDefault: referencedObjectsNullableByDefault,
     includeTags: includeTags,
     excludeTags: excludeTags,
-    onlyUsedSchemas: onlyUsedSchemas
+    onlyUsedSchemas: onlyUsedSchemas,
+    includeSchemasByMask: includeSchemasByMask
 }).then(() => {
 });

package/dist/components-parse.js

@@ -1,4 +1,4 @@
-import { Collection, mutable, Nil, option } from 'scats';
+import { Collection, HashSet, mutable, Nil, option } from 'scats';
 import { SchemaFactory, SchemaObject } from './schemas.js';
 import { Property, SCHEMA_PREFIX } from './property.js';
 import { Method, supportedBodyMimeTypes } from './method.js';
@@ -95,9 +95,15 @@ function collectSchemaRefsFromType(type, schemas, add) {
         .filter(t => schemas.containsKey(t))
         .foreach(t => add(t));
 }
-export function filterUsedSchemas(paths, schemas) {
+function wildcardMaskToRegExp(mask) {
+    const escaped = mask.replace(/[.+^${}()|[\]\\]/g, '\\$&');
+    const regex = escaped.replace(/\*/g, '.*').replace(/\?/g, '.');
+    return new RegExp(`^${regex}$`);
+}
+export function filterUsedSchemas(paths, schemas, includeSchemasByMask = HashSet.empty) {
     const used = new Set();
     const pending = [];
+    const maskRegexes = includeSchemasByMask.map(mask => wildcardMaskToRegExp(mask));
     const add = (name) => {
         if (!used.has(name) && schemas.containsKey(name)) {
             used.add(name);
@@ -117,6 +123,9 @@ export function filterUsedSchemas(paths, schemas) {
             }
         });
     });
+    schemas.keySet
+        .filter(name => maskRegexes.exists(regex => regex.test(name)))
+        .foreach(name => add(name));
     while (pending.length > 0) {
         const schemaName = pending.shift();
         const schema = schemas.get(schemaName).getOrElseThrow(() => new Error(`No schema for ${schemaName}`));

package/dist/index.js

@@ -28,7 +28,9 @@ export async function main(url, enableScats, targetNode, outputFile, ignoreSSLEr
         const schemasTypes = resolveSchemasTypes(json);
         const allSchemas = resolveSchemas(json, schemasTypes, options);
         const paths = resolvePaths(json, schemasTypes, options, allSchemas);
-        const schemas = options.onlyUsedSchemas ? filterUsedSchemas(paths, allSchemas) : allSchemas;
+        const schemas = options.onlyUsedSchemas
+            ? filterUsedSchemas(paths, allSchemas, options.includeSchemasByMask)
+            : allSchemas;
         const inplace = generateInPlace(paths, schemasTypes, options, schemas);
         logger.debug(`Downloaded swagger: ${schemas.size} schemas, ${paths.size} paths`);
         await renderer.renderToFile(schemas.appendedAll(inplace.toMap(s => [s.name, s])).values, paths, enableScats, targetNode, outputFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "type": "module",
   "bin": {
     "generate-client": "dist/cli.mjs"