@istar-ts/core 0.13.3 → 0.13.4

package/dist/index.d.cts

@@ -715,7 +715,17 @@ export interface SourceLayout {
   readonly keys: readonly string[];
   /** `display` ids in file order. */
   readonly display: readonly string[];
+  /**
+   * Each element's, link's and hub entry's keys in file order, by id (a hub's entry under
+   * `hubEntryLayoutKey(id)`), and the diagram's under `DIAGRAM_LAYOUT_KEY`. Files written by
+   * other tools order keys differently from piStar; this keeps them as they were.
+   */
+  readonly objects?: ReadonlyMap<string, readonly string[]>;
 }
+/** The `objects` key of a hub's entry (`{ hub, starts, end }`) in a `SourceLayout`. */
+export declare function hubEntryLayoutKey(hubId: string): string;
+/** The `objects` key of the diagram in a `SourceLayout`. */
+export declare const DIAGRAM_LAYOUT_KEY = "\0diagram";
 /** The key order recorded when `model` was parsed, if it came from `parsePistar`. */
 export declare function getSourceLayout<EK extends string, LK extends string>(model: IstarModel<EK, LK>): SourceLayout | undefined;
 /**
@@ -767,8 +777,8 @@ export interface ToPistarOptions {
   metamodel?: AnyMetamodel;
   /**
    * Value for `saveDate`. Defaults to the model's own `saveDate` (so a load/save round trip is
-   * lossless), or the current time for models that never had one. Pass `new Date()` when
-   * saving an edited model, as piStar does.
+   * lossless); a parsed file that had none keeps none, and a model that was never a file gets
+   * the current time. Pass `new Date()` when saving an edited model, as piStar does.
    */
   saveDate?: string | Date;
 }

package/dist/index.d.ts

@@ -715,7 +715,17 @@ export interface SourceLayout {
   readonly keys: readonly string[];
   /** `display` ids in file order. */
   readonly display: readonly string[];
+  /**
+   * Each element's, link's and hub entry's keys in file order, by id (a hub's entry under
+   * `hubEntryLayoutKey(id)`), and the diagram's under `DIAGRAM_LAYOUT_KEY`. Files written by
+   * other tools order keys differently from piStar; this keeps them as they were.
+   */
+  readonly objects?: ReadonlyMap<string, readonly string[]>;
 }
+/** The `objects` key of a hub's entry (`{ hub, starts, end }`) in a `SourceLayout`. */
+export declare function hubEntryLayoutKey(hubId: string): string;
+/** The `objects` key of the diagram in a `SourceLayout`. */
+export declare const DIAGRAM_LAYOUT_KEY = "\0diagram";
 /** The key order recorded when `model` was parsed, if it came from `parsePistar`. */
 export declare function getSourceLayout<EK extends string, LK extends string>(model: IstarModel<EK, LK>): SourceLayout | undefined;
 /**
@@ -767,8 +777,8 @@ export interface ToPistarOptions {
   metamodel?: AnyMetamodel;
   /**
    * Value for `saveDate`. Defaults to the model's own `saveDate` (so a load/save round trip is
-   * lossless), or the current time for models that never had one. Pass `new Date()` when
-   * saving an edited model, as piStar does.
+   * lossless); a parsed file that had none keeps none, and a model that was never a file gets
+   * the current time. Pass `new Date()` when saving an edited model, as piStar does.
    */
   saveDate?: string | Date;
 }

package/dist/index.js

