@wildwinter/toolkit 0.2.0 → 0.2.2

package/dist/extensions.cjs

@@ -406,7 +406,7 @@ function targetProblems(host, kind, target, path, settings, out) {
     if (!SCALAR_TYPES.includes(claim.type)) {
       out.push(err2("claim-type", atKey(at, "type"), "a claim presents a host field, which is a scalar"));
     } else {
-      typeProblems(host, claim, at, false, out);
+      typeProblems(host, claim, at, false, out, true);
     }
     if (typeof claim.setting !== "string" || !settings.has(claim.setting)) {
       out.push(err2("claim-setting", atKey(at, "setting"), `a claim names its field through a setting, and "${String(claim.setting)}" is not one of the manifest's settings`));
@@ -449,7 +449,7 @@ function fieldListProblems(host, fields, path, topLevel, out) {
     }
   });
 }
-function typeProblems(host, decl, path, named, out) {
+function typeProblems(host, decl, path, named, out, claim = false) {
   const typeAt = atKey(path, "type");
   if (decl.type === "string") {
     out.push(err2("string-type", typeAt, 'the text type is spelled "text"'));
@@ -465,6 +465,7 @@ function typeProblems(host, decl, path, named, out) {
     case "enum":
     case "flags": {
       const values = decl.values;
+      if (claim && values === void 0) break;
       if (!Array.isArray(values) || values.length === 0) {
         out.push(err2("values-empty", at("values"), `an ${decl.type === "enum" ? "enum" : "flags field"} lists its values`));
         sound = false;
@@ -483,6 +484,7 @@ function typeProblems(host, decl, path, named, out) {
       break;
     }
     case "quality": {
+      if (claim && decl.stages === void 0) break;
       for (const p of expr.qualityDeclarationProblems(decl.stages)) {
         out.push(err2(
           `quality-${p.kind === "default-not-a-stage" ? "default" : p.kind}`,
@@ -542,7 +544,11 @@ function typeProblems(host, decl, path, named, out) {
     }
   }
   if (decl.renamedStages !== void 0) renamedStagesProblems(decl, at("renamedStages"), out);
-  if (decl.valueHelp !== void 0) {
+  if (decl.valueHelp !== void 0 && claim) {
+    if (!isObject(decl.valueHelp) || !["enum", "flags", "quality"].includes(decl.type)) {
+      out.push(err2("value-help", at("valueHelp"), "value help describes the values of an enum or flags field, or a quality's stages"));
+    }
+  } else if (decl.valueHelp !== void 0) {
     const vocabulary = decl.type === "quality" ? decl.stages : decl.type === "enum" || decl.type === "flags" ? decl.values : void 0;
     if (vocabulary === void 0 || !isObject(decl.valueHelp)) {
       out.push(err2("value-help", at("valueHelp"), "value help describes the values of an enum or flags field, or a quality's stages"));
@@ -623,10 +629,19 @@ function targetOf(manifest, host, kind) {
   const kinds = manifest?.targets[host];
   return kinds !== void 0 && own(kinds, kind) ? kinds[kind] : void 0;
 }
+function effectiveClaim(claim, hostDecl) {
+  return {
+    ...claim,
+    ...claim.values === void 0 && hostDecl.values !== void 0 ? { values: hostDecl.values } : {},
+    ...claim.stages === void 0 && hostDecl.stages !== void 0 ? { stages: hostDecl.stages } : {},
+    ...claim.default === void 0 && hostDecl.default !== void 0 ? { default: hostDecl.default } : {}
+  };
+}
 
 // src/extensions/merge.ts
 var ATOMIC = { kind: "atomic" };
 var SET = { kind: "set" };
+var COMMENTS = { kind: "comments" };
 var mapOf = (of) => ({ kind: "map", of });
 var keyedBy = (key, of, opts) => ({
   kind: "keyed",
@@ -669,6 +684,7 @@ function hasShape(spec, v) {
       return true;
     case "set":
     case "keyed":
+    case "comments":
       return Array.isArray(v);
     case "map":
     case "object":
@@ -708,6 +724,8 @@ function mergeValue(spec, b, o, t, id, path, ctx) {
     }
     case "keyed":
       return mergeKeyed(spec, asArr(b), o, t, path, ctx);
+    case "comments":
+      return mergeThreads(asArr(b), o, t, path, ctx);
   }
 }
 function mergeKeyed(spec, B, O, T, path, ctx) {
@@ -786,6 +804,70 @@ function preservedOrder(B, O, T, survivors, path, ctx) {
   for (const k of [...survivors.keys()].sort()) if (!result.includes(k)) result.push(k);
   return result;
 }
+function mergeComments(base, ours, theirs, opts) {
+  return mergeTree(COMMENTS, base, ours, theirs, opts);
+}
+function mergeThreads(B, O, T, path, ctx) {
+  const index = (arr) => {
+    const m = /* @__PURE__ */ new Map();
+    for (const c of arr) if (isObject(c) && typeof c["id"] === "string") m.set(c["id"], c);
+    return m;
+  };
+  const Bm = index(B), Om = index(O), Tm = index(T);
+  const out = [];
+  for (const id of /* @__PURE__ */ new Set([...Bm.keys(), ...Om.keys(), ...Tm.keys()])) {
+    const b = Bm.get(id), o = Om.get(id), t = Tm.get(id);
+    const here = `${path}[${id}]`;
+    if (o === void 0 && t === void 0) continue;
+    if (![b, o, t].some((c) => Array.isArray(c?.["messages"]))) {
+      const v = o !== void 0 && t !== void 0 ? merge3(b, o, t, id, here, ctx) : b !== void 0 && ctx.eq(o ?? t, b) ? void 0 : o ?? t;
+      if (isObject(v)) out.push(v);
+      continue;
+    }
+    const messages = mergeMessages(b, o, t, id, here, ctx);
+    if (messages.length === 0 || messages.every((m) => m["deleted"] === true)) continue;
+    const fields = {};
+    if (o !== void 0 && t !== void 0) {
+      const B0 = b ?? {};
+      const flag = (c, k) => k === "resolved" ? c[k] === true ? true : void 0 : c[k];
+      for (const k of /* @__PURE__ */ new Set([...Object.keys(o), ...Object.keys(t), ...Object.keys(B0)])) {
+        if (k === "messages") continue;
+        const v = merge3(flag(B0, k), flag(o, k), flag(t, k), id, `${here}.${k}`, ctx);
+        if (v !== void 0) fields[k] = v;
+      }
+    } else {
+      for (const [k, v] of Object.entries(o ?? t)) if (k !== "messages") fields[k] = v;
+    }
+    out.push({ ...fields, messages });
+  }
+  const first = (c) => {
+    const m = asArr(c["messages"])[0];
+    return isObject(m) && typeof m["ts"] === "string" ? m["ts"] : "";
+  };
+  return out.sort((x, y) => first(x).localeCompare(first(y)) || String(x["id"]).localeCompare(String(y["id"])));
+}
+function mergeMessages(b, o, t, id, here, ctx) {
+  const keyOf = (m) => `${String(m["author"] ?? "")}|${String(m["ts"] ?? "")}`;
+  const index = (c) => {
+    const m = /* @__PURE__ */ new Map();
+    for (const x of asArr(c?.["messages"])) if (isObject(x)) m.set(keyOf(x), x);
+    return m;
+  };
+  const Bm = index(b), Om = index(o), Tm = index(t);
+  const out = [];
+  for (const k of /* @__PURE__ */ new Set([...Bm.keys(), ...Om.keys(), ...Tm.keys()])) {
+    const mb = Bm.get(k), mo = Om.get(k), mt = Tm.get(k);
+    if ([mb, mo, mt].some((m) => m?.["deleted"] === true) || mb !== void 0 && (mo === void 0 || mt === void 0)) {
+      out.push({ ...mo ?? mt ?? mb, body: "", deleted: true });
+    } else if (mo !== void 0 && mt !== void 0) {
+      out.push(merge3(mb, mo, mt, id, `${here}.messages[${k}]`, ctx));
+    } else {
+      out.push(mo ?? mt);
+    }
+  }
+  const ts = (m) => String(m["ts"] ?? "");
+  return out.sort((x, y) => ts(x).localeCompare(ts(y)) || String(x["author"] ?? "").localeCompare(String(y["author"] ?? "")));
+}
 function strategyForType(decl) {
   switch (decl.type) {
     case "flags":
@@ -894,6 +976,7 @@ function orphanedEntries(data, exists) {
 }
 
 exports.ATOMIC = ATOMIC;
+exports.COMMENTS = COMMENTS;
 exports.HOSTS = HOSTS;
 exports.MANIFEST_FILE_SUFFIX = MANIFEST_FILE_SUFFIX;
 exports.MANIFEST_SCHEMA = MANIFEST_SCHEMA;
@@ -907,12 +990,14 @@ exports.claimClashes = claimClashes;
 exports.compileEntry = compileEntry;
 exports.compiledTarget = compiledTarget;
 exports.defaultOf = defaultOf;
+exports.effectiveClaim = effectiveClaim;
 exports.entryProblems = entryProblems;
 exports.extensionDataStrategy = extensionDataStrategy;
 exports.keyedBy = keyedBy;
 exports.manifestProblems = manifestProblems;
 exports.mapOf = mapOf;
 exports.markUnresolved = markUnresolved;
+exports.mergeComments = mergeComments;
 exports.mergeExtensionData = mergeExtensionData;
 exports.mergeTree = mergeTree;
 exports.objectOf = objectOf;