flowquery 1.0.85 → 1.0.86
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.
|
@@ -45,6 +45,12 @@ declare class Expression extends ASTNode {
|
|
|
45
45
|
setAlias(alias: string): void;
|
|
46
46
|
set alias(alias: string);
|
|
47
47
|
get alias(): string | null;
|
|
48
|
+
/**
|
|
49
|
+
* Names an un-aliased dot lookup after its source text (`u.displayName`)
|
|
50
|
+
* so projected columns keep a readable key. Returns null for anything
|
|
51
|
+
* else, leaving the caller to fall back to `expr<n>`.
|
|
52
|
+
*/
|
|
53
|
+
private static propertyPath;
|
|
48
54
|
toString(): string;
|
|
49
55
|
reducers(): AggregateFunction[];
|
|
50
56
|
patterns(): PatternExpression[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/parsing/expressions/expression.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,OAAO,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/parsing/expressions/expression.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,OAAO,MAAM,aAAa,CAAC;AAElC,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAGhE,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AAEvD;;;;;;;;;;;;;;;GAeG;AACH,cAAM,UAAW,SAAQ,OAAO;IAC5B,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,SAAS,CAAoC;IAErD;;;;;;OAMG;IACI,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAsBnC;;;;OAIG;IACI,MAAM,IAAI,IAAI;IAQrB,OAAO,CAAC,MAAM;IAWP,UAAU,IAAI,OAAO;IAIrB,KAAK,IAAI,GAAG;IAUZ,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,IAAW,KAAK,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,IAAW,KAAK,IAAI,MAAM,GAAG,IAAI,CAShC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAkBpB,QAAQ,IAAI,MAAM;IAOlB,QAAQ,IAAI,iBAAiB,EAAE;IAM/B,QAAQ,IAAI,iBAAiB,EAAE;IAMtC,OAAO,CAAC,WAAW,CAAqC;IACjD,UAAU,IAAI,kBAAkB,EAAE;IAMzC,OAAO,CAAE,QAAQ;IAQV,QAAQ,IAAI,OAAO;IAGnB,YAAY,IAAI,OAAO;IAG9B,IAAW,UAAU,CAAC,KAAK,EAAE,GAAG,EAE/B;CACJ;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const pattern_expression_1 = __importDefault(require("../../graph/pattern_expression"));
|
|
7
7
|
const ast_node_1 = __importDefault(require("../ast_node"));
|
|
8
|
+
const lookup_1 = __importDefault(require("../data_structures/lookup"));
|
|
8
9
|
const aggregate_function_1 = __importDefault(require("../functions/aggregate_function"));
|
|
10
|
+
const identifier_1 = __importDefault(require("./identifier"));
|
|
9
11
|
const reference_1 = __importDefault(require("./reference"));
|
|
10
12
|
const subquery_expression_1 = __importDefault(require("./subquery_expression"));
|
|
11
13
|
/**
|
|
@@ -104,10 +106,35 @@ class Expression extends ast_node_1.default {
|
|
|
104
106
|
this._alias = alias;
|
|
105
107
|
}
|
|
106
108
|
get alias() {
|
|
107
|
-
if (this.
|
|
108
|
-
return this.
|
|
109
|
+
if (this._alias !== null) {
|
|
110
|
+
return this._alias;
|
|
111
|
+
}
|
|
112
|
+
const first = this.firstChild();
|
|
113
|
+
if (first instanceof reference_1.default) {
|
|
114
|
+
return first.identifier;
|
|
115
|
+
}
|
|
116
|
+
return Expression.propertyPath(first);
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Names an un-aliased dot lookup after its source text (`u.displayName`)
|
|
120
|
+
* so projected columns keep a readable key. Returns null for anything
|
|
121
|
+
* else, leaving the caller to fall back to `expr<n>`.
|
|
122
|
+
*/
|
|
123
|
+
static propertyPath(node) {
|
|
124
|
+
if (!(node instanceof lookup_1.default)) {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
const index = node.index;
|
|
128
|
+
// Bracket lookups carry an Expression index; only dot access has a bare
|
|
129
|
+
// Identifier, and Reference extends Identifier so it must be excluded.
|
|
130
|
+
if (!(index instanceof identifier_1.default) || index instanceof reference_1.default) {
|
|
131
|
+
return null;
|
|
109
132
|
}
|
|
110
|
-
|
|
133
|
+
const variable = node.variable;
|
|
134
|
+
const prefix = variable instanceof reference_1.default
|
|
135
|
+
? variable.identifier
|
|
136
|
+
: Expression.propertyPath(variable);
|
|
137
|
+
return prefix === null ? null : `${prefix}.${index.value()}`;
|
|
111
138
|
}
|
|
112
139
|
toString() {
|
|
113
140
|
if (this._alias !== null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../src/parsing/expressions/expression.ts"],"names":[],"mappings":";;;;;AAAA,wFAA+D;AAC/D,2DAAkC;AAClC,yFAAgE;AAChE,4DAAoC;AACpC,gFAAuD;AAEvD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAW,SAAQ,kBAAO;IAAhC;;QACY,cAAS,GAAyB,EAAE,CAAC;QACrC,WAAM,GAAyB,EAAE,CAAC;QAClC,WAAM,GAAkB,IAAI,CAAC;QAC7B,gBAAW,GAAQ,SAAS,CAAC;QAC7B,cAAS,GAA+B,IAAI,CAAC;QAC7C,cAAS,GAA+B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../src/parsing/expressions/expression.ts"],"names":[],"mappings":"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"}
|