poe-code 3.0.186 → 3.0.187

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-code",
-  "version": "3.0.186",
+  "version": "3.0.187",
   "description": "CLI tool to configure Poe API for developer workflows.",
   "type": "module",
   "main": "./dist/index.js",

package/packages/cmdkit-openapi/dist/generate.js

@@ -311,7 +311,7 @@ function assertSupportedSuccessResponses(document, operation, operationId) {
     }
 }
 function assertSupportedSuccessResponseSchema(document, schema, operationId, context) {
-    const resolvedSchema = expectSchema(document, schema, operationId, context);
+    const resolvedSchema = expectSupportedSuccessResponseSchema(document, schema, operationId, context);
     if (resolvedSchema.additionalProperties !== undefined &&
         resolvedSchema.additionalProperties !== false) {
         throw new UserError(`Operation ${JSON.stringify(operationId)} uses unsupported ${context}. Object response schemas with additionalProperties are not supported in v1.`);
@@ -323,6 +323,20 @@ function assertSupportedSuccessResponseSchema(document, schema, operationId, con
         assertSupportedSuccessResponseSchema(document, resolvedSchema.items, operationId, `${context} items`);
     }
 }
+function expectSupportedSuccessResponseSchema(document, schema, operationId, context) {
+    const resolvedSchema = resolveSchema(document, schema, operationId, context);
+    const compositionKeyword = getCompositionKeyword(resolvedSchema);
+    if (compositionKeyword === undefined) {
+        return resolvedSchema;
+    }
+    const nullableAnyOfSchema = compositionKeyword === "anyOf"
+        ? resolveNullableAnyOfSchema(document, resolvedSchema, operationId, context)
+        : undefined;
+    if (nullableAnyOfSchema !== undefined) {
+        return nullableAnyOfSchema;
+    }
+    throw new UserError(`Operation ${JSON.stringify(operationId)} uses unsupported ${context}. JSON Schema composition keyword ${JSON.stringify(compositionKeyword)} is not supported in v1.`);
+}
 function createGeneratedParameter(document, parameter, operationId) {
     const schema = expectSchema(document, parameter.schema, operationId, `parameter ${JSON.stringify(parameter.name)}`);
     if (parameter.in === "path") {
@@ -749,16 +763,20 @@ function expectResponse(document, response, operationId, statusCode, refChain =
     return expectResponse(document, resolveLocalReference(document, response.$ref, operationId, context), operationId, statusCode, [...refChain, response.$ref]);
 }
 function expectSchema(document, schema, operationId, context, refChain = []) {
+    const resolvedSchema = resolveSchema(document, schema, operationId, context, refChain);
+    const compositionKeyword = getCompositionKeyword(resolvedSchema);
+    if (compositionKeyword !== undefined) {
+        throw new UserError(`Operation ${JSON.stringify(operationId)} uses unsupported ${context}. JSON Schema composition keyword ${JSON.stringify(compositionKeyword)} is not supported in v1.`);
+    }
+    return resolvedSchema;
+}
+function resolveSchema(document, schema, operationId, context, refChain = []) {
     if (schema === undefined) {
         throw new UserError(`Operation ${JSON.stringify(operationId)} is missing a schema for ${context}.`);
     }
     if (isReferenceObject(schema)) {
         assertAcyclicRef(schema.$ref, refChain, operationId, context);
-        return expectSchema(document, resolveLocalReference(document, schema.$ref, operationId, context), operationId, context, [...refChain, schema.$ref]);
-    }
-    const compositionKeyword = getCompositionKeyword(schema);
-    if (compositionKeyword !== undefined) {
-        throw new UserError(`Operation ${JSON.stringify(operationId)} uses unsupported ${context}. JSON Schema composition keyword ${JSON.stringify(compositionKeyword)} is not supported in v1.`);
+        return resolveSchema(document, resolveLocalReference(document, schema.$ref, operationId, context), operationId, context, [...refChain, schema.$ref]);
     }
     return schema;
 }
@@ -770,6 +788,28 @@ function getCompositionKeyword(schema) {
     }
     return undefined;
 }
+function resolveNullableAnyOfSchema(document, schema, operationId, context) {
+    const variants = schema.anyOf;
+    if (variants === undefined || variants.length !== 2) {
+        return undefined;
+    }
+    const resolvedVariants = variants.map((variant, index) => resolveSchema(document, variant, operationId, `${context} anyOf variant ${index}`));
+    const nullVariantIndex = resolvedVariants.findIndex(isExplicitNullSchema);
+    if (nullVariantIndex === -1) {
+        return undefined;
+    }
+    const nonNullVariant = resolvedVariants[Number(!nullVariantIndex)];
+    if (nonNullVariant === undefined || getCompositionKeyword(nonNullVariant) !== undefined) {
+        return undefined;
+    }
+    return {
+        ...nonNullVariant,
+        nullable: true
+    };
+}
+function isExplicitNullSchema(schema) {
+    return schema.type === "null";
+}
 function assertAcyclicRef(ref, refChain, operationId, context) {
     if (!refChain.includes(ref)) {
         return;