Merge pull request #28 from kiko240/feature/sortResults

Sorting CSN read results, so contract entities will be sorted

.vscode/launch.json

@@ -18,7 +18,8 @@
                 "I",
                 "--format",
                 "--json",
-                "--debug"
+                "--debug",
+                "--sort"
             ],
             "runtimeArgs": ["-r", "ts-node/register"],
             "cwd": "${workspaceRoot}",

src/cli.ts

@@ -29,6 +29,10 @@ function main(): void {
             "-f, --format",
             "Flag, whether to format the outputted source code or not (will try to format with prettier rules in the project)"
         )
+        .option(
+            "-s, --sort",
+            "Flag, whether to sort outputted source code or not"
+        )
         .parse(process.argv);
 
     if (!process.argv.slice(2).length) {

src/program.ts

@@ -27,7 +27,10 @@ export class Program {
      */
     public async run(options: IOptions): Promise<void> {
         // Load compiled CDS.
-        const jsonObj = await this.loadCdsAndConvertToJSON(options.cds);
+        const jsonObj = await this.loadCdsAndConvertToJSON(
+            options.cds,
+            options.sort
+        );
 
         // Write the compiled CDS JSON to disc for debugging.
         if (options.json) {
@@ -84,9 +87,23 @@ export class Program {
      * @returns {Promise<any>}
      * @memberof Program
      */
-    private async loadCdsAndConvertToJSON(path: string): Promise<unknown> {
+    private async loadCdsAndConvertToJSON(
+        path: string,
+        sort: boolean
+    ): Promise<unknown> {
         const csn = await cds.load(path);
-        return JSON.parse(cds.compile.to.json(csn));
+
+        const result: ICsn = JSON.parse(cds.compile.to.json(csn));
+
+        if (sort) {
+            result.definitions = Object.fromEntries(
+                Object.entries(result.definitions).sort((key, value) =>
+                    String(key[0]).localeCompare(value[0])
+                )
+            );
+        }
+
+        return result;
     }
 
     /**

src/utils/types.ts

@@ -161,4 +161,5 @@ export interface IOptions {
     debug: boolean;
     version: string;
     format: boolean;
+    sort: boolean;
 }

tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "es2015",
         "module": "commonjs",
-        "lib": ["es6", "es2015", "es2016", "dom"],
+        "lib": ["es6", "es2015", "es2016", "es2020", "dom"],
         "rootDir": "./",
         "downlevelIteration": true,
         "strict": true,