@@ -1234,6 +1234,12 @@ var PistarParseError = class extends Error {
 var PistarWriteError = class extends Error {
 	name = "PistarWriteError";
 };
+/** The `objects` key of a hub's entry (`{ hub, starts, end }`) in a `SourceLayout`. */
+function hubEntryLayoutKey(hubId) {
+	return `${hubId}\u0000entry`;
+}
+/** The `objects` key of the diagram in a `SourceLayout`. */
+const DIAGRAM_LAYOUT_KEY = "\0diagram";
 const layouts = /* @__PURE__ */ new WeakMap();
 /** The key order recorded when `model` was parsed, if it came from `parsePistar`. */
 function getSourceLayout(model) {
@@ -1341,6 +1347,7 @@ function parsePistar(input, options = {}) {
 		usedDisplay.add(id);
 		return entry;
 	};
+	const objects = /* @__PURE__ */ new Map();
 	const readElement = (raw, where, known, extras) => {
 		if (!isRecord(raw)) throw new PistarParseError(`${where}: expected an object`);
 		const { id, type } = raw;
@@ -1360,6 +1367,7 @@ function parsePistar(input, options = {}) {
 			...optional("extra", extraOf(raw, known))
 		};
 		elements.set(id, element);
+		objects.set(id, Object.keys(raw));
 		return element;
 	};
 	asArray(json.actors, "actors").forEach((raw, i) => {
@@ -1404,12 +1412,14 @@ function parsePistar(input, options = {}) {
 			...optional("extra", extraOf(raw, LINK_KEYS))
 		};
 		links.set(id, link);
+		objects.set(id, Object.keys(raw));
 		return link;
 	};
 	const readHubEntry = (raw, where) => {
 		const hub = readElement(raw.hub, `${where}.hub`, HUB_KEYS, {});
 		const hubKind = metamodel.elements.get(hub.kind);
 		if (hubKind?.role !== "hub") throw new PistarParseError(`${where}.hub (${hub.id}): ${hub.kind} is not a hub kind`);
+		objects.set(hubEntryLayoutKey(hub.id), Object.keys(raw));
 		const entryExtra = extraOf(raw, HUB_ENTRY_KEYS);
 		if (entryExtra) elements.set(hub.id, {
 			...hub,
@@ -1447,6 +1457,7 @@ function parsePistar(input, options = {}) {
 			...isRecord(d.customProperties) ? { customProperties: d.customProperties } : {},
 			...optional("extra", extraOf(d, DIAGRAM_KEYS))
 		};
+		objects.set(DIAGRAM_LAYOUT_KEY, Object.keys(d));
 	}
 	const model = {
 		elements,
@@ -1460,7 +1471,8 @@ function parsePistar(input, options = {}) {
 	};
 	layouts.set(model, {
 		keys: Object.keys(json),
-		display: Object.keys(display)
+		display: Object.keys(display),
+		objects
 	});
 	setHostMetamodel(model, host);
 	return withMetamodel(model, metamodel);
@@ -1533,6 +1545,19 @@ function pistarTypeOf(type, kind, metamodel) {
 	if (type === void 0) throw new PistarWriteError(`kind "${kind}" is not part of ${metamodel.name}; pass its metamodel (toPistar(model, { metamodel }) or withMetamodel)`);
 	return type;
 }
+/**
+* `value` with its keys in the order `keys` gives (those present), then the rest as built (piStar's
+* order): an object read from a file is written back with the file's key order, and keys the
+* file lacked follow.
+*/
+function inSourceOrder(value, keys) {
+	if (!keys) return value;
+	const result = {};
+	const record = value;
+	for (const key of keys) if (key in record) result[key] = record[key];
+	for (const key of Object.keys(record)) if (!(key in result)) result[key] = record[key];
+	return result;
+}
 function elementJson(element, metamodel) {
 	return {
 		id: element.id,
@@ -1553,38 +1578,40 @@ function toPistarObject(input, options = {}) {
 	const orphans = [];
 	const dependencies = [];
 	const children = /* @__PURE__ */ new Map();
+	const layout = layouts.get(model);
+	const sourceOrder = (id, value) => inSourceOrder(value, layout?.objects?.get(id));
 	for (const element of model.elements.values()) {
 		if (isHub(element)) continue;
 		if (element.parent !== void 0 && !isActorKind(element.kind)) {
 			let list = children.get(element.parent);
 			if (!list) children.set(element.parent, list = []);
-			list.push({
+			list.push(sourceOrder(element.id, {
 				...elementJson(element, metamodel),
 				...element.extra
-			});
+			}));
 		}
 	}
 	for (const element of model.elements.values()) {
 		if (isHub(element)) continue;
-		if (isActorKind(element.kind)) actors.push({
+		if (isActorKind(element.kind)) actors.push(sourceOrder(element.id, {
 			...elementJson(element, metamodel),
 			nodes: children.get(element.id) ?? [],
 			...element.extra
-		});
+		}));
 		else if (element.isDependum) {
 			const { inbound, outbound } = dependencyLinksOf(model, element.id);
-			dependencies.push({
+			dependencies.push(sourceOrder(element.id, {
 				...elementJson(element, metamodel),
 				source: inbound?.source ?? element.dependency?.source ?? "",
 				target: outbound?.target ?? element.dependency?.target ?? "",
 				...element.extra
-			});
-		} else if (element.parent === void 0 || !model.elements.has(element.parent)) orphans.push({
+			}));
+		} else if (element.parent === void 0 || !model.elements.has(element.parent)) orphans.push(sourceOrder(element.id, {
 			...elementJson(element, metamodel),
 			...element.extra
-		});
+		}));
 	}
-	const linkJson = (link) => ({
+	const linkJson = (link) => sourceOrder(link.id, {
 		id: link.id,
 		type: pistarTypeOf(metamodel.links.get(link.kind)?.pistarType, link.kind, metamodel),
 		source: link.source,
@@ -1616,19 +1643,19 @@ function toPistarObject(input, options = {}) {
 	const hubEntry = (hub) => {
 		const parts = hubs.get(hub.id) ?? { legs: [] };
 		const { [HUB_ENTRY_KEY]: entryExtra, ...hubExtra } = hub.extra ?? {};
-		return {
-			hub: {
+		return sourceOrder(hubEntryLayoutKey(hub.id), {
+			hub: sourceOrder(hub.id, {
 				id: hub.id,
 				type: pistarTypeOf(metamodel.elements.get(hub.kind)?.pistarType, hub.kind, metamodel),
 				x: hub.x,
 				y: hub.y,
 				...hub.customProperties ? { customProperties: { ...hub.customProperties } } : {},
 				...hubExtra
-			},
+			}),
 			starts: parts.legs.map(linkJson),
 			...parts.end ? { end: linkJson(parts.end) } : {},
 			...isRecord(entryExtra) ? entryExtra : {}
-		};
+		});
 	};
 	const links = [];
 	const written = /* @__PURE__ */ new Set();
@@ -1642,7 +1669,6 @@ function toPistarObject(input, options = {}) {
 		}
 	}
 	for (const element of model.elements.values()) if (isHub(element) && !written.has(element.id)) links.push(hubEntry(element));
-	const layout = layouts.get(model);
 	const display = {};
 	const displayOf = (id) => {
 		const owner = model.elements.get(id) ?? model.links.get(id);
@@ -1657,15 +1683,16 @@ function toPistarObject(input, options = {}) {
 	for (const [id, entry] of Object.entries(model.extraDisplay ?? {})) if (!(id in display)) display[id] = entry;
 	let saveDate;
 	if (options.saveDate instanceof Date) saveDate = formatDate(options.saveDate);
-	else saveDate = options.saveDate ?? model.saveDate ?? formatDate(/* @__PURE__ */ new Date());
+	else if (options.saveDate !== void 0 || model.saveDate !== void 0) saveDate = options.saveDate ?? model.saveDate;
+	else if (!layout || layout.keys.includes("saveDate")) saveDate = formatDate(/* @__PURE__ */ new Date());
 	const d = model.diagram;
-	const diagram = d && {
+	const diagram = d && sourceOrder("\0diagram", {
 		...d.width !== void 0 ? { width: d.width } : {},
 		...d.height !== void 0 ? { height: d.height } : {},
 		...d.name !== void 0 ? { name: d.name } : {},
 		...d.customProperties ? { customProperties: { ...d.customProperties } } : {},
 		...d.extra
-	};
+	});
 	const values = {
 		...model.extra,
 		actors,
@@ -2843,6 +2870,6 @@ function fromNodeIdDiagnostics(diagnostics) {
 	return result;
 }
 //#endregion
-export { ACTOR_KINDS, ACTOR_LINK_KINDS, CONTRIBUTION_LABELS, DEFAULT_DIAGRAM, DEFAULT_ELEMENT_SIZE, DEPENDENCY_LINK_KINDS, DIAGNOSTIC_SEVERITIES, DSM3_FILE_KEYS, DSM3_TOOL, ELEMENT_KINDS, FILE_METAMODEL_KEY, HUB_ENTRY_KEY, ISTAR_2_0, ISTAR_2_0_DECLARATION, ISTAR_PREFIX, ISTAR_VERSION, LINK_KINDS, LINK_KIND_INFO, LINK_SELECTOR, METAMODEL_VERSION, MetamodelError, ModelOperationError, NODE_KINDS, NODE_KIND_INFO, NODE_LINK_KINDS, PISTAR_TOOL, PistarParseError, PistarWriteError, addDependency, addElement, addLeg, boolean, canLink, childrenOf, compareSeverity, connect, createDiagnosticsStore, createEmptyModel, createModelStore, defaultHubPosition, defaultIdGenerator, defineMetamodel, defineMetamodelExtension, defineProperties, dependencyEnds, dependencyLinksOf, detectFramework, detectPrefix, disconnect, effectiveElementKind, effectiveLinkKind, elementBehavesLike, elementCenter, elementKindDefinition, enumOf, extendMetamodel, fileMetamodelExtension, fileMetamodelOf, fromLspDiagnostic, fromLspDiagnostics, fromNodeIdDiagnostic, fromNodeIdDiagnostics, getSourceLayout, groupDiagnostics, hostMetamodelOf, hubLinkOf, hubOfLink, inheritMetamodel, inheritSourceLayout, isActor, isActorIn, isActorKind, isActorKindIn, isActorLinkKind, isContributionLabel, isDependencyLinkKind, isElementKind, isHubElement, isLinkKind, isLinkRef, isNode, isNodeIn, isNodeKind, isNodeKindIn, isNodeLinkKind, linkBehavesLike, linkKindDefinition, linkTargetOf, linksOf, mergeDiagnostics, metamodelOf, moveElement, nestElement, number, parsePistar, prop, removeElement, removeElements, removeLeg, setHostMetamodel, shortKindName, string, targetsLinks, toPistar, toPistarObject, updateDiagram, updateElement, updateLink, validateFileMetamodel, validateModel, validateModelProperties, withFileMetamodel, withMetamodel, worstDiagnosticSeverity };
+export { ACTOR_KINDS, ACTOR_LINK_KINDS, CONTRIBUTION_LABELS, DEFAULT_DIAGRAM, DEFAULT_ELEMENT_SIZE, DEPENDENCY_LINK_KINDS, DIAGNOSTIC_SEVERITIES, DIAGRAM_LAYOUT_KEY, DSM3_FILE_KEYS, DSM3_TOOL, ELEMENT_KINDS, FILE_METAMODEL_KEY, HUB_ENTRY_KEY, ISTAR_2_0, ISTAR_2_0_DECLARATION, ISTAR_PREFIX, ISTAR_VERSION, LINK_KINDS, LINK_KIND_INFO, LINK_SELECTOR, METAMODEL_VERSION, MetamodelError, ModelOperationError, NODE_KINDS, NODE_KIND_INFO, NODE_LINK_KINDS, PISTAR_TOOL, PistarParseError, PistarWriteError, addDependency, addElement, addLeg, boolean, canLink, childrenOf, compareSeverity, connect, createDiagnosticsStore, createEmptyModel, createModelStore, defaultHubPosition, defaultIdGenerator, defineMetamodel, defineMetamodelExtension, defineProperties, dependencyEnds, dependencyLinksOf, detectFramework, detectPrefix, disconnect, effectiveElementKind, effectiveLinkKind, elementBehavesLike, elementCenter, elementKindDefinition, enumOf, extendMetamodel, fileMetamodelExtension, fileMetamodelOf, fromLspDiagnostic, fromLspDiagnostics, fromNodeIdDiagnostic, fromNodeIdDiagnostics, getSourceLayout, groupDiagnostics, hostMetamodelOf, hubEntryLayoutKey, hubLinkOf, hubOfLink, inheritMetamodel, inheritSourceLayout, isActor, isActorIn, isActorKind, isActorKindIn, isActorLinkKind, isContributionLabel, isDependencyLinkKind, isElementKind, isHubElement, isLinkKind, isLinkRef, isNode, isNodeIn, isNodeKind, isNodeKindIn, isNodeLinkKind, linkBehavesLike, linkKindDefinition, linkTargetOf, linksOf, mergeDiagnostics, metamodelOf, moveElement, nestElement, number, parsePistar, prop, removeElement, removeElements, removeLeg, setHostMetamodel, shortKindName, string, targetsLinks, toPistar, toPistarObject, updateDiagram, updateElement, updateLink, validateFileMetamodel, validateModel, validateModelProperties, withFileMetamodel, withMetamodel, worstDiagnosticSeverity };
 
 //# sourceMappingURL=index.js.map