flowquery 1.0.24 → 1.0.25
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.
- package/dist/flowquery.min.js +1 -1
- package/dist/tokenization/string_walker.d.ts.map +1 -1
- package/dist/tokenization/string_walker.js +13 -12
- package/dist/tokenization/string_walker.js.map +1 -1
- package/docs/flowquery.min.js +1 -1
- package/flowquery-py/pyproject.toml +1 -1
- package/flowquery-py/src/tokenization/string_walker.py +1 -1
- package/flowquery-py/tests/parsing/test_parser.py +46 -0
- package/flowquery-vscode/flowQueryEngine/flowquery.min.js +1 -1
- package/package.json +1 -1
- package/src/tokenization/string_walker.ts +19 -16
- package/tests/parsing/parser.test.ts +45 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string_walker.d.ts","sourceRoot":"","sources":["../../src/tokenization/string_walker.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,cAAM,YAAY;IACd,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAE9B;;;;OAIG;gBACS,IAAI,EAAE,MAAM;IAKxB,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAEM,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAIxC,kBAAkB,IAAI,MAAM;IAI5B,qBAAqB,IAAI,OAAO;IAUhC,wBAAwB,IAAI,OAAO;IAcnC,sBAAsB,IAAI,OAAO;IAIjC,qBAAqB,IAAI,OAAO;IAIhC,mBAAmB,IAAI,OAAO;IAI9B,OAAO,IAAI,OAAO;IAOlB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B,YAAY,IAAI,OAAO;
|
|
1
|
+
{"version":3,"file":"string_walker.d.ts","sourceRoot":"","sources":["../../src/tokenization/string_walker.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,cAAM,YAAY;IACd,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAE9B;;;;OAIG;gBACS,IAAI,EAAE,MAAM;IAKxB,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAEM,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAIxC,kBAAkB,IAAI,MAAM;IAI5B,qBAAqB,IAAI,OAAO;IAUhC,wBAAwB,IAAI,OAAO;IAcnC,sBAAsB,IAAI,OAAO;IAIjC,qBAAqB,IAAI,OAAO;IAIhC,mBAAmB,IAAI,OAAO;IAI9B,OAAO,IAAI,OAAO;IAOlB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B,YAAY,IAAI,OAAO;IAOvB,YAAY,IAAI,OAAO;IAIvB,YAAY,IAAI,OAAO;IAIvB,kBAAkB,IAAI,OAAO;IAQ7B,cAAc,IAAI,OAAO;IAQzB,aAAa,IAAI,OAAO;IAQxB,aAAa,IAAI,MAAM,GAAG,IAAI;IAS9B,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAUtC,kBAAkB,IAAI,OAAO;IAI7B,oBAAoB,IAAI,OAAO;IAI/B,QAAQ,IAAI,IAAI;IAIhB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI3B,YAAY,IAAI,IAAI;IAIpB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAOrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAIlD;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -72,34 +72,35 @@ class StringWalker {
|
|
|
72
72
|
return false;
|
|
73
73
|
}
|
|
74
74
|
singleLineCommentStart() {
|
|
75
|
-
return this.currentChar ===
|
|
75
|
+
return this.currentChar === "/" && this.nextChar === "/";
|
|
76
76
|
}
|
|
77
77
|
multiLineCommentStart() {
|
|
78
|
-
return this.currentChar ===
|
|
78
|
+
return this.currentChar === "/" && this.nextChar === "*";
|
|
79
79
|
}
|
|
80
80
|
multiLineCommentEnd() {
|
|
81
|
-
return this.currentChar ===
|
|
81
|
+
return this.currentChar === "*" && this.nextChar === "/";
|
|
82
82
|
}
|
|
83
83
|
newLine() {
|
|
84
|
-
if (this.currentChar ===
|
|
84
|
+
if (this.currentChar === "\n") {
|
|
85
85
|
return true;
|
|
86
86
|
}
|
|
87
87
|
return false;
|
|
88
88
|
}
|
|
89
89
|
escaped(char) {
|
|
90
|
-
return this.currentChar ===
|
|
90
|
+
return this.currentChar === "\\" && this.nextChar === char;
|
|
91
91
|
}
|
|
92
92
|
escapedBrace() {
|
|
93
|
-
return (this.currentChar ===
|
|
93
|
+
return ((this.currentChar === "{" && this.nextChar === "{") ||
|
|
94
|
+
(this.currentChar === "}" && this.nextChar === "}"));
|
|
94
95
|
}
|
|
95
96
|
openingBrace() {
|
|
96
|
-
return this.currentChar ===
|
|
97
|
+
return this.currentChar === "{";
|
|
97
98
|
}
|
|
98
99
|
closingBrace() {
|
|
99
|
-
return this.currentChar ===
|
|
100
|
+
return this.currentChar === "}";
|
|
100
101
|
}
|
|
101
102
|
checkForUnderScore() {
|
|
102
|
-
const foundUnderScore = this.currentChar ===
|
|
103
|
+
const foundUnderScore = this.currentChar === "_";
|
|
103
104
|
if (foundUnderScore) {
|
|
104
105
|
this._position++;
|
|
105
106
|
}
|
|
@@ -121,7 +122,7 @@ class StringWalker {
|
|
|
121
122
|
}
|
|
122
123
|
checkForQuote() {
|
|
123
124
|
const quoteChar = this.currentChar;
|
|
124
|
-
if (quoteChar === '"' || quoteChar === "'" || quoteChar ===
|
|
125
|
+
if (quoteChar === '"' || quoteChar === "'" || quoteChar === "`") {
|
|
125
126
|
this._position++;
|
|
126
127
|
return quoteChar;
|
|
127
128
|
}
|
|
@@ -139,7 +140,7 @@ class StringWalker {
|
|
|
139
140
|
return string_utils_1.default.whitespace.includes(this.currentChar);
|
|
140
141
|
}
|
|
141
142
|
checkForFStringStart() {
|
|
142
|
-
return this.currentChar.toLowerCase() ===
|
|
143
|
+
return this.currentChar.toLowerCase() === "f" && ["'", '"', "`"].includes(this.nextChar);
|
|
143
144
|
}
|
|
144
145
|
moveNext() {
|
|
145
146
|
this._position++;
|
|
@@ -158,7 +159,7 @@ class StringWalker {
|
|
|
158
159
|
}
|
|
159
160
|
word_continuation(word) {
|
|
160
161
|
const next = this.text[this.position + word.length];
|
|
161
|
-
return string_utils_1.default.word_valid_chars.includes(next);
|
|
162
|
+
return next !== undefined && string_utils_1.default.word_valid_chars.includes(next.toLowerCase());
|
|
162
163
|
}
|
|
163
164
|
}
|
|
164
165
|
exports.default = StringWalker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string_walker.js","sourceRoot":"","sources":["../../src/tokenization/string_walker.ts"],"names":[],"mappings":";;;;;AAAA,yEAAgD;AAEhD;;;;;;;;;;;;;GAaG;AACH,MAAM,YAAY;IAId;;;;OAIG;IACH,YAAY,IAAY;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC7C,CAAC;IAEM,SAAS,CAAC,aAAqB;QAClC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEM,qBAAqB;QACxB,IAAI,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,wBAAwB;QAC3B,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACnB,IAAI,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;oBAC7B,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;oBACpB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,+CAA+C,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,sBAAsB;QACzB,OAAO,IAAI,CAAC,WAAW,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC;IAC7D,CAAC;IAEM,qBAAqB;QACxB,OAAO,IAAI,CAAC,WAAW,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC;IAC7D,CAAC;IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,WAAW,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC;IAC7D,CAAC;IAEM,OAAO;QACV,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,OAAO,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,WAAW,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC;IAC/D,CAAC;IAEM,YAAY;QACf,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"string_walker.js","sourceRoot":"","sources":["../../src/tokenization/string_walker.ts"],"names":[],"mappings":"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"}
|