gs2 1.3.158 → 1.3.160

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.
Files changed (5) hide show
  1. package/dictionary/model/Entry.d.ts +2 -2
  2. package/dictionary/model/Entry.js +10 -10
  3. package/dictionary/model/Entry.js.map +1 -1
  4. package/dictionary/model/Entry.ts +10 -10
  5. package/package.json +1 -1
package/dictionary/model/Entry.d.ts CHANGED
@@ -8,9 +8,9 @@ export default class Entry implements IModel {
8
8
  static getOwnerId(grn: string): string | null;
9
9
  static getNamespaceName(grn: string): string | null;
10
10
  static getUserId(grn: string): string | null;
11
- static getEntryModelName(grn: string): string | null;
11
+ static getEntryName(grn: string): string | null;
12
12
  static isValid(grn: string): boolean;
13
- static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, userId: string | null, entryModelName: string | null): string | null;
13
+ static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, userId: string | null, entryName: string | null): string | null;
14
14
  getEntryId(): string | null;
15
15
  setEntryId(entryId: string | null): this;
16
16
  withEntryId(entryId: string | null): this;
package/dictionary/model/Entry.js CHANGED
@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
15
15
  permissions and limitations under the License.
16
16
  */
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
- var grnFormat = "grn:gs2:{region}:{ownerId}:dictionary:{namespaceName}:user:{userId}:entry:{entryModelName}";
18
+ var grnFormat = "grn:gs2:{region}:{ownerId}:dictionary:{namespaceName}:user:{userId}:entry:{entryName}";
19
19
  var Entry = /** @class */ (function () {
20
20
  function Entry() {
21
21
  this.entryId = null;
@@ -29,7 +29,7 @@ var Entry = /** @class */ (function () {
29
29
  .replace('{ownerId}', '.*')
30
30
  .replace('{namespaceName}', '.*')
31
31
  .replace('{userId}', '.*')
32
- .replace('{entryModelName}', '.*'));
32
+ .replace('{entryName}', '.*'));
33
33
  if (match) {
34
34
  return match[1];
35
35
  }
@@ -41,7 +41,7 @@ var Entry = /** @class */ (function () {
41
41
  .replace('{ownerId}', '(.*)')
42
42
  .replace('{namespaceName}', '.*')
43
43
  .replace('{userId}', '.*')
44
- .replace('{entryModelName}', '.*'));
44
+ .replace('{entryName}', '.*'));
45
45
  if (match) {
46
46
  return match[1];
47
47
  }
@@ -53,7 +53,7 @@ var Entry = /** @class */ (function () {
53
53
  .replace('{ownerId}', '.*')
54
54
  .replace('{namespaceName}', '(.*)')
55
55
  .replace('{userId}', '.*')
56
- .replace('{entryModelName}', '.*'));
56
+ .replace('{entryName}', '.*'));
57
57
  if (match) {
58
58
  return match[1];
59
59
  }
@@ -65,19 +65,19 @@ var Entry = /** @class */ (function () {
65
65
  .replace('{ownerId}', '.*')
66
66
  .replace('{namespaceName}', '.*')
67
67
  .replace('{userId}', '(.*)')
68
- .replace('{entryModelName}', '.*'));
68
+ .replace('{entryName}', '.*'));
69
69
  if (match) {
70
70
  return match[1];
71
71
  }
72
72
  return null;
73
73
  };
74
- Entry.getEntryModelName = function (grn) {
74
+ Entry.getEntryName = function (grn) {
75
75
  var match = grn.match(grnFormat
76
76
  .replace('{region}', '.*')
77
77
  .replace('{ownerId}', '.*')
78
78
  .replace('{namespaceName}', '.*')
79
79
  .replace('{userId}', '.*')
80
- .replace('{entryModelName}', '(.*)'));
80
+ .replace('{entryName}', '(.*)'));
81
81
  if (match) {
82
82
  return match[1];
83
83
  }
@@ -96,18 +96,18 @@ var Entry = /** @class */ (function () {
96
96
  if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
97
97
  return false;
98
98
  }
99
- if (this.getEntryModelName(grn) == null || this.getEntryModelName(grn) === '') {
99
+ if (this.getEntryName(grn) == null || this.getEntryName(grn) === '') {
100
100
  return false;
101
101
  }
102
102
  return true;
103
103
  };
104
- Entry.createGrn = function (region, ownerId, namespaceName, userId, entryModelName) {
104
+ Entry.createGrn = function (region, ownerId, namespaceName, userId, entryName) {
105
105
  return grnFormat
106
106
  .replace('{region}', region !== null && region !== void 0 ? region : '')
107
107
  .replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
108
108
  .replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
109
109
  .replace('{userId}', userId !== null && userId !== void 0 ? userId : '')
110
- .replace('{entryModelName}', entryModelName !== null && entryModelName !== void 0 ? entryModelName : '');
110
+ .replace('{entryName}', entryName !== null && entryName !== void 0 ? entryName : '');
111
111
  };
112
112
  Entry.prototype.getEntryId = function () {
113
113
  return this.entryId;
package/dictionary/model/Entry.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Entry.js","sourceRoot":"","sources":["Entry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Entry.js","sourceRoot":"","sources":["Entry.ts"],"names":[],"mappings":"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"}
package/dictionary/model/Entry.ts CHANGED
@@ -15,7 +15,7 @@ permissions and limitations under the License.
15
15
  */
16
16
 
17
17
  import IModel from '../../core/interface/IModel';
18
- const grnFormat: string = "grn:gs2:{region}:{ownerId}:dictionary:{namespaceName}:user:{userId}:entry:{entryModelName}";
18
+ const grnFormat: string = "grn:gs2:{region}:{ownerId}:dictionary:{namespaceName}:user:{userId}:entry:{entryName}";
19
19
 
20
20
  export default class Entry implements IModel {
21
21
  private entryId: string|null = null;
@@ -29,7 +29,7 @@ export default class Entry implements IModel {
29
29
  .replace('{ownerId}', '.*')
30
30
  .replace('{namespaceName}', '.*')
31
31
  .replace('{userId}', '.*')
32
- .replace('{entryModelName}', '.*')
32
+ .replace('{entryName}', '.*')
33
33
  );
34
34
  if (match) {
35
35
  return match[1];
@@ -43,7 +43,7 @@ export default class Entry implements IModel {
43
43
  .replace('{ownerId}', '(.*)')
44
44
  .replace('{namespaceName}', '.*')
45
45
  .replace('{userId}', '.*')
46
- .replace('{entryModelName}', '.*')
46
+ .replace('{entryName}', '.*')
47
47
  );
48
48
  if (match) {
49
49
  return match[1];
@@ -57,7 +57,7 @@ export default class Entry implements IModel {
57
57
  .replace('{ownerId}', '.*')
58
58
  .replace('{namespaceName}', '(.*)')
59
59
  .replace('{userId}', '.*')
60
- .replace('{entryModelName}', '.*')
60
+ .replace('{entryName}', '.*')
61
61
  );
62
62
  if (match) {
63
63
  return match[1];
@@ -71,7 +71,7 @@ export default class Entry implements IModel {
71
71
  .replace('{ownerId}', '.*')
72
72
  .replace('{namespaceName}', '.*')
73
73
  .replace('{userId}', '(.*)')
74
- .replace('{entryModelName}', '.*')
74
+ .replace('{entryName}', '.*')
75
75
  );
76
76
  if (match) {
77
77
  return match[1];
@@ -79,13 +79,13 @@ export default class Entry implements IModel {
79
79
  return null;
80
80
  }
81
81
 
82
- public static getEntryModelName(grn: string): string|null {
82
+ public static getEntryName(grn: string): string|null {
83
83
  const match = grn.match(grnFormat
84
84
  .replace('{region}', '.*')
85
85
  .replace('{ownerId}', '.*')
86
86
  .replace('{namespaceName}', '.*')
87
87
  .replace('{userId}', '.*')
88
- .replace('{entryModelName}', '(.*)')
88
+ .replace('{entryName}', '(.*)')
89
89
  );
90
90
  if (match) {
91
91
  return match[1];
@@ -106,7 +106,7 @@ export default class Entry implements IModel {
106
106
  if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
107
107
  return false;
108
108
  }
109
- if (this.getEntryModelName(grn) == null || this.getEntryModelName(grn) === '') {
109
+ if (this.getEntryName(grn) == null || this.getEntryName(grn) === '') {
110
110
  return false;
111
111
  }
112
112
  return true;
@@ -117,14 +117,14 @@ export default class Entry implements IModel {
117
117
  ownerId: string|null,
118
118
  namespaceName: string|null,
119
119
  userId: string|null,
120
- entryModelName: string|null,
120
+ entryName: string|null,
121
121
  ): string|null {
122
122
  return grnFormat
123
123
  .replace('{region}', region ?? '')
124
124
  .replace('{ownerId}', ownerId ?? '')
125
125
  .replace('{namespaceName}', namespaceName ?? '')
126
126
  .replace('{userId}', userId ?? '')
127
- .replace('{entryModelName}', entryModelName ?? '');
127
+ .replace('{entryName}', entryName ?? '');
128
128
  }
129
129
  public getEntryId(): string|null {
130
130
  return this.entryId;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gs2",
3
- "version": "1.3.158",
3
+ "version": "1.3.160",
4
4
  "scripts": {
5
5
  "build": "tsc",
6
6
  "prepublishOnly": "npm run build"