@aws-amplify/data-schema 1.3.4 → 1.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/SchemaProcessor.ts

@@ -4,6 +4,7 @@ import {
   type InternalField,
   string,
   type BaseModelField,
+  ModelFieldType,
 } from './ModelField';
 import { type InternalRelationalField } from './ModelRelationalField';
 import type { InternalModel } from './ModelType';
@@ -484,6 +485,34 @@ function escapeGraphQlString(str: string) {
   return JSON.stringify(str);
 }
 
+/**
+ * AWS AppSync scalars that are stored as strings in the data source
+ */
+const stringFieldTypes = {
+  ID: true,
+  String: true,
+  AWSDate: true,
+  AWSTime: true,
+  AWSDateTime: true,
+  AWSEmail: true,
+  AWSPhone: true,
+  AWSURL: true,
+  AWSIPAddress: true,
+};
+
+/**
+ * Normalize string-compatible field types for comparison
+ */
+const normalizeStringFieldTypes = (
+  fieldType: ModelFieldType,
+): ModelFieldType => {
+  if (fieldType in stringFieldTypes) {
+    return ModelFieldType.String;
+  }
+
+  return fieldType;
+};
+
 /**
  * Tests whether two ModelField definitions are in conflict.
  *
@@ -496,15 +525,24 @@ function escapeGraphQlString(str: string) {
  * @returns
  */
 function areConflicting(left: BaseModelField, right: BaseModelField): boolean {
-  // These are the only props we care about for this comparison, because the others
+  const leftData = (left as InternalField).data;
+  const rightData = (right as InternalField).data;
+
+  // `array` and `fieldType` are the only props we care about for this comparison, because the others
   // (required, arrayRequired, etc) are not specified on auth or FK directives.
-  const relevantProps = ['array', 'fieldType'] as const;
-  for (const prop of relevantProps) {
-    if (
-      (left as InternalField).data[prop] !== (right as InternalField).data[prop]
-    ) {
-      return true;
-    }
+  if (leftData.array !== rightData.array) {
+    return true;
+  }
+
+  // Convert "string-compatible" field types to `String` for the sake of this comparison
+  //
+  // E.g. if a customer has an explicit a.id() field that they're referencing in an allow.ownerDefinedIn rule
+  // we treat ID and String as equivalent/non-conflicting
+  if (
+    normalizeStringFieldTypes(leftData.fieldType) !==
+    normalizeStringFieldTypes(rightData.fieldType)
+  ) {
+    return true;
   }
 
   return false;

package/src/runtime/internals/APIClient.ts

@@ -46,7 +46,7 @@ const skGraphQlFieldTypeMap = {
   AWSDate: 'String',
   AWSTime: 'String',
   AWSDateTime: 'String',
-  AWSTimestamp: 'String',
+  AWSTimestamp: 'Int',
   AWSEmail: 'String',
   AWSPhone: 'String',
   AWSURL: 'String',