Merge branch 'develop' into wip/vitvakatu/uploading-files

.github/workflows/gui.yml

@@ -821,6 +821,7 @@ jobs:
         env:
           APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
           APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
           CSC_IDENTITY_AUTO_DISCOVERY: "true"
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
           CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
@@ -1008,6 +1009,7 @@ jobs:
         env:
           APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
           APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
           CSC_IDENTITY_AUTO_DISCOVERY: "true"
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
           CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}

.github/workflows/release.yml

@@ -628,6 +628,7 @@ jobs:
         env:
           APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
           APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
           CSC_IDENTITY_AUTO_DISCOVERY: "true"
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
           CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
@@ -725,7 +726,7 @@ jobs:
     steps:
       - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
         name: Setup conda (GH runners only)
-        uses: s-weigand/setup-conda@v1.0.6
+        uses: s-weigand/setup-conda@v1.2.1
         with:
           update-conda: false
           conda-channels: anaconda, conda-forge
@@ -747,7 +748,7 @@ jobs:
         run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
         shell: bash
       - name: Checking out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           clean: false
           submodules: recursive
@@ -787,7 +788,7 @@ jobs:
     steps:
       - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
         name: Setup conda (GH runners only)
-        uses: s-weigand/setup-conda@v1.0.6
+        uses: s-weigand/setup-conda@v1.2.1
         with:
           update-conda: false
           conda-channels: anaconda, conda-forge
@@ -809,7 +810,7 @@ jobs:
         run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
         shell: bash
       - name: Checking out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           clean: false
           submodules: recursive
@@ -826,6 +827,7 @@ jobs:
         env:
           APPLEID: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
           APPLEIDPASS: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+          APPLETEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAM_ID }}
           CSC_IDENTITY_AUTO_DISCOVERY: "true"
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CODE_SIGNING_CERT_PASSWORD }}
           CSC_LINK: ${{ secrets.APPLE_CODE_SIGNING_CERT }}
@@ -856,7 +858,7 @@ jobs:
     steps:
       - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
         name: Setup conda (GH runners only)
-        uses: s-weigand/setup-conda@v1.0.6
+        uses: s-weigand/setup-conda@v1.2.1
         with:
           update-conda: false
           conda-channels: anaconda, conda-forge
@@ -878,7 +880,7 @@ jobs:
         run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
         shell: bash
       - name: Checking out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           clean: false
           submodules: recursive

CHANGELOG.md

@@ -588,6 +588,8 @@
 - [Implemented `Table.expand_to_rows` for the in-memory backend.][8029]
 - [Added XML support for `.to Table` and `.expand_column`.][8083]
 - [Added `Previous_Value` option to `fill_nothing` and `fill_empty`.][8105]
+- [Implemented new selector for when parameter in `filter_blank_rows`,
+  `select_blank_columns`, `remove_blank_columns`][7935]
 
 [debug-shortcuts]:
   https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
@@ -839,6 +841,7 @@
 [8029]: https://github.com/enso-org/enso/pull/8029
 [8083]: https://github.com/enso-org/enso/pull/8083
 [8105]: https://github.com/enso-org/enso/pull/8105
+[7935]: https://github.com/enso-org/enso/pull/7935
 
 #### Enso Compiler
 

app/gui2/src/util/__tests__/array.test.ts

