@lionweb/cli 0.6.0-beta.3 → 0.6.1

package/README.md

@@ -15,54 +15,59 @@ $ npx @lionweb/cli
 
 produces information about which commands are available.
 
+This CLI utility does not perform any explicit validation apart from the file at the given path existing and being valid JSON.
+It does some implicit validation as it can error out on incorrect serializations.
+
 
-## Extracting essential information from a serialization chunk
+## Sorting a serialization chunk
 
-Run the following command to make "extractions" from a serialization chunk (e.g.):
+Run the following command to sort a serialization chunk (e.g.):
 
 ```shell
-npx @lionweb/cli extract ../artifacts/chunks/languages/lioncore.json
+npx @lionweb/cli sort ../artifacts/chunks/languages/lioncore.json
 ```
 
-This is meant as a way to inspect, reason about, and compare serialization because the format is rather verbose.
-These extractions are:
+Sorting a serialization chunk means the following:
 
-* A "sorted" JSON with:
-    * all nodes sorted by ID,
-    * for all nodes, their properties, containments, and references sorted by key (from the meta-pointer),
-    * and all containments and references sorted by ID.
-* A "shortened" JSON where keys are used as key names.
-* If the serialization represents a language - i.e.: a LionCore model - then a textual version is generated as well.
+* All nodes sorted by ID.
+* For all nodes, their properties, containments, and references sorted by key (from the meta-pointer),
+* All containments and references sorted by ID.
 
-This CLI utility does not perform any explicit validation apart from the file at the given path existing and being valid JSON.
-It does some implicit validation as it can error out on incorrect serializations.
+The sorting produces a serialization chunk that's also aligned on JSON-level with the specification.
+That means that key-value pairs appear in precisely the same order as they do in the specification, and that missing key-value pairs are put in and get their default values.
 
 
 ## Changelog
 
+### 0.6.1
+
+* Fix that `@lionweb/validation` was not specified as a (non-dev) dependency.
+
 ### 0.6.0
 
-* Add a `repair` command that aligns a JSON serialization chunk with the specification.
+* Change the `diagram` command to output PlantUML and Mermaid diagram files _per language_.
+* Add a `validation` commmand to validate JSON files as serialization chunks.
+* Remove the shortening functionality from `extract`.
+* Rename the `extract` command → `sort`, and remove the textualization for chunks that are the serialization of languages.
+* Textualizing a serialization chunk of languages will use the LionCore/M3-specific syntax _unless_ the flag `--languagesAsRegular` is an argument.
+* Add a `repair` command.
 * Add a `textualize` command – that's optionally language-aware – to render a JSON serialization chunk as pure text.
 
-
 ### 0.5.0
 
 This is the first version corresponding to a release of LionWeb (version: 2023.1) as a whole.
 
 * Make language-related functionality "multi-lingual", i.e. a serialization chunk can contain multiple `Language`s.
-  * (Languages will be sorted by name.)
+    * (Languages will be sorted by name.)
 * Improve extraction functionality: only catch JSON-parsing exceptions.
 * Configure single entrypoint named `lionweb-cli`.
 
 No changelog has been kept for previous versions, regardless of whether these were published or not.
 
-
 ## Development
 
 Build the executable from source as follows:
 
 ```shell
-$ ./build.sh
+$ npm run build
 ```
-

package/dist/lionweb-cli.js

@@ -2,16 +2,18 @@
 import { argv } from "process";
 import { diagramFromSerialization } from "./m3/diagram-generator.js";
 import { generateTsTypesWith } from "./m3/ts-types-generator.js";
-import { extractFromSerialization } from "./serialization/extractor.js";
+import { sortSerialization } from "./serialization/sorter.js";
 import { repairSerializationChunk } from "./serialization/repairer.js";
 import { executeTextualizeCommand } from "./serialization/textualizer.js";
-const main = (args) => {
+import { runValidation } from "./validator.js";
+const main = async (args) => {
     const DIAGRAM_COMMAND = "diagram";
-    const EXTRACT_COMMAND = "extract";
+    const SORT_COMMAND = "sort";
     const GENERATE_TS_TYPES_COMMAND = "generate-ts-types";
     const REPAIR_COMMAND = "repair";
     const TEXTUALIZE_COMMAND = "textualize";
-    const commands = [DIAGRAM_COMMAND, EXTRACT_COMMAND, GENERATE_TS_TYPES_COMMAND, REPAIR_COMMAND, TEXTUALIZE_COMMAND].sort();
+    const VALIDATE_COMMAND = "validate";
+    const commands = [DIAGRAM_COMMAND, SORT_COMMAND, GENERATE_TS_TYPES_COMMAND, REPAIR_COMMAND, TEXTUALIZE_COMMAND, VALIDATE_COMMAND].sort();
     if (args.length <= 2) {
         console.log(`lionweb-cli is a LionWeb utility around LionWeb-TypeScript
 
@@ -35,14 +37,13 @@ ${commands.map((command) => `    ${command}\n`).join(``)}
             }
             return;
         }
-        case EXTRACT_COMMAND: {
+        case SORT_COMMAND: {
             if (commandArgs.length === 0) {
-                console.log(`The ${EXTRACT_COMMAND} command extracts the following from a serialization chunk in the form of files: a sorted JSON, and a shortened JSON.
-If the chunk is the serialization of a LionCore Language/M2, then a textual rendering is also output.
+                console.log(`The ${SORT_COMMAND} command sorts JSON files that are serialization chunk – sorted serialization chunks can be easily compared.
 (See the README.md for more information.)`);
             }
             else {
-                commandArgs.forEach(extractFromSerialization);
+                commandArgs.forEach(sortSerialization);
             }
             return;
         }
@@ -51,14 +52,15 @@ If the chunk is the serialization of a LionCore Language/M2, then a textual rend
                 console.log(`The ${GENERATE_TS_TYPES_COMMAND} command generates a TypeScript source files with type definitions for the given (JSON serializations of) languages, assuming the use of the dynamic façade.`);
             }
             else {
-                generateTsTypesWith(commandArgs);
+                await generateTsTypesWith(commandArgs);
             }
             return;
         }
         case REPAIR_COMMAND: {
             if (commandArgs.length === 0) {
                 console.log(`The ${REPAIR_COMMAND} command "repairs" the given JSON files that represent serialization chunks.
-Right now, that means that the ordering of the key-value pairs is precisely aligned with the specification.`);
+Right now, that means that key-value pairs appear in precisely the same order as they do in the specification.
+Missing key-value pairs are put in and get their default values.`);
             }
             else {
                 commandArgs.forEach(repairSerializationChunk);
@@ -70,18 +72,28 @@ Right now, that means that the ordering of the key-value pairs is precisely alig
                 console.log(`The ${TEXTUALIZE_COMMAND} command produces purely textual renderings of the given serialization chunks.
 Chunks given after a '--language' or '--languages' flag (which are synonyms) are assumed to be serializations of languages.
 These languages are then used to try and resolve the keys of languages' entities and their features to names.
+If a serialization chunk is the serialization of a language (as instance of LionCore/M3), then the LionCore/M3-specific
+textual syntax is used, unless a flag '--asRegular' is provided.
 `);
             }
             else {
-                executeTextualizeCommand(commandArgs);
+                await executeTextualizeCommand(commandArgs);
+            }
+            return;
+        }
+        case VALIDATE_COMMAND: {
+            if (commandArgs.length === 0) {
+                console.log(`The ${VALIDATE_COMMAND} command validates a serialization chunk. \nUsage: npx @lionweb/cli validate <path_to_chunk>`);
+            }
+            else {
+                commandArgs.forEach(runValidation);
             }
             return;
         }
-        // TODO  generate schema, import Ecore
         default: {
             console.error(`command "${command}" is not recognized`);
         }
     }
 };
-main(argv);
+await main(argv);
 //# sourceMappingURL=lionweb-cli.js.map

package/dist/lionweb-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"lionweb-cli.js","sourceRoot":"","sources":["../src/lionweb-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lionweb-cli.js","sourceRoot":"","sources":["../src/lionweb-cli.ts"],"names":[],"mappings":"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"}

package/dist/m3/diagram-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-generator.d.ts","sourceRoot":"","sources":["../../src/m3/diagram-generator.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,wBAAwB,SAAgB,MAAM,kBAW1D,CAAA"}
+{"version":3,"file":"diagram-generator.d.ts","sourceRoot":"","sources":["../../src/m3/diagram-generator.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,wBAAwB,SAAgB,MAAM,kBAc1D,CAAA"}

package/dist/m3/diagram-generator.js

@@ -1,15 +1,17 @@
 import { writeFileSync } from "fs";
-import { extname } from "path";
+import { dirname } from "path";
 import { deserializeLanguages } from "@lionweb/core";
 import { generateMermaidForLanguage, generatePlantUmlForLanguage, readFileAsJson } from "@lionweb/utilities";
 export const diagramFromSerialization = async (path) => {
     try {
         const json = readFileAsJson(path);
-        const extlessPath = path.substring(0, path.length - extname(path).length);
+        const dir = dirname(path);
         const languages = deserializeLanguages(json);
-        writeFileSync(extlessPath + ".puml", languages.map(generatePlantUmlForLanguage).join("\n\n"));
-        writeFileSync(extlessPath + ".md", languages.map(generateMermaidForLanguage).join("\n\n"));
-        console.log(`generated diagrams: "${path}" -> "${extlessPath}"`);
+        languages.forEach((language) => {
+            writeFileSync(`${dir}/${language.name}.puml`, generatePlantUmlForLanguage(language));
+            writeFileSync(`${dir}/${language.name}.md`, generateMermaidForLanguage(language));
+        });
+        console.log(`generated diagrams: "${path}" -> "${dir}/"`);
     }
     catch (_) {
         console.error(`"${path}" does not point to a valid JSON serialization of a language`);

package/dist/m3/diagram-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-generator.js","sourceRoot":"","sources":["../../src/m3/diagram-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,IAAI,CAAA;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAC,oBAAoB,EAAqB,MAAM,eAAe,CAAA;AACtE,OAAO,EAAC,0BAA0B,EAAE,2BAA2B,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAA;AAG1G,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC3D,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAuB,CAAA;QACvD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;QACzE,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;QAC5C,aAAa,CAAC,WAAW,GAAG,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7F,aAAa,CAAC,WAAW,GAAG,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1F,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,SAAS,WAAW,GAAG,CAAC,CAAA;IACpE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,8DAA8D,CAAC,CAAA;IACzF,CAAC;AACL,CAAC,CAAA"}
+{"version":3,"file":"diagram-generator.js","sourceRoot":"","sources":["../../src/m3/diagram-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,IAAI,CAAA;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAC,oBAAoB,EAAqB,MAAM,eAAe,CAAA;AACtE,OAAO,EAAC,0BAA0B,EAAE,2BAA2B,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAA;AAG1G,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC3D,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAuB,CAAA;QACvD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACzB,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;QAC5C,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC3B,aAAa,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,OAAO,EAAE,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAA;YACpF,aAAa,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAA;QAErF,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,SAAS,GAAG,IAAI,CAAC,CAAA;IAC7D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,8DAA8D,CAAC,CAAA;IACzF,CAAC;AACL,CAAC,CAAA"}

package/dist/serialization/sorter.d.ts

@@ -0,0 +1,2 @@
+export declare const sortSerialization: (path: string) => Promise<void>;
+//# sourceMappingURL=sorter.d.ts.map

package/dist/serialization/sorter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sorter.d.ts","sourceRoot":"","sources":["../../src/serialization/sorter.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,SAAgB,MAAM,kBAMnD,CAAA"}

package/dist/serialization/sorter.js

@@ -0,0 +1,10 @@
+import { extname } from "path";
+import { readChunk, sortedSerializationChunk, writeJsonAsFile } from "@lionweb/utilities";
+export const sortSerialization = async (path) => {
+    const chunk = await readChunk(path);
+    const extLessPath = path.substring(0, path.length - extname(path).length);
+    const sortedJson = sortedSerializationChunk(chunk);
+    writeJsonAsFile(extLessPath + ".sorted.json", sortedJson);
+    console.log(`sorted: "${path}" -> ${extLessPath}`);
+};
+//# sourceMappingURL=sorter.js.map

package/dist/serialization/sorter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sorter.js","sourceRoot":"","sources":["../../src/serialization/sorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAC,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAC,MAAM,oBAAoB,CAAA;AAGvF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAA;IAClD,eAAe,CAAC,WAAW,GAAG,cAAc,EAAE,UAAU,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,QAAQ,WAAW,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}

package/dist/serialization/textualizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,wBAAwB,SAAgB,MAAM,EAAE,kBAS5D,CAAA"}
+{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,wBAAwB,SAAgB,MAAM,EAAE,kBAW5D,CAAA"}

package/dist/serialization/textualizer.js

@@ -1,20 +1,26 @@
 import { writeFile } from "fs/promises";
 import { extname } from "path";
-import { genericAsTreeText, readChunk, tryLoadAllAsLanguages } from "@lionweb/utilities";
+import { genericAsTreeText, languagesAsText, looksLikeSerializedLanguages, readChunk, tryLoadAllAsLanguages } from "@lionweb/utilities";
+import { deserializeLanguages } from "@lionweb/core";
+const languagesAsRegularFlag = "--languagesAsRegular";
 export const executeTextualizeCommand = async (args) => {
-    const indexLanguageArg = args.findIndex((arg) => arg === "--language" || arg === "--languages");
+    const languagesAsRegular = args.some((arg) => arg === languagesAsRegularFlag);
+    const otherArgs = args.filter((arg) => arg !== languagesAsRegularFlag);
+    const indexLanguageArg = otherArgs.findIndex((arg) => arg === "--language" || arg === "--languages");
     const languages = indexLanguageArg > -1
-        ? await tryLoadAllAsLanguages(args.slice(indexLanguageArg + 1))
+        ? await tryLoadAllAsLanguages(otherArgs.slice(indexLanguageArg + 1))
         : [];
-    const chunkPaths = args.slice(0, indexLanguageArg > -1 ? indexLanguageArg : undefined);
+    const chunkPaths = otherArgs.slice(0, indexLanguageArg > -1 ? indexLanguageArg : undefined);
     chunkPaths.forEach((chunkPath) => {
-        textualizeSerializationChunk(chunkPath, languages);
+        textualizeSerializationChunk(chunkPath, languagesAsRegular, languages);
     });
 };
-const textualizeSerializationChunk = async (path, languages = []) => {
+const textualizeSerializationChunk = async (path, languagesAsRegular, languages = []) => {
     const chunk = await readChunk(path);
     const extLessPath = path.substring(0, path.length - extname(path).length);
-    await writeFile(extLessPath + ".txt", genericAsTreeText(chunk, languages));
+    await writeFile(extLessPath + ".txt", looksLikeSerializedLanguages(chunk) && !languagesAsRegular
+        ? languagesAsText(deserializeLanguages(chunk))
+        : genericAsTreeText(chunk, languages));
     console.log(`textualized: ${path}`);
 };
 //# sourceMappingURL=textualizer.js.map

package/dist/serialization/textualizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAE,qBAAqB,EAAC,MAAM,oBAAoB,CAAA;AAItF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;IAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,YAAY,IAAI,GAAG,KAAK,aAAa,CAAC,CAAA;IAC/F,MAAM,SAAS,GAAG,gBAAgB,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,MAAM,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,EAAE,CAAA;IACR,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACtF,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7B,4BAA4B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAGD,MAAM,4BAA4B,GAAG,KAAK,EAAE,IAAY,EAAE,YAAwB,EAAE,EAAE,EAAE;IACpF,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IACzE,MAAM,SAAS,CAAC,WAAW,GAAG,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAA;IAC1E,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAA;AACvC,CAAC,CAAA"}
+{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAC5B,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,4BAA4B,EAC5B,SAAS,EACT,qBAAqB,EACxB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAC,oBAAoB,EAAW,MAAM,eAAe,CAAA;AAG5D,MAAM,sBAAsB,GAAG,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;IAC7D,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,sBAAsB,CAAC,CAAA;IAC7E,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,sBAAsB,CAAC,CAAA;IACtE,MAAM,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,YAAY,IAAI,GAAG,KAAK,aAAa,CAAC,CAAA;IACpG,MAAM,SAAS,GAAG,gBAAgB,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,MAAM,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,EAAE,CAAA;IACR,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC3F,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7B,4BAA4B,CAAC,SAAS,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAGD,MAAM,4BAA4B,GAAG,KAAK,EAAE,IAAY,EAAE,kBAA2B,EAAE,YAAwB,EAAE,EAAE,EAAE;IACjH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IACzE,MAAM,SAAS,CACX,WAAW,GAAG,MAAM,EACpB,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB;QACtD,CAAC,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAC5C,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAA;AACvC,CAAC,CAAA"}

package/dist/validator.d.ts

@@ -0,0 +1,2 @@
+export declare function runValidation(file: string): void;
+//# sourceMappingURL=validator.d.ts.map

package/dist/validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAGA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAQhD"}

package/dist/validator.js

@@ -0,0 +1,9 @@
+import { validateFileResultWithLanguage } from "@lionweb/validation";
+export function runValidation(file) {
+    console.log(`Validating ${file}`);
+    const validationResult = validateFileResultWithLanguage(file);
+    console.log(validationResult.hasErrors()
+        ? validationResult.issues.map(issue => issue.errorMsg()).join("\n")
+        : "No errors found");
+}
+//# sourceMappingURL=validator.js.map

package/dist/validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,8BAA8B,EAAC,MAAM,qBAAqB,CAAA;AAGlE,MAAM,UAAU,aAAa,CAAC,IAAY;IACtC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;IACjC,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAA;IAC7D,OAAO,CAAC,GAAG,CACP,gBAAgB,CAAC,SAAS,EAAE;QACxB,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACnE,CAAC,CAAC,iBAAiB,CAC1B,CAAA;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionweb/cli",
-  "version": "0.6.0-beta.3",
+  "version": "0.6.1",
   "description": "LionWeb CLI for {Java|Type}Script",
   "bin": {
     "lionweb-cli": "./dist/lionweb-cli.js"
@@ -18,14 +18,15 @@
     "url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
   },
   "dependencies": {
-    "@lionweb/core": "0.6.0-beta.3",
-    "@lionweb/utilities": "0.6.0-beta.3"
-  },
-  "devDependencies": {
-    "@types/node": "20.10.4",
-    "typescript": "5.3.3"
+    "@lionweb/core": "0.6.0",
+    "@lionweb/utilities": "0.6.0",
+    "@lionweb/validation": "0.6.0"
   },
   "scripts": {
-    "build": "tsc"
+    "clean": "rm -rf dist/ lionweb-cli-*.tgz",
+    "build": "tsc",
+    "lint": "eslint src",
+    "test": "node dist/lionweb-cli.js",
+    "release": "npm publish"
   }
 }

package/build.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-rm -rf dist/ node_modules/ lionweb-cli-*.tgz
-npm i
-npm run build
-

package/dist/serialization/extractor.d.ts

@@ -1,2 +0,0 @@
-export declare const extractFromSerialization: (path: string) => Promise<void>;
-//# sourceMappingURL=extractor.d.ts.map

package/dist/serialization/extractor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../src/serialization/extractor.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,wBAAwB,SAAgB,MAAM,kBAU1D,CAAA"}

package/dist/serialization/extractor.js

@@ -1,16 +0,0 @@
-import { writeFileSync } from "fs";
-import { extname } from "path";
-import { deserializeLanguages } from "@lionweb/core";
-import { languagesAsText, looksLikeSerializedLanguages, readChunk, shortenedSerializationChunk, sortedSerializationChunk, writeJsonAsFile } from "@lionweb/utilities";
-export const extractFromSerialization = async (path) => {
-    const chunk = await readChunk(path);
-    const extLessPath = path.substring(0, path.length - extname(path).length);
-    const sortedJson = sortedSerializationChunk(chunk);
-    writeJsonAsFile(extLessPath + ".sorted.json", sortedJson);
-    writeJsonAsFile(extLessPath + ".shortened.json", shortenedSerializationChunk(chunk)); // (could also sort)
-    if (looksLikeSerializedLanguages(chunk)) {
-        writeFileSync(extLessPath + ".txt", languagesAsText(deserializeLanguages(chunk)));
-    }
-    console.log(`extracted: "${path}" -> ${extLessPath}`);
-};
-//# sourceMappingURL=extractor.js.map

package/dist/serialization/extractor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/serialization/extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,IAAI,CAAA;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAA;AAClD,OAAO,EACH,eAAe,EACf,4BAA4B,EAC5B,SAAS,EACT,2BAA2B,EAC3B,wBAAwB,EACxB,eAAe,EAClB,MAAM,oBAAoB,CAAA;AAG3B,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC3D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAA;IAClD,eAAe,CAAC,WAAW,GAAG,cAAc,EAAE,UAAU,CAAC,CAAA;IACzD,eAAe,CAAC,WAAW,GAAG,iBAAiB,EAAE,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAA,CAAG,oBAAoB;IAC3G,IAAI,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,aAAa,CAAC,WAAW,GAAG,MAAM,EAAE,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACrF,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,QAAQ,WAAW,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA"}