@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/errorHandler.js

@@ -1,13 +1,4 @@
 "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.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME = exports.MongoErrorCode = void 0;
 exports.isMongoError = isMongoError;
@@ -35,63 +26,57 @@ var MongoErrorCode;
     MongoErrorCode[MongoErrorCode["ExceededTimeLimit"] = 262] = "ExceededTimeLimit";
     MongoErrorCode[MongoErrorCode["DuplicateKey"] = 11000] = "DuplicateKey";
 })(MongoErrorCode || (exports.MongoErrorCode = MongoErrorCode = {}));
-function isMongoError(error) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (mongo === undefined) {
-            mongo = (yield Promise.resolve().then(() => require('mongoose'))).mongo;
-        }
-        return (error instanceof mongo.MongoError || error instanceof mongo.MongoServerError);
-    });
+async function isMongoError(error) {
+    if (mongo === undefined) {
+        mongo = (await Promise.resolve().then(() => require('mongoose'))).mongo;
+    }
+    return (error instanceof mongo.MongoError || error instanceof mongo.MongoServerError);
 }
-function handleMongoError(error) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        if (mongo === undefined) {
-            mongo = (yield Promise.resolve().then(() => require('mongoose'))).mongo;
-        }
-        if (mongooseError === undefined) {
-            mongooseError = (yield Promise.resolve().then(() => require('mongoose'))).Error;
-        }
-        let handledError = error;
-        if (handledError instanceof mongo.MongoError || handledError instanceof mongo.MongoServerError) {
-            switch (handledError.code) {
-                case MongoErrorCode.ConflictUpdateOperator:
-                    handledError = new factory_1.errors.Argument('', `Some updating fields conflict. code:${handledError.code} message:${handledError.message}`);
-                    break;
-                case MongoErrorCode.DuplicateKey:
-                    handledError = new factory_1.errors.AlreadyInUse('', [], `Some fields already in use. code:${handledError.code} message:${handledError.message}`);
-                    break;
-                case MongoErrorCode.MaxTimeMSExpired:
-                case MongoErrorCode.ExceededTimeLimit:
-                    handledError = new factory_1.errors.GatewayTimeout(`Gateway Timeout. name:${handledError.name} code:${handledError.code} message:${handledError.message}`);
-                    break;
-                default:
-            }
-        }
-        if (mongo.BSON.BSONError.isBSONError(handledError)) {
-            handledError = new factory_1.errors.Argument('', handledError.message);
-        }
-        // handle CastError(2025-10-27~)
-        // CastError: Cast to ObjectId failed for value "xxx" (type string) at path "_id" for model "xxxxxxxxxxxxx"
-        if (handledError instanceof mongooseError.CastError) {
-            handledError = new factory_1.errors.Argument(`${(_a = handledError.model) === null || _a === void 0 ? void 0 : _a.modelName}.${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
+async function handleMongoError(error) {
+    if (mongo === undefined) {
+        mongo = (await Promise.resolve().then(() => require('mongoose'))).mongo;
+    }
+    if (mongooseError === undefined) {
+        mongooseError = (await Promise.resolve().then(() => require('mongoose'))).Error;
+    }
+    let handledError = error;
+    if (handledError instanceof mongo.MongoError || handledError instanceof mongo.MongoServerError) {
+        switch (handledError.code) {
+            case MongoErrorCode.ConflictUpdateOperator:
+                handledError = new factory_1.errors.Argument('', `Some updating fields conflict. code:${handledError.code} message:${handledError.message}`);
+                break;
+            case MongoErrorCode.DuplicateKey:
+                handledError = new factory_1.errors.AlreadyInUse('', [], `Some fields already in use. code:${handledError.code} message:${handledError.message}`);
+                break;
+            case MongoErrorCode.MaxTimeMSExpired:
+            case MongoErrorCode.ExceededTimeLimit:
+                handledError = new factory_1.errors.GatewayTimeout(`Gateway Timeout. name:${handledError.name} code:${handledError.code} message:${handledError.message}`);
+                break;
+            default:
         }
-        return handledError;
-    });
+    }
+    if (mongo.BSON.BSONError.isBSONError(handledError)) {
+        handledError = new factory_1.errors.Argument('', handledError.message);
+    }
+    // handle CastError(2025-10-27~)
+    // CastError: Cast to ObjectId failed for value "xxx" (type string) at path "_id" for model "xxxxxxxxxxxxx"
+    if (handledError instanceof mongooseError.CastError) {
+        handledError = new factory_1.errors.Argument(`${handledError.model?.modelName}.${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
+    }
+    return handledError;
 }
 /**
  * 汎用的なCOAエラーハンドリング
  */
 // tslint:disable-next-line:no-any
 function handleCOAError(error) {
-    var _a;
     let handledError = error;
     if (error.name === 'AbortError') {
         handledError = new factory_1.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} code:${error.code} message:${error.message}`);
     }
     if (error.name === 'COAServiceError') {
         // error.requestOptions.uriを処理
-        const uri = (_a = error.requestOptions) === null || _a === void 0 ? void 0 : _a.uri;
+        const uri = error.requestOptions?.uri;
         if (error.message === 'ETIMEDOUT' || error.message === 'ESOCKETTIMEDOUT') {
             handledError = new factory_1.errors.GatewayTimeout(`Timeout. name:${error.name} code:${error.code} message:${error.message} uri:${uri}`);
         }
@@ -106,7 +91,6 @@ function handleCOAError(error) {
  */
 // tslint:disable-next-line:no-any
 function handleCOAReserveTemporarilyError(error) {
-    var _a;
     let handledError = error;
     // if (error.message === '座席取得失敗') {
     // }
@@ -121,7 +105,7 @@ function handleCOAReserveTemporarilyError(error) {
             handledError = new factory_1.errors.Argument('Event', error.message);
         }
         else {
-            const uri = (_a = error.requestOptions) === null || _a === void 0 ? void 0 : _a.uri;
+            const uri = error.requestOptions?.uri;
             if (error.message === 'ETIMEDOUT' || error.message === 'ESOCKETTIMEDOUT') {
                 handledError = new factory_1.errors.GatewayTimeout(`Timeout. name:${error.name} code:${error.code} message:${error.message} uri:${uri}`);
             }

package/lib/chevre/factory/event.js

@@ -6,46 +6,73 @@ const factory = require("../factory");
  * 興行イベントのsuperEventを作成する
  */
 function minimizeSuperEvent(params) {
-    const workPerformed = Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, identifier: String(params.superEventFromDB.workPerformed.identifier) }, (typeof params.superEventFromDB.workPerformed.id === 'string')
-        ? { id: params.superEventFromDB.workPerformed.id }
-        : undefined), (params.superEventFromDB.workPerformed.name !== undefined)
-        ? { name: params.superEventFromDB.workPerformed.name }
-        : undefined), (typeof params.superEventFromDB.workPerformed.duration === 'string')
-        ? { duration: params.superEventFromDB.workPerformed.duration }
-        : undefined), (typeof params.superEventFromDB.workPerformed.contentRating === 'string')
-        ? { contentRating: params.superEventFromDB.workPerformed.contentRating }
-        : undefined);
-    const location = Object.assign({ typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
-        ? { name: params.superEventFromDB.location.name }
-        : undefined
-    // 廃止(2024-03-05~)
-    // ...(typeof params.superEventFromDB.location.kanaName === 'string')
-    //     ? { kanaName: params.superEventFromDB.location.kanaName }
-    //     : undefined
-    );
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, id: params.superEventFromDB.id, soundFormat: params.superEventFromDB.soundFormat, workPerformed,
-        location, kanaName: params.superEventFromDB.kanaName, name: Object.assign(Object.assign({}, (typeof params.superEventFromDB.name.en === 'string') ? { en: params.superEventFromDB.name.en } : undefined), (typeof params.superEventFromDB.name.ja === 'string') ? { ja: params.superEventFromDB.name.ja } : undefined) }, (Array.isArray(params.superEventFromDB.additionalProperty))
-        ? { additionalProperty: params.superEventFromDB.additionalProperty }
-        : undefined), (params.superEventFromDB.startDate instanceof Date)
-        ? { startDate: params.superEventFromDB.startDate }
-        : undefined), (params.superEventFromDB.endDate instanceof Date)
-        ? { endDate: params.superEventFromDB.endDate }
-        : undefined), (params.superEventFromDB.description !== undefined)
-        ? { description: params.superEventFromDB.description }
-        : undefined), (params.superEventFromDB.headline !== undefined)
-        ? { headline: params.superEventFromDB.headline }
-        : undefined), (params.superEventFromDB.dubLanguage !== undefined)
-        ? { dubLanguage: params.superEventFromDB.dubLanguage }
-        : undefined), (params.superEventFromDB.subtitleLanguage !== undefined)
-        ? { subtitleLanguage: params.superEventFromDB.subtitleLanguage }
-        : undefined
-    // 完全に廃止(2026-02-10~)
-    // // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMAT_EVENTSで再設定可能)(2026-02-04~)
-    // ...(USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
-    //     ? {
-    //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-    //         videoFormat: params.superEventFromDB.videoFormat
-    //     }
-    //     : undefined
-    );
+    const workPerformed = {
+        typeOf: factory.creativeWorkType.Movie,
+        identifier: String(params.superEventFromDB.workPerformed.identifier),
+        ...(typeof params.superEventFromDB.workPerformed.id === 'string')
+            ? { id: params.superEventFromDB.workPerformed.id }
+            : undefined,
+        ...(params.superEventFromDB.workPerformed.name !== undefined)
+            ? { name: params.superEventFromDB.workPerformed.name }
+            : undefined,
+        ...(typeof params.superEventFromDB.workPerformed.duration === 'string')
+            ? { duration: params.superEventFromDB.workPerformed.duration }
+            : undefined,
+        ...(typeof params.superEventFromDB.workPerformed.contentRating === 'string')
+            ? { contentRating: params.superEventFromDB.workPerformed.contentRating }
+            : undefined
+    };
+    const location = {
+        typeOf: factory.placeType.MovieTheater,
+        id: params.superEventFromDB.location.id,
+        branchCode: params.superEventFromDB.location.branchCode,
+        ...(params.superEventFromDB.location.name !== undefined)
+            ? { name: params.superEventFromDB.location.name }
+            : undefined
+        // 廃止(2024-03-05~)
+        // ...(typeof params.superEventFromDB.location.kanaName === 'string')
+        //     ? { kanaName: params.superEventFromDB.location.kanaName }
+        //     : undefined
+    };
+    return {
+        typeOf: factory.eventType.ScreeningEventSeries,
+        id: params.superEventFromDB.id,
+        soundFormat: params.superEventFromDB.soundFormat,
+        workPerformed,
+        location,
+        kanaName: params.superEventFromDB.kanaName,
+        name: {
+            ...(typeof params.superEventFromDB.name.en === 'string') ? { en: params.superEventFromDB.name.en } : undefined,
+            ...(typeof params.superEventFromDB.name.ja === 'string') ? { ja: params.superEventFromDB.name.ja } : undefined
+        },
+        ...(Array.isArray(params.superEventFromDB.additionalProperty))
+            ? { additionalProperty: params.superEventFromDB.additionalProperty }
+            : undefined,
+        ...(params.superEventFromDB.startDate instanceof Date)
+            ? { startDate: params.superEventFromDB.startDate }
+            : undefined,
+        ...(params.superEventFromDB.endDate instanceof Date)
+            ? { endDate: params.superEventFromDB.endDate }
+            : undefined,
+        ...(params.superEventFromDB.description !== undefined)
+            ? { description: params.superEventFromDB.description }
+            : undefined,
+        ...(params.superEventFromDB.headline !== undefined)
+            ? { headline: params.superEventFromDB.headline }
+            : undefined,
+        ...(params.superEventFromDB.dubLanguage !== undefined)
+            ? { dubLanguage: params.superEventFromDB.dubLanguage }
+            : undefined,
+        ...(params.superEventFromDB.subtitleLanguage !== undefined)
+            ? { subtitleLanguage: params.superEventFromDB.subtitleLanguage }
+            : undefined
+        // 完全に廃止(2026-02-10~)
+        // // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMAT_EVENTSで再設定可能)(2026-02-04~)
+        // ...(USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
+        //     ? {
+        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        //         videoFormat: params.superEventFromDB.videoFormat
+        //     }
+        //     : undefined
+    };
 }

package/lib/chevre/factory/transactionNumber.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberFactory = void 0;
 const crypto_1 = require("crypto");
-const fpe2Module = require("node-fpe-v2");
+const fpe2Module = require("node-fpe");
 const factory = require("../factory");
 // 型定義が新しいtypescriptに適合しないので、強制的に型変更
 const fpe2 = fpe2Module;
@@ -12,6 +12,8 @@ const SEQUENCE_MAX_LENGTH = 2;
  * 取引番号ファクトリー
  */
 class TransactionNumberFactory {
+    fpeSecret;
+    version;
     constructor(params) {
         const { fpeSecret, version } = params;
         this.fpeSecret = fpeSecret;

package/lib/chevre/index.js

@@ -1,13 +1,4 @@
 "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.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
 exports.loadPecorinoapi = loadPecorinoapi;
@@ -28,29 +19,23 @@ exports.service = service;
 const settings = require("./settings");
 exports.settings = settings;
 let pecorinoapi;
-function loadPecorinoapi() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (pecorinoapi === undefined) {
-            pecorinoapi = yield Promise.resolve().then(() => require('./pecorinoapi'));
-        }
-        return pecorinoapi;
-    });
+async function loadPecorinoapi() {
+    if (pecorinoapi === undefined) {
+        pecorinoapi = await Promise.resolve().then(() => require('./pecorinoapi'));
+    }
+    return pecorinoapi;
 }
 let COA;
-function loadCOA() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (COA === undefined) {
-            COA = yield Promise.resolve().then(() => require('@motionpicture/coa-service'));
-        }
-        return COA;
-    });
+async function loadCOA() {
+    if (COA === undefined) {
+        COA = await Promise.resolve().then(() => require('@motionpicture/coa-service'));
+    }
+    return COA;
 }
 let GMO;
-function loadGMO() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (GMO === undefined) {
-            GMO = yield Promise.resolve().then(() => require('@motionpicture/gmo-service'));
-        }
-        return GMO;
-    });
+async function loadGMO() {
+    if (GMO === undefined) {
+        GMO = await Promise.resolve().then(() => require('@motionpicture/gmo-service'));
+    }
+    return GMO;
 }