@@ -14,18 +14,26 @@ fcTest.prop({
 })
 
 fcTest.prop({
-  arr: fc
-    .array(fc.float())
-    .map((a) => ({ arr: a.sort((a, b) => a - b), i: Math.floor(Math.random() * a.length) })),
+  arr: fc.array(fc.float({ noNaN: true })).chain((a) => {
+    const sorted = a.sort((a, b) => a - b)
+    return fc.record({
+      arr: fc.constant(sorted),
+      i: fc.nat({ max: Math.max(sorted.length - 1, 0) }).map((i) => Math.max(0, a.indexOf(a[i]!))),
+    })
+  }),
 })('partitionPoint (ascending)', ({ arr: { arr, i } }) => {
   const target = arr[i]!
   expect(partitionPoint(arr, (n) => n < target)).toEqual(i)
 })
 
 fcTest.prop({
-  arr: fc
-    .array(fc.float())
-    .map((a) => ({ arr: a.sort((a, b) => b - a), i: Math.floor(Math.random() * a.length) })),
+  arr: fc.array(fc.float({ noNaN: true })).chain((a) => {
+    const sorted = a.sort((a, b) => b - a)
+    return fc.record({
+      arr: fc.constant(sorted),
+      i: fc.nat({ max: Math.max(sorted.length - 1, 0) }).map((i) => Math.max(0, a.indexOf(a[i]!))),
+    })
+  }),
 })('partitionPoint (descending)', ({ arr: { arr, i } }) => {
   const target = arr[i]!
   expect(partitionPoint(arr, (n) => n > target)).toEqual(i)

app/ide-desktop/lib/client/electron-builder-config.ts

@@ -10,7 +10,7 @@ import * as childProcess from 'node:child_process'
 import * as fs from 'node:fs/promises'
 
 import * as electronBuilder from 'electron-builder'
-import * as electronNotarize from 'electron-notarize'
+import * as electronNotarize from '@electron/notarize'
 import type * as macOptions from 'app-builder-lib/out/options/macOptions'
 import yargs from 'yargs'
 
@@ -230,8 +230,6 @@ export function createElectronBuilderConfig(passedArgs: Arguments): electronBuil
             ) {
                 const {
                     packager: {
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                        platformSpecificBuildOptions: buildOptions,
                         appInfo: { productFilename: appName },
                         config: { mac: macConfig },
                     },
@@ -250,20 +248,17 @@ export function createElectronBuilderConfig(passedArgs: Arguments): electronBuil
                 })
 
                 console.log('  • Notarizing.')
-                // The type-cast is safe because this is only executes
-                // when `platform === electronBuilder.Platform.MAC`.
-                // eslint-disable-next-line no-restricted-syntax
-                const macBuildOptions = buildOptions as macOptions.MacConfiguration
+
                 await electronNotarize.notarize({
-                    // This will always be defined since we set it at the top of this object.
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    appBundleId: macBuildOptions.appId!,
+                    tool: 'notarytool',
                     appPath: `${appOutDir}/${appName}.app`,
                     // It is a mistake for either of these to be undefined.
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     appleId: process.env.APPLEID!,
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     appleIdPassword: process.env.APPLEIDPASS!,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    teamId: process.env.APPLETEAMID!,
                 })
             }
         },

app/ide-desktop/lib/client/package.json

@@ -36,7 +36,7 @@
     "crypto-js": "4.1.1",
     "electron": "25.7.0",
     "electron-builder": "^22.14.13",
-    "electron-notarize": "1.2.2",
+    "@electron/notarize": "2.1.0",
     "enso-common": "^1.0.0",
     "esbuild": "^0.19.3",
     "fast-glob": "^3.2.12",

app/ide-desktop/lib/types/globals.d.ts

@@ -81,6 +81,7 @@ declare global {
             /* eslint-disable @typescript-eslint/naming-convention */
             APPLEID?: string
             APPLEIDPASS?: string
+            APPLETEAMID?: string
             /* eslint-enable @typescript-eslint/naming-convention */
         }
     }

build.sbt

@@ -281,6 +281,7 @@ lazy val enso = (project in file("."))
     launcher,
     downloader,
     `runtime-parser`,
+    `runtime-compiler`,
     `runtime-language-epb`,
     `runtime-instrument-common`,
     `runtime-instrument-id-execution`,
@@ -459,7 +460,7 @@ val zio = Seq(
 val bcpkixJdk15Version      = "1.70"
 val bumpVersion             = "0.1.3"
 val declineVersion          = "2.4.1"
-val directoryWatcherVersion = "0.9.10"
+val directoryWatcherVersion = "0.18.0"
 val flatbuffersVersion      = "1.12.0"
 val guavaVersion            = "32.0.0-jre"
 val jlineVersion            = "3.23.0"
@@ -1352,8 +1353,7 @@ lazy val runtime = (project in file("engine/runtime"))
       "org.typelevel"      %% "cats-core"             % catsVersion,
       "junit"               % "junit"                 % junitVersion              % Test,
       "com.github.sbt"      % "junit-interface"       % junitIfVersion            % Test,
-      "org.hamcrest"        % "hamcrest-all"          % hamcrestVersion           % Test,
-      "com.lihaoyi"        %% "fansi"                 % fansiVersion
+      "org.hamcrest"        % "hamcrest-all"          % hamcrestVersion           % Test
     ),
     Compile / compile / compileInputs := (Compile / compile / compileInputs)
       .dependsOn(CopyTruffleJAR.preCompileTask)
@@ -1418,8 +1418,7 @@ lazy val runtime = (project in file("engine/runtime"))
   .dependsOn(`logging-truffle-connector`)
   .dependsOn(`polyglot-api`)
   .dependsOn(`text-buffer`)
-  .dependsOn(`runtime-parser`)
-  .dependsOn(pkg)
+  .dependsOn(`runtime-compiler`)
   .dependsOn(`connected-lock-manager`)
   .dependsOn(testkit % Test)
   .dependsOn(`logging-service-logback` % "test->test")
