@istar-ts/core 0.8.0 → 0.8.1

package/README.md

@@ -225,6 +225,9 @@ const model = parsePistar(text, { metamodel: RATIONAL_AGENTS });
   need no extra argument. The association lives beside the model (`metamodelOf`), never in it:
   models keep their shape, and nothing reaches JSON or disk. A model rebuilt with an object
   spread loses it; `withMetamodel(model, metamodel)` restores it.
+- **Predicates.** `isActor` / `isNode` answer for iStar 2.0 and take one argument, so they stay
+  safe as `filter` callbacks. For extended kinds use `isActorIn(metamodel)` / `isNodeIn(metamodel)`,
+  which return a predicate: `elements.filter(isActorIn(metamodelOf(model)))`.
 - **Types.** `ElementKind`, `LinkKind` and the other iStar 2.0 exports are unchanged.
   `IstarModel<EK, LK>`, `ModelStore<EK, LK>` and `Metamodel<EK, LK>` default to them, and
   `extendMetamodel` types the new kinds (`ElementKindOf<typeof RATIONAL_AGENTS>`).

package/dist/index.cjs

@@ -415,13 +415,27 @@ function createEmptyModel(diagram = DEFAULT_DIAGRAM, options = {}) {
 function metamodelOf(model) {
 	return metamodels.get(model) ?? ISTAR_2_0;
 }
-/** True for actor-category elements; pass the metamodel for extended actor kinds. */
-function isActor(element, metamodel = ISTAR_2_0) {
-	return element !== void 0 && isActorKindIn(metamodel, element.kind);
+/**
+* True for iStar 2.0 actors (Actor, Agent, Role). One argument, so it is safe as an array
+* callback (`elements.filter(isActor)`). For extended actor kinds use `isActorIn(metamodel)`.
+*/
+function isActor(element) {
+	return element !== void 0 && isActorKindIn(ISTAR_2_0, element.kind);
+}
+/** True for iStar 2.0 intentional elements. For extended kinds use `isNodeIn(metamodel)`. */
+function isNode(element) {
+	return element !== void 0 && !isActorKindIn(ISTAR_2_0, element.kind);
 }
-/** True for node-category elements; pass the metamodel for extended node kinds. */
-function isNode(element, metamodel = ISTAR_2_0) {
-	return element !== void 0 && !isActorKindIn(metamodel, element.kind);
+/**
+* A predicate for actor-category elements of `metamodel`, extended actor kinds included:
+* `elements.filter(isActorIn(metamodelOf(model)))`.
+*/
+function isActorIn(metamodel) {
+	return (element) => element !== void 0 && isActorKindIn(metamodel, element.kind);
+}
+/** A predicate for node-category elements of `metamodel`, extended node kinds included. */
+function isNodeIn(metamodel) {
+	return (element) => element !== void 0 && metamodel.elements.get(element.kind)?.category === "node";
 }
 /** Inner elements of an actor, in model order. */
 function childrenOf(model, actorId) {
@@ -690,13 +704,8 @@ const CHECKS = {
 	"istar.ContributionLink": contributionLink,
 	"istar.QualificationLink": qualificationLink
 };
-/**
-* Re-validates every link of a model, the way piStar does when loading a file: dependencies
-* first (each checked before its own links are added), then the remaining links in file
-* order, each against the graph built so far. Invalid links are reported, not removed.
-*/
-function validateModel(model, options = {}) {
-	const metamodel = options.metamodel ?? metamodelOf(model);
+function validateModel(model, options) {
+	const metamodel = (typeof options === "object" && options !== null ? options.metamodel : void 0) ?? metamodelOf(model);
 	const any = model;
 	const issues = [];
 	const accepted = /* @__PURE__ */ new Map();
@@ -1076,7 +1085,7 @@ function typed(model) {
 function metaOf(model) {
 	return metamodelOf(model);
 }
-function isActorIn(model, kind) {
+function isActorIn$1(model, kind) {
 	return metaOf(model).elements.get(kind)?.category === "actor";
 }
 function derive(from, changes) {
@@ -1109,7 +1118,7 @@ function addElement(model, input, ctx = {}) {
 	if (m.elements.has(id) || m.links.has(id)) throw new ModelOperationError(`id "${id}" is already in use`);
 	if (input.parent !== void 0) {
 		if (definition.category === "actor") throw new ModelOperationError("actors cannot be nested");
-		if (!isActorIn(m, requireElement(m, input.parent).kind)) throw new ModelOperationError(`parent "${input.parent}" is not an actor`);
+		if (!isActorIn$1(m, requireElement(m, input.parent).kind)) throw new ModelOperationError(`parent "${input.parent}" is not an actor`);
 	}
 	const element = withoutUndefined({
 		id,
@@ -1161,7 +1170,7 @@ function moveElement(model, id, x, y) {
 		x,
 		y
 	});
-	if (isActorIn(m, current.kind)) {
+	if (isActorIn$1(m, current.kind)) {
 		for (const child of m.elements.values()) if (child.parent === id) elements.set(child.id, {
 			...child,
 			x: child.x + dx,
@@ -1178,10 +1187,10 @@ function moveElement(model, id, x, y) {
 function nestElement(model, id, parent) {
 	const m = any(model);
 	const current = requireElement(m, id);
-	if (isActorIn(m, current.kind)) throw new ModelOperationError("actors cannot be nested");
+	if (isActorIn$1(m, current.kind)) throw new ModelOperationError("actors cannot be nested");
 	if (current.isDependum) throw new ModelOperationError("a dependum cannot be nested");
 	if ((current.parent ?? null) === parent) return model;
-	if (parent !== null && !isActorIn(m, requireElement(m, parent).kind)) throw new ModelOperationError(`parent "${parent}" is not an actor`);
+	if (parent !== null && !isActorIn$1(m, requireElement(m, parent).kind)) throw new ModelOperationError(`parent "${parent}" is not an actor`);
 	const elements = new Map(m.elements);
 	elements.delete(id);
 	const { parent: _old, ...rest } = current;
@@ -1878,6 +1887,7 @@ exports.getSourceLayout = getSourceLayout;
 exports.inheritMetamodel = inheritMetamodel;
 exports.inheritSourceLayout = inheritSourceLayout;
 exports.isActor = isActor;
+exports.isActorIn = isActorIn;
 exports.isActorKind = isActorKind;
 exports.isActorKindIn = isActorKindIn;
 exports.isActorLinkKind = isActorLinkKind;
@@ -1886,6 +1896,7 @@ exports.isDependencyLinkKind = isDependencyLinkKind;
 exports.isElementKind = isElementKind;
 exports.isLinkKind = isLinkKind;
 exports.isNode = isNode;
+exports.isNodeIn = isNodeIn;
 exports.isNodeKind = isNodeKind;
 exports.isNodeKindIn = isNodeKindIn;
 exports.isNodeLinkKind = isNodeLinkKind;