@microsoft/typespec-msgraph 0.0.1-Preview.13 → 0.0.1-Preview.14
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/annotations.d.ts.map +1 -1
- package/dist/src/components/annotations.js +3 -0
- package/dist/src/components/annotations.js.map +1 -1
- package/dist/src/components/entity-container-element.d.ts.map +1 -1
- package/dist/src/components/entity-container-element.js +13 -6
- package/dist/src/components/entity-container-element.js.map +1 -1
- package/dist/src/components/property-element.js +1 -1
- package/dist/src/components/property-element.js.map +1 -1
- package/dist/src/components/reference-target-element.d.ts +9 -0
- package/dist/src/components/reference-target-element.d.ts.map +1 -0
- package/dist/src/components/reference-target-element.js +3 -0
- package/dist/src/components/reference-target-element.js.map +1 -0
- package/dist/src/components/select-supported-annotation.d.ts +5 -0
- package/dist/src/components/select-supported-annotation.d.ts.map +1 -0
- package/dist/src/components/select-supported-annotation.js +6 -0
- package/dist/src/components/select-supported-annotation.js.map +1 -0
- package/dist/src/decorators/address-url.d.ts +16 -0
- package/dist/src/decorators/address-url.d.ts.map +1 -0
- package/dist/src/decorators/address-url.js +19 -0
- package/dist/src/decorators/address-url.js.map +1 -0
- package/dist/src/decorators/index.d.ts +3 -0
- package/dist/src/decorators/index.d.ts.map +1 -1
- package/dist/src/decorators/index.js +3 -0
- package/dist/src/decorators/index.js.map +1 -1
- package/dist/src/decorators/reference-target.d.ts +16 -0
- package/dist/src/decorators/reference-target.d.ts.map +1 -0
- package/dist/src/decorators/reference-target.js +52 -0
- package/dist/src/decorators/reference-target.js.map +1 -0
- package/dist/src/decorators/select.d.ts +9 -0
- package/dist/src/decorators/select.d.ts.map +1 -0
- package/dist/src/decorators/select.js +13 -0
- package/dist/src/decorators/select.js.map +1 -0
- package/dist/src/entities/address-url.d.ts +4 -0
- package/dist/src/entities/address-url.d.ts.map +1 -0
- package/dist/src/entities/address-url.js +18 -0
- package/dist/src/entities/address-url.js.map +1 -0
- package/dist/src/entities/annotations.d.ts +2 -0
- package/dist/src/entities/annotations.d.ts.map +1 -1
- package/dist/src/entities/annotations.js +14 -5
- package/dist/src/entities/annotations.js.map +1 -1
- package/dist/src/entities/entity-container.d.ts +10 -0
- package/dist/src/entities/entity-container.d.ts.map +1 -1
- package/dist/src/entities/entity-container.js +3 -0
- package/dist/src/entities/entity-container.js.map +1 -1
- package/dist/src/entities/model.d.ts +2 -0
- package/dist/src/entities/model.d.ts.map +1 -1
- package/dist/src/entities/model.js +13 -1
- package/dist/src/entities/model.js.map +1 -1
- package/dist/src/entities/ms-graph-route.d.ts +13 -0
- package/dist/src/entities/ms-graph-route.d.ts.map +1 -0
- package/dist/src/entities/ms-graph-route.js +70 -0
- package/dist/src/entities/ms-graph-route.js.map +1 -0
- package/dist/src/entities/namespace.d.ts.map +1 -1
- package/dist/src/entities/namespace.js +27 -7
- package/dist/src/entities/namespace.js.map +1 -1
- package/dist/src/entities/operation.d.ts.map +1 -1
- package/dist/src/entities/operation.js +13 -2
- package/dist/src/entities/operation.js.map +1 -1
- package/dist/src/lib.d.ts +10 -0
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +6 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/rules/address-url.d.ts +6 -0
- package/dist/src/rules/address-url.d.ts.map +1 -0
- package/dist/src/rules/address-url.js +40 -0
- package/dist/src/rules/address-url.js.map +1 -0
- package/dist/src/rules/graph-route.d.ts +4 -0
- package/dist/src/rules/graph-route.d.ts.map +1 -1
- package/dist/src/rules/graph-route.js +26 -2
- package/dist/src/rules/graph-route.js.map +1 -1
- package/dist/src/rules/index.d.ts +2 -0
- package/dist/src/rules/index.d.ts.map +1 -1
- package/dist/src/rules/index.js +2 -0
- package/dist/src/rules/index.js.map +1 -1
- package/dist/src/rules/reference-target.d.ts +8 -0
- package/dist/src/rules/reference-target.d.ts.map +1 -0
- package/dist/src/rules/reference-target.js +119 -0
- package/dist/src/rules/reference-target.js.map +1 -0
- package/dist/src/utils.d.ts +16 -1
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +25 -16
- package/dist/src/utils.js.map +1 -1
- package/dist/src/validate.d.ts.map +1 -1
- package/dist/src/validate.js +5 -0
- package/dist/src/validate.js.map +1 -1
- package/lib/decorators.tsp +91 -22
- package/lib/porcelain.tsp +18 -7
- package/lib/responses.tsp +32 -7
- package/lib/shared-models.tsp +0 -50
- package/package.json +4 -4
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { buildAttributes } from "../decorators/ags-attribute.js";
|
|
2
2
|
import { getPropertyTypeName, getInterfaceNavigationSourceType, } from "../utils.js";
|
|
3
|
+
import { getMsGraphAddressUrl } from "./address-url.js";
|
|
3
4
|
export function GetSingletons(program, sources) {
|
|
4
5
|
const singletons = new Map();
|
|
5
6
|
sources.forEach((entity, routePath) => {
|
|
@@ -15,6 +16,7 @@ function getSingleton(program, routePath, entity) {
|
|
|
15
16
|
Name: routePath,
|
|
16
17
|
TypeName: getPropertyTypeName(program, type),
|
|
17
18
|
AgsAttributes: agsAttributes,
|
|
19
|
+
AddressUrl: getMsGraphAddressUrl(program, singleton),
|
|
18
20
|
};
|
|
19
21
|
return entry;
|
|
20
22
|
}
|
|
@@ -33,6 +35,7 @@ function getEntitySet(program, routePath, entity) {
|
|
|
33
35
|
Name: routePath,
|
|
34
36
|
TypeName: getPropertyTypeName(program, type),
|
|
35
37
|
AgsAttributes: agsAttributes,
|
|
38
|
+
AddressUrl: getMsGraphAddressUrl(program, entitySet),
|
|
36
39
|
};
|
|
37
40
|
return entry;
|
|
38
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,gCAAgC,GAGjC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,gCAAgC,GAGjC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAqB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAsB3E,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,OAAsC;IACpF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC;KACrD,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,OAAsC;IACpF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;QAC5B,UAAU,EAAE,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC;KACrD,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAgB,EAChB,UAA8B;IAE9B,OAAO,UAAU;SACd,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC;SAC1C,MAAM,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5F,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Model, ModelProperty, Program } from "@typespec/compiler";
|
|
2
2
|
import { RevisionDefinition } from "./revision-definition.js";
|
|
3
|
+
import { MsGraphAddressUrl } from "./address-url.js";
|
|
3
4
|
export interface MsGraphModel {
|
|
4
5
|
Kind: MsGraphModelKind;
|
|
5
6
|
Name: string;
|
|
@@ -39,6 +40,7 @@ export interface MsGraphModelProperty {
|
|
|
39
40
|
isImmutable: boolean;
|
|
40
41
|
allowedValues: AllowedValues;
|
|
41
42
|
IsCollection: boolean;
|
|
43
|
+
AddressUrl: MsGraphAddressUrl | undefined;
|
|
42
44
|
}
|
|
43
45
|
export interface AlternateKeyProperty {
|
|
44
46
|
IsModel: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAqC,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA8BrF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB;AACD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAqC,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA8BrF,OAAO,EAAE,iBAAiB,EAAwB,MAAM,kBAAkB,CAAC;AAG3E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB;AACD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAgCxG"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { getDoc, getLocationContext, isKey } from "@typespec/compiler";
|
|
2
2
|
import { GetRevisionDefinition } from "./revision-definition.js";
|
|
3
|
-
import { isContains, isComputed, isReadOnly, isWriteOnly, isAlternateKey, isComplex, getStreamTypes, isEntity, isOpen, hasStream, isAbstract, isImmutable, hasAllowedValues, getAllowedValues } from "../index.js";
|
|
3
|
+
import { isContains, isComputed, isReadOnly, isWriteOnly, isAlternateKey, isComplex, getStreamTypes, isEntity, isOpen, hasStream, isAbstract, isImmutable, hasAllowedValues, getAllowedValues, hasAddressUrl, } from "../index.js";
|
|
4
4
|
import { isNavigationProperty, isTypeNullable, getPropertyTypeName, getIdForType, isTypeCollection, extractTypesFromUnion, removeReferencePrefixFromType, } from "../utils.js";
|
|
5
5
|
import { buildAttributes } from "../decorators/ags-attribute.js";
|
|
6
6
|
import { usedLibraryTypesKey } from "./namespace.js";
|
|
7
7
|
import { isPartial } from "../decorators/partial.js";
|
|
8
|
+
import { getMsGraphAddressUrl } from "./address-url.js";
|
|
9
|
+
import { GetMsGraphRoutes } from "./ms-graph-route.js";
|
|
8
10
|
export var MsGraphModelKind;
|
|
9
11
|
(function (MsGraphModelKind) {
|
|
10
12
|
MsGraphModelKind[MsGraphModelKind["Unknown"] = 0] = "Unknown";
|
|
@@ -110,6 +112,7 @@ function getModelProperties(program, properties) {
|
|
|
110
112
|
isImmutable: isImmutable(program, v),
|
|
111
113
|
allowedValues: hasAllowedValues(program, v) ? getAllowedValues(program, v) : [],
|
|
112
114
|
IsCollection: isTypeCollection(program, v.type),
|
|
115
|
+
AddressUrl: isNavigationProperty(program, v) ? getNavigationPropertyAddressUrl(program, v) : undefined,
|
|
113
116
|
};
|
|
114
117
|
});
|
|
115
118
|
}
|
|
@@ -151,4 +154,13 @@ function getAlternateKeys(program, properties) {
|
|
|
151
154
|
});
|
|
152
155
|
return result;
|
|
153
156
|
}
|
|
157
|
+
function getNavigationPropertyAddressUrl(program, property) {
|
|
158
|
+
const msGraphRoutes = GetMsGraphRoutes(program);
|
|
159
|
+
for (const [_, msGraphRoute] of msGraphRoutes.entries()) {
|
|
160
|
+
if (msGraphRoute.resource === property && hasAddressUrl(program, msGraphRoute.theInterface)) {
|
|
161
|
+
return getMsGraphAddressUrl(program, msGraphRoute.theInterface);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return undefined;
|
|
165
|
+
}
|
|
154
166
|
//# sourceMappingURL=model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACrF,OAAO,EACL,UAAU,EACV,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,SAAS,EACT,cAAc,EACd,QAAQ,EACR,MAAM,EACN,SAAS,EACT,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Program, Interface, Model, ModelProperty } from "@typespec/compiler";
|
|
2
|
+
export interface MsGraphRoute {
|
|
3
|
+
resource: Model | ModelProperty;
|
|
4
|
+
routeType: MsGraphRouteType;
|
|
5
|
+
theInterface: Interface;
|
|
6
|
+
}
|
|
7
|
+
export declare enum MsGraphRouteType {
|
|
8
|
+
EntitySet = 0,
|
|
9
|
+
Singleton = 1,
|
|
10
|
+
NavigationProperty = 2
|
|
11
|
+
}
|
|
12
|
+
export declare function GetMsGraphRoutes(program: Program): Map<string, MsGraphRoute>;
|
|
13
|
+
//# sourceMappingURL=ms-graph-route.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ms-graph-route.d.ts","sourceRoot":"","sources":["../../../src/entities/ms-graph-route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAI9E,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,KAAK,GAAG,aAAa,CAAC;IAChC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,oBAAY,gBAAgB;IAC1B,SAAS,IAAA;IACT,SAAS,IAAA;IACT,kBAAkB,IAAA;CACnB;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CA4D5E"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { getInterfaceNavigationSourceType, getInterfacesOfKinds, getSourceInterfaces, isNavigationProperty, isTopLevelNavigationSource } from "../utils.js";
|
|
2
|
+
import { GetDeclaredNamespaces, getNavigationSources } from "./namespace.js";
|
|
3
|
+
export var MsGraphRouteType;
|
|
4
|
+
(function (MsGraphRouteType) {
|
|
5
|
+
MsGraphRouteType[MsGraphRouteType["EntitySet"] = 0] = "EntitySet";
|
|
6
|
+
MsGraphRouteType[MsGraphRouteType["Singleton"] = 1] = "Singleton";
|
|
7
|
+
MsGraphRouteType[MsGraphRouteType["NavigationProperty"] = 2] = "NavigationProperty";
|
|
8
|
+
})(MsGraphRouteType || (MsGraphRouteType = {}));
|
|
9
|
+
let graphRoutesCache = undefined;
|
|
10
|
+
export function GetMsGraphRoutes(program) {
|
|
11
|
+
if (graphRoutesCache) {
|
|
12
|
+
return graphRoutesCache;
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
graphRoutesCache = new Map();
|
|
16
|
+
}
|
|
17
|
+
const namespaces = GetDeclaredNamespaces(program);
|
|
18
|
+
for (const namespace of namespaces) {
|
|
19
|
+
const sources = getNavigationSources(namespace.interfaces);
|
|
20
|
+
const navigationSources = getInterfacesOfKinds(program, sources, ["Resource", "Collection"]);
|
|
21
|
+
// Populate cache with entitysets and singletons
|
|
22
|
+
navigationSources.forEach((msGraphInterface, graphRoute) => {
|
|
23
|
+
if (isTopLevelNavigationSource(program, msGraphInterface)) {
|
|
24
|
+
const navigationSourceType = getInterfaceNavigationSourceType(program, msGraphInterface.theInterface);
|
|
25
|
+
if (getSourceInterfaces(msGraphInterface.theInterface).some((baseInterface) => baseInterface.name === "Collection")) {
|
|
26
|
+
graphRoutesCache.set(graphRoute, {
|
|
27
|
+
resource: navigationSourceType,
|
|
28
|
+
routeType: MsGraphRouteType.EntitySet,
|
|
29
|
+
theInterface: msGraphInterface.theInterface
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
graphRoutesCache.set(graphRoute, {
|
|
34
|
+
resource: navigationSourceType,
|
|
35
|
+
routeType: MsGraphRouteType.Singleton,
|
|
36
|
+
theInterface: msGraphInterface.theInterface
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
// Then populate cache with navigation properties
|
|
42
|
+
navigationSources.forEach((msGraphInterface, graphRoute) => {
|
|
43
|
+
if (!isTopLevelNavigationSource(program, msGraphInterface)) {
|
|
44
|
+
const routeSegments = graphRoute.split("/");
|
|
45
|
+
const topLevelGraphRoute = graphRoutesCache.get(routeSegments[0]);
|
|
46
|
+
if (topLevelGraphRoute) {
|
|
47
|
+
let model = topLevelGraphRoute === null || topLevelGraphRoute === void 0 ? void 0 : topLevelGraphRoute.resource;
|
|
48
|
+
for (let i = 1; i < routeSegments.length; i++) {
|
|
49
|
+
model.properties.forEach((property) => {
|
|
50
|
+
if (property.name === routeSegments[i] && isNavigationProperty(program, property)) {
|
|
51
|
+
if (i === routeSegments.length - 1) {
|
|
52
|
+
graphRoutesCache.set(graphRoute, {
|
|
53
|
+
resource: property,
|
|
54
|
+
routeType: MsGraphRouteType.NavigationProperty,
|
|
55
|
+
theInterface: msGraphInterface.theInterface
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
model = property.type;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return graphRoutesCache;
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=ms-graph-route.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ms-graph-route.js","sourceRoot":"","sources":["../../../src/entities/ms-graph-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAgC,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAwB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAoD,wBAAwB,EAA+B,MAAM,kBAAkB,CAAC;AAEvL,OAAO,EAAmB,WAAW,EAAE,MAAM,WAAW,CAAC;AAGzD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACtD,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC1D,wBAAwB,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChE,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAMnE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAqBzE;AA0ED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,CAElE;
|
|
1
|
+
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAgC,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAwB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAoD,wBAAwB,EAA+B,MAAM,kBAAkB,CAAC;AAEvL,OAAO,EAAmB,WAAW,EAAE,MAAM,WAAW,CAAC;AAGzD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACtD,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC1D,wBAAwB,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChE,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAMnE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAqBzE;AA0ED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,CAElE;AAsGD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAU/F"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { getInterfacesOfKinds,
|
|
1
|
+
import { getInterfacesOfKinds, getCollectionIndexInterfaces, isExcludedCoreType, isNavigationSource, isTopLevelNavigationSource, isTypeDefinedInExternalLibrary } from "../utils.js";
|
|
2
2
|
import { GetMsGraphEnumTypeElement } from "./enum.js";
|
|
3
3
|
import { GetMsGraphModels } from "./model.js";
|
|
4
4
|
import { GetEntitySets, GetSingletons } from "./entity-container.js";
|
|
5
5
|
import { GetMsGraphOperations } from "./operation.js";
|
|
6
6
|
import { GetCollectionAnnotations, GetResourceAnnotations, GetAllowedValuesAnnotations } from "./annotations.js";
|
|
7
|
-
import { applyOwnerlessAttributeToInterfaceBindingType, buildAttributes, getPublicNamespaceName } from "../index.js";
|
|
7
|
+
import { applyOwnerlessAttributeToInterfaceBindingType, buildAttributes, getGraphRoutePaths, getNavigationPropertyBindingProperties, getPublicNamespaceName, hasReferenceTarget } from "../index.js";
|
|
8
8
|
import { GetMsGraphTerms } from "./term.js";
|
|
9
9
|
const DEFAULT_MSGRAPH_NAMESPACE = "microsoft.graph";
|
|
10
10
|
export const usedLibraryTypesKey = Symbol("usedLibraryTypesKey");
|
|
@@ -107,7 +107,7 @@ function getMsGraphNamespace(program, namespace) {
|
|
|
107
107
|
models = applyOwnerlessAttributeToInterfaceBindingType(program, namespace.interfaces, models);
|
|
108
108
|
const enums = [...namespace.enums].map(([_, e]) => GetMsGraphEnumTypeElement(program, e));
|
|
109
109
|
const sources = getNavigationSources(namespace.interfaces);
|
|
110
|
-
const
|
|
110
|
+
const collectionIndexSources = getCollectionIndexInterfaces(program, sources);
|
|
111
111
|
const resourceSources = getInterfacesOfKinds(program, sources, ["Resource"]);
|
|
112
112
|
const collectionSources = getInterfacesOfKinds(program, sources, ["Collection"]);
|
|
113
113
|
resourceSources.forEach((entity, routePath) => {
|
|
@@ -117,8 +117,8 @@ function getMsGraphNamespace(program, namespace) {
|
|
|
117
117
|
resourceSources.delete(routePath);
|
|
118
118
|
}
|
|
119
119
|
});
|
|
120
|
-
if (
|
|
121
|
-
|
|
120
|
+
if (collectionIndexSources && collectionIndexSources.size > 0) {
|
|
121
|
+
collectionIndexSources.forEach((entity, routePath) => {
|
|
122
122
|
if (collectionSources.has(routePath)) {
|
|
123
123
|
const existing = collectionSources.get(routePath);
|
|
124
124
|
existing.operations = [...existing.operations, ...entity.operations.values()];
|
|
@@ -129,8 +129,10 @@ function getMsGraphNamespace(program, namespace) {
|
|
|
129
129
|
}
|
|
130
130
|
const singletonSources = getRootNavigationSources(program, resourceSources);
|
|
131
131
|
const entitySetSources = getRootNavigationSources(program, collectionSources);
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
let singletons = GetSingletons(program, singletonSources);
|
|
133
|
+
let entitySets = GetEntitySets(program, entitySetSources);
|
|
134
|
+
singletons = applyNavigationPropertyBindingToCollection(program, singletons, resourceSources);
|
|
135
|
+
entitySets = applyNavigationPropertyBindingToCollection(program, entitySets, collectionSources);
|
|
134
136
|
const resourceAnnotations = GetResourceAnnotations(program, namespaceName, resourceSources);
|
|
135
137
|
const collectionAnnotations = GetCollectionAnnotations(program, namespaceName, collectionSources);
|
|
136
138
|
const allowedValuesAnnotations = GetAllowedValuesAnnotations(program, namespaceName, models);
|
|
@@ -150,6 +152,24 @@ function getMsGraphNamespace(program, namespace) {
|
|
|
150
152
|
Terms: terms,
|
|
151
153
|
};
|
|
152
154
|
}
|
|
155
|
+
function applyNavigationPropertyBindingToCollection(program, collections, sources) {
|
|
156
|
+
sources.forEach((msgraphInterface, routePath) => {
|
|
157
|
+
if (hasReferenceTarget(program, msgraphInterface.theInterface)) {
|
|
158
|
+
const graphRoutes = getGraphRoutePaths(program, msgraphInterface.theInterface);
|
|
159
|
+
if (graphRoutes) {
|
|
160
|
+
graphRoutes.forEach(graphRoute => {
|
|
161
|
+
const firstSegment = graphRoute.split("/")[0];
|
|
162
|
+
const referencedCollection = collections.get(firstSegment);
|
|
163
|
+
if (referencedCollection) {
|
|
164
|
+
referencedCollection.NavigationPropertyBindingProperties = getNavigationPropertyBindingProperties(program, msgraphInterface.theInterface, graphRoute, referencedCollection.Name);
|
|
165
|
+
collections.set(firstSegment, referencedCollection);
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
return collections;
|
|
172
|
+
}
|
|
153
173
|
export function getNavigationSources(interfaces) {
|
|
154
174
|
const navigationSources = new Map();
|
|
155
175
|
interfaces.forEach((theInterface, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/entities/operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/entities/operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA8D,SAAS,EAAsB,MAAM,oBAAoB,CAAC;AAMxI,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAGrF,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,MAAM,IAAA;IACN,QAAQ,IAAA;CACT;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,eAAe,EAAE,wBAAwB,EAAE,EAAE,CAAC;IAC9C,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IAEvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAClD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACpD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,gBAAgB,EAAE,CAuB7G"}
|
|
@@ -45,7 +45,18 @@ function GetMsGraphOperation(program, bindingTypeName, operation) {
|
|
|
45
45
|
IsGlobalOperation: isGlobalOperation(program, operation)
|
|
46
46
|
};
|
|
47
47
|
if (!element.IsVoid) {
|
|
48
|
-
|
|
48
|
+
let returnType = operation.returnType;
|
|
49
|
+
// Remove unions with Error responses added in by standard Operation base op.
|
|
50
|
+
if (returnType.kind === "Union") {
|
|
51
|
+
const unionTypes = extractTypesFromUnion(returnType);
|
|
52
|
+
const filteredTypes = unionTypes.filter((type) => {
|
|
53
|
+
if (type.kind === "Model" && type.name.endsWith("ErrorResponse")) {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
return true;
|
|
57
|
+
});
|
|
58
|
+
returnType = filteredTypes[0];
|
|
59
|
+
}
|
|
49
60
|
if (!returnType || isVoidType(returnType)) {
|
|
50
61
|
element.IsVoid = true;
|
|
51
62
|
}
|
|
@@ -99,7 +110,7 @@ function getBindingTypeName(program, operation) {
|
|
|
99
110
|
function getParameterProperties(program, parameters) {
|
|
100
111
|
const properties = [...parameters].flatMap(([, property]) => {
|
|
101
112
|
var _a;
|
|
102
|
-
if (isPathParam(program, property)) {
|
|
113
|
+
if (isPathParam(program, property) || property.name === "graphRouteParams") {
|
|
103
114
|
return [];
|
|
104
115
|
}
|
|
105
116
|
if (property.type.kind === "Model" && isOperationParameters(program, property.type)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/entities/operation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/entities/operation.ts"],"names":[],"mappings":"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"}
|
package/dist/src/lib.d.ts
CHANGED
|
@@ -44,6 +44,11 @@ export declare const reportDiagnostic: <C extends "decorator-missing-dependencie
|
|
|
44
44
|
readonly globalOperationMustBeUsedWithNonRoutedInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
45
45
|
readonly globalOperationMustBeUsedWithProjectBindingType: import("@typespec/compiler").CallableMessage<[]>;
|
|
46
46
|
readonly graphRouteWithRoutingParameterAsFinalSegment: import("@typespec/compiler").CallableMessage<[string]>;
|
|
47
|
+
readonly referenceTargetInterfaceMustHaveGraphRoute: import("@typespec/compiler").CallableMessage<[]>;
|
|
48
|
+
readonly referenceTargetMustOnlyBeUsedOnceOnInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
49
|
+
readonly referenceTargetPathShouldNotHaveParameters: import("@typespec/compiler").CallableMessage<[string]>;
|
|
50
|
+
readonly singletonOrEntitySetHostingBindingsShouldExist: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
51
|
+
readonly interfaceWithGraphRouteMustExtendGraphStandardBaseInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
47
52
|
};
|
|
48
53
|
"singleton-invalid-name": {
|
|
49
54
|
readonly default: import("@typespec/compiler").CallableMessage<[string]>;
|
|
@@ -94,6 +99,11 @@ export declare const reportDiagnostic: <C extends "decorator-missing-dependencie
|
|
|
94
99
|
readonly globalOperationMustBeUsedWithNonRoutedInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
95
100
|
readonly globalOperationMustBeUsedWithProjectBindingType: import("@typespec/compiler").CallableMessage<[]>;
|
|
96
101
|
readonly graphRouteWithRoutingParameterAsFinalSegment: import("@typespec/compiler").CallableMessage<[string]>;
|
|
102
|
+
readonly referenceTargetInterfaceMustHaveGraphRoute: import("@typespec/compiler").CallableMessage<[]>;
|
|
103
|
+
readonly referenceTargetMustOnlyBeUsedOnceOnInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
104
|
+
readonly referenceTargetPathShouldNotHaveParameters: import("@typespec/compiler").CallableMessage<[string]>;
|
|
105
|
+
readonly singletonOrEntitySetHostingBindingsShouldExist: import("@typespec/compiler").CallableMessage<[string, string]>;
|
|
106
|
+
readonly interfaceWithGraphRouteMustExtendGraphStandardBaseInterface: import("@typespec/compiler").CallableMessage<[]>;
|
|
97
107
|
};
|
|
98
108
|
"singleton-invalid-name": {
|
|
99
109
|
readonly default: import("@typespec/compiler").CallableMessage<[string]>;
|
package/dist/src/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAeD,eAAO,MAAQ,gBAAgB
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAeD,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8EpB,CAAC"}
|
package/dist/src/lib.js
CHANGED
|
@@ -64,6 +64,11 @@ export const { reportDiagnostic } = createTypeSpecLibrary({
|
|
|
64
64
|
globalOperationMustBeUsedWithNonRoutedInterface: paramMessage `The @globalOperation decorator must be used on an operation with a non-routed interface.`,
|
|
65
65
|
globalOperationMustBeUsedWithProjectBindingType: paramMessage `The @globalOperation decorator must be used on an operation that has a local model binding the interface.`,
|
|
66
66
|
graphRouteWithRoutingParameterAsFinalSegment: paramMessage `The @graphRoute ${"graphRoute"} with a routing parameter as the last segment cannot be used with a collection interface.`,
|
|
67
|
+
referenceTargetInterfaceMustHaveGraphRoute: paramMessage `The @referenceTarget decorator must be used on an interface with a @graphRoute decorator.`,
|
|
68
|
+
referenceTargetMustOnlyBeUsedOnceOnInterface: paramMessage `The @referenceTarget decorator can only be used once on an interface.`,
|
|
69
|
+
referenceTargetPathShouldNotHaveParameters: paramMessage `The @referenceTarget path "${"target"}" cannot have parameters {}.`,
|
|
70
|
+
singletonOrEntitySetHostingBindingsShouldExist: paramMessage `A singleton or entityset definition should exist to bind "${"firstSegment"}" to "${"target"}"`,
|
|
71
|
+
interfaceWithGraphRouteMustExtendGraphStandardBaseInterface: paramMessage `The @graphRoute decorator can only be used on an interface that ultimately extends a Graph standard base interface i.e. Resource<T> or Collection<T>.`,
|
|
67
72
|
},
|
|
68
73
|
},
|
|
69
74
|
"singleton-invalid-name": {
|
|
@@ -82,7 +87,7 @@ export const { reportDiagnostic } = createTypeSpecLibrary({
|
|
|
82
87
|
},
|
|
83
88
|
// TODO: Enable the linter rule
|
|
84
89
|
// linter: {
|
|
85
|
-
// rules: [useEvolvableEnumRule],
|
|
90
|
+
// rules: [useEvolvableEnumRule, singletonOrEntitySetHostingBindingsShouldExist],
|
|
86
91
|
// },
|
|
87
92
|
emitter: { options: EmitterOptionsSchema },
|
|
88
93
|
});
|
package/dist/src/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzF,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC;AAMnC,MAAM,oBAAoB,GAA0C;IAClE,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,wFAAwF;SACtG;KACF;IACD,QAAQ,EAAE,EAAE;CACb,CAAA;AAED,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,qBAAqB,CAAC;IACxD,IAAI,EAAE,6BAA6B;IACnC,WAAW,EAAE;QACX,gCAAgC,EAAE;YAChC,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,OAAO,WAAW,sDAAsD,UAAU,qBAAqB,UAAU,GAAG;gBACzI,QAAQ,EAAE,YAAY,CAAA,oFAAoF;aAC3G;SACF;QACD,8BAA8B,EAAE;YAC9B,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,OAAO,SAAS,+BAA+B,OAAO,SAAS,UAAU,GAAG;gBACjG,SAAS,EAAE,YAAY,CAAA,4CAA4C;gBACnE,yCAAyC,EAAE,6DAA6D;gBACxG,yBAAyB,EAAE,YAAY,CAAA,iBAAiB,UAAU,SAAS,OAAO,6FAA6F;gBAC/K,qBAAqB,EAAE,YAAY,CAAA,cAAc,OAAO,mCAAmC;gBAC3F,0BAA0B,EAAE,YAAY,CAAA,kBAAkB,WAAW,kCAAkC,YAAY,qEAAqE;gBACxL,uCAAuC,EAAE,YAAY,CAAA,wDAAwD,WAAW,IAAI;gBAC5H,mCAAmC,EAAE,YAAY,CAAA,iBAAiB,UAAU,cAAc,QAAQ,0DAA0D;aAC7J;SACF;QACD,uBAAuB,EAAE;YACvB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,OAAO,WAAW,2CAA2C,OAAO,SAAS,UAAU,GAAG;gBAC/G,YAAY,EAAE,YAAY,CAAA,8FAA8F;gBACxH,4BAA4B,EAAE,YAAY,CAAA,iBAAiB,WAAW,uCAAuC;gBAC7G,gBAAgB,EAAE,YAAY,CAAA,mBAAmB,YAAY,6GAA6G,OAAO,iCAAiC;gBAClN,gBAAgB,EAAE,YAAY,CAAA,mBAAmB,YAAY,+EAA+E,OAAO,iCAAiC;gBACpL,GAAG,EAAE,YAAY,CAAA,2EAA2E;gBAC5F,iBAAiB,EAAE,YAAY,CAAA,mBAAmB,YAAY,kHAAkH,OAAO,iCAAiC;gBACxN,QAAQ,EAAE,YAAY,CAAA,OAAO,WAAW,mCAAmC,YAAY,GAAG;gBAC1F,SAAS,EAAE,YAAY,CAAA,OAAO,WAAW,uCAAuC,QAAQ,GAAG;gBAC3F,UAAU,EAAE,YAAY,CAAA,4CAA4C;gBACpE,aAAa,EAAE,YAAY,CAAA,+CAA+C;gBAC1E,4BAA4B,EAAE,YAAY,CAAA,mEAAmE;gBAC7G,wBAAwB,EAAE,YAAY,CAAA,wEAAwE;gBAC9G,0BAA0B,EAAE,YAAY,CAAA,sDAAsD,WAAW,wCAAwC;gBACjJ,OAAO,EAAE,YAAY,CAAA,qHAAqH;gBAC1I,4CAA4C,EAAE,YAAY,CAAA,+FAA+F;gBACzJ,uDAAuD,EAAE,YAAY,CAAA,qGAAqG;gBAC1K,iEAAiE,EAAE,YAAY,CAAA,+FAA+F;gBAC9K,oDAAoD,EAAE,YAAY,CAAA,kEAAkE;gBACpI,oDAAoD,EAAE,YAAY,CAAA,kEAAkE;gBACpI,yCAAyC,EAAE,YAAY,CAAA,oFAAoF;gBAC3I,yCAAyC,EAAE,YAAY,CAAA,yFAAyF;gBAChJ,oDAAoD,EAAE,YAAY,CAAA,2GAA2G;gBAC7K,+CAA+C,EAAE,YAAY,CAAA,0FAA0F;gBACvJ,+CAA+C,EAAE,YAAY,CAAA,2GAA2G;gBACxK,4CAA4C,EAAE,YAAY,CAAA,mBAAmB,YAAY,2FAA2F;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Program } from "@typespec/compiler";
|
|
2
|
+
/**
|
|
3
|
+
* @addressUrl only applies to either routed interfaces (entity sets, singletons and navigation properties) or action operations.
|
|
4
|
+
*/
|
|
5
|
+
export declare function validateAddressUrlOnlyAppliesToRoutedInterfacesOrActionOperations(program: Program): void;
|
|
6
|
+
//# sourceMappingURL=address-url.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"address-url.d.ts","sourceRoot":"","sources":["../../../src/rules/address-url.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAkD,MAAM,oBAAoB,CAAC;AAG7F;;GAEG;AACH,wBAAgB,iEAAiE,CAAC,OAAO,EAAE,OAAO,QAWjG"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { hasAddressUrl, hasGraphRoute, isAction } from "../index.js";
|
|
2
|
+
import { reportDiagnostic } from "../lib.js";
|
|
3
|
+
import { navigateTypesInNamespace } from "@typespec/compiler";
|
|
4
|
+
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
5
|
+
/**
|
|
6
|
+
* @addressUrl only applies to either routed interfaces (entity sets, singletons and navigation properties) or action operations.
|
|
7
|
+
*/
|
|
8
|
+
export function validateAddressUrlOnlyAppliesToRoutedInterfacesOrActionOperations(program) {
|
|
9
|
+
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
10
|
+
navigateTypesInNamespace(namespace, {
|
|
11
|
+
interface: (theInterface) => {
|
|
12
|
+
validateAddressUrlApplication(program, theInterface);
|
|
13
|
+
},
|
|
14
|
+
operation: (operation) => {
|
|
15
|
+
validateAddressUrlApplication(program, operation);
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
function validateAddressUrlApplication(program, target) {
|
|
21
|
+
if (!hasAddressUrl(program, target)) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
if (target.kind === "Interface" && hasGraphRoute(program, target)) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
if (target.kind === "Operation" && isAction(program, target)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
reportDiagnostic(program, {
|
|
31
|
+
code: "decorator-invalid-use",
|
|
32
|
+
target: target,
|
|
33
|
+
messageId: "wrongType",
|
|
34
|
+
format: {
|
|
35
|
+
decorator: "@addressUrl",
|
|
36
|
+
target: "routed interface (entityset, singleton or navigation property) or an action operation",
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=address-url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"address-url.js","sourceRoot":"","sources":["../../../src/rules/address-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAiC,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE;;GAEG;AACH,MAAM,UAAU,iEAAiE,CAAC,OAAgB;IAChG,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACtD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC1B,6BAA6B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvD,CAAC;YACD,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,6BAA6B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACpD,CAAC;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,OAAgB,EAAE,MAA6B;IACpF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;QACnC,OAAO;KACR;IAED,IAAG,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;QAChE,OAAO;KACR;IAED,IAAG,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,gBAAgB,CAAC,OAAO,EAAE;QACxB,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,WAAW;QACtB,MAAM,EAAE;YACN,SAAS,EAAE,aAAa;YACxB,MAAM,EAAE,uFAAuF;SAChG;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -5,4 +5,8 @@ import { Program } from "@typespec/compiler";
|
|
|
5
5
|
export declare function validateGraphRouteLeadingSlash(program: Program): void;
|
|
6
6
|
export declare function validateOperationParametersMatchGraphRouteParameters(program: Program): void;
|
|
7
7
|
export declare function validateGraphRouteAndInterfaceExtendsMatchForCollections(program: Program): void;
|
|
8
|
+
/**
|
|
9
|
+
* A interface decorated with @graphRoute must ultimately extend one of the standard graph interface i.e Resource<T> or Collection<T>.
|
|
10
|
+
*/
|
|
11
|
+
export declare function validateGraphRouteInterfaceExtendsGraphStandardInterface(program: Program): void;
|
|
8
12
|
//# sourceMappingURL=graph-route.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-route.d.ts","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,OAAO,EAAkC,MAAM,oBAAoB,CAAC;AAInG;;GAEG;AAEH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,QAW9D;AAyBD,wBAAgB,oDAAoD,CAAC,OAAO,EAAE,OAAO,QAWpF;AAqDD,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA2BxF"}
|
|
1
|
+
{"version":3,"file":"graph-route.d.ts","sourceRoot":"","sources":["../../../src/rules/graph-route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,OAAO,EAAkC,MAAM,oBAAoB,CAAC;AAInG;;GAEG;AAEH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,QAW9D;AAyBD,wBAAgB,oDAAoD,CAAC,OAAO,EAAE,OAAO,QAWpF;AAqDD,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA2BxF;AAeD;;GAEG;AACH,wBAAgB,wDAAwD,CAAC,OAAO,EAAE,OAAO,QA0BxF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { reportDiagnostic } from "../lib.js";
|
|
2
2
|
import { extractParamsFromPath, getGraphRoutePaths, hasGraphRoute } from "../index.js";
|
|
3
3
|
import { navigateTypesInNamespace } from "@typespec/compiler";
|
|
4
|
-
import { getIdForType } from "../utils.js";
|
|
4
|
+
import { getIdForType, getSourceInterfaces } from "../utils.js";
|
|
5
5
|
import { GetDeclaredNamespaces } from "../entities/namespace.js";
|
|
6
6
|
/**
|
|
7
7
|
* @graphRoute should not have a leading forward slash
|
|
@@ -99,7 +99,7 @@ export function validateGraphRouteAndInterfaceExtendsMatchForCollections(program
|
|
|
99
99
|
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
100
100
|
navigateTypesInNamespace(namespace, {
|
|
101
101
|
interface: ($interface) => {
|
|
102
|
-
$interface.
|
|
102
|
+
getSourceInterfaces($interface).forEach(sourceInterface => {
|
|
103
103
|
if (sourceInterface.name === "Collection") {
|
|
104
104
|
const graphRoutePaths = getGraphRoutePaths(program, $interface);
|
|
105
105
|
if (graphRoutePaths === undefined) {
|
|
@@ -134,4 +134,28 @@ function isLastSegmentAnIdentifier(graphRoutePath) {
|
|
|
134
134
|
}
|
|
135
135
|
return false;
|
|
136
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* A interface decorated with @graphRoute must ultimately extend one of the standard graph interface i.e Resource<T> or Collection<T>.
|
|
139
|
+
*/
|
|
140
|
+
export function validateGraphRouteInterfaceExtendsGraphStandardInterface(program) {
|
|
141
|
+
for (const namespace of GetDeclaredNamespaces(program)) {
|
|
142
|
+
navigateTypesInNamespace(namespace, {
|
|
143
|
+
interface: (theInterface) => {
|
|
144
|
+
if (!hasGraphRoute(program, theInterface)) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
const standardGraphBaseInterfaces = ["Resource", "Collection"];
|
|
148
|
+
if (getSourceInterfaces(theInterface).some((sourceInterface) => standardGraphBaseInterfaces.includes(sourceInterface.name))) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
reportDiagnostic(program, {
|
|
152
|
+
code: "decorator-invalid-use",
|
|
153
|
+
target: theInterface,
|
|
154
|
+
messageId: "interfaceWithGraphRouteMustExtendGraphStandardBaseInterface",
|
|
155
|
+
format: {},
|
|
156
|
+
});
|
|
157
|
+
},
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
}
|
|
137
161
|
//# sourceMappingURL=graph-route.js.map
|