gd-sprest-def 1.2.8 → 1.3.0

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

@@ -1,22 +1,24 @@
 import { IBaseExecution } from "../../base";
+import * as EntityTypes from "./entityTypes.d";
+
 /*********************************************
 * invitations
 **********************************************/
 export interface invitations extends IBaseExecution<EntityTypes.invitation> {
-	invitedUser: () => IBaseExecution<users>;
+	invitedUser: () => IBaseExecution<EntityTypes.user[]>;
 }
 /*********************************************
 * users
 **********************************************/
 export interface users extends IBaseExecution<EntityTypes.user> {
-	createdObjects: () => IBaseExecution<directoryObjects>;
-	directReports: () => IBaseExecution<directoryObjects>;
-	manager: () => IBaseExecution<directoryObjects>;
-	memberOf: () => IBaseExecution<directoryObjects>;
-	ownedDevices: () => IBaseExecution<directoryObjects>;
-	ownedObjects: () => IBaseExecution<directoryObjects>;
-	registeredDevices: () => IBaseExecution<directoryObjects>;
-	transitiveMemberOf: () => IBaseExecution<directoryObjects>;
+	createdObjects: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	directReports: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	manager: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	memberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	ownedDevices: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	ownedObjects: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	registeredDevices: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMemberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * applicationTemplates
@@ -40,8 +42,8 @@ export interface identityProviders extends IBaseExecution<EntityTypes.identityPr
 * applications
 **********************************************/
 export interface applications extends IBaseExecution<EntityTypes.application> {
-	createdOnBehalfOf: () => IBaseExecution<directoryObjects>;
-	owners: () => IBaseExecution<directoryObjects>;
+	createdOnBehalfOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	owners: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * certificateBasedAuthConfiguration
@@ -53,10 +55,10 @@ export interface certificateBasedAuthConfiguration extends IBaseExecution<Entity
 * contacts
 **********************************************/
 export interface contacts extends IBaseExecution<EntityTypes.orgContact> {
-	directReports: () => IBaseExecution<directoryObjects>;
-	manager: () => IBaseExecution<directoryObjects>;
-	memberOf: () => IBaseExecution<directoryObjects>;
-	transitiveMemberOf: () => IBaseExecution<directoryObjects>;
+	directReports: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	manager: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	memberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMemberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * contracts
@@ -68,9 +70,9 @@ export interface contracts extends IBaseExecution<EntityTypes.contract> {
 * devices
 **********************************************/
 export interface devices extends IBaseExecution<EntityTypes.device> {
-	registeredOwners: () => IBaseExecution<directoryObjects>;
-	registeredUsers: () => IBaseExecution<directoryObjects>;
-	transitiveMemberOf: () => IBaseExecution<directoryObjects>;
+	registeredOwners: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	registeredUsers: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMemberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * directoryObjects
@@ -82,7 +84,7 @@ export interface directoryObjects extends IBaseExecution<EntityTypes.directoryOb
 * directoryRoles
 **********************************************/
 export interface directoryRoles extends IBaseExecution<EntityTypes.directoryRole> {
-	members: () => IBaseExecution<directoryObjects>;
+	members: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * directoryRoleTemplates
@@ -100,18 +102,18 @@ export interface domainDnsRecords extends IBaseExecution<EntityTypes.domainDnsRe
 * domains
 **********************************************/
 export interface domains extends IBaseExecution<EntityTypes.domain> {
-	domainNameReferences: () => IBaseExecution<directoryObjects>;
+	domainNameReferences: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * groups
 **********************************************/
 export interface groups extends IBaseExecution<EntityTypes.group> {
-	createdOnBehalfOf: () => IBaseExecution<directoryObjects>;
-	memberOf: () => IBaseExecution<directoryObjects>;
-	members: () => IBaseExecution<directoryObjects>;
-	owners: () => IBaseExecution<directoryObjects>;
-	transitiveMemberOf: () => IBaseExecution<directoryObjects>;
-	transitiveMembers: () => IBaseExecution<directoryObjects>;
+	createdOnBehalfOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	memberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	members: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	owners: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMemberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMembers: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * groupSettings
@@ -159,12 +161,12 @@ export interface scopedRoleMemberships extends IBaseExecution<EntityTypes.scoped
 * servicePrincipals
 **********************************************/
 export interface servicePrincipals extends IBaseExecution<EntityTypes.servicePrincipal> {
-	createdObjects: () => IBaseExecution<directoryObjects>;
-	memberOf: () => IBaseExecution<directoryObjects>;
+	createdObjects: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	memberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
 	oauth2PermissionGrants: () => IBaseExecution<oauth2PermissionGrants>;
-	ownedObjects: () => IBaseExecution<directoryObjects>;
-	owners: () => IBaseExecution<directoryObjects>;
-	transitiveMemberOf: () => IBaseExecution<directoryObjects>;
+	ownedObjects: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	owners: () => IBaseExecution<EntityTypes.directoryObject[]>;
+	transitiveMemberOf: () => IBaseExecution<EntityTypes.directoryObject[]>;
 }
 /*********************************************
 * subscribedSkus
@@ -194,10 +196,10 @@ export interface shares extends IBaseExecution<EntityTypes.sharedDriveItem> {
 * sites
 **********************************************/
 export interface sites extends IBaseExecution<EntityTypes.site> {
-	parentTerm: () => IBaseExecution<terms>;
-	termSet: () => IBaseExecution<sets>;
-	sharedColumns: () => IBaseExecution<columns>;
-	welcomePageColumns: () => IBaseExecution<columns>;
+	parentTerm: () => IBaseExecution<EntityTypes.term[]>;
+	termSet: () => IBaseExecution<EntityTypes.set[]>;
+	sharedColumns: () => IBaseExecution<ComplexTypes.columnDefinition[]>;
+	welcomePageColumns: () => IBaseExecution<ComplexTypes.columnDefinition[]>;
 }
 /*********************************************
 * schemaExtensions
@@ -251,8 +253,8 @@ export interface chats extends IBaseExecution<EntityTypes.chat> {
 * teams
 **********************************************/
 export interface teams extends IBaseExecution<EntityTypes.team> {
-	group: () => IBaseExecution<groups>;
-	template: () => IBaseExecution<teamsTemplates>;
+	group: () => IBaseExecution<EntityTypes.group[]>;
+	template: () => IBaseExecution<EntityTypes.teamsTemplate[]>;
 }
 /*********************************************
 * teamsTemplates

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

@@ -1,4 +1,5 @@
-export * as API from "./api";
-export * as ComplexTypes from "./complexTypes";
-export * from "./entityTypes";
-export * as Enums from "./enumTypes";
+import * as API from "./api";
+import * as ComplexTypes from "./complexTypes";
+import * as Enums from "./enumTypes";
+export { API, ComplexTypes, Enums }
+export * from "./entityTypes";

package/main.js

@@ -74,8 +74,8 @@ function applyMethodsToDirectories(methods, directories) {
         let idx = name.lastIndexOf('.');
 
         // Set the lib and obj name
-        let lib = name.substr(0, idx);
-        let obj = name.substr(idx + 1);
+        let lib = name.substring(0, idx);
+        let obj = name.substring(idx + 1);
 
         // See if a file name exists for this object
         if (directories[lib] && directories[lib].EntityTypes && directories[lib].EntityTypes[obj]) {
@@ -267,7 +267,7 @@ function updateReferences(fileImports, dirName, type) {
     if (type && type.indexOf('.') > 0) {
         // Get the last index of it
         let refType = type.replace(/^Array\<|\>$/g, '');
-        refType = refType.substr(0, refType.lastIndexOf('.'));
+        refType = refType.substring(0, refType.lastIndexOf('.'));
 
         // Set the root namespace
         let root = refType.split('.')[0];
@@ -400,7 +400,6 @@ function processGraph(schemas) {
                             returnType = returnTypeInfo[returnTypeInfo.length - 1];
                         }
 
-
                         // Add the method
                         methods.push({ name, returnType });
                     }
@@ -507,7 +506,7 @@ function processGraph(schemas) {
             let name2 = null;
             if (!isCollection && name[name.length - 1] == "s") {
                 // Set the name
-                name2 = name.substring(name.length - 1);
+                name2 = name.substring(0, name.length - 1);
             }
 
             // See if it's a complex type
@@ -542,6 +541,14 @@ function processGraph(schemas) {
             else if (info[0] == "Edm") {
                 returnType = getType(returnType);
             }
+            // Else, see if this is a column
+            else if (name == "column") {
+                returnType = "ComplexTypes.columnDefinition";
+            }
+            // Else, see if this is a column array
+            else if (name == "columns") {
+                returnType = "ComplexTypes.columnDefinition[]";
+            }
 
             // Update the collection
             isCollection ? returnType += "[]" : null;
@@ -555,7 +562,10 @@ function processGraph(schemas) {
     if (fs.existsSync("lib/microsoft/Graph") == false) { fs.mkdirSync("lib/microsoft/Graph"); }
 
     // Create the endpoints
-    let content = ["import { IBaseExecution } from \"../../base\";"];
+    let content = [
+        "import { IBaseExecution } from \"../../base\";",
+        "import * as EntityTypes from \"./entityTypes.d\";\n"
+    ];
     for (let name in endPoints) {
         let endPoint = endPoints[name];
 
@@ -583,10 +593,11 @@ ${methods.join('\n')}
 
     // Append the export of the enums
     fs.appendFileSync("lib/microsoft/graph/index.d.ts", [
-        'export * as API from "./api";',
-        'export * as ComplexTypes from "./complexTypes";',
+        'import * as API from "./api";',
+        'import * as ComplexTypes from "./complexTypes";',
+        'import * as Enums from "./enumTypes";',
+        'export { API, ComplexTypes, Enums }',
         'export * from "./entityTypes";',
-        'export * as Enums from "./enumTypes";'
     ].join('\n'));
 
     // Append the graph endpoint
@@ -889,7 +900,7 @@ function processREST(schemas) {
                     else if (hasMethods[endpoint.ReturnType]) {
                         // Update the return type
                         let idx = endpoint.ReturnType.lastIndexOf('.');
-                        endpoint.ReturnType = endpoint.ReturnType.substr(0, idx) + '.I' + endpoint.ReturnType.substr(idx + 1);
+                        endpoint.ReturnType = endpoint.ReturnType.substring(0, idx) + '.I' + endpoint.ReturnType.substring(idx + 1);
                     }
 
                     // Update the imports

package/package.json

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