Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
AttilaMihaly committed Mar 18, 2020
2 parents c22e947 + 1726587 commit 2f9550d
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build --if-present
- run: npm test
env:
CI: true
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "morphir-elm",
"version": "0.2.1",
"version": "0.3.2",
"description": "Elm bindings for Morphir",
"scripts": {
"test": "elm-test",
Expand Down Expand Up @@ -38,4 +38,4 @@
"dependencies": {
"commander": "^4.1.1"
}
}
}
13 changes: 0 additions & 13 deletions src/Morphir/Elm/Frontend.elm
Original file line number Diff line number Diff line change
Expand Up @@ -239,19 +239,6 @@ mapProcessedFile currentPackagePath processedFile modulesSoFar =
|> Node.value
|> ElmModule.exposingList

moduleDeclsSoFar =
modulesSoFar
|> Dict.map
(\path def ->
Module.definitionToDeclaration def
)

moduleResolver : ModuleResolver
moduleResolver =
Resolve.createModuleResolver
(Resolve.createPackageResolver Dict.empty currentPackagePath moduleDeclsSoFar)
(processedFile.file.imports |> List.map Node.value)

typesResult : Result Errors (Dict Name (AccessControlled (Type.Definition SourceLocation)))
typesResult =
mapDeclarationsToType processedFile.parsedFile.sourceFile moduleExpose (processedFile.file.declarations |> List.map Node.value)
Expand Down

0 comments on commit 2f9550d

Please sign in to comment.