gs2 1.3.175 → 1.3.176

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,9 +9,8 @@ export default class FormModel implements IModel {
9
9
  static getOwnerId(grn: string): string | null;
10
10
  static getNamespaceName(grn: string): string | null;
11
11
  static getMoldModelName(grn: string): string | null;
12
- static getFormModelName(grn: string): string | null;
13
12
  static isValid(grn: string): boolean;
14
- static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, moldModelName: string | null, formModelName: string | null): string | null;
13
+ static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, moldModelName: string | null): string | null;
15
14
  getFormModelId(): string | null;
16
15
  setFormModelId(formModelId: string | null): this;
17
16
  withFormModelId(formModelId: string | null): this;
@@ -17,7 +17,7 @@ permissions and limitations under the License.
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  var tslib_1 = require("tslib");
19
19
  var SlotModel_1 = tslib_1.__importDefault(require("./SlotModel"));
20
- var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:model:form:{formModelName}";
20
+ var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:form";
21
21
  var FormModel = /** @class */ (function () {
22
22
  function FormModel() {
23
23
  this.formModelId = null;
@@ -30,8 +30,7 @@ var FormModel = /** @class */ (function () {
30
30
  .replace('{region}', '(.*)')
31
31
  .replace('{ownerId}', '.*')
32
32
  .replace('{namespaceName}', '.*')
33
- .replace('{moldModelName}', '.*')
34
- .replace('{formModelName}', '.*'));
33
+ .replace('{moldModelName}', '.*'));
35
34
  if (match) {
36
35
  return match[1];
37
36
  }
@@ -42,8 +41,7 @@ var FormModel = /** @class */ (function () {
42
41
  .replace('{region}', '.*')
43
42
  .replace('{ownerId}', '(.*)')
44
43
  .replace('{namespaceName}', '.*')
45
- .replace('{moldModelName}', '.*')
46
- .replace('{formModelName}', '.*'));
44
+ .replace('{moldModelName}', '.*'));
47
45
  if (match) {
48
46
  return match[1];
49
47
  }
@@ -54,8 +52,7 @@ var FormModel = /** @class */ (function () {
54
52
  .replace('{region}', '.*')
55
53
  .replace('{ownerId}', '.*')
56
54
  .replace('{namespaceName}', '(.*)')
57
- .replace('{moldModelName}', '.*')
58
- .replace('{formModelName}', '.*'));
55
+ .replace('{moldModelName}', '.*'));
59
56
  if (match) {
60
57
  return match[1];
61
58
  }
@@ -66,20 +63,7 @@ var FormModel = /** @class */ (function () {
66
63
  .replace('{region}', '.*')
67
64
  .replace('{ownerId}', '.*')
68
65
  .replace('{namespaceName}', '.*')
69
- .replace('{moldModelName}', '(.*)')
70
- .replace('{formModelName}', '.*'));
71
- if (match) {
72
- return match[1];
73
- }
74
- return null;
75
- };
76
- FormModel.getFormModelName = function (grn) {
77
- var match = grn.match(grnFormat
78
- .replace('{region}', '.*')
79
- .replace('{ownerId}', '.*')
80
- .replace('{namespaceName}', '.*')
81
- .replace('{moldModelName}', '.*')
82
- .replace('{formModelName}', '(.*)'));
66
+ .replace('{moldModelName}', '(.*)'));
83
67
  if (match) {
84
68
  return match[1];
85
69
  }
@@ -98,18 +82,14 @@ var FormModel = /** @class */ (function () {
98
82
  if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
99
83
  return false;
100
84
  }
101
- if (this.getFormModelName(grn) == null || this.getFormModelName(grn) === '') {
102
- return false;
103
- }
104
85
  return true;
105
86
  };
106
- FormModel.createGrn = function (region, ownerId, namespaceName, moldModelName, formModelName) {
87
+ FormModel.createGrn = function (region, ownerId, namespaceName, moldModelName) {
107
88
  return grnFormat
108
89
  .replace('{region}', region !== null && region !== void 0 ? region : '')
109
90
  .replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
110
91
  .replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
111
- .replace('{moldModelName}', moldModelName !== null && moldModelName !== void 0 ? moldModelName : '')
112
- .replace('{formModelName}', formModelName !== null && formModelName !== void 0 ? formModelName : '');
92
+ .replace('{moldModelName}', moldModelName !== null && moldModelName !== void 0 ? moldModelName : '');
113
93
  };
114
94
  FormModel.prototype.getFormModelId = function () {
115
95
  return this.formModelId;
@@ -1 +1 @@
1
- {"version":3,"file":"FormModel.js","sourceRoot":"","sources":["FormModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FormModel.js","sourceRoot":"","sources":["FormModel.ts"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@ permissions and limitations under the License.
16
16
 
17
17
  import IModel from '../../core/interface/IModel';
18
18
  import SlotModel from './SlotModel';
19
- const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:model:form:{formModelName}";
19
+ const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:form";
20
20
 
21
21
  export default class FormModel implements IModel {
22
22
  private formModelId: string|null = null;
@@ -30,7 +30,6 @@ export default class FormModel implements IModel {
30
30
  .replace('{ownerId}', '.*')
31
31
  .replace('{namespaceName}', '.*')
32
32
  .replace('{moldModelName}', '.*')
33
- .replace('{formModelName}', '.*')
34
33
  );
35
34
  if (match) {
36
35
  return match[1];
@@ -44,7 +43,6 @@ export default class FormModel implements IModel {
44
43
  .replace('{ownerId}', '(.*)')
45
44
  .replace('{namespaceName}', '.*')
46
45
  .replace('{moldModelName}', '.*')
47
- .replace('{formModelName}', '.*')
48
46
  );
49
47
  if (match) {
50
48
  return match[1];
@@ -58,7 +56,6 @@ export default class FormModel implements IModel {
58
56
  .replace('{ownerId}', '.*')
59
57
  .replace('{namespaceName}', '(.*)')
60
58
  .replace('{moldModelName}', '.*')
61
- .replace('{formModelName}', '.*')
62
59
  );
63
60
  if (match) {
64
61
  return match[1];
@@ -72,21 +69,6 @@ export default class FormModel implements IModel {
72
69
  .replace('{ownerId}', '.*')
73
70
  .replace('{namespaceName}', '.*')
74
71
  .replace('{moldModelName}', '(.*)')
75
- .replace('{formModelName}', '.*')
76
- );
77
- if (match) {
78
- return match[1];
79
- }
80
- return null;
81
- }
82
-
83
- public static getFormModelName(grn: string): string|null {
84
- const match = grn.match(grnFormat
85
- .replace('{region}', '.*')
86
- .replace('{ownerId}', '.*')
87
- .replace('{namespaceName}', '.*')
88
- .replace('{moldModelName}', '.*')
89
- .replace('{formModelName}', '(.*)')
90
72
  );
91
73
  if (match) {
92
74
  return match[1];
@@ -107,9 +89,6 @@ export default class FormModel implements IModel {
107
89
  if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
108
90
  return false;
109
91
  }
110
- if (this.getFormModelName(grn) == null || this.getFormModelName(grn) === '') {
111
- return false;
112
- }
113
92
  return true;
114
93
  }
115
94
 
@@ -118,14 +97,12 @@ export default class FormModel implements IModel {
118
97
  ownerId: string|null,
119
98
  namespaceName: string|null,
120
99
  moldModelName: string|null,
121
- formModelName: string|null,
122
100
  ): string|null {
123
101
  return grnFormat
124
102
  .replace('{region}', region ?? '')
125
103
  .replace('{ownerId}', ownerId ?? '')
126
104
  .replace('{namespaceName}', namespaceName ?? '')
127
- .replace('{moldModelName}', moldModelName ?? '')
128
- .replace('{formModelName}', formModelName ?? '');
105
+ .replace('{moldModelName}', moldModelName ?? '');
129
106
  }
130
107
  public getFormModelId(): string|null {
131
108
  return this.formModelId;
@@ -1,9 +1,13 @@
1
1
  import IModel from '../../core/interface/IModel';
2
2
  import AcquireAction from './AcquireAction';
3
3
  export default class BoxItem implements IModel {
4
+ private prizeId;
4
5
  private acquireActions;
5
6
  private remaining;
6
7
  private initial;
8
+ getPrizeId(): string | null;
9
+ setPrizeId(prizeId: string | null): this;
10
+ withPrizeId(prizeId: string | null): this;
7
11
  getAcquireActions(): AcquireAction[] | null;
8
12
  setAcquireActions(acquireActions: AcquireAction[] | null): this;
9
13
  withAcquireActions(acquireActions: AcquireAction[] | null): this;
@@ -19,10 +19,22 @@ var tslib_1 = require("tslib");
19
19
  var AcquireAction_1 = tslib_1.__importDefault(require("./AcquireAction"));
20
20
  var BoxItem = /** @class */ (function () {
21
21
  function BoxItem() {
22
+ this.prizeId = null;
22
23
  this.acquireActions = null;
23
24
  this.remaining = null;
24
25
  this.initial = null;
25
26
  }
27
+ BoxItem.prototype.getPrizeId = function () {
28
+ return this.prizeId;
29
+ };
30
+ BoxItem.prototype.setPrizeId = function (prizeId) {
31
+ this.prizeId = prizeId;
32
+ return this;
33
+ };
34
+ BoxItem.prototype.withPrizeId = function (prizeId) {
35
+ this.prizeId = prizeId;
36
+ return this;
37
+ };
26
38
  BoxItem.prototype.getAcquireActions = function () {
27
39
  return this.acquireActions;
28
40
  };
@@ -61,6 +73,7 @@ var BoxItem = /** @class */ (function () {
61
73
  return null;
62
74
  }
63
75
  return new BoxItem()
76
+ .withPrizeId(data["prizeId"])
64
77
  .withAcquireActions(data.acquireActions ?
65
78
  data.acquireActions.map(function (item) {
66
79
  return AcquireAction_1.default.fromDict(item);
@@ -70,6 +83,7 @@ var BoxItem = /** @class */ (function () {
70
83
  };
71
84
  BoxItem.prototype.toDict = function () {
72
85
  return {
86
+ "prizeId": this.getPrizeId(),
73
87
  "acquireActions": this.getAcquireActions() ?
74
88
  this.getAcquireActions().map(function (item) {
75
89
  return item.toDict();
@@ -1 +1 @@
1
- {"version":3,"file":"BoxItem.js","sourceRoot":"","sources":["BoxItem.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,0EAA4C;AAE5C;IAAA;QACY,mBAAc,GAAyB,IAAI,CAAC;QAC5C,cAAS,GAAgB,IAAI,CAAC;QAC9B,YAAO,GAAgB,IAAI,CAAC;IA4DxC,CAAC;IA3DU,mCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,mCAAiB,GAAxB,UAAyB,cAAoC;QACzD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oCAAkB,GAAzB,UAA0B,cAAoC;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAY,GAAnB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,8BAAY,GAAnB,UAAoB,SAAsB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAa,GAApB,UAAqB,SAAsB;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,gBAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,OAAO,EAAE;aACf,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAC,IAA0B;gBAC/C,OAAO,uBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAChC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,wBAAM,GAAb;QACI,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,iBAAiB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAmB;oBAC9C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE;YAChC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;SAC/B,CAAC;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AA/DD,IA+DC"}
1
+ {"version":3,"file":"BoxItem.js","sourceRoot":"","sources":["BoxItem.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,0EAA4C;AAE5C;IAAA;QACY,YAAO,GAAgB,IAAI,CAAC;QAC5B,mBAAc,GAAyB,IAAI,CAAC;QAC5C,cAAS,GAAgB,IAAI,CAAC;QAC9B,YAAO,GAAgB,IAAI,CAAC;IAyExC,CAAC;IAxEU,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,mCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,mCAAiB,GAAxB,UAAyB,cAAoC;QACzD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oCAAkB,GAAzB,UAA0B,cAAoC;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAY,GAAnB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,8BAAY,GAAnB,UAAoB,SAAsB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAa,GAApB,UAAqB,SAAsB;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,gBAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,OAAO,EAAE;aACf,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC5B,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAC,IAA0B;gBAC/C,OAAO,uBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAChC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,wBAAM,GAAb;QACI,OAAO;YACH,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;YAC5B,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,iBAAiB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAmB;oBAC9C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE;YAChC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;SAC/B,CAAC;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AA7ED,IA6EC"}
@@ -18,9 +18,21 @@ import IModel from '../../core/interface/IModel';
18
18
  import AcquireAction from './AcquireAction';
19
19
 
20
20
  export default class BoxItem implements IModel {
21
+ private prizeId: string|null = null;
21
22
  private acquireActions: AcquireAction[]|null = null;
22
23
  private remaining: number|null = null;
23
24
  private initial: number|null = null;
25
+ public getPrizeId(): string|null {
26
+ return this.prizeId;
27
+ }
28
+ public setPrizeId(prizeId: string|null) {
29
+ this.prizeId = prizeId;
30
+ return this;
31
+ }
32
+ public withPrizeId(prizeId: string|null): this {
33
+ this.prizeId = prizeId;
34
+ return this;
35
+ }
24
36
  public getAcquireActions(): AcquireAction[]|null {
25
37
  return this.acquireActions;
26
38
  }
@@ -60,6 +72,7 @@ export default class BoxItem implements IModel {
60
72
  return null;
61
73
  }
62
74
  return new BoxItem()
75
+ .withPrizeId(data["prizeId"])
63
76
  .withAcquireActions(data.acquireActions ?
64
77
  data.acquireActions.map((item: {[key: string]: any}) => {
65
78
  return AcquireAction.fromDict(item);
@@ -71,6 +84,7 @@ export default class BoxItem implements IModel {
71
84
 
72
85
  public toDict(): {[key: string]: any} {
73
86
  return {
87
+ "prizeId": this.getPrizeId(),
74
88
  "acquireActions": this.getAcquireActions() ?
75
89
  this.getAcquireActions()!.map((item: AcquireAction) => {
76
90
  return item.toDict();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gs2",
3
- "version": "1.3.175",
3
+ "version": "1.3.176",
4
4
  "scripts": {
5
5
  "build": "tsc",
6
6
  "prepublishOnly": "npm run build"