Add 'ForType' suffix

cognitoforms · Apr 19, 2024 · 2c165ac · 2c165ac
1 parent d75640e
commit 2c165ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/model.ts b/src/model.ts
@@ -1,7 +1,7 @@
 import { Event, EventSubscriber } from "./events";
 import { replaceTokens, ObjectLookup } from "./helpers";
 import { EntityRegisteredEventArgs, Entity, EntityChangeEventArgs, EntityConstructorForType } from "./entity";
-import { Type, PropertyType, isEntityType, ValueConstructor, TypeOptions, TypeOfType } from "./type";
+import { Type, PropertyType, isEntityType, ValueConstructor, TypeOptionsForType, TypeOfType } from "./type";
 import { Format, createFormat } from "./format";
 import { EntitySerializer } from "./entity-serializer";
 import { LocalizedResourcesMap, setDefaultLocale, defineResources, getResource, resourceExists } from "./resource";
@@ -249,7 +249,7 @@ export class Model {
 					}
 				}
 
-				let typeOptions = options[typeName] as TypeOptions<unknown>;
+				let typeOptions = options[typeName] as TypeOptionsForType<unknown>;
 				let type = this.types[typeName];
 
 				typesToInitialize.push(typeName);
@@ -272,7 +272,7 @@ export class Model {
 
 			// Extend Types
 			for (let typeName of typesToInitialize) {
-				let typeOptions = options[typeName] as TypeOptions<unknown>;
+				let typeOptions = options[typeName] as TypeOptionsForType<unknown>;
 				this.types[typeName].extend(typeOptions);
 			}
 		});
@@ -397,7 +397,7 @@ export type ModelTypeOptions<TTypes> = {
 	/**
 	 * Standard type options ($extends and $format), properties, and methods/rules
 	 */
-	[T in keyof TTypes]: (TypeOptions<TTypes[T]>) | string;
+	[T in keyof TTypes]: (TypeOptionsForType<TTypes[T]>) | string;
 }
 
 export type ModelLocalizationOptions = {

diff --git a/src/type.ts b/src/type.ts
@@ -40,7 +40,7 @@ export class Type {
 	readonly initExisting: EventSubscriber<Type, EntityInitExistingEventArgs>;
 	// readonly conditionsChanged: EventSubscriber<Type, ConditionTargetsChangedEventArgs>;
 
-	constructor(model: Model, fullName: string, baseType: Type = null, format: string | Format<Entity>, options?: TypeExtensionOptions<unknown>) {
+	constructor(model: Model, fullName: string, baseType: Type = null, format: string | Format<Entity>, options?: TypeExtensionOptionsForType<unknown>) {
 		this.model = model;
 		this.fullName = fullName;
 		this.jstype = Type$generateConstructor(this, fullName, baseType, model.settings.useGlobalObject ? getGlobalObject() : null);
@@ -391,7 +391,7 @@ export class Type {
 	 * Extends the current type with the specified format, properties and methods
 	 * @param options The options specifying how to extend the type
 	 */
-	extend(options: TypeExtensionOptions<unknown>): void {
+	extend(options: TypeExtensionOptionsForType<unknown>): void {
 		let type = this;
 
 		// Utility function to convert a path string into a resolved array of Property and PropertyChain instances
@@ -546,11 +546,11 @@ export interface RuleOrMethodOptions<EntityType> {
 
 export type RuleOrMethodFunctionOrOptions<EntityType> = ((this: EntityOfType<EntityType>, ...args: any[]) => any) | RuleOrMethodOptions<EntityType>;
 
-export type TypeExtensionOptions<EntityType> = {
+export type TypeExtensionOptionsForType<EntityType> = {
 	[P in keyof EntityType]: ValueConstructorForType<EntityType[P]> | string | PropertyOptions<EntityType, EntityType[P]> | RuleOrMethodFunctionOrOptions<EntityType>;
 }
 
-export type TypeOptions<EntityType> = TypeBasicOptions & TypeExtensionOptions<EntityType>;
+export type TypeOptionsForType<EntityType> = TypeBasicOptions & TypeExtensionOptionsForType<EntityType>;
 
 export function isValueType(type: any): type is ValueConstructor {
 	return type === String || type === Number || type === Date || type === Boolean;