@systemfsoftware/stryker-js-instrumenter 16.0.1 → 16.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @systemfsoftware/stryker-js-instrumenter
 
+## 16.0.2
+
+Rebuilt against the span taxonomy that declares the html report write attribute; behaviour is unchanged. The html reporter test of that span is a trace-spec contract.
+
+Format resolution now decides only which format claims a file; the skip reason is built where the skip is recorded, byte for byte as before, and an unclaimed pinned format id is a decision the type-check disabler turns into its InstrumentError.
+
+Rebuilt against the span taxonomy that declares the checker compile counts; behaviour is unchanged. The span tests of the instrument phase, sandbox acquisition, worker trace propagation and importer shortcut are trace-spec contracts.
+
 ## 16.0.1
 
 Updated dependency @systemfsoftware/stryker-framework-interface to 0.0.3

package/dist/index.mjs

@@ -3561,19 +3561,15 @@ var FormatAssigned = class extends S.TaggedClass()("FormatAssigned", {
 };
 var FormatSkipped = class extends S.TaggedClass()("FormatSkipped", {
 	fileName: S.String,
-	extension: S.String,
-	reason: S.String
+	extension: S.String
 }) {
 	[FormatResolutionTypeId] = FormatResolutionTypeId;
 };
-var FormatOverrideUnclaimed = class extends S.TaggedError()("FormatOverrideUnclaimed", {
+var FormatOverrideUnclaimed = class extends S.TaggedClass()("FormatOverrideUnclaimed", {
 	fileName: S.String,
-	formatId: S.String,
-	reason: S.String
+	formatId: S.String
 }) {
-	get message() {
-		return `Cannot instrument ${this.fileName}: ${this.reason}`;
-	}
+	[FormatResolutionTypeId] = FormatResolutionTypeId;
 };
 const pinOf = (command) => Option.fromUndefinedOr(command.formatId);
 const matchesCommand = (claim, command) => Match.value(pinOf(command)).pipe(Match.when(Option.isSome, (pin) => claim.formatId === pin.value), Match.orElse(() => claim.extensions.includes(command.extension)));
@@ -3586,13 +3582,11 @@ const assignedFrom = (claim, command) => FormatAssigned.make({
 });
 const skippedFrom = (command) => FormatSkipped.make({
 	fileName: command.fileName,
-	extension: command.extension,
-	reason: `No installed format claims "${command.extension}". Install the framework plugin that claims this file type to instrument it.`
+	extension: command.extension
 });
 const overrideUnclaimedFrom = (command, formatId) => FormatOverrideUnclaimed.make({
 	fileName: command.fileName,
-	formatId,
-	reason: `No installed format carries the id "${formatId}" pinned for this file.`
+	formatId
 });
 const ClaimSelected = S.TaggedStruct("ClaimSelected", { claim: FormatClaimSchema });
 const PinUnclaimed = S.TaggedStruct("PinUnclaimed", { formatId: S.String });
@@ -3611,9 +3605,13 @@ const selectionFor = (command) => Option.match(Option.fromUndefinedOr(claimFor(c
 });
 const resolveFormat = Workflow.make({
 	command: FormatResolutionCommand,
-	decision: S.Union([FormatAssigned, FormatSkipped]),
-	error: FormatOverrideUnclaimed,
-	decide: (command) => Match.value(selectionFor(command)).pipe(Match.tag("ClaimSelected", ({ claim }) => Result.succeed(assignedFrom(claim, command))), Match.tag("PinUnclaimed", ({ formatId }) => Result.fail(overrideUnclaimedFrom(command, formatId))), Match.tag("ExtensionUnclaimed", () => Result.succeed(skippedFrom(command))), Match.exhaustive)
+	decision: S.Union([
+		FormatAssigned,
+		FormatSkipped,
+		FormatOverrideUnclaimed
+	]),
+	error: S.Never,
+	decide: (command) => Match.value(selectionFor(command)).pipe(Match.tag("ClaimSelected", ({ claim }) => Result.succeed(assignedFrom(claim, command))), Match.tag("PinUnclaimed", ({ formatId }) => Result.succeed(overrideUnclaimedFrom(command, formatId))), Match.tag("ExtensionUnclaimed", () => Result.succeed(skippedFrom(command))), Match.exhaustive)
 });
 const AridRuleId = S.Literals([
 	"arid-logging",
@@ -5242,20 +5240,22 @@ const parsedOutcomeFor = (registry, file, assigned) => Option.match(registry.ent
 		}
 	}))
 });
+const skipReasonOf = (skipped) => `No installed format claims "${skipped.extension}". Install the framework plugin that claims this file type to instrument it.`;
+const overrideUnclaimedTextOf = (unclaimed) => `Cannot instrument ${unclaimed.fileName}: No installed format carries the id "${unclaimed.formatId}" pinned for this file.`;
 const skippedOutcomeFor = (file, skipped) => ({
 	kind: "skipped",
 	record: InstrumentFileSkip.make({
 		file: file.name,
 		extension: skipped.extension,
-		reason: skipped.reason
+		reason: skipReasonOf(skipped)
 	})
 });
 const unclaimedOverrideError = (file) => InstrumentError.make({
 	message: `No installed format owns ${file.name}`,
 	cause: /* @__PURE__ */ new Error(`Unresolvable format pin for ${file.name}`)
 });
-const outcomeFor = (registry, file, decision) => Match.value(decision).pipe(Match.when(S.is(FormatAssigned), (assigned) => parsedOutcomeFor(registry, file, assigned)), Match.when(S.is(FormatSkipped), (skipped) => Effect.succeed(skippedOutcomeFor(file, skipped))), Match.exhaustive);
-const fileOutcome = (request) => Match.value(resolveFile(request.registry, request.file.name)).pipe(Match.when(Result.isSuccess, (resolved) => outcomeFor(request.registry, request.file, resolved.success)), Match.orElse(() => Effect.fail(unclaimedOverrideError(request.file))));
+const outcomeFor = (registry, file, decision) => Match.value(decision).pipe(Match.when(S.is(FormatAssigned), (assigned) => parsedOutcomeFor(registry, file, assigned)), Match.when(S.is(FormatSkipped), (skipped) => Effect.succeed(skippedOutcomeFor(file, skipped))), Match.when(S.is(FormatOverrideUnclaimed), () => Effect.fail(unclaimedOverrideError(file))), Match.exhaustive);
+const fileOutcome = (request) => Effect.flatMap(Effect.fromResult(resolveFile(request.registry, request.file.name)), (decision) => outcomeFor(request.registry, request.file, decision));
 const isParsedOutcome = (outcome) => outcome.kind === "parsed";
 const skipsOf = (outcome) => outcome.kind === "skipped" ? [outcome.record] : [];
 const transformInto = (request) => transform(request.ast, request.collector, {
@@ -5427,7 +5427,10 @@ const disableTypeChecksCell = Sandwich.named(SpanTaxonomy.Spans.instrumentDisabl
 		formatId: assigned.formatId
 	}),
 	FormatSkipped: (_skipped, raw) => Effect.succeed(raw.file),
-	FormatOverrideUnclaimed: (failure) => Effect.fail(FormatOverrideUnclaimed.make(failure)),
+	FormatOverrideUnclaimed: (unclaimed, raw) => Effect.fail(InstrumentError.make({
+		message: `No installed format owns ${raw.file.name}`,
+		cause: new Error(overrideUnclaimedTextOf(unclaimed))
+	})),
 	CommandRejected: ({ issue }) => Effect.fail(InstrumentError.make({
 		message: issue,
 		cause: new Error(issue)
@@ -5536,9 +5539,6 @@ const disableTypeChecksDataFirst = (file, registry = coreFormatRegistry) => disa
 }).pipe(Effect.map((disabled) => ({
 	...file,
 	content: disabled.content
-})), Effect.mapError((cause) => S.is(InstrumentError)(cause) ? cause : InstrumentError.make({
-	message: `No installed format owns ${file.name}`,
-	cause
 })));
 const disableTypeChecks = dual((args) => Predicate.hasProperty(args[0], "content"), disableTypeChecksDataFirst);
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@systemfsoftware/stryker-js-instrumenter",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/systemfsoftware/stryker-js-effect.git",
@@ -28,7 +28,7 @@
     "@oxc-project/types": "^0.150.0",
     "@systemfsoftware/effect-cell-types": "^12.1.4",
     "@systemfsoftware/stryker-framework-interface": "^0.0.3",
-    "@systemfsoftware/stryker-js-cli-contract": "^3.0.1",
+    "@systemfsoftware/stryker-js-cli-contract": "^3.1.0",
     "@systemfsoftware/stryker-js-plugin-interface": "^19.0.1",
     "oxc-parser": "^0.150.0",
     "oxc-walker": "^1"