From da6737012f97ec3ce34c8aeedb79d8b37040d104 Mon Sep 17 00:00:00 2001 From: Krishna Chaitanya Date: Tue, 6 Oct 2026 20:43:57 +0530 Subject: [PATCH] Revert "Merge pull request #101309 from c3024/chaitanya/681919-vendor-search-filter-column" This reverts commit 5005ab918a7eeb9d38ee24b7139abe0ac9efae04, reversing changes made to e5fac34edec7f05bb4719f94f0fdab6d5b7dcd54. # Conflicts: # tests/unit/PolicyUtilsTest.ts --- src/CONST/index.ts | 3 - src/ONYXKEYS.ts | 8 - .../FilterComponents/ListFilterContent.tsx | 3 - .../FilterComponents/VendorSelector.tsx | 98 - src/hooks/useAdvancedSearchFilters.ts | 15 +- src/hooks/useLoadSearchVendorData.ts | 59 - src/languages/de.ts | 1 - src/languages/el.ts | 1 - src/languages/en.ts | 1 - src/languages/es.ts | 1 - src/languages/fr.ts | 1 - src/languages/it.ts | 1 - src/languages/ja.ts | 1 - src/languages/nl.ts | 1 - src/languages/pl.ts | 1 - src/languages/pt-BR.ts | 1 - src/languages/zh-hans.ts | 1 - src/libs/API/types.ts | 2 - src/libs/ExportOnyxState/masking.ts | 2 - src/libs/PolicyUtils/index.ts | 16 +- src/libs/SearchAutocompleteUtils.ts | 1 - src/libs/SearchParser/autocompleteParser.js | 1598 ++++++++--------- .../SearchParser/autocompleteParser.peggy | 1 - src/libs/SearchParser/baseRules.peggy | 1 - src/libs/SearchParser/searchParser.js | 1574 ++++++++-------- src/libs/SearchParser/searchParser.peggy | 1 - src/libs/SearchQueryUtils.ts | 5 - src/libs/SearchUIUtils.ts | 11 - src/libs/actions/Search.ts | 29 - src/setup/index.ts | 1 - src/types/form/SearchAdvancedFiltersForm.ts | 8 - tests/unit/PolicyUtilsTest.ts | 16 +- tests/unit/Search/SearchQueryUtilsTest.ts | 59 - tests/unit/SearchAutocompleteUtilsTest.ts | 13 - .../hooks/useAdvancedSearchFilters.test.ts | 33 - 35 files changed, 1563 insertions(+), 2005 deletions(-) delete mode 100644 src/components/Search/FilterComponents/VendorSelector.tsx delete mode 100644 src/hooks/useLoadSearchVendorData.ts diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 096da2d06f64..b18d6e7a3840 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -8080,7 +8080,6 @@ const CONST = { EXPORTER: 'exporter', CATEGORY: 'category', TAG: 'tag', - VENDOR: 'vendor', TAX_RATE: 'taxRate', CARD_ID: 'cardID', FEED: 'feed', @@ -8132,7 +8131,6 @@ const CONST = { TAG_EMPTY_VALUE: 'none', CATEGORY_EMPTY_VALUE: 'none', CATEGORY_DEFAULT_VALUE: 'Uncategorized', - VENDOR_EMPTY_VALUE: 'none', MERCHANT_EMPTY_VALUE: 'none', SEARCH_ROUTER_ITEM_TYPE: { CONTEXTUAL_SUGGESTION: 'contextualSuggestion', @@ -8169,7 +8167,6 @@ const CONST = { EXPORTER: 'exporter', CATEGORY: 'category', TAG: 'tag', - VENDOR: 'vendor', TAX_RATE: 'tax-rate', CARD_ID: 'card', FEED: 'feed', diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 41b0e2466e0c..edc195fa449d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -518,12 +518,6 @@ const ONYXKEYS = { /** Set while search filter category data is loading */ RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA: 'isLoadingSearchFiltersCategoryData', - /** Set whether the search filters vendor data has loaded */ - IS_SEARCH_FILTERS_VENDOR_DATA_LOADED: 'isSearchFiltersVendorDataLoaded', - - /** Set while search filter vendor data is loading */ - RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA: 'isLoadingSearchFiltersVendorData', - HAS_LOADED_APP: 'hasLoadedApp', IS_TEST_TOOLS_MODAL_OPEN: 'isTestToolsModalOpen', @@ -1797,8 +1791,6 @@ type OnyxValuesMapping = { [ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED]: boolean; [ONYXKEYS.RAM_ONLY_IS_LOADING_RULES]: boolean; [ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA]: boolean; - [ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED]: boolean; - [ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA]: boolean; [ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA]: boolean; [ONYXKEYS.IS_PENDING_UPDATE_PERSONAL_KARMA]: boolean; [ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN]: boolean; diff --git a/src/components/Search/FilterComponents/ListFilterContent.tsx b/src/components/Search/FilterComponents/ListFilterContent.tsx index 8fdc72e27eee..b6c51e39154e 100644 --- a/src/components/Search/FilterComponents/ListFilterContent.tsx +++ b/src/components/Search/FilterComponents/ListFilterContent.tsx @@ -34,7 +34,6 @@ import TagSelector from './TagSelector'; import TaxRateSelector from './TaxRateSelector'; import TypeSelector from './TypeSelector'; import UserSelector from './UserSelector'; -import VendorSelector from './VendorSelector'; import WorkspaceSelector from './WorkspaceSelector'; type FilterKeys = Exclude; @@ -195,7 +194,6 @@ function ListFilterContent({ case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE: case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO: case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG: - case CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR: case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY: { const Component = { [CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED]: FeedSelector, @@ -205,7 +203,6 @@ function ListFilterContent({ [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE]: TaxRateSelector, [CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO]: ExportedToSelector, [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG]: TagSelector, - [CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR]: VendorSelector, [CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY]: CategorySelector, }[baseFilterKey]; content = ( diff --git a/src/components/Search/FilterComponents/VendorSelector.tsx b/src/components/Search/FilterComponents/VendorSelector.tsx deleted file mode 100644 index 84fc959dd390..000000000000 --- a/src/components/Search/FilterComponents/VendorSelector.tsx +++ /dev/null @@ -1,98 +0,0 @@ -import ActivityIndicator from '@components/ActivityIndicator'; -import type {Filter, SearchFilterCommonProps} from '@components/Search/types'; - -import useLoadSearchVendorData from '@hooks/useLoadSearchVendorData'; -import useLocalize from '@hooks/useLocalize'; -import useOnyx from '@hooks/useOnyx'; -import usePermissions from '@hooks/usePermissions'; -import useTheme from '@hooks/useTheme'; -import useThemeStyles from '@hooks/useThemeStyles'; - -import {getVendorFeaturePolicyIDs} from '@libs/PolicyUtils'; -import {getAllPolicyValues, sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils'; - -import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; -import type {Policy, PolicyVendors} from '@src/types/onyx'; -import {getEmptyObject} from '@src/types/utils/EmptyObject'; - -import type {OnyxCollection} from 'react-native-onyx'; - -import React, {useCallback} from 'react'; -import {View} from 'react-native'; - -import MultiSelect from './MultiSelect'; - -type VendorSelectorProps = SearchFilterCommonProps & { - policyID: Filter | undefined; -}; - -function VendorSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: VendorSelectorProps) { - const {translate, localeCompare} = useLocalize(); - const {isBetaEnabled} = usePermissions(); - const isVendorMatchingBetaEnabled = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING); - const {isLoadingInitialVendors} = useLoadSearchVendorData({shouldRefresh: true}); - const theme = useTheme(); - const styles = useThemeStyles(); - const vendorFeaturePolicyIDsSelector = useCallback( - (allPolicies: OnyxCollection) => getVendorFeaturePolicyIDs(allPolicies, isVendorMatchingBetaEnabled), - [isVendorMatchingBetaEnabled], - ); - const [vendorFeaturePolicyIDs] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: vendorFeaturePolicyIDsSelector}); - const [allPolicyVendors = getEmptyObject>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY_VENDORS); - - const noVendorLabel = translate('search.noVendor'); - const selectedVendorItems = value.map((vendor) => { - if (vendor === CONST.SEARCH.VENDOR_EMPTY_VALUE) { - return {text: noVendorLabel, value: vendor}; - } - return {text: vendor, value: vendor}; - }); - - // Vendor lists are only offered for the workspaces where the vendor feature is on, so stale lists left behind by a - // disconnected integration never surface in the picker. - const eligiblePolicyIDs = new Set(vendorFeaturePolicyIDs); - const eligiblePolicyVendors: OnyxCollection = Object.fromEntries( - Object.entries(allPolicyVendors).filter(([key]) => eligiblePolicyIDs.has(key.replace(ONYXKEYS.COLLECTION.POLICY_VENDORS, ''))), - ); - - const vendorItems = [{text: noVendorLabel, value: CONST.SEARCH.VENDOR_EMPTY_VALUE as string}]; - const uniqueVendorNames = new Set( - getAllPolicyValues(policyID?.value?.length ? policyID : undefined, ONYXKEYS.COLLECTION.POLICY_VENDORS, eligiblePolicyVendors).flatMap((policyVendors) => - Object.values(policyVendors ?? {}).map((vendor) => vendor.name), - ), - ); - vendorItems.push( - ...Array.from(uniqueVendorNames) - .filter(Boolean) - .map((vendorName) => ({text: vendorName, value: vendorName})) - .toSorted((a, b) => sortOptionsWithEmptyValue(a.text, b.text, localeCompare)), - ); - - if (isLoadingInitialVendors) { - return ( - - - - ); - } - - return ( - = CONST.STANDARD_LIST_ITEM_LIMIT} - autoFocus={autoFocus} - selectionListTextInputStyle={selectionListTextInputStyle} - selectionListStyle={selectionListStyle} - footer={footer} - onChange={(vendors) => onChange(vendors.map((vendor) => vendor.value))} - /> - ); -} - -export default VendorSelector; diff --git a/src/hooks/useAdvancedSearchFilters.ts b/src/hooks/useAdvancedSearchFilters.ts index 11b39b8ee3fb..54ff2aa0531a 100644 --- a/src/hooks/useAdvancedSearchFilters.ts +++ b/src/hooks/useAdvancedSearchFilters.ts @@ -1,5 +1,5 @@ import {isFilterableBankAccount} from '@libs/BankAccountUtils'; -import {hasVendorFeatureOnAnyPolicy, isPolicyFeatureEnabled} from '@libs/PolicyUtils'; +import {isPolicyFeatureEnabled} from '@libs/PolicyUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -11,11 +11,9 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import {filterCardsHiddenFromSearch} from '@selectors/Card'; import {emailSelector} from '@selectors/Session'; -import {useCallback} from 'react'; import useLocalize from './useLocalize'; import useOnyx from './useOnyx'; -import usePermissions from './usePermissions'; import useWorkspaceList from './useWorkspaceList'; /** @@ -40,7 +38,6 @@ const typeFiltersKeys = { CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, - CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR, CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE, CONST.SEARCH.SYNTAX_FILTER_KEYS.ATTENDEE, CONST.SEARCH.SYNTAX_FILTER_KEYS.REIMBURSABLE, @@ -318,13 +315,6 @@ function useAdvancedSearchFilters(type: SearchDataTypes | undefined) { const [shouldDisplayCardFilter] = useOnyx(ONYXKEYS.DERIVED.PERSONAL_AND_WORKSPACE_CARD_LIST, {selector: shouldDisplayCardFilterSelector}); const [policies = getEmptyObject>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: advancedSearchPoliciesSelector}); const [policyDerived] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policyDerivedSelector}); - const {isBetaEnabled} = usePermissions(); - const isVendorMatchingBetaEnabled = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING); - const isVendorFilterAvailableSelector = useCallback( - (allPolicies: OnyxCollection) => hasVendorFeatureOnAnyPolicy(allPolicies, isVendorMatchingBetaEnabled), - [isVendorMatchingBetaEnabled], - ); - const [isVendorFilterAvailable = false] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: isVendorFilterAvailableSelector}); const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); const {workspaces} = useAdvancedSearchFiltersWorkspaces(policies); @@ -349,9 +339,6 @@ function useAdvancedSearchFilters(type: SearchDataTypes | undefined) { if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG && !shouldDisplayTagFilter) { return; } - if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR && !isVendorFilterAvailable) { - return; - } if ( (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED || diff --git a/src/hooks/useLoadSearchVendorData.ts b/src/hooks/useLoadSearchVendorData.ts deleted file mode 100644 index 0995cfab7082..000000000000 --- a/src/hooks/useLoadSearchVendorData.ts +++ /dev/null @@ -1,59 +0,0 @@ -import {openSearchVendorFiltersPage} from '@libs/actions/Search'; - -import ONYXKEYS from '@src/ONYXKEYS'; - -import {useEffect, useRef} from 'react'; - -import useNetwork from './useNetwork'; -import useOnyx from './useOnyx'; - -type UseLoadSearchVendorDataParams = { - /** Whether vendor data should be loaded. */ - shouldLoad?: boolean; - - /** Whether already loaded vendor data should be refreshed. */ - shouldRefresh?: boolean; -}; - -function useLoadSearchVendorData({shouldLoad = true, shouldRefresh = false}: UseLoadSearchVendorDataParams = {}) { - const {isOffline} = useNetwork(); - const [areVendorsLoaded] = useOnyx(ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED); - const [isLoadingVendors] = useOnyx(ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA); - const hasRequestedVendorDataRef = useRef(false); - const hasObservedVendorRequestStateRef = useRef(!!areVendorsLoaded || isLoadingVendors !== undefined); - - useEffect(() => { - if (areVendorsLoaded || isLoadingVendors !== undefined) { - hasObservedVendorRequestStateRef.current = true; - } - - const wasVendorRequestStateCleared = hasRequestedVendorDataRef.current && hasObservedVendorRequestStateRef.current && !areVendorsLoaded && isLoadingVendors === undefined; - if (wasVendorRequestStateCleared) { - hasRequestedVendorDataRef.current = false; - hasObservedVendorRequestStateRef.current = false; - } - - if (!shouldLoad) { - hasRequestedVendorDataRef.current = false; - hasObservedVendorRequestStateRef.current = false; - return; - } - - if (isLoadingVendors) { - hasRequestedVendorDataRef.current = true; - return; - } - - if (isOffline || hasRequestedVendorDataRef.current || (areVendorsLoaded && !shouldRefresh)) { - return; - } - hasRequestedVendorDataRef.current = true; - openSearchVendorFiltersPage(); - }, [areVendorsLoaded, isLoadingVendors, isOffline, shouldLoad, shouldRefresh]); - - const isLoadingInitialVendors = shouldLoad && !areVendorsLoaded && !isOffline && isLoadingVendors !== false; - - return {areVendorsLoaded, isLoadingInitialVendors, isOffline}; -} - -export default useLoadSearchVendorData; diff --git a/src/languages/de.ts b/src/languages/de.ts index f3d08a937615..fd3e79038071 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -10018,7 +10018,6 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc noCategory: 'Keine Kategorie', noMerchant: 'Kein Händler', noTag: 'Kein Tag', - noVendor: 'Kein Lieferant', expenseType: 'Ausgabenart', receiptType: 'Belegart', receiptTypeValues: { diff --git a/src/languages/el.ts b/src/languages/el.ts index 0cf1aaacb9e3..565786102914 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -10230,7 +10230,6 @@ ${reportName}`, noCategory: 'Χωρίς κατηγορία', noMerchant: 'Χωρίς έμπορο', noTag: 'Χωρίς ετικέτα', - noVendor: 'Χωρίς προμηθευτή', expenseType: 'Τύπος εξόδου', receiptType: 'Τύπος απόδειξης', receiptTypeValues: { diff --git a/src/languages/en.ts b/src/languages/en.ts index 515a594692e5..5484a03cd476 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -10265,7 +10265,6 @@ const translations = { noCategory: 'No category', noMerchant: 'No merchant', noTag: 'No tag', - noVendor: 'No vendor', expenseType: 'Expense type', receiptType: 'Receipt type', receiptTypeValues: { diff --git a/src/languages/es.ts b/src/languages/es.ts index 2e3202acdf5a..98f9054b36dd 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -9856,7 +9856,6 @@ ${reportName}`, noCategory: 'Sin categoría', noMerchant: 'Sin comerciante', noTag: 'Sin etiqueta', - noVendor: 'Sin proveedor', expenseType: 'Tipo de gasto', receiptType: 'Tipo de recibo', receiptTypeValues: { diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 81915a15282f..0ad335694a44 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -10041,7 +10041,6 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e noCategory: 'Aucune catégorie', noMerchant: 'Aucun commerçant', noTag: 'Aucun tag', - noVendor: 'Aucun fournisseur', expenseType: 'Type de dépense', receiptType: 'Type de reçu', receiptTypeValues: { diff --git a/src/languages/it.ts b/src/languages/it.ts index 2afa12598809..ea61b9ebaa80 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -9971,7 +9971,6 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`, noCategory: 'Nessuna categoria', noMerchant: 'Nessun esercente', noTag: 'Nessun tag', - noVendor: 'Nessun fornitore', expenseType: 'Tipo di spesa', receiptType: 'Tipo di ricevuta', receiptTypeValues: { diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 35cf9871163b..8d20c0cafa1a 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -9827,7 +9827,6 @@ ${reportName}`, noCategory: 'カテゴリなし', noMerchant: '店舗なし', noTag: 'タグなし', - noVendor: 'ベンダーなし', expenseType: '経費の種類', receiptType: '領収書の種類', receiptTypeValues: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 8bbfb5ec1565..22aa7aad467b 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -9925,7 +9925,6 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`, noCategory: 'Geen categorie', noMerchant: 'Geen handelaar', noTag: 'Geen tag', - noVendor: 'Geen leverancier', expenseType: 'Onkostentype', receiptType: 'Bontype', receiptTypeValues: { diff --git a/src/languages/pl.ts b/src/languages/pl.ts index a821e2758f79..de325ab6a863 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -9954,7 +9954,6 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`, noCategory: 'Brak kategorii', noMerchant: 'Brak sprzedawcy', noTag: 'Brak tagu', - noVendor: 'Brak dostawcy', expenseType: 'Typ wydatku', receiptType: 'Typ paragonu', receiptTypeValues: { diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 74a22e4985b6..8c0a31e4a3e2 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -9922,7 +9922,6 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`, noCategory: 'Sem categoria', noMerchant: 'Sem comerciante', noTag: 'Sem tag', - noVendor: 'Sem fornecedor', expenseType: 'Tipo de despesa', receiptType: 'Tipo de recibo', receiptTypeValues: { diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 0d5a896e76b7..64f16f396a09 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -9568,7 +9568,6 @@ ${reportName}`, noCategory: '无类别', noMerchant: '无商家', noTag: '无标签', - noVendor: '无供应商', expenseType: '报销类型', receiptType: '收据类型', receiptTypeValues: { diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 7709b0da6b5d..129fa7af7702 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -1565,7 +1565,6 @@ const READ_COMMANDS = { OPEN_SEARCH_PAGE: 'OpenSearchPage', OPEN_SEARCH_CARD_FILTERS_PAGE: 'OpenSearchCardFiltersPage', OPEN_SEARCH_CATEGORY_FILTERS_PAGE: 'OpenSearchCategoryFiltersPage', - OPEN_SEARCH_VENDOR_FILTERS_PAGE: 'OpenSearchVendorFiltersPage', SEARCH: 'Search', GET_INSIGHTS: 'GetInsights', GET_TRANSACTIONS_CONVERTED_AMOUNT: 'GetTransactionsConvertedAmount', @@ -1748,7 +1747,6 @@ type ReadCommandParameters = { [READ_COMMANDS.OPEN_DRAFT_DISTANCE_EXPENSE]: null; [READ_COMMANDS.OPEN_SEARCH_CARD_FILTERS_PAGE]: null; [READ_COMMANDS.OPEN_SEARCH_CATEGORY_FILTERS_PAGE]: null; - [READ_COMMANDS.OPEN_SEARCH_VENDOR_FILTERS_PAGE]: null; [READ_COMMANDS.START_ISSUE_NEW_CARD_FLOW]: Parameters.StartIssueNewCardFlowParams; [READ_COMMANDS.OPEN_CARD_DETAILS_PAGE]: Parameters.OpenCardDetailsPageParams; [READ_COMMANDS.GET_CORPAY_ONBOARDING_FIELDS]: Parameters.GetCorpayOnboardingFieldsParams; diff --git a/src/libs/ExportOnyxState/masking.ts b/src/libs/ExportOnyxState/masking.ts index d63fd33ff595..0dc6dfafb980 100644 --- a/src/libs/ExportOnyxState/masking.ts +++ b/src/libs/ExportOnyxState/masking.ts @@ -256,7 +256,6 @@ const safeOnyxKeys = new Set([ ONYXKEYS.IS_PLAID_DISABLED, ONYXKEYS.IS_SEARCH_FILTERS_CARD_DATA_LOADED, ONYXKEYS.IS_SEARCH_FILTERS_CATEGORY_DATA_LOADED, - ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED, ONYXKEYS.IS_SENTRY_DEBUG_ENABLED, ONYXKEYS.IS_SENTRY_SEND_ENABLED, ONYXKEYS.IS_SWITCHING_TO_DELEGATOR, @@ -505,7 +504,6 @@ const onyxKeysToMaskFragileData = new Set([ ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER, ONYXKEYS.RAM_ONLY_HAS_FRESH_WALLET_DATA, ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA, - ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA, ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION, ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_RESULTS, ONYXKEYS.RAM_ONLY_WALLET_ONFIDO, diff --git a/src/libs/PolicyUtils/index.ts b/src/libs/PolicyUtils/index.ts index 4eb60739b272..3206b0621ac6 100644 --- a/src/libs/PolicyUtils/index.ts +++ b/src/libs/PolicyUtils/index.ts @@ -2401,25 +2401,12 @@ function hasVendorFeature(policy: OnyxEntry, isVendorMatchingBetaEnabled } /** - * Search spans every workspace at once, so the vendor filter and column are offered when any workspace has the vendor feature. + * Search spans every workspace at once, so the vendor column is offered when any workspace has the vendor feature. */ function hasVendorFeatureOnAnyPolicy(policies: OnyxCollection, isVendorMatchingBetaEnabled: boolean): boolean { return Object.values(policies ?? {}).some((policy) => hasVendorFeature(policy, isVendorMatchingBetaEnabled)); } -/** - * IDs of the workspaces that have the vendor feature, so the Search vendor filter only offers their vendor lists. - */ -function getVendorFeaturePolicyIDs(policies: OnyxCollection, isVendorMatchingBetaEnabled: boolean): string[] { - const policyIDs: string[] = []; - for (const policy of Object.values(policies ?? {})) { - if (policy?.id && hasVendorFeature(policy, isVendorMatchingBetaEnabled)) { - policyIDs.push(policy.id); - } - } - return policyIDs; -} - /** * Single source of truth for which connected integration scopes the vendor field for this workspace * (QBO, Sage Intacct, Xero, Rillet, DualEntry, Business Central, Campfire, or Certinia) and what its vendor list looks like. Returns `undefined` when no @@ -3282,7 +3269,6 @@ export { isXeroVendorMatchingActive, hasVendorFeature, hasVendorFeatureOnAnyPolicy, - getVendorFeaturePolicyIDs, isMatchingVendorListLoaded, getValidConnectedIntegration, getIneligibleInvitees, diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts index bf853191ee79..30934ec63579 100644 --- a/src/libs/SearchAutocompleteUtils.ts +++ b/src/libs/SearchAutocompleteUtils.ts @@ -258,7 +258,6 @@ function filterOutRangesWithCorrectValue( case CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT: case CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION: case CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE: - case CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR: return range.value.length > 0; case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO: return exportedToList.get().includes(range.value); diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js index 987c224a1d87..aff5fc529fc3 100644 --- a/src/libs/SearchParser/autocompleteParser.js +++ b/src/libs/SearchParser/autocompleteParser.js @@ -200,117 +200,116 @@ function peg$parse(input, options) { var peg$c14 = "group-currency"; var peg$c15 = "tag"; var peg$c16 = "category"; - var peg$c17 = "vendor"; - var peg$c18 = "to"; - var peg$c19 = "exporter"; - var peg$c20 = "payer"; - var peg$c21 = "paidBy"; - var peg$c22 = "paid-by"; - var peg$c23 = "taxrate"; - var peg$c24 = "tax-rate"; - var peg$c25 = "cardID"; - var peg$c26 = "card"; - var peg$c27 = "bankAccount"; - var peg$c28 = "bank-account"; - var peg$c29 = "from"; - var peg$c30 = "attendee"; - var peg$c31 = "expenseType"; - var peg$c32 = "expense-type"; - var peg$c33 = "receiptType"; - var peg$c34 = "receipt-type"; - var peg$c35 = "transactionStatus"; - var peg$c36 = "transaction-status"; - var peg$c37 = "withdrawalType"; - var peg$c38 = "withdrawal-type"; - var peg$c39 = "withdrawalStatus"; - var peg$c40 = "withdrawal-status"; - var peg$c41 = "paidStatus"; - var peg$c42 = "paid-status"; - var peg$c43 = "withdrawalid"; - var peg$c44 = "withdrawal-id"; - var peg$c45 = "billable"; - var peg$c46 = "reimbursable"; - var peg$c47 = "type"; - var peg$c48 = "status"; - var peg$c49 = "sortBy"; - var peg$c50 = "sort-by"; - var peg$c51 = "sortOrder"; - var peg$c52 = "sort-order"; - var peg$c53 = "policyID"; - var peg$c54 = "workspace"; - var peg$c55 = "submitted"; - var peg$c56 = "approved"; - var peg$c57 = "paid"; - var peg$c58 = "exported"; - var peg$c59 = "posted"; - var peg$c60 = "withdrawn"; - var peg$c61 = "groupby"; - var peg$c62 = "group-by"; - var peg$c63 = "limit"; - var peg$c64 = "feed"; - var peg$c65 = "title"; - var peg$c66 = "submitteruserid"; - var peg$c67 = "submitter-user-id"; - var peg$c68 = "submitterpayrollid"; - var peg$c69 = "submitter-payroll-id"; - var peg$c70 = "orderdealnumbers"; - var peg$c71 = "order-deal-numbers"; - var peg$c72 = "assignee"; - var peg$c73 = "createdby"; - var peg$c74 = "created-by"; - var peg$c75 = "action"; - var peg$c76 = "total"; - var peg$c77 = "has"; - var peg$c78 = "is"; - var peg$c79 = "purchaseamount"; - var peg$c80 = "purchase-amount"; - var peg$c81 = "purchasecurrency"; - var peg$c82 = "purchase-currency"; - var peg$c83 = "amountdebited"; - var peg$c84 = "amount-debited"; - var peg$c85 = "amountreimbursed"; - var peg$c86 = "amount-reimbursed"; - var peg$c87 = "columns"; - var peg$c88 = "view"; - var peg$c89 = "compare"; - var peg$c90 = "per-diem"; - var peg$c91 = "drafts"; - var peg$c92 = "draft"; - var peg$c93 = "tax"; - var peg$c94 = "policy-name"; - var peg$c95 = "long-report-id"; - var peg$c96 = "exported-to"; - var peg$c97 = "exportedto"; - var peg$c98 = "exchange-rate"; - var peg$c99 = "reimbursable-total"; - var peg$c100 = "non-reimbursable-total"; - var peg$c101 = "group-from"; - var peg$c102 = "group-expenses"; - var peg$c103 = "group-total"; - var peg$c104 = "group-card"; - var peg$c105 = "group-feed"; - var peg$c106 = "group-bank-account"; - var peg$c107 = "group-withdrawn"; - var peg$c108 = "group-withdrawal-id"; - var peg$c109 = "group-amount-debited"; - var peg$c110 = "group-amount-reimbursed"; - var peg$c111 = "group-category"; - var peg$c112 = "group-tag"; - var peg$c113 = "group-merchant"; - var peg$c114 = "group-day"; - var peg$c115 = "group-month"; - var peg$c116 = "group-week"; - var peg$c117 = "group-year"; - var peg$c118 = "group-quarter"; - var peg$c119 = "!="; - var peg$c120 = ">="; - var peg$c121 = ">"; - var peg$c122 = "<="; - var peg$c123 = "<"; - var peg$c124 = "\\"; - var peg$c125 = "\u201C"; - var peg$c126 = "\u201D"; - var peg$c127 = "\""; + var peg$c17 = "to"; + var peg$c18 = "exporter"; + var peg$c19 = "payer"; + var peg$c20 = "paidBy"; + var peg$c21 = "paid-by"; + var peg$c22 = "taxrate"; + var peg$c23 = "tax-rate"; + var peg$c24 = "cardID"; + var peg$c25 = "card"; + var peg$c26 = "bankAccount"; + var peg$c27 = "bank-account"; + var peg$c28 = "from"; + var peg$c29 = "attendee"; + var peg$c30 = "expenseType"; + var peg$c31 = "expense-type"; + var peg$c32 = "receiptType"; + var peg$c33 = "receipt-type"; + var peg$c34 = "transactionStatus"; + var peg$c35 = "transaction-status"; + var peg$c36 = "withdrawalType"; + var peg$c37 = "withdrawal-type"; + var peg$c38 = "withdrawalStatus"; + var peg$c39 = "withdrawal-status"; + var peg$c40 = "paidStatus"; + var peg$c41 = "paid-status"; + var peg$c42 = "withdrawalid"; + var peg$c43 = "withdrawal-id"; + var peg$c44 = "billable"; + var peg$c45 = "reimbursable"; + var peg$c46 = "type"; + var peg$c47 = "status"; + var peg$c48 = "sortBy"; + var peg$c49 = "sort-by"; + var peg$c50 = "sortOrder"; + var peg$c51 = "sort-order"; + var peg$c52 = "policyID"; + var peg$c53 = "workspace"; + var peg$c54 = "submitted"; + var peg$c55 = "approved"; + var peg$c56 = "paid"; + var peg$c57 = "exported"; + var peg$c58 = "posted"; + var peg$c59 = "withdrawn"; + var peg$c60 = "groupby"; + var peg$c61 = "group-by"; + var peg$c62 = "limit"; + var peg$c63 = "feed"; + var peg$c64 = "title"; + var peg$c65 = "submitteruserid"; + var peg$c66 = "submitter-user-id"; + var peg$c67 = "submitterpayrollid"; + var peg$c68 = "submitter-payroll-id"; + var peg$c69 = "orderdealnumbers"; + var peg$c70 = "order-deal-numbers"; + var peg$c71 = "assignee"; + var peg$c72 = "createdby"; + var peg$c73 = "created-by"; + var peg$c74 = "action"; + var peg$c75 = "total"; + var peg$c76 = "has"; + var peg$c77 = "is"; + var peg$c78 = "purchaseamount"; + var peg$c79 = "purchase-amount"; + var peg$c80 = "purchasecurrency"; + var peg$c81 = "purchase-currency"; + var peg$c82 = "amountdebited"; + var peg$c83 = "amount-debited"; + var peg$c84 = "amountreimbursed"; + var peg$c85 = "amount-reimbursed"; + var peg$c86 = "columns"; + var peg$c87 = "view"; + var peg$c88 = "compare"; + var peg$c89 = "per-diem"; + var peg$c90 = "drafts"; + var peg$c91 = "draft"; + var peg$c92 = "tax"; + var peg$c93 = "policy-name"; + var peg$c94 = "long-report-id"; + var peg$c95 = "exported-to"; + var peg$c96 = "exportedto"; + var peg$c97 = "exchange-rate"; + var peg$c98 = "reimbursable-total"; + var peg$c99 = "non-reimbursable-total"; + var peg$c100 = "group-from"; + var peg$c101 = "group-expenses"; + var peg$c102 = "group-total"; + var peg$c103 = "group-card"; + var peg$c104 = "group-feed"; + var peg$c105 = "group-bank-account"; + var peg$c106 = "group-withdrawn"; + var peg$c107 = "group-withdrawal-id"; + var peg$c108 = "group-amount-debited"; + var peg$c109 = "group-amount-reimbursed"; + var peg$c110 = "group-category"; + var peg$c111 = "group-tag"; + var peg$c112 = "group-merchant"; + var peg$c113 = "group-day"; + var peg$c114 = "group-month"; + var peg$c115 = "group-week"; + var peg$c116 = "group-year"; + var peg$c117 = "group-quarter"; + var peg$c118 = "!="; + var peg$c119 = ">="; + var peg$c120 = ">"; + var peg$c121 = "<="; + var peg$c122 = "<"; + var peg$c123 = "\\"; + var peg$c124 = "\u201C"; + var peg$c125 = "\u201D"; + var peg$c126 = "\""; var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/; var peg$r1 = /^[:=]/; @@ -347,134 +346,133 @@ function peg$parse(input, options) { var peg$e17 = peg$literalExpectation("group-currency", true); var peg$e18 = peg$literalExpectation("tag", true); var peg$e19 = peg$literalExpectation("category", true); - var peg$e20 = peg$literalExpectation("vendor", true); - var peg$e21 = peg$literalExpectation("to", true); - var peg$e22 = peg$literalExpectation("exporter", true); - var peg$e23 = peg$literalExpectation("payer", true); - var peg$e24 = peg$literalExpectation("paidBy", false); - var peg$e25 = peg$literalExpectation("paid-by", true); - var peg$e26 = peg$literalExpectation("taxRate", true); - var peg$e27 = peg$literalExpectation("tax-rate", true); - var peg$e28 = peg$literalExpectation("cardID", false); - var peg$e29 = peg$literalExpectation("card", true); - var peg$e30 = peg$literalExpectation("bankAccount", false); - var peg$e31 = peg$literalExpectation("bank-account", true); - var peg$e32 = peg$literalExpectation("from", true); - var peg$e33 = peg$literalExpectation("attendee", true); - var peg$e34 = peg$literalExpectation("expenseType", false); - var peg$e35 = peg$literalExpectation("expense-type", true); - var peg$e36 = peg$literalExpectation("receiptType", false); - var peg$e37 = peg$literalExpectation("receipt-type", true); - var peg$e38 = peg$literalExpectation("transactionStatus", false); - var peg$e39 = peg$literalExpectation("transaction-status", true); - var peg$e40 = peg$literalExpectation("withdrawalType", false); - var peg$e41 = peg$literalExpectation("withdrawal-type", true); - var peg$e42 = peg$literalExpectation("withdrawalStatus", false); - var peg$e43 = peg$literalExpectation("withdrawal-status", true); - var peg$e44 = peg$literalExpectation("paidStatus", false); - var peg$e45 = peg$literalExpectation("paid-status", true); - var peg$e46 = peg$literalExpectation("withdrawalID", true); - var peg$e47 = peg$literalExpectation("withdrawal-id", true); - var peg$e48 = peg$literalExpectation("billable", true); - var peg$e49 = peg$literalExpectation("reimbursable", true); - var peg$e50 = peg$literalExpectation("type", true); - var peg$e51 = peg$literalExpectation("status", true); - var peg$e52 = peg$literalExpectation("sortBy", false); - var peg$e53 = peg$literalExpectation("sort-by", true); - var peg$e54 = peg$literalExpectation("sortOrder", false); - var peg$e55 = peg$literalExpectation("sort-order", true); - var peg$e56 = peg$literalExpectation("policyID", false); - var peg$e57 = peg$literalExpectation("workspace", true); - var peg$e58 = peg$literalExpectation("submitted", true); - var peg$e59 = peg$literalExpectation("approved", true); - var peg$e60 = peg$literalExpectation("paid", true); - var peg$e61 = peg$literalExpectation("exported", true); - var peg$e62 = peg$literalExpectation("posted", true); - var peg$e63 = peg$literalExpectation("withdrawn", true); - var peg$e64 = peg$literalExpectation("groupBy", true); - var peg$e65 = peg$literalExpectation("group-by", true); - var peg$e66 = peg$literalExpectation("limit", true); - var peg$e67 = peg$literalExpectation("feed", true); - var peg$e68 = peg$literalExpectation("title", true); - var peg$e69 = peg$literalExpectation("submitterUserID", true); - var peg$e70 = peg$literalExpectation("submitter-user-id", true); - var peg$e71 = peg$literalExpectation("submitterPayrollID", true); - var peg$e72 = peg$literalExpectation("submitter-payroll-id", true); - var peg$e73 = peg$literalExpectation("orderDealNumbers", true); - var peg$e74 = peg$literalExpectation("order-deal-numbers", true); - var peg$e75 = peg$literalExpectation("assignee", true); - var peg$e76 = peg$literalExpectation("createdBy", true); - var peg$e77 = peg$literalExpectation("created-by", true); - var peg$e78 = peg$literalExpectation("action", true); - var peg$e79 = peg$literalExpectation("total", true); - var peg$e80 = peg$literalExpectation("has", true); - var peg$e81 = peg$literalExpectation("is", true); - var peg$e82 = peg$literalExpectation("purchaseAmount", true); - var peg$e83 = peg$literalExpectation("purchase-amount", true); - var peg$e84 = peg$literalExpectation("purchaseCurrency", true); - var peg$e85 = peg$literalExpectation("purchase-currency", true); - var peg$e86 = peg$literalExpectation("amountDebited", true); - var peg$e87 = peg$literalExpectation("amount-debited", true); - var peg$e88 = peg$literalExpectation("amountReimbursed", true); - var peg$e89 = peg$literalExpectation("amount-reimbursed", true); - var peg$e90 = peg$literalExpectation("columns", true); - var peg$e91 = peg$literalExpectation("view", true); - var peg$e92 = peg$literalExpectation("compare", true); - var peg$e93 = peg$literalExpectation("per-diem", true); - var peg$e94 = peg$literalExpectation("drafts", true); - var peg$e95 = peg$literalExpectation("draft", true); - var peg$e96 = peg$literalExpectation("tax", true); - var peg$e97 = peg$literalExpectation("policy-name", true); - var peg$e98 = peg$literalExpectation("long-report-id", true); - var peg$e99 = peg$literalExpectation("exported-to", true); - var peg$e100 = peg$classExpectation([":", "="], false, false); - var peg$e101 = peg$literalExpectation("exportedTo", true); - var peg$e102 = peg$literalExpectation("exchange-rate", true); - var peg$e103 = peg$literalExpectation("reimbursable-total", true); - var peg$e104 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e105 = peg$literalExpectation("group-from", true); - var peg$e106 = peg$literalExpectation("group-expenses", true); - var peg$e107 = peg$literalExpectation("group-total", true); - var peg$e108 = peg$literalExpectation("group-card", true); - var peg$e109 = peg$literalExpectation("group-feed", true); - var peg$e110 = peg$literalExpectation("group-bank-account", true); - var peg$e111 = peg$literalExpectation("group-withdrawn", true); - var peg$e112 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e113 = peg$literalExpectation("group-amount-debited", true); - var peg$e114 = peg$literalExpectation("group-amount-reimbursed", true); - var peg$e115 = peg$literalExpectation("group-category", true); - var peg$e116 = peg$literalExpectation("group-tag", true); - var peg$e117 = peg$literalExpectation("group-merchant", true); - var peg$e118 = peg$literalExpectation("group-day", true); - var peg$e119 = peg$literalExpectation("group-month", true); - var peg$e120 = peg$literalExpectation("group-week", true); - var peg$e121 = peg$literalExpectation("group-year", true); - var peg$e122 = peg$literalExpectation("group-quarter", true); - var peg$e123 = peg$otherExpectation("operator"); - var peg$e124 = peg$literalExpectation("!=", false); - var peg$e125 = peg$literalExpectation(">=", false); - var peg$e126 = peg$literalExpectation(">", false); - var peg$e127 = peg$literalExpectation("<=", false); - var peg$e128 = peg$literalExpectation("<", false); - var peg$e129 = peg$literalExpectation("\\", false); - var peg$e130 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false); - var peg$e131 = peg$otherExpectation("word"); - var peg$e132 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e133 = peg$otherExpectation("whitespace"); - var peg$e134 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e135 = peg$otherExpectation("quote"); - var peg$e136 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e137 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e138 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e139 = peg$literalExpectation("\u201C", false); - var peg$e140 = peg$literalExpectation("\u201D", false); - var peg$e141 = peg$literalExpectation("\"", false); - var peg$e142 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e143 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e145 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e146 = peg$classExpectation([","], false, false); - var peg$e147 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); + var peg$e20 = peg$literalExpectation("to", true); + var peg$e21 = peg$literalExpectation("exporter", true); + var peg$e22 = peg$literalExpectation("payer", true); + var peg$e23 = peg$literalExpectation("paidBy", false); + var peg$e24 = peg$literalExpectation("paid-by", true); + var peg$e25 = peg$literalExpectation("taxRate", true); + var peg$e26 = peg$literalExpectation("tax-rate", true); + var peg$e27 = peg$literalExpectation("cardID", false); + var peg$e28 = peg$literalExpectation("card", true); + var peg$e29 = peg$literalExpectation("bankAccount", false); + var peg$e30 = peg$literalExpectation("bank-account", true); + var peg$e31 = peg$literalExpectation("from", true); + var peg$e32 = peg$literalExpectation("attendee", true); + var peg$e33 = peg$literalExpectation("expenseType", false); + var peg$e34 = peg$literalExpectation("expense-type", true); + var peg$e35 = peg$literalExpectation("receiptType", false); + var peg$e36 = peg$literalExpectation("receipt-type", true); + var peg$e37 = peg$literalExpectation("transactionStatus", false); + var peg$e38 = peg$literalExpectation("transaction-status", true); + var peg$e39 = peg$literalExpectation("withdrawalType", false); + var peg$e40 = peg$literalExpectation("withdrawal-type", true); + var peg$e41 = peg$literalExpectation("withdrawalStatus", false); + var peg$e42 = peg$literalExpectation("withdrawal-status", true); + var peg$e43 = peg$literalExpectation("paidStatus", false); + var peg$e44 = peg$literalExpectation("paid-status", true); + var peg$e45 = peg$literalExpectation("withdrawalID", true); + var peg$e46 = peg$literalExpectation("withdrawal-id", true); + var peg$e47 = peg$literalExpectation("billable", true); + var peg$e48 = peg$literalExpectation("reimbursable", true); + var peg$e49 = peg$literalExpectation("type", true); + var peg$e50 = peg$literalExpectation("status", true); + var peg$e51 = peg$literalExpectation("sortBy", false); + var peg$e52 = peg$literalExpectation("sort-by", true); + var peg$e53 = peg$literalExpectation("sortOrder", false); + var peg$e54 = peg$literalExpectation("sort-order", true); + var peg$e55 = peg$literalExpectation("policyID", false); + var peg$e56 = peg$literalExpectation("workspace", true); + var peg$e57 = peg$literalExpectation("submitted", true); + var peg$e58 = peg$literalExpectation("approved", true); + var peg$e59 = peg$literalExpectation("paid", true); + var peg$e60 = peg$literalExpectation("exported", true); + var peg$e61 = peg$literalExpectation("posted", true); + var peg$e62 = peg$literalExpectation("withdrawn", true); + var peg$e63 = peg$literalExpectation("groupBy", true); + var peg$e64 = peg$literalExpectation("group-by", true); + var peg$e65 = peg$literalExpectation("limit", true); + var peg$e66 = peg$literalExpectation("feed", true); + var peg$e67 = peg$literalExpectation("title", true); + var peg$e68 = peg$literalExpectation("submitterUserID", true); + var peg$e69 = peg$literalExpectation("submitter-user-id", true); + var peg$e70 = peg$literalExpectation("submitterPayrollID", true); + var peg$e71 = peg$literalExpectation("submitter-payroll-id", true); + var peg$e72 = peg$literalExpectation("orderDealNumbers", true); + var peg$e73 = peg$literalExpectation("order-deal-numbers", true); + var peg$e74 = peg$literalExpectation("assignee", true); + var peg$e75 = peg$literalExpectation("createdBy", true); + var peg$e76 = peg$literalExpectation("created-by", true); + var peg$e77 = peg$literalExpectation("action", true); + var peg$e78 = peg$literalExpectation("total", true); + var peg$e79 = peg$literalExpectation("has", true); + var peg$e80 = peg$literalExpectation("is", true); + var peg$e81 = peg$literalExpectation("purchaseAmount", true); + var peg$e82 = peg$literalExpectation("purchase-amount", true); + var peg$e83 = peg$literalExpectation("purchaseCurrency", true); + var peg$e84 = peg$literalExpectation("purchase-currency", true); + var peg$e85 = peg$literalExpectation("amountDebited", true); + var peg$e86 = peg$literalExpectation("amount-debited", true); + var peg$e87 = peg$literalExpectation("amountReimbursed", true); + var peg$e88 = peg$literalExpectation("amount-reimbursed", true); + var peg$e89 = peg$literalExpectation("columns", true); + var peg$e90 = peg$literalExpectation("view", true); + var peg$e91 = peg$literalExpectation("compare", true); + var peg$e92 = peg$literalExpectation("per-diem", true); + var peg$e93 = peg$literalExpectation("drafts", true); + var peg$e94 = peg$literalExpectation("draft", true); + var peg$e95 = peg$literalExpectation("tax", true); + var peg$e96 = peg$literalExpectation("policy-name", true); + var peg$e97 = peg$literalExpectation("long-report-id", true); + var peg$e98 = peg$literalExpectation("exported-to", true); + var peg$e99 = peg$classExpectation([":", "="], false, false); + var peg$e100 = peg$literalExpectation("exportedTo", true); + var peg$e101 = peg$literalExpectation("exchange-rate", true); + var peg$e102 = peg$literalExpectation("reimbursable-total", true); + var peg$e103 = peg$literalExpectation("non-reimbursable-total", true); + var peg$e104 = peg$literalExpectation("group-from", true); + var peg$e105 = peg$literalExpectation("group-expenses", true); + var peg$e106 = peg$literalExpectation("group-total", true); + var peg$e107 = peg$literalExpectation("group-card", true); + var peg$e108 = peg$literalExpectation("group-feed", true); + var peg$e109 = peg$literalExpectation("group-bank-account", true); + var peg$e110 = peg$literalExpectation("group-withdrawn", true); + var peg$e111 = peg$literalExpectation("group-withdrawal-id", true); + var peg$e112 = peg$literalExpectation("group-amount-debited", true); + var peg$e113 = peg$literalExpectation("group-amount-reimbursed", true); + var peg$e114 = peg$literalExpectation("group-category", true); + var peg$e115 = peg$literalExpectation("group-tag", true); + var peg$e116 = peg$literalExpectation("group-merchant", true); + var peg$e117 = peg$literalExpectation("group-day", true); + var peg$e118 = peg$literalExpectation("group-month", true); + var peg$e119 = peg$literalExpectation("group-week", true); + var peg$e120 = peg$literalExpectation("group-year", true); + var peg$e121 = peg$literalExpectation("group-quarter", true); + var peg$e122 = peg$otherExpectation("operator"); + var peg$e123 = peg$literalExpectation("!=", false); + var peg$e124 = peg$literalExpectation(">=", false); + var peg$e125 = peg$literalExpectation(">", false); + var peg$e126 = peg$literalExpectation("<=", false); + var peg$e127 = peg$literalExpectation("<", false); + var peg$e128 = peg$literalExpectation("\\", false); + var peg$e129 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false); + var peg$e130 = peg$otherExpectation("word"); + var peg$e131 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e132 = peg$otherExpectation("whitespace"); + var peg$e133 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e134 = peg$otherExpectation("quote"); + var peg$e135 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e136 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e137 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e138 = peg$literalExpectation("\u201C", false); + var peg$e139 = peg$literalExpectation("\u201D", false); + var peg$e140 = peg$literalExpectation("\"", false); + var peg$e141 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e142 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e143 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e145 = peg$classExpectation([","], false, false); + var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); var peg$f0 = function(ranges) { return { autocomplete, ranges }; }; var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); }; @@ -550,123 +548,122 @@ function peg$parse(input, options) { var peg$f16 = function() { return "groupCurrency"; }; var peg$f17 = function() { return "tag"; }; var peg$f18 = function() { return "category"; }; - var peg$f19 = function() { return "vendor"; }; - var peg$f20 = function() { return "to"; }; - var peg$f21 = function() { return "exporter"; }; - var peg$f22 = function() { return "payer"; }; - var peg$f23 = function() { return "paidBy"; }; - var peg$f24 = function() { return "taxRate"; }; - var peg$f25 = function() { return "cardID"; }; - var peg$f26 = function() { return "bankAccount"; }; - var peg$f27 = function() { return "from"; }; - var peg$f28 = function() {return "attendee"}; - var peg$f29 = function() { return "expenseType"; }; - var peg$f30 = function() { return "receiptType"; }; - var peg$f31 = function() { return "transactionStatus"; }; - var peg$f32 = function() { return "withdrawalType"; }; - var peg$f33 = function() { return "withdrawalStatus"; }; - var peg$f34 = function() { return "paidStatus"; }; - var peg$f35 = function() { return "withdrawalID"; }; - var peg$f36 = function() { return "billable"; }; - var peg$f37 = function() { return "reimbursable"; }; - var peg$f38 = function() { return "type"; }; - var peg$f39 = function() { return "status"; }; - var peg$f40 = function() { return "sortBy"; }; - var peg$f41 = function() { return "sortOrder"; }; - var peg$f42 = function() { return "policyID"; }; - var peg$f43 = function() { return "submitted"; }; - var peg$f44 = function() { return "approved"; }; - var peg$f45 = function() { return "paid"; }; - var peg$f46 = function() { return "exported"; }; - var peg$f47 = function() { return "posted"; }; - var peg$f48 = function() { return "withdrawn"; }; - var peg$f49 = function() { return "groupBy"; }; - var peg$f50 = function() { return "limit"; }; - var peg$f51 = function() { return "feed"; }; - var peg$f52 = function() { return "title"; }; - var peg$f53 = function() { return "submitterUserID"; }; - var peg$f54 = function() { return "submitterPayrollID"; }; - var peg$f55 = function() { return "orderDealNumbers"; }; - var peg$f56 = function() { return "assignee"; }; - var peg$f57 = function() { return "createdBy"; }; - var peg$f58 = function() { return "action"; }; - var peg$f59 = function() {return "total"; }; - var peg$f60 = function() {return "has"; }; - var peg$f61 = function() {return "is"; }; - var peg$f62 = function() {return "purchaseAmount"}; - var peg$f63 = function() {return "purchaseCurrency"}; - var peg$f64 = function() {return "amountDebited"}; - var peg$f65 = function() {return "amountReimbursed"}; - var peg$f66 = function() { + var peg$f19 = function() { return "to"; }; + var peg$f20 = function() { return "exporter"; }; + var peg$f21 = function() { return "payer"; }; + var peg$f22 = function() { return "paidBy"; }; + var peg$f23 = function() { return "taxRate"; }; + var peg$f24 = function() { return "cardID"; }; + var peg$f25 = function() { return "bankAccount"; }; + var peg$f26 = function() { return "from"; }; + var peg$f27 = function() {return "attendee"}; + var peg$f28 = function() { return "expenseType"; }; + var peg$f29 = function() { return "receiptType"; }; + var peg$f30 = function() { return "transactionStatus"; }; + var peg$f31 = function() { return "withdrawalType"; }; + var peg$f32 = function() { return "withdrawalStatus"; }; + var peg$f33 = function() { return "paidStatus"; }; + var peg$f34 = function() { return "withdrawalID"; }; + var peg$f35 = function() { return "billable"; }; + var peg$f36 = function() { return "reimbursable"; }; + var peg$f37 = function() { return "type"; }; + var peg$f38 = function() { return "status"; }; + var peg$f39 = function() { return "sortBy"; }; + var peg$f40 = function() { return "sortOrder"; }; + var peg$f41 = function() { return "policyID"; }; + var peg$f42 = function() { return "submitted"; }; + var peg$f43 = function() { return "approved"; }; + var peg$f44 = function() { return "paid"; }; + var peg$f45 = function() { return "exported"; }; + var peg$f46 = function() { return "posted"; }; + var peg$f47 = function() { return "withdrawn"; }; + var peg$f48 = function() { return "groupBy"; }; + var peg$f49 = function() { return "limit"; }; + var peg$f50 = function() { return "feed"; }; + var peg$f51 = function() { return "title"; }; + var peg$f52 = function() { return "submitterUserID"; }; + var peg$f53 = function() { return "submitterPayrollID"; }; + var peg$f54 = function() { return "orderDealNumbers"; }; + var peg$f55 = function() { return "assignee"; }; + var peg$f56 = function() { return "createdBy"; }; + var peg$f57 = function() { return "action"; }; + var peg$f58 = function() {return "total"; }; + var peg$f59 = function() {return "has"; }; + var peg$f60 = function() {return "is"; }; + var peg$f61 = function() {return "purchaseAmount"}; + var peg$f62 = function() {return "purchaseCurrency"}; + var peg$f63 = function() {return "amountDebited"}; + var peg$f64 = function() {return "amountReimbursed"}; + var peg$f65 = function() { isColumnsContext = true; return "columns"; }; - var peg$f67 = function() {return "view"}; - var peg$f68 = function() {return "compare"}; - var peg$f69 = function() { return isColumnsContext; }; - var peg$f70 = function() { return "perDiem"; }; - var peg$f71 = function() { return "drafts"; }; - var peg$f72 = function() { return "originalamount"; }; - var peg$f73 = function() { return "taxAmount"; }; - var peg$f74 = function() { return "taxrate"; }; - var peg$f75 = function() { return "policyname"; }; - var peg$f76 = function() { return "withdrawalID"; }; - var peg$f77 = function() { return "bankAccount"; }; - var peg$f78 = function() { return "reportID"; }; - var peg$f79 = function() { return "base62ReportID"; }; - var peg$f80 = function() { return "exportedto"; }; + var peg$f66 = function() {return "view"}; + var peg$f67 = function() {return "compare"}; + var peg$f68 = function() { return isColumnsContext; }; + var peg$f69 = function() { return "perDiem"; }; + var peg$f70 = function() { return "drafts"; }; + var peg$f71 = function() { return "originalamount"; }; + var peg$f72 = function() { return "taxAmount"; }; + var peg$f73 = function() { return "taxrate"; }; + var peg$f74 = function() { return "policyname"; }; + var peg$f75 = function() { return "withdrawalID"; }; + var peg$f76 = function() { return "bankAccount"; }; + var peg$f77 = function() { return "reportID"; }; + var peg$f78 = function() { return "base62ReportID"; }; + var peg$f79 = function() { return "exportedto"; }; + var peg$f80 = function() { return "exportedTo"; }; var peg$f81 = function() { return "exportedTo"; }; - var peg$f82 = function() { return "exportedTo"; }; - var peg$f83 = function() { return "exchangeRate"; }; - var peg$f84 = function() { return "reimbursableTotal"; }; - var peg$f85 = function() { return "nonReimbursableTotal"; }; - var peg$f86 = function() { return "groupFrom"; }; - var peg$f87 = function() { return "groupExpenses"; }; - var peg$f88 = function() { return "groupTotal"; }; - var peg$f89 = function() { return "groupCard"; }; - var peg$f90 = function() { return "groupFeed"; }; - var peg$f91 = function() { return "groupBankAccount"; }; - var peg$f92 = function() { return "groupWithdrawn"; }; - var peg$f93 = function() { return "groupWithdrawalID"; }; - var peg$f94 = function() { return "groupAmountDebited"; }; - var peg$f95 = function() { return "groupAmountReimbursed"; }; - var peg$f96 = function() { return "amountDebited"; }; - var peg$f97 = function() { return "amountReimbursed"; }; - var peg$f98 = function() { return "groupCategory"; }; - var peg$f99 = function() { return "groupTag"; }; - var peg$f100 = function() { return "groupMerchant"; }; - var peg$f101 = function() { return "groupday"; }; - var peg$f102 = function() { return "groupmonth"; }; - var peg$f103 = function() { return "groupweek"; }; - var peg$f104 = function() { return "groupyear"; }; - var peg$f105 = function() { return "groupquarter"; }; - var peg$f106 = function() { return "eq"; }; - var peg$f107 = function() { return "neq"; }; - var peg$f108 = function() { return "gte"; }; - var peg$f109 = function() { return "gt"; }; - var peg$f110 = function() { return "lte"; }; - var peg$f111 = function() { return "lt"; }; - var peg$f112 = function(o) { + var peg$f82 = function() { return "exchangeRate"; }; + var peg$f83 = function() { return "reimbursableTotal"; }; + var peg$f84 = function() { return "nonReimbursableTotal"; }; + var peg$f85 = function() { return "groupFrom"; }; + var peg$f86 = function() { return "groupExpenses"; }; + var peg$f87 = function() { return "groupTotal"; }; + var peg$f88 = function() { return "groupCard"; }; + var peg$f89 = function() { return "groupFeed"; }; + var peg$f90 = function() { return "groupBankAccount"; }; + var peg$f91 = function() { return "groupWithdrawn"; }; + var peg$f92 = function() { return "groupWithdrawalID"; }; + var peg$f93 = function() { return "groupAmountDebited"; }; + var peg$f94 = function() { return "groupAmountReimbursed"; }; + var peg$f95 = function() { return "amountDebited"; }; + var peg$f96 = function() { return "amountReimbursed"; }; + var peg$f97 = function() { return "groupCategory"; }; + var peg$f98 = function() { return "groupTag"; }; + var peg$f99 = function() { return "groupMerchant"; }; + var peg$f100 = function() { return "groupday"; }; + var peg$f101 = function() { return "groupmonth"; }; + var peg$f102 = function() { return "groupweek"; }; + var peg$f103 = function() { return "groupyear"; }; + var peg$f104 = function() { return "groupquarter"; }; + var peg$f105 = function() { return "eq"; }; + var peg$f106 = function() { return "neq"; }; + var peg$f107 = function() { return "gte"; }; + var peg$f108 = function() { return "gt"; }; + var peg$f109 = function() { return "lte"; }; + var peg$f110 = function() { return "lt"; }; + var peg$f111 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } isColumnsContext = false; return o; }; - var peg$f113 = function(c) { return c; }; - var peg$f114 = function(chars) { return chars.join("").trim(); }; - var peg$f115 = function() { + var peg$f112 = function(c) { return c; }; + var peg$f113 = function(chars) { return chars.join("").trim(); }; + var peg$f114 = function() { isColumnsContext = false; return "and"; }; - var peg$f116 = function() { return expectingNestedQuote; }; - var peg$f117 = function(start, inner, end) { //handle no-breaking space + var peg$f115 = function() { return expectingNestedQuote; }; + var peg$f116 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f118 = function(start) {return "“"}; - var peg$f119 = function(start) {return "”"}; - var peg$f120 = function(start) {return "\""}; - var peg$f121 = function(start, inner, end) { + var peg$f117 = function(start) {return "“"}; + var peg$f118 = function(start) {return "”"}; + var peg$f119 = function(start) {return "\""}; + var peg$f120 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -1091,112 +1088,109 @@ function peg$parse(input, options) { if (s1 === peg$FAILED) { s1 = peg$parsecategory(); if (s1 === peg$FAILED) { - s1 = peg$parsevendor(); + s1 = peg$parseto(); if (s1 === peg$FAILED) { - s1 = peg$parseto(); + s1 = peg$parsetaxRate(); if (s1 === peg$FAILED) { - s1 = peg$parsetaxRate(); + s1 = peg$parsefrom(); if (s1 === peg$FAILED) { - s1 = peg$parsefrom(); + s1 = peg$parseattendee(); if (s1 === peg$FAILED) { - s1 = peg$parseattendee(); + s1 = peg$parsepayer(); if (s1 === peg$FAILED) { - s1 = peg$parsepayer(); + s1 = peg$parsepaidBy(); if (s1 === peg$FAILED) { - s1 = peg$parsepaidBy(); + s1 = peg$parseexporter(); if (s1 === peg$FAILED) { - s1 = peg$parseexporter(); + s1 = peg$parsecreatedBy(); if (s1 === peg$FAILED) { - s1 = peg$parsecreatedBy(); + s1 = peg$parseassignee(); if (s1 === peg$FAILED) { - s1 = peg$parseassignee(); + s1 = peg$parseexpenseType(); if (s1 === peg$FAILED) { - s1 = peg$parseexpenseType(); + s1 = peg$parsereceiptType(); if (s1 === peg$FAILED) { - s1 = peg$parsereceiptType(); + s1 = peg$parsetransactionStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsetransactionStatus(); + s1 = peg$parsewithdrawalType(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalType(); + s1 = peg$parsewithdrawalStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalStatus(); + s1 = peg$parsepaidStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsepaidStatus(); + s1 = peg$parsetype(); if (s1 === peg$FAILED) { - s1 = peg$parsetype(); + s1 = peg$parsestatus(); if (s1 === peg$FAILED) { - s1 = peg$parsestatus(); + s1 = peg$parsecardID(); if (s1 === peg$FAILED) { - s1 = peg$parsecardID(); + s1 = peg$parsebankAccount(); if (s1 === peg$FAILED) { - s1 = peg$parsebankAccount(); + s1 = peg$parsefeed(); if (s1 === peg$FAILED) { - s1 = peg$parsefeed(); + s1 = peg$parsegroupBy(); if (s1 === peg$FAILED) { - s1 = peg$parsegroupBy(); + s1 = peg$parseview(); if (s1 === peg$FAILED) { - s1 = peg$parseview(); + s1 = peg$parsereimbursable(); if (s1 === peg$FAILED) { - s1 = peg$parsereimbursable(); + s1 = peg$parsebillable(); if (s1 === peg$FAILED) { - s1 = peg$parsebillable(); + s1 = peg$parsepolicyID(); if (s1 === peg$FAILED) { - s1 = peg$parsepolicyID(); + s1 = peg$parseaction(); if (s1 === peg$FAILED) { - s1 = peg$parseaction(); + s1 = peg$parsedate(); if (s1 === peg$FAILED) { - s1 = peg$parsedate(); + s1 = peg$parsesubmitted(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitted(); + s1 = peg$parseapproved(); if (s1 === peg$FAILED) { - s1 = peg$parseapproved(); + s1 = peg$parsepaid(); if (s1 === peg$FAILED) { - s1 = peg$parsepaid(); + s1 = peg$parseexportedTo(); if (s1 === peg$FAILED) { - s1 = peg$parseexportedTo(); + s1 = peg$parseexported(); if (s1 === peg$FAILED) { - s1 = peg$parseexported(); + s1 = peg$parsewithdrawn(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawn(); + s1 = peg$parseposted(); if (s1 === peg$FAILED) { - s1 = peg$parseposted(); + s1 = peg$parsehas(); if (s1 === peg$FAILED) { - s1 = peg$parsehas(); + s1 = peg$parseis(); if (s1 === peg$FAILED) { - s1 = peg$parseis(); + s1 = peg$parsepurchaseCurrency(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseCurrency(); + s1 = peg$parsepurchaseAmount(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseAmount(); + s1 = peg$parseamountDebited(); if (s1 === peg$FAILED) { - s1 = peg$parseamountDebited(); + s1 = peg$parseamountReimbursed(); if (s1 === peg$FAILED) { - s1 = peg$parseamountReimbursed(); + s1 = peg$parseamount(); if (s1 === peg$FAILED) { - s1 = peg$parseamount(); + s1 = peg$parsemerchant(); if (s1 === peg$FAILED) { - s1 = peg$parsemerchant(); + s1 = peg$parsedescription(); if (s1 === peg$FAILED) { - s1 = peg$parsedescription(); + s1 = peg$parsereportID(); if (s1 === peg$FAILED) { - s1 = peg$parsereportID(); + s1 = peg$parsewithdrawalID(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalID(); + s1 = peg$parsetitle(); if (s1 === peg$FAILED) { - s1 = peg$parsetitle(); + s1 = peg$parsesubmitterUserID(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitterUserID(); + s1 = peg$parsesubmitterPayrollID(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitterPayrollID(); + s1 = peg$parseorderDealNumbers(); if (s1 === peg$FAILED) { - s1 = peg$parseorderDealNumbers(); + s1 = peg$parsereportFieldDynamic(); if (s1 === peg$FAILED) { - s1 = peg$parsereportFieldDynamic(); + s1 = peg$parsecolumns(); if (s1 === peg$FAILED) { - s1 = peg$parsecolumns(); - if (s1 === peg$FAILED) { - s1 = peg$parselimit(); - } + s1 = peg$parselimit(); } } } @@ -1594,40 +1588,20 @@ function peg$parse(input, options) { return s0; } - function peg$parsevendor() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c17) { - peg$currPos += 6; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f19(); - } - s0 = s1; - - return s0; - } - function peg$parseto() { var s0, s1; s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c18) { + if (s1.toLowerCase() === peg$c17) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } + if (peg$silentFails === 0) { peg$fail(peg$e20); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f20(); + s1 = peg$f19(); } s0 = s1; @@ -1639,15 +1613,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c19) { + if (s1.toLowerCase() === peg$c18) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } + if (peg$silentFails === 0) { peg$fail(peg$e21); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f21(); + s1 = peg$f20(); } s0 = s1; @@ -1659,15 +1633,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c20) { + if (s1.toLowerCase() === peg$c19) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f22(); + s1 = peg$f21(); } s0 = s1; @@ -1677,25 +1651,25 @@ function peg$parse(input, options) { function peg$parsepaidBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c21) { - s0 = peg$c21; + if (input.substr(peg$currPos, 6) === peg$c20) { + s0 = peg$c20; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } + if (peg$silentFails === 0) { peg$fail(peg$e23); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c22) { + if (s1.toLowerCase() === peg$c21) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } + if (peg$silentFails === 0) { peg$fail(peg$e24); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f23(); + s1 = peg$f22(); } s0 = s1; } @@ -1707,24 +1681,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c23) { + if (s0.toLowerCase() === peg$c22) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } + if (peg$silentFails === 0) { peg$fail(peg$e25); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c24) { + if (s1.toLowerCase() === peg$c23) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } + if (peg$silentFails === 0) { peg$fail(peg$e26); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f24(); + s1 = peg$f23(); } s0 = s1; } @@ -1735,25 +1709,25 @@ function peg$parse(input, options) { function peg$parsecardID() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c25) { - s0 = peg$c25; + if (input.substr(peg$currPos, 6) === peg$c24) { + s0 = peg$c24; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } + if (peg$silentFails === 0) { peg$fail(peg$e27); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c26) { + if (s1.toLowerCase() === peg$c25) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } + if (peg$silentFails === 0) { peg$fail(peg$e28); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f25(); + s1 = peg$f24(); } s0 = s1; } @@ -1764,25 +1738,25 @@ function peg$parse(input, options) { function peg$parsebankAccount() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c27) { - s0 = peg$c27; + if (input.substr(peg$currPos, 11) === peg$c26) { + s0 = peg$c26; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } + if (peg$silentFails === 0) { peg$fail(peg$e29); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c28) { + if (s1.toLowerCase() === peg$c27) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { peg$fail(peg$e30); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f26(); + s1 = peg$f25(); } s0 = s1; } @@ -1795,15 +1769,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c29) { + if (s1.toLowerCase() === peg$c28) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } + if (peg$silentFails === 0) { peg$fail(peg$e31); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f27(); + s1 = peg$f26(); } s0 = s1; @@ -1815,15 +1789,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c30) { + if (s1.toLowerCase() === peg$c29) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f28(); + s1 = peg$f27(); } s0 = s1; @@ -1833,25 +1807,25 @@ function peg$parse(input, options) { function peg$parseexpenseType() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c31) { - s0 = peg$c31; + if (input.substr(peg$currPos, 11) === peg$c30) { + s0 = peg$c30; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c32) { + if (s1.toLowerCase() === peg$c31) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f29(); + s1 = peg$f28(); } s0 = s1; } @@ -1862,25 +1836,25 @@ function peg$parse(input, options) { function peg$parsereceiptType() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c33) { - s0 = peg$c33; + if (input.substr(peg$currPos, 11) === peg$c32) { + s0 = peg$c32; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c34) { + if (s1.toLowerCase() === peg$c33) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f30(); + s1 = peg$f29(); } s0 = s1; } @@ -1891,25 +1865,25 @@ function peg$parse(input, options) { function peg$parsetransactionStatus() { var s0, s1; - if (input.substr(peg$currPos, 17) === peg$c35) { - s0 = peg$c35; + if (input.substr(peg$currPos, 17) === peg$c34) { + s0 = peg$c34; peg$currPos += 17; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c36) { + if (s1.toLowerCase() === peg$c35) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f31(); + s1 = peg$f30(); } s0 = s1; } @@ -1920,25 +1894,25 @@ function peg$parse(input, options) { function peg$parsewithdrawalType() { var s0, s1; - if (input.substr(peg$currPos, 14) === peg$c37) { - s0 = peg$c37; + if (input.substr(peg$currPos, 14) === peg$c36) { + s0 = peg$c36; peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e39); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c38) { + if (s1.toLowerCase() === peg$c37) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e40); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f32(); + s1 = peg$f31(); } s0 = s1; } @@ -1949,25 +1923,25 @@ function peg$parse(input, options) { function peg$parsewithdrawalStatus() { var s0, s1; - if (input.substr(peg$currPos, 16) === peg$c39) { - s0 = peg$c39; + if (input.substr(peg$currPos, 16) === peg$c38) { + s0 = peg$c38; peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e41); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c40) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f33(); + s1 = peg$f32(); } s0 = s1; } @@ -1978,25 +1952,25 @@ function peg$parse(input, options) { function peg$parsepaidStatus() { var s0, s1; - if (input.substr(peg$currPos, 10) === peg$c41) { - s0 = peg$c41; + if (input.substr(peg$currPos, 10) === peg$c40) { + s0 = peg$c40; peg$currPos += 10; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c42) { + if (s1.toLowerCase() === peg$c41) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f34(); + s1 = peg$f33(); } s0 = s1; } @@ -2008,24 +1982,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 12); - if (s0.toLowerCase() === peg$c43) { + if (s0.toLowerCase() === peg$c42) { peg$currPos += 12; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c44) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f35(); + s1 = peg$f34(); } s0 = s1; } @@ -2038,15 +2012,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c45) { + if (s1.toLowerCase() === peg$c44) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f36(); + s1 = peg$f35(); } s0 = s1; @@ -2058,15 +2032,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c46) { + if (s1.toLowerCase() === peg$c45) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f37(); + s1 = peg$f36(); } s0 = s1; @@ -2078,15 +2052,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c47) { + if (s1.toLowerCase() === peg$c46) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f38(); + s1 = peg$f37(); } s0 = s1; @@ -2098,15 +2072,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c48) { + if (s1.toLowerCase() === peg$c47) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f39(); + s1 = peg$f38(); } s0 = s1; @@ -2116,25 +2090,25 @@ function peg$parse(input, options) { function peg$parsesortBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c49) { - s0 = peg$c49; + if (input.substr(peg$currPos, 6) === peg$c48) { + s0 = peg$c48; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c50) { + if (s1.toLowerCase() === peg$c49) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f40(); + s1 = peg$f39(); } s0 = s1; } @@ -2145,25 +2119,25 @@ function peg$parse(input, options) { function peg$parsesortOrder() { var s0, s1; - if (input.substr(peg$currPos, 9) === peg$c51) { - s0 = peg$c51; + if (input.substr(peg$currPos, 9) === peg$c50) { + s0 = peg$c50; peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c52) { + if (s1.toLowerCase() === peg$c51) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f41(); + s1 = peg$f40(); } s0 = s1; } @@ -2174,25 +2148,25 @@ function peg$parse(input, options) { function peg$parsepolicyID() { var s0, s1; - if (input.substr(peg$currPos, 8) === peg$c53) { - s0 = peg$c53; + if (input.substr(peg$currPos, 8) === peg$c52) { + s0 = peg$c52; peg$currPos += 8; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c54) { + if (s1.toLowerCase() === peg$c53) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f42(); + s1 = peg$f41(); } s0 = s1; } @@ -2205,15 +2179,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c55) { + if (s1.toLowerCase() === peg$c54) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f43(); + s1 = peg$f42(); } s0 = s1; @@ -2225,15 +2199,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c56) { + if (s1.toLowerCase() === peg$c55) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f44(); + s1 = peg$f43(); } s0 = s1; @@ -2245,15 +2219,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c57) { + if (s1.toLowerCase() === peg$c56) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f45(); + s1 = peg$f44(); } s0 = s1; @@ -2265,15 +2239,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c58) { + if (s1.toLowerCase() === peg$c57) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f46(); + s1 = peg$f45(); } s0 = s1; @@ -2285,15 +2259,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c59) { + if (s1.toLowerCase() === peg$c58) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f47(); + s1 = peg$f46(); } s0 = s1; @@ -2305,15 +2279,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c60) { + if (s1.toLowerCase() === peg$c59) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f48(); + s1 = peg$f47(); } s0 = s1; @@ -2324,24 +2298,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c61) { + if (s0.toLowerCase() === peg$c60) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c62) { + if (s1.toLowerCase() === peg$c61) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f49(); + s1 = peg$f48(); } s0 = s1; } @@ -2354,15 +2328,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c63) { + if (s1.toLowerCase() === peg$c62) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f50(); + s1 = peg$f49(); } s0 = s1; @@ -2374,15 +2348,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c64) { + if (s1.toLowerCase() === peg$c63) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f51(); + s1 = peg$f50(); } s0 = s1; @@ -2394,15 +2368,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c65) { + if (s1.toLowerCase() === peg$c64) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f52(); + s1 = peg$f51(); } s0 = s1; @@ -2413,24 +2387,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 15); - if (s0.toLowerCase() === peg$c66) { + if (s0.toLowerCase() === peg$c65) { peg$currPos += 15; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c67) { + if (s1.toLowerCase() === peg$c66) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f53(); + s1 = peg$f52(); } s0 = s1; } @@ -2442,24 +2416,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 18); - if (s0.toLowerCase() === peg$c68) { + if (s0.toLowerCase() === peg$c67) { peg$currPos += 18; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 20); - if (s1.toLowerCase() === peg$c69) { + if (s1.toLowerCase() === peg$c68) { peg$currPos += 20; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f54(); + s1 = peg$f53(); } s0 = s1; } @@ -2471,24 +2445,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c70) { + if (s0.toLowerCase() === peg$c69) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c71) { + if (s1.toLowerCase() === peg$c70) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f55(); + s1 = peg$f54(); } s0 = s1; } @@ -2501,15 +2475,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c72) { + if (s1.toLowerCase() === peg$c71) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f56(); + s1 = peg$f55(); } s0 = s1; @@ -2520,24 +2494,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 9); - if (s0.toLowerCase() === peg$c73) { + if (s0.toLowerCase() === peg$c72) { peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c74) { + if (s1.toLowerCase() === peg$c73) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f57(); + s1 = peg$f56(); } s0 = s1; } @@ -2550,15 +2524,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c75) { + if (s1.toLowerCase() === peg$c74) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f58(); + s1 = peg$f57(); } s0 = s1; @@ -2570,15 +2544,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c76) { + if (s1.toLowerCase() === peg$c75) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f59(); + s1 = peg$f58(); } s0 = s1; @@ -2590,15 +2564,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c77) { + if (s1.toLowerCase() === peg$c76) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f60(); + s1 = peg$f59(); } s0 = s1; @@ -2610,15 +2584,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c78) { + if (s1.toLowerCase() === peg$c77) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f61(); + s1 = peg$f60(); } s0 = s1; @@ -2629,24 +2603,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 14); - if (s0.toLowerCase() === peg$c79) { + if (s0.toLowerCase() === peg$c78) { peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f62(); + s1 = peg$f61(); } s0 = s1; } @@ -2658,24 +2632,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c81) { + if (s0.toLowerCase() === peg$c80) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c82) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f63(); + s1 = peg$f62(); } s0 = s1; } @@ -2687,24 +2661,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 13); - if (s0.toLowerCase() === peg$c83) { + if (s0.toLowerCase() === peg$c82) { peg$currPos += 13; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f64(); + s1 = peg$f63(); } s0 = s1; } @@ -2716,24 +2690,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c85) { + if (s0.toLowerCase() === peg$c84) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f65(); + s1 = peg$f64(); } s0 = s1; } @@ -2746,15 +2720,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c87) { + if (s1.toLowerCase() === peg$c86) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f66(); + s1 = peg$f65(); } s0 = s1; @@ -2766,15 +2740,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c88) { + if (s1.toLowerCase() === peg$c87) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f67(); + s1 = peg$f66(); } s0 = s1; @@ -2786,15 +2760,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c89) { + if (s1.toLowerCase() === peg$c88) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f68(); + s1 = peg$f67(); } s0 = s1; @@ -2806,7 +2780,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f69(); + s1 = peg$f68(); if (s1) { s1 = undefined; } else { @@ -2941,11 +2915,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c90) { + if (s1.toLowerCase() === peg$c89) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -2960,7 +2934,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f70(); + s0 = peg$f69(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2978,19 +2952,19 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c91) { + if (s1.toLowerCase() === peg$c90) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } if (s1 === peg$FAILED) { s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c92) { + if (s1.toLowerCase() === peg$c91) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } } if (s1 !== peg$FAILED) { @@ -3006,7 +2980,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f71(); + s0 = peg$f70(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3024,11 +2998,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3043,7 +3017,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f72(); + s0 = peg$f71(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3061,11 +3035,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c93) { + if (s1.toLowerCase() === peg$c92) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e95); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3080,7 +3054,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f73(); + s0 = peg$f72(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3098,11 +3072,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c24) { + if (s1.toLowerCase() === peg$c23) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } + if (peg$silentFails === 0) { peg$fail(peg$e26); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3117,7 +3091,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f74(); + s0 = peg$f73(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3135,11 +3109,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c94) { + if (s1.toLowerCase() === peg$c93) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e96); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3154,7 +3128,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f75(); + s0 = peg$f74(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3172,11 +3146,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c44) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3191,7 +3165,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f76(); + s0 = peg$f75(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3209,11 +3183,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c28) { + if (s1.toLowerCase() === peg$c27) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { peg$fail(peg$e30); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3228,7 +3202,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f77(); + s0 = peg$f76(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3246,11 +3220,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c95) { + if (s1.toLowerCase() === peg$c94) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e97); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3265,7 +3239,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f78(); + s0 = peg$f77(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3302,7 +3276,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f79(); + s0 = peg$f78(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3320,11 +3294,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e98); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3339,7 +3313,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f80(); + s0 = peg$f79(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3364,7 +3338,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e99); } } if (s2 !== peg$FAILED) { s1 = [s1, s2]; @@ -3383,11 +3357,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c97) { + if (s1.toLowerCase() === peg$c96) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e100); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3402,7 +3376,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f81(); + s0 = peg$f80(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3414,11 +3388,11 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e98); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3433,7 +3407,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f82(); + s0 = peg$f81(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3452,11 +3426,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c98) { + if (s1.toLowerCase() === peg$c97) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e101); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3471,7 +3445,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f83(); + s0 = peg$f82(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3489,11 +3463,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c99) { + if (s1.toLowerCase() === peg$c98) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e102); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3508,7 +3482,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f84(); + s0 = peg$f83(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3526,11 +3500,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c100) { + if (s1.toLowerCase() === peg$c99) { peg$currPos += 22; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e103); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3545,7 +3519,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f85(); + s0 = peg$f84(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3563,11 +3537,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c101) { + if (s1.toLowerCase() === peg$c100) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e104); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3582,7 +3556,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f86(); + s0 = peg$f85(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3600,11 +3574,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c102) { + if (s1.toLowerCase() === peg$c101) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e105); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3619,7 +3593,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f87(); + s0 = peg$f86(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3637,11 +3611,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c103) { + if (s1.toLowerCase() === peg$c102) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e106); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3656,7 +3630,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f88(); + s0 = peg$f87(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3674,11 +3648,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c104) { + if (s1.toLowerCase() === peg$c103) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e107); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3693,7 +3667,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f89(); + s0 = peg$f88(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3711,11 +3685,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c105) { + if (s1.toLowerCase() === peg$c104) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e108); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3730,7 +3704,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f90(); + s0 = peg$f89(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3748,11 +3722,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c106) { + if (s1.toLowerCase() === peg$c105) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e109); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3767,7 +3741,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f91(); + s0 = peg$f90(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3785,11 +3759,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c107) { + if (s1.toLowerCase() === peg$c106) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e111); } + if (peg$silentFails === 0) { peg$fail(peg$e110); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3804,7 +3778,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f92(); + s0 = peg$f91(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3822,11 +3796,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c108) { + if (s1.toLowerCase() === peg$c107) { peg$currPos += 19; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e111); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3841,7 +3815,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f93(); + s0 = peg$f92(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3859,11 +3833,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 20); - if (s1.toLowerCase() === peg$c109) { + if (s1.toLowerCase() === peg$c108) { peg$currPos += 20; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e113); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3878,7 +3852,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f94(); + s0 = peg$f93(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3896,11 +3870,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 23); - if (s1.toLowerCase() === peg$c110) { + if (s1.toLowerCase() === peg$c109) { peg$currPos += 23; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e113); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3915,7 +3889,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f95(); + s0 = peg$f94(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3933,11 +3907,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3952,7 +3926,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f96(); + s0 = peg$f95(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3970,11 +3944,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3989,7 +3963,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f97(); + s0 = peg$f96(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4007,11 +3981,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c111) { + if (s1.toLowerCase() === peg$c110) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4026,7 +4000,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f98(); + s0 = peg$f97(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4044,11 +4018,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c112) { + if (s1.toLowerCase() === peg$c111) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e115); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4063,7 +4037,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f99(); + s0 = peg$f98(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4081,11 +4055,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c113) { + if (s1.toLowerCase() === peg$c112) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4100,7 +4074,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f100(); + s0 = peg$f99(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4118,11 +4092,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c114) { + if (s1.toLowerCase() === peg$c113) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4137,7 +4111,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f101(); + s0 = peg$f100(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4155,11 +4129,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c115) { + if (s1.toLowerCase() === peg$c114) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4174,7 +4148,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f102(); + s0 = peg$f101(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4192,11 +4166,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c116) { + if (s1.toLowerCase() === peg$c115) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4211,7 +4185,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f103(); + s0 = peg$f102(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4229,11 +4203,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c117) { + if (s1.toLowerCase() === peg$c116) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4248,7 +4222,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f104(); + s0 = peg$f103(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4266,11 +4240,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c118) { + if (s1.toLowerCase() === peg$c117) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4285,7 +4259,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f105(); + s0 = peg$f104(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4308,81 +4282,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e99); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f106(); + s1 = peg$f105(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c119) { - s1 = peg$c119; + if (input.substr(peg$currPos, 2) === peg$c118) { + s1 = peg$c118; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e124); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f107(); + s1 = peg$f106(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c120) { - s1 = peg$c120; + if (input.substr(peg$currPos, 2) === peg$c119) { + s1 = peg$c119; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e125); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f108(); + s1 = peg$f107(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c121; + s1 = peg$c120; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e126); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f109(); + s1 = peg$f108(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c122) { - s1 = peg$c122; + if (input.substr(peg$currPos, 2) === peg$c121) { + s1 = peg$c121; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e127); } + if (peg$silentFails === 0) { peg$fail(peg$e126); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f110(); + s1 = peg$f109(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c123; + s1 = peg$c122; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e128); } + if (peg$silentFails === 0) { peg$fail(peg$e127); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f111(); + s1 = peg$f110(); } s0 = s1; } @@ -4393,7 +4367,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } return s0; @@ -4406,7 +4380,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f112(s1); + s1 = peg$f111(s1); } s0 = s1; @@ -4418,11 +4392,11 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c124; + s1 = peg$c123; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e129); } + if (peg$silentFails === 0) { peg$fail(peg$e128); } } if (s1 !== peg$FAILED) { s2 = input.charAt(peg$currPos); @@ -4430,11 +4404,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e130); } + if (peg$silentFails === 0) { peg$fail(peg$e129); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f113(s2); + s0 = peg$f112(s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4460,7 +4434,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e132); } + if (peg$silentFails === 0) { peg$fail(peg$e131); } } } if (s2 !== peg$FAILED) { @@ -4473,7 +4447,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e132); } + if (peg$silentFails === 0) { peg$fail(peg$e131); } } } } @@ -4482,13 +4456,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f114(s1); + s1 = peg$f113(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e131); } + if (peg$silentFails === 0) { peg$fail(peg$e130); } } return s0; @@ -4500,7 +4474,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f115(); + s1 = peg$f114(); s0 = s1; return s0; @@ -4516,7 +4490,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -4525,12 +4499,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e133); } + if (peg$silentFails === 0) { peg$fail(peg$e132); } return s0; } @@ -4540,7 +4514,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f116(); + s1 = peg$f115(); if (s1) { s1 = undefined; } else { @@ -4577,7 +4551,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4586,7 +4560,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } } s2 = input.charAt(peg$currPos); @@ -4594,7 +4568,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4605,7 +4579,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } } while (s4 !== peg$FAILED) { @@ -4617,7 +4591,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } } } @@ -4626,7 +4600,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } if (s4 !== peg$FAILED) { s5 = []; @@ -4635,7 +4609,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e132); } + if (peg$silentFails === 0) { peg$fail(peg$e131); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -4644,11 +4618,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e132); } + if (peg$silentFails === 0) { peg$fail(peg$e131); } } } peg$savedPos = s0; - s0 = peg$f117(s1, s3, s5); + s0 = peg$f116(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4660,7 +4634,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e135); } + if (peg$silentFails === 0) { peg$fail(peg$e134); } } return s0; @@ -4677,7 +4651,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4686,7 +4660,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } } s2 = input.charAt(peg$currPos); @@ -4694,7 +4668,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4705,7 +4679,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4721,15 +4695,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c125; + s6 = peg$c124; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f118(s1); + s4 = peg$f117(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4752,15 +4726,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c126; + s6 = peg$c125; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f119(s1); + s4 = peg$f118(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4783,15 +4757,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c127; + s6 = peg$c126; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e141); } + if (peg$silentFails === 0) { peg$fail(peg$e140); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f120(s1); + s4 = peg$f119(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4813,7 +4787,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4829,15 +4803,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c125; + s6 = peg$c124; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f118(s1); + s4 = peg$f117(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4860,15 +4834,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c126; + s6 = peg$c125; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f119(s1); + s4 = peg$f118(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4891,15 +4865,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c127; + s6 = peg$c126; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e141); } + if (peg$silentFails === 0) { peg$fail(peg$e140); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f120(s1); + s4 = peg$f119(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4916,7 +4890,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f121(s1, s3, s4); + s0 = peg$f120(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4928,7 +4902,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e135); } + if (peg$silentFails === 0) { peg$fail(peg$e134); } } return s0; @@ -4943,7 +4917,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4981,7 +4955,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e142); } + if (peg$silentFails === 0) { peg$fail(peg$e141); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4990,7 +4964,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e142); } + if (peg$silentFails === 0) { peg$fail(peg$e141); } } } s2 = []; @@ -4999,7 +4973,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e143); } + if (peg$silentFails === 0) { peg$fail(peg$e142); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -5008,7 +4982,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e143); } + if (peg$silentFails === 0) { peg$fail(peg$e142); } } } s3 = []; @@ -5017,7 +4991,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e144); } + if (peg$silentFails === 0) { peg$fail(peg$e143); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -5026,7 +5000,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e144); } + if (peg$silentFails === 0) { peg$fail(peg$e143); } } } s4 = peg$parseoperator(); @@ -5045,7 +5019,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e145); } + if (peg$silentFails === 0) { peg$fail(peg$e144); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -5054,7 +5028,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e145); } + if (peg$silentFails === 0) { peg$fail(peg$e144); } } } s2 = peg$currPos; @@ -5101,7 +5075,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e146); } + if (peg$silentFails === 0) { peg$fail(peg$e145); } } } } @@ -5117,7 +5091,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e147); } + if (peg$silentFails === 0) { peg$fail(peg$e146); } } if (s0 === peg$FAILED) { s0 = peg$currPos; diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy index 3670ddc8a7fb..1a24a98020eb 100644 --- a/src/libs/SearchParser/autocompleteParser.peggy +++ b/src/libs/SearchParser/autocompleteParser.peggy @@ -81,7 +81,6 @@ autocompleteKey "key" / total / tag / category - / vendor / to / taxRate / from diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy index 7f157f8f71e7..5077ae7f8862 100644 --- a/src/libs/SearchParser/baseRules.peggy +++ b/src/libs/SearchParser/baseRules.peggy @@ -29,7 +29,6 @@ groupCurrency / "group-currency"i { return "groupCurrency"; } tag = "tag"i { return "tag"; } category = "category"i { return "category"; } -vendor = "vendor"i { return "vendor"; } to = "to"i { return "to"; } exporter = "exporter"i { return "exporter"; } payer = "payer"i { return "payer"; } diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js index 7d8737a32597..edaa43a60119 100644 --- a/src/libs/SearchParser/searchParser.js +++ b/src/libs/SearchParser/searchParser.js @@ -201,117 +201,116 @@ function peg$parse(input, options) { var peg$c14 = "group-currency"; var peg$c15 = "tag"; var peg$c16 = "category"; - var peg$c17 = "vendor"; - var peg$c18 = "to"; - var peg$c19 = "exporter"; - var peg$c20 = "payer"; - var peg$c21 = "paidBy"; - var peg$c22 = "paid-by"; - var peg$c23 = "taxrate"; - var peg$c24 = "tax-rate"; - var peg$c25 = "cardID"; - var peg$c26 = "card"; - var peg$c27 = "bankAccount"; - var peg$c28 = "bank-account"; - var peg$c29 = "from"; - var peg$c30 = "attendee"; - var peg$c31 = "expenseType"; - var peg$c32 = "expense-type"; - var peg$c33 = "receiptType"; - var peg$c34 = "receipt-type"; - var peg$c35 = "transactionStatus"; - var peg$c36 = "transaction-status"; - var peg$c37 = "withdrawalType"; - var peg$c38 = "withdrawal-type"; - var peg$c39 = "withdrawalStatus"; - var peg$c40 = "withdrawal-status"; - var peg$c41 = "paidStatus"; - var peg$c42 = "paid-status"; - var peg$c43 = "withdrawalid"; - var peg$c44 = "withdrawal-id"; - var peg$c45 = "billable"; - var peg$c46 = "reimbursable"; - var peg$c47 = "type"; - var peg$c48 = "status"; - var peg$c49 = "sortBy"; - var peg$c50 = "sort-by"; - var peg$c51 = "sortOrder"; - var peg$c52 = "sort-order"; - var peg$c53 = "policyID"; - var peg$c54 = "workspace"; - var peg$c55 = "submitted"; - var peg$c56 = "approved"; - var peg$c57 = "paid"; - var peg$c58 = "exported"; - var peg$c59 = "posted"; - var peg$c60 = "withdrawn"; - var peg$c61 = "groupby"; - var peg$c62 = "group-by"; - var peg$c63 = "limit"; - var peg$c64 = "feed"; - var peg$c65 = "title"; - var peg$c66 = "submitteruserid"; - var peg$c67 = "submitter-user-id"; - var peg$c68 = "submitterpayrollid"; - var peg$c69 = "submitter-payroll-id"; - var peg$c70 = "orderdealnumbers"; - var peg$c71 = "order-deal-numbers"; - var peg$c72 = "assignee"; - var peg$c73 = "createdby"; - var peg$c74 = "created-by"; - var peg$c75 = "action"; - var peg$c76 = "total"; - var peg$c77 = "has"; - var peg$c78 = "is"; - var peg$c79 = "purchaseamount"; - var peg$c80 = "purchase-amount"; - var peg$c81 = "purchasecurrency"; - var peg$c82 = "purchase-currency"; - var peg$c83 = "amountdebited"; - var peg$c84 = "amount-debited"; - var peg$c85 = "amountreimbursed"; - var peg$c86 = "amount-reimbursed"; - var peg$c87 = "columns"; - var peg$c88 = "view"; - var peg$c89 = "compare"; - var peg$c90 = "per-diem"; - var peg$c91 = "drafts"; - var peg$c92 = "draft"; - var peg$c93 = "tax"; - var peg$c94 = "policy-name"; - var peg$c95 = "long-report-id"; - var peg$c96 = "exported-to"; - var peg$c97 = "exportedto"; - var peg$c98 = "exchange-rate"; - var peg$c99 = "reimbursable-total"; - var peg$c100 = "non-reimbursable-total"; - var peg$c101 = "group-from"; - var peg$c102 = "group-expenses"; - var peg$c103 = "group-total"; - var peg$c104 = "group-card"; - var peg$c105 = "group-feed"; - var peg$c106 = "group-bank-account"; - var peg$c107 = "group-withdrawn"; - var peg$c108 = "group-withdrawal-id"; - var peg$c109 = "group-amount-debited"; - var peg$c110 = "group-amount-reimbursed"; - var peg$c111 = "group-category"; - var peg$c112 = "group-tag"; - var peg$c113 = "group-merchant"; - var peg$c114 = "group-day"; - var peg$c115 = "group-month"; - var peg$c116 = "group-week"; - var peg$c117 = "group-year"; - var peg$c118 = "group-quarter"; - var peg$c119 = "!="; - var peg$c120 = ">="; - var peg$c121 = ">"; - var peg$c122 = "<="; - var peg$c123 = "<"; - var peg$c124 = "\\"; - var peg$c125 = "\u201C"; - var peg$c126 = "\u201D"; - var peg$c127 = "\""; + var peg$c17 = "to"; + var peg$c18 = "exporter"; + var peg$c19 = "payer"; + var peg$c20 = "paidBy"; + var peg$c21 = "paid-by"; + var peg$c22 = "taxrate"; + var peg$c23 = "tax-rate"; + var peg$c24 = "cardID"; + var peg$c25 = "card"; + var peg$c26 = "bankAccount"; + var peg$c27 = "bank-account"; + var peg$c28 = "from"; + var peg$c29 = "attendee"; + var peg$c30 = "expenseType"; + var peg$c31 = "expense-type"; + var peg$c32 = "receiptType"; + var peg$c33 = "receipt-type"; + var peg$c34 = "transactionStatus"; + var peg$c35 = "transaction-status"; + var peg$c36 = "withdrawalType"; + var peg$c37 = "withdrawal-type"; + var peg$c38 = "withdrawalStatus"; + var peg$c39 = "withdrawal-status"; + var peg$c40 = "paidStatus"; + var peg$c41 = "paid-status"; + var peg$c42 = "withdrawalid"; + var peg$c43 = "withdrawal-id"; + var peg$c44 = "billable"; + var peg$c45 = "reimbursable"; + var peg$c46 = "type"; + var peg$c47 = "status"; + var peg$c48 = "sortBy"; + var peg$c49 = "sort-by"; + var peg$c50 = "sortOrder"; + var peg$c51 = "sort-order"; + var peg$c52 = "policyID"; + var peg$c53 = "workspace"; + var peg$c54 = "submitted"; + var peg$c55 = "approved"; + var peg$c56 = "paid"; + var peg$c57 = "exported"; + var peg$c58 = "posted"; + var peg$c59 = "withdrawn"; + var peg$c60 = "groupby"; + var peg$c61 = "group-by"; + var peg$c62 = "limit"; + var peg$c63 = "feed"; + var peg$c64 = "title"; + var peg$c65 = "submitteruserid"; + var peg$c66 = "submitter-user-id"; + var peg$c67 = "submitterpayrollid"; + var peg$c68 = "submitter-payroll-id"; + var peg$c69 = "orderdealnumbers"; + var peg$c70 = "order-deal-numbers"; + var peg$c71 = "assignee"; + var peg$c72 = "createdby"; + var peg$c73 = "created-by"; + var peg$c74 = "action"; + var peg$c75 = "total"; + var peg$c76 = "has"; + var peg$c77 = "is"; + var peg$c78 = "purchaseamount"; + var peg$c79 = "purchase-amount"; + var peg$c80 = "purchasecurrency"; + var peg$c81 = "purchase-currency"; + var peg$c82 = "amountdebited"; + var peg$c83 = "amount-debited"; + var peg$c84 = "amountreimbursed"; + var peg$c85 = "amount-reimbursed"; + var peg$c86 = "columns"; + var peg$c87 = "view"; + var peg$c88 = "compare"; + var peg$c89 = "per-diem"; + var peg$c90 = "drafts"; + var peg$c91 = "draft"; + var peg$c92 = "tax"; + var peg$c93 = "policy-name"; + var peg$c94 = "long-report-id"; + var peg$c95 = "exported-to"; + var peg$c96 = "exportedto"; + var peg$c97 = "exchange-rate"; + var peg$c98 = "reimbursable-total"; + var peg$c99 = "non-reimbursable-total"; + var peg$c100 = "group-from"; + var peg$c101 = "group-expenses"; + var peg$c102 = "group-total"; + var peg$c103 = "group-card"; + var peg$c104 = "group-feed"; + var peg$c105 = "group-bank-account"; + var peg$c106 = "group-withdrawn"; + var peg$c107 = "group-withdrawal-id"; + var peg$c108 = "group-amount-debited"; + var peg$c109 = "group-amount-reimbursed"; + var peg$c110 = "group-category"; + var peg$c111 = "group-tag"; + var peg$c112 = "group-merchant"; + var peg$c113 = "group-day"; + var peg$c114 = "group-month"; + var peg$c115 = "group-week"; + var peg$c116 = "group-year"; + var peg$c117 = "group-quarter"; + var peg$c118 = "!="; + var peg$c119 = ">="; + var peg$c120 = ">"; + var peg$c121 = "<="; + var peg$c122 = "<"; + var peg$c123 = "\\"; + var peg$c124 = "\u201C"; + var peg$c125 = "\u201D"; + var peg$c126 = "\""; var peg$r0 = /^[^ \t\r\n\xA0]/; var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/; @@ -351,134 +350,133 @@ function peg$parse(input, options) { var peg$e19 = peg$literalExpectation("group-currency", true); var peg$e20 = peg$literalExpectation("tag", true); var peg$e21 = peg$literalExpectation("category", true); - var peg$e22 = peg$literalExpectation("vendor", true); - var peg$e23 = peg$literalExpectation("to", true); - var peg$e24 = peg$literalExpectation("exporter", true); - var peg$e25 = peg$literalExpectation("payer", true); - var peg$e26 = peg$literalExpectation("paidBy", false); - var peg$e27 = peg$literalExpectation("paid-by", true); - var peg$e28 = peg$literalExpectation("taxRate", true); - var peg$e29 = peg$literalExpectation("tax-rate", true); - var peg$e30 = peg$literalExpectation("cardID", false); - var peg$e31 = peg$literalExpectation("card", true); - var peg$e32 = peg$literalExpectation("bankAccount", false); - var peg$e33 = peg$literalExpectation("bank-account", true); - var peg$e34 = peg$literalExpectation("from", true); - var peg$e35 = peg$literalExpectation("attendee", true); - var peg$e36 = peg$literalExpectation("expenseType", false); - var peg$e37 = peg$literalExpectation("expense-type", true); - var peg$e38 = peg$literalExpectation("receiptType", false); - var peg$e39 = peg$literalExpectation("receipt-type", true); - var peg$e40 = peg$literalExpectation("transactionStatus", false); - var peg$e41 = peg$literalExpectation("transaction-status", true); - var peg$e42 = peg$literalExpectation("withdrawalType", false); - var peg$e43 = peg$literalExpectation("withdrawal-type", true); - var peg$e44 = peg$literalExpectation("withdrawalStatus", false); - var peg$e45 = peg$literalExpectation("withdrawal-status", true); - var peg$e46 = peg$literalExpectation("paidStatus", false); - var peg$e47 = peg$literalExpectation("paid-status", true); - var peg$e48 = peg$literalExpectation("withdrawalID", true); - var peg$e49 = peg$literalExpectation("withdrawal-id", true); - var peg$e50 = peg$literalExpectation("billable", true); - var peg$e51 = peg$literalExpectation("reimbursable", true); - var peg$e52 = peg$literalExpectation("type", true); - var peg$e53 = peg$literalExpectation("status", true); - var peg$e54 = peg$literalExpectation("sortBy", false); - var peg$e55 = peg$literalExpectation("sort-by", true); - var peg$e56 = peg$literalExpectation("sortOrder", false); - var peg$e57 = peg$literalExpectation("sort-order", true); - var peg$e58 = peg$literalExpectation("policyID", false); - var peg$e59 = peg$literalExpectation("workspace", true); - var peg$e60 = peg$literalExpectation("submitted", true); - var peg$e61 = peg$literalExpectation("approved", true); - var peg$e62 = peg$literalExpectation("paid", true); - var peg$e63 = peg$literalExpectation("exported", true); - var peg$e64 = peg$literalExpectation("posted", true); - var peg$e65 = peg$literalExpectation("withdrawn", true); - var peg$e66 = peg$literalExpectation("groupBy", true); - var peg$e67 = peg$literalExpectation("group-by", true); - var peg$e68 = peg$literalExpectation("limit", true); - var peg$e69 = peg$literalExpectation("feed", true); - var peg$e70 = peg$literalExpectation("title", true); - var peg$e71 = peg$literalExpectation("submitterUserID", true); - var peg$e72 = peg$literalExpectation("submitter-user-id", true); - var peg$e73 = peg$literalExpectation("submitterPayrollID", true); - var peg$e74 = peg$literalExpectation("submitter-payroll-id", true); - var peg$e75 = peg$literalExpectation("orderDealNumbers", true); - var peg$e76 = peg$literalExpectation("order-deal-numbers", true); - var peg$e77 = peg$literalExpectation("assignee", true); - var peg$e78 = peg$literalExpectation("createdBy", true); - var peg$e79 = peg$literalExpectation("created-by", true); - var peg$e80 = peg$literalExpectation("action", true); - var peg$e81 = peg$literalExpectation("total", true); - var peg$e82 = peg$literalExpectation("has", true); - var peg$e83 = peg$literalExpectation("is", true); - var peg$e84 = peg$literalExpectation("purchaseAmount", true); - var peg$e85 = peg$literalExpectation("purchase-amount", true); - var peg$e86 = peg$literalExpectation("purchaseCurrency", true); - var peg$e87 = peg$literalExpectation("purchase-currency", true); - var peg$e88 = peg$literalExpectation("amountDebited", true); - var peg$e89 = peg$literalExpectation("amount-debited", true); - var peg$e90 = peg$literalExpectation("amountReimbursed", true); - var peg$e91 = peg$literalExpectation("amount-reimbursed", true); - var peg$e92 = peg$literalExpectation("columns", true); - var peg$e93 = peg$literalExpectation("view", true); - var peg$e94 = peg$literalExpectation("compare", true); - var peg$e95 = peg$literalExpectation("per-diem", true); - var peg$e96 = peg$literalExpectation("drafts", true); - var peg$e97 = peg$literalExpectation("draft", true); - var peg$e98 = peg$literalExpectation("tax", true); - var peg$e99 = peg$literalExpectation("policy-name", true); - var peg$e100 = peg$literalExpectation("long-report-id", true); - var peg$e101 = peg$literalExpectation("exported-to", true); - var peg$e102 = peg$classExpectation([":", "="], false, false); - var peg$e103 = peg$literalExpectation("exportedTo", true); - var peg$e104 = peg$literalExpectation("exchange-rate", true); - var peg$e105 = peg$literalExpectation("reimbursable-total", true); - var peg$e106 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e107 = peg$literalExpectation("group-from", true); - var peg$e108 = peg$literalExpectation("group-expenses", true); - var peg$e109 = peg$literalExpectation("group-total", true); - var peg$e110 = peg$literalExpectation("group-card", true); - var peg$e111 = peg$literalExpectation("group-feed", true); - var peg$e112 = peg$literalExpectation("group-bank-account", true); - var peg$e113 = peg$literalExpectation("group-withdrawn", true); - var peg$e114 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e115 = peg$literalExpectation("group-amount-debited", true); - var peg$e116 = peg$literalExpectation("group-amount-reimbursed", true); - var peg$e117 = peg$literalExpectation("group-category", true); - var peg$e118 = peg$literalExpectation("group-tag", true); - var peg$e119 = peg$literalExpectation("group-merchant", true); - var peg$e120 = peg$literalExpectation("group-day", true); - var peg$e121 = peg$literalExpectation("group-month", true); - var peg$e122 = peg$literalExpectation("group-week", true); - var peg$e123 = peg$literalExpectation("group-year", true); - var peg$e124 = peg$literalExpectation("group-quarter", true); - var peg$e125 = peg$otherExpectation("operator"); - var peg$e126 = peg$literalExpectation("!=", false); - var peg$e127 = peg$literalExpectation(">=", false); - var peg$e128 = peg$literalExpectation(">", false); - var peg$e129 = peg$literalExpectation("<=", false); - var peg$e130 = peg$literalExpectation("<", false); - var peg$e131 = peg$literalExpectation("\\", false); - var peg$e132 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false); - var peg$e133 = peg$otherExpectation("word"); - var peg$e134 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e135 = peg$otherExpectation("whitespace"); - var peg$e136 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e137 = peg$otherExpectation("quote"); - var peg$e138 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e139 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e140 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e141 = peg$literalExpectation("\u201C", false); - var peg$e142 = peg$literalExpectation("\u201D", false); - var peg$e143 = peg$literalExpectation("\"", false); - var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e145 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e147 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e148 = peg$classExpectation([","], false, false); - var peg$e149 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); + var peg$e22 = peg$literalExpectation("to", true); + var peg$e23 = peg$literalExpectation("exporter", true); + var peg$e24 = peg$literalExpectation("payer", true); + var peg$e25 = peg$literalExpectation("paidBy", false); + var peg$e26 = peg$literalExpectation("paid-by", true); + var peg$e27 = peg$literalExpectation("taxRate", true); + var peg$e28 = peg$literalExpectation("tax-rate", true); + var peg$e29 = peg$literalExpectation("cardID", false); + var peg$e30 = peg$literalExpectation("card", true); + var peg$e31 = peg$literalExpectation("bankAccount", false); + var peg$e32 = peg$literalExpectation("bank-account", true); + var peg$e33 = peg$literalExpectation("from", true); + var peg$e34 = peg$literalExpectation("attendee", true); + var peg$e35 = peg$literalExpectation("expenseType", false); + var peg$e36 = peg$literalExpectation("expense-type", true); + var peg$e37 = peg$literalExpectation("receiptType", false); + var peg$e38 = peg$literalExpectation("receipt-type", true); + var peg$e39 = peg$literalExpectation("transactionStatus", false); + var peg$e40 = peg$literalExpectation("transaction-status", true); + var peg$e41 = peg$literalExpectation("withdrawalType", false); + var peg$e42 = peg$literalExpectation("withdrawal-type", true); + var peg$e43 = peg$literalExpectation("withdrawalStatus", false); + var peg$e44 = peg$literalExpectation("withdrawal-status", true); + var peg$e45 = peg$literalExpectation("paidStatus", false); + var peg$e46 = peg$literalExpectation("paid-status", true); + var peg$e47 = peg$literalExpectation("withdrawalID", true); + var peg$e48 = peg$literalExpectation("withdrawal-id", true); + var peg$e49 = peg$literalExpectation("billable", true); + var peg$e50 = peg$literalExpectation("reimbursable", true); + var peg$e51 = peg$literalExpectation("type", true); + var peg$e52 = peg$literalExpectation("status", true); + var peg$e53 = peg$literalExpectation("sortBy", false); + var peg$e54 = peg$literalExpectation("sort-by", true); + var peg$e55 = peg$literalExpectation("sortOrder", false); + var peg$e56 = peg$literalExpectation("sort-order", true); + var peg$e57 = peg$literalExpectation("policyID", false); + var peg$e58 = peg$literalExpectation("workspace", true); + var peg$e59 = peg$literalExpectation("submitted", true); + var peg$e60 = peg$literalExpectation("approved", true); + var peg$e61 = peg$literalExpectation("paid", true); + var peg$e62 = peg$literalExpectation("exported", true); + var peg$e63 = peg$literalExpectation("posted", true); + var peg$e64 = peg$literalExpectation("withdrawn", true); + var peg$e65 = peg$literalExpectation("groupBy", true); + var peg$e66 = peg$literalExpectation("group-by", true); + var peg$e67 = peg$literalExpectation("limit", true); + var peg$e68 = peg$literalExpectation("feed", true); + var peg$e69 = peg$literalExpectation("title", true); + var peg$e70 = peg$literalExpectation("submitterUserID", true); + var peg$e71 = peg$literalExpectation("submitter-user-id", true); + var peg$e72 = peg$literalExpectation("submitterPayrollID", true); + var peg$e73 = peg$literalExpectation("submitter-payroll-id", true); + var peg$e74 = peg$literalExpectation("orderDealNumbers", true); + var peg$e75 = peg$literalExpectation("order-deal-numbers", true); + var peg$e76 = peg$literalExpectation("assignee", true); + var peg$e77 = peg$literalExpectation("createdBy", true); + var peg$e78 = peg$literalExpectation("created-by", true); + var peg$e79 = peg$literalExpectation("action", true); + var peg$e80 = peg$literalExpectation("total", true); + var peg$e81 = peg$literalExpectation("has", true); + var peg$e82 = peg$literalExpectation("is", true); + var peg$e83 = peg$literalExpectation("purchaseAmount", true); + var peg$e84 = peg$literalExpectation("purchase-amount", true); + var peg$e85 = peg$literalExpectation("purchaseCurrency", true); + var peg$e86 = peg$literalExpectation("purchase-currency", true); + var peg$e87 = peg$literalExpectation("amountDebited", true); + var peg$e88 = peg$literalExpectation("amount-debited", true); + var peg$e89 = peg$literalExpectation("amountReimbursed", true); + var peg$e90 = peg$literalExpectation("amount-reimbursed", true); + var peg$e91 = peg$literalExpectation("columns", true); + var peg$e92 = peg$literalExpectation("view", true); + var peg$e93 = peg$literalExpectation("compare", true); + var peg$e94 = peg$literalExpectation("per-diem", true); + var peg$e95 = peg$literalExpectation("drafts", true); + var peg$e96 = peg$literalExpectation("draft", true); + var peg$e97 = peg$literalExpectation("tax", true); + var peg$e98 = peg$literalExpectation("policy-name", true); + var peg$e99 = peg$literalExpectation("long-report-id", true); + var peg$e100 = peg$literalExpectation("exported-to", true); + var peg$e101 = peg$classExpectation([":", "="], false, false); + var peg$e102 = peg$literalExpectation("exportedTo", true); + var peg$e103 = peg$literalExpectation("exchange-rate", true); + var peg$e104 = peg$literalExpectation("reimbursable-total", true); + var peg$e105 = peg$literalExpectation("non-reimbursable-total", true); + var peg$e106 = peg$literalExpectation("group-from", true); + var peg$e107 = peg$literalExpectation("group-expenses", true); + var peg$e108 = peg$literalExpectation("group-total", true); + var peg$e109 = peg$literalExpectation("group-card", true); + var peg$e110 = peg$literalExpectation("group-feed", true); + var peg$e111 = peg$literalExpectation("group-bank-account", true); + var peg$e112 = peg$literalExpectation("group-withdrawn", true); + var peg$e113 = peg$literalExpectation("group-withdrawal-id", true); + var peg$e114 = peg$literalExpectation("group-amount-debited", true); + var peg$e115 = peg$literalExpectation("group-amount-reimbursed", true); + var peg$e116 = peg$literalExpectation("group-category", true); + var peg$e117 = peg$literalExpectation("group-tag", true); + var peg$e118 = peg$literalExpectation("group-merchant", true); + var peg$e119 = peg$literalExpectation("group-day", true); + var peg$e120 = peg$literalExpectation("group-month", true); + var peg$e121 = peg$literalExpectation("group-week", true); + var peg$e122 = peg$literalExpectation("group-year", true); + var peg$e123 = peg$literalExpectation("group-quarter", true); + var peg$e124 = peg$otherExpectation("operator"); + var peg$e125 = peg$literalExpectation("!=", false); + var peg$e126 = peg$literalExpectation(">=", false); + var peg$e127 = peg$literalExpectation(">", false); + var peg$e128 = peg$literalExpectation("<=", false); + var peg$e129 = peg$literalExpectation("<", false); + var peg$e130 = peg$literalExpectation("\\", false); + var peg$e131 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false); + var peg$e132 = peg$otherExpectation("word"); + var peg$e133 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e134 = peg$otherExpectation("whitespace"); + var peg$e135 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e136 = peg$otherExpectation("quote"); + var peg$e137 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e138 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e139 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e140 = peg$literalExpectation("\u201C", false); + var peg$e141 = peg$literalExpectation("\u201D", false); + var peg$e142 = peg$literalExpectation("\"", false); + var peg$e143 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e144 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e145 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e147 = peg$classExpectation([","], false, false); + var peg$e148 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false); var peg$f0 = function(filters) { return applyDefaults(filters); }; var peg$f1 = function(head, tail) { @@ -576,123 +574,122 @@ function peg$parse(input, options) { var peg$f16 = function() { return "groupCurrency"; }; var peg$f17 = function() { return "tag"; }; var peg$f18 = function() { return "category"; }; - var peg$f19 = function() { return "vendor"; }; - var peg$f20 = function() { return "to"; }; - var peg$f21 = function() { return "exporter"; }; - var peg$f22 = function() { return "payer"; }; - var peg$f23 = function() { return "paidBy"; }; - var peg$f24 = function() { return "taxRate"; }; - var peg$f25 = function() { return "cardID"; }; - var peg$f26 = function() { return "bankAccount"; }; - var peg$f27 = function() { return "from"; }; - var peg$f28 = function() {return "attendee"}; - var peg$f29 = function() { return "expenseType"; }; - var peg$f30 = function() { return "receiptType"; }; - var peg$f31 = function() { return "transactionStatus"; }; - var peg$f32 = function() { return "withdrawalType"; }; - var peg$f33 = function() { return "withdrawalStatus"; }; - var peg$f34 = function() { return "paidStatus"; }; - var peg$f35 = function() { return "withdrawalID"; }; - var peg$f36 = function() { return "billable"; }; - var peg$f37 = function() { return "reimbursable"; }; - var peg$f38 = function() { return "type"; }; - var peg$f39 = function() { return "status"; }; - var peg$f40 = function() { return "sortBy"; }; - var peg$f41 = function() { return "sortOrder"; }; - var peg$f42 = function() { return "policyID"; }; - var peg$f43 = function() { return "submitted"; }; - var peg$f44 = function() { return "approved"; }; - var peg$f45 = function() { return "paid"; }; - var peg$f46 = function() { return "exported"; }; - var peg$f47 = function() { return "posted"; }; - var peg$f48 = function() { return "withdrawn"; }; - var peg$f49 = function() { return "groupBy"; }; - var peg$f50 = function() { return "limit"; }; - var peg$f51 = function() { return "feed"; }; - var peg$f52 = function() { return "title"; }; - var peg$f53 = function() { return "submitterUserID"; }; - var peg$f54 = function() { return "submitterPayrollID"; }; - var peg$f55 = function() { return "orderDealNumbers"; }; - var peg$f56 = function() { return "assignee"; }; - var peg$f57 = function() { return "createdBy"; }; - var peg$f58 = function() { return "action"; }; - var peg$f59 = function() {return "total"; }; - var peg$f60 = function() {return "has"; }; - var peg$f61 = function() {return "is"; }; - var peg$f62 = function() {return "purchaseAmount"}; - var peg$f63 = function() {return "purchaseCurrency"}; - var peg$f64 = function() {return "amountDebited"}; - var peg$f65 = function() {return "amountReimbursed"}; - var peg$f66 = function() { + var peg$f19 = function() { return "to"; }; + var peg$f20 = function() { return "exporter"; }; + var peg$f21 = function() { return "payer"; }; + var peg$f22 = function() { return "paidBy"; }; + var peg$f23 = function() { return "taxRate"; }; + var peg$f24 = function() { return "cardID"; }; + var peg$f25 = function() { return "bankAccount"; }; + var peg$f26 = function() { return "from"; }; + var peg$f27 = function() {return "attendee"}; + var peg$f28 = function() { return "expenseType"; }; + var peg$f29 = function() { return "receiptType"; }; + var peg$f30 = function() { return "transactionStatus"; }; + var peg$f31 = function() { return "withdrawalType"; }; + var peg$f32 = function() { return "withdrawalStatus"; }; + var peg$f33 = function() { return "paidStatus"; }; + var peg$f34 = function() { return "withdrawalID"; }; + var peg$f35 = function() { return "billable"; }; + var peg$f36 = function() { return "reimbursable"; }; + var peg$f37 = function() { return "type"; }; + var peg$f38 = function() { return "status"; }; + var peg$f39 = function() { return "sortBy"; }; + var peg$f40 = function() { return "sortOrder"; }; + var peg$f41 = function() { return "policyID"; }; + var peg$f42 = function() { return "submitted"; }; + var peg$f43 = function() { return "approved"; }; + var peg$f44 = function() { return "paid"; }; + var peg$f45 = function() { return "exported"; }; + var peg$f46 = function() { return "posted"; }; + var peg$f47 = function() { return "withdrawn"; }; + var peg$f48 = function() { return "groupBy"; }; + var peg$f49 = function() { return "limit"; }; + var peg$f50 = function() { return "feed"; }; + var peg$f51 = function() { return "title"; }; + var peg$f52 = function() { return "submitterUserID"; }; + var peg$f53 = function() { return "submitterPayrollID"; }; + var peg$f54 = function() { return "orderDealNumbers"; }; + var peg$f55 = function() { return "assignee"; }; + var peg$f56 = function() { return "createdBy"; }; + var peg$f57 = function() { return "action"; }; + var peg$f58 = function() {return "total"; }; + var peg$f59 = function() {return "has"; }; + var peg$f60 = function() {return "is"; }; + var peg$f61 = function() {return "purchaseAmount"}; + var peg$f62 = function() {return "purchaseCurrency"}; + var peg$f63 = function() {return "amountDebited"}; + var peg$f64 = function() {return "amountReimbursed"}; + var peg$f65 = function() { isColumnsContext = true; return "columns"; }; - var peg$f67 = function() {return "view"}; - var peg$f68 = function() {return "compare"}; - var peg$f69 = function() { return isColumnsContext; }; - var peg$f70 = function() { return "perDiem"; }; - var peg$f71 = function() { return "drafts"; }; - var peg$f72 = function() { return "originalamount"; }; - var peg$f73 = function() { return "taxAmount"; }; - var peg$f74 = function() { return "taxrate"; }; - var peg$f75 = function() { return "policyname"; }; - var peg$f76 = function() { return "withdrawalID"; }; - var peg$f77 = function() { return "bankAccount"; }; - var peg$f78 = function() { return "reportID"; }; - var peg$f79 = function() { return "base62ReportID"; }; - var peg$f80 = function() { return "exportedto"; }; + var peg$f66 = function() {return "view"}; + var peg$f67 = function() {return "compare"}; + var peg$f68 = function() { return isColumnsContext; }; + var peg$f69 = function() { return "perDiem"; }; + var peg$f70 = function() { return "drafts"; }; + var peg$f71 = function() { return "originalamount"; }; + var peg$f72 = function() { return "taxAmount"; }; + var peg$f73 = function() { return "taxrate"; }; + var peg$f74 = function() { return "policyname"; }; + var peg$f75 = function() { return "withdrawalID"; }; + var peg$f76 = function() { return "bankAccount"; }; + var peg$f77 = function() { return "reportID"; }; + var peg$f78 = function() { return "base62ReportID"; }; + var peg$f79 = function() { return "exportedto"; }; + var peg$f80 = function() { return "exportedTo"; }; var peg$f81 = function() { return "exportedTo"; }; - var peg$f82 = function() { return "exportedTo"; }; - var peg$f83 = function() { return "exchangeRate"; }; - var peg$f84 = function() { return "reimbursableTotal"; }; - var peg$f85 = function() { return "nonReimbursableTotal"; }; - var peg$f86 = function() { return "groupFrom"; }; - var peg$f87 = function() { return "groupExpenses"; }; - var peg$f88 = function() { return "groupTotal"; }; - var peg$f89 = function() { return "groupCard"; }; - var peg$f90 = function() { return "groupFeed"; }; - var peg$f91 = function() { return "groupBankAccount"; }; - var peg$f92 = function() { return "groupWithdrawn"; }; - var peg$f93 = function() { return "groupWithdrawalID"; }; - var peg$f94 = function() { return "groupAmountDebited"; }; - var peg$f95 = function() { return "groupAmountReimbursed"; }; - var peg$f96 = function() { return "amountDebited"; }; - var peg$f97 = function() { return "amountReimbursed"; }; - var peg$f98 = function() { return "groupCategory"; }; - var peg$f99 = function() { return "groupTag"; }; - var peg$f100 = function() { return "groupMerchant"; }; - var peg$f101 = function() { return "groupday"; }; - var peg$f102 = function() { return "groupmonth"; }; - var peg$f103 = function() { return "groupweek"; }; - var peg$f104 = function() { return "groupyear"; }; - var peg$f105 = function() { return "groupquarter"; }; - var peg$f106 = function() { return "eq"; }; - var peg$f107 = function() { return "neq"; }; - var peg$f108 = function() { return "gte"; }; - var peg$f109 = function() { return "gt"; }; - var peg$f110 = function() { return "lte"; }; - var peg$f111 = function() { return "lt"; }; - var peg$f112 = function(o) { + var peg$f82 = function() { return "exchangeRate"; }; + var peg$f83 = function() { return "reimbursableTotal"; }; + var peg$f84 = function() { return "nonReimbursableTotal"; }; + var peg$f85 = function() { return "groupFrom"; }; + var peg$f86 = function() { return "groupExpenses"; }; + var peg$f87 = function() { return "groupTotal"; }; + var peg$f88 = function() { return "groupCard"; }; + var peg$f89 = function() { return "groupFeed"; }; + var peg$f90 = function() { return "groupBankAccount"; }; + var peg$f91 = function() { return "groupWithdrawn"; }; + var peg$f92 = function() { return "groupWithdrawalID"; }; + var peg$f93 = function() { return "groupAmountDebited"; }; + var peg$f94 = function() { return "groupAmountReimbursed"; }; + var peg$f95 = function() { return "amountDebited"; }; + var peg$f96 = function() { return "amountReimbursed"; }; + var peg$f97 = function() { return "groupCategory"; }; + var peg$f98 = function() { return "groupTag"; }; + var peg$f99 = function() { return "groupMerchant"; }; + var peg$f100 = function() { return "groupday"; }; + var peg$f101 = function() { return "groupmonth"; }; + var peg$f102 = function() { return "groupweek"; }; + var peg$f103 = function() { return "groupyear"; }; + var peg$f104 = function() { return "groupquarter"; }; + var peg$f105 = function() { return "eq"; }; + var peg$f106 = function() { return "neq"; }; + var peg$f107 = function() { return "gte"; }; + var peg$f108 = function() { return "gt"; }; + var peg$f109 = function() { return "lte"; }; + var peg$f110 = function() { return "lt"; }; + var peg$f111 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } isColumnsContext = false; return o; }; - var peg$f113 = function(c) { return c; }; - var peg$f114 = function(chars) { return chars.join("").trim(); }; - var peg$f115 = function() { + var peg$f112 = function(c) { return c; }; + var peg$f113 = function(chars) { return chars.join("").trim(); }; + var peg$f114 = function() { isColumnsContext = false; return "and"; }; - var peg$f116 = function() { return expectingNestedQuote; }; - var peg$f117 = function(start, inner, end) { //handle no-breaking space + var peg$f115 = function() { return expectingNestedQuote; }; + var peg$f116 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f118 = function(start) {return "“"}; - var peg$f119 = function(start) {return "”"}; - var peg$f120 = function(start) {return "\""}; - var peg$f121 = function(start, inner, end) { + var peg$f117 = function(start) {return "“"}; + var peg$f118 = function(start) {return "”"}; + var peg$f119 = function(start) {return "\""}; + var peg$f120 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -1208,88 +1205,85 @@ function peg$parse(input, options) { if (s1 === peg$FAILED) { s1 = peg$parsecategory(); if (s1 === peg$FAILED) { - s1 = peg$parsevendor(); + s1 = peg$parseto(); if (s1 === peg$FAILED) { - s1 = peg$parseto(); + s1 = peg$parsetaxRate(); if (s1 === peg$FAILED) { - s1 = peg$parsetaxRate(); + s1 = peg$parsecardID(); if (s1 === peg$FAILED) { - s1 = peg$parsecardID(); + s1 = peg$parsebankAccount(); if (s1 === peg$FAILED) { - s1 = peg$parsebankAccount(); + s1 = peg$parsefrom(); if (s1 === peg$FAILED) { - s1 = peg$parsefrom(); + s1 = peg$parseattendee(); if (s1 === peg$FAILED) { - s1 = peg$parseattendee(); + s1 = peg$parsepayer(); if (s1 === peg$FAILED) { - s1 = peg$parsepayer(); + s1 = peg$parsepaidBy(); if (s1 === peg$FAILED) { - s1 = peg$parsepaidBy(); + s1 = peg$parseexporter(); if (s1 === peg$FAILED) { - s1 = peg$parseexporter(); + s1 = peg$parseexpenseType(); if (s1 === peg$FAILED) { - s1 = peg$parseexpenseType(); + s1 = peg$parsereceiptType(); if (s1 === peg$FAILED) { - s1 = peg$parsereceiptType(); + s1 = peg$parsetransactionStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsetransactionStatus(); + s1 = peg$parsewithdrawalType(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalType(); + s1 = peg$parsewithdrawalStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalStatus(); + s1 = peg$parsepaidStatus(); if (s1 === peg$FAILED) { - s1 = peg$parsepaidStatus(); + s1 = peg$parsewithdrawalID(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawalID(); + s1 = peg$parsesubmitted(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitted(); + s1 = peg$parseapproved(); if (s1 === peg$FAILED) { - s1 = peg$parseapproved(); + s1 = peg$parsepaid(); if (s1 === peg$FAILED) { - s1 = peg$parsepaid(); + s1 = peg$parseexportedTo(); if (s1 === peg$FAILED) { - s1 = peg$parseexportedTo(); + s1 = peg$parseexported(); if (s1 === peg$FAILED) { - s1 = peg$parseexported(); + s1 = peg$parseposted(); if (s1 === peg$FAILED) { - s1 = peg$parseposted(); + s1 = peg$parsewithdrawn(); if (s1 === peg$FAILED) { - s1 = peg$parsewithdrawn(); + s1 = peg$parsefeed(); if (s1 === peg$FAILED) { - s1 = peg$parsefeed(); + s1 = peg$parsetitle(); if (s1 === peg$FAILED) { - s1 = peg$parsetitle(); + s1 = peg$parsesubmitterUserID(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitterUserID(); + s1 = peg$parsesubmitterPayrollID(); if (s1 === peg$FAILED) { - s1 = peg$parsesubmitterPayrollID(); + s1 = peg$parseorderDealNumbers(); if (s1 === peg$FAILED) { - s1 = peg$parseorderDealNumbers(); + s1 = peg$parseassignee(); if (s1 === peg$FAILED) { - s1 = peg$parseassignee(); + s1 = peg$parsecreatedBy(); if (s1 === peg$FAILED) { - s1 = peg$parsecreatedBy(); + s1 = peg$parsereimbursable(); if (s1 === peg$FAILED) { - s1 = peg$parsereimbursable(); + s1 = peg$parsebillable(); if (s1 === peg$FAILED) { - s1 = peg$parsebillable(); + s1 = peg$parseaction(); if (s1 === peg$FAILED) { - s1 = peg$parseaction(); + s1 = peg$parsehas(); if (s1 === peg$FAILED) { - s1 = peg$parsehas(); + s1 = peg$parseis(); if (s1 === peg$FAILED) { - s1 = peg$parseis(); + s1 = peg$parsepurchaseCurrency(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseCurrency(); + s1 = peg$parsepurchaseAmount(); if (s1 === peg$FAILED) { - s1 = peg$parsepurchaseAmount(); + s1 = peg$parsepolicyID(); if (s1 === peg$FAILED) { - s1 = peg$parsepolicyID(); + s1 = peg$parsestatus(); if (s1 === peg$FAILED) { - s1 = peg$parsestatus(); - if (s1 === peg$FAILED) { - s1 = peg$parsereportFieldDynamic(); - } + s1 = peg$parsereportFieldDynamic(); } } } @@ -1775,40 +1769,20 @@ function peg$parse(input, options) { return s0; } - function peg$parsevendor() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c17) { - peg$currPos += 6; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f19(); - } - s0 = s1; - - return s0; - } - function peg$parseto() { var s0, s1; s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c18) { + if (s1.toLowerCase() === peg$c17) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f20(); + s1 = peg$f19(); } s0 = s1; @@ -1820,15 +1794,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c19) { + if (s1.toLowerCase() === peg$c18) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } + if (peg$silentFails === 0) { peg$fail(peg$e23); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f21(); + s1 = peg$f20(); } s0 = s1; @@ -1840,15 +1814,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c20) { + if (s1.toLowerCase() === peg$c19) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } + if (peg$silentFails === 0) { peg$fail(peg$e24); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f22(); + s1 = peg$f21(); } s0 = s1; @@ -1858,25 +1832,25 @@ function peg$parse(input, options) { function peg$parsepaidBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c21) { - s0 = peg$c21; + if (input.substr(peg$currPos, 6) === peg$c20) { + s0 = peg$c20; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } + if (peg$silentFails === 0) { peg$fail(peg$e25); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c22) { + if (s1.toLowerCase() === peg$c21) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } + if (peg$silentFails === 0) { peg$fail(peg$e26); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f23(); + s1 = peg$f22(); } s0 = s1; } @@ -1888,24 +1862,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c23) { + if (s0.toLowerCase() === peg$c22) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } + if (peg$silentFails === 0) { peg$fail(peg$e27); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c24) { + if (s1.toLowerCase() === peg$c23) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } + if (peg$silentFails === 0) { peg$fail(peg$e28); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f24(); + s1 = peg$f23(); } s0 = s1; } @@ -1916,25 +1890,25 @@ function peg$parse(input, options) { function peg$parsecardID() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c25) { - s0 = peg$c25; + if (input.substr(peg$currPos, 6) === peg$c24) { + s0 = peg$c24; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } + if (peg$silentFails === 0) { peg$fail(peg$e29); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c26) { + if (s1.toLowerCase() === peg$c25) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { peg$fail(peg$e30); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f25(); + s1 = peg$f24(); } s0 = s1; } @@ -1945,25 +1919,25 @@ function peg$parse(input, options) { function peg$parsebankAccount() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c27) { - s0 = peg$c27; + if (input.substr(peg$currPos, 11) === peg$c26) { + s0 = peg$c26; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } + if (peg$silentFails === 0) { peg$fail(peg$e31); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c28) { + if (s1.toLowerCase() === peg$c27) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f26(); + s1 = peg$f25(); } s0 = s1; } @@ -1976,15 +1950,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c29) { + if (s1.toLowerCase() === peg$c28) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f27(); + s1 = peg$f26(); } s0 = s1; @@ -1996,15 +1970,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c30) { + if (s1.toLowerCase() === peg$c29) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f28(); + s1 = peg$f27(); } s0 = s1; @@ -2014,25 +1988,25 @@ function peg$parse(input, options) { function peg$parseexpenseType() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c31) { - s0 = peg$c31; + if (input.substr(peg$currPos, 11) === peg$c30) { + s0 = peg$c30; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c32) { + if (s1.toLowerCase() === peg$c31) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f29(); + s1 = peg$f28(); } s0 = s1; } @@ -2043,25 +2017,25 @@ function peg$parse(input, options) { function peg$parsereceiptType() { var s0, s1; - if (input.substr(peg$currPos, 11) === peg$c33) { - s0 = peg$c33; + if (input.substr(peg$currPos, 11) === peg$c32) { + s0 = peg$c32; peg$currPos += 11; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c34) { + if (s1.toLowerCase() === peg$c33) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f30(); + s1 = peg$f29(); } s0 = s1; } @@ -2072,25 +2046,25 @@ function peg$parse(input, options) { function peg$parsetransactionStatus() { var s0, s1; - if (input.substr(peg$currPos, 17) === peg$c35) { - s0 = peg$c35; + if (input.substr(peg$currPos, 17) === peg$c34) { + s0 = peg$c34; peg$currPos += 17; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e39); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c36) { + if (s1.toLowerCase() === peg$c35) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e40); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f31(); + s1 = peg$f30(); } s0 = s1; } @@ -2101,25 +2075,25 @@ function peg$parse(input, options) { function peg$parsewithdrawalType() { var s0, s1; - if (input.substr(peg$currPos, 14) === peg$c37) { - s0 = peg$c37; + if (input.substr(peg$currPos, 14) === peg$c36) { + s0 = peg$c36; peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e41); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c38) { + if (s1.toLowerCase() === peg$c37) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f32(); + s1 = peg$f31(); } s0 = s1; } @@ -2130,25 +2104,25 @@ function peg$parse(input, options) { function peg$parsewithdrawalStatus() { var s0, s1; - if (input.substr(peg$currPos, 16) === peg$c39) { - s0 = peg$c39; + if (input.substr(peg$currPos, 16) === peg$c38) { + s0 = peg$c38; peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c40) { + if (s1.toLowerCase() === peg$c39) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f33(); + s1 = peg$f32(); } s0 = s1; } @@ -2159,25 +2133,25 @@ function peg$parse(input, options) { function peg$parsepaidStatus() { var s0, s1; - if (input.substr(peg$currPos, 10) === peg$c41) { - s0 = peg$c41; + if (input.substr(peg$currPos, 10) === peg$c40) { + s0 = peg$c40; peg$currPos += 10; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c42) { + if (s1.toLowerCase() === peg$c41) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f34(); + s1 = peg$f33(); } s0 = s1; } @@ -2189,24 +2163,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 12); - if (s0.toLowerCase() === peg$c43) { + if (s0.toLowerCase() === peg$c42) { peg$currPos += 12; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c44) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f35(); + s1 = peg$f34(); } s0 = s1; } @@ -2219,15 +2193,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c45) { + if (s1.toLowerCase() === peg$c44) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f36(); + s1 = peg$f35(); } s0 = s1; @@ -2239,15 +2213,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c46) { + if (s1.toLowerCase() === peg$c45) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f37(); + s1 = peg$f36(); } s0 = s1; @@ -2259,15 +2233,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c47) { + if (s1.toLowerCase() === peg$c46) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f38(); + s1 = peg$f37(); } s0 = s1; @@ -2279,15 +2253,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c48) { + if (s1.toLowerCase() === peg$c47) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f39(); + s1 = peg$f38(); } s0 = s1; @@ -2297,25 +2271,25 @@ function peg$parse(input, options) { function peg$parsesortBy() { var s0, s1; - if (input.substr(peg$currPos, 6) === peg$c49) { - s0 = peg$c49; + if (input.substr(peg$currPos, 6) === peg$c48) { + s0 = peg$c48; peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c50) { + if (s1.toLowerCase() === peg$c49) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f40(); + s1 = peg$f39(); } s0 = s1; } @@ -2326,25 +2300,25 @@ function peg$parse(input, options) { function peg$parsesortOrder() { var s0, s1; - if (input.substr(peg$currPos, 9) === peg$c51) { - s0 = peg$c51; + if (input.substr(peg$currPos, 9) === peg$c50) { + s0 = peg$c50; peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c52) { + if (s1.toLowerCase() === peg$c51) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f41(); + s1 = peg$f40(); } s0 = s1; } @@ -2355,25 +2329,25 @@ function peg$parse(input, options) { function peg$parsepolicyID() { var s0, s1; - if (input.substr(peg$currPos, 8) === peg$c53) { - s0 = peg$c53; + if (input.substr(peg$currPos, 8) === peg$c52) { + s0 = peg$c52; peg$currPos += 8; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c54) { + if (s1.toLowerCase() === peg$c53) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f42(); + s1 = peg$f41(); } s0 = s1; } @@ -2386,15 +2360,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c55) { + if (s1.toLowerCase() === peg$c54) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f43(); + s1 = peg$f42(); } s0 = s1; @@ -2406,15 +2380,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c56) { + if (s1.toLowerCase() === peg$c55) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f44(); + s1 = peg$f43(); } s0 = s1; @@ -2426,15 +2400,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c57) { + if (s1.toLowerCase() === peg$c56) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f45(); + s1 = peg$f44(); } s0 = s1; @@ -2446,15 +2420,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c58) { + if (s1.toLowerCase() === peg$c57) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f46(); + s1 = peg$f45(); } s0 = s1; @@ -2466,15 +2440,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c59) { + if (s1.toLowerCase() === peg$c58) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f47(); + s1 = peg$f46(); } s0 = s1; @@ -2486,15 +2460,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c60) { + if (s1.toLowerCase() === peg$c59) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f48(); + s1 = peg$f47(); } s0 = s1; @@ -2505,24 +2479,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 7); - if (s0.toLowerCase() === peg$c61) { + if (s0.toLowerCase() === peg$c60) { peg$currPos += 7; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c62) { + if (s1.toLowerCase() === peg$c61) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f49(); + s1 = peg$f48(); } s0 = s1; } @@ -2535,15 +2509,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c63) { + if (s1.toLowerCase() === peg$c62) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f50(); + s1 = peg$f49(); } s0 = s1; @@ -2555,15 +2529,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c64) { + if (s1.toLowerCase() === peg$c63) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f51(); + s1 = peg$f50(); } s0 = s1; @@ -2575,15 +2549,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c65) { + if (s1.toLowerCase() === peg$c64) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f52(); + s1 = peg$f51(); } s0 = s1; @@ -2594,24 +2568,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 15); - if (s0.toLowerCase() === peg$c66) { + if (s0.toLowerCase() === peg$c65) { peg$currPos += 15; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c67) { + if (s1.toLowerCase() === peg$c66) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f53(); + s1 = peg$f52(); } s0 = s1; } @@ -2623,24 +2597,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 18); - if (s0.toLowerCase() === peg$c68) { + if (s0.toLowerCase() === peg$c67) { peg$currPos += 18; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 20); - if (s1.toLowerCase() === peg$c69) { + if (s1.toLowerCase() === peg$c68) { peg$currPos += 20; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f54(); + s1 = peg$f53(); } s0 = s1; } @@ -2652,24 +2626,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c70) { + if (s0.toLowerCase() === peg$c69) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c71) { + if (s1.toLowerCase() === peg$c70) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f55(); + s1 = peg$f54(); } s0 = s1; } @@ -2682,15 +2656,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c72) { + if (s1.toLowerCase() === peg$c71) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f56(); + s1 = peg$f55(); } s0 = s1; @@ -2701,24 +2675,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 9); - if (s0.toLowerCase() === peg$c73) { + if (s0.toLowerCase() === peg$c72) { peg$currPos += 9; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c74) { + if (s1.toLowerCase() === peg$c73) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f57(); + s1 = peg$f56(); } s0 = s1; } @@ -2731,15 +2705,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c75) { + if (s1.toLowerCase() === peg$c74) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f58(); + s1 = peg$f57(); } s0 = s1; @@ -2751,15 +2725,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c76) { + if (s1.toLowerCase() === peg$c75) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f59(); + s1 = peg$f58(); } s0 = s1; @@ -2771,15 +2745,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c77) { + if (s1.toLowerCase() === peg$c76) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f60(); + s1 = peg$f59(); } s0 = s1; @@ -2791,15 +2765,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 2); - if (s1.toLowerCase() === peg$c78) { + if (s1.toLowerCase() === peg$c77) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f61(); + s1 = peg$f60(); } s0 = s1; @@ -2810,24 +2784,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 14); - if (s0.toLowerCase() === peg$c79) { + if (s0.toLowerCase() === peg$c78) { peg$currPos += 14; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f62(); + s1 = peg$f61(); } s0 = s1; } @@ -2839,24 +2813,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c81) { + if (s0.toLowerCase() === peg$c80) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c82) { + if (s1.toLowerCase() === peg$c81) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f63(); + s1 = peg$f62(); } s0 = s1; } @@ -2868,24 +2842,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 13); - if (s0.toLowerCase() === peg$c83) { + if (s0.toLowerCase() === peg$c82) { peg$currPos += 13; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f64(); + s1 = peg$f63(); } s0 = s1; } @@ -2897,24 +2871,24 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 16); - if (s0.toLowerCase() === peg$c85) { + if (s0.toLowerCase() === peg$c84) { peg$currPos += 16; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f65(); + s1 = peg$f64(); } s0 = s1; } @@ -2927,15 +2901,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c87) { + if (s1.toLowerCase() === peg$c86) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f66(); + s1 = peg$f65(); } s0 = s1; @@ -2947,15 +2921,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 4); - if (s1.toLowerCase() === peg$c88) { + if (s1.toLowerCase() === peg$c87) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f67(); + s1 = peg$f66(); } s0 = s1; @@ -2967,15 +2941,15 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 7); - if (s1.toLowerCase() === peg$c89) { + if (s1.toLowerCase() === peg$c88) { peg$currPos += 7; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f68(); + s1 = peg$f67(); } s0 = s1; @@ -2987,7 +2961,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f69(); + s1 = peg$f68(); if (s1) { s1 = undefined; } else { @@ -3122,11 +3096,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c90) { + if (s1.toLowerCase() === peg$c89) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3141,7 +3115,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f70(); + s0 = peg$f69(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3159,19 +3133,19 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 6); - if (s1.toLowerCase() === peg$c91) { + if (s1.toLowerCase() === peg$c90) { peg$currPos += 6; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e95); } } if (s1 === peg$FAILED) { s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c92) { + if (s1.toLowerCase() === peg$c91) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e96); } } } if (s1 !== peg$FAILED) { @@ -3187,7 +3161,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f71(); + s0 = peg$f70(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3205,11 +3179,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c80) { + if (s1.toLowerCase() === peg$c79) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3224,7 +3198,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f72(); + s0 = peg$f71(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3242,11 +3216,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c93) { + if (s1.toLowerCase() === peg$c92) { peg$currPos += 3; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e97); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3261,7 +3235,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f73(); + s0 = peg$f72(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3279,11 +3253,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c24) { + if (s1.toLowerCase() === peg$c23) { peg$currPos += 8; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } + if (peg$silentFails === 0) { peg$fail(peg$e28); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3298,7 +3272,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f74(); + s0 = peg$f73(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3316,11 +3290,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c94) { + if (s1.toLowerCase() === peg$c93) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e98); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3335,7 +3309,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f75(); + s0 = peg$f74(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3353,11 +3327,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c44) { + if (s1.toLowerCase() === peg$c43) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3372,7 +3346,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f76(); + s0 = peg$f75(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3390,11 +3364,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c28) { + if (s1.toLowerCase() === peg$c27) { peg$currPos += 12; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3409,7 +3383,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f77(); + s0 = peg$f76(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3427,11 +3401,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c95) { + if (s1.toLowerCase() === peg$c94) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e99); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3446,7 +3420,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f78(); + s0 = peg$f77(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3483,7 +3457,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f79(); + s0 = peg$f78(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3501,11 +3475,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e100); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3520,7 +3494,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f80(); + s0 = peg$f79(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3545,7 +3519,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e101); } } if (s2 !== peg$FAILED) { s1 = [s1, s2]; @@ -3564,11 +3538,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c97) { + if (s1.toLowerCase() === peg$c96) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e102); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3583,7 +3557,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f81(); + s0 = peg$f80(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3595,11 +3569,11 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c96) { + if (s1.toLowerCase() === peg$c95) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e100); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3614,7 +3588,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f82(); + s0 = peg$f81(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3633,11 +3607,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c98) { + if (s1.toLowerCase() === peg$c97) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e103); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3652,7 +3626,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f83(); + s0 = peg$f82(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3670,11 +3644,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c99) { + if (s1.toLowerCase() === peg$c98) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e104); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3689,7 +3663,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f84(); + s0 = peg$f83(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3707,11 +3681,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c100) { + if (s1.toLowerCase() === peg$c99) { peg$currPos += 22; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e105); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3726,7 +3700,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f85(); + s0 = peg$f84(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3744,11 +3718,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c101) { + if (s1.toLowerCase() === peg$c100) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e106); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3763,7 +3737,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f86(); + s0 = peg$f85(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3781,11 +3755,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c102) { + if (s1.toLowerCase() === peg$c101) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e107); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3800,7 +3774,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f87(); + s0 = peg$f86(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3818,11 +3792,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c103) { + if (s1.toLowerCase() === peg$c102) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e108); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3837,7 +3811,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f88(); + s0 = peg$f87(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3855,11 +3829,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c104) { + if (s1.toLowerCase() === peg$c103) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e109); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3874,7 +3848,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f89(); + s0 = peg$f88(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3892,11 +3866,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c105) { + if (s1.toLowerCase() === peg$c104) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e111); } + if (peg$silentFails === 0) { peg$fail(peg$e110); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3911,7 +3885,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f90(); + s0 = peg$f89(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3929,11 +3903,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c106) { + if (s1.toLowerCase() === peg$c105) { peg$currPos += 18; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e112); } + if (peg$silentFails === 0) { peg$fail(peg$e111); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3948,7 +3922,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f91(); + s0 = peg$f90(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3966,11 +3940,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c107) { + if (s1.toLowerCase() === peg$c106) { peg$currPos += 15; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e113); } + if (peg$silentFails === 0) { peg$fail(peg$e112); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3985,7 +3959,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f92(); + s0 = peg$f91(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4003,11 +3977,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c108) { + if (s1.toLowerCase() === peg$c107) { peg$currPos += 19; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e114); } + if (peg$silentFails === 0) { peg$fail(peg$e113); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4022,7 +3996,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f93(); + s0 = peg$f92(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4040,11 +4014,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 20); - if (s1.toLowerCase() === peg$c109) { + if (s1.toLowerCase() === peg$c108) { peg$currPos += 20; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e115); } + if (peg$silentFails === 0) { peg$fail(peg$e114); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4059,7 +4033,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f94(); + s0 = peg$f93(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4077,11 +4051,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 23); - if (s1.toLowerCase() === peg$c110) { + if (s1.toLowerCase() === peg$c109) { peg$currPos += 23; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e116); } + if (peg$silentFails === 0) { peg$fail(peg$e115); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4096,7 +4070,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f95(); + s0 = peg$f94(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4114,11 +4088,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c84) { + if (s1.toLowerCase() === peg$c83) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4133,7 +4107,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f96(); + s0 = peg$f95(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4151,11 +4125,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 17); - if (s1.toLowerCase() === peg$c86) { + if (s1.toLowerCase() === peg$c85) { peg$currPos += 17; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4170,7 +4144,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f97(); + s0 = peg$f96(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4188,11 +4162,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c111) { + if (s1.toLowerCase() === peg$c110) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e117); } + if (peg$silentFails === 0) { peg$fail(peg$e116); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4207,7 +4181,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f98(); + s0 = peg$f97(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4225,11 +4199,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c112) { + if (s1.toLowerCase() === peg$c111) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e118); } + if (peg$silentFails === 0) { peg$fail(peg$e117); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4244,7 +4218,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f99(); + s0 = peg$f98(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4262,11 +4236,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c113) { + if (s1.toLowerCase() === peg$c112) { peg$currPos += 14; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e119); } + if (peg$silentFails === 0) { peg$fail(peg$e118); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4281,7 +4255,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f100(); + s0 = peg$f99(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4299,11 +4273,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c114) { + if (s1.toLowerCase() === peg$c113) { peg$currPos += 9; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e120); } + if (peg$silentFails === 0) { peg$fail(peg$e119); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4318,7 +4292,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f101(); + s0 = peg$f100(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4336,11 +4310,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c115) { + if (s1.toLowerCase() === peg$c114) { peg$currPos += 11; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e121); } + if (peg$silentFails === 0) { peg$fail(peg$e120); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4355,7 +4329,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f102(); + s0 = peg$f101(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4373,11 +4347,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c116) { + if (s1.toLowerCase() === peg$c115) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e122); } + if (peg$silentFails === 0) { peg$fail(peg$e121); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4392,7 +4366,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f103(); + s0 = peg$f102(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4410,11 +4384,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c117) { + if (s1.toLowerCase() === peg$c116) { peg$currPos += 10; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e123); } + if (peg$silentFails === 0) { peg$fail(peg$e122); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4429,7 +4403,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f104(); + s0 = peg$f103(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4447,11 +4421,11 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c118) { + if (s1.toLowerCase() === peg$c117) { peg$currPos += 13; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e124); } + if (peg$silentFails === 0) { peg$fail(peg$e123); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -4466,7 +4440,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f105(); + s0 = peg$f104(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4489,81 +4463,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e101); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f106(); + s1 = peg$f105(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c119) { - s1 = peg$c119; + if (input.substr(peg$currPos, 2) === peg$c118) { + s1 = peg$c118; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e126); } + if (peg$silentFails === 0) { peg$fail(peg$e125); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f107(); + s1 = peg$f106(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c120) { - s1 = peg$c120; + if (input.substr(peg$currPos, 2) === peg$c119) { + s1 = peg$c119; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e127); } + if (peg$silentFails === 0) { peg$fail(peg$e126); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f108(); + s1 = peg$f107(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c121; + s1 = peg$c120; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e128); } + if (peg$silentFails === 0) { peg$fail(peg$e127); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f109(); + s1 = peg$f108(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c122) { - s1 = peg$c122; + if (input.substr(peg$currPos, 2) === peg$c121) { + s1 = peg$c121; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e129); } + if (peg$silentFails === 0) { peg$fail(peg$e128); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f110(); + s1 = peg$f109(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c123; + s1 = peg$c122; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e130); } + if (peg$silentFails === 0) { peg$fail(peg$e129); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f111(); + s1 = peg$f110(); } s0 = s1; } @@ -4574,7 +4548,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e125); } + if (peg$silentFails === 0) { peg$fail(peg$e124); } } return s0; @@ -4587,7 +4561,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f112(s1); + s1 = peg$f111(s1); } s0 = s1; @@ -4599,11 +4573,11 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c124; + s1 = peg$c123; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e131); } + if (peg$silentFails === 0) { peg$fail(peg$e130); } } if (s1 !== peg$FAILED) { s2 = input.charAt(peg$currPos); @@ -4611,11 +4585,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e132); } + if (peg$silentFails === 0) { peg$fail(peg$e131); } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f113(s2); + s0 = peg$f112(s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4641,7 +4615,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } } if (s2 !== peg$FAILED) { @@ -4654,7 +4628,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } } } @@ -4663,13 +4637,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f114(s1); + s1 = peg$f113(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e133); } + if (peg$silentFails === 0) { peg$fail(peg$e132); } } return s0; @@ -4681,7 +4655,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f115(); + s1 = peg$f114(); s0 = s1; return s0; @@ -4697,7 +4671,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -4706,12 +4680,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e136); } + if (peg$silentFails === 0) { peg$fail(peg$e135); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e135); } + if (peg$silentFails === 0) { peg$fail(peg$e134); } return s0; } @@ -4721,7 +4695,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f116(); + s1 = peg$f115(); if (s1) { s1 = undefined; } else { @@ -4758,7 +4732,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4767,7 +4741,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } } s2 = input.charAt(peg$currPos); @@ -4775,7 +4749,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4786,7 +4760,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } } while (s4 !== peg$FAILED) { @@ -4798,7 +4772,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } } } @@ -4807,7 +4781,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s4 !== peg$FAILED) { s5 = []; @@ -4816,7 +4790,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -4825,11 +4799,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e134); } + if (peg$silentFails === 0) { peg$fail(peg$e133); } } } peg$savedPos = s0; - s0 = peg$f117(s1, s3, s5); + s0 = peg$f116(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4841,7 +4815,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } return s0; @@ -4858,7 +4832,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -4867,7 +4841,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e138); } + if (peg$silentFails === 0) { peg$fail(peg$e137); } } } s2 = input.charAt(peg$currPos); @@ -4875,7 +4849,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s2 !== peg$FAILED) { s3 = []; @@ -4886,7 +4860,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -4902,15 +4876,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c125; + s6 = peg$c124; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e141); } + if (peg$silentFails === 0) { peg$fail(peg$e140); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f118(s1); + s4 = peg$f117(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4933,15 +4907,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c126; + s6 = peg$c125; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e142); } + if (peg$silentFails === 0) { peg$fail(peg$e141); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f119(s1); + s4 = peg$f118(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4964,15 +4938,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c127; + s6 = peg$c126; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e143); } + if (peg$silentFails === 0) { peg$fail(peg$e142); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f120(s1); + s4 = peg$f119(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -4994,7 +4968,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e140); } + if (peg$silentFails === 0) { peg$fail(peg$e139); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -5010,15 +4984,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c125; + s6 = peg$c124; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e141); } + if (peg$silentFails === 0) { peg$fail(peg$e140); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f118(s1); + s4 = peg$f117(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -5041,15 +5015,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c126; + s6 = peg$c125; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e142); } + if (peg$silentFails === 0) { peg$fail(peg$e141); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f119(s1); + s4 = peg$f118(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -5072,15 +5046,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c127; + s6 = peg$c126; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e143); } + if (peg$silentFails === 0) { peg$fail(peg$e142); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f120(s1); + s4 = peg$f119(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -5097,7 +5071,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f121(s1, s3, s4); + s0 = peg$f120(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -5109,7 +5083,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e137); } + if (peg$silentFails === 0) { peg$fail(peg$e136); } } return s0; @@ -5124,7 +5098,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e139); } + if (peg$silentFails === 0) { peg$fail(peg$e138); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -5162,7 +5136,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e144); } + if (peg$silentFails === 0) { peg$fail(peg$e143); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -5171,7 +5145,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e144); } + if (peg$silentFails === 0) { peg$fail(peg$e143); } } } s2 = []; @@ -5180,7 +5154,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e145); } + if (peg$silentFails === 0) { peg$fail(peg$e144); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -5189,7 +5163,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e145); } + if (peg$silentFails === 0) { peg$fail(peg$e144); } } } s3 = []; @@ -5198,7 +5172,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e146); } + if (peg$silentFails === 0) { peg$fail(peg$e145); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -5207,7 +5181,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e146); } + if (peg$silentFails === 0) { peg$fail(peg$e145); } } } s4 = peg$parseoperator(); @@ -5226,7 +5200,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e147); } + if (peg$silentFails === 0) { peg$fail(peg$e146); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -5235,7 +5209,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e147); } + if (peg$silentFails === 0) { peg$fail(peg$e146); } } } s2 = peg$currPos; @@ -5282,7 +5256,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e148); } + if (peg$silentFails === 0) { peg$fail(peg$e147); } } } } @@ -5298,7 +5272,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e149); } + if (peg$silentFails === 0) { peg$fail(peg$e148); } } if (s0 === peg$FAILED) { s0 = peg$currPos; diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy index 93b2a29b7c65..09585572ecd6 100644 --- a/src/libs/SearchParser/searchParser.peggy +++ b/src/libs/SearchParser/searchParser.peggy @@ -272,7 +272,6 @@ key "key" / groupCurrency / tag / category - / vendor / to / taxRate / cardID diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts index 46e8dbdb9f60..098734ea4746 100644 --- a/src/libs/SearchQueryUtils.ts +++ b/src/libs/SearchQueryUtils.ts @@ -1348,7 +1348,6 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial uniqueCategories.has(name)) .concat(hasEmptyCategoriesInFilter ? [CONST.SEARCH.CATEGORY_EMPTY_VALUE] : []); } - if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR) { - // Vendor names are matched by text on the server and the synced vendor lists load lazily, so the typed values are kept as-is. - filtersForm[addNegation(filterKey, isNegated)] = filterValues; - } if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) { filtersForm[filterKey] = filterValues ?.map((filter) => { diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index fe5ef6bc690a..59034706b53b 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -5626,10 +5626,6 @@ const FILTER_VIEW_MAP = { labelKey: 'common.tag', icon: 'Tag', }, - [CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR]: { - labelKey: 'common.vendor', - icon: 'Building', - }, [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE]: { labelKey: 'workspace.taxes.taxRate', icon: 'Percent', @@ -5864,13 +5860,6 @@ function getDisplayValue( .join(', '); } - if (key === FILTER_KEYS.VENDOR || key === FILTER_KEYS.VENDOR_NOT) { - return form[key] - ?.sort((a, b) => sortOptionsWithEmptyValue(a, b, localeCompare)) - .map((value) => (value === CONST.SEARCH.VENDOR_EMPTY_VALUE ? translate('search.noVendor') : value)) - .join(', '); - } - if (key === FILTER_KEYS.CURRENCY || key === FILTER_KEYS.CURRENCY_NOT || key === FILTER_KEYS.PURCHASE_CURRENCY || key === FILTER_KEYS.PURCHASE_CURRENCY_NOT) { return form[key]?.sort(localeCompare).join(', '); } diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts index 55331b75f16f..adfcb11aeb30 100644 --- a/src/libs/actions/Search.ts +++ b/src/libs/actions/Search.ts @@ -1078,34 +1078,6 @@ function openSearchCategoryFiltersPage() { read(READ_COMMANDS.OPEN_SEARCH_CATEGORY_FILTERS_PAGE, null, {optimisticData, successData, finallyData}); } -function openSearchVendorFiltersPage() { - const optimisticData: Array> = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA, - value: true, - }, - ]; - - const successData: Array> = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED, - value: true, - }, - ]; - - const finallyData: Array> = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA, - value: false, - }, - ]; - - read(READ_COMMANDS.OPEN_SEARCH_VENDOR_FILTERS_PAGE, null, {optimisticData, successData, finallyData}); -} - /** * Fetches a page of tag filter search results from the server. * Returns pagination metadata (hasMore, nextCursor) for infinite scroll. @@ -2657,7 +2629,6 @@ export { handlePreventSearchAPI, openSearchCardFiltersPage, openSearchCategoryFiltersPage, - openSearchVendorFiltersPage, openSearchTagFiltersPage, setSearchTagFiltersPagination, clearSearchTagFiltersState, diff --git a/src/setup/index.ts b/src/setup/index.ts index 7f43c08e211c..db2eb0cf3555 100644 --- a/src/setup/index.ts +++ b/src/setup/index.ts @@ -90,7 +90,6 @@ export default function () { ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED, ONYXKEYS.RAM_ONLY_IS_LOADING_RULES, ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA, - ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA, ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION, ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_RESULTS, ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE, diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts index 74008ae656b1..f0b17df5675a 100644 --- a/src/types/form/SearchAdvancedFiltersForm.ts +++ b/src/types/form/SearchAdvancedFiltersForm.ts @@ -139,9 +139,6 @@ const FILTER_KEYS = { CATEGORY_NOT: 'categoryNot', CATEGORY: 'category', - VENDOR_NOT: 'vendorNot', - VENDOR: 'vendor', - CARD_ID_NOT: 'cardIDNot', CARD_ID: 'cardID', @@ -310,8 +307,6 @@ const ALLOWED_TYPE_FILTERS: Record> = { FILTER_KEYS.CATEGORY_NOT, FILTER_KEYS.TAG, FILTER_KEYS.TAG_NOT, - FILTER_KEYS.VENDOR, - FILTER_KEYS.VENDOR_NOT, FILTER_KEYS.PAYER, FILTER_KEYS.PAYER_NOT, FILTER_KEYS.PAID_BY, @@ -798,9 +793,6 @@ type SearchAdvancedFiltersForm = Form< [FILTER_KEYS.CATEGORY]: string[]; [FILTER_KEYS.CATEGORY_NOT]: string[]; - [FILTER_KEYS.VENDOR]: string[]; - [FILTER_KEYS.VENDOR_NOT]: string[]; - [FILTER_KEYS.POLICY_ID]: string[]; [FILTER_KEYS.POLICY_ID_NOT]: string[]; diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts index 93436784e970..4078dc4f938f 100644 --- a/tests/unit/PolicyUtilsTest.ts +++ b/tests/unit/PolicyUtilsTest.ts @@ -15,7 +15,6 @@ import { canSendInvoiceFromWorkspace, evaluateApprovalWorkflowRule, findVendorByID, - getVendorFeaturePolicyIDs, getVendorDisplayName, hasVendorFeatureOnAnyPolicy, getActivePolicies, @@ -5594,7 +5593,7 @@ describe('PolicyUtils', () => { }); }); - describe('hasVendorFeatureOnAnyPolicy and getVendorFeaturePolicyIDs', () => { + describe('hasVendorFeatureOnAnyPolicy', () => { const qboPolicy: Policy = {...buildQBOPolicy(CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD), id: 'qbo'}; const xeroPolicy: Policy = {...buildXeroPolicy(), id: 'xero'}; const businessCentralPolicy: Policy = {...buildBusinessCentralPolicy(), id: 'businessCentral'}; @@ -5644,19 +5643,6 @@ describe('PolicyUtils', () => { // Then the feature is not available on any workspace because Business Central still depends on the beta expect(isVendorFeatureAvailable).toBe(false); }); - - it('lists the workspaces that have the vendor feature', () => { - // Given QBO, Xero and Business Central workspaces next to one with no accounting connection - const policies = {[qboKey]: qboPolicy, [xeroKey]: xeroPolicy, [businessCentralKey]: businessCentralPolicy, [plainKey]: plainPolicy}; - - // When the workspace IDs are listed with and without the vendorMatching beta - const policyIDsWithBeta = getVendorFeaturePolicyIDs(policies, true); - const policyIDsWithoutBeta = getVendorFeaturePolicyIDs(policies, false); - - // Then every connected workspace is listed with the beta, and Business Central is dropped without it because it still depends on the beta - expect(policyIDsWithBeta.toSorted()).toEqual(['businessCentral', 'qbo', 'xero']); - expect(policyIDsWithoutBeta.toSorted()).toEqual(['qbo', 'xero']); - }); }); describe('getVendorDisplayName', () => { diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts index 9d9eef2e2894..c44544f54193 100644 --- a/tests/unit/Search/SearchQueryUtilsTest.ts +++ b/tests/unit/Search/SearchQueryUtilsTest.ts @@ -555,31 +555,6 @@ describe('SearchQueryUtils', () => { expect(result).toEqual('type:expense policyID:12345 amount<100'); }); - test('vendor filter value', () => { - const filterValues: Partial = { - type: 'expense', - vendor: ['Acme', 'none'], - }; - - const result = buildQueryStringFromFilterFormValues(filterValues); - - expect(result).toEqual('type:expense vendor:Acme,none'); - }); - - test('negated vendor filter value', () => { - // Given a filter form that excludes a vendor - const filterValues: Partial = { - type: 'expense', - vendorNot: ['Acme'], - }; - - // When the query string is built from the form - const result = buildQueryStringFromFilterFormValues(filterValues); - - // Then the vendor filter keeps its negation so the exclusion is not turned into a match - expect(result).toEqual('type:expense -vendor:Acme'); - }); - test('receipt type filter value', () => { const filterValues: Partial = { type: 'expense', @@ -1510,40 +1485,6 @@ describe('SearchQueryUtils', () => { }); }); - test('vendor filter keeps the typed names and the empty value', () => { - const queryString = 'sortBy:date sortOrder:desc type:expense vendor:"Acme Tools",none'; - const queryJSON = buildSearchQueryJSON(queryString); - - if (!queryJSON) { - throw new Error('Failed to parse query string'); - } - - const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}); - - expect(result).toEqual({ - type: 'expense', - vendor: ['Acme Tools', 'none'], - }); - }); - - test('negated vendor filter is kept in the negated form key', () => { - // Given a typed query that excludes a vendor - const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense -vendor:"Acme Tools"'); - - if (!queryJSON) { - throw new Error('Failed to parse query string'); - } - - // When the filter form is built from the query - const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}); - - // Then the exclusion lands in vendorNot so applying the form keeps it an exclusion - expect(result).toEqual({ - type: 'expense', - vendorNot: ['Acme Tools'], - }); - }); - test('action filter should be set to undefined if the input value is invalid', () => { const policyCategories = {}; const currencyList = {}; diff --git a/tests/unit/SearchAutocompleteUtilsTest.ts b/tests/unit/SearchAutocompleteUtilsTest.ts index f69afc8f54ab..c22a11bc2d87 100644 --- a/tests/unit/SearchAutocompleteUtilsTest.ts +++ b/tests/unit/SearchAutocompleteUtilsTest.ts @@ -137,19 +137,6 @@ describe('SearchAutocompleteUtils', () => { expect(result).toEqual([]); }); - it('should highlight VENDOR filter with a typed vendor name', () => { - // Given a typed vendor filter, whose names are matched by text on the server - const input = 'vendor:"Acme Tools"'; - - // When the input is parsed for highlighting - const result = parseForLiveMarkdown(input, currentUserName, mockSubstitutionMap, mockUserLogins, mockCurrencyList, mockCategoryList, mockTagList, mockExportedToList); - - // Then the vendor value is highlighted like other free-text filters - expect(result).toEqual([ - {start: 7, type: 'mention-user', length: 12}, // vendor:"Acme Tools" - ]); - }); - it('should highlight EXPORTED_TO filter when value is in predefined integrations or custom template list', () => { const input = 'exported-to:Xero'; diff --git a/tests/unit/hooks/useAdvancedSearchFilters.test.ts b/tests/unit/hooks/useAdvancedSearchFilters.test.ts index 71b64312da65..b8424496dd33 100644 --- a/tests/unit/hooks/useAdvancedSearchFilters.test.ts +++ b/tests/unit/hooks/useAdvancedSearchFilters.test.ts @@ -7,7 +7,6 @@ import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy, PolicyTagLists} from '@src/types/onyx'; -import type {Connections} from '@src/types/onyx/Policy'; import type * as NativeNavigation from '@react-navigation/native'; @@ -15,7 +14,6 @@ import React from 'react'; import Onyx from 'react-native-onyx'; import createRandomPolicy from '../../utils/collections/policies'; -import createMock from '../../utils/createMock'; import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; jest.mock('@src/libs/Log'); @@ -179,37 +177,6 @@ describe('useAdvancedSearchFilters', () => { }); }); - describe('vendor filter visibility', () => { - it('hides the vendor filter when no workspace has the vendor feature', async () => { - await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, buildPolicy(1, {connections: undefined})); - - const {result} = renderHook(() => useAdvancedSearchFilters(undefined), {wrapper}); - - await waitFor(() => { - const allKeys = result.current.flat(); - expect(allKeys).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY); - expect(allKeys).not.toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR); - }); - }); - - it('shows the vendor filter when a workspace exports QBO card expenses as credit card transactions', async () => { - const connections = createMock({ - [CONST.POLICY.CONNECTIONS.NAME.QBO]: { - config: {nonReimbursableExpensesExportDestination: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}, - data: {vendors: []}, - }, - }); - await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, buildPolicy(1, {connections})); - - const {result} = renderHook(() => useAdvancedSearchFilters(undefined), {wrapper}); - - await waitFor(() => { - const allKeys = result.current.flat(); - expect(allKeys).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR); - }); - }); - }); - describe('tax filter visibility', () => { it('hides tax filter when no policies have taxes enabled', async () => { const policy = buildPolicy(1, {tax: {trackingEnabled: false}});