@livestore/utils-dev 0.3.2-dev.11 → 0.3.2-dev.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo.json +1 -1
- package/dist/node/mod.d.ts +15 -2
- package/dist/node/mod.d.ts.map +1 -1
- package/dist/node/mod.js +36 -6
- package/dist/node/mod.js.map +1 -1
- package/dist/node-vitest/Vitest.d.ts +18 -0
- package/dist/node-vitest/Vitest.d.ts.map +1 -0
- package/dist/node-vitest/Vitest.js +21 -0
- package/dist/node-vitest/Vitest.js.map +1 -0
- package/dist/node-vitest/global.d.ts +2 -0
- package/dist/node-vitest/global.d.ts.map +1 -0
- package/dist/node-vitest/global.js +3 -0
- package/dist/node-vitest/global.js.map +1 -0
- package/dist/node-vitest/mod.d.ts +2 -1
- package/dist/node-vitest/mod.d.ts.map +1 -1
- package/dist/node-vitest/mod.js +2 -1
- package/dist/node-vitest/mod.js.map +1 -1
- package/package.json +8 -6
- package/src/node/mod.ts +75 -28
- package/src/node-vitest/Vitest.ts +62 -0
- package/src/node-vitest/mod.ts +3 -1
- /package/src/node-vitest/{polyfill.ts → global.ts} +0 -0
package/dist/node/mod.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CommandExecutor, PlatformError, Tracer } from '@livestore/utils/effect';
|
|
2
|
-
import { Effect, Layer, OtelTracer } from '@livestore/utils/effect';
|
|
2
|
+
import { Effect, Layer, OtelTracer, Schema } from '@livestore/utils/effect';
|
|
3
3
|
import * as otel from '@opentelemetry/api';
|
|
4
4
|
export { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
5
5
|
export { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
@@ -16,13 +16,26 @@ export declare const logTraceUiUrlForSpan: (printMsg?: (url: string) => string)
|
|
|
16
16
|
export declare const getTracingBackendUrl: (span: otel.Span) => Effect.Effect<string | undefined, never, never>;
|
|
17
17
|
export declare const cmd: (commandInput: string | (string | undefined)[], options?: {
|
|
18
18
|
cwd?: string;
|
|
19
|
+
stderr?: 'inherit' | 'pipe';
|
|
20
|
+
stdout?: 'inherit' | 'pipe';
|
|
19
21
|
shell?: boolean;
|
|
20
22
|
env?: Record<string, string | undefined>;
|
|
21
|
-
} | undefined) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError, CommandExecutor.CommandExecutor>;
|
|
23
|
+
} | undefined) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError | CmdError, CommandExecutor.CommandExecutor>;
|
|
22
24
|
export declare const cmdText: (commandInput: string | (string | undefined)[], options?: {
|
|
23
25
|
cwd?: string;
|
|
24
26
|
stderr?: 'inherit' | 'pipe';
|
|
25
27
|
runInShell?: boolean;
|
|
26
28
|
env?: Record<string, string | undefined>;
|
|
27
29
|
}) => Effect.Effect<string, PlatformError.PlatformError, CommandExecutor.CommandExecutor>;
|
|
30
|
+
declare const CmdError_base: Schema.TaggedErrorClass<CmdError, "CmdError", {
|
|
31
|
+
readonly _tag: Schema.tag<"CmdError">;
|
|
32
|
+
} & {
|
|
33
|
+
command: typeof Schema.String;
|
|
34
|
+
args: Schema.Array$<typeof Schema.String>;
|
|
35
|
+
cwd: typeof Schema.String;
|
|
36
|
+
env: Schema.Record$<typeof Schema.String, Schema.UndefinedOr<typeof Schema.String>>;
|
|
37
|
+
stderr: Schema.Literal<["inherit", "pipe"]>;
|
|
38
|
+
}>;
|
|
39
|
+
export declare class CmdError extends CmdError_base {
|
|
40
|
+
}
|
|
28
41
|
//# sourceMappingURL=mod.d.ts.map
|
package/dist/node/mod.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrF,OAAO,
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrF,OAAO,EAGL,MAAM,EAGN,KAAK,EAEL,UAAU,EACV,MAAM,EACP,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAM1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAE3E,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAI,iGAO1B;IACD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5C,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CACxB,KAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CA0FxC,CAAA;AAEpC,eAAO,MAAM,oBAAoB,GAAI,WAAW,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,MAAM,MAAM,IAAI,CAAC,IAAI,oDAazF,CAAA;AAEH,eAAO,MAAM,oBAAoB,GAAI,MAAM,IAAI,CAAC,IAAI,oDAqBhD,CAAA;AAEJ,eAAO,MAAM,GAAG,EAAE,CAChB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EACJ;IACE,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC,GACD,SAAS,KACV,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,GAAG,QAAQ,EAAE,eAAe,CAAC,eAAe,CAwChH,CAAA;AAEJ,eAAO,MAAM,OAAO,EAAE,CACpB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IACR,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC,KACE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,EAAE,eAAe,CAAC,eAAe,CAwBtF,CAAA;;;;;;;;;;AAED,qBAAa,QAAS,SAAQ,aAM5B;CAAG"}
|
package/dist/node/mod.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { performance } from 'node:perf_hooks';
|
|
2
2
|
import * as OtelNodeSdk from '@effect/opentelemetry/NodeSdk';
|
|
3
3
|
import { IS_BUN, isNonEmptyString, isNotUndefined, shouldNeverHappen } from '@livestore/utils';
|
|
4
|
-
import { Command, Config, Effect, identity, Layer, OtelTracer } from '@livestore/utils/effect';
|
|
4
|
+
import { Command, Config, Effect, FiberRef, identity, Layer, LogLevel, OtelTracer, Schema, } from '@livestore/utils/effect';
|
|
5
5
|
import { OtelLiveDummy } from '@livestore/utils/node';
|
|
6
6
|
import * as otel from '@opentelemetry/api';
|
|
7
7
|
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
@@ -35,7 +35,18 @@ export const OtelLiveHttp = ({ serviceName, rootSpanName, rootSpanAttributes, pa
|
|
|
35
35
|
resource,
|
|
36
36
|
metricReader,
|
|
37
37
|
spanProcessor: new BatchSpanProcessor(new OTLPTraceExporter({ url: `${config.exporterUrl}/v1/traces`, headers: {} }), { scheduledDelayMillis: 50 }),
|
|
38
|
-
}))
|
|
38
|
+
})).pipe(
|
|
39
|
+
// If an OpenTelemetry backend is not available, the `OtelNodeSdk` layer
|
|
40
|
+
// will ignore the error when attempting to connect and emit a debug log
|
|
41
|
+
// stating the reason for the error (in this case `ECONNREFUSED`). This
|
|
42
|
+
// can cause problems for programs which rely on clean `stdout` (e.g.
|
|
43
|
+
// command-line applications). To remedy this, the below code sets the
|
|
44
|
+
// minimum log level `FiberRef` to `"None"` for the duration of the
|
|
45
|
+
// `OtelNodeSdk`'s layer constructor.
|
|
46
|
+
//
|
|
47
|
+
// This can likely be removed when Livestore is migrated to the Effect
|
|
48
|
+
// native Otlp exporters.
|
|
49
|
+
Layer.locally(FiberRef.currentMinimumLogLevel, LogLevel.None));
|
|
39
50
|
const RootSpanLive = Layer.span(config.rootSpanName, {
|
|
40
51
|
attributes: { config, ...rootSpanAttributes },
|
|
41
52
|
onEnd: skipLogUrl ? undefined : (span) => logTraceUiUrlForSpan()(span.span),
|
|
@@ -100,7 +111,9 @@ export const getTracingBackendUrl = (span) => Effect.gen(function* () {
|
|
|
100
111
|
});
|
|
101
112
|
export const cmd = Effect.fn('cmd')(function* (commandInput, options) {
|
|
102
113
|
const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set');
|
|
103
|
-
const [command, ...args] = Array.isArray(commandInput)
|
|
114
|
+
const [command, ...args] = Array.isArray(commandInput)
|
|
115
|
+
? commandInput.filter(isNotUndefined)
|
|
116
|
+
: commandInput.split(' ');
|
|
104
117
|
const debugEnvStr = Object.entries(options?.env ?? {})
|
|
105
118
|
.map(([key, value]) => `${key}='${value}' `)
|
|
106
119
|
.join('');
|
|
@@ -110,9 +123,18 @@ export const cmd = Effect.fn('cmd')(function* (commandInput, options) {
|
|
|
110
123
|
return yield* Command.make(command, ...args).pipe(
|
|
111
124
|
// TODO don't forward abort signal to the command
|
|
112
125
|
Command.stdin('inherit'), // Forward stdin to the command
|
|
113
|
-
|
|
114
|
-
Command.
|
|
115
|
-
|
|
126
|
+
// inherit = Stream stdout to process.stdout, pipe = Stream stdout to process.stderr
|
|
127
|
+
Command.stdout(options?.stdout ?? 'inherit'),
|
|
128
|
+
// inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
|
|
129
|
+
Command.stderr(options?.stderr ?? 'inherit'), Command.workingDirectory(cwd), options?.shell ? Command.runInShell(true) : identity, Command.env(options?.env ?? {}), Command.exitCode, Effect.tap((exitCode) => exitCode === 0
|
|
130
|
+
? Effect.void
|
|
131
|
+
: Effect.fail(CmdError.make({
|
|
132
|
+
command: command,
|
|
133
|
+
args,
|
|
134
|
+
cwd,
|
|
135
|
+
env: options?.env ?? {},
|
|
136
|
+
stderr: options?.stderr ?? 'inherit',
|
|
137
|
+
}))));
|
|
116
138
|
});
|
|
117
139
|
export const cmdText = Effect.fn('cmdText')(function* (commandInput, options) {
|
|
118
140
|
const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set');
|
|
@@ -129,4 +151,12 @@ export const cmdText = Effect.fn('cmdText')(function* (commandInput, options) {
|
|
|
129
151
|
// inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
|
|
130
152
|
Command.stderr(options?.stderr ?? 'inherit'), Command.workingDirectory(cwd), options?.runInShell ? Command.runInShell(true) : identity, Command.env(options?.env ?? {}), Command.string);
|
|
131
153
|
});
|
|
154
|
+
export class CmdError extends Schema.TaggedError()('CmdError', {
|
|
155
|
+
command: Schema.String,
|
|
156
|
+
args: Schema.Array(Schema.String),
|
|
157
|
+
cwd: Schema.String,
|
|
158
|
+
env: Schema.Record({ key: Schema.String, value: Schema.String.pipe(Schema.UndefinedOr) }),
|
|
159
|
+
stderr: Schema.Literal('inherit', 'pipe'),
|
|
160
|
+
}) {
|
|
161
|
+
}
|
|
132
162
|
//# sourceMappingURL=mod.js.map
|
package/dist/node/mod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAE9F,OAAO,
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type * as Vitest from '@effect/vitest';
|
|
2
|
+
import { type Cause, Duration, Effect, Layer, type OtelTracer, type Scope } from '@livestore/utils/effect';
|
|
3
|
+
export * from '@effect/vitest';
|
|
4
|
+
export declare const DEBUGGER_ACTIVE: boolean;
|
|
5
|
+
export declare const makeWithTestCtx: <R1 = never, E1 = never>(ctxParams: WithTestCtxParams<R1, E1>) => (testContext: Vitest.TestContext) => <A, E>(self: Effect.Effect<A, E, Scope.Scope | OtelTracer.OtelTracer | R1>) => Effect.Effect<A, Cause.TimeoutException | E1 | E, Scope.Scope>;
|
|
6
|
+
export type WithTestCtxParams<R1 = never, E1 = never> = {
|
|
7
|
+
suffix?: string;
|
|
8
|
+
makeLayer?: (testContext: Vitest.TestContext) => Layer.Layer<R1, E1, Scope.Scope>;
|
|
9
|
+
timeout?: Duration.DurationInput;
|
|
10
|
+
forceOtel?: boolean;
|
|
11
|
+
};
|
|
12
|
+
export declare const withTestCtx: <R1 = never, E1 = never>(testContext: Vitest.TestContext, { suffix, makeLayer, timeout, forceOtel, }?: {
|
|
13
|
+
suffix?: string;
|
|
14
|
+
makeLayer?: (testContext: Vitest.TestContext) => Layer.Layer<R1, E1, Scope.Scope>;
|
|
15
|
+
timeout?: Duration.DurationInput;
|
|
16
|
+
forceOtel?: boolean;
|
|
17
|
+
}) => <A, E>(self: Effect.Effect<A, E, Scope.Scope | OtelTracer.OtelTracer | R1>) => Effect.Effect<A, E | Cause.TimeoutException | E1, Scope.Scope>;
|
|
18
|
+
//# sourceMappingURL=Vitest.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Vitest.d.ts","sourceRoot":"","sources":["../../src/node-vitest/Vitest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,KAAK,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAY,KAAK,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAIpH,cAAc,gBAAgB,CAAA;AAE9B,eAAO,MAAM,eAAe,SAAwE,CAAA;AAEpG,eAAO,MAAM,eAAe,GACzB,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,WAAW,iBAAiB,CAAC,EAAE,EAAE,EAAE,CAAC,MAC5D,aAAa,MAAM,CAAC,WAAW,MAyB/B,CAAC,EAAE,CAAC,wIAxBgC,CAAA;AAEvC,MAAM,MAAM,iBAAiB,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,IAAI;IACtD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACjF,OAAO,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;IAChC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,WAAW,GACrB,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,EACrB,aAAa,MAAM,CAAC,WAAW,EAC/B,6CAKG;IACD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACjF,OAAO,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;IAChC,SAAS,CAAC,EAAE,OAAO,CAAA;CACf,MAEP,CAAC,EAAE,CAAC,EACH,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,GAAG,EAAE,CAAC,KAClE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,gBAAgB,GAAG,EAAE,EAAE,KAAK,CAAC,KAAK,CAqB/D,CAAA"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import * as inspector from 'node:inspector';
|
|
2
|
+
import { IS_CI } from '@livestore/utils';
|
|
3
|
+
import { Duration, Effect, identity, Layer } from '@livestore/utils/effect';
|
|
4
|
+
import { OtelLiveDummy } from '@livestore/utils/node';
|
|
5
|
+
import { OtelLiveHttp } from "../node/mod.js";
|
|
6
|
+
export * from '@effect/vitest';
|
|
7
|
+
export const DEBUGGER_ACTIVE = Boolean(process.env.DEBUGGER_ACTIVE ?? inspector.url() !== undefined);
|
|
8
|
+
export const makeWithTestCtx = (ctxParams) => (testContext) => withTestCtx(testContext, ctxParams);
|
|
9
|
+
export const withTestCtx = (testContext, { suffix, makeLayer, timeout = IS_CI ? 60_000 : 10_000, forceOtel = false, } = {}) => (self) => {
|
|
10
|
+
const spanName = `${testContext.task.suite?.name}:${testContext.task.name}${suffix ? `:${suffix}` : ''}`;
|
|
11
|
+
const layer = makeLayer?.(testContext);
|
|
12
|
+
const otelLayer = DEBUGGER_ACTIVE || forceOtel ? OtelLiveHttp({ serviceName: 'vitest-runner', skipLogUrl: false }) : OtelLiveDummy;
|
|
13
|
+
return self.pipe(DEBUGGER_ACTIVE
|
|
14
|
+
? identity
|
|
15
|
+
: Effect.logWarnIfTakesLongerThan({
|
|
16
|
+
duration: Duration.toMillis(timeout) * 0.8,
|
|
17
|
+
label: `${spanName} approaching timeout (timeout: ${Duration.format(timeout)})`,
|
|
18
|
+
}), DEBUGGER_ACTIVE ? identity : Effect.timeout(timeout), Effect.provide(otelLayer), Effect.provide(layer ?? Layer.empty), Effect.scoped, // We need to scope the effect manually here because otherwise the span is not closed
|
|
19
|
+
Effect.withSpan(spanName), Effect.annotateLogs({ suffix }));
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=Vitest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Vitest.js","sourceRoot":"","sources":["../../src/node-vitest/Vitest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAA+B,MAAM,yBAAyB,CAAA;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,cAAc,gBAAgB,CAAA;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,SAAS,CAAC,CAAA;AAEpG,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAyB,SAAoC,EAAE,EAAE,CACjE,CAAC,WAA+B,EAAE,EAAE,CAClC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AASvC,MAAM,CAAC,MAAM,WAAW,GACtB,CACE,WAA+B,EAC/B,EACE,MAAM,EACN,SAAS,EACT,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EACjC,SAAS,GAAG,KAAK,MAMf,EAAE,EACN,EAAE,CACJ,CACE,IAAmE,EACH,EAAE;IAClE,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACxG,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,WAAW,CAAC,CAAA;IAEtC,MAAM,SAAS,GACb,eAAe,IAAI,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;IAElH,OAAO,IAAI,CAAC,IAAI,CACd,eAAe;QACb,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC9B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG;YAC1C,KAAK,EAAE,GAAG,QAAQ,kCAAkC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG;SAChF,CAAC,EACN,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACpD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EACzB,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,EACpC,MAAM,CAAC,MAAM,EAAE,qFAAqF;IACpG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACzB,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CACzB,CAAA;AACV,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/node-vitest/global.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global.js","sourceRoot":"","sources":["../../src/node-vitest/global.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node-vitest/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node-vitest/mod.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA"}
|
package/dist/node-vitest/mod.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node-vitest/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node-vitest/mod.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/utils-dev",
|
|
3
|
-
"version": "0.3.2-dev.
|
|
3
|
+
"version": "0.3.2-dev.13",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
6
|
-
"./
|
|
6
|
+
"./src/node-vitest/polyfill.ts"
|
|
7
7
|
],
|
|
8
8
|
"exports": {
|
|
9
9
|
"./node": "./dist/node/mod.js",
|
|
10
|
-
"./node-vitest": "./dist/node-vitest/mod.js"
|
|
11
|
-
"./node-vitest-polyfill": "./dist/node-vitest/polyfill.js"
|
|
10
|
+
"./node-vitest": "./dist/node-vitest/mod.js"
|
|
12
11
|
},
|
|
13
12
|
"dependencies": {
|
|
14
13
|
"@effect/opentelemetry": "0.56.0",
|
|
@@ -19,7 +18,7 @@
|
|
|
19
18
|
"@opentelemetry/sdk-metrics": "2.0.1",
|
|
20
19
|
"@opentelemetry/sdk-trace-base": "2.0.1",
|
|
21
20
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
22
|
-
"@livestore/utils": "0.3.2-dev.
|
|
21
|
+
"@livestore/utils": "0.3.2-dev.13"
|
|
23
22
|
},
|
|
24
23
|
"devDependencies": {},
|
|
25
24
|
"files": [
|
|
@@ -30,7 +29,10 @@
|
|
|
30
29
|
"license": "Apache-2.0",
|
|
31
30
|
"peerDependencies": {},
|
|
32
31
|
"publishConfig": {
|
|
33
|
-
"access": "public"
|
|
32
|
+
"access": "public",
|
|
33
|
+
"sideEffects": [
|
|
34
|
+
"./dist/node-vitest/polyfill.js"
|
|
35
|
+
]
|
|
34
36
|
},
|
|
35
37
|
"scripts": {
|
|
36
38
|
"test": "echo 'No tests for utils-dev'"
|
package/src/node/mod.ts
CHANGED
|
@@ -3,7 +3,17 @@ import { performance } from 'node:perf_hooks'
|
|
|
3
3
|
import * as OtelNodeSdk from '@effect/opentelemetry/NodeSdk'
|
|
4
4
|
import { IS_BUN, isNonEmptyString, isNotUndefined, shouldNeverHappen } from '@livestore/utils'
|
|
5
5
|
import type { CommandExecutor, PlatformError, Tracer } from '@livestore/utils/effect'
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
Command,
|
|
8
|
+
Config,
|
|
9
|
+
Effect,
|
|
10
|
+
FiberRef,
|
|
11
|
+
identity,
|
|
12
|
+
Layer,
|
|
13
|
+
LogLevel,
|
|
14
|
+
OtelTracer,
|
|
15
|
+
Schema,
|
|
16
|
+
} from '@livestore/utils/effect'
|
|
7
17
|
import { OtelLiveDummy } from '@livestore/utils/node'
|
|
8
18
|
import * as otel from '@opentelemetry/api'
|
|
9
19
|
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'
|
|
@@ -65,7 +75,19 @@ export const OtelLiveHttp = ({
|
|
|
65
75
|
new OTLPTraceExporter({ url: `${config.exporterUrl}/v1/traces`, headers: {} }),
|
|
66
76
|
{ scheduledDelayMillis: 50 },
|
|
67
77
|
),
|
|
68
|
-
}))
|
|
78
|
+
})).pipe(
|
|
79
|
+
// If an OpenTelemetry backend is not available, the `OtelNodeSdk` layer
|
|
80
|
+
// will ignore the error when attempting to connect and emit a debug log
|
|
81
|
+
// stating the reason for the error (in this case `ECONNREFUSED`). This
|
|
82
|
+
// can cause problems for programs which rely on clean `stdout` (e.g.
|
|
83
|
+
// command-line applications). To remedy this, the below code sets the
|
|
84
|
+
// minimum log level `FiberRef` to `"None"` for the duration of the
|
|
85
|
+
// `OtelNodeSdk`'s layer constructor.
|
|
86
|
+
//
|
|
87
|
+
// This can likely be removed when Livestore is migrated to the Effect
|
|
88
|
+
// native Otlp exporters.
|
|
89
|
+
Layer.locally(FiberRef.currentMinimumLogLevel, LogLevel.None),
|
|
90
|
+
)
|
|
69
91
|
|
|
70
92
|
const RootSpanLive = Layer.span(config.rootSpanName, {
|
|
71
93
|
attributes: { config, ...rootSpanAttributes },
|
|
@@ -153,36 +175,53 @@ export const cmd: (
|
|
|
153
175
|
options?:
|
|
154
176
|
| {
|
|
155
177
|
cwd?: string
|
|
178
|
+
stderr?: 'inherit' | 'pipe'
|
|
179
|
+
stdout?: 'inherit' | 'pipe'
|
|
156
180
|
shell?: boolean
|
|
157
181
|
env?: Record<string, string | undefined>
|
|
158
182
|
}
|
|
159
183
|
| undefined,
|
|
160
|
-
) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError, CommandExecutor.CommandExecutor> =
|
|
161
|
-
'cmd',
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
.
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
184
|
+
) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError | CmdError, CommandExecutor.CommandExecutor> =
|
|
185
|
+
Effect.fn('cmd')(function* (commandInput, options) {
|
|
186
|
+
const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set')
|
|
187
|
+
const [command, ...args] = Array.isArray(commandInput)
|
|
188
|
+
? commandInput.filter(isNotUndefined)
|
|
189
|
+
: commandInput.split(' ')
|
|
190
|
+
|
|
191
|
+
const debugEnvStr = Object.entries(options?.env ?? {})
|
|
192
|
+
.map(([key, value]) => `${key}='${value}' `)
|
|
193
|
+
.join('')
|
|
194
|
+
const commandDebugStr = debugEnvStr + [command, ...args].join(' ')
|
|
195
|
+
|
|
196
|
+
yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'`)
|
|
197
|
+
yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, cwd, command, args })
|
|
198
|
+
|
|
199
|
+
return yield* Command.make(command!, ...args).pipe(
|
|
200
|
+
// TODO don't forward abort signal to the command
|
|
201
|
+
Command.stdin('inherit'), // Forward stdin to the command
|
|
202
|
+
// inherit = Stream stdout to process.stdout, pipe = Stream stdout to process.stderr
|
|
203
|
+
Command.stdout(options?.stdout ?? 'inherit'),
|
|
204
|
+
// inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
|
|
205
|
+
Command.stderr(options?.stderr ?? 'inherit'),
|
|
206
|
+
Command.workingDirectory(cwd),
|
|
207
|
+
options?.shell ? Command.runInShell(true) : identity,
|
|
208
|
+
Command.env(options?.env ?? {}),
|
|
209
|
+
Command.exitCode,
|
|
210
|
+
Effect.tap((exitCode) =>
|
|
211
|
+
exitCode === 0
|
|
212
|
+
? Effect.void
|
|
213
|
+
: Effect.fail(
|
|
214
|
+
CmdError.make({
|
|
215
|
+
command: command!,
|
|
216
|
+
args,
|
|
217
|
+
cwd,
|
|
218
|
+
env: options?.env ?? {},
|
|
219
|
+
stderr: options?.stderr ?? 'inherit',
|
|
220
|
+
}),
|
|
221
|
+
),
|
|
222
|
+
),
|
|
223
|
+
)
|
|
224
|
+
})
|
|
186
225
|
|
|
187
226
|
export const cmdText: (
|
|
188
227
|
commandInput: string | (string | undefined)[],
|
|
@@ -217,3 +256,11 @@ export const cmdText: (
|
|
|
217
256
|
)
|
|
218
257
|
},
|
|
219
258
|
)
|
|
259
|
+
|
|
260
|
+
export class CmdError extends Schema.TaggedError<CmdError>()('CmdError', {
|
|
261
|
+
command: Schema.String,
|
|
262
|
+
args: Schema.Array(Schema.String),
|
|
263
|
+
cwd: Schema.String,
|
|
264
|
+
env: Schema.Record({ key: Schema.String, value: Schema.String.pipe(Schema.UndefinedOr) }),
|
|
265
|
+
stderr: Schema.Literal('inherit', 'pipe'),
|
|
266
|
+
}) {}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import * as inspector from 'node:inspector'
|
|
2
|
+
import type * as Vitest from '@effect/vitest'
|
|
3
|
+
import { IS_CI } from '@livestore/utils'
|
|
4
|
+
import { type Cause, Duration, Effect, identity, Layer, type OtelTracer, type Scope } from '@livestore/utils/effect'
|
|
5
|
+
import { OtelLiveDummy } from '@livestore/utils/node'
|
|
6
|
+
import { OtelLiveHttp } from '../node/mod.ts'
|
|
7
|
+
|
|
8
|
+
export * from '@effect/vitest'
|
|
9
|
+
|
|
10
|
+
export const DEBUGGER_ACTIVE = Boolean(process.env.DEBUGGER_ACTIVE ?? inspector.url() !== undefined)
|
|
11
|
+
|
|
12
|
+
export const makeWithTestCtx =
|
|
13
|
+
<R1 = never, E1 = never>(ctxParams: WithTestCtxParams<R1, E1>) =>
|
|
14
|
+
(testContext: Vitest.TestContext) =>
|
|
15
|
+
withTestCtx(testContext, ctxParams)
|
|
16
|
+
|
|
17
|
+
export type WithTestCtxParams<R1 = never, E1 = never> = {
|
|
18
|
+
suffix?: string
|
|
19
|
+
makeLayer?: (testContext: Vitest.TestContext) => Layer.Layer<R1, E1, Scope.Scope>
|
|
20
|
+
timeout?: Duration.DurationInput
|
|
21
|
+
forceOtel?: boolean
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export const withTestCtx =
|
|
25
|
+
<R1 = never, E1 = never>(
|
|
26
|
+
testContext: Vitest.TestContext,
|
|
27
|
+
{
|
|
28
|
+
suffix,
|
|
29
|
+
makeLayer,
|
|
30
|
+
timeout = IS_CI ? 60_000 : 10_000,
|
|
31
|
+
forceOtel = false,
|
|
32
|
+
}: {
|
|
33
|
+
suffix?: string
|
|
34
|
+
makeLayer?: (testContext: Vitest.TestContext) => Layer.Layer<R1, E1, Scope.Scope>
|
|
35
|
+
timeout?: Duration.DurationInput
|
|
36
|
+
forceOtel?: boolean
|
|
37
|
+
} = {},
|
|
38
|
+
) =>
|
|
39
|
+
<A, E>(
|
|
40
|
+
self: Effect.Effect<A, E, Scope.Scope | OtelTracer.OtelTracer | R1>,
|
|
41
|
+
): Effect.Effect<A, E | Cause.TimeoutException | E1, Scope.Scope> => {
|
|
42
|
+
const spanName = `${testContext.task.suite?.name}:${testContext.task.name}${suffix ? `:${suffix}` : ''}`
|
|
43
|
+
const layer = makeLayer?.(testContext)
|
|
44
|
+
|
|
45
|
+
const otelLayer =
|
|
46
|
+
DEBUGGER_ACTIVE || forceOtel ? OtelLiveHttp({ serviceName: 'vitest-runner', skipLogUrl: false }) : OtelLiveDummy
|
|
47
|
+
|
|
48
|
+
return self.pipe(
|
|
49
|
+
DEBUGGER_ACTIVE
|
|
50
|
+
? identity
|
|
51
|
+
: Effect.logWarnIfTakesLongerThan({
|
|
52
|
+
duration: Duration.toMillis(timeout) * 0.8,
|
|
53
|
+
label: `${spanName} approaching timeout (timeout: ${Duration.format(timeout)})`,
|
|
54
|
+
}),
|
|
55
|
+
DEBUGGER_ACTIVE ? identity : Effect.timeout(timeout),
|
|
56
|
+
Effect.provide(otelLayer),
|
|
57
|
+
Effect.provide(layer ?? Layer.empty),
|
|
58
|
+
Effect.scoped, // We need to scope the effect manually here because otherwise the span is not closed
|
|
59
|
+
Effect.withSpan(spanName),
|
|
60
|
+
Effect.annotateLogs({ suffix }),
|
|
61
|
+
) as any
|
|
62
|
+
}
|
package/src/node-vitest/mod.ts
CHANGED
|
File without changes
|