Skip to content

Commit e769103

Browse files
committed
Mark more internal functions
1 parent 6d801d7 commit e769103

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

jmespath.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@
12411241
for (var i = 0; i < signature.length; i++) {
12421242
typeMatched = false;
12431243
currentSpec = signature[i].types;
1244-
actualType = this.getTypeName(args[i]);
1244+
actualType = this.__getTypeName(args[i]);
12451245
for (var j = 0; j < currentSpec.length; j++) {
12461246
if (this.__typeMatches(actualType, currentSpec[j], args[i])) {
12471247
typeMatched = true;
@@ -1282,7 +1282,7 @@
12821282
}
12831283
for (var i = 0; i < argValue.length; i++) {
12841284
if (!this.__typeMatches(
1285-
this.getTypeName(argValue[i]), subtype,
1285+
this.__getTypeName(argValue[i]), subtype,
12861286
argValue[i])) {
12871287
return false;
12881288
}
@@ -1293,7 +1293,7 @@
12931293
return actual === expected;
12941294
}
12951295
},
1296-
getTypeName: function(obj) {
1296+
__getTypeName: function(obj) {
12971297
switch (Object.prototype.toString.call(obj)) {
12981298
case "[object String]":
12991299
return TYPE_STRING;
@@ -1327,7 +1327,7 @@
13271327
},
13281328

13291329
__functionReverse: function(resolvedArgs) {
1330-
var typeName = this.getTypeName(resolvedArgs[0]);
1330+
var typeName = this.__getTypeName(resolvedArgs[0]);
13311331
if (typeName === TYPE_STRING) {
13321332
var originalStr = resolvedArgs[0];
13331333
var reversedStr = "";
@@ -1401,7 +1401,7 @@
14011401

14021402
__functionMax: function(resolvedArgs) {
14031403
if (resolvedArgs[0].length > 0) {
1404-
var typeName = this.getTypeName(resolvedArgs[0][0]);
1404+
var typeName = this.__getTypeName(resolvedArgs[0][0]);
14051405
if (typeName === TYPE_NUMBER) {
14061406
return Math.max.apply(Math, resolvedArgs[0]);
14071407
} else {
@@ -1421,7 +1421,7 @@
14211421

14221422
__functionMin: function(resolvedArgs) {
14231423
if (resolvedArgs[0].length > 0) {
1424-
var typeName = this.getTypeName(resolvedArgs[0][0]);
1424+
var typeName = this.__getTypeName(resolvedArgs[0][0]);
14251425
if (typeName === TYPE_NUMBER) {
14261426
return Math.min.apply(Math, resolvedArgs[0]);
14271427
} else {
@@ -1449,7 +1449,7 @@
14491449
},
14501450

14511451
__functionType: function(resolvedArgs) {
1452-
switch (this.getTypeName(resolvedArgs[0])) {
1452+
switch (this.__getTypeName(resolvedArgs[0])) {
14531453
case TYPE_NUMBER:
14541454
return "number";
14551455
case TYPE_STRING:
@@ -1488,23 +1488,23 @@
14881488
},
14891489

14901490
__functionToArray: function(resolvedArgs) {
1491-
if (this.getTypeName(resolvedArgs[0]) === TYPE_ARRAY) {
1491+
if (this.__getTypeName(resolvedArgs[0]) === TYPE_ARRAY) {
14921492
return resolvedArgs[0];
14931493
} else {
14941494
return [resolvedArgs[0]];
14951495
}
14961496
},
14971497

14981498
__functionToString: function(resolvedArgs) {
1499-
if (this.getTypeName(resolvedArgs[0]) === TYPE_STRING) {
1499+
if (this.__getTypeName(resolvedArgs[0]) === TYPE_STRING) {
15001500
return resolvedArgs[0];
15011501
} else {
15021502
return JSON.stringify(resolvedArgs[0]);
15031503
}
15041504
},
15051505

15061506
__functionToNumber: function(resolvedArgs) {
1507-
var typeName = this.getTypeName(resolvedArgs[0]);
1507+
var typeName = this.__getTypeName(resolvedArgs[0]);
15081508
var convertedValue;
15091509
if (typeName === TYPE_NUMBER) {
15101510
return resolvedArgs[0];
@@ -1519,7 +1519,7 @@
15191519

15201520
__functionNotNull: function(resolvedArgs) {
15211521
for (var i = 0; i < resolvedArgs.length; i++) {
1522-
if (this.getTypeName(resolvedArgs[i]) !== TYPE_NULL) {
1522+
if (this.__getTypeName(resolvedArgs[i]) !== TYPE_NULL) {
15231523
return resolvedArgs[i];
15241524
}
15251525
}
@@ -1539,7 +1539,7 @@
15391539
}
15401540
var interpreter = this.interpreter;
15411541
var exprefNode = resolvedArgs[1];
1542-
var requiredType = this.getTypeName(
1542+
var requiredType = this.__getTypeName(
15431543
interpreter.visit(exprefNode, sortedArray[0]));
15441544
if ([TYPE_NUMBER, TYPE_STRING].indexOf(requiredType) < 0) {
15451545
throw new Error("TypeError");
@@ -1559,14 +1559,14 @@
15591559
decorated.sort(function(a, b) {
15601560
var exprA = interpreter.visit(exprefNode, a[1]);
15611561
var exprB = interpreter.visit(exprefNode, b[1]);
1562-
if (that.getTypeName(exprA) !== requiredType) {
1562+
if (that.__getTypeName(exprA) !== requiredType) {
15631563
throw new Error(
15641564
"TypeError: expected " + requiredType + ", received " +
1565-
that.getTypeName(exprA));
1566-
} else if (that.getTypeName(exprB) !== requiredType) {
1565+
that.__getTypeName(exprA));
1566+
} else if (that.__getTypeName(exprB) !== requiredType) {
15671567
throw new Error(
15681568
"TypeError: expected " + requiredType + ", received " +
1569-
that.getTypeName(exprB));
1569+
that.__getTypeName(exprB));
15701570
}
15711571
if (exprA > exprB) {
15721572
return 1;
@@ -1625,9 +1625,9 @@
16251625
var interpreter = this.interpreter;
16261626
var keyFunc = function(x) {
16271627
var current = interpreter.visit(exprefNode, x);
1628-
if (allowedTypes.indexOf(that.getTypeName(current)) < 0) {
1628+
if (allowedTypes.indexOf(that.__getTypeName(current)) < 0) {
16291629
var msg = "TypeError: expected one of " + allowedTypes +
1630-
", received " + that.getTypeName(current);
1630+
", received " + that.__getTypeName(current);
16311631
throw new Error(msg);
16321632
}
16331633
return current;

0 commit comments

Comments
 (0)