@chevre/domain 21.21.0-alpha.9 → 21.21.0

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,11 +20,11 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(153, 'days')
+                    .add(175, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(180, 'days')
+                    .add(200, 'days')
                     .toDate()
             }
             // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }

package/example/src/chevre/playAroundProjectMakesOffer.ts

@@ -0,0 +1,47 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const CLIENT_ID = 'xxxx';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectMakesOfferRepo = await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection);
+    const result = await projectMakesOfferRepo.search({
+        limit: 100,
+        page: 1,
+        offeredBy: { id: { $eq: project.id } },
+        availableAtOrFrom: { id: { $eq: CLIENT_ID } }
+    });
+    console.log('result:', result);
+
+    try {
+        await projectMakesOfferRepo.create({
+            availableAtOrFrom: { id: CLIENT_ID },
+            offeredBy: { id: project.id }
+        });
+        console.log('offer created');
+    } catch (error) {
+        console.error(error);
+    }
+
+    await projectMakesOfferRepo.updateOne({
+        availableAtOrFrom: { id: CLIENT_ID },
+        eligibleCustomerType: [{ codeValue: 'Enduser' }],
+        offeredBy: { id: project.id }
+    });
+    console.log('offer updated');
+
+    await projectMakesOfferRepo.deleteOne({
+        availableAtOrFrom: { id: CLIENT_ID },
+        offeredBy: { id: project.id }
+    });
+    console.log('offer deleted');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/project.js