@@ -1438,6 +1437,23 @@ lazy val `runtime-parser` =
     .dependsOn(syntax)
     .dependsOn(`syntax-rust-definition`)
 
+lazy val `runtime-compiler` =
+  (project in file("engine/runtime-compiler"))
+    .settings(
+      frgaalJavaCompilerSetting,
+      instrumentationSettings,
+      libraryDependencies ++= Seq(
+        "junit"          % "junit"           % junitVersion     % Test,
+        "com.github.sbt" % "junit-interface" % junitIfVersion   % Test,
+        "org.scalatest" %% "scalatest"       % scalatestVersion % Test,
+        "com.lihaoyi"   %% "fansi"           % fansiVersion
+      )
+    )
+    .dependsOn(`runtime-parser`)
+    .dependsOn(pkg)
+    .dependsOn(`polyglot-api`)
+    .dependsOn(editions)
+
 lazy val `runtime-instrument-common` =
   (project in file("engine/runtime-instrument-common"))
     .configs(Benchmark)

build/build/src/ci_gen.rs

@@ -94,6 +94,7 @@ pub mod secret {
     pub const APPLE_CODE_SIGNING_CERT_PASSWORD: &str = "APPLE_CODE_SIGNING_CERT_PASSWORD";
     pub const APPLE_NOTARIZATION_USERNAME: &str = "APPLE_NOTARIZATION_USERNAME";
     pub const APPLE_NOTARIZATION_PASSWORD: &str = "APPLE_NOTARIZATION_PASSWORD";
+    pub const APPLE_NOTARIZATION_TEAM_ID: &str = "APPLE_NOTARIZATION_TEAM_ID";
 
     // === Windows Code Signing ===
     /// Name of the GitHub Actions secret that stores path to the Windows code signing certificate

build/build/src/ci_gen/job.rs

@@ -232,6 +232,10 @@ pub fn expose_os_specific_signing_secret(os: OS, step: Step) -> Step {
                 secret::APPLE_NOTARIZATION_PASSWORD,
                 &crate::ide::web::env::APPLEIDPASS,
             )
+            .with_secret_exposed_as(
+                secret::APPLE_NOTARIZATION_TEAM_ID,
+                &crate::ide::web::env::APPLETEAMID,
+            )
             .with_env(&crate::ide::web::env::CSC_IDENTITY_AUTO_DISCOVERY, "true"),
         _ => step,
     }

build/build/src/ide/web.rs

@@ -85,6 +85,9 @@ pub mod env {
         /// https://support.apple.com/HT204397
         APPLEIDPASS, String;
 
+        /// Apple Team ID.
+        APPLETEAMID, String;
+
         /// `true` or `false`. Defaults to `true` — on a macOS development machine valid and
         /// appropriate identity from your keychain will be automatically used.
         CSC_IDENTITY_AUTO_DISCOVERY, bool;

distribution/engine/THIRD-PARTY/NOTICE

@@ -253,17 +253,17 @@ Copyright notices related to this dependency can be found in the directory `io.c
 
 'directory-watcher', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `io.methvin.directory-watcher-0.9.10`.
+Copyright notices related to this dependency can be found in the directory `io.methvin.directory-watcher-0.18.0`.
 
 
 'spray-json_2.13', licensed under the Apache 2, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `io.spray.spray-json_2.13-1.3.6`.
 
 
-'jna', licensed under the Apache License v2.0, is distributed with the engine.
+'jna', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `net.java.dev.jna.jna-5.5.0`.
+Copyright notices related to this dependency can be found in the directory `net.java.dev.jna.jna-5.12.1`.
 
 
 'bump_2.13', licensed under the MIT, is distributed with the engine.

distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.16.0/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Commons Codec
+Copyright 2002-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).

distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.16.0/NOTICES

@@ -1 +1,5 @@
 
+
+Some portions of this file Copyright (c) 2004-2006 Intel Corporation
+
+this work for additional information regarding copyright ownership.

distribution/engine/THIRD-PARTY/net.java.dev.jna.jna-5.12.1/NOTICES

@@ -0,0 +1,25 @@
+Copyright (c) 2007 Timothy Wall
+
+Copyright (c) 2007 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007 Wayne Meissner, All Rights Reserved
+
+Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2012 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2013 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2015 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2009 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2011 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2012 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2017 Matthias Bläsing, All Rights Reserved
+
+Copyright (c) 2018 Matthias Bläsing
+
+Copyright (c) 2019 Matthias Bläsing, All Rights Reserved