@aws-amplify/data-schema 1.6.0 → 1.6.2

package/package.json

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

package/src/runtime/internals/APIClient.ts

@@ -204,8 +204,10 @@ export function initializeModel(
     .map(([fieldName]) => fieldName);
 
   return result.map((record) => {
+    if (record === null || record === undefined) {
+      return record;
+    }
     const initializedRelationalFields: Record<string, any> = {};
-
     for (const fieldName of modelFields) {
       const modelField = introModelFields[fieldName];
       const modelFieldType = modelField?.type as ModelFieldType;

package/src/runtime/internals/clientUtils.ts

@@ -49,6 +49,7 @@ export const excludeDisabledOps = (
     "properties": {
       "subscriptions": null,
       "mutations": { "delete": null }
+      "timestamps": null
     } }*/
   const modelAttrs = mis.models[modelName].attributes?.find(
     (attr) => attr.type === 'model',
@@ -68,6 +69,11 @@ export const excludeDisabledOps = (
 
   if (modelAttrs.properties) {
     for (const [key, value] of Object.entries(modelAttrs.properties)) {
+      // model.properties can contain other values that are not relevant to disabling ops, e.g. timestamps
+      if (!(key in coarseToFineDict)) {
+        continue;
+      }
+
       if (value === null) {
         // coarse-grained disable, e.g. "subscriptions": null,
         disabledOps.push(...coarseToFineDict[key]);