glotstack 0.0.8 → 0.0.10

package/src/util/findConfig.ts

@@ -1,20 +1,70 @@
 import { existsSync } from 'fs'
 import { readFile } from 'fs/promises'
 import * as path from 'path'
+import { loadYaml } from './yaml'
+
+
+function dropKeys<T>(input: T | string, keysToDrop: string[]): T {
+  const obj = typeof input === 'string' ? JSON.parse(input) : structuredClone(input)
+
+  for (const path of keysToDrop) {
+    const segments = path.split('.')
+    let target: any = obj
+
+    for (let i = 0; i < segments.length - 1; i++) {
+      const key = segments[i]
+      const next = isNaN(Number(key)) ? key : Number(key)
+
+      if (target[next] === undefined) {
+        target = undefined
+        break
+      }
+      target = target[next]
+    }
+
+    if (target !== undefined) {
+      const finalKey = segments[segments.length - 1]
+      const final = isNaN(Number(finalKey)) ? finalKey : Number(finalKey)
+      delete target[final]
+    }
+  }
+
+  return obj
+}
+
+
+export interface GlotstackConfig {
+  outputDir?: string
+  sourcePath: string
+  sourceLocale: string
+  outputLocales: string[]
+  apiOrigin?: string
+  apiKey: string
+  projectId?: string
+}
 
 /**
  * Recursively looks for `.glotstack.json` from the current directory up to the root.
  * @param startDir The directory to start the search from. Defaults to process.cwd().
  * @returns The absolute path to the file if found, or null if not found.
  */
-export async function findGlotstackConfig(startDir: string = process.cwd()): Promise<object | null> {
+export async function findGlotstackConfig(startDir: string = process.cwd()): Promise<GlotstackConfig | null> {
   let currentDir = path.resolve(startDir)
   let configPath = null
 
   while (true) {
-    const candidate = path.join(currentDir, '.glotstack.json')
-    if (existsSync(candidate)) {
-      configPath = candidate
+    const jsonCandidate = path.join(currentDir, '.glotstack.json')
+    const yamlCandidate = path.join(currentDir, '.glotstack.yaml')
+    const jsonExists = existsSync(jsonCandidate)
+    const yamlExists = existsSync(yamlCandidate)
+    if (jsonExists && yamlExists) {
+      console.error('Both .glotstack.json and .glotstack.yaml exist, please delete one\n\n  json: ', jsonCandidate, '\n  yaml: ', yamlCandidate)
+      throw new Error('Two config formats cannot be used at the same time')
+
+    } else if (jsonExists) {
+      configPath = jsonCandidate
+    } else if (yamlExists) {
+      configPath = yamlCandidate
     }
 
     const parentDir = path.dirname(currentDir)
@@ -24,19 +74,23 @@ export async function findGlotstackConfig(startDir: string = process.cwd()): Pro
     currentDir = parentDir
   }
 
-  let config = {}
+  let config: GlotstackConfig
 
   if (configPath != null) {
-    console.info('Loading config file at ', configPath)
+    console.info('Loading config file at ', dropKeys(configPath, ['apiKey']))
     try {
       const text = await readFile(configPath, 'utf-8')
-      config = JSON.parse(text)
+      if (path.parse(configPath).ext === '.yaml') {
+        config = loadYaml(text) as GlotstackConfig
+      } else {
+        config = JSON.parse(text)
+      }
       console.info('Loaded config file', config)
       return config
     } catch (err) {
       console.warn('Could not load config', configPath)
     }
   }
-  console.warn('Could not find any .glotstack.json config files')
+  console.warn('Could not find any .glotstack config files')
   return null
 }

package/src/util/object.ts

@@ -21,12 +21,8 @@ function _merge(target: any, source: any): any {
   return target;
 }
 
-type MergeTarget = Record<string|number|symbol, any>
-
-export function merge(target: MergeTarget, ...sources: MergeTarget[]): MergeTarget {
-  return sources.reduce((previous, current) => {
-    return _merge(previous, current);
-  }, target)
+export function  merge<T extends object>(target: T, ...sources: Partial<T>[]): T {
+  return sources.reduce((previous, current) => _merge(previous, current), target) as T
 }
 
 export function isEqual(a: any, b: any): boolean {