gd-sprest-def 1.2.9 → 1.3.1

package/custom.js

@@ -2,17 +2,6 @@
  * Custom Methods
  */
 module.exports = {
-    // Search
-    "Microsoft.Office.Server.Search.REST.SearchService": [
-        {
-            name: "searchquery",
-            returnType: "Microsoft.Office.Server.Search.REST.SearchResult",
-            params: [
-                { $: { Name: "request", Type: "Microsoft.Office.Server.Search.REST.SearchRequest" } }
-            ]
-        }
-    ],
-
     // Attachments
     "Collection(SP.Attachment)": [
         {
@@ -392,6 +381,24 @@ module.exports = {
         }
     ],
 
+    // Search
+    "Microsoft.Office.Server.Search.REST.SearchService": [
+        {
+            name: "searchquery",
+            returnType: "{ query: Microsoft.Office.Server.Search.REST.SearchResult }",
+            params: [
+                { $: { Name: "request", Type: "Microsoft.Office.Server.Search.REST.SearchRequest" } }
+            ]
+        },
+        {
+            name: "postquery",
+            returnType: "{ postquery: Microsoft.Office.Server.Search.REST.SearchResult }",
+            params: [
+                { $: { Name: "request", Type: "Microsoft.Office.Server.Search.REST.SearchRequest" } }
+            ]
+        }
+    ],
+
     // Site
     "SP.Site": [
         {

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

@@ -1,5 +1,5 @@
 import { IBaseExecution } from "../../base";
-import * as EntityTypes from "./entityTypes.d"
+import * as EntityTypes from "./entityTypes.d";
 
 /*********************************************
 * invitations
@@ -198,8 +198,8 @@ export interface shares extends IBaseExecution<EntityTypes.sharedDriveItem> {
 export interface sites extends IBaseExecution<EntityTypes.site> {
 	parentTerm: () => IBaseExecution<EntityTypes.term[]>;
 	termSet: () => IBaseExecution<EntityTypes.set[]>;
-	sharedColumns: () => IBaseExecution<columns>;
-	welcomePageColumns: () => IBaseExecution<columns>;
+	sharedColumns: () => IBaseExecution<ComplexTypes.columnDefinition[]>;
+	welcomePageColumns: () => IBaseExecution<ComplexTypes.columnDefinition[]>;
 }
 /*********************************************
 * schemaExtensions

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/lib/Microsoft/Office/Server/Search/REST/entitytypes.d.ts

@@ -72,13 +72,14 @@ export interface SearchServiceMethods {
 	export(userName?: string, startTime?: any): Base.IBaseExecution<string>;
 	exportmanualsuggestions(): Base.IBaseExecution<Microsoft.SharePoint.Client.Search.Query.TenantCustomQuerySuggestions>;
 	exportpopulartenantqueries(count?: number): Base.IBaseCollection<Microsoft.SharePoint.Client.Search.Query.PopularTenantQuery>;
-	postquery(request?: Microsoft.Office.Server.Search.REST.SearchRequest): Base.IBaseExecution<Microsoft.Office.Server.Search.REST.SearchResult>;
+	// postquery(request?: Microsoft.Office.Server.Search.REST.SearchRequest): Base.IBaseExecution<Microsoft.Office.Server.Search.REST.SearchResult>;
 	query(querytext?: string, queryTemplate?: string, enableInterleaving?: boolean, sourceId?: any, rankingModelId?: string, startRow?: number, rowLimit?: number, rowsPerPage?: number, selectProperties?: string, culture?: number, refinementFilters?: string, refiners?: string, hiddenConstraints?: string, sortList?: string, enableStemming?: boolean, trimDuplicates?: boolean, timeout?: number, enableNicknames?: boolean, enablePhonetic?: boolean, enableFQL?: boolean, hitHighlightedProperties?: string, propertiesToGenerateAcronyms?: string, bypassResultTypes?: boolean, processBestBets?: boolean, clientType?: string, personalizationData?: any, resultsUrl?: string, queryTag?: string, trimDuplicatesIncludeId?: number, totalRowsExactMinimum?: number, impressionId?: string, properties?: string, enableQueryRules?: boolean, summaryLength?: number, maxSnippetLength?: number, desiredSnippetLength?: number, uiLanguage?: number, blockDedupeMode?: number, generateBlockRankLog?: boolean, enableSorting?: boolean, collapseSpecification?: string, processPersonalFavorites?: boolean, enableOrderingHitHighlightedProperty?: boolean, hitHighlightedMultivaluePropertyLimit?: number, queryTemplatePropertiesUrl?: string, timeZoneId?: number, useOLSQuery?: number, OLSQuerySession?: string): Base.IBaseExecution<Microsoft.Office.Server.Search.REST.SearchResult>;
 	recordPageClick(pageInfo?: string, clickType?: string, blockType?: number, clickedResultId?: string, subResultIndex?: number, immediacySourceId?: string, immediacyQueryString?: string, immediacyTitle?: string, immediacyUrl?: string): Base.IBaseExecution<any>;
 	resultspageaddress(): Base.IBaseExecution<string>;
 	searchcenterurl(): Base.IBaseExecution<string>;
 	suggest(querytext?: string, iNumberOfQuerySuggestions?: number, iNumberOfResultSuggestions?: number, iNumberOfPopularResultSuggestions?: number, fPreQuerySuggestions?: boolean, fHitHighlighting?: boolean, fCapitalizeFirstLetters?: boolean, culture?: number, enableStemming?: boolean, showPeopleNameSuggestions?: boolean, enableQueryRules?: boolean, fPrefixMatchAllTerms?: boolean, sourceId?: string, clientType?: string, useOLSQuery?: number, OLSQuerySession?: string, zeroTermSuggestions?: boolean): Base.IBaseExecution<Microsoft.SharePoint.Client.Search.Query.QuerySuggestionResults>;
-	searchquery(request?: Microsoft.Office.Server.Search.REST.SearchRequest): Base.IBaseExecution<Microsoft.Office.Server.Search.REST.SearchResult>;
+	searchquery(request?: Microsoft.Office.Server.Search.REST.SearchRequest): Base.IBaseExecution<{ query: Microsoft.Office.Server.Search.REST.SearchResult }>;
+	postquery(request?: Microsoft.Office.Server.Search.REST.SearchRequest): Base.IBaseExecution<{ postquery: Microsoft.Office.Server.Search.REST.SearchResult }>;
 }
 
 /*********************************************

package/main.js

@@ -264,7 +264,7 @@ function getType(type = "any", enumInterfaces) {
 // Method to update the references
 function updateReferences(fileImports, dirName, type) {
     // See if the type requires an import
-    if (type && type.indexOf('.') > 0) {
+    if (!type.startsWith('{') && type && type.indexOf('.') > 0) {
         // Get the last index of it
         let refType = type.replace(/^Array\<|\>$/g, '');
         refType = refType.substring(0, refType.lastIndexOf('.'));
@@ -541,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;
@@ -556,7 +564,7 @@ function processGraph(schemas) {
     // Create the endpoints
     let content = [
         "import { IBaseExecution } from \"../../base\";",
-        "import * as EntityTypes from \"./entityTypes.d\"\n"
+        "import * as EntityTypes from \"./entityTypes.d\";\n"
     ];
     for (let name in endPoints) {
         let endPoint = endPoints[name];
@@ -585,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

package/package.json

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

package/pnpm-lock.yaml

@@ -0,0 +1,97 @@
+devDependencies:
+  rimraf: 2.7.1
+  xml2js: 0.4.23
+lockfileVersion: 5.2
+packages:
+  /balanced-match/1.0.2:
+    dev: true
+    resolution:
+      integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+  /brace-expansion/1.1.11:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+    dev: true
+    resolution:
+      integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  /concat-map/0.0.1:
+    dev: true
+    resolution:
+      integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  /fs.realpath/1.0.0:
+    dev: true
+    resolution:
+      integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  /glob/7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+    dev: true
+    resolution:
+      integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  /inflight/1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+    dev: true
+    resolution:
+      integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  /inherits/2.0.4:
+    dev: true
+    resolution:
+      integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+  /minimatch/3.1.2:
+    dependencies:
+      brace-expansion: 1.1.11
+    dev: true
+    resolution:
+      integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  /once/1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+    dev: true
+    resolution:
+      integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  /path-is-absolute/1.0.1:
+    dev: true
+    engines:
+      node: '>=0.10.0'
+    resolution:
+      integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  /rimraf/2.7.1:
+    dependencies:
+      glob: 7.2.3
+    dev: true
+    hasBin: true
+    resolution:
+      integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  /sax/1.2.4:
+    dev: true
+    resolution:
+      integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  /wrappy/1.0.2:
+    dev: true
+    resolution:
+      integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  /xml2js/0.4.23:
+    dependencies:
+      sax: 1.2.4
+      xmlbuilder: 11.0.1
+    dev: true
+    engines:
+      node: '>=4.0.0'
+    resolution:
+      integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  /xmlbuilder/11.0.1:
+    dev: true
+    engines:
+      node: '>=4.0'
+    resolution:
+      integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+specifiers:
+  rimraf: ^2.6.2
+  xml2js: ^0.4.19