@actions/languageservice 0.3.1 → 0.3.3
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/expression-validation/evaluator.d.ts +14 -0
- package/dist/expression-validation/evaluator.d.ts.map +1 -0
- package/dist/expression-validation/evaluator.js +50 -0
- package/dist/expression-validation/evaluator.js.map +1 -0
- package/dist/validate.d.ts.map +1 -1
- package/dist/validate.js +12 -26
- package/dist/validate.js.map +1 -1
- package/dist/value-providers/definition.js +4 -0
- package/dist/value-providers/definition.js.map +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Evaluator } from "@actions/expressions";
|
|
2
|
+
import { Expr, Logical } from "@actions/expressions/ast";
|
|
3
|
+
import { ExpressionData } from "@actions/expressions/data/expressiondata";
|
|
4
|
+
export type ValidationError = {
|
|
5
|
+
message: string;
|
|
6
|
+
severity: "error" | "warning";
|
|
7
|
+
};
|
|
8
|
+
export declare class ValidationEvaluator extends Evaluator {
|
|
9
|
+
readonly errors: ValidationError[];
|
|
10
|
+
validate(): void;
|
|
11
|
+
protected eval(n: Expr): ExpressionData;
|
|
12
|
+
visitLogical(logical: Logical): ExpressionData;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=evaluator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../../src/expression-validation/evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAkC,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,0CAA0C,CAAC;AAKxE,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,SAAS;IAChD,SAAgB,MAAM,EAAE,eAAe,EAAE,CAAM;IAExC,QAAQ;cAII,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,cAAc;IAsBvC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc;CAmBxD"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { Evaluator, ExpressionEvaluationError, data } from "@actions/expressions";
|
|
2
|
+
import { TokenType } from "@actions/expressions/lexer";
|
|
3
|
+
import { falsy, truthy } from "@actions/expressions/result";
|
|
4
|
+
import { AccessError } from "./error-dictionary";
|
|
5
|
+
export class ValidationEvaluator extends Evaluator {
|
|
6
|
+
constructor() {
|
|
7
|
+
super(...arguments);
|
|
8
|
+
this.errors = [];
|
|
9
|
+
}
|
|
10
|
+
validate() {
|
|
11
|
+
super.evaluate();
|
|
12
|
+
}
|
|
13
|
+
eval(n) {
|
|
14
|
+
try {
|
|
15
|
+
return super.eval(n);
|
|
16
|
+
}
|
|
17
|
+
catch (e) {
|
|
18
|
+
// Record error
|
|
19
|
+
if (e instanceof AccessError) {
|
|
20
|
+
this.errors.push({
|
|
21
|
+
message: `Context access might be invalid: ${e.keyName}`,
|
|
22
|
+
severity: "warning"
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
else if (e instanceof ExpressionEvaluationError) {
|
|
26
|
+
this.errors.push({
|
|
27
|
+
message: `Expression might be invalid: ${e.message}`,
|
|
28
|
+
severity: "error"
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
// Return null but continue with the validation
|
|
33
|
+
return new data.Null();
|
|
34
|
+
}
|
|
35
|
+
visitLogical(logical) {
|
|
36
|
+
let result;
|
|
37
|
+
for (const arg of logical.args) {
|
|
38
|
+
const r = this.eval(arg);
|
|
39
|
+
// Simulate short-circuit behavior but continue to evalute all arguments for validation purposes
|
|
40
|
+
if (!result &&
|
|
41
|
+
((logical.operator.type === TokenType.AND && falsy(r)) || (logical.operator.type === TokenType.OR && truthy(r)))) {
|
|
42
|
+
result = r;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// result is always assigned before we return here
|
|
46
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
47
|
+
return result;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=evaluator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evaluator.js","sourceRoot":"","sources":["../../src/expression-validation/evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAC,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAO/C,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IAAlD;;QACkB,WAAM,GAAsB,EAAE,CAAC;IA+CjD,CAAC;IA7CQ,QAAQ;QACb,KAAK,CAAC,QAAQ,EAAE,CAAC;IACnB,CAAC;IAEkB,IAAI,CAAC,CAAO;QAC7B,IAAI;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,eAAe;YACf,IAAI,CAAC,YAAY,WAAW,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;oBACf,OAAO,EAAE,oCAAoC,CAAC,CAAC,OAAO,EAAE;oBACxD,QAAQ,EAAE,SAAS;iBACpB,CAAC,CAAC;aACJ;iBAAM,IAAI,CAAC,YAAY,yBAAyB,EAAE;gBACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;oBACf,OAAO,EAAE,gCAAgC,CAAC,CAAC,OAAO,EAAE;oBACpD,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC;aACJ;SACF;QAED,+CAA+C;QAC/C,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAEQ,YAAY,CAAC,OAAgB;QACpC,IAAI,MAAuC,CAAC;QAE5C,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE;YAC9B,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEzB,gGAAgG;YAChG,IACE,CAAC,MAAM;gBACP,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAChH;gBACA,MAAM,GAAG,CAAC,CAAC;aACZ;SACF;QAED,kDAAkD;QAClD,oEAAoE;QACpE,OAAO,MAAO,CAAC;IACjB,CAAC;CACF"}
|
package/dist/validate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,YAAY,EAAC,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAC,YAAY,EAAC,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAC,UAAU,EAA0B,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,YAAY,EAAC,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAC,YAAY,EAAC,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAC,UAAU,EAA0B,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AAWjE,OAAO,EAAC,mBAAmB,EAAoB,MAAM,0BAA0B,CAAC;AAGhF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;CACnF,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAuC3G"}
|
package/dist/validate.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Lexer, Parser } from "@actions/expressions";
|
|
2
2
|
import { isBasicExpression, isString } from "@actions/workflow-parser";
|
|
3
3
|
import { ErrorPolicy } from "@actions/workflow-parser/model/convert";
|
|
4
4
|
import { splitAllowedContext } from "@actions/workflow-parser/templates/allowed-context";
|
|
5
5
|
import { TemplateToken } from "@actions/workflow-parser/templates/tokens/template-token";
|
|
6
6
|
import { DiagnosticSeverity } from "vscode-languageserver-types";
|
|
7
|
-
import {
|
|
7
|
+
import { Mode, getContext } from "./context-providers/default";
|
|
8
8
|
import { getWorkflowContext } from "./context/workflow-context";
|
|
9
|
-
import {
|
|
9
|
+
import { wrapDictionary } from "./expression-validation/error-dictionary";
|
|
10
|
+
import { ValidationEvaluator } from "./expression-validation/evaluator";
|
|
10
11
|
import { validatorFunctions } from "./expression-validation/functions";
|
|
11
12
|
import { error } from "./log";
|
|
12
13
|
import { findToken } from "./utils/find-token";
|
|
@@ -134,29 +135,14 @@ async function validateExpression(diagnostics, token, allowedContext, contextPro
|
|
|
134
135
|
// Ignore any error here, we should've caught this earlier in the parsing process
|
|
135
136
|
continue;
|
|
136
137
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
if (e instanceof AccessError) {
|
|
146
|
-
diagnostics.push({
|
|
147
|
-
message: `Context access might be invalid: ${e.keyName}`,
|
|
148
|
-
severity: DiagnosticSeverity.Warning,
|
|
149
|
-
range: mapRange(expression.range)
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
else if (e instanceof ExpressionEvaluationError) {
|
|
153
|
-
diagnostics.push({
|
|
154
|
-
message: `Expression might be invalid: ${e.message}`,
|
|
155
|
-
severity: DiagnosticSeverity.Error,
|
|
156
|
-
range: mapRange(expression.range)
|
|
157
|
-
});
|
|
158
|
-
}
|
|
159
|
-
}
|
|
138
|
+
const context = await getContext(namedContexts, contextProviderConfig, workflowContext, Mode.Validation);
|
|
139
|
+
const e = new ValidationEvaluator(expr, wrapDictionary(context), validatorFunctions);
|
|
140
|
+
e.validate();
|
|
141
|
+
diagnostics.push(...e.errors.map(e => ({
|
|
142
|
+
message: e.message,
|
|
143
|
+
range: mapRange(expression.range),
|
|
144
|
+
severity: e.severity === "error" ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning
|
|
145
|
+
})));
|
|
160
146
|
}
|
|
161
147
|
}
|
|
162
148
|
//# sourceMappingURL=validate.js.map
|
package/dist/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,10 @@ function mappingValues(mappingDefinition, definitions, indentation) {
|
|
|
52
52
|
case DefinitionType.OneOf:
|
|
53
53
|
// No special insertText in this case
|
|
54
54
|
break;
|
|
55
|
+
case DefinitionType.String:
|
|
56
|
+
case DefinitionType.Boolean:
|
|
57
|
+
insertText = `\n${indentation}${key}: `;
|
|
58
|
+
break;
|
|
55
59
|
default:
|
|
56
60
|
insertText = `${key}: `;
|
|
57
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/value-providers/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,8DAA8D,CAAC;AAE/F,OAAO,EAAC,cAAc,EAAC,MAAM,2DAA2D,CAAC;AACzF,OAAO,EAAC,iBAAiB,EAAC,MAAM,8DAA8D,CAAC;AAC/F,OAAO,EAAC,eAAe,EAAC,MAAM,6DAA6D,CAAC;AAC5F,OAAO,EAAC,kBAAkB,EAAC,MAAM,+DAA+D,CAAC;AACjG,OAAO,EAAC,gBAAgB,EAAC,MAAM,6DAA6D,CAAC;AAC7F,OAAO,EAAC,iBAAiB,EAAC,MAAM,oDAAoD,CAAC;AAErF,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAEpD,MAAM,UAAU,gBAAgB,CAAC,GAAe,EAAE,WAAmB;IACnE,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IAEnC,IAAI,GAAG,YAAY,iBAAiB,EAAE;QACpC,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KAC5D;IAED,IAAI,GAAG,YAAY,eAAe,EAAE;QAClC,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KAC1D;IAED,IAAI,GAAG,YAAY,iBAAiB,EAAE;QACpC,OAAO,eAAe,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KAC3C;IAED,IAAI,GAAG,YAAY,gBAAgB,IAAI,GAAG,CAAC,QAAQ,EAAE;QACnD,OAAO;YACL;gBACE,KAAK,EAAE,GAAG,CAAC,QAAQ;gBACnB,WAAW,EAAE,GAAG,CAAC,WAAW;aAC7B;SACF,CAAC;KACH;IAED,IAAI,GAAG,YAAY,kBAAkB,EAAE;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,OAAO,EAAE;YACX,OAAO,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;SAC/C;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,aAAa,CACpB,iBAAoC,EACpC,WAAwC,EACxC,WAAmB;IAEnB,MAAM,UAAU,GAAY,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE;QACvE,IAAI,UAA8B,CAAC;QAEnC,IAAI,WAA+B,CAAC;QACpC,IAAI,KAAK,CAAC,IAAI,EAAE;YACd,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxC,WAAW,GAAG,OAAO,EAAE,WAAW,CAAC;YAEnC,IAAI,OAAO,EAAE;gBACX,QAAQ,OAAO,CAAC,cAAc,EAAE;oBAC9B,KAAK,cAAc,CAAC,QAAQ;wBAC1B,UAAU,GAAG,GAAG,GAAG,MAAM,WAAW,IAAI,CAAC;wBACzC,MAAM;oBAER,KAAK,cAAc,CAAC,OAAO;wBACzB,UAAU,GAAG,GAAG,GAAG,MAAM,WAAW,EAAE,CAAC;wBACvC,MAAM;oBAER,KAAK,cAAc,CAAC,KAAK;wBACvB,qCAAqC;wBACrC,MAAM;oBAER;wBACE,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC;iBAC3B;aACF;SACF;QAED,UAAU,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,GAAG;YACV,WAAW;YACX,UAAU;SACX,CAAC,CAAC;KACJ;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAClB,eAAgC,EAChC,WAAwC,EACxC,WAAmB;IAEnB,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,KAAK,EAAE;QACvC,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;KACjE;IACD,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,MAAe;IACrC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAiB,CAAC;IACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KAC7B;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;AAClC,CAAC"}
|
|
1
|
+
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/value-providers/definition.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@actions/languageservice",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.3",
|
|
4
4
|
"description": "Language service for GitHub Actions",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"watch": "tsc --build tsconfig.build.json --watch"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@actions/expressions": "^0.3.
|
|
48
|
-
"@actions/workflow-parser": "^0.3.
|
|
47
|
+
"@actions/expressions": "^0.3.3",
|
|
48
|
+
"@actions/workflow-parser": "^0.3.3",
|
|
49
49
|
"vscode-languageserver-textdocument": "^1.0.7",
|
|
50
50
|
"vscode-languageserver-types": "^3.17.2",
|
|
51
51
|
"vscode-uri": "^3.0.7",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"ts-node": "^10.9.1",
|
|
74
74
|
"typescript": "^4.8.4"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "cf2fd6332f6229e6d69e4fbee7c7d665404f4181"
|
|
77
77
|
}
|