@erudit-js/prose 4.2.0-dev.1 → 4.2.0

package/dist/elements/problem/problemContent.js

@@ -1,4 +1,4 @@
-import { defineSchema, ensureTagBlockChildren, ensureTagChildren, isRawBlock, isRawElement } from "tsprose";
+import { defineSchema, ensureTagBlockChildren, ensureTagChildren, isRawElement } from "tsprose";
 import { defineEruditTag } from "../../tag.js";
 import { uppercaseFirst } from "../../utils/case.js";
 import { paragraphWrap } from "../../shared/paragraphWrap.js";
@@ -76,7 +76,7 @@ function defineProblemSectionContainer(name) {
 		tagName,
 		schema
 	})(({ element, children }) => {
-		const head = [];
+		const headRaw = [];
 		const sections = [];
 		let seenSection = false;
 		for (const child of children) {
@@ -84,15 +84,13 @@ function defineProblemSectionContainer(name) {
 				seenSection = true;
 				sections.push(child);
 			} else {
-				if (!isRawBlock(child)) {
-					throw new EruditProseError(`${tagName} cannot have inline children (found "${child.schema.name}").`);
-				}
 				if (seenSection) {
 					throw new EruditProseError(`${tagName}: non-section children must come before <ProblemSection>.`);
 				}
-				head.push(child);
+				headRaw.push(child);
 			}
 		}
+		const head = headRaw.length > 0 ? toBlockChildren(tagName, headRaw) : [];
 		element.children = [...head, ...sections];
 	});
 	const coreElement = defineProseCoreElement({

package/dist/shared/filePath.js

@@ -1,11 +1,38 @@
 import { EruditProseError } from "../error.js";
+function normalizeForCompare(p) {
+	return p.replace(/\\/g, "/").replace(/^([A-Za-z]):/, (_, d) => d.toLowerCase() + ":").replace(/\/+$/g, "");
+}
+function isAbsolutePath(p) {
+	// After normalization separators are '/', so check for:
+	// - Windows drive-root: C:/...
+	// - POSIX root: /...
+	// - UNC root: //server/share/...
+	return /^[A-Za-z]:\//.test(p) || p.startsWith("/") || p.startsWith("//");
+}
+function hasParentTraversal(relPath) {
+	return relPath.split("/").some((segment) => segment === "..");
+}
 /**
 * Checks that the given absolute file path is within the given absolute project path.
 * Returns the file path relative to the project path.
 */
 export function projectRelFilePath(projectAbsPath, fileAbsPath) {
-	if (!fileAbsPath.startsWith(projectAbsPath)) {
+	const project = normalizeForCompare(projectAbsPath);
+	const file = normalizeForCompare(fileAbsPath);
+	if (isAbsolutePath(file)) {
+		const projectPrefix = project + "/";
+		if (!file.startsWith(projectPrefix)) {
+			throw new EruditProseError(`File "${fileAbsPath}" is outside of project "${projectAbsPath}"`);
+		}
+		const rel = file.slice(projectPrefix.length);
+		if (!rel || hasParentTraversal(rel)) {
+			throw new EruditProseError(`File "${fileAbsPath}" is outside of project "${projectAbsPath}"`);
+		}
+		return rel;
+	}
+	const rel = file.replace(/^\.\/+/, "").replace(/^\/+/, "");
+	if (!rel || hasParentTraversal(rel)) {
 		throw new EruditProseError(`File "${fileAbsPath}" is outside of project "${projectAbsPath}"`);
 	}
-	return fileAbsPath.slice(projectAbsPath.length + 1);
+	return rel;
 }

package/dist/toc.js

@@ -19,8 +19,8 @@ export function finalizeToc(rawElement, tocTagProp) {
 		return;
 	}
 	if (rawElement.toc === true) {
-		// Implicitly add to TOC using general title
-		const tocString = rawElement.title?.trim();
+		// Implicitly add to TOC using general title, fall back to finalized snippet title
+		const tocString = rawElement.title?.trim() || rawElement.snippet?.title?.trim();
 		if (!tocString) {
 			throw new EruditProseError("Addition to TOC was requested via internal toc: true flag, but unable to retrieve title!");
 		}
@@ -32,8 +32,8 @@ export function finalizeToc(rawElement, tocTagProp) {
 		return;
 	}
 	if (tocTagProp === true) {
-		// Explicitly add to TOC using general internal toc string or general title
-		const tocString = rawElement.toc?.trim() || rawElement.title?.trim();
+		// Explicitly add to TOC using general internal toc string, general title, or finalized snippet title
+		const tocString = rawElement.toc?.trim() || rawElement.title?.trim() || rawElement.snippet?.title?.trim();
 		if (!tocString) {
 			throw new EruditProseError("Addition to TOC was manually requested via true tag toc prop, but unable to retrieve title!");
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@erudit-js/prose",
-  "version": "4.2.0-dev.1",
+  "version": "4.2.0",
   "description": "📝 JSX prose subsystem for Erudit sites",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   },
   "files": [
     "dist",
-    "types.d.ts"
+    "raw.d.ts"
   ],
   "license": "MIT",
   "scripts": {
@@ -32,7 +32,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@erudit-js/core": "4.2.0-dev.1",
+    "@erudit-js/core": "4.2.0",
     "@floating-ui/vue": "^1.1.10",
     "tsprose": "^1.0.0",
     "image-size": "^2.0.2",

package/raw.d.ts

@@ -0,0 +1,4 @@
+declare module '*?raw' {
+  const content: string;
+  export default content;
+}