express-mock-server 3.5.0 → 3.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -62,7 +62,7 @@ const getMatchingResultByQueryStrings = (masterQS, slaveQS) => {
62
62
  if (!masterQS[name]) {
63
63
  result = _MatchingResult.MATCH_NO;
64
64
  } else {
65
- let isContained = !Array.isArray(masterQS[name]) && values.length === 1 && values.indexOf(masterQS[name]) !== -1;
65
+ let isContained = values.indexOf(masterQS[name]) !== -1;
66
66
  let isSpecific = values.indexOf(_constants.REG_ALL) === -1;
67
67
 
68
68
  if (type === TYPE_SPECIFIC_REGEX) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../lib/core/matchers/query-string-matcher.js"],"names":["TYPE_SPECIFIC_REGEX","isEqualQueryParamValues","masterValues","slaveValues","Array","isArray","length","sort","join","getMatchingResultByQueryStrings","masterQS","slaveQS","isMasterExist","JSON","stringify","isSlaveExist","MATCH_STRICT","MATCH_NO","MATCH_DEFAULT","result","countOfMatches","countOfMatchesUnspecific","forEach","name","values","type","isContained","indexOf","isSpecific","REG_ALL","value","regex","RegExp","test","masterQSLength","Object","keys","slaveQSLength","MatchingResult","MATCH_TYPE","SUBSET","getMatchesByQueryString","req","definitions","matches","record","query","queryStringParameters","isNo","push","MatchItem"],"mappings":"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","sourcesContent":["import MatchItem from './MatchItem';\nimport { REG_ALL } from '../../constants';\nimport MatchingResult, {\n MATCH_DEFAULT,\n MATCH_NO,\n MATCH_STRICT,\n MATCH_TYPE,\n} from './MatchingResult';\n\nconst TYPE_SPECIFIC_REGEX = 'SPECIFIC_REGEX';\n\nconst isEqualQueryParamValues = (masterValues, slaveValues) => {\n if (!Array.isArray(masterValues) || !Array.isArray(slaveValues)) {\n return false;\n }\n\n if (masterValues.length <= 1 || slaveValues.length <= 1) {\n return false;\n }\n\n return [...masterValues].sort().join('') === [...slaveValues].sort().join('');\n};\n\n/**\n * exist dont exist dont\n * req/master 0 1 0 1\n * bundle/slave 0 0 1 1\n * result = strict default no subset/no\n *\n * @param {Object} masterQS request\n * @param {Array.<Object>} slaveQS bundle\n */\nexport const getMatchingResultByQueryStrings = (masterQS, slaveQS) => {\n let isMasterExist = !!masterQS && JSON.stringify(masterQS) !== '{}';\n let isSlaveExist = !!slaveQS;\n // console.log('+++++++++++'.green);\n // console.log(masterQS);\n // console.log(slaveQS);\n // console.log('+++++++++++'.blue);\n if (!isMasterExist && !isSlaveExist) return MATCH_STRICT;\n if (!isMasterExist && isSlaveExist) return MATCH_NO;\n if (isMasterExist && !isSlaveExist) return MATCH_DEFAULT;\n let result = null;\n let countOfMatches = 0;\n let countOfMatchesUnspecific = 0;\n slaveQS.forEach(({ name, values, type }) => {\n if (!masterQS[name]) {\n result = MATCH_NO;\n } else {\n let isContained =\n !Array.isArray(masterQS[name]) &&\n values.length === 1 &&\n values.indexOf(masterQS[name]) !== -1;\n\n let isSpecific = values.indexOf(REG_ALL) === -1;\n if (type === TYPE_SPECIFIC_REGEX) {\n isSpecific = true;\n if (!isContained) {\n values.forEach((value) => {\n let regex = new RegExp(value);\n\n // console.log(name);\n // console.log(regex);\n // console.log(masterQS[name]);\n // console.log('regex.test(masterQS[name]) ' +regex.test(masterQS[name]));\n if (regex.test(masterQS[name])) {\n isSpecific = false;\n }\n });\n }\n }\n\n if (isSpecific && !isContained) {\n if (isEqualQueryParamValues(masterQS[name], values)) {\n countOfMatches++;\n } else {\n result = MATCH_NO;\n }\n } else {\n if (!isSpecific) countOfMatchesUnspecific++;\n countOfMatches++;\n }\n }\n });\n\n if (result !== null) return result;\n\n let masterQSLength = Object.keys(masterQS).length;\n let slaveQSLength = slaveQS.length;\n\n if (slaveQSLength === countOfMatches && countOfMatches === masterQSLength)\n return MATCH_STRICT;\n return new MatchingResult(\n MATCH_TYPE.SUBSET,\n countOfMatches,\n countOfMatchesUnspecific\n );\n};\n\nexport const getMatchesByQueryString = (req, definitions) => {\n let matches = [];\n definitions.forEach((record) => {\n // console.log(req.query);\n // console.log(record.queryStringParameters);\n let result = getMatchingResultByQueryStrings(\n req.query,\n record.queryStringParameters\n );\n // console.log('result');\n // console.log(result);\n if (!result.isNo()) {\n matches.push(new MatchItem(record, result));\n }\n });\n return matches;\n};\n"],"file":"query-string-matcher.js"}
1
+ {"version":3,"sources":["../../../lib/core/matchers/query-string-matcher.js"],"names":["TYPE_SPECIFIC_REGEX","isEqualQueryParamValues","masterValues","slaveValues","Array","isArray","length","sort","join","getMatchingResultByQueryStrings","masterQS","slaveQS","isMasterExist","JSON","stringify","isSlaveExist","MATCH_STRICT","MATCH_NO","MATCH_DEFAULT","result","countOfMatches","countOfMatchesUnspecific","forEach","name","values","type","isContained","indexOf","isSpecific","REG_ALL","value","regex","RegExp","test","masterQSLength","Object","keys","slaveQSLength","MatchingResult","MATCH_TYPE","SUBSET","getMatchesByQueryString","req","definitions","matches","record","query","queryStringParameters","isNo","push","MatchItem"],"mappings":"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","sourcesContent":["import MatchItem from './MatchItem';\nimport { REG_ALL } from '../../constants';\nimport MatchingResult, {\n MATCH_DEFAULT,\n MATCH_NO,\n MATCH_STRICT,\n MATCH_TYPE,\n} from './MatchingResult';\n\nconst TYPE_SPECIFIC_REGEX = 'SPECIFIC_REGEX';\n\nconst isEqualQueryParamValues = (masterValues, slaveValues) => {\n if (!Array.isArray(masterValues) || !Array.isArray(slaveValues)) {\n return false;\n }\n\n if (masterValues.length <= 1 || slaveValues.length <= 1) {\n return false;\n }\n\n return [...masterValues].sort().join('') === [...slaveValues].sort().join('');\n};\n\n/**\n * exist dont exist dont\n * req/master 0 1 0 1\n * bundle/slave 0 0 1 1\n * result = strict default no subset/no\n *\n * @param {Object} masterQS request\n * @param {Array.<Object>} slaveQS bundle\n */\nexport const getMatchingResultByQueryStrings = (masterQS, slaveQS) => {\n let isMasterExist = !!masterQS && JSON.stringify(masterQS) !== '{}';\n let isSlaveExist = !!slaveQS;\n // console.log('+++++++++++'.green);\n // console.log(masterQS);\n // console.log(slaveQS);\n // console.log('+++++++++++'.blue);\n if (!isMasterExist && !isSlaveExist) return MATCH_STRICT;\n if (!isMasterExist && isSlaveExist) return MATCH_NO;\n if (isMasterExist && !isSlaveExist) return MATCH_DEFAULT;\n let result = null;\n let countOfMatches = 0;\n let countOfMatchesUnspecific = 0;\n slaveQS.forEach(({ name, values, type }) => {\n if (!masterQS[name]) {\n result = MATCH_NO;\n } else {\n let isContained = values.indexOf(masterQS[name]) !== -1;\n\n let isSpecific = values.indexOf(REG_ALL) === -1;\n if (type === TYPE_SPECIFIC_REGEX) {\n isSpecific = true;\n if (!isContained) {\n values.forEach((value) => {\n let regex = new RegExp(value);\n\n // console.log(name);\n // console.log(regex);\n // console.log(masterQS[name]);\n // console.log('regex.test(masterQS[name]) ' +regex.test(masterQS[name]));\n if (regex.test(masterQS[name])) {\n isSpecific = false;\n }\n });\n }\n }\n\n if (isSpecific && !isContained) {\n if (isEqualQueryParamValues(masterQS[name], values)) {\n countOfMatches++;\n } else {\n result = MATCH_NO;\n }\n } else {\n if (!isSpecific) countOfMatchesUnspecific++;\n countOfMatches++;\n }\n }\n });\n\n if (result !== null) return result;\n\n let masterQSLength = Object.keys(masterQS).length;\n let slaveQSLength = slaveQS.length;\n\n if (slaveQSLength === countOfMatches && countOfMatches === masterQSLength)\n return MATCH_STRICT;\n return new MatchingResult(\n MATCH_TYPE.SUBSET,\n countOfMatches,\n countOfMatchesUnspecific\n );\n};\n\nexport const getMatchesByQueryString = (req, definitions) => {\n let matches = [];\n definitions.forEach((record) => {\n // console.log(req.query);\n // console.log(record.queryStringParameters);\n let result = getMatchingResultByQueryStrings(\n req.query,\n record.queryStringParameters\n );\n // console.log('result');\n // console.log(result);\n if (!result.isNo()) {\n matches.push(new MatchItem(record, result));\n }\n });\n return matches;\n};\n"],"file":"query-string-matcher.js"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "express-mock-server",
3
- "version": "3.5.0",
3
+ "version": "3.5.1",
4
4
  "description": "Mock server powered by Express.js",
5
5
  "main": "dist/index.js",
6
6
  "files": [