@effected/markdown 0.4.2 → 0.5.1

package/Frontmatter.js

@@ -14,7 +14,7 @@ import { Effect, Schema } from "effect";
 *
 * @public
 */
-var FrontmatterFormatMismatchError = class extends Schema.TaggedErrorClass()("FrontmatterFormatMismatchError", {
+var FrontmatterFormatMismatchError = class extends Schema.TaggedError()("FrontmatterFormatMismatchError", {
 	/** The format the codec decodes. */
 	expected: FrontmatterFormat,
 	/** The format the capture node actually carries. */
@@ -36,7 +36,7 @@ var FrontmatterFormatMismatchError = class extends Schema.TaggedErrorClass()("Fr
 *
 * @public
 */
-var FrontmatterDecodeError = class extends Schema.TaggedErrorClass()("FrontmatterDecodeError", {
+var FrontmatterDecodeError = class extends Schema.TaggedError()("FrontmatterDecodeError", {
 	/** The format that failed to parse. */
 	format: FrontmatterFormat,
 	/** The underlying format-package failure, preserved structurally. */
@@ -58,7 +58,7 @@ var FrontmatterDecodeError = class extends Schema.TaggedErrorClass()("Frontmatte
 *
 * @public
 */
-var FrontmatterEncodeError = class extends Schema.TaggedErrorClass()("FrontmatterEncodeError", {
+var FrontmatterEncodeError = class extends Schema.TaggedError()("FrontmatterEncodeError", {
 	/** The format that failed to serialize. */
 	format: FrontmatterFormat,
 	/** The underlying format-package failure, preserved structurally. */
@@ -101,7 +101,7 @@ const FrontmatterMissingReason = Schema.Literals(["absent", "captureDisabled"]);
 *
 * @public
 */
-var FrontmatterMissingError = class extends Schema.TaggedErrorClass()("FrontmatterMissingError", { 
+var FrontmatterMissingError = class extends Schema.TaggedError()("FrontmatterMissingError", { 
 /** Why there is no capture: no block at all, or capture left off. */
 reason: FrontmatterMissingReason }) {
 	get message() {
@@ -121,7 +121,7 @@ reason: FrontmatterMissingReason }) {
 *
 * @public
 */
-var FrontmatterValidationError = class extends Schema.TaggedErrorClass()("FrontmatterValidationError", { 
+var FrontmatterValidationError = class extends Schema.TaggedError()("FrontmatterValidationError", { 
 /** The structured schema issue. Never a string. */
 issue: Schema.Defect() }) {
 	get message() {

package/FrontmatterResolver.js

@@ -81,7 +81,7 @@ const SchemaDeclaration = Schema.Union([
 *
 * @public
 */
-var SchemaDeclarationInvalidError = class extends Schema.TaggedErrorClass()("SchemaDeclarationInvalidError", {
+var SchemaDeclarationInvalidError = class extends Schema.TaggedError()("SchemaDeclarationInvalidError", {
 	/** Why the value failed to classify. */
 	reason: Schema.String,
 	/** The offending value, preserved structurally. */
@@ -98,7 +98,7 @@ var SchemaDeclarationInvalidError = class extends Schema.TaggedErrorClass()("Sch
 *
 * @public
 */
-var SchemaDeclarationMissingError = class extends Schema.TaggedErrorClass()("SchemaDeclarationMissingError", {}) {
+var SchemaDeclarationMissingError = class extends Schema.TaggedError()("SchemaDeclarationMissingError", {}) {
 	get message() {
 		return "the frontmatter data carries no $schema declaration";
 	}
@@ -110,7 +110,7 @@ var SchemaDeclarationMissingError = class extends Schema.TaggedErrorClass()("Sch
 *
 * @public
 */
-var SchemaNameUnknownError = class extends Schema.TaggedErrorClass()("SchemaNameUnknownError", { 
+var SchemaNameUnknownError = class extends Schema.TaggedError()("SchemaNameUnknownError", { 
 /** The declaration that failed to resolve, when one exists. */
 declaration: Schema.optionalKey(SchemaDeclaration) }) {
 	get message() {
@@ -126,7 +126,7 @@ declaration: Schema.optionalKey(SchemaDeclaration) }) {
 *
 * @public
 */
-var SchemaVersionUnresolvableError = class extends Schema.TaggedErrorClass()("SchemaVersionUnresolvableError", {
+var SchemaVersionUnresolvableError = class extends Schema.TaggedError()("SchemaVersionUnresolvableError", {
 	/** The registered name whose version could not be satisfied. */
 	name: Schema.String,
 	/** The requested version, when the declaration carried one. */

package/Markdown.js

@@ -3,7 +3,7 @@ import { isGuardExceeded, isRawMarkdownError } from "./internal/carriers.js";
 import { parseBlocks } from "./internal/blockParser.js";
 import { stringifyTree } from "./internal/stringify.js";
 import { MarkdownDiagnostic } from "./MarkdownDiagnostic.js";
-import { Effect, Option, Result, Schema, SchemaIssue, SchemaTransformation } from "effect";
+import { Effect, Result, Schema, SchemaIssue, SchemaTransformation } from "effect";
 
 //#region src/Markdown.ts
 /**
@@ -51,7 +51,7 @@ var MarkdownParseOptions = class extends Schema.Class("MarkdownParseOptions")({
 *
 * @public
 */
-var MarkdownParseError = class extends Schema.TaggedErrorClass()("MarkdownParseError", { diagnostic: MarkdownDiagnostic }) {
+var MarkdownParseError = class extends Schema.TaggedError()("MarkdownParseError", { diagnostic: MarkdownDiagnostic }) {
 	get message() {
 		const { code, line, character, message } = this.diagnostic;
 		return `Markdown parse failed: ${code} at ${line}:${character} ${message}`;
@@ -72,7 +72,7 @@ var MarkdownParseError = class extends Schema.TaggedErrorClass()("MarkdownParseE
 *
 * @public
 */
-var MarkdownStringifyError = class extends Schema.TaggedErrorClass()("MarkdownStringifyError", { diagnostic: MarkdownDiagnostic }) {
+var MarkdownStringifyError = class extends Schema.TaggedError()("MarkdownStringifyError", { diagnostic: MarkdownDiagnostic }) {
 	get message() {
 		const { code, message } = this.diagnostic;
 		return `Markdown stringify failed: ${code} ${message}`;
@@ -242,8 +242,8 @@ var Markdown = class Markdown {
 	*/
 	static fromString(options) {
 		return Schema.String.pipe(Schema.decodeTo(Root, SchemaTransformation.transformOrFail({
-			decode: (input) => Effect.mapError(Markdown.parse(input, options), (error) => new SchemaIssue.InvalidValue(Option.some(input), { message: error.message })),
-			encode: (value) => Effect.mapError(Markdown.stringify(value), (error) => new SchemaIssue.InvalidValue(Option.some(value), { message: error.message }))
+			decode: (input) => Effect.mapError(Markdown.parse(input, options), (error) => new SchemaIssue.InvalidValue({ message: error.message }, input)),
+			encode: (value) => Effect.mapError(Markdown.stringify(value), (error) => new SchemaIssue.InvalidValue({ message: error.message }, value))
 		})));
 	}
 	/**

package/MarkdownFormat.js

@@ -80,7 +80,7 @@ const MarkdownModificationErrorCode = Schema.Literals([
 *
 * @public
 */
-var MarkdownModificationError = class extends Schema.TaggedErrorClass()("MarkdownModificationError", {
+var MarkdownModificationError = class extends Schema.TaggedError()("MarkdownModificationError", {
 	code: MarkdownModificationErrorCode,
 	detail: Schema.String,
 	offset: Schema.Number,

package/Mdast.js

@@ -42,7 +42,7 @@ import { Effect, Result, Schema } from "effect";
 *
 * @public
 */
-var MdastDecodeError = class extends Schema.TaggedErrorClass()("MdastDecodeError", { 
+var MdastDecodeError = class extends Schema.TaggedError()("MdastDecodeError", { 
 /** The structured schema issue. Never a string. */
 issue: Schema.Defect() }) {
 	get message() {

package/internal/inlineParser.js

@@ -219,39 +219,40 @@ var InlineParser = class {
 				opener = opener.previous;
 			}
 			const oldCloser = closer;
-			if (closercc === C_ASTERISK || closercc === C_UNDERSCORE) if (!openerFound || opener === void 0) closer = closer.next;
-			else {
-				const useDelims = closer.numdelims >= 2 && opener.numdelims >= 2 ? 2 : 1;
-				const openerNode = opener.node;
-				const closerNode = closer.node;
-				opener.numdelims -= useDelims;
-				closer.numdelims -= useDelims;
-				openerNode.value = openerNode.value.slice(0, openerNode.value.length - useDelims);
-				openerNode.end -= useDelims;
-				closerNode.value = closerNode.value.slice(0, closerNode.value.length - useDelims);
-				closerNode.start += useDelims;
-				const emphasis = makeInlineNode(useDelims === 1 ? "emphasis" : "strong", openerNode.end, closerNode.start);
-				emphasis.data.markerChar = closercc === C_UNDERSCORE ? "_" : "*";
-				let between = openerNode.next;
-				while (between !== void 0 && between !== closerNode) {
-					const following = between.next;
-					appendChild(emphasis, between);
-					between = following;
-				}
-				insertAfter(openerNode, emphasis);
-				this.removeDelimitersBetween(opener, closer);
-				if (opener.numdelims === 0) {
-					unlink(openerNode);
-					this.removeDelimiter(opener);
-				}
-				if (closer.numdelims === 0) {
-					unlink(closerNode);
-					const next = closer.next;
-					this.removeDelimiter(closer);
-					closer = next;
+			if (closercc === C_ASTERISK || closercc === C_UNDERSCORE) {
+				if (!openerFound || opener === void 0) closer = closer.next;
+				else {
+					const useDelims = closer.numdelims >= 2 && opener.numdelims >= 2 ? 2 : 1;
+					const openerNode = opener.node;
+					const closerNode = closer.node;
+					opener.numdelims -= useDelims;
+					closer.numdelims -= useDelims;
+					openerNode.value = openerNode.value.slice(0, openerNode.value.length - useDelims);
+					openerNode.end -= useDelims;
+					closerNode.value = closerNode.value.slice(0, closerNode.value.length - useDelims);
+					closerNode.start += useDelims;
+					const emphasis = makeInlineNode(useDelims === 1 ? "emphasis" : "strong", openerNode.end, closerNode.start);
+					emphasis.data.markerChar = closercc === C_UNDERSCORE ? "_" : "*";
+					let between = openerNode.next;
+					while (between !== void 0 && between !== closerNode) {
+						const following = between.next;
+						appendChild(emphasis, between);
+						between = following;
+					}
+					insertAfter(openerNode, emphasis);
+					this.removeDelimitersBetween(opener, closer);
+					if (opener.numdelims === 0) {
+						unlink(openerNode);
+						this.removeDelimiter(opener);
+					}
+					if (closer.numdelims === 0) {
+						unlink(closerNode);
+						const next = closer.next;
+						this.removeDelimiter(closer);
+						closer = next;
+					}
 				}
-			}
-			else if (closercc === 126) closer = !openerFound || opener === void 0 ? closer.next : insertStrikethrough(this, opener, closer);
+			} else if (closercc === 126) closer = !openerFound || opener === void 0 ? closer.next : insertStrikethrough(this, opener, closer);
 			else closer = closer.next;
 			if (!openerFound) {
 				openersBottom[openersBottomIndex] = oldCloser.previous;

package/internal/references.js

@@ -154,11 +154,13 @@ const parseReference = (text) => {
 	let title = scanner.pos === beforeTitle ? void 0 : scanner.parseLinkTitle();
 	if (title === void 0) scanner.pos = beforeTitle;
 	let atLineEnd = true;
-	if (scanner.match(reSpaceAtEndOfLine) === void 0) if (title === void 0) atLineEnd = false;
-	else {
-		title = void 0;
-		scanner.pos = beforeTitle;
-		atLineEnd = scanner.match(reSpaceAtEndOfLine) !== void 0;
+	if (scanner.match(reSpaceAtEndOfLine) === void 0) {
+		if (title === void 0) atLineEnd = false;
+		else {
+			title = void 0;
+			scanner.pos = beforeTitle;
+			atLineEnd = scanner.match(reSpaceAtEndOfLine) !== void 0;
+		}
 	}
 	if (!atLineEnd) return;
 	const key = normalizeReference(rawLabel);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/markdown",
-	"version": "0.4.2",
+	"version": "0.5.1",
 	"private": false,
 	"description": "CommonMark and GFM markdown parse, edit and transform schemas for Effect",
 	"keywords": [
@@ -39,10 +39,10 @@
 		"./package.json": "./package.json"
 	},
 	"peerDependencies": {
-		"@effected/jsonc": "^0.5.2",
-		"@effected/toml": "^0.3.2",
-		"@effected/yaml": "^0.6.1",
-		"effect": "4.0.0-beta.101"
+		"@effected/jsonc": "^0.6.0",
+		"@effected/toml": "^0.4.0",
+		"@effected/yaml": "^0.8.0",
+		"effect": "4.0.0-beta.107"
 	},
 	"peerDependenciesMeta": {
 		"@effected/jsonc": {