@microsoft/typespec-msgraph 0.0.1-Preview.12 → 0.0.1-Preview.14

package/dist/src/rules/top.js

@@ -1,15 +1,15 @@
-import { createRule } from "@typespec/lint";
+import { navigateTypesInNamespace } from "@typespec/compiler";
 import { getOperationVerb } from "@typespec/http";
 import { isTop } from "../index.js";
 import { isTypeCollection } from "../utils.js";
 import { reportDiagnostic } from "../lib.js";
+import { GetDeclaredNamespaces } from "../entities/namespace.js";
 /**
  * @top applies to get operations that return collections.
  */
-export const topAppliesToGetOperationsThatReturnCollectionsRule = createRule({
-    name: "top-applies-to-get-operations-that-return-collections",
-    create({ program }) {
-        return {
+export function validateTopAppliesToGetOperationsThatReturnCollections(program) {
+    for (const namespace of GetDeclaredNamespaces(program)) {
+        navigateTypesInNamespace(namespace, {
             operation: (operation) => {
                 if (!isTop(program, operation)) {
                     return;
@@ -31,7 +31,8 @@ export const topAppliesToGetOperationsThatReturnCollectionsRule = createRule({
                     },
                 });
             },
-        };
-    },
-});
+        });
+    }
+}
+;
 //# sourceMappingURL=top.js.map

package/dist/src/rules/top.js.map

@@ -1 +1 @@
-{"version":3,"file":"top.js","sourceRoot":"","sources":["../../../src/rules/top.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C;;GAEG;AACH,MAAM,CAAC,MAAM,kDAAkD,GAAG,UAAU,CAAC;IAC3E,IAAI,EAAE,uDAAuD;IAC7D,MAAM,CAAC,EAAE,OAAO,EAAE;QAChB,OAAO;YACL,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;oBAC9B,OAAO;iBACR;gBAED,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,KAAK,EAAE;oBAClD,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;oBACxC,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBAC3D,IAAI,YAAY,EAAE;wBAChB,OAAO;qBACR;iBACF;gBAED,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE;wBACN,SAAS,EAAE,MAAM;wBACjB,MAAM,EAAE,yCAAyC;qBAClD;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"top.js","sourceRoot":"","sources":["../../../src/rules/top.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE;;GAEG;AACH,MAAM,UAAU,sDAAsD,CAAC,OAAgB;IACrF,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACtD,wBAAwB,CAAC,SAAS,EAAE;YAClC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;oBAC9B,OAAO;iBACR;gBAED,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,KAAK,EAAE;oBAClD,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;oBACxC,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBAC3D,IAAI,YAAY,EAAE;wBAChB,OAAO;qBACR;iBACF;gBAED,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,WAAW;oBACtB,MAAM,EAAE;wBACN,SAAS,EAAE,MAAM;wBACjB,MAAM,EAAE,yCAAyC;qBAClD;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;KACJ;AACH,CAAC;AAAA,CAAC"}

package/dist/src/testing/index.d.ts

@@ -1,3 +1,4 @@
 import { TypeSpecTestLibrary } from "@typespec/compiler/testing";
 export declare const MsGraphTestLibrary: TypeSpecTestLibrary;
+export declare const ReferenceModelTestLibrary: TypeSpecTestLibrary;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,eAAO,MAAM,kBAAkB,EAAE,mBAoBhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,eAAO,MAAM,kBAAkB,EAAE,mBAoBhC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,mBAoBvC,CAAA"}

package/dist/src/testing/index.js

@@ -21,4 +21,25 @@ export const MsGraphTestLibrary = {
         },
     ],
 };
+export const ReferenceModelTestLibrary = {
+    name: "@microsoft/typespec-msgraph-reference-prod-beta",
+    packageRoot: resolvePath(fileURLToPath(import.meta.url), "../../../../../typespec-msgraph-reference-prod-beta/"),
+    files: [
+        {
+            realDir: "",
+            pattern: "package.json",
+            virtualPath: "./node_modules/@microsoft/typespec-msgraph-reference-prod-beta",
+        },
+        {
+            realDir: "dist/",
+            pattern: "*.js",
+            virtualPath: "./node_modules/@microsoft/typespec-msgraph-reference-prod-beta/dist/",
+        },
+        {
+            realDir: "lib",
+            pattern: "*.tsp",
+            virtualPath: "./node_modules/@microsoft/typespec-msgraph-reference-prod-beta/lib",
+        },
+    ],
+};
 //# sourceMappingURL=index.js.map

