@aws-amplify/data-schema 1.3.9 → 1.4.0

package/src/runtime/internals/utils/clientProperties/generateModelsProperty.ts

@@ -9,13 +9,16 @@ import {
   ModelIntrospectionSchema,
 } from '../../../bridge-types';
 
-import { ModelOperation, graphQLOperationsInfo } from '../../APIClient';
+import { ModelOperation } from '../../APIClient';
 import { listFactory } from '../../operations/list';
 import { indexQueryFactory } from '../../operations/indexQuery';
 import { getFactory } from '../../operations/get';
 import { subscriptionFactory } from '../../operations/subscription';
 import { observeQueryFactory } from '../../operations/observeQuery';
-import { getSecondaryIndexesFromSchemaModel } from '../../clientUtils';
+import {
+  getSecondaryIndexesFromSchemaModel,
+  excludeDisabledOps,
+} from '../../clientUtils';
 
 export function generateModelsProperty<T extends Record<any, any> = never>(
   client: BaseClient,
@@ -38,38 +41,38 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 
     models[name] = {} as Record<string, any>;
 
-    Object.entries(graphQLOperationsInfo).forEach(
-      ([key, { operationPrefix }]) => {
-        const operation = key as ModelOperation;
+    const enabledModelOps = excludeDisabledOps(modelIntrospection, name);
+
+    Object.entries(enabledModelOps).forEach(([key, { operationPrefix }]) => {
+      const operation = key as ModelOperation;
 
-        if (operation === 'LIST') {
-          models[name][operationPrefix] = listFactory(
-            client,
-            modelIntrospection,
-            model,
-            getInternals,
-          );
-        } else if (SUBSCRIPTION_OPS.includes(operation)) {
-          models[name][operationPrefix] = subscriptionFactory(
-            client as BaseBrowserClient,
-            modelIntrospection,
-            model,
-            operation,
-            getInternals,
-          );
-        } else if (operation === 'OBSERVE_QUERY') {
-          models[name][operationPrefix] = observeQueryFactory(models, model);
-        } else {
-          models[name][operationPrefix] = getFactory(
-            client,
-            modelIntrospection,
-            model,
-            operation,
-            getInternals,
-          );
-        }
-      },
-    );
+      if (operation === 'LIST') {
+        models[name][operationPrefix] = listFactory(
+          client,
+          modelIntrospection,
+          model,
+          getInternals,
+        );
+      } else if (SUBSCRIPTION_OPS.includes(operation)) {
+        models[name][operationPrefix] = subscriptionFactory(
+          client as BaseBrowserClient,
+          modelIntrospection,
+          model,
+          operation,
+          getInternals,
+        );
+      } else if (operation === 'OBSERVEQUERY') {
+        models[name][operationPrefix] = observeQueryFactory(models, model);
+      } else {
+        models[name][operationPrefix] = getFactory(
+          client,
+          modelIntrospection,
+          model,
+          operation,
+          getInternals,
+        );
+      }
+    });
 
     const secondaryIdxs = getSecondaryIndexesFromSchemaModel(model);
 

package/src/runtime/utils/index.ts

@@ -5,3 +5,4 @@ export { resolvePKFields } from './resolvePKFields';
 export { findIndexByFields } from './findIndexByFields';
 export { resolveOwnerFields } from './resolveOwnerFields';
 export { capitalize } from './stringTransformation';
+export { selfAwareAsync } from './selfAwareAsync';

package/src/runtime/utils/selfAwareAsync.ts

@@ -0,0 +1,39 @@
+/**
+ * Executes an `async` resolver function, providing the `Promise`-to-be-returned as the
+ * first argument to the resolver so that the resolver can refer to the `Promise` that
+ * external callers will see.
+ *
+ * ```ts
+ * const outer = selfAwareAsync(async inner => {
+ *  console.log(outer === inner); // true
+ * });
+ * ```
+ *
+ * This utility exists to reduce boilerplate in cases where promise resolving code needs
+ * to track or register its "own" `Promise` *as seen by the caller* in some way. E.g.,
+ * when mapping `Promise` chains for `client.cancel()`.
+ *
+ * @param resolver
+ * @returns
+ */
+export function selfAwareAsync<T>(
+  resolver: (promise: Promise<T>) => Promise<T>,
+): Promise<T> {
+  let resolve: (value: T) => void;
+  let reject: (reason?: any) => void;
+
+  const resultPromise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+
+  resolver(resultPromise)
+    .then((result) => {
+      resolve(result);
+    })
+    .catch((error) => {
+      reject(error);
+    });
+
+  return resultPromise;
+}

package/src/util/Filters.ts

@@ -6,9 +6,12 @@
  */
 
 /**
- * Filters options that can be used on string-like fields.
+ * CRUDL Filters
+ *
+ * reference: https://github.com/aws-amplify/amplify-category-api/blob/a655e71115e0e8e3597b4c2ef1b2940a79fdcaa1/packages/amplify-graphql-model-transformer/src/definitions.ts
  */
 
+// Filter options that can be used on string-like fields (string, ID, AWSDateTime, etc.).
 export type StringFilter<T extends string = string> = {
   attributeExists?: boolean;
   beginsWith?: string;
@@ -24,6 +27,7 @@ export type StringFilter<T extends string = string> = {
   size?: SizeFilter;
 };
 
+// Filter options that can be used on numeric fields (int, float, AWSTimestamp).
 export type NumericFilter = {
   attributeExists?: boolean;
   between?: [number, number];
@@ -35,6 +39,12 @@ export type NumericFilter = {
   ne?: number;
 };
 
+export type BooleanFilters = {
+  attributeExists?: boolean;
+  eq?: boolean;
+  ne?: boolean;
+};
+
 /**
  * Filter options that can be used on fields where size checks are supported.
  */
@@ -48,8 +58,39 @@ export type SizeFilter = {
   ne?: number;
 };
 
-export type BooleanFilters = {
-  attributeExists?: boolean;
+/**
+ * Subscription Filters
+ *
+ * reference: https://github.com/aws-amplify/amplify-category-api/blob/a655e71115e0e8e3597b4c2ef1b2940a79fdcaa1/packages/amplify-graphql-model-transformer/src/definitions.ts
+ */
+export type SubscriptionStringFilter = {
+  beginsWith?: string;
+  between?: [string, string];
+  contains?: string;
+  eq?: string;
+  ge?: string;
+  gt?: string;
+  le?: string;
+  lt?: string;
+  ne?: string;
+  notContains?: string;
+  in?: string[];
+  notIn?: string[];
+};
+
+export type SubscriptionNumericFilter = {
+  between?: [number, number];
+  in?: number[];
+  notIn?: number[];
+  eq?: number;
+  ge?: number;
+  gt?: number;
+  le?: number;
+  lt?: number;
+  ne?: number;
+};
+
+export type SubscriptionBooleanFilters = {
   eq?: boolean;
   ne?: boolean;
 };
@@ -88,6 +129,9 @@ export type BooleanFilters = {
  *   beginsWith: {sk1: string; sk2: number};
  * }
  * ```
+ * 
+ * reference: https://github.com/aws-amplify/amplify-category-api/blob/a655e71115e0e8e3597b4c2ef1b2940a79fdcaa1/packages/graphql-transformer-common/src/dynamodbUtils.ts#L32-L36
+ * 
  * */
 export type ModelPrimaryCompositeKeyInput<
   SkIr extends Record<string, string | number>,