@lionweb/utilities 0.7.2-beta.1 → 0.7.2-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -1
- package/dist/m3/diagrams/Mermaid-generator.js +5 -2
- package/dist/m3/diagrams/Mermaid-generator.js.map +1 -1
- package/dist/m3/diagrams/PlantUML-generator.js +1 -1
- package/dist/m3/diagrams/PlantUML-generator.js.map +1 -1
- package/package.json +5 -5
- package/src/m3/diagrams/Mermaid-generator.ts +5 -2
- package/src/m3/diagrams/PlantUML-generator.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,8 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
## 0.7.2
|
|
4
4
|
|
|
5
|
-
*
|
|
5
|
+
* W.r.t. the `generate{PlantUml|Mermaid}ForLanguage` diagram generation functions:
|
|
6
6
|
* (Expose a `DiagramRenderer` type to unify these two diagram generation functions type-wise.)
|
|
7
|
+
* Add an optional second argument to both functions, that determines which entities to focus on.
|
|
8
|
+
* Fix the `generationMermaidForLanguage` function to correctly deal with concepts that are partitions, and classifiers that are annotations.
|
|
9
|
+
* Modify both functions to make the relation between annotations and annotated classifier clearer.
|
|
7
10
|
|
|
8
11
|
|
|
9
12
|
## 0.7.1
|
|
@@ -21,14 +21,17 @@ export const generateMermaidForLanguage = ({ entities }, focusEntities = nameSor
|
|
|
21
21
|
]);
|
|
22
22
|
const generateForEnumeration = ({ name, literals }) => withNewLine(block(`class ${name}`, [`<<enumeration>>`, literals.map(({ name }) => name)]));
|
|
23
23
|
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }) => [
|
|
24
|
-
block([`class ${name}
|
|
24
|
+
block([`class ${name}`], nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
25
|
+
`<<Annotation>> ${name}`,
|
|
26
|
+
isRef(annotates) ? `${name} ..> ${annotates.name} : <i>annotates</i>` : [],
|
|
25
27
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
26
28
|
implements_.filter(isRef).map(interface_ => `${interface_.name} <|.. ${name}`),
|
|
27
29
|
``
|
|
28
30
|
];
|
|
29
31
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_ /*, implements: implements_*/, partition }) => [
|
|
30
|
-
block(`class ${
|
|
32
|
+
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
31
33
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
34
|
+
partition ? `<<Partition>> ${name}` : [],
|
|
32
35
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
33
36
|
``
|
|
34
37
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,WAAW,EAEX,SAAS,EACT,oBAAoB,EACpB,KAAK,EAGL,IAAI,EACJ,UAAU,EACV,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAA;AAKnE,iDAAiD;AAEjD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,KAAK,GAAG,CAAC,MAAgB,EAAE,QAAoB,EAAY,EAAE,CAC/D,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAA;AAE7E,MAAM,WAAW,GAAG,CAAC,OAAiB,EAAY,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AAElE;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAoB,CAAC,EAAE,QAAQ,EAAY,EAAE,gBAAkC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,CAC1I,QAAQ,CAAC;IACL,YAAY;IACZ,cAAc;IACd,EAAE;IACF,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC9C,EAAE;IACF,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACnD,EAAE;IACF,KAAK;CACR,CAAC,CAAA;AAEN,MAAM,sBAAsB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAe,EAAE,EAAE,CAC/D,WAAW,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAE5F,MAAM,qBAAqB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAc,EAAE,EAAE,CAAC;IACrH,KAAK,CACD,CAAC,SAAS,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
39
39
|
}
|
|
40
40
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
41
41
|
return nonRelationalFeatures_.length === 0
|
|
42
|
-
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name}
|
|
42
|
+
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name} ..# ${annotates.name} : <i>annotates</i>` : [], ``]
|
|
43
43
|
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``];
|
|
44
44
|
};
|
|
45
45
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_, implements: implements_, partition }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,WAAW,EAEX,SAAS,EACT,oBAAoB,EACpB,KAAK,EAGL,IAAI,EACJ,MAAM,EACN,UAAU,EACV,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAKzD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAoB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAY,EAAE,gBAAkC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,CACjJ,QAAQ,CAAC;IACL,WAAW;IACX,oBAAoB;IACpB,EAAE;IACF,sBAAsB,IAAI,GAAG;IAC7B,EAAE;IACF,EAAE;IACF,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC;IACpC,EAAE;IACF,EAAE;IACF,cAAc;IACd,EAAE;IACF,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACzC,EAAE;IACF,SAAS;CACZ,CAAC,CAAA;AAEN,MAAM,sBAAsB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAe,EAAE,EAAE,CAAC;IAChE,QAAQ,IAAI,IAAI;IAChB,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1C,GAAG;IACH,EAAE;CACL,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAc,EAAE,EAAE;IACpH,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3E,CAAC;IACD,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IAC9D,OAAO,sBAAsB,CAAC,MAAM,KAAK,CAAC;QACtC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ,SAAS,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/utilities",
|
|
3
|
-
"version": "0.7.2-beta.
|
|
3
|
+
"version": "0.7.2-beta.3",
|
|
4
4
|
"description": "LionWeb utilities",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@lionweb/core": "0.7.2-beta.
|
|
19
|
-
"@lionweb/json": "0.7.2-beta.
|
|
20
|
-
"@lionweb/textgen-utils": "0.7.2-beta.
|
|
21
|
-
"@lionweb/ts-utils": "0.7.2-beta.
|
|
18
|
+
"@lionweb/core": "0.7.2-beta.3",
|
|
19
|
+
"@lionweb/json": "0.7.2-beta.3",
|
|
20
|
+
"@lionweb/textgen-utils": "0.7.2-beta.3",
|
|
21
|
+
"@lionweb/ts-utils": "0.7.2-beta.3",
|
|
22
22
|
"littoral-templates": "0.5.1",
|
|
23
23
|
"nanoid": "5.1.5"
|
|
24
24
|
},
|
|
@@ -53,9 +53,11 @@ const generateForEnumeration = ({ name, literals }: Enumeration) =>
|
|
|
53
53
|
|
|
54
54
|
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }: Annotation) => [
|
|
55
55
|
block(
|
|
56
|
-
[`class ${name}
|
|
56
|
+
[`class ${name}`],
|
|
57
57
|
nonRelationalFeatures(features).map(generateForNonRelationalFeature)
|
|
58
58
|
),
|
|
59
|
+
`<<Annotation>> ${name}`,
|
|
60
|
+
isRef(annotates) ? `${name} ..> ${annotates.name} : <i>annotates</i>` : [],
|
|
59
61
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
60
62
|
implements_.filter(isRef).map(interface_ => `${interface_.name} <|.. ${name}`),
|
|
61
63
|
``
|
|
@@ -68,8 +70,9 @@ const generateForConcept = ({
|
|
|
68
70
|
extends: extends_ /*, implements: implements_*/,
|
|
69
71
|
partition
|
|
70
72
|
}: Concept) => [
|
|
71
|
-
block(`class ${
|
|
73
|
+
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
72
74
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
75
|
+
partition ? `<<Partition>> ${name}` : [],
|
|
73
76
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
74
77
|
``
|
|
75
78
|
]
|
|
@@ -66,7 +66,7 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
66
66
|
}
|
|
67
67
|
const nonRelationalFeatures_ = nonRelationalFeatures(features)
|
|
68
68
|
return nonRelationalFeatures_.length === 0
|
|
69
|
-
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name}
|
|
69
|
+
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name} ..# ${annotates.name} : <i>annotates</i>` : [], ``]
|
|
70
70
|
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``]
|
|
71
71
|
}
|
|
72
72
|
|