package/dist/src/testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAwB;IACrD,IAAI,EAAE,6BAA6B;IACnC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;IACxE,KAAK,EAAE;QACL;YACE,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,4CAA4C;SAC1D;QACD;YACE,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,qDAAqD;SACnE;QACD;YACE,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,gDAAgD;SAC9D;KACF;CACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAwB;IACrD,IAAI,EAAE,6BAA6B;IACnC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;IACxE,KAAK,EAAE;QACL;YACE,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,4CAA4C;SAC1D;QACD;YACE,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,qDAAqD;SACnE;QACD;YACE,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,gDAAgD;SAC9D;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAwB;IAC5D,IAAI,EAAE,iDAAiD;IACvD,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,sDAAsD,CAAC;IAChH,KAAK,EAAE;QACL;YACE,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,gEAAgE;SAC9E;QACD;YACE,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,sEAAsE;SACpF;QACD;YACE,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,oEAAoE;SAClF;KACF;CACF,CAAA"}

package/dist/src/utils.d.ts

@@ -14,8 +14,9 @@ export declare function getCSDLPrimitiveType(typespecType: string): string;
 export declare function getIdForType(program: Program, type: Type): string;
 export declare function getNavigationTypeId(program: Program, getOperation: Operation): string;
 export declare function getInterfacesOfKinds(program: Program, navigationSources: Map<string, Interface>, kinds: string[]): Map<string, MsGraphInterface>;
-export declare function getTwoSegmentResourceInterface(program: Program, navigationSources: Map<string, Interface>): Map<string, MsGraphInterface>;
+export declare function getCollectionIndexInterfaces(program: Program, navigationSources: Map<string, Interface>): Map<string, MsGraphInterface>;
 export declare function getPropertyTypeName(program: Program, type: Type): string;
+export declare function removeReferencePrefixFromType(typeName: string): string;
 export declare function isTypeNullable(program: Program, type: Type): boolean;
 export declare function extractTypesFromUnion(type: Union): Type[];
 export declare function getSingletonTypeId(program: Program, singletonType: string | null, getOperation: Operation | undefined): string | undefined;
@@ -47,4 +48,21 @@ export declare function isNavigationSource(theInterface: Interface): boolean;
 export declare function isTopLevelNavigationSource(program: Program, theInterface: MsGraphInterface): boolean;
 export declare function getInterfaceNavigationSourceType(program: Program, theInterface: Interface): Model | undefined;
 export declare function getNavigationSourceType(program: Program, operation: Operation): Model | undefined;
+/**
+ * Removes route path params from a route path
+ *
+ * Examples:
+ *  - user/{id}/manager -> user/manager
+ *  - user/{id}/friends/{friendId}/hobbies -> user/friends/hobbies
+ *  - user/{user-id}/friends/{friend-id}/hobbies -> user/friends/hobbies
+ */
+export declare function removeRoutePathParams(routePath: string): string;
+export declare function isSameNamespace(program: Program, model: Model, baseModel?: Model): boolean;
+export declare function isTypeDefinedInExternalLibrary(program: Program, type: Type): boolean;
+/**
+ * Recursively get all source interfaces of an interface
+ * @param theInterface
+ * @returns an array of all source interfaces
+ */
+export declare function getSourceInterfaces(theInterface: Interface): Interface[];
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAEJ,SAAS,EAET,KAAK,EACL,aAAa,EACb,SAAS,EACT,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EACJ,KAAK,EACN,MAAM,oBAAoB,CAAC;AAI5B,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,SAAS,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,SAAS,CAAC;IACxB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAqBnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM,UAyCzE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,UAqCxD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAsBjE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,GAAG,MAAM,CAOrF;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EACzC,KAAK,EAAE,MAAM,EAAE,GACd,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAyB/B;AAeD,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAoBzI;AAsBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAgBxE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAOpE;AAgBD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,CAEzD;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,YAAY,EAAE,SAAS,GAAG,SAAS,GAClC,MAAM,GAAG,SAAS,CAMpB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAoBtE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,GAC1F,MAAM,CAsBR;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,GAC9E,OAAO,CAOT;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,IAAI,GAC9E,OAAO,CAIT;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,WAuB7E;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,SAAS,GAAG,OAAO,CAEnE;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,gBAAgB,GAC7B,OAAO,CAET;AAID,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,GAAG,KAAK,GAAE,SAAS,CAQ5G;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,KAAK,GAAE,SAAS,CAE/F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils.js

