@microsoft/typespec-msgraph 0.0.1-Preview.4 → 0.0.1-Preview.5

package/dist/src/entities/entity-container.js

@@ -1,132 +1,38 @@
-import { getDoc, walkPropertiesInherited } from "@typespec/compiler";
-import { getRoutePath, getOperationVerb } from "@typespec/http";
-import { buildAttributes, isExpand, getExpand, isContains, isReferences, isCount, isSearch, isSkip, isTop, isOrderBy, getOrderBy } from "../index.js";
-import { getPropertyTypeName } from "../utils.js";
-export function GetEntityContainer(program, namespace) {
-    const navigationSources = [...namespace.interfaces]
-        .filter(([_, $interface]) => $interface.operations.has("_isNavigationSource"))
-        .map(([_, $interface]) => [
-        $interface.operations.get("_isNavigationSource").returnType,
-        $interface,
-    ]);
-    const entityContainer = {
-        AgsAttributes: buildAttributes(program, namespace),
-        SingletonElements: getMsGraphSingletonElements(program, navigationSources),
-        EntitySetElements: getMsGraphEntitySetElements(program, navigationSources),
-    };
-    return entityContainer;
-}
-function getMsGraphSingletonElements(program, navigationSources) {
-    const singletons = navigationSources
-        .filter(([returnType, _]) => returnType.kind === "Model" && returnType.name !== "Array")
-        .map(([_, $interface]) => $interface);
-    const elements = singletons.map(singleton => getMsGraphSingletonElement(program, singleton));
+import { buildAttributes } from "../decorators/ags-attribute.js";
+import { getPropertyTypeName, getInterfaceNavigationSourceType, getInterfacesOfKinds, } from "../utils.js";
+export function GetSingletons(program, navigationSources) {
+    const singletonMap = getInterfacesOfKinds(program, navigationSources, ["Singleton"]);
+    const elements = [...singletonMap].map(([routePath, entity]) => getSingleton(program, routePath, entity));
     return elements;
 }
-function getMsGraphSingletonElement(program, singleton) {
-    const routePath = getRoutePath(program, singleton);
-    const type = singleton.operations.get("_isNavigationSource").returnType;
-    const element = {
-        Name: routePath === null || routePath === void 0 ? void 0 : routePath.path.split("/")[0],
+function getSingleton(program, routePath, entity) {
+    const singleton = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, singleton);
+    const agsAttributes = { ...getOperationAgsAttributes(program, entity.operations), ...buildAttributes(program, singleton) };
+    const entry = {
+        Name: routePath,
         TypeName: getPropertyTypeName(program, type),
-        AgsAttributes: buildAttributes(program, singleton),
-        HasExpandOperation: false,
-        NonExpandableProperties: undefined,
-        Description: getDoc(program, singleton)
+        AgsAttributes: agsAttributes,
     };
-    const expandedOperation = [...singleton.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isExpand(program, operation));
-    if (expandedOperation) {
-        element.HasExpandOperation = true;
-        // Destructuring to get the operation from the [string, Operation] expandedOperation tuple
-        const [_, operation] = expandedOperation;
-        const expandableProperties = getExpand(program, operation);
-        const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => isContains(program, property) || isReferences(program, property))
-            .map((property) => property.name);
-        element.NonExpandableProperties = navigationProperties.filter(property => { var _a; return (_a = !(expandableProperties === null || expandableProperties === void 0 ? void 0 : expandableProperties.includes(property))) !== null && _a !== void 0 ? _a : false; });
-    }
-    return element;
+    return entry;
 }
-function getMsGraphEntitySetElements(program, navigationSources) {
-    const entitySets = navigationSources
-        .filter(([returnType, _]) => returnType.kind === "Model" && returnType.name === "Array")
-        .reduce((map, [_, item]) => {
-        var _a;
-        const key = (_a = getRoutePath(program, item)) === null || _a === void 0 ? void 0 : _a.path.split("/")[0];
-        if (!key) {
-            return map;
-        }
-        const items = [...(map.get(key) || []), ...item.operations.values()];
-        map.set(key, items);
-        return map;
-    }, new Map());
-    const elements = [...entitySets]
-        .map(([_, operations]) => getMsGraphEntitySetElement(program, operations))
-        .filter((element) => !!element);
+export function GetEntitySets(program, navigationSources) {
+    const entitySetMap = getInterfacesOfKinds(program, navigationSources, ["EntitySet", "EntitySetResource"]);
+    const elements = [...entitySetMap].map(([routePath, entity]) => getEntitySet(program, routePath, entity));
     return elements;
 }
-function getMsGraphEntitySetElement(program, operations) {
-    var _a;
-    const entitySet = operations[0].interface;
-    if (entitySet === undefined) {
-        return undefined;
-    }
-    let agsAttributes = operations.reduce((attr, item) => ({ ...attr, ...buildAttributes(program, item) }), {});
-    agsAttributes = { ...agsAttributes, ...buildAttributes(program, entitySet) };
-    const returnType = entitySet.operations.get("_isNavigationSource").returnType;
-    const type = returnType.indexer.value;
-    const operationMethods = operations.map((operation) => ({
-        operation,
-        verb: getOperationVerb(program, operation),
-        hasEmptyParameters: operation.parameters.properties.size === 0,
-    }));
+function getEntitySet(program, routePath, entity) {
+    const entitySet = entity.theInterface;
+    const type = getInterfaceNavigationSourceType(program, entitySet);
+    const agsAttributes = { ...getOperationAgsAttributes(program, entity.operations), ...buildAttributes(program, entitySet) };
     const entry = {
-        Name: (_a = getRoutePath(program, entitySet)) === null || _a === void 0 ? void 0 : _a.path.split("/")[0],
+        Name: routePath,
         TypeName: getPropertyTypeName(program, type),
         AgsAttributes: agsAttributes,
-        HasGetOnCollection: operationMethods.some(({ verb, hasEmptyParameters }) => hasEmptyParameters && verb === "get"),
-        HasGetOnItem: operationMethods.some(({ verb, hasEmptyParameters }) => !hasEmptyParameters && verb === "get"),
-        HasPostOnCollection: operationMethods.some(({ verb }) => verb === "post"),
-        HasPatchOnItem: operationMethods.some(({ verb }) => verb === "patch"),
-        HasDeleteOnItem: operationMethods.some(({ verb }) => verb === "delete"),
-        HasCountOperation: [...entitySet.operations].some(([_, operation]) => isCount(program, operation)),
-        HasExpandOperation: false,
-        NonExpandableProperties: undefined,
-        HasSearchOperation: [...entitySet.operations].some(([_, operation]) => isSearch(program, operation)),
-        HasSkipOperation: [...entitySet.operations].some(([_, operation]) => isSkip(program, operation)),
-        HasSortOperation: false,
-        NonSortableProperties: undefined,
-        HasTopOperation: [...entitySet.operations].some(([_, operation]) => isTop(program, operation)),
-        Description: getDoc(program, entitySet),
     };
-    const expandedOperation = [...entitySet.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isExpand(program, operation));
-    if (expandedOperation) {
-        entry.HasExpandOperation = true;
-        // Destructuring to get the operation from the [string, Operation] expandedOperation tuple
-        const [_, operation] = expandedOperation;
-        const expandableProperties = getExpand(program, operation);
-        const navigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => isContains(program, property) || isReferences(program, property))
-            .map((property) => property.name);
-        entry.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 sortOperation = [...entitySet.operations].find(([_, operation]) => getOperationVerb(program, operation) === "get" &&
-        operation.parameters.properties.size === 0 &&
-        isOrderBy(program, operation));
-    if (sortOperation) {
-        entry.HasSortOperation = true;
-        // Destructuring to get the operation from the [string, Operation] orderedOperation tuple
-        const [_, operation] = sortOperation;
-        const sortableProperties = getOrderBy(program, operation);
-        const nonNavigationProperties = [...walkPropertiesInherited(type)]
-            .filter((property) => !isContains(program, property) && !isReferences(program, property))
-            .map((property) => property.name);
-        entry.NonSortableProperties = nonNavigationProperties.filter((property) => !sortableProperties.includes(property));
-    }
     return entry;
 }
+function getOperationAgsAttributes(program, operations) {
+    return operations.reduce((attr, item) => ({ ...attr, ...buildAttributes(program, item) }), {});
+}
 //# sourceMappingURL=entity-container.js.map

package/dist/src/entities/entity-container.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-container.js","sourceRoot":"","sources":["../../../src/entities/entity-container.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,gCAAgC,EAChC,oBAAoB,GAErB,MAAM,aAAa,CAAC;AAcrB,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,iBAA8B;IAC5E,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAC7D,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,iBAA8B;IAC5E,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAA;IAEzG,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAC7D,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,MAAwB;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC;IAEtC,MAAM,IAAI,GAAG,gCAAgC,CAAC,OAAO,EAAE,SAAS,CAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAE3H,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5C,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgB,EAAE,UAAuB;IAC1E,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,EAChE,EAAE,CACH,CAAC;AACJ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAc,MAAM,oBAAoB,CAAA;AAE9D,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAEpF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;CACnD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,WAAW,CASvF"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/entities/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAc,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAGrF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,WAAW,CASvF"}

package/dist/src/entities/enum.js

@@ -1,11 +1,11 @@
-import { buildAttributes } from "../index.js";
 import { GetRevisionDefinition } from "./revision-definition.js";
+import { buildAttributes } from "../decorators/ags-attribute.js";
 export function GetMsGraphEnumTypeElement(program, enumType) {
     const element = {
         Name: enumType.name,
         AgsAttributes: buildAttributes(program, enumType),
         RevisionDefinition: GetRevisionDefinition(program, enumType, enumType === null || enumType === void 0 ? void 0 : enumType.namespace),
-        Elements: [...enumType.members].map(([_, m]) => getMsGraphEnumMember(program, m))
+        Elements: [...enumType.members].map(([_, m]) => getMsGraphEnumMember(program, m)),
     };
     return element;
 }
@@ -15,7 +15,7 @@ function getMsGraphEnumMember(program, member) {
         Name: member.name,
         Value: member.value,
         AgsAttributes: buildAttributes(program, member),
-        RevisionDefinition: GetRevisionDefinition(program, member, (_a = member.enum) === null || _a === void 0 ? void 0 : _a.namespace)
+        RevisionDefinition: GetRevisionDefinition(program, member, (_a = member.enum) === null || _a === void 0 ? void 0 : _a.namespace),
     };
     return element;
 }

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

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

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

@@ -1,36 +1,25 @@
 import { Model, ModelProperty, Program } from "@typespec/compiler";
 import { RevisionDefinition } from "./revision-definition.js";
 export interface MsGraphModel {
-    Properties: EntityType | ComplexType | undefined;
     Kind: MsGraphModelKind;
-}
-export interface EntityType {
-    StructuredType: StructuredType;
-    KeyProperty: [string, ModelProperty] | undefined;
-    Properties: MsGraphModelProperty[];
-    AlternateKeys: AlternateKeyProperty[];
-    StreamTypes: string[];
-    RevisionDefinition: RevisionDefinition | undefined;
-    Description: string | undefined;
-}
-export interface ComplexType {
-    StructuredType: StructuredType;
+    Name: string;
+    IsAbstract: true | undefined;
+    BaseType: string | undefined;
+    IsOpenType: true | undefined;
+    HasStream: true | undefined;
+    AgsAttributes: Record<string, string>;
     Properties: MsGraphModelProperty[];
     RevisionDefinition: RevisionDefinition | undefined;
     Description: string | undefined;
+    KeyProperty: [string, ModelProperty] | undefined;
+    AlternateKeys: AlternateKeyProperty[];
+    StreamTypes: string[];
 }
 export declare enum MsGraphModelKind {
     Unknown = 0,
     Entity = 1,
     Complex = 2
 }
-export interface StructuredType {
-    Name: string;
-    Abstract?: string;
-    BaseType?: string;
-    Children?: any;
-    [key: string]: any;
-}
 export interface MsGraphModelProperty {
     Name: string;
     IsNavigation: boolean;
@@ -43,8 +32,9 @@ export interface MsGraphModelProperty {
     RevisionDefinition: RevisionDefinition | undefined;
     Description: string | undefined;
 }
-export interface AlternateKeyProperty extends ModelProperty {
+export interface AlternateKeyProperty {
     IsModel: boolean;
+    ModelProperty: ModelProperty;
 }
-export declare function GetMsGraphModel(program: Program, model: Model): MsGraphModel;
+export declare function GetMsGraphModels(program: Program, models: Map<string, Model>): MsGraphModel[];
 //# sourceMappingURL=model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAA;AACjF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAIpF,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;IACjD,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAA;IAChD,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,aAAa,EAAE,oBAAoB,EAAE,CAAA;IACrC,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAChC;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,YAAY,CAgF5E"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/entities/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAiB,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAyB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAsBrF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,oBAAY,gBAAgB;IAC1B,OAAO,IAAA;IACP,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAW7F"}

package/dist/src/entities/model.js

@@ -1,119 +1,82 @@
 import { getDoc, isKey } from "@typespec/compiler";
 import { GetRevisionDefinition } from "./revision-definition.js";
-import { buildAttributes, isContains, isComputed, isReadOnly, isWriteOnly, isAlternateKey, isComplex, getStreamTypes, isEntity, isOpen, hasStream, isAbstract } from "../index.js";
-import { isNavigationProperty, isTypeNullable, getPropertyTypeName, getIdForType } from "../utils.js";
+import { isContains, isComputed, isReadOnly, isWriteOnly, isAlternateKey, isComplex, getStreamTypes, isEntity, isOpen, hasStream, isAbstract, } from "../index.js";
+import { isNavigationProperty, isTypeNullable, getPropertyTypeName, getIdForType, } from "../utils.js";
+import { buildAttributes } from "../decorators/ags-attribute.js";
 export var MsGraphModelKind;
 (function (MsGraphModelKind) {
     MsGraphModelKind[MsGraphModelKind["Unknown"] = 0] = "Unknown";
     MsGraphModelKind[MsGraphModelKind["Entity"] = 1] = "Entity";
     MsGraphModelKind[MsGraphModelKind["Complex"] = 2] = "Complex";
 })(MsGraphModelKind = MsGraphModelKind || (MsGraphModelKind = {}));
-export function GetMsGraphModel(program, model) {
-    const kind = getModelKind(program, model);
-    switch (kind) {
-        case MsGraphModelKind.Entity: {
-            return {
-                Kind: kind,
-                Properties: {
-                    StructuredType: getStructuredType(program, model),
-                    KeyProperty: [...model.properties].find(([_, property]) => isKey(program, property)),
-                    Properties: [...model.properties]
-                        .map(([_, v]) => {
-                        var _a;
-                        return {
-                            Name: v.name,
-                            IsNavigation: isNavigationProperty(program, v),
-                            IsNullable: isTypeNullable(program, v.type),
-                            AgsAttributes: buildAttributes(program, v),
-                            PropertyTypeName: getPropertyTypeName(program, v.type),
-                            IsContained: isContains(program, v),
-                            IsComputed: isComputed(program, v),
-                            Permission: isReadOnly(program, v)
-                                ? "Read"
-                                : isWriteOnly(program, v)
-                                    ? "Write"
-                                    : null,
-                            RevisionDefinition: GetRevisionDefinition(program, v, (_a = v.model) === null || _a === void 0 ? void 0 : _a.namespace),
-                            Description: getDoc(program, v)
-                        };
-                    }),
-                    AlternateKeys: [...model.properties]
-                        .filter(([_, v]) => isAlternateKey(program, v))
-                        .map(([_, key]) => {
-                        const altProp = key;
-                        altProp.IsModel = key.type.kind === "Model" && !isComplex(program, key.type);
-                        return altProp;
-                    }),
-                    StreamTypes: getStreamTypes(program, model),
-                    RevisionDefinition: GetRevisionDefinition(program, model, model.namespace),
-                    Description: getDoc(program, model)
-                }
-            };
+export function GetMsGraphModels(program, models) {
+    const result = new Array();
+    models.forEach(m => {
+        const model = getMsGraphModel(program, m);
+        if (model) {
+            result.push(model);
         }
-        case MsGraphModelKind.Complex: {
-            return {
-                Kind: kind,
-                Properties: {
-                    StructuredType: getStructuredType(program, model),
-                    Properties: [...model.properties]
-                        .map(([_, v]) => {
-                        var _a;
-                        return {
-                            Name: v.name,
-                            IsNavigation: isNavigationProperty(program, v),
-                            IsNullable: isTypeNullable(program, v.type),
-                            AgsAttributes: buildAttributes(program, v),
-                            PropertyTypeName: getPropertyTypeName(program, v.type),
-                            IsContained: isContains(program, v),
-                            IsComputed: isComputed(program, v),
-                            Permission: isReadOnly(program, v)
-                                ? "Read"
-                                : isWriteOnly(program, v)
-                                    ? "Write"
-                                    : null,
-                            RevisionDefinition: GetRevisionDefinition(program, v, (_a = v.model) === null || _a === void 0 ? void 0 : _a.namespace),
-                            Description: getDoc(program, v)
-                        };
-                    }),
-                    RevisionDefinition: GetRevisionDefinition(program, model, model.namespace),
-                    Description: getDoc(program, model)
-                }
-            };
-        }
-        default: {
-            return {
-                Kind: kind,
-                Properties: undefined,
-            };
-        }
-    }
+    });
+    return result;
 }
-function getModelKind(program, model) {
+function getMsGraphModel(program, model) {
+    let kind = MsGraphModelKind.Unknown;
     if (isEntity(program, model)) {
-        return MsGraphModelKind.Entity;
+        kind = MsGraphModelKind.Entity;
     }
     else if (isComplex(program, model)) {
-        return MsGraphModelKind.Complex;
+        kind = MsGraphModelKind.Complex;
     }
-    return MsGraphModelKind.Unknown;
-}
-function getStructuredType(program, model) {
-    const props = {
+    else {
+        return undefined;
+    }
+    return {
+        Kind: kind,
         Name: model.name,
+        IsAbstract: isAbstract(program, model) ? true : undefined,
+        BaseType: model.baseModel ? getIdForType(program, model.baseModel) : undefined,
+        IsOpenType: isOpen(program, model) ? true : undefined,
+        HasStream: hasStream(program, model) ? true : undefined,
+        AgsAttributes: buildAttributes(program, model),
+        RevisionDefinition: GetRevisionDefinition(program, model, model.namespace),
+        Description: getDoc(program, model),
+        KeyProperty: kind === MsGraphModelKind.Entity ? [...model.properties].find(([_, property]) => isKey(program, property)) : undefined,
+        AlternateKeys: kind === MsGraphModelKind.Entity ? getAlternateKeys(program, model.properties) : [],
+        StreamTypes: kind === MsGraphModelKind.Entity ? getStreamTypes(program, model) : [],
+        Properties: getModelProperties(program, model.properties),
     };
-    if (isOpen(program, model)) {
-        props.OpenType = "true";
-    }
-    if (hasStream(program, model)) {
-        props.HasStream = "true";
-    }
-    if (model.baseModel) {
-        props.BaseType = getIdForType(program, model.baseModel);
-    }
-    if (isAbstract(program, model)) {
-        props.Abstract = "true";
-    }
-    const agsAttributes = buildAttributes(program, model);
-    return Object.assign(props, agsAttributes);
+}
+function getModelProperties(program, properties) {
+    return [...properties].map(([_, v]) => {
+        var _a;
+        return {
+            Name: v.name,
+            IsNavigation: isNavigationProperty(program, v),
+            IsNullable: isTypeNullable(program, v.type),
+            AgsAttributes: buildAttributes(program, v),
+            PropertyTypeName: getPropertyTypeName(program, v.type),
+            IsContained: isContains(program, v),
+            IsComputed: isComputed(program, v),
+            Permission: isReadOnly(program, v)
+                ? "Read"
+                : isWriteOnly(program, v)
+                    ? "Write"
+                    : null,
+            RevisionDefinition: GetRevisionDefinition(program, v, (_a = v.model) === null || _a === void 0 ? void 0 : _a.namespace),
+            Description: getDoc(program, v),
+        };
+    });
+}
+function getAlternateKeys(program, properties) {
+    const result = new Array();
+    properties.forEach(v => {
+        if (isAlternateKey(program, v)) {
+            result.push({
+                IsModel: v.type.kind === "Model" && !isComplex(program, v.type),
+                ModelProperty: v,
+            });
+        }
+    });
+    return result;
 }
 //# sourceMappingURL=model.js.map

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

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

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

@@ -1,14 +1,19 @@
 import { Program } from "@typespec/compiler";
 import { MsGraphEnum } from "./enum.js";
 import { MsGraphModel } from "./model.js";
-import { EntityContainer } from "./entity-container.js";
+import { EntitySet, Singleton } from "./entity-container.js";
 import { MsGraphOperation } from "./operation.js";
+import { EntitySetAnnotations, SingletonAnnotations } from "./annotations.js";
 export interface MsGraphNamespace {
     Name: string;
     Enums: MsGraphEnum[];
     Models: MsGraphModel[];
-    EntityContainer: EntityContainer;
+    AgsAttributes: Record<string, string>;
+    Singletons: Singleton[];
+    EntitySets: EntitySet[];
     Operations: MsGraphOperation[];
+    EntitySetAnnotations: EntitySetAnnotations[];
+    SingletonAnnotations: SingletonAnnotations[];
 }
 export declare function GetMsGraphNamespaces(program: Program): MsGraphNamespace[];
 //# sourceMappingURL=namespace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAmB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAsB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAuB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAOzE"}
+{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAA6B,WAAW,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAoB,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAgC,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAwB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAoD,MAAM,kBAAkB,CAAC;AAGhI,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;CAC9C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAOzE"}

package/dist/src/entities/namespace.js

@@ -1,8 +1,10 @@
-import { getNamespaceName, isExcludedCoreType } from "../utils.js";
+import { getNamespaceName, getNavigationSources, isExcludedCoreType } from "../utils.js";
 import { GetMsGraphEnumTypeElement } from "./enum.js";
-import { GetMsGraphModel } from "./model.js";
-import { GetEntityContainer } from "./entity-container.js";
-import { GetMsGraphOperation } from "./operation.js";
+import { GetMsGraphModels } from "./model.js";
+import { GetEntitySets, GetSingletons } from "./entity-container.js";
+import { GetMsGraphOperations } from "./operation.js";
+import { GetEntitySetAnnotations, GetSingletonAnnotations } from "./annotations.js";
+import { buildAttributes } from "../index.js";
 export function GetMsGraphNamespaces(program) {
     const root = program.checker.getGlobalNamespaceType();
     const namespaces = expandNamespaces(root)
@@ -22,20 +24,25 @@ function hasChildren(type) {
     }
 }
 function getMsGraphNamespace(program, namespace) {
-    const models = [...namespace.models].map(([_, m]) => GetMsGraphModel(program, m));
+    const namespaceName = getNamespaceName(program, namespace);
+    const navigationSources = getNavigationSources(program, namespace);
+    const models = GetMsGraphModels(program, namespace.models);
     const enums = [...namespace.enums].map(([_, e]) => GetMsGraphEnumTypeElement(program, e));
-    const entityContainer = GetEntityContainer(program, namespace);
-    const operations = [...namespace.interfaces]
-        .filter(([_, $interface]) => $interface.operations.has("_isOperation"))
-        .flatMap(([_, $interface]) => [...$interface.operations])
-        .map(([_, operation]) => GetMsGraphOperation(program, operation))
-        .filter((o) => !!o);
+    const singletons = GetSingletons(program, navigationSources);
+    const entitySets = GetEntitySets(program, navigationSources);
+    const operations = GetMsGraphOperations(program, namespace.interfaces);
+    const entitySetAnnotations = GetEntitySetAnnotations(program, namespaceName, navigationSources);
+    const singletonAnnotations = GetSingletonAnnotations(program, namespaceName, navigationSources);
     return {
-        Name: getNamespaceName(program, namespace),
+        Name: namespaceName,
         Enums: enums,
         Models: models,
-        EntityContainer: entityContainer,
+        AgsAttributes: buildAttributes(program, namespace),
+        Singletons: singletons,
+        EntitySets: entitySets,
         Operations: operations,
+        EntitySetAnnotations: entitySetAnnotations,
+        SingletonAnnotations: singletonAnnotations,
     };
 }
 //# sourceMappingURL=namespace.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAe,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,eAAe,EAAgB,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAoB,MAAM,gBAAgB,CAAC;AAUvE,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAQ,CAAC,sBAAsB,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC;SACtC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;SACxF,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/D,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC7F;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,SAAoB;IACjE,MAAM,MAAM,GAAmB,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAgB,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/G,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;IAEzF,MAAM,eAAe,GAAoB,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAE/E,MAAM,UAAU,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC;SACzC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACtE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;SACxD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;SAChE,MAAM,CAAC,CAAC,CAAC,EAAyB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,OAAO;QACL,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;QAC1C,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,MAAM;QACd,eAAe,EAAE,eAAe;QAChC,UAAU,EAAE,UAAU;KACvB,CAAA;AACH,CAAC"}
+{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/entities/namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAe,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAgB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAoB,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAA8C,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAChI,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAc9C,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAQ,CAAC,sBAAsB,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC;SACtC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;SACxF,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/D,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,WAAW,CAAC,IAAU;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC7F;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,SAAoB;IACjE,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEnE,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1F,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAEvE,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAChG,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAEhG,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC;QAClD,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,UAAU;QACtB,oBAAoB,EAAE,oBAAoB;QAC1C,oBAAoB,EAAE,oBAAoB;KAC3C,CAAC;AACJ,CAAC"}