@microsoft/typespec-msgraph 0.0.1-Preview.9 → 1.0.0-Preview.3

package/dist/src/dom/renderer.js

@@ -1,5 +1,6 @@
 import { DOMParser, XMLSerializer } from "@xmldom/xmldom";
 import reconciler from "./reconciler.js";
+import "./error-interceptor.js";
 function formatXml(xml, tab = "  ") {
     let formatted = "";
     let indent = "";

package/dist/src/dom/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/dom/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,SAAS,SAAS,CAAC,GAAW,EAAE,MAAc,IAAI;IAChD,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QACvC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YACvB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,+BAA+B;SACvE;QAED,SAAS,IAAI,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC;QAC3C,IAAI,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;YACjC,MAAM,IAAI,GAAG,CAAC,CAAC,kBAAkB;SAClC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,eAAe;IACb,cAAc,CAAC,OAAoB;QACjC,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CACnC,wJAAwJ,EACxJ,UAAU,CACX,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,UAAW,CAAC;QACxD,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAC1C,YAAY,EACZ,CAAC,EACD,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,EAAE,EACF,GAAG,EAAE,GAAE,CAAC,EACR,IAAI,CACL,CAAC;QAEF,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,OAAoB;QAC7B,MAAM,UAAU,GAAG,IAAI,aAAa,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;CACF,CAAC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/dom/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,wBAAwB,CAAC;AAEhC,SAAS,SAAS,CAAC,GAAW,EAAE,MAAc,IAAI;IAChD,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QACvC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACxB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,+BAA+B;QACxE,CAAC;QAED,SAAS,IAAI,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC;QAC3C,IAAI,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,CAAC,CAAC,kBAAkB;QACnC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,eAAe;IACb,cAAc,CAAC,OAAoB;QACjC,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CACnC,wJAAwJ,EACxJ,UAAU,CACX,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,UAAW,CAAC;QACxD,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAC1C,YAAY,EACZ,CAAC,EACD,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,EAAE,EACF,GAAG,EAAE,GAAE,CAAC,EACR,IAAI,CACL,CAAC;QAEF,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,OAAoB;QAC7B,MAAM,UAAU,GAAG,IAAI,aAAa,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;CACF,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,EAA2E,MAAM,oBAAoB,CAAC;AAG1H,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,qBAAqB,CAAC,iBAoCxE"}

package/dist/src/emitter.js

@@ -3,13 +3,40 @@ import { renderCsdl } from "./components/index.js";
 import { GetMsGraphNamespaces } from "./entities/namespace.js";
 export const defaultCsdlFileName = "workload.csdl";
 export async function $onEmit(context) {
-    var _a;
     const program = context.program;
     const namespaces = GetMsGraphNamespaces(program);
-    const csdl = renderCsdl(namespaces);
+    // Get the first file in sourceFiles that is within the project root and not inside node_modules folder
+    const localFile = Array.from(program.sourceFiles.keys())
+        .find((sourceFile) => sourceFile.startsWith(program.projectRoot) && !sourceFile.includes('node_modules'));
+    const typespecFilename = localFile === null || localFile === void 0 ? void 0 : localFile.replace(/^.*[\\/]/, '');
+    const initialCsdl = renderCsdl(namespaces);
+    const xmlDeclarationEndIndex = initialCsdl.indexOf("?>") + 2;
+    const xmlComment = typespecFilename
+        ? `<!-- This file is auto-generated from the TypeSpec source '${typespecFilename}'.  DO NOT MODIFY -->`
+        : `<!-- Automatically generated file. DO NOT MODIFY -->`;
+    const csdl = `${initialCsdl.substring(0, xmlDeclarationEndIndex)}\n${xmlComment}${initialCsdl.substring(xmlDeclarationEndIndex)}`;
+    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;
+    let csdlFileName = context.options.filename;
+    if (csdlFileName === undefined) {
+        if (typespecFilename) {
+            const firstFileStem = removeExtension(typespecFilename);
+            csdlFileName = `${firstFileStem}.csdl`;
+        }
+        else {
+            // Ultimate fallback.
+            csdlFileName = defaultCsdlFileName;
+        }
+    }
     const csdlPath = resolvePath(program.compilerOptions.outputDir, csdlFileName);
     await program.host.writeFile(csdlPath, csdl);
 }
+function removeExtension(filename) {
+    const lastDotIndex = filename.lastIndexOf('.');
+    if (lastDotIndex !== -1) {
+        return filename.substring(0, lastDotIndex);
+    }
+    return filename; // No extension found
+}
 //# sourceMappingURL=emitter.js.map

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,EAA8D,MAAM,oBAAoB,CAAC;AAC1H,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,CAAC;IAEjD,uGAAuG;IACvG,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;SACrD,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAE5G,MAAM,gBAAgB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,sBAAsB,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,gBAAgB;QACjC,CAAC,CAAC,8DAA8D,gBAAgB,uBAAuB;QACvG,CAAC,CAAC,sDAAsD,CAAC;IAE3D,MAAM,IAAI,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,sBAAsB,CAAC,KAAK,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC;IAElI,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO;IAEpD,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,SAAU,CAAC,CAAC;IAE9D,IAAI,YAAY,GAAuB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;IAChE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,aAAa,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;YACxD,YAAY,GAAG,GAAG,aAAa,OAAO,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,qBAAqB;YACrB,YAAY,GAAG,mBAAmB,CAAC;QACrC,CAAC;IACH,CAAC;IAED,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;AAED,SAAS,eAAe,CAAC,QAAgB;IACvC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,QAAQ,CAAC,CAAC,qBAAqB;AACxC,CAAC"}

package/dist/src/entities/address-url.d.ts

@@ -0,0 +1,8 @@
+import { Program, Interface, Operation } from "@typespec/compiler";
+export type MsGraphAddressUrl = Record<string, string | boolean>;
+export type MsGraphPassthroughAddressUrl = Record<string, string>;
+export declare function getMsGraphAddressUrl(program: Program, target: Interface | Operation): MsGraphAddressUrl | undefined;
+export declare function getMsGraphAddressUrlMsa(program: Program, target: Interface | Operation): MsGraphAddressUrl | undefined;
+export declare function getMsGraphPassthroughAddressUrl(program: Program, target: Interface): MsGraphPassthroughAddressUrl | undefined;
+export declare function getMsGraphPassthroughAddressUrlMsa(program: Program, target: Interface): MsGraphPassthroughAddressUrl | undefined;
+//# sourceMappingURL=address-url.d.ts.map

package/dist/src/entities/address-url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"address-url.d.ts","sourceRoot":"","sources":["../../../src/entities/address-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAenE,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;AACjE,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAElE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,SAAS,GAAG,SAAS,GAC5B,iBAAiB,GAAG,SAAS,CAM/B;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,SAAS,GAAG,SAAS,GAC5B,iBAAiB,GAAG,SAAS,CAM/B;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,SAAS,GAChB,4BAA4B,GAAG,SAAS,CAM1C;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,SAAS,GAChB,4BAA4B,GAAG,SAAS,CAM1C"}

package/dist/src/entities/address-url.js

@@ -0,0 +1,47 @@
+import { getAddressUrl, getAddressUrlMsa, getPassthroughAddressUrl, hasAddressUrl, hasAddressUrlMsa, hasPassthroughAddressUrl, } from "../index.js";
+import { getPassthroughAddressUrlMsa, hasPassthroughAddressUrlMsa, } from "../decorators/passthrough-address-url-msa.js";
+export function getMsGraphAddressUrl(program, target) {
+    if (hasAddressUrl(program, target)) {
+        const addressUrl = getAddressUrl(program, target);
+        return populateMsGraphAddressUrl("ags:AddressUrl", addressUrl);
+    }
+    return undefined;
+}
+export function getMsGraphAddressUrlMsa(program, target) {
+    if (hasAddressUrlMsa(program, target)) {
+        const addressUrlMsa = getAddressUrlMsa(program, target);
+        return populateMsGraphAddressUrl("ags:AddressUrlMSA", addressUrlMsa);
+    }
+    return undefined;
+}
+export function getMsGraphPassthroughAddressUrl(program, target) {
+    if (hasPassthroughAddressUrl(program, target)) {
+        const passthroughAddressUrl = getPassthroughAddressUrl(program, target);
+        return populateMsGraphPassthroughAddressUrl("ags:PassthroughAddressUrl", passthroughAddressUrl.url);
+    }
+    return undefined;
+}
+export function getMsGraphPassthroughAddressUrlMsa(program, target) {
+    if (hasPassthroughAddressUrlMsa(program, target)) {
+        const passthroughAddressUrlMsa = getPassthroughAddressUrlMsa(program, target);
+        return populateMsGraphPassthroughAddressUrl("ags:PassthroughAddressUrlMSA", passthroughAddressUrlMsa.url);
+    }
+    return undefined;
+}
+function populateMsGraphAddressUrl(addressUrlVariant, addressUrl) {
+    const msGraphAddressUrl = {};
+    msGraphAddressUrl[addressUrlVariant] = addressUrl.url;
+    if (addressUrl.omitRootNavigationSegment) {
+        msGraphAddressUrl["ags:AddressContainsEntitySetSegment"] = true;
+    }
+    if (addressUrl.appendSegmentNameToAddress) {
+        msGraphAddressUrl["ags:AppendSegmentNameToAddress"] = true;
+    }
+    return msGraphAddressUrl;
+}
+function populateMsGraphPassthroughAddressUrl(passthroughAddressUrlVariant, passthroughAddressUrl) {
+    const msGraphPassthroughAddressUrl = {};
+    msGraphPassthroughAddressUrl[passthroughAddressUrlVariant] = passthroughAddressUrl;
+    return msGraphPassthroughAddressUrl;
+}
+//# sourceMappingURL=address-url.js.map

package/dist/src/entities/address-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"address-url.js","sourceRoot":"","sources":["../../../src/entities/address-url.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,8CAA8C,CAAC;AAKtD,MAAM,UAAU,oBAAoB,CAClC,OAAgB,EAChB,MAA6B;IAE7B,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAE,CAAC;QACnD,OAAO,yBAAyB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAgB,EAChB,MAA6B;IAE7B,IAAI,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAE,CAAC;QACzD,OAAO,yBAAyB,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,OAAgB,EAChB,MAAiB;IAEjB,IAAI,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9C,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAE,CAAC;QACzE,OAAO,oCAAoC,CAAC,2BAA2B,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,OAAgB,EAChB,MAAiB;IAEjB,IAAI,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QACjD,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAE,CAAC;QAC/E,OAAO,oCAAoC,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC5G,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,yBAAyB,CAChC,iBAEuB,EACvB,UAA+B;IAE/B,MAAM,iBAAiB,GAAsB,EAAE,CAAC;IAChD,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC;IACtD,IAAI,UAAU,CAAC,yBAAyB,EAAE,CAAC;QACzC,iBAAiB,CAAC,qCAAqC,CAAC,GAAG,IAAI,CAAC;IAClE,CAAC;IACD,IAAI,UAAU,CAAC,0BAA0B,EAAE,CAAC;QAC1C,iBAAiB,CAAC,gCAAgC,CAAC,GAAG,IAAI,CAAC;IAC7D,CAAC;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,oCAAoC,CAC3C,4BAA0F,EAC1F,qBAA6B;IAE7B,MAAM,4BAA4B,GAAiC,EAAE,CAAC;IACtE,4BAA4B,CAAC,4BAA4B,CAAC,GAAG,qBAAqB,CAAC;IACnF,OAAO,4BAA4B,CAAC;AACtC,CAAC"}

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

@@ -4,11 +4,15 @@ import { AllowedValues, MsGraphModel } from "./model.js";
 export interface ResourceAnnotations {
     Target: string | undefined;
     HasGetOnResource: boolean;
-    HasPatchOnResource: boolean;
+    HasPut: boolean;
+    HasPatch: boolean;
     HasDeleteOnResource: boolean;
     HasExpandOnCollectionOrResource: boolean;
     NonExpandableProperties: string[] | undefined;
     Description: string | undefined;
+    HasNavigationProperties: boolean;
+    ExplicitBindingOperationNames: string[];
+    IsSelectable: boolean;
 }
 export interface CollectionAnnotations {
     Target: string | undefined;
@@ -16,7 +20,8 @@ export interface CollectionAnnotations {
     HasGetOnResource: boolean;
     HasPostOnCollection: boolean;
     RequiredProperties: string[] | undefined;
-    HasPatchOnResource: boolean;
+    HasPut: boolean;
+    HasPatch: boolean;
     HasDeleteOnResource: boolean;
     HasCountOnCollection: boolean;
     HasExpandOnCollectionOrResource: boolean;
@@ -29,12 +34,20 @@ export interface CollectionAnnotations {
     NonSortableProperties: string[] | undefined;
     HasTopOnCollection: boolean;
     Description: string | undefined;
+    HasNavigationProperties: boolean;
+    ExplicitBindingOperationNames: string[];
+    IsSelectable: boolean;
+}
+export interface ExplicitOperationBindingsAnnotation {
+    Target: string | undefined;
+    Description: string | undefined;
+    ExplicitBindingOperationNames: string[];
 }
 export interface AllowedValuesAnnotations {
     Target: string;
     allowedValues: AllowedValues;
 }
-export declare function GetResourceAnnotations(program: Program, namespaceName: string, navigationSources: Map<string, MsGraphInterface>): Map<string, ResourceAnnotations>;
-export declare function GetCollectionAnnotations(program: Program, namespaceName: string, sources: Map<string, MsGraphInterface>): Map<string, CollectionAnnotations>;
+export declare function GetResourceAnnotations(program: Program, namespaceName: string, navigationSources: Map<string, MsGraphInterface>): Map<string, ResourceAnnotations | ExplicitOperationBindingsAnnotation>;
+export declare function GetCollectionAnnotations(program: Program, namespaceName: string, sources: Map<string, MsGraphInterface>): Map<string, CollectionAnnotations | ExplicitOperationBindingsAnnotation>;
 export declare function GetAllowedValuesAnnotations(program: Program, namespaceName: string, models: Map<string, MsGraphModel>): Map<string, AllowedValuesAnnotations>;
 //# sourceMappingURL=annotations.d.ts.map

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;AAmCD,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,EAAS,OAAO,EAAmC,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAmK,MAAM,aAAa,CAAC;AAEhN,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAGzD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,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;IACxC,YAAY,EAAE,OAAO,CAAC;CACvB;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,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,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;IACxC,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,6BAA6B,EAAE,MAAM,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,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,GAAG,mCAAmC,CAAC,CAYxM;AA8DD,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,GAAG,mCAAmC,CAAC,CAYlM;AA0HD,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

@@ -1,10 +1,14 @@
 import { getDoc, walkPropertiesInherited } from "@typespec/compiler";
-import { getInterfaceNavigationSourceType } from "../utils.js";
-import { getOperationVerb } from "@typespec/http";
-import { getExpand, getFilter, getOrderBy, isContains, isCount, isExpand, isFilter, isOrderBy, isReferences, isRequiredForCreate, isSearch, isSkip, isTop } from "../index.js";
+import { getInterfaceNavigationSourceType, getModelStructuralPropertyNames, isInterfaceBindingTypeOwned, isRouteIndexOfACollection, isNavigationProperty } from "../utils.js";
+import { getAction, getContainerName, getExpand, getFilter, getFunction, getOrderBy, getPublicNamespaceName, isAction, isCount, isExpand, isFilter, isFunction, isOrderBy, isRequiredForCreate, isSearch, isSelect, isSkip, isTop } from "../index.js";
+import { DEFAULT_MSGRAPH_NAMESPACE } from "./namespace.js";
 export function GetResourceAnnotations(program, namespaceName, navigationSources) {
     const annotations = new Map();
     navigationSources.forEach((entity, routePath) => {
+        // skip any route that ends with $ref
+        if (routePath.endsWith("$ref")) {
+            return;
+        }
         annotations.set(routePath, getResourceAnnotations(program, namespaceName, routePath, entity));
     });
     return annotations;
@@ -12,99 +16,143 @@ export function GetResourceAnnotations(program, namespaceName, navigationSources
 function getResourceAnnotations(program, namespaceName, routePath, entity) {
     const resource = entity.theInterface;
     const type = getInterfaceNavigationSourceType(program, resource);
-    const minimumParameters = routePath.split('/').length - 1;
-    const operationMethods = [...entity.operations].map(operation => ({
-        operation,
-        verb: getOperationVerb(program, operation),
-        hasMinimumParameters: operation.parameters.properties.size === minimumParameters,
-    }));
-    const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
-    const annotations = {
-        Target: `${namespaceName}.container/${routePath}`,
-        HasGetOnResource: operationMethods.some(({ verb }) => verb === "get"),
-        HasPatchOnResource: operationMethods.some(({ verb }) => verb === "patch"),
-        HasDeleteOnResource: operationMethods.some(({ verb }) => verb === "delete"),
-        HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
-        NonExpandableProperties: nonExpandableProperties,
-        Description: getDoc(program, resource),
-    };
+    const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
+    let annotations;
+    const containerName = getContainerName(program);
+    if (isInterfaceBindingTypeOwned(program, resource)) {
+        const hasNavigationProperties = [...walkPropertiesInherited(type)].some((property) => isNavigationProperty(program, property));
+        const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, entity.operations);
+        const isSelectable = entity.operations.some(o => isSelect(program, o.theOperation));
+        annotations = {
+            Target: `${namespaceName}.${containerName}/${routePath}`,
+            HasGetOnResource: entity.operations.some(o => o.verb === "get"),
+            HasPut: entity.operations.some(o => o.verb === "put"),
+            HasPatch: entity.operations.some(o => o.verb === "patch"),
+            HasDeleteOnResource: entity.operations.some(o => o.verb === "delete"),
+            HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
+            NonExpandableProperties: nonExpandableProperties,
+            Description: getDoc(program, resource),
+            HasNavigationProperties: hasNavigationProperties,
+            ExplicitBindingOperationNames: explicitBindingOperationNames,
+            IsSelectable: isSelectable,
+        };
+    }
+    else {
+        annotations = {
+            Target: `${namespaceName}.${containerName}/${routePath}`,
+            Description: getDoc(program, resource),
+            ExplicitBindingOperationNames: explicitBindingOperationNames
+        };
+    }
     return annotations;
 }
+function getExplicitBindingOperationNames(program, entity) {
+    var _a;
+    const actionAndFunctionOperations = Object.values(entity.operations).
+        filter(({ theOperation }) => isAction(program, theOperation) || isFunction(program, theOperation));
+    const namespaceName = entity.theInterface.namespace
+        ? (_a = getPublicNamespaceName(program, entity.theInterface.namespace)) !== null && _a !== void 0 ? _a : DEFAULT_MSGRAPH_NAMESPACE
+        : DEFAULT_MSGRAPH_NAMESPACE;
+    return actionAndFunctionOperations.
+        map(({ theOperation }) => {
+        var _a;
+        if (isAction(program, theOperation)) {
+            return getAction(program, theOperation) || '';
+        }
+        return ((_a = getFunction(program, theOperation)) === null || _a === void 0 ? void 0 : _a.name) || '';
+    }).
+        map(value => `${namespaceName}.${value}`);
+}
 export function GetCollectionAnnotations(program, namespaceName, sources) {
     const annotations = new Map();
     sources.forEach((entity, routePath) => {
+        // skip any route that ends with $ref
+        if (routePath.endsWith("$ref")) {
+            return;
+        }
         annotations.set(routePath, getCollectionAnnotations(program, namespaceName, routePath, entity));
     });
     return annotations;
 }
 function getCollectionAnnotations(program, namespaceName, routePath, entity) {
     const collection = entity.theInterface;
-    const type = getInterfaceNavigationSourceType(program, collection);
-    const minimumParameters = routePath.split('/').length - 1;
-    const operationMethods = entity.operations.map(operation => ({
-        operation,
-        verb: getOperationVerb(program, operation),
-        hasMinimumParameters: operation.parameters.properties.size === minimumParameters,
-    }));
-    const [hasFilterOperation, nonFilterableProperties] = getFilterProperties(program, type, operationMethods);
-    const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, operationMethods);
-    const [hasSortOnCollection, nonSortableProperties] = getSortProperties(program, type, operationMethods);
-    const annotations = {
-        Target: `${namespaceName}.container/${routePath}`,
-        HasGetOnCollection: operationMethods.some(m => m.hasMinimumParameters && m.verb === "get"),
-        HasGetOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "get"),
-        HasPostOnCollection: operationMethods.some(m => m.verb === "post"),
-        RequiredProperties: getRequiredForCreateProperties(program, type),
-        HasPatchOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "patch"),
-        HasDeleteOnResource: operationMethods.some(m => !m.hasMinimumParameters && m.verb === "delete"),
-        HasCountOnCollection: operationMethods.some(m => isCount(program, m.operation)),
-        HasSearchOnCollection: operationMethods.some(m => isSearch(program, m.operation)),
-        HasSkipOnCollection: operationMethods.some(m => isSkip(program, m.operation)),
-        HasFilterOperation: hasFilterOperation,
-        NonFilterableProperties: nonFilterableProperties,
-        HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
-        NonExpandableProperties: nonExpandableProperties,
-        HasSortOnCollection: hasSortOnCollection,
-        NonSortableProperties: nonSortableProperties,
-        HasTopOnCollection: operationMethods.some(m => isTop(program, m.operation)),
-        Description: getDoc(program, collection),
-    };
+    const explicitBindingOperationNames = getExplicitBindingOperationNames(program, entity);
+    let annotations;
+    const containerName = getContainerName(program);
+    if (isInterfaceBindingTypeOwned(program, collection)) {
+        const type = getInterfaceNavigationSourceType(program, collection);
+        const hasNavigationProperties = [...walkPropertiesInherited(type)].some((property) => isNavigationProperty(program, property));
+        const [hasFilterOperation, nonFilterableProperties] = getFilterProperties(program, type, entity.operations);
+        const [hasExpandOnCollectionOrResource, nonExpandableProperties] = getExpandProperties(program, type, entity.operations);
+        const [hasSortOnCollection, nonSortableProperties] = getSortProperties(program, type, entity.operations);
+        const isSelectable = entity.operations.some(o => isSelect(program, o.theOperation));
+        const hasGetOnCollection = entity.operations.some(o => !isRouteIndexOfACollection(o.theOperation.interface, o.graphRoute) && o.verb === "get");
+        const hasGetOnResource = entity.operations.some(o => isRouteIndexOfACollection(o.theOperation.interface, o.graphRoute) && o.verb === "get");
+        annotations = {
+            Target: `${namespaceName}.${containerName}/${routePath}`,
+            HasGetOnCollection: hasGetOnCollection,
+            HasGetOnResource: hasGetOnResource,
+            HasPostOnCollection: entity.operations.some(o => o.verb === "post"),
+            RequiredProperties: getRequiredForCreateProperties(program, type),
+            HasPut: entity.operations.some(o => o.verb === "put"),
+            HasPatch: entity.operations.some(o => o.verb === "patch"),
+            HasDeleteOnResource: entity.operations.some(o => o.verb === "delete"),
+            HasCountOnCollection: entity.operations.some(o => isCount(program, o.theOperation)),
+            HasSearchOnCollection: entity.operations.some(o => isSearch(program, o.theOperation)),
+            HasSkipOnCollection: entity.operations.some(o => isSkip(program, o.theOperation)),
+            HasFilterOperation: hasFilterOperation,
+            NonFilterableProperties: nonFilterableProperties,
+            HasExpandOnCollectionOrResource: hasExpandOnCollectionOrResource,
+            NonExpandableProperties: nonExpandableProperties,
+            HasSortOnCollection: hasSortOnCollection,
+            NonSortableProperties: nonSortableProperties,
+            HasTopOnCollection: entity.operations.some(o => isTop(program, o.theOperation)),
+            Description: getDoc(program, collection),
+            HasNavigationProperties: hasNavigationProperties,
+            ExplicitBindingOperationNames: explicitBindingOperationNames,
+            IsSelectable: isSelectable,
+        };
+    }
+    else {
+        annotations = {
+            Target: `${namespaceName}.${containerName}/${routePath}`,
+            Description: getDoc(program, collection),
+            ExplicitBindingOperationNames: explicitBindingOperationNames
+        };
+    }
     return annotations;
 }
-function getExpandProperties(program, type, operationMethods) {
-    const expandOperationMethod = operationMethods.find(m => m.verb === "get" &&
-        m.hasMinimumParameters &&
-        isExpand(program, m.operation));
-    if (expandOperationMethod) {
-        const expandableProperties = getExpand(program, expandOperationMethod.operation);
+function getExpandProperties(program, type, operations) {
+    const expandOperation = operations.find(o => o.verb === "get" && isExpand(program, o.theOperation));
+    if (expandOperation) {
+        const expandableProperties = getExpand(program, expandOperation.theOperation);
         const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => isContains(program, property) || isReferences(program, property))
+            .filter((property) => isNavigationProperty(program, property))
             .map((property) => property.name);
-        const nonExpandableProperties = navigationProperties.filter((property) => { var _a; return (_a = !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property))) !== null && _a !== void 0 ? _a : false; });
+        const nonExpandableProperties = navigationProperties.filter((property) => !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property)));
         return [true, nonExpandableProperties];
     }
     return [false, undefined];
 }
