From 3434312cf7f839dcb4414b66712133fe307403c2 Mon Sep 17 00:00:00 2001 From: kyle Date: Fri, 8 Feb 2019 17:16:18 -0600 Subject: [PATCH] housekeeping: corresponding changes for swagger-api/swagger-editor#1935 (via #5170) * `schema` -> `structural` * drop strip-instance transformer --- src/core/plugins/err/error-transformers/hook.js | 4 +--- .../transformers/parameter-oneof.js | 4 ++-- .../transformers/strip-instance.js | 14 -------------- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 src/core/plugins/err/error-transformers/transformers/strip-instance.js diff --git a/src/core/plugins/err/error-transformers/hook.js b/src/core/plugins/err/error-transformers/hook.js index e33dbb6f..47df3af4 100644 --- a/src/core/plugins/err/error-transformers/hook.js +++ b/src/core/plugins/err/error-transformers/hook.js @@ -1,12 +1,10 @@ import reduce from "lodash/reduce" import * as NotOfType from "./transformers/not-of-type" import * as ParameterOneOf from "./transformers/parameter-oneof" -import * as StripInstance from "./transformers/strip-instance" const errorTransformers = [ NotOfType, - ParameterOneOf, - StripInstance + ParameterOneOf ] export default function transformErrors (errors, system) { diff --git a/src/core/plugins/err/error-transformers/transformers/parameter-oneof.js b/src/core/plugins/err/error-transformers/transformers/parameter-oneof.js index 9e363cd0..15c731ed 100644 --- a/src/core/plugins/err/error-transformers/transformers/parameter-oneof.js +++ b/src/core/plugins/err/error-transformers/transformers/parameter-oneof.js @@ -38,7 +38,7 @@ function createTailoredParameterError(err, jsSpec) { message, path: err.get("path") + ".in", type: "spec", - source: "schema", + source: "structural", level: "error" }) } @@ -49,7 +49,7 @@ function createTailoredParameterError(err, jsSpec) { message, path: err.get("path") + ".collectionFormat", type: "spec", - source: "schema", + source: "structural", level: "error" }) } diff --git a/src/core/plugins/err/error-transformers/transformers/strip-instance.js b/src/core/plugins/err/error-transformers/transformers/strip-instance.js deleted file mode 100644 index 0187fb11..00000000 --- a/src/core/plugins/err/error-transformers/transformers/strip-instance.js +++ /dev/null @@ -1,14 +0,0 @@ -export function transform(errors) { - return errors - .map(err => { - if(err.get("type") === "schema") { - return err.set("message", removeSubstring(err.get("message"), "instance\\.")) - } else { - return err - } - }) -} - -function removeSubstring(str, substr) { - return str.replace(new RegExp(substr, "g"), "") -}