Skip to content

Commit 9f65124

Browse files
committed
feat: adjust extract-features & metadata
1 parent 16e2f44 commit 9f65124

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.changeset/late-files-wave.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@lottiefiles/relottie-extract-features': major
3+
'@lottiefiles/relottie-metadata': major
4+
---
5+
6+
feat: use v2 relottie packages with required changes

packages/relottie-extract-features/src/extract-features.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2022 Design Barn Inc.
33
*/
44

5-
import type { Root, AnyTitle, NodeValue, KeyNode, Primitive } from '@lottiefiles/last';
5+
import type { Root, AnyTitle, NodeValue, KeyNode, PrimitiveNode } from '@lottiefiles/last';
66
import type { Plugin } from 'unified';
77
import { visitParents } from 'unist-util-visit-parents';
88
import type { Data, VFile } from 'vfile';
@@ -35,7 +35,7 @@ export interface ExtractFeaturesFileData extends Data {
3535
}
3636

3737
type AncestorChildNode = Exclude<NodeValue, KeyNode>;
38-
type AncestorNode = Exclude<AncestorChildNode, Primitive>;
38+
type AncestorNode = Exclude<AncestorChildNode, PrimitiveNode>;
3939

4040
const extractFeatures: Plugin<[Options?], Root> = (_ops: Options = {}) => {
4141
// const options = { ...DEFAULT_OPTIONS, ...ops };

packages/relottie-extract-features/src/used-features.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type {
1010
Element,
1111
Collection,
1212
ArrayNode,
13-
Primitive,
13+
PrimitiveNode,
1414
Root,
1515
} from '@lottiefiles/last';
1616

@@ -52,7 +52,7 @@ export const elementNodeChecker: IsFeatureUsedChecker<Element> = (node): boolean
5252
return objectNodeChecker(objectNode);
5353
};
5454

55-
export const primitiveNodeChecker: IsFeatureUsedChecker<Primitive> = (node): boolean => {
55+
export const primitiveNodeChecker = (node: PrimitiveNode): boolean => {
5656
const value = node.value;
5757

5858
switch (typeof value) {
@@ -176,19 +176,19 @@ export const isFeatureUsed = (feature: AnyTitle, node: NodeWithTitle): boolean =
176176
}
177177

178178
switch (node.type) {
179-
case 'attribute':
179+
case 'Attribute':
180180
return attributeValueChecker(node);
181181

182-
case 'element':
182+
case 'Element':
183183
return elementNodeChecker(node);
184184

185-
case 'collection':
185+
case 'Collection':
186186
return collectionNodeChecker(node);
187187

188-
case 'array':
188+
case 'Array':
189189
return arrayNodeChecker(node);
190190

191-
case 'object':
191+
case 'Object':
192192
return objectNodeChecker(node);
193193

194194
default:

packages/relottie-metadata/src/metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const getRgbaFromNode = (node: Collection): number[] => {
156156
if (!valueNode) return [];
157157

158158
const rgbaColor = valueNode.children.reduce((acc, child) => {
159-
if (child.type !== 'primitive') return acc;
159+
if (child.type !== 'Number') return acc;
160160

161161
const childValue = child.value;
162162

0 commit comments

Comments
 (0)