Skip to content

Commit

Permalink
fix: exports types from standard-log
Browse files Browse the repository at this point in the history
  • Loading branch information
unional committed Jun 13, 2023
1 parent 79095ef commit 3d0784c
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 26 deletions.
7 changes: 7 additions & 0 deletions .changeset/rich-peas-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'mocktomata': patch
'@mocktomata/framework': patch
---

Re-exports needed types and code from `standard-log`.
This should fix the "Inferred type cannot be named" issue.
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { a } from 'assertron'
import { createStandardLogForTest, logLevels } from 'standard-log'
import { createStandardLogForTest } from 'standard-log'
import { createIncubator } from '../incubator/create_incubator.js'
import {
createKomondor,
createMockto,
createZucchini,
Spec
logLevels,
type Spec
} from '../index.js'
import { createTestContext, newMemoryIO } from '../testing/index.js'
import { CannotConfigAfterUsed, ConfigPropertyInvalid, createConfigurator, loadConfig } from './index.js'
Expand Down
4 changes: 2 additions & 2 deletions packages/framework/ts/config/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { LogMethodNames } from 'standard-log'
import type { Log } from '../log/types.js'
import type { SpecPlugin } from '../spec_plugin/types.js'
import type { Spec } from '../spec/types.js'
import type { SpecPlugin } from '../spec_plugin/types.js'
import type { LogMethodNames } from '../standard_log.types.js'

export type Config = Spec.Config & SpecPlugin.Config & Log.Config
export namespace Config {
Expand Down
3 changes: 1 addition & 2 deletions packages/framework/ts/incubator/incubator.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import a, { AssertOrder } from 'assertron'
import { some } from 'satisfier'
import { logLevels, MemoryLogReporter } from 'standard-log'
import { SpecNotFound, type Spec } from '../index.js'
import { SpecNotFound, logLevels, type MemoryLogReporter, type Spec } from '../index.js'
import { createTestContext } from '../testing/index.js'
import { createIncubator } from './create_incubator.js'
import { incubator } from './index.js'
Expand Down
1 change: 1 addition & 0 deletions packages/framework/ts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ export * from './spec_plugin/index.js'
export * from './spec_record/index.js'
export * from './stack_frame.js'
export * from './stack_frame.types.js'
export * from './standard_log.types.js'
export type { Mocktomata } from './types.js'
export * from './zucchini/index.js'
3 changes: 1 addition & 2 deletions packages/framework/ts/komondor/komondor.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { a } from 'assertron'
import { filename } from 'dirname-filename-esm'
import { some } from 'satisfier'
import { logLevels } from 'standard-log'
import { createKomondor } from '../index.js'
import { createKomondor, logLevels } from '../index.js'
import { createTestContext } from '../testing/index.js'
import { indirectKomondor } from './komondor.test-setup.js'

Expand Down
3 changes: 2 additions & 1 deletion packages/framework/ts/komondor/komondor.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { AsyncContext } from 'async-fp'
import { createMemoryLogReporter, type MemoryLogReporter } from 'standard-log'
import { createMemoryLogReporter } from 'standard-log'
import { loadConfig } from '../config/index.js'
import type { LoadedContext } from '../context.internal.js'
import { createLogContext } from '../log/log_context.js'
import { createSpecObject, getEffectiveSpecModeContext, type Spec } from '../spec/index.js'
import { loadPlugins } from '../spec_plugin/index.js'
import type { StackFrameContext } from '../stack_frame.types.js'
import { type MemoryLogReporter } from '../standard_log.types.js'
import { initTimeTrackers } from '../time_trackter/index.js'
import type { Mocktomata } from '../types.js'

Expand Down
3 changes: 2 additions & 1 deletion packages/framework/ts/log/log_context.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createStandardLog, logLevels, MemoryLogReporter } from 'standard-log'
import { createStandardLog } from 'standard-log'
import { createColorLogReporter } from 'standard-log-color'
import type { Spec } from '../spec/types.js'
import { logLevels, type MemoryLogReporter } from '../standard_log.types.js'
import type { Log } from './types.js'

