Added typechecking of typescript files as tasks

alexsieland · May 30, 2024 · 1f9db2e · 1f9db2e
1 parent a703d65
commit 1f9db2e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/.moon/tasks/typescript.yml b/.moon/tasks/typescript.yml
@@ -0,0 +1,28 @@
+fileGroups:
+  sources:
+    - 'src/**/*'
+    - 'tsconfig.json'
+    - 'tsconfig.cjs.json'
+    - 'types/**/*'
+tasks:
+  type-check-esm:
+    command: tsc
+    args:
+    - '--project'
+    - 'tsconfig.json'
+    inputs:
+    - '@globs(sources)'    
+
+  type-check-cjs:
+   command: tsc
+   args:
+    - '--project'
+    - 'tsconfig.cjs.json'
+   inputs:
+    - '@globs(sources)'
+
+  type-check:
+    inputs: []
+    deps:
+      - target: '~:type-check-esm'
+      - target: '~:type-check-cjs'
diff --git a/packages/morphir-elm-compiler/src/cli.ts b/packages/morphir-elm-compiler/src/cli.ts
@@ -8,7 +8,6 @@ import * as Dependencies from "./dependencies";
 
 import { DependencyConfig } from "./dependencies";
 import { parseIncludes } from "./compiler/types";
-import { z } from "zod";
 import CLI from "./elm/Morphir/Elm/CLI.elm";
 
 const fsExists = util.promisify(fs.exists);

diff --git a/packages/morphir-elm-compiler/src/compiler.ts b/packages/morphir-elm-compiler/src/compiler.ts
@@ -4,6 +4,7 @@ import {
   VirtualFile,
 } from "./compiler/types";
 import * as Dependencies from "./dependencies";
+
 import {
   type FileChanges,
   type FileChange,
@@ -15,8 +16,16 @@ export function compileVirtualFiles(
   projectManifest: MorphirProjectManifest,
   options: ElmCompilerOptions
 ) {
-  const changes = virtualFilesToFileChanges(...files);
+  const _changes = virtualFilesToFileChanges(...files);
+  console.log("changes: ", _changes);
   //TODO: Load dependencies and such
+  const loadOptions = {
+    ...projectManifest,
+    localDependencies: projectManifest.localDependencies || [],
+    dependencies: projectManifest.dependencies || [],
+    includes: options.include || [],
+  };
+  Dependencies.loadAllDependencies(loadOptions);
   return {};
 }
 

diff --git a/packages/morphir-elm-compiler/src/dependencies.ts b/packages/morphir-elm-compiler/src/dependencies.ts
@@ -7,7 +7,6 @@ import { Readable } from "stream";
 import { ResultAsync } from "neverthrow";
 import { DataUrl, FileUrl } from "./compiler/types";
 
-const parseDataUrl = require("data-urls");
 //const fsReadFile = util.promisify(fs.readFile);
 
 const Url = z