-function getFilterProperties(program, type, operationMethods) {
-    const filterOperationMethod = operationMethods.find((m) => m.verb === "get" && m.hasMinimumParameters && isFilter(program, m.operation));
-    if (filterOperationMethod) {
-        const filterableProperties = getFilter(program, filterOperationMethod.operation);
-        const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => !isContains(program, property) && !isReferences(program, property))
-            .map((property) => property.name);
-        const nonFilterableProperties = navigationProperties.filter((property) => !filterableProperties.includes(property));
-        return [true, nonFilterableProperties];
+function getFilterProperties(program, type, operations) {
+    const filterOperation = operations.find(o => o.verb === "get" && isFilter(program, o.theOperation));
+    if (filterOperation) {
+        const filterablePropertyNames = getFilter(program, filterOperation.theOperation);
+        if (filterablePropertyNames.length === 1 && filterablePropertyNames[0] === "*") {
+            return [true, undefined];
+        }
+        const structuralPropertyNames = getModelStructuralPropertyNames(program, type);
+        const nonFilterablePropertyNames = structuralPropertyNames.filter(p => !filterablePropertyNames.includes(p));
+        return [true, nonFilterablePropertyNames];
     }
     return [false, undefined];
 }
-function getSortProperties(program, type, operationMethods) {
-    const sortOperationMethod = operationMethods.find(m => m.verb === "get" &&
-        m.hasMinimumParameters &&
-        isOrderBy(program, m.operation));
+function getSortProperties(program, type, operations) {
+    const sortOperationMethod = operations.find(o => o.verb === "get" && isOrderBy(program, o.theOperation));
     if (sortOperationMethod) {
-        const sortableProperties = getOrderBy(program, sortOperationMethod.operation);
+        const sortableProperties = getOrderBy(program, sortOperationMethod.theOperation);
         const nonNavigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => !isContains(program, property) && !isReferences(program, property))
+            .filter((property) => !isNavigationProperty(program, property))
             .map((property) => property.name);
         const nonSortableProperties = nonNavigationProperties.filter((property) => !sortableProperties.includes(property));
         return [true, nonSortableProperties];
@@ -124,10 +172,10 @@ export function GetAllowedValuesAnnotations(program, namespaceName, models) {
         if ((properties === null || properties === void 0 ? void 0 : properties.length) > 0) {
             properties.forEach(property => {
                 var _a, _b;
-                if (((_b = (_a = property === null || property === void 0 ? void 0 : property.allowedValues) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                if (((_b = (_a = property === null || property === void 0 ? void 0 : property.AllowedValues) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b.length) > 0) {
                     annotations.set(`${namespaceName}/${value.Name}/${property.Name}`, {
                         Target: `${namespaceName}/${value.Name}/${property.Name}`,
-                        allowedValues: property.allowedValues,
+                        allowedValues: property.AllowedValues,
                     });
                 }
             });

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

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../src/entities/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAoC,gCAAgC,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAChN,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,sBAAsB,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvP,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAoD3D,MAAM,UAAU,sBAAsB,CAAC,OAAgB,EAAE,aAAqB,EAAE,iBAAgD;IAC9H,MAAM,WAAW,GAAG,IAAI,GAAG,EAAqE,CAAC;IACjG,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC9C,qCAAqC;QACrC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAgB,EAChB,aAAqB,EACrB,SAAiB,EACjB,MAAwB;IAExB,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC;IACrC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,QAAQ,CAAE,CAAC;IAClE,MAAM,6BAA6B,GAAG,gCAAgC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxF,IAAI,WAAsE,CAAC;IAC3E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnD,MAAM,uBAAuB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC/H,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACzH,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QAEpF,WAAW,GAAG;YACZ,MAAM,EAAE,GAAG,aAAa,IAAI,aAAa,IAAI,SAAS,EAAE;YACxD,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;YAC/D,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;YACrD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;YACzD,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;YACrE,+BAA+B,EAAE,+BAA+B;YAChE,uBAAuB,EAAE,uBAAuB;YAChD,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;YACtC,uBAAuB,EAAE,uBAAuB;YAChD,6BAA6B,EAAE,6BAA6B;YAC5D,YAAY,EAAE,YAAY;SAC3B,CAAC;IACJ,CAAC;SACI,CAAC;QACJ,WAAW,GAAG;YACZ,MAAM,EAAE,GAAG,aAAa,IAAI,aAAa,IAAI,SAAS,EAAE;YACxD,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;YACtC,6BAA6B,EAAE,6BAA6B;SACtB,CAAC;IAC3C,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,gCAAgC,CAAC,OAAgB,EAAE,MAAwB;;IAClF,MAAM,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QACpE,MAAM,CAAC,CAAC,EAAC,YAAY,EAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAEjG,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS;QACjD,CAAC,CAAC,MAAA,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,mCAAK,yBAAyB;QAC9F,CAAC,CAAC,yBAAyB,CAAC;IAE9B,OAAO,2BAA2B;QAChC,GAAG,CAAC,CAAC,EAAC,YAAY,EAAC,EAAE,EAAE;;QACrB,IAAG,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC;QAChD,CAAC;QACD,OAAO,CAAA,MAAA,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,0CAAE,IAAI,KAAI,EAAE,CAAC;IACxD,CAAC,CAAC;QACF,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,aAAa,IAAI,KAAK,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAgB,EAAE,aAAqB,EAAE,OAAsC;IACtH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAuE,CAAC;IACnG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QACpC,qCAAqC;QACrC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,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;IACvC,MAAM,6BAA6B,GAAG,gCAAgC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxF,IAAI,WAAwE,CAAA;IAC5E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,UAAU,CAAE,CAAC;QACpE,MAAM,uBAAuB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC/H,MAAM,CAAC,kBAAkB,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5G,MAAM,CAAC,+BAA+B,EAAE,uBAAuB,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACzH,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACzG,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QACpF,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;QAC/I,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;QAE5I,WAAW,GAAG;YACZ,MAAM,EAAE,GAAG,aAAa,IAAI,aAAa,IAAI,SAAS,EAAE;YACxD,kBAAkB,EAAE,kBAAkB;YACtC,gBAAgB,EAAE,gBAAgB;YAClC,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;YACnE,kBAAkB,EAAE,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC;YACjE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;YACrD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;YACzD,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;YACrE,oBAAoB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;YACnF,qBAAqB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;YACrF,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;YACjF,kBAAkB,EAAE,kBAAkB;YACtC,uBAAuB,EAAE,uBAAuB;YAChD,+BAA+B,EAAE,+BAA+B;YAChE,uBAAuB,EAAE,uBAAuB;YAChD,mBAAmB,EAAE,mBAAmB;YACxC,qBAAqB,EAAE,qBAAqB;YAC5C,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;YAC/E,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;YACxC,uBAAuB,EAAE,uBAAuB;YAChD,6BAA6B,EAAE,6BAA6B;YAC5D,YAAY,EAAE,YAAY;SAC3B,CAAC;IACJ,CAAC;SACI,CAAC;QACJ,WAAW,GAAG;YACZ,MAAM,EAAE,GAAG,aAAa,IAAI,aAAa,IAAI,SAAS,EAAE;YACxD,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;YACxC,6BAA6B,EAAE,6BAA6B;SACtB,CAAC;IAC3C,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,IAAW,EAAE,UAA4B;IACtF,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAEpG,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;QAE9E,MAAM,oBAAoB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC5D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,CAAC;QAErH,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;IACxC,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,IAAW,EAAE,UAA4B;IACtF,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAEpG,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,uBAAuB,GAAG,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;QAEjF,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YAC/E,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,uBAAuB,GAAG,+BAA+B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/E,MAAM,0BAA0B,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7G,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB,EAAE,IAAW,EAAE,UAA4B;IACpF,MAAM,mBAAmB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzG,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAEjF,MAAM,uBAAuB,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;aAC/D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aAC9D,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;IACvC,CAAC;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,CAAC;QAClC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QACpC,IAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC,EAAC,CAAC;YACzB,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,CAAC;oBAC/C,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;gBACJ,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAAA,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/src/entities/entity-container.d.ts

@@ -1,15 +1,36 @@
 import { Program } from "@typespec/compiler";
 import { MsGraphInterface } from "../utils.js";
+import { MsGraphAddressUrl } from "./address-url.js";
+import { DeltaProperties } from "./model.js";
+import { RevisionDefinition } from "./revision-definition.js";
+interface NavigationPropertyBinding {
+    Path: string;
+    Target: string;
+}
 export interface Singleton {
     Name: string | undefined;
     TypeName: string;
     AgsAttributes: Record<string, string>;
+    NavigationPropertyBindingProperties?: NavigationPropertyBinding;
+    AddressUrl: MsGraphAddressUrl | undefined;
+    AddressUrlMsa: MsGraphAddressUrl | undefined;
+    PassThroughAddressUrl: MsGraphAddressUrl | undefined;
+    PassThroughAddressUrlMsa: MsGraphAddressUrl | undefined;
+    RevisionDefinition?: RevisionDefinition | undefined;
 }
 export interface EntitySet {
     Name: string | undefined;
     TypeName: string;
     AgsAttributes: Record<string, string | boolean | undefined>;
+    NavigationPropertyBindingProperties?: NavigationPropertyBinding;
+    AddressUrl: MsGraphAddressUrl | undefined;
+    AddressUrlMsa: MsGraphAddressUrl | undefined;
+    PassThroughAddressUrl: MsGraphAddressUrl | undefined;
+    PassThroughAddressUrlMsa: MsGraphAddressUrl | undefined;
+    DeltaProperties: DeltaProperties | undefined;
+    RevisionDefinition?: RevisionDefinition | undefined;
 }
 export declare function GetSingletons(program: Program, sources: Map<string, MsGraphInterface>): Map<string, Singleton>;
 export declare function GetEntitySets(program: Program, sources: Map<string, MsGraphInterface>): Map<string, EntitySet>;
+export {};
 //# sourceMappingURL=entity-container.d.ts.map

package/dist/src/entities/entity-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-container.d.ts","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAER,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAGL,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;CAC7D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G;AAkBD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G"}
+{"version":3,"file":"entity-container.d.ts","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAGL,gBAAgB,EAGjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAsH,MAAM,kBAAkB,CAAC;AAEzK,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAErF,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mCAAmC,CAAC,EAAE,yBAAyB,CAAC;IAChE,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC1C,aAAa,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC7C,qBAAqB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACrD,wBAAwB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxD,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACrD;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC5D,mCAAmC,CAAC,EAAE,yBAAyB,CAAC;IAChE,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC1C,aAAa,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC7C,qBAAqB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACrD,wBAAwB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxD,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACrD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G;AA8BD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAQ9G"}