Merge pull request #925 from aml-org/r/v5.4.0

R/v5.4.0

Dockerfile

@@ -5,8 +5,8 @@ USER root
 
 ARG USER_HOME_DIR="/root"
 
-ENV SCALA_VERSION 2.12.13
-ENV SBT_VERSION 1.7.1
+ENV SCALA_VERSION="2.12.13"
+ENV SBT_VERSION="1.7.1"
 
 
 # Update the repository sources list and install dependencies
@@ -28,7 +28,7 @@ RUN apt-get install unzip -y && \
 ## Piping curl directly in tar
 RUN \
   apt-get install curl --assume-yes && \
-  curl -fsL http://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \
+  curl -fsL http://www.scala-lang.org/files/archive/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \
   echo >> /root/.bashrc && \
   echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc
 

Jenkinsfile

@@ -86,7 +86,7 @@ pipeline {
                 wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {
                     script {
                         try {
-                            sh 'sbt -mem 6000 -Dflaky.ignore=true -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 clean coverage test coverageAggregate'
+                            sh 'sbt -mem 12000 -Dflaky.ignore=true -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 -Djava.io.tmpdir=$HOME clean coverage test coverageAggregate --warn'
                         } catch (e) {
                             failedStage = failedStage + " TEST "
                             unstable "Failed tests"
@@ -154,7 +154,7 @@ pipeline {
                 script {
                     try {
                         if (failedStage.isEmpty()) {
-                            sh 'sbt publish'
+                            sh 'sbt --mem 10000 publish -Djava.io.tmpdir=$HOME'
                         }
                     } catch (e) {
                         failedStage = failedStage + " PUBLISH "
@@ -177,7 +177,7 @@ pipeline {
                         if (failedStage.isEmpty()) {
                             publish_version_node_client = "${publish_version}".replace("\n", "")
                             echo "$publish_version_node_client"
-                            sh 'sbt -mem 6000 -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 buildNodeJsClient'
+                            sh 'sbt -mem 10000 -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 buildNodeJsClient -Djava.io.tmpdir=$HOME'
                             def statusCode = 1
                             dir("als-node-client/node-package") {
                                 echo "Publishing NPM package: ${publish_version_node_client}"
@@ -205,7 +205,7 @@ pipeline {
                     script {
                         if (failedStage.isEmpty()) {
                             def statusCode = 1
-                            statusCode = sh script:'sbt -mem 6000 -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 buildJsServerLibrary', returnStatus: true
+                            statusCode = sh script:'sbt -mem 12000 -Dsbt.global.base=.sbt -Dsbt.boot.directory=.sbt -Dsbt.ivy.home=.ivy2 -Djava.io.tmpdir=$HOME buildJsServerLibrary', returnStatus: true
                             if(statusCode != 0) {
                                 failedStage = failedStage + " PUBLISH-SERVER-JS "
                                 unstable "Failed als-server JS publication"

adrs/bumps/0001-scalaJS-1.1.0.md

@@ -0,0 +1,47 @@
+# 1. Bump ScalaJS from 0.6 to 1.1
+
+Date: 2023-03-10
+
+## Status
+In Progress
+
+## Context
+Bump ScalaJS from 0.6 to 1.1 had a lot of compatibility issues with some plugins and dependencies, like:
+
+- sbt-scalajs: 1.6.0 
+- scalatest
+- upickle
+- node v16.19.0
+
+
+## Decision
+1. We follow AMF suggestion to use `sbt-scalaJS:1.6.0` instead of `1.7.0+` beacuse of _RegEx adaption_
+2. We found a `scalatest` version that has compatibility with `scalaJS 1`
+3. `upickle` use `scalaJS 1` since `0.9.x`. [See more details](https://mvnrepository.com/artifact/com.lihaoyi/upickle_sjs1_2.12)
+4. For node 16 we decide to use `scala-js-nodejs-v14` from `net-exoego`. We had to downgrade to _Node 14_ because this is used only for **Test mode** and for _Node 16_ there was just one version and this unique version requires `sbt-scalajs 1.8.0+`
+
+## Issues
+- Changing to latest `Upickle` version fix compatibility with `sbt-scalaJS` but fail all `als-suggestion` tests because the write function of an empty array change from:
+`[]` to 
+`[ \n ]`
+- Some code had to been changed because of deprecated packages
+- Some `@JSExport` annotations were changed to `@JSExportTopLevel`
+- Workspaces name were removed from exported annotations
+- `ScalaJSModuleKind` was replaced with `scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)
+.withESFeatures(_.withESVersion(ESVersion.ES2016))
+  }`
+- Other replacements (depends of scala version):
+  - `fastOptJS` -> `fastLinkJS`
+  - `fullOptJS` -> `fullLinkJS`
+  - `artifactPath` -> `scalaJSLinkerOutputDirectory`
+
+  ** NOTE: This modifications in the linkerJS config change the way that the autogenerated JS file is created. It creates a folder with main.js files instead of .js files. Keep in mind that for some commands (i.e. buildServerJsLibrary) need to run an script that move those file to another dir. If this config is updated the script file need to be fixed.
+- Some commons dependencies do not on JS, so we need to add those using `libraryDependencies` in _JS Settings_ section.
+
+
+
+### Internal Work Items
+- [W-12658516](https://gus.lightning.force.com/a07EE00001MkxRJYAZ)
+- [W-12601018](https://gus.lightning.force.com/a07EE00001LqaxfYAB)
+
+

als-actions/js/package.json

@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.23",
+    "@aml-org/amf-antlr-parsers": "0.7.24",
     "ajv": "6.12.6"
   },
   "author": "",

als-actions/shared/src/test/scala/org/mulesoft/als/actions/HoverActionTest.scala

@@ -12,7 +12,8 @@ import org.mulesoft.amfintegration.amfconfiguration.{
   EditorConfiguration,
   EmptyProjectConfigurationState
 }
-import org.scalatest.{Assertion, AsyncFunSuite}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
 import org.yaml.model._
 
 import scala.concurrent.{ExecutionContext, Future}

als-actions/shared/src/test/scala/org/mulesoft/als/actions/codeactions/BaseCodeActionTests.scala

@@ -8,7 +8,6 @@ import org.mulesoft.als.common.diff.FileAssertionTest
 import org.mulesoft.als.common.dtoTypes.PositionRange
 import org.mulesoft.als.common.{PlatformDirectoryResolver, WorkspaceEditSerializer}
 import org.mulesoft.als.configuration.AlsConfiguration
-import org.mulesoft.amfintegration.AmfImplicits.AmfAnnotationsImp
 import org.mulesoft.amfintegration.amfconfiguration.{
   ALSConfigurationState,
   AmfParseResult,
@@ -21,7 +20,9 @@ import org.mulesoft.lsp.edit.WorkspaceEdit
 import org.mulesoft.lsp.feature.codeactions.CodeAction
 import org.mulesoft.lsp.feature.telemetry.MessageTypes.MessageTypes
 import org.mulesoft.lsp.feature.telemetry.TelemetryProvider
-import org.scalatest.{Assertion, AsyncFlatSpec, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{ExecutionContext, Future}

als-actions/shared/src/test/scala/org/mulesoft/als/actions/codeactions/DeleteDeclaredNodeTest.scala

@@ -9,7 +9,7 @@ import org.mulesoft.amfintegration.amfconfiguration.{
   EditorConfiguration,
   EmptyProjectConfigurationState
 }
-import org.scalatest.Assertion
+import org.scalatest.compatible.Assertion
 import org.yaml.model.YDocument
 import org.yaml.model.YDocument.{EntryBuilder, PartBuilder}
 import org.yaml.render.YamlRender

als-actions/shared/src/test/scala/org/mulesoft/als/actions/definition/DefinitionFileTests.scala

@@ -1,7 +1,8 @@
 package org.mulesoft.als.actions.definition
 
 import amf.core.internal.unsafe.PlatformSecrets
-import org.scalatest.{AsyncFlatSpec, Matchers}
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext
 

als-actions/shared/src/test/scala/org/mulesoft/als/actions/folding/FoldingRangesTests.scala

@@ -10,7 +10,8 @@ import org.mulesoft.amfintegration.amfconfiguration.{
   EmptyProjectConfigurationState
 }
 import org.mulesoft.lsp.feature.folding.FoldingRange
-import org.scalatest.{AsyncFlatSpec, Matchers}
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{ExecutionContext, Future}

als-actions/shared/src/test/scala/org/mulesoft/als/actions/links/FindLinksTests.scala

@@ -1,9 +1,10 @@
 package org.mulesoft.als.actions.links
 
 import amf.core.internal.unsafe.PlatformSecrets
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class FindLinksTests extends FlatSpec with Matchers with PlatformSecrets {
+class FindLinksTests extends AnyFlatSpec with Matchers with PlatformSecrets {
   behavior of "Find Links"
 
   // todo: find a way to test this in a simple way (currently tested in server module)

als-actions/shared/src/test/scala/org/mulesoft/als/actions/rangeFormatting/FormattingOptionsTest.scala

@@ -4,10 +4,11 @@ import amf.core.internal.unsafe.PlatformSecrets
 import org.mulesoft.als.actions.formatting.RangeFormatting
 import org.mulesoft.amfintegration.ErrorsCollected
 import org.mulesoft.lsp.configuration.FormattingOptions
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import org.yaml.model.YMap
 
-class FormattingOptionsTest extends FlatSpec with Matchers with PlatformSecrets {
+class FormattingOptionsTest extends AnyFlatSpec with Matchers with PlatformSecrets {
   behavior of "Formatting Options"
 
   private val baseTest = "my:    \n  test: lorem ipsum       \n\n\n\n\n"

als-actions/shared/src/test/scala/org/mulesoft/als/actions/selection/SelectionRangeFinderTest.scala

@@ -12,7 +12,8 @@ import org.mulesoft.amfintegration.amfconfiguration.{
 }
 import org.mulesoft.lsp.feature.common.{Range, Position => LspPosition}
 import org.mulesoft.lsp.feature.selectionRange.SelectionRange
-import org.scalatest.{AsyncFlatSpec, Matchers}
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

als-common/js/package.json

@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.23",
+    "@aml-org/amf-antlr-parsers": "0.7.24",
     "ajv": "6.12.6"
   },
   "author": "",

als-common/js/src/main/scala/org/mulesoft/als/configuration/ClientDirectoryResolver.scala

@@ -2,12 +2,10 @@ package org.mulesoft.als.configuration
 
 import org.mulesoft.als.common.{DirectoryResolver => InternalResolver}
 
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.scalajs.js
-import scala.scalajs.js.annotation.ScalaJSDefined
-import scala.concurrent.ExecutionContext.Implicits.global
 
-@ScalaJSDefined
 trait ClientDirectoryResolver extends js.Object {
 
   def exists(path: String): js.Promise[Boolean]