@okfit/engine 0.7.5 → 0.8.0

package/index.d.ts

@@ -1,4 +1,4 @@
-import { Actor, BundleLoadError, ConceptId, Diagnostic, DiagnosticRange, DiagnosticSeverity, GraphLink, GraphNode, LinkGraph, LoadedBundle, OkfitConfig, OkfitConfigFile, StaleConcept, ValidationReport } from "@okfit/core";
+import { Actor, BundleLoadError, ConceptId, Diagnostic, DiagnosticRange, DiagnosticSeverity, GraphLink, GraphNode, LinkGraph, LoadedBundle, LoadedConcept, OkfitConfig, OkfitConfigFile, StaleConcept, ValidationReport } from "@okfit/core";
 import { Context, Crypto, DateTime, Effect, FileSystem, Layer, Option, Path, PlatformError, Result, Runtime, Schema } from "effect";
 import { AppDirs, Xdg } from "@effected/xdg";
 import { ConfigReadError } from "@effected/config-file";
@@ -1428,6 +1428,20 @@ export declare class BundleSession extends BundleSession_base {
   static readonly make: (options: BundleSessionOptions) => Effect.Effect<BundleSessionShape, never, BundleSessionServices>;
 }
 //#endregion
+//#region src/session/concept.d.ts
+/**
+ * The loaded concept at `absolutePath`, if any. `absolutePath` must already sit under
+ * `bundle.root` (a real resolved path, never re-resolved here: `@okfit/core`'s own
+ * `internal/posixPath.ts` avoids `path.resolve`/`path.relative` on purpose, because both read
+ * `process.cwd()`, and this package holds the same line). Strips `bundle.root` as a plain
+ * string prefix, then applies the same `ConceptId.fromPath` normalisation `withFallbackRange`
+ * uses: `None` for a path outside the bundle, a reserved file (`index.md`, `log.md`), a
+ * non-markdown file, or a markdown file that never decoded into a concept.
+ *
+ * @public
+ */
+export declare const conceptFor: (bundle: LoadedBundle, absolutePath: string) => Option.Option<LoadedConcept>;
+//#endregion
 //#region src/session/range.d.ts
 /**
  * Give a range-less diagnostic somewhere to point (spec 4.3): the concept's

package/index.js

@@ -21,9 +21,10 @@ import { SkipReason, runSync } from "./sync/run.js";
 import { SyncEnvelope, SyncModeEnvelope, syncEnvelope } from "./render/sync.js";
 import { VerifyBatchEnvelope, VerifyEnvelope, verifyBatchEnvelope, verifyEnvelope } from "./render/verify.js";
 import { Now, run } from "./validate/run.js";
+import { conceptFor } from "./session/concept.js";
 import { withFallbackRange } from "./session/range.js";
 import { BundleSession } from "./session/BundleSession.js";
 import { runStale } from "./stale/run.js";
 import { runVerify, runVerifyBatch } from "./verify/run.js";
 
-export { BundleSession, CONFIG_RELATIVE_PATH, ConfigMalformedError, ConfigPathNotFoundError, ContextEnvelope, ContextField, ContextFieldValue, ContextTag, ContextType, DEFAULT_PROFILE_NAME, DistributionField, DocumentPathError, ENGINE_VERSION, ExternalReferences, GraphEdgeEnvelope, GraphEnvelope, GraphNodeEnvelope, GraphSummary, InitOverwriteError, JsonDiagnostic, JsonEnvelope, JsonErrorEnvelope, JsonSummary, Now, OkfitPlatform, OverlayDocuments, ReferenceCheck, ReferenceState, SkipReason, StaleEnvelope, StaleItem, StaleSummary, SyncEnvelope, SyncModeEnvelope, SyncStagedLogError, VerifyBatchEnvelope, VerifyConceptNotFoundError, VerifyEnvelope, VerifySelectionError, VerifyUnsupportedFrontmatterError, buildConfigLayer, collect, configValue, contextEnvelope, files, forDiagnostics, graphEnvelope, json, jsonError, layerOverlayFileSystem, makeOverlayFileSystem, provideConfig, provideDocuments, resolveBundleRoot, resolveDocumentPath, resolveProjectConfig, resolveProjectRoot, run, runContext, runGraph, runStale, runSync, runVerify, runVerifyBatch, sort, staleEnvelope, syncEnvelope, tally, targetPaths, verifyBatchEnvelope, verifyEnvelope, withFallbackRange };
+export { BundleSession, CONFIG_RELATIVE_PATH, ConfigMalformedError, ConfigPathNotFoundError, ContextEnvelope, ContextField, ContextFieldValue, ContextTag, ContextType, DEFAULT_PROFILE_NAME, DistributionField, DocumentPathError, ENGINE_VERSION, ExternalReferences, GraphEdgeEnvelope, GraphEnvelope, GraphNodeEnvelope, GraphSummary, InitOverwriteError, JsonDiagnostic, JsonEnvelope, JsonErrorEnvelope, JsonSummary, Now, OkfitPlatform, OverlayDocuments, ReferenceCheck, ReferenceState, SkipReason, StaleEnvelope, StaleItem, StaleSummary, SyncEnvelope, SyncModeEnvelope, SyncStagedLogError, VerifyBatchEnvelope, VerifyConceptNotFoundError, VerifyEnvelope, VerifySelectionError, VerifyUnsupportedFrontmatterError, buildConfigLayer, collect, conceptFor, configValue, contextEnvelope, files, forDiagnostics, graphEnvelope, json, jsonError, layerOverlayFileSystem, makeOverlayFileSystem, provideConfig, provideDocuments, resolveBundleRoot, resolveDocumentPath, resolveProjectConfig, resolveProjectRoot, run, runContext, runGraph, runStale, runSync, runVerify, runVerifyBatch, sort, staleEnvelope, syncEnvelope, tally, targetPaths, verifyBatchEnvelope, verifyEnvelope, withFallbackRange };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@okfit/engine",
-	"version": "0.7.5",
+	"version": "0.8.0",
 	"private": false,
 	"description": "The okfit engine: platform layer, config discovery, and the validate, verify, sync, init and context programs shared by the okfit CLI and MCP server.",
 	"keywords": [
@@ -46,8 +46,8 @@
 		"@effected/walker": "^0.12.0",
 		"@effected/xdg": "^0.7.0",
 		"@effected/yaml": "^0.17.0",
-		"@okfit/core": "0.7.4",
-		"@okfit/profiles": "0.7.5",
+		"@okfit/core": "0.8.0",
+		"@okfit/profiles": "0.8.0",
 		"effect": "4.0.0-rc.117"
 	},
 	"engines": {

package/session/concept.js

@@ -0,0 +1,34 @@
+import { ConceptId } from "@okfit/core";
+import { Option } from "effect";
+
+//#region src/session/concept.ts
+/** Backslashes to forward slashes; the rest of this module treats every path as already resolved. */
+const posixOf = (value) => value.split("\\").join("/");
+/** Drops every trailing `/` without a regex (a `/\/+$/` pattern is quadratic on a long run of slashes). */
+const stripTrailingSlashes = (path) => {
+	let end = path.length;
+	while (end > 0 && path.charCodeAt(end - 1) === 47) end -= 1;
+	return path.slice(0, end);
+};
+/**
+* The loaded concept at `absolutePath`, if any. `absolutePath` must already sit under
+* `bundle.root` (a real resolved path, never re-resolved here: `@okfit/core`'s own
+* `internal/posixPath.ts` avoids `path.resolve`/`path.relative` on purpose, because both read
+* `process.cwd()`, and this package holds the same line). Strips `bundle.root` as a plain
+* string prefix, then applies the same `ConceptId.fromPath` normalisation `withFallbackRange`
+* uses: `None` for a path outside the bundle, a reserved file (`index.md`, `log.md`), a
+* non-markdown file, or a markdown file that never decoded into a concept.
+*
+* @public
+*/
+const conceptFor = (bundle, absolutePath) => {
+	const root = stripTrailingSlashes(posixOf(bundle.root));
+	const target = posixOf(absolutePath);
+	const prefix = `${root}/`;
+	if (!target.startsWith(prefix)) return Option.none();
+	const relative = target.slice(prefix.length);
+	return Option.flatMap(ConceptId.fromPath(relative), (id) => Option.fromUndefinedOr(bundle.concepts.get(id)));
+};
+
+//#endregion
+export { conceptFor };

