Add parser utils, refactor

src/index.ts

@@ -1,6 +1,6 @@
 import { derived, get, writable } from 'svelte/store';
 import { fetchTranslations, testRoute, toDotNotation, useDefault as d } from './utils';
-import parser from './parser/parser';
+import parser from './parser';
 
 import type { Config, ConfigTranslations, LoaderModule, LoadingStore, LocalTranslationFunction, Route, TranslationFunction, Translations, ExtendedStore } from './types';
 import type { CustomModifiers } from './parser/types';

src/parser/parser.ts → src/parser/index.ts

@@ -1,5 +1,5 @@
 import * as defaultModifiers from './modifiers';
-import { useDefault } from '../utils';
+import { useDefault } from './utils';
 
 import type { CustomModifiers, ModifierOption, Parser } from './types';
 

src/parser/modifiers.ts

@@ -1,4 +1,4 @@
-import { useDefault, findOption } from '../utils';
+import { useDefault, findOption } from './utils';
 import type { Modifier, ModifierOption } from './types';
 
 export const eq: Modifier = (value, options = [], defaultValue = '') => useDefault(options.find(

src/parser/utils.ts

@@ -0,0 +1,5 @@
+import type { ModifierOption } from './types';
+
+export const useDefault = <T = any>(value: any, def:any = {}): T => value || def;
+
+export const findOption = <T = string>(options: ModifierOption[], key: string, defaultValue?: string): T => ((options.find((option) => option.key === key))?.value || defaultValue) as any;

src/utils.ts

@@ -1,7 +1,8 @@
+import { useDefault } from './parser/utils';
+
 import type { ToDotNotation, FetchTranslations, Route, LoaderModule } from './types';
-import type { ModifierOption } from './parser/types';
 
-export const useDefault = <T = any>(value: any, def:any = {}): T => value || def;
+export { useDefault };
 
 export const toDotNotation: ToDotNotation = (input, parentKey) => Object.keys(useDefault(input)).reduce((acc, key) => {
   const value = input[key];
@@ -46,5 +47,3 @@ export const testRoute = (route: string) => (input: Route) => {
 
   return false;
 };
-
-export const findOption = <T = string>(options: ModifierOption[], key: string, defaultValue?: string): T => ((options.find((option) => option.key === key))?.value || defaultValue) as any;