@@ -1,4 +1,4 @@
-import { getNamespaceFullName, isArrayModelType, } from "@typespec/compiler";
+import { getLocationContext, getNamespaceFullName, isArrayModelType, } from "@typespec/compiler";
 import { getEntity, getGraphRoutePaths, getPublicNamespaceName, hasPublicNamespace, isEntity } from "./decorators/index.js";
 export function getNameForType(program, type) {
     switch (type.kind) {
@@ -46,6 +46,10 @@ export function getNameForModelType(program, type) {
             return "Edm.TimeOfDay";
         case "zonedDateTime":
             return "Edm.DateTimeOffset";
+        case "offsetDateTime":
+            return "Edm.DateTimeOffset";
+        case "utcDateTime":
+            return "Edm.DateTimeOffset";
         case "duration":
             return "Edm.Duration";
         case "boolean":
@@ -134,7 +138,7 @@ export function getNavigationTypeId(program, getOperation) {
 export function getInterfacesOfKinds(program, navigationSources, kinds) {
     const interfaces = new Map();
     navigationSources.forEach((theInterface) => {
-        if (!theInterface.sourceInterfaces.some((s) => kinds.includes(s.name))) {
+        if (!getSourceInterfaces(theInterface).some((s) => kinds.includes(s.name))) {
             // if source interfaces DO NOT have the kinds.
             return;
         }
@@ -144,7 +148,7 @@ export function getInterfacesOfKinds(program, navigationSources, kinds) {
         }
         graphRoutePaths.forEach((graphRoute) => {
             // skip two-segment resources as they are collections
-            if (isTwoSegmentResource(theInterface, graphRoute)) {
+            if (isRouteIndexOfACollection(theInterface, graphRoute)) {
                 return;
             }
             processGraphRoute(graphRoute, interfaces, theInterface);
@@ -152,30 +156,27 @@ export function getInterfacesOfKinds(program, navigationSources, kinds) {
     });
     return interfaces;
 }
-function isTwoSegmentResource(theInterface, graphRoute) {
-    const pathParts = graphRoute.split("/");
-    if (pathParts.length && pathParts.length === 2) {
-        const pattern = /\{[^}]*id[^}]*\}/i;
-        if (pattern.test(pathParts[1]) && theInterface.sourceInterfaces.some((s) => s.name === "Resource")) {
-            return true;
-        }
+function isRouteIndexOfACollection(theInterface, graphRoute) {
+    const pathSegments = graphRoute.split("/");
+    const pathSegmentsWithoutParams = removeRoutePathParams(graphRoute).split("/");
+    if (pathSegments.length / pathSegmentsWithoutParams.length === 2
+        && getSourceInterfaces(theInterface).some((s) => s.name === "Resource")) {
+        return true;
     }
     return false;
 }
 // Generate an interface for a resource that has a root path and an index like /users/{id}. Note that this is a collection.
 // Resources with two-segment paths like /users/{id} are essentially collections
-export function getTwoSegmentResourceInterface(program, navigationSources) {
+// This applies to deeply nested resources as well e.g. /cars/{carId}/wheels/{wheelId}
+export function getCollectionIndexInterfaces(program, navigationSources) {
     const interfaces = new Map();
     navigationSources.forEach((theInterface) => {
-        if (!theInterface.sourceInterfaces.some((s) => ["Resource"].includes(s.name))) {
-            return;
-        }
         const graphRoutePaths = getGraphRoutePaths(program, theInterface);
         if (!graphRoutePaths || !graphRoutePaths.length) {
             return;
         }
         graphRoutePaths.forEach((graphRoute) => {
-            if (isTwoSegmentResource(theInterface, graphRoute)) {
+            if (isRouteIndexOfACollection(theInterface, graphRoute)) {
                 processGraphRoute(graphRoute, interfaces, theInterface);
             }
         });
@@ -206,12 +207,15 @@ export function getPropertyTypeName(program, type) {
         if (!nonNullTypes.length) {
             return "undefined.";
         }
-        return getPropertyTypeName(program, nonNullTypes[0]);
+        return removeReferencePrefixFromType(getPropertyTypeName(program, nonNullTypes[0]));
     }
     if ((type.kind === "Model" || type.kind === "Scalar") && ((_a = type.namespace) === null || _a === void 0 ? void 0 : _a.name) === "TypeSpec") {
-        return getNameForType(program, type);
+        return removeReferencePrefixFromType(getNameForType(program, type));
     }
-    return getIdForType(program, type);
+    return removeReferencePrefixFromType(getIdForType(program, type));
+}
+export function removeReferencePrefixFromType(typeName) {
+    return typeName.replace(/^reference\./, "");
 }
 export function isTypeNullable(program, type) {
     if (type.kind !== "Union") {
@@ -350,7 +354,7 @@ export function getNavigationSourceType(program, operation) {
     return getInterfaceNavigationSourceType(program, operation.interface);
 }
 function findNavigationSource(theInterface) {
-    for (const baseInterface of theInterface.sourceInterfaces) {
+    for (const baseInterface of getSourceInterfaces(theInterface)) {
         if (baseInterface.name === "Resource" || baseInterface.name === "Collection") {
             return baseInterface;
         }
@@ -369,8 +373,27 @@ function findNavigationSource(theInterface) {
  * Examples:
  *  - user/{id}/manager -> user/manager
  *  - user/{id}/friends/{friendId}/hobbies -> user/friends/hobbies
+ *  - user/{user-id}/friends/{friend-id}/hobbies -> user/friends/hobbies
+ */
+export function removeRoutePathParams(routePath) {
+    return routePath.replace(/\/\{[\w-]+\}/g, "");
+}
+export function isSameNamespace(program, model, baseModel) {
+    if (!baseModel) {
+        return false;
+    }
+    return getNamespaceName(program, model) === getNamespaceName(program, baseModel);
+}
+export function isTypeDefinedInExternalLibrary(program, type) {
+    const locationContext = getLocationContext(program, type);
+    return locationContext.type === "library";
+}
+/**
+ * Recursively get all source interfaces of an interface
+ * @param theInterface
+ * @returns an array of all source interfaces
  */
-function removeRoutePathParams(routePath) {
-    return routePath.replace(/\/\{\w+\}/g, "");
+export function getSourceInterfaces(theInterface) {
+    return [...theInterface.sourceInterfaces, ...[...theInterface.sourceInterfaces.values()].flatMap(getSourceInterfaces)];
 }
 //# sourceMappingURL=utils.js.map

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,oBAAoB,EAEpB,gBAAgB,GASjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAc5H,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,IAAU;IACzD,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,OAAO;YACV,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5E,KAAK,mBAAmB;YACtB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACzB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5C;YACE,OAAO,IAAI,CAAC,IAAI,CAAC;KACpB;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAgB,EAAE,IAAoB;IACxE,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,YAAY,CAAC;QACtB,KAAK,OAAO;YACV,OAAO,sBAAsB,CAAC;QAChC,KAAK,MAAM;YACT,OAAO,UAAU,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,WAAW,CAAC;QACrB,KAAK,OAAO;YACV,OAAO,WAAW,CAAC;QACrB,KAAK,OAAO;YACV,OAAO,WAAW,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,YAAY,CAAC;QACtB,KAAK,SAAS;YACZ,OAAO,YAAY,CAAC;QACtB,KAAK,WAAW;YACd,OAAO,UAAU,CAAC;QACpB,KAAK,WAAW;YACd,OAAO,eAAe,CAAC;QACzB,KAAK,eAAe;YAClB,OAAO,oBAAoB,CAAC;QAC9B,KAAK,gBAAgB;YACnB,OAAO,oBAAoB,CAAC;QAC9B,KAAK,aAAa;YAChB,OAAO,oBAAoB,CAAC;QAC9B,KAAK,UAAU;YACb,OAAO,cAAc,CAAC;QACxB,KAAK,SAAS;YACZ,OAAO,aAAa,CAAC;QACvB,KAAK,QAAQ;YACX,OAAO,YAAY,CAAC;QACtB,KAAK,MAAM;YACT,OAAO,UAAU,CAAC;QACpB;YACE,MAAM;KACT;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACnE,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IAED,OAAO,cAAc,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,YAAoB;IACvD,QAAO,YAAY,EAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,WAAW;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,WAAW;YACd,OAAO,WAAW,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,gBAAgB,CAAC;QAC1B,KAAK,UAAU;YACb,OAAO,UAAU,CAAC;QACpB,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,YAAY,CAAC;KACvB;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAgB,EAAE,IAAU;IACvD,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW;YACd,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC;gBACtC,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAE;gBACxC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACjC,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW;YACd,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,SAAU,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAClE,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACzB,KAAK,OAAO;YACV,OAAO,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,QAAQ;YACX,OAAO,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5C;YACE,OAAO,IAAI,CAAC,IAAI,CAAC;KACpB;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAgB,EAAE,YAAuB;;IAC3E,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;IAC3C,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,iBAAiB,0CAAE,MAAM,CAAA,EAAE;QACxE,OAAO,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;KAC1C;IAED,OAAO,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAAgB,EAChB,iBAAyC,EACzC,KAAe;IAEf,MAAM,UAAU,GAAG,IAAI,GAAG,EAA4B,CAAC;IAEvD,iBAAiB,CAAC,OAAO,CAAC,CAAC,YAAuB,EAAE,EAAE;QACpD,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;YAC1E,8CAA8C;YAC9C,OAAO;SACR;QAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC/C,OAAO;SACR;QAED,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACrC,qDAAqD;YACrD,IAAG,yBAAyB,CAAC,YAAY,EAAE,UAAU,CAAC,EAAC;gBACrD,OAAO;aACR;YACD,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,yBAAyB,CAAC,YAAuB,EAAE,UAAkB;IAC5E,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,yBAAyB,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/E,IAAI,YAAY,CAAC,MAAM,GAAG,yBAAyB,CAAC,MAAM,KAAK,CAAC;WAC3D,mBAAmB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;QACzE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,2HAA2H;AAC3H,gFAAgF;AAChF,sFAAsF;AACtF,MAAM,UAAU,4BAA4B,CAAC,OAAgB,EAAE,iBAAyC;IACtG,MAAM,UAAU,GAAG,IAAI,GAAG,EAA4B,CAAC;IACvD,iBAAiB,CAAC,OAAO,CAAC,CAAC,YAAuB,EAAE,EAAE;QACpD,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC/C,OAAO;SACR;QAED,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACrC,IAAI,yBAAyB,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE;gBACrD,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;aAC3D;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CACA,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAkB,EAAE,UAAyC,EAAE,YAAuB;IAC/G,MAAM,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC,IAAI,EAAE;QACT,OAAO;KACR;IAED,IAAI,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAC,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,CAAC,CAAG,CAAC;IAEjI,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QACvC,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;KACtD;IAED,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE;QACnB,YAAY,EAAE,YAAY;QAC1B,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,UAAU;KACjB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAgB,EAAE,IAAU;;IAC9D,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;QACzB,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxB,OAAO,YAAY,CAAC;SACrB;QAED,OAAO,6BAA6B,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrF;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,MAAK,UAAU,EAAE;QAC5F,OAAO,6BAA6B,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;KACrE;IAED,OAAO,6BAA6B,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,QAAgB;IAC5D,OAAO,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,IAAU;IACzD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,aAAa,CAAC,OAAgB,EAAE,SAAgB;IACvD,MAAM,UAAU,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,UAAU,CAAC,OAAgB,EAAE,IAAU;IAC9C,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAW;IAC/C,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,aAA4B,EAC5B,YAAmC;IAEnC,IAAI,aAAa,EAAE;QACjB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACjD,OAAO,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAChD;IACD,OAAO,YAAY,IAAI,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACpE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB,EAAE,IAAU;IAC3D,IAAI,UAAU,GAAiB,EAAE,CAAC;IAClC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;QACzB,MAAM,SAAS,GAAqB,CAClC,qBAAqB,CAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CACrE,CAAC;QACF,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;KAC3C;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;QAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,UAAU,CAAC,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,OAAO;QAClB,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,IAA2F;IAE3F,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,EAAE,CAAC;SACX;QAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;KAC9C;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE;QAC7B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;KACvB;IAED,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,IAA+E;IAE/E,EAAE;IACF,6EAA6E;IAC7E,EAAE;IACF,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,kBAAkB,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACnD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,IAA+E;IAE/E,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,kBAAkB,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACnD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,QAAuB;IAC5E,IAAI,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IACjC,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE;QACjC,MAAM,UAAU,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QACD,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;KAChC;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IAED,IAAI,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE;QAC3C,YAAY,GAAG,YAAY,CAAC,OAAQ,CAAC,KAAK,CAAC;QAC3C,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE;YACjC,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,YAAuB;IACxD,OAAO,oBAAoB,CAAC,YAAY,CAAC,KAAK,SAAS,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,OAAgB,EAChB,YAA8B;IAE9B,OAAO,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC1E,CAAC;AAED,4FAA4F;AAC5F,gDAAgD;AAChD,MAAM,UAAU,gCAAgC,CAAC,OAAgB,EAAE,YAAuB;;IACxF,MAAM,SAAS,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACrD,IAAG,SAAS,KAAK,SAAS,EAAE;QAC1B,OAAO,SAAS,CAAC;KAClB;SACI;QACH,OAAc,MAAA,SAAS,CAAC,cAAc,0CAAE,IAAI,CAAC,CAAC,CAAC,CAAC;KACjD;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,uBAAuB,CAAC,OAAgB,EAAE,SAAoB;IAC5E,OAAO,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAC,SAAU,CAAC,CAAC;AACxE,CAAC;AAEF,SAAS,oBAAoB,CAAC,YAAuB;IACnD,KAAK,MAAM,aAAa,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE;QAC7D,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,IAAI,aAAa,CAAC,IAAI,KAAK,YAAY,EAAE;YAC5E,OAAO,aAAa,CAAC;SACtB;aACI;YACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;YACrD,IAAI,QAAQ,KAAK,SAAS,EAAG;gBAC3B,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,OAAO,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,KAAY,EAAE,SAAiB;IAC/E,IAAG,CAAC,SAAS,EAAC;QACZ,OAAO,KAAK,CAAC;KACd;IACD,OAAO,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,OAAgB,EAAE,IAAU;IACzE,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1D,OAAO,eAAe,CAAC,IAAI,KAAK,SAAS,CAAC;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAuB;IACzD,OAAO,CAAC,GAAG,YAAY,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;AACzH,CAAC"}

package/dist/src/{linter.d.ts → validate.d.ts}

@@ -1,3 +1,3 @@
 import { Program } from "@typespec/compiler";
 export declare function $onValidate(program: Program): void;
-//# sourceMappingURL=linter.d.ts.map
+//# sourceMappingURL=validate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAsD3C"}

package/dist/src/validate.js

@@ -0,0 +1,56 @@
+import * as theRules from "./rules/index.js";
+export function $onValidate(program) {
+    theRules.validateNamespaceIsRequired(program);
+    theRules.validatePublicNamespaceName(program);
+    theRules.validateTopLevelNamespaceMustHavePublicNamespace(program);
+    theRules.validateAbstractOnlyAppliesToStructuredTypes(program);
+    theRules.validateAddressUrlOnlyAppliesToRoutedInterfacesOrActionOperations(program);
+    theRules.validateAllowedValuesCannotBeEmpty(program);
+    theRules.validateAlternateKeyOnKey(program);
+    theRules.validateAlternateKeyOnPrimitiveProperty(program);
+    theRules.validateAlternateKeyRequiresKey(program);
+    theRules.validateKeyOnlyOnEntityNonNullablePrimitiveProperty(program);
+    theRules.validateComputedCannotBeCombined(program);
+    theRules.validatecontainsOnlyAppliesToNavigationProperty(program);
+    theRules.validateCountAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateDisallowedTypeSpecDecorators(program);
+    theRules.validateCollectionValuedNavigationPropertiesCannotBeNullable(program);
+    theRules.validateRequiredRequestParameters(program);
+    theRules.validateEntityMustHaveKey(program);
+    theRules.validateExpandOnlyOnGetNavigationSource(program);
+    theRules.validateExpandOnlyNavigationProperties(program);
+    theRules.validateExtendsOnSameType(program);
+    theRules.validateFilterAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateFilterOnlyAppliesToModelProperties(program);
+    theRules.validateFilterPropertiesMustNotBeEmpty(program);
+    theRules.validateGraphRouteInterfaceExtendsGraphStandardInterface(program);
+    theRules.validateHasStreamOnlyOnEntity(program);
+    theRules.validateOpenOnlyAppliesToStructuredType(program);
+    theRules.validateOperationInsideInterface(program);
+    theRules.validateOrderByAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateOrderByOnlyNonNavigationProperties(program);
+    theRules.validateReferencesOnlyAppliesToNavigationProperty(program);
+    theRules.validateSearchAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateSkipAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateTopAppliesToGetOperationsThatReturnCollections(program);
+    theRules.validateVoidFunction(program);
+    theRules.validateGraphRouteLeadingSlash(program);
+    theRules.validateOperationParametersMatchGraphRouteParameters(program);
+    theRules.validateExtendedModelBaseShouldMatchPartialBaseModel(program);
+    theRules.validateGraphDeprecatedMustBeAccompaniedByDefinition(program);
+    theRules.validateGraphDeprecatedValueMustBeDefinedInDeprecatedDefinition(program);
+    theRules.validateExtendOnlyAppliesOnDifferentNamespaces(program);
+    theRules.validateOwnerlessMustOnlyBeAppliedToInterfacesWithSingleSegmentGraphRoute(program);
+    theRules.validateOwnerlessEntityModelReferencedMustOnlyHaveNavigationPropertiesRule(program);
+    theRules.validateOwnerlessInterfaceMustNotHaveAnyOperations(program);
+    theRules.validateOwnerlessDecoratorCannotBeUsedWithIsOwner(program);
+    theRules.validateEntityTypeInOwnerlessExtendsClauseCannotBeUsedInOtherInterfaces(program);
+    theRules.validatePropertyTypeOfEntityTypeMustHaveContainsOrReferences(program);
+    theRules.validateGlobalOperationMustBeUsedWithNonRoutedInterface(program);
+    theRules.validateGlobalOperationMustBeUsedWithProjectBindingType(program);
+    theRules.validateGraphRouteAndInterfaceExtendsMatchForCollections(program);
+    theRules.validateReferenceTargetInterfaceHasGraphRoutes(program);
+    theRules.validateReferenceTargetUsedOnlyOnceOnInterface(program);
+    theRules.validateTargetPathShouldNotHaveParameters(program);
+}
+//# sourceMappingURL=validate.js.map

package/dist/src/validate.js.map

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

package/lib/decorators.tsp

@@ -16,14 +16,31 @@ extern dec action(target: Operation, name?: valueof string);
 
 /**
  * `@additionalQueryParameters` - Appends a key=value pair to the query string of the mapped internal URL for all models defined within the namespace.
- * 
+ *
  * `@additionalQueryParameters` can only be applied to namespaces
  */
-extern dec additionalQueryParameters(target: Namespace, name: valueof string, value: valueof string);
+extern dec additionalQueryParameters(
+  target: Namespace,
+  name: valueof string,
+  value: valueof string
+);
+
+/**
+ * `@addressUrl` - Specifies the URL to which the operation request is forwarded when the request
+ * is authenticated with an AAD account.
+ *
+ * `@addressUrl` can only be applied to routed interfaces (entity sets, singletons and navigation properties) or action operations.
+ */
+extern dec addressUrl(
+  target: Interface | Operation,
+  url: valueof string,
+  omitRootNavigationSegment?: valueof boolean,
+  appendSegmentNameToAddress?: valueof boolean
+);
 
 /**
  * `@agsAttribute` - Allows all AGS CSDL extensions that are not yet modelled explicitly in TypeSpec to be maintained
- * 
+ *
  * `@agsAttribute` - Applies to models.
  */
 extern dec agsAttribute(
@@ -34,10 +51,10 @@ extern dec agsAttribute(
 
 /**
  * `@allowedValues` - mark model property with allowedValues.
- * 
+ *
  * `@allowedValues` - can only be applied to model properties.
  */
- extern dec allowedValues(target: ModelProperty, ...values: valueof unknown[]);
+extern dec allowedValues(target: ModelProperty, ...values: valueof unknown[]);
 
 /**
  * `@alternateKey` - mark a model property as an alternateKey
@@ -81,6 +98,23 @@ extern dec count(target: Operation);
  */
 extern dec deltaCollection(target: Model);
 
+/**
+ * `@graphDeprecated` - mark an entity as graphDeprecated.
+ *
+ * `@graphDeprecated` can be applied to Model, ModelProperty, Enum, EnumMember, Operation, Namespace, Interface.
+ */
+extern dec graphDeprecated(
+  target:
+    | Model
+    | ModelProperty
+    | Enum
+    | EnumMember
+    | Operation
+    | Namespace
+    | Interface,
+  name: valueof string
+);
+
 /**
  * `@deprecatedDefinition` - Allow us create a reusable deprecation definition.
  * `@deprecatedDefinition` - Applies only to namespaces.
@@ -108,14 +142,27 @@ extern dec entity(target: Model);
  * `properties` - Property names in the model returned from the get that can be used in a $expand query parameter.
  * At least one property must be specified.
  */
-extern dec expand(target: Operation, property: valueof string, ...otherProperties: valueof string[]);
+extern dec expand(
+  target: Operation,
+  property: valueof string,
+  ...otherProperties: valueof string[]
+);
 
 /**
  * `@experimental` - mark the entity as experimental
  *
  * `@experimental` can be applied to Model, ModelProperty, Enum, EnumMember, Operation, Namespace, Interface.
  */
-extern dec experimental(target: Model | ModelProperty | Enum | EnumMember | Operation | Namespace | Interface);
+extern dec experimental(
+  target:
+    | Model
+    | ModelProperty
+    | Enum
+    | EnumMember
+    | Operation
+    | Namespace
+    | Interface
+);
 
 /**
  * `@filter` - Applies to: get operations that return collections of @entity or @complex models.
@@ -124,8 +171,11 @@ extern dec experimental(target: Model | ModelProperty | Enum | EnumMember | Oper
  * `properties` - array of property names in the model returned
  * from the get operation that can be used in $filter query parameter.
  */
-extern dec filter(target: Operation, property: valueof string, ...properties: valueof string[]);
-
+extern dec filter(
+  target: Operation,
+  property: valueof string,
+  ...properties: valueof string[]
+);
 
 /**
  * `@flags` - mark an enumeration type as a flag.
@@ -141,15 +191,25 @@ extern dec flags(target: Enum);
  */
 extern dec function(target: Operation, name?: valueof string);
 
+/**
+ * `@globalOperation` - mark an operation as a globalOperation
+ *
+ * `@globalOperation` can only be applied to operations.
+ */
+extern dec globalOperation(target: Operation);
+
 /**
  * `@graphRoute` - mark an interface or operation with an HTTP route.
- * 
+ *
  * `@graphRoute` - can only be applied to interfaces or operations.
  */
 // TODO: Using @graphRoute on an operation currently does not work due to the following TypeSpec core issue
 // https://github.com/microsoft/typespec/issues/2106
 // Disabling all related features while we await the outcome.
-extern dec graphRoute(target: Interface /* | Operation */, path: valueof string);
+extern dec graphRoute(
+  target: Interface,  /* | Operation */
+  path: valueof string
+);
 
 /**
  * `@hasStream` - indicates that an `@entity` model has a stream.
@@ -165,6 +225,13 @@ extern dec hasStream(target: Model, ...mediaTypes: valueof string[]);
  */
 extern dec immutable(target: ModelProperty);
 
+/**
+ * `@ownerless` - mark an interface as ownerless.
+ *
+ * `@ownerless` can only be applied to interfaces.
+ */
+extern dec ownerless(target: Interface);
+
 /**
  * `@open` - mark a model type as open
  *
@@ -188,7 +255,11 @@ extern dec operationParameters(target: Model);
  * `properties` - List of property names in the model returned from the get operation that can be used in a $orderBy query parameter.
  * At least one property must be specified.
  */
-extern dec orderBy(target: Operation, property: valueof string, ...otherProperties: valueof string[]);
+extern dec orderBy(
+  target: Operation,
+  property: valueof string,
+  ...otherProperties: valueof string[]
+);
 
 /**
  * `@pagedCollection` - mark a model as representing a paged collection.
@@ -230,7 +301,9 @@ extern dec privatePreviewDefinition(
  *
  * `@privileged` can be applied to Model, ModelProperty, Enum, EnumMember, Operation, Namespace.
  */
-extern dec privileged(target: Model | ModelProperty | Enum | EnumMember | Operation | Namespace);
+extern dec privileged(
+  target: Model | ModelProperty | Enum | EnumMember | Operation | Namespace
+);
 
 /**
  * `@publicNamespace` - defines the namespace to be used in generating CSDL output for all elements contained within the namespace
@@ -253,6 +326,13 @@ extern dec readOnly(target: ModelProperty);
  */
 extern dec references(target: ModelProperty);
 
+/**
+ * `@referenceTarget` - mark an interface with referenceTarget
+ *
+ * `@references` can only be applied to interfaces.
+ */
+ extern dec referenceTarget(target: Interface, value: valueof string);
+
 /**
  * `@requiredForCreate` - mark a model property as required when a request is made to
  * Graph to create or update a resource.
@@ -273,6 +353,23 @@ extern dec search(target: Operation);
  */
 extern dec skip(target: Operation);
 
+/**
+ * `@select` - Applies to operations
+ *  Indicates that the operation supports the OData $select query parameter
+ */
+ extern dec select(target: Operation);
+
+/**
+ * `@term` - Applies to: namespaces.
+ * Indicates that a workload wishes to require or return instance annotations in their request / response packets at runtime.
+ */
+extern dec term(
+  target: Namespace,
+  name: valueof string,
+  type: Scalar,
+  description: valueof string
+);
+
 /**
  * `@top` - Applies to: get operations that return collections.
  * Indicates that the get operation supports the OData $top query parameter.
@@ -287,10 +384,10 @@ extern dec top(target: Operation);
 extern dec writeOnly(target: ModelProperty);
 
 /**
-* `@isOwner` - specify that this workload is the primary owner of this entity model
-*
-* `@isOwner` can be applied to Model where the model also has an @entity decorator or a ModelProperty where it has either an @contains or @references decorator.
-*/
+ * `@isOwner` - specify that this workload is the primary owner of this entity model
+ *
+ * `@isOwner` can be applied to Model where the model also has an @entity decorator or a ModelProperty where it has either an @contains or @references decorator.
+ */
 extern dec isOwner(target: Model | ModelProperty, value?: valueof boolean);
 
 /**