@aws-amplify/data-schema 1.25.0 → 1.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.25.0",
+  "version": "1.25.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -63,7 +63,7 @@
     "jest": "^29.7.0",
     "jest-tsd": "^0.2.2",
     "rimraf": "^5.0.5",
-    "rollup": "^4.22.4",
+    "rollup": "^4.59.0",
     "ts-jest": "^29.1.1",
     "turbo": "^1.10.14",
     "typescript": "^5.1.6"

package/src/SchemaProcessor.ts

@@ -1821,13 +1821,23 @@ const schemaPreprocessor = (
       const refersToString = typeDef.data.originalName
         ? ` @refersTo(name: "${typeDef.data.originalName}")`
         : '';
-      // TODO: update @model(timestamps: null) once a longer term solution gets
-      // determined.
-      //
-      // Context: SQL schema should not be automatically inserted with timestamp fields,
-      // passing (timestamps: null) to @model to suppress this behavior as a short
-      // term solution.
-      const model = `type ${typeName} @model(timestamps: null) ${authString}${refersToString}\n{\n  ${joined}\n}`;
+
+      const disabledAttrs = modelAttributesFromDisabledOps(
+        typeDef.data.disabledOperations,
+      );
+      const modelAttrs = disabledAttrs
+        ? `timestamps: null, ${disabledAttrs}`
+        : 'timestamps: null';
+
+      /*
+       * TODO: update @model(timestamps: null) once a longer term solution gets
+       * determined.
+       *
+       * Context: SQL schema should not be automatically inserted with timestamp
+       * fields, passing (timestamps: null) to @model to suppress this behavior
+       * as a short term solution.
+       */
+      const model = `type ${typeName} @model(${modelAttrs}) ${authString}${refersToString}\n{\n  ${joined}\n}`;
       gqlModels.push(model);
     } else {
       const fields = typeDef.data.fields as Record<string, BaseModelField>;

package/src/util/Filters.ts

@@ -125,7 +125,7 @@ export type SubscriptionBooleanFilters = {
  *   lt: {sk1: string; sk2: number};
  *   ge: {sk1: string; sk2: number};
  *   gt: {sk1: string; sk2: number};
- *   between: [ {sk1: string; sk2: number} ];
+ *   between: [ {sk1: string; sk2: number}, {sk1: string; sk2: number} ];
  *   beginsWith: {sk1: string; sk2: number};
  * }
  * ```
@@ -141,6 +141,6 @@ export type ModelPrimaryCompositeKeyInput<
   lt?: SkIr;
   ge?: SkIr;
   gt?: SkIr;
-  between?: [SkIr];
+  between?: [SkIr, SkIr];
   beginsWith?: SkIr;
 };