@pactflow/openapi-pact-comparator 2.0.0 → 2.0.1

package/dist/index.cjs

@@ -4132,10 +4132,6 @@ const cleanupDiscriminators = (s) => {
     if (s.discriminator?.propertyName && s.oneOf) {
         s.required = uniq([...(s.required || []), s.discriminator.propertyName]);
     }
-    // no-op from a validation perspective
-    if (s.discriminator?.mapping) {
-        delete s.discriminator.mapping;
-    }
     if (s.discriminator && !s.oneOf) {
         delete s.discriminator;
     }
@@ -19884,8 +19880,6 @@ function requireDiscriminator () {
 	        const tagName = schema.propertyName;
 	        if (typeof tagName != "string")
 	            throw new Error("discriminator: requires propertyName");
-	        if (schema.mapping)
-	            throw new Error("discriminator: mapping is not supported");
 	        if (!oneOf)
 	            throw new Error("discriminator: requires oneOf keyword");
 	        const valid = gen.let("valid", false);
@@ -19914,6 +19908,37 @@ function requireDiscriminator () {
 	            const oneOfMapping = {};
 	            const topRequired = hasRequired(parentSchema);
 	            let tagRequired = true;
+	            if (schema.mapping) {
+	                const refToIndex = {};
+	                for (let i = 0; i < oneOf.length; i++) {
+	                    const sch = oneOf[i];
+	                    if (sch === null || sch === void 0 ? void 0 : sch.$ref) {
+	                        refToIndex[sch.$ref] = i;
+	                    }
+	                }
+	                for (const [tagValue, ref] of Object.entries(schema.mapping)) {
+	                    const i = refToIndex[ref];
+	                    if (i === undefined) {
+	                        throw new Error(`discriminator: mapping "${tagValue}" does not correspond to any oneOf entry`);
+	                    }
+	                    addMapping(tagValue, i);
+	                }
+	                for (let i = 0; i < oneOf.length; i++) {
+	                    let sch = oneOf[i];
+	                    if ((sch === null || sch === void 0 ? void 0 : sch.$ref) && !(0, util_1.schemaHasRulesButRef)(sch, it.self.RULES)) {
+	                        const ref = sch.$ref;
+	                        sch = compile_1.resolveRef.call(it.self, it.schemaEnv.root, it.baseId, ref);
+	                        if (sch instanceof compile_1.SchemaEnv)
+	                            sch = sch.schema;
+	                        if (sch === undefined)
+	                            throw new ref_error_1.default(it.opts.uriResolver, it.baseId, ref);
+	                    }
+	                    tagRequired = tagRequired && (topRequired || hasRequired(sch));
+	                }
+	                if (!tagRequired)
+	                    throw new Error(`discriminator: "${tagName}" must be required`);
+	                return oneOfMapping;
+	            }
 	            for (let i = 0; i < oneOf.length; i++) {
 	                let sch = oneOf[i];
 	                if ((sch === null || sch === void 0 ? void 0 : sch.$ref) && !(0, util_1.schemaHasRulesButRef)(sch, it.self.RULES)) {