@microsoft/typespec-msgraph 0.0.1-Preview.11 → 0.0.1-Preview.13

package/dist/src/decorators/ownerless.js

@@ -0,0 +1,12 @@
+const ownerlessKey = Symbol("ownerless");
+/**
+ * `@ownerless` - mark an interface as ownerless
+ *  '@ownerless' can only be applied to Interfaces.
+ */
+export function $ownerless(context, target) {
+    context.program.stateSet(ownerlessKey).add(target);
+}
+export function isOwnerless(program, target) {
+    return program.stateSet(ownerlessKey).has(target);
+}
+//# sourceMappingURL=ownerless.js.map

package/dist/src/decorators/ownerless.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ownerless.js","sourceRoot":"","sources":["../../../src/decorators/ownerless.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAEzC;;;GAGG;AAEH,MAAM,UAAU,UAAU,CAAC,OAAyB,EAAE,MAAiB;IACrE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAgB,EAAE,MAAiB;IAC7D,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACpD,CAAC"}

package/dist/src/decorators/public-namespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public-namespace.d.ts","sourceRoot":"","sources":["../../../src/decorators/public-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI1E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,QAE7F;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,WAExE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAEjG"}
+{"version":3,"file":"public-namespace.d.ts","sourceRoot":"","sources":["../../../src/decorators/public-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI1E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,QAE7F;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,WAExE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAKjG"}

package/dist/src/decorators/public-namespace.js

@@ -11,6 +11,9 @@ export function hasPublicNamespace(program, namespace) {
     return program.stateMap(publicNamespaceKey).has(namespace);
 }
 export function getPublicNamespaceName(program, namespace) {
-    return program.stateMap(publicNamespaceKey).get(namespace);
+    if (hasPublicNamespace(program, namespace)) {
+        return program.stateMap(publicNamespaceKey).get(namespace);
+    }
+    return namespace.namespace ? getPublicNamespaceName(program, namespace.namespace) : undefined;
 }
 //# sourceMappingURL=public-namespace.js.map

package/dist/src/decorators/public-namespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-namespace.js","sourceRoot":"","sources":["../../../src/decorators/public-namespace.ts"],"names":[],"mappings":"AAEA,MAAM,kBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAyB,EAAE,SAAoB,EAAE,IAAY;IAC5F,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,SAAoB;IACvE,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,SAAoB;IAC3E,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"public-namespace.js","sourceRoot":"","sources":["../../../src/decorators/public-namespace.ts"],"names":[],"mappings":"AAEA,MAAM,kBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAyB,EAAE,SAAoB,EAAE,IAAY;IAC5F,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,SAAoB;IACvE,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,SAAoB;IAC3E,IAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAC;QACxC,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC5D;IACD,OAAO,SAAS,CAAC,SAAS,CAAA,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/F,CAAC"}

package/dist/src/decorators/term.d.ts

@@ -0,0 +1,13 @@
+import { DecoratorContext, Namespace, Program, Scalar } from "@typespec/compiler";
+export interface TermParameters {
+    name: string;
+    type: Scalar;
+    description: string;
+}
+/**
+ * `@term` - Applies to: namespaces.
+ * Indicates that a workload wishes to require or return instance annotations in their request / response packets at runtime.
+ */
+export declare function $term(context: DecoratorContext, target: Namespace, name: string, type: Scalar, description: string): void;
+export declare function getTerms(program: Program, target: Namespace): Map<string, TermParameters>;
+//# sourceMappingURL=term.d.ts.map

package/dist/src/decorators/term.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"term.d.ts","sourceRoot":"","sources":["../../../src/decorators/term.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIlF,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,QAMpB;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAEzF"}

package/dist/src/decorators/term.js

@@ -0,0 +1,14 @@
+const termKey = Symbol("term");
+/**
+ * `@term` - Applies to: namespaces.
+ * Indicates that a workload wishes to require or return instance annotations in their request / response packets at runtime.
+ */
+export function $term(context, target, name, type, description) {
+    const terms = getTerms(context.program, target);
+    terms.set(name, { name, type, description });
+    context.program.stateMap(termKey).set(target, terms);
+}
+export function getTerms(program, target) {
+    return program.stateMap(termKey).get(target) || new Map();
+}
+//# sourceMappingURL=term.js.map

