chore: move non-shared code from frontend-shared to app (#24674)

* move non shared code to packages/app * move things around * fix bug * remove unused code * remove unused code * revert change * unused * fix code * revert [skip ci] * revert [skip ci] Co-authored-by: amehta265 <65267668+amehta265@users.noreply.github.com>
cypress-io · Nov 16, 2022 · 206fdd5 · 206fdd5
1 parent f73bb46
commit 206fdd5
Show file tree

Hide file tree

Showing 17 changed files with 280 additions and 405 deletions.
diff --git a/packages/app/src/composables/useSpecFilter.ts b/packages/app/src/composables/useSpecFilter.ts
@@ -25,7 +25,6 @@ export function useSpecFilter (savedFilter?: string) {
 
   function setSpecFilter (specFilter: string) {
     if (specStore.specFilter !== specFilter) {
-      specStore.setSpecFilter(specFilter)
       saveSpecFilter.executeMutation({ value: JSON.stringify({ specFilter }) })
     }
   }

diff --git a/packages/app/src/runs/RunsError.spec.tsx → packages/app/src/runs/RunsError.cy.tsx b/packages/app/src/runs/RunsError.spec.tsx → packages/app/src/runs/RunsError.cy.tsx
diff --git a/packages/app/src/specs/InlineSpecList.vue b/packages/app/src/specs/InlineSpecList.vue
@@ -29,7 +29,7 @@ import InlineSpecListHeader from './InlineSpecListHeader.vue'
 import InlineSpecListTree from './InlineSpecListTree.vue'
 import CreateSpecModal from './CreateSpecModal.vue'
 import { fuzzySortSpecs, makeFuzzyFoundSpec, useCachedSpecs } from './spec-utils'
-import type { FuzzyFoundSpec } from './spec-utils'
+import type { FuzzyFoundSpec } from './tree/useCollapsibleTree'
 import { useSpecFilter } from '../composables/useSpecFilter'
 
 gql`

diff --git a/packages/app/src/specs/InlineSpecListTree.cy.tsx b/packages/app/src/specs/InlineSpecListTree.cy.tsx
@@ -1,7 +1,7 @@
-import type { FuzzyFoundSpec } from './spec-utils'
 import { ref } from 'vue'
 import { useSpecStore } from '../store'
 import InlineSpecListTree from './InlineSpecListTree.vue'
+import type { FuzzyFoundSpec } from './tree/useCollapsibleTree'
 
 describe('InlineSpecListTree', () => {
   let foundSpecs: FuzzyFoundSpec[]

diff --git a/packages/app/src/specs/InlineSpecListTree.vue b/packages/app/src/specs/InlineSpecListTree.vue
@@ -60,17 +60,14 @@
 </template>
 
 <script setup lang="ts">
-import { useCollapsibleTree } from '@packages/frontend-shared/src/composables/useCollapsibleTree'
-import type { UseCollapsibleTreeNode } from '@packages/frontend-shared/src/composables/useCollapsibleTree'
-import { buildSpecTree } from './spec-utils'
-import type { SpecTreeNode, FuzzyFoundSpec } from './spec-utils'
+import { UseCollapsibleTreeNode, useCollapsibleTree, SpecTreeNode, FuzzyFoundSpec, buildSpecTree } from './tree/useCollapsibleTree'
 import SpecFileItem from './SpecFileItem.vue'
 import { computed, watch, onMounted } from 'vue'
 import DirectoryItem from './DirectoryItem.vue'
 import { RouterLink, useRouter } from 'vue-router'
 import { useSpecStore } from '../store'
-import { useVirtualList } from '@packages/frontend-shared/src/composables/useVirtualList'
-import { useVirtualListNavigation } from '@packages/frontend-shared/src/composables/useVirtualListNavigation'
+import { useVirtualList } from './tree/useVirtualList'
+import { useVirtualListNavigation } from './tree/useVirtualListNavigation'
 import { useStudioStore } from '../store/studio-store'
 
 const props = defineProps<{

diff --git a/packages/app/src/specs/SpecsList.vue b/packages/app/src/specs/SpecsList.vue
@@ -183,12 +183,11 @@ import { gql, useSubscription } from '@urql/vue'
 import { computed, ref, toRef, watch } from 'vue'
 import { Specs_SpecsListFragment, SpecsList_GitInfoUpdatedDocument, SpecsListFragment } from '../generated/graphql'
 import { useI18n } from '@cy/i18n'
-import { buildSpecTree, fuzzySortSpecs, makeFuzzyFoundSpec, useCachedSpecs } from './spec-utils'
-import type { FuzzyFoundSpec } from './spec-utils'
-import { useCollapsibleTree } from '@packages/frontend-shared/src/composables/useCollapsibleTree'
+import { buildSpecTree, FuzzyFoundSpec, useCollapsibleTree } from './tree/useCollapsibleTree'
+import { fuzzySortSpecs, makeFuzzyFoundSpec, useCachedSpecs } from './spec-utils'
 import RowDirectory from './RowDirectory.vue'
 import SpecItem from './SpecItem.vue'
-import { useVirtualList } from '@packages/frontend-shared/src/composables/useVirtualList'
+import { useVirtualList } from './tree/useVirtualList'
 import NoResults from '@cy/components/NoResults.vue'
 import SpecPatternModal from '../components/SpecPatternModal.vue'
 import { useOnline, useResizeObserver } from '@vueuse/core'

diff --git a/packages/app/src/specs/generators/scaffold/ScaffoldGeneratorStepOne.vue b/packages/app/src/specs/generators/scaffold/ScaffoldGeneratorStepOne.vue
@@ -58,8 +58,8 @@
 import { gql, useMutation } from '@urql/vue'
 import { ScaffoldGeneratorStepOne_ScaffoldIntegrationDocument } from '../../../generated/graphql'
 import { computed, onMounted } from 'vue'
-import { buildSpecTree } from '../../spec-utils'
-import { useCollapsibleTree } from '@packages/frontend-shared/src/composables/useCollapsibleTree'
+import { buildSpecTree } from '../../../specs/tree/useCollapsibleTree'
+import { useCollapsibleTree } from '../../tree/useCollapsibleTree'
 import StandardModalFooter from '@cy/components/StandardModalFooter.vue'
 import Button from '@cy/components/Button.vue'
 import { useI18n } from '@cy/i18n'

diff --git a/packages/app/src/specs/spec-utils.ts b/packages/app/src/specs/spec-utils.ts
@@ -2,127 +2,7 @@ import fuzzySort from 'fuzzysort'
 import type { FoundSpec } from '@packages/types'
 import { ComputedRef, Ref, ref, watch } from 'vue'
 import _ from 'lodash'
-import { getRunnerConfigFromWindow } from '../runner'
-
-// Platform may not be available when this file is loaded (e.g. during component our component tests) so
-// we defer loading it until it's used
-let platform
-const getPlatform = (): string => {
-  if (!platform) {
-    platform = getRunnerConfigFromWindow().platform
-  }
-
-  return platform
-}
-const getRegexSeparator = () => getPlatform() === 'win32' ? /\\/ : /\//
-const getSeparator = () => getPlatform() === 'win32' ? '\\' : '/'
-
-export type FuzzyFoundSpec<T = FoundSpec> = T & {
-  fuzzyIndexes: {
-    relative: number[]
-    baseName: number[]
-  }
-}
-
-export type SpecTreeNode<T extends FoundSpec = FoundSpec> = {
-  id: string
-  name: string
-  children: SpecTreeNode<T>[]
-  isLeaf: boolean
-  parent?: SpecTreeNode<T>
-  data?: T
-  highlightIndexes: number[]
-}
-
-export function buildSpecTree<T extends FoundSpec> (specs: FoundSpec[], root: SpecTreeNode<T> = { name: '', isLeaf: false, children: [], id: '', highlightIndexes: [] }): SpecTreeNode<T> {
-  specs.forEach((spec) => buildSpecTreeRecursive(spec.relative, root, spec))
-  collapseEmptyChildren(root)
-
-  return root
-}
-
-export function buildSpecTreeRecursive<T extends FoundSpec> (path: string, tree: SpecTreeNode<T>, data?: T) {
-  const [firstFile, ...rest] = path.split(getRegexSeparator())
-  const id = tree.id ? [tree.id, firstFile].join(getSeparator()) : firstFile
-
-  const newNode: SpecTreeNode<T> = { name: firstFile, isLeaf: false, children: [], parent: tree, data, id, highlightIndexes: [] }
-
-  if (rest.length < 1) {
-    newNode.isLeaf = true
-    newNode.highlightIndexes = getHighlightIndexes(newNode)
-
-    tree.children.push(newNode)
-
-    return tree
-  }
-
-  const foundChild = tree.children.find((child) => child.name === firstFile)
-
-  if (foundChild) {
-    buildSpecTreeRecursive(rest.join(getSeparator()), foundChild, data)
-
-    return tree
-  }
-
-  newNode.highlightIndexes = getHighlightIndexes(newNode)
-  const newTree = buildSpecTreeRecursive(rest.join(getSeparator()), newNode, data)
-
-  tree.children.push(newTree)
-
-  return tree
-}
-
-function collapseEmptyChildren<T extends FoundSpec> (node: SpecTreeNode<T>) {
-  for (const child of node.children) {
-    collapseEmptyChildren(child)
-  }
-  if (node.isLeaf) {
-    return
-  }
-
-  // Root name of our tree is '/'. We don't want to collapse into the root node
-  // so we check node.parent.parent
-  if (node.parent && node.parent.parent && (node.parent.children.length === 1)) {
-    node.parent.name = [node.parent.name, node.name].join(getSeparator())
-    node.parent.id = [node.parent.id, node.name].join(getSeparator())
-    node.parent.children = node.children
-    node.parent.highlightIndexes = getHighlightIndexes(node.parent)
-  }
-
-  return
-}
-
-// Given a node, return the indexes of the characters that should be highlighted
-// The indexes are matched to the `relative` and `baseName` keys of FoundSpec, and
-// depending on whether the node is a leaf or not, the indexes are normalized to the position
-// of the node's location in the tree.
-// If a search of "src/comp" is given with indexes [0,1,2,3,4,5,6,7], the indexes will be split
-// into [0,1,2] and [4,5,6,7] corresponding with a
-// - src
-//   - components
-//     - index.ts
-// tree (given that src/comp is not collapsed)
-function getHighlightIndexes <T extends FoundSpec> (node: SpecTreeNode<T>) {
-  if (!(node.data as any)?.fuzzyIndexes) {
-    return []
-  }
-
-  const { relative: relativeIndexes, baseName: baseNameIndexes } = (node.data as FuzzyFoundSpec<T>).fuzzyIndexes
-
-  // When there is a full (or close to) relative match, baseName will no longer match.
-  // If we have indexes for baseName we show them, otherwise we pull from relative to derive
-  // baseName indexes
-  if (node.isLeaf && baseNameIndexes.length > 0) {
-    return baseNameIndexes
-  }
-
-  const maxIndex = node.id.length - 1
-  const minIndex = maxIndex - node.name.length + 1
-
-  const res = relativeIndexes.filter((index) => index >= minIndex && index <= maxIndex)
-
-  return res.map((idx) => idx - minIndex)
-}
+import { FuzzyFoundSpec, getPlatform } from './tree/useCollapsibleTree'
 
 export function fuzzySortSpecs <T extends FuzzyFoundSpec> (specs: T[], searchValue: string) {
   const normalizedSearchValue = getPlatform() === 'win32' ? searchValue.replaceAll('/', '\\') : searchValue