@wildwinter/toolkit 0.2.6 → 0.3.0

package/dist/extensions.cjs

@@ -14,13 +14,11 @@ var MANIFEST_FILE_SUFFIX = ".extension.json";
 var HOSTS = {
   patter: {
     kinds: ["scene", "block", "snippet", "line", "text", "gameEvent", "option", "project"],
-    references: ["cast", "scene", "block", "snippet", "line"],
-    claimable: ["scene", "block", "snippet", "line", "text", "gameEvent", "option"]
+    references: ["cast", "scene", "block", "snippet", "line"]
   },
   storylets: {
     kinds: ["box", "tagGroup", "tag", "deck", "card", "outcome", "handTemplate", "hand", "project"],
-    references: ["box", "deck", "card", "outcome", "tag"],
-    claimable: ["card", "outcome"]
+    references: ["box", "deck", "card", "outcome", "tag"]
   }
 };
 var SCALAR_TYPES = ["text", "multiline", "number", "boolean", "enum", "flags", "quality"];
@@ -368,9 +366,14 @@ var VERSION = /^\d+\.\d+\.\d+$/;
 var NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var TYPE_KEYS = ["type", "values", "stages", "renamedStages", "to", "from", "fields", "key", "of", "id", "min", "max", "valueHelp", "default"];
 var FIELD_KEYS = /* @__PURE__ */ new Set([...TYPE_KEYS, "name", "label", "help", "required", "group", "editorOnly"]);
-var CLAIM_KEYS = /* @__PURE__ */ new Set([...TYPE_KEYS, "setting", "label", "help", "required"]);
 var BARE_KEYS = new Set(TYPE_KEYS);
-var MANIFEST_KEYS = /* @__PURE__ */ new Set(["schema", "id", "name", "version", "docs", "settings", "targets", "views", "reads"]);
+var MANIFEST_KEYS = /* @__PURE__ */ new Set(["schema", "id", "name", "version", "docs", "targets", "views", "reads"]);
+var REMOVED_MANIFEST_KEYS = {
+  settings: "settings were removed with claims; declare the extension's own fields, or a project field for a project-wide value"
+};
+var REMOVED_TARGET_KEYS = {
+  claims: "claims on host fields were removed; declare a field of the extension's own, which the runtimes hand the game"
+};
 var VIEW_KEYS = /* @__PURE__ */ new Set(["id", "name", "entry", "element", "hosts"]);
 var ELEMENT = /^[a-z][a-z0-9._]*-[a-z0-9._-]*$/;
 var err2 = (code, path, message) => ({ severity: "error", code, path, message });
@@ -381,7 +384,7 @@ function manifestProblems(manifest) {
   const out = [];
   if (!isObject(manifest)) return [err2("not-an-object", "", "a manifest is a JSON object")];
   const m = manifest;
-  unknownKeys(m, MANIFEST_KEYS, "", out);
+  unknownKeys(m, MANIFEST_KEYS, "", out, REMOVED_MANIFEST_KEYS);
   if (m["schema"] !== MANIFEST_SCHEMA) {
     out.push(err2("schema", "schema", `the schema tag is ${JSON.stringify(m["schema"])}, not "${MANIFEST_SCHEMA}"`));
   }
@@ -393,7 +396,6 @@ function manifestProblems(manifest) {
     out.push(err2("version", "version", "the version is major.minor.patch, such as 1.0.0"));
   }
   if (m["docs"] !== void 0 && typeof m["docs"] !== "string") out.push(err2("docs", "docs", "docs is a link, as text"));
-  const settings = settingsProblems(m["settings"], out);
   viewsProblems(m["views"], m["targets"], out);
   readsProblems(m["reads"], m["id"], out);
   const targets = m["targets"];
@@ -418,12 +420,16 @@ function manifestProblems(manifest) {
         out.push(err2("unknown-kind", kindPath, `"${kind}" is not a node kind of ${host}; it has ${spec.kinds.join(", ")}`));
         continue;
       }
-      targetProblems(host, kind, target, kindPath, settings, out);
+      targetProblems(host, target, kindPath, out);
     }
     pickListProblems(kinds, hostPath, out);
   }
   return out;
 }
