@azure-tools/typespec-azure-core 0.36.0-dev.9 → 0.36.0
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spread-discriminated-model.d.ts","sourceRoot":"","sources":["../../../src/rules/spread-discriminated-model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spread-discriminated-model.d.ts","sourceRoot":"","sources":["../../../src/rules/spread-discriminated-model.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,4BAA4B;;EA8CvC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SyntaxKind, createRule, getDiscriminator, paramMessage
|
|
1
|
+
import { SyntaxKind, createRule, getDiscriminator, paramMessage } from "@typespec/compiler";
|
|
2
2
|
export const spreadDiscriminatedModelRule = createRule({
|
|
3
3
|
name: "spread-discriminated-model",
|
|
4
4
|
description: "Check a model with a discriminator has not been used in composition.",
|
|
@@ -10,20 +10,23 @@ export const spreadDiscriminatedModelRule = createRule({
|
|
|
10
10
|
const visited = new Set();
|
|
11
11
|
return {
|
|
12
12
|
modelProperty: (property) => {
|
|
13
|
-
var _a;
|
|
14
|
-
|
|
13
|
+
var _a, _b;
|
|
14
|
+
const model = property.model;
|
|
15
|
+
if (model &&
|
|
16
|
+
((_a = model.node) === null || _a === void 0 ? void 0 : _a.kind) === SyntaxKind.ModelStatement &&
|
|
17
|
+
property.sourceProperty &&
|
|
18
|
+
property.sourceProperty.model) {
|
|
15
19
|
const targetModel = property.sourceProperty.model;
|
|
16
20
|
if (visited.has(targetModel)) {
|
|
17
21
|
return;
|
|
18
22
|
}
|
|
19
23
|
visited.add(targetModel);
|
|
20
|
-
const model = property.model;
|
|
21
24
|
if (model.sourceModel === targetModel) {
|
|
22
25
|
return;
|
|
23
26
|
}
|
|
24
27
|
if (getDiscriminator(context.program, targetModel) !== undefined) {
|
|
25
|
-
const diagnosticTarget = (
|
|
26
|
-
context.program.checker.getTypeForNode(x.target) === targetModel)) !== null &&
|
|
28
|
+
const diagnosticTarget = (_b = model.node.properties.find((x) => x.kind === SyntaxKind.ModelSpreadProperty &&
|
|
29
|
+
context.program.checker.getTypeForNode(x.target) === targetModel)) !== null && _b !== void 0 ? _b : model;
|
|
27
30
|
context.reportDiagnostic({
|
|
28
31
|
format: {
|
|
29
32
|
name: targetModel.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spread-discriminated-model.js","sourceRoot":"","sources":["../../../src/rules/spread-discriminated-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"spread-discriminated-model.js","sourceRoot":"","sources":["../../../src/rules/spread-discriminated-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEnG,MAAM,CAAC,MAAM,4BAA4B,GAAG,UAAU,CAAC;IACrD,IAAI,EAAE,4BAA4B;IAClC,WAAW,EAAE,sEAAsE;IACnF,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE;QACR,OAAO,EAAE,YAAY,CAAA,UAAU,MAAM,8KAA8K;KACpN;IACD,MAAM,CAAC,OAAO;QACZ,MAAM,OAAO,GAAG,IAAI,GAAG,EAAS,CAAC;QAEjC,OAAO;YACL,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE;;gBAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;gBAC7B,IACE,KAAK;oBACL,CAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,IAAI,MAAK,UAAU,CAAC,cAAc;oBAC9C,QAAQ,CAAC,cAAc;oBACvB,QAAQ,CAAC,cAAc,CAAC,KAAK,EAC7B;oBACA,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC;oBAClD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;wBAC5B,OAAO;qBACR;oBACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAEzB,IAAI,KAAK,CAAC,WAAW,KAAK,WAAW,EAAE;wBACrC,OAAO;qBACR;oBACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,SAAS,EAAE;wBAChE,MAAM,gBAAgB,GACpB,MAAA,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,mBAAmB;4BACzC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,WAAW,CACnE,mCAAI,KAAK,CAAC;wBACb,OAAO,CAAC,gBAAgB,CAAC;4BACvB,MAAM,EAAE;gCACN,IAAI,EAAE,WAAW,CAAC,IAAI;6BACvB;4BACD,MAAM,EAAE,gBAAgB;yBACzB,CAAC,CAAC;qBACJ;iBACF;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure-tools/typespec-azure-core",
|
|
3
|
-
"version": "0.36.0
|
|
3
|
+
"version": "0.36.0",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec Azure Core library",
|
|
6
6
|
"homepage": "https://azure.github.io/typespec-azure",
|
|
@@ -38,20 +38,20 @@
|
|
|
38
38
|
"!dist/test/**"
|
|
39
39
|
],
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@typespec/compiler": "~0.
|
|
42
|
-
"@typespec/http": "~0.
|
|
43
|
-
"@typespec/rest": "~0.
|
|
41
|
+
"@typespec/compiler": "~0.50.0",
|
|
42
|
+
"@typespec/http": "~0.50.0",
|
|
43
|
+
"@typespec/rest": "~0.50.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@typespec/compiler": "~0.
|
|
47
|
-
"@typespec/http": "~0.
|
|
48
|
-
"@typespec/rest": "~0.
|
|
49
|
-
"@typespec/eslint-config-typespec": "~0.
|
|
50
|
-
"@typespec/library-linter": "~0.
|
|
51
|
-
"@typespec/eslint-plugin": "~0.
|
|
52
|
-
"@typespec/openapi": "~0.
|
|
53
|
-
"@typespec/tspd": "~0.46.0
|
|
54
|
-
"@typespec/versioning": "~0.
|
|
46
|
+
"@typespec/compiler": "~0.50.0",
|
|
47
|
+
"@typespec/http": "~0.50.0",
|
|
48
|
+
"@typespec/rest": "~0.50.0",
|
|
49
|
+
"@typespec/eslint-config-typespec": "~0.50.0",
|
|
50
|
+
"@typespec/library-linter": "~0.50.0",
|
|
51
|
+
"@typespec/eslint-plugin": "~0.50.0",
|
|
52
|
+
"@typespec/openapi": "~0.50.0",
|
|
53
|
+
"@typespec/tspd": "~0.46.0",
|
|
54
|
+
"@typespec/versioning": "~0.50.0",
|
|
55
55
|
"@types/mocha": "~10.0.1",
|
|
56
56
|
"@types/node": "~18.11.9",
|
|
57
57
|
"eslint": "^8.49.0",
|
|
@@ -62,7 +62,6 @@
|
|
|
62
62
|
"rimraf": "~5.0.1",
|
|
63
63
|
"typescript": "~5.2.2"
|
|
64
64
|
},
|
|
65
|
-
"dependencies": {},
|
|
66
65
|
"scripts": {
|
|
67
66
|
"clean": "rimraf ./dist ./temp",
|
|
68
67
|
"build": "tsc -p . && npm run lint-typespec-library",
|