Comparing version 1.9.0 to 1.9.1
{ | ||
"name": "anumargak", | ||
"version": "1.9.0", | ||
"version": "1.9.1", | ||
"description": "Amazing fast multipurpose simple to use web/ HTTP router", | ||
@@ -12,7 +12,7 @@ "main": "./src/letsRoute.js", | ||
}, | ||
"author": "Amit Gupta (https://github.com/amitguptagwl)", | ||
"author": "Amit Gupta (http://amitkumargupta.work)", | ||
"license": "MIT", | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/NaturalIntelligence/anumargak" | ||
"url": "https://github.com/node-muneem/anumargak" | ||
}, | ||
@@ -19,0 +19,0 @@ "keywords": [ |
@@ -1,5 +0,9 @@ | ||
var { getFirstMatche, getAllMatches, doesMatch, urlSlice } = require("./util"); | ||
'use strict' | ||
var getFirstMatche = require("./util").getFirstMatche; | ||
var getAllMatches = require("./util").getAllMatches; | ||
var doesMatch = require("./util").doesMatch; | ||
var urlSlice = require("./util").urlSlice; | ||
var namedExpressionsStore = require("./namedExpressionsStore"); | ||
var semverStore = require("./semver-store"); | ||
var safeRegex = require('safe-regex'); | ||
var processPathParameters = require("./../src/paramsProcessor"); | ||
@@ -237,3 +241,4 @@ | ||
var urlPartsRegex = new RegExp("(\\/\\(.*?\\)|\\/[^\\(\\)\\/]+)"); | ||
//var urlPartsRegex = new RegExp("(\\/\\(.*?\\)|\\/[^\\(\\)\\/]+)"); | ||
var urlPartsRegex = new RegExp(/(\/\(.*?\)|\/[^\(\)\/]+)/g); | ||
@@ -248,4 +253,6 @@ Anumargak.prototype.isRegistered = function (arr, method, url) { | ||
var urls = Object.keys( arr[method] ); | ||
//var givenUrlParts = getAllMatches(url, urlPartsRegex); | ||
var givenUrlParts = getAllMatches(url, urlPartsRegex); | ||
for (var u_i in urls) {//compare against all the registered URLs | ||
//var urlParts = getAllMatches(urls[u_i], urlPartsRegex); | ||
var urlParts = getAllMatches(urls[u_i], urlPartsRegex); | ||
@@ -252,0 +259,0 @@ if (urlParts.length !== givenUrlParts.length) { |
@@ -1,3 +0,5 @@ | ||
var { getFirstMatche, getAllMatches, doesMatch, urlSlice, getAllRegexMatches } = require("./util"); | ||
'use strict' | ||
var getAllMatches = require("./util").getAllMatches; | ||
function NamedExpressionsStore(){ | ||
@@ -35,4 +37,5 @@ if(!(this instanceof NamedExpressionsStore)) return new NamedExpressionsStore(); | ||
NamedExpressionsStore.prototype.replaceNamedExpression= function (url) { | ||
var namedExpressionRegexStr = "\\(:(.*?):\\)"; | ||
var namedExpressionMatches = getNamedExpressionMatches(url, namedExpressionRegexStr); | ||
//var namedExpressionRegexStr = "\\(:(.*?):\\)"; | ||
var namedExpressionRegexStr = /\(:(.*?):\)/g; | ||
var namedExpressionMatches = getAllMatches(url, namedExpressionRegexStr); | ||
@@ -53,7 +56,2 @@ if (namedExpressionMatches && namedExpressionMatches.length > 0) { | ||
var getNamedExpressionMatches = function (string, regex_str) { | ||
var regex = new RegExp(regex_str, "g"); | ||
return getAllRegexMatches(string, regex); | ||
} | ||
module.exports = NamedExpressionsStore; |
@@ -0,1 +1,2 @@ | ||
'use strict' | ||
@@ -2,0 +3,0 @@ var safeRegex = require('safe-regex'); |
@@ -0,1 +1,3 @@ | ||
'use strict' | ||
var SemVerStore = require("semver-store"); | ||
@@ -2,0 +4,0 @@ |
@@ -0,1 +1,3 @@ | ||
'use strict' | ||
const RandExp = require('randexp'); | ||
@@ -41,3 +43,4 @@ | ||
exports.getAllMatches = function (string, regex_str) { | ||
var regex = new RegExp(regex_str, "g"); | ||
//var regex = new RegExp(regex_str, "g"); | ||
var regex = new RegExp(regex_str); | ||
return exports.getAllRegexMatches(string, regex); | ||
@@ -44,0 +47,0 @@ } |
Sorry, the diff of this file is not supported yet
75237
739