package/dist/src/decorators/term.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"term.js","sourceRoot":"","sources":["../../../src/decorators/term.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAQ/B;;;GAGG;AACH,MAAM,UAAU,KAAK,CACnB,OAAyB,EACzB,MAAiB,EACjB,IAAY,EACZ,IAAY,EACZ,WAAmB;IAEnB,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAE7C,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAAgB,EAAE,MAAiB;IAC1D,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAA0B,CAAC;AACpF,CAAC"}

package/dist/src/emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,qBAAqB,CAAC,iBAYxE"}
+{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,qBAAqB,CAAC,iBAcxE"}

package/dist/src/emitter.js

@@ -7,6 +7,8 @@ export async function $onEmit(context) {
     const program = context.program;
     const namespaces = GetMsGraphNamespaces(program);
     const csdl = renderCsdl(namespaces);
+    if (program.compilerOptions.noEmit === true)
+        return;
     await program.host.mkdirp(program.compilerOptions.outputDir);
     const csdlFileName = (_a = context.options.filename) !== null && _a !== void 0 ? _a : defaultCsdlFileName;
     const csdlPath = resolvePath(program.compilerOptions.outputDir, csdlFileName);

package/dist/src/emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA2C;;IACvE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAEhD,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAEpC,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,SAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,OAAO,CAAC,QAAQ,mCAAI,mBAAmB,CAAC;IACrE,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,SAAU,EAAE,YAAY,CAAC,CAAC;IAE/E,MAAM,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA2C;;IACvE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAEhD,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAEpC,IAAG,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO;IAEnD,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,SAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,OAAO,CAAC,QAAQ,mCAAI,mBAAmB,CAAC;IACrE,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,SAAU,EAAE,YAAY,CAAC,CAAC;IAE/E,MAAM,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}

package/dist/src/entities/annotations.d.ts

@@ -9,6 +9,8 @@ export interface ResourceAnnotations {
     HasExpandOnCollectionOrResource: boolean;
     NonExpandableProperties: string[] | undefined;
     Description: string | undefined;
+    HasContainsOrReferences: boolean;
+    ExplicitBindingOperationNames: string[];
 }
 export interface CollectionAnnotations {
     Target: string | undefined;
@@ -29,6 +31,8 @@ export interface CollectionAnnotations {
     NonSortableProperties: string[] | undefined;
     HasTopOnCollection: boolean;
     Description: string | undefined;
+    HasContainsOrReferences: boolean;
+    ExplicitBindingOperationNames: string[];
 }
 export interface AllowedValuesAnnotations {
     Target: string;

package/dist/src/entities/annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAoC,MAAM,aAAa,CAAC;AAGjF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACzC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;CAC9B;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAQlK;AAkCD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAQ5J;AA4HD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAiB7J"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAsD,MAAM,aAAa,CAAC;AAGnG,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,uBAAuB,EAAE,OAAO,CAAC;IACjC,6BAA6B,EAAE,MAAM,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACzC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,+BAA+B,EAAE,OAAO,CAAC;IACzC,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,uBAAuB,EAAE,OAAO,CAAC;IACjC,6BAA6B,EAAE,MAAM,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;CAC9B;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAQlK;AA+CD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAQ5J;AA+HD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAiB7J"}

package/dist/src/entities/annotations.js

@@ -12,6 +12,7 @@ export function GetResourceAnnotations(program, namespaceName, navigationSources
 function getResourceAnnotations(program, namespaceName, routePath, entity) {
     const resource = entity.theInterface;
     const type = getInterfaceNavigationSourceType(program, resource);
+    const hasContainsOrReferences = [...walkPropertiesInherited(type)].some((property) => isContains(program, property) || isReferences(program, property));
     const minimumParameters = routePath.split('/').length - 1;
     const operationMethods = [...entity.operations].map(({ theOperation, graphRoute }) => ({
         operation: theOperation,
@@ -19,6 +20,7 @@ function getResourceAnnotations(program, namespaceName, routePath, entity) {
         hasMinimumParameters: resolveOperationParametersForGraphRoute(theOperation, graphRoute).size === minimumParameters,
     }));
     const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
+    const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
     const annotations = {
         Target: `${namespaceName}.container/${routePath}`,
         HasGetOnResource: operationMethods.some(({ verb }) => verb === "get"),
@@ -27,9 +29,18 @@ function getResourceAnnotations(program, namespaceName, routePath, entity) {
         HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
         NonExpandableProperties: nonExpandableProperties,
         Description: getDoc(program, resource),
+        HasContainsOrReferences: hasContainsOrReferences,
+        ExplicitBindingOperationNames: explicitBindingOperationNames,
     };
     return annotations;
 }
+function getExplicitBindingOperationNames(program, entity) {
+    const reservedValues = ['get', 'patch', 'delete', 'post'];
+    return Object.values(entity.operations).
+        map(({ theOperation }) => theOperation.name).
+        filter(value => !reservedValues.includes(value)).
+        map(value => 'microsoft.graph.' + value);
+}
 export function GetCollectionAnnotations(program, namespaceName, sources) {
     const annotations = new Map();
     sources.forEach((entity, routePath) => {
@@ -40,6 +51,7 @@ export function GetCollectionAnnotations(program, namespaceName, sources) {
 function getCollectionAnnotations(program, namespaceName, routePath, entity) {
     const collection = entity.theInterface;
     const type = getInterfaceNavigationSourceType(program, collection);
+    const hasContainsOrReferences = [...walkPropertiesInherited(type)].some((property) => isContains(program, property) || isReferences(program, property));
     const minimumParameters = routePath.split('/').length - 1;
     const operationMethods = entity.operations.map(({ theOperation, graphRoute }) => ({
         operation: theOperation,
@@ -49,6 +61,7 @@ function getCollectionAnnotations(program, namespaceName, routePath, entity) {
     const [hasFilterOperation, nonFilterableProperties] = getFilterProperties(program, type, operationMethods);
     const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
     const [hasSortOnCollection, nonSortableProperties] = getSortProperties(program, type, operationMethods);
+    const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
     const annotations = {
         Target: `${namespaceName}.container/${routePath}`,
         HasGetOnCollection: operationMethods.some(m => m.hasMinimumParameters && m.verb === "get"),
@@ -68,6 +81,8 @@ function getCollectionAnnotations(program, namespaceName, routePath, entity) {
         NonSortableProperties: nonSortableProperties,
         HasTopOnCollection: operationMethods.some(m => isTop(program, m.operation)),
         Description: getDoc(program, collection),
+        HasContainsOrReferences: hasContainsOrReferences,
+        ExplicitBindingOperationNames: explicitBindingOperationNames,
     };
     return annotations;
 }

package/dist/src/entities/annotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,MAAM,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAoB,gCAAgC,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAY,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,uCAAuC,EAAE,MAAM,aAAa,CAAC;AA6CxN,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,aAAqB,EAAE,iBAAgD;IAC9H,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAE3D,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC9C,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;IAErC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,QAAQ,CAAE,CAAC;IAElE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAsB,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,YAAY,EAAE,UAAU,EAAC,EAAE,EAAE,CAAC,CAAC;QACtG,SAAS,EAAE,YAAY;QACvB,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;QAC7C,oBAAoB,EAAE,uCAAuC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,IAAI,KAAK,iBAAiB;KACnH,CAAC,CAAC,CAAA;IAEH,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAExH,MAAM,WAAW,GAAwB;QACvC,MAAM,EAAE,GAAG,aAAa,cAAc,SAAS,EAAE;QACjD,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;QACrE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC;QACzE,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC3E,+BAA+B,EAAE,+BAA+B;QAChE,uBAAuB,EAAE,uBAAuB;QAChD,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;KACvC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAgB,EAAE,aAAqB,EAAE,OAAsC;IACtH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAiC,CAAC;IAE7D,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,wBAAwB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAAgB,EAChB,aAAqB,EACrB,SAAiB,EACjB,MAAwB;IAExB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC;IAEvC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,UAAU,CAAE,CAAC;IAEpE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAsB,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,YAAY,EAAE,UAAU,EAAC,EAAE,EAAE,CAAC,CAAC;QACjG,SAAS,EAAE,YAAY;QACvB,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;QAC7C,oBAAoB,EAAE,uCAAuC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,IAAI,KAAK,iBAAiB;KACnH,CAAC,CAAC,CAAC;IAEJ,MAAM,CAAC,kBAAkB,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC3G,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxH,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAExG,MAAM,WAAW,GAA0B;QACzC,MAAM,EAAE,GAAG,aAAa,cAAc,SAAS,EAAE;QACjD,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1F,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;QACzF,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;QAClE,kBAAkB,EAAE,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC;QACjE,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;QAC7F,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QAC/F,oBAAoB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/E,qBAAqB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QACjF,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC7E,kBAAkB,EAAE,kBAAkB;QACtC,uBAAuB,EAAE,uBAAuB;QAChD,+BAA+B,EAAE,+BAA+B;QAChE,uBAAuB,EAAE,uBAAuB;QAChD,mBAAmB,EAAE,mBAAmB;QACxC,qBAAqB,EAAE,qBAAqB;QAC5C,kBAAkB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3E,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;KACzC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,IAAW,EAAE,gBAAmC;IAC7F,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACtD,CAAC,CAAC,IAAI,KAAK,KAAK;QAChB,CAAC,CAAC,oBAAoB;QACtB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAElC,IAAI,qBAAqB,EAAE;QACzB,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAEjF,MAAM,oBAAoB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC5D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACtF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA,mCAAI,KAAK,CAAA,EAAA,CAAC,CAAC;QAE9H,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;KACvC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAAgB,EAChB,IAAW,EACX,gBAAmC;IAEnC,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,oBAAoB,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CACpF,CAAC;IAEF,IAAI,qBAAqB,EAAE;QACzB,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAEjF,MAAM,oBAAoB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC5D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACxF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,MAAM,CACzD,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACvD,CAAC;QAEF,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;KACxC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB,EAAE,IAAW,EAAE,gBAAmC;IAC3F,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACpD,CAAC,CAAC,IAAI,KAAK,KAAK;QAChB,CAAC,CAAC,oBAAoB;QACtB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnC,IAAI,mBAAmB,EAAE;QACvB,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAE9E,MAAM,uBAAuB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC/D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACxF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEnH,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;KACtC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,8BAA8B,CAAC,OAAgB,EAAE,IAAW;IACnE,MAAM,2BAA2B,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;SACnE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC5D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEpC,OAAO,2BAA2B,IAAI,SAAS,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,OAAgB,EAAE,aAAqB,EAAE,MAAiC;IACpH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoC,CAAC;IAEhE,KAAI,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QACpC,IAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC,EAAC;YACxB,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;;gBAC5B,IAAG,CAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,0CAAE,MAAM,0CAAE,MAAM,IAAG,CAAC,EAAE;oBAC9C,WAAW,CAAC,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE;wBACjE,MAAM,EAAE,GAAG,aAAa,IAAI,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACzD,aAAa,EAAE,QAAQ,CAAC,aAAa;qBACtC,CAAC,CAAA;iBACH;YACH,CAAC,CAAC,CAAA;SACH;KACF;IAAA,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"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"}

package/dist/src/entities/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAiBtC,MAAM,UAAU,yBAAyB,CAAC,OAAgB,EAAE,QAAc;IACxE,MAAM,OAAO,GAAgB;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC;QACjD,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC;QACjF,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;KACpC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB,EAAE,MAAkB;;IAChE,MAAM,OAAO,GAAsB;QACjC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,SAAS,CAAC;KACnF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAiBtC,MAAM,UAAU,yBAAyB,CAAC,OAAgB,EAAE,QAAc;IACxE,MAAM,OAAO,GAAgB;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC;QACjD,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC;QACjF,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;KACpC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB,EAAE,MAAkB;;IAChE,MAAM,OAAO,GAAsB;QACjC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC;QAC/C,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,SAAS,CAAC;KACnF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/src/entities/model.d.ts

@@ -38,6 +38,7 @@ export interface MsGraphModelProperty {
     Description: string | undefined;
     isImmutable: boolean;
     allowedValues: AllowedValues;
+    IsCollection: boolean;
 }
 export interface AlternateKeyProperty {
     IsModel: boolean;

package/dist/src/entities/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA2BrF,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;CAC9B;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,CA4BxG"}
+{"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;CACvB;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"}

package/dist/src/entities/model.js

@@ -1,8 +1,9 @@
-import { getDoc, isKey } from "@typespec/compiler";
+import { getDoc, getLocationContext, isKey } from "@typespec/compiler";
 import { GetRevisionDefinition } from "./revision-definition.js";
 import { isContains, isComputed, isReadOnly, isWriteOnly, isAlternateKey, isComplex, getStreamTypes, isEntity, isOpen, hasStream, isAbstract, isImmutable, hasAllowedValues, getAllowedValues } from "../index.js";
-import { isNavigationProperty, isTypeNullable, getPropertyTypeName, getIdForType, } from "../utils.js";
+import { isNavigationProperty, isTypeNullable, getPropertyTypeName, getIdForType, isTypeCollection, extractTypesFromUnion, removeReferencePrefixFromType, } from "../utils.js";
 import { buildAttributes } from "../decorators/ags-attribute.js";
+import { usedLibraryTypesKey } from "./namespace.js";
 import { isPartial } from "../decorators/partial.js";
 export var MsGraphModelKind;
 (function (MsGraphModelKind) {
@@ -20,17 +21,20 @@ export function GetMsGraphModels(program, models) {
                 if (baseModel) {
                     baseModel.IsOpenType = false;
                     baseModel.BaseType = undefined;
-                    map.set(key + Math.random(), baseModel);
+                    map.set(baseModel.Name + Math.random(), baseModel);
                 }
             }
             const partialModel = getMsGraphModel(program, m);
             if (partialModel) {
                 partialModel.IsOpenType = false;
                 partialModel.BaseType = undefined;
-                map.set(key + Math.random(), partialModel);
+                map.set(partialModel.Name + Math.random(), partialModel);
             }
             return;
         }
+        populateImportedModelType(program, m);
+        // Removes properties and inheritance information from imported entity types
+        m = removePropertiesAndInheritanceFromImportedType(program, m);
         const model = getMsGraphModel(program, m);
         if (model) {
             map.set(key, model);
@@ -38,6 +42,24 @@ export function GetMsGraphModels(program, models) {
     });
     return map;
 }
+function removePropertiesAndInheritanceFromImportedType(program, model) {
+    if (model.baseModel) {
+        model.baseModel.name = removeReferencePrefixFromType(model.baseModel.name);
+    }
+    if (isComplex(program, model)) {
+        return model;
+    }
+    if (getLocationContext(program, model).type === "library") {
+        model.properties.clear();
+        model.baseModel = undefined;
+    }
+    return model;
+}
+function populateImportedModelType(program, m) {
+    if (m.baseModel && getLocationContext(program, m.baseModel).type !== "project" && getLocationContext(program, m).type !== "library") {
+        program.stateSet(usedLibraryTypesKey).add(m.baseModel);
+    }
+}
 function getMsGraphModel(program, model, generateProperties = true) {
     let kind = MsGraphModelKind.Unknown;
     if (isEntity(program, model)) {
@@ -69,6 +91,7 @@ function getMsGraphModel(program, model, generateProperties = true) {
 function getModelProperties(program, properties) {
     return [...properties].map(([_, v]) => {
         var _a;
+        populateUsedTypeModel(program, v);
         return {
             Name: v.name,
             IsNavigation: isNavigationProperty(program, v),
@@ -86,9 +109,36 @@ function getModelProperties(program, properties) {
             Description: getDoc(program, v),
             isImmutable: isImmutable(program, v),
             allowedValues: hasAllowedValues(program, v) ? getAllowedValues(program, v) : [],
+            IsCollection: isTypeCollection(program, v.type),
         };
     });
 }
+function populateUsedTypeModel(program, v) {
+    const isNavProperty = isNavigationProperty(program, v);
+    if (isNavProperty && getLocationContext(program, v.type).type === "library") {
+        /**
+         * we add the type of the property like:
+         * someProperty: reference.microsoft.graph.someType
+         * The type added to stateSet is reference.microsoft.graph.someType
+         */
+        program.stateSet(usedLibraryTypesKey).add(v.type);
+    }
+    // Takes care of complex types
+    if (v.type.kind === "Model" && getLocationContext(program, v.type).type === "library") {
+        program.stateSet(usedLibraryTypesKey).add(v.type);
+    }
+    if (v.type.kind === "Enum" && getLocationContext(program, v.type).type === "library") {
+        program.stateSet(usedLibraryTypesKey).add(v.type);
+    }
+    if (v.type.kind === "Union") {
+        const unionTypes = extractTypesFromUnion(v.type);
+        unionTypes.forEach(type => {
+            if (getLocationContext(program, type).type === "library") {
+                program.stateSet(usedLibraryTypesKey).add(type);
+            }
+        });
+    }
+}
 function getAlternateKeys(program, properties) {
     const result = new Array();
     properties.forEach(v => {

package/dist/src/entities/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"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"}

package/dist/src/entities/namespace.d.ts

@@ -1,9 +1,10 @@
-import { Namespace, Program } from "@typespec/compiler";
+import { Interface, Namespace, Program } from "@typespec/compiler";
 import { MsGraphEnum } from "./enum.js";
 import { MsGraphModel } from "./model.js";
 import { EntitySet, Singleton } from "./entity-container.js";
 import { MsGraphOperation } from "./operation.js";
 import { CollectionAnnotations, ResourceAnnotations, AllowedValuesAnnotations } from "./annotations.js";
+import { MsGraphTerm } from "./term.js";
 export interface MsGraphNamespace {
     Name: string;
     Enums: MsGraphEnum[];
@@ -15,8 +16,12 @@ export interface MsGraphNamespace {
     ResourceAnnotations: Map<string, ResourceAnnotations>;
     CollectionAnnotations: Map<string, CollectionAnnotations>;
     AllowedValuesAnnotations: Map<string, AllowedValuesAnnotations>;
+    Terms: MsGraphTerm[];
     key?: string;
 }
+export declare const usedLibraryTypesKey: unique symbol;
 export declare function GetDeclaredNamespaces(program: Program): Namespace[];
 export declare function GetMsGraphNamespaces(program: Program): MsGraphNamespace[];
+export declare function expandNamespaces(namespace: Namespace): Namespace[];
+export declare function getNavigationSources(interfaces: Map<string, Interface>): Map<string, Interface>;
 //# sourceMappingURL=namespace.d.ts.map

package/dist/src/entities/namespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,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;AAIvL,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,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,CAMnE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAMzE"}
+{"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;AAwED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAU/F"}

package/dist/src/entities/namespace.js

@@ -1,11 +1,13 @@
-import { getInterfacesOfKinds, isExcludedCoreType, isNavigationSource, isTopLevelNavigationSource } from "../utils.js";
+import { getInterfacesOfKinds, getTwoSegmentResourceInterface, isExcludedCoreType, isNavigationSource, isTopLevelNavigationSource, isTypeDefinedInExternalLibrary } from "../utils.js";
 import { GetMsGraphEnumTypeElement } from "./enum.js";
 import { GetMsGraphModels } from "./model.js";
 import { GetEntitySets, GetSingletons } from "./entity-container.js";
 import { GetMsGraphOperations } from "./operation.js";
 import { GetCollectionAnnotations, GetResourceAnnotations, GetAllowedValuesAnnotations } from "./annotations.js";
-import { buildAttributes, getPublicNamespaceName } from "../index.js";
+import { applyOwnerlessAttributeToInterfaceBindingType, buildAttributes, getPublicNamespaceName } from "../index.js";
+import { GetMsGraphTerms } from "./term.js";
 const DEFAULT_MSGRAPH_NAMESPACE = "microsoft.graph";
+export const usedLibraryTypesKey = Symbol("usedLibraryTypesKey");
 export function GetDeclaredNamespaces(program) {
     const root = program.checker.getGlobalNamespaceType();
     const namespaces = expandNamespaces(root)
@@ -13,10 +15,81 @@ export function GetDeclaredNamespaces(program) {
     return namespaces;
 }
 export function GetMsGraphNamespaces(program) {
-    const namespaces = GetDeclaredNamespaces(program).map((namespace) => getMsGraphNamespace(program, namespace));
+    let libraryNamespaces = [];
+    let namespaces = GetDeclaredNamespaces(program).map((namespace) => {
+        // Defer creation of library namespaces until we know what has been imported
+        if (isTypeDefinedInExternalLibrary(program, namespace)) {
+            libraryNamespaces.push(namespace);
+            return null;
+        }
+        return getMsGraphNamespace(program, namespace);
+    }).filter((result) => result !== null);
+    // Remove non-imported items from the library before creating their namespaces
+    libraryNamespaces = filterUnimportedLibraryTypesFromNamespaces(program, libraryNamespaces, namespaces);
+    if (libraryNamespaces.length > 0) {
+        namespaces = getMsGraphLibraryNamespaces(namespaces, libraryNamespaces, program);
+    }
+    namespaces = filterEmptyMsGraphNamespaces(namespaces);
     return namespaces;
 }
-function expandNamespaces(namespace) {
+function getMsGraphLibraryNamespaces(namespaces, libraryNamespaces, program) {
+    return [...namespaces, ...libraryNamespaces.map((namespace) => {
+            const libraryNamespace = getMsGraphNamespace(program, namespace);
+            // we need this key to identify library namespaces in schema-element.tsx so as not to emit EntityContainer
+            // in the imported schema
+            libraryNamespace.key = "library";
+            return libraryNamespace;
+        })];
+}
+function filterEmptyMsGraphNamespaces(namespaces) {
+    return namespaces.filter((namespace) => {
+        const hasChildren = namespace.Enums.length || namespace.Models.size;
+        return hasChildren;
+    });
+}
+function filterUnimportedLibraryTypesFromNamespaces(program, libraryNamespaces, projectNamespaces) {
+    if (libraryNamespaces.length === 0) {
+        return [];
+    }
+    const usedLibraryTypes = program.stateSet(usedLibraryTypesKey);
+    return libraryNamespaces.map(libraryNamespace => {
+        return getLibraryNameSpaceWithUsedTypes(libraryNamespace, usedLibraryTypes, projectNamespaces);
+    }).filter((result) => result !== null);
+}
+function getLibraryNameSpaceWithUsedTypes(libraryNamespace, usedLibraryTypes, projectNamespaces) {
+    const usedLibraryTypeNames = [];
+    usedLibraryTypes.forEach(type => {
+        switch (type.kind) {
+            case "Model":
+            case "ModelProperty":
+            case "Enum":
+                usedLibraryTypeNames.push(type.name);
+                break;
+        }
+    });
+    const projectNamespacesTypeNames = projectNamespaces.flatMap(namespace => {
+        return [...namespace.Models.keys(), ...namespace.Enums.map(e => e.Name)];
+    });
+    const allLibraryTypeNames = [];
+    libraryNamespace.models.forEach(model => {
+        allLibraryTypeNames.push(model.name);
+    });
+    libraryNamespace.enums.forEach(enumType => {
+        allLibraryTypeNames.push(enumType.name);
+    });
+    allLibraryTypeNames.filter(libraryTypeName => !usedLibraryTypeNames.includes(libraryTypeName))
+        .forEach(type => {
+        libraryNamespace.models.delete(type);
+        libraryNamespace.enums.delete(type);
+    });
+    projectNamespacesTypeNames.forEach(type => {
+        const strippedType = type.replace(/[0-9.]/g, '');
+        libraryNamespace.models.delete(strippedType);
+    });
+    libraryNamespace.models.delete('entity');
+    return libraryNamespace;
+}
+export function expandNamespaces(namespace) {
     return [namespace, ...[...namespace.namespaces.values()].flatMap(expandNamespaces)];
 }
 function hasChildren(type) {
@@ -30,9 +103,11 @@ function hasChildren(type) {
 function getMsGraphNamespace(program, namespace) {
     var _a;
     const namespaceName = (_a = getPublicNamespaceName(program, namespace)) !== null && _a !== void 0 ? _a : DEFAULT_MSGRAPH_NAMESPACE;
-    const models = GetMsGraphModels(program, namespace.models);
+    let models = GetMsGraphModels(program, namespace.models);
+    models = applyOwnerlessAttributeToInterfaceBindingType(program, namespace.interfaces, models);
     const enums = [...namespace.enums].map(([_, e]) => GetMsGraphEnumTypeElement(program, e));
     const sources = getNavigationSources(namespace.interfaces);
+    const twoSegmentResources = getTwoSegmentResourceInterface(program, sources);
     const resourceSources = getInterfacesOfKinds(program, sources, ["Resource"]);
     const collectionSources = getInterfacesOfKinds(program, sources, ["Collection"]);
     resourceSources.forEach((entity, routePath) => {
@@ -42,6 +117,16 @@ function getMsGraphNamespace(program, namespace) {
             resourceSources.delete(routePath);
         }
     });
+    if (twoSegmentResources && twoSegmentResources.size > 0) {
+        twoSegmentResources.forEach((entity, routePath) => {
+            if (collectionSources.has(routePath)) {
+                const existing = collectionSources.get(routePath);
+                existing.operations = [...existing.operations, ...entity.operations.values()];
+                return;
+            }
+            collectionSources.set(routePath, entity);
+        });
+    }
     const singletonSources = getRootNavigationSources(program, resourceSources);
     const entitySetSources = getRootNavigationSources(program, collectionSources);
     const singletons = GetSingletons(program, singletonSources);
@@ -50,6 +135,7 @@ function getMsGraphNamespace(program, namespace) {
     const collectionAnnotations = GetCollectionAnnotations(program, namespaceName, collectionSources);
     const allowedValuesAnnotations = GetAllowedValuesAnnotations(program, namespaceName, models);
     const operations = GetMsGraphOperations(program, namespace.interfaces);
+    const terms = GetMsGraphTerms(program, namespace);
     return {
         Name: namespaceName,
         Enums: enums,
@@ -61,9 +147,10 @@ function getMsGraphNamespace(program, namespace) {
         ResourceAnnotations: resourceAnnotations,
         CollectionAnnotations: collectionAnnotations,
         AllowedValuesAnnotations: allowedValuesAnnotations,
+        Terms: terms,
     };
 }
-function getNavigationSources(interfaces) {
+export function getNavigationSources(interfaces) {
     const navigationSources = new Map();
     interfaces.forEach((theInterface, key) => {
         if (isNavigationSource(theInterface)) {

package/dist/src/entities/namespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,oBAAoB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzI,OAAO,EAAE,yBAAyB,EAAe,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAgB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAoB,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAA8C,wBAAwB,EAAE,sBAAsB,EAA4B,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AACvL,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAEtE,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAepD,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAQ,CAAC,sBAAsB,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC;SACtC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IAE5F,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClE,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CACxC,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC7F;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,SAAoB;;IACjE,MAAM,aAAa,GAAG,MAAA,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,mCAAI,yBAAyB,CAAC;IAE9F,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1F,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3D,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7E,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjF,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC5C,IAAI,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YACnD,QAAQ,CAAC,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9E,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAE9E,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAC5F,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAClG,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAE7F,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAEvE,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC;QAClD,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU;QACtB,mBAAmB,EAAE,mBAAmB;QACxC,qBAAqB,EAAE,qBAAqB;QAC5C,wBAAwB,EAAE,wBAAwB;KACnD,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAkC;IAC9D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEvD,UAAU,CAAC,OAAO,CAAC,CAAC,YAAuB,EAAE,GAAW,EAAE,EAAE;QAC1D,IAAI,kBAAkB,CAAC,YAAY,CAAC,EAAE;YACpC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,wBAAwB,CAAC,OAAgB,EAAE,OAAsC;IACxF,MAAM,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAC;IAExD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,IAAI,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;YAC/C,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACpC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"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"}