Skip to content

Commit

Permalink
feat(config): support async syncpack.config.mjs
Browse files Browse the repository at this point in the history
Closes #164
  • Loading branch information
JamieMason committed Dec 29, 2023
1 parent 58f8bcb commit 7216ded
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/io/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cosmiconfigSync } from 'cosmiconfig';
import { cosmiconfig } from 'cosmiconfig';
import { Context } from 'effect';
import { prompt } from 'enquirer';
import * as fs from 'fs';
Expand All @@ -7,7 +7,7 @@ import * as readYamlFile from 'read-yaml-file';

export interface Io {
cosmiconfig: {
cosmiconfigSync: typeof cosmiconfigSync;
cosmiconfig: typeof cosmiconfig;
};
enquirer: {
prompt: typeof prompt<any>;
Expand All @@ -29,7 +29,7 @@ export const IoTag = Context.Tag<Io>();

export const io: Io = {
cosmiconfig: {
cosmiconfigSync,
cosmiconfig,
},
enquirer: {
prompt,
Expand Down
4 changes: 2 additions & 2 deletions src/io/read-config-file-sync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export function readConfigFileSync(
configPath?: string,
): Effect.Effect<never, never, UnverifiedRcConfig> {
return pipe(
Effect.try(() => io.cosmiconfig.cosmiconfigSync('syncpack')),
Effect.try(() => io.cosmiconfig.cosmiconfig('syncpack')),
Effect.flatMap((client) =>
Effect.try(() => (configPath ? client.load(configPath) : client.search())),
Effect.tryPromise(() => (configPath ? client.load(configPath) : client.search())),
),
Effect.flatMap((result) =>
result !== null ? getValueFromCosmiconfig(result) : findConfigInPackageJson(io),
Expand Down
6 changes: 3 additions & 3 deletions test/lib/create-scenario.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@ const mock = {
const cwd = '/fake/dir';
return {
cosmiconfig: {
cosmiconfigSync() {
cosmiconfig() {
return {
load(configPath: string) {
async load(configPath: string) {
const config = filesByName[configPath];
const filepath = `/fake/dir/${configPath}`;
return config ? { config, filepath } : null;
},
search() {
async search() {
const config = filesByName['.syncpackrc'];
const filepath = '/fake/dir/.syncpackrc';
return config ? { config, filepath } : null;
Expand Down

0 comments on commit 7216ded

Please sign in to comment.