Attributes initialization refactoring (#19)

2026-05-18 19:47:32 +08:00 · 2024-03-24 17:30:50 +01:00
parent 5973570911
commit cc9e3d833a
93 changed files with 4134 additions and 4082 deletions
--- a/types.js
+++ b/types.js
@@ -1,13 +1,3 @@
-/** @typedef {[Number, Number]} Coordinates */
-/**
- * @typedef {IEntity | String | Number | BigInt | Boolean | Array} TerminalAttribute
- * @typedef {TerminalAttribute | MirroredEntity<TerminalAttribute>} Attribute
- * @typedef {(
- *      AttributeConstructor<Attribute> | AttributeConstructor<Attribute>[] 
- *     | MirroredEntity<Attribute> | Union | Union[] | ComputedType
- * )} AttributeTypeDescription
- * @typedef {(entity: IEntity) => Attribute} ValueSupplier
- */
 /**
 * @template T
 * @typedef {new (...args: any) => T} AnyConstructor
@@ -15,7 +5,17 @@
 /**
 * @template {Attribute} T
 * @typedef {AnyConstructor<T> & EntityConstructor | StringConstructor | NumberConstructor | BigIntConstructor
- *     | BooleanConstructor | ArrayConstructor | MirroredEntityConstructor<T>} AttributeConstructor
+*     | BooleanConstructor | ArrayConstructor | MirroredEntityConstructor<T>} AttributeConstructor
+*/
+/**
+ * @typedef {[Number, Number]} Coordinates
+ * @typedef {IEntity | String | Number | BigInt | Boolean | Array} TerminalAttribute
+ * @typedef {TerminalAttribute | MirroredEntity<TerminalAttribute>} Attribute
+ * @typedef {(
+ *      AttributeConstructor<Attribute> | AttributeConstructor<Attribute>[] 
+ *     | MirroredEntity<Attribute> | Union<any> | Union<any>[] | ComputedType
+ * )} AttributeTypeDescription
+ * @typedef {(entity: IEntity) => Attribute} ValueSupplier
 */
 /**
 * @template {Attribute} T
@@ -38,7 +38,9 @@
 */
 /**
 * @template T
- * @typedef {T extends StringConstructor
+ * @typedef {T extends AnyConstructor<infer R>
+ *     ? R
+ *     : T extends StringConstructor
 *     ? String
 *     : T extends NumberConstructor
 *     ? Number
@@ -48,26 +50,40 @@
 *     ? Boolean
 *     : T extends ArrayConstructor
 *     ? Array
- *     : T extends MirroredEntity<infer R>
- *     ? MirroredEntity<R>
- *     : T extends AnyConstructor<infer R>
- *     ? R
 *     : any
 * } ConstructedType
 */
 /**
- * @typedef {{
- *     type?: AttributeTypeDescription,
- *     default?: Attribute | ValueSupplier,
- *     nullable?: Boolean,
- *     ignored?: Boolean,
- *     serialized?: Boolean,
- *     expected?: Boolean,
- *     inlined?: Boolean,
- *     quoted?: Boolean,
- *     predicate?: (value: Attribute) => Boolean,
- * }} AttributeInformation
- * @typedef {{ [key: String]: AttributeInformation }} AttributeDeclarations
+ * @template T
+ * @typedef {T extends [infer A] ? DescribedType<A>
+*     : T extends [infer A, ...infer B] ? (DescribedType<A> | DescribedTypesFromArray<B>)
+*     : any
+* } DescribedTypesFromArray
+**/
+/**
+ * @template T
+ * @typedef {T extends AnyConstructor<infer R>
+ *     ? R
+ *     : T extends StringConstructor
+ *     ? String
+ *     : T extends NumberConstructor
+ *     ? Number
+ *     : T extends BigIntConstructor
+ *     ? BigInt
+ *     : T extends BooleanConstructor
+ *     ? Boolean
+ *     : T extends Array<infer R>
+ *     ? DescribedType<R>[]
+ *     : T extends MirroredEntity<infer R>
+ *     ? DescribedType<R>
+ *     : T extends Union<infer R>
+ *     ? DescribedTypesFromArray<R>
+ *     : T
+ * } DescribedType
+ */
+/**
+ * @typedef {import("./js/entity/AttributeInfo.js").default} AttributeInfo
+ * @typedef {{ [key: String]: AttributeInfo }} AttributeDeclarations
 */
 /**
 * @typedef {CustomEvent<{ value: Coordinates }>} UEBDragEvent
@@ -82,6 +98,10 @@
 *     (value: T): typeof value.constructor,
 * }} TypeGetter
 */
+/**
+ * @template {any[]} T
+ * @typedef {import("./js/entity/Union.js").default<T>} Union
+ */
 /**
 * @typedef {typeof import("./js/Blueprint.js").default} BlueprintConstructor
 * @typedef {typeof import("./js/element/LinkElement.js").default} LinkElementConstructor
@@ -141,7 +161,6 @@
 * @typedef {import("./js/entity/SimpleSerializationVectorEntity.js").default} SimpleSerializationVectorEntity
 * @typedef {import("./js/entity/SymbolEntity.js").default} SymbolEntity
 * @typedef {import("./js/entity/TerminalTypeEntity.js").default} TerminalTypeEntity
- * @typedef {import("./js/entity/Union.js").default} Union
 * @typedef {import("./js/entity/UnknownKeysEntity.js").default} UnknownKeysEntity
 * @typedef {import("./js/entity/UnknownPinEntity.js").default} UnknownPinEntity
 * @typedef {import("./js/entity/VariableReferenceEntity.js").default} VariableReferenceEntity
@@ -191,6 +210,7 @@
 * @typedef {import("./js/template/SelectorTemplate.js").default} SelectorTemplate
 * @typedef {import("./js/template/window/ColorPickerWindowTemplate.js").default} ColorPickerWindowTemplate
 * @typedef {import("./js/template/window/WindowTemplate.js").default} WindowTemplate
+ * @typedef {import ("./tests/fixtures/BlueprintFixture.js").default} BlueprintFixture
 * @typedef {import("lit").CSSResult} CSSResult
 * @typedef {import("lit").PropertyValues} PropertyValues
 * @typedef {import("lit").TemplateResult} TemplateResult
@@ -210,7 +230,7 @@
 /**
 * @template T
 * @typedef {{
-*     evaluate<R, Arg>(pageFunction: (node: T, arg: Arg) => R, arg: Arg, options?: { timeout?: number }): Promise<R>
-*     evaluate<R>(pageFunction: (node: T) => R, options?: { timeout?: number }): Promise<R>
-* } & import("@playwright/test").Locator} Locator
-*/
+ *     evaluate<R, Arg>(pageFunction: (node: T, arg: Arg) => R, arg: Arg, options?: { timeout?: number }): Promise<R>
+ *     evaluate<R>(pageFunction: (node: T) => R, options?: { timeout?: number }): Promise<R>
+ * } & import("@playwright/test").Locator} Locator
+ */