@pnp/spfx-controls-react 4.0.0-beta.6059083 → 4.0.0-beta.6059091

package/lib/services/PeopleSearchService.js

@@ -36,12 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { SPHttpClient } from '@microsoft/sp-http';
 import { findIndex } from "@microsoft/sp-lodash-subset";
-import { sp } from '@pnp/sp';
 import "@pnp/sp/site-users/web";
 import "@pnp/sp/sputilities";
 import "@pnp/sp/webs";
 import { Web } from "@pnp/sp/webs";
 import { PrincipalType } from "../PeoplePicker";
+import { getSP } from '../common/utilities/PnPJSConfig';
 /**
  * Service implementation to search people in SharePoint
  */
@@ -55,7 +55,7 @@ var SPPeopleSearchService = /** @class */ (function () {
         this.cachedLocalUsers = {};
         this.cachedLocalUsers[this.context.pageContext.web.absoluteUrl] = [];
         // Setup PnPjs
-        sp.setup({ pageContext: this.context.pageContext });
+        this._sp = getSP(this.context);
     }
     /**
      * Generate the user photo link using SharePoint user photo endpoint.
@@ -186,12 +186,12 @@ var SPPeopleSearchService = /** @class */ (function () {
      */
     SPPeopleSearchService.prototype.searchTenant = function (siteUrl, query, maximumSuggestions, principalTypes, ensureUser, allowUnvalidated, groupId) {
         return __awaiter(this, void 0, void 0, function () {
-            var userRequestUrl, searchBody, graphUserRequestUrl, graphClient, graphUserResponse, _users_2, batch, _i, _a, value, userResult, _b, _users_1, user, httpPostOptions, data, userDataResp, values, _c, values_1, value, id, userResults, e_1;
+            var userRequestUrl, searchBody, graphUserRequestUrl, graphClient, graphUserResponse, _users_2, _a, batch, execute, _i, _b, value, userResult, _c, _users_1, user, httpPostOptions, data, userDataResp, values, _d, values_1, value, id, userResults, e_1;
             var _this = this;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _d.trys.push([0, 14, , 15]);
+                        _e.trys.push([0, 14, , 15]);
                         userRequestUrl = "".concat(siteUrl || this.context.pageContext.web.absoluteUrl, "/_api/SP.UI.ApplicationPages.ClientPeoplePickerWebServiceInterface.clientPeoplePickerSearchUser");
                         searchBody = {
                             queryParams: {
@@ -216,25 +216,25 @@ var SPPeopleSearchService = /** @class */ (function () {
                         graphUserRequestUrl = "/groups/".concat(groupId, "/transitiveMembers?$count=true&$search=\"userPrincipalName:").concat(query, "\" OR \"displayName:").concat(query, "\" OR \"mail:").concat(query, "\"");
                         return [4 /*yield*/, this.context.msGraphClientFactory.getClient("3")];
                     case 2:
-                        graphClient = _d.sent();
+                        graphClient = _e.sent();
                         return [4 /*yield*/, graphClient.api(graphUserRequestUrl).header('ConsistencyLevel', 'eventual').get()];
                     case 3:
-                        graphUserResponse = _d.sent();
+                        graphUserResponse = _e.sent();
                         if (!(graphUserResponse.value && graphUserResponse.value.length > 0)) return [3 /*break*/, 5];
                         _users_2 = [];
-                        batch = Web(this.context.pageContext.web.absoluteUrl).createBatch();
-                        for (_i = 0, _a = graphUserResponse.value; _i < _a.length; _i++) {
-                            value = _a[_i];
-                            sp.web.inBatch(batch).ensureUser(value.userPrincipalName).then(function (u) { return _users_2.push(u.data); }).catch(function () {
+                        _a = Web(this.context.pageContext.web.absoluteUrl).batched(), batch = _a[0], execute = _a[1];
+                        for (_i = 0, _b = graphUserResponse.value; _i < _b.length; _i++) {
+                            value = _b[_i];
+                            batch.ensureUser(value.userPrincipalName).then(function (u) { return _users_2.push(u.data); }).catch(function () {
                                 // no-op
                             });
                         }
-                        return [4 /*yield*/, batch.execute()];
+                        return [4 /*yield*/, execute()];
                     case 4:
-                        _d.sent();
+                        _e.sent();
                         userResult = [];
-                        for (_b = 0, _users_1 = _users_2; _b < _users_1.length; _b++) {
-                            user = _users_1[_b];
+                        for (_c = 0, _users_1 = _users_2; _c < _users_1.length; _c++) {
+                            user = _users_1[_c];
                             userResult.push({
                                 id: ensureUser ? user.Id : user.LoginName,
                                 loginName: user.LoginName,
@@ -260,11 +260,11 @@ var SPPeopleSearchService = /** @class */ (function () {
                         };
                         return [4 /*yield*/, this.context.spHttpClient.post(userRequestUrl, SPHttpClient.configurations.v1, httpPostOptions)];
                     case 7:
-                        data = _d.sent();
+                        data = _e.sent();
                         if (!data.ok) return [3 /*break*/, 13];
                         return [4 /*yield*/, data.json()];
                     case 8:
-                        userDataResp = _d.sent();
+                        userDataResp = _e.sent();
                         if (!(userDataResp && userDataResp.value && userDataResp.value.length > 0)) return [3 /*break*/, 13];
                         values = userDataResp.value;
                         if (typeof userDataResp.value === "string") {
@@ -275,20 +275,20 @@ var SPPeopleSearchService = /** @class */ (function () {
                             values = values.filter(function (v) { return !(v.EntityData && v.EntityData.PrincipalType && v.EntityData.PrincipalType === "UNVALIDATED_EMAIL_ADDRESS"); });
                         }
                         if (!ensureUser) return [3 /*break*/, 12];
-                        _c = 0, values_1 = values;
-                        _d.label = 9;
+                        _d = 0, values_1 = values;
+                        _e.label = 9;
                     case 9:
-                        if (!(_c < values_1.length)) return [3 /*break*/, 12];
-                        value = values_1[_c];
+                        if (!(_d < values_1.length)) return [3 /*break*/, 12];
+                        value = values_1[_d];
                         if (!(!value.EntityData || (value.EntityData && typeof value.EntityData.SPGroupID === "undefined" && value.EntityData.PrincipalType !== "UNVALIDATED_EMAIL_ADDRESS"))) return [3 /*break*/, 11];
                         return [4 /*yield*/, this.ensureUser(value.Key, siteUrl || this.context.pageContext.web.absoluteUrl)];
                     case 10:
-                        id = _d.sent();
+                        id = _e.sent();
                         value.LoginName = value.Key;
                         value.Key = id;
-                        _d.label = 11;
+                        _e.label = 11;
                     case 11:
-                        _c++;
+                        _d++;
                         return [3 /*break*/, 9];
                     case 12:
                         // Filter out NULL keys
@@ -342,7 +342,7 @@ var SPPeopleSearchService = /** @class */ (function () {
                     // Nothing to return
                     return [2 /*return*/, []];
                     case 14:
-                        e_1 = _d.sent();
+                        e_1 = _e.sent();
                         console.error("PeopleSearchService::searchTenant: error occured while fetching the users.");
                         return [2 /*return*/, []];
                     case 15: return [2 /*return*/];

package/lib/services/PeopleSearchService.js.map

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

package/lib/services/SPTaxonomyService.d.ts

@@ -4,14 +4,15 @@ import '@pnp/sp/taxonomy';
 import { ITermInfo, ITermSetInfo, ITermStoreInfo } from '@pnp/sp/taxonomy';
 export declare class SPTaxonomyService {
     private context;
+    private readonly _sp;
     constructor(context: BaseComponentContext);
-    getTerms(termSetId: Guid, parentTermId?: Guid, skiptoken?: string, hideDeprecatedTerms?: boolean, pageSize?: number): Promise<{
+    getTerms: (termSetId: Guid, parentTermId?: Guid, skiptoken?: string, hideDeprecatedTerms?: boolean, pageSize?: number) => Promise<{
         value: ITermInfo[];
         skiptoken: string;
     }>;
-    getTermById(termSetId: Guid, termId: Guid): Promise<ITermInfo>;
-    searchTerm(termSetId: Guid, label: string, languageTag: string, parentTermId?: Guid, allowSelectingChildren?: boolean, stringMatchId?: string, pageSize?: number): Promise<ITermInfo[]>;
-    getTermSetInfo(termSetId: Guid): Promise<ITermSetInfo | undefined>;
-    getTermStoreInfo(): Promise<ITermStoreInfo | undefined>;
+    getTermById: (termSetId: Guid, termId: Guid) => Promise<ITermInfo>;
+    searchTerm: (termSetId: Guid, label: string, languageTag: string, parentTermId?: Guid, allowSelectingChildren?: boolean, stringMatchId?: string, pageSize?: number) => Promise<ITermInfo[]>;
+    getTermSetInfo: (termSetId: Guid) => Promise<ITermSetInfo | undefined>;
+    getTermStoreInfo: () => Promise<ITermStoreInfo | undefined>;
 }
 //# sourceMappingURL=SPTaxonomyService.d.ts.map

package/lib/services/SPTaxonomyService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SPTaxonomyService.d.ts","sourceRoot":"","sources":["../../src/services/SPTaxonomyService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGlD,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,qBAAa,iBAAiB;IAEhB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,oBAAoB;IAIpC,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,GAAE,MAAW,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAmC5K,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;IAY9D,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,sBAAsB,UAAO,EAAE,aAAa,GAAE,MAAY,EAAE,QAAQ,GAAE,MAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAiC7L,cAAc,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAKlE,gBAAgB,IAAI,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CAIrE"}
+{"version":3,"file":"SPTaxonomyService.d.ts","sourceRoot":"","sources":["../../src/services/SPTaxonomyService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,qBAAa,iBAAiB;IAIhB,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;gBAEP,OAAO,EAAE,oBAAoB;IAI1C,QAAQ,cAAqB,IAAI,iBAAiB,IAAI,cAAc,MAAM,wBAAwB,OAAO,aAAY,MAAM;eAAyB,SAAS,EAAE;mBAAa,MAAM;OAmCxL;IAEM,WAAW,cAAqB,IAAI,UAAU,IAAI,KAAG,QAAQ,SAAS,CAAC,CAW7E;IAEM,UAAU,cACJ,IAAI,SACR,MAAM,eACA,MAAM,iBACJ,IAAI,oDAEJ,MAAM,aACX,MAAM,KACf,QAAQ,SAAS,EAAE,CAAC,CA+BtB;IAEM,cAAc,cAAqB,IAAI,KAAG,QAAQ,YAAY,GAAG,SAAS,CAAC,CAGjF;IAEM,gBAAgB,QAAa,QAAQ,cAAc,GAAG,SAAS,CAAC,CAGtE;CACF"}

package/lib/services/SPTaxonomyService.js

@@ -35,68 +35,60 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { Guid } from '@microsoft/sp-core-library';
-import { LambdaParser } from '@pnp/odata/parsers';
-import { SharePointQueryableCollection, sp } from '@pnp/sp';
+import { SPCollection } from '@pnp/sp';
 import '@pnp/sp/taxonomy';
+import { JSONParse } from '@pnp/queryable';
+import { getSP } from '../common/utilities/PnPJSConfig';
 var SPTaxonomyService = /** @class */ (function () {
     function SPTaxonomyService(context) {
+        var _this = this;
         this.context = context;
-    }
-    SPTaxonomyService.prototype.getTerms = function (termSetId, parentTermId, skiptoken, hideDeprecatedTerms, pageSize) {
-        if (pageSize === void 0) { pageSize = 50; }
-        return __awaiter(this, void 0, void 0, function () {
-            var parser, legacyChildrenUrlAndQuery, legacyChildrenQueryable, termsResult, error_1;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        parser = new LambdaParser(function (r) { return __awaiter(_this, void 0, void 0, function () {
-                            var json, newSkiptoken, urlParams;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, r.json()];
-                                    case 1:
-                                        json = _a.sent();
-                                        newSkiptoken = '';
-                                        if (json['@odata.nextLink']) {
-                                            urlParams = new URLSearchParams(json['@odata.nextLink'].split('?')[1]);
-                                            if (urlParams.has('$skiptoken')) {
-                                                newSkiptoken = urlParams.get('$skiptoken');
-                                            }
-                                        }
-                                        return [2 /*return*/, { value: json.value, skiptoken: newSkiptoken }];
+        this.getTerms = function (termSetId, parentTermId, skiptoken, hideDeprecatedTerms, pageSize) {
+            if (pageSize === void 0) { pageSize = 50; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var localSpfi, legacyChildrenTerms, termsJsonResult, newSkiptoken, urlParams, error_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            localSpfi = this._sp.using(JSONParse());
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            legacyChildrenTerms = void 0;
+                            if (parentTermId && parentTermId !== Guid.empty) {
+                                legacyChildrenTerms = SPCollection(localSpfi.termStore.sets.getById(termSetId.toString()).terms.getById(parentTermId.toString()).concat('/getLegacyChildren'));
+                            }
+                            else {
+                                legacyChildrenTerms = SPCollection(localSpfi.termStore.sets.getById(termSetId.toString()).concat('/getLegacyChildren'));
+                            }
+                            legacyChildrenTerms = legacyChildrenTerms.top(pageSize);
+                            if (hideDeprecatedTerms) {
+                                legacyChildrenTerms = legacyChildrenTerms.filter('isDeprecated eq false');
+                            }
+                            if (skiptoken && skiptoken !== '') {
+                                legacyChildrenTerms.query.set('$skiptoken', skiptoken);
+                            }
+                            return [4 /*yield*/, legacyChildrenTerms()];
+                        case 2:
+                            termsJsonResult = _a.sent();
+                            newSkiptoken = '';
+                            if (termsJsonResult['@odata.nextLink']) {
+                                urlParams = new URLSearchParams(termsJsonResult['@odata.nextLink'].split('?')[1]);
+                                if (urlParams.has('$skiptoken')) {
+                                    newSkiptoken = urlParams.get('$skiptoken');
                                 }
-                            });
-                        }); });
-                        legacyChildrenUrlAndQuery = '';
-                        if (parentTermId && parentTermId !== Guid.empty) {
-                            legacyChildrenUrlAndQuery = sp.termStore.sets.getById(termSetId.toString()).terms.getById(parentTermId.toString()).concat('/getLegacyChildren').toUrl();
-                        }
-                        else {
-                            legacyChildrenUrlAndQuery = sp.termStore.sets.getById(termSetId.toString()).concat('/getLegacyChildren').toUrl();
-                        }
-                        legacyChildrenQueryable = SharePointQueryableCollection(legacyChildrenUrlAndQuery).top(pageSize).usingParser(parser);
-                        if (hideDeprecatedTerms) {
-                            legacyChildrenQueryable = legacyChildrenQueryable.filter('isDeprecated eq false');
-                        }
-                        if (skiptoken && skiptoken !== '') {
-                            legacyChildrenQueryable.query.set('$skiptoken', skiptoken);
-                        }
-                        return [4 /*yield*/, legacyChildrenQueryable()];
-                    case 1:
-                        termsResult = _a.sent();
-                        return [2 /*return*/, termsResult];
-                    case 2:
-                        error_1 = _a.sent();
-                        return [2 /*return*/, { value: [], skiptoken: '' }];
-                    case 3: return [2 /*return*/];
-                }
+                            }
+                            return [2 /*return*/, { value: termsJsonResult.value, skiptoken: newSkiptoken }];
+                        case 3:
+                            error_1 = _a.sent();
+                            console.error("SPTaxonomyService.getTerms:", error_1);
+                            return [2 /*return*/, { value: [], skiptoken: '' }];
+                        case 4: return [2 /*return*/];
+                    }
+                });
             });
-        });
-    };
-    SPTaxonomyService.prototype.getTermById = function (termSetId, termId) {
-        return __awaiter(this, void 0, void 0, function () {
+        };
+        this.getTermById = function (termSetId, termId) { return __awaiter(_this, void 0, void 0, function () {
             var termInfo, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -107,86 +99,84 @@ var SPTaxonomyService = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, sp.termStore.sets.getById(termSetId.toString()).terms.getById(termId.toString()).expand("parent")()];
+                        return [4 /*yield*/, this._sp.termStore.sets.getById(termSetId.toString()).terms.getById(termId.toString()).expand("parent")()];
                     case 2:
                         termInfo = _a.sent();
                         return [2 /*return*/, termInfo];
                     case 3:
                         error_2 = _a.sent();
+                        console.error("SPTaxonomyService.getTermById:", error_2);
                         return [2 /*return*/, undefined];
                     case 4: return [2 /*return*/];
                 }
             });
-        });
-    };
-    SPTaxonomyService.prototype.searchTerm = function (termSetId, label, languageTag, parentTermId, allowSelectingChildren, stringMatchId, pageSize) {
-        if (allowSelectingChildren === void 0) { allowSelectingChildren = true; }
-        if (stringMatchId === void 0) { stringMatchId = '0'; }
-        if (pageSize === void 0) { pageSize = 50; }
-        return __awaiter(this, void 0, void 0, function () {
-            var query, searchTermUrl, searchTermQuery, filteredTerms, hasParentId, set, collection, childrenIds_1, error_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 4, , 5]);
-                        query = [
-                            "label='".concat(label, "'"),
-                            "setId='".concat(termSetId, "'"),
-                            "languageTag='".concat(languageTag, "'"),
-                            "stringMatchId='".concat(stringMatchId, "'")
-                        ];
-                        if (parentTermId !== Guid.empty) {
-                            query.push("parentTermId='".concat(parentTermId, "'"));
-                        }
-                        searchTermUrl = sp.termStore.concat("/searchTerm(".concat(query.join(','), ")")).toUrl();
-                        searchTermQuery = SharePointQueryableCollection(searchTermUrl).top(pageSize);
-                        return [4 /*yield*/, searchTermQuery()];
-                    case 1:
-                        filteredTerms = _a.sent();
-                        if (!(allowSelectingChildren === false)) return [3 /*break*/, 3];
-                        hasParentId = parentTermId !== Guid.empty;
-                        set = sp.termStore.sets.getById(termSetId.toString());
-                        collection = hasParentId ? set.terms.getById(parentTermId.toString()).children : set.children;
-                        return [4 /*yield*/, collection.select("id").get().then(function (children) { return children.map(function (c) { return c.id; }); })];
-                    case 2:
-                        childrenIds_1 = _a.sent();
-                        filteredTerms = filteredTerms.filter(function (term) { return childrenIds_1.includes(term.id); });
-                        _a.label = 3;
-                    case 3: return [2 /*return*/, filteredTerms];
-                    case 4:
-                        error_3 = _a.sent();
-                        return [2 /*return*/, []];
-                    case 5: return [2 /*return*/];
-                }
+        }); };
+        this.searchTerm = function (termSetId, label, languageTag, parentTermId, allowSelectingChildren, stringMatchId, pageSize) {
+            if (allowSelectingChildren === void 0) { allowSelectingChildren = true; }
+            if (stringMatchId === void 0) { stringMatchId = '0'; }
+            if (pageSize === void 0) { pageSize = 50; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var query, searchTermQuery, filteredTerms, hasParentId, set, collection, childrenIds_1, error_3;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _a.trys.push([0, 4, , 5]);
+                            query = [
+                                "label='".concat(label, "'"),
+                                "setId='".concat(termSetId, "'"),
+                                "languageTag='".concat(languageTag, "'"),
+                                "stringMatchId='".concat(stringMatchId, "'")
+                            ];
+                            if (parentTermId !== Guid.empty) {
+                                query.push("parentTermId='".concat(parentTermId, "'"));
+                            }
+                            searchTermQuery = SPCollection(this._sp.termStore.concat("/searchTerm(".concat(query.join(','), ")"))).top(pageSize);
+                            return [4 /*yield*/, searchTermQuery()];
+                        case 1:
+                            filteredTerms = _a.sent();
+                            if (!(allowSelectingChildren === false)) return [3 /*break*/, 3];
+                            hasParentId = parentTermId !== Guid.empty;
+                            set = this._sp.termStore.sets.getById(termSetId.toString());
+                            collection = hasParentId ? set.terms.getById(parentTermId.toString()).children : set.children;
+                            return [4 /*yield*/, collection.select("id")().then(function (children) { return children.map(function (c) { return c.id; }); })];
+                        case 2:
+                            childrenIds_1 = _a.sent();
+                            filteredTerms = filteredTerms.filter(function (term) { return childrenIds_1.includes(term.id); });
+                            _a.label = 3;
+                        case 3: return [2 /*return*/, filteredTerms];
+                        case 4:
+                            error_3 = _a.sent();
+                            console.error("SPTaxonomyService.searchTerm:", error_3);
+                            return [2 /*return*/, []];
+                        case 5: return [2 /*return*/];
+                    }
+                });
             });
-        });
-    };
-    SPTaxonomyService.prototype.getTermSetInfo = function (termSetId) {
-        return __awaiter(this, void 0, void 0, function () {
+        };
+        this.getTermSetInfo = function (termSetId) { return __awaiter(_this, void 0, void 0, function () {
             var tsInfo;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, sp.termStore.sets.getById(termSetId.toString()).get()];
+                    case 0: return [4 /*yield*/, this._sp.termStore.sets.getById(termSetId.toString())()];
                     case 1:
                         tsInfo = _a.sent();
                         return [2 /*return*/, tsInfo];
                 }
             });
-        });
-    };
-    SPTaxonomyService.prototype.getTermStoreInfo = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        }); };
+        this.getTermStoreInfo = function () { return __awaiter(_this, void 0, void 0, function () {
             var termStoreInfo;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, sp.termStore()];
+                    case 0: return [4 /*yield*/, this._sp.termStore()];
                     case 1:
                         termStoreInfo = _a.sent();
                         return [2 /*return*/, termStoreInfo];
                 }
             });
-        });
-    };
+        }); };
+        this._sp = getSP(context);
+    }
     return SPTaxonomyService;
 }());
 export { SPTaxonomyService };

package/lib/services/SPTaxonomyService.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "4.0.0-beta.6059083",
+  "version": "4.0.0-beta.6059091",
   "scripts": {
     "build": "gulp build",
     "clean": "gulp clean",
@@ -41,7 +41,7 @@
     "@microsoft/sp-property-pane": "1.17.3",
     "@microsoft/sp-webpart-base": "1.17.3",
     "@monaco-editor/loader": "^1.3.1",
-    "@pnp/sp": "2.5.0",
+    "@pnp/sp": "^3.16.0",
     "@pnp/telemetry-js": "2.0.0",
     "@popperjs/core": "2.5.4",
     "@uifabric/icons": "7.9.5",