Skip to content

Commit 761fdfd

Browse files
vmasekvmasek
committed
refactor(guards): models prefix for enum type
1 parent 0b92daa commit 761fdfd

File tree

5 files changed

+61
-125
lines changed

5 files changed

+61
-125
lines changed

‎templates/ngx-model-guards-export.mustache‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@ export function is{{&definitionName}}(arg: any): arg is models.{{&definitionName
5454
}
5555

5656
{{/isEnum}}{{#isEnum}}
57-
import {
58-
{{&definitionName}},
59-
} from '../models';
60-
61-
export function is{{&definitionName}}(arg: any): arg is {{&definitionName}} {
57+
export function is{{&definitionName}}(arg: any): arg is models.{{&definitionName}} {
6258
return false
63-
{{#properties}} || arg === {{&definitionName}}.{{name}}
59+
{{#properties}} || arg === models.{{&definitionName}}.{{name}}
6460
{{/properties}};
6561
}
6662

‎tests/custom/api/guards/index.ts‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -231,31 +231,23 @@ export function isPet(arg: any): arg is models.Pet {
231231
);
232232
}
233233

234-
import {
235-
Possition,
236-
} from '../models';
237-
238-
export function isPossition(arg: any): arg is Possition {
234+
export function isPossition(arg: any): arg is models.Possition {
239235
return false
240-
|| arg === Possition.First
241-
|| arg === Possition.Second
242-
|| arg === Possition.Third
236+
|| arg === models.Possition.First
237+
|| arg === models.Possition.Second
238+
|| arg === models.Possition.Third
243239
;
244240
}
245241

246-
import {
247-
Right,
248-
} from '../models';
249-
250-
export function isRight(arg: any): arg is Right {
242+
export function isRight(arg: any): arg is models.Right {
251243
return false
252-
|| arg === Right.MEMBER
253-
|| arg === Right.ADMIN
254-
|| arg === Right.VIEW_ALL
255-
|| arg === Right.VIEW_MY
256-
|| arg === Right.VIEW_EDIT
257-
|| arg === Right.READ_WRITE
258-
|| arg === Right.CONTROL
244+
|| arg === models.Right.MEMBER
245+
|| arg === models.Right.ADMIN
246+
|| arg === models.Right.VIEW_ALL
247+
|| arg === models.Right.VIEW_MY
248+
|| arg === models.Right.VIEW_EDIT
249+
|| arg === models.Right.READ_WRITE
250+
|| arg === models.Right.CONTROL
259251
;
260252
}
261253

‎tests/esquare/api/guards/index.ts‎

Lines changed: 34 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -103,27 +103,19 @@ export function isColumnMapping(arg: any): arg is models.ColumnMapping {
103103
);
104104
}
105105

106-
import {
107-
Criticality,
108-
} from '../models';
109-
110-
export function isCriticality(arg: any): arg is Criticality {
106+
export function isCriticality(arg: any): arg is models.Criticality {
111107
return false
112-
|| arg === Criticality.Low
113-
|| arg === Criticality.Medium
114-
|| arg === Criticality.High
108+
|| arg === models.Criticality.Low
109+
|| arg === models.Criticality.Medium
110+
|| arg === models.Criticality.High
115111
;
116112
}
117113

118-
import {
119-
Frequency,
120-
} from '../models';
121-
122-
export function isFrequency(arg: any): arg is Frequency {
114+
export function isFrequency(arg: any): arg is models.Frequency {
123115
return false
124-
|| arg === Frequency.Daily
125-
|| arg === Frequency.Weekly
126-
|| arg === Frequency.Yearly
116+
|| arg === models.Frequency.Daily
117+
|| arg === models.Frequency.Weekly
118+
|| arg === models.Frequency.Yearly
127119
;
128120
}
129121

@@ -187,14 +179,10 @@ export function isImportStatsGroup(arg: any): arg is models.ImportStatsGroup {
187179
);
188180
}
189181

190-
import {
191-
ImportStatus,
192-
} from '../models';
193-
194-
export function isImportStatus(arg: any): arg is ImportStatus {
182+
export function isImportStatus(arg: any): arg is models.ImportStatus {
195183
return false
196-
|| arg === ImportStatus.Live
197-
|| arg === ImportStatus.PastDeadline
184+
|| arg === models.ImportStatus.Live
185+
|| arg === models.ImportStatus.PastDeadline
198186
;
199187
}
200188

@@ -242,14 +230,10 @@ export function isImportStatusItem(arg: any): arg is models.ImportStatusItem {
242230
);
243231
}
244232

245-
import {
246-
ImportType,
247-
} from '../models';
248-
249-
export function isImportType(arg: any): arg is ImportType {
233+
export function isImportType(arg: any): arg is models.ImportType {
250234
return false
251-
|| arg === ImportType.ThirdParty
252-
|| arg === ImportType.File
235+
|| arg === models.ImportType.ThirdParty
236+
|| arg === models.ImportType.File
253237
;
254238
}
255239

@@ -278,25 +262,17 @@ export function isIssue(arg: any): arg is models.Issue {
278262
);
279263
}
280264

281-
import {
282-
IssueAlertType,
283-
} from '../models';
284-
285-
export function isIssueAlertType(arg: any): arg is IssueAlertType {
265+
export function isIssueAlertType(arg: any): arg is models.IssueAlertType {
286266
return false
287-
|| arg === IssueAlertType.Validation
288-
|| arg === IssueAlertType.Data
267+
|| arg === models.IssueAlertType.Validation
268+
|| arg === models.IssueAlertType.Data
289269
;
290270
}
291271

292-
import {
293-
IssueStatus,
294-
} from '../models';
295-
296-
export function isIssueStatus(arg: any): arg is IssueStatus {
272+
export function isIssueStatus(arg: any): arg is models.IssueStatus {
297273
return false
298-
|| arg === IssueStatus.Pending
299-
|| arg === IssueStatus.Resolved
274+
|| arg === models.IssueStatus.Pending
275+
|| arg === models.IssueStatus.Resolved
300276
;
301277
}
302278

@@ -383,14 +359,10 @@ export function isNotificationTrigger(arg: any): arg is models.NotificationTrigg
383359
);
384360
}
385361

386-
import {
387-
Order,
388-
} from '../models';
389-
390-
export function isOrder(arg: any): arg is Order {
362+
export function isOrder(arg: any): arg is models.Order {
391363
return false
392-
|| arg === Order.asc
393-
|| arg === Order.desc
364+
|| arg === models.Order.asc
365+
|| arg === models.Order.desc
394366
;
395367
}
396368

@@ -475,15 +447,11 @@ export function isPasswordVerificationPolicies(arg: any): arg is models.Password
475447
);
476448
}
477449

478-
import {
479-
Period,
480-
} from '../models';
481-
482-
export function isPeriod(arg: any): arg is Period {
450+
export function isPeriod(arg: any): arg is models.Period {
483451
return false
484-
|| arg === Period.Year
485-
|| arg === Period.Month
486-
|| arg === Period.Week
452+
|| arg === models.Period.Year
453+
|| arg === models.Period.Month
454+
|| arg === models.Period.Week
487455
;
488456
}
489457

@@ -685,15 +653,11 @@ export function isSchoolImportStats(arg: any): arg is models.SchoolImportStats {
685653
);
686654
}
687655

688-
import {
689-
Status,
690-
} from '../models';
691-
692-
export function isStatus(arg: any): arg is Status {
656+
export function isStatus(arg: any): arg is models.Status {
693657
return false
694-
|| arg === Status.Pending
695-
|| arg === Status.InProgress
696-
|| arg === Status.Complete
658+
|| arg === models.Status.Pending
659+
|| arg === models.Status.InProgress
660+
|| arg === models.Status.Complete
697661
;
698662
}
699663

@@ -833,14 +797,10 @@ export function isUserListItem(arg: any): arg is models.UserListItem {
833797
);
834798
}
835799

836-
import {
837-
UserStatus,
838-
} from '../models';
839-
840-
export function isUserStatus(arg: any): arg is UserStatus {
800+
export function isUserStatus(arg: any): arg is models.UserStatus {
841801
return false
842-
|| arg === UserStatus.Active
843-
|| arg === UserStatus.Blocked
802+
|| arg === models.UserStatus.Active
803+
|| arg === models.UserStatus.Blocked
844804
;
845805
}
846806

‎tests/gcloud-firestore/api/guards/index.ts‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,18 @@ return arg != null && typeof arg.lastModified === 'number' && typeof arg.name ==
3434

3535
/* generated type guards */
3636

37-
import {
38-
$Xgafv,
39-
} from '../models';
40-
41-
export function is$Xgafv(arg: any): arg is $Xgafv {
37+
export function is$Xgafv(arg: any): arg is models.$Xgafv {
4238
return false
43-
|| arg === $Xgafv.V1
44-
|| arg === $Xgafv.V2
39+
|| arg === models.$Xgafv.V1
40+
|| arg === models.$Xgafv.V2
4541
;
4642
}
4743

48-
import {
49-
Alt,
50-
} from '../models';
51-
52-
export function isAlt(arg: any): arg is Alt {
44+
export function isAlt(arg: any): arg is models.Alt {
5345
return false
54-
|| arg === Alt.json
55-
|| arg === Alt.media
56-
|| arg === Alt.proto
46+
|| arg === models.Alt.json
47+
|| arg === models.Alt.media
48+
|| arg === models.Alt.proto
5749
;
5850
}
5951

‎tests/with-all-tags/api/guards/index.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,13 @@ export function isRowModel(arg: any): arg is models.RowModel {
135135
);
136136
}
137137

138-
import {
139-
StatusSeverity,
140-
} from '../models';
141-
142-
export function isStatusSeverity(arg: any): arg is StatusSeverity {
138+
export function isStatusSeverity(arg: any): arg is models.StatusSeverity {
143139
return false
144-
|| arg === StatusSeverity.Unknown
145-
|| arg === StatusSeverity.OK
146-
|| arg === StatusSeverity.Warning
147-
|| arg === StatusSeverity.Error
148-
|| arg === StatusSeverity.Critical
140+
|| arg === models.StatusSeverity.Unknown
141+
|| arg === models.StatusSeverity.OK
142+
|| arg === models.StatusSeverity.Warning
143+
|| arg === models.StatusSeverity.Error
144+
|| arg === models.StatusSeverity.Critical
149145
;
150146
}
151147

0 commit comments

Comments
 (0)