feat: adjust extract-features & metadata

LottieFiles · Dec 17, 2024 · 31c1996 · 31c1996
1 parent 1a5f7c1
commit 31c1996
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.changeset/late-files-wave.md b/.changeset/late-files-wave.md
@@ -0,0 +1,6 @@
+---
+'@lottiefiles/relottie-extract-features': major
+'@lottiefiles/relottie-metadata': major
+---
+
+feat: use v2 relottie packages with required changes
diff --git a/packages/relottie-extract-features/src/extract-features.ts b/packages/relottie-extract-features/src/extract-features.ts
@@ -2,7 +2,7 @@
  * Copyright 2022 Design Barn Inc.
  */
 
-import type { Root, AnyTitle, NodeValue, KeyNode, Primitive } from '@lottiefiles/last';
+import type { Root, AnyTitle, NodeValue, KeyNode, PrimitiveNode } from '@lottiefiles/last';
 import type { Plugin } from 'unified';
 import { visitParents } from 'unist-util-visit-parents';
 import type { Data, VFile } from 'vfile';
@@ -35,7 +35,7 @@ export interface ExtractFeaturesFileData extends Data {
 }
 
 type AncestorChildNode = Exclude<NodeValue, KeyNode>;
-type AncestorNode = Exclude<AncestorChildNode, Primitive>;
+type AncestorNode = Exclude<AncestorChildNode, PrimitiveNode>;
 
 const extractFeatures: Plugin<[Options?], Root> = (_ops: Options = {}) => {
   // const options = { ...DEFAULT_OPTIONS, ...ops };

diff --git a/packages/relottie-extract-features/src/used-features.ts b/packages/relottie-extract-features/src/used-features.ts
@@ -10,7 +10,7 @@ import type {
   Element,
   Collection,
   ArrayNode,
-  Primitive,
+  PrimitiveNode,
   Root,
 } from '@lottiefiles/last';
 
@@ -52,7 +52,7 @@ export const elementNodeChecker: IsFeatureUsedChecker<Element> = (node): boolean
   return objectNodeChecker(objectNode);
 };
 
-export const primitiveNodeChecker: IsFeatureUsedChecker<Primitive> = (node): boolean => {
+export const primitiveNodeChecker = (node: PrimitiveNode): boolean => {
   const value = node.value;
 
   switch (typeof value) {
@@ -176,19 +176,19 @@ export const isFeatureUsed = (feature: AnyTitle, node: NodeWithTitle): boolean =
   }
 
   switch (node.type) {
-    case 'attribute':
+    case 'Attribute':
       return attributeValueChecker(node);
 
-    case 'element':
+    case 'Element':
       return elementNodeChecker(node);
 
-    case 'collection':
+    case 'Collection':
       return collectionNodeChecker(node);
 
-    case 'array':
+    case 'Array':
       return arrayNodeChecker(node);
 
-    case 'object':
+    case 'Object':
       return objectNodeChecker(node);
 
     default:

diff --git a/packages/relottie-metadata/src/metadata.ts b/packages/relottie-metadata/src/metadata.ts
@@ -156,7 +156,7 @@ const getRgbaFromNode = (node: Collection): number[] => {
   if (!valueNode) return [];
 
   const rgbaColor = valueNode.children.reduce((acc, child) => {
-    if (child.type !== 'primitive') return acc;
+    if (child.type !== 'Number') return acc;
 
     const childValue = child.value;