export function createLogContext({
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/ts/log/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Logger, LogLevel } from 'standard-log'
import type { Logger, LogLevel } from '../standard_log.types.js'

export namespace Log {
export type Context = { log: Logger; logLevel?: LogLevel }
Expand Down
4 changes: 2 additions & 2 deletions packages/framework/ts/spec/logs.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { logLevels } from 'standard-log'
import esp from 'error-stack-parser'
import { tersify } from 'tersify'
import type { Log } from '../log/types.js'
import type { SpecRecord } from '../spec_record/types.js'
import { StackFrameContext } from '../stack_frame.types.js'
import { logLevels } from '../standard_log.types.js'
import { prettifyAction } from './action.format.js'
import { maskString } from './masking.js'
import type { MaskCriterion, Recorder } from './types.internal.js'
import esp from 'error-stack-parser'

export function logCreateSpy(
{ log, maskCriteria }: Log.Context & { maskCriteria: MaskCriterion[] },
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/ts/spec/masking.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { logLevels } from 'standard-log'
import { incubator } from '../incubator/index.js'
import { logLevels } from '../standard_log.types.js'
import { createTestAxios } from '../test_artifacts/test_subjects.js'

afterAll(incubator.cleanup)
Expand Down
8 changes: 4 additions & 4 deletions packages/framework/ts/spec/simulator.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { AsyncContext } from 'async-fp'
import type { Logger } from 'standard-log'
import { notDefined } from '../constants.js'
import { findPlugin, getPlugin } from '../spec_plugin/index.js'
import type { SpecPlugin } from '../spec_plugin/types.js'
import { getDefaultPerformer, type SpecRecord } from '../spec_record/index.js'
import type { StackFrameContext } from '../stack_frame.types.js'
import { createTimeTracker, TimeTracker } from '../time_trackter/index.js'
import type { Logger } from '../standard_log.types.js'
import { TimeTracker, createTimeTracker } from '../time_trackter/index.js'
import {
getArgumentContext,
getPropertyContext,
Expand All @@ -27,9 +27,9 @@ import {
logMissingResultAction,
logRecordingTimeout
} from './logs.js'
import { createSpecRecordValidator, SpecRecordValidator, ValidateReference } from './record.js'
import { SpecRecordValidator, ValidateReference, createSpecRecordValidator } from './record.js'
import { createPluginSpyContext } from './recorder.js'
import type { createSpec, MaskCriterion, Recorder, SpecRecordLive } from './types.internal.js'
import type { MaskCriterion, Recorder, SpecRecordLive, createSpec } from './types.internal.js'
import type { Spec } from './types.js'
import { referenceMismatch } from './validations.js'

Expand Down
2 changes: 1 addition & 1 deletion packages/framework/ts/spec/types.internal.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Logger } from 'standard-log'
import type { Logger } from '../standard_log.types.js'
import type { SpecPlugin } from '../spec_plugin/types.js'
import type { SpecRecord } from '../spec_record/types.js'
import type { StackFrameContext } from '../stack_frame.types.js'
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/ts/spec_plugin/plugin.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Logger } from 'standard-log'
import { es2015 } from '../es2015.js'
import { es2020 } from '../es2020.js'
import { Log } from '../log/types.js'
import type { Logger } from '../standard_log.types.js'
import { PluginModuleNotConforming, PluginNotFound } from './errors.js'
import { addPluginModule } from './plugin_module.js'
import type { SpecPlugin } from './types.js'
Expand Down
2 changes: 2 additions & 0 deletions packages/framework/ts/standard_log.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { logLevels } from 'standard-log'
export type { Logger, LogLevel, LogMethodNames, MemoryLogReporter } from 'standard-log'
5 changes: 3 additions & 2 deletions packages/framework/ts/testing/test_context.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { AsyncContext } from 'async-fp'
import { createMemoryLogReporter, createStandardLog, logLevels } from 'standard-log'
import { createMemoryLogReporter, createStandardLog } from 'standard-log'
import { createColorLogReporter } from 'standard-log-color'
import { requiredDeep } from 'type-plus'
import { createConfigurator, resolveLogLevel } from '../config/index.js'
import { createStackFrameContext } from '../stack_frame.js'
import { newMemoryIO } from '../memory_io.js'
import { createStackFrameContext } from '../stack_frame.js'
import { logLevels } from '../standard_log.types.js'

export namespace createTestContext {
export type Options = newMemoryIO.Options
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/ts/time_trackter/time_tracker.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Logger } from 'standard-log'
import type { Spec } from '../spec/types.js'
import type { Logger } from '../standard_log.types.js'

export type TimeTracker = ReturnType<typeof createTimeTracker>
export type TimeTrackersContext = {
Expand Down
7 changes: 4 additions & 3 deletions packages/framework/ts/zucchini/zucchini.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import { ExpressionFactory, ParameterType, ParameterTypeRegistry } from '@cucumber/cucumber-expressions'
import type { AsyncContext } from 'async-fp'
import { createMemoryLogReporter, MemoryLogReporter } from 'standard-log'
import { createMemoryLogReporter } from 'standard-log'
import { loadConfig } from '../config/index.js'
import type { LoadedContext } from '../context.internal.js'
import { createLogContext } from '../log/log_context.js'
import { createSpecFns, getEffectiveSpecModeContext } from '../spec/index.js'
import type { Spec } from '../spec/types.js'
import { loadPlugins } from '../spec_plugin/index.js'
import type { SpecRecord } from '../spec_record/index.js'
import { StackFrameContext } from '../stack_frame.types.js'
import type { StackFrameContext } from '../stack_frame.types.js'
import type { MemoryLogReporter } from '../standard_log.types.js'
import { initTimeTrackers } from '../time_trackter/time_tracker.js'
import type { Mocktomata } from '../types.js'
import { DuplicateStep, MissingStep } from './errors.js'
import { createStore, Step, Store } from './store.js'
import { Step, Store, createStore } from './store.js'

export namespace Zucchini {
export type StepCaller<T = any> = (clause: string, ...inputs: any[]) => Promise<T>
Expand Down
5 changes: 5 additions & 0 deletions packages/mocktomata/ts/framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ export {
PluginsNotLoaded,
SpecIDCannotBeEmpty,
SpecNotFound,
logLevels,
type Komondor,
type LogLevel,
type LogMethodNames,
type Logger,
type MemoryLogReporter,
type MismatchActionModel,
type Mocktomata,
type Spec,
Expand Down

0 comments on commit 3d0784c

Please sign in to comment.