From 3f21e0aa8f252b4833042dc8224ac5525be17ca4 Mon Sep 17 00:00:00 2001
From: nartc <nartc7789@gmail.com>
Date: Mon, 2 Dec 2024 10:56:54 -0600
Subject: [PATCH] fix: adjust animations parser

---
 cli.js              |  2 ++
 package.json        |  2 +-
 src/utils/parser.js | 10 ++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cli.js b/cli.js
index 16c9e17..2a7cc66 100755
--- a/cli.js
+++ b/cli.js
@@ -18,6 +18,7 @@ const cli = meow(
   Options
     --output, -o        Output file name/path
     --selector          Selector for the component
+    --name, -n          Name of the component
     --keepnames, -k     Keep original names
     --keepgroups, -K    Keep (empty) groups, disable pruning
     --meta, -m          Include metadata (as userData)
@@ -40,6 +41,7 @@ const cli = meow(
     flags: {
       output: { type: "string", shortFlag: "o" },
       selector: { type: "string" },
+      name: { type: "string" },
       types: { type: "boolean", shortFlag: "t" },
       keepnames: { type: "boolean", shortFlag: "k" },
       keepgroups: { type: "boolean", shortFlag: "K" },
diff --git a/package.json b/package.json
index 538b74d..9233f25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-three-gltf",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "GLTF to Angular Three converter",
   "scripts": {
     "cleanup": "rimraf node_modules"
diff --git a/src/utils/parser.js b/src/utils/parser.js
index cafa45b..81f2424 100644
--- a/src/utils/parser.js
+++ b/src/utils/parser.js
@@ -6,6 +6,7 @@ function parse(fileName, gltf, options = {}) {
   const animations = gltf.animations;
   const hasAnimations = animations.length > 0;
   const selector = options.selector ?? "app-model";
+  const componentName = options.name ?? "Model";
   const ngtTypes = new Set();
 
   // Collect all objects
@@ -107,7 +108,8 @@ function parse(fileName, gltf, options = {}) {
 
     if (animations.length) {
       types.push(
-        `type ActionName = ${animations.map((clip, i) => `"${clip.name}"`).join(" | ")};`,
+        `type ActionName = ${animations.map((clip, i) => `"${clip.name}"`).join(" | ")};
+        type GLTFAnimationClips = NgtsAnimationClips<ActionName>;`,
       );
     }
 
@@ -581,7 +583,7 @@ function parse(fileName, gltf, options = {}) {
         import { Component, ChangeDetectionStrategy, CUSTOM_ELEMENTS_SCHEMA, Signal, input, viewChild, ElementRef, inject, effect${hasAnimations ? ", computed, model" : ""} } from '@angular/core';
         import { injectGLTF } from 'angular-three-soba/loaders';
         import { GLTF } from 'three-stdlib';
-        ${hasAnimations ? "import { injectAnimations } from 'angular-three-soba/misc';" : ""}
+        ${hasAnimations ? "import { injectAnimations, NgtsAnimationClips } from 'angular-three-soba/misc';" : ""}
         ${ngtTypes.has("PerspectiveCamera") ? "import { NgtsPerspectiveCamera } from 'angular-three-soba/cameras';" : ""}
         ${ngtTypes.has("OrthographicCamera") ? "import { NgtsOrthographicCamera } from 'angular-three-soba/cameras';" : ""}
 	`;
@@ -641,11 +643,11 @@ ${printTypes(objects, animations)}
     schemas: [CUSTOM_ELEMENTS_SCHEMA],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class Model {
+export class ${componentName} {
     protected readonly Math = Math;
 
     options = input({} as Partial<NgtGroup>);
-    ${hasAnimations ? "animations = model<any>();" : ""}
+    ${hasAnimations ? "animations = model<ReturnType<typeof injectAnimations<GLTFAnimationClips>>>();" : ""}
     modelRef = viewChild<ElementRef<Group>>('model');
     
     protected gltf = injectGLTF(() => "${url}"${gltfOptions ? `, ${JSON.stringify(gltfOptions)}` : ""}) as unknown as Signal<GLTFResult | null>;