@primmel/primmel 1.3.1 → 1.3.2

package/dist/src/ser-des/includes.js

@@ -49,21 +49,18 @@ function preprocessIncludes(filePath, _seen = new Set()) {
     // Replace each include directive with the preprocessed content of
     // the referenced file. Skip comment lines so a `// include "..."` in
     // a comment doesn't get falsely expanded.
-    return content.replace(INCLUDE_RE, (match, includePath) => {
-        // Look backward from the match start to the start of the line —
-        // if everything before the match on this line is whitespace
-        // followed by `#` or `//`, the match is inside a comment.
-        const matchEnd = INCLUDE_RE.lastIndex;
-        const lineStart = content.lastIndexOf('\n', matchEnd - match.length) + 1;
-        const prefix = content.slice(lineStart, matchEnd - match.length);
+    return content.replace(INCLUDE_RE, (match, includePath, offset) => {
+        const lineStart = content.lastIndexOf('\n', offset) + 1;
+        const prefix = content.slice(lineStart, offset);
         if (COMMENT_LINE_RE.test(prefix)) {
-            return match; // in a comment — leave untouched
+            return match;
         }
         const resolved = (0, path_1.isAbsolute)(includePath)
             ? includePath
             : (0, path_1.resolve)(dir, includePath);
-        // Add .mmel extension if not present
-        const withExt = resolved.endsWith('.mmel') ? resolved : `${resolved}.mmel`;
+        const withExt = resolved.endsWith('.mmel')
+            ? resolved
+            : `${resolved}.mmel`;
         return preprocessIncludes(withExt, new Set(_seen));
     });
 }

package/dist/src/ser-des/includes.js.map

@@ -1 +1 @@
-{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,wBAAwB;AACxB,EAAE;AACF,uEAAuE;AACvE,gEAAgE;AAChE,EAAE;AACF,iEAAiE;AACjE,qEAAqE;AACrE,EAAE;AACF,sEAAsE;AACtE,wEAAwE;AACxE,0DAA0D;AAC1D,wEAAwE;;AAuBxE,gDA6CC;AAlED,2BAA8C;AAC9C,+BAAoD;AAEpD,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAE1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,QAAqB,IAAI,GAAG,EAAE;IAE9B,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,YAAY,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAClB,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAE7B,kEAAkE;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,WAAmB,EAAE,EAAE;QAChE,gEAAgE;QAChE,4DAA4D;QAC5D,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC,CAAC,iCAAiC;QACjD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,WAAW,CAAC;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE9B,qCAAqC;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,OAAO,CAAC;QAE3E,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"includes.js","sourceRoot":"","sources":["../../../src/ser-des/includes.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,wBAAwB;AACxB,EAAE;AACF,uEAAuE;AACvE,gEAAgE;AAChE,EAAE;AACF,iEAAiE;AACjE,qEAAqE;AACrE,EAAE;AACF,sEAAsE;AACtE,wEAAwE;AACxE,0DAA0D;AAC1D,wEAAwE;;AAuBxE,gDA6CC;AAlED,2BAA8C;AAC9C,+BAAoD;AAEpD,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAC5C,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAE1C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,QAAqB,IAAI,GAAG,EAAE;IAE9B,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,YAAY,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAClB,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAE7B,kEAAkE;IAClE,qEAAqE;IACrE,0CAA0C;IAC1C,OAAO,OAAO,CAAC,OAAO,CACpB,UAAU,EACV,CAAC,KAAK,EAAE,WAAmB,EAAE,MAAc,EAAE,EAAE;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,WAAW,CAAC;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE9B,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;YACxC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,GAAG,QAAQ,OAAO,CAAC;QAEvB,OAAO,kBAAkB,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC,CACF,CAAC;AACJ,CAAC"}

package/dist-browser/index.mjs

@@ -560,17 +560,17 @@ var ae = function(e, t) {
 		t += "    }\n";
 	}
 	return t += "  }\n", t;
-}, _e = (e) => {
+}, y = (e) => {
 	let t = "  " + e.id + " {\n";
 	return t += "    definition \"" + o(e.value) + "\"\n", t += "  }\n", t;
-}, y = function(e) {
+}, b = function(e) {
 	let t = "enum " + e.id + " {\n";
-	for (let n of e.values) t += _e(n);
+	for (let n of e.values) t += y(n);
 	return t += "}\n", t;
-}, b = function(e) {
+}, x = function(e) {
 	let t = "data_registry " + e.id + " {\n";
 	return t += "  title \"" + o(e.title) + "\"\n", e.data !== null && (t += "  data_class " + e.data.id + "\n"), t += "}\n", t;
-}, x = function(e, t) {
+}, S = function(e, t) {
 	let n = {
 		id: e,
 		type: "",
@@ -587,17 +587,17 @@ var ae = function(e, t) {
 		construct: "variable",
 		id: e
 	}), (t) => (t.variables[e] = n, t);
-}, S = function(e) {
+}, C = function(e) {
 	let t = "variable " + e.id + " {\n";
 	return e.type !== "" && (t += "  type " + e.type + "\n"), e.definition !== "" && (t += "  definition \"" + o(e.definition) + "\"\n"), e.description !== "" && (t += "  description \"" + o(e.description) + "\"\n"), t += "}\n", t;
-}, C = function(e, t) {
+}, w = function(e, t) {
 	let n = {
 		id: e,
 		eventType: "end"
 	};
 	if (t !== "" && r(t).length > 0) throw Error(`Parsing error: end_event. ID ${e}: Expecting empty body`);
 	return (t) => (t.events[e] = n, t);
-}, w = function(e, t) {
+}, T = function(e, t) {
 	let n = {
 		id: e,
 		eventType: "signalcatch",
@@ -612,14 +612,14 @@ var ae = function(e, t) {
 		}
 	}
 	return (t) => (t.events[e] = n, t);
-}, T = function(e, t) {
+}, E = function(e, t) {
 	let n = {
 		id: e,
 		eventType: "start"
 	};
 	if (t !== "" && r(t).length > 0) throw Error(`Parsing error: end_event. ID ${e}: Expecting empty body`);
 	return (t) => (t.events[e] = n, t);
-}, E = function(e, t) {
+}, D = function(e, t) {
 	let n = {
 		id: e,
 		eventType: "timer",
@@ -635,26 +635,26 @@ var ae = function(e, t) {
 		}
 	}
 	return (t) => (t.events[e] = n, t);
-}, D = function(e) {
-	return e.eventType === "start" ? A(e) : e.eventType === "end" ? O(e) : e.eventType === "signalcatch" ? k(e) : e.eventType === "timer" ? j(e) : "";
+}, O = function(e) {
+	return e.eventType === "start" ? j(e) : e.eventType === "end" ? k(e) : e.eventType === "signalcatch" ? A(e) : e.eventType === "timer" ? M(e) : "";
 };
-function O(e) {
+function k(e) {
 	return "end_event " + e.id + " {\n}\n";
 }
-function k(e) {
+function A(e) {
 	let t = "signal_catch_event " + e.id + " {\n";
 	return e.signal !== "" && (t += "  catch \"" + o(e.signal) + "\"\n"), t += "}\n", t;
 }
-function A(e) {
+function j(e) {
 	return "start_event " + e.id + " {\n}\n";
 }
-function j(e) {
+function M(e) {
 	let t = "timer_event " + e.id + " {\n";
 	return e.type !== "" && (t += "  type " + e.type + "\n"), e.para !== "" && (t += "  para \"" + o(e.para) + "\"\n"), t += "}\n", t;
 }
 //#endregion
 //#region src/ser-des/config/gateway.ts
-var M = function(e, t) {
+var N = function(e, t) {
 	let n = {
 		id: e,
 		gatewayType: "exclusive_gateway",
@@ -668,16 +668,16 @@ var M = function(e, t) {
 		construct: "Exclusive gateway",
 		id: e
 	}), (t) => (t.gateways[e] = n, t);
-}, N = function(e) {
-	return e.gatewayType === "exclusive_gateway" ? P(e) : "";
+}, P = function(e) {
+	return e.gatewayType === "exclusive_gateway" ? F(e) : "";
 };
-function P(e) {
+function F(e) {
 	let t = "exclusive_gateway " + e.id + " {\n";
 	return e.label !== "" && (t += "  label \"" + o(e.label) + "\"\n"), t += "}\n", t;
 }
 //#endregion
 //#region src/ser-des/config/provision.ts
-var F = function(e, t) {
+var I = function(e, t) {
 	let n = {
 		subject: /* @__PURE__ */ new Map(),
 		id: e,
@@ -690,7 +690,7 @@ var F = function(e, t) {
 		construct: "provision",
 		id: e
 	}), (t) => (t.provisions[e] = n, t);
-}, I = function(e, t) {
+}, L = function(e, t) {
 	let n = [];
 	for (let r of t._relations.ref) {
 		let t = d(e, "references", r);
@@ -700,7 +700,7 @@ var F = function(e, t) {
 		...t,
 		ref: n
 	};
-}, ve = function(e) {
+}, _e = function(e) {
 	let t = "provision " + e.id + " {\n";
 	if (e.subject.forEach((e, n) => {
 		t += "  " + n + " " + e + "\n";
@@ -710,7 +710,7 @@ var F = function(e, t) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, ye = (e, t) => {
+}, ve = (e, t) => {
 	let n = {
 		id: e,
 		document: "",
@@ -725,10 +725,10 @@ var F = function(e, t) {
 		}
 	}
 	return (t) => (t.references[e] = n, t);
-}, be = function(e) {
+}, ye = function(e) {
 	let t = "reference " + e.id + " {\n";
 	return t += "  document \"" + o(e.document) + "\"\n", t += "  clause \"" + o(e.clause) + "\"\n", t += "}\n", t;
-}, xe = (e, t) => {
+}, be = (e, t) => {
 	let n = {
 		id: e,
 		name: ""
@@ -741,10 +741,10 @@ var F = function(e, t) {
 		construct: "role",
 		id: e
 	}), (t) => (t.roles[e] = n, t);
-}, Se = function(e) {
+}, xe = function(e) {
 	let t = "role " + e.id + " {\n";
 	return t += "  name \"" + o(e.name) + "\"\n", t += "}\n", t;
-}, Ce = function(e, t) {
+}, Se = function(e, t) {
 	let n = {
 		id: e,
 		childs: [],
@@ -761,18 +761,18 @@ var F = function(e, t) {
 		let a = r(t), o = 0;
 		for (; o < a.length;) {
 			let t = a[o++];
-			if (o < a.length) t === "elements" ? n = we(i(a[o++]))(n) : t === "process_flow" ? n = Ee(i(a[o++]))(n) : t === "data" ? n = Te(i(a[o++]))(n) : o++;
+			if (o < a.length) t === "elements" ? n = Ce(i(a[o++]))(n) : t === "process_flow" ? n = Te(i(a[o++]))(n) : t === "data" ? n = we(i(a[o++]))(n) : o++;
 			else throw Error(`Parsing error: subprocess. ID ${e}: Expecting value for ${t}`);
 		}
 	}
 	return (t) => (t.pages[e] = n, t);
-}, we = function(e) {
+}, Ce = function(e) {
 	let t = r(e), n = {}, i = 0;
 	for (; i < t.length;) {
 		let e = t[i++];
 		if (i < t.length) {
 			let r = e.trim();
-			n[r] = L(r, t[i++]);
+			n[r] = R(r, t[i++]);
 		} else throw Error(`Parsing error: elements in subprocess. Expecting value for ${e}`);
 	}
 	return (e) => ({
@@ -786,13 +786,13 @@ var F = function(e, t) {
 			childs: Object.values(n)
 		}
 	});
-}, Te = function(e) {
+}, we = function(e) {
 	let t = r(e), n = {}, i = 0;
 	for (; i < t.length;) {
 		let e = t[i++];
 		if (i < t.length) {
 			let r = e.trim();
-			n[r] = L(r, t[i++]);
+			n[r] = R(r, t[i++]);
 		} else throw Error(`Parsing error: data in subprocess. Expecting value for ${e}`);
 	}
 	return (e) => ({
@@ -806,11 +806,11 @@ var F = function(e, t) {
 			data: Object.values(n)
 		}
 	});
-}, Ee = function(e) {
+}, Te = function(e) {
 	let t = r(e), n = {}, i = 0;
 	for (; i < t.length;) {
 		let e = t[i++].trim();
-		if (i < t.length) n[e] = De(e.trim(), t[i++]);
+		if (i < t.length) n[e] = Ee(e.trim(), t[i++]);
 		else throw Error(`Parsing error: edges in subprocess. Expecting value for ${e}`);
 	}
 	return (e) => ({
@@ -821,7 +821,7 @@ var F = function(e, t) {
 		}
 	});
 };
-function L(e, t) {
+function R(e, t) {
 	let n = {
 		name: e,
 		element: null,
@@ -836,7 +836,7 @@ function L(e, t) {
 	}
 	return n;
 }
-function De(e, t) {
+function Ee(e, t) {
 	let n = {
 		id: e,
 		from: null,
@@ -855,7 +855,7 @@ function De(e, t) {
 	}
 	return n;
 }
-var Oe = function(e, t) {
+var De = function(e, t) {
 	let n = t._relations ?? {
 		childs: [],
 		edges: [],
@@ -866,7 +866,7 @@ var Oe = function(e, t) {
 		name: t.name,
 		x: t.x,
 		y: t.y,
-		element: ke(e, t._relations.element)
+		element: Oe(e, t._relations.element)
 	});
 	return {
 		id: t.id,
@@ -884,34 +884,34 @@ var Oe = function(e, t) {
 		data: n.data.map(a)
 	};
 };
-function ke(e, t) {
+function Oe(e, t) {
 	return d(e, "processes", t) ?? d(e, "approvals", t) ?? d(e, "events", t) ?? d(e, "gateways", t) ?? null;
 }
-var Ae = function(e) {
+var ke = function(e) {
 	let t = "canvas " + e.id + " {\n";
 	return t += "  elements {\n", e.childs.forEach((e) => {
-		t += R(e);
+		t += z(e);
 	}), t += "  }\n", t += "  process_flow {\n", e.edges.forEach((e) => {
-		t += je(e);
+		t += Ae(e);
 	}), t += "  }\n", t += "  data {\n", e.data.forEach((e) => {
-		t += R(e);
+		t += z(e);
 	}), t += "  }\n", t += "}\n", t;
 };
-function R(e) {
+function z(e) {
 	let t = "    " + (e.element?.id ?? e.name) + " {\n";
 	return t += "      x " + e.x + "\n", t += "      y " + e.y + "\n", t += "    }\n", t;
 }
-function je(e) {
+function Ae(e) {
 	let t = "    " + e.id + " {\n";
 	return e.from !== null && e.from.element !== null && (t += "      from " + e.from.element.id + "\n"), e.to !== null && e.to.element !== null && (t += "      to " + e.to.element.id + "\n"), e.description !== "" && (t += "      description \"" + o(e.description) + "\"\n"), e.condition !== "" && (t += "      condition \"" + o(e.condition) + "\"\n"), t += "    }\n", t;
 }
 //#endregion
 //#region src/ser-des/config/note.ts
-var z = [
+var B = [
 	"NOTE",
 	"CAUTION",
 	"WARNING"
-], Me = function(e, t) {
+], je = function(e, t) {
 	let n = {
 		id: e,
 		type: "NOTE",
@@ -922,7 +922,7 @@ var z = [
 	return m(t, (t, i) => {
 		if (t === "type") {
 			let t = i();
-			if (!z.includes(t)) throw Error(`Parsing error: note. ID ${e}: Unknown type ${t} (valid: ${z.join(", ")})`);
+			if (!B.includes(t)) throw Error(`Parsing error: note. ID ${e}: Unknown type ${t} (valid: ${B.join(", ")})`);
 			n.type = t;
 		} else if (t === "message") n.message = h(i);
 		else if (t === "reference") n._relations.ref = r(i());
@@ -932,7 +932,7 @@ var z = [
 		construct: "note",
 		id: e
 	}), (t) => (t.notes[e] = n, t);
-}, Ne = function(e, t) {
+}, Me = function(e, t) {
 	let n = [];
 	for (let r of t._relations.ref) {
 		let t = d(e, "references", r);
@@ -942,7 +942,7 @@ var z = [
 		...t,
 		ref: n
 	};
-}, Pe = function(e) {
+}, Ne = function(e) {
 	let t = "note " + e.id + " {\n";
 	if (t += "  type " + e.type + "\n", t += "  message \"" + o(e.message) + "\"\n", e.ref.length > 0) {
 		t += "  reference {\n";
@@ -950,7 +950,7 @@ var z = [
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, Fe = function(e, t) {
+}, Pe = function(e, t) {
 	let n = {
 		id: e,
 		title: "",
@@ -963,20 +963,20 @@ var z = [
 		let a = r(t), o = 0;
 		for (; o < a.length;) {
 			let t = a[o++];
-			if (o < a.length) t === "title" ? n.title = i(a[o++]) : t === "columns" ? n.columns = i(a[o++]) : t === "display" ? n.display = i(a[o++]) : t === "domain" ? n.domain = i(a[o++]) : t === "data" ? n.data = Ie(i(a[o++])) : o++;
+			if (o < a.length) t === "title" ? n.title = i(a[o++]) : t === "columns" ? n.columns = i(a[o++]) : t === "display" ? n.display = i(a[o++]) : t === "domain" ? n.domain = i(a[o++]) : t === "data" ? n.data = Fe(i(a[o++])) : o++;
 			else throw Error(`Parsing error: table. ID ${e}: Expecting value for ${t}`);
 		}
 	}
 	return (t) => (t.tables[e] = n, t);
 };
-function Ie(e) {
+function Fe(e) {
 	return e.split(/\n+/).map((e) => e.trim()).filter((e) => e.length > 0).map((e) => {
 		let t = [], n = /"([^"]*)"|(\S+)/g, r;
 		for (; (r = n.exec(e)) !== null;) t.push(r[1] ?? r[2] ?? "");
 		return t;
 	});
 }
-var Le = function(e) {
+var Ie = function(e) {
 	let t = "table " + e.id + " {\n";
 	if (t += "  title \"" + e.title + "\"\n", t += "  columns \"" + e.columns + "\"\n", e.display && (t += "  display \"" + e.display + "\"\n"), e.domain && (t += "  domain { }\n"), e.data.length > 0) {
 		t += "  data {\n";
@@ -987,7 +987,7 @@ var Le = function(e) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, Re = function(e, t) {
+}, Le = function(e, t) {
 	let n = {
 		id: e,
 		title: "",
@@ -1002,10 +1002,10 @@ var Le = function(e) {
 		}
 	}
 	return (t) => (t.figures[e] = n, t);
-}, ze = function(e) {
+}, Re = function(e) {
 	let t = "figure " + e.id + " {\n";
 	return t += "  title \"" + o(e.title) + "\"\n", t += "  src \"" + o(e.src) + "\"\n", t += "}\n", t;
-}, B = ["REPO", "URL"], Be = function(e, t) {
+}, V = ["REPO", "URL"], ze = function(e, t) {
 	let n = {
 		id: e,
 		kind: "URL",
@@ -1018,17 +1018,17 @@ var Le = function(e) {
 			let t = a[o++];
 			if (o < a.length) if (t === "type" || t === "kind") {
 				let t = a[o++];
-				if (!B.includes(t)) throw Error(`Parsing error: link. ID ${e}: Unknown kind ${t} (valid: ${B.join(", ")})`);
+				if (!V.includes(t)) throw Error(`Parsing error: link. ID ${e}: Unknown kind ${t} (valid: ${V.join(", ")})`);
 				n.kind = t;
 			} else t === "target" || t === "path" || t === "url" ? n.target = i(a[o++]) : t === "namespace" || t === "ns" ? n.namespace = i(a[o++]) : o++;
 			else throw Error(`Parsing error: link. ID ${e}: Expecting value for ${t}`);
 		}
 	}
 	return (t) => (t.links[e] = n, t);
-}, Ve = function(e) {
+}, Be = function(e) {
 	let t = "link " + e.id + " {\n";
 	return t += "  type " + e.kind + "\n", t += "  target \"" + o(e.target) + "\"\n", e.namespace && (t += "  namespace \"" + o(e.namespace) + "\"\n"), t += "}\n", t;
-}, He = function(e, t) {
+}, Ve = function(e, t) {
 	let n = {
 		namespace: e,
 		description: "",
@@ -1048,7 +1048,7 @@ var Le = function(e) {
 		construct: "map_profile",
 		id: e
 	}), (t) => (t.mapProfiles[e] = n, t);
-}, Ue = function(e) {
+}, He = function(e) {
 	let t = "map_profile " + e.namespace + " {\n";
 	e.description && (t += "  description \"" + e.description + "\"\n");
 	let n = Object.keys(e.mappings);
@@ -1058,7 +1058,7 @@ var Le = function(e) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, We = function(e, t) {
+}, Ue = function(e, t) {
 	let n = {
 		id: e,
 		description: "",
@@ -1075,13 +1075,13 @@ var Le = function(e) {
 		construct: "view_profile",
 		id: e
 	}), (t) => (t.viewProfiles[e] = n, t);
-}, Ge = function(e) {
+}, We = function(e) {
 	let t = "view_profile " + e.id + " {\n";
 	return e.description && (t += "  description \"" + e.description + "\"\n"), e.roles.length > 0 && (t += "  roles " + e.roles.join(" ") + "\n"), e.visibleElements.length > 0 && (t += "  visible " + e.visibleElements.join(" ") + "\n"), t += "}\n", t;
 };
 //#endregion
 //#region src/ser-des/config/field-parser.ts
-function V(e, t) {
+function H(e, t) {
 	let n = {
 		name: e,
 		type: "string",
@@ -1113,7 +1113,7 @@ function V(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/form.ts
-var Ke = function(e, t) {
+var Ge = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -1136,23 +1136,23 @@ var Ke = function(e, t) {
 			else if (t === "data_class") n.dataClassId = a(o[s++]);
 			else if (t === "header") n.headerFormId = a(o[s++]);
 			else if (t === "conformance_process") n.conformanceProcessId = a(o[s++]);
-			else if (t === "applicability") n.applicability = H(i(o[s++]));
+			else if (t === "applicability") n.applicability = U(i(o[s++]));
 			else if (t === "field") {
 				let e = o[s++];
 				if (s < o.length) {
 					let t = i(o[s++]);
-					n.fields.push(V(e, t));
+					n.fields.push(H(e, t));
 				}
 			} else if (t === "subform_ref") {
 				let e = o[s++], t = s < o.length ? i(o[s++]) : "";
-				n.fields.push(Je(e, t));
-			} else t === "pass_fail" ? n.passFail = qe(i(o[s++])) : t === "reference" ? n.referenceIds = r(o[s++]) : s++;
+				n.fields.push(qe(e, t));
+			} else t === "pass_fail" ? n.passFail = Ke(i(o[s++])) : t === "reference" ? n.referenceIds = r(o[s++]) : s++;
 			else throw Error(`Parsing error: form. ID ${e}: Expecting value for ${t}`);
 		}
 	}
 	return (t) => (t.forms[e] = n, t);
 };
-function H(e) {
+function U(e) {
 	let t = [], n = r(e), a = 0;
 	for (; a < n.length;) {
 		let e = n[a++];
@@ -1186,7 +1186,7 @@ function H(e) {
 	}
 	return t;
 }
-function qe(e) {
+function Ke(e) {
 	let t = {
 		criteria: "",
 		passIf: ""
@@ -1197,7 +1197,7 @@ function qe(e) {
 	}
 	return t;
 }
-function Je(e, t) {
+function qe(e, t) {
 	return {
 		name: "",
 		type: "array",
@@ -1216,10 +1216,10 @@ function Je(e, t) {
 		referenceIds: [],
 		fields: [],
 		itemsType: "",
-		subformRef: Ye(e, t)
+		subformRef: Je(e, t)
 	};
 }
-function Ye(e, t) {
+function Je(e, t) {
 	let n = {
 		subformId: e,
 		parameters: {},
@@ -1235,12 +1235,12 @@ function Ye(e, t) {
 					let e = t[o++];
 					o < t.length && (t[o] === ":" && o++, o < t.length && (n.parameters[e] = i(t[o++])));
 				}
-			} else t === "applicability" ? n.applicability = H(i(e[a++])) : i(e[a++]);
+			} else t === "applicability" ? n.applicability = U(i(e[a++])) : i(e[a++]);
 		}
 	}
 	return n;
 }
-var Xe = function(e) {
+var Ye = function(e) {
 	let t = "form " + e.id + " {\n";
 	if (t += "  name \"" + o(e.name) + "\"\n", e.description && (t += "  description \"" + o(e.description) + "\"\n"), e.dataClassId && (t += "  data_class " + e.dataClassId + "\n"), e.headerFormId && (t += "  header " + e.headerFormId + "\n"), e.conformanceProcessId && (t += "  conformance_process " + e.conformanceProcessId + "\n"), e.applicability.length > 0) {
 		t += "  applicability {\n";
@@ -1263,7 +1263,7 @@ var Xe = function(e) {
 		t += "}\n";
 	} else t += "  field " + n.name + " { ", n.label && (t += "label \"" + o(n.label) + "\" "), n.unit && (t += "unit \"" + o(n.unit) + "\" "), n.required && (t += "required true "), t += "}\n";
 	return e.passFail && (t += "  pass_fail { criteria \"" + o(e.passFail.criteria) + "\" pass_if \"" + o(e.passFail.passIf) + "\" }\n"), t += "}\n", t;
-}, Ze = function(e, t) {
+}, Xe = function(e, t) {
 	let n = {
 		id: e,
 		description: "",
@@ -1280,11 +1280,11 @@ var Xe = function(e) {
 				let t = a[o++];
 				if (t === "object" || t === "array") n.shapeType = t;
 				else throw Error(`Parsing error: subform. ID ${e}: type must be object or array (got ${t})`);
-			} else if (t === "parameters") n.parameters = Qe(i(a[o++]));
+			} else if (t === "parameters") n.parameters = Ze(i(a[o++]));
 			else if (t === "field") {
 				let e = a[o++];
 				if (o < a.length) {
-					let t = V(e, i(a[o++]));
+					let t = H(e, i(a[o++]));
 					n.fields.push(t);
 				}
 			} else o++;
@@ -1293,7 +1293,7 @@ var Xe = function(e) {
 	}
 	return (t) => (t.subforms[e] = n, t);
 };
-function Qe(e) {
+function Ze(e) {
 	let t = [], n = r(e), a = 0;
 	for (; a < n.length;) {
 		let e = n[a++];
@@ -1328,7 +1328,7 @@ function Qe(e) {
 	}
 	return t;
 }
-var $e = function(e) {
+var Qe = function(e) {
 	let t = "subform " + e.id + " {\n";
 	if (t += "  type " + e.shapeType + "\n", e.description && (t += "  description \"" + o(e.description) + "\"\n"), e.parameters.length > 0) {
 		t += "  parameters {\n";
@@ -1345,13 +1345,13 @@ var $e = function(e) {
 	}
 	for (let n of e.fields) t += "  field " + n.name + " { ", n.label && (t += "label \"" + o(n.label) + "\" "), n.unit && (t += "unit \"" + o(n.unit) + "\" "), n.required && (t += "required true "), t += "}\n";
 	return t += "}\n", t;
-}, U = [
+}, W = [
 	"number",
 	"integer",
 	"string",
 	"boolean",
 	"enum"
-], et = function(e, t) {
+], $e = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -1368,7 +1368,7 @@ var $e = function(e) {
 		else if (t === "definition") n.definition = h(i);
 		else if (t === "type") {
 			let t = i();
-			if (!U.includes(t)) throw Error(`Parsing error: symbol. ID ${e}: Unknown type ${t} (valid: ${U.join(", ")})`);
+			if (!W.includes(t)) throw Error(`Parsing error: symbol. ID ${e}: Unknown type ${t} (valid: ${W.join(", ")})`);
 			n.type = t;
 		} else if (t === "unit") n.unit = h(i);
 		else if (t === "latex") n.latex = h(i);
@@ -1380,7 +1380,7 @@ var $e = function(e) {
 		construct: "symbol",
 		id: e
 	}), (t) => (t.symbols[e] = n, t);
-}, tt = function(e, t) {
+}, et = function(e, t) {
 	let n = [];
 	for (let r of t._relations.ref) {
 		let t = d(e, "references", r);
@@ -1390,7 +1390,7 @@ var $e = function(e) {
 		...t,
 		ref: n
 	};
-}, nt = function(e) {
+}, tt = function(e) {
 	let t = "symbol " + e.id + " {\n";
 	if (t += "  name \"" + o(e.name) + "\"\n", e.definition && (t += "  definition \"" + o(e.definition) + "\"\n"), t += "  type " + e.type + "\n", e.unit && e.unit !== "1" && (t += "  unit \"" + o(e.unit) + "\"\n"), e.latex && (t += "  latex \"" + o(e.latex) + "\"\n"), e.values.length > 0 && (t += "  values " + e.values.join(" ") + "\n"), e.ref.length > 0) {
 		t += "  reference {\n";
@@ -1398,7 +1398,7 @@ var $e = function(e) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, rt = function(e, t) {
+}, nt = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -1416,13 +1416,13 @@ var $e = function(e) {
 		let a = r(t), o = 0;
 		for (; o < a.length;) {
 			let t = a[o++];
-			if (o < a.length) t === "name" ? n.name = i(a[o++]) : t === "description" ? n.description = i(a[o++]) : t === "expression" ? n.expression = i(a[o++]) : t === "reference" ? n._relations.ref = r(a[o++]) : t === "inputs" ? n.inputs = it(i(a[o++])) : t === "output" ? n.output = at(i(a[o++])) : o++;
+			if (o < a.length) t === "name" ? n.name = i(a[o++]) : t === "description" ? n.description = i(a[o++]) : t === "expression" ? n.expression = i(a[o++]) : t === "reference" ? n._relations.ref = r(a[o++]) : t === "inputs" ? n.inputs = rt(i(a[o++])) : t === "output" ? n.output = it(i(a[o++])) : o++;
 			else throw Error(`Parsing error: calculation. ID ${e}: Expecting value for ${t}`);
 		}
 	}
 	return (t) => (t.calculations[e] = n, t);
 };
-function it(e) {
+function rt(e) {
 	let t = [], n = r(e), a = 0;
 	for (; a < n.length;) {
 		let e = n[a++];
@@ -1447,7 +1447,7 @@ function it(e) {
 	}
 	return t;
 }
-function at(e) {
+function it(e) {
 	let t = r(e), n = 0, a = "number", o = "1";
 	if (t[n] === ":" && n++, n < t.length && (a = t[n++]), n < t.length && t[n].startsWith("{")) {
 		let e = r(i(t[n++])), a = 0;
@@ -1461,7 +1461,7 @@ function at(e) {
 		unit: o
 	};
 }
-var ot = function(e, t) {
+var at = function(e, t) {
 	let n = [];
 	for (let r of t._relations.ref) {
 		let t = d(e, "references", r);
@@ -1471,7 +1471,7 @@ var ot = function(e, t) {
 		...t,
 		ref: n
 	};
-}, st = function(e) {
+}, ot = function(e) {
 	let t = "calculation " + e.id + " {\n";
 	if (t += "  name \"" + o(e.name) + "\"\n", e.description && (t += "  description \"" + o(e.description) + "\"\n"), e.inputs.length > 0) {
 		t += "  inputs {\n";
@@ -1487,7 +1487,7 @@ var ot = function(e, t) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, ct = function(e, t) {
+}, st = function(e, t) {
 	let n = {
 		entityName: e,
 		initialState: "",
@@ -1518,7 +1518,7 @@ var ot = function(e, t) {
 							let n = e[t++];
 							if (t < e.length) {
 								let r = i(e[t++]);
-								l.push(lt(n, r));
+								l.push(ct(n, r));
 							}
 						} else n === "reference" ? u.push(...r(e[t++])) : i(e[t++]);
 					}
@@ -1538,7 +1538,7 @@ var ot = function(e, t) {
 	}
 	return (t) => (t.stateMachines[e] = n, t);
 };
-function lt(e, t) {
+function ct(e, t) {
 	let n = {
 		targetEntity: e,
 		where: "",
@@ -1563,7 +1563,7 @@ function lt(e, t) {
 	}
 	return n;
 }
-var ut = function(e) {
+var lt = function(e) {
 	let t = "state_machine " + e.entityName + " {\n";
 	if (t += "  initial " + e.initialState + "\n", e.states.length > 0) {
 		t += "  states {\n";
@@ -1583,7 +1583,7 @@ var ut = function(e) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, dt = function(e, t) {
+}, ut = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -1603,7 +1603,7 @@ var ut = function(e) {
 		construct: "term",
 		id: e
 	}), (t) => (t.terms[e] = n, t);
-}, ft = function(e) {
+}, dt = function(e) {
 	let t = "term " + e.id + " {\n";
 	if (e.label && (t += "  label \"" + o(e.label) + "\"\n"), e.definition && (t += "  definition \"" + o(e.definition) + "\"\n"), e.symbolId && (t += "  symbol " + e.symbolId + "\n"), e.referenceIds.length > 0) {
 		t += "  reference {\n";
@@ -1614,26 +1614,26 @@ var ut = function(e) {
 };
 //#endregion
 //#region src/ser-des/config/index.ts
-function W(e) {
+function G(e) {
 	return e;
 }
-var G = [
-	W({
+var K = [
+	G({
 		keyword: "role",
 		field: "roles",
 		takesID: !0,
-		parse: xe,
-		dump: Se
+		parse: be,
+		dump: xe
 	}),
-	W({
+	G({
 		keyword: "provision",
 		field: "provisions",
 		takesID: !0,
-		parse: F,
-		resolve: I,
-		dump: ve
+		parse: I,
+		resolve: L,
+		dump: _e
 	}),
-	W({
+	G({
 		keyword: "process",
 		field: "processes",
 		takesID: !0,
@@ -1641,7 +1641,7 @@ var G = [
 		resolve: ne,
 		dump: v
 	}),
-	W({
+	G({
 		keyword: "approval",
 		field: "approvals",
 		takesID: !0,
@@ -1649,7 +1649,7 @@ var G = [
 		resolve: oe,
 		dump: se
 	}),
-	W({
+	G({
 		keyword: "class",
 		field: "dataclasses",
 		takesID: !0,
@@ -1657,172 +1657,172 @@ var G = [
 		resolve: pe,
 		dump: he
 	}),
-	W({
+	G({
 		keyword: "enum",
 		field: "enums",
 		takesID: !0,
 		parse: ce,
-		dump: y
+		dump: b
 	}),
-	W({
+	G({
 		keyword: "data_registry",
 		field: "regs",
 		takesID: !0,
 		parse: ue,
 		resolve: me,
-		dump: b
+		dump: x
 	}),
-	W({
+	G({
 		keyword: "variable",
 		field: "variables",
 		takesID: !0,
-		parse: x,
-		dump: S
+		parse: S,
+		dump: C
 	}),
-	W({
+	G({
 		keyword: "exclusive_gateway",
 		field: "gateways",
 		takesID: !0,
-		parse: M,
-		dump: N
+		parse: N,
+		dump: P
 	}),
-	W({
+	G({
 		keyword: "start",
 		aliases: ["start_event"],
 		field: "events",
 		takesID: !0,
-		parse: T,
-		dump: D
+		parse: E,
+		dump: O
 	}),
-	W({
+	G({
 		keyword: "end",
 		aliases: ["end_event"],
 		field: "events",
 		takesID: !0,
-		parse: C,
-		dump: D
+		parse: w,
+		dump: O
 	}),
-	W({
+	G({
 		keyword: "signalcatch",
 		aliases: ["signal_catch_event"],
 		field: "events",
 		takesID: !0,
-		parse: w,
-		dump: D
+		parse: T,
+		dump: O
 	}),
-	W({
+	G({
 		keyword: "timer",
 		aliases: ["timer_event"],
 		field: "events",
 		takesID: !0,
-		parse: E,
-		dump: D
+		parse: D,
+		dump: O
 	}),
-	W({
+	G({
 		keyword: "reference",
 		field: "references",
 		takesID: !0,
-		parse: ye,
-		dump: be
+		parse: ve,
+		dump: ye
 	}),
-	W({
+	G({
 		keyword: "canvas",
 		aliases: ["subprocess"],
 		field: "pages",
 		takesID: !0,
-		parse: Ce,
-		resolve: Oe,
-		dump: Ae
+		parse: Se,
+		resolve: De,
+		dump: ke
 	}),
-	W({
+	G({
 		keyword: "note",
 		field: "notes",
 		takesID: !0,
-		parse: Me,
-		resolve: Ne,
-		dump: Pe
+		parse: je,
+		resolve: Me,
+		dump: Ne
 	}),
-	W({
+	G({
 		keyword: "table",
 		field: "tables",
 		takesID: !0,
-		parse: Fe,
-		dump: Le
+		parse: Pe,
+		dump: Ie
 	}),
-	W({
+	G({
 		keyword: "figure",
 		field: "figures",
 		takesID: !0,
-		parse: Re,
-		dump: ze
+		parse: Le,
+		dump: Re
 	}),
-	W({
+	G({
 		keyword: "link",
 		field: "links",
 		takesID: !0,
-		parse: Be,
-		dump: Ve
+		parse: ze,
+		dump: Be
 	}),
-	W({
+	G({
 		keyword: "map_profile",
 		field: "mapProfiles",
 		takesID: !0,
-		parse: He,
-		dump: Ue
+		parse: Ve,
+		dump: He
 	}),
-	W({
+	G({
 		keyword: "view_profile",
 		field: "viewProfiles",
 		takesID: !0,
-		parse: We,
-		dump: Ge
+		parse: Ue,
+		dump: We
 	}),
-	W({
+	G({
 		keyword: "term",
 		field: "terms",
 		takesID: !0,
-		parse: dt,
-		dump: ft
+		parse: ut,
+		dump: dt
 	}),
-	W({
+	G({
 		keyword: "form",
 		field: "forms",
 		takesID: !0,
-		parse: Ke,
-		dump: Xe
+		parse: Ge,
+		dump: Ye
 	}),
-	W({
+	G({
 		keyword: "subform",
 		field: "subforms",
 		takesID: !0,
-		parse: Ze,
-		dump: $e
+		parse: Xe,
+		dump: Qe
 	}),
-	W({
+	G({
 		keyword: "symbol",
 		field: "symbols",
 		takesID: !0,
-		parse: et,
-		resolve: tt,
-		dump: nt
+		parse: $e,
+		resolve: et,
+		dump: tt
 	}),
-	W({
+	G({
 		keyword: "calculation",
 		field: "calculations",
 		takesID: !0,
-		parse: rt,
-		resolve: ot,
-		dump: st
+		parse: nt,
+		resolve: at,
+		dump: ot
 	}),
-	W({
+	G({
 		keyword: "state_machine",
 		field: "stateMachines",
 		takesID: !0,
-		parse: ct,
-		dump: ut
+		parse: st,
+		dump: lt
 	})
 ];
-function pt(e) {
+function ft(e) {
 	let t = {};
 	for (let n of e) {
 		if (!n.field) continue;
@@ -1836,32 +1836,32 @@ function pt(e) {
 	}
 	return t;
 }
-function mt(e) {
+function pt(e) {
 	let t = {};
 	for (let n of e) n.field && (t[n.field] = { resolve: n.resolve ?? ((e, t) => t) });
 	return t;
 }
-function ht(e) {
+function mt(e) {
 	let t = {};
 	for (let n of e) n.field && (t[n.field] = n.dump);
 	return t;
 }
-var K = {
+var q = {
 	root: { parse: (e) => (t) => (t.root = e.trim(), t) },
 	metadata: { parse: p },
-	...pt(G)
-}, q = mt(G), gt = ht(G), J = (/* @__PURE__ */ e(((e, t) => {
+	...ft(K)
+}, J = pt(K), ht = mt(K), Y = (/* @__PURE__ */ e(((e, t) => {
 	t.exports = {};
-})))(), Y = /^include\s+"([^"]+)"/gm, _t = /^[ \t]*(#|\/\/)/;
+})))(), gt = /^include\s+"([^"]+)"/gm, _t = /^[ \t]*(#|\/\/)/;
 function X(e, t = /* @__PURE__ */ new Set()) {
-	let n = (0, J.resolve)(e);
+	let n = (0, Y.resolve)(e);
 	if (t.has(n)) throw Error(`Include cycle detected: ${n} (chain: ${[...t, n].map((e) => e.split("/").pop()).join(" → ")})`);
-	if (t.add(n), !(0, J.existsSync)(n)) throw Error(`Include file not found: ${n}`);
-	let r = (0, J.readFileSync)(n, "utf8"), i = (0, J.dirname)(n);
-	return r.replace(Y, (e, n) => {
-		let a = Y.lastIndex, o = r.lastIndexOf("\n", a - e.length) + 1, s = r.slice(o, a - e.length);
+	if (t.add(n), !(0, Y.existsSync)(n)) throw Error(`Include file not found: ${n}`);
+	let r = (0, Y.readFileSync)(n, "utf8"), i = (0, Y.dirname)(n);
+	return r.replace(gt, (e, n, a) => {
+		let o = r.lastIndexOf("\n", a) + 1, s = r.slice(o, a);
 		if (_t.test(s)) return e;
-		let c = (0, J.isAbsolute)(n) ? n : (0, J.resolve)(i, n);
+		let c = (0, Y.isAbsolute)(n) ? n : (0, Y.resolve)(i, n);
 		return X(c.endsWith(".mmel") ? c : `${c}.mmel`, new Set(t));
 	});
 }
@@ -1956,12 +1956,12 @@ function* wt(e) {
 //#endregion
 //#region src/ser-des/index.ts
 function Z(e, t = {}) {
-	return f(l(e, K, t), q);
+	return f(l(e, q, t), J);
 }
 function Q(e, t = {}) {
-	let n = l(e, K, t);
+	let n = l(e, q, t);
 	return {
-		standard: f(n, q),
+		standard: f(n, J),
 		issues: n.issues
 	};
 }
@@ -1972,7 +1972,7 @@ function $(e, t = {}) {
 	return Q(X(e), t);
 }
 function Et(e) {
-	return ie(e, gt);
+	return ie(e, ht);
 }
 function Dt(e) {
 	return vt(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primmel/primmel",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Primmel — parser, types, and serializer for the Primmel modelling language (successor to MMEL)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",