+function pickWords(from) {
+  if (!Array.isArray(from)) return [];
+  return from.flatMap((s) => isObject(s) && Array.isArray(s["words"]) ? s["words"].filter((w) => typeof w === "string") : []);
+}
 function pickSourcesSound(host, from, path, out) {
   if (!Array.isArray(from) || from.length === 0) {
     out.push(err2("pick-from", path, 'a pick lists its sources in "from": { "words": [...] }, { "to": a node kind }, or { "list": a project list }'));
@@ -560,81 +566,23 @@ function viewsFor(manifest, host) {
   const targeted = Object.keys(manifest.targets ?? {});
   return (Array.isArray(manifest.views) ? manifest.views : []).filter((v) => isObject(v) && typeof v.id === "string" && ID.test(v.id) && typeof v.name === "string" && isViewEntry(v.entry) && typeof v.element === "string" && ELEMENT.test(v.element) && (v.hosts === void 0 ? targeted.includes(host) : Array.isArray(v.hosts) && v.hosts.includes(host)));
 }
-function unknownKeys(obj, known, path, out) {
+function unknownKeys(obj, known, path, out, removed = {}) {
   for (const k of Object.keys(obj)) {
-    if (!known.has(k)) {
+    if (own(removed, k)) {
+      out.push({ severity: "warning", code: "removed-key", path: atKey(path, k), message: `"${k}" is ignored: ${removed[k]}` });
+    } else if (!known.has(k)) {
       out.push({ severity: "warning", code: "unknown-key", path: atKey(path, k), message: `"${k}" means nothing here; it is ignored` });
     }
   }
 }
-function settingsProblems(settings, out) {
-  const names = /* @__PURE__ */ new Set();
-  if (settings === void 0) return names;
-  if (!Array.isArray(settings)) {
-    out.push(err2("not-a-list", "settings", "settings are a list"));
-    return names;
-  }
-  settings.forEach((s, i) => {
-    const at = atIndex("settings", i);
-    if (!isObject(s)) {
-      out.push(err2("not-an-object", at, "a setting is an object"));
-      return;
-    }
-    const name = s["name"];
-    if (typeof name !== "string" || !NAME.test(name)) {
-      out.push(err2("setting-name", atKey(at, "name"), "a setting's name is an identifier"));
-    } else if (names.has(name)) {
-      out.push(err2("setting-duplicate", atKey(at, "name"), `setting "${name}" is declared twice`));
-    } else {
-      names.add(name);
-    }
-    const dflt = s.default;
-    if (typeof dflt !== "string" || !NAME.test(dflt)) {
-      out.push(err2("setting-default", atKey(at, "default"), "a setting names a host field by default, so its default is a field name"));
-    }
-  });
-  return names;
-}
-function targetProblems(host, kind, target, path, settings, out) {
+function targetProblems(host, target, path, out) {
   if (!isObject(target)) {
     out.push(err2("not-an-object", path, "a target is an object"));
     return;
   }
-  unknownKeys(target, /* @__PURE__ */ new Set(["fields", "claims"]), path, out);
+  unknownKeys(target, /* @__PURE__ */ new Set(["fields"]), path, out, REMOVED_TARGET_KEYS);
   const t = target;
   if (t.fields !== void 0) fieldListProblems(host, t.fields, atKey(path, "fields"), true, out);
-  if (t.claims === void 0) return;
-  if (!Array.isArray(t.claims)) {
-    out.push(err2("not-a-list", atKey(path, "claims"), "claims are a list"));
-    return;
-  }
-  const claimable = HOSTS[host].claimable.includes(kind);
-  const claimed = /* @__PURE__ */ new Set();
-  t.claims.forEach((c, i) => {
-    const at = atIndex(atKey(path, "claims"), i);
-    if (!claimable) {
-      out.push(err2("claim-kind", at, `a ${kind} has no host fields to claim; ${host} has them on ${HOSTS[host].claimable.join(", ")}`));
-      return;
-    }
-    if (!isObject(c)) {
-      out.push(err2("not-an-object", at, "a claim is an object"));
-      return;
-    }
-    const claim = c;
-    unknownKeys(c, CLAIM_KEYS, at, 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, 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`));
-    } else if (claimed.has(claim.setting)) {
-      out.push(err2("claim-duplicate", atKey(at, "setting"), `setting "${claim.setting}" is claimed twice for one kind`));
-    } else {
-      claimed.add(claim.setting);
-    }
-  });
 }
 function fieldListProblems(host, fields, path, topLevel, out) {
   if (!Array.isArray(fields)) {
@@ -668,7 +616,7 @@ function fieldListProblems(host, fields, path, topLevel, out) {
     }
   });
 }
-function typeProblems(host, decl, path, named, out, claim = false) {
+function typeProblems(host, decl, path, named, out) {
   const typeAt = atKey(path, "type");
   if (decl.type === "string") {
     out.push(err2("string-type", typeAt, 'the text type is spelled "text"'));
@@ -684,7 +632,6 @@ function typeProblems(host, decl, path, named, out, claim = false) {
     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;
@@ -703,7 +650,6 @@ function typeProblems(host, decl, path, named, out, claim = false) {
       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}`,
@@ -766,17 +712,15 @@ function typeProblems(host, decl, path, named, out, claim = false) {
     }
   }
   if (decl.renamedStages !== void 0) renamedStagesProblems(decl, at("renamedStages"), out);
-  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 (decl.valueHelp !== void 0) {
+    const vocabulary = decl.type === "quality" ? decl.stages : decl.type === "enum" || decl.type === "flags" ? decl.values : decl.type === "pick" ? pickWords(decl.from) : 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"));
+      out.push(err2("value-help", at("valueHelp"), "value help describes the values of an enum or flags field, a quality's stages, or a pick's words"));
     } else {
       for (const k of Object.keys(decl.valueHelp)) {
-        if (!vocabulary.includes(k)) out.push(err2("value-help", atKey(at("valueHelp"), k), `"${k}" is not one of its values`));
+        if (!vocabulary.includes(k)) {
+          out.push(err2("value-help", atKey(at("valueHelp"), k), decl.type === "pick" ? `"${k}" is not one of its words: value help describes a pick's fixed words, never the project's lists or nodes` : `"${k}" is not one of its values`));
+        }
       }
     }
   }
@@ -809,56 +753,10 @@ function renamedStagesProblems(decl, path, out) {
     }
   }
 }
-function settingValues(manifest, chosen) {
-  const out = {};
-  for (const s of manifest.settings ?? []) {
-    const v = chosen !== void 0 && own(chosen, s.name) ? chosen[s.name] : void 0;
-    out[s.name] = typeof v === "string" && v !== "" ? v : s.default;
-  }
-  return out;
-}
-function resolvedClaims(manifest, host, chosen) {
-  const settings = settingValues(manifest, chosen);
-  const out = [];
-  for (const [kind, target] of Object.entries(manifest.targets[host] ?? {})) {
-    for (const claim of target.claims ?? []) {
-      const field = settings[claim.setting];
-      if (field !== void 0) out.push({ extension: manifest.id, host, kind, field, claim });
-    }
-  }
-  return out;
-}
-function claimClashes(claims) {
-  const out = [];
-  const first = /* @__PURE__ */ new Map();
-  for (const c of claims) {
-    const key = `${c.host}\0${c.kind}\0${c.field}`;
-    const prior = first.get(key);
-    if (prior === void 0) {
-      first.set(key, c);
-      continue;
-    }
-    if (prior.extension === c.extension) continue;
-    out.push(err2(
-      "claim-clash",
-      `${c.kind}.${c.field}`,
-      `extensions "${prior.extension}" and "${c.extension}" both claim the ${c.kind} field "${c.field}"`
-    ));
-  }
-  return out;
-}
 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" };
@@ -1208,11 +1106,9 @@ exports.UNRESOLVED_KEY = UNRESOLVED_KEY;
 exports.VALUE_TYPES = VALUE_TYPES;
 exports.atIndex = atIndex;
 exports.atKey = atKey;
-exports.claimClashes = claimClashes;
 exports.compileEntry = compileEntry;
 exports.compiledTarget = compiledTarget;
 exports.defaultOf = defaultOf;
-exports.effectiveClaim = effectiveClaim;
 exports.entryProblems = entryProblems;
 exports.extensionDataStrategy = extensionDataStrategy;
 exports.isTextList = isTextList;
@@ -1231,8 +1127,6 @@ exports.pickChoices = pickChoices;
 exports.pickClashes = pickClashes;
 exports.pickLists = pickLists;
 exports.renameStages = renameStages;
-exports.resolvedClaims = resolvedClaims;
-exports.settingValues = settingValues;
 exports.stableStringify = stableStringify;
 exports.strategyForTarget = strategyForTarget;
 exports.strategyForType = strategyForType;