package/session/range.js

@@ -1,4 +1,5 @@
-import { ConceptId, DiagnosticRange } from "@okfit/core";
+import { conceptFor } from "./concept.js";
+import { DiagnosticRange } from "@okfit/core";
 import { Option } from "effect";
 
 //#region src/session/range.ts
@@ -20,10 +21,7 @@ const FILE_START = DiagnosticRange.make({
 */
 const withFallbackRange = (bundle, diagnostic) => {
 	if (diagnostic.range !== void 0 || diagnostic.file === "") return diagnostic;
-	const concept = Option.match(ConceptId.fromPath(diagnostic.file), {
-		onNone: () => void 0,
-		onSome: (id) => bundle.concepts.get(id)
-	});
+	const concept = Option.getOrUndefined(conceptFor(bundle, `${bundle.root}/${diagnostic.file}`));
 	const node = concept?.document.frontmatter;
 	if (concept === void 0 || node === void 0) return {
 		...diagnostic,

package/validate/resources.js

@@ -1,4 +1,4 @@
-import { Diagnostic, OkfitConfig } from "@okfit/core";
+import { Diagnostic, DiagnosticRange, OkfitConfig } from "@okfit/core";
 import { Effect, FileSystem, Path } from "effect";
 
 //#region src/validate/resources.ts
@@ -22,11 +22,23 @@ const stripSuffix = (value) => {
 	const at = value.search(/[?#]/);
 	return at === -1 ? value : value.slice(0, at);
 };
-/** Every `resource` value on a concept: the top-level field, then each source's. */
+/** Every `resource` value on a concept, each with its own frontmatter path: the top-level field, then each source's. */
 const resourceValuesOf = (concept) => {
 	const values = [];
-	if (concept.frontmatter.resource !== void 0) values.push(concept.frontmatter.resource);
-	for (const source of concept.frontmatter.sources ?? []) values.push(source.resource);
+	if (concept.frontmatter.resource !== void 0) values.push({
+		value: concept.frontmatter.resource,
+		path: ["resource"]
+	});
+	concept.frontmatter.sources?.forEach((source, index) => {
+		values.push({
+			value: source.resource,
+			path: [
+				"sources",
+				index,
+				"resource"
+			]
+		});
+	});
 	return values;
 };
 /**
@@ -36,9 +48,11 @@ const resourceValuesOf = (concept) => {
 * pattern) or a literal path resolved in D-23 order: relative to the
 * concept's own directory, then (for a bare path) relative to the bundle
 * root, or with a leading `/` relative to the bundle root only; only the
-* latter is checked against the filesystem. Total over severity (mirrors
-* `Provenance.lint`'s S-28 posture): returns `[]`, touching neither
-* `FileSystem` nor `Path`, the moment
+* latter is checked against the filesystem. Ranges at the offending value
+* (phase 4 decision 2, via `DiagnosticRange.forFrontmatterPath`) using the
+* `["resource"]` or `["sources", index, "resource"]` path the value came
+* from. Total over severity (mirrors `Provenance.lint`'s S-28 posture):
+* returns `[]`, touching neither `FileSystem` nor `Path`, the moment
 * `OkfitConfig.severityFor(config, "source-resource-missing")` is `"off"`.
 *
 * @public
@@ -49,7 +63,7 @@ const lintResources = (bundle, config) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const diagnostics = [];
-	for (const [, concept] of bundle.concepts) for (const value of resourceValuesOf(concept)) {
+	for (const [, concept] of bundle.concepts) for (const { value, path: fieldPath } of resourceValuesOf(concept)) {
 		if (isDescriptor(value)) continue;
 		const stripped = stripSuffix(value);
 		const candidates = stripped.startsWith("/") ? [path.join(bundle.root, stripped.slice(1))] : [path.resolve(bundle.root, path.dirname(concept.path), stripped), ...stripped.startsWith("./") || stripped.startsWith("../") ? [] : [path.resolve(bundle.root, stripped)]];
@@ -59,11 +73,13 @@ const lintResources = (bundle, config) => Effect.gen(function* () {
 			break;
 		}
 		if (exists) continue;
+		const range = DiagnosticRange.forFrontmatterPath(concept.document, fieldPath);
 		diagnostics.push(Diagnostic.make({
 			file: concept.path,
 			code: "source-resource-missing",
 			severity,
-			message: `Resource "${value}" does not exist relative to ${concept.path}`
+			message: `Resource "${value}" does not exist relative to ${concept.path}`,
+			...range === void 0 ? {} : { range }
 		}));
 	}
 	return diagnostics;

package/version.js

@@ -11,7 +11,7 @@
 *
 * @public
 */
-const ENGINE_VERSION = "0.7.5";
+const ENGINE_VERSION = "0.8.0";
 
 //#endregion
 export { ENGINE_VERSION };