trellis 3.1.35 → 3.2.2

package/dist/cms/index.js

@@ -1,28 +1,6 @@
-// @bun
-import"../index-a76rekgs.js";
+import "../chunk-KFQGP6VL.js";
 
 // src/cms/internal.ts
-var SYSTEM_TYPES = new Set([
-  "issue",
-  "agent",
-  "project",
-  "memory",
-  "mcp",
-  "sprite",
-  "workunit",
-  "cycle",
-  "epic",
-  "roadmap",
-  "suggestion",
-  "file",
-  "directory",
-  "op",
-  "branch",
-  "decision",
-  "session",
-  "typeschema",
-  "field"
-]);
 function typeKey(type) {
   return type.trim().toLowerCase();
 }
@@ -31,8 +9,7 @@ function entryFromFacts(entity, facts, links) {
   let status = "draft";
   let cmsStatusSeen = false;
   for (const f of facts) {
-    if (f.a === "type")
-      continue;
+    if (f.a === "type") continue;
     if (f.a === "cms_status") {
       status = f.v === "published" ? "published" : "draft";
       cmsStatusSeen = true;
@@ -41,62 +18,54 @@ function entryFromFacts(entity, facts, links) {
     fields[f.a] = f.v;
   }
   if (!cmsStatusSeen) {
-    if (fields.status === "published")
-      status = "published";
-    else if (fields.status === "draft")
-      status = "draft";
+    if (fields.status === "published") status = "published";
+    else if (fields.status === "draft") status = "draft";
   }
   if (links) {
     for (const link of links) {
-      if (link.e1 !== entity.id)
-        continue;
-      if (!(link.a in fields))
-        fields[link.a] = link.e2;
+      if (link.e1 !== entity.id) continue;
+      if (!(link.a in fields)) fields[link.a] = link.e2;
     }
   }
   return { id: entity.id, type: entity.type, status, fields };
 }
 function groupFactsByEntity(facts) {
-  const map = new Map;
+  const map = /* @__PURE__ */ new Map();
   for (const f of facts) {
     const list = map.get(f.e);
-    if (list)
-      list.push(f);
-    else
-      map.set(f.e, [f]);
+    if (list) list.push(f);
+    else map.set(f.e, [f]);
   }
   return map;
 }
 function groupLinksBySource(links) {
-  const map = new Map;
+  const map = /* @__PURE__ */ new Map();
   for (const l of links) {
     const list = map.get(l.e1);
-    if (list)
-      list.push(l);
-    else
-      map.set(l.e1, [l]);
+    if (list) list.push(l);
+    else map.set(l.e1, [l]);
   }
   return map;
 }
 async function expandReferences(entries, expandKeys, fetchEntity) {
-  const ids = new Set;
+  const ids = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     for (const key of expandKeys) {
       const v = entry.fields[key];
-      if (typeof v === "string")
-        ids.add(v);
+      if (typeof v === "string") ids.add(v);
     }
   }
-  if (ids.size === 0)
-    return entries;
-  const resolved = new Map;
-  await Promise.all([...ids].map(async (id) => {
-    try {
-      resolved.set(id, await fetchEntity(id));
-    } catch {
-      resolved.set(id, null);
-    }
-  }));
+  if (ids.size === 0) return entries;
+  const resolved = /* @__PURE__ */ new Map();
+  await Promise.all(
+    [...ids].map(async (id) => {
+      try {
+        resolved.set(id, await fetchEntity(id));
+      } catch {
+        resolved.set(id, null);
+      }
+    })
+  );
   return entries.map((entry) => {
     const next = { ...entry.fields };
     for (const key of expandKeys) {
@@ -113,14 +82,13 @@ function fingerprint(value) {
 }
 
 // src/cms/formula.ts
-var OPS = new Set(["+", "-", "*", "/", "(", ")"]);
+var OPS = /* @__PURE__ */ new Set(["+", "-", "*", "/", "(", ")"]);
 function num(value) {
   if (typeof value === "number")
-    return Number.isFinite(value) ? value : undefined;
-  if (typeof value !== "string" || value.trim() === "")
-    return;
+    return Number.isFinite(value) ? value : void 0;
+  if (typeof value !== "string" || value.trim() === "") return void 0;
   const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
+  return Number.isFinite(parsed) ? parsed : void 0;
 }
 function tokenize(expr) {
   const tokens = [];
@@ -138,16 +106,14 @@ function tokenize(expr) {
     }
     if (/\d|\./.test(ch)) {
       let end = i + 1;
-      while (end < expr.length && /\d|\./.test(expr[end]))
-        end++;
+      while (end < expr.length && /\d|\./.test(expr[end])) end++;
       const value = Number(expr.slice(i, end));
-      if (!Number.isFinite(value))
-        return;
+      if (!Number.isFinite(value)) return void 0;
       tokens.push(value);
       i = end;
       continue;
     }
-    return;
+    return void 0;
   }
   return tokens;
 }
@@ -157,29 +123,25 @@ function parse(tokens) {
   const take = () => tokens[i++];
   const primary = () => {
     const token = take();
-    if (typeof token === "number")
-      return token;
-    if (token === "+")
-      return primary();
+    if (typeof token === "number") return token;
+    if (token === "+") return primary();
     if (token === "-") {
       const value2 = primary();
-      return value2 === undefined ? undefined : -value2;
+      return value2 === void 0 ? void 0 : -value2;
     }
     if (token === "(") {
       const value2 = add();
-      if (take() !== ")")
-        return;
+      if (take() !== ")") return void 0;
       return value2;
     }
-    return;
+    return void 0;
   };
   const mul = () => {
     let left = primary();
     while (peek() === "*" || peek() === "/") {
       const op = take();
       const right = primary();
-      if (left === undefined || right === undefined)
-        return;
+      if (left === void 0 || right === void 0) return void 0;
       left = op === "*" ? left * right : left / right;
     }
     return left;
@@ -189,26 +151,25 @@ function parse(tokens) {
     while (peek() === "+" || peek() === "-") {
       const op = take();
       const right = mul();
-      if (left === undefined || right === undefined)
-        return;
+      if (left === void 0 || right === void 0) return void 0;
       left = op === "+" ? left + right : left - right;
     }
     return left;
   };
   const value = add();
-  if (i !== tokens.length || value === undefined || !Number.isFinite(value))
-    return;
+  if (i !== tokens.length || value === void 0 || !Number.isFinite(value))
+    return void 0;
   return value;
 }
 function evaluateFormula(expr, fields) {
   const interpolated = expr.replace(/\{([^{}]+)\}/g, (match, key) => {
     const value = num(fields[key.trim()]);
-    return value === undefined ? match : String(value);
+    return value === void 0 ? match : String(value);
   });
   if (interpolated.includes("{") || interpolated.includes("}"))
-    return;
+    return void 0;
   const tokens = tokenize(interpolated);
-  return tokens ? parse(tokens) : undefined;
+  return tokens ? parse(tokens) : void 0;
 }
 function keys(value) {
   const raw = value.replace(/^schema:/, "").trim();
@@ -219,15 +180,12 @@ function keys(value) {
   return [...new Set([lower, snake, compact].filter(Boolean))];
 }
 function parseFields(raw) {
-  if (typeof raw !== "string")
-    return [];
+  if (typeof raw !== "string") return [];
   try {
     const parsed = JSON.parse(raw);
-    if (!Array.isArray(parsed))
-      return [];
+    if (!Array.isArray(parsed)) return [];
     return parsed.filter((item) => {
-      if (!item || typeof item !== "object")
-        return false;
+      if (!item || typeof item !== "object") return false;
       const def = item;
       return typeof def.key === "string" && typeof def.type === "string";
     });
@@ -237,15 +195,18 @@ function parseFields(raw) {
 }
 function schemaFields(facts, names) {
   const wanted = new Set(names.flatMap(keys));
-  const fact = facts.find((item) => item.e.startsWith("schema:") && item.a === "props" && keys(item.e).some((key) => wanted.has(key)));
+  const fact = facts.find(
+    (item) => item.e.startsWith("schema:") && item.a === "props" && keys(item.e).some((key) => wanted.has(key))
+  );
   return parseFields(fact?.v);
 }
 function applyFormulas(entry, defs) {
-  const formulas = defs.filter((def) => def.type === "formula" && typeof def.formula === "string" && def.formula.trim());
-  if (formulas.length === 0)
-    return entry;
+  const formulas = defs.filter(
+    (def) => def.type === "formula" && typeof def.formula === "string" && def.formula.trim()
+  );
+  if (formulas.length === 0) return entry;
   const fields = { ...entry.fields };
-  for (let pass = 0;pass < formulas.length; pass++) {
+  for (let pass = 0; pass < formulas.length; pass++) {
     for (const def of formulas)
       fields[def.key] = evaluateFormula(def.formula, fields);
   }
@@ -254,25 +215,27 @@ function applyFormulas(entry, defs) {
 
 // src/cms/client.ts
 var DEFAULT_BASE_PATH = "/trellis/store";
-var DEFAULT_POLL_MS = 2000;
+var DEFAULT_POLL_MS = 2e3;
 var MIN_POLL_MS = 500;
-var MAX_FACTS_PER_FETCH = 5000;
-var MAX_ENTITIES_PER_FETCH = 1000;
+var MAX_FACTS_PER_FETCH = 5e3;
+var MAX_ENTITIES_PER_FETCH = 1e3;
 var defaultEquals = (prev, next) => fingerprint(prev) === fingerprint(next);
-
-class CmsClient {
+var CmsClient = class {
   url;
   basePath;
   directory;
   pollIntervalMs;
   fetchFn;
   apiKey;
-  subscriptions = new Map;
+  subscriptions = /* @__PURE__ */ new Map();
   constructor(opts) {
     this.url = opts.url.replace(/\/+$/, "");
     this.basePath = (opts.basePath ?? DEFAULT_BASE_PATH).replace(/\/+$/, "");
     this.directory = opts.directory;
-    this.pollIntervalMs = Math.max(MIN_POLL_MS, opts.pollIntervalMs ?? DEFAULT_POLL_MS);
+    this.pollIntervalMs = Math.max(
+      MIN_POLL_MS,
+      opts.pollIntervalMs ?? DEFAULT_POLL_MS
+    );
     this.fetchFn = opts.fetch ?? globalThis.fetch.bind(globalThis);
     this.apiKey = opts.apiKey;
   }
@@ -282,25 +245,24 @@ class CmsClient {
   entry(id) {
     return new EntryRef(this, id);
   }
+  /** List CMS collections (TypeSchema entities marked cms=true). */
   async collections() {
     const [entities, facts] = await Promise.all([
       this._entities(),
       this._facts()
     ]);
     const factsByEntity = groupFactsByEntity(facts ?? []);
-    const counts = new Map;
+    const counts = /* @__PURE__ */ new Map();
     for (const e of entities ?? []) {
       const k = typeKey(e.type);
       counts.set(k, (counts.get(k) ?? 0) + 1);
     }
-    const out = new Map;
+    const out = /* @__PURE__ */ new Map();
     for (const e of entities ?? []) {
-      if (e.type !== "TypeSchema")
-        continue;
+      if (e.type !== "TypeSchema") continue;
       const efacts = factsByEntity.get(e.id) ?? [];
       const isCms = efacts.some((f) => f.a === "cms" && f.v === true);
-      if (!isCms)
-        continue;
+      if (!isCms) continue;
       const name = e.id.replace(/^schema:/, "");
       const k = typeKey(name);
       const labelFact = efacts.find((f) => f.a === "label");
@@ -321,12 +283,19 @@ class CmsClient {
     }
     this.subscriptions.clear();
   }
+  /**
+   * Shared polling subscription. Multiple subscribers to the same key share a
+   * single timer and one HTTP request per poll cycle. New subscribers receive
+   * the most recently fetched value immediately if one is cached.
+   *
+   * @internal
+   */
   _share(key, fetcher, callback, extras = {}) {
     let sub = this.subscriptions.get(key);
     if (!sub) {
       const fresh = {
-        subscribers: new Set,
-        interval: undefined,
+        subscribers: /* @__PURE__ */ new Set(),
+        interval: void 0,
         hasLast: false,
         fetcher
       };
@@ -343,14 +312,13 @@ class CmsClient {
             }
           }
         } catch (err) {
-          for (const item2 of fresh.subscribers)
-            item2.onError?.(err);
+          for (const item2 of fresh.subscribers) item2.onError?.(err);
         }
       };
       fresh.interval = setInterval(tick, this.pollIntervalMs);
       this.subscriptions.set(key, fresh);
       sub = fresh;
-      tick();
+      void tick();
     }
     const item = {
       callback,
@@ -372,6 +340,7 @@ class CmsClient {
       }
     };
   }
+  /** @internal */
   async _get(path) {
     const u = new URL(`${this.basePath}${path}`, this.url);
     if (this.directory && !u.searchParams.has("directory")) {
@@ -380,29 +349,37 @@ class CmsClient {
     const res = await this.fetchFn(u.toString(), {
       headers: this.apiKey ? { Authorization: `Bearer ${this.apiKey}` } : {}
     });
-    if (res.status === 404)
-      return;
+    if (res.status === 404) return void 0;
     if (!res.ok)
-      throw new Error(`Trellis CMS request failed (${res.status}) ${u.pathname}`);
+      throw new Error(
+        `Trellis CMS request failed (${res.status}) ${u.pathname}`
+      );
     const kind = res.headers.get("content-type") ?? "";
     const text = await res.text();
     if (!kind.toLowerCase().includes("application/json")) {
-      throw new Error(`Trellis CMS expected JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`);
+      throw new Error(
+        `Trellis CMS expected JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`
+      );
     }
     try {
       return JSON.parse(text);
     } catch (err) {
-      throw new Error(`Trellis CMS invalid JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`, { cause: err });
+      throw new Error(
+        `Trellis CMS invalid JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`,
+        { cause: err }
+      );
     }
   }
+  /** @internal */
   async _entities() {
     const out = [];
     let offset = 0;
     while (true) {
-      const page = await this._get(`/entities?limit=${MAX_ENTITIES_PER_FETCH}&offset=${offset}`) ?? [];
+      const page = await this._get(
+        `/entities?limit=${MAX_ENTITIES_PER_FETCH}&offset=${offset}`
+      ) ?? [];
       out.push(...page);
-      if (page.length < MAX_ENTITIES_PER_FETCH)
-        return out;
+      if (page.length < MAX_ENTITIES_PER_FETCH) return out;
       offset += MAX_ENTITIES_PER_FETCH;
     }
   }
@@ -410,27 +387,28 @@ class CmsClient {
     const out = [];
     let offset = 0;
     while (true) {
-      const page = await this._get(`/facts?limit=${MAX_FACTS_PER_FETCH}&offset=${offset}`) ?? [];
+      const page = await this._get(
+        `/facts?limit=${MAX_FACTS_PER_FETCH}&offset=${offset}`
+      ) ?? [];
       out.push(...page);
-      if (page.length < MAX_FACTS_PER_FETCH)
-        return out;
+      if (page.length < MAX_FACTS_PER_FETCH) return out;
       offset += MAX_FACTS_PER_FETCH;
     }
   }
+  /** @internal */
   async _entryById(id, schemaFacts) {
     const detail = await this._get(`/entity/${encodeURIComponent(id)}`);
-    if (!detail)
-      return null;
+    if (!detail) return null;
     const typeFact = detail.facts.find((f) => f.a === "type");
     const type = typeof typeFact?.v === "string" ? typeFact.v : "unknown";
     const facts = schemaFacts ?? await this._facts() ?? [];
-    return applyFormulas(entryFromFacts({ id: detail.id, type }, detail.facts, detail.links), schemaFields(facts, [type]));
+    return applyFormulas(
+      entryFromFacts({ id: detail.id, type }, detail.facts, detail.links),
+      schemaFields(facts, [type])
+    );
   }
-}
-
-class CollectionRef {
-  client;
-  key;
+};
+var CollectionRef = class {
   constructor(client, key) {
     this.client = client;
     this.key = key;
@@ -444,62 +422,88 @@ class CollectionRef {
       this.client._facts(),
       this.client._get(`/links`)
     ]);
-    if (!allEntities)
-      return [];
+    if (!allEntities) return [];
     const wantedKey = typeKey(this.key);
     const matching = allEntities.filter((e) => typeKey(e.type) === wantedKey);
-    if (matching.length === 0)
-      return [];
+    if (matching.length === 0) return [];
     const factsByEntity = groupFactsByEntity(facts ?? []);
     const linksBySource = groupLinksBySource(links ?? []);
     const defs = schemaFields(facts ?? [], [
       this.key,
       ...matching.map((e) => e.type)
     ]);
-    let entries = matching.map((e) => applyFormulas(entryFromFacts(e, factsByEntity.get(e.id) ?? [], linksBySource.get(e.id) ?? []), defs));
+    let entries = matching.map(
+      (e) => applyFormulas(
+        entryFromFacts(
+          e,
+          factsByEntity.get(e.id) ?? [],
+          linksBySource.get(e.id) ?? []
+        ),
+        defs
+      )
+    );
     if (status !== "all") {
       entries = entries.filter((e) => e.status === status);
     }
     entries = entries.slice(0, limit);
     if (wantsExpand) {
-      entries = await expandReferences(entries, opts.expand, (id) => this.client._entryById(id, facts ?? []));
+      entries = await expandReferences(
+        entries,
+        opts.expand,
+        (id) => this.client._entryById(id, facts ?? [])
+      );
     }
     return entries;
   }
   async get(id, opts = {}) {
     const entry = await this.client._entryById(id);
-    if (!entry)
-      return null;
+    if (!entry) return null;
     if (opts.expand && opts.expand.length > 0) {
-      const [expanded] = await expandReferences([entry], opts.expand, (eid) => this.client._entryById(eid));
+      const [expanded] = await expandReferences(
+        [entry],
+        opts.expand,
+        (eid) => this.client._entryById(eid)
+      );
       return expanded;
     }
     return entry;
   }
+  /**
+   * Subscribe to changes. Currently implemented as polling; a future SSE-backed
+   * upgrade will replace the transport without changing this API.
+   *
+   * Multiple subscribers to the same collection + opts share one polling timer
+   * and one HTTP request per cycle.
+   */
   subscribe(callback, opts = {}) {
     const { onError, equals, ...listOpts } = opts;
     const key = `coll:${typeKey(this.key)}:${JSON.stringify(listOpts)}`;
-    return this.client._share(key, () => this.list(listOpts), callback, { onError, equals });
+    return this.client._share(
+      key,
+      () => this.list(listOpts),
+      callback,
+      { onError, equals }
+    );
   }
   async schema() {
     const facts = await this.client._facts();
     return schemaFields(facts ?? [], [this.key]);
   }
-}
-
-class EntryRef {
-  client;
-  id;
+};
+var EntryRef = class {
   constructor(client, id) {
     this.client = client;
     this.id = id;
   }
   async get(opts = {}) {
     const entry = await this.client._entryById(this.id);
-    if (!entry)
-      return null;
+    if (!entry) return null;
     if (opts.expand && opts.expand.length > 0) {
-      const [expanded] = await expandReferences([entry], opts.expand, (eid) => this.client._entryById(eid));
+      const [expanded] = await expandReferences(
+        [entry],
+        opts.expand,
+        (eid) => this.client._entryById(eid)
+      );
       return expanded;
     }
     return entry;
@@ -507,22 +511,26 @@ class EntryRef {
   subscribe(callback, opts = {}) {
     const { onError, equals, ...getOpts } = opts;
     const key = `entry:${this.id}:${JSON.stringify(getOpts)}`;
-    return this.client._share(key, () => this.get(getOpts), callback, { onError, equals });
+    return this.client._share(
+      key,
+      () => this.get(getOpts),
+      callback,
+      { onError, equals }
+    );
   }
-}
+};
 function createCmsClient(opts) {
   return new CmsClient(opts);
 }
+
 // src/cms/scaffold.ts
 var DEFAULT_URL = "http://localhost:4096";
 function expandLiteral(expand) {
-  if (!expand || expand.length === 0)
-    return "";
+  if (!expand || expand.length === 0) return "";
   return ` expand: ${JSON.stringify(expand)},`;
 }
 function clientLiteral(url, directory) {
-  if (!directory)
-    return `createCmsClient({ url: "${url}" })`;
+  if (!directory) return `createCmsClient({ url: "${url}" })`;
   return `createCmsClient({ url: "${url}", directory: ${JSON.stringify(directory)} })`;
 }
 function vanilla(opts) {
@@ -636,13 +644,13 @@ function scaffoldFilename(opts) {
   }
 }
 export {
-  scaffoldFilename,
-  scaffoldConsumer,
-  parseFields,
-  evaluateFormula,
-  createCmsClient,
-  applyFormulas,
-  EntryRef,
+  CmsClient,
   CollectionRef,
-  CmsClient
+  EntryRef,
+  applyFormulas,
+  createCmsClient,
+  evaluateFormula,
+  parseFields,
+  scaffoldConsumer,
+  scaffoldFilename
 };

package/dist/{config-8hczw0rs.js → config-PFTP67TR.js}

@@ -1,4 +1,3 @@
-// @bun
 import {
   CONFIG_FILE,
   configPath,
@@ -7,14 +6,14 @@ import {
   readConfig,
   updateConfig,
   writeConfig
-} from "./index-xzym9w0m.js";
-import"./index-a76rekgs.js";
+} from "./chunk-JA7AIHRK.js";
+import "./chunk-KFQGP6VL.js";
 export {
-  writeConfig,
-  updateConfig,
-  readConfig,
-  hasConfig,
-  defaultLocalConfig,
+  CONFIG_FILE,
   configPath,
-  CONFIG_FILE
+  defaultLocalConfig,
+  hasConfig,
+  readConfig,
+  updateConfig,
+  writeConfig
 };

package/dist/core/computation/index.d.ts

@@ -0,0 +1,5 @@
+export { ExprEvaluator, evalExpr } from './expr-evaluator.js';
+export type { EvalContext } from './expr-evaluator.js';
+export { evaluateRollup, collectRollupRelatedIds, projectRelationFields, } from './rollup.js';
+export type { RollupEvalContext } from './rollup.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/core/computation/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/computation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC9D,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/dist/core/computation/rollup.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Ontology rollup evaluation — aggregates over graph links or join-entities.
+ */
+import type { EAVStore, Atom } from '../store/eav-store.js';
+import type { PropertyValueSpecification, RollupConfig, SchemaDefinition } from '../ontology/types.js';
+export interface RollupEvalContext {
+    store: EAVStore;
+    entityId: string;
+    schema?: SchemaDefinition;
+    getEntityType?: (entityId: string) => string | undefined;
+}
+/** Collect related entity ids for a rollup field. */
+export declare function collectRollupRelatedIds(rollup: RollupConfig, ctx: RollupEvalContext): string[];
+export declare function evaluateRollup(rollup: RollupConfig, ctx: RollupEvalContext): Atom;
+/** Project ontology relation fields from graph links onto a binding row. */
+export declare function projectRelationFields(binding: Record<string, Atom>, schema: SchemaDefinition, store: EAVStore, entityId: string): void;
+export declare function findRollupField(schema: SchemaDefinition, name: string): PropertyValueSpecification | undefined;
+//# sourceMappingURL=rollup.d.ts.map