fix: glob pattern in push + tests (#134)

* fix: glob pattern in push + tests

* fix: glob pattern in push + tests

src/commands/push.ts

@@ -3,7 +3,6 @@ import type { BaseOptions } from '../options.js';
 import { extname, join } from 'path';
 import { readdir, readFile, stat } from 'fs/promises';
 import { Command, Option } from 'commander';
-import { glob } from 'glob';
 
 import {
   loading,
@@ -17,6 +16,7 @@ import { askString } from '../utils/ask.js';
 import { mapImportFormat } from '../utils/mapImportFormat.js';
 import { TolgeeClient, handleLoadableError } from '../client/TolgeeClient.js';
 import { BodyOf } from '../client/internal/schema.utils.js';
+import { windowsCompatibleGlob } from '../utils/windowsCompatibleGlob.js';
 
 type ImportRequest = BodyOf<
   '/v2/projects/{projectId}/single-step-import',
@@ -46,7 +46,7 @@ type PushOptions = BaseOptions & {
 
 async function allInPattern(pattern: string) {
   const files: File[] = [];
-  const items = await glob(pattern);
+  const items = await windowsCompatibleGlob(pattern);
   for (const item of items) {
     if ((await stat(item)).isDirectory()) {
       files.push(...(await readDirectory(item)));

src/config/tolgeerc.ts

@@ -60,6 +60,7 @@ function parseConfig(input: Schema, configDir: string): Schema {
     }));
   }
 
+  // convert relative paths in config to absolute
   if (rc.pull?.path !== undefined) {
     rc.pull.path = resolve(configDir, rc.pull.path);
   }

src/extractor/runner.ts

@@ -4,11 +4,11 @@ import type {
   ParserType,
   VerboseOption,
 } from './index.js';
-import { glob } from 'glob';
 import { extname } from 'path';
 
 import { callWorker } from './worker.js';
 import { exitWithError } from '../utils/logger.js';
+import { windowsCompatibleGlob } from '../utils/windowsCompatibleGlob.js';
 
 export const NullNamespace = Symbol('namespace.null');
 
@@ -94,9 +94,8 @@ export async function extractKeysOfFiles(opts: Opts) {
     exitWithError("Missing '--patterns' or 'config.patterns' option");
   }
 
-  const files = await glob(opts.patterns, {
+  const files = await windowsCompatibleGlob(opts.patterns, {
     nodir: true,
-    windowsPathsNoEscape: process.platform === 'win32',
   });
 
   if (files.length === 0) {

src/utils/windowsCompatibleGlob.ts

@@ -0,0 +1,11 @@
+import { glob, GlobOptionsWithFileTypesUnset } from 'glob';
+
+export const windowsCompatibleGlob = (
+  pattern: string | string[],
+  options?: GlobOptionsWithFileTypesUnset | undefined
+) => {
+  return glob(pattern, {
+    ...options,
+    windowsPathsNoEscape: process.platform === 'win32',
+  });
+};

test/__fixtures__/validTolgeeRc/i18n/en.json

@@ -0,0 +1,3 @@
+{
+  "test": "Test"
+}

test/__fixtures__/validTolgeeRc/src/App.tsx

@@ -0,0 +1,3 @@
+export function App() {
+  return null;
+}

test/unit/config.test.ts

@@ -2,6 +2,7 @@ import { fileURLToPath } from 'url';
 import { MockInstance, vi } from 'vitest';
 
 import loadTolgeeRc from '#cli/config/tolgeerc.js';
+import { windowsCompatibleGlob } from '#cli/utils/windowsCompatibleGlob.js';
 
 const FIXTURES_PATH = new URL('../__fixtures__/', import.meta.url);
 
@@ -73,13 +74,14 @@ describe('.tolgeerc', () => {
     const cfg = (await loadTolgeeRc(path))!;
 
     // make sure all paths in the config file are expanded relatively to the config location
-    [
+    for (const path of [
       cfg.extractor,
       ...cfg.patterns!,
       ...cfg.push!.files!.map((f) => f.path),
-    ].forEach((path) => {
-      expect(path).toMatch(/[/\\]validTolgeeRc[/\\]/);
-    });
+    ]) {
+      expect(path).toMatch(/[^/\\][/\\]validTolgeeRc[/\\][^/\\]/);
+      expect(await windowsCompatibleGlob(path!)).length.above(0);
+    }
   });
 
   it('converts projectId to number', async () => {