From 4c0a6164cf734b270245f3667db63a7b5eaa7e26 Mon Sep 17 00:00:00 2001 From: Roman Usaniov Date: Fri, 3 Jun 2022 15:16:44 +0300 Subject: [PATCH] chg: d.ts build errors fixed; typescript updated; api-extractor updated; Skeleton.ts - should have findBoneIndex and findSlotIndex methods based on interface SkeletonBinary.ts - duplicated AttachmentType, have import from @pixi-spine/base --- bundles/all-3.8/package.json | 2 +- bundles/all-4.0/package.json | 2 +- bundles/pixi-spine/package.json | 2 +- packages/base/package.json | 4 ++-- packages/loader-3.8/package.json | 2 +- packages/loader-4.0/package.json | 2 +- packages/loader-base/package.json | 2 +- packages/loader-uni/package.json | 2 +- packages/runtime-3.7/package.json | 2 +- packages/runtime-3.8/package.json | 2 +- packages/runtime-4.0/package.json | 2 +- packages/runtime-4.0/src/core/Skeleton.ts | 18 ++++++++++++++++++ .../runtime-4.0/src/core/SkeletonBinary.ts | 2 -- 13 files changed, 30 insertions(+), 14 deletions(-) diff --git a/bundles/all-3.8/package.json b/bundles/all-3.8/package.json index e8d578d8..b99fd9b9 100644 --- a/bundles/all-3.8/package.json +++ b/bundles/all-3.8/package.json @@ -55,6 +55,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/bundles/all-4.0/package.json b/bundles/all-4.0/package.json index 3642f913..06c6cc15 100644 --- a/bundles/all-4.0/package.json +++ b/bundles/all-4.0/package.json @@ -55,6 +55,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/bundles/pixi-spine/package.json b/bundles/pixi-spine/package.json index 01b28c61..e81ed50d 100644 --- a/bundles/pixi-spine/package.json +++ b/bundles/pixi-spine/package.json @@ -56,6 +56,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/base/package.json b/packages/base/package.json index 0a56dbc0..a7da97ef 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/pixijs/pixi-spine/#readme", "devDependencies": { - "@microsoft/api-extractor": "7.13.5", + "@microsoft/api-extractor": "7.18.4", "@pixi-spine/eslint-config": "~1.0.0", "@pixi-spine/rollup-config": "~1.0.0", "chai": "~4.2.0", @@ -51,6 +51,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/loader-3.8/package.json b/packages/loader-3.8/package.json index 07fc65bd..2399ddef 100644 --- a/packages/loader-3.8/package.json +++ b/packages/loader-3.8/package.json @@ -52,6 +52,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/loader-4.0/package.json b/packages/loader-4.0/package.json index 49d9a1aa..e3741ac9 100644 --- a/packages/loader-4.0/package.json +++ b/packages/loader-4.0/package.json @@ -51,6 +51,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/loader-base/package.json b/packages/loader-base/package.json index 3cd7f32c..9db6b4e9 100644 --- a/packages/loader-base/package.json +++ b/packages/loader-base/package.json @@ -50,6 +50,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/loader-uni/package.json b/packages/loader-uni/package.json index 68da04cb..699039fd 100644 --- a/packages/loader-uni/package.json +++ b/packages/loader-uni/package.json @@ -48,6 +48,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/runtime-3.7/package.json b/packages/runtime-3.7/package.json index d8814fb2..251be5e0 100644 --- a/packages/runtime-3.7/package.json +++ b/packages/runtime-3.7/package.json @@ -46,6 +46,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/runtime-3.8/package.json b/packages/runtime-3.8/package.json index 6e234439..4708cbd9 100644 --- a/packages/runtime-3.8/package.json +++ b/packages/runtime-3.8/package.json @@ -46,6 +46,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/runtime-4.0/package.json b/packages/runtime-4.0/package.json index fde0643b..655e000e 100644 --- a/packages/runtime-4.0/package.json +++ b/packages/runtime-4.0/package.json @@ -46,6 +46,6 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.2.3" + "typescript": "~4.3.0" } } diff --git a/packages/runtime-4.0/src/core/Skeleton.ts b/packages/runtime-4.0/src/core/Skeleton.ts index 714eb76e..d6983edf 100644 --- a/packages/runtime-4.0/src/core/Skeleton.ts +++ b/packages/runtime-4.0/src/core/Skeleton.ts @@ -419,6 +419,15 @@ export class Skeleton implements ISkeleton { return null; } + /** @returns -1 if the bone was not found. */ + findBoneIndex (boneName: string) { + if (!boneName) throw new Error("boneName cannot be null."); + let bones = this.bones; + for (let i = 0, n = bones.length; i < n; i++) + if (bones[i].data.name == boneName) return i; + return -1; + } + /** Finds a slot by comparing each slot's name. It is more efficient to cache the results of this method than to call it * repeatedly. * @returns May be null. */ @@ -432,6 +441,15 @@ export class Skeleton implements ISkeleton { return null; } + /** @returns -1 if the bone was not found. */ + findSlotIndex (slotName: string) { + if (!slotName) throw new Error("slotName cannot be null."); + let slots = this.slots; + for (let i = 0, n = slots.length; i < n; i++) + if (slots[i].data.name == slotName) return i; + return -1; + } + /** Sets a skin by name. * * See {@link #setSkin()}. */ diff --git a/packages/runtime-4.0/src/core/SkeletonBinary.ts b/packages/runtime-4.0/src/core/SkeletonBinary.ts index 1b9decca..494291cc 100644 --- a/packages/runtime-4.0/src/core/SkeletonBinary.ts +++ b/packages/runtime-4.0/src/core/SkeletonBinary.ts @@ -967,8 +967,6 @@ class Vertices { constructor (public bones: Array = null, public vertices: Array | Float32Array = null) { } } -enum AttachmentType { Region, BoundingBox, Mesh, LinkedMesh, Path, Point, Clipping } - function readTimeline1 (input: BinaryInput, timeline: CurveTimeline1, scale: number): CurveTimeline1 { let time = input.readFloat(), value = input.readFloat() * scale; for (let frame = 0, bezier = 0, frameLast = timeline.getFrameCount() - 1; ; frame++) {