@aws-amplify/data-schema 0.13.18 → 0.14.1

package/lib-esm/src/CustomOperation.d.ts

@@ -37,7 +37,7 @@ type InternalCustomData = CustomData & {
     authorization: Authorization<any, any, any>[];
 };
 export type CustomOperationParamShape = {
-    arguments: CustomArguments;
+    arguments: CustomArguments | null;
     returnType: CustomReturnType | null;
     functionRef: string | null;
     authorization: Authorization<any, any, any>[];
@@ -69,7 +69,7 @@ export type InternalCustom<B extends CustomOperationBrand = any> = CustomOperati
 };
 export type QueryCustomOperation = CustomOperation<CustomOperationParamShape, any, typeof queryBrand>;
 export declare function query(): CustomOperation<{
-    arguments: CustomArguments;
+    arguments: null;
     returnType: null;
     functionRef: null;
     authorization: [];
@@ -78,7 +78,7 @@ export declare function query(): CustomOperation<{
 }, never, typeof queryBrand>;
 export type MutationCustomOperation = CustomOperation<CustomOperationParamShape, any, typeof mutationBrand>;
 export declare function mutation(): CustomOperation<{
-    arguments: CustomArguments;
+    arguments: null;
     returnType: null;
     functionRef: null;
     authorization: [];
@@ -87,7 +87,7 @@ export declare function mutation(): CustomOperation<{
 }, never, typeof mutationBrand>;
 export type SubscriptionCustomOperation = CustomOperation<CustomOperationParamShape, any, typeof subscriptionBrand>;
 export declare function subscription(): CustomOperation<{
-    arguments: CustomArguments;
+    arguments: null;
     returnType: null;
     functionRef: null;
     authorization: [];

package/lib-esm/src/MappedTypes/CustomOperations.d.ts

@@ -28,7 +28,7 @@ export type CustomOpShapes<Schema extends GenericModelSchema<any>> = {
 /**
  * Digs out custom operation arguments, mapped to the intended graphql types.
  */
-export type CustomOpArguments<Shape extends CustomOperationParamShape> = {
+export type CustomOpArguments<Shape extends CustomOperationParamShape> = Shape['arguments'] extends null ? never : {
     [FieldName in keyof Shape['arguments']]: Shape['arguments'][FieldName] extends ModelField<infer R, any, any> ? R : never;
 };
 /**

package/lib-esm/src/ModelType.d.ts

@@ -43,7 +43,7 @@ type IdentifierFields<T extends ModelTypeParamShape> = keyof IdentifierMap<T> &
 type IdentifierType<T extends ModelTypeParamShape, Fields extends string = IdentifierFields<T>> = Array<Fields>;
 export type ModelType<T extends ModelTypeParamShape, K extends keyof ModelType<T> = never> = Omit<{
     identifier<ID extends IdentifierType<T> = []>(identifier: ID): ModelType<SetTypeSubArg<T, 'identifier', ID>, K | 'identifier'>;
-    secondaryIndexes<const Indexes extends readonly ModelIndexType<SecondaryIndexFields<ExtractType<T>>, SecondaryIndexFields<ExtractType<T>>, unknown, never, any>[] = readonly [], const IndexesIR extends readonly any[] = SecondaryIndexToIR<Indexes, ExtractType<T>>>(indexes: Indexes): ModelType<SetTypeSubArg<T, 'secondaryIndexes', IndexesIR>, K | 'secondaryIndexes'>;
+    secondaryIndexes<const SecondaryIndexPKPool extends string = SecondaryIndexFields<ExtractType<T>>, const Indexes extends readonly ModelIndexType<string, string, unknown, readonly [], any>[] = readonly [], const IndexesIR extends readonly any[] = SecondaryIndexToIR<Indexes, ExtractType<T>>>(callback: (index: <PK extends SecondaryIndexPKPool>(pk: PK) => ModelIndexType<SecondaryIndexPKPool, PK, ReadonlyArray<Exclude<SecondaryIndexPKPool, PK>>>) => Indexes): ModelType<SetTypeSubArg<T, 'secondaryIndexes', IndexesIR>, K | 'secondaryIndexes'>;
     authorization<AuthRuleType extends Authorization<any, any, any>>(rules: AuthRuleType[]): ModelType<SetTypeSubArg<T, 'authorization', AuthRuleType[]>, K | 'authorization'>;
 }, K> & Brand<typeof brandName>;
 /**

package/lib-esm/src/ModelType.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.model = exports.isSchemaModelType = void 0;
 const util_1 = require("./util");
+const ModelIndex_1 = require("./ModelIndex");
 const brandName = 'modelType';
 function _model(fields) {
     const data = {
@@ -15,8 +16,8 @@ function _model(fields) {
             data.identifier = identifier;
             return this;
         },
-        secondaryIndexes(indexes) {
-            data.secondaryIndexes = indexes;
+        secondaryIndexes(callback) {
+            data.secondaryIndexes = callback(ModelIndex_1.modelIndex);
             return this;
         },
         authorization(rules) {

package/lib-esm/src/index.d.ts

@@ -1,6 +1,5 @@
 import { schema } from './ModelSchema';
 import { model } from './ModelType';
-import { modelIndex } from './ModelIndex';
 import { id, string, integer, float, boolean, date, time, datetime, timestamp, email, json, phone, url, ipAddress } from './ModelField';
 import { ref } from './RefType';
 import { hasOne, hasMany, belongsTo, manyToMany } from './ModelRelationalField';
@@ -9,4 +8,4 @@ import { customType } from './CustomType';
 import { enumType } from './EnumType';
 import { query, mutation, subscription } from './CustomOperation';
 import { handler } from './Handler';
-export { schema, model, modelIndex as index, ref, customType, enumType as enum, query, mutation, subscription, hasOne, hasMany, belongsTo, manyToMany, allow, id, string, integer, float, boolean, date, time, datetime, timestamp, email, json, phone, url, ipAddress, handler, };
+export { schema, model, ref, customType, enumType as enum, query, mutation, subscription, hasOne, hasMany, belongsTo, manyToMany, allow, id, string, integer, float, boolean, date, time, datetime, timestamp, email, json, phone, url, ipAddress, handler, };

package/lib-esm/src/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handler = exports.ipAddress = exports.url = exports.phone = exports.json = exports.email = exports.timestamp = exports.datetime = exports.time = exports.date = exports.boolean = exports.float = exports.integer = exports.string = exports.id = exports.allow = exports.manyToMany = exports.belongsTo = exports.hasMany = exports.hasOne = exports.subscription = exports.mutation = exports.query = exports.enum = exports.customType = exports.ref = exports.index = exports.model = exports.schema = void 0;
+exports.handler = exports.ipAddress = exports.url = exports.phone = exports.json = exports.email = exports.timestamp = exports.datetime = exports.time = exports.date = exports.boolean = exports.float = exports.integer = exports.string = exports.id = exports.allow = exports.manyToMany = exports.belongsTo = exports.hasMany = exports.hasOne = exports.subscription = exports.mutation = exports.query = exports.enum = exports.customType = exports.ref = exports.model = exports.schema = void 0;
 const ModelSchema_1 = require("./ModelSchema");
 Object.defineProperty(exports, "schema", { enumerable: true, get: function () { return ModelSchema_1.schema; } });
 const ModelType_1 = require("./ModelType");
 Object.defineProperty(exports, "model", { enumerable: true, get: function () { return ModelType_1.model; } });
-const ModelIndex_1 = require("./ModelIndex");
-Object.defineProperty(exports, "index", { enumerable: true, get: function () { return ModelIndex_1.modelIndex; } });
 const ModelField_1 = require("./ModelField");
 Object.defineProperty(exports, "id", { enumerable: true, get: function () { return ModelField_1.id; } });
 Object.defineProperty(exports, "string", { enumerable: true, get: function () { return ModelField_1.string; } });