gs2-cdk 1.0.111 → 1.0.113

package/mission/model/CounterScopeModel.ts

@@ -15,20 +15,20 @@
  */
 import { VerifyAction } from "../../core/model";
 import { CounterScopeModelOptions } from "./options/CounterScopeModelOptions";
-import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions";
-import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions";
 import { CounterScopeModelResetTypeIsNotResetOptions } from "./options/CounterScopeModelResetTypeIsNotResetOptions";
 import { CounterScopeModelResetTypeIsDailyOptions } from "./options/CounterScopeModelResetTypeIsDailyOptions";
 import { CounterScopeModelResetTypeIsWeeklyOptions } from "./options/CounterScopeModelResetTypeIsWeeklyOptions";
 import { CounterScopeModelResetTypeIsMonthlyOptions } from "./options/CounterScopeModelResetTypeIsMonthlyOptions";
 import { CounterScopeModelResetTypeIsDaysOptions } from "./options/CounterScopeModelResetTypeIsDaysOptions";
+import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions";
+import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions";
 import { CounterScopeModelScopeType } from "./enums/CounterScopeModelScopeType";
 import { CounterScopeModelResetType } from "./enums/CounterScopeModelResetType";
 import { CounterScopeModelResetDayOfWeek } from "./enums/CounterScopeModelResetDayOfWeek";
 
 export default class CounterScopeModel {
     private readonly scopeType: CounterScopeModelScopeType;
-    private readonly resetType: CounterScopeModelResetType|null = null;
+    private readonly resetType: CounterScopeModelResetType;
     private readonly resetDayOfMonth: number|null = null;
     private readonly resetDayOfWeek: CounterScopeModelResetDayOfWeek|null = null;
     private readonly resetHour: number|null = null;
@@ -39,10 +39,11 @@ export default class CounterScopeModel {
 
     public constructor(
         scopeType: CounterScopeModelScopeType,
+        resetType: CounterScopeModelResetType,
         options: CounterScopeModelOptions|null = null,
     ) {
         this.scopeType = scopeType;
-        this.resetType = options?.resetType ?? null;
+        this.resetType = resetType;
         this.resetDayOfMonth = options?.resetDayOfMonth ?? null;
         this.resetDayOfWeek = options?.resetDayOfWeek ?? null;
         this.resetHour = options?.resetHour ?? null;
@@ -52,38 +53,13 @@ export default class CounterScopeModel {
         this.days = options?.days ?? null;
     }
 
-    public static scopeTypeIsResetTiming(
-        resetType: CounterScopeModelResetType,
-        options: CounterScopeModelScopeTypeIsResetTimingOptions|null = null,
-    ): CounterScopeModel {
-        return new CounterScopeModel(
-            CounterScopeModelScopeType.RESET_TIMING,
-            {
-                resetType: resetType,
-            },
-        );
-    }
-
-    public static scopeTypeIsVerifyAction(
-        conditionName: string,
-        condition: VerifyAction,
-        options: CounterScopeModelScopeTypeIsVerifyActionOptions|null = null,
-    ): CounterScopeModel {
-        return new CounterScopeModel(
-            CounterScopeModelScopeType.VERIFY_ACTION,
-            {
-                conditionName: conditionName,
-                condition: condition,
-            },
-        );
-    }
-
     public static resetTypeIsNotReset(
         scopeType: CounterScopeModelScopeType,
         options: CounterScopeModelResetTypeIsNotResetOptions|null = null,
     ): CounterScopeModel {
         return new CounterScopeModel(
             scopeType,
+            CounterScopeModelResetType.NOT_RESET,
             {
             },
         );
@@ -96,6 +72,7 @@ export default class CounterScopeModel {
     ): CounterScopeModel {
         return new CounterScopeModel(
             scopeType,
+            CounterScopeModelResetType.DAILY,
             {
                 resetHour: resetHour,
             },
@@ -110,6 +87,7 @@ export default class CounterScopeModel {
     ): CounterScopeModel {
         return new CounterScopeModel(
             scopeType,
+            CounterScopeModelResetType.WEEKLY,
             {
                 resetDayOfWeek: resetDayOfWeek,
                 resetHour: resetHour,
@@ -125,6 +103,7 @@ export default class CounterScopeModel {
     ): CounterScopeModel {
         return new CounterScopeModel(
             scopeType,
+            CounterScopeModelResetType.MONTHLY,
             {
                 resetDayOfMonth: resetDayOfMonth,
                 resetHour: resetHour,
@@ -140,6 +119,7 @@ export default class CounterScopeModel {
     ): CounterScopeModel {
         return new CounterScopeModel(
             scopeType,
+            CounterScopeModelResetType.DAYS,
             {
                 anchorTimestamp: anchorTimestamp,
                 days: days,
@@ -147,6 +127,34 @@ export default class CounterScopeModel {
         );
     }
 
+    public static scopeTypeIsResetTiming(
+        resetType: CounterScopeModelResetType,
+        options: CounterScopeModelScopeTypeIsResetTimingOptions|null = null,
+    ): CounterScopeModel {
+        return new CounterScopeModel(
+            CounterScopeModelScopeType.RESET_TIMING,
+            resetType,
+            {
+            },
+        );
+    }
+
+    public static scopeTypeIsVerifyAction(
+        resetType: CounterScopeModelResetType,
+        conditionName: string,
+        condition: VerifyAction,
+        options: CounterScopeModelScopeTypeIsVerifyActionOptions|null = null,
+    ): CounterScopeModel {
+        return new CounterScopeModel(
+            CounterScopeModelScopeType.VERIFY_ACTION,
+            resetType,
+            {
+                conditionName: conditionName,
+                condition: condition,
+            },
+        );
+    }
+
     public properties(
     ): {[name: string]: any} {
         let properties: {[name: string]: any} = {};

package/mission/model/index.d.ts

@@ -3,13 +3,13 @@ import { CounterScopeModelOptions } from "./options/CounterScopeModelOptions";
 import { CounterScopeModelScopeType } from "./enums/CounterScopeModelScopeType";
 import { CounterScopeModelResetType } from "./enums/CounterScopeModelResetType";
 import { CounterScopeModelResetDayOfWeek } from "./enums/CounterScopeModelResetDayOfWeek";
-import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions";
-import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions";
 import { CounterScopeModelResetTypeIsNotResetOptions } from "./options/CounterScopeModelResetTypeIsNotResetOptions";
 import { CounterScopeModelResetTypeIsDailyOptions } from "./options/CounterScopeModelResetTypeIsDailyOptions";
 import { CounterScopeModelResetTypeIsWeeklyOptions } from "./options/CounterScopeModelResetTypeIsWeeklyOptions";
 import { CounterScopeModelResetTypeIsMonthlyOptions } from "./options/CounterScopeModelResetTypeIsMonthlyOptions";
 import { CounterScopeModelResetTypeIsDaysOptions } from "./options/CounterScopeModelResetTypeIsDaysOptions";
+import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions";
+import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions";
 import Namespace from "./Namespace";
 import { NamespaceOptions } from "./options/NamespaceOptions";
 import CounterModel from "./CounterModel";
@@ -50,4 +50,4 @@ import { AcquireActionResultOptions } from "./options/AcquireActionResultOptions
 import TransactionResult from "./TransactionResult";
 import { TransactionResultOptions } from "./options/TransactionResultOptions";
 import CurrentMasterData from "./CurrentMasterData";
-export { CounterScopeModel, CounterScopeModelOptions, CounterScopeModelScopeType, CounterScopeModelResetType, CounterScopeModelResetDayOfWeek, CounterScopeModelScopeTypeIsResetTimingOptions, CounterScopeModelScopeTypeIsVerifyActionOptions, CounterScopeModelResetTypeIsNotResetOptions, CounterScopeModelResetTypeIsDailyOptions, CounterScopeModelResetTypeIsWeeklyOptions, CounterScopeModelResetTypeIsMonthlyOptions, CounterScopeModelResetTypeIsDaysOptions, Namespace, NamespaceOptions, CounterModel, CounterModelOptions, MissionGroupModel, MissionGroupModelOptions, MissionGroupModelResetType, MissionGroupModelResetDayOfWeek, MissionGroupModelResetTypeIsNotResetOptions, MissionGroupModelResetTypeIsDailyOptions, MissionGroupModelResetTypeIsWeeklyOptions, MissionGroupModelResetTypeIsMonthlyOptions, MissionGroupModelResetTypeIsDaysOptions, MissionTaskModel, MissionTaskModelOptions, MissionTaskModelVerifyCompleteType, MissionTaskModelTargetResetType, MissionTaskModelVerifyCompleteTypeIsCounterOptions, MissionTaskModelVerifyCompleteTypeIsVerifyActionsOptions, ScopedValue, ScopedValueOptions, ScopedValueScopeType, ScopedValueResetType, ScopedValueScopeTypeIsResetTimingOptions, ScopedValueScopeTypeIsVerifyActionOptions, TargetCounterModel, TargetCounterModelOptions, TargetCounterModelScopeType, TargetCounterModelResetType, TargetCounterModelScopeTypeIsResetTimingOptions, TargetCounterModelScopeTypeIsVerifyActionOptions, VerifyActionResult, VerifyActionResultOptions, ConsumeActionResult, ConsumeActionResultOptions, AcquireActionResult, AcquireActionResultOptions, TransactionResult, TransactionResultOptions, CurrentMasterData, };
+export { CounterScopeModel, CounterScopeModelOptions, CounterScopeModelScopeType, CounterScopeModelResetType, CounterScopeModelResetDayOfWeek, CounterScopeModelResetTypeIsNotResetOptions, CounterScopeModelResetTypeIsDailyOptions, CounterScopeModelResetTypeIsWeeklyOptions, CounterScopeModelResetTypeIsMonthlyOptions, CounterScopeModelResetTypeIsDaysOptions, CounterScopeModelScopeTypeIsResetTimingOptions, CounterScopeModelScopeTypeIsVerifyActionOptions, Namespace, NamespaceOptions, CounterModel, CounterModelOptions, MissionGroupModel, MissionGroupModelOptions, MissionGroupModelResetType, MissionGroupModelResetDayOfWeek, MissionGroupModelResetTypeIsNotResetOptions, MissionGroupModelResetTypeIsDailyOptions, MissionGroupModelResetTypeIsWeeklyOptions, MissionGroupModelResetTypeIsMonthlyOptions, MissionGroupModelResetTypeIsDaysOptions, MissionTaskModel, MissionTaskModelOptions, MissionTaskModelVerifyCompleteType, MissionTaskModelTargetResetType, MissionTaskModelVerifyCompleteTypeIsCounterOptions, MissionTaskModelVerifyCompleteTypeIsVerifyActionsOptions, ScopedValue, ScopedValueOptions, ScopedValueScopeType, ScopedValueResetType, ScopedValueScopeTypeIsResetTimingOptions, ScopedValueScopeTypeIsVerifyActionOptions, TargetCounterModel, TargetCounterModelOptions, TargetCounterModelScopeType, TargetCounterModelResetType, TargetCounterModelScopeTypeIsResetTimingOptions, TargetCounterModelScopeTypeIsVerifyActionOptions, VerifyActionResult, VerifyActionResultOptions, ConsumeActionResult, ConsumeActionResultOptions, AcquireActionResult, AcquireActionResultOptions, TransactionResult, TransactionResultOptions, CurrentMasterData, };

package/mission/model/index.ts

@@ -18,13 +18,13 @@ import { CounterScopeModelOptions } from "./options/CounterScopeModelOptions";
 import { CounterScopeModelScopeType } from "./enums/CounterScopeModelScopeType";
 import { CounterScopeModelResetType } from "./enums/CounterScopeModelResetType";
 import { CounterScopeModelResetDayOfWeek } from "./enums/CounterScopeModelResetDayOfWeek";
-import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions"
-import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions"
 import { CounterScopeModelResetTypeIsNotResetOptions } from "./options/CounterScopeModelResetTypeIsNotResetOptions"
 import { CounterScopeModelResetTypeIsDailyOptions } from "./options/CounterScopeModelResetTypeIsDailyOptions"
 import { CounterScopeModelResetTypeIsWeeklyOptions } from "./options/CounterScopeModelResetTypeIsWeeklyOptions"
 import { CounterScopeModelResetTypeIsMonthlyOptions } from "./options/CounterScopeModelResetTypeIsMonthlyOptions"
 import { CounterScopeModelResetTypeIsDaysOptions } from "./options/CounterScopeModelResetTypeIsDaysOptions"
+import { CounterScopeModelScopeTypeIsResetTimingOptions } from "./options/CounterScopeModelScopeTypeIsResetTimingOptions"
+import { CounterScopeModelScopeTypeIsVerifyActionOptions } from "./options/CounterScopeModelScopeTypeIsVerifyActionOptions"
 import Namespace from "./Namespace";
 import { NamespaceOptions } from "./options/NamespaceOptions";
 import CounterModel from "./CounterModel";
@@ -72,13 +72,13 @@ export {
     CounterScopeModelScopeType,
     CounterScopeModelResetType,
     CounterScopeModelResetDayOfWeek,
-    CounterScopeModelScopeTypeIsResetTimingOptions,
-    CounterScopeModelScopeTypeIsVerifyActionOptions,
     CounterScopeModelResetTypeIsNotResetOptions,
     CounterScopeModelResetTypeIsDailyOptions,
     CounterScopeModelResetTypeIsWeeklyOptions,
     CounterScopeModelResetTypeIsMonthlyOptions,
     CounterScopeModelResetTypeIsDaysOptions,
+    CounterScopeModelScopeTypeIsResetTimingOptions,
+    CounterScopeModelScopeTypeIsVerifyActionOptions,
     Namespace,
     NamespaceOptions,
     CounterModel,

package/mission/model/options/CounterScopeModelOptions.d.ts

@@ -1,8 +1,6 @@
 import { VerifyAction } from "../../../core/model";
-import { CounterScopeModelResetType } from "../enums/CounterScopeModelResetType";
 import { CounterScopeModelResetDayOfWeek } from "../enums/CounterScopeModelResetDayOfWeek";
 export interface CounterScopeModelOptions {
-    resetType?: CounterScopeModelResetType | null;
     resetDayOfMonth?: number | null;
     resetDayOfWeek?: CounterScopeModelResetDayOfWeek | null;
     resetHour?: number | null;

package/mission/model/options/CounterScopeModelOptions.ts

@@ -19,7 +19,6 @@ import { CounterScopeModelResetType } from "../enums/CounterScopeModelResetType"
 import { CounterScopeModelResetDayOfWeek } from "../enums/CounterScopeModelResetDayOfWeek";
 
 export interface CounterScopeModelOptions {
-    resetType?: CounterScopeModelResetType|null;
     resetDayOfMonth?: number|null;
     resetDayOfWeek?: CounterScopeModelResetDayOfWeek|null;
     resetHour?: number|null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs2-cdk",
-  "version": "1.0.111",
+  "version": "1.0.113",
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"