Skip to content

[Refactor] Use partition helper in filterRegexValues #8598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Refactor] Use partition helper in filterRegexValues #8598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions packages/theme/src/cli/utilities/asset-ignore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {uniqBy} from '@shopify/cli-kit/common/array'
import {partition} from '@shopify/cli-kit/common/collection'
import {fileExists, readFile, matchGlob as originalMatchGlob} from '@shopify/cli-kit/node/fs'
import {outputDebug} from '@shopify/cli-kit/node/output'
import {joinPath} from '@shopify/cli-kit/node/path'
Expand All @@ -16,9 +17,9 @@ export function applyIgnoreFilters<T extends {key: string}>(
const ignoreOptions = options.ignore ?? []
const onlyOptions = options.only ?? []

const [normalShopifyPatterns = [], negatedShopifyPatterns = []] = filterRegexValues(shopifyIgnore)
const [normalIgnorePatterns = [], negatedIgnorePatterns = []] = filterRegexValues(ignoreOptions)
const [normalOnlyPatterns = [], negatedOnlyPatterns = []] = filterRegexValues(onlyOptions)
const [normalShopifyPatterns, negatedShopifyPatterns] = filterRegexValues(shopifyIgnore)
const [normalIgnorePatterns, negatedIgnorePatterns] = filterRegexValues(ignoreOptions)
const [normalOnlyPatterns, negatedOnlyPatterns] = filterRegexValues(onlyOptions)

let filteredFiles = files.filter(filterBy(normalShopifyPatterns, '.shopifyignore'))
filteredFiles = filteredFiles.filter(filterBy(normalIgnorePatterns, '--ignore'))
Expand Down Expand Up @@ -70,13 +71,10 @@ export async function getPatternsFromShopifyIgnore(root: string) {
.filter((line) => line && !line.startsWith('#'))
}

function filterRegexValues(regexList: string[]) {
const negatedPatterns = regexList
.filter((regexList) => regexList.startsWith('!'))
.map((regexList) => regexList.slice(1))
const normalPatterns = regexList.filter((regexList) => !regexList.startsWith('!'))
function filterRegexValues(regexList: string[]): [string[], string[]] {
const [negatedPatterns, normalPatterns] = partition(regexList, (pattern) => pattern.startsWith('!'))

return [normalPatterns, negatedPatterns]
return [normalPatterns, negatedPatterns.map((pattern) => pattern.slice(1))]
}

function matchGlob(key: string, pattern: string) {
Expand Down