@@ -12,6 +12,7 @@ const schemaDefinition = {
     alternateName: String,
     logo: String,
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,
+    makesOffer: [mongoose_1.SchemaTypes.Mixed],
     name: String,
     settings: mongoose_1.SchemaTypes.Mixed,
     subscription: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -20,8 +20,6 @@ export declare class MongoRepository {
      */
     placeOrder(order: Omit<factory.order.IOrder, 'id'> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }, options: {
-        ignoreAccpetedOffersFromResult: boolean;
     }): Promise<void>;
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongodb").UpdateResult | undefined>;
     /**

package/lib/chevre/repo/orderInTransaction.js

@@ -46,17 +46,16 @@ class MongoRepository {
     /**
      * 注文を受注する
      */
-    placeOrder(order, options) {
+    placeOrder(order
+    // options: {
+    //     ignoreAccpetedOffersFromResult: boolean;
+    // }
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
             let setFields;
-            if (options.ignoreAccpetedOffersFromResult) {
-                // acceptedOffersを上書きしない
-                const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-                setFields = orderWithoutAcceptedOffers;
-            }
-            else {
-                setFields = order;
-            }
+            // acceptedOffersを上書きしない
+            const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
+            setFields = orderWithoutAcceptedOffers;
             debug('placing an order...', order.orderNumber, 'setFields:', setFields);
             // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
             yield this.orderModel.updateOne({

package/lib/chevre/repo/project.d.ts

@@ -54,6 +54,7 @@ export declare class MongoRepository {
         settings?: {
             sendEmailMessage?: factory.project.ISendEmailMessageSettings;
             sendgridApiKey?: string;
+            tokenIssuers?: string[];
         };
         subscription?: {
             useEventServiceAsProduct?: boolean;

package/lib/chevre/repo/project.js

@@ -73,14 +73,17 @@ class MongoRepository {
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== 'makesOffer') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    makesOffer: 0
                 };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
                     exclusion.forEach((field) => {
@@ -109,9 +112,9 @@ class MongoRepository {
         });
     }
     findByIdAndIUpdate(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
                 : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_c = (_b = (_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendEmailMessage) === null || _b === void 0 ? void 0 : _b.sender) === null || _c === void 0 ? void 0 : _c.email) === 'string')
                 ? {
@@ -121,9 +124,11 @@ class MongoRepository {
                 }
                 : undefined), (typeof ((_d = params.settings) === null || _d === void 0 ? void 0 : _d.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (typeof ((_e = params.subscription) === null || _e === void 0 ? void 0 : _e.useEventServiceAsProduct) === 'boolean')
+                : undefined), (Array.isArray((_e = params.settings) === null || _e === void 0 ? void 0 : _e.tokenIssuers))
+                ? { 'settings.tokenIssuers': (_f = params.settings) === null || _f === void 0 ? void 0 : _f.tokenIssuers }
+                : undefined), (typeof ((_g = params.subscription) === null || _g === void 0 ? void 0 : _g.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
-                : undefined), (typeof ((_f = params.hasMerchantReturnPolicy) === null || _f === void 0 ? void 0 : _f.sameAs) === 'string')
+                : undefined), (typeof ((_h = params.hasMerchantReturnPolicy) === null || _h === void 0 ? void 0 : _h.sameAs) === 'string')
                 ? { 'hasMerchantReturnPolicy.sameAs': params.hasMerchantReturnPolicy.sameAs }
                 : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)
@@ -133,12 +138,12 @@ class MongoRepository {
     }
     updateAggregateReservation(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.projectModel.findOneAndUpdate({ _id: params.id }, {
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, {
                 $set: Object.assign({ updatedAt: new Date() }, (params.aggregateReservation !== undefined) ? { aggregateReservation: params.aggregateReservation } : undefined),
                 $unset: {
                     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
                 }
-            }, { new: true })
+            }, { new: true, projection: { _id: 1 } })
                 .exec();
         });
     }

package/lib/chevre/repo/projectMakesOffer.d.ts

@@ -0,0 +1,52 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IMakesOffer = factory.project.IMakesOffer;
+/**
+ * プロジェクト提供オファーリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly projectModel;
+    constructor(connection: Connection);
+    search(params: {
+        limit?: number;
+        page?: number;
+        offeredBy?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        availableAtOrFrom?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+    }): Promise<IMakesOffer[]>;
+    create(params: {
+        availableAtOrFrom: {
+            id: string;
+        };
+        offeredBy: {
+            id: string;
+        };
+    }): Promise<void>;
+    updateOne(params: {
+        availableAtOrFrom: {
+            id: string;
+        };
+        eligibleCustomerType?: {
+            codeValue: string;
+        }[];
+        offeredBy: {
+            id: string;
+        };
+    }): Promise<void>;
+    deleteOne(params: {
+        availableAtOrFrom: {
+            id: string;
+        };
+        offeredBy: {
+            id: string;
+        };
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/projectMakesOffer.js

@@ -0,0 +1,133 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const project_1 = require("./mongoose/schemas/project");
+const factory = require("../factory");
+const settings_1 = require("../settings");
+/**
+ * プロジェクト提供オファーリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.projectModel = connection.model(project_1.modelName, (0, project_1.createSchema)());
+    }
+    search(params) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [];
+            const offeredByIdEq = (_b = (_a = params.offeredBy) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof offeredByIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: offeredByIdEq } } });
+            }
+            const availableAtOrFromIdEq = (_d = (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof availableAtOrFromIdEq === 'string') {
+                matchStages.push({ $match: { 'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFromIdEq } } });
+            }
+            const aggregate = this.projectModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$makesOffer'
+                    }
+                },
+                ...matchStages,
+                // { $sort: { 'makesOffer.availableAtOrFrom.id': factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$makesOffer.typeOf',
+                        availableAtOrFrom: '$makesOffer.availableAtOrFrom',
+                        eligibleCustomerType: '$makesOffer.eligibleCustomerType'
+                    }
+                }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc = yield this.projectModel.findOne({
+                _id: { $eq: params.offeredBy.id }
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.organizationType.Project);
+            }
+            const creatingMakesOffer = {
+                typeOf: factory.offerType.Offer,
+                availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+            };
+            doc = yield this.projectModel.findOneAndUpdate({
+                _id: { $eq: params.offeredBy.id },
+                'makesOffer.availableAtOrFrom.id': { $ne: params.availableAtOrFrom.id }
+            }, {
+                $push: { makesOffer: creatingMakesOffer }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.AlreadyInUse('makesOffer', ['availableAtOrFrom.id']);
+            }
+        });
+    }
+    updateOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updatingMakesOffer = Object.assign({ typeOf: factory.offerType.Offer, availableAtOrFrom: [{ id: params.availableAtOrFrom.id }] }, (Array.isArray(params.eligibleCustomerType))
+                ? {
+                    eligibleCustomerType: params.eligibleCustomerType.map(({ codeValue }) => ({
+                        codeValue,
+                        typeOf: 'CategoryCode'
+                    }))
+                }
+                : undefined);
+            const doc = yield this.projectModel.findOneAndUpdate({
+                _id: { $eq: params.offeredBy.id },
+                'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
+            }, {
+                $set: { 'makesOffer.$[makesOfferElement]': updatingMakesOffer }
+            }, {
+                new: true,
+                arrayFilters: [
+                    { 'makesOfferElement.availableAtOrFrom.id': { $eq: params.availableAtOrFrom.id } }
+                ],
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.offerType.Offer);
+            }
+        });
+    }
+    deleteOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.projectModel.findOneAndUpdate({
+                _id: { $eq: params.offeredBy.id },
+                'makesOffer.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
+            }, {
+                $pull: { makesOffer: { 'availableAtOrFrom.id': params.availableAtOrFrom.id } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.organizationType.Project);
+            }
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repository.d.ts

@@ -37,6 +37,7 @@ import type { MongoRepository as PriceSpecificationRepo } from './repo/priceSpec
 import type { MongoRepository as ProductRepo } from './repo/product';
 import type { MongoRepository as ProductOfferRepo } from './repo/productOffer';
 import type { MongoRepository as ProjectRepo } from './repo/project';
+import type { MongoRepository as ProjectMakesOfferRepo } from './repo/projectMakesOffer';
 import type { RedisRepository as OfferRateLimitRepo } from './repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from './repo/reservation';
 import type { MongoRepository as RoleRepo } from './repo/role';
@@ -221,6 +222,10 @@ export type Project = ProjectRepo;
 export declare namespace Project {
     function createInstance(...params: ConstructorParameters<typeof ProjectRepo>): Promise<ProjectRepo>;
 }
+export type ProjectMakesOffer = ProjectMakesOfferRepo;
+export declare namespace ProjectMakesOffer {
+    function createInstance(...params: ConstructorParameters<typeof ProjectMakesOfferRepo>): Promise<ProjectMakesOfferRepo>;
+}
 export type Reservation = ReservationRepo;
 export declare namespace Reservation {
     function createInstance(...params: ConstructorParameters<typeof ReservationRepo>): Promise<ReservationRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionNumber = void 0;
+exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -537,6 +537,19 @@ var Project;
     }
     Project.createInstance = createInstance;
 })(Project = exports.Project || (exports.Project = {}));
+var ProjectMakesOffer;
+(function (ProjectMakesOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/projectMakesOffer'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    ProjectMakesOffer.createInstance = createInstance;
+})(ProjectMakesOffer = exports.ProjectMakesOffer || (exports.ProjectMakesOffer = {}));
 var Reservation;
 (function (Reservation) {
     let repo;

package/lib/chevre/service/order/placeOrder.js

@@ -14,59 +14,79 @@ const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
-const settings_1 = require("../../settings");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const debug = createDebug('chevre-domain:service:order');
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    const acceptedOffers = (Array.isArray(params.acceptedOffers))
-        ? params.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign(Object.assign({}, reservationFor), (reservationFor.doorTime !== undefined && reservationFor.doorTime !== null)
-                        ? {
-                            doorTime: moment(reservationFor.doorTime)
-                                .toDate()
-                        }
-                        : undefined), (reservationFor.endDate !== undefined)
-                        ? {
-                            endDate: moment(reservationFor.endDate)
-                                .toDate()
-                        }
-                        : undefined), (reservationFor.startDate !== undefined)
-                        ? {
-                            startDate: moment(reservationFor.startDate)
-                                .toDate()
-                        }
-                        : undefined) });
-                return Object.assign(Object.assign({}, o), { itemOffered });
-            }
-            else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign({}, reservationFor), (reservationFor.arrivalTime !== undefined)
-                        ? {
-                            arrivalTime: moment(reservationFor.arrivalTime)
-                                .toDate()
-                        }
-                        : undefined), (reservationFor.departureTime !== undefined)
-                        ? {
-                            departureTime: moment(reservationFor.departureTime)
-                                .toDate()
-                        }
-                        : undefined) });
-                return Object.assign(Object.assign({}, o), { itemOffered });
-            }
-            else {
-                return o;
-            }
-        })
-        : [];
+    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
+    //     ? params.acceptedOffers.map((o) => {
+    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.doorTime !== undefined && reservationFor.doorTime !== null)
+    //                         ? {
+    //                             doorTime: moment(reservationFor.doorTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.endDate !== undefined)
+    //                         ? {
+    //                             endDate: moment(reservationFor.endDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.startDate !== undefined)
+    //                         ? {
+    //                             startDate: moment(reservationFor.startDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             };
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.arrivalTime !== undefined)
+    //                         ? {
+    //                             arrivalTime: moment(reservationFor.arrivalTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.departureTime !== undefined)
+    //                         ? {
+    //                             departureTime: moment(reservationFor.departureTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             };
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else {
+    //             return o;
+    //         }
+    //     })
+    //     : [];
     const orderedItems = (Array.isArray(params.orderedItem)) ? params.orderedItem : [];
     return Object.assign(Object.assign(Object.assign({}, params), { orderDate: moment(params.orderDate)
-            .toDate(), acceptedOffers, orderedItem: orderedItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
+            .toDate(), 
+        // acceptedOffers,
+        orderedItem: orderedItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
         ? {
             dateReturned: moment(params.dateReturned)
                 .toDate()
@@ -210,61 +230,67 @@ function voidAcceptedOfferIfNecessary(params) {
         }
     });
 }
-function verifyAcceptedOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { order } = params;
-        const orderInTransaction = (yield repos.orderInTransaction.searchByOrderNumber({
-            orderNumber: { $eq: order.orderNumber }
-        })).shift();
-        if (orderInTransaction !== undefined) {
-            debug('verifying acceptedOffers...', order.orderNumber);
-            const acceptedOffersLengthMatched = orderInTransaction.acceptedOffers.length === order.acceptedOffers.length;
-            debug('acceptedOffers.length matched?', acceptedOffersLengthMatched);
-            if (!acceptedOffersLengthMatched) {
-                throw new factory.errors.ServiceUnavailable('acceptedOffers.length not matched');
-            }
-            const reservationIdsByOrderInTransation = orderInTransaction.acceptedOffers.map((offer) => {
-                return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
-                    ? offer.itemOffered.id
-                    : '';
-            });
-            const reservationIdsByOrder = order.acceptedOffers.map((offer) => {
-                return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
-                    ? offer.itemOffered.id
-                    : '';
-            });
-            debug('reservationIdsByOrderInTransation:', reservationIdsByOrderInTransation);
-            debug('reservationIdsByOrder:', reservationIdsByOrder);
-            const offerIdsByOrderInTransation = [...new Set(orderInTransaction.acceptedOffers.map((offer) => {
-                    return String(offer.id);
-                }))];
-            const offerIdsByOrder = [...new Set(order.acceptedOffers.map((offer) => {
-                    return String(offer.id);
-                }))];
-            debug('offerIdsByOrderInTransation:', offerIdsByOrderInTransation);
-            debug('offerIdsByOrder:', offerIdsByOrder);
-            const reservationIdsMatched = reservationIdsByOrderInTransation.length === reservationIdsByOrder.length
-                && reservationIdsByOrderInTransation.every((reservationId) => reservationIdsByOrder.includes(reservationId));
-            debug('reservationIds matched?', reservationIdsMatched);
-            const offerIdsMatched = offerIdsByOrderInTransation.length === offerIdsByOrder.length
-                && offerIdsByOrderInTransation.every((offerId) => offerIdsByOrder.includes(offerId));
-            debug('offerIds matched?', offerIdsMatched);
-            if (!reservationIdsMatched) {
-                throw new factory.errors.ServiceUnavailable('reservationIds not matched');
-            }
-            if (!offerIdsMatched) {
-                throw new factory.errors.ServiceUnavailable('offerIds not matched');
-            }
-        }
-    });
-}
+// function verifyAcceptedOffers(params: {
+//     order: factory.order.IOrder & {
+//         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+//     };
+// }) {
+//     return async (repos: {
+//         orderInTransaction: OrderInTransactionRepo;
+//     }) => {
+//         const { order } = params;
+//         const orderInTransaction = (await repos.orderInTransaction.searchByOrderNumber({
+//             orderNumber: { $eq: order.orderNumber }
+//         })).shift();
+//         if (orderInTransaction !== undefined) {
+//             debug('verifying acceptedOffers...', order.orderNumber);
+//             const acceptedOffersLengthMatched = orderInTransaction.acceptedOffers.length === order.acceptedOffers.length;
+//             debug('acceptedOffers.length matched?', acceptedOffersLengthMatched);
+//             if (!acceptedOffersLengthMatched) {
+//                 throw new factory.errors.ServiceUnavailable('acceptedOffers.length not matched');
+//             }
+//             const reservationIdsByOrderInTransation = orderInTransaction.acceptedOffers.map((offer) => {
+//                 return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
+//                     ? offer.itemOffered.id
+//                     : '';
+//             });
+//             const reservationIdsByOrder = order.acceptedOffers.map((offer) => {
+//                 return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
+//                     ? offer.itemOffered.id
+//                     : '';
+//             });
+//             debug('reservationIdsByOrderInTransation:', reservationIdsByOrderInTransation);
+//             debug('reservationIdsByOrder:', reservationIdsByOrder);
+//             const offerIdsByOrderInTransation = [...new Set(orderInTransaction.acceptedOffers.map((offer) => {
+//                 return String(offer.id);
+//             }))];
+//             const offerIdsByOrder = [...new Set(order.acceptedOffers.map((offer) => {
+//                 return String(offer.id);
+//             }))];
+//             debug('offerIdsByOrderInTransation:', offerIdsByOrderInTransation);
+//             debug('offerIdsByOrder:', offerIdsByOrder);
+//             const reservationIdsMatched = reservationIdsByOrderInTransation.length === reservationIdsByOrder.length
+//                 && reservationIdsByOrderInTransation.every((reservationId) => reservationIdsByOrder.includes(reservationId));
+//             debug('reservationIds matched?', reservationIdsMatched);
+//             const offerIdsMatched = offerIdsByOrderInTransation.length === offerIdsByOrder.length
+//                 && offerIdsByOrderInTransation.every((offerId) => offerIdsByOrder.includes(offerId));
+//             debug('offerIds matched?', offerIdsMatched);
+//             if (!reservationIdsMatched) {
+//                 throw new factory.errors.ServiceUnavailable('reservationIds not matched');
+//             }
+//             if (!offerIdsMatched) {
+//                 throw new factory.errors.ServiceUnavailable('offerIds not matched');
+//             }
+//         }
+//     };
+// }
 /**
  * 注文を作成する
  */
 function placeOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -326,17 +352,17 @@ function placeOrder(params) {
                     purpose: placeOrderTransaction
                 })(repos);
                 // acceptedOffersの内容検証(開発)
-                if (settings_1.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
-                    if (settings_1.USE_VERIFY_ACCEPTED_OFFERS) {
-                        yield verifyAcceptedOffers({ order })(repos);
-                    }
-                }
-                const ignoreAccpetedOffersFromResult = ((_c = (_b = placeOrderTransaction.result) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.ignoreAccpetedOffersFromResult) === true;
+                // if (USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
+                //     if (USE_VERIFY_ACCEPTED_OFFERS) {
+                //         await verifyAcceptedOffers({ order })(repos);
+                //     }
+                // }
+                // const ignoreAccpetedOffersFromResult = placeOrderTransaction.result?.options?.ignoreAccpetedOffersFromResult === true;
                 // orderInTransactionを考慮(2024-01-14~)
-                yield repos.orderInTransaction.placeOrder(order, { ignoreAccpetedOffersFromResult });
-                if (!ignoreAccpetedOffersFromResult) {
-                    yield repos.order.createIfNotExist(order);
-                }
+                yield repos.orderInTransaction.placeOrder(order);
+                // if (!ignoreAccpetedOffersFromResult) {
+                //     await repos.order.createIfNotExist(order);
+                // }
             }
             catch (error) {
                 try {

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -19,10 +19,6 @@ interface IConfirmOperationRepos {
 type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
 type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
     options: {
-        /**
-         * 取引resultから注文オファーを作成するかどうか
-         */
-        ignoreAccpetedOffersFromResult: boolean;
         /**
          * 確定レスポンスに予約IDを含めるかどうか(ttts対応)
          */

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -24,7 +24,6 @@ exports.confirm = void 0;
 const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 const potentialActions_1 = require("./potentialActions");
 const publishCode_1 = require("./publishCode");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
@@ -151,7 +150,6 @@ function createReservationIdsResult(order) {
     return { eventId, reservationIds };
 }
 function createResult(params) {
-    var _a;
     const transaction = params.transaction;
     // 取引の確定条件が全て整っているかどうか確認
     (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
@@ -194,13 +192,12 @@ function createResult(params) {
     order.url = url;
     const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
     let orderAsResult;
-    if (settings_1.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
-        orderAsResult = order;
-    }
-    else {
-        const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-        orderAsResult = orderWithoutAcceptedOffers;
-    }
+    // if (USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT) {
+    //     orderAsResult = order;
+    // } else {
+    // }
+    const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
+    orderAsResult = orderWithoutAcceptedOffers;
     let eventId;
     let reservationIds;
     if (params.options.expectsReservationIds) {
@@ -212,7 +209,7 @@ function createResult(params) {
     return {
         orderWithAcceptedOffers: order,
         result: Object.assign({ order: orderAsResult, authorizeActions, numAcceptedOffers: order.acceptedOffers.length, options: {
-                ignoreAccpetedOffersFromResult: ((_a = params.options) === null || _a === void 0 ? void 0 : _a.ignoreAccpetedOffersFromResult) === true
+                ignoreAccpetedOffersFromResult: true
             } }, (typeof params.code === 'string') ? { code: params.code } : undefined),
         eventId,
         reservationIds

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateStartRequest.js

@@ -15,13 +15,13 @@ const factory = require("../../../../factory");
 function verifyMembershipToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
-        const { secret, token } = params;
+        const { issuer, secret, token } = params;
         if (typeof token === 'string' && token.length > 0) {
             try {
                 result = yield new Promise((resolve, reject) => {
                     jwt.verify(token, secret, {
-                    // issuer: credentials.jwt.issuer,
-                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+                        issuer
+                        // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
                     }, (err, decoded) => {
                         if (err instanceof Error) {
                             reject(err);
@@ -51,7 +51,7 @@ function verifyMembershipToken(params) {
 }
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,
@@ -103,8 +103,9 @@ function validateStartRequest(params) {
         let memeberOfPayload;
         if (Array.isArray(iamMember.member.member)) {
             const verifySecret = (_d = (_c = iamMember.member.member[0]) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.secret; // ひとまず1種類のメンバーシップのみ対応
+            const verifyIssuer = (_f = (_e = iamMember.member.member[0]) === null || _e === void 0 ? void 0 : _e.memberOf) === null || _f === void 0 ? void 0 : _f.issuer; // ひとまず1種類のメンバーシップのみ対応
             if (typeof verifySecret === 'string') {
-                memeberOfPayload = yield verifyMembershipToken({ token: params.memberOfToken, secret: verifySecret });
+                memeberOfPayload = yield verifyMembershipToken({ token: params.memberOfToken, secret: verifySecret, issuer: verifyIssuer });
             }
         }
         return { makesOfferFromClient, memeberOfPayload, seller };

package/lib/chevre/service/transaction/validation.d.ts

@@ -1,8 +1,13 @@
+/**
+ * 取引バリデーション
+ */
+import * as jwt from 'jsonwebtoken';
 import * as factory from '../../factory';
 import { IPassportValidator } from '../../factory/transaction';
 export type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {
     passportValidator?: IPassportValidator;
 };
+export declare function createPassport(params: string | jwt.JwtPayload | undefined): factory.waiter.passport.IPassport;
 export declare function validateWaiterPassport(params: IStartParams): Promise<{
     passport: factory.waiter.passport.IPassport | undefined;
     customerType?: string;

package/lib/chevre/service/transaction/validation.js

@@ -9,12 +9,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateWaiterPassport = void 0;
+exports.validateWaiterPassport = exports.createPassport = void 0;
 /**
  * 取引バリデーション
  */
-const waiter = require("@waiter/domain");
+const jwt = require("jsonwebtoken");
 const factory = require("../../factory");
+function createPassport(params) {
+    var _a;
+    if (typeof params === 'string' || params === undefined) {
+        throw new factory.errors.Argument('decoded must be an object');
+    }
+    // eslint-disable-next-line no-magic-numbers
+    if (typeof params.scope !== 'string' || params.scope.length === 0) {
+        throw new factory.errors.ArgumentNull('scope');
+    }
+    if (typeof params.iat !== 'number') {
+        throw new factory.errors.Argument('iat', 'iat must be number');
+    }
+    if (typeof params.exp !== 'number') {
+        throw new factory.errors.Argument('exp', 'exp must be number');
+    }
+    // eslint-disable-next-line no-magic-numbers
+    if (typeof params.iss !== 'string' || params.iss.length === 0) {
+        throw new factory.errors.ArgumentNull('iss');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, no-magic-numbers
+    if (typeof ((_a = params.issueUnit) === null || _a === void 0 ? void 0 : _a.identifier) !== 'string' || params.issueUnit.identifier.length === 0) {
+        throw new factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    if (typeof params.issueUnit.numberOfRequests !== 'number') {
+        throw new factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
+    }
+    return Object.assign({ scope: params.scope, iat: params.iat, exp: params.exp, iss: params.iss, 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        project: params.project, 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        issueUnit: params.issueUnit }, (Array.isArray(params.aud)) ? { aud: params.aud } : undefined);
+}
+exports.createPassport = createPassport;
+/**
+ * 暗号化された許可証を検証する
+ */
+function verify(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            jwt.verify(params.token, params.secret, (err, decoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    const passport = createPassport(decoded);
+                    resolve(passport);
+                }
+            });
+        });
+    });
+}
 function validateWaiterPassport(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -23,7 +75,7 @@ function validateWaiterPassport(params) {
         // WAITER許可証トークンがあれば検証する
         if (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') {
             try {
-                passport = yield (yield waiter.service.passport.createService()).verify({
+                passport = yield verify({
                     token: params.object.passport.token,
                     secret: params.object.passport.secret
                 });

package/lib/chevre/settings.d.ts

@@ -40,8 +40,6 @@ export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const USE_FETCH_API: boolean;
 export declare const USE_INFORM_ORDER_IN_TRANSIT: boolean;
 export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
-export declare const USE_VERIFY_ACCEPTED_OFFERS: boolean;
-export declare const USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT: boolean;
 export declare const USE_MINIMIZED_PAY_TASK: boolean;
 export declare const USE_KANA_NAME_IN_ACCEPTED_OFFER: boolean;
 export declare const MONGO_MAX_TIME_MS: number;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT = exports.USE_VERIFY_ACCEPTED_OFFERS = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -64,8 +64,6 @@ exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1
 exports.USE_FETCH_API = process.env.USE_FETCH_API === '1';
 exports.USE_INFORM_ORDER_IN_TRANSIT = process.env.USE_INFORM_ORDER_IN_TRANSIT === '1';
 exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING === '1';
-exports.USE_VERIFY_ACCEPTED_OFFERS = process.env.USE_VERIFY_ACCEPTED_OFFERS === '1';
-exports.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT = process.env.USE_ACCEPTED_OFFERS_AS_TRANSACTION_RESULT === '1';
 exports.USE_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';
 exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = process.env.USE_KANA_NAME_IN_ACCEPTED_OFFER === '1';
 // export const USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK = process.env.USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK === '1';

package/package.json

@@ -10,13 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.354.0",
-    "@cinerino/sdk": "5.11.0",
+    "@chevre/factory": "4.355.0-alpha.1",
+    "@cinerino/sdk": "5.12.0-alpha.0",
     "@motionpicture/coa-service": "9.3.0-alpha.5",
     "@motionpicture/gmo-service": "5.3.0-alpha.4",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.2.0",
-    "@waiter/domain": "6.4.0-alpha.4",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -111,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.21.0-alpha.9"
+  "version": "21.21.0"
 }