@microsoft/typespec-msgraph 0.0.1-Preview.26 → 0.0.1-Preview.28
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/src/components/operation-element.js +7 -7
- package/dist/src/components/operation-element.js.map +1 -1
- package/dist/src/decorators/ags-attribute.d.ts.map +1 -1
- package/dist/src/decorators/ags-attribute.js +14 -9
- package/dist/src/decorators/ags-attribute.js.map +1 -1
- package/dist/src/entities/annotations.js +4 -4
- package/dist/src/entities/annotations.js.map +1 -1
- package/dist/src/entities/property.d.ts.map +1 -1
- package/dist/src/entities/property.js +7 -0
- package/dist/src/entities/property.js.map +1 -1
- package/dist/src/linter.d.ts.map +1 -1
- package/dist/src/linter.js +16 -9
- package/dist/src/linter.js.map +1 -1
- package/dist/src/rules/model.d.ts +3 -0
- package/dist/src/rules/model.d.ts.map +1 -1
- package/dist/src/rules/model.js +34 -5
- package/dist/src/rules/model.js.map +1 -1
- package/package.json +14 -14
|
@@ -66,15 +66,15 @@ const ParameterElement = ({ parameter }) => {
|
|
|
66
66
|
React.createElement(RevisionsAnnotation, { definition: parameter.RevisionDefinition })));
|
|
67
67
|
};
|
|
68
68
|
const OptionalParameterAnnotation = ({ isOptional, defaultValue }) => {
|
|
69
|
-
if (!
|
|
70
|
-
return React.createElement(React.Fragment, null);
|
|
71
|
-
}
|
|
72
|
-
if (!defaultValue) {
|
|
69
|
+
if (isOptional && !defaultValue) {
|
|
73
70
|
return React.createElement(AnnotationElement, { Term: "Org.OData.Core.V1.OptionalParameter" });
|
|
74
71
|
}
|
|
75
|
-
|
|
76
|
-
React.createElement(
|
|
77
|
-
React.createElement(
|
|
72
|
+
if (defaultValue) {
|
|
73
|
+
return (React.createElement(AnnotationElement, { Term: "Org.OData.Core.V1.OptionalParameter" },
|
|
74
|
+
React.createElement(RecordElement, null,
|
|
75
|
+
React.createElement(PropertyValueElement, { Property: "DefaultValue", ...defaultValue }))));
|
|
76
|
+
}
|
|
77
|
+
return null;
|
|
78
78
|
};
|
|
79
79
|
const ReturnTypeElement = ({ isVoidType, isNullable, returnTypeName }) => {
|
|
80
80
|
if (isVoidType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-element.js","sourceRoot":"","sources":["../../../src/components/operation-element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAa,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAoB,aAAa,EAA4B,MAAM,0BAA0B,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAqBxD,MAAM,MAAM,GAAG,CAAC,KAAqB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC/E,MAAM,QAAQ,GAAG,CAAC,KAAqB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACnF,MAAM,SAAS,GAAG,CAAC,KAAqB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AACrF,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;AAExF,MAAM,CAAC,MAAM,gBAAgB,GAAsC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IACjF,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1B,OAAO,oBAAC,aAAa,IAAC,OAAO,EAAE,OAAO,GAAI,CAAA;QAC5C,CAAC;QACD,KAAK,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5B,OAAO,oBAAC,eAAe,IAAC,OAAO,EAAE,OAAO,GAAI,CAAA;QAC9C,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,OAAO,yCAAK,CAAA;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,aAAa,GAAsC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IACvE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC1C,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAC,MAAM,KACtC,OAAO,CAAC,aAAa,KACrB,OAAO,CAAC,UAAU,KAClB,OAAO,CAAC,aAAa,KACrB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAC,aAAa,EAAG,YAAY,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,oBAAC,SAAS,IAAC,IAAI,EAAC,kBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,eAAe,GAAI;QACpE,oBAAC,aAAa,IAAC,UAAU,EAAE,OAAO,CAAC,UAAU,GAAI;QACjD,oBAAC,iBAAiB,IAAC,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,GAAI;QACzH,oBAAC,qBAAqB,IAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAI;QAC3D,oBAAC,mBAAmB,IAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAI;QAE7D,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClC,oBAAC,iBAAiB,IAAC,IAAI,EAAC,2CAA2C,GAAG,CAEjE,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAsC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QAC1C,OAAO,CACL,oBAAC,QAAQ,IAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAC,MAAM,KACxC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACtD,OAAO,CAAC,aAAa,KACrB,OAAO,CAAC,UAAU,KAClB,OAAO,CAAC,aAAa,KACrB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAC,aAAa,EAAG,YAAY,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACxD,oBAAC,SAAS,IAAC,IAAI,EAAC,kBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,eAAe,GAAI;YACpE,oBAAC,aAAa,IAAC,UAAU,EAAE,OAAO,CAAC,UAAU,GAAI;YACjD,oBAAC,iBAAiB,IAAC,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,GAAI;YACzH,oBAAC,qBAAqB,IAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAI;YAC1D,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAC,eAAe,IAAC,eAAe,EAAE,OAAO,CAAC,eAAe,GAAI,CAAC,CAAC,CAAC,IAAI;YAC/F,oBAAC,mBAAmB,IAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAI;YAE7D,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClC,oBAAC,iBAAiB,IAAC,IAAI,EAAC,2CAA2C,GAAG,CAE/D,CACZ,CAAC;IACJ,CAAC;IAED,OAAO,CACL,0CACG,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;QAC7C,OAAO,CACL,oBAAC,QAAQ,IAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAC,MAAM,KACxC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACtD,OAAO,CAAC,aAAa,KACrB,OAAO,CAAC,UAAU,KAClB,OAAO,CAAC,aAAa,EACzB,GAAG,EAAE,GAAG;YACN,oBAAC,SAAS,IAAC,IAAI,EAAC,kBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,eAAe,GAAI;YACpE,oBAAC,aAAa,IAAC,UAAU,EAAE,QAAQ,GAAI;YACvC,oBAAC,iBAAiB,IAAC,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,GAAI;YACzH,oBAAC,qBAAqB,IAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAI;YAC3D,oBAAC,mBAAmB,IAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAI;YAE7D,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClC,oBAAC,iBAAiB,IAAC,IAAI,EAAC,2CAA2C,GAAG,CAE/D,CACZ,CAAA;IACH,CAAC,CAAC,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAmD,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IACvF,OAAO,oBAAC,QAAQ,IAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAC,gBAAgB,IAAC,SAAS,EAAE,QAAQ,GAAI,GAAI,CAAA;AACzG,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAgD,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IACtF,OAAO,CACL,oBAAC,SAAS,IACR,IAAI,EAAE,SAAS,CAAC,IAAI,EACpB,IAAI,EAAE,SAAS,CAAC,gBAAgB,KAC5B,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,KACnD,SAAS,CAAC,aAAa,KACvB,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAElE,oBAAC,2BAA2B,IAC1B,UAAU,EAAE,SAAS,CAAC,UAAU,EAChC,YAAY,EAAE,SAAS,CAAC,YAAY,GACpC;QACF,oBAAC,qBAAqB,IAAC,WAAW,EAAE,SAAS,CAAC,WAAW,GAAI;QAC7D,oBAAC,mBAAmB,IAAC,UAAU,EAAE,SAAS,CAAC,kBAAkB,GAAI,CACvD,CACb,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,2BAA2B,GAAyC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;IACzG,IAAI,
|
|
1
|
+
{"version":3,"file":"operation-element.js","sourceRoot":"","sources":["../../../src/components/operation-element.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ags-attribute.d.ts","sourceRoot":"","sources":["../../../src/decorators/ags-attribute.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,KAAK,EACL,aAAa,EACb,SAAS,EACT,SAAS,EACT,OAAO,EACP,IAAI,EACL,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ags-attribute.d.ts","sourceRoot":"","sources":["../../../src/decorators/ags-attribute.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,KAAK,EACL,aAAa,EACb,SAAS,EACT,SAAS,EACT,OAAO,EACP,IAAI,EACL,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAWtE;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,EACrF,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,QAMd;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GACpF,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAErB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ7F;AAsBD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,UAAU,EACnF,IAAI,CAAC,EAAE,gBAAgB,GACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoCxB;AA8ED,wBAAgB,6CAA6C,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAmBhL"}
|
|
@@ -3,10 +3,10 @@ import { getIsOwnerAttribute, hasIsOwner } from "./is-owner.js";
|
|
|
3
3
|
import { isPrivileged } from "./privileged.js";
|
|
4
4
|
import { getWorkloadNameMsa } from "./workload-name-msa.js";
|
|
5
5
|
import { getWorkloadName } from "./workload-name.js";
|
|
6
|
-
import { isExperimental, isOwnerless, isPartial, isSharedEntity } from "../index.js";
|
|
6
|
+
import { isContains, isExperimental, isOwnerless, isPartial, isSharedEntity } from "../index.js";
|
|
7
7
|
import { MsGraphModelKind } from "../entities/model.js";
|
|
8
8
|
import { isPrivatePreview } from "./private-preview.js";
|
|
9
|
-
import { getInterfaceNavigationSourceType, isNavigationProperty, isTypeDefinedInLocalProject } from "../utils.js";
|
|
9
|
+
import { getInterfaceNavigationSourceType, isNavigationProperty, isTypeDefinedInExternalLibrary, isTypeDefinedInLocalProject } from "../utils.js";
|
|
10
10
|
const agsAttributeKey = Symbol("agsAttribute");
|
|
11
11
|
/**
|
|
12
12
|
* `@agsAttribute` - Allows all AGS CSDL extensions that are not yet modelled explicitly in TypeSpec to be maintained
|
|
@@ -87,8 +87,8 @@ function enrichAttributesWithIsOwner(program, type, attrs, kind) {
|
|
|
87
87
|
if (type.kind === "Model" && isSharedEntity(program, type)) {
|
|
88
88
|
return attrs;
|
|
89
89
|
}
|
|
90
|
-
if (type.kind ===
|
|
91
|
-
if (type.kind ===
|
|
90
|
+
if (type.kind === "Model" || type.kind === "ModelProperty") {
|
|
91
|
+
if (type.kind === "ModelProperty" && !isNavigationProperty(program, type)) {
|
|
92
92
|
return attrs;
|
|
93
93
|
}
|
|
94
94
|
const isOwnerAttribute = getIsOwnerAttribute(program, type);
|
|
@@ -102,7 +102,12 @@ function enrichAttributesWithIsOwner(program, type, attrs, kind) {
|
|
|
102
102
|
}
|
|
103
103
|
else {
|
|
104
104
|
const isOwner = isTypeDefinedInLocalProject(program, type);
|
|
105
|
-
if (
|
|
105
|
+
if (type.kind === "Model" && isOwner && isPartial(program, type)) {
|
|
106
|
+
attrs["ags:IsOwner"] = "false";
|
|
107
|
+
return attrs;
|
|
108
|
+
}
|
|
109
|
+
else if (type.kind === "ModelProperty" && isContains(program, type)
|
|
110
|
+
&& isTypeDefinedInExternalLibrary(program, type.type) && !isSharedEntity(program, type.type)) {
|
|
106
111
|
attrs["ags:IsOwner"] = "false";
|
|
107
112
|
return attrs;
|
|
108
113
|
}
|
|
@@ -114,7 +119,7 @@ function enrichAttributesWithIsOwner(program, type, attrs, kind) {
|
|
|
114
119
|
function enrichAttributesWithIsHidden(program, type, attrs) {
|
|
115
120
|
const hiddenStatusChecks = [isPrivatePreview, isPrivileged, isExperimental];
|
|
116
121
|
let isHidden = hiddenStatusChecks.some(check => check(program, type) || namespaceHasDecorator(program, type, check));
|
|
117
|
-
if (isHidden && !attrs.hasOwnProperty(
|
|
122
|
+
if (isHidden && !attrs.hasOwnProperty("ags:IsHidden")) {
|
|
118
123
|
attrs = { ...attrs, "ags:IsHidden": "true" };
|
|
119
124
|
}
|
|
120
125
|
return attrs;
|
|
@@ -127,7 +132,7 @@ function enrichAttributesWithIsSharedEntity(program, type, attrs) {
|
|
|
127
132
|
}
|
|
128
133
|
function namespaceHasDecorator(program, type, isDecoratorPresent) {
|
|
129
134
|
switch (type.kind) {
|
|
130
|
-
case
|
|
135
|
+
case "Model":
|
|
131
136
|
case "Enum":
|
|
132
137
|
case "Interface":
|
|
133
138
|
case "Operation":
|
|
@@ -150,8 +155,8 @@ export function applyOwnerlessAttributeToInterfaceBindingType(program, interface
|
|
|
150
155
|
const model = models.get(bindingType.name);
|
|
151
156
|
if (model) {
|
|
152
157
|
const modelAttributes = model === null || model === void 0 ? void 0 : model.AgsAttributes;
|
|
153
|
-
modelAttributes[
|
|
154
|
-
modelAttributes[
|
|
158
|
+
modelAttributes["ags:IsOwner"] = "false";
|
|
159
|
+
modelAttributes["ags:IsOwnerlessSingleton"] = "true";
|
|
155
160
|
model.AgsAttributes = modelAttributes;
|
|
156
161
|
}
|
|
157
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ags-attribute.js","sourceRoot":"","sources":["../../../src/decorators/ags-attribute.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ags-attribute.js","sourceRoot":"","sources":["../../../src/decorators/ags-attribute.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export function GetResourceAnnotations(program, namespaceName, navigationSources
|
|
|
15
15
|
function getResourceAnnotations(program, namespaceName, routePath, entity) {
|
|
16
16
|
const resource = entity.theInterface;
|
|
17
17
|
const type = getInterfaceNavigationSourceType(program, resource);
|
|
18
|
-
const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
|
|
18
|
+
const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity, namespaceName);
|
|
19
19
|
let annotations;
|
|
20
20
|
if (isInterfaceBindingTypeOwned(program, resource)) {
|
|
21
21
|
const hasNavigationProperties = [...walkPropertiesInherited(type)].some((property) => isNavigationProperty(program, property));
|
|
@@ -44,7 +44,7 @@ function getResourceAnnotations(program, namespaceName, routePath, entity) {
|
|
|
44
44
|
}
|
|
45
45
|
return annotations;
|
|
46
46
|
}
|
|
47
|
-
function getExplicitBindingOperationNames(program, entity) {
|
|
47
|
+
function getExplicitBindingOperationNames(program, entity, namespaceName) {
|
|
48
48
|
const actionAndFunctionOperations = Object.values(entity.operations).
|
|
49
49
|
filter(({ theOperation }) => isAction(program, theOperation) || isFunction(program, theOperation));
|
|
50
50
|
return actionAndFunctionOperations.
|
|
@@ -55,7 +55,7 @@ function getExplicitBindingOperationNames(program, entity) {
|
|
|
55
55
|
}
|
|
56
56
|
return ((_a = getFunction(program, theOperation)) === null || _a === void 0 ? void 0 : _a.name) || '';
|
|
57
57
|
}).
|
|
58
|
-
map(value =>
|
|
58
|
+
map(value => `${namespaceName}.${value}`);
|
|
59
59
|
}
|
|
60
60
|
export function GetCollectionAnnotations(program, namespaceName, sources) {
|
|
61
61
|
const annotations = new Map();
|
|
@@ -70,7 +70,7 @@ export function GetCollectionAnnotations(program, namespaceName, sources) {
|
|
|
70
70
|
}
|
|
71
71
|
function getCollectionAnnotations(program, namespaceName, routePath, entity) {
|
|
72
72
|
const collection = entity.theInterface;
|
|
73
|
-
const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
|
|
73
|
+
const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity, namespaceName);
|
|
74
74
|
let annotations;
|
|
75
75
|
if (isInterfaceBindingTypeOwned(program, collection)) {
|
|
76
76
|
const type = getInterfaceNavigationSourceType(program, collection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAoC,gCAAgC,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAChN,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAqD7M,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,aAAqB,EAAE,iBAAgD;IAC9H,MAAM,WAAW,GAAG,IAAI,GAAG,EAAqE,CAAC;IACjG,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC9C,qCAAqC;QACrC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAgB,EAChB,aAAqB,EACrB,SAAiB,EACjB,MAAwB;IAExB,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC;IACrC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,QAAQ,CAAE,CAAC;IAClE,MAAM,6BAA6B,GAAG,gCAAgC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGvE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAiErC"}
|
|
@@ -10,6 +10,9 @@ export function getDefaultPropertyValue(program, property) {
|
|
|
10
10
|
case "Number":
|
|
11
11
|
defaultValueValue = property.default.value;
|
|
12
12
|
break;
|
|
13
|
+
case "EnumMember":
|
|
14
|
+
defaultValueValue = property.defaultValue.value.name;
|
|
15
|
+
break;
|
|
13
16
|
default:
|
|
14
17
|
return undefined;
|
|
15
18
|
}
|
|
@@ -50,6 +53,10 @@ export function getDefaultPropertyValue(program, property) {
|
|
|
50
53
|
case "Edm.Duration":
|
|
51
54
|
case "Edm.TimeOfDay":
|
|
52
55
|
default:
|
|
56
|
+
if (property.type.kind === "Enum") {
|
|
57
|
+
defaultValueKey = "String";
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
53
60
|
return undefined;
|
|
54
61
|
}
|
|
55
62
|
return { [defaultValueKey]: defaultValueValue };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,uBAAuB,CACrC,OAAgB,EAChB,QAAuB;IAEvB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,iBAAiB,GAAQ,SAAS,CAAC;IACvC,QAAQ,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3C,MAAM;QACR;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,eAAe,GAAG,QAAQ,CAAC;IAC/B,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,sBAAsB;YACzB,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU,CAAC;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM;QACR,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,oBAAoB;YACvB,eAAe,GAAG,gBAAgB,CAAC;YACnC,MAAM;QACR,KAAK,aAAa;YAChB,eAAe,GAAG,SAAS,CAAC;YAC5B,MAAM;QACR,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe,CAAC;QACrB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;AAClD,CAAC"}
|
|
1
|
+
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/entities/property.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,uBAAuB,CACrC,OAAgB,EAChB,QAAuB;IAEvB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,iBAAiB,GAAQ,SAAS,CAAC;IACvC,QAAQ,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3C,MAAM;QACR,KAAK,YAAY;YACb,iBAAiB,GAAI,QAAQ,CAAC,YAA0B,CAAC,KAAK,CAAC,IAAI,CAAC;YACtE,MAAM;QACR;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,eAAe,GAAG,QAAQ,CAAC;IAC/B,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,sBAAsB;YACzB,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU,CAAC;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM;QACR,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,oBAAoB;YACvB,eAAe,GAAG,gBAAgB,CAAC;YACnC,MAAM;QACR,KAAK,aAAa;YAChB,eAAe,GAAG,SAAS,CAAC;YAC5B,MAAM;QACR,KAAK,YAAY;YACf,eAAe,GAAG,QAAQ,CAAC;YAC3B,MAAM;QACR,KAAK,UAAU;YACb,eAAe,GAAG,MAAM,CAAC;YACzB,MAAM;QACR,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe,CAAC;QACrB;YACE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAClC,eAAe,GAAG,QAAQ,CAAC;gBAC3B,MAAM;YACR,CAAC;YACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,CAAC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;AAClD,CAAC"}
|
package/dist/src/linter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,OAAO,+CA+BlB,CAAC"}
|
package/dist/src/linter.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import { defineLinter } from "@typespec/compiler";
|
|
2
|
-
import { modelShouldBeEntityOrComplexType, useEvolvableEnumRule, mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes, interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified, getPutPostAndPatchOperationsShouldHaveSelectDecorator, useRecordTypeInsteadOfDictionary, dictionaryTypeIsMostlyUsedWithRecordType, containedNavigationPropertyTypeShouldNotBeExternallyReferenced, entityAndComplexPropertyNameShouldNotBeName, validateCoreElementsHaveDocString } from "./rules/index.js";
|
|
2
|
+
import { modelShouldBeEntityOrComplexType, useEvolvableEnumRule, mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes, interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified, getPutPostAndPatchOperationsShouldHaveSelectDecorator, useRecordTypeInsteadOfDictionary, dictionaryTypeIsMostlyUsedWithRecordType, containedNavigationPropertyTypeShouldNotBeExternallyReferenced, entityAndComplexPropertyNameShouldNotBeName, validateCoreElementsHaveDocString, operationParametersShouldHaveRequiredBeforeOptional } from "./rules/index.js";
|
|
3
3
|
export const $linter = defineLinter({
|
|
4
|
-
rules: [
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
rules: [
|
|
5
|
+
useEvolvableEnumRule,
|
|
6
|
+
modelShouldBeEntityOrComplexType,
|
|
7
|
+
mediaTypeValuesShouldBeMinimallyFormattedForMIMETypes,
|
|
8
|
+
interfaceNavigationSourceShouldHaveMediaIf$ValueIsSpecified,
|
|
9
|
+
getPutPostAndPatchOperationsShouldHaveSelectDecorator,
|
|
10
|
+
useRecordTypeInsteadOfDictionary,
|
|
11
|
+
dictionaryTypeIsMostlyUsedWithRecordType,
|
|
12
|
+
containedNavigationPropertyTypeShouldNotBeExternallyReferenced,
|
|
13
|
+
entityAndComplexPropertyNameShouldNotBeName,
|
|
14
|
+
validateCoreElementsHaveDocString,
|
|
15
|
+
operationParametersShouldHaveRequiredBeforeOptional
|
|
10
16
|
],
|
|
11
17
|
ruleSets: {
|
|
12
18
|
recommended: {
|
|
@@ -21,8 +27,9 @@ export const $linter = defineLinter({
|
|
|
21
27
|
[`@microsoft/typespec-msgraph/${containedNavigationPropertyTypeShouldNotBeExternallyReferenced.name}`]: true,
|
|
22
28
|
[`@microsoft/typespec-msgraph/${entityAndComplexPropertyNameShouldNotBeName.name}`]: true,
|
|
23
29
|
[`@microsoft/typespec-msgraph/${validateCoreElementsHaveDocString.name}`]: true,
|
|
24
|
-
|
|
25
|
-
|
|
30
|
+
[`@microsoft/typespec-msgraph/${operationParametersShouldHaveRequiredBeforeOptional.name}`]: true,
|
|
31
|
+
}
|
|
32
|
+
}
|
|
26
33
|
}
|
|
27
34
|
});
|
|
28
35
|
//# sourceMappingURL=linter.js.map
|
package/dist/src/linter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,gCAAgC,EAChC,oBAAoB,EACpB,qDAAqD,EACrD,2DAA2D,EAC3D,qDAAqD,EACrD,gCAAgC,EAChC,wCAAwC,EACxC,8DAA8D,EAC9D,2CAA2C,EAC3C,iCAAiC,EACjC,mDAAmD,EACpD,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,OAAO,GAAG,YAAY,CAAC;IAClC,KAAK,EAAE;QACL,oBAAoB;QACpB,gCAAgC;QAChC,qDAAqD;QACrD,2DAA2D;QAC3D,qDAAqD;QACrD,gCAAgC;QAChC,wCAAwC;QACxC,8DAA8D;QAC9D,2CAA2C;QAC3C,iCAAiC;QACjC,mDAAmD;KACpD;IACD,QAAQ,EAAE;QACR,WAAW,EAAE;YACX,MAAM,EAAE;gBACN,CAAC,+BAA+B,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAClE,CAAC,+BAA+B,gCAAgC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC9E,CAAC,+BAA+B,qDAAqD,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACnG,CAAC,+BAA+B,2DAA2D,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACzG,CAAC,+BAA+B,qDAAqD,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACnG,CAAC,+BAA+B,gCAAgC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC9E,CAAC,+BAA+B,wCAAwC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACtF,CAAC,+BAA+B,8DAA8D,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC5G,CAAC,+BAA+B,2CAA2C,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBACzF,CAAC,+BAA+B,iCAAiC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;gBAC/E,CAAC,+BAA+B,mDAAmD,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI;aAClG;SACF;KACF;CACF,CAAC,CAAC"}
|
|
@@ -5,5 +5,8 @@ export declare const modelShouldBeEntityOrComplexType: import("@typespec/compile
|
|
|
5
5
|
export declare const containedNavigationPropertyTypeShouldNotBeExternallyReferenced: import("@typespec/compiler").LinterRuleDefinition<"contained-navigation-property-type-should-not-be-externally-referenced", {
|
|
6
6
|
readonly default: import("@typespec/compiler").CallableMessage<["property"]>;
|
|
7
7
|
}>;
|
|
8
|
+
export declare const operationParametersShouldHaveRequiredBeforeOptional: import("@typespec/compiler").LinterRuleDefinition<"operation-parameters-should-have-required-before-optional", {
|
|
9
|
+
readonly default: import("@typespec/compiler").CallableMessage<[]>;
|
|
10
|
+
}>;
|
|
8
11
|
export declare function validatePropertyTypeIsNotStringLiteral(program: Program): void;
|
|
9
12
|
//# sourceMappingURL=model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EAIR,MAAM,oBAAoB,CAAC;AAW5B,eAAO,MAAM,gCAAgC;;EAkC3C,CAAC;AAEH,eAAO,MAAM,8DAA8D;;EAyBzE,CAAC;AAEH,eAAO,MAAM,mDAAmD;;EA6B9D,CAAC;AAEH,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QA4BtE"}
|
package/dist/src/rules/model.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRule, navigateTypesInNamespace, paramMessage } from "@typespec/compiler";
|
|
2
2
|
import { extractTypesFromUnion, getTypeModel, isExcludedCoreType, isTypeDefinedInExternalLibrary } from "../utils.js";
|
|
3
|
-
import { isEntity, isComplex, isContains } from "../index.js";
|
|
3
|
+
import { isEntity, isComplex, isContains, isOperationParameters } from "../index.js";
|
|
4
4
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
5
5
|
import { reportDiagnostic } from "../lib.js";
|
|
6
6
|
export const modelShouldBeEntityOrComplexType = createRule({
|
|
@@ -29,11 +29,11 @@ export const modelShouldBeEntityOrComplexType = createRule({
|
|
|
29
29
|
target: model,
|
|
30
30
|
format: {
|
|
31
31
|
model: model.name,
|
|
32
|
-
}
|
|
32
|
+
}
|
|
33
33
|
});
|
|
34
|
-
}
|
|
34
|
+
}
|
|
35
35
|
};
|
|
36
|
-
}
|
|
36
|
+
}
|
|
37
37
|
});
|
|
38
38
|
export const containedNavigationPropertyTypeShouldNotBeExternallyReferenced = createRule({
|
|
39
39
|
name: "contained-navigation-property-type-should-not-be-externally-referenced",
|
|
@@ -52,7 +52,7 @@ export const containedNavigationPropertyTypeShouldNotBeExternallyReferenced = cr
|
|
|
52
52
|
context.reportDiagnostic({
|
|
53
53
|
target: property,
|
|
54
54
|
format: {
|
|
55
|
-
property: property.name
|
|
55
|
+
property: property.name
|
|
56
56
|
}
|
|
57
57
|
});
|
|
58
58
|
}
|
|
@@ -61,6 +61,35 @@ export const containedNavigationPropertyTypeShouldNotBeExternallyReferenced = cr
|
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
});
|
|
64
|
+
export const operationParametersShouldHaveRequiredBeforeOptional = createRule({
|
|
65
|
+
name: "operation-parameters-should-have-required-before-optional",
|
|
66
|
+
severity: "warning",
|
|
67
|
+
description: "Operation parameters should have required parameters before optional ones",
|
|
68
|
+
messages: {
|
|
69
|
+
default: paramMessage `Required parameters should appear before optional parameters in @operationParameters.`
|
|
70
|
+
},
|
|
71
|
+
create(context) {
|
|
72
|
+
return {
|
|
73
|
+
model: (model) => {
|
|
74
|
+
if (!isOperationParameters(context.program, model)) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
let foundOptional = false;
|
|
78
|
+
for (const [_, param] of model.properties) {
|
|
79
|
+
if (param.optional) {
|
|
80
|
+
foundOptional = true;
|
|
81
|
+
}
|
|
82
|
+
else if (foundOptional) {
|
|
83
|
+
context.reportDiagnostic({
|
|
84
|
+
target: param,
|
|
85
|
+
format: {}
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
});
|
|
64
93
|
export function validatePropertyTypeIsNotStringLiteral(program) {
|
|
65
94
|
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
66
95
|
navigateTypesInNamespace(namespace, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/rules/model.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/typespec-msgraph",
|
|
3
|
-
"version": "0.0.1-Preview.
|
|
3
|
+
"version": "0.0.1-Preview.28",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec for Microsoft Graph provides a description of the Microsoft Graph APIs. It is used for generating API description languages, client and service code, documentation, and other assets.",
|
|
6
6
|
"homepage": "https://github.com/microsoftgraph/typespec-msgraph",
|
|
@@ -52,26 +52,26 @@
|
|
|
52
52
|
"!dist/test/**"
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@xmldom/xmldom": "~0.8.4",
|
|
56
55
|
"@typespec/compiler": "~0.64.0",
|
|
57
56
|
"@typespec/http": "~0.64.0",
|
|
57
|
+
"@xmldom/xmldom": "~0.8.10",
|
|
58
58
|
"prettier": "~3.2.5",
|
|
59
|
-
"react-dom": "~18.3.1",
|
|
60
59
|
"react": "~18.3.1",
|
|
61
|
-
"react-
|
|
60
|
+
"react-dom": "~18.3.1",
|
|
61
|
+
"react-reconciler": "~0.29.2"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@types/mocha": "~10.0.
|
|
65
|
-
"@types/node": "~20.12.
|
|
66
|
-
"@types/react": "~18.3.
|
|
67
|
-
"@types/react-reconciler": "~0.28.
|
|
64
|
+
"@types/mocha": "~10.0.10",
|
|
65
|
+
"@types/node": "~20.12.14",
|
|
66
|
+
"@types/react": "~18.3.18",
|
|
67
|
+
"@types/react-reconciler": "~0.28.9",
|
|
68
68
|
"c8": "~9.1.0",
|
|
69
|
-
"eslint": "^9.
|
|
70
|
-
"mocha": "~
|
|
71
|
-
"rimraf": "~5.0.
|
|
69
|
+
"eslint": "^9.20.1",
|
|
70
|
+
"mocha": "~11.1.0",
|
|
71
|
+
"rimraf": "~5.0.10",
|
|
72
|
+
"source-map-support": "~0.5.21",
|
|
73
|
+
"tsx": "~4.19.3",
|
|
72
74
|
"typescript": "~5.7.3",
|
|
73
|
-
"xpath": "~0.0.
|
|
74
|
-
"tsx": "~4.8.1",
|
|
75
|
-
"source-map-support": "~0.5.21"
|
|
75
|
+
"xpath": "~0.0.34"
|
|
76
76
|
}
|
|
77
77
|
}
|