stabilise order of generated definitions' imports

cdn77 · Nov 8, 2023 · 02860cb · 02860cb
1 parent c0f5439
commit 02860cb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/core/cli/package.json b/core/cli/package.json
@@ -9,7 +9,7 @@
     "ioc",
     "inversion of control"
   ],
-  "version": "0.0.40",
+  "version": "0.0.41",
   "license": "MIT",
   "author": {
     "name": "Dan Kadera",

diff --git a/core/cli/src/compiler.ts b/core/cli/src/compiler.ts
@@ -447,9 +447,15 @@ function compareIDs(a: string, b: string): number {
 }
 
 function extractSources(definitions: ServiceDefinitionInfo[]): Map<SourceFile, string> {
-  return new Map([
-    ...new Set(definitions.flatMap((d) => [d.source, ...d.decorators.map((o) => o.source)])),
-  ].map((s, i) => [s, `defs${i}`]));
+  const sources = [...new Set(definitions.flatMap((d) => [d.source, ...d.decorators.map((o) => o.source)]))];
+  sources.sort(compareSourceFiles);
+  return new Map(sources.map((s, i) => [s, `defs${i}`]));
+}
+
+function compareSourceFiles(a: SourceFile, b: SourceFile): number {
+  const pa = a.getFilePath();
+  const pb = b.getFilePath();
+  return pa < pb ? -1 : pa > pb ? 1 : 0;
 }
 
 function join(separator: string, ...tokens: (string | 0 | false | undefined)[]): string {

diff --git a/package-lock.json b/package-lock.json