File tree 3 files changed +89
-57
lines changed 3 files changed +89
-57
lines changed Original file line number Diff line number Diff line change @@ -78,10 +78,16 @@ export function isReferenceTarget(item: unknown): item is ReferenceTarget {
78
78
return reflection . isInstance ( item , ReferenceTarget ) ;
79
79
}
80
80
81
- export type RegularID = 'Any' | 'BigInt' | 'Boolean' | 'Bytes' | 'DateTime' | 'Decimal' | 'Float' | 'Int' | 'Json' | 'Null' | 'Object' | 'String' | 'Unsupported' | ' abstract' | 'attribute' | 'datasource' | 'enum' | 'import' | 'in' | 'model' | 'plugin' | 'view' | string ;
81
+ export type RegularID = 'abstract' | 'attribute' | 'datasource' | 'enum' | 'import' | 'in' | 'model' | 'plugin' | 'view' | string ;
82
82
83
83
export function isRegularID ( item : unknown ) : item is RegularID {
84
- return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'view' || item === 'import' || item === 'String' || item === 'Boolean' || item === 'Int' || item === 'BigInt' || item === 'Float' || item === 'Decimal' || item === 'DateTime' || item === 'Json' || item === 'Bytes' || item === 'Null' || item === 'Object' || item === 'Any' || item === 'Unsupported' || ( typeof item === 'string' && ( / [ _ a - z A - Z ] [ \w _ ] * / . test ( item ) ) ) ;
84
+ return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'view' || item === 'import' || ( typeof item === 'string' && ( / [ _ a - z A - Z ] [ \w _ ] * / . test ( item ) ) ) ;
85
+ }
86
+
87
+ export type RegularIDWithTypeNames = 'Any' | 'BigInt' | 'Boolean' | 'Bytes' | 'DateTime' | 'Decimal' | 'Float' | 'Int' | 'Json' | 'Null' | 'Object' | 'String' | 'Unsupported' | RegularID ;
88
+
89
+ export function isRegularIDWithTypeNames ( item : unknown ) : item is RegularIDWithTypeNames {
90
+ return isRegularID ( item ) || item === 'String' || item === 'Boolean' || item === 'Int' || item === 'BigInt' || item === 'Float' || item === 'Decimal' || item === 'DateTime' || item === 'Json' || item === 'Bytes' || item === 'Null' || item === 'Object' || item === 'Any' || item === 'Unsupported' ;
85
91
}
86
92
87
93
export type TypeDeclaration = DataModel | Enum ;
@@ -288,7 +294,7 @@ export interface DataModelField extends AstNode {
288
294
readonly $type : 'DataModelField' ;
289
295
attributes : Array < DataModelFieldAttribute >
290
296
comments : Array < string >
291
- name : RegularID
297
+ name : RegularIDWithTypeNames
292
298
type : DataModelFieldType
293
299
}
294
300
You can’t perform that action at this time.
0 commit comments