Move utils.

evilmartians · Oct 2, 2023 · 8fa45ff · 8fa45ff
1 parent 887f25e
commit 8fa45ff
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/utils/is-layer-visible.ts → ...i/services/figma/nodes/is-node-visible.ts b/src/utils/is-layer-visible.ts → ...i/services/figma/nodes/is-node-visible.ts
@@ -1,8 +1,8 @@
+import { nodeHasFills } from '~api/services/figma/nodes/node-has-fills.ts';
 import { type FigmaNode } from '~types/figma.ts';
-import { nodeHasFills } from '~utils/node-has-fills.ts';
 import { notEmpty } from '~utils/not-empty.ts';
 
-export const isLayerVisible = (node: FigmaNode): boolean =>
+export const isNodeVisible = (node: FigmaNode): boolean =>
   node.visible === true &&
   notEmpty(node.opacity) &&
   node.opacity > 0 &&

diff --git a/src/utils/node-has-fills.ts → ...pi/services/figma/nodes/node-has-fills.ts b/src/utils/node-has-fills.ts → ...pi/services/figma/nodes/node-has-fills.ts
@@ -1,6 +1,5 @@
 import { type FigmaNode } from '~types/figma.ts';
-
-import { getNodeFills } from './get-node-fills.ts';
+import { getNodeFills } from '~utils/get-node-fills.ts';
 
 export const nodeHasFills = (node: FigmaNode): boolean =>
   getNodeFills(node).some((fill) => fill.visible);
diff --git a/src/api/services/figma/nodes/specs/node-has-fills.spec.ts b/src/api/services/figma/nodes/specs/node-has-fills.spec.ts
@@ -1,5 +1,5 @@
 import { createFigmaNode } from '~api/services/figma/nodes/create-figma-node.ts';
-import { nodeHasFills } from '~utils/node-has-fills.ts';
+import { nodeHasFills } from '~api/services/figma/nodes/node-has-fills.ts';
 import { describe, expect, test } from 'vitest';
 
 describe('nodeHasFills', () => {

diff --git a/src/api/services/payload/build-general-selection-payload.ts b/src/api/services/payload/build-general-selection-payload.ts
@@ -1,7 +1,7 @@
 import { getIntersectingNodes } from '~api/services/figma/intersections/get-intersecting-nodes.ts';
 import { createFigmaNode } from '~api/services/figma/nodes/create-figma-node.ts';
+import { isNodeVisible } from '~api/services/figma/nodes/is-node-visible.ts';
 import { type SelectionChangeMessage } from '~types/messages.ts';
-import { isLayerVisible } from '~utils/is-layer-visible.ts';
 
 export const buildGeneralSelectionPayload = (
   selection: readonly SceneNode[]
@@ -11,7 +11,7 @@ export const buildGeneralSelectionPayload = (
       intersectingNodes: getIntersectingNodes(selectedNode),
       selectedNode: createFigmaNode(selectedNode),
     }))
-    .filter((pair) => isLayerVisible(pair.selectedNode));
+    .filter((pair) => isNodeVisible(pair.selectedNode));
 
   return {
     colorSpace: figma.root.documentColorProfile,

diff --git a/src/api/services/payload/build-pair-selection-payload.ts b/src/api/services/payload/build-pair-selection-payload.ts
@@ -1,7 +1,7 @@
 import { createFigmaNode } from '~api/services/figma/nodes/create-figma-node.ts';
+import { isNodeVisible } from '~api/services/figma/nodes/is-node-visible.ts';
 import { sortNodesByLayers } from '~api/services/figma/nodes/sort-nodes-by-layers.ts';
 import { type SelectionChangeMessage } from '~types/messages.ts';
-import { isLayerVisible } from '~utils/is-layer-visible.ts';
 import { isEmpty } from '~utils/not-empty.ts';
 
 export const buildPairSelectionPayload = (
@@ -19,7 +19,7 @@ export const buildPairSelectionPayload = (
   const secondFigmaNode = createFigmaNode(secondNode);
 
   const [fg, bg] = sortNodesByLayers(
-    [firstFigmaNode, secondFigmaNode].filter(isLayerVisible)
+    [firstFigmaNode, secondFigmaNode].filter(isNodeVisible)
   );
 
   if (isEmpty(fg) || isEmpty(bg))