@cinerino/sdk 11.0.0 → 11.1.0

package/lib/abstract/chevrePay/payment.js

@@ -61,17 +61,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentService = void 0;
 var http_status_1 = require("http-status");
@@ -90,15 +79,17 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.checkMovieTicket = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/check",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: params,
+                        body: { object: object, purpose: purpose },
                         qs: {
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -112,16 +103,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.checkMovieTicketAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/check",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED],
-                        body: params,
+                        body: { object: object, purpose: purpose },
                         qs: {
                             async: true,
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -135,15 +128,21 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizeAnyPayment = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, amount, issuedThrough, paymentMethod, name, additionalProperty, ticketToken;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
+                amount = object.amount, issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.FaceToFace + "/authorize",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: params,
+                        body: {
+                            object: __assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (typeof name === 'string') ? { name: name } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
+                            purpose: purpose
+                        },
                         qs: {
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -157,14 +156,20 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizeCreditCard = function (params, options) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, amount, issuedThrough, paymentMethod, creditCard, method, paymentMethodId, name, additionalProperty, ticketToken;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
+                amount = object.amount, issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, creditCard = object.creditCard, method = object.method, paymentMethodId = object.paymentMethodId, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/authorize",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED, http_status_1.CREATED],
-                        body: params,
-                        qs: __assign(__assign({}, options), { purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                        body: {
+                            object: __assign(__assign(__assign(__assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (creditCard !== undefined && creditCard !== null) ? { creditCard: creditCard } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof method === 'string') ? { method: method } : undefined), (typeof paymentMethodId === 'string') ? { paymentMethodId: paymentMethodId } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
+                            purpose: purpose
+                        },
+                        qs: __assign(__assign({}, options), { purpose: { id: purpose.id } // 追加(2024-04-01~)
                          })
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -178,14 +183,20 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizeMovieTicket = function (params, options) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
+                issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, movieTickets = object.movieTickets, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/authorize",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED, http_status_1.CREATED],
-                        body: params,
-                        qs: __assign(__assign({}, options), { purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                        body: {
+                            object: __assign(__assign(__assign(__assign({ issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (Array.isArray(movieTickets)) ? { movieTickets: movieTickets } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
+                            purpose: purpose
+                        },
+                        qs: __assign(__assign({}, options), { purpose: { id: purpose.id } // 追加(2024-04-01~)
                          })
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -199,15 +210,21 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.authorizePaymentCard = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose, amount, issuedThrough, paymentMethod, name, additionalProperty, fromLocation, description;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
+                amount = object.amount, issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, name = object.name, additionalProperty = object.additionalProperty, fromLocation = object.fromLocation, description = object.description;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.product.ProductType.PaymentCard + "/authorize",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.CREATED],
-                        body: params,
+                        body: {
+                            object: __assign(__assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (typeof fromLocation === 'string') ? { fromLocation: fromLocation } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof description === 'string') ? { description: description } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
+                            purpose: purpose
+                        },
                         qs: {
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -221,15 +238,19 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var object, purpose;
+            var object, purpose, amount, creditCard, issuedThrough, paymentMethod, method, ticketToken;
             var _this = this;
             return __generator(this, function (_a) {
                 object = params.object, purpose = params.purpose;
+                amount = object.amount, creditCard = object.creditCard, issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, method = object.method, ticketToken = object.ticketToken;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/publishPaymentUrl",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED],
-                        body: { object: object, purpose: purpose },
+                        body: {
+                            object: __assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (creditCard !== undefined && creditCard !== null) ? { creditCard: creditCard } : undefined), (typeof method === 'string') ? { method: method } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined),
+                            purpose: purpose
+                        },
                         qs: {
                             async: true,
                             purpose: { id: purpose.id } // 追加(2024-04-01~)
@@ -246,18 +267,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.voidAnyPayment = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var id, body;
+            var id, purpose;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        id = params.id, body = __rest(params, ["id"]);
+                        id = params.id, purpose = params.purpose;
                         return [4 /*yield*/, this.fetch({
                                 uri: "/payment/" + factory.service.paymentService.PaymentServiceType.FaceToFace + "/authorize/" + id + "/void",
                                 method: 'PUT',
                                 expectedStatusCodes: [http_status_1.NO_CONTENT],
-                                body: body,
+                                body: { purpose: purpose },
                                 qs: {
-                                    purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                                    purpose: { id: purpose.id } // 追加(2024-04-01~)
                                 }
                             })];
                     case 1:
@@ -272,18 +293,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.voidTransaction = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var id, object, body;
+            var id, object, purpose;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        id = params.id, object = params.object, body = __rest(params, ["id", "object"]);
+                        id = params.id, object = params.object, purpose = params.purpose;
                         return [4 /*yield*/, this.fetch({
                                 uri: "/payment/" + object.typeOf + "/authorize/" + id + "/void",
                                 method: 'PUT',
                                 expectedStatusCodes: [http_status_1.NO_CONTENT],
-                                body: body,
+                                body: { purpose: purpose },
                                 qs: {
-                                    purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                                    purpose: { id: purpose.id } // 追加(2024-04-01~)
                                 }
                             })];
                     case 1:
@@ -413,7 +434,7 @@ var PaymentService = /** @class */ (function (_super) {
                         expectedStatusCodes: [http_status_1.CREATED],
                         body: { purpose: purpose },
                         qs: {
-                            purpose: { id: params.purpose.id }
+                            purpose: { id: purpose.id }
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -434,7 +455,7 @@ var PaymentService = /** @class */ (function (_super) {
                         expectedStatusCodes: [http_status_1.CREATED],
                         body: { purpose: purpose, ticketedPermit: ticketedPermit },
                         qs: {
-                            purpose: { id: params.purpose.id }
+                            purpose: { id: purpose.id }
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -455,7 +476,7 @@ var PaymentService = /** @class */ (function (_super) {
                         expectedStatusCodes: [http_status_1.CREATED],
                         body: { purpose: purpose, ticketedInvoice: ticketedInvoice },
                         qs: {
-                            purpose: { id: params.purpose.id }
+                            purpose: { id: purpose.id }
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {

package/lib/abstract/cloud/admin/me.d.ts

@@ -1,20 +1,21 @@
-import * as factory from '../../factory';
+import type { IFindMyProjectConditions, IFindMySellerConditions, IMyProject, IMySeller } from '../../chevreAdmin/me';
 import { IOptions, Service } from '../../service';
-export interface ISearchProjectConditions {
-    limit?: number;
-    page?: number;
-    id?: {
-        $eq?: string;
-        $regex?: string;
-    };
-}
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 export declare class MeService extends Service<IOptions> {
     constructor(options: Pick<IOptions, 'auth' | 'endpoint' | 'transporter' | 'defaultPath'>);
     /**
      * マイプロジェクト検索
      */
-    searchProjects(params: ISearchProjectConditions): Promise<Pick<factory.project.IProject, 'id' | 'logo' | 'name'>[]>;
+    searchProjects(params: IFindMyProjectConditions): Promise<IMyProject[]>;
+    /**
+     * マイ販売者検索
+     */
+    findMySellers(params: {
+        project: {
+            id: string;
+        };
+        conditions: IFindMySellerConditions;
+    }): Promise<IMySeller[]>;
 }

package/lib/abstract/cloud/admin/me.js

@@ -66,7 +66,7 @@ exports.MeService = void 0;
 var index_1 = require("../../index");
 var service_1 = require("../../service");
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 var MeService = /** @class */ (function (_super) {
     __extends(MeService, _super);
@@ -94,6 +94,27 @@ var MeService = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * マイ販売者検索
+     */
+    MeService.prototype.findMySellers = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, auth, endpoint, chevreAdmin, meService;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.options, auth = _a.auth, endpoint = _a.endpoint;
+                        return [4 /*yield*/, index_1.loadChevreAdmin({ auth: auth, endpoint: endpoint })];
+                    case 1:
+                        chevreAdmin = _b.sent();
+                        return [4 /*yield*/, chevreAdmin.createMeInstance()];
+                    case 2:
+                        meService = _b.sent();
+                        return [2 /*return*/, meService.findMySellers(params)];
+                }
+            });
+        });
+    };
     return MeService;
 }(service_1.Service));
 exports.MeService = MeService;

package/lib/auth/clientCredentialsClient.d.ts

@@ -1,4 +1,4 @@
-import ICredentials from './credentials';
+import { ICredentials } from './credentials';
 import OAuth2client from './oAuth2client';
 export interface IOptions {
     domain: string;

package/lib/auth/credentials.d.ts

@@ -31,4 +31,4 @@ interface ICredentials {
     idTokenPayload?: any;
     state?: string;
 }
-export default ICredentials;
+export { ICredentials };

package/lib/auth/oAuth2client.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { AuthClient } from '../abstract/auth/authClient';
-import type ICredentials from './credentials';
+import { ICredentials } from './credentials';
 import { LoginTicket } from './loginTicket';
 export declare const MAX_RETRY_NUM = 2;
 export interface IGenerateAuthUrlOpts {
@@ -8,6 +8,8 @@ export interface IGenerateAuthUrlOpts {
     state: string;
     codeVerifier?: string;
 }
+declare type IOnTokenRefreshedParams = Pick<ICredentials, 'access_token' | 'expiry_date' | 'id_token' | 'token_type' | 'refresh_token'>;
+declare type IOnTokenRefreshed = (params: IOnTokenRefreshedParams) => Promise<void>;
 export interface IOptions {
     domain: string;
     clientId?: string;
@@ -47,6 +49,10 @@ export default class OAuth2client implements AuthClient {
      */
     credentials: ICredentials;
     options: IOptions;
+    /**
+     * 認証クライアントインスタンス内で発生するイベント
+     */
+    private readonly events;
     constructor(options: IOptions);
     static BASE64URLENCODE(str: Buffer): string;
     static SHA256(buffer: any): Buffer;
@@ -89,6 +95,10 @@ export default class OAuth2client implements AuthClient {
      * 結果にはIDトークンの付加情報が含まれます。
      */
     verifyIdToken(options: IVerifyIdTokenOptions): LoginTicket;
+    /**
+     * トークン更新イベントハンドラを登録する
+     */
+    onTokenRefreshed(params: IOnTokenRefreshed): void;
     /**
      * Provides a request implementation with OAuth 2.0 flow.
      * If credentials have a refresh_token, in cases of HTTP
@@ -120,3 +130,4 @@ export default class OAuth2client implements AuthClient {
      */
     private verifySignedJwt;
 }
+export {};

package/lib/auth/oAuth2client.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -70,6 +81,7 @@ var OAuth2client = /** @class */ (function () {
         // TODO add minimum validation
         this.options = options;
         this.credentials = {};
+        this.events = {};
     }
     OAuth2client.BASE64URLENCODE = function (str) {
         return str.toString('base64')
@@ -188,12 +200,22 @@ var OAuth2client = /** @class */ (function () {
                     throw new Error('No refresh token is set.');
                 }
                 return [2 /*return*/, this.refreshToken(this.credentials.refresh_token)
-                        .then(function (tokens) {
-                        tokens.refresh_token = _this.credentials.refresh_token;
-                        debug('setting credentials...', tokens);
-                        _this.credentials = tokens;
-                        return _this.credentials;
-                    })];
+                        .then(function (refreshTokenResult) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    // tokens.refresh_token = this.credentials.refresh_token;
+                                    debug('setting credentials...', refreshTokenResult);
+                                    this.credentials = __assign(__assign({}, refreshTokenResult), { refresh_token: this.credentials.refresh_token });
+                                    if (!(typeof this.events.onTokenRefreshed === 'function')) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, this.events.onTokenRefreshed(this.credentials)];
+                                case 1:
+                                    _a.sent();
+                                    _a.label = 2;
+                                case 2: return [2 /*return*/, this.credentials];
+                            }
+                        });
+                    }); })];
             });
         });
     };
@@ -339,6 +361,12 @@ var OAuth2client = /** @class */ (function () {
         // return this.verifySignedJwt(options.idToken, options.audience, OAuth2Client.ISSUERS_);
         return this.verifySignedJwt(this.credentials.id_token, options.audience);
     };
+    /**
+     * トークン更新イベントハンドラを登録する
+     */
+    OAuth2client.prototype.onTokenRefreshed = function (params) {
+        this.events.onTokenRefreshed = params;
+    };
     /**
      * Provides a request implementation with OAuth 2.0 flow.
      * If credentials have a refresh_token, in cases of HTTP
@@ -404,7 +432,7 @@ var OAuth2client = /** @class */ (function () {
                 debug('fetching...', options);
                 return [2 /*return*/, fetch("https://" + this.options.domain + OAuth2client.OAUTH2_TOKEN_URI, options)
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                        var body, body, tokens;
+                        var body, body, result, refreshTokenResponse, access_token, id_token, expires_in, token_type;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -420,17 +448,29 @@ var OAuth2client = /** @class */ (function () {
                                     body = _a.sent();
                                     throw new Error(body);
                                 case 4: return [3 /*break*/, 7];
-                                case 5: return [4 /*yield*/, response.json()];
+                                case 5:
+                                    result = void 0;
+                                    return [4 /*yield*/, response.json()];
                                 case 6:
-                                    tokens = _a.sent();
+                                    refreshTokenResponse = _a.sent();
                                     // tslint:disable-next-line:no-single-line-block-comment
                                     /* istanbul ignore else */
-                                    if (tokens && tokens.expires_in) {
-                                        // tslint:disable-next-line:no-magic-numbers
-                                        tokens.expiry_date = ((new Date()).getTime() + (tokens.expires_in * 1000));
-                                        delete tokens.expires_in;
+                                    if (refreshTokenResponse !== undefined && typeof refreshTokenResponse.expires_in === 'number') {
+                                        access_token = refreshTokenResponse.access_token, id_token = refreshTokenResponse.id_token, expires_in = refreshTokenResponse.expires_in, token_type = refreshTokenResponse.token_type;
+                                        result = {
+                                            access_token: access_token, id_token: id_token, token_type: token_type,
+                                            // tslint:disable-next-line:no-magic-numbers
+                                            expiry_date: ((new Date()).getTime() + (expires_in * 1000))
+                                        };
+                                        // delete tokens.expires_in;
                                     }
-                                    return [2 /*return*/, tokens];
+                                    else {
+                                        // 想定していないリフレッシュトークンレスポンスはログ出力
+                                        // tslint:disable-next-line:no-console
+                                        console.error('unexpected refreshToken response:', refreshTokenResponse);
+                                        throw new Error('unexpected refreshToken response.');
+                                    }
+                                    return [2 /*return*/, result];
                                 case 7: return [2 /*return*/];
                             }
                         });