refactor: extract sequence field identification logic

aws-amplify · Oct 17, 2024 · 759789e · 759789e
1 parent 2c89d64
commit 759789e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/amplify-graphql-schema-generator/src/ts-schema-generator/helpers.ts b/packages/amplify-graphql-schema-generator/src/ts-schema-generator/helpers.ts
@@ -38,8 +38,7 @@ const createProperty = (field: Field): ts.Node => {
  * @returns Typescript data schema type in TS Node format
  */
 const createDataType = (field: Field): ts.Node => {
- const sequenceRegex = /^nextval\(.+::regclass\)$/;
- if (field.default?.kind === 'DB_GENERATED' && sequenceRegex.test(field.default.value.toString())) {
+ if (isSequenceField(field)) {
  const baseTypeExpression =
  field.type.kind === 'NonNull'
  ? createDataType(new Field(field.name, field.type.type))
@@ -94,6 +93,11 @@ const createDataType = (field: Field): ts.Node => {
  );
 };
 
+const isSequenceField = (field: Field): boolean => {
+ const sequenceRegex = /^nextval\(.+::regclass\)$/;
+ return field.default?.kind === 'DB_GENERATED' && sequenceRegex.test(field.default.value.toString());
+};
+
 const getTypescriptDataSchemaType = (type: string): string => {
  const DEFAULT_DATATYPE = TYPESCRIPT_DATA_SCHEMA_CONSTANTS.STRING_METHOD;
  const tsDataSchemaType = GQL_TYPESCRIPT_DATA_SCHEMA_TYPE_MAP[type.toLowerCase()];