gd-sprest-def 1.3.6 → 1.3.7

package/lib/Microsoft/Graph/entityTypes.d.ts

@@ -12,14 +12,20 @@ export interface drive  {
 	quota: ComplexTypes.quota;
 	sharePointIds: ComplexTypes.sharepointIds;
 	system: ComplexTypes.system;
-	activities: () => IBaseExecution<activityEntity[]>;
-	activitycounts: () => IBaseExecution<itemActivityStatEntity[]>;
-	apps: () => IBaseExecution<driveApp[]>;
+	activities: () => IBaseExecution<activityEntityCollection>;
+	activitycounts: () => IBaseExecution<itemActivityStatEntityCollection>;
+	apps: () => IBaseExecution<driveAppCollection>;
 	commands: () => IBaseExecution<ComplexTypes.command[]>;
-	items: () => IBaseExecution<item[]>;
+	items: () => IBaseExecution<itemCollection>;
 	list: () => IBaseExecution<list>;
-	special: () => IBaseExecution<item[]>;
-	trackedItems: () => IBaseExecution<item[]>;
+	special: () => IBaseExecution<itemCollection>;
+	trackedItems: () => IBaseExecution<itemCollection>;
+}
+/*********************************************
+* drive
+**********************************************/
+export interface driveCollection {
+    results: drive[];
 }
 /*********************************************
 * share
@@ -70,16 +76,22 @@ export interface item  {
 	formats: ComplexTypes.formats;
 	media: ComplexTypes.media;
 	source: ComplexTypes.driveItemSource;
-	permissions: () => IBaseExecution<permission[]>;
-	children: () => IBaseExecution<item[]>;
-	subscriptions: () => IBaseExecution<subscription[]>;
-	thumbnails: () => IBaseExecution<thumbnailSet[]>;
-	activities: () => IBaseExecution<activityEntity[]>;
+	permissions: () => IBaseExecution<permissionCollection>;
+	children: () => IBaseExecution<itemCollection>;
+	subscriptions: () => IBaseExecution<subscriptionCollection>;
+	thumbnails: () => IBaseExecution<thumbnailSetCollection>;
+	activities: () => IBaseExecution<activityEntityCollection>;
 	analytics: () => IBaseExecution<analytics>;
 	commands: () => IBaseExecution<ComplexTypes.command[]>;
 	featureStatus: () => IBaseExecution<featureStatus>;
 	listItem: () => IBaseExecution<listItem>;
-	versions: () => IBaseExecution<driveItemVersion[]>;
+	versions: () => IBaseExecution<driveItemVersionCollection>;
+}
+/*********************************************
+* item
+**********************************************/
+export interface itemCollection {
+    results: item[];
 }
 /*********************************************
 * permission
@@ -96,6 +108,12 @@ export interface permission  {
 
 }
 /*********************************************
+* permission
+**********************************************/
+export interface permissionCollection {
+    results: permission[];
+}
+/*********************************************
 * subscription
 **********************************************/
 export interface subscription  {
@@ -108,6 +126,12 @@ export interface subscription  {
 
 }
 /*********************************************
+* subscription
+**********************************************/
+export interface subscriptionCollection {
+    results: subscription[];
+}
+/*********************************************
 * thumbnailSet
 **********************************************/
 export interface thumbnailSet  {
@@ -118,6 +142,12 @@ export interface thumbnailSet  {
 
 }
 /*********************************************
+* thumbnailSet
+**********************************************/
+export interface thumbnailSetCollection {
+    results: thumbnailSet[];
+}
+/*********************************************
 * activityEntity
 **********************************************/
 export interface activityEntity  {
@@ -131,6 +161,12 @@ export interface activityEntity  {
 	listItem: () => IBaseExecution<listItem>;
 }
 /*********************************************
+* activityEntity
+**********************************************/
+export interface activityEntityCollection {
+    results: activityEntity[];
+}
+/*********************************************
 * analytics
 **********************************************/
 export interface analytics  {
@@ -161,11 +197,17 @@ export interface featureStatus  {
 export interface listItem extends baseItem {
 	contentType: ComplexTypes.contentTypeFacet;
 	sharepointIds: ComplexTypes.sharepointIds;
-	activities: () => IBaseExecution<activityEntity[]>;
+	activities: () => IBaseExecution<activityEntityCollection>;
 	analytics: () => IBaseExecution<analytics>;
 	driveItem: () => IBaseExecution<item>;
 	fields: () => IBaseExecution<fieldValueSet>;
-	versions: () => IBaseExecution<listItemVersion[]>;
+	versions: () => IBaseExecution<listItemVersionCollection>;
+}
+/*********************************************
+* listItem
+**********************************************/
+export interface listItemCollection {
+    results: listItem[];
 }
 /*********************************************
 * fieldValueSet
@@ -192,11 +234,23 @@ export interface listItemVersion extends baseItemVersion {
 	fields: () => IBaseExecution<fieldValueSet>;
 }
 /*********************************************
+* listItemVersion
+**********************************************/
+export interface listItemVersionCollection {
+    results: listItemVersion[];
+}
+/*********************************************
 * driveItemVersion
 **********************************************/
 export interface driveItemVersion extends baseItemVersion {
 	size: number;
-	streams: () => IBaseExecution<stream[]>;
+	streams: () => IBaseExecution<streamCollection>;
+}
+/*********************************************
+* driveItemVersion
+**********************************************/
+export interface driveItemVersionCollection {
+    results: driveItemVersion[];
 }
 /*********************************************
 * stream
@@ -209,6 +263,12 @@ export interface stream  {
 
 }
 /*********************************************
+* stream
+**********************************************/
+export interface streamCollection {
+    results: stream[];
+}
+/*********************************************
 * columnDefinition
 **********************************************/
 export interface columnDefinition  {
@@ -236,6 +296,12 @@ export interface columnDefinition  {
 
 }
 /*********************************************
+* columnDefinition
+**********************************************/
+export interface columnDefinitionCollection {
+    results: columnDefinition[];
+}
+/*********************************************
 * contentType
 **********************************************/
 export interface contentType  {
@@ -249,7 +315,13 @@ export interface contentType  {
 	parentId: string;
 	readOnly: boolean;
 	sealed: boolean;
-	columnLinks: () => IBaseExecution<columnLink[]>;
+	columnLinks: () => IBaseExecution<columnLinkCollection>;
+}
+/*********************************************
+* contentType
+**********************************************/
+export interface contentTypeCollection {
+    results: contentType[];
 }
 /*********************************************
 * columnLink
@@ -260,6 +332,12 @@ export interface columnLink  {
 
 }
 /*********************************************
+* columnLink
+**********************************************/
+export interface columnLinkCollection {
+    results: columnLink[];
+}
+/*********************************************
 * itemActivityStatEntity
 **********************************************/
 export interface itemActivityStatEntity  {
@@ -269,13 +347,25 @@ export interface itemActivityStatEntity  {
 
 }
 /*********************************************
+* itemActivityStatEntity
+**********************************************/
+export interface itemActivityStatEntityCollection {
+    results: itemActivityStatEntity[];
+}
+/*********************************************
 * driveApp
 **********************************************/
 export interface driveApp  {
 	application: ComplexTypes.identity;
 	fileHandler: ComplexTypes.fileHandler;
 	id: string;
-	actions: () => IBaseExecution<driveAppAction[]>;
+	actions: () => IBaseExecution<driveAppActionCollection>;
+}
+/*********************************************
+* driveApp
+**********************************************/
+export interface driveAppCollection {
+    results: driveApp[];
 }
 /*********************************************
 * driveAppAction
@@ -290,6 +380,12 @@ export interface driveAppAction  {
 
 }
 /*********************************************
+* driveAppAction
+**********************************************/
+export interface driveAppActionCollection {
+    results: driveAppAction[];
+}
+/*********************************************
 * list
 **********************************************/
 export interface list extends baseItem {
@@ -297,11 +393,17 @@ export interface list extends baseItem {
 	list: ComplexTypes.listInfo;
 	sharepointIds: ComplexTypes.sharepointIds;
 	system: ComplexTypes.system;
-	activities: () => IBaseExecution<activityEntity[]>;
-	columns: () => IBaseExecution<columnDefinition[]>;
-	contentTypes: () => IBaseExecution<contentType[]>;
+	activities: () => IBaseExecution<activityEntityCollection>;
+	columns: () => IBaseExecution<columnDefinitionCollection>;
+	contentTypes: () => IBaseExecution<contentTypeCollection>;
 	drive: () => IBaseExecution<drive>;
-	items: () => IBaseExecution<listItem[]>;
+	items: () => IBaseExecution<listItemCollection>;
+}
+/*********************************************
+* list
+**********************************************/
+export interface listCollection {
+    results: list[];
 }
 /*********************************************
 * baseItem
@@ -320,6 +422,12 @@ export interface baseItem  {
 
 }
 /*********************************************
+* baseItem
+**********************************************/
+export interface baseItemCollection {
+    results: baseItem[];
+}
+/*********************************************
 * site
 **********************************************/
 export interface site extends baseItem {
@@ -328,13 +436,19 @@ export interface site extends baseItem {
 	siteCollection: ComplexTypes.siteCollection;
 	title: string;
 	analytics: () => IBaseExecution<analytics>;
-	columns: () => IBaseExecution<columnDefinition[]>;
-	contentTypes: () => IBaseExecution<contentType[]>;
+	columns: () => IBaseExecution<columnDefinitionCollection>;
+	contentTypes: () => IBaseExecution<contentTypeCollection>;
 	drive: () => IBaseExecution<drive>;
-	drives: () => IBaseExecution<drive[]>;
-	items: () => IBaseExecution<baseItem[]>;
-	lists: () => IBaseExecution<list[]>;
-	sites: () => IBaseExecution<site[]>;
+	drives: () => IBaseExecution<driveCollection>;
+	items: () => IBaseExecution<baseItemCollection>;
+	lists: () => IBaseExecution<listCollection>;
+	sites: () => IBaseExecution<siteCollection>;
+}
+/*********************************************
+* site
+**********************************************/
+export interface siteCollection {
+    results: site[];
 }
 /*********************************************
 * sharePoint
@@ -342,5 +456,5 @@ export interface site extends baseItem {
 export interface sharePoint  {
 
 	site: () => IBaseExecution<site>;
-	sites: () => IBaseExecution<site[]>;
+	sites: () => IBaseExecution<siteCollection>;
 }

package/main.js

@@ -289,6 +289,7 @@ function updateReferences(fileImports, dirName, type) {
 
 // Process the Graph metadata
 function processGraph(schemas) {
+    let collections = {};
     let complexTypes = {};
     let endPoints = {};
     let enums = {};
@@ -409,6 +410,13 @@ function processGraph(schemas) {
 
                         // Add the method
                         methods.push({ name, returnType });
+
+                        // See if this is a collection
+                        if (returnType.startsWith("Collection(")) {
+                            let collectionType = returnType.replace("Collection(", "").replace(")", "");
+                            collectionType = collectionType.split('.')[1];
+                            collections[collectionType] = returnType;
+                        }
                     }
 
                     // Add the entity type
@@ -501,7 +509,7 @@ function processGraph(schemas) {
     }
 
     // Method to get the type
-    let getGraphType = (returnType = "") => {
+    let getGraphType = (returnType = "", isMethod = false) => {
         // See if the return type is in not an Edm
         if (returnType.indexOf("graph." == 0)) {
             // Set the return type information
@@ -557,8 +565,10 @@ function processGraph(schemas) {
                 returnType = "ComplexTypes.columnDefinition[]";
             }
 
-            // Update the collection
-            isCollection ? returnType += "[]" : null;
+            // See if this is a collection
+            if (isCollection) {
+                returnType += isMethod ? "Collection" : "[]";
+            }
         }
 
         // Return the type
@@ -662,7 +672,7 @@ ${props.join('\n')}
         let methods = [];
         for (let method of entity.methods) {
             // Add the method
-            methods.push("\t" + method.name + ": () => IBaseExecution<" + getGraphType(method.returnType) + ">;");
+            methods.push("\t" + method.name + ": () => IBaseExecution<" + getGraphType(method.returnType, true) + ">;");
         }
 
         // Add the endpoint
@@ -673,6 +683,16 @@ export interface ${name} ${entity.returnType ? "extends " + entity.returnType :
 ${props.join('\n')}
 ${methods.join('\n')}
 }`);
+
+        // See if there is a collection required for this
+        if(collections[name]) {
+            content.push(`/*********************************************
+* ${name}
+**********************************************/
+export interface ${name}Collection {
+    results: ${name}[];
+}`);
+        }
     }
     fs.writeFileSync("lib/microsoft/graph/entityTypes.d.ts", content.join('\n').replace(/EntityTypes./g, ""));
 }
@@ -1128,10 +1148,6 @@ function processREST(schemas) {
                     // Update the references
                     updateReferences(fileImports, dirName, type);
 
-                    if (propName == "Cells") {
-                        console.log(propName);
-                        console.log(type);
-                    }
                     // See if this type is a collection and this is the complex or entity types
                     if ((filename == "ComplexTypes" || filename == "EntityTypes") && /^Array\<.*\>$/.test(type)) {
                         // Ensure it's a results type

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gd-sprest-def",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "description": "TypeScript definition files generated from the $metadata REST endpoint in SharePoint.",
     "author": "Gunjan Datta <me@dattabase.com> (https://gunjandatta.github.io)",
     "license": "MIT",