Introduce RED.utils.createSVGElement

Bump dev to 3.1.0-beta.0

.github/ISSUE_TEMPLATE.md

@@ -1,35 +0,0 @@
-<!--
-## Before you hit that Submit button....
-
-This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
-
-If your issue is:
-  - a general 'how-to' type question,
-  - a feature request or suggestion for a change,
-  - or problems with 3rd party (`node-red-contrib-`) nodes
-
-please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
-
-You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
-
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-## So you have a real issue to raise...
-
-To help us understand the issue, please fill-in as much of the following information as you can:
--->
-
-### What are the steps to reproduce?
-
-### What happens?
-
-### What do you expect to happen?
-
-### Please tell us about your environment:
-
-- [ ] Node-RED version:
-- [ ] Node.js version:
-- [ ] npm version:
-- [ ] Platform/OS:
-- [ ] Browser:
-- [ ] running in Docker:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Reproducible software issues in the core of Node-RED
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
-
-If your issue is:
-  - a general 'how-to' type question,
-  - a feature request or suggestion for a change,
-  - or problems with 3rd party (`node-red-contrib-`) nodes
-
-please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
-
-You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
-
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-To help us understand the issue, please fill-in as much of the following information as you can:
--->
-
-### What are the steps to reproduce?
-
-### What happens?
-
-### What do you expect to happen?
-
-### Please tell us about your environment:
-
-- [ ] Node-RED version:
-- [ ] Node.js version:
-- [ ] npm version:
-- [ ] Platform/OS:
-- [ ] Browser:

.github/ISSUE_TEMPLATE/-anything-else.md

@@ -1,17 +0,0 @@
----
-name: Anything Else
-about: Something that is not a bug report
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please DO NOT raise an issue.
-
-We DO NOT use the issue tracker for general support or feature requests. Only bug reports should be raised here using the 'Bug report' template.
-
-For general support, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack). You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`. 
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-For feature requests, please use the Node-RED Forum](https://discourse.nodered.org). Many ideas have already been discussed there and you should search that for your request before starting a new discussion.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,61 @@
+name: 🐞 Report a bug
+description: File a bug/issue on the core of Node-RED
+labels: [needs-triage]
+body:
+- type: markdown
+  attributes:
+    value: |
+        This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
+
+        If your issue is:
+          - a general 'how-to' type question,
+          - a feature request or suggestion for a change,
+          - or problems with 3rd party (`node-red-contrib-`) nodes
+
+        please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
+
+        You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
+
+        That way the whole Node-RED user community can help, rather than rely on the core development team.
+
+        To help us understand the issue, please fill-in as much of the following information as you can:
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A clear & concise description of what you're experiencing.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A clear & concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Example flow
+    description: If you have a minimal example flow that demonstrates the issue, share it here.
+    value: |
+      ```
+      paste your flow here
+      ```
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: Please tell us about your environment. Include any relevant information on how you are running Node-RED.
+    value: |
+        - Node-RED version:
+        - Node.js version:
+        - npm version:
+        - Platform/OS:
+        - Browser:
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: true
+contact_links:
+  - name: ❓ Questions
+    url: https://discourse.nodered.org
+    about: Ask your question on the Node-RED forum
+  - name: ⭐️ Feature Request
+    url: https://discourse.nodered.org/c/development/feature-requests
+    about: Discuss your request with the community
+  - name: 🗂 Documentation
+    url: https://nodered.org/docs
+    about: Go straight to the documentation
+  - name: 💬 Slack
+    url: https://nodered.org/slack
+    about: Chat about the project on our slack team

.github/workflows/release.yml

@@ -1,5 +1,6 @@
-name: PublishDockerImage
-
+name: Publish Release
+env:
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 on:
   release:
     types: [published]
@@ -25,7 +26,7 @@ jobs:
             path: 'node-red.github.io'
       - uses: actions/setup-node@v1
         with:
-            node-version: '12'
+            node-version: '16'
       - run: node ./node-red/.github/scripts/update-node-red-docker.js
       - name: Create Docker Pull Request
         uses: peter-evans/create-pull-request@v2

.github/workflows/tests.yml

@@ -0,0 +1,30 @@
+name: Run tests
+
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    branches: [ master, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14, 16]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install Dependencies
+      run: npm install
+    - name: Run tests
+      run: |
+        npm run test
+    - name: Publish to coveralls.io
+      if: ${{ matrix.node-version == 14 }}
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ github.token }}

.gitignore

@@ -7,7 +7,9 @@
 .sessions.json
 .settings
 .tern-project
+.i18n-editor-metadata
 *.backup
+*.bak
 *_cred*
 coverage
 credentials.json
@@ -22,4 +24,6 @@ packages/node_modules/@node-red/editor-client/public
 !test/**/node_modules
 docs
 !packages/node_modules/**/docs
-.vscode
+.vscode
+.nyc_output
+sync.ffs_db

.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-addons:
-  chrome: stable
-language: node_js
-matrix:
-  include:
-    - node_js: "14"
-    - node_js: "12"
-    - node_js: "10"
-      script:
-        - ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
-        - scripts/install-ui-test-dependencies.sh && grunt test-ui
-      before_script:
-        - npm install -g istanbul coveralls
-    - node_js: "8"

API.md

@@ -1,8 +1,12 @@
-Node-RED Modules
----
+Node-RED consists of 6 node modules under the `@node-red` scope, which are pulled together
+by the top-level `node-red` module. The typical scenario is where you are embedding Node-RED into your
+own application, in which case you would use the `node-red` module rather than any of the
+internal modules directly.
+
+```javascript
+let RED = require("node-red");
+```
 
-Node-RED provides a set of node modules that implement different parts of the
-application.
 
 Module | Description
 -------|-------
@@ -10,6 +14,6 @@ Module | Description
 [@node-red/editor-api](@node-red_editor-api.html) | an Express application that serves the Node-RED editor and provides the Admin HTTP API
 [@node-red/runtime](@node-red_runtime.html) | the core runtime of Node-RED
 [@node-red/util](@node-red_util.html) | common utilities for the Node-RED runtime and editor modules
-@node-red/registry | the internal node registry
-@node-red/nodes | the default set of core nodes
+[@node-red/registry](@node-red_registry.html) | the internal node registry
+@node-red/nodes | the default set of core nodes. This module only contains the Node-RED nodes - it does not expose any APIs.
 @node-red/editor-client | the client-side resources of the Node-RED editor application

CONTRIBUTING.md

@@ -38,13 +38,18 @@ If you want to raise a pull-request with a new feature, or a refactoring
 of existing code, it may well get rejected if you haven't discussed it on
 the [forum](https://discourse.nodered.org) first.
 
-All contributors need to sign the JS Foundation's Contributor License Agreement.
-It is an online process and quick to do. You can read the details of the agreement
-here: https://cla.js.foundation/node-red/node-red.
+All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
+It is an online process and quick to do. If you raise a pull-request without
+having signed the CLA, you will be prompted to do so automatically.
 
-If you raise a pull-request without having signed the CLA, you will be prompted
-to do so automatically.
 
+### Code Branches
+
+When raising a PR for a fix or a new feature, it is important to target the right branch.
+
+ - `master` - this is the main branch for the latest stable release of Node-RED. All bug fixes for that release should target this branch.
+ - `v1.x` - this is the maintenance branch for the 1.x stream. If a fix *only* applies to 1.x, then it should target this branch. If it applies to the current stable release as well, target `master` first. We will then decide if it needs to be back ported to the 1.x stream.
+ - `dev` - this is the branch for new feature development targeting the next milestone release.
 
 ### Coding standards
 

Gruntfile.js

@@ -16,14 +16,20 @@
 
 var path = require("path");
 var fs = require("fs-extra");
-var sass = require("node-sass");
+var sass = require("sass");
 
 module.exports = function(grunt) {
 
-    var nodemonArgs = ["-v"];
+    var nodemonArgs = ["-V"];
     var flowFile = grunt.option('flowFile');
     if (flowFile) {
         nodemonArgs.push(flowFile);
+        process.env.NODE_RED_ENABLE_PROJECTS=false;
+    }
+    var userDir = grunt.option('userDir');
+    if (userDir) {
+        nodemonArgs.push("-u");
+        nodemonArgs.push(userDir);
     }
 
     var browserstack = grunt.option('browserstack');
@@ -34,8 +40,10 @@ module.exports = function(grunt) {
     if (nonHeadless) {
         process.env.NODE_RED_NON_HEADLESS = true;
     }
+    const pkg = grunt.file.readJSON('package.json');
+    process.env.NODE_RED_PACKAGE_VERSION = pkg.version;
     grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
+        pkg: pkg,
         paths: {
             dist: ".dist"
         },
@@ -47,8 +55,8 @@ module.exports = function(grunt) {
                 ui: 'bdd',
                 reporter: 'spec'
             },
-            all: { src: ['test/**/*_spec.js'] },
-            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
+            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         webdriver: {
@@ -56,19 +64,19 @@ module.exports = function(grunt) {
                 configFile: 'test/editor/wdio.conf.js'
             }
         },
-        mocha_istanbul: {
+        nyc: {
             options: {
-                globals: ['expect'],
-                timeout: 3000,
-                ignoreLeaks: false,
-                ui: 'bdd',
-                reportFormats: ['lcov','html'],
-                print: 'both',
-                istanbulOptions: ['--no-default-excludes', '-i','**/packages/node_modules/**']
+                cwd: '.',
+                include: ['packages/node_modules/**'],
+                excludeNodeModules: false,
+                exclude: ['packages/node_modules/@node-red/editor-client/**'],
+                reporter: ['lcov', 'html','text-summary'],
+                reportDir: 'coverage',
+                all: true
             },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
-            nodes: { src: ["test/nodes/**/*_spec.js"]}
+            all:   { cmd: false, args: ['grunt', 'simplemocha:all'] },
+            core:  { options: { exclude:['packages/node_modules/@node-red/editor-client/**', 'packages/node_modules/@node-red/nodes/**']},cmd: false, args: ['grunt', 'simplemocha:core'] },
+            nodes: { cmd: false, args: ['grunt', 'simplemocha:nodes'] }
         },
         jshint: {
             options: {
@@ -129,18 +137,22 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js",
                     "packages/node_modules/@node-red/editor-client/src/js/red.js",
                     "packages/node_modules/@node-red/editor-client/src/js/events.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/hooks.js",
                     "packages/node_modules/@node-red/editor-client/src/js/i18n.js",
                     "packages/node_modules/@node-red/editor-client/src/js/settings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/user.js",
                     "packages/node_modules/@node-red/editor-client/src/js/comms.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/runtime.js",
                     "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
                     "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/plugins.js",
                     "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
                     "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                     "packages/node_modules/@node-red/editor-client/src/js/history.js",
                     "packages/node_modules/@node-red/editor-client/src/js/validators.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils-domselection.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js",
@@ -152,14 +164,16 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/colorPicker.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
@@ -171,13 +185,16 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/*.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/*.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
@@ -187,7 +204,8 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tour/*.js"
                 ],
                 dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
             },
@@ -201,7 +219,9 @@ module.exports = function(grunt) {
                         "node_modules/marked/marked.min.js",
                         "node_modules/dompurify/dist/purify.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
+                        "node_modules/i18next/i18next.min.js",
+                        "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
+                        "node_modules/jquery-i18next/jquery-i18next.min.js",
                         "node_modules/jsonata/jsonata-es5.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
@@ -274,7 +294,9 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/public/index.html",
                     "packages/node_modules/@node-red/editor-client/public/favicon.ico",
                     "packages/node_modules/@node-red/editor-client/public/icons",
-                    "packages/node_modules/@node-red/editor-client/public/vendor"
+                    "packages/node_modules/@node-red/editor-client/public/vendor",
+                    "packages/node_modules/@node-red/editor-client/public/types/node",
+                    "packages/node_modules/@node-red/editor-client/public/types/node-red",
                 ]
             },
             release: {
@@ -310,6 +332,12 @@ module.exports = function(grunt) {
                 ],
                 tasks: ['jsonlint:keymaps','copy:build']
             },
+            tours: {
+                files: [
+                    'packages/node_modules/@node-red/editor-client/src/tours/**/*.js'
+                ],
+                tasks: ['copy:build']
+            },
             misc: {
                 files: [
                     'CHANGELOG.md'
@@ -364,11 +392,24 @@ module.exports = function(grunt) {
                         src: [
                             'ace/**',
                             'jquery/css/base/**',
-                            'font-awesome/**'
+                            'font-awesome/**',
+                            'monaco/dist/**',
+                            'monaco/types/extraLibs.js',
+                            'monaco/style.css',
+                            'monaco/monaco-bootstrap.js'
                         ],
                         expand: true,
                         dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
                     },
+                    {
+                        cwd: 'packages/node_modules/@node-red/editor-client/src',
+                        src: [
+                            'types/node/*.ts',
+                            'types/node-red/*.ts',
+                        ],
+                        expand: true,
+                        dest: 'packages/node_modules/@node-red/editor-client/public/'
+                    },
                     {
                         cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
                         src: '**',
@@ -394,6 +435,12 @@ module.exports = function(grunt) {
                         src: '**',
                         expand: true,
                         dest: 'packages/node_modules/@node-red/editor-client/public/vendor/ace/'
+                    },
+                    {
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/tours',
+                        src: '**',
+                        expand: true,
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/tours/'
                     }
                 ]
             }
@@ -452,13 +499,16 @@ module.exports = function(grunt) {
                     'packages/node_modules/@node-red/runtime/lib/index.js',
                     'packages/node_modules/@node-red/runtime/lib/api/*.js',
                     'packages/node_modules/@node-red/runtime/lib/events.js',
+                    'packages/node_modules/@node-red/runtime/lib/hooks.js',
                     'packages/node_modules/@node-red/util/**/*.js',
                     'packages/node_modules/@node-red/editor-api/lib/index.js',
-                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js'
+                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js',
+                    'packages/node_modules/@node-red/registry/lib/index.js'
                 ],
                 options: {
                     destination: 'docs',
-                    configure: './jsdoc.json'
+                    configure: './jsdoc.json',
+                    fred: "hi there"
                 }
             },
             _editor: {
@@ -502,12 +552,10 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-concurrent');
     grunt.loadNpmTasks('grunt-sass');
-    grunt.loadNpmTasks('grunt-nodemon');
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
-    grunt.loadNpmTasks('grunt-mocha-istanbul');
     if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
         grunt.loadNpmTasks('grunt-webdriver');
     }
@@ -515,11 +563,31 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
     grunt.loadNpmTasks('grunt-npm-command');
     grunt.loadNpmTasks('grunt-mkdir');
+    grunt.loadNpmTasks('grunt-simple-nyc');
+
+    grunt.registerMultiTask('nodemon', 'Runs a nodemon monitor of your node.js server.', function () {
+        const nodemon = require('nodemon');
+        this.async();
+        const options = this.options();
+        options.script = this.data.script;
+        let callback;
+        if (options.callback) {
+            callback = options.callback;
+            delete options.callback;
+        } else {
+            callback = function(nodemonApp) {
+                nodemonApp.on('log', function (event) {
+                    console.log(event.colour);
+                });
+            };
+        }
+        callback(nodemon(options));
+    });
 
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
         var copyright = "/**\n"+
-            " * Copyright JS Foundation and other contributors, http://js.foundation\n"+
+            " * Copyright OpenJS Foundation and other contributors, https://openjsf.org/\n"+
             " *\n"+
             " * Licensed under the Apache License, Version 2.0 (the \"License\");\n"+
             " * you may not use this file except in compliance with the License.\n"+
@@ -596,11 +664,16 @@ module.exports = function(grunt) {
 
     grunt.registerTask('default',
         'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','verifyPackageDependencies','jshint:editor','mocha_istanbul:all']);
+        ['build','verifyPackageDependencies','jshint:editor','nyc:all']);
+
+    grunt.registerTask('no-coverage',
+        'Builds editor content then runs code style checks and unit tests on all components without code coverage',
+        ['build','verifyPackageDependencies','jshint:editor','simplemocha:all']);
+
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
-        ['build','mocha_istanbul:core']);
+        ['build','nyc:core']);
 
     grunt.registerTask('test-editor',
         'Runs code style check on editor code',
@@ -618,12 +691,12 @@ module.exports = function(grunt) {
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
-        ['build','mocha_istanbul:nodes']);
+        ['build','nyc:nodes']);
 
     grunt.registerTask('build',
         'Builds editor content',
         ['clean:build','jsonlint','concat:build','concat:vendor','copy:build','uglify:build','sass:build','attachCopyright']);
-        
+
     grunt.registerTask('build-dev',
         'Developer mode: build dev version',
         ['clean:build','concat:build','concat:vendor','copy:build','sass:build','setDevEnv']);
@@ -643,7 +716,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('coverage',
         'Run Istanbul code test coverage task',
-        ['build','mocha_istanbul:all']);
+        ['build','nyc:all']);
 
     grunt.registerTask('docs',
         'Generates API documentation',

LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

README.md

@@ -56,15 +56,15 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
+Node-RED is a project of the [OpenJS Foundation](http://openjsf.org).
 
-It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
-
-* Nick O'Leary [@knolleary](http://twitter.com/knolleary)
-* Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+It is maintained by:
 
+ * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
+ * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+ * And many others...
 
 
 ## Copyright and license
 
-Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).
+Copyright OpenJS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).

SECURITY.md

@@ -1,13 +1,5 @@
 # Security Policy
 
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.0.0   | :white_check_mark: |
-| 0.20.x  | :white_check_mark: |
-
-
 ## Reporting a Vulnerability
 
 Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.1.3",
+    "version": "3.1.0-beta.0",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -26,96 +26,101 @@
         }
     ],
     "dependencies": {
-        "ajv": "6.12.3",
+        "acorn": "8.7.1",
+        "acorn-walk": "8.2.0",
+        "ajv": "8.11.0",
+        "async-mutex": "0.3.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
-        "cheerio": "0.22.0",
+        "body-parser": "1.20.0",
+        "cheerio": "1.0.0-rc.10",
         "clone": "2.1.2",
         "content-type": "1.0.4",
-        "cookie": "0.4.1",
-        "cookie-parser": "1.4.5",
+        "cookie": "0.5.0",
+        "cookie-parser": "1.4.6",
         "cors": "2.8.5",
-        "cron": "1.7.2",
-        "denque": "1.4.1",
-        "express": "4.17.1",
-        "express-session": "1.17.1",
-        "fs-extra": "8.1.0",
-        "fs.notify": "0.0.4",
+        "cronosjs": "1.7.1",
+        "denque": "2.0.1",
+        "express": "4.18.1",
+        "express-session": "1.17.3",
+        "form-data": "4.0.0",
+        "fs-extra": "10.1.0",
+        "got": "11.8.5",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "5.0.0",
-        "i18next": "15.1.2",
-        "iconv-lite": "0.6.2",
+        "hpagent": "1.0.0",
+        "https-proxy-agent": "5.0.1",
+        "i18next": "21.8.14",
+        "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
-        "js-yaml": "3.14.0",
+        "js-yaml": "4.1.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.3",
+        "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
-        "memorystore": "1.6.2",
-        "mime": "2.4.6",
-        "moment-timezone": "^0.5.31",
-        "mqtt": "2.18.8",
-        "multer": "1.4.2",
-        "mustache": "4.0.1",
-        "node-red-admin": "^0.2.6",
-        "node-red-node-rbe": "^0.2.9",
-        "node-red-node-sentiment": "^0.1.6",
-        "node-red-node-tail": "^0.1.0",
-        "nopt": "4.0.3",
-        "oauth2orize": "1.11.0",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "moment": "2.29.4",
+        "moment-timezone": "0.5.34",
+        "mqtt": "4.3.7",
+        "multer": "1.4.5-lts.1",
+        "mustache": "4.2.0",
+        "node-red-admin": "^3.0.0",
+        "node-watch": "0.7.3",
+        "nopt": "5.0.0",
+        "oauth2orize": "1.11.1",
         "on-headers": "1.0.2",
-        "passport": "0.4.1",
+        "passport": "0.6.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.1",
-        "request": "2.88.0",
-        "semver": "6.3.0",
-        "uglify-js": "3.10.0",
-        "when": "3.7.8",
-        "ws": "6.2.1",
+        "raw-body": "2.5.1",
+        "semver": "7.3.7",
+        "tar": "6.1.11",
+        "tough-cookie": "4.0.0",
+        "uglify-js": "3.16.2",
+        "uuid": "8.3.2",
+        "ws": "7.5.6",
         "xml2js": "0.4.23"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.8"
+        "bcrypt": "5.0.1"
     },
     "devDependencies": {
-        "marked": "0.8.2",
-        "dompurify": "2.0.12",
-        "grunt": "~1.0.4",
+        "dompurify": "2.3.9",
+        "grunt": "1.5.3",
         "grunt-chmod": "~1.1.1",
-        "grunt-cli": "~1.3.2",
-        "grunt-concurrent": "~2.3.1",
-        "grunt-contrib-clean": "~2.0.0",
-        "grunt-contrib-compress": "~1.5.0",
-        "grunt-contrib-concat": "~1.0.1",
-        "grunt-contrib-copy": "~1.0.0",
-        "grunt-contrib-jshint": "~2.1.0",
-        "grunt-contrib-uglify": "~4.0.1",
-        "grunt-contrib-watch": "~1.1.0",
-        "grunt-jsdoc": "^2.2.1",
-        "grunt-jsdoc-to-markdown": "^4.0.0",
-        "grunt-jsonlint": "~2.0.0",
-        "grunt-mkdir": "~1.0.0",
-        "grunt-mocha-istanbul": "5.0.2",
-        "grunt-nodemon": "~0.4.2",
+        "grunt-cli": "~1.4.3",
+        "grunt-concurrent": "3.0.0",
+        "grunt-contrib-clean": "2.0.1",
+        "grunt-contrib-compress": "2.0.0",
+        "grunt-contrib-concat": "2.1.0",
+        "grunt-contrib-copy": "1.0.0",
+        "grunt-contrib-jshint": "3.2.0",
+        "grunt-contrib-uglify": "5.2.2",
+        "grunt-contrib-watch": "1.1.0",
+        "grunt-jsdoc": "2.4.1",
+        "grunt-jsdoc-to-markdown": "6.0.0",
+        "grunt-jsonlint": "2.1.3",
+        "grunt-mkdir": "~1.1.0",
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
-        "http-proxy": "1.18.1",
-        "istanbul": "0.4.5",
+        "grunt-simple-nyc": "^3.0.1",
+        "i18next-http-backend": "1.4.1",
+        "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
+        "marked": "4.0.18",
         "minami": "1.2.3",
-        "mocha": "^5.2.0",
-        "mosca": "^2.8.3",
-        "node-red-node-test-helper": "^0.2.5",
-        "node-sass": "^4.14.1",
-        "should": "^8.4.0",
-        "sinon": "1.17.7",
+        "mocha": "9.2.2",
+        "node-red-node-test-helper": "^0.3.0",
+        "nodemon": "2.0.19",
+        "proxy": "^1.0.2",
+        "sass": "1.53.0",
+        "should": "13.2.3",
+        "sinon": "11.1.2",
         "stoppable": "^1.1.0",
-        "supertest": "3.4.2"
+        "supertest": "6.2.4"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=14"
     }
 }

packages/node_modules/@node-red/editor-api/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

packages/node_modules/@node-red/editor-api/lib/admin/diagnostics.js

@@ -0,0 +1,23 @@
+let runtimeAPI;
+let settings;
+const apiUtil = require("../util");
+module.exports = {
+    init: function(_settings, _runtimeAPI) {
+        settings = _settings;
+        runtimeAPI = _runtimeAPI;
+    },
+    getReport: function(req, res) {
+        const diagnosticsOpts = settings.diagnostics || {};
+        const opts = {
+            user: req.user,
+            scope: diagnosticsOpts.level || "basic"
+        }
+        if(diagnosticsOpts.enabled === false || diagnosticsOpts.enabled === "false") {
+            apiUtil.rejectHandler(req, res, {message: "diagnostics are disabled", status: 403, code: "diagnostics.disabled" })
+        } else {
+            runtimeAPI.diagnostics.get(opts)
+            .then(function(result) { res.json(result); })
+            .catch(err => apiUtil.rejectHandler(req, res, err))
+        }
+    }
+}

packages/node_modules/@node-red/editor-api/lib/admin/flows.js

@@ -68,5 +68,28 @@ module.exports = {
         }).catch(function(err) {
             apiUtils.rejectHandler(req,res,err);
         })
+    },
+    getState: function(req,res) {
+        const opts = {
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
+        }
+        runtimeAPI.flows.getState(opts).then(function(result) {
+            res.json(result);
+        }).catch(function(err) {
+            apiUtils.rejectHandler(req,res,err);
+        })
+    },
+    postState: function(req,res) {
+        const opts = {
+            user: req.user,
+            state: req.body.state || "",
+            req: apiUtils.getRequestLogObject(req)
+        }
+        runtimeAPI.flows.setState(opts).then(function(result) {
+            res.json(result);
+        }).catch(function(err) {
+            apiUtils.rejectHandler(req,res,err);
+        })
     }
 }

packages/node_modules/@node-red/editor-api/lib/admin/index.js

@@ -22,6 +22,8 @@ var flow = require("./flow");
 var context = require("./context");
 var auth = require("../auth");
 var info = require("./settings");
+var plugins = require("./plugins");
+var diagnostics = require("./diagnostics");
 
 var apiUtil = require("../util");
 
@@ -32,15 +34,32 @@ module.exports = {
         nodes.init(runtimeAPI);
         context.init(runtimeAPI);
         info.init(settings,runtimeAPI);
+        plugins.init(runtimeAPI);
+        diagnostics.init(settings, runtimeAPI);
 
         var needsPermission = auth.needsPermission;
 
         var adminApp = express();
 
+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }
+
+
         // Flows
         adminApp.get("/flows",needsPermission("flows.read"),flows.get,apiUtil.errorHandler);
         adminApp.post("/flows",needsPermission("flows.write"),flows.post,apiUtil.errorHandler);
 
+        // Flows/state
+        adminApp.get("/flows/state", needsPermission("flows.read"), flows.getState, apiUtil.errorHandler);
+        if (settings.runtimeState && settings.runtimeState.enabled === true) {
+            adminApp.post("/flows/state", needsPermission("flows.write"), flows.postState, apiUtil.errorHandler);
+        }
+
         // Flow
         adminApp.get("/flow/:id",needsPermission("flows.read"),flow.get,apiUtil.errorHandler);
         adminApp.post("/flow",needsPermission("flows.write"),flow.post,apiUtil.errorHandler);
@@ -49,7 +68,16 @@ module.exports = {
 
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,apiUtil.errorHandler);
-        adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
+
+        if (!settings.externalModules || !settings.externalModules.palette || settings.externalModules.palette.allowInstall !== false) {
+            if (!settings.externalModules || !settings.externalModules.palette || settings.externalModules.palette.allowUpload !== false) {
+                const multer  = require('multer');
+                const upload = multer({ storage: multer.memoryStorage() });
+                adminApp.post("/nodes",needsPermission("nodes.write"),upload.single("tarball"),nodes.post,apiUtil.errorHandler);
+            } else {
+                adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
+            }
+        }
         adminApp.get(/^\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
         adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
         adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
@@ -71,6 +99,12 @@ module.exports = {
 
         adminApp.get("/settings",needsPermission("settings.read"),info.runtimeSettings,apiUtil.errorHandler);
 
+        // Plugins
+        adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
+        adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);
+
+        adminApp.get("/diagnostics", needsPermission("diagnostics.read"), diagnostics.getReport, apiUtil.errorHandler);
+
         return adminApp;
     }
 }

packages/node_modules/@node-red/editor-api/lib/admin/nodes.js

@@ -33,6 +33,9 @@ module.exports = {
             })
         } else {
             opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
+            if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+                opts.lang = "en-US";
+            }
             runtimeAPI.nodes.getNodeConfigs(opts).then(function(configs) {
                 res.send(configs);
             })
@@ -45,11 +48,22 @@ module.exports = {
             module: req.body.module,
             version: req.body.version,
             url: req.body.url,
+            tarball: undefined,
             req: apiUtils.getRequestLogObject(req)
         }
+        if (!runtimeAPI.settings.editorTheme || !runtimeAPI.settings.editorTheme.palette || runtimeAPI.settings.editorTheme.palette.upload !== false) {
+            if (req.file) {
+                opts.tarball = {
+                    name: req.file.originalname,
+                    size: req.file.size,
+                    buffer: req.file.buffer
+                }
+            }
+        }
         runtimeAPI.nodes.addModule(opts).then(function(info) {
             res.json(info);
         }).catch(function(err) {
+            console.log(err.stack);
             apiUtils.rejectHandler(req,res,err);
         })
     },
@@ -81,6 +95,9 @@ module.exports = {
             })
         } else {
             opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
+            if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+                opts.lang = "en-US";
+            }
             runtimeAPI.nodes.getNodeConfig(opts).then(function(result) {
                 return res.send(result);
             }).catch(function(err) {
@@ -150,6 +167,9 @@ module.exports = {
             lang: req.query.lng,
             req: apiUtils.getRequestLogObject(req)
         }
+        if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+            opts.lang = "en-US";
+        }
         runtimeAPI.nodes.getModuleCatalog(opts).then(function(result) {
             res.json(result);
         }).catch(function(err) {
@@ -164,6 +184,9 @@ module.exports = {
             lang: req.query.lng,
             req: apiUtils.getRequestLogObject(req)
         }
+        if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+            opts.lang = "en-US";
+        }
         runtimeAPI.nodes.getModuleCatalogs(opts).then(function(result) {
             res.json(result);
         }).catch(function(err) {

packages/node_modules/@node-red/editor-api/lib/admin/plugins.js

@@ -0,0 +1,44 @@
+var apiUtils = require("../util");
+
+var runtimeAPI;
+
+module.exports = {
+    init: function(_runtimeAPI) {
+        runtimeAPI = _runtimeAPI;
+    },
+    getAll: function(req,res) {
+        var opts = {
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
+        }
+        if (req.get("accept") == "application/json") {
+            runtimeAPI.plugins.getPluginList(opts).then(function(list) {
+                res.json(list);
+            })
+        } else {
+            opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
+            if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+                opts.lang = "en-US";
+            }
+            runtimeAPI.plugins.getPluginConfigs(opts).then(function(configs) {
+                res.send(configs);
+            })
+        }
+    },
+    getCatalogs: function(req,res) {
+        var opts = {
+            user: req.user,
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
+        }
+        if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+            opts.lang = "en-US";
+        }
+        runtimeAPI.plugins.getPluginCatalogs(opts).then(function(result) {
+            res.json(result);
+        }).catch(function(err) {
+            console.log(err.stack);
+            apiUtils.rejectHandler(req,res,err);
+        })
+    }
+};

packages/node_modules/@node-red/editor-api/lib/auth/index.js

@@ -90,7 +90,7 @@ function getToken(req,res,next) {
     return server.token()(req,res,next);
 }
 
-function login(req,res) {
+async function login(req,res) {
     var response = {};
     if (settings.adminAuth) {
         var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
@@ -106,9 +106,15 @@ function login(req,res) {
                 urlPrefix += "/";
             }
             response = {
-                "type":"strategy",
-                "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
+                "type":"strategy"
             }
+            if (mergedAdminAuth.strategy.autoLogin) {
+                response.autoLogin = true
+                response.loginRedirect = urlPrefix + "auth/strategy"
+            }
+            response.prompts = [
+                {type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}
+            ]
             if (mergedAdminAuth.strategy.icon) {
                 response.prompts[0].icon = mergedAdminAuth.strategy.icon;
             }
@@ -116,8 +122,9 @@ function login(req,res) {
                 response.prompts[0].image = theme.serveFile('/login/',mergedAdminAuth.strategy.image);
             }
         }
-        if (theme.context().login && theme.context().login.image) {
-            response.image = theme.context().login.image;
+        let themeContext = await theme.context();
+        if (themeContext.login && themeContext.login.image) {
+            response.image = themeContext.login.image;
         }
     }
     res.json(response);
@@ -140,7 +147,7 @@ function completeVerify(profile,done) {
     Users.authenticate(profile).then(function(user) {
         if (user) {
             Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) {
-                log.audit({event: "auth.login",username:user.username,scope:user.permissions});
+                log.audit({event: "auth.login",user,username:user.username,scope:user.permissions});
                 user.tokens = tokens;
                 done(null,user);
             });
@@ -172,31 +179,38 @@ function genericStrategy(adminApp,strategy) {
     adminApp.use(passport.session());
 
     var options = strategy.options;
+    var verify = function() {
+        var originalDone = arguments[arguments.length-1];
+        if (options.verify) {
+            var args = Array.from(arguments);
+            args[args.length-1] = function(err,profile) {
+                if (err) {
+                    return originalDone(err);
+                } else {
+                    return completeVerify(profile,originalDone);
+                }
+            };
 
-    passport.use(new strategy.strategy(options,
-        function() {
-            var originalDone = arguments[arguments.length-1];
-            if (options.verify) {
-                var args = Array.from(arguments);
-                args[args.length-1] = function(err,profile) {
-                    if (err) {
-                        return originalDone(err);
-                    } else {
-                        return completeVerify(profile,originalDone);
-                    }
-                };
-                options.verify.apply(null,args);
-            } else {
-                var profile = arguments[arguments.length - 2];
-                return completeVerify(profile,originalDone);
-            }
-
+            options.verify.apply(this,args);
+        } else {
+            var profile = arguments[arguments.length - 2];
+            return completeVerify(profile,originalDone);
         }
-    ));
+    };
+    // Give our callback the same arity as the original one from options
+    if (options.verify) {
+        Object.defineProperty(verify, "length", { value: options.verify.length })
+    }
+
+    passport.use(new strategy.strategy(options, verify));
 
     adminApp.get('/auth/strategy',
-        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
-        completeGenerateStrategyAuth
+        passport.authenticate(strategy.name, {session:false,
+            failureMessage: true,
+            failureRedirect: settings.httpAdminRoot
+        }),
+        completeGenerateStrategyAuth,
+        handleStrategyError
     );
 
     var callbackMethodFunc = adminApp.get;
@@ -204,8 +218,13 @@ function genericStrategy(adminApp,strategy) {
         callbackMethodFunc = adminApp.post;
     }
     callbackMethodFunc.call(adminApp,'/auth/strategy/callback',
-        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
-        completeGenerateStrategyAuth
+        passport.authenticate(strategy.name, {
+            session:false,
+            failureMessage: true,
+            failureRedirect: settings.httpAdminRoot
+        }),
+        completeGenerateStrategyAuth,
+        handleStrategyError
     );
 
 }
@@ -215,6 +234,13 @@ function completeGenerateStrategyAuth(req,res) {
     // Successful authentication, redirect home.
     res.redirect(settings.httpAdminRoot + '?access_token='+tokens.accessToken);
 }
+function handleStrategyError(err, req, res, next) {
+    if (res.headersSent) {
+        return next(err)
+    }
+    log.audit({event: "auth.login.fail.oauth",error:err.toString()});
+    res.redirect(settings.httpAdminRoot + '?session_message='+err.toString());
+}
 
 module.exports = {
     init: init,

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -92,10 +92,16 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                 loginAttempts = loginAttempts.filter(function(logEntry) {
                     return logEntry.user !== username;
                 });
-                Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",username:username,client:client.id,scope:scope});
-                    done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
-                });
+                // Check if the user contains a user defined token and use it
+                // instead of generating a new token
+                if(user.token){
+                    done(null,user.token,null,null);
+                } else {
+                    Tokens.create(username,client.id,scope).then(function(tokens) {
+                        log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
+                        done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
+                    });
+                }
             } else {
                 log.audit({event: "auth.login.fail.permissions",username:username,client:client.id,scope:scope});
                 done(null,false);
@@ -146,7 +152,7 @@ function authenticateUserToken(req) {
                 } else {
                     reject();
                 }
-            });
+            }).catch(reject);
         } else {
             reject();
         }
@@ -163,6 +169,9 @@ TokensStrategy.prototype.authenticate = function(req) {
     authenticateUserToken(req).then(user => {
         this.success(user,{scope:user.permissions});
     }).catch(err => {
+        if (err) {
+            log.trace("token authentication failure: "+err.stack?err.stack:err)
+        }
         this.fail(401);
     });
 }

packages/node_modules/@node-red/editor-api/lib/auth/tokens.js

@@ -14,15 +14,7 @@
  * limitations under the License.
  **/
 
-function generateToken(length) {
-    var c = "ABCDEFGHIJKLMNOPQRSTUZWXYZabcdefghijklmnopqrstuvwxyz1234567890";
-    var token = [];
-    for (var i=0;i<length;i++) {
-        token.push(c[Math.floor(Math.random()*c.length)]);
-    }
-    return token.join("");
-}
-
+const crypto = require("crypto");
 
 var storage;
 var sessionExpiryTime
@@ -115,7 +107,7 @@ module.exports = {
     },
     create: function(user,client,scope) {
         return loadSessions().then(function() {
-            var accessToken = generateToken(128);
+            var accessToken = crypto.randomBytes(128).toString('base64');
 
             var accessTokenExpiresAt = Date.now() + (sessionExpiryTime*1000);
 

packages/node_modules/@node-red/editor-api/lib/editor/comms.js

@@ -16,6 +16,7 @@
 
 var ws = require("ws");
 var url = require("url");
+const crypto = require("crypto");
 
 var log = require("@node-red/util").log; // TODO: separate module
 var Tokens;
@@ -32,8 +33,6 @@ var activeConnections = [];
 
 var anonymousUser;
 
-var retained = {};
-
 var heartbeatTimer;
 var lastSentTime;
 
@@ -56,17 +55,9 @@ function handleSessionExpiry(session) {
         }
     })
 }
-function generateSession(length) {
-    var c = "ABCDEFGHIJKLMNOPQRSTUZWXYZabcdefghijklmnopqrstuvwxyz1234567890";
-    var token = [];
-    for (var i=0;i<length;i++) {
-        token.push(c[Math.floor(Math.random()*c.length)]);
-    }
-    return token.join("");
-}
 
 function CommsConnection(ws, user) {
-    this.session = generateSession(32);
+    this.session = crypto.randomBytes(32).toString('base64');
     this.ws = ws;
     this.stack = [];
     this.user = user;
@@ -167,25 +158,31 @@ function CommsConnection(ws, user) {
 }
 
 CommsConnection.prototype.send = function(topic,data) {
-    var self = this;
     if (topic && data) {
         this.stack.push({topic:topic,data:data});
     }
+    this._queueSend();
+}
+CommsConnection.prototype._queueSend = function() {
+    var self = this;
     if (!this._xmitTimer) {
         this._xmitTimer = setTimeout(function() {
             try {
-                self.ws.send(JSON.stringify(self.stack));
+                self.ws.send(JSON.stringify(self.stack.splice(0,50)));
                 self.lastSentTime = Date.now();
             } catch(err) {
                 removeActiveConnection(self);
                 log.warn(log._("comms.error-send",{message:err.toString()}));
             }
             delete self._xmitTimer;
-            self.stack = [];
+            if (self.stack.length > 0) {
+                self._queueSend();
+            }
         },50);
     }
 }
 
+
 CommsConnection.prototype.subscribe = function(topic) {
     runtimeAPI.comms.subscribe({
         user: this.user,

packages/node_modules/@node-red/editor-api/lib/editor/index.js

@@ -64,10 +64,12 @@ module.exports = {
                     }
                 });
             }
-            if (settings.httpServerOptions) {
-                for (var eOption in settings.httpServerOptions) {
-                    editorApp.set(eOption, settings.httpServerOptions[eOption]);
-                }
+            var defaultServerSettings = {
+                "x-powered-by": false
+            }
+            var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+            for (var eOption in serverSettings) {
+                editorApp.set(eOption, serverSettings[eOption]);
             }
             editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
 
@@ -75,8 +77,10 @@ module.exports = {
             editorApp.get("/icons/:module/:icon",ui.icon);
             editorApp.get("/icons/:scope/:module/:icon",ui.icon);
 
+            editorApp.get(/^\/resources\/((?:@[^\/]+\/)?[^\/]+)\/(.+)$/,ui.moduleResource);
+
             var theme = require("./theme");
-            theme.init(settings);
+            theme.init(settings, runtimeAPI);
             editorApp.use("/theme",theme.app());
             editorApp.use("/",ui.editorResources);
 
@@ -93,6 +97,7 @@ module.exports = {
             // Library
             var library = require("./library");
             library.init(runtimeAPI);
+            // editorApp.get("/library/:id",needsPermission("library.read"),library.getLibraryConfig);
             editorApp.get(/^\/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
             editorApp.post(/^\/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
 

packages/node_modules/@node-red/editor-api/lib/editor/library.js

@@ -17,7 +17,6 @@
 var apiUtils = require("../util");
 var fs = require('fs');
 var fspath = require('path');
-var when = require('when');
 
 var runtimeAPI;
 
@@ -25,6 +24,17 @@ module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
     },
+    // getLibraryConfig: function(req,res) {
+    //     var opts = {
+    //         user: req.user,
+    //         library: req.params.id
+    //     }
+    //     runtimeAPI.library.getConfig(opts).then(function(result) {
+    //         res.json(result);
+    //     }).catch(function(err) {
+    //         apiUtils.rejectHandler(req,res,err);
+    //     });
+    // },
     getEntry: function(req,res) {
         var opts = {
             user: req.user,

packages/node_modules/@node-red/editor-api/lib/editor/locales.js

@@ -39,15 +39,19 @@ module.exports = {
     },
     get: function(req,res) {
         var namespace = req.params[0];
-        var lngs = req.query.lng;
         namespace = namespace.replace(/\.json$/,"");
         var lang = req.query.lng || i18n.defaultLang; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
+        if (/[^0-9a-z=\-\*]/i.test(lang)) {
+            res.json({});
+            return;
+        }
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){
-            var catalog = loadResource(lang, namespace);
-            res.json(catalog||{});
+            i18n.i.changeLanguage(prevLang, function() {
+                var catalog = loadResource(lang, namespace);
+                res.json(catalog||{});
+            });
         });
-        i18n.i.changeLanguage(prevLang);
     }
 }

packages/node_modules/@node-red/editor-api/lib/editor/projects.js

@@ -122,6 +122,7 @@ module.exports = {
             }
 
             if (req.body.active) {
+                opts.clearContext = req.body.hasOwnProperty('clearContext')?req.body.clearContext:true
                 runtimeAPI.projects.setActiveProject(opts).then(function() {
                     listProjects(req,res);
                 }).catch(function(err) {
@@ -137,6 +138,7 @@ module.exports = {
                        req.body.hasOwnProperty('description') ||
                        req.body.hasOwnProperty('dependencies')||
                        req.body.hasOwnProperty('summary') ||
+                       req.body.hasOwnProperty('version') ||
                        req.body.hasOwnProperty('files') ||
                         req.body.hasOwnProperty('git')) {
                 runtimeAPI.projects.updateProject(opts).then(function() {

packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js

@@ -18,14 +18,6 @@ var apiUtils = require("../util");
 var express = require("express");
 var runtimeAPI;
 
-function getUsername(userObj) {
-    var username = '__default';
-    if ( userObj && userObj.name ) {
-        username = userObj.name;
-    }
-    return username;
-}
-
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;

packages/node_modules/@node-red/editor-api/lib/editor/theme.js

@@ -24,16 +24,20 @@ var defaultContext = {
     page: {
         title: "Node-RED",
         favicon: "favicon.ico",
-        tabicon: "red/images/node-red-icon-black.svg"
+        tabicon: {
+            icon: "red/images/node-red-icon-black.svg",
+            colour: "#8f0000"
+        },
+        version: require(path.join(__dirname,"../../package.json")).version
     },
     header: {
         title: "Node-RED",
         image: "red/images/node-red.svg"
     },
     asset: {
-        red: (process.env.NODE_ENV == "development")? "red/red.js":"red/red.min.js",
-        main: (process.env.NODE_ENV == "development")? "red/main.js":"red/main.min.js",
-
+        red: "red/red.min.js",
+        main: "red/main.min.js",
+        vendorMonaco: ""
     }
 };
 
@@ -41,6 +45,10 @@ var theme = null;
 var themeContext = clone(defaultContext);
 var themeSettings = null;
 
+var activeTheme = null;
+var activeThemeInitialised = false;
+
+var runtimeAPI;
 var themeApp;
 
 function serveFile(app,baseUrl,file) {
@@ -58,7 +66,7 @@ function serveFile(app,baseUrl,file) {
     }
 }
 
-function serveFilesFromTheme(themeValue, themeApp, directory) {
+function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
     var result = [];
     if (themeValue) {
         var array = themeValue;
@@ -67,7 +75,14 @@ function serveFilesFromTheme(themeValue, themeApp, directory) {
         }
 
         for (var i=0;i<array.length;i++) {
-            var url = serveFile(themeApp,directory,array[i]);
+            let fullPath = array[i];
+            if (baseDirectory) {
+                fullPath = path.resolve(baseDirectory,array[i]);
+                if (fullPath.indexOf(path.resolve(baseDirectory)) !== 0) {
+                    continue;
+                }
+            }
+            var url = serveFile(themeApp,directory,fullPath);
             if (url) {
                 result.push(url);
             }
@@ -77,10 +92,20 @@ function serveFilesFromTheme(themeValue, themeApp, directory) {
 }
 
 module.exports = {
-    init: function(settings) {
+    init: function(settings, _runtimeAPI) {
+        runtimeAPI = _runtimeAPI;
         themeContext = clone(defaultContext);
+        if (process.env.NODE_ENV == "development") {
+            themeContext.asset.red = "red/red.js";
+            themeContext.asset.main = "red/main.js";
+        }
         themeSettings = null;
         theme = settings.editorTheme || {};
+        themeContext.asset.vendorMonaco = "vendor/monaco/monaco-bootstrap.js"
+        if (theme.codeEditor && theme.codeEditor.lib === 'ace') {
+            themeContext.asset.vendorMonaco = ''
+        }
+        activeTheme = theme.theme;
     },
 
     app: function() {
@@ -109,13 +134,25 @@ module.exports = {
             }
 
             if (theme.page.tabicon) {
-                url = serveFile(themeApp,"/tabicon/",theme.page.tabicon)
+                let icon = theme.page.tabicon.icon || theme.page.tabicon
+                url = serveFile(themeApp,"/tabicon/", icon)
                 if (url) {
-                    themeContext.page.tabicon = url;
+                    themeContext.page.tabicon.icon = url;
+                }
+                if (theme.page.tabicon.colour) {
+                    themeContext.page.tabicon.colour = theme.page.tabicon.colour
                 }
             }
 
             themeContext.page.title = theme.page.title || themeContext.page.title;
+
+            // Store the resolved urls to these resources so nodes (such as Debug)
+            // can access them
+            theme.page._ = {
+                css: themeContext.page.css,
+                scripts: themeContext.page.scripts,
+                favicon: themeContext.page.favicon
+            }
         }
 
         if (theme.header) {
@@ -169,7 +206,9 @@ module.exports = {
                 }
             }
         }
-        themeApp.get("/", function(req,res) {
+        themeApp.get("/", async function(req,res) {
+            const themePluginList = await runtimeAPI.plugins.getPluginsByType({type:"node-red-theme"});
+            themeContext.themes = themePluginList.map(theme => theme.id);
             res.json(themeContext);
         })
 
@@ -185,10 +224,115 @@ module.exports = {
             themeSettings.projects = theme.projects;
         }
 
+        if (theme.hasOwnProperty("keymap")) {
+            themeSettings.keymap = theme.keymap;
+        }
+
+        if (theme.theme) {
+            themeSettings.theme = theme.theme;
+        }
+
+        if (theme.hasOwnProperty("tours")) {
+            themeSettings.tours = theme.tours;
+        }
 
         return themeApp;
     },
-    context: function() {
+    context: async function() {
+        if (activeTheme && !activeThemeInitialised) {
+            const themePlugin = await runtimeAPI.plugins.getPlugin({
+                id:activeTheme
+            });
+            if (themePlugin) {
+                if (themePlugin.css) {
+                    const cssFiles = serveFilesFromTheme(
+                        themePlugin.css,
+                        themeApp,
+                        "/css/",
+                        themePlugin.path
+                    );
+                    themeContext.page.css = cssFiles.concat(themeContext.page.css || [])
+                    theme.page = theme.page || {_:{}}
+                    theme.page._.css = cssFiles.concat(theme.page._.css || [])
+                }
+                if (themePlugin.scripts) {
+                    const scriptFiles = serveFilesFromTheme(
+                        themePlugin.scripts,
+                        themeApp,
+                        "/scripts/",
+                        themePlugin.path
+                    )
+                    themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
+                    theme.page = theme.page || {_:{}}
+                    theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
+                }
+                // check and load page settings from theme
+                if (themePlugin.page) {
+                    if (themePlugin.page.favicon  && !theme.page.favicon) {
+                        const result = serveFilesFromTheme(
+                            [themePlugin.page.favicon],
+                            themeApp,
+                            "/",
+                            themePlugin.path
+                        )
+                        if(result && result.length > 0) {
+                            // update themeContext page favicon
+                            themeContext.page.favicon = result[0]
+                            theme.page = theme.page || {_:{}}
+                            theme.page._.favicon = result[0]
+                        }
+                    }
+                    if (themePlugin.page.tabicon && themePlugin.page.tabicon.icon && !theme.page.tabicon) {
+                        const result = serveFilesFromTheme(
+                            [themePlugin.page.tabicon.icon],
+                            themeApp,
+                            "/page/",
+                            themePlugin.path
+                        )
+                        if(result && result.length > 0) {
+                            // update themeContext page tabicon
+                            themeContext.page.tabicon.icon = result[0]
+                            themeContext.page.tabicon.colour = themeContext.page.tabicon.colour || themeContext.page.tabicon.colour
+                            theme.page = theme.page || {_:{}}
+                            theme.page._.tabicon = theme.page._.tabicon || {}
+                            theme.page._.tabicon.icon = themeContext.page.tabicon.icon 
+                            theme.page._.tabicon.colour = themeContext.page.tabicon.colour
+                        }
+                    }
+                    // if the plugin has a title AND the users settings.js does NOT
+                    if (themePlugin.page.title && !theme.page.title) {
+                        themeContext.page.title = themePlugin.page.title || themeContext.page.title
+                    }
+                }
+                // check and load header settings from theme
+                if (themePlugin.header) {
+                    if (themePlugin.header.image && !theme.header.image) {
+                        const result = serveFilesFromTheme(
+                            [themePlugin.header.image],
+                            themeApp,
+                            "/header/",
+                            themePlugin.path
+                        )
+                        if(result && result.length > 0) {
+                            // update themeContext header image
+                            themeContext.header.image = result[0]
+                        }
+                    }
+                    // if the plugin has a title AND the users settings.js does NOT have a title
+                    if (themePlugin.header.title && !theme.header.title) {
+                        themeContext.header.title = themePlugin.header.title || themeContext.header.title
+                    }
+                    // if the plugin has a header url AND the users settings.js does NOT
+                    if (themePlugin.header.url && !theme.header.url) {
+                        themeContext.header.url = themePlugin.header.url || themeContext.header.url
+                    }
+                }
+                if(theme.codeEditor) {
+                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+                }
+            }
+            activeThemeInitialised = true;
+        }
         return themeContext;
     },
     settings: function() {

packages/node_modules/@node-red/editor-api/lib/editor/ui.js

@@ -68,8 +68,39 @@ module.exports = {
             apiUtils.rejectHandler(req,res,err);
         })
     },
-    editor: function(req,res) {
-        res.send(Mustache.render(editorTemplate,theme.context()));
+
+    moduleResource: function(req, res) {
+        let resourcePath = req.params[1];
+        let opts = {
+            user: req.user,
+            module: req.params[0],
+            path: resourcePath
+        }
+        runtimeAPI.nodes.getModuleResource(opts).then(function(data) {
+            if (data) {
+                var contentType = mime.getType(resourcePath);
+                res.set("Content-Type", contentType);
+                res.send(data);
+            } else {
+                res.status(404).end()
+            }
+        }).catch(function(err) {
+            console.log(err.stack);
+            apiUtils.rejectHandler(req,res,err);
+        })
+    },
+
+    editor: async function(req,res) {
+
+        let sessionMessages;
+        if (req.session && req.session.messages) {
+            sessionMessages = JSON.stringify(req.session.messages);
+            delete req.session.messages
+        }
+        res.send(Mustache.render(editorTemplate,{
+            sessionMessages,
+            ...await theme.context()
+        }));
     },
     editorResources: express.static(path.join(editorClientDir,'public'))
 };

packages/node_modules/@node-red/editor-api/lib/index.js

@@ -28,7 +28,6 @@ var express = require("express");
 var bodyParser = require("body-parser");
 var util = require('util');
 var passport = require('passport');
-var when = require('when');
 var cors = require('cors');
 
 var auth = require("./auth");
@@ -60,11 +59,19 @@ function init(settings,_server,storage,runtimeAPI) {
         adminApp.use(corsHandler);
 
         if (settings.httpAdminMiddleware) {
-            if (typeof settings.httpAdminMiddleware === "function") {
-                adminApp.use(settings.httpAdminMiddleware)
+            if (typeof settings.httpAdminMiddleware === "function" || Array.isArray(settings.httpAdminMiddleware)) {
+                adminApp.use(settings.httpAdminMiddleware);
             }
         }
 
+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }
+
         auth.init(settings,storage);
 
         var maxApiRequestSize = settings.apiMaxLength || '5mb';
@@ -83,6 +90,8 @@ function init(settings,_server,storage,runtimeAPI) {
                     auth.getToken,
                     auth.errorHandler
                 );
+            } else if (settings.adminAuth.tokens) {
+                adminApp.use(passport.initialize());
             }
             adminApp.post("/auth/revoke",auth.needsPermission(""),auth.revoke,apiUtil.errorHandler);
         }
@@ -111,11 +120,9 @@ function init(settings,_server,storage,runtimeAPI) {
  * @return {Promise} resolves when the application is ready to handle requests
  * @memberof @node-red/editor-api
  */
-function start() {
+async function start() {
     if (editor) {
         return editor.start();
-    } else {
-        return when.resolve();
     }
 }
 
@@ -124,11 +131,10 @@ function start() {
  * @return {Promise} resolves when the application is stopped
  * @memberof @node-red/editor-api
  */
-function stop() {
+async function stop() {
     if (editor) {
         editor.stop();
     }
-    return when.resolve();
 }
 module.exports = {
     init: init,

packages/node_modules/@node-red/editor-api/lib/util.js

@@ -43,6 +43,10 @@ module.exports = {
     rejectHandler: function(req,res,err) {
         //TODO: why this when errorHandler also?!
         log.audit({event: "api.error",error:err.code||"unexpected_error",message:err.message||err.toString()},req);
+        if (!err.code) {
+            // by definition, an unexpected_error to log
+            log.error(err);
+        }
         var response = {
             code: err.code||"unexpected_error",
             message: err.message||err.toString()

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.1.3",
+    "version": "3.1.0-beta.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,25 +16,25 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.1.3",
-        "@node-red/editor-client": "1.1.3",
+        "@node-red/util": "3.1.0-beta.0",
+        "@node-red/editor-client": "3.1.0-beta.0",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.20.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.17.1",
-        "express": "4.17.1",
-        "memorystore": "1.6.2",
-        "mime": "2.4.6",
-        "mustache": "4.0.1",
-        "oauth2orize": "1.11.0",
+        "express-session": "1.17.3",
+        "express": "4.18.1",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "multer": "1.4.5-lts.1",
+        "mustache": "4.2.0",
+        "oauth2orize": "1.11.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.4.1",
-        "when": "3.7.8",
-        "ws": "6.2.1"
+        "passport": "0.6.0",
+        "ws": "7.5.6"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.6"
+        "bcrypt": "5.0.1"
     }
 }

packages/node_modules/@node-red/editor-client/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

packages/node_modules/@node-red/editor-client/locales/de/infotips.json

@@ -1,23 +1,23 @@
 {
-  "info" : {
-    "tip0" : "Sie können die ausgewählten Nodes oder Verbindungen mit {{ core:delete-selection }} entfernen.",
-    "tip1" : "Suche nach Nodes mit {{ core:search }}",
-    "tip2" : "{{ core:toggle-sidebar }} schaltet die Ansicht dieser Seitenleiste ein.",
-    "tip3" : "Sie können Ihre Palette von Nodes mit {{ core:manage-palette }} verwalten.",
-    "tip4" : "Ihre Flow-Konfigurations-Nodes werden in der Seitenleiste angezeigt. Es kann über das Menü oder mit {{ core:show-config-tab }} aufgerufen werden.",
-    "tip5" : "Aktiviert oder inaktiviert diese Tipps von der Option in den Einstellungen",
-    "tip6" : "Verschieben Sie die ausgewählten Nodes mit Hilfe der [left] [up] [down] und [right] Tasten. Halten Sie [Shift] gedrückt, um das Fenster weiter zu schieben",
-    "tip7" : "Wenn Sie einen Node auf eine Verbindung ziehen, wird er in die Verbindung eingefügt.",
-    "tip8" : "Die ausgewählten Nodes exportieren oder die aktuelle Registerkarte mit {{ core:show-export-dialog }}",
-    "tip9" : "Importieren Sie einen Flow, indem Sie sein JSON in den Editor ziehen oder mit {{ core:show-import-dialog }}.",
-    "tip10" : "[Umschalt] [Klicken] und ziehen Sie auf einen Node-Anschluss, um alle angeschlossenen Verbindungen oder nur die ausgewählte zu verschieben.",
-    "tip11" : "Die Registerkarte \"Info\" mit {{ core:show-info-tab }} oder der Registerkarte \"Debug\" mit {{ core:show-debug-tab }} anzeigen",
-    "tip12" : "[ctrl] [Klicken] in den Arbeitsbereich, um den Schnellhinzufügedialog zu öffnen.",
-    "tip13" : "Halten Sie [ctrl] gedrückt, wenn Sie auf einem Node-Anschluss klicken, um eine Schnellverbindung zu aktivieren.",
-    "tip14" : "Halten Sie [Umschalt] gedrückt, wenn Sie auf einen Node klicken, um auch alle verbundenen Nodes auszuwählen.",
-    "tip15" : "Halten Sie [ctrl] gedrückt, wenn Sie auf einen Node klicken, um ihn aus der aktuellen Auswahl hinzuzufügen oder zu entfernen.",
-    "tip16" : "Indexzungen wechseln mit {{ core:show-previous-tab }} und {{ core:show-next-tab }}",
-    "tip17" : "Sie können die Änderungen im Editierrahmen des Nodes mit {{ core:confirm-edit-tray }} bestätigen oder sie mit {{ core:cancel-edit-tray }} abbrechen.",
-    "tip18" : "Durch Drücken von {{ core:edit-selected-node }} wird der erste Node in der aktuellen Auswahl bearbeitet."
-  }
-}
+    "info": {
+        "tip0": "Sie können die ausgewählten Nodes oder Verbindungen mit {{ core:delete-selection }} entfernen",
+        "tip1": "Sie können nach Nodes mit  {{ core:search }} suchen",
+        "tip2": "{{ core:toggle-sidebar }} blendet die Seitenleiste ein/aus",
+        "tip3": "Sie können Ihre Node-Palette mit {{ core:manage-palette }} verwalten",
+        "tip4": "Ihre Flow-Konfigurationsnodes werden in der Seitenleiste angezeigt, die über das Menü oder mit {{ core:show-config-tab }} angezeigt werden kann",
+        "tip5": "Aktiviere oder deaktiviere diese Tipps in den Einstellungen im Tab 'Ansicht'",
+        "tip6": "Sie können die ausgewählten Nodes mit den [left]/[up]/[down]/[right]-Tasten verschieben. Wenn Sie dabei [Shift] gedrückt halten, können Sie den Fensterausschnitt verschieben.",
+        "tip7": "Wenn Sie ein Node auf eine Verbindung ziehen, wird es in die Verbindung eingefügt",
+        "tip8": "Sie können die ausgewählten Nodes oder den aktuellen Flow-Tab mit {{ core:show-export-dialog }} exportieren",
+        "tip9": "Sie können einen Flow importieren, indem Sie sein JSON in den Editor ziehen oder mittels {{ core:show-import-dialog }}",
+        "tip10": "Halten Sie [Shift] beim [Klicken] auf ein Node gedrückt, um auch alle verbundenen Nodes mit zu verschieben",
+        "tip11": "Sie können den Tab 'Info' mit {{ core:show-info-tab }} oder den Tab 'Debug' mit {{ core:show-debug-tab }} anzeigen lassen",
+        "tip12": "Halten Sie [Strg] beim [Klicken] in den Arbeitsbereich gedrückt, um den Schnellhinzufügedialog öffnen",
+        "tip13": "Halten Sie [Strg] beim [Klicken] auf einen Node-Anschluss gedrückt, um eine Verbindung nur durch kurzes [Klicken] (ohne Halten) zu verlegen",
+        "tip14": "Halten Sie [Shift] beim [Klicken] auf ein Node gedrückt, um auch alle verbundenen Nodes mit auszuwählen",
+        "tip15": "Halten Sie [Strg] beim [Klicken] auf ein Node gedrückt, um es zu der aktuellen Auswahl hinzuzufügen oder aus ihr zu entfernen",
+        "tip16": "Sie können die Flow-Tabs mit {{ core:show-previous-tab }} und {{ core:show-next-tab }} wechseln",
+        "tip17": "Sie können die Änderungen im Node-Editor mit {{ core:confirm-edit-tray }} bestätigen oder sie mit {{ core:cancel-edit-tray }} verwerfen",
+        "tip18": "Sie können mit {{ core:edit-selected-node }} den ersten Node in der aktuellen Auswahl bearbeiten"
+    }
+}

packages/node_modules/@node-red/editor-client/locales/de/jsonata.json

@@ -1,222 +1,274 @@
 {
-  "$string" : {
-    "args" : "arg",
-    "desc" : "Transformiert den Parameter *arg* in eine Zeichenfolge mit den folgenden Transformationsregeln:\n\n -Zeichenfolgen bleiben unverändert\n -Funktionen werden in eine leere Zeichenfolge konvertiert\n -Numerische Unendlichkeit und NaN lösen einen Fehler aus, da sie nicht als JSON-Nummer dargestellt werden können.\n -Alle anderen Werte werden mit Hilfe der Funktion 'JSON.stringify' in eine JSON-Zeichenfolge konvertiert."
-  },
-  "$length" : {
-    "args" : "str",
-    "desc" : "Gibt die Anzahl der Zeichen in der Zeichenfolge `str` zurück. Es wird ein Fehler ausgelöst, wenn `str` keine Zeichenfolge ist."
-  },
-  "$substring" : {
-    "args" : "str, start [, länge]",
-    "desc" : "Gibt eine Zeichenfolge zurück, die die Zeichen im ersten Parameter `str` beginnend bei Position `start` (Null-Offset) enthält. Wenn \"length\" angegeben ist, enthält die Unterzeichenfolge maximal \"Länge\" Zeichen. Wenn `start` negativ ist, gibt es die Anzahl der Zeichen am Ende von `str`  an."
-  },
-  "$substringBefore" : {
-    "args" : "str, chars",
-    "desc" : "Gibt die Unterzeichenfolge vor dem ersten Auftreten der Zeichenfolge `chars` in `str` zurück. Falls `str` nicht `chars` enthält, gibt es `str` zurück."
-  },
-  "$substringAfter" : {
-    "args" : "str, chars",
-    "desc" : "Gibt die Unterzeichenfolge nach dem ersten Auftreten der Zeichenfolge `chars` in `str` zurück. Falls `str` nicht `chars` enthält, gibt es `str` zurück."
-  },
-  "$uppercase" : {
-    "args" : "str",
-    "desc" : "Gibt eine Zeichenfolge mit allen Zeichen von `str` zurück, die in Großbuchstaben konvertiert werden."
-  },
-  "$lowercase" : {
-    "args" : "str",
-    "desc" : "Gibt eine Zeichenfolge mit allen Zeichen von `str` in Kleinbuchstaben zurück."
-  },
-  "$trim" : {
-    "args" : "str",
-    "desc" : "Normalisiert und trimmt alle Leerzeichen in `str` durch Anwenden der folgenden Schritte:\n\n -Alle Tabulatorstopps, Wagenrückläufe und Zeilenvorschübe werden durch Leerzeichen ersetzt.\n-Zusammenhängende Folgen von Räumen werden auf einen einzigen Raum reduziert.\n-Trailing und führende Plätze werden entfernt.\n\n Wenn 'str' nicht angegeben ist (d. h. Diese Funktion wird ohne Argumente aufgerufen), dann wird der Kontextwert als Wert von `str` verwendet. Es wird ein Fehler ausgelöst, wenn `str` keine Zeichenfolge ist."
-  },
-  "$contains" : {
-    "args" : "str, Muster",
-    "desc" : "Gibt `true` zurück, wenn `str` durch `Muster` abgeglichen wird, sonst gibt es `false` zurück. Wenn 'str' nicht angegeben ist (d. h. Diese Funktion wird mit einem Argument aufgerufen), dann wird der Kontextwert als Wert von `str` verwendet. Der Parameter 'Muster' kann entweder eine Zeichenfolge oder ein regulärer Ausdruck sein."
-  },
-  "$split" : {
-    "args" : "str [, Trennzeichen] [, Grenzwert]",
-    "desc" : "Teilt den Parameter 'str' in einem Array mit Unterzeichenfolgen. Es ist ein Fehler, wenn `str` keine Zeichenfolge ist. Der optionale Parameter 'Trennzeichen' gibt die Zeichen in der `str` an, um die es entweder als Zeichenfolge oder als regulärer Ausdruck geteilt werden soll. Wenn 'Trennzeichen' nicht angegeben wird, wird die leere Zeichenfolge angenommen, und `str` wird in ein Array aus einzelnen Zeichen aufgeteilt. Es handelt sich um einen Fehler, wenn `Trennzeichen' keine Zeichenfolge ist. Der optionale Parameter 'Grenzwert' ist eine Zahl, die die maximale Anzahl von Unterzeichenfolgen angibt, die in das resultierende Array eingeschlossen werden sollen. Alle zusätzlichen Unterzeichenfolgen werden gelöscht. Wenn 'Grenzwert' nicht angegeben wird, wird ' str ` vollständig geteilt, wobei die Größe des resultierenden Arrays nicht begrenzt ist. Es handelt sich um einen Fehler, wenn `Grenzwert' keine nicht negative Zahl ist."
-  },
-  "$join" : {
-    "args" : "array [, Trennzeichen]",
-    "desc" : "Verkettet ein Array von Komponentenzeichenfolgen in eine einzelne verkettete Zeichenfolge mit jeder Komponentenzeichenfolge, die durch den optionalen Parameter 'separator' getrennt ist. Es ist ein Fehler, wenn die Eingabe `Array` ein Element enthält, das keine Zeichenfolge ist. Wenn 'Trennzeichen' nicht angegeben wird, wird davon ausgegangen, dass es sich um eine leere Zeichenfolge handelt, d. h. Zwischen den Komponentenzeichenfolgen ist kein Trennzeichen vorhanden. Es handelt sich um einen Fehler, wenn `Trennzeichen' keine Zeichenfolge ist."
-  },
-  "$match" : {
-    "args" : "str, Muster [, Grenzwert]",
-    "desc" : "Wendet die Zeichenfolge `str`  an den regulären Ausdruck `Muster` an und gibt ein Array von Objekten zurück, wobei jedes Objekt Informationen zu jedem Vorkommen einer Übereinstimmung in `str` enthält."
-  },
-  "$replace" : {
-    "args" : "str, Muster, Ersatz [, Grenzwert]",
-    "desc" : "Findet Vorkommen von `Muster` in `str` und ersetzt sie durch `Ersatz`.\n\nDer optionale Parameter 'Grenzwert' ist die maximale Anzahl an Ersetzungen."
-  },
-  "$now" : {
-    "args" : "",
-    "desc" : "Generiert einen Zeitstempel im ISO-8601-kompatiblen Format und gibt sie als Zeichenfolge zurück."
-  },
-  "$base64encode" : {
-    "args" : "Zeichenfolge",
-    "desc" : "Konvertiert eine ASCII-Zeichenfolge in eine Basis-64-Darstellung. Jedes Zeichen in der Zeichenfolge wird als Byte mit binären Daten behandelt. Dies setzt voraus, dass alle Zeichen in der Zeichenfolge im Bereich von 0x00 bis 0xFF liegen, der alle Zeichen in URI-codierten Zeichenfolgen enthält. Unicode-Zeichen außerhalb dieses Bereichs werden nicht unterstützt."
-  },
-  "$base64decode" : {
-    "args" : "Zeichenfolge",
-    "desc" : "Konvertiert die Basis-64-codierten Byte in eine Zeichenfolge unter Verwendung einer UTF-8-Unicode-Codepage."
-  },
-  "$number" : {
-    "args" : "arg",
-    "desc" : "Der Parameter 'arg' wird unter Verwendung der folgenden Regeln für das Casting in eine Zahl verwendet:\n\n -Zahlen bleiben unverändert\n -Zeichenfolgen, die eine Folge von Zeichen enthalten, die eine rechtliche JSON-Nummer darstellen, werden in diese Zahl konvertiert.\n -Alle anderen Werte bewirken, dass ein Fehler ausgelöst wird."
-  },
-  "$abs" : {
-    "args" : "Anzahl",
-    "desc" : "Gibt den absoluten Wert des Parameters 'Zahl' zurück."
-  },
-  "$floor" : {
-    "args" : "Anzahl",
-    "desc" : "Gibt den Wert von 'Zahl' auf die nächste ganze Zahl zurück, die kleiner oder gleich 'Zahl' ist."
-  },
-  "$ceil" : {
-    "args" : "Anzahl",
-    "desc" : "Gibt den Wert von 'Zahl' auf die nächste ganze Zahl zurück, die größer oder gleich 'Zahl' ist."
-  },
-  "$round" : {
-    "args" : "Zahl [, Genauigkeit]",
-    "desc" : "Gibt den Wert des Parameters `Zahl` zurück, der auf die Anzahl der Dezimalstellen gerundet wird, die durch den optionalen Parameter 'Genauigkeit' angegeben wird."
-  },
-  "$power" : {
-    "args" : "Basis, Exponent",
-    "desc" : "Gibt den Wert von `Basis` potenziert mit `Exponent` zurück."
-  },
-  "$sqrt" : {
-    "args" : "Zahl",
-    "desc" : "Gibt die Quadratwurzel des Werts des Parameters 'Zahl' zurück."
-  },
-  "$random" : {
-    "args" : "",
-    "desc" : "Gibt eine Pseudozufallszahl größer-gleich null und kleiner als eins zurück."
-  },
-  "$millis" : {
-    "args" : "",
-    "desc" : "Gibt die Anzahl der Millisekunden seit der Unix-Epoche (1. Januar 1970 (UTC)) als Zahl zurück. Alle Invocationen von `$millis ()` innerhalb einer Auswertung eines Ausdrucks geben alle denselben Wert zurück."
-  },
-  "$sum" : {
-    "args" : "Array",
-    "desc" : "Gibt die arithmetische Summe eines `Array` von Zahlen zurück. Es ist ein Fehler, wenn die Eingabe `Array` ein Element enthält, das keine Zahl ist."
-  },
-  "$max" : {
-    "args" : "Array",
-    "desc" : "Gibt die maximale Anzahl in einem `Array` von Zahlen zurück. Es ist ein Fehler, wenn die Eingabe `Array` ein Element enthält, das keine Zahl ist."
-  },
-  "$min" : {
-    "args" : "Array",
-    "desc" : "Gibt die minimale Zahl in einem `Array` von Zahlen zurück. Es ist ein Fehler, wenn die Eingabe `Array` ein Element enthält, das keine Zahl ist."
-  },
-  "$average" : {
-    "args" : "Array",
-    "desc" : "Gibt den Mittelwert eines `Array` von Zahlen zurück. Es ist ein Fehler, wenn die Eingabe `Array` ein Element enthält, das keine Zahl ist."
-  },
-  "$boolean" : {
-    "args" : "arg",
-    "desc" : "Castet das Argument mit den folgenden Regeln in einen Booleschen Wert:\n\n -` Boolean ': nicht geändert\n -` string `: leer: `false`\n -` string `: nicht leer: `true`\n -` Zahl `: ` 0 `: ` falsch `\n -` Zahl `: Nicht-Null: `true`\n -` null `: `false`\n -` array `: leer: `false`\n -` array `: enthält ein Mitglied, das auf `true` setzt: `true`\n -` array `: alle Member werden in `false` umgesetzt: `false`\n -` object `: empty: `false`\n -` object `: non-empty: `true`\n -` Funktion `: ` falsch `"
-  },
-  "$not" : {
-    "args" : "arg",
-    "desc" : "Gibt den Booleschen Wert NOT für das Argument zurück. `arg` wird zuerst in einen Booleschen Wert umgesetzt."
-  },
-  "$exists" : {
-    "args" : "arg",
-    "desc" : "Gibt den Booleschen Wert 'true' zurück, wenn der Ausdruck `arg` als Wert ausgewertet wird, oder 'false', wenn der Ausdruck nicht mit einem anderen Ausdruck übereinstimmt (z. B. ein Pfad zu einer nicht vorhandenen Feldreferenz)."
-  },
-  "$count" : {
-    "args" : "Array",
-    "desc" : "Gibt die Anzahl der Elemente in dem Array zurück."
-  },
-  "$append" : {
-    "args" : "Array, Array",
-    "desc" : "Hängen Sie zwei Arrays an."
-  },
-  "$sort" : {
-    "args" : "array [, Funktion]",
-    "desc" : "Gibt ein Array zurück, das alle Werte im Parameter 'array' enthält, aber in der Reihenfolge sortiert wird.\n\nWenn ein Vergleichsoperator 'function' angegeben wird, muss es sich um eine Funktion handeln, die zwei Parameter benötigt:\n\n` Funktion (links, rechts) `\n\nDiese Funktion wird durch den Sortieralgorithmus aufgerufen, um zwei Werte links und rechts zu vergleichen. Wenn der Wert von links nach dem Wert von rechts in der gewünschten Sortierreihenfolge platziert werden soll, muss die Funktion den Booleschen Wert 'true' zurückgeben, um einen Auslagerungsspeicher anzuzeigen. Andernfalls muss 'false' zurückgegeben werden."
-  },
-  "$reverse" : {
-    "args" : "Array",
-    "desc" : "Gibt ein Array zurück, das alle Werte aus dem Parameter 'array' enthält, aber in umgekehrter Reihenfolge."
-  },
-  "$shuffle" : {
-    "args" : "Array",
-    "desc" : "Gibt ein Array zurück, das alle Werte aus dem Parameter ` array ` enthält, aber in zufälliger Reihenfolge geschattiert ist."
-  },
-  "$zip" : {
-    "args" : "Array, ...",
-    "desc" : "Gibt ein konvolviertes (gezipptes) Array zurück, das gruppierte Arrays von Werten aus den Argumenten ` array1 ` ... ` arrayN ' aus Index 0, 1, 2 ... enthält."
-  },
-  "$keys" : {
-    "args" : "Objekt",
-    "desc" : "Gibt ein Array zurück, das die Schlüssel in dem Objekt enthält. Wenn es sich bei dem Argument um ein Array von Objekten handelt, enthält das zurückgegebene Array eine deduplizierte Liste aller Schlüssel in allen Objekten."
-  },
-  "$lookup" : {
-    "args" : "Objekt, Schlüssel",
-    "desc" : "Gibt den Wert zurück, der dem Schlüssel im Objekt zugeordnet ist. Wenn es sich bei dem ersten Argument um ein Array von Objekten handelt, werden alle Objekte im Array durchsucht, und die Werte, die mit allen Vorkommen des Schlüssels verknüpft sind, werden zurückgegeben."
-  },
-  "$spread" : {
-    "args" : "Objekt",
-    "desc" : "Teilt ein Objekt, das Schlüssel/Wert-Paare enthält, in ein Array von Objekten, von denen jedes ein einzelnes Schlüssel/Wert-Paar aus dem Eingabeobjekt hat. Wenn es sich bei dem Parameter um ein Array von Objekten handelt, enthält die resultierende Feldgruppe ein Objekt für jedes Schlüssel/Wert-Paar in jedem Objekt in der angegebenen Feldgruppe."
-  },
-  "$merge" : {
-    "args" : "array <object>",
-    "desc" : "Mischt ein Array von ` Objekten ` in ein einzelnes ` Objekt `, das alle Schlüssel/Wert-Paare aus jedem der Objekte in dem Eingabe-Array enthält. Wenn eines der Eingabeobjekte denselben Schlüssel enthält, enthält das zurückgegebene Objekt den Wert des letzten Objekts in der Feldgruppe. Es handelt sich um einen Fehler, wenn das Eingabe-Array ein Element enthält, das kein Objekt ist."
-  },
-  "$sift" : {
-    "args" : "Objekt, Funktion",
-    "desc" : "Gibt ein Objekt zurück, das nur die Schlüssel/Wert-Paare aus dem Parameter 'object' enthält, die die Prädikat ` funktion ' erfüllen, die als zweiter Parameter übergeben wird.\n\nDie Funktion ` function `, die als zweiter Parameter angegeben wird, muss die folgende Signatur aufweisen:\n\n` function (value [, key [, object]]) `"
-  },
-  "$each" : {
-    "args" : "Objekt, Funktion",
-    "desc" : "Gibt ein Array zurück, das die Werte enthält, die von der Funktion ` function ` zurückgegeben werden, wenn sie auf jedes Schlüssel/Wert-Paar im ` object ` angewendet werden."
-  },
-  "$map" : {
-    "args" : "Array, Funktion",
-    "desc" : "Gibt ein Array zurück, das die Ergebnisse der Anwendung des Parameters ` function ` auf jeden Wert im Parameter 'array' enthält.\n\nDie Funktion ` function `, die als zweiter Parameter angegeben wird, muss die folgende Signatur aufweisen:\n\n` function (value [, index [, array]]) `"
-  },
-  "$filter" : {
-    "args" : "Array, Funktion",
-    "desc" : "Gibt ein Array zurück, das nur die Werte im Parameter 'array' enthält, die das Prädikat ` funktion ` erfüllen.\n\nDie Funktion ` function `, die als zweiter Parameter angegeben wird, muss die folgende Signatur aufweisen:\n\n` function (value [, index [, array]]) `"
-  },
-  "$reduce" : {
-    "args" : "array, function [, init]",
-    "desc" : "Gibt einen aggregierten Wert zurück, der aus der Anwendung des Parameters ` function 'nacheinander auf jeden Wert in' array ` in Kombination mit dem Ergebnis der vorherigen Anwendung der Funktion angewendet wurde.\n\nDie Funktion muss zwei Argumente akzeptieren und verhält sich wie ein Infix-Operator zwischen jedem Wert innerhalb des ` Array `.\n\nDer optionale Parameter 'init' wird als Anfangswert in der Aggregation verwendet."
-  },
-  "$flowContext" : {
-    "args" : "Zeichenfolge [, Zeichenfolge]",
-    "desc" : "Ruft eine Flusskontexteigenschaft ab.\n\nDies ist eine definierte Funktion vom Typ \"Node-RED\"."
-  },
-  "$globalContext" : {
-    "args" : "Zeichenfolge [, Zeichenfolge]",
-    "desc" : "Ruft eine globale Kontexteigenschaft ab.\n\nDies ist eine definierte Funktion vom Typ \"Node-RED\"."
-  },
-  "$pad" : {
-    "args" : "string, width [, char]",
-    "desc" : "Gibt eine Kopie der ` Zeichenfolge ` mit zusätzlichen Aufenthalten zurück, falls erforderlich, so dass die Gesamtzahl der Zeichen mindestens der absolute Wert des Parameters 'width' ist.\n\nWenn ` width ` eine positive Zahl ist, wird die Zeichenfolge nach rechts aufgefüllt. Wenn sie negativ ist, wird sie nach links geplisften.\n\nDas optionale Argument 'char' gibt die Padding-Zeichen an, die verwendet werden sollen. Wenn keine Angabe gemacht wird, wird standardmäßig der Wert für das Leerzeichen angenommen."
-  },
-  "$fromMillis" : {
-    "args" : "Anzahl",
-    "desc" : "Konvertieren Sie eine Zahl, die Millisekunden seit der Unix-Epoche (1. Januar 1970 (UTC)) enthält in eine Zeitangabe im ISO 8601-Format."
-  },
-  "$formatNumber" : {
-    "args" : "Zahl, Bild [, Optionen]",
-    "desc" : "Transformiere die `Zahl` an eine Zeichenfolge und formatiert sie in eine dezimale Darstellung, wie in der 'Bild' -Zeichenfolge angegeben.\n\n Das Verhalten dieser Funktion ist mit der XPath/XQuery-Funktion fn:formatnummer konsistent, wie sie in der XPath F&O 3.1-Spezifikation definiert ist. Der Parameter für die Bildzeichenfolge definiert, wie die Zahl formatiert ist und hat die gleiche Syntax wie fn:format-number.\n\nDas optionale dritte Argument ` Optionen ` wird verwendet, um die standardmäßigen länderspezifischen Formatierungszeichen, wie z. B. das Dezimaltrennzeichen, zu überschreiben. Wenn dieses Argument angegeben wird, muss es sich um ein Objekt handeln, das Name/Wert-Paare enthält, die im Abschnitt mit dem Dezimalformat der XPath F&O 3.1-Spezifikation angegeben sind."
-  },
-  "$formatBase" : {
-    "args" : "Zahl [, Radix]",
-    "desc" : "Transformiere die `Zahl` in eine Zeichenfolge und formatiert sie in eine ganze Zahl, die in der durch das `radix` -Argument angegebenen Zahlenbasis dargestellt wird. Wenn 'radix' nicht angegeben wird, wird standardmäßig die Basis 10 verwendet. 'radix` kann zwischen 2 und 36 liegen, andernfalls wird ein Fehler ausgelöst."
-  },
-  "$toMillis" : {
-    "args" : "timestamp",
-    "desc" : "Konvertieren Sie eine Zeitangabe im ISO 8601-Format in die Anzahl der Millisekunden seit der Unix-Epoche (1. Januar 1970 (UTC)) als Zahl. Es wird ein Fehler ausgelöst, wenn die Zeichenfolge nicht das richtige Format hat."
-  },
-  "$env" : {
-    "args" : "arg",
-    "desc" : "Gibt den Wert einer Umgebungsvariablen zurück.\n\nDies ist eine definierte Funktion vom Typ \"Node-RED\"."
-  }
-}
+    "$string": {
+        "args": "arg[, prettify]",
+        "desc": "Wandelt `arg` in eine Zeichenfolge um gemäß der folgenden Regeln:\n\n- Zeichenfolgen (string) bleiben unverändert\n- Funktionen werden in eine leere Zeichenfolge konvertiert\n- Numerische Unendlichkeit und NaN lösen einen Fehler aus, da sie nicht als JSON-Zahlenwert dargestellt werden können.\n- Alle anderen Werte werden mit Hilfe der Funktion `JSON.stringify` in eine JSON-Zeichenfolge konvertiert. Wenn `prettify` `true` ist, wird \"prettified\" JSON erzeugt. Z.B. Eine Zeile pro Feld und Zeilen werden eingeschoben basierend auf der Feldtiefe."
+    },
+    "$length": {
+        "args": "str",
+        "desc": "Gibt die Zeichenanzahl von `str` zurück. Es wird ein Fehler ausgelöst, wenn `str` keine Zeichenfolge ist."
+    },
+    "$substring": {
+        "args": "str, start [, length]",
+        "desc": "Gibt eine Teilzeichenfolge zurück, die die Zeichen in `str` beginnend bei Position `start` (Null-Offset) enthält. Wenn `length` vorgegeben ist, enthält die rückgegebene Zeichenfolge maximal die in `length` vorgegebene Zeichenanzahl. Wenn `start` negativ ist, werden die Zeichen vom Ende aus gezählt von `str` zurückgegeben."
+    },
+    "$substringBefore": {
+        "args": "str, chars",
+        "desc": "Gibt die Teilzeichenfolge vor dem ersten Auftreten der Zeichenfolge `chars` in `str` zurück. Falls `str` nicht `chars` enthält, wird `str` zurückgegeben."
+    },
+    "$substringAfter": {
+        "args": "str, chars",
+        "desc": "Gibt die Teilzeichenfolge nach dem ersten Auftreten der Zeichenfolge `chars` in `str` zurück. Falls `str` nicht `chars` enthält, wird `str` zurückgegeben."
+    },
+    "$uppercase": {
+        "args": "str",
+        "desc": "Gibt veränderten `str` zurück, bei dem allen Zeichen in Großbuchstaben umgewandelt wurden."
+    },
+    "$lowercase": {
+        "args": "str",
+        "desc": "Gibt veränderten `str` zurück, bei dem allen Zeichen in Kleinbuchstaben umgewandelt wurden."
+    },
+    "$trim": {
+        "args": "[str]",
+        "desc": "Normalisiert und trimmt alle Leerzeichen in `str` durch Anwenden der folgenden Schritte:\n\n- Alle Tabulatoren, Wagenrückläufe (returns) und Zeilenvorschübe (line feeds) werden durch Leerzeichen ersetzt.\n- Zusammenhängende Folgen von Leerzeichen werden auf ein einzelnes Leerzeichen reduziert.\n- Leerzeichen am Anfang und am Ende werden entfernt.\n\nWenn `str` nicht vorgegeben ist (d.h. diese Funktion wird ohne Parameter aufgerufen), dann wird der Kontextwert als Wert von `str` verwendet. Es wird ein Fehler ausgelöst, wenn `str` keine Zeichenfolge ist."
+    },
+    "$contains": {
+        "args": "str, pattern",
+        "desc": "Gibt `false` zurück, wenn `pattern` als Teilzeichenfolge in `str` enthalten ist, sonst gibt sie `false` zurück. Wenn `str` nicht vorgegeben ist (d. h. Diese Funktion wird mit einem Parameter aufgerufen), dann wird der Kontextwert als Wert von `str` verwendet. `pattern` kann entweder eine Zeichenfolge oder ein regulärer Ausdruck sein."
+    },
+    "$split": {
+        "args": "str [, separator] [, limit]",
+        "desc": "Teilt `str` in einem Array mit Teilzeichenfolgen. Es ergibt einen Fehler, wenn `str` keine Zeichenfolge ist.\n\nDer optionale Parameter `separator` gibt die Zeichen in der `str` an, anhand dem, vorgegeben entweder als Zeichenfolge oder als regulärer Ausdruck, `str` geteilt werden soll. Wenn `separator` nicht vorgegeben wird, wird ein leerer String als `separator` angenommen und `str` wird in ein Array aus einzelnen Zeichen aufgeteilt. Es handelt sich um einen Fehler, wenn `separator` leer ist.\n\nDer optionale Parameter `limit` ist eine Zahl, die die maximale Anzahl von Teilzeichenfolgen angibt, die in dem rückzugebenen Array enthalten sein sollen. Alle zusätzlichen Teilzeichenfolgen werden verworfen. Wenn `limit` nicht vorgegeben wird, wird `str` vollständig geteilt, wobei die Größe des resultierenden Arrays nicht begrenzt ist. Es handelt sich um einen Fehler, wenn `limit` eine negative Zahl ist."
+    },
+    "$join": {
+        "args": "array [, separator]",
+        "desc": "Verkettet ein Array von Zeichenfolgen zu einer einzigen Zeichenfolge, wobei die einzelnen Zeichenfolgen durch den optionalen Trennzeichen-Parameter `separator` getrennt sind. Es ergibt einen Fehler, wenn das `array` ein Element enthält, das keine Zeichenfolge ist. Wenn `separator` nicht vorgegeben wird, wird davon ausgegangen, dass es sich um eine leere Zeichenfolge handelt, d.h. zwischen den einzelnen Zeichenfolgen wird kein Trennzeichen eingefügt. Es handelt sich um einen Fehler, wenn `separator` keine Zeichenfolge ist."
+    },
+    "$match": {
+        "args": "str, pattern [, limit]",
+        "desc": "Wendet den regulären Ausdruck `pattern` auf die Zeichenfolge `str` an und gibt ein Array von Objekten zurück, die Informationen zu jedem Vorkommen von `pattern` in `str` enthält."
+    },
+    "$replace": {
+        "args": "str, pattern, replacement [, limit]",
+        "desc": "Findet Vorkommen von `pattern` in `str` und ersetzt sie durch `replacement`.\n\nDer optionale Parameter `limit` ist die maximale Anzahl an Ersetzungen."
+    },
+    "$now": {
+        "args": "",
+        "desc": "Generiert einen Zeitstempel im ISO-8601-kompatiblen Format und gibt sie als Zeichenfolge zurück."
+    },
+    "$base64encode": {
+        "args": "str",
+        "desc": "Konvertiert eine ASCII-Zeichenfolge `str` in eine Basis-64-Darstellung. Jedes Zeichen in `str` wird als Byte mit binären Daten behandelt. Dies setzt voraus, dass alle Zeichen in der Zeichenfolge im Bereich von 0x00 bis 0xFF liegen, der alle Zeichen in URI-codierten Zeichenfolgen enthält. Unicode-Zeichen außerhalb dieses Bereichs werden nicht unterstützt."
+    },
+    "$base64decode": {
+        "args": "str",
+        "desc": "Konvertiert den Basis-64-codierten `str` in eine Zeichenfolge unter Verwendung einer UTF-8-Unicode-Codepage."
+    },
+    "$number": {
+        "args": "arg",
+        "desc": "Wandelt `arg` unter Verwendung der folgenden Regeln in eine Zahl um:\n\n- Zahlen bleiben unverändert\n- Zeichenfolgen, die eine Folge von Zeichen enthalten, die einen echten JSON-Zahlenwert darstellen, werden in die entsprechende Zahl konvertiert.\n- Alle anderen Werte bewirken, dass ein Fehler ausgelöst wird."
+    },
+    "$abs": {
+        "args": "number",
+        "desc": "Gibt den absoluten Wert von `number` zurück."
+    },
+    "$floor": {
+        "args": "number",
+        "desc": "Gibt `number` abgerundet auf die nächste ganze Zahl zurück, die kleiner oder gleich `number` ist."
+    },
+    "$ceil": {
+        "args": "number",
+        "desc": "Gibt `number` aufgerundet auf die nächste ganze Zahl zurück, die größer oder gleich `number` ist."
+    },
+    "$round": {
+        "args": "number [, precision]",
+        "desc": "Gibt `number` gerundet auf die Anzahl der Nachkommastellen zurück, welche durch den optionalen Parameter `precision` vorgegeben ist."
+    },
+    "$power": {
+        "args": "base, exponent",
+        "desc": "Gibt `base` potenziert mit `exponent` zurück."
+    },
+    "$sqrt": {
+        "args": "number",
+        "desc": "Gibt die Quadratwurzel von `number` zurück."
+    },
+    "$random": {
+        "args": "",
+        "desc": "Gibt eine Pseudozufallszahl größer-gleich null und kleiner als eins zurück."
+    },
+    "$millis": {
+        "args": "",
+        "desc": "Gibt die aktuelle Anzahl der Millisekunden seit Beginn der Unix-Zeitrechnung (1. Januar 1970 UTC) als Zahl zurück. Alle Aufrufe von `$millis()` innerhalb der Auswertung eines Ausdrucks geben alle denselben Wert zurück."
+    },
+    "$sum": {
+        "args": "array",
+        "desc": "Gibt die arithmetische Summe eines `array` von Zahlen zurück. Es ergibt einen Fehler, wenn `array` ein Element enthält, das keine Zahl ist."
+    },
+    "$max": {
+        "args": "array",
+        "desc": "Gibt die größte Zahl von einem `array` von Zahlen zurück. Es ergibt einen Fehler, wenn `array` ein Element enthält, das keine Zahl ist."
+    },
+    "$min": {
+        "args": "array",
+        "desc": "Gibt die kleinste Zahl von einem `array` von Zahlen zurück. Es ergibt einen Fehler, wenn `array` ein Element enthält, das keine Zahl ist."
+    },
+    "$average": {
+        "args": "array",
+        "desc": "Gibt den Mittelwert eines `array` von Zahlen zurück. Es ergibt einen Fehler, wenn `array` ein Element enthält, das keine Zahl ist."
+    },
+    "$boolean": {
+        "args": "arg",
+        "desc": "Wandelt `arg` gemäß folgender Regeln in einen booleschen Wert um:\n\n- `Boolean`: unverändert\n- `string`: leer → `false`, nicht leer → `true`\n- `Zahl`: `0` → `falsch`, Nicht-Null → `true`\n- `null` → `false`\n- `array`: leer → `false`, enthält mindestens ein Element, das `true` ist → `true`, alle Elemente sind `false` → `false`\n- `object`: leer → `false`, nicht leer → `true`\n- `function`: `false`"
+    },
+    "$not": {
+        "args": "arg",
+        "desc": "Gibt den invertierten booleschen Wert von `arg` zurück. `arg` wird zuerst in einen booleschen Wert umgesetzt."
+    },
+    "$exists": {
+        "args": "arg",
+        "desc": "Gibt den booleschen Wert `true` zurück, wenn der Ausdruck `arg` zu einem Wert ausgewertet wird, oder `false`, wenn der Ausdruck nicht mit einem anderen Ausdruck übereinstimmt (z.B. ein Pfad zu einer nicht vorhandenen Feldreferenz)."
+    },
+    "$count": {
+        "args": "array",
+        "desc": "Gibt die Anzahl der Elemente in dem Array `array` zurück."
+    },
+    "$append": {
+        "args": "array, array",
+        "desc": "Verkettet zwei Arrays miteinander."
+    },
+    "$sort": {
+        "args": "array [, function]",
+        "desc": "Gibt ein Array zurück, das alle Elemente vom `array` in sortierter Reihenfolge enthält.\n\nWenn ein Vergleichsoperator `function` vorgegeben wird, muss es sich um eine Funktion handeln, die zwei Parameter benötigt:\n\n`function(left, right)`\n\nDiese Funktion wird durch den Sortieralgorithmus aufgerufen, um zwei Elemente links und rechts zu vergleichen. Wenn das linke Element nach dem rechten in der gewünschten Sortierreihenfolge platziert werden soll, muss die Funktion den booleschen Wert `true` zurückgeben, um eine Vertauschung anzuzeigen. Andernfalls muss `false` zurückgegeben werden."
+    },
+    "$reverse": {
+        "args": "array",
+        "desc": "Gibt ein Array zurück, das alle Elemente vom `array` in umgekehrter Reihenfolge enthält."
+    },
+    "$shuffle": {
+        "args": "array",
+        "desc": "Gibt ein Array zurück, das alle Elemente vom `array` in zufälliger Reihenfolge enthält."
+    },
+    "$zip": {
+        "args": "array, ...",
+        "desc": "Gibt ein gepacktes (geziptes) Array zurück, das gruppierte Arrays der Elemente von `array1` ... `arrayN` aus Index 0, 1, 2 ... enthält."
+    },
+    "$keys": {
+        "args": "object",
+        "desc": "Gibt ein Array zurück, das die Schlüssel in dem Objekt `object` enthält. Wenn es sich bei dem Parameter um ein Array von Objekten handelt, enthält das zurückgegebene Array eine deduplizierte Liste aller Schlüssel in allen Objekten."
+    },
+    "$lookup": {
+        "args": "object, key",
+        "desc": "Gibt den Wert zurück, der dem Schlüssel `key` im Objekt `object` zugeordnet ist. Wenn es sich bei dem ersten Parameter um ein Array von Objekten handelt, werden alle Objekte im Array durchsucht, und die Werte, die mit allen Vorkommen des Schlüssels verknüpft sind, werden zurückgegeben."
+    },
+    "$spread": {
+        "args": "object",
+        "desc": "Teilt ein Objekt `object`, das Schlüssel/Wert-Paare enthält, in ein Array von Objekten, von denen jedes ein einzelnes Schlüssel/Wert-Paar aus dem Eingabeobjekt hat. Wenn es sich bei dem Parameter um ein Array von Objekten handelt, enthält die resultierende Feldgruppe ein Objekt für jedes Schlüssel/Wert-Paar in jedem Objekt in der vorgegebenen Feldgruppe."
+    },
+    "$merge": {
+        "args": "array<object>",
+        "desc": "Fügt ein Array von Objekt-Elementen `object` in ein einzelnes Objekt `object` zusammen, das alle Schlüssel/Wert-Paare aus jedem der Objekte in dem Ausgangs-Array enthält. Wenn eines der Ausgangs-Objekte denselben Schlüssel enthält, enthält das zurückgegebene Objekt den Wert des letzten Objekts des Arrays. Es handelt sich um einen Fehler, wenn das Ausgangs-Array ein Element enthält, das kein Objekt ist."
+    },
+    "$sift": {
+        "args": "object, function",
+        "desc": "Gibt ein Objekt zurück, das nur die Schlüssel/Wert-Paare aus dem Parameter `object` enthält, die die Prädikat `function` erfüllen, die als zweiter Parameter übergeben wird.\n\nDie Funktion `function`, die als zweiter Parameter vorgegeben wird, muss die folgende Signatur aufweisen:\n\n`function(value [, key [, object]])`"
+    },
+    "$each": {
+        "args": "object, function",
+        "desc": "Gibt ein Array zurück, das die Werte enthält, die von der Funktion `function` zurückgegeben werden, wenn sie auf jedes Schlüssel/Wert-Paar im `object` angewendet werden."
+    },
+    "$map": {
+        "args": "array, function",
+        "desc": "Gibt ein Array zurück, das die Ergebnisse von `function`, angewendet auf jedes Element von `array`, enthält.\n\nDie Funktion `function`, die als zweiter Parameter vorgegeben wird, muss die folgende Signatur aufweisen:\n\n`function(value [, index [, array]])`"
+    },
+    "$filter": {
+        "args": "array, function",
+        "desc": "Gibt ein Array zurück, das nur die Elemente von `array` enthält, die das Eigenschaft `function` erfüllen.\n\nDie Funktion `function`, die als zweiter Parameter vorgegeben wird, muss die folgende Signatur aufweisen:\n\n`function(value [, index [, array]])`"
+    },
+    "$reduce": {
+        "args": "array, function [, init]",
+        "desc": "Gibt einen aggregierten Wert zurück, der aus der Anwendung des Parameters `function` nacheinander auf jedes Element in `array` in Kombination mit dem Ergebnis der vorherigen Anwendung der Funktion angewendet wurde.\n\nDie Funktion muss zwei Parameter akzeptieren und verhält sich wie ein Infix-Operator zwischen jedem Element innerhalb des `array`.\n\nDer optionale Parameter `init` wird als Anfangswert in der Aggregation verwendet."
+    },
+    "$flowContext": {
+        "args": "str [, str]",
+        "desc": "Ruft eine Flow-Kontexteigenschaft ab.\n\nDies ist eine definierte Funktion vom Typ `Node-RED`."
+    },
+    "$globalContext": {
+        "args": "str [, str]",
+        "desc": "Ruft eine globale Kontexteigenschaft ab.\n\nDies ist eine definierte Funktion vom Typ `Node-RED`."
+    },
+    "$pad": {
+        "args": "str, width [, char]",
+        "desc": "Gibt eine aufgefüllte Kopie von `str` zurück, so dass (falls erforderlich) die Gesamtzahl der Zeichen mindestens dem absoluten Wert von `width` entspricht.\n\nWenn `width` eine positive Zahl ist, wird die Zeichenfolge nach rechts aufgefüllt. Wenn sie negativ ist, wird sie nach links aufgefüllt.\n\nDer optionale Parameter `char` gibt die Auffüll-Zeichen an, die verwendet werden sollen. Wenn keine Angabe gemacht wird, wird standardmäßig mit Leerzeichen aufgefüllt."
+    },
+    "$fromMillis": {
+        "args": "number",
+        "desc": "Konvertiert `number`, die die Millisekunden seit Beginn der Unix-Zeitrechnung (1. Januar 1970 UTC) enthält, in eine Zeitangabe im ISO 8601-Format."
+    },
+    "$formatNumber": {
+        "args": "number, picture [, options]",
+        "desc": "Wandelt `number` in eine Zeichenfolge um und formatiert sie in eine dezimale Darstellung, wie im `picture`-String-Parameter vorgegeben.\n\nDas Verhalten dieser Funktion ist mit der XPath/XQuery-Funktion fn:formatnummer konsistent, wie sie in der XPath F&O 3.1-Spezifikation definiert ist. Der `picture`-String-Parameter definiert, wie die Zahl formatiert ist und hat die gleiche Syntax wie fn:format-number.\n\nDer optionale dritte Parameter `options` wird verwendet, um die standardmäßigen länderspezifischen Formatierungszeichen, wie z.B. das Dezimaltrennzeichen, zu überschreiben. Wenn dieser Parameter vorgegeben wird, muss es sich um ein Objekt handeln, das Name/Wert-Paare enthält, die im Abschnitt mit dem Dezimalformat der XPath F&O 3.1-Spezifikation vorgegeben sind."
+    },
+    "$formatBase": {
+        "args": "number [, radix]",
+        "desc": "Wandelt `number` in eine Zeichenfolge um und formatiert sie in eine ganze Zahl, die in der durch den `radix`-Parameter vorgegebenen Zahlenbasis dargestellt wird. Wenn `radix` nicht vorgegeben wird, wird standardmäßig die Basis 10 verwendet. `radix` kann zwischen 2 und 36 liegen, andernfalls wird ein Fehler ausgelöst."
+    },
+    "$toMillis": {
+        "args": "timestamp",
+        "desc": "Konvertiert eine Zeitangabe `timestamp` im ISO 8601-Format in die Anzahl der Millisekunden seit Beginn der Unix-Zeitrechnung (1. Januar 1970 UTC). Es wird ein Fehler ausgelöst, wenn die Zeichenfolge nicht das richtige Format hat."
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "Gibt den Wert einer Umgebungsvariablen zurück.\n\nDies ist eine definierte Funktion vom Typ `Node-RED`."
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "Analysiert (parse) und evaluiert den String `expr`, welcher JSON or a JSONata Ausdrücke enthält, unter Benutzung des aktuellen Kontextes für die Evaluierung."
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "Wandelt `number` in eine Zeichenfolge um und formatiert sie in einer Ganzzahl-Darstellung, spezifiziert durch den `picture`-String-Parameter. Der `picture`-String-Parameter definiert, wie die Zahl `number` formatiert werden soll und hat den selben Syntax wie `fn:format-integer` der XPath F&O 3.1 Spezifikation."
+    },
+    "$parseInteger": {
+        "args": "str, picture",
+        "desc": "Wandelt den Inhalt von `str` in eine Ganzzahl `integer` (als JSON Zahl), spezifiziert durch den `picture`-String-Parameter. Der `picture`-String-Parameter hat das selbe Format wie `$formatInteger`."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "Erzeugt eine Fehlermeldung. Der optionale String `str` ersetzt die Standardmeldung `$error() function evaluated`."
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "Wenn `arg` gleich `true` ist, liefert die Function `undefined` zurück. Wenn `arg` gleich `false` ist, wird ein Ausnahmefehler gemeldet mit dem String_Parameter `str` als Meldetext."
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "Gibt ein einziges Element aus `array` zurück, welches die Bedingung `function` erfüllt (d.h. die Funktion `function` gibt den booleschen Wert `true` zurück, wenn das Element übergeben werden soll). Sie meldet einen Ausnahmefehler, wenn die Anzahl der Elemente mit erfüllter Bedingung (`function` ist `true`) nicht genau eins ist.\n\nDie Funktion `function` sollte in der folgenden Art vorgegeben werden: `function(value [, index [, array]])` wobei `value` für jedes Element des Arrays gilt, `index` ist die Position dieses Elements und das gesamte Array `array` wird als dritter Parameter übergeben."
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Kodiert eine URL-Komponente (Uniform Resource Locator), indem jedes Vorkommen bestimmter Zeichen durch eine, zwei, drei oder vier Escape-Sequenzen ersetzt wird, die die UTF-8-Kodierung des Zeichens darstellen.\n\nBeispiel: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Kodiert eine URL (Uniform Resource Locator), indem jedes Vorkommen bestimmter Zeichen durch eine, zwei, drei oder vier Escape-Sequenzen ersetzt wird, die die UTF-8-Kodierung des Zeichens darstellen.\n\nBeispiel: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "Dekodiert eine URL-Komponente (Uniform Resource Locator) zuvor erzeugt von encodeUrlComponent.\n\nBeispiel: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "Dekodiert eine URL (Uniform Resource Locator) zuvor erzeugt von encodeUrl.\n\nBeispiel: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "Liefert ein `array` zurück, bei dem doppelte Elemente entfernt wurden."
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Liefert den Typ von `value` als String. When `value` undefiniert ist, wird `undefined` zurückgeliefert."
+    },
+    "$moment": {
+        "args": "[str]",
+        "desc": "Liefert ein `date` Objekt unter Benutzung der Moment Library."
+    }
+}

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -3,7 +3,7 @@
         "label": {
             "name": "Name",
             "ok": "Ok",
-            "done":"Done",
+            "done": "Done",
             "cancel": "Cancel",
             "delete": "Delete",
             "close": "Close",
@@ -22,7 +22,8 @@
             "color": "Color",
             "position": "Position",
             "enable": "Enable",
-            "disable": "Disable"
+            "disable": "Disable",
+            "upload": "Upload"
         },
         "type": {
             "string": "string",
@@ -37,11 +38,14 @@
         }
     },
     "event": {
+        "loadPlugins": "Loading Plugins",
         "loadPalette": "Loading Palette",
         "loadNodeCatalogs": "Loading Node catalogs",
         "loadNodes": "Loading Nodes __count__",
         "loadFlows": "Loading Flows",
-        "importFlows": "Adding Flows to workspace"
+        "importFlows": "Adding Flows to workspace",
+        "importError": "<p>Error adding flows</p><p>__message__</p>",
+        "loadingProject": "Loading project"
     },
     "workspace": {
         "defaultName": "Flow __number__",
@@ -49,11 +53,20 @@
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
-        "addFlow": "Add Flow",
-        "listFlows": "List Flows",
+        "addFlow": "Add flow",
+        "addFlowToRight": "Add flow to the right",
+        "hideFlow": "Hide flow",
+        "hideOtherFlows": "Hide other flows",
+        "showAllFlows": "Show all flows",
+        "hideAllFlows": "Hide all flows",
+        "hiddenFlows": "List __count__ hidden flow",
+        "hiddenFlows_plural": "List __count__ hidden flows",
+        "showLastHiddenFlow": "Show last hidden flow",
+        "listFlows": "List flows",
+        "listSubflows": "List subflows",
         "status": "Status",
         "enabled": "Enabled",
-        "disabled":"Disabled",
+        "disabled": "Disabled",
         "info": "Description",
         "selectNodes": "Click nodes to select"
     },
@@ -62,6 +75,8 @@
             "view": {
                 "view": "View",
                 "grid": "Grid",
+                "storeZoom": "Restore zoom level on load",
+                "storePosition": "Restore scroll position on load",
                 "showGrid": "Show grid",
                 "snapGrid": "Snap to grid",
                 "gridSize": "Grid size",
@@ -79,6 +94,7 @@
             "palette": {
                 "show": "Show palette"
             },
+            "edit": "Edit",
             "settings": "Settings",
             "userSettings": "User Settings",
             "nodes": "Nodes",
@@ -98,27 +114,46 @@
             "keyboardShortcuts": "Keyboard shortcuts",
             "login": "Login",
             "logout": "Logout",
-            "editPalette":"Manage palette",
+            "editPalette": "Manage palette",
             "other": "Other",
             "showTips": "Show tips",
+            "showWelcomeTours": "Show guided tours for new versions",
             "help": "Node-RED website",
             "projects": "Projects",
             "projects-new": "New",
             "projects-open": "Open",
             "projects-settings": "Project Settings",
             "showNodeLabelDefault": "Show label of newly added nodes",
+            "codeEditor": "Code Editor",
             "groups": "Groups",
             "groupSelection": "Group selection",
             "ungroupSelection": "Ungroup selection",
             "groupMergeSelection": "Merge selection",
-            "groupRemoveSelection": "Remove from group"
+            "groupRemoveSelection": "Remove from group",
+            "arrange": "Arrange",
+            "alignLeft": "Align to left",
+            "alignCenter": "Align to center",
+            "alignRight": "Align to right",
+            "alignTop": "Align to top",
+            "alignMiddle": "Align to middle",
+            "alignBottom": "Align to bottom",
+            "distributeHorizontally": "Distribute horizontally",
+            "distributeVertically": "Distribute vertically",
+            "moveToBack": "Move to back",
+            "moveToFront": "Move to front",
+            "moveBackwards": "Move backwards",
+            "moveForwards": "Move forwards"
         }
     },
     "actions": {
         "toggle-navigator": "Toggle navigator",
         "zoom-out": "Zoom out",
         "zoom-reset": "Reset zoom",
-        "zoom-in": "Zoom in"
+        "zoom-in": "Zoom in",
+        "search-flows": "Search flows",
+        "search-prev": "Previous",
+        "search-next": "Next",
+        "search-counter": "\"__term__\" __result__ of __count__"
     },
     "user": {
         "loggedInAs": "Logged in as __name__",
@@ -134,16 +169,21 @@
         }
     },
     "notification": {
+        "state": {
+            "flowsStopped": "Flows stopped",
+            "flowsStarted": "Flows started"
+        },
         "warning": "<strong>Warning</strong>: __message__",
         "warnings": {
             "undeployedChanges": "node has undeployed changes",
             "nodeActionDisabled": "node actions disabled",
             "nodeActionDisabledSubflow": "node actions disabled within subflow",
             "missing-types": "<p>Flows stopped due to missing node types.</p>",
-            "safe-mode":"<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
+            "missing-modules": "<p>Flows stopped due to missing modules.</p>",
+            "safe-mode": "<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
             "restartRequired": "Node-RED must be restarted to enable upgraded modules",
             "credentials_load_failed": "<p>Flows stopped as the credentials could not be decrypted.</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p>",
-            "credentials_load_failed_reset":"<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
+            "credentials_load_failed_reset": "<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
             "missing_flow_file": "<p>Project flow file not found.</p><p>The project is not configured with a flow file.</p>",
             "missing_package_file": "<p>Project package file not found.</p><p>The project is missing a package.json file.</p>",
             "project_empty": "<p>The project is empty.</p><p>Do you want to create a default set of project files?<br/>Otherwise, you will have to manually add files to the project outside of the editor.</p>",
@@ -181,7 +221,8 @@
             "create-default-package": "Create default package file",
             "no-thanks": "No thanks",
             "create-default-project": "Create default project files",
-            "show-merge-conflicts": "Show merge conflicts"
+            "show-merge-conflicts": "Show merge conflicts",
+            "unknownNodesButton": "Search for unknown nodes"
         }
     },
     "clipboard": {
@@ -197,6 +238,8 @@
         "flow_plural": "__count__ flows",
         "subflow": "__count__ subflow",
         "subflow_plural": "__count__ subflows",
+        "replacedNodes": "__count__ node replaced",
+        "replacedNodes_plural": "__count__ nodes replaced",
         "pasteNodes": "Paste flow json or",
         "selectFile": "select a file to import",
         "importNodes": "Import nodes",
@@ -204,6 +247,8 @@
         "download": "Download",
         "importUnrecognised": "Imported unrecognised type:",
         "importUnrecognised_plural": "Imported unrecognised types:",
+        "importDuplicate": "Imported duplicate node:",
+        "importDuplicate_plural": "Imported duplicate nodes:",
         "nodesExported": "Nodes exported to clipboard",
         "nodesImported": "Imported:",
         "nodeCopied": "__count__ node copied",
@@ -212,12 +257,15 @@
         "groupCopied_plural": "__count__ groups copied",
         "groupStyleCopied": "Group style copied",
         "invalidFlow": "Invalid flow: __message__",
+        "recoveredNodes": "Recovered Nodes",
+        "recoveredNodesInfo": "The nodes on this flow were missing a valid flow id when they were imported. They have been added to this flow so you can either restore or delete them.",
+        "recoveredNodesNotification": "<p>Imported nodes without a valid flow id</p><p>They have been added to a new flow called '__flowName__'.</p>",
         "export": {
-            "selected":"selected nodes",
-            "current":"current flow",
-            "all":"all flows",
-            "compact":"compact",
-            "formatted":"formatted",
+            "selected": "selected nodes",
+            "current": "current flow",
+            "all": "all flows",
+            "compact": "compact",
+            "formatted": "formatted",
             "copy": "Copy to clipboard",
             "export": "Export to library",
             "exportAs": "Export as",
@@ -226,13 +274,19 @@
         },
         "import": {
             "import": "Import to",
+            "importSelected": "Import selected",
+            "importCopy": "Import copy",
+            "viewNodes": "View nodes...",
             "newFlow": "new flow",
+            "replace": "replace",
             "errors": {
                 "notArray": "Input not a JSON Array",
                 "itemNotObject": "Input not a valid flow - item __index__ not a node object",
                 "missingId": "Input not a valid flow - item __index__ missing 'id' property",
                 "missingType": "Input not a valid flow - item __index__ missing 'type' property"
-            }
+            },
+            "conflictNotification1": "Some of the nodes you are importing already exist in your workspace.",
+            "conflictNotification2": "Select which nodes to import and whether to replace the existing nodes, or to import a copy of them."
         },
         "copyMessagePath": "Path copied",
         "copyMessageValue": "Value copied",
@@ -246,13 +300,19 @@
         "modifiedFlowsDesc": "Only deploys flows that contain changed nodes",
         "modifiedNodes": "Modified Nodes",
         "modifiedNodesDesc": "Only deploys nodes that have changed",
+        "startFlows": "Start",
+        "startFlowsDesc": "Start Flows",
+        "stopFlows": "Stop",
+        "stopFlowsDesc": "Stop Flows",
         "restartFlows": "Restart Flows",
         "restartFlowsDesc": "Restarts the current deployed flows",
         "successfulDeploy": "Successfully deployed",
         "successfulRestart": "Successfully restarted flows",
         "deployFailed": "Deploy failed: __message__",
-        "unusedConfigNodes":"You have some unused configuration nodes.",
-        "unusedConfigNodesLink":"Click here to see them",
+        "unusedConfigNodes": "You have some unused configuration nodes.",
+        "unusedConfigNodesButton": "Search unused config nodes",
+        "unknownNodesButton": "Search for unknown nodes",
+        "invalidNodesButton": "Search for invalid nodes",
         "errors": {
             "noResponse": "no response from server"
         },
@@ -299,8 +359,8 @@
         },
         "nodeCount": "__count__ node",
         "nodeCount_plural": "__count__ nodes",
-        "local":"Local changes",
-        "remote":"Remote changes",
+        "local": "Local changes",
+        "remote": "Remote changes",
         "reviewChanges": "Review Changes",
         "noBinaryFileShowed": "Cannot show binary file contents",
         "viewCommitDiff": "View Commit Changes",
@@ -322,8 +382,21 @@
         "output": "outputs:",
         "status": "status node",
         "deleteSubflow": "delete subflow",
+        "confirmDelete": "Are you sure you want to delete this subflow?",
         "info": "Description",
         "category": "Category",
+        "module": "Module",
+        "license": "License",
+        "licenseNone": "none",
+        "licenseOther": "Other",
+        "type": "Node Type",
+        "version": "Version",
+        "versionPlaceholder": "x.y.z",
+        "keys": "Keywords",
+        "keysPlaceholder": "Comma-separated keywords",
+        "author": "Author",
+        "authorPlaceholder": "Your Name <email@example.com>",
+        "desc": "Description",
         "env": {
             "restore": "Restore to subflow default",
             "remove": "Remove environment variable"
@@ -370,7 +443,8 @@
         "icon": "Icon",
         "inputType": "Input type",
         "selectType": "select types...",
-        "inputs" : {
+        "loadCredentials": "Loading node credentials",
+        "inputs": {
             "input": "input",
             "select": "select",
             "checkbox": "checkbox",
@@ -404,7 +478,8 @@
         },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
-            "invalidProperties": "Invalid properties:"
+            "invalidProperties": "Invalid properties:",
+            "credentialLoadFailed": "Failed to load node credentials"
         }
     },
     "keyboard": {
@@ -416,8 +491,9 @@
         "unassigned": "Unassigned",
         "global": "global",
         "workspace": "workspace",
-        "selectAll": "Select all nodes",
-        "selectAllConnected": "Select all connected nodes",
+        "selectAll": "Select all",
+        "selectNone": "Select none",
+        "selectAllConnected": "Select connected",
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
         "deleteSelected": "Delete selected nodes or link",
@@ -430,10 +506,14 @@
         "copyNode": "Copy selected nodes",
         "cutNode": "Cut selected nodes",
         "pasteNode": "Paste nodes",
-        "undoChange": "Undo the last change performed",
+        "copyGroupStyle": "Copy group style",
+        "pasteGroupStyle": "Paste group style",
+        "undoChange": "Undo",
+        "redoChange": "Redo",
         "searchBox": "Open search box",
         "managePalette": "Manage palette",
-        "actionList":"Action list"
+        "actionList": "Action list",
+        "splitWireWithLinks": "Split selection with Link nodes"
     },
     "library": {
         "library": "Library",
@@ -485,7 +565,8 @@
             "nodeEnabled_plural": "Nodes enabled:",
             "nodeDisabled": "Node disabled:",
             "nodeDisabled_plural": "Nodes disabled:",
-            "nodeUpgraded": "Node module __module__ upgraded to version __version__"
+            "nodeUpgraded": "Node module __module__ upgraded to version __version__",
+            "unknownNodeRegistered": "Error loading node: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "Manage palette",
@@ -532,6 +613,8 @@
             "sortAZ": "a-z",
             "sortRecent": "recent",
             "more": "+ __count__ more",
+            "upload": "Upload module tgz file",
+            "refresh": "Refresh module list",
             "errors": {
                 "catalogLoadFailed": "<p>Failed to load node catalogue.</p><p>Check the browser console for more information</p>",
                 "installFailed": "<p>Failed to install: __module__</p><p>__message__</p><p>Check the log for more information</p>",
@@ -542,19 +625,19 @@
             },
             "confirm": {
                 "install": {
-                    "body":"<p>Installing '__module__'</p><p>Before installing, please read the node's documentation. Some nodes have dependencies that cannot be automatically resolved and can require a restart of Node-RED.</p>",
+                    "body": "<p>Installing '__module__'</p><p>Before installing, please read the node's documentation. Some nodes have dependencies that cannot be automatically resolved and can require a restart of Node-RED.</p>",
                     "title": "Install nodes"
                 },
                 "remove": {
-                    "body":"<p>Removing '__module__'</p><p>Removing the node will uninstall it from Node-RED. The node may continue to use resources until Node-RED is restarted.</p>",
+                    "body": "<p>Removing '__module__'</p><p>Removing the node will uninstall it from Node-RED. The node may continue to use resources until Node-RED is restarted.</p>",
                     "title": "Remove nodes"
                 },
                 "update": {
-                    "body":"<p>Updating '__module__'</p><p>Updating the node will require a restart of Node-RED to complete the update. This must be done manually.</p>",
+                    "body": "<p>Updating '__module__'</p><p>Updating the node will require a restart of Node-RED to complete the update. This must be done manually.</p>",
                     "title": "Update nodes"
                 },
                 "cannotUpdate": {
-                    "body":"An update for this node is available, but it is not installed in a location that the palette manager can update.<br/><br/>Please refer to the documentation for how to update this node."
+                    "body": "An update for this node is available, but it is not installed in a location that the palette manager can update.<br/><br/>Please refer to the documentation for how to update this node."
                 },
                 "button": {
                     "review": "Open node information",
@@ -588,26 +671,19 @@
             "showMore": "show more",
             "showLess": "show less",
             "flow": "Flow",
-            "selection":"Selection",
-            "nodes":"__count__ nodes",
+            "selection": "Selection",
+            "nodes": "__count__ nodes",
             "flowDesc": "Flow Description",
             "subflowDesc": "Subflow Description",
             "nodeHelp": "Node Help",
-            "none":"None",
+            "none": "None",
             "arrayItems": "__count__ items",
-            "showTips":"You can open the tips from the settings panel",
+            "showTips": "You can open the tips from the settings panel",
             "outline": "Outline",
             "empty": "empty",
             "globalConfig": "Global Configuration Nodes",
             "triggerAction": "Trigger action",
-            "find": "Find in workspace",
-            "search": {
-                "configNodes": "Configuration nodes",
-                "unusedConfigNodes": "Unused configuration nodes",
-                "invalidNodes": "Invalid nodes",
-                "uknownNodes": "Unknown nodes",
-                "unusedSubflows": "Unused subflows"
-            }
+            "find": "Find in workspace"
         },
         "help": {
             "name": "Help",
@@ -617,7 +693,8 @@
             "showHelp": "Show help",
             "showInOutline": "Show in outline",
             "showTopics": "Show topics",
-            "noHelp": "No help topic selected"
+            "noHelp": "No help topic selected",
+            "changeLog": "Change Log"
         },
         "config": {
             "name": "Configuration nodes",
@@ -633,8 +710,8 @@
             "filtered": "__count__ hidden"
         },
         "context": {
-            "name":"Context Data",
-            "label":"context",
+            "name": "Context Data",
+            "label": "context",
             "none": "none selected",
             "refresh": "refresh to load",
             "empty": "empty",
@@ -672,9 +749,9 @@
                 "files": "Files",
                 "flow": "Flow",
                 "credentials": "Credentials",
-                "package":"Package",
-                "packageCreate":"File will be created when changes are saved",
-                "fileNotExist":"File does not exist",
+                "package": "Package",
+                "packageCreate": "File will be created when changes are saved",
+                "fileNotExist": "File does not exist",
                 "selectFile": "Select File",
                 "invalidEncryptionKey": "Invalid encryption key",
                 "encryptionEnabled": "Encryption enabled",
@@ -708,6 +785,12 @@
                 "committerTip": "Leave blank to use system default",
                 "userName": "Username",
                 "email": "Email",
+                "workflow": "Workflow",
+                "workfowTip": "Choose your preferred git workflow",
+                "workflowManual": "Manual",
+                "workflowManualTip": "All changes must be manually committed under the 'history' sidebar",
+                "workflowAuto": "Automatic",
+                "workflowAutoTip": "Changes are committed automatically with every deploy",
                 "sshKeys": "SSH Keys",
                 "sshKeysTip": "Allows you to create secure connections to remote git repositories.",
                 "add": "add key",
@@ -818,11 +901,24 @@
         }
     },
     "editableList": {
-        "add": "add"
+        "add": "add",
+        "addTitle": "add an item"
     },
     "search": {
+        "history": "Search history",
+        "clear": "clear all",
         "empty": "No matches found",
-        "addNode": "add a node..."
+        "addNode": "add a node...",
+        "options": {
+            "configNodes": "Configuration nodes",
+            "unusedConfigNodes": "Unused configuration nodes",
+            "invalidNodes": "Invalid nodes",
+            "uknownNodes": "Unknown nodes",
+            "unusedSubflows": "Unused subflows",
+            "hiddenFlows": "Hidden flows",
+            "modifiedNodes": "Modified nodes and flows",
+            "thisFlow": "Current flow"
+        }
     },
     "expressionEditor": {
         "functions": "Functions",
@@ -843,6 +939,9 @@
             "eval": "Error evaluating expression:\n  __message__"
         }
     },
+    "monaco": {
+        "setTheme": "Set theme"
+    },
     "jsEditor": {
         "title": "JavaScript editor"
     },
@@ -854,6 +953,8 @@
         "format": "format JSON",
         "rawMode": "Edit JSON",
         "uiMode": "Visual editor",
+        "rawMode-readonly": "JSON",
+        "uiMode-readonly": "Visual",
         "insertAbove": "Insert above",
         "insertBelow": "Insert below",
         "addItem": "Add item",
@@ -886,7 +987,7 @@
         "title": "Buffer editor",
         "modeString": "Handle as UTF-8 String",
         "modeArray": "Handle as JSON array",
-        "modeDesc":"<h3>Buffer editor</h3><p>The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.</p><p>For example, a value of <code>Hello World</code> will be converted to the JSON array:<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+        "modeDesc": "<h3>Buffer editor</h3><p>The Buffer type is stored as a JSON array of byte values. The editor will attempt to parse the entered value as a JSON array. If it is not valid JSON, it will be treated as a UTF-8 String and converted to an array of the individual character code points.</p><p>For example, a value of <code>Hello World</code> will be converted to the JSON array:<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
     },
     "projects": {
         "config-git": "Configure Git client",
@@ -1015,7 +1116,8 @@
             "not-git": "Not a git repository",
             "no-resource": "Repository not found",
             "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
-            "unexpected_error": "unexpected_error"
+            "unexpected_error": "unexpected_error",
+            "clearContext": "Clear context when switching projects"
         },
         "delete": {
             "confirm": "Are you sure you want to delete this project?"
@@ -1047,7 +1149,7 @@
             "no-empty": "Cannot create default file set on a non-empty project",
             "git-error": "git error"
         },
-        "errors" : {
+        "errors": {
             "no-username-email": "Your Git client is not configured with a username/email.",
             "unexpected": "An unexpected error occurred",
             "code": "code"
@@ -1056,17 +1158,50 @@
     "editor-tab": {
         "properties": "Properties",
         "envProperties": "Environment Variables",
+        "module": "Module Properties",
         "description": "Description",
         "appearance": "Appearance",
         "preview": "UI Preview",
         "defaultValue": "Default value"
     },
-    "languages" : {
+    "tourGuide": {
+        "takeATour": "Take a tour",
+        "start": "Start",
+        "next": "Next",
+        "welcomeTours": "Welcome Tours"
+    },
+    "diagnostics": {
+        "title": "System Info"
+    },
+    "languages": {
         "de": "German",
         "en-US": "English",
         "ja": "Japanese",
         "ko": "Korean",
+        "ru": "Russian",
         "zh-CN": "Chinese(Simplified)",
         "zh-TW": "Chinese(Traditional)"
+    },
+    "validator": {
+        "errors": {
+            "invalid-json": "Invalid JSON data: __error__",
+            "invalid-json-prop": "__prop__: invalid JSON data: __error__",
+            "invalid-prop": "Invalid property expression",
+            "invalid-prop-prop": "__prop__: invalid property expression",
+            "invalid-num": "Invalid number",
+            "invalid-num-prop": "__prop__: invalid number",
+            "invalid-regexp": "Invalid input pattern",
+            "invalid-regex-prop": "__prop__: invalid input pattern",
+            "missing-required-prop": "__prop__: property value missing",
+            "invalid-config": "__prop__: invalid configuration node",
+            "missing-config": "__prop__: missing configuration node",
+            "validation-error": "__prop__: validation error: __node__, __id__: __error__"
+        }
+    },
+    "contextMenu": {
+        "insert": "Insert",
+        "node": "Node",
+        "junction": "Junction",
+        "linkNodes": "Link Nodes"
     }
 }

packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json

@@ -1,23 +1,23 @@
 {
     "info": {
-        "tip0" : "You can remove the selected nodes or links with {{core:delete-selection}}",
-        "tip1" : "Search for nodes using {{core:search}}",
-        "tip2" : "{{core:toggle-sidebar}} will toggle the view of this sidebar",
-        "tip3" : "You can manage your palette of nodes with {{core:manage-palette}}",
-        "tip4" : "Your flow configuration nodes are listed in the sidebar panel. It can be accessed from the menu or with {{core:show-config-tab}}",
-        "tip5" : "Enable or disable these tips from the option in the settings",
-        "tip6" : "Move the selected nodes using the [left] [up] [down] and [right] keys. Hold [shift] to nudge them further",
-        "tip7" : "Dragging a node onto a wire will splice it into the link",
-        "tip8" : "Export the selected nodes, or the current tab with {{core:show-export-dialog}}",
-        "tip9" : "Import a flow by dragging its JSON into the editor, or with {{core:show-import-dialog}}",
-        "tip10" : "[shift] [click] and drag on a node port to move all of the attached wires or just the selected one",
-        "tip11" : "Show the Info tab with {{core:show-info-tab}} or the Debug tab with {{core:show-debug-tab}}",
-        "tip12" : "[ctrl] [click] in the workspace to open the quick-add dialog",
-        "tip13" : "Hold down [ctrl] when you [click] on a node port to enable quick-wiring",
-        "tip14" : "Hold down [shift] when you [click] on a node to also select all of its connected nodes",
-        "tip15" : "Hold down [ctrl] when you [click] on a node to add or remove it from the current selection",
-        "tip16" : "Switch flow tabs with {{core:show-previous-tab}} and {{core:show-next-tab}}",
-        "tip17" : "You can confirm your changes in the node edit tray with {{core:confirm-edit-tray}} or cancel them with {{core:cancel-edit-tray}}",
-        "tip18" : "Pressing {{core:edit-selected-node}} will edit the first node in the current selection"
+        "tip0": "You can remove the selected nodes or links with {{core:delete-selection}}",
+        "tip1": "Search for nodes using {{core:search}}",
+        "tip2": "{{core:toggle-sidebar}} will toggle the view of this sidebar",
+        "tip3": "You can manage your palette of nodes with {{core:manage-palette}}",
+        "tip4": "Your flow configuration nodes are listed in the sidebar panel. It can be accessed from the menu or with {{core:show-config-tab}}",
+        "tip5": "Enable or disable these tips from the option in the settings",
+        "tip6": "Move the selected nodes using the [left] [up] [down] and [right] keys. Hold [shift] to nudge them further",
+        "tip7": "Dragging a node onto a wire will splice it into the link",
+        "tip8": "Export the selected nodes, or the current tab with {{core:show-export-dialog}}",
+        "tip9": "Import a flow by dragging its JSON into the editor, or with {{core:show-import-dialog}}",
+        "tip10": "[shift] [click] and drag on a node port to move all of the attached wires or just the selected one",
+        "tip11": "Show the Info tab with {{core:show-info-tab}} or the Debug tab with {{core:show-debug-tab}}",
+        "tip12": "[ctrl] [click] in the workspace to open the quick-add dialog",
+        "tip13": "Hold down [ctrl] when you [click] on a node port to enable quick-wiring",
+        "tip14": "Hold down [shift] when you [click] on a node to also select all of its connected nodes",
+        "tip15": "Hold down [ctrl] when you [click] on a node to add or remove it from the current selection",
+        "tip16": "Switch flow tabs with {{core:show-previous-tab}} and {{core:show-next-tab}}",
+        "tip17": "You can confirm your changes in the node edit tray with {{core:confirm-edit-tray}} or cancel them with {{core:cancel-edit-tray}}",
+        "tip18": "Pressing {{core:edit-selected-node}} will edit the first node in the current selection"
     }
 }

packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json

@@ -52,52 +52,52 @@
         "desc": "Finds occurrences of `pattern` within `str` and replaces them with `replacement`.\n\nThe optional `limit` parameter is the maximum number of replacements."
     },
     "$now": {
-        "args":"",
-        "desc":"Generates a timestamp in ISO 8601 compatible format and returns it as a string."
+        "args": "$[picture [, timezone]]",
+        "desc": "Generates a timestamp in ISO 8601 compatible format and returns it as a string. If the optional picture and timezone parameters are supplied, then the current timestamp is formatted as described by the `$fromMillis()` function"
     },
     "$base64encode": {
-        "args":"string",
-        "desc":"Converts an ASCII string to a base 64 representation. Each character in the string is treated as a byte of binary data. This requires that all characters in the string are in the 0x00 to 0xFF range, which includes all characters in URI encoded strings. Unicode characters outside of that range are not supported."
+        "args": "string",
+        "desc": "Converts an ASCII string to a base 64 representation. Each character in the string is treated as a byte of binary data. This requires that all characters in the string are in the 0x00 to 0xFF range, which includes all characters in URI encoded strings. Unicode characters outside of that range are not supported."
     },
     "$base64decode": {
-        "args":"string",
-        "desc":"Converts base 64 encoded bytes to a string, using a UTF-8 Unicode codepage."
+        "args": "string",
+        "desc": "Converts base 64 encoded bytes to a string, using a UTF-8 Unicode codepage."
     },
     "$number": {
         "args": "arg",
         "desc": "Casts the `arg` parameter to a number using the following casting rules:\n\n - Numbers are unchanged\n - Strings that contain a sequence of characters that represent a legal JSON number are converted to that number\n - All other values cause an error to be thrown."
     },
     "$abs": {
-        "args":"number",
-        "desc":"Returns the absolute value of the `number` parameter."
+        "args": "number",
+        "desc": "Returns the absolute value of the `number` parameter."
     },
     "$floor": {
-        "args":"number",
-        "desc":"Returns the value of `number` rounded down to the nearest integer that is smaller or equal to `number`."
+        "args": "number",
+        "desc": "Returns the value of `number` rounded down to the nearest integer that is smaller or equal to `number`."
     },
     "$ceil": {
-        "args":"number",
-        "desc":"Returns the value of `number` rounded up to the nearest integer that is greater than or equal to `number`."
+        "args": "number",
+        "desc": "Returns the value of `number` rounded up to the nearest integer that is greater than or equal to `number`."
     },
     "$round": {
-        "args":"number [, precision]",
-        "desc":"Returns the value of the `number` parameter rounded to the number of decimal places specified by the optional `precision` parameter."
+        "args": "number [, precision]",
+        "desc": "Returns the value of the `number` parameter rounded to the number of decimal places specified by the optional `precision` parameter."
     },
     "$power": {
-        "args":"base, exponent",
-        "desc":"Returns the value of `base` raised to the power of `exponent`."
+        "args": "base, exponent",
+        "desc": "Returns the value of `base` raised to the power of `exponent`."
     },
     "$sqrt": {
-        "args":"number",
-        "desc":"Returns the square root of the value of the `number` parameter."
+        "args": "number",
+        "desc": "Returns the square root of the value of the `number` parameter."
     },
     "$random": {
-        "args":"",
-        "desc":"Returns a pseudo random number greater than or equal to zero and less than one."
+        "args": "",
+        "desc": "Returns a pseudo random number greater than or equal to zero and less than one."
     },
     "$millis": {
-        "args":"",
-        "desc":"Returns the number of milliseconds since the Unix Epoch (1 January, 1970 UTC) as a number. All invocations of `$millis()` within an evaluation of an expression will all return the same value."
+        "args": "",
+        "desc": "Returns the number of milliseconds since the Unix Epoch (1 January, 1970 UTC) as a number. All invocations of `$millis()` within an evaluation of an expression will all return the same value."
     },
     "$sum": {
         "args": "array",
@@ -136,20 +136,20 @@
         "desc": "Appends two arrays"
     },
     "$sort": {
-        "args":"array [, function]",
-        "desc":"Returns an array containing all the values in the `array` parameter, but sorted into order.\n\nIf a comparator `function` is supplied, then it must be a function that takes two parameters:\n\n`function(left, right)`\n\nThis function gets invoked by the sorting algorithm to compare two values left and right. If the value of left should be placed after the value of right in the desired sort order, then the function must return Boolean `true` to indicate a swap. Otherwise it must return `false`."
+        "args": "array [, function]",
+        "desc": "Returns an array containing all the values in the `array` parameter, but sorted into order.\n\nIf a comparator `function` is supplied, then it must be a function that takes two parameters:\n\n`function(left, right)`\n\nThis function gets invoked by the sorting algorithm to compare two values left and right. If the value of left should be placed after the value of right in the desired sort order, then the function must return Boolean `true` to indicate a swap. Otherwise it must return `false`."
     },
     "$reverse": {
-        "args":"array",
-        "desc":"Returns an array containing all the values from the `array` parameter, but in reverse order."
+        "args": "array",
+        "desc": "Returns an array containing all the values from the `array` parameter, but in reverse order."
     },
     "$shuffle": {
-        "args":"array",
-        "desc":"Returns an array containing all the values from the `array` parameter, but shuffled into random order."
+        "args": "array",
+        "desc": "Returns an array containing all the values from the `array` parameter, but shuffled into random order."
     },
     "$zip": {
-        "args":"array, ...",
-        "desc":"Returns a convolved (zipped) array containing grouped arrays of values from the `array1` … `arrayN` arguments from index 0, 1, 2...."
+        "args": "array, ...",
+        "desc": "Returns a convolved (zipped) array containing grouped arrays of values from the `array1` … `arrayN` arguments from index 0, 1, 2...."
     },
     "$keys": {
         "args": "object",
@@ -168,24 +168,24 @@
         "desc": "Merges an array of `objects` into a single `object` containing all the key/value pairs from each of the objects in the input array. If any of the input objects contain the same key, then the returned `object` will contain the value of the last one in the array. It is an error if the input array contains an item that is not an object."
     },
     "$sift": {
-        "args":"object, function",
-        "desc":"Returns an object that contains only the key/value pairs from the `object` parameter that satisfy the predicate `function` passed in as the second parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, key [, object]])`"
+        "args": "object, function",
+        "desc": "Returns an object that contains only the key/value pairs from the `object` parameter that satisfy the predicate `function` passed in as the second parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, key [, object]])`"
     },
     "$each": {
-        "args":"object, function",
-        "desc":"Returns an array containing the values return by the `function` when applied to each key/value pair in the `object`."
+        "args": "object, function",
+        "desc": "Returns an array containing the values return by the `function` when applied to each key/value pair in the `object`."
     },
     "$map": {
-        "args":"array, function",
-        "desc":"Returns an array containing the results of applying the `function` parameter to each value in the `array` parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
+        "args": "array, function",
+        "desc": "Returns an array containing the results of applying the `function` parameter to each value in the `array` parameter.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
     },
     "$filter": {
-        "args":"array, function",
-        "desc":"Returns an array containing only the values in the `array` parameter that satisfy the `function` predicate.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
+        "args": "array, function",
+        "desc": "Returns an array containing only the values in the `array` parameter that satisfy the `function` predicate.\n\nThe `function` that is supplied as the second parameter must have the following signature:\n\n`function(value [, index [, array]])`"
     },
     "$reduce": {
-        "args":"array, function [, init]",
-        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
+        "args": "array, function [, init]",
+        "desc": "Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
     },
     "$flowContext": {
         "args": "string[, string]",
@@ -200,8 +200,8 @@
         "desc": "Returns a copy of the `string` with extra padding, if necessary, so that its total number of characters is at least the absolute value of the `width` parameter.\n\nIf `width` is a positive number, then the string is padded to the right; if negative, it is padded to the left.\n\nThe optional `char` argument specifies the padding character(s) to use. If not specified, it defaults to the space character."
     },
     "$fromMillis": {
-        "args": "number",
-        "desc": "Convert a number representing milliseconds since the Unix Epoch (1 January, 1970 UTC) to a timestamp string in the ISO 8601 format."
+        "args": "number, [, picture [, timezone]]",
+        "desc": "Convert the `number` representing milliseconds since the Unix Epoch (1 January, 1970 UTC) to a formatted string representation of the timestamp as specified by the picture string.\n\nIf the optional `picture` parameter is omitted, then the timestamp is formatted in the ISO 8601 format.\n\nIf the optional `picture` string is supplied, then the timestamp is formatted occording to the representation specified in that string. The behaviour of this function is consistent with the two-argument version of the XPath/XQuery function `format-dateTime` as defined in the XPath F&O 3.1 specification. The picture string parameter defines how the timestamp is formatted and has the same syntax as `format-dateTime`.\n\nIf the optional `timezone` string is supplied, then the formatted timestamp will be in that timezone. The `timezone` string should be in the format '±HHMM', where ± is either the plus or minus sign and HHMM is the offset in hours and minutes from UTC. Positive offset for timezones east of UTC, negative offset for timezones west of UTC."
     },
     "$formatNumber": {
         "args": "number, picture [, options]",
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "Returns the one and only value in the `array` parameter that satisfies the `function` predicate (i.e. the `function` returns Boolean `true` when passed the value).  Throws an exception if the number of matching values is not exactly one.\n\nThe function should be supplied in the following signature: `function(value [, index [, array]])` where value is each input of the array, index is the position of that value and the whole array is passed as the third argument"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "Encodes a Uniform Resource Locator (URL) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.\n\nExample: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "Encodes a Uniform Resource Locator (URL) by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character. \n\nExample: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "Decodes a Uniform Resource Locator (URL) previously created by encodeUrl. \n\nExample: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -22,7 +22,8 @@
             "color": "色",
             "position": "配置",
             "enable": "有効",
-            "disable": "無効"
+            "disable": "無効",
+            "upload": "アップロード"
         },
         "type": {
             "string": "文字列",
@@ -37,11 +38,14 @@
         }
     },
     "event": {
+        "loadPlugins": "プラグインを読み込み中",
         "loadPalette": "パレットを読み込み中",
         "loadNodeCatalogs": "ノードカタログを読み込み中",
         "loadNodes": "ノードを読み込み中 __count__",
         "loadFlows": "フローを読み込み中",
-        "importFlows": "ワークスペースにフローを追加中"
+        "importFlows": "ワークスペースにフローを追加中",
+        "importError": "<p>フロー追加エラー</p><p>__message__</p>",
+        "loadingProject": "プロジェクトを読み込み中"
     },
     "workspace": {
         "defaultName": "フロー __number__",
@@ -50,7 +54,16 @@
         "delete": "本当に '__label__' を削除しますか？",
         "dropFlowHere": "ここにフローをドロップしてください",
         "addFlow": "フローの追加",
+        "addFlowToRight": "右側にフローを追加",
+        "hideFlow": "フローを非表示",
+        "hideOtherFlows": "他のフローを非表示",
+        "showAllFlows": "全てのフローを表示",
+        "hideAllFlows": "全てのフローを非表示",
+        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
+        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
+        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
         "listFlows": "フロー一覧",
+        "listSubflows": "サブフロー一覧",
         "status": "状態",
         "enabled": "有効",
         "disabled": "無効",
@@ -62,6 +75,8 @@
             "view": {
                 "view": "表示",
                 "grid": "グリッド",
+                "storeZoom": "読み込み時に拡大/縮小のレベルを復元",
+                "storePosition": "読み込み時にスクロール位置を復元",
                 "showGrid": "グリッドを表示",
                 "snapGrid": "ノードの配置を補助",
                 "gridSize": "グリッドの大きさ",
@@ -79,11 +94,12 @@
             "palette": {
                 "show": "パレットを表示"
             },
+            "edit": "編集",
             "settings": "設定",
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
             "displayStatus": "ノードのステータスを表示",
-            "displayConfig": "ノードの設定",
+            "displayConfig": "設定ノード",
             "import": "読み込み",
             "export": "書き出し",
             "search": "ノードを検索",
@@ -101,24 +117,43 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
+            "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
             "showNodeLabelDefault": "追加したノードのラベルを表示",
+            "codeEditor": "コードエディタ",
             "groups": "グループ",
             "groupSelection": "選択部分をグループ化",
             "ungroupSelection": "選択部分をグループ解除",
             "groupMergeSelection": "選択部分をマージ",
-            "groupRemoveSelection": "グループから削除"
+            "groupRemoveSelection": "グループから削除",
+            "arrange": "配置",
+            "alignLeft": "左揃え",
+            "alignCenter": "左右中央揃え",
+            "alignRight": "右揃え",
+            "alignTop": "上揃え",
+            "alignMiddle": "上下中央揃え",
+            "alignBottom": "下揃え",
+            "distributeHorizontally": "左右に整列",
+            "distributeVertically": "上下に整列",
+            "moveToBack": "最背面へ移動",
+            "moveToFront": "最前面へ移動",
+            "moveBackwards": "背面へ移動",
+            "moveForwards": "前面へ移動"
         }
     },
     "actions": {
         "toggle-navigator": "ナビゲータの表示/非表示を切替",
         "zoom-out": "縮小",
         "zoom-reset": "拡大/縮小を初期化",
-        "zoom-in": "拡大"
+        "zoom-in": "拡大",
+        "search-flows": "フローを検索",
+        "search-prev": "前へ",
+        "search-next": "次へ",
+        "search-counter": "\"__term__\" __count__ 件中の __result__ 件目"
     },
     "user": {
         "loggedInAs": "__name__ としてログインしました",
@@ -134,12 +169,17 @@
         }
     },
     "notification": {
+        "state": {
+            "flowsStopped": "フローを停止しました",
+            "flowsStarted": "フローを開始しました"
+        },
         "warning": "<strong>警告</strong>: __message__",
         "warnings": {
             "undeployedChanges": "ノードの変更をデプロイしていません",
             "nodeActionDisabled": "ノードのアクションは無効になっています",
             "nodeActionDisabledSubflow": "ノードのアクションは、サブフロー内で無効になっています",
             "missing-types": "<p>不明なノードが存在するため、フローを停止しました。</p>",
+            "missing-modules": "<p>不明なモジュールが存在するため、フローを停止しました。</p>",
             "safe-mode": "<p>セーフモードでフローを停止しました</p><p>フローを変更し、再起動するために変更をデプロイできます</p>",
             "restartRequired": "更新されたモジュールを有効化するため、Node-REDを再起動する必要があります",
             "credentials_load_failed": "<p>認証情報を復号できないため、フローを停止しました</p><p>フローの認証情報ファイルは暗号化されています。しかし、プロジェクトの暗号鍵が存在しない、または不正です</p>",
@@ -181,7 +221,8 @@
             "create-default-package": "デフォルトパッケージファイルの作成",
             "no-thanks": "不要",
             "create-default-project": "デフォルトプロジェクトファイルの作成",
-            "show-merge-conflicts": "マージ競合を表示"
+            "show-merge-conflicts": "マージ競合を表示",
+            "unknownNodesButton": "不明なノードを検索する"
         }
     },
     "clipboard": {
@@ -197,13 +238,17 @@
         "flow_plural": "__count__ 個のフロー",
         "subflow": "__count__ 個のサブフロー",
         "subflow_plural": "__count__ 個のサブフロー",
-        "pasteNodes": "JSON形式のフローデータを貼り付けてください",
-        "selectFile": "読み込むファイルを選択してください",
-        "importNodes": "フローをクリップボートから読み込み",
-        "exportNodes": "フローをクリップボードへ書き出し",
+        "replacedNodes": "置換された __count__ 個のノード",
+        "replacedNodes_plural": "置換された __count__ 個のノード",
+        "pasteNodes": "JSON形式のフローデータを貼り付け",
+        "selectFile": "読み込むファイルを選択",
+        "importNodes": "フローを読み込み",
+        "exportNodes": "フローを書き出し",
         "download": "ダウンロード",
         "importUnrecognised": "認識できない型が読み込まれました:",
         "importUnrecognised_plural": "認識できない型が読み込まれました:",
+        "importDuplicate": "重複したノードを読み込みました:",
+        "importDuplicate_plural": "重複したノードを読み込みました:",
         "nodesExported": "クリップボードへフローを書き出しました",
         "nodesImported": "読み込みました:",
         "nodeCopied": "__count__ 個のノードをコピーしました",
@@ -212,6 +257,9 @@
         "groupCopied_plural": "__count__ 個のグループをコピーしました",
         "groupStyleCopied": "グループの形式をコピーしました",
         "invalidFlow": "不正なフロー: __message__",
+        "recoveredNodes": "復旧したノード",
+        "recoveredNodesInfo": "このフロー内のノードは読み込み時に、有効なフローIDがありませんでした。これらフローIDは、フローに追加されているため、復元または削除できます。",
+        "recoveredNodesNotification": "<p>有効なフローIDを持たないノードが読み込まれました</p><p>これらノードは '__flowName__' という新しいフローへ追加されました。</p>",
         "export": {
             "selected": "選択したフロー",
             "current": "現在のタブ",
@@ -226,13 +274,19 @@
         },
         "import": {
             "import": "読み込み先",
+            "importSelected": "選択したノードを読み込み",
+            "importCopy": "コピーを読み込み",
+            "viewNodes": "ノードを参照...",
             "newFlow": "新規のタブ",
+            "replace": "置換",
             "errors": {
                 "notArray": "JSON形式の配列ではありません",
                 "itemNotObject": "不正なフロー - __index__ 番目の要素はノードオブジェクトではありません",
                 "missingId": "不正なフロー - __index__ 番目の要素に'id'プロパティがありません",
                 "missingType": "不正なフロー - __index__ 番目の要素に'type'プロパティがありません"
-            }
+            },
+            "conflictNotification1": "読み込もうとしているノードのいくつかは、既にワークスペース内に存在しています。",
+            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。"
         },
         "copyMessagePath": "パスをコピーしました",
         "copyMessageValue": "値をコピーしました",
@@ -246,13 +300,19 @@
         "modifiedFlowsDesc": "変更したノードを含むフローのみデプロイ",
         "modifiedNodes": "変更したノード",
         "modifiedNodesDesc": "変更したノードのみデプロイ",
+        "startFlows": "開始",
+        "startFlowsDesc": "フローを開始",
+        "stopFlows": "停止",
+        "stopFlowsDesc": "フローを停止",
         "restartFlows": "フローを再起動",
         "restartFlowsDesc": "デプロイされた現在のフローを再起動",
         "successfulDeploy": "デプロイが成功しました",
         "successfulRestart": "フローの再起動が成功しました",
         "deployFailed": "デプロイが失敗しました: __message__",
-        "unusedConfigNodes": "使われていない「ノードの設定」があります。",
-        "unusedConfigNodesLink": "設定を参照する",
+        "unusedConfigNodes": "使われていない設定ノードがあります。",
+        "unusedConfigNodesButton": "未使用の構成ノードを検索",
+        "unknownNodesButton": "不明なノードを検索する",
+        "invalidNodesButton": "無効なノードを検索する",
         "errors": {
             "noResponse": "サーバの応答がありません"
         },
@@ -322,8 +382,21 @@
         "output": "出力:",
         "status": "ステータスノード",
         "deleteSubflow": "サブフローを削除",
+        "confirmDelete": "このサブフローを削除しても良いですか？",
         "info": "詳細",
         "category": "カテゴリ",
+        "module": "モジュール",
+        "license": "ライセンス",
+        "licenseNone": "なし",
+        "licenseOther": "その他",
+        "type": "ノードの型",
+        "version": "バージョン",
+        "versionPlaceholder": "x.y.z",
+        "keys": "キーワード",
+        "keysPlaceholder": "カンマ区切りのキーワード",
+        "author": "作者",
+        "authorPlaceholder": "名前 <email@example.com>",
+        "desc": "説明",
         "env": {
             "restore": "デフォルト値に戻す",
             "remove": "環境変数を削除"
@@ -347,9 +420,9 @@
         "configDelete": "削除",
         "nodesUse": "__count__ 個のノードが、この設定を使用しています",
         "nodesUse_plural": "__count__ 個のノードが、この設定を使用しています",
-        "addNewConfig": "新規に __type__ ノードの設定を追加",
+        "addNewConfig": "新規に __type__ 設定ノードを追加",
         "editNode": "__type__ ノードを編集",
-        "editConfig": "__type__ ノードの設定を編集",
+        "editConfig": "__type__ 設定ノードを編集",
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
@@ -370,6 +443,7 @@
         "icon": "記号",
         "inputType": "入力形式",
         "selectType": "形式選択...",
+        "loadCredentials": "ノードの認証情報を読み込み中",
         "inputs": {
             "input": "入力",
             "select": "メニュー",
@@ -404,7 +478,8 @@
         },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
-            "invalidProperties": "プロパティが不正です:"
+            "invalidProperties": "プロパティが不正です:",
+            "credentialLoadFailed": "ノードの認証情報の読み込みに失敗"
         }
     },
     "keyboard": {
@@ -417,7 +492,8 @@
         "global": "グローバル",
         "workspace": "ワークスペース",
         "selectAll": "全てのノードを選択",
-        "selectAllConnected": "接続された全てのノードを選択",
+        "selectNone": "選択を外す",
+        "selectAllConnected": "接続されたノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
         "deleteSelected": "選択したノードや接続を削除",
@@ -427,13 +503,17 @@
         "moveNode": "選択したノードを移動(移動量大)",
         "toggleSidebar": "サイドバーの表示/非表示",
         "togglePalette": "パレットの表示/非表示",
-        "copyNode": "選択したノードをコピー",
-        "cutNode": "選択したノードを切り取り",
+        "copyNode": "ノードをコピー",
+        "cutNode": "ノードを切り取り",
         "pasteNode": "ノードを貼り付け",
+        "copyGroupStyle": "グループ様式をコピー",
+        "pasteGroupStyle": "グループ様式を貼り付け",
         "undoChange": "変更操作を戻す",
+        "redoChange": "変更操作をやり直し",
         "searchBox": "ノードを検索",
         "managePalette": "パレットの管理",
-        "actionList": "動作一覧"
+        "actionList": "動作一覧",
+        "splitWireWithLinks": "選択したワイヤーをlinkノードで分離"
     },
     "library": {
         "library": "ライブラリ",
@@ -485,14 +565,15 @@
             "nodeEnabled_plural": "ノードを有効化しました:",
             "nodeDisabled": "ノードを無効化しました:",
             "nodeDisabled_plural": "ノードを無効化しました:",
-            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました"
+            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました",
+            "unknownNodeRegistered": "ノードの読み込みエラー: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "パレットの管理",
             "palette": "パレット",
             "times": {
-                "seconds": "秒前",
-                "minutes": "分前",
+                "seconds": "数秒前",
+                "minutes": "数分前",
                 "minutesV": "__count__ 分前",
                 "hoursV": "__count__ 時間前",
                 "hoursV_plural": "__count__ 時間前",
@@ -532,6 +613,8 @@
             "sortAZ": "辞書順",
             "sortRecent": "日付順",
             "more": "+ さらに __count__ 個",
+            "upload": "モジュールのtgzファイルをアップロード",
+            "refresh": "モジュールリスト更新",
             "errors": {
                 "catalogLoadFailed": "<p>ノードのカタログの読み込みに失敗しました。</p><p>詳細はブラウザのコンソールを確認してください。</p>",
                 "installFailed": "<p>追加処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
@@ -600,14 +683,7 @@
             "empty": "空",
             "globalConfig": "グローバル設定ノード",
             "triggerAction": "アクションを実行",
-            "find": "ワークスペース内を検索",
-            "search": {
-                "configNodes": "設定ノード",
-                "unusedConfigNodes": "未使用の設定ノード",
-                "invalidNodes": "不正なノード",
-                "uknownNodes": "未知のノード",
-                "unusedSubflows": "未使用のサブフロー"
-            }
+            "find": "ワークスペース内を検索"
         },
         "help": {
             "name": "ヘルプ",
@@ -617,11 +693,12 @@
             "showHelp": "ヘルプを表示",
             "showInOutline": "アウトラインに表示",
             "showTopics": "トピックを表示",
-            "noHelp": "ヘルプのトピックが未選択"
+            "noHelp": "ヘルプのトピックが未選択",
+            "changeLog": "更新履歴"
         },
         "config": {
-            "name": "ノードの設定を表示",
-            "label": "ノードの設定",
+            "name": "設定ノードを表示",
+            "label": "設定ノード",
             "global": "全てのフロー上",
             "none": "なし",
             "subflows": "サブフロー",
@@ -708,6 +785,12 @@
                 "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください",
                 "userName": "ユーザ名",
                 "email": "メールアドレス",
+                "workflow": "ワークフロー",
+                "workfowTip": "望ましいgitワークフローを選択してください",
+                "workflowManual": "手動",
+                "workflowManualTip": "全ての変更は「履歴」サイドバー内で手動でコミットする必要があります",
+                "workflowAuto": "自動",
+                "workflowAutoTip": "変更はデプロイの度に自動的にコミットされます",
                 "sshKeys": "SSH キー",
                 "sshKeysTip": "gitリポジトリへのセキュアな接続を作成できます。",
                 "add": "キーを追加",
@@ -771,7 +854,7 @@
                 "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。",
                 "push": "プッシュ",
                 "pull": "プル",
-                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
+                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更が上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
                 "showUnstagedChanges": "ステージングされていない変更を表示",
                 "connectionFailed": "リモートリポジトリに接続できません: ",
                 "pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか？</p>",
@@ -818,11 +901,24 @@
         }
     },
     "editableList": {
-        "add": "追加"
+        "add": "追加",
+        "addTitle": "要素を追加"
     },
     "search": {
+        "history": "検索履歴",
+        "clear": "全て削除",
         "empty": "一致したものが見つかりませんでした",
-        "addNode": "ノードを追加..."
+        "addNode": "ノードを追加...",
+        "options": {
+            "configNodes": "設定ノード",
+            "unusedConfigNodes": "未使用の設定ノード",
+            "invalidNodes": "不正なノード",
+            "uknownNodes": "未知のノード",
+            "unusedSubflows": "未使用のサブフロー",
+            "hiddenFlows": "非表示のフロー",
+            "modifiedNodes": "修正したノードやフロー",
+            "thisFlow": "現在のフロー"
+        }
     },
     "expressionEditor": {
         "functions": "関数",
@@ -843,6 +939,9 @@
             "eval": "表現評価エラー:\n  __message__"
         }
     },
+    "monaco": {
+        "setTheme": "テーマを設定:"
+    },
     "jsEditor": {
         "title": "JavaScriptエディタ"
     },
@@ -854,6 +953,8 @@
         "format": "JSONフォーマット",
         "rawMode": "JSONを編集",
         "uiMode": "ビジュアルエディタ",
+        "rawMode-readonly": "JSON",
+        "uiMode-readonly": "ビジュアル",
         "insertAbove": "上に挿入",
         "insertBelow": "下に挿入",
         "addItem": "要素を追加",
@@ -1015,7 +1116,8 @@
             "not-git": "Gitリポジトリではありません",
             "no-resource": "リポジトリが見つかりません",
             "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。",
-            "unexpected_error": "予期しないエラー"
+            "unexpected_error": "予期しないエラー",
+            "clearContext": "プロジェクトを切り替る際にコンテキストを初期化"
         },
         "delete": {
             "confirm": "プロジェクトを削除しても良いですか?"
@@ -1056,17 +1158,196 @@
     "editor-tab": {
         "properties": "プロパティ",
         "envProperties": "環境変数",
+        "module": "モジュールプロパティ",
         "description": "説明",
         "appearance": "外観",
         "preview": "UIプレビュー",
         "defaultValue": "デフォルト値"
     },
+    "tourGuide": {
+        "takeATour": "ツアーを開始",
+        "start": "開始",
+        "next": "次へ",
+        "welcomeTours": "ウェルカムツアー",
+        "tours": "ツアー"
+    },
+    "diagnostics": {
+        "title": "システム情報"
+    },
     "languages": {
         "de": "ドイツ語",
         "en-US": "英語",
         "ja": "日本語",
         "ko": "韓国語",
+        "ru": "ロシア語",
         "zh-CN": "中国語(簡体)",
         "zh-TW": "中国語(繁体)"
+    },
+    "validator": {
+        "errors": {
+            "invalid-json": "JSONデータが不正: __error__",
+            "invalid-json-prop": "__prop__: JSONデータが不正: __error__",
+            "invalid-prop": "プロパティ式が不正",
+            "invalid-prop-prop": "__prop__: プロパティ式が不正",
+            "invalid-num": "数値が不正",
+            "invalid-num-prop": "__prop__: 数値が不正",
+            "invalid-regexp": "入力パターンが不正",
+            "invalid-regex-prop": "__prop__: 入力パターンが不正",
+            "missing-required-prop": "__prop__: プロパティが未設定",
+            "invalid-config": "__prop__: 設定ノードが不正",
+            "missing-config": "__prop__: 設定ノードが存在しません",
+            "validation-error": "__prop__: チェックエラー: __node__, __id__: __error__"
+        }
+    },
+    "contextMenu": {
+        "insert": "挿入",
+        "node": "ノード",
+        "junction": "分岐点",
+        "linkNodes": "Linkノード"
+    },
+    "action-list": {
+        "toggle-show-tips": "ヒント表示切替",
+        "show-about": "Node-REDの説明を表示",
+        "show-welcome-tour": "ウェルカムツアー表示",
+        "show-next-tab": "次のタブを表示",
+        "show-previous-tab": "前のタブを表示",
+        "add-flow": "フローを追加",
+        "add-flow-to-right": "フローを右に追加",
+        "edit-flow": "フローを編集",
+        "remove-flow": "フローを削除",
+        "enable-flow": "フローを有効化",
+        "disable-flow": "フローを無効化",
+        "hide-flow": "フローを隠す",
+        "hide-other-flows": "他のフローを非表示",
+        "hide-all-flows": "全てのフローを非表示",
+        "show-all-flows": "全てのフローを表示",
+        "show-last-hidden-flow": "最後に非表示にしたフローを表示",
+        "list-modified-nodes": "修正したフローを表示",
+        "list-hidden-flows": "非表示フローを表示",
+        "list-flows": "フロー一覧",
+        "list-subflows": "サブフロー一覧",
+        "go-to-previous-location": "前の位置に移動",
+        "go-to-next-location": "次の位置に移動",
+        "copy-selection-to-internal-clipboard": "選択をクリップボードにコピー",
+        "cut-selection-to-internal-clipboard": "選択をクリップボードに切り取り",
+        "paste-from-internal-clipboard": "クリップボードから貼り付け",
+        "detach-selected-nodes": "選択ノードを接続から外す",
+        "delete-selection": "選択を削除",
+        "delete-selection-and-reconnect": "選択を削除し再接続",
+        "edit-selected-node": "選択したノードを編集",
+        "go-to-selection": "選択に移動",
+        "undo": "変更操作を戻す",
+        "redo": "変更操作をやり直し",
+        "select-all-nodes": "全てのノードを選択",
+        "select-none": "ノードを選択",
+        "enable-selected-nodes": "選択ノードを有効化",
+        "disable-selected-nodes": "選択ノードを無効化",
+        "toggle-show-grid": "グリッド表示切替",
+        "toggle-snap-grid": "ノードの配置補助切替",
+        "toggle-status": "ステータス表示切替",
+        "show-selected-node-labels": "選択したノードのラベルを表示",
+        "hide-selected-node-labels": "選択したノードのラベルを非表示",
+        "scroll-view-up": "上スクロール",
+        "scroll-view-right": "右スクロール",
+        "scroll-view-down": "下スクロール",
+        "scroll-view-left": "左スクロール",
+        "step-view-up": "一単位上スクロール",
+        "step-view-right": "一単位右スクロール",
+        "step-view-down": "一単位下スクロール",
+        "step-view-left": "一単位左スクロール",
+        "move-selection-up": "選択を上移動",
+        "move-selection-right": "選択を右移動",
+        "move-selection-down": "選択を下移動",
+        "move-selection-left": "選択を左移動",
+        "move-selection-forwards": "選択を前面に移動",
+        "move-selection-backwards": "選択を背面に移動",
+        "move-selection-to-front": "選択を最前面に移動",
+        "move-selection-to-back": "選択を最背面に移動",
+        "step-selection-up": "選択を一単位上移動",
+        "step-selection-right": "選択を一単位右移動",
+        "step-selection-down": "選択を一単位下移動",
+        "step-selection-left": "選択を一単位左移動",
+        "select-connected-nodes": "接続されたノードを選択",
+        "select-downstream-nodes": "後方に接続されたノードを選択",
+        "select-upstream-nodes": "前方に接続されたノードを選択",
+        "go-to-next-node": "次のノードに移動",
+        "go-to-previous-node": "前のノードに移動",
+        "go-to-next-sibling": "次の兄弟ノードに移動",
+        "go-to-previous-sibling": "前の兄弟ノードに移動",
+        "go-to-nearest-node-on-left": "最も近い左側ノードに移動",
+        "go-to-nearest-node-on-right": "最も近い右側ノードに移動",
+        "go-to-nearest-node-above": "最も近い上側ノードに移動",
+        "go-to-nearest-node-below": "最も近い下側ノードに移動",
+        "align-selection-to-grid": "選択を整列",
+        "align-selection-to-left": "選択を左揃え",
+        "align-selection-to-right": "選択を右揃え",
+        "align-selection-to-top": "選択を上揃え",
+        "align-selection-to-bottom": "選択を下揃え",
+        "align-selection-to-middle": "選択を上下中央揃え",
+        "align-selection-to-center": "選択を左右中央揃え",
+        "distribute-selection-horizontally": "選択を左右に整列",
+        "distribute-selection-vertically": "選択を上下に整列",
+        "wire-series-of-nodes": "ノードを一続きに接続",
+        "wire-node-to-multiple": "ノードを複数に接続",
+        "split-wire-with-link-nodes": "ワイヤーをlinkノードで分割",
+        "generate-node-names": "ノード名を生成",
+        "show-user-settings": "ユーザ設定を表示",
+        "show-help": "ヘルプを表示",
+        "toggle-palette": "パレットの表示切替",
+        "show-event-log": "イベントログを表示",
+        "manage-palette": "パレットの管理",
+        "toggle-sidebar": "サイドバーの表示切替",
+        "show-info-tab": "ノード情報タブの表示",
+        "show-help-tab": "ノードヘルプタブの表示",
+        "show-config-tab": "設定ノードタブの表示",
+        "select-all-config-nodes": "全ての設定ノードを選択",
+        "delete-config-selection": "選択した設定ノードを削除",
+        "show-context-tab": "コンテキストデータタブを表示",
+        "create-subflow": "サブフローを作成",
+        "convert-to-subflow": "選択をサブフローに変換",
+        "group-selection": "選択をグループ化",
+        "ungroup-selection": "選択をグループ解除",
+        "merge-selection-to-group": "選択をグループにマージ",
+        "remove-selection-from-group": "選択をグループから削除",
+        "copy-group-style": "グループのスタイルをコピー",
+        "paste-group-style": "グループのスタイルを貼り付け",
+        "show-export-dialog": "書き出しダイアログを表示",
+        "show-import-dialog": "読み込みダイアログを表示",
+        "show-library-export-dialog": "ライブラリ書き出しダイアログを表示",
+        "show-library-import-dialog": "ライブラリ読み込みダイアログを表示",
+        "show-examples-import-dialog": "サンプル読み込みダイアログを表示",
+        "search": "検索",
+        "search-previous": "前を検索",
+        "search-next": "次を検索",
+        "show-action-list": "動作一覧を表示",
+        "confirm-edit-tray": "編集を完了",
+        "cancel-edit-tray": "編集をキャンセル",
+        "show-remote-diff": "リモートとの変更差分を表示",
+        "deploy-flows": "フローをデプロイ",
+        "restart-flows": "フローを再起動",
+        "set-deploy-type-to-full": "デプロイを「全て」に設定",
+        "set-deploy-type-to-modified-flows": "デプロイを「変更したフロー」に設定",
+        "set-deploy-type-to-modified-nodes": "デプロイを「変更したノード」に設定",
+        "show-debug-tab": "デバッグタブを表示",
+        "clear-debug-messages": "デバッグメッセージを削除",
+        "clear-filtered-debug-messages": "フィルタしたデバッグメッセージを削除",
+        "activate-selected-debug-nodes": "選択したデバッグノードを有効化",
+        "activate-all-debug-nodes": "全てのデバッグノードを有効化",
+        "activate-all-flow-debug-nodes": "フロー内の全デバッグノードを有効化",
+        "deactivate-selected-debug-nodes": "選択したデバッグノードを無効化",
+        "deactivate-all-debug-nodes": "全てのデバッグノードを無効化",
+        "deactivate-all-flow-debug-nodes": "フロー内の全デバッグノードを無効化",
+        "zoom-in": "ズームイン",
+        "zoom-out": "ズームアウト",
+        "zoom-reset": "ズームリセット",
+        "toggle-navigator": "ナビゲータ表示切替",
+        "show-system-info": "システム情報",
+        "split-wires-with-junctions": "分岐点によりワイヤーを分割",
+        "new-project": "新しいプロジェクト",
+        "open-project": "プロジェクトを開く",
+        "show-project-settings": "プロジェクト設定を表示",
+        "show-version-control-tab": "バージョンコントロールタブを表示",
+        "start-flows": "フローを開始",
+        "stop-flows": "フローを停止"
     }
 }

packages/node_modules/@node-red/editor-client/locales/ja/infotips.json

@@ -17,7 +17,7 @@
         "tip14": "[shift] を押しながらノードを [click] すると、接続された全てのノードを選択できます。",
         "tip15": "[ctrl] を押しながらノードを [click] すると、選択/非選択を切り替えできます。",
         "tip16": "{{core:show-previous-tab}} や {{core:show-next-tab}} で、タブの切り替えができます。",
-        "tip17": "ノードのプロバティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
+        "tip17": "ノードのプロパティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
         "tip18": "ノードを選択し、 {{core:edit-selected-node}} を押すとプロパティ設定画面が表示されます。"
     }
 }

packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json

@@ -52,8 +52,8 @@
         "desc": "文字列 `str` からパターン `pattern` を検索し、置換文字列 `replacement` に置き換えます。\n\n任意の引数 `limit` には、置換回数の上限値を指定します。"
     },
     "$now": {
-        "args": "",
-        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。"
+        "args": "$[picture [, timezone]]",
+        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。pictureおよびtimezoneパラメータが指定されている場合、現在時刻を`$fromMillis()`関数の説明に従ってフォーマットします。"
     },
     "$base64encode": {
         "args": "string",
@@ -200,8 +200,8 @@
         "desc": "文字数が引数 `width` の絶対値以上となるよう、必要に応じて追加文字を付け足した `string` のコピーを返します。\n\n`width` が正の値の場合、文字列の右側に追加文字を付け足します。もし負の値の場合、文字列の左側に追加文字を付け足します。\n\n任意の引数 `char` には、本関数で用いる追加文字を指定します。もし追加文字を指定しない場合は、既定値として空白文字を使用します。"
     },
     "$fromMillis": {
-        "args": "number",
-        "desc": "Unixエポック(1 January, 1970 UTC)からの経過ミリ秒を表す数値を、ISO 8601形式のタイムスタンプの文字列に変換します。"
+        "args": "number, [, picture [, timezone]]",
+        "desc": "Unixエポック(1 January, 1970 UTC)からの経過ミリ秒を表す数値を、`picture`の指定に従ってタイムスタンプの文字列に変換します。\n\n`picture`パラメータが指定されない場合、ISO 8601形式に変換します。\n\n`picture`を指定すると、指定した文字列に従って変換を行います。この変換はXPath F&O 3.1仕様におけるXPath/XQueryの2引数形式`format-dateTime`と同様です。`picture`パラメータはタイムスタンプの変換形式を定義し、その書式は`format-dateTime`と同じです。\n\n`timezone`を指定すると、指定タイムゾーンで変換します。`timezone`は'±HHMM'という形式で指定します。ここで、±は+もしくは-記号を表し、HHMMはUTCからの差分時間と分を表します。正の差分はUTCの東、負の差分は西のタイムゾーンとなります。"
     },
     "$formatNumber": {
         "args": "number, picture [, options]",
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "encodeUrlで置換したUniform Resource Locator (URL)要素をデコードします。 \n\n例: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },

packages/node_modules/@node-red/editor-client/locales/ko/editor.json

@@ -56,7 +56,7 @@
       "displayConfig": "설정노드 보기",
       "import": "가져오기",
       "export": "내보내기",
-      "search": "플로우 겅색",
+      "search": "플로우 검색",
       "searchInput": "플로우 검색",
       "subflows": "보조 플로우",
       "createSubflow": "보조 플로우 생성",
@@ -141,7 +141,8 @@
       "create-default-package": "기본 패키지 파일 생성",
       "no-thanks": "괜찮습니다",
       "create-default-project": "기본 프로젝트 파일 생성",
-      "show-merge-conflicts": "병합 충돌 보여주기"
+      "show-merge-conflicts": "병합 충돌 보여주기",
+      "unknownNodesButton": "알 수 없는 노드 검색"
     }
   },
   "clipboard": {
@@ -203,7 +204,9 @@
     "successfulRestart": "플로우 재시작을 성공했습니다",
     "deployFailed": "배포 실패 : __message__",
     "unusedConfigNodes": "사용되지 않는 설정노드가 있습니다",
-    "unusedConfigNodesLink": "여기를 클릭하면 볼 수 있습니다",
+    "unusedConfigNodesButton":"사용하지 않는 구성 노드 검색",
+    "unknownNodesButton":"알 수 없는 노드 검색",
+    "invalidNodesButton":"잘못된 노드 검색",
     "errors": {
       "noResponse": "서버의 응답이 없습니다"
     },

packages/node_modules/@node-red/editor-client/locales/ru/infotips.json

@@ -0,0 +1,23 @@
+{
+    "info": {
+        "tip0" : "Вы можете удалить выбранные узлы или провода с {{core:delete-selection}}",
+        "tip1" : "Ищите узлы с {{core:search}}",
+        "tip2" : "{{core:toggle-sidebar}} показывает/скрывает эту боковою панель",
+        "tip3" : "Вы можете управлять палитрой узлов с помощью {{core:manage-palette}}",
+        "tip4" : "Узлы конфигурации потока перечисляются на боковой панели. Доступ к списку можно получить из меню или с помощью {{core:show-config-tab}}",
+        "tip5" : "Эти советы можно включить/выключить через настройки",
+        "tip6" : "Перемещайте выбранные узлы клавишами [влево] [вверх] [вниз] и [вправо]. Удерживайте [Shift], чтобы увеличить шаг",
+        "tip7" : "Перетаскивание узла на провод соединит его с обеих сторон",
+        "tip8" : "Экспортируйте выбранные узлы или текущую вкладку с {{core:show-export-dialog}}",
+        "tip9" : "Импортируйте поток, перетаскивая его JSON в редактор или с помощью {{core:show-import-dialog}}",
+        "tip10" : "Нажмите [Shift], [кликните] по порту узла и перетаскивайте подключенные провода на другой узел",
+        "tip11" : "Открывайте вкладку Информация с {{core:show-info-tab}} или вкладку Отладка с {{core:show-debug-tab}}",
+        "tip12" : "Нажмите [ctrl] и [кликните] в рабочей области, чтобы открыть диалог быстрого добавления",
+        "tip13" : "Нажмите [ctrl] и [кликните] по порту узла, чтобы начать быстрое подключение",
+        "tip14" : "Нажмите [Shift] и [кликните] по узлу, чтобы выбрать все соединенные узлы",
+        "tip15" : "Нажмите [ctrl] и [кликните] по узлу, чтобы добавить или убрать его из текущего выбора",
+        "tip16" : "Переключайте вкладки потока с помощью {{core:show-previous-tab}} и {{core:show-next-tab}}",
+        "tip17" : "Вы можете подтвердить изменения в редакторе узла с {{core:confirm-edit-tray}} или отменить их с {{core:cancel-edit-tray}}",
+        "tip18" : "Нажатие {{core:edit-selected-node}} откроет редактор первого узла в текущем выборе"
+    }
+}

packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json

@@ -0,0 +1,274 @@
+{
+    "$string": {
+        "args": "arg[, prettify]",
+        "desc": "Преобразует параметр `arg` в строку, используя следующие правила приведения:\n\n - Строки возвращаются как есть\n - Функции преобразуются в пустую строку\n - Числовая бесконечность и NaN выдают ошибку, поскольку они не могут быть представлены числом в JSON\n - Все остальные значения преобразуются в строку JSON с помощью функции `JSON.stringify`. Если значение `prettify` равно true, тогда будет сгенерирован \"отформатированный\" JSON. То есть каждое поле будет в отдельной строке, а строки будут иметь отступ в зависимости от глубины поля."
+    },
+    "$length": {
+        "args": "str",
+        "desc": "Возвращает количество символов в строке `str`. Выдается ошибка, если `str` не является строкой."
+    },
+    "$substring": {
+        "args": "str, start[, length]",
+        "desc": "Возвращает строку, содержащую символы из первого параметра `str`, начиная с позиции `start` (отсчет с нуля). Если указан `length`, то подстрока будет содержать максимум `length` символов. Если `start` отрицателен, то это означает количество символов с конца `str`."
+    },
+    "$substringBefore": {
+        "args": "str, chars",
+        "desc": "Возвращает подстроку перед первым вхождением последовательности символов `chars` в строке `str`. Если `str` не содержит `chars`, то он возвращает `str`."
+    },
+    "$substringAfter": {
+        "args": "str, chars",
+        "desc": "Возвращает подстроку после первого вхождения последовательности символов `chars` в строке `str`. Если `str` не содержит `chars`, то он возвращает `str`."
+    },
+    "$uppercase": {
+        "args": "str",
+        "desc": "Возвращает строку со всеми символами `str`, преобразованными в верхний регистр."
+    },
+    "$lowercase": {
+        "args": "str",
+        "desc": "Возвращает строку со всеми символами `str`, преобразованными в нижний регистр."
+    },
+    "$trim": {
+        "args": "str",
+        "desc": "Нормализует и обрезает все пробельные символы в строке `str`, выполняя следующие шаги:\n\n - Все символы табуляции, возврата каретки и перевода строки заменяются пробелами.\n- Последовательности пробелов сокращаются до одного пробела.\n- Пробелы в начале и конце `str` удаляются.\n\n Если `str` не указан (то есть эта функция вызывается без аргументов), тогда значение контекста используется в качестве значения `str`. Выдается ошибка, если `str` не является строкой."
+    },
+    "$contains": {
+        "args": "str, pattern",
+        "desc": "Возвращает `true`, если строка `str` соответствует шаблону `pattern`, в противном случае возвращает `false`. Если `str` не указан (то есть эта функция вызывается с одним аргументом), то значение контекста используется как значение `str`. Параметр `pattern` может быть либо строкой, либо регулярным выражением."
+    },
+    "$split": {
+        "args": "str[, separator][, limit]",
+        "desc": "Разбивает строку `str` на массив подстрок. Выдает ошибку, если `str` не является строкой. Необязательный параметр `separator` (строка или регулярное выражение) указывает символы внутри строки `str`, относительно которых она должна быть разделена. Если `separator` не указан, то предполагается пустая строка, и `str` будет разбит на массив из отдельных символов. Выдает ошибку, если `separator` не является строкой. Необязательный параметр `limit` - это число, указывающее максимальное количество подстрок для включения в результирующий массив. Любые дополнительные подстроки отбрасываются. Если `limit` не указан, то весь `str` разделяется без ограничения размера результирующего массива. Выдает ошибку, если `limit` не является положительным числом."
+    },
+    "$join": {
+        "args": "array[, separator]",
+        "desc": "Объединяет массив подстрок в одну объединенную строку, в которой каждая подстрока отделена необязательным параметром `separator`. Выдает ошибку, если входной массив содержит элемент, который не является строкой. Если `separator` не указан, то предполагается, что это пустая строка, то есть нет `separator` между подстроками. Выдает ошибку, если `separator` не является строкой."
+    },
+    "$match": {
+        "args": "str, pattern [, limit]",
+        "desc": "Применяет строку `str` к регулярному выражению `pattern` и возвращает массив объектов, каждый из которых содержит информацию о каждом совпадении внутри `str`."
+    },
+    "$replace": {
+        "args": "str, pattern, replacement [, limit]",
+        "desc": "Находит вхождения шаблона `pattern` в строке `str` и заменяет их на строку `replacement`.\n\nНеобязательный параметр `limit` - это максимальное количество замен."
+    },
+    "$now": {
+        "args":"",
+        "desc":"Создает отметку времени в формате, совместимом с ISO 8601, и возвращает ее как строку."
+    },
+    "$base64encode": {
+        "args":"string",
+        "desc":"Преобразует ASCII-строку в base-64 кодировку. Каждый символ в строке обрабатывается как байт двоичных данных. Для этого необходимо, чтобы все символы в строке находились в диапазоне от 0x00 до 0xFF, который включает все символы строк в URI-кодировке. Символы Юникода за пределами этого диапазона не поддерживаются."
+    },
+    "$base64decode": {
+        "args":"string",
+        "desc":"Преобразует байты в кодировке base-64 в строку, используя кодовую страницу Юникод UTF-8."
+    },
+    "$number": {
+        "args": "arg",
+        "desc": "Преобразует параметр `arg` в число с использованием следующих правил приведения:\n\n - Числа возвращаются как есть\n - Строки, которые содержат последовательность символов, представляющих допустимое в JSON число, преобразуются в это число\n - Все остальные значения вызывают ошибку."
+    },
+    "$abs": {
+        "args":"number",
+        "desc":"Возвращает абсолютное значение числа `number`."
+    },
+    "$floor": {
+        "args":"number",
+        "desc":"Возвращает значение числа `number`, округленное до ближайшего целого числа, которое меньше или равно `number`."
+    },
+    "$ceil": {
+        "args":"number",
+        "desc":"Возвращает значение числа `number`, округленное до ближайшего целого числа, которое больше или равно `number`."
+    },
+    "$round": {
+        "args":"number [, precision]",
+        "desc":"Возвращает значение числа `number`, округленное до количества десятичных знаков, указанных необязательным параметром `precision`."
+    },
+    "$power": {
+        "args":"base, exponent",
+        "desc":"Возвращает значение числа `base`, возведенное в степень `exponent`."
+    },
+    "$sqrt": {
+        "args":"number",
+        "desc":"Возвращает квадратный корень из значения числа `number`."
+    },
+    "$random": {
+        "args":"",
+        "desc":"Возвращает псевдослучайное число, которе больше или равно нулю и меньше единицы."
+    },
+    "$millis": {
+        "args":"",
+        "desc":"Возвращает число миллисекунд с начала Unix-эпохи (1 января 1970 года по Гринвичу) в виде числа. Все вызовы `$millis()` в пределах выполнения выражения будут возвращать одно и то же значение."
+    },
+    "$sum": {
+        "args": "array",
+        "desc": "Возвращает арифметическую сумму массива чисел `array`. Вызывает ошибку, если входной массив `array` содержит элемент, который не является числом."
+    },
+    "$max": {
+        "args": "array",
+        "desc": "Возвращает максимальное число в массиве чисел `array`. Вызывает ошибку, если входной массив `array` содержит элемент, который не является числом."
+    },
+    "$min": {
+        "args": "array",
+        "desc": "Возвращает минимальное число в массиве чисел `array`. Вызывает ошибку, если входной массив `array` содержит элемент, который не является числом."
+    },
+    "$average": {
+        "args": "array",
+        "desc": "Возвращает среднее значение массива чисел `array`. Вызывает ошибку, если входной массив `array` содержит элемент, который не является числом."
+    },
+    "$boolean": {
+        "args": "arg",
+        "desc": "Приводит аргумент к логическому значению, используя следующие правила: \n\n - Логические значения возвращаются как есть\n - пустая строка: `false`\n - непустая строка: `true`\n - число равное `0`: `false`\n - ненулевое число: `true`\n - `null` : `false`\n - пустой массив: `false`\n - массив, который содержит хотя бы один элемент, приводимый к `true`: `true`\n - массив, все элементы которого приводятся к `false`: `false`\n - пустой объект: `false`\n - непустой объект: `true`\n - функция: `false`"
+    },
+    "$not": {
+        "args": "arg",
+        "desc": "Возвращает логическое НЕ для аргумента. `arg` сначала приводится к логическому значению"
+    },
+    "$exists": {
+        "args": "arg",
+        "desc": "Возвращает логическое `true`, если выполнение выражения `arg` возвращает значение, или `false`, если выражение ничему не соответствует (например, путь к несуществующему полю)."
+    },
+    "$count": {
+        "args": "array",
+        "desc": "Возвращает количество элементов в массиве"
+    },
+    "$append": {
+        "args": "array, array",
+        "desc": "Присоединяет один массив к другому"
+    },
+    "$sort": {
+        "args":"array [, function]",
+        "desc":"Возвращает массив, содержащий все значения параметра `array`, но отсортированные по порядку.\n\nЕсли указан компаратор `function`, то это должна быть функция, которая принимает два параметра:\n\n`function(val1, val2)`\n\nЭту функцию вызывает алгоритм сортировки для сравнения двух значений: val1 и val2. Если значение val1 следует поместить после значения val2 в желаемом порядке сортировки, то функция должна возвращать логическое значение `true`, чтобы обозначить замену. В противном случае она должна вернуть `false`."
+    },
+    "$reverse": {
+        "args":"array",
+        "desc":"Возвращает массив, содержащий все значения из параметра `array`, но в обратном порядке."
+    },
+    "$shuffle": {
+        "args":"array",
+        "desc":"Возвращает массив, содержащий все значения из параметра `array`, но перемешанный в случайном порядке."
+    },
+    "$zip": {
+        "args":"array, ...",
+        "desc":"Возвращает свернутый (сжатый) массив, содержащий сгруппированные массивы значений из аргументов `array1` … `arrayN` по индексам 0, 1, 2...."
+    },
+    "$keys": {
+        "args": "object",
+        "desc": "Возвращает массив, содержащий ключи объекта. Если аргумент является массивом объектов, то возвращаемый массив содержит недублированный список всех ключей из всех объектов."
+    },
+    "$lookup": {
+        "args": "object, key",
+        "desc": "Возвращает значение, связанное с ключом в объекте. Если первый аргумент является массивом объектов, то просходит поиск по всем объектам в массиве, и возвращаются значения, связанные со всеми вхождениями ключа."
+    },
+    "$spread": {
+        "args": "object",
+        "desc": "Разбивает объект, содержащий пары ключ / значение, на массив объектов, каждый из которых имеет одну пару ключ / значение из входного объекта. Если параметр является массивом объектов, то результирующий массив содержит объект для каждой пары ключ / значение из каждого объекта предоставленного массива."
+    },
+    "$merge": {
+        "args": "array<object>",
+        "desc": "Объединяет массив объектов в один объект, содержащий все пары ключ / значение каждого из объектов входного массива. Если какой-либо из входных объектов содержит один и тот же ключ, возвращаемый объект будет содержать значение последнего в массиве. Вызывает ошибку, если входной массив содержит элемент, который не является объектом."
+    },
+    "$sift": {
+        "args":"object, function",
+        "desc":"Возвращает объект, который содержит только пары ключ / значение из параметра `object`, которые удовлетворяют предикату `function`, переданному в качестве второго параметра.\n\n`function`, которая передается в качестве второго параметра, должна иметь следующую сигнатуру:\n\n`function(value [, key [, object]])`"
+    },
+    "$each": {
+        "args":"object, function",
+        "desc":"Возвращает массив, который содержит значения, возвращаемые функцией `function` при применении к каждой паре ключ/значение из объекта `object`."
+    },
+    "$map": {
+        "args":"array, function",
+        "desc":"Возвращает массив, содержащий результаты применения функции `function` к каждому значению массива `array`.\n\nФункция `function`, указанная в качестве второго параметра, должна иметь следующую сигнатуру:\n\n`function(value [, index [, array]])`"
+    },
+    "$filter": {
+        "args":"array, function",
+        "desc":"Возвращает массив, содержащий только те значения из массива `array`, которые удовлетворяют предикату `function`.\n\nФункция `function`, указанная в качестве второго параметра, должна иметь следующую сигнатуру:\n\n`function(value [, index [, array]])`"
+    },
+    "$reduce": {
+        "args":"array, function [, init]",
+        "desc":"Возвращает агрегированное значение, полученное в результате последовательного применения функции `function` к каждому значению в массиве в сочетании с результатом от предыдущего применения функции.\n\nФункция должна принимать два аргумента и вести себя как инфиксный оператор между каждым значением в массиве `array`. Сигнатура `function` должна иметь форму: `myfunc($accumulator, $value[, $index[, $array]])`\n\nНеобязательный параметр `init` используется в качестве начального значения в агрегации."
+    },
+    "$flowContext": {
+        "args": "string[, string]",
+        "desc": "Извлекает свойство контекста потока.\n\nЭто функция от Node-RED."
+    },
+    "$globalContext": {
+        "args": "string[, string]",
+        "desc": "Извлекает свойство глобального контекста.\n\nЭто функция от Node-RED."
+    },
+    "$pad": {
+        "args": "string, width [, char]",
+        "desc": "Возвращает копию строки `string` с дополнительным заполнением, если необходимо, чтобы общее количество символов как минимум соответствовало абсолютному значению параметра `width`.\n\nЕсли `width` является положительным числом, то строка дополняется справа; если отрицательным, то дополняется слева.\n\nНеобязательный аргумент `char` указывает символ(ы) для заполнения. Если не указано, по умолчанию используется пробел."
+    },
+    "$fromMillis": {
+        "args": "number",
+        "desc": "Преобразует число, представляющее миллисекунды с начала Unix-эпохи (1 января 1970 года по Гринвичу), в строку отметки времени в формате ISO 8601."
+    },
+    "$formatNumber": {
+        "args": "number, picture [, options]",
+        "desc": "Преобразует число `number` в строку и форматирует ее в десятичное представление, как указано в строке `picture`.\n\nПоведение этой функции соответствует XPath/XQuery-функции fn:format-number, как определено в спецификация XPath F&O 3.1. Строка `picture` определяет, как форматируется число и имеет тот же синтаксис, что и fn:format-number.\n\nНеобязательный третий аргумент `options` используется для переопределения символов форматирования, специфичных для локали по умолчанию, таких как десятичный разделитель. Если аргумент указан, то это должен быть объект, содержащий пары имя/значение, указанные в разделе десятичного формата спецификации XPath F&O 3.1."
+    },
+    "$formatBase": {
+        "args": "number [, radix]",
+        "desc": "Преобразует число `number` в строку и форматирует ее в целое число, представленное в системе счисления, указанной аргументом `radix`. Если `radix` не указан, то по умолчанию используется десятичная. Значение 'radix` может быть от 2 до 36, в противном случае выдается ошибка."
+    },
+    "$toMillis": {
+        "args": "timestamp",
+        "desc": "Преобразует строку `timestamp` в формате ISO 8601 в число миллисекунд с начала Unix-эпохи (1 января 1970 года по Гринвичу). Вызывает ошибку, если строка в неправильном формате."
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "Возвращает значение переменной среды.\n\nЭто функция от Node-RED."
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "Анализирует и исполняет строку `expr`, которая содержит JSON или выражение JSONata, используя текущий контекст в качестве контекста для исполнения."
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "Преобразует число `number` в строку и форматирует ее в целочисленное представление, как указано в строке `picture`. Строка `picture` определяет, как форматируется число и имеет тот же синтаксис, что и `fn:format-integer` из спецификации XPath F&O 3.1."
+    },
+    "$parseInteger": {
+        "args": "string, picture",
+        "desc": "Разбирает содержимое строки `string` в целое число (как число JSON), используя формат, указанный в строке `picture`. Строковый параметр `picture` имеет тот же формат, что и `$formatInteger`."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "Вызывает ошибку с сообщением. Необязательная строка `str` заменяет сообщение по умолчанию $error() function evaluated`"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "Если значение `arg` равно true, функция возвращает значение undefined. Если значение `arg` равно false, генерируется исключение с `str` в качестве сообщения об исключении."
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "Возвращает одно-единственное значение из массива `array`, которое удовлетворяет предикату `function` (то есть когда `function` возвращает логическое `true` при передаче значения). Выдает исключение, если число подходящих значений не одно.\n\nФункция должна соответствовать следующей сигнатуре: `function(value [, index [, array]])` где value - элемент массива, index - позиция этого значения, а весь массив передается в качестве третьего аргумента"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Кодирует компонент Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Кодирует Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrlComponent.\n\nПример: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrl. \n\nПример: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "Возвращает массив содержащий все элементы из массива `array`, с удаленными дупликатами"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Возвращает тип значения `value` в виде строки. Если `value` не определено, то будет возвращено `undefined`"
+    },
+    "$moment": {
+        "args": "[str]",
+        "desc": "Получает date объект, используя библиотеку Moment."
+    }
+}

packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json

@@ -22,7 +22,8 @@
             "color": "颜色",
             "position": "位置",
             "enable": "启用",
-            "disable": "禁用"
+            "disable": "禁用",
+            "upload": "上传"
         },
         "type": {
             "string": "字符串",
@@ -96,7 +97,7 @@
             "rename": "重命名",
             "delete": "删除",
             "keyboardShortcuts": "键盘快捷方式",
-            "login": "登陆",
+            "login": "登录",
             "logout": "退出",
             "editPalette": "节点管理",
             "other": "其他",
@@ -121,16 +122,16 @@
         "zoom-in": "放大"
     },
     "user": {
-        "loggedInAs": "作为 __name__ 登陆",
+        "loggedInAs": "作为 __name__ 登录",
         "username": "账号",
         "password": "密码",
-        "login": "登陆",
-        "loginFailed": "登陆失败",
+        "login": "登录",
+        "loginFailed": "登录失败",
         "notAuthorized": "未授权",
         "errors": {
-            "settings": "设置信息需要登陆后才能访问",
-            "deploy": "改动需要登陆后才能部署",
-            "notAuthorized": "此操作需要登陆后才能执行"
+            "settings": "设置信息需要登录后才能访问",
+            "deploy": "改动需要登录后才能部署",
+            "notAuthorized": "此操作需要登录后才能执行"
         }
     },
     "notification": {
@@ -181,7 +182,8 @@
             "create-default-package": "创建默认的包文件",
             "no-thanks": "不了，谢谢",
             "create-default-project": "创建默认项目文件",
-            "show-merge-conflicts": "显示合并冲突"
+            "show-merge-conflicts": "显示合并冲突",
+            "unknownNodesButton": "搜索未知节点"
         }
     },
     "clipboard": {
@@ -197,6 +199,8 @@
         "flow_plural": "__count__ 个流程",
         "subflow": "__count__ 个子流程",
         "subflow_plural": "__count__ 子流程",
+        "replacedNodes": "__count__ 个节点被置换",
+        "replacedNodes_plural": "__count__ 个节点被置换",
         "pasteNodes": "在这里粘贴节点",
         "selectFile": "选择要导入的文件",
         "importNodes": "导入节点",
@@ -212,6 +216,9 @@
         "groupCopied_plural": "已复制 __count__ 个groups",
         "groupStyleCopied": "已复制组风格",
         "invalidFlow": "无效的流程: __message__",
+        "recoveredNodes": "复原的节点",
+        "recoveredNodesInfo": "导入节点时，此流上的节点缺少有效的流ID。 它们已被添加到此流中，您可以复原或删除它们。",
+        "recoveredNodesNotification": "<p>导入的节点缺少有效的流ID</p><p>已将它们添加到名为 '__flowName__'的新流中。</p>",
         "export": {
             "selected": "已选择的节点",
             "current": "现在的节点",
@@ -219,20 +226,26 @@
             "compact": "紧凑",
             "formatted": "已格式化",
             "copy": "导出到剪贴板",
-            "export": "到处到库",
+            "export": "导出到库",
             "exportAs": "导出为",
             "overwrite": "替换",
             "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"
         },
         "import": {
             "import": "导入到",
+            "importSelected": "导入所选项",
+            "importCopy": "导入副本",
+            "viewNodes": "查看节点",
             "newFlow": "新流程",
+            "replace": "置换",
             "errors": {
                 "notArray": "输入的不是JSON数组",
                 "itemNotObject": "输入的流无效 - 项目 __index__ 不是节点对象",
                 "missingId": "输入的流无效-项 __index__ 缺少'id'属性",
                 "missingType": "输入的流程无效-项 __index__ 缺少'类型'属性"
-            }
+            },
+            "conflictNotification1": "您要导入的某些节点已经存在于工作空间中。",
+            "conflictNotification2": "选择要导入的节点，并确认要替换现有的节点还是导入它们的副本"
         },
         "copyMessagePath": "已复制路径",
         "copyMessageValue": "已复制数值",
@@ -252,7 +265,9 @@
         "successfulRestart": "成功重启流程",
         "deployFailed": "部署失败: __message__",
         "unusedConfigNodes": "您有一些未使用的配置节点",
-        "unusedConfigNodesLink": "点击此处查看它们",
+        "unusedConfigNodesButton":"搜索未使用的配置节点",
+        "unknownNodesButton":"搜索未知节点",
+        "invalidNodesButton":"搜索无效节点",
         "errors": {
             "noResponse": "服务器没有响应"
         },
@@ -533,6 +548,7 @@
             "sortAZ": "a-z顺序",
             "sortRecent": "日期顺序",
             "more": "增加 __count__ 个",
+            "upload": "上传模块tgz文件",
             "errors": {
                 "catalogLoadFailed": "无法加载节点目录。<br>查看浏览器控制台了解更多信息",
                 "installFailed": "无法安装: __module__<br>__message__<br>查看日志了解更多信息",
@@ -601,14 +617,7 @@
             "empty": "空的",
             "globalConfig": "全局配置节点",
             "triggerAction": "触发动作",
-            "find": "在工作区中查找",
-            "search": {
-                "configNodes": "配置节点",
-                "unusedConfigNodes": "未使用的配置节点",
-                "invalidNodes": "无效的节点",
-                "uknownNodes": "未知的节点",
-                "unusedSubflows": "未使用的子流程"
-            }
+            "find": "在工作区中查找"
         },
         "help": {
             "name": "帮助",
@@ -635,7 +644,7 @@
         },
         "context": {
             "name": "上下文数据",
-            "label": "上下午",
+            "label": "上下文",
             "none": "未选择",
             "refresh": "刷新以加载",
             "empty": "空",
@@ -709,6 +718,12 @@
                 "committerTip": "保留空白以使用系统默认值",
                 "userName": "用户名",
                 "email": "电子邮件",
+                "workflow": "工作流",
+                "workfowTip": "选择您偏好的工作流",
+                "workflowManual": "手动",
+                "workflowManualTip": "所有更改都必须在“历史记录”侧边栏中手动提交",
+                "workflowAuto": "自动",
+                "workflowAutoTip": "每次部署后都会自动提交更改",
                 "sshKeys": "SSH密钥",
                 "sshKeysTip": "允许您创建到远程git存储库的安全连接。",
                 "add": "添加密钥",
@@ -823,7 +838,14 @@
     },
     "search": {
         "empty": "找不到匹配",
-        "addNode": "添加一个节点..."
+        "addNode": "添加一个节点...",
+        "options": {
+            "configNodes": "配置节点",
+            "unusedConfigNodes": "未使用的配置节点",
+            "invalidNodes": "无效的节点",
+            "uknownNodes": "未知的节点",
+            "unusedSubflows": "未使用的子流程"
+        }
     },
     "expressionEditor": {
         "functions": "功能",

packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json

@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数： `function（value [，index [，array []]]）` 其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例： `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）进行编码。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "解码先前由encodeUrl创建的统一资源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },

packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json

@@ -22,7 +22,8 @@
             "color": "顏色",
             "position": "位置",
             "enable": "啟用",
-            "disable": "禁用"
+            "disable": "禁用",
+            "upload": "上傳"
         },
         "type": {
             "string": "字符串",
@@ -181,7 +182,8 @@
             "create-default-package": "創建默認的包文件",
             "no-thanks": "不了，謝謝",
             "create-default-project": "創建默認項目文件",
-            "show-merge-conflicts": "顯示合併衝突"
+            "show-merge-conflicts": "顯示合併衝突",
+            "unknownNodesButton": "搜索未知節點"
         }
     },
     "clipboard": {
@@ -197,6 +199,8 @@
         "flow_plural": "__count__ 多流程",
         "subflow": "__count__ 子流程",
         "subflow_plural": "__count__ 多子流程",
+        "replacedNodes": "__count__ 個節點被置換",
+        "replacedNodes_plural": "__count__ 個節點被置換",
         "pasteNodes": "在這裡粘貼節點",
         "selectFile": "匯入所選檔案",
         "importNodes": "匯入節點",
@@ -212,6 +216,9 @@
         "groupCopied_plural": "已複製 __count__ 個groups",
         "groupStyleCopied": "已複製組風格",
         "invalidFlow": "無效的流程: __message__",
+        "recoveredNodes": "復原的節點",
+        "recoveredNodesInfo": "導入節點時，此流上的節點缺少有效的流ID。它們已被添加到此流中，您可以復原或刪除它們。",
+        "recoveredNodesNotification": "<p>導入的節點缺少有效的流ID</p><p>已將它們添加到名為 '__flowName__'的新流中。</p>",
         "export": {
             "selected": "已選擇的節點",
             "current": "現在的節點",
@@ -226,13 +233,19 @@
         },
         "import": {
             "import": "匯入到",
+            "importSelected": "導入所選項",
+            "importCopy": "導入副本",
+            "viewNodes": "查看節點",
             "newFlow": "新流程",
+            "replace": "置換",
             "errors": {
                 "notArray": "輸入的不是JSON數組",
                 "itemNotObject": "輸入的流程無效-項目 __index__ 不是節點對象",
                 "missingId": "輸入的流程無效-項 __index__ 缺少“ id”屬性",
                 "missingType": "輸入的流程無效-項 __index__ 缺少“類型”屬性"
-            }
+            },
+            "conflictNotification1": "您要導入的某些節點已經存在於工作空間中。",
+            "conflictNotification2": "選擇要導入的節點，並確認要替換現有的節點還是導入它們的副本"
         },
         "copyMessagePath": "已複製路徑",
         "copyMessageValue": "已複製數值",
@@ -252,7 +265,9 @@
         "successfulRestart": "成功重啟流程",
         "deployFailed": "部署失敗: __message__",
         "unusedConfigNodes": "您有一些未使用的配置節點",
-        "unusedConfigNodesLink": "點擊此處查看它們",
+        "unusedConfigNodesButton":"搜索未使用的配置節點",
+        "unknownNodesButton":"搜索未知節點",
+        "invalidNodesButton":"搜索無效節點",
         "errors": {
             "noResponse": "伺服器沒有回應"
         },
@@ -533,6 +548,7 @@
             "sortAZ": "a-z順序",
             "sortRecent": "日期順序",
             "more": "增加 __count__ 個",
+            "upload": "上傳模塊tgz文件",
             "errors": {
                 "catalogLoadFailed": "無法載入節點目錄。<br>查看瀏覽器控制臺瞭解更多資訊",
                 "installFailed": "無法安裝: __module__<br>__message__<br>查看日誌瞭解更多資訊",
@@ -601,14 +617,7 @@
             "empty": "空的",
             "globalConfig": "全局配置節點",
             "triggerAction": "觸發動作",
-            "find": "在工作區中查找",
-            "search": {
-                "configNodes": "配置節點",
-                "unusedConfigNodes": "未使用的配置節點",
-                "invalidNodes": "無效的節點",
-                "uknownNodes": "未知的節點",
-                "unusedSubflows": "未使用的子流程"
-            }
+            "find": "在工作區中查找"
         },
         "help": {
             "name": "幫助",
@@ -709,6 +718,12 @@
                 "committerTip": "保留空白以使用系統默認值",
                 "userName": "用戶名",
                 "email": "電子郵件",
+                "workflow": "工作流",
+                "workfowTip": "選擇您偏好的工作流",
+                "workflowManual": "手動",
+                "workflowManualTip": "所有更改都必須在“歷史記錄”側邊欄中手動提交",
+                "workflowAuto": "自動",
+                "workflowAutoTip": "每次部署後都會自動提交更改",
                 "sshKeys": "SSH密鑰",
                 "sshKeysTip": "允許您創建到遠程git存儲庫的安全連接。",
                 "add": "添加密鑰",
@@ -823,7 +838,14 @@
     },
     "search": {
         "empty": "找不到匹配",
-        "addNode": "添加一個節點..."
+        "addNode": "添加一個節點...",
+        "options": {
+            "configNodes": "配置節點",
+            "unusedConfigNodes": "未使用的配置節點",
+            "invalidNodes": "無效的節點",
+            "uknownNodes": "未知的節點",
+            "unusedSubflows": "未使用的子流程"
+        }
     },
     "expressionEditor": {
         "functions": "功能",

packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json

@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "返回滿足參數function謂語的array參數中的唯一值 (比如：傳遞值時，函數返回布林值“true”)。如果匹配值的數量不唯一時，則拋出異常。\n\n應在以下簽名中提供函數：`function（value [，index [，array []]]）`其中value是數組的每個輸入，index是該值的位置，整個數組作為第三個參數傳遞。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）組件進行編碼。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）進行編碼。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "解碼以前由encodeUrlComponent創建的統一資源定位器（URL）組件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "解碼先前由encodeUrl創建的統一資源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.1.3",
+    "version": "3.1.0-beta.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -14,5 +14,5 @@
             "name": "Dave Conway-Jones"
         }
     ],
-    "main": "./lib/index.js"
+    "main": "./index.js"
 }

packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js

@@ -1,8 +1,8 @@
-ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText='# Prototype\nsnippet proto\n	${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {\n		${4:// body...}\n	};\n# Function\nsnippet fun\n	function ${1?:function_name}(${2:argument}) {\n		${3:// body...}\n	}\n# Anonymous Function\nregex /((=)\\s*|(:)\\s*|(\\()|\\b)/f/(\\))?/\nsnippet f\n	function${M1?: ${1:functionName}}($2) {\n		${0:$TM_SELECTED_TEXT}\n	}${M2?;}${M3?,}${M4?)}\n# Immediate function\ntrigger \\(?f\\(\nendTrigger \\)?\nsnippet f(\n	(function(${1}) {\n		${0:${TM_SELECTED_TEXT:/* code */}}\n	}(${1}));\n# if\nsnippet if\n	if (${1:true}) {\n		${0}\n	}\n# if ... else\nsnippet ife\n	if (${1:true}) {\n		${2}\n	} else {\n		${0}\n	}\n# tertiary conditional\nsnippet ter\n	${1:/* condition */} ? ${2:a} : ${3:b}\n# switch\nsnippet switch\n	switch (${1:expression}) {\n		case \'${3:case}\':\n			${4:// code}\n			break;\n		${5}\n		default:\n			${2:// code}\n	}\n# case\nsnippet case\n	case \'${1:case}\':\n		${2:// code}\n		break;\n	${3}\n\n# while (...) {...}\nsnippet wh\n	while (${1:/* condition */}) {\n		${0:/* code */}\n	}\n# try\nsnippet try\n	try {\n		${0:/* code */}\n	} catch (e) {}\n# do...while\nsnippet do\n	do {\n		${2:/* code */}\n	} while (${1:/* condition */});\n# Object Method\nsnippet :f\nregex /([,{[])|^\\s*/:f/\n	${1:method_name}: function(${2:attribute}) {\n		${0}\n	}${3:,}\n# setTimeout function\nsnippet setTimeout\nregex /\\b/st|timeout|setTimeo?u?t?/\n	setTimeout(function() {${3:$TM_SELECTED_TEXT}}, ${1:10});\n# console.log (Firebug)\nsnippet cl\n	console.log(${1});\n# return\nsnippet ret\n	return ${1:result}\n# for (property in object ) { ... }\nsnippet fori\n	for (var ${1:prop} in ${2:Things}) {\n		${0:$2[$1]}\n	}\n# hasOwnProperty\nsnippet has\n	hasOwnProperty(${1})\n# docstring\nsnippet /**\n	/**\n	 * ${1:description}\n	 *\n	 */\nsnippet @par\nregex /^\\s*\\*\\s*/@(para?m?)?/\n	@param {${1:type}} ${2:name} ${3:description}\nsnippet @ret\n	@return {${1:type}} ${2:description}\n# JSON.parse\nsnippet jsonp\n	JSON.parse(${1:jstr});\n# JSON.stringify\nsnippet jsons\n	JSON.stringify(${1:object});\n# self-defining function\nsnippet sdf\n	var ${1:function_name} = function(${2:argument}) {\n		${3:// initial code ...}\n\n		$1 = function($2) {\n			${4:// main code}\n		};\n	}\n# \nsnippet for-\n	for (var ${1:i} = ${2:Things}.length; ${1:i}--; ) {\n		${0:${2:Things}[${1:i}];}\n	}\n# for (...) {...}\nsnippet for\n	for (var ${1:i} = 0; $1 < ${2:Things}.length; $1++) {\n		${3:$2[$1]}$0\n	}\n# for (...) {...} (Improved Native For-Loop)\nsnippet forr\n	for (var ${1:i} = ${2:Things}.length - 1; $1 >= 0; $1--) {\n		${3:$2[$1]}$0\n	}\n# Node-RED Specific Funcs\nsnippet nodes\n	node.send(${1:msg})\nsnippet clone\n	RED.util.cloneMessage(${1:msg})\nsnippet nodel\n	node.log($1)\nsnippet nodew\n	node.warn($1)\nsnippet nodee\n	node.error($1)\nsnippet noded\n	node.debug($1)\nsnippet done\n	node.done($1)\nsnippet flowg\n	flow.get($1)\nsnippet flows\n	flow.set($1, $2)\nsnippet globalg\n	global.get($1)\nsnippet globals\n	global.set($1, $2)\n',t.scope="nrjavascript"});
-                (function() {
+;                (function() {
                     ace.require(["ace/snippets/nrjavascript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
                         }
                     });
                 })();
+            

packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js

@@ -76,13 +76,12 @@ oop.inherits(NRJavaScriptWorker, Mirror);
 
 (function() {
     this.setOptions = function(options) {
-        this.options = options || {
+        o.options = {
             // undef: true,
             // unused: true,
-            esnext: true,
-            moz: true,
+            esversion: 9,
             devel: true,
-            browser: true,
+            browser: false,
             node: true,
             laxcomma: true,
             laxbreak: true,
@@ -92,8 +91,17 @@ oop.inherits(NRJavaScriptWorker, Mirror);
             maxerr: 100,
             expr: true,
             multistr: true,
-            globalstrict: true
+            strict: false,
+            sub: true,
+            asi: true
         };
+        if (options) {
+            for (var opt in options) {
+                if (options.hasOwnProperty(opt)) {
+                    o.options[opt] = options[opt];
+                }
+            }
+        }
         this.doc.getValue() && this.deferredUpdate.schedule(100);
     };
 
@@ -119,6 +127,8 @@ oop.inherits(NRJavaScriptWorker, Mirror);
         if (!value)
             return this.sender.emit("annotate", []);
 
+        var originalValue = value;
+
         // [Node-RED] wrap the code in a function
         value = "async function __nodered__(msg) {\n"+value+"\n}";
 
@@ -138,6 +148,7 @@ oop.inherits(NRJavaScriptWorker, Mirror);
                 continue;
             var raw = error.raw;
             var type = "warning";
+            var line = error.line - 2;
 
             if (raw == "Missing semicolon.") {
                 var str = error.evidence.substr(error.character);
@@ -166,9 +177,62 @@ oop.inherits(NRJavaScriptWorker, Mirror);
                 type = "info";
             }
 
+            if (raw === "Unmatched '{a}'." && line === -1) {
+                // This is an unmatched { error. It has incorrectly matched it
+                // against the { in the added line. Need to find the next valid {
+                // This code scans through the original code looking for the first '{'
+                // that is not in a comment or string.
+                // It will incorrectly find a '{' if it is inside a regex... but
+                // at least the error will be shown somwhere. There are only
+                // so many hours in the day to fix every tiny edge case of an
+                // edge case.
+                var inSingleComment = false;
+                var inMultiComment = false;
+                var inString = false;
+                var stringQ;
+                var lineNumber = 0;
+                for (var pos = 0;pos<originalValue.length;pos++) {
+                    var c = originalValue[pos];
+                    if (c === "\\") {
+                        pos++;
+                    } else if (inSingleComment) {
+                        if (c === "\n") {
+                            lineNumber++;
+                            inSingleComment = false;
+                        }
+                    } else if (inMultiComment) {
+                        if (c === "*" && originalValue[pos+1] === "/") {
+                            pos++;
+                            inMultiComment = false;
+                        } else if (c === "\n") {
+                            lineNumber++;
+                        }
+                    } else if (inString) {
+                        if (c === stringQ) {
+                            inString = false;
+                        }
+                    } else if (c === "'" || c === "\"") {
+                        inString = true;
+                        stringQ = c;
+                    } else if (c === "/") {
+                        if (originalValue[pos+1] === "/") {
+                            inSingleComment = true;
+                        } else if (originalValue[pos+1] === "*") {
+                            inMultiComment = true;
+                        }
+                    } else if (c === "\n") {
+                        lineNumber++;
+                    } else if (c === "{") {
+                        // found it!
+                        break;
+                    }
+                }
+                line = lineNumber;
+            }
+
             errors.push({
                 // [Node-RED] offset the row for the added line
-                row: error.line-2,
+                row: Math.max(0,line),
                 column: error.character-1,
                 text: error.reason,
                 type: type,

packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.svg

@@ -0,0 +1 @@
+<svg width="50" height="5" viewBox="0, 0, 50, 5" xmlns="http://www.w3.org/2000/svg"><path d="M0 1H50V4H0Z" fill="#CCC"/></svg>

packages/node_modules/@node-red/editor-client/src/images/grip.svg

@@ -0,0 +1 @@
+<svg width="5" height="50" viewBox="0, 0, 5, 50" xmlns="http://www.w3.org/2000/svg"><path d="M1 0H4V50H1Z" fill="#CCC"/></svg>

packages/node_modules/@node-red/editor-client/src/images/node-red-256.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="512" width="512"><g transform="translate(0 -540.36)"><path fill="#8f0000" color="#000" d="M0 540.36h512v392H0z"/><rect ry="0" height="108.23" width="500.23" stroke="#fff" y="938.25" x="5.89" stroke-width="11.77" fill="#fff"/><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;solid-color:#000;block-progression:tb;text-decoration-line:none;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" d="M122.88 305.82a4.46 4.46 0 0 0-4.38 4.42v.78c-2.23.1-4.04.54-5.33 1.43a10.5 10.5 0 0 0-3.18 3.87c-.71 1.3-1.3 2.41-2.15 3.2-.72.66-1.8 1.12-3.45 1.32a4.37 4.37 0 0 0-4.3-3.95H82.91a4.43 4.43 0 0 0-4.42 4.35v4.24a4.43 4.43 0 0 0 4.42 4.36h17.16a4.4 4.4 0 0 0 4.4-4.36v-1.6c9.72.14 12.46 2.6 15.59 5.33 3 2.62 6.66 5.38 15.43 5.5v.73a4.49 4.49 0 0 0 4.46 4.38h17.09c2.38 0 4.45-2 4.45-4.38v-4.24a4.49 4.49 0 0 0-4.45-4.38h-17.1c-2.38 0-4.45 2-4.45 4.38v.58c-8.1-.06-10.48-2.15-13.5-4.79-2.5-2.19-5.64-4.58-11.94-5.58 1.17-1.18 1.88-2.52 2.51-3.66.68-1.23 1.29-2.2 2.27-2.88.76-.52 1.98-.84 3.66-.94v.55c0 2.39 2 4.34 4.38 4.34h17.24a4.39 4.39 0 0 0 4.38-4.34v-4.24c0-2.38-2-4.42-4.38-4.42zm0 3h17.24c.8 0 1.38.62 1.38 1.42v4.24c0 .81-.57 1.34-1.38 1.34h-17.24c-.8 0-1.38-.53-1.38-1.34v-4.24c0-.8.57-1.42 1.38-1.42zm-39.96 11.02h17.16c.81 0 1.42.6 1.42 1.4v4.24c0 .81-.61 1.41-1.42 1.41H82.92c-.8 0-1.42-.6-1.42-1.4v-4.25c0-.8.61-1.4 1.42-1.4zm57.04 9.98h17.09c.8 0 1.45.57 1.45 1.38v4.17c0 .8-.65 1.45-1.45 1.45h-17.1c-.8 0-1.45-.65-1.45-1.45v-4.17c0-.8.65-1.38 1.46-1.38z" fill="#fff" color="#000" transform="matrix(4 0 0 4 -162 -450.91)"/><g fill="#8f0000"><path d="M91 954.34v8.45l-8 1.45v60.07H69.03l-28.53-47.1-.5.05v37.2l8 1.44v8.41H19v-8.4l7.45-1.45v-50.22L19 962.79v-8.46h21.48l28.37 47.1.15-.04v-37.15l-7-1.45v-8.45h29zM95 997.83q0-11.63 6.49-19.03 6.53-7.45 18.02-7.45 11.53 0 18.02 7.4 6.54 7.4 6.54 19.08v1q0 11.74-6.54 19.14-6.49 7.35-17.93 7.35-11.58 0-18.11-7.35-6.5-7.4-6.5-19.13v-1.01zm14.03 1q0 7.12 2.5 11.45 2.5 4.28 8.08 4.28 5.43 0 7.93-4.33 2.54-4.33 2.54-11.4v-1q0-6.92-2.54-11.3-2.55-4.37-8.03-4.37t-7.98 4.37-2.5 11.3v1zM184.48 1017.96a17.15 17.15 0 0 1-5.82 5.48 15.17 15.17 0 0 1-7.59 1.88c-6.4 0-11.4-2.35-14.95-7.03-3.52-4.67-5.13-10.86-5.13-18.55v-1c0-8.21 1.62-14.83 5.18-19.86 3.56-5.03 8.56-7.54 15-7.54 2.6 0 4.93.57 7.01 1.73a17.94 17.94 0 0 1 5.81 4.8v-18.64l-8-1.45v-8.46h22v65.13l6 1.44v8.43h-18.45l-1.06-6.36zm-19.49-18.22c0 4.55.63 8.14 2.14 10.77 1.54 2.6 4.04 3.9 7.5 3.9 2.05 0 3.83-.43 5.33-1.26 1.5-.83 3.07-2.03 4.03-3.6v-22.06a11.27 11.27 0 0 0-4.03-3.85 9.62 9.62 0 0 0-5.24-1.4c-3.43 0-5.92 1.53-7.5 4.57s-2.23 7.02-2.23 11.92v1.01zM233.7 1025.28c-7.5 0-13.5-2.4-17.98-7.21-4.48-4.81-6.73-10.91-6.73-18.32v-1.92c0-7.72 2.12-14.08 6.35-19.08 4.26-5 9.96-7.46 17.1-7.43 7.03 0 12.47 2.1 16.35 6.33a23.46 23.46 0 0 1 6.2 17.15v7.52h-31.43l-.1.41c.26 3.43 1.4 6.25 3.41 8.46 2.05 2.21 4.83 3.32 8.32 3.32 3.1 0 5.69-.3 7.74-.91 2.05-.64 4.29-1.64 6.73-2.98l3.8 8.65a27.59 27.59 0 0 1-8.37 4.28 35.28 35.28 0 0 1-11.4 1.73zm-1.25-43.16c-2.6 0-4.65.99-6.15 2.98s-2.44 4.6-2.8 7.83l.15.4H241v-1.41c0-2.98-.84-5.35-2.25-7.11-1.37-1.8-3.47-2.7-6.3-2.7zM291.99 1000.32h-27v-11h27zM331.88 954.34c7.95 0 14.18 1.82 18.7 5.47 4.52 3.63 6.4 8.64 6.4 15.05 0 3.52-.57 6.58-2.46 9.18-1.89 2.6-4.66 4.7-8.31 6.3 4.13 1.21 7.1 3.25 8.89 6.1a19.02 19.02 0 0 1 2.89 10.52v3.56c0 1.54.15 2.74.76 3.6.6.84 1.62 1.34 3.03 1.5l1.2.24v8.46h-6.73c-4.58 0-7.8-1.24-9.66-3.7s-2.6-5.66-2.6-9.57v-3.99c0-3.4-1.1-6.05-2.93-7.98-1.8-1.95-4.34-2.98-7.64-3.07H322v18.45l7 1.44v8.42h-29v-8.42l8-1.44v-50.22l-8-1.44v-8.46h31.89zm-9.95 30.85h9.71c3.91 0 6.84-.83 8.8-2.5s2.93-4.07 2.93-7.2c0-3.15-.98-5.65-2.93-7.5-1.92-1.9-4.78-2.84-8.56-2.84h-9.9v20.04zM412.99 993.32h-23v20h22.21l.63-8h10.2v18.99H368v-8.42l8-1.44v-50.22l-8-1.44v-8.47h54.95v19h-10.3l-.63-8H390v17h23v11zM462.48 954.36c8.55 0 15.6 2.71 21.14 8.19 5.55 5.45 8.36 12.42 8.36 20.98v11.58c0 8.59-2.81 15.63-8.36 21.08-5.54 5.41-12.59 8.12-21.14 8.12h-31.5v-8.41l7-1.52v-50.22l-7-1.37v-8.43l7.46-.08 24.04.08zm-10.5 10.76v48.4l9.77.02c5.03.02 8.98-1.7 11.83-5.1 2.85-3.39 4.4-7.8 4.4-13.28v-11.68c0-5.42-1.55-9.84-4.4-13.24-2.85-3.4-6.8-5.1-11.83-5.1l-9.77-.02z"/></g></g></svg>

packages/node_modules/@node-red/editor-client/src/images/start.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
+    <path color="#000" fill="#8c101c" d="M0 0h32v32H0z"></path>
+    <path style="fill:#ffffff;stroke:#000000;stroke-width:0" d="M 24,16 8,24 8,8 Z" fill="none" stroke="#000" stroke-width="1.5"></path>
+</svg>

packages/node_modules/@node-red/editor-client/src/images/stop.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
+    <path color="#000" fill="#8c101c" d="M0 0h32v32H0z"></path>
+    <rect style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;" width="15" height="15" x="8" y="8.5"></rect>
+</svg>

packages/node_modules/@node-red/editor-client/src/js/history.js

@@ -13,10 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+/** 
+ * An API for undo / redo history buffer
+ * @namespace RED.history
+*/
 RED.history = (function() {
     var undoHistory = [];
     var redoHistory = [];
 
+    function nodeOrJunction(id) {
+        var node = RED.nodes.node(id);
+        if (node) {
+            return node;
+        }
+        return RED.nodes.junction(id);
+    }
+
     function undoEvent(ev) {
         var i;
         var len;
@@ -37,25 +50,43 @@ RED.history = (function() {
                     inverseEv.events.push(r);
                 }
             } else if (ev.t == 'replace') {
-                inverseEv = {
-                    t: 'replace',
-                    config: RED.nodes.createCompleteNodeSet(),
-                    changed: {},
-                    rev: RED.nodes.version()
-                };
-                RED.nodes.clear();
-                var imported = RED.nodes.import(ev.config);
-                imported[0].forEach(function(n) {
-                    if (ev.changed[n.id]) {
-                        n.changed = true;
-                        inverseEv.changed[n.id] = true;
-                    }
-                })
+                if (ev.complete) {
+                    // This is a replace of everything. We can short-cut
+                    // the logic by clearing everyting first, then importing
+                    // the ev.config.
+                    // Used by RED.diff.mergeDiff
+                    inverseEv = {
+                        t: 'replace',
+                        config: RED.nodes.createCompleteNodeSet(),
+                        changed: {},
+                        rev: RED.nodes.version()
+                    };
+                    RED.nodes.clear();
+                    var imported = RED.nodes.import(ev.config);
+                    imported.nodes.forEach(function(n) {
+                        if (ev.changed[n.id]) {
+                            n.changed = true;
+                            inverseEv.changed[n.id] = true;
+                        }
+                    })
 
-                RED.nodes.version(ev.rev);
+                    RED.nodes.version(ev.rev);
+                } else {
+                    var importMap = {};
+                    ev.config.forEach(function(n) {
+                        importMap[n.id] = "replace";
+                    })
+                    var importedResult = RED.nodes.import(ev.config,{importMap: importMap})
+                    inverseEv = {
+                        t: 'replace',
+                        config: importedResult.removedNodes,
+                        dirty: RED.nodes.dirty()
+                    }
+                }
             } else if (ev.t == 'add') {
                 inverseEv = {
                     t: "delete",
+                    dirty: RED.nodes.dirty()
                 };
                 if (ev.nodes) {
                     inverseEv.nodes = [];
@@ -83,6 +114,23 @@ RED.history = (function() {
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
+                if (ev.junctions) {
+                    inverseEv.junctions = [];
+                    for (i=0;i<ev.junctions.length;i++) {
+                        inverseEv.junctions.push(ev.junctions[i]);
+                        RED.nodes.removeJunction(ev.junctions[i]);
+                        if (ev.junctions[i].g) {
+                            var group = RED.nodes.group(ev.junctions[i].g);
+                            var index = group.nodes.indexOf(ev.junctions[i]);
+                            if (index !== -1) {
+                                group.nodes.splice(index,1);
+                                RED.group.markDirty(group);
+                            }
+                        }
+
+
+                    }
+                }
                 if (ev.groups) {
                     inverseEv.groups = [];
                     for (i = ev.groups.length - 1;i>=0;i--) {
@@ -142,7 +190,8 @@ RED.history = (function() {
 
             } else if (ev.t == "delete") {
                 inverseEv = {
-                    t: "add"
+                    t: "add",
+                    dirty: RED.nodes.dirty()
                 };
                 if (ev.workspaces) {
                     inverseEv.workspaces = [];
@@ -248,6 +297,21 @@ RED.history = (function() {
                         }
                     }
                 }
+                if (ev.junctions) {
+                    inverseEv.junctions = [];
+                    for (i=0;i<ev.junctions.length;i++) {
+                        inverseEv.junctions.push(ev.junctions[i]);
+                        RED.nodes.addJunction(ev.junctions[i]);
+                        if (ev.junctions[i].g) {
+                            group = RED.nodes.group(ev.junctions[i].g);
+                            if (group.nodes.indexOf(ev.junctions[i]) === -1) {
+                                group.nodes.push(ev.junctions[i]);
+                            }
+                            RED.group.markDirty(group)
+                        }
+
+                    }
+                }
                 if (ev.links) {
                     inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
@@ -284,11 +348,12 @@ RED.history = (function() {
             } else if (ev.t == "move") {
                 inverseEv = {
                     t: 'move',
-                    nodes: []
+                    nodes: [],
+                    dirty: RED.nodes.dirty()
                 };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
-                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.n.moved};
                     inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
@@ -320,24 +385,38 @@ RED.history = (function() {
             } else if (ev.t == "edit") {
                 inverseEv = {
                     t: "edit",
-                    changes: {}
+                    changes: {},
+                    changed: ev.node.changed,
+                    dirty: RED.nodes.dirty()
                 };
                 inverseEv.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
                         inverseEv.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
-                            // This is a config node property
-                            var currentConfigNode = RED.nodes.node(ev.node[i]);
-                            if (currentConfigNode) {
-                                currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
-                                RED.events.emit("nodes:change",currentConfigNode);
+                            // This property is a reference to another node or nodes.
+                            var nodeList = ev.node[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                             }
-                            var newConfigNode = RED.nodes.node(ev.changes[i]);
-                            if (newConfigNode) {
-                                newConfigNode.users.push(ev.node);
-                                RED.events.emit("nodes:change",newConfigNode);
+                            nodeList.forEach(function(id) {
+                                var currentConfigNode = RED.nodes.node(id);
+                                if (currentConfigNode && currentConfigNode._def.category === "config") {
+                                    currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
+                                    RED.events.emit("nodes:change",currentConfigNode);
+                                }
+                            });
+                            nodeList = ev.changes[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                             }
+                            nodeList.forEach(function(id) {
+                                var newConfigNode = RED.nodes.node(id);
+                                if (newConfigNode && newConfigNode._def.category === "config") {
+                                    newConfigNode.users.push(ev.node);
+                                    RED.events.emit("nodes:change",newConfigNode);
+                                }
+                            });
                         }
                         ev.node[i] = ev.changes[i];
                     }
@@ -443,6 +522,7 @@ RED.history = (function() {
                     var z = ev.activeWorkspace;
                     var fullNodeList = RED.nodes.filterNodes({z:ev.subflow.subflow.id});
                     fullNodeList = fullNodeList.concat(RED.nodes.groups(ev.subflow.subflow.id))
+                    fullNodeList = fullNodeList.concat(RED.nodes.junctions(ev.subflow.subflow.id))
                     fullNodeList.forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
@@ -452,7 +532,7 @@ RED.history = (function() {
                     });
                     inverseEv.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
-                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
+                        inverseEv.subflows.push(nodeOrJunction(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
@@ -524,10 +604,22 @@ RED.history = (function() {
             } else if (ev.t == "reorder") {
                 inverseEv = {
                     t: 'reorder',
-                    order: RED.nodes.getWorkspaceOrder()
+                    dirty: RED.nodes.dirty()
                 };
-                if (ev.order) {
-                    RED.workspaces.order(ev.order);
+                if (ev.workspaces) {
+                    inverseEv.workspaces = {
+                        from: ev.workspaces.to,
+                        to: ev.workspaces.from
+                    }
+                    RED.workspaces.order(ev.workspaces.from);
+                }
+                if (ev.nodes) {
+                    inverseEv.nodes = {
+                        z: ev.nodes.z,
+                        from: ev.nodes.to,
+                        to: ev.nodes.from
+                    }
+                    RED.nodes.setNodeOrder(ev.nodes.z,ev.nodes.from);
                 }
             } else if (ev.t == "createGroup") {
                 inverseEv = {
@@ -623,6 +715,8 @@ RED.history = (function() {
         push: function(ev) {
             undoHistory.push(ev);
             redoHistory = [];
+            RED.menu.setDisabled("menu-item-edit-undo", false);
+            RED.menu.setDisabled("menu-item-edit-redo", true);
         },
         pop: function() {
             var ev = undoHistory.pop();
@@ -630,13 +724,24 @@ RED.history = (function() {
             if (rev) {
                 redoHistory.push(rev);
             }
+            RED.menu.setDisabled("menu-item-edit-undo", undoHistory.length === 0);
+            RED.menu.setDisabled("menu-item-edit-redo", redoHistory.length === 0);
         },
         peek: function() {
             return undoHistory[undoHistory.length-1];
         },
+        replace: function(ev) {
+            if (undoHistory.length === 0) {
+                RED.history.push(ev);
+            } else {
+                undoHistory[undoHistory.length-1] = ev;
+            }
+        },
         clear: function() {
             undoHistory = [];
             redoHistory = [];
+            RED.menu.setDisabled("menu-item-edit-undo", true);
+            RED.menu.setDisabled("menu-item-edit-redo", true);
         },
         redo: function() {
             var ev = redoHistory.pop();
@@ -646,6 +751,8 @@ RED.history = (function() {
                     undoHistory.push(uev);
                 }
             }
+            RED.menu.setDisabled("menu-item-edit-undo", undoHistory.length === 0);
+            RED.menu.setDisabled("menu-item-edit-redo", redoHistory.length === 0);
         }
     }
 

packages/node_modules/@node-red/editor-client/src/js/hooks.js

@@ -0,0 +1,156 @@
+RED.hooks = (function() {
+
+    var VALID_HOOKS = [
+
+    ]
+
+    var hooks = { }
+    var labelledHooks = { }
+
+    function add(hookId, callback) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+
+        // if (VALID_HOOKS.indexOf(id) === -1) {
+        //     throw new Error("Invalid hook '"+id+"'");
+        // }
+        if (label && labelledHooks[label] && labelledHooks[label][id]) {
+            throw new Error("Hook "+hookId+" already registered")
+        }
+        var hookItem = {cb:callback, previousHook: null, nextHook: null }
+
+        var tailItem = hooks[id];
+        if (tailItem === undefined) {
+            hooks[id] = hookItem;
+        } else {
+            while(tailItem.nextHook !== null) {
+                tailItem = tailItem.nextHook
+            }
+            tailItem.nextHook = hookItem;
+            hookItem.previousHook = tailItem;
+        }
+
+        if (label) {
+            labelledHooks[label] = labelledHooks[label]||{};
+            labelledHooks[label][id] = hookItem;
+        }
+    }
+    function remove(hookId) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+        if ( !label) {
+            throw new Error("Cannot remove hook without label: "+hookId)
+        }
+        if (labelledHooks[label]) {
+            if (id === "*") {
+                // Remove all hooks for this label
+                var hookList = Object.keys(labelledHooks[label]);
+                for (var i=0;i<hookList.length;i++) {
+                    removeHook(hookList[i],labelledHooks[label][hookList[i]])
+                }
+                delete labelledHooks[label];
+            } else if (labelledHooks[label][id]) {
+                removeHook(id,labelledHooks[label][id])
+                delete labelledHooks[label][id];
+                if (Object.keys(labelledHooks[label]).length === 0){
+                    delete labelledHooks[label];
+                }
+            }
+        }
+    }
+
+    function removeHook(id,hookItem) {
+        var previousHook = hookItem.previousHook;
+        var nextHook = hookItem.nextHook;
+
+        if (previousHook) {
+            previousHook.nextHook = nextHook;
+        } else {
+            hooks[id] = nextHook;
+        }
+        if (nextHook) {
+            nextHook.previousHook = previousHook;
+        }
+        hookItem.removed = true;
+        if (!previousHook && !nextHook) {
+            delete hooks[id];
+        }
+    }
+
+    function trigger(hookId, payload, done) {
+        var hookItem = hooks[hookId];
+        if (!hookItem) {
+            if (done) {
+                done();
+            }
+            return;
+        }
+        function callNextHook(err) {
+            if (!hookItem || err) {
+                if (done) { done(err) }
+                return err;
+            }
+            if (hookItem.removed) {
+                hookItem = hookItem.nextHook;
+                return callNextHook();
+            }
+            var callback = hookItem.cb;
+            if (callback.length === 1) {
+                try {
+                    let result = callback(payload);
+                    if (result === false) {
+                        // Halting the flow
+                        if (done) { done(false) }
+                        return result;
+                    }
+                    hookItem = hookItem.nextHook;
+                    return callNextHook();
+                } catch(e) {
+                    console.warn(e);
+                    if (done) { done(e);}
+                    return e;
+                }
+            } else {
+                // There is a done callback
+                try {
+                    callback(payload,function(result) {
+                        if (result === undefined) {
+                            hookItem = hookItem.nextHook;
+                            callNextHook();
+                        } else {
+                            if (done) { done(result)}
+                        }
+                    })
+                } catch(e) {
+                    console.warn(e);
+                    if (done) { done(e) }
+                    return e;
+                }
+            }
+        }
+
+        return callNextHook();
+    }
+
+    function clear() {
+        hooks = {}
+        labelledHooks = {}
+    }
+
+    function has(hookId) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+        if (label) {
+            return !!(labelledHooks[label] && labelledHooks[label][id])
+        }
+        return !!hooks[id]
+    }
+
+    return {
+        has: has,
+        clear: clear,
+        add: add,
+        remove: remove,
+        trigger: trigger
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/i18n.js

@@ -18,53 +18,69 @@ RED.i18n = (function() {
 
     var apiRootUrl;
 
+    function detectLanguage() {
+        return navigator.language
+    }
+
     return {
         init: function(options, done) {
             apiRootUrl = options.apiRootUrl||"";
-            var preferredLanguage = localStorage.getItem("editor-language");
+            var preferredLanguage = localStorage.getItem("editor-language") || detectLanguage();
             var opts = {
-                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
-                dynamicLoad: false,
-                load:'current',
-                ns: {
-                    namespaces: ["editor","node-red","jsonata","infotips"],
-                    defaultNs: "editor"
+                compatibilityJSON: 'v3',
+                backend: {
+                    loadPath: apiRootUrl+'locales/__ns__?lng=__lng__',
                 },
+                lng: 'en-US',
+                // debug: true,
+                preload:['en-US'],
+                ns: ["editor","node-red","jsonata","infotips"],
+                defaultNS: "editor",
                 fallbackLng: ['en-US'],
-                useCookie: false,
-                returnObjectTrees: true
+                returnObjects: true,
+                keySeparator: ".",
+                nsSeparator: ":",
+                interpolation: {
+                    unescapeSuffix: 'HTML',
+                    escapeValue: false,
+                    prefix: '__',
+                    suffix: '__'
+                }
             };
             if (preferredLanguage) {
                 opts.lng = preferredLanguage;
             }
-            i18n.init(opts,function() {
+
+            i18next.use(i18nextHttpBackend).init(opts,function() {
                 done();
             });
+            jqueryI18next.init(i18next, $, { handleName: 'i18n' });
+
+
             RED["_"] = function() {
-                var v = i18n.t.apply(null,arguments);
+                var v = i18next.t.apply(i18next,arguments);
                 if (typeof v === 'string') {
                     return v;
                 } else {
                     return arguments[0];
                 }
             }
-
         },
         lang: function() {
             // Gets the active message catalog language. This is based on what
             // locale the editor is using and what languages are available.
             //
-            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var preferredLangs = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var knownLangs = RED.settings.theme("languages")||["en-US"];
             for (var i=0;i<preferredLangs.length;i++) {
                 if (knownLangs.indexOf(preferredLangs[i]) > -1) {
                     return preferredLangs[i]
                 }
             }
-            return 'end-US'
+            return 'en-US'
         },
         loadNodeCatalog: function(namespace,done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
                 $.ajax({
@@ -74,7 +90,7 @@ RED.i18n = (function() {
                     cache: false,
                     url: apiRootUrl+'nodes/'+namespace+'/messages?lng='+lang,
                     success: function(data) {
-                        i18n.addResourceBundle(lang,namespace,data);
+                        i18next.addResourceBundle(lang,namespace,data);
                         toLoad--;
                         if (toLoad === 0) {
                             done();
@@ -86,7 +102,7 @@ RED.i18n = (function() {
         },
 
         loadNodeCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {
@@ -99,7 +115,7 @@ RED.i18n = (function() {
                     success: function(data) {
                         var namespaces = Object.keys(data);
                         namespaces.forEach(function(ns) {
-                            i18n.addResourceBundle(lang,ns,data[ns]);
+                            i18next.addResourceBundle(lang,ns,data[ns]);
                         });
                         toLoad--;
                         if (toLoad === 0) {
@@ -108,6 +124,32 @@ RED.i18n = (function() {
                     }
                 });
             })
-        }
+        },
+
+        loadPluginCatalogs: function(done) {
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
+            var toLoad = languageList.length;
+
+            languageList.forEach(function(lang) {
+                $.ajax({
+                    headers: {
+                        "Accept":"application/json"
+                    },
+                    cache: false,
+                    url: apiRootUrl+'plugins/messages?lng='+lang,
+                    success: function(data) {
+                        var namespaces = Object.keys(data);
+                        namespaces.forEach(function(ns) {
+                            i18next.addResourceBundle(lang,ns,data[ns]);
+                        });
+                        toLoad--;
+                        if (toLoad === 0) {
+                            done();
+                        }
+                    }
+                });
+            })
+        },
+        detectLanguage: detectLanguage
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/keymap.json

@@ -3,16 +3,12 @@
         "alt-shift-p":"core:manage-palette",
         "ctrl-f": "core:search",
         "ctrl-shift-f": "core:list-flows",
-        "ctrl-=": "core:zoom-in",
-        "ctrl--": "core:zoom-out",
-        "ctrl-0": "core:zoom-reset",
-        "ctrl-enter": "core:confirm-edit-tray",
-        "ctrl-escape": "core:cancel-edit-tray",
         "ctrl-d": "core:deploy-flows",
-        "ctrl-g i": "core:show-info-tab",
-        "ctrl-g h": "core:show-help-tab",
-        "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
+        "ctrl-g d": "core:show-debug-tab",
+        "ctrl-g h": "core:show-help-tab",
+        "ctrl-g i": "core:show-info-tab",
+        "ctrl-g v": "core:show-version-control-tab",
         "ctrl-g x": "core:show-context-tab",
         "ctrl-e": "core:show-export-dialog",
         "ctrl-i": "core:show-import-dialog",
@@ -23,7 +19,6 @@
         "ctrl-alt-r": "core:show-remote-diff",
         "ctrl-alt-n": "core:new-project",
         "ctrl-alt-o": "core:open-project",
-        "ctrl-g v": "core:show-version-control-tab",
         "ctrl-shift-l": "core:show-event-log",
         "ctrl-shift-p":"core:show-action-list"
     },
@@ -36,14 +31,21 @@
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
+        "ctrl-backspace": "core:delete-selection-and-reconnect",
         "delete": "core:delete-selection",
+        "ctrl-delete": "core:delete-selection-and-reconnect",
         "enter": "core:edit-selected-node",
+        "ctrl-enter": "core:go-to-selection",
         "ctrl-c": "core:copy-selection-to-internal-clipboard",
         "ctrl-x": "core:cut-selection-to-internal-clipboard",
         "ctrl-v": "core:paste-from-internal-clipboard",
         "ctrl-z": "core:undo",
         "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
+        "escape": "core:select-none",
+        "alt-s u": "core:select-upstream-nodes",
+        "alt-s d": "core:select-downstream-nodes",
+        "alt-s c": "core:select-connected-nodes",
         "shift-?": "core:show-help",
         "w": "core:scroll-view-up",
         "d": "core:scroll-view-right",
@@ -53,19 +55,47 @@
         "shift-d": "core:step-view-right",
         "shift-s": "core:step-view-down",
         "shift-a": "core:step-view-left",
-        "up": "core:move-selection-up",
-        "right": "core:move-selection-right",
-        "down": "core:move-selection-down",
-        "left": "core:move-selection-left",
+        "ctrl-up": "core:move-selection-up",
+        "ctrl-right": "core:move-selection-right",
+        "ctrl-down": "core:move-selection-down",
+        "ctrl-left": "core:move-selection-left",
         "shift-up": "core:step-selection-up",
         "shift-right": "core:step-selection-right",
         "shift-down": "core:step-selection-down",
         "shift-left": "core:step-selection-left",
-        "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab",
+        "ctrl-[": "core:show-previous-tab",
+        "ctrl-]": "core:show-next-tab",
+        "ctrl-shift-left": "core:go-to-previous-location",
+        "ctrl-shift-right": "core:go-to-next-location",
         "ctrl-shift-g": "core:group-selection",
         "ctrl-shift-u": "core:ungroup-selection",
         "ctrl-shift-c": "core:copy-group-style",
-        "ctrl-shift-v": "core:paste-group-style"
+        "ctrl-shift-v": "core:paste-group-style",
+        "right": "core:go-to-nearest-node-on-right",
+        "left": "core:go-to-nearest-node-on-left",
+        "up": "core:go-to-nearest-node-above",
+        "down": "core:go-to-nearest-node-below",
+        "alt-a g": "core:align-selection-to-grid",
+        "alt-a l": "core:align-selection-to-left",
+        "alt-a r": "core:align-selection-to-right",
+        "alt-a t": "core:align-selection-to-top",
+        "alt-a b": "core:align-selection-to-bottom",
+        "alt-a m": "core:align-selection-to-middle",
+        "alt-a c": "core:align-selection-to-center",
+        "alt-a h": "core:distribute-selection-horizontally",
+        "alt-a v": "core:distribute-selection-vertically",
+        "shift-f": "core:search-previous",
+        "f": "core:search-next",
+        "alt-l l": "core:split-wire-with-link-nodes",
+        "alt-w": "core:hide-flow",
+        "alt-shift-w": "core:show-last-hidden-flow",
+        "ctrl-+": "core:zoom-in",
+        "ctrl--": "core:zoom-out",
+        "ctrl-0": "core:zoom-reset"
+
+     },
+     "red-ui-editor-stack": {
+        "ctrl-enter": "core:confirm-edit-tray",
+        "ctrl-escape": "core:cancel-edit-tray"
      }
 }

packages/node_modules/@node-red/editor-client/src/js/plugins.js

@@ -0,0 +1,46 @@
+RED.plugins = (function() {
+    var plugins = {};
+    var pluginsByType = {};
+
+    function registerPlugin(id,definition) {
+        plugins[id] = definition;
+        if (definition.type) {
+            pluginsByType[definition.type] = pluginsByType[definition.type] || [];
+            pluginsByType[definition.type].push(definition);
+        }
+        if (RED._loadingModule) {
+            definition.module = RED._loadingModule;
+            definition["_"] = function() {
+                var args = Array.prototype.slice.call(arguments);
+                var originalKey = args[0];
+                if (!/:/.test(args[0])) {
+                    args[0] = definition.module+":"+args[0];
+                }
+                var result = RED._.apply(null,args);
+                if (result === args[0]) {
+                    return originalKey;
+                }
+                return result;
+            }
+        } else {
+            definition["_"] = RED["_"]
+        }
+        if (definition.onadd && typeof definition.onadd === 'function') {
+            definition.onadd();
+        }
+        RED.events.emit("registry:plugin-added",id);
+    }
+
+    function getPlugin(id) {
+        return plugins[id]
+    }
+
+    function getPluginsByType(type) {
+        return pluginsByType[type] || [];
+    }
+    return {
+        registerPlugin: registerPlugin,
+        getPlugin: getPlugin,
+        getPluginsByType: getPluginsByType
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/polyfills.js

@@ -52,6 +52,5 @@
             Set.prototype = _Set.prototype;
             Set.prototype.constructor = Set;
         }
-
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/red.js

@@ -15,19 +15,65 @@
  **/
 var RED = (function() {
 
-    function appendNodeConfig(nodeConfig,done) {
+
+    function loadPluginList() {
+        loader.reportProgress(RED._("event.loadPlugins"), 10)
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                loader.reportProgress(RED._("event.loadPlugins"), 13)
+                RED.i18n.loadPluginCatalogs(function() {
+                    loadPlugins(function() {
+                        loadNodeList();
+                    });
+                });
+            }
+        });
+    }
+    function loadPlugins(done) {
+        loader.reportProgress(RED._("event.loadPlugins",{count:""}), 17)
+        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+
+        $.ajax({
+            headers: {
+                "Accept":"text/html",
+                "Accept-Language": lang
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                var configs = data.trim().split(/(?=<!-- --- \[red-plugin:\S+\] --- -->)/);
+                var totalCount = configs.length;
+                var stepConfig = function() {
+                    // loader.reportProgress(RED._("event.loadNodes",{count:(totalCount-configs.length)+"/"+totalCount}), 30 + ((totalCount-configs.length)/totalCount)*40 )
+                    if (configs.length === 0) {
+                        done();
+                    } else {
+                        var config = configs.shift();
+                        appendPluginConfig(config,stepConfig);
+                    }
+                }
+                stepConfig();
+            }
+        });
+    }
+
+    function appendConfig(config, moduleIdMatch, targetContainer, done) {
         done = done || function(){};
-        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
         var moduleId;
-        if (m) {
-            moduleId = m[1];
+        if (moduleIdMatch) {
+            moduleId = moduleIdMatch[1];
+            RED._loadingModule = moduleId;
         } else {
             moduleId = "unknown";
         }
         try {
             var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
+            var nodeConfigEls = $("<div>"+config+"</div>");
             var scripts = nodeConfigEls.find("script");
             var scriptCount = scripts.length;
             scripts.each(function(i,el) {
@@ -38,14 +84,15 @@ var RED = (function() {
                     newScript.onload = function() {
                         scriptCount--;
                         if (scriptCount === 0) {
-                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                            $(targetContainer).append(nodeConfigEls);
+                            delete RED._loadingModule;
                             done()
                         }
                     }
                     if ($(el).attr('type') === "module") {
                         newScript.type = "module";
                     }
-                    $("#red-ui-editor-node-configs").append(newScript);
+                    $(targetContainer).append(newScript);
                     newScript.src = RED.settings.apiRootUrl+srcUrl;
                     hasDeferred = true;
                 } else {
@@ -61,7 +108,8 @@ var RED = (function() {
                 }
             })
             if (!hasDeferred) {
-                $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                $(targetContainer).append(nodeConfigEls);
+                delete RED._loadingModule;
                 done();
             }
         } catch(err) {
@@ -70,9 +118,27 @@ var RED = (function() {
                 timeout: 10000
             });
             console.log("["+moduleId+"] "+err.toString());
+            delete RED._loadingModule;
             done();
         }
     }
+    function appendPluginConfig(pluginConfig,done) {
+        appendConfig(
+            pluginConfig,
+            /<!-- --- \[red-plugin:(\S+)\] --- -->/.exec(pluginConfig.trim()),
+            "#red-ui-editor-plugin-configs",
+            done
+        );
+    }
+
+    function appendNodeConfig(nodeConfig,done) {
+        appendConfig(
+            nodeConfig,
+            /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim()),
+            "#red-ui-editor-node-configs",
+            done
+        );
+    }
 
     function loadNodeList() {
         loader.reportProgress(RED._("event.loadPalette"), 20)
@@ -110,7 +176,7 @@ var RED = (function() {
 
     function loadNodes() {
         loader.reportProgress(RED._("event.loadNodes",{count:""}), 30)
-        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
 
         $.ajax({
             headers: {
@@ -135,6 +201,7 @@ var RED = (function() {
                             RED.projects.refresh(function(activeProject) {
                                 loadFlows(function() {
                                     RED.sidebar.info.refresh()
+                                    var showProjectWelcome = false;
                                     if (!activeProject) {
                                         // Projects enabled but no active project
                                         RED.menu.setDisabled('menu-item-projects-open',true);
@@ -142,10 +209,10 @@ var RED = (function() {
                                         if (activeProject === false) {
                                             // User previously decline the migration to projects.
                                         } else { // null/undefined
-                                            RED.projects.showStartup();
+                                            showProjectWelcome = true;
                                         }
                                     }
-                                    completeLoad();
+                                    completeLoad(showProjectWelcome);
                                 });
                             });
                         } else {
@@ -178,11 +245,38 @@ var RED = (function() {
                     var currentHash = window.location.hash;
                     RED.nodes.version(nodes.rev);
                     loader.reportProgress(RED._("event.importFlows"),90 )
-                    RED.nodes.import(nodes.flows);
-                    RED.nodes.dirty(false);
-                    RED.view.redraw(true);
-                    if (/^#flow\/.+$/.test(currentHash)) {
-                        RED.workspaces.show(currentHash.substring(6));
+                    try {
+                        RED.nodes.import(nodes.flows);
+                        RED.nodes.dirty(false);
+                        RED.view.redraw(true);
+                        if (/^#flow\/.+$/.test(currentHash)) {
+                            RED.workspaces.show(currentHash.substring(6),true);
+                        }
+                        if (RED.workspaces.count() > 0) {
+                            const hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                            const workspaces = RED.nodes.getWorkspaceOrder();
+                            if (RED.workspaces.active() === 0) {
+                                for (let index = 0; index < workspaces.length; index++) {
+                                    const ws = workspaces[index];
+                                    if (!hiddenTabs[ws]) {
+                                        RED.workspaces.show(ws);
+                                        break;
+                                    }
+                                }
+                            }
+                            if (RED.workspaces.active() === 0) {
+                                RED.workspaces.show(workspaces[0]);
+                            }
+                        }
+                    } catch(err) {
+                        console.warn(err);
+                        RED.notify(
+                            RED._("event.importError", {message: err.message}),
+                            {
+                                fixed: true,
+                                type: 'error'
+                            }
+                        );
                     }
                 }
                 done();
@@ -190,7 +284,7 @@ var RED = (function() {
         });
     }
 
-    function completeLoad() {
+    function completeLoad(showProjectWelcome) {
         var persistentNotifications = {};
         RED.comms.subscribe("notification/#",function(topic,msg) {
             var parts = topic.split("/");
@@ -203,8 +297,12 @@ var RED = (function() {
                 // handled below
                 return;
             }
+            if (notificationId === "flows-run-state") {
+                // handled in editor-client/src/js/runtime.js
+                return;
+            }
             if (notificationId === "project-update") {
-                loader.start("Loading project",0)
+                loader.start(RED._("event.loadingProject"), 0);
                 RED.nodes.clear();
                 RED.history.clear();
                 RED.view.redraw(true);
@@ -221,7 +319,7 @@ var RED = (function() {
                             "merge-complete": RED._("notification.project.merge-complete")
                         }[msg.action];
                         loader.end()
-                        RED.notify("<p>"+message+"</p>");
+                        RED.notify($("<p>").text(message));
                         RED.sidebar.info.refresh()
                     });
                 });
@@ -259,10 +357,18 @@ var RED = (function() {
                                     }
                                 }
                             ]
-                            // } else if (RED.settings.theme('palette.editable') !== false) {
+                            // } else if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
                         } else {
                             options.buttons = [
                                 {
+                                    text: RED._("notification.label.unknownNodesButton"),
+                                    class: "pull-left",
+                                    click: function() {
+                                        RED.actions.invoke("core:search", "type:unknown ");
+                                    }
+                                },
+                                {
+                                    class: "primary",
                                     text: RED._("common.label.close"),
                                     click: function() {
                                         persistentNotifications[notificationId].hideNotification();
@@ -270,6 +376,16 @@ var RED = (function() {
                                 }
                             ]
                         }
+                    } else if (msg.error === "missing-modules") {
+                        text+="<ul><li>"+msg.modules.map(function(m) { return RED.utils.sanitize(m.module)+(m.error?(" - <small>"+RED.utils.sanitize(""+m.error)+"</small>"):"")}).join("</li><li>")+"</li></ul>";
+                        options.buttons = [
+                            {
+                                text: RED._("common.label.close"),
+                                click: function() {
+                                    persistentNotifications[notificationId].hideNotification();
+                                }
+                            }
+                        ]
                     } else if (msg.error === "credentials_load_failed") {
                         if (RED.settings.theme("projects.enabled",false)) {
                             // projects enabled
@@ -361,12 +477,15 @@ var RED = (function() {
                 persistentNotifications[notificationId].close();
                 delete persistentNotifications[notificationId];
             }
+            if (notificationId === 'runtime-state') {
+                RED.events.emit("runtime-state",msg);
+            }
         });
         RED.comms.subscribe("status/#",function(topic,msg) {
             var parts = topic.split("/");
             var node = RED.nodes.node(parts[1]);
             if (node) {
-                if (msg.hasOwnProperty("text") && msg.text !== null && /^[a-zA-Z]/.test(msg.text)) {
+                if (msg.hasOwnProperty("text") && msg.text !== null && /^[@a-zA-Z]/.test(msg.text)) {
                     msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
                 }
                 node.status = msg;
@@ -380,51 +499,73 @@ var RED = (function() {
             var typeList;
             var info;
             if (topic == "notification/node/added") {
-                var addedTypes = [];
-                msg.forEach(function(m) {
-                    var id = m.id;
-                    RED.nodes.addNodeSet(m);
-                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
-                        $.get('nodes/'+id, function(data) {
-                            appendNodeConfig(data);
+                RED.settings.refreshSettings(function(err, data) {
+                    var addedTypes = [];
+                    msg.forEach(function(m) {
+                        var id = m.id;
+                        RED.nodes.addNodeSet(m);
+                        addedTypes = addedTypes.concat(m.types);
+                        RED.i18n.loadNodeCatalog(id, function() {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                }
+                            });
                         });
                     });
-                });
-                if (addedTypes.length) {
-                    typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
-                    RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
-                }
-                loadIconList();
+                    if (addedTypes.length) {
+                        typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
+                    }
+                    loadIconList();
+                })
             } else if (topic == "notification/node/removed") {
                 for (i=0;i<msg.length;i++) {
                     m = msg[i];
                     info = RED.nodes.removeNodeSet(m.id);
                     if (info.added) {
-                        typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
+                        typeList = "<ul><li>"+m.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
                         RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
                     }
                 }
                 loadIconList();
             } else if (topic == "notification/node/enabled") {
                 if (msg.types) {
-                    info = RED.nodes.getNodeSet(msg.id);
-                    if (info.added) {
-                        RED.nodes.enableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
-                    } else {
-                        $.get('nodes/'+msg.id, function(data) {
-                            appendNodeConfig(data);
-                            typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                            RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
-                        });
-                    }
+                    RED.settings.refreshSettings(function(err, data) {
+                        info = RED.nodes.getNodeSet(msg.id);
+                        if (info.added) {
+                            RED.nodes.enableNodeSet(msg.id);
+                            typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                        } else {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+msg.id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                }
+                            });
+                        }
+                    });
                 }
             } else if (topic == "notification/node/disabled") {
                 if (msg.types) {
                     RED.nodes.disableNodeSet(msg.id);
-                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
                     RED.notify(RED._("palette.event.nodeDisabled", {count:msg.types.length})+typeList,"success");
                 }
             } else if (topic == "notification/node/upgraded") {
@@ -439,19 +580,28 @@ var RED = (function() {
 
         $(".red-ui-header-toolbar").show();
 
+        RED.sidebar.show(":first", true);
+
         setTimeout(function() {
             loader.end();
+            checkFirstRun(function() {
+                if (showProjectWelcome) {
+                    RED.projects.showStartup();
+                }
+            });
         },100);
     }
 
-    function showAbout() {
-        $.get('red/about', function(data) {
-            var aboutHeader = '<div style="text-align:center;">'+
-            '<img width="50px" src="red/images/node-red-icon.svg" />'+
-            '</div>';
-
-            RED.sidebar.help.set(aboutHeader+RED.utils.renderMarkdown(data));
-        });
+    function checkFirstRun(done) {
+        if (RED.settings.theme("tours") === false) {
+            done();
+            return;
+        }
+        if (!RED.settings.get("editor.view.view-show-welcome-tours", true)) {
+            done();
+            return;
+        }
+        RED.actions.invoke("core:show-welcome-tour", RED.settings.get("editor.tours.welcome"), done);
     }
 
     function buildMainMenu() {
@@ -463,6 +613,25 @@ var RED = (function() {
                 {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
             ]});
         }
+        menuOptions.push({id:"menu-item-edit-menu", label:RED._("menu.label.edit"), options: [
+            {id: "menu-item-edit-undo", label:RED._("keyboard.undoChange"), disabled: true, onselect: "core:undo"},
+            {id: "menu-item-edit-redo", label:RED._("keyboard.redoChange"), disabled: true, onselect: "core:redo"},
+            null,
+            {id: "menu-item-edit-cut", label:RED._("keyboard.cutNode"), onselect: "core:cut-selection-to-internal-clipboard"},
+            {id: "menu-item-edit-copy", label:RED._("keyboard.copyNode"), onselect: "core:copy-selection-to-internal-clipboard"},
+            {id: "menu-item-edit-paste", label:RED._("keyboard.pasteNode"), disabled: true, onselect: "core:paste-from-internal-clipboard"},
+            null,
+            {id: "menu-item-edit-copy-group-style", label:RED._("keyboard.copyGroupStyle"), onselect: "core:copy-group-style"},
+            {id: "menu-item-edit-paste-group-style", label:RED._("keyboard.pasteGroupStyle"), disabled: true, onselect: "core:paste-group-style"},
+            null,
+            {id: "menu-item-edit-select-all", label:RED._("keyboard.selectAll"), onselect: "core:select-all-nodes"},
+            {id: "menu-item-edit-select-connected", label:RED._("keyboard.selectAllConnected"), onselect: "core:select-connected-nodes"},
+            {id: "menu-item-edit-select-none", label:RED._("keyboard.selectNone"), onselect: "core:select-none"},
+            null,
+            {id: "menu-item-edit-split-wire-with-links", label:RED._("keyboard.splitWireWithLinks"), onselect: "core:split-wire-with-link-nodes"},
+
+        ]});
+
         menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
             {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
@@ -470,6 +639,25 @@ var RED = (function() {
             {id:"menu-item-action-list",label:RED._("keyboard.actionList"),onselect:"core:show-action-list"},
             null
         ]});
+
+        menuOptions.push({id:"menu-item-arrange-menu", label:RED._("menu.label.arrange"), options: [
+            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
+            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
+            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
+            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"},
+            null,
+            {id: "menu-item-view-tools-align-left", label:RED._("menu.label.alignLeft"), disabled: true, onselect: "core:align-selection-to-left"},
+            {id: "menu-item-view-tools-align-center", label:RED._("menu.label.alignCenter"), disabled: true, onselect: "core:align-selection-to-center"},
+            {id: "menu-item-view-tools-align-right", label:RED._("menu.label.alignRight"), disabled: true, onselect: "core:align-selection-to-right"},
+            null,
+            {id: "menu-item-view-tools-align-top", label:RED._("menu.label.alignTop"), disabled: true, onselect: "core:align-selection-to-top"},
+            {id: "menu-item-view-tools-align-middle", label:RED._("menu.label.alignMiddle"), disabled: true, onselect: "core:align-selection-to-middle"},
+            {id: "menu-item-view-tools-align-bottom", label:RED._("menu.label.alignBottom"), disabled: true, onselect: "core:align-selection-to-bottom"},
+            null,
+            {id: "menu-item-view-tools-distribute-horizontally", label:RED._("menu.label.distributeHorizontally"), disabled: true, onselect: "core:distribute-selection-horizontally"},
+            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"}
+        ]});
+
         menuOptions.push(null);
         if (RED.settings.theme("menu.menu-item-import-library", true)) {
             menuOptions.push({id: "menu-item-import", label: RED._("menu.label.import"), onselect: "core:show-import-dialog"});
@@ -499,7 +687,7 @@ var RED = (function() {
         ]});
 
         menuOptions.push(null);
-        if (RED.settings.theme('palette.editable') !== false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
             menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
             menuOptions.push(null);
         }
@@ -530,11 +718,10 @@ var RED = (function() {
         RED.user.init();
         RED.notifications.init();
         RED.library.init();
-        RED.keyboard.init();
         RED.palette.init();
         RED.eventLog.init();
 
-        if (RED.settings.theme('palette.editable') !== false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
             RED.palette.editor.init();
         } else {
             console.log("Palette editor disabled");
@@ -554,22 +741,21 @@ var RED = (function() {
         RED.search.init();
         RED.actionList.init();
         RED.editor.init();
+        RED.diagnostics.init();
         RED.diff.init();
 
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
 
-        buildMainMenu();
+        RED.keyboard.init(buildMainMenu);
 
         RED.nodes.init();
+        RED.runtime.init()
         RED.comms.connect();
 
         $("#red-ui-main-container").show();
 
-
-        RED.actions.add("core:show-about", showAbout);
-
-        loadNodeList();
+        loadPluginList();
     }
 
 
@@ -585,6 +771,7 @@ var RED = (function() {
             '<div id="red-ui-sidebar"></div>'+
             '<div id="red-ui-sidebar-separator"></div>'+
         '</div>').appendTo(options.target);
+        $('<div id="red-ui-editor-plugin-configs"></div>').appendTo(options.target);
         $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
         $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);
 
@@ -603,9 +790,12 @@ var RED = (function() {
                     $('<span>').html(theme.header.title).appendTo(logo);
                 }
             }
+            if (theme.themes) {
+                knownThemes = theme.themes;
+            }
         });
     }
-
+    var knownThemes = null;
     var initialised = false;
 
     function init(options) {
@@ -613,7 +803,7 @@ var RED = (function() {
             throw new Error("RED already initialised");
         }
         initialised = true;
-        ace.require("ace/ext/language_tools");
+        if(window.ace) { window.ace.require("ace/ext/language_tools"); }
         options = options || {};
         options.apiRootUrl = options.apiRootUrl || "";
         if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) {
@@ -625,7 +815,13 @@ var RED = (function() {
         buildEditor(options);
 
         RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
+            RED.settings.init(options, function() {
+                if (knownThemes) {
+                    RED.settings.editorTheme = RED.settings.editorTheme || {};
+                    RED.settings.editorTheme.themes = knownThemes;
+                }
+                loadEditor();
+            });
         })
     }
 

packages/node_modules/@node-red/editor-client/src/js/runtime.js

@@ -0,0 +1,36 @@
+RED.runtime = (function() {
+    let state = ""
+    let settings = { ui: false, enabled: false };
+    const STOPPED = "stop"
+    const STARTED = "start"
+    const SAFE = "safe"
+
+    return {
+        init: function() {
+            // refresh the current runtime status from server
+            settings = Object.assign({}, settings, RED.settings.runtimeState);
+            RED.events.on("runtime-state", function(msg) {
+                if (msg.state) {
+                    const currentState = state
+                    state = msg.state
+                    $(".red-ui-flow-node-button").toggleClass("red-ui-flow-node-button-stopped", state !== STARTED)
+                    if(settings.enabled === true && settings.ui === true) {
+                        RED.menu.setVisible("deploymenu-item-runtime-stop", state === STARTED)
+                        RED.menu.setVisible("deploymenu-item-runtime-start", state !== STARTED)
+                    }
+                    // Do not notify the user about this event if:
+                    // - This is the very first event we've received after loading the editor (currentState = '')
+                    // - The state matches what we already thought was the case (state === currentState)
+                    // - The event was triggered by a deploy (msg.deploy === true)
+                    // - The event is a safe mode event - that gets notified separately
+                    if (currentState !== '' && state !== currentState && !msg.deploy && state !== SAFE) {
+                        RED.notify(RED._("notification.state.flows"+(state === STOPPED?'Stopped':'Started'), msg), "success")
+                    }
+                }
+            });
+        },
+        get started() {
+            return state === STARTED
+        }
+    }
+})()

packages/node_modules/@node-red/editor-client/src/js/settings.js

@@ -19,7 +19,6 @@ RED.settings = (function () {
 
     var loadedSettings = {};
     var userSettings = {};
-    var settingsDirty = false;
     var pendingSave;
 
     var hasLocalStorage = function () {
@@ -57,12 +56,11 @@ RED.settings = (function () {
             return JSON.parse(localStorage.getItem(key));
         } else {
             var v;
-            try {
-                v = RED.utils.getMessageProperty(userSettings,key);
-                if (v === undefined) {
-                    v = defaultIfUndefined;
-                }
-            } catch(err) {
+            try { v = RED.utils.getMessageProperty(userSettings,key); } catch(err) {}
+            if (v === undefined) {
+                try { v = RED.utils.getMessageProperty(RED.settings,key); } catch(err) {}
+            }
+            if (v === undefined) {
                 v = defaultIfUndefined;
             }
             return v;
@@ -127,7 +125,7 @@ RED.settings = (function () {
         load(done);
     }
 
-    var load = function(done) {
+    var refreshSettings = function(done) {
         $.ajax({
             headers: {
                 "Accept": "application/json"
@@ -137,6 +135,23 @@ RED.settings = (function () {
             url: 'settings',
             success: function (data) {
                 setProperties(data);
+                done(null, data);
+            },
+            error: function(jqXHR,textStatus,errorThrown) {
+                if (jqXHR.status === 401) {
+                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
+                        window.location.search = "";
+                    }
+                    RED.user.login(function() { refreshSettings(done); });
+                } else {
+                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                }
+            }
+        });
+    }
+    var load = function(done) {
+        refreshSettings(function(err, data) {
+            if (!err) {
                 if (!RED.settings.user || RED.settings.user.anonymous) {
                     RED.settings.remove("auth-tokens");
                 }
@@ -144,22 +159,13 @@ RED.settings = (function () {
                 console.groupCollapsed("Versions");
                 console.log("jQuery",$().jquery)
                 console.log("jQuery UI",$.ui.version);
-                console.log("ACE",ace.version);
+                if(window.ace) { console.log("ACE",ace.version); }
+                if(window.monaco) { console.log("MONACO",monaco.version || "unknown"); }
                 console.log("D3",d3.version);
                 console.groupEnd();
                 loadUserSettings(done);
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                if (jqXHR.status === 401) {
-                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
-                        window.location.search = "";
-                    }
-                    RED.user.login(function() { load(done); });
-                } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
-                }
             }
-        });
+        })
     };
 
     function loadUserSettings(done) {
@@ -220,14 +226,28 @@ RED.settings = (function () {
             return defaultValue;
         }
     }
+    function getLocal(key) {
+        return localStorage.getItem(key)
+    }
+    function setLocal(key, value) {
+        localStorage.setItem(key, value);
+    }
+    function removeLocal(key) {
+        localStorage.removeItem(key)
+    }
+
 
     return {
         init: init,
         load: load,
         loadUserSettings: loadUserSettings,
+        refreshSettings: refreshSettings,
         set: set,
         get: get,
         remove: remove,
-        theme: theme
+        theme: theme,
+        setLocal: setLocal,
+        getLocal: getLocal,
+        removeLocal: removeLocal
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js

@@ -151,7 +151,6 @@ RED.actionList = (function() {
         }
         if (!visible) {
             previousActiveElement = document.activeElement;
-            RED.keyboard.add("*","escape",function(){hide()});
             $("#red-ui-header-shade").show();
             $("#red-ui-editor-shade").show();
             $("#red-ui-palette-shade").show();
@@ -161,18 +160,19 @@ RED.actionList = (function() {
                 createDialog();
             }
             dialog.slideDown(300);
-            searchInput.searchBox('value',v)
+            searchInput.searchBox('value',v);
             searchResults.editableList('empty');
             results = [];
             var actions = RED.actions.list();
             actions.sort(function(A,B) {
-                return A.id.localeCompare(B.id);
+                var Akey = A.label;
+                var Bkey = B.label;
+                return Akey.localeCompare(Bkey);
             });
             actions.forEach(function(action) {
-                action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
                 action._label = action.label.toLowerCase();
-                searchResults.editableList('addItem',action)
-            })
+                searchResults.editableList('addItem',action);
+            });
             RED.events.emit("actionList:open");
             visible = true;
         }
@@ -185,7 +185,6 @@ RED.actionList = (function() {
 
     function hide() {
         if (visible) {
-            RED.keyboard.remove("escape");
             visible = false;
             $("#red-ui-header-shade").hide();
             $("#red-ui-editor-shade").hide();
@@ -215,6 +214,9 @@ RED.actionList = (function() {
         RED.events.on("type-search:open",function() { disabled = true; });
         RED.events.on("type-search:close",function() { disabled = false; });
 
+        RED.keyboard.add("red-ui-actionList","escape",function(){hide()});
+
+
         $("#red-ui-header-shade").on('mousedown',hide);
         $("#red-ui-editor-shade").on('mousedown',hide);
         $("#red-ui-palette-shade").on('mousedown',hide);

packages/node_modules/@node-red/editor-client/src/js/ui/actions.js

@@ -1,34 +1,93 @@
 RED.actions = (function() {
     var actions = {
 
-    }
+    };
 
-    function addAction(name,handler) {
-        actions[name] = handler;
+    function addAction(name,handler,options) {
+        if (typeof handler !== 'function') {
+            throw new Error("Action handler not a function");
+        }
+        if (actions[name]) {
+            throw new Error("Cannot override existing action");
+        }
+        actions[name] = {
+            handler: handler,
+            options: options,
+        };
     }
     function removeAction(name) {
         delete actions[name];
     }
     function getAction(name) {
-        return actions[name];
+        return actions[name].handler;
     }
-    function invokeAction(name,args) {
+    function getActionLabel(name) {
+        let def = actions[name]
+        if (!def) {
+            return ''
+        }
+        if (!def.label) {
+            var options = def.options;
+            var key = options ? options.label : undefined;
+            if (!key) {
+                key = "action-list." +name.replace(/^.*:/,"");
+            }
+            var label = RED._(key);
+            if (label === key) {
+                // no translation. convert `name` to description
+                label = name.replace(/(^.+:([a-z]))|(-([a-z]))/g, function() {
+                    if (arguments[5] === 0) {
+                        return arguments[2].toUpperCase();
+                    } else {
+                        return " "+arguments[4].toUpperCase();
+                    }
+                });
+            }
+            def.label = label;
+        }
+        return def.label
+    }
+
+
+    function invokeAction() {
+        var args = Array.prototype.slice.call(arguments);
+        var name = args.shift();
         if (actions.hasOwnProperty(name)) {
-            actions[name](args);
+            var handler = actions[name].handler;
+            handler.apply(null, args);
         }
     }
     function listActions() {
         var result = [];
+
         Object.keys(actions).forEach(function(action) {
+            var def = actions[action];
             var shortcut = RED.keyboard.getShortcut(action);
-            result.push({id:action,scope:shortcut?shortcut.scope:undefined,key:shortcut?shortcut.key:undefined,user:shortcut?shortcut.user:undefined})
-        })
+            var isUser = false;
+            if (shortcut) {
+                isUser = shortcut.user;
+            } else {
+                isUser = !!RED.keyboard.getUserShortcut(action);
+            }
+            if (!def.label) {
+                def.label = getActionLabel(action)
+            }
+            result.push({
+                id:action,
+                scope:shortcut?shortcut.scope:undefined,
+                key:shortcut?shortcut.key:undefined,
+                user:isUser,
+                label: def.label,
+                options: def.options,
+            });
+        });
         return result;
     }
     return {
         add: addAction,
         remove: removeAction,
         get: getAction,
+        getLabel: getActionLabel,
         invoke: invokeAction,
         list: listActions
     }

packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js

@@ -0,0 +1,126 @@
+(function($) {
+
+/**
+ * Attach to an <input type="text"> to provide auto-complete
+ *
+ * $("#node-red-text").autoComplete({
+ *     search: function(value) { return ['a','b','c'] }
+ * })
+ *
+ * options:
+ *
+ *  search:    function(value, [done])
+ *             A function that is passed the current contents of the input whenever
+ *             it changes.
+ *             The function must either return auto-complete options, or pass them
+ *             to the optional 'done' parameter.
+ *             If the function signature includes 'done', it must be used
+ *  minLength: number
+ *             If `minLength` is 0, pressing down arrow will show the list
+ *
+ * The auto-complete options should be an array of objects in the form:
+ *  {
+ *      value: String : the value to insert if selected
+ *      label: String|DOM Element : the label to display in the dropdown.
+ *  }
+ *
+ */
+
+    $.widget( "nodered.autoComplete", {
+        _create: function() {
+            const that = this;
+            this.completionMenuShown = false;
+            this.options.minLength = parseInteger(this.options.minLength, 1, 0);
+            this.options.search = this.options.search || function() { return [] };
+            this.element.addClass("red-ui-autoComplete");
+            this.element.on("keydown.red-ui-autoComplete", function(evt) {
+                if ((evt.keyCode === 13 || evt.keyCode === 9) && that.completionMenuShown) {
+                    var opts = that.menu.options();
+                    that.element.val(opts[0].value);
+                    that.menu.hide();
+                    evt.preventDefault();
+                }
+            })
+            this.element.on("keyup.red-ui-autoComplete", function(evt) {
+                if (evt.keyCode === 13 || evt.keyCode === 9 || evt.keyCode === 27) {
+                    // ENTER / TAB / ESCAPE
+                    return
+                }
+                if (evt.keyCode === 8 || evt.keyCode === 46) {
+                    // Delete/Backspace
+                    if (!that.completionMenuShown) {
+                        return;
+                    }
+                }
+                that._updateCompletions(this.value);
+            });
+        },
+        _showCompletionMenu: function(completions) {
+            if (this.completionMenuShown) {
+                return;
+            }
+            this.menu = RED.popover.menu({
+                tabSelect: true,
+                width: 300,
+                maxHeight: 200,
+                class: "red-ui-autoComplete-container",
+                options: completions,
+                onselect: (opt) => { this.element.val(opt.value); this.element.focus(); this.element.trigger("change") },
+                onclose: () => { this.completionMenuShown = false; delete this.menu; this.element.focus()}
+            });
+            this.menu.show({
+                target: this.element
+            })
+            this.completionMenuShown = true;
+        },
+        _updateCompletions: function(val) {
+            const that = this;
+            if (val.trim().length < this.options.minLength) {
+                if (this.completionMenuShown) {
+                    this.menu.hide();
+                }
+                return;
+            }
+            function displayResults(completions,requestId) {
+                if (requestId && requestId !== that.pendingRequest) {
+                    // This request has been superseded
+                    return
+                }
+                if (!completions || completions.length === 0) {
+                    if (that.completionMenuShown) {
+                        that.menu.hide();
+                    }
+                    return
+                }
+                if (that.completionMenuShown) {
+                    that.menu.options(completions);
+                } else {
+                    that._showCompletionMenu(completions);
+                }
+            }
+            if (this.options.search.length === 2) {
+                const requestId = 1+Math.floor(Math.random()*10000);
+                this.pendingRequest = requestId;
+                this.options.search(val,function(completions) { displayResults(completions,requestId);})
+            } else {
+                displayResults(this.options.search(val))
+            }
+        },
+        _destroy: function() {
+            this.element.removeClass("red-ui-autoComplete")
+            this.element.off("keydown.red-ui-autoComplete")
+            this.element.off("keyup.red-ui-autoComplete")
+            if (this.completionMenuShown) {
+                this.menu.hide();
+            }
+        }
+    });
+    function parseInteger(input, def, min, max) {
+        if(input == null) { return (def || 0); }
+        min = min == null ? Number.NEGATIVE_INFINITY : min; 
+        max = max == null ? Number.POSITIVE_INFINITY : max; 
+        let n = parseInt(input);
+        if(isNaN(n) || n < min || n > max) { n = def || 0; }
+        return n;
+    }
+})(jQuery);

packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js

@@ -27,26 +27,26 @@
             this.partialFlag = false;
             this.stateValue = 0;
             var initialState = this.element.prop('checked');
-            this.options = [
+            this.states = [
                 $('<span class="red-ui-checkboxSet-option hide"><i class="fa fa-square-o"></i></span>').appendTo(this.uiElement),
                 $('<span class="red-ui-checkboxSet-option hide"><i class="fa fa-check-square-o"></i></span>').appendTo(this.uiElement),
                 $('<span class="red-ui-checkboxSet-option hide"><i class="fa fa-minus-square-o"></i></span>').appendTo(this.uiElement)
             ];
             if (initialState) {
-                this.options[1].show();
+                this.states[1].show();
             } else {
-                this.options[0].show();
+                this.states[0].show();
             }
 
             this.element.on("change", function() {
                 if (this.checked) {
-                    that.options[0].hide();
-                    that.options[1].show();
-                    that.options[2].hide();
+                    that.states[0].hide();
+                    that.states[1].show();
+                    that.states[2].hide();
                 } else {
-                    that.options[1].hide();
-                    that.options[0].show();
-                    that.options[2].hide();
+                    that.states[1].hide();
+                    that.states[0].show();
+                    that.states[2].hide();
                 }
                 var isChecked = this.checked;
                 that.children.forEach(function(child) {
@@ -106,17 +106,17 @@
                 var trueState = this.partialFlag||state;
                 this.element.prop('checked',trueState);
                 if (state === true) {
-                    this.options[0].hide();
-                    this.options[1].show();
-                    this.options[2].hide();
+                    this.states[0].hide();
+                    this.states[1].show();
+                    this.states[2].hide();
                 } else if (state === false) {
-                    this.options[2].hide();
-                    this.options[1].hide();
-                    this.options[0].show();
+                    this.states[2].hide();
+                    this.states[1].hide();
+                    this.states[0].show();
                 } else if (state === null) {
-                    this.options[0].hide();
-                    this.options[1].hide();
-                    this.options[2].show();
+                    this.states[0].hide();
+                    this.states[1].hide();
+                    this.states[2].show();
                 }
                 if (!suppressEvent) {
                     this.element.trigger('change',null);

packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js

@@ -18,6 +18,7 @@
 /**
  * options:
  *   - addButton : boolean|string - text for add label, default 'add'
+ *   - buttons : array - list of custom buttons (objects with fields 'id', 'label', 'icon', 'title', 'click')
  *   - height : number|'auto'
  *   - resize : function - called when list as a whole is resized
  *   - resizeItem : function(item) - called to resize individual item
@@ -67,30 +68,64 @@
                 this.topContainer.addClass(this.options.class);
             }
 
+            var buttons = this.options.buttons || [];
+
             if (this.options.addButton !== false) {
-                var addLabel;
+                var addLabel, addTitle;
                 if (typeof this.options.addButton === 'string') {
                     addLabel = this.options.addButton
                 } else {
                     if (RED && RED._) {
                         addLabel = RED._("editableList.add");
+                        addTitle = RED._("editableList.addTitle");
                     } else {
                         addLabel = 'add';
+                        addTitle = 'add new item';
                     }
                 }
-                $('<a href="#" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px;"><i class="fa fa-plus"></i> '+addLabel+'</a>')
-                    .appendTo(this.topContainer)
+                buttons.unshift({
+                    label: addLabel,
+                    icon: "fa fa-plus",
+                    click: function(evt) {
+                        that.addItem({});
+                    },
+                    title: addTitle
+                });
+            }
+
+            buttons.forEach(function(button) {
+                var element = $('<button type="button" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></button>')
+                    .appendTo(that.topContainer)
                     .on("click", function(evt) {
                         evt.preventDefault();
-                        that.addItem({});
+                        if (button.click !== undefined) {
+                            button.click(evt);
+                        }
                     });
-            }
+
+                if (button.id) {
+                    element.attr("id", button.id);
+                }
+                if (button.title) {
+                    element.attr("title", button.title);
+                }
+                if (button.icon) {
+                    element.append($("<i></i>").attr("class", button.icon));
+                }
+                if (button.label) {
+                    element.append($("<span></span>").text(" " + button.label));
+                }
+            });
+
             if (this.element.css("position") === "absolute") {
                 ["top","left","bottom","right"].forEach(function(s) {
                     var v = that.element.css(s);
                     if (v!=="auto" && v!=="") {
                         that.topContainer.css(s,v);
                         that.uiContainer.css(s,"0");
+                        if (s === "top" && that.options.header) {
+                            that.uiContainer.css(s,"20px")
+                        }
                         that.element.css(s,'auto');
                     }
                 })

packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js

@@ -16,6 +16,7 @@
 RED.menu = (function() {
 
     var menuItems = {};
+    let menuItemCount = 0
 
     function createMenuItem(opt) {
         var item;
@@ -59,15 +60,16 @@ RED.menu = (function() {
             item = $('<li class="red-ui-menu-divider"></li>');
         } else {
             item = $('<li></li>');
-
+            if (!opt.id) {
+                opt.id = 'red-ui-menu-item-'+(menuItemCount++)
+            }
             if (opt.group) {
                 item.addClass("red-ui-menu-group-"+opt.group);
-
             }
             var linkContent = '<a '+(opt.id?'id="'+opt.id+'" ':'')+'tabindex="-1" href="#">';
             if (opt.toggle) {
-                linkContent += '<i class="fa fa-square pull-left"></i>';
-                linkContent += '<i class="fa fa-check-square pull-left"></i>';
+                linkContent += '<i class="fa fa-square'+(opt.direction!=='right'?" pull-left":"")+'"></i>';
+                linkContent += '<i class="fa fa-check-square'+(opt.direction!=='right'?" pull-left":"")+'"></i>';
 
             }
             if (opt.icon !== undefined) {
@@ -77,17 +79,27 @@ RED.menu = (function() {
                     linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
                 }
             }
-
+            let label = opt.label
+            if (!opt.label && typeof opt.onselect === 'string') {
+                label = RED.actions.getLabel(opt.onselect)
+            }
             if (opt.sublabel) {
-                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
+                linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+label+'</span>'+
                                '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
             } else {
-                linkContent += '<span class="red-ui-menu-label">'+opt.label+'</span>'
+                linkContent += '<span class="red-ui-menu-label"><span>'+label+'</span></span>'
             }
 
             linkContent += '</a>';
 
             var link = $(linkContent).appendTo(item);
+            opt.link = link;
+            if (typeof opt.onselect === 'string') {
+                var shortcut = RED.keyboard.getShortcut(opt.onselect);
+                if (shortcut && shortcut.key) {
+                    opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(link.find(".red-ui-menu-label"));
+                }
+            }
 
             menuItems[opt.id] = opt;
 
@@ -119,19 +131,45 @@ RED.menu = (function() {
                 });
             }
             if (opt.options) {
-                item.addClass("red-ui-menu-dropdown-submenu pull-left");
+                item.addClass("red-ui-menu-dropdown-submenu"+(opt.direction!=='right'?" pull-left":""));
                 var submenu = $('<ul id="'+opt.id+'-submenu" class="red-ui-menu-dropdown"></ul>').appendTo(item);
+                var hasIcons = false
+                var hasSubmenus = false
 
                 for (var i=0;i<opt.options.length;i++) {
+
+                    if (opt.options[i]) {
+                        if (opt.onpreselect && opt.options[i].onpreselect === undefined) {
+                            opt.options[i].onpreselect = opt.onpreselect
+                        }
+                        if (opt.onpostselect && opt.options[i].onpostselect === undefined) {
+                            opt.options[i].onpostselect = opt.onpostselect
+                        }
+                        opt.options[i].direction = opt.direction
+                        hasIcons = hasIcons || (opt.options[i].icon);
+                        hasSubmenus = hasSubmenus || (opt.options[i].options);
+                    }
+
                     var li = createMenuItem(opt.options[i]);
                     if (li) {
                         li.appendTo(submenu);
                     }
                 }
+                if (!hasIcons) {
+                    submenu.addClass("red-ui-menu-dropdown-noicons")
+                }
+                if (hasSubmenus) {
+                    submenu.addClass("red-ui-menu-dropdown-submenus")
+                }
+
+
             }
             if (opt.disabled) {
                 item.addClass("disabled");
             }
+            if (opt.visible === false) {
+                item.addClass("hide");
+            }
         }
 
 
@@ -140,7 +178,9 @@ RED.menu = (function() {
     }
     function createMenu(options) {
         var topMenu = $("<ul/>",{class:"red-ui-menu red-ui-menu-dropdown pull-right"});
-
+        if (options.direction) {
+            topMenu.addClass("red-ui-menu-dropdown-direction-"+options.direction)
+        }
         if (options.id) {
             topMenu.attr({id:options.id+"-submenu"});
             var menuParent = $("#"+options.id);
@@ -166,9 +206,22 @@ RED.menu = (function() {
         }
 
         var lastAddedSeparator = false;
+        var hasSubmenus = false;
+        var hasIcons = false;
         for (var i=0;i<options.options.length;i++) {
             var opt = options.options[i];
+            if (opt) {
+                if (options.onpreselect && opt.onpreselect === undefined) {
+                    opt.onpreselect = options.onpreselect
+                }
+                if (options.onpostselect && opt.onpostselect === undefined) {
+                    opt.onpostselect = options.onpostselect
+                }
+                opt.direction = options.direction || 'left'
+            }
             if (opt !== null || !lastAddedSeparator) {
+                hasIcons = hasIcons || (opt && opt.icon);
+                hasSubmenus = hasSubmenus || (opt && opt.options);
                 var li = createMenuItem(opt);
                 if (li) {
                     li.appendTo(topMenu);
@@ -176,13 +229,21 @@ RED.menu = (function() {
                 }
             }
         }
-
+        if (!hasIcons) {
+            topMenu.addClass("red-ui-menu-dropdown-noicons")
+        }
+        if (hasSubmenus) {
+            topMenu.addClass("red-ui-menu-dropdown-submenus")
+        }
         return topMenu;
     }
 
     function triggerAction(id, args) {
         var opt = menuItems[id];
         var callback = opt.onselect;
+        if (opt.onpreselect) {
+            opt.onpreselect.call(opt,args)
+        }
         if (typeof opt.onselect === 'string') {
             callback = RED.actions.get(opt.onselect);
         }
@@ -191,6 +252,9 @@ RED.menu = (function() {
         } else {
             console.log("No callback for",id,opt.onselect);
         }
+        if (opt.onpostselect) {
+            opt.onpostselect.call(opt,args)
+        }
     }
 
     function isSelected(id) {
@@ -242,6 +306,14 @@ RED.menu = (function() {
         }
     }
 
+    function setVisible(id,state) {
+        if (!state) {
+            $("#"+id).parent().addClass("hide");
+        } else {
+            $("#"+id).parent().removeClass("hide");
+        }
+    }
+
     function addItem(id,opt) {
         var item = createMenuItem(opt);
         if (opt !== null && opt.group) {
@@ -276,14 +348,32 @@ RED.menu = (function() {
         }
     }
 
+    function refreshShortcuts() {
+        for (var id in menuItems) {
+            if (menuItems.hasOwnProperty(id)) {
+                var opt = menuItems[id];
+                if (typeof opt.onselect === "string" && opt.shortcutSpan) {
+                    opt.shortcutSpan.remove();
+                    delete opt.shortcutSpan;
+                    var shortcut = RED.keyboard.getShortcut(opt.onselect);
+                    if (shortcut && shortcut.key) {
+                        opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(opt.link.find(".red-ui-menu-label"));
+                    }
+                }
+            }
+        }
+    }
+
     return {
         init: createMenu,
         setSelected: setSelected,
         isSelected: isSelected,
         toggleSelected: toggleSelected,
         setDisabled: setDisabled,
+        setVisible: setVisible,
         addItem: addItem,
         removeItem: removeItem,
-        setAction: setAction
+        setAction: setAction,
+        refreshShortcuts: refreshShortcuts
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js

@@ -13,24 +13,138 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+/*
+ * RED.popover.create(options) - create a popover callout box
+ * RED.popover.tooltip(target,content, action) - add a tooltip to an element
+ * RED.popover.menu(options) - create a dropdown menu
+ * RED.popover.panel(content) - create a dropdown container element
+ */
+
+
+/*
+ * RED.popover.create(options)
+ *
+ *  options
+ *    - target : DOM element - the element to target with the popover
+ *    - direction : string - position of the popover relative to target
+ *                  'top', 'right'(default), 'bottom', 'left', 'inset-[top,right,bottom,left]'
+ *    - trigger : string - what triggers the popover to be displayed
+ *                  'hover' - display when hovering the target
+ *                  'click' - display when target is clicked
+ *                  'modal' - hmm not sure, need to find where we use that mode
+ *    - content : string|function - contents of the popover. If a string, handled
+ *                                  as raw HTML, so take care.
+ *                                  If a function, can return a String to be added
+ *                                  as text (not HTML), or a DOM element to append
+ *    - delay : object - sets show/hide delays after mouseover/out events
+ *                  { show: 750, hide: 50 }
+ *    - autoClose : number - delay before closing the popover in some cases
+ *                     if trigger is click - delay after mouseout
+ *                     else if trigger not hover/modal - delay after showing
+ *    - width : number - width of popover, default 'auto'
+ *    - maxWidth : number - max width of popover, default 'auto'
+ *    - size : string - scale of popover. 'default', 'small'
+ *    - offset : number - px offset from target
+ *    - tooltip : boolean - if true, clicking on popover closes it
+ *    - class : string - optional css class to apply to popover
+ *    - interactive : if trigger is 'hover' and this is set to true, allow the mouse
+ *                    to move over the popover without hiding it.
+ *
+ * Returns the popover object with the following properties/functions:
+ *   properties:
+ *    - element : DOM element - the popover dom element
+ *   functions:
+ *    - setContent(content) - change the popover content. This only works if the
+ *                            popover is not currently displayed. It does not
+ *                            change the content of a visible popover.
+ *    - open(instant) - show the popover. If 'instant' is true, don't fade in
+ *    - close(instant) - hide the popover. If 'instant' is true, don't fade out
+ *    - move(options) - move the popover. The options parameter can take many
+ *                      of the options detailed above including:
+ *                       target,direction,content,width,offset
+ *                      Other settings probably won't work because we haven't needed to change them
+ */
+
+/*
+ * RED.popover.tooltip(target,content, action)
+ *
+ *  - target : DOM element - the element to apply the tooltip to
+ *  - content : string - the text of the tooltip
+ *  - action : string - *optional* the name of an Action this tooltip is tied to
+ *                      For example, it 'target' is a button that triggers a particular action.
+ *                      The tooltip will include the keyboard shortcut for the action
+ *                      if one is defined
+ *
+ */
+
+/*
+ * RED.popover.menu(options)
+ *
+ *  options
+ *    - options : array - list of menu options - see below for format
+ *    - width : number - width of the menu. Default: 'auto'
+ *    - class : string - class to apply to the menu container
+ *    - maxHeight : number - maximum height of menu before scrolling items. Default: none
+ *    - onselect : function(item) - called when a menu item is selected, if that item doesn't
+ *                                  have its own onselect function
+ *    - onclose : function(cancelled) - called when the menu is closed
+ *    - disposeOnClose : boolean - by default, the menu is discarded when it closes
+ *                                 and mustbe rebuilt to redisplay. Setting this to 'false'
+ *                                 keeps the menu on the DOM so it can be shown again.
+ *
+ *  Menu Options array:
+ *  [
+ *      label : string|DOM element - the label of the item. Can be custom DOM element
+ *      onselect : function - called when the item is selected
+ *  ]
+ *
+ * Returns the menu object with the following functions:
+ *
+ *  - options([menuItems]) - if menuItems is undefined, returns the current items.
+ *                           otherwise, sets the current menu items
+ *  - show(opts) - shows the menu. `opts` is an object of options. See  RED.popover.panel.show(opts)
+ *                 for the full list of options. In most scenarios, this just needs:
+ *                  - target : DOM element - the element to display the menu below
+ *  - hide(cancelled) - hide the menu
+ */
+
+/*
+ * RED.popover.panel(content)
+ *  Create a UI panel that can be displayed relative to any target element.
+ *  Handles auto-closing when mouse clicks outside the panel
+ *
+ *  - 'content' - DOM element to display in the panel
+ *
+ * Returns the panel object with the following functions:
+ *
+ *  properties:
+ *    - container : DOM element - the panel element
+ *
+ *  functions:
+ *    - show(opts) - show the panel.
+ *       opts:
+ *          - onclose : function - called when the panel closes
+ *          - closeButton : DOM element - if the panel is closeable by a click of a button,
+ *                                        by providing a reference to it here, we can
+ *                                        handle the events properly to hide the panel
+ *          - target : DOM element - the element to display the panel relative to
+ *          - align : string - should the panel align to the left or right edge of target
+ *                             default: 'right'
+ *          - offset : Array - px offset to apply from the target. [width, height]
+ *          - dispose : boolean - whether the panel should be removed from DOM when hidden
+ *                                default: true
+ *    - hide(dispose) - hide the panel.
+ */
 
 RED.popover = (function() {
     var deltaSizes = {
         "default": {
-            top: 10,
-            topTop: 30,
-            leftRight: 17,
-            leftLeft: 25,
-            leftBottom: 8,
-            leftTop: 11
+            x: 12,
+            y: 12
         },
         "small": {
-            top: 6,
-            topTop: 20,
-            leftRight: 8,
-            leftLeft: 26,
-            leftBottom: 8,
-            leftTop: 9
+            x:8,
+            y:8
         }
     }
     function createPopover(options) {
@@ -41,7 +155,9 @@ RED.popover = (function() {
         var delay = options.delay ||  { show: 750, hide: 50 };
         var autoClose = options.autoClose;
         var width = options.width||"auto";
+        var maxWidth = options.maxWidth;
         var size = options.size||"default";
+        var popupOffset = options.offset || 0;
         if (!deltaSizes[size]) {
             throw new Error("Invalid RED.popover size value:",size);
         }
@@ -49,6 +165,8 @@ RED.popover = (function() {
         var timer = null;
         var active;
         var div;
+        var contentDiv;
+        var currentStyle;
 
         var openPopup = function(instant) {
             if (active) {
@@ -58,6 +176,10 @@ RED.popover = (function() {
                     return;
                 }
                 div = $('<div class="red-ui-popover"></div>');
+                if (options.class) {
+                    div.addClass(options.class);
+                }
+                contentDiv = $('<div class="red-ui-popover-content">').appendTo(div);
                 if (size !== "default") {
                     div.addClass("red-ui-popover-size-"+size);
                 }
@@ -67,70 +189,23 @@ RED.popover = (function() {
                         return;
                     }
                     if (typeof result === 'string') {
-                        div.text(result);
+                        contentDiv.text(result);
                     } else {
-                        div.append(result);
+                        contentDiv.append(result);
                     }
                 } else {
-                    div.html(content);
-                }
-                if (width !== "auto") {
-                    div.width(width);
+                    contentDiv.html(content);
                 }
                 div.appendTo("body");
 
-                var targetPos = target.offset();
-                var targetWidth = target.outerWidth();
-                var targetHeight = target.outerHeight();
-                var divHeight = div.height();
-                var divWidth = div.width();
+                movePopup({target,direction,width,maxWidth});
 
-                var viewportTop = $(window).scrollTop();
-                var viewportLeft = $(window).scrollLeft();
-                var viewportBottom = viewportTop + $(window).height();
-                var viewportRight = viewportLeft + $(window).width();
-                var top = 0;
-                var left = 0;
-                var d = direction;
-                if (d === 'right') {
-                    top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                    left = targetPos.left+targetWidth+deltaSizes[size].leftRight;
-                } else if (d === 'left') {
-                    top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                    left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
-                } else if (d === 'bottom') {
-                    top = targetPos.top+targetHeight+deltaSizes[size].top;
-                    left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
-                    if (left < 0) {
-                        d = "right";
-                        top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                        left = targetPos.left+targetWidth+deltaSizes[size].leftRight;
-                    } else if (left+divWidth > viewportRight) {
-                        d = "left";
-                        top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                        left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
-                        if (top+divHeight+targetHeight/2 + 5 > viewportBottom) {
-                            top -= (top+divHeight+targetHeight/2 - viewportBottom + 5)
-                        }
-                    } else if (top+divHeight > viewportBottom) {
-                        d = 'top';
-                        top = targetPos.top-deltaSizes[size].topTop-divHeight;
-                        left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftTop;
-                    }
-                } else if (d === 'top') {
-                    top = targetPos.top-deltaSizes[size].topTop-divHeight;
-                    left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftTop;
-                    if (top < 0) {
-                        d = 'bottom';
-                        top = targetPos.top+targetHeight+deltaSizes[size].top;
-                        left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
-                    }
-                }
-                div.addClass('red-ui-popover-'+d).css({top: top, left: left});
                 if (existingPopover) {
                     existingPopover.close(true);
                 }
-                target.data("red-ui-popover",res)
+                if (options.trigger !== 'manual') {
+                    target.data("red-ui-popover",res)
+                }
                 if (options.tooltip) {
                     div.on("mousedown", function(evt) {
                         closePopup(true);
@@ -160,6 +235,104 @@ RED.popover = (function() {
                 }
             }
         }
+        var movePopup = function(options) {
+            target = options.target || target;
+            direction = options.direction || direction || "right";
+            popupOffset = options.offset || popupOffset;
+            var transition = options.transition;
+
+            var width = options.width||"auto";
+            div.width(width);
+            if (options.maxWidth) {
+                div.css("max-width",options.maxWidth)
+            } else {
+                div.css("max-width", 'auto');
+            }
+
+            var targetPos = target[0].getBoundingClientRect();
+            var targetHeight = targetPos.height;
+            var targetWidth = targetPos.width;
+
+            var divHeight = div.outerHeight();
+            var divWidth = div.outerWidth();
+            var paddingRight = 10;
+
+            var viewportTop = $(window).scrollTop();
+            var viewportLeft = $(window).scrollLeft();
+            var viewportBottom = viewportTop + $(window).height();
+            var viewportRight = viewportLeft + $(window).width();
+            var top = 0;
+            var left = 0;
+            if (direction === 'right') {
+                top = targetPos.top+targetHeight/2-divHeight/2;
+                left = targetPos.left+targetWidth+deltaSizes[size].x+popupOffset;
+            } else if (direction === 'left') {
+                top = targetPos.top+targetHeight/2-divHeight/2;
+                left = targetPos.left-deltaSizes[size].x-divWidth-popupOffset;
+            } else if (direction === 'bottom') {
+                top = targetPos.top+targetHeight+deltaSizes[size].y+popupOffset;
+                left = targetPos.left+targetWidth/2-divWidth/2;
+                if (left < 0) {
+                    direction = "right";
+                    top = targetPos.top+targetHeight/2-divHeight/2;
+                    left = targetPos.left+targetWidth+deltaSizes[size].x+popupOffset;
+                } else if (left+divWidth+paddingRight > viewportRight) {
+                    direction = "left";
+                    top = targetPos.top+targetHeight/2-divHeight/2;
+                    left = targetPos.left-deltaSizes[size].x-divWidth-popupOffset;
+                    if (top+divHeight+targetHeight/2 + 5 > viewportBottom) {
+                        top -= (top+divHeight+targetHeight/2 - viewportBottom + 5)
+                    }
+                } else if (top+divHeight > viewportBottom) {
+                    direction = 'top';
+                    top = targetPos.top-deltaSizes[size].y-divHeight-popupOffset;
+                    left = targetPos.left+targetWidth/2-divWidth/2;
+                }
+            } else if (direction === 'top') {
+                top = targetPos.top-deltaSizes[size].y-divHeight-popupOffset;
+                left = targetPos.left+targetWidth/2-divWidth/2;
+                if (top < 0) {
+                    direction = 'bottom';
+                    top = targetPos.top+targetHeight+deltaSizes[size].y+popupOffset;
+                    left = targetPos.left+targetWidth/2-divWidth/2;
+                }
+            } else if (/inset/.test(direction)) {
+                top = targetPos.top + targetHeight/2 - divHeight/2;
+                left = targetPos.left + targetWidth/2 - divWidth/2;
+
+                if (/bottom/.test(direction)) {
+                    top = targetPos.top + targetHeight - divHeight-popupOffset;
+                }
+                if (/top/.test(direction)) {
+                    top = targetPos.top+popupOffset;
+                }
+                if (/left/.test(direction)) {
+                    left = targetPos.left+popupOffset;
+                }
+                if (/right/.test(direction)) {
+                    left = targetPos.left + targetWidth - divWidth-popupOffset;
+                }
+            }
+            if (currentStyle) {
+                div.removeClass(currentStyle);
+            }
+            if (transition) {
+                div.css({
+                    "transition": "0.6s ease",
+                    "transition-property": "top,left,right,bottom"
+                })
+            }
+            currentStyle = 'red-ui-popover-'+direction;
+            div.addClass(currentStyle).css({top: top, left: left});
+            if (transition) {
+                setTimeout(function() {
+                    div.css({
+                        "transition": "none"
+                    });
+                },600);
+            }
+
+        }
         var closePopup = function(instant) {
             $(document).off('mousedown.red-ui-popover');
             if (!active) {
@@ -177,6 +350,16 @@ RED.popover = (function() {
             }
         }
 
+        target.on("remove", function (ev) {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            if (active) {
+                active = false;
+                setTimeout(closePopup,delay.hide);
+            }
+        });
+
         if (trigger === 'hover') {
             target.on('mouseenter',function(e) {
                 clearTimeout(timer);
@@ -235,8 +418,10 @@ RED.popover = (function() {
             },autoClose);
         }
         var res = {
+            get element() { return div },
             setContent: function(_content) {
                 content = _content;
+
                 return res;
             },
             open: function (instant) {
@@ -248,6 +433,10 @@ RED.popover = (function() {
                 active = false;
                 closePopup(instant);
                 return res;
+            },
+            move: function(options) {
+                movePopup(options);
+                return
             }
         }
         return res;
@@ -257,18 +446,17 @@ RED.popover = (function() {
     return {
         create: createPopover,
         tooltip: function(target,content, action) {
-            var label = content;
-            if (action) {
-                label = function() {
-                    var label = content;
+            var label = function() {
+                var label = content;
+                if (action) {
                     var shortcut = RED.keyboard.getShortcut(action);
                     if (shortcut && shortcut.key) {
                         label = $('<span>'+content+' <span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span></span>');
                     }
-                    return label;
                 }
+                return label;
             }
-            return RED.popover.create({
+            var popover = RED.popover.create({
                 tooltip: true,
                 target:target,
                 trigger: "hover",
@@ -277,6 +465,19 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
+            popover.setContent = function(newContent) {
+                content = newContent;
+            }
+            popover.setAction = function(newAction) {
+                action = newAction;
+            }
+            popover.delete = function() {
+                popover.close(true)
+                target.off("mouseenter");
+                target.off("mouseleave");
+            };
+            return popover;
+
         },
         menu: function(options) {
             var list = $('<ul class="red-ui-menu"></ul>');
@@ -285,20 +486,47 @@ RED.popover = (function() {
             }
             var menuOptions = options.options || [];
             var first;
-            menuOptions.forEach(function(opt) {
-                var item = $('<li>').appendTo(list);
-                var link = $('<a href="#"></a>').text(opt.label).appendTo(item);
-                link.on("click", function(evt) {
-                    evt.preventDefault();
-                    if (opt.onselect) {
-                        opt.onselect();
-                    }
-                    menu.hide();
-                })
-                if (!first) { first = link}
-            })
+
             var container = RED.popover.panel(list);
+            if (options.width) {
+                container.container.width(options.width);
+            }
+            if (options.class) {
+                container.container.addClass(options.class);
+            }
+            if (options.maxHeight) {
+                container.container.css({
+                    "max-height": options.maxHeight,
+                    "overflow-y": 'auto'
+                })
+            }
             var menu = {
+                options: function(opts) {
+                    if (opts === undefined) {
+                        return menuOptions
+                    }
+                    menuOptions = opts || [];
+                    list.empty();
+                    menuOptions.forEach(function(opt) {
+                        var item = $('<li>').appendTo(list);
+                        var link = $('<a href="#"></a>').appendTo(item);
+                        if (typeof opt.label == "string") {
+                            link.text(opt.label)
+                        } else if (opt.label){
+                            opt.label.appendTo(link);
+                        }
+                        link.on("click", function(evt) {
+                            evt.preventDefault();
+                            if (opt.onselect) {
+                                opt.onselect();
+                            } else if (options.onselect) {
+                                options.onselect(opt);
+                            }
+                            menu.hide();
+                        })
+                        if (!first) { first = link}
+                    })
+                },
                 show: function(opts) {
                     $(document).on("keydown.red-ui-menu", function(evt) {
                         var currentItem = list.find(":focus").parent();
@@ -307,11 +535,9 @@ RED.popover = (function() {
                             // DOWN
                             if (currentItem.length > 0) {
                                 if (currentItem.index() === menuOptions.length-1) {
-                                    console.log("WARP TO TOP")
                                     // Wrap to top of list
                                     list.children().first().children().first().focus();
                                 } else {
-                                    console.log("GO DOWN ONE")
                                     currentItem.next().children().first().focus();
                                 }
                             } else {
@@ -322,11 +548,9 @@ RED.popover = (function() {
                             // UP
                             if (currentItem.length > 0) {
                                 if (currentItem.index() === 0) {
-                                    console.log("WARP TO BOTTOM")
                                     // Wrap to bottom of list
                                     list.children().last().children().first().focus();
                                 } else {
-                                    console.log("GO UP ONE")
                                     currentItem.prev().children().first().focus();
                                 }
                             } else {
@@ -336,6 +560,11 @@ RED.popover = (function() {
                             // ESCAPE
                             evt.preventDefault();
                             menu.hide(true);
+                        } else if (evt.keyCode === 9 && options.tabSelect) {
+                            // TAB - with tabSelect enabled
+                            evt.preventDefault();
+                            currentItem.find("a").trigger("click");
+
                         }
                         evt.stopPropagation();
                     })
@@ -355,6 +584,7 @@ RED.popover = (function() {
                     }
                 }
             }
+            menu.options(menuOptions);
             return menu;
         },
         panel: function(content) {
@@ -362,7 +592,6 @@ RED.popover = (function() {
             panel.css({ display: "none" });
             panel.appendTo(document.body);
             content.appendTo(panel);
-            var closeCallback;
 
             function hide(dispose) {
                 $(document).off("mousedown.red-ui-popover-panel-close");
@@ -377,22 +606,26 @@ RED.popover = (function() {
             }
             function show(options) {
                 var closeCallback = options.onclose;
+                var closeButton = options.closeButton;
                 var target = options.target;
                 var align = options.align || "right";
                 var offset = options.offset || [0,0];
+                var xPos = options.x;
+                var yPos = options.y;
+                var isAbsolutePosition = (xPos !== undefined && yPos !== undefined)
 
-                var pos = target.offset();
-                var targetWidth = target.width();
-                var targetHeight = target.height();
+                var pos = isAbsolutePosition?{left:xPos, top: yPos}:target.offset();
+                var targetWidth = isAbsolutePosition?0:target.width();
+                var targetHeight = isAbsolutePosition?0:target.outerHeight();
                 var panelHeight = panel.height();
                 var panelWidth = panel.width();
 
                 var top = (targetHeight+pos.top) + offset[1];
-                if (top+panelHeight > $(window).height()) {
+                if (top+panelHeight-$(document).scrollTop() > $(window).height()) {
                     top -= (top+panelHeight)-$(window).height() + 5;
                 }
                 if (top < 0) {
-                    panelHeight.height(panelHeight+top)
+                    panel.height(panelHeight+top)
                     top = 0;
                 }
                 if (align === "right") {
@@ -419,7 +652,8 @@ RED.popover = (function() {
                 });
 
                 $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
-                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                    var hitCloseButton = closeButton && $(event.target).closest(closeButton).length;
+                    if(!hitCloseButton && !$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
                         if (closeCallback) {
                             closeCallback();
                         }

packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js

@@ -105,8 +105,8 @@
                     }
                 });
                 this.element.on("keydown",function(e) {
-                    if (!menuShown && e.keyCode === 40) {
-                        //DOWN
+                    if (!menuShown && e.keyCode === 40 && $(this).val() === '') {
+                        //DOWN (only show menu if search field is emty)
                         showMenu();
                     }
                 });
@@ -119,6 +119,9 @@
                 if (evt.keyCode === 27) {
                     that.element.val("");
                 }
+                if (evt.keyCode === 13) {
+                    evt.preventDefault();
+                }
             })
             this.element.on("keyup",function(evt) {
                 that._change($(this).val());

packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js

@@ -29,7 +29,8 @@ RED.tabs = (function() {
         var currentTabWidth;
         var currentActiveTabWidth = 0;
         var collapsibleMenu;
-
+        var mousedownTab;
+        var preferredOrder = options.order;
         var ul = options.element || $("#"+options.id);
         var wrapper = ul.wrap( "<div>" ).parent();
         var scrollContainer = ul.wrap( "<div>" ).parent();
@@ -37,6 +38,7 @@ RED.tabs = (function() {
         if (options.vertical) {
             wrapper.addClass("red-ui-tabs-vertical");
         }
+
         if (options.addButton) {
             wrapper.addClass("red-ui-tabs-add");
             var addButton = $('<div class="red-ui-tab-button red-ui-tabs-add"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
@@ -74,6 +76,8 @@ RED.tabs = (function() {
             });
         }
         if (options.searchButton) {
+            // This is soft-deprecated as we don't use this in the core anymore
+            // We no use the `menu` option to provide a drop-down list of actions
             wrapper.addClass("red-ui-tabs-search");
             var searchButton = $('<div class="red-ui-tab-button red-ui-tabs-search"><a href="#"><i class="fa fa-list-ul"></i></a></div>').appendTo(wrapper);
             searchButton.find('a').on("click", function(evt) {
@@ -93,17 +97,78 @@ RED.tabs = (function() {
             }
 
         }
+        if (options.menu) {
+            wrapper.addClass("red-ui-tabs-menu");
+            var menuButton = $('<div class="red-ui-tab-button red-ui-tabs-menu"><a href="#"><i class="fa fa-caret-down"></i></a></div>').appendTo(wrapper);
+            var menuButtonLink = menuButton.find('a')
+            var menuOpen = false;
+            var menu;
+            menuButtonLink.on("click", function(evt) {
+                evt.stopPropagation();
+                evt.preventDefault();
+                if (menuOpen) {
+                    menu.remove();
+                    menuOpen = false;
+                    return;
+                }
+                menuOpen = true;
+                var menuOptions = [];
+                if (typeof options.searchButton === 'function') {
+                    menuOptions = options.menu()
+                } else if (Array.isArray(options.menu)) {
+                    menuOptions = options.menu;
+                } else if (typeof options.menu === 'function') {
+                    menuOptions = options.menu();
+                }
+                menu = RED.menu.init({options: menuOptions});
+                menu.attr("id",options.id+"-menu");
+                menu.css({
+                    position: "absolute"
+                })
+                menu.appendTo("body");
+                var elementPos = menuButton.offset();
+                menu.css({
+                    top: (elementPos.top+menuButton.height()-2)+"px",
+                    left: (elementPos.left - menu.width() + menuButton.width())+"px"
+                })
+                $(".red-ui-menu.red-ui-menu-dropdown").hide();
+                $(document).on("click.red-ui-tabmenu", function(evt) {
+                    $(document).off("click.red-ui-tabmenu");
+                    menuOpen = false;
+                    menu.remove();
+                });
+                menu.show();
+            })
+        }
+
+
+
         var scrollLeft;
         var scrollRight;
 
         if (options.scrollable) {
             wrapper.addClass("red-ui-tabs-scrollable");
             scrollContainer.addClass("red-ui-tabs-scroll-container");
-            scrollContainer.on("scroll",updateScroll);
+            scrollContainer.on("scroll",function(evt) {
+                // Generated by trackpads - not mousewheel
+                updateScroll(evt);
+            });
+            scrollContainer.on("wheel", function(evt) {
+                if (evt.originalEvent.deltaX === 0) {
+                    // Prevent the scroll event from firing
+                    evt.preventDefault();
+
+                    // Assume this is wheel event which might not trigger
+                    // the scroll event, so do things manually
+                    var sl = scrollContainer.scrollLeft();
+                    sl -= evt.originalEvent.deltaY;
+                    scrollContainer.scrollLeft(sl);
+                }
+            })
             scrollLeft = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-left"><a href="#" style="display:none;"><i class="fa fa-caret-left"></i></a></div>').appendTo(wrapper).find("a");
-            scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollLeft.on('mousedown',function(evt) {scrollEventHandler(evt, evt.shiftKey?('-='+scrollContainer.scrollLeft()):'-=150') }).on('click',function(evt){ evt.preventDefault();});
             scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
-            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,evt.shiftKey?('+='+(scrollContainer[0].scrollWidth - scrollContainer.width()-scrollContainer.scrollLeft())):'+=150') }).on('click',function(evt){ evt.preventDefault();});
         }
 
         if (options.collapsible) {
@@ -132,11 +197,11 @@ RED.tabs = (function() {
                                     activateTab(id);
                                 }
                             };
-                            if (tabs[id].pinned) {
-                                pinnedOptions.push(opt);
-                            } else {
+                            // if (tabs[id].pinned) {
+                            //     pinnedOptions.push(opt);
+                            // } else {
                                 options.push(opt);
-                            }
+                            // }
                         });
                         options = pinnedOptions.concat(options);
                         collapsibleMenu = RED.menu.init({options: options});
@@ -207,6 +272,11 @@ RED.tabs = (function() {
             if (dragActive) {
                 return
             }
+            if (evt.currentTarget !== mousedownTab) {
+                mousedownTab = null;
+                return;
+            }
+            mousedownTab = null;
             if (dblClickTime && Date.now()-dblClickTime < 400) {
                 dblClickTime = 0;
                 dblClickArmed = true;
@@ -316,6 +386,12 @@ RED.tabs = (function() {
             if (link.length === 0) {
                 return;
             }
+            if (link.parent().hasClass("hide-tab")) {
+                link.parent().removeClass("hide-tab").removeClass("hide");
+                if (options.onshow) {
+                    options.onshow(tabs[link.attr('href').slice(1)])
+                }
+            }
             if (!link.parent().hasClass("active")) {
                 ul.children().removeClass("active");
                 ul.children().css({"transition": "width 100ms"});
@@ -341,13 +417,13 @@ RED.tabs = (function() {
             }
         }
         function activatePreviousTab() {
-            var previous = ul.find("li.active").prev();
+            var previous = findPreviousVisibleTab();
             if (previous.length > 0) {
                 activateTab(previous.find("a"));
             }
         }
         function activateNextTab() {
-            var next = ul.find("li.active").next();
+            var next = findNextVisibleTab();
             if (next.length > 0) {
                 activateTab(next.find("a"));
             }
@@ -357,29 +433,47 @@ RED.tabs = (function() {
             if (options.vertical) {
                 return;
             }
-            var tabs = ul.find("li.red-ui-tab");
+            var allTabs = ul.find("li.red-ui-tab");
+            var tabs = allTabs.filter(":not(.hide-tab)");
+            var hiddenTabs = allTabs.filter(".hide-tab");
             var width = wrapper.width();
             var tabCount = tabs.length;
             var tabWidth;
 
             if (options.collapsible) {
+                var availableCount = collapsedButtonsRow.children().length;
+                var visibleCount = collapsedButtonsRow.children(":visible").length;
                 tabWidth = width - collapsedButtonsRow.width()-10;
-                if (tabWidth < 198) {
-                    var delta = 198 - tabWidth;
+                var maxTabWidth = 198;
+                var minTabWidth = 120;
+                if (tabWidth <= minTabWidth || (tabWidth < maxTabWidth && visibleCount > 5)) {
+                    // The tab is too small. Hide the next button to make room
+                    // Start at the end of the button row, -1 for the menu button
                     var b = collapsedButtonsRow.find("a:last").prev();
+                    var index = collapsedButtonsRow.children().length - 2;
+                    // Work backwards to find the first visible button
                     while (b.is(":not(:visible)")) {
                         b = b.prev();
+                        index--;
                     }
-                    if (!b.hasClass("red-ui-tab-link-button-pinned")) {
+                    // If it isn't a pinned button, hide it to get the room
+                    if (tabWidth <= minTabWidth || visibleCount>6) {//}!b.hasClass("red-ui-tab-link-button-pinned")) {
                         b.hide();
                     }
-                    tabWidth = width - collapsedButtonsRow.width()-10;
+                    tabWidth = Math.max(minTabWidth,width - collapsedButtonsRow.width()-10);
                 } else {
-                    var space = width - 198 - collapsedButtonsRow.width();
+                    if (visibleCount !== availableCount) {
+                        if (visibleCount < 6) {
+                            tabWidth = minTabWidth;
+                        } else {
+                            tabWidth = maxTabWidth;
+                        }
+                    }
+                    var space = width - tabWidth - collapsedButtonsRow.width();
                     if (space > 40) {
                         collapsedButtonsRow.find("a:not(:visible):first").show();
-                        tabWidth = width - collapsedButtonsRow.width()-10;
                     }
+                    tabWidth = width - collapsedButtonsRow.width()-10;
                 }
                 tabs.css({width:tabWidth});
 
@@ -409,6 +503,7 @@ RED.tabs = (function() {
                 // }
 
                 tabs.css({width:currentTabWidth});
+                hiddenTabs.css({width:"0px"});
                 if (tabWidth < 50) {
                     // ul.find(".red-ui-tab-close").hide();
                     ul.find(".red-ui-tab-icon").hide();
@@ -429,6 +524,7 @@ RED.tabs = (function() {
         }
 
         ul.find("li.red-ui-tab a")
+            .on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
             .on("mouseup",onTabClick)
             .on("click", function(evt) {evt.preventDefault(); })
             .on("dblclick", function(evt) {evt.stopPropagation(); evt.preventDefault(); })
@@ -448,12 +544,19 @@ RED.tabs = (function() {
             }
             var li = ul.find("a[href='#"+id+"']").parent();
             if (li.hasClass("active")) {
-                var tab = li.prev();
+                var tab = findPreviousVisibleTab(li);
                 if (tab.length === 0) {
-                    tab = li.next();
+                    tab = findNextVisibleTab(li);
+                }
+                if (tab.length > 0) {
+                    activateTab(tab.find("a"));
+                } else {
+                    if (options.onchange) {
+                        options.onchange(null);
+                    }
                 }
-                activateTab(tab.find("a"));
             }
+
             li.remove();
             if (tabs[id].pinned) {
                 pinnedTabsCount--;
@@ -469,7 +572,76 @@ RED.tabs = (function() {
             }
         }
 
-        return {
+        function findPreviousVisibleTab(li) {
+            if (!li) {
+                li = ul.find("li.active");
+            }
+            var previous = li.prev();
+            while(previous.length > 0 && previous.hasClass("hide-tab")) {
+                previous = previous.prev();
+            }
+            return previous;
+        }
+        function findNextVisibleTab(li) {
+            if (!li) {
+                li = ul.find("li.active");
+            }
+            var next = li.next();
+            while(next.length > 0 && next.hasClass("hide-tab")) {
+                next = next.next();
+            }
+            return next;
+        }
+        function showTab(id) {
+            if (tabs[id]) {
+                var li = ul.find("a[href='#"+id+"']").parent();
+                if (li.hasClass("hide-tab")) {
+                    li.removeClass("hide-tab").removeClass("hide");
+                    if (ul.find("li.red-ui-tab:not(.hide-tab)").length === 1) {
+                        activateTab(li.find("a"))
+                    }
+                    updateTabWidths();
+                    if (options.onshow) {
+                        options.onshow(tabs[id])
+                    }
+                }
+            }
+        }
+        function hideTab(id) {
+            if (tabs[id]) {
+                var li = ul.find("a[href='#"+id+"']").parent();
+                if (!li.hasClass("hide-tab")) {
+                    if (li.hasClass("active")) {
+                        var tab = findPreviousVisibleTab(li);
+                        if (tab.length === 0) {
+                            tab = findNextVisibleTab(li);
+                        }
+                        if (tab.length > 0) {
+                            activateTab(tab.find("a"));
+                        } else {
+                            if (options.onchange) {
+                                options.onchange(null);
+                            }
+                        }
+                    }
+                    li.removeClass("active");
+                    li.one("transitionend", function(evt) {
+                        li.addClass("hide");
+                        updateTabWidths();
+                        if (options.onhide) {
+                            options.onhide(tabs[id])
+                        }
+                        setTimeout(function() {
+                            updateScroll()
+                        },200)
+                    })
+                    li.addClass("hide-tab");
+                    li.css({width:0})
+                }
+            }
+        }
+
+        var tabAPI =  {
             addTab: function(tab,targetIndex) {
                 if (options.onselect) {
                     var selection = ul.find("li.red-ui-tab.selected");
@@ -493,12 +665,12 @@ RED.tabs = (function() {
                 li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
                 li.data("tabId",tab.id);
 
-                if (options.maximumTabWidth) {
-                    li.css("maxWidth",options.maximumTabWidth+"px");
+                if (options.maximumTabWidth || tab.maximumTabWidth) {
+                    li.css("maxWidth",(options.maximumTabWidth || tab.maximumTabWidth) +"px");
                 }
                 var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
                 if (tab.icon) {
-                    $('<img src="'+tab.icon+'" class="red-ui-tab-icon"/>').appendTo(link);
+                    $('<i>',{class:"red-ui-tab-icon", style:"mask-image: url("+tab.icon+"); -webkit-mask-image: url("+tab.icon+");"}).appendTo(link);
                 } else if (tab.iconClass) {
                     $('<i>',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
                 }
@@ -531,17 +703,101 @@ RED.tabs = (function() {
                         evt.preventDefault();
                         activateTab(tab.id);
                     });
+                    pinnedLink.data("tabId",tab.id)
                     if (tab.pinned) {
                         pinnedLink.addClass("red-ui-tab-link-button-pinned");
                         pinnedTabsCount++;
                     }
                     RED.popover.tooltip($(pinnedLink), tab.name, tab.action);
+                    if (options.onreorder) {
+                        var pinnedLinkIndex;
+                        var pinnedLinks = [];
+                        var startPinnedIndex;
+                        pinnedLink.draggable({
+                            distance: 10,
+                            axis:"x",
+                            containment: ".red-ui-tab-link-buttons",
+                            start: function(event,ui) {
+                                dragActive = true;
+                                $(".red-ui-tab-link-buttons").width($(".red-ui-tab-link-buttons").width());
+                                if (dblClickArmed) { dblClickArmed = false; return false }
+                                collapsedButtonsRow.children().each(function(i) {
+                                    pinnedLinks[i] = {
+                                        el:$(this),
+                                        text: $(this).text(),
+                                        left: $(this).position().left,
+                                        width: $(this).width(),
+                                        menu: $(this).hasClass("red-ui-tab-link-button-menu")
+                                    };
+                                    if ($(this).is(pinnedLink)) {
+                                        pinnedLinkIndex = i;
+                                        startPinnedIndex = i;
+                                    }
+                                });
+                                collapsedButtonsRow.children().each(function(i) {
+                                    if (i!==pinnedLinkIndex) {
+                                        $(this).css({
+                                            position: 'absolute',
+                                            left: pinnedLinks[i].left+"px",
+                                            width: pinnedLinks[i].width+2,
+                                            transition: "left 0.3s"
+                                        });
+                                    }
+                                })
+                                if (!pinnedLink.hasClass('active')) {
+                                    pinnedLink.css({'zIndex':1});
+                                }
+                            },
+                            drag: function(event,ui) {
+                                ui.position.left += pinnedLinks[pinnedLinkIndex].left;
+                                var tabCenter = ui.position.left + pinnedLinks[pinnedLinkIndex].width/2;
+                                for (var i=0;i<pinnedLinks.length;i++) {
+                                    if (i === pinnedLinkIndex || pinnedLinks[i].menu || pinnedLinks[i].el.is(":not(:visible)")) {
+                                        continue;
+                                    }
+                                    if (tabCenter > pinnedLinks[i].left && tabCenter < pinnedLinks[i].left+pinnedLinks[i].width) {
+                                        if (i < pinnedLinkIndex) {
+                                            pinnedLinks[i].left += pinnedLinks[pinnedLinkIndex].width+8;
+                                            pinnedLinks[pinnedLinkIndex].el.detach().insertBefore(pinnedLinks[i].el);
+                                        } else {
+                                            pinnedLinks[i].left -= pinnedLinks[pinnedLinkIndex].width+8;
+                                            pinnedLinks[pinnedLinkIndex].el.detach().insertAfter(pinnedLinks[i].el);
+                                        }
+                                        pinnedLinks[i].el.css({left:pinnedLinks[i].left+"px"});
+
+                                        pinnedLinks.splice(i, 0, pinnedLinks.splice(pinnedLinkIndex, 1)[0]);
+
+                                        pinnedLinkIndex = i;
+                                        break;
+                                    }
+                                }
+                            },
+                            stop: function(event,ui) {
+                                dragActive = false;
+                                collapsedButtonsRow.children().css({position:"relative",left:"",transition:""});
+                                $(".red-ui-tab-link-buttons").width('auto');
+                                pinnedLink.css({zIndex:""});
+                                updateTabWidths();
+                                if (startPinnedIndex !== pinnedLinkIndex) {
+                                    if (collapsibleMenu) {
+                                        collapsibleMenu.remove();
+                                        collapsibleMenu = null;
+                                    }
+                                    var newOrder = $.makeArray(collapsedButtonsRow.children().map(function() { return $(this).data('tabId');}));
+                                    tabAPI.order(newOrder);
+                                    options.onreorder(newOrder);
+                                }
+                            }
+                        });
+                    }
 
                 }
+                link.on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
                 link.on("mouseup",onTabClick);
                 link.on("click", function(evt) { evt.preventDefault(); })
                 link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })
 
+                $('<span class="red-ui-tabs-fade"></span>').appendTo(li);
 
                 if (tab.closeable) {
                     li.addClass("red-ui-tabs-closeable")
@@ -551,6 +807,18 @@ RED.tabs = (function() {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
+                }
+                if (tab.hideable) {
+                    li.addClass("red-ui-tabs-closeable")
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
+                    closeLink.on("click",function(event) {
+                        event.preventDefault();
+                        hideTab(tab.id);
+                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
 
                 var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
@@ -558,14 +826,17 @@ RED.tabs = (function() {
                     $('<i class="red-ui-tabs-badge-changed fa fa-circle"></i>').appendTo(badges);
                     $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                 }
+
+                // link.attr("title",tab.label);
+                RED.popover.tooltip(link,function() { return RED.utils.sanitize(tab.label); });
+
                 if (options.onadd) {
                     options.onadd(tab);
                 }
-                link.attr("title",tab.label);
                 if (ul.find("li.red-ui-tab").length == 1) {
                     activateTab(link);
                 }
-                if (options.onreorder) {
+                if (options.onreorder && !options.collapsible) {
                     var originalTabOrder;
                     var tabDragIndex;
                     var tabElements = [];
@@ -652,6 +923,9 @@ RED.tabs = (function() {
                     collapsibleMenu.remove();
                     collapsibleMenu = null;
                 }
+                if (preferredOrder) {
+                    tabAPI.order(preferredOrder);
+                }
             },
             removeTab: removeTab,
             activateTab: activateTab,
@@ -659,24 +933,40 @@ RED.tabs = (function() {
             previousTab: activatePreviousTab,
             resize: updateTabWidths,
             count: function() {
-                return ul.find("li.red-ui-tab").length;
+                return ul.find("li.red-ui-tab:not(.hide)").length;
+            },
+            activeIndex: function() {
+                return ul.find("li.active").index()
             },
             contains: function(id) {
                 return ul.find("a[href='#"+id+"']").length > 0;
             },
+            showTab: showTab,
+            hideTab: hideTab,
+
             renameTab: function(id,label) {
                 tabs[id].label = label;
                 var tab = ul.find("a[href='#"+id+"']");
-                tab.attr("title",label);
                 tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                 updateTabWidths();
             },
+            listTabs: function() {
+                return $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
+            },
             selection: getSelection,
-            order: function(order) {
-                var existingTabOrder = $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
-                if (existingTabOrder.length !== order.length) {
-                    return
+            clearSelection: function() {
+                if (options.onselect) {
+                    var selection = ul.find("li.red-ui-tab.selected");
+                    if (selection.length > 0) {
+                        selection.removeClass("selected");
+                        selectionChanged();
+                    }
                 }
+
+            },
+            order: function(order) {
+                preferredOrder = order;
+                var existingTabOrder = $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
                 var i;
                 var match = true;
                 for (i=0;i<order.length;i++) {
@@ -692,12 +982,41 @@ RED.tabs = (function() {
                 var existingTabs = ul.children().detach().each(function() {
                     existingTabMap[$(this).data("tabId")] = $(this);
                 });
+                var pinnedButtons = {};
+                if (options.collapsible) {
+                    collapsedButtonsRow.children().detach().each(function() {
+                        var id = $(this).data("tabId");
+                        if (!id) {
+                            id = "__menu__"
+                        }
+                        pinnedButtons[id] = $(this);
+                    });
+                }
                 for (i=0;i<order.length;i++) {
-                    existingTabMap[order[i]].appendTo(ul);
+                    if (existingTabMap[order[i]]) {
+                        existingTabMap[order[i]].appendTo(ul);
+                        if (options.collapsible) {
+                            pinnedButtons[order[i]].appendTo(collapsedButtonsRow);
+                        }
+                        delete existingTabMap[order[i]];
+                    }
+                }
+                // Add any tabs that aren't known in the order
+                for (i in existingTabMap) {
+                    if (existingTabMap.hasOwnProperty(i)) {
+                        existingTabMap[i].appendTo(ul);
+                        if (options.collapsible) {
+                            pinnedButtons[i].appendTo(collapsedButtonsRow);
+                        }
+                    }
+                }
+                if (options.collapsible) {
+                    pinnedButtons["__menu__"].appendTo(collapsedButtonsRow);
+                    updateTabWidths();
                 }
             }
-
         }
+        return tabAPI;
     }
 
     return {

packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js

@@ -37,8 +37,8 @@
                 invertState = this.options.invertState;
             }
             var baseClass = this.options.baseClass || "red-ui-button";
-            var enabledIcon = this.options.enabledIcon || "fa-check-square-o";
-            var disabledIcon = this.options.disabledIcon || "fa-square-o";
+            var enabledIcon = this.options.hasOwnProperty('enabledIcon')?this.options.enabledIcon : "fa-check-square-o";
+            var disabledIcon = this.options.hasOwnProperty('disabledIcon')?this.options.disabledIcon : "fa-square-o";
             var enabledLabel = this.options.hasOwnProperty('enabledLabel') ? this.options.enabledLabel : RED._("editor:workspace.enabled");
             var disabledLabel = this.options.hasOwnProperty('disabledLabel') ? this.options.disabledLabel : RED._("editor:workspace.disabled");
 
@@ -46,25 +46,41 @@
             this.element.on("focus", function() {
                 that.button.focus();
             });
-            this.button = $('<button type="button" class="red-ui-toggleButton '+baseClass+' toggle single"><i class="fa"></i> <span></span></button>');
+            this.button = $('<button type="button" class="red-ui-toggleButton '+baseClass+' toggle single"></button>');
+            if (enabledLabel || disabledLabel) {
+                this.buttonLabel = $("<span>").appendTo(this.button).css("margin-left", "5px");
+            }
+
             if (this.options.class) {
                 this.button.addClass(this.options.class)
             }
             this.element.after(this.button);
-            this.buttonIcon = this.button.find("i");
-            this.buttonLabel = this.button.find("span");
+
+            if (enabledIcon && disabledIcon) {
+                this.buttonIcon = $('<i class="fa"></i>').prependTo(this.button);
+            }
 
             // Quick hack to find the maximum width of the button
             this.button.addClass("selected");
-            this.buttonIcon.addClass(enabledIcon);
-            this.buttonLabel.text(enabledLabel);
+            if (this.buttonIcon) {
+                this.buttonIcon.addClass(enabledIcon);
+            }
+            if (this.buttonLabel) {
+                this.buttonLabel.text(enabledLabel);
+            }
             var width = this.button.width();
             this.button.removeClass("selected");
-            this.buttonIcon.removeClass(enabledIcon);
-            that.buttonIcon.addClass(disabledIcon);
-            that.buttonLabel.text(disabledLabel);
+            if (this.buttonIcon) {
+                this.buttonIcon.removeClass(enabledIcon);
+                that.buttonIcon.addClass(disabledIcon);
+            }
+            if (this.buttonLabel) {
+                that.buttonLabel.text(disabledLabel);
+            }
             width = Math.max(width,this.button.width());
-            this.buttonIcon.removeClass(disabledIcon);
+            if (this.buttonIcon) {
+                this.buttonIcon.removeClass(disabledIcon);
+            }
 
             // Fix the width of the button so it doesn't jump around when toggled
             if (width > 0) {
@@ -73,7 +89,7 @@
 
             this.button.on("click",function(e) {
                 e.stopPropagation();
-                if (that.buttonIcon.hasClass(disabledIcon)) {
+                if (!that.state) {
                     that.element.prop("checked",!invertState);
                 } else {
                     that.element.prop("checked",invertState);
@@ -84,14 +100,24 @@
             this.element.on("change", function(e) {
                 if ($(this).prop("checked") !== invertState) {
                     that.button.addClass("selected");
-                    that.buttonIcon.addClass(enabledIcon);
-                    that.buttonIcon.removeClass(disabledIcon);
-                    that.buttonLabel.text(enabledLabel);
+                    that.state = true;
+                    if (that.buttonIcon) {
+                        that.buttonIcon.addClass(enabledIcon);
+                        that.buttonIcon.removeClass(disabledIcon);
+                    }
+                    if (that.buttonLabel) {
+                        that.buttonLabel.text(enabledLabel);
+                    }
                 } else {
                     that.button.removeClass("selected");
-                    that.buttonIcon.addClass(disabledIcon);
-                    that.buttonIcon.removeClass(enabledIcon);
-                    that.buttonLabel.text(disabledLabel);
+                    that.state = false;
+                    if (that.buttonIcon) {
+                        that.buttonIcon.addClass(disabledIcon);
+                        that.buttonIcon.removeClass(enabledIcon);
+                    }
+                    if (that.buttonLabel) {
+                        that.buttonLabel.text(disabledLabel);
+                    }
                 }
             })
             this.element.trigger("change");

packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js

@@ -21,9 +21,13 @@
  *   - multi : boolean - if true, .selected will return an array of results
  *                       otherwise, returns the first selected item
  *   - sortable: boolean/string - TODO: see editableList
+ *   - selectable: boolean - default true - whether individual items can be selected
  *   - rootSortable: boolean - if 'sortable' is set, then setting this to
  *                             false, prevents items being sorted to the
  *                             top level of the tree
+ *   - autoSelect: boolean - default true - triggers item selection when navigating
+ *                           list by keyboard. If the list has checkboxed items
+ *                           you probably want to set this to false
  *
  * methods:
  *   - data(items) - clears existing items and replaces with new data
@@ -41,6 +45,7 @@
  *         sublabel: 'Local', // a sub-label for the item
  *         icon: 'fa fa-rocket', // (optional) icon for the item
  *         checkbox: true/false, // (optional) if present, display checkbox accordingly
+ *         radio: 'group-name',  // (optional) if present, display radio box - using group-name to set radio group
  *         selected: true/false, // (optional) whether the item is selected or not
  *         children: [] | function(done,item) // (optional) an array of child items, or a function
  *                                       // that will call the `done` callback with an array
@@ -49,6 +54,7 @@
  *         deferBuild: true/false, // don't build any ui elements for the item's children
  *                                    until it is expanded by the user.
  *         element: // custom dom element to use for the item - ignored if `label` is set
+ *         collapsible: true/false, // prevent a parent item from being collapsed. default true.
  *     }
  * ]
  *
@@ -89,77 +95,100 @@
     $.widget( "nodered.treeList", {
         _create: function() {
             var that = this;
-
+            var autoSelect = true;
+            if (that.options.autoSelect === false) {
+                autoSelect = false;
+            }
             this.element.addClass('red-ui-treeList');
             this.element.attr("tabIndex",0);
             var wrapper = $('<div>',{class:'red-ui-treeList-container'}).appendTo(this.element);
             this.element.on('keydown', function(evt) {
-                var selected = that._topList.find(".selected").parent().data('data');
-                if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) {
-                    that.select(that._data[0]);
+                var focussed = that._topList.find(".focus").parent().data('data');
+                if (!focussed && (evt.keyCode === 40 || evt.keyCode === 38)) {
+                    if (that._data[0]) {
+                        if (autoSelect) {
+                            that.select(that._data[0]);
+                        } else {
+                            that._topList.find(".focus").removeClass("focus")
+                        }
+                        that._data[0].treeList.label.addClass('focus')
+                    }
                     return;
                 }
                 var target;
                 switch(evt.keyCode) {
+                    case 32: // SPACE
                     case 13: // ENTER
+                        if (!that.options.selectable) { return }
+                        if (evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey) {
+                            return
+                        }
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children) {
-                            if (selected.treeList.container.hasClass("expanded")) {
-                                selected.treeList.collapse()
+                        if (focussed.checkbox) {
+                            focussed.treeList.checkbox.trigger("click");
+                        } else if (focussed.radio) {
+                            focussed.treeList.radio.trigger("click");
+                        } else if (focussed.children) {
+                            if (focussed.treeList.container.hasClass("expanded")) {
+                                focussed.treeList.collapse()
                             } else {
-                                selected.treeList.expand()
+                                focussed.treeList.expand()
                             }
                         } else {
-                            that._trigger("confirm",null,selected)
+                            that._trigger("confirm",null,focussed)
                         }
-
                     break;
                     case 37: // LEFT
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children&& selected.treeList.container.hasClass("expanded")) {
-                            selected.treeList.collapse()
-                        } else if (selected.parent) {
-                            target = selected.parent;
+                        if (focussed.children&& focussed.treeList.container.hasClass("expanded")) {
+                            focussed.treeList.collapse()
+                        } else if (focussed.parent) {
+                            target = focussed.parent;
                         }
                     break;
                     case 38: // UP
                         evt.preventDefault();
                         evt.stopPropagation();
-                        target = that._getPreviousSibling(selected);
+                        target = that._getPreviousSibling(focussed);
                         if (target) {
                             target = that._getLastDescendant(target);
                         }
-                        if (!target && selected.parent) {
-                            target = selected.parent;
+                        if (!target && focussed.parent) {
+                            target = focussed.parent;
                         }
                     break;
                     case 39: // RIGHT
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children) {
-                            if (!selected.treeList.container.hasClass("expanded")) {
-                                selected.treeList.expand()
+                        if (focussed.children) {
+                            if (!focussed.treeList.container.hasClass("expanded")) {
+                                focussed.treeList.expand()
                             }
                         }
                     break
                     case 40: //DOWN
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) {
-                            target = selected.children[0];
+                        if (focussed.children && Array.isArray(focussed.children) && focussed.children.length > 0 && focussed.treeList.container.hasClass("expanded")) {
+                            target = focussed.children[0];
                         } else {
-                            target = that._getNextSibling(selected);
-                            while (!target && selected.parent) {
-                                selected = selected.parent;
-                                target = that._getNextSibling(selected);
+                            target = that._getNextSibling(focussed);
+                            while (!target && focussed.parent) {
+                                focussed = focussed.parent;
+                                target = that._getNextSibling(focussed);
                             }
                         }
                     break
                 }
                 if (target) {
-                    that.select(target);
+                    if (autoSelect) {
+                        that.select(target);
+                    } else {
+                        that._topList.find(".focus").removeClass("focus")
+                    }
+                    target.treeList.label.addClass('focus')
                 }
             });
             this._data = [];
@@ -167,7 +196,7 @@
             this._selected = new Set();
             this._topList = $('<ol class="red-ui-treeList-list">').css({
                 position:'absolute',
-                top: 0,
+                top:0,
                 left:0,
                 right:0,
                 bottom:0
@@ -181,6 +210,9 @@
                     that._addSubtree(that._topList,container,item,0);
                 }
             };
+            if (this.options.header) {
+                topListOptions.header = this.options.header;
+            }
             if (this.options.rootSortable !== false && !!this.options.sortable) {
                 topListOptions.sortable = this.options.sortable;
                 topListOptions.connectWith = '.red-ui-treeList-sortable';
@@ -309,7 +341,8 @@
             }
             if (child.depth !== parent.depth+1) {
                 child.depth = parent.depth+1;
-                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
+                // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20));
+                var labelPaddingWidth = (((child.gutter&&!child.gutter.hasClass("red-ui-treeList-gutter-float"))?child.gutter.width()+2:0)+(child.depth*20));
                 child.treeList.labelPadding.width(labelPaddingWidth+'px');
                 if (child.element) {
                     $(child.element).css({
@@ -345,6 +378,18 @@
                 that._selected.delete(item);
                 delete item.treeList;
                 delete that._items[item.id];
+                if(item.depth === 0) {
+                    for(var key in that._items) {
+                        if (that._items.hasOwnProperty(key)) {
+                            var child = that._items[key];
+                            if(child.parent && child.parent.id === item.id) {
+                                delete that._items[key].treeList;
+                                delete that._items[key];
+                            }
+                        }
+                    }
+                    that._data = that._data.filter(function(data) { return data.id !== item.id})
+                }
             }
             item.treeList.insertChildAt = function(newItem,position,select) {
                 newItem.parent = item;
@@ -446,6 +491,9 @@
                 container.addClass("expanded");
             }
             item.treeList.collapse = function() {
+                if (item.collapsible === false) {
+                    return
+                }
                 if (!item.children) {
                     return;
                 }
@@ -477,7 +525,10 @@
                     if (item.treeList.container) {
                         $(item.element).remove();
                         $(element).appendTo(item.treeList.label);
-                        var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(item.depth*20);
+                        // using the JQuery Object, the gutter width will
+                        // be wrong when the element is reattached the second time
+                        var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (item.depth * 20);
+
                         $(element).css({
                             width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)"
                         })
@@ -513,9 +564,12 @@
                 }).appendTo(label)
 
             }
-            var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
+
+            var labelPaddingWidth = ((item.gutter&&!item.gutter.hasClass("red-ui-treeList-gutter-float"))?item.gutter.width()+2:0)+(depth*20);
+
             item.treeList.labelPadding = $('<span>').css({
                 display: "inline-block",
+                "flex-shrink": 0,
                 width:  labelPaddingWidth+'px'
             }).appendTo(label);
 
@@ -561,7 +615,7 @@
                     // Already a parent because we've got the angle-right icon
                     return;
                 }
-                $('<i class="fa fa-angle-right" />').appendTo(treeListIcon);
+                $('<i class="fa fa-angle-right" />').toggleClass("hide",item.collapsible === false).appendTo(treeListIcon);
                 treeListIcon.on("click.red-ui-treeList-expand", function(e) {
                         e.stopPropagation();
                         e.preventDefault();
@@ -612,6 +666,46 @@
                     label.on("click", function(e) {
                         e.stopPropagation();
                         cb.trigger("click");
+                        that._topList.find(".focus").removeClass("focus")
+                        label.addClass('focus')
+                    })
+                }
+                item.treeList.select = function(v) {
+                    if (v !== item.selected) {
+                        cb.trigger("click");
+                    }
+                }
+                item.treeList.checkbox = cb;
+                selectWrapper.appendTo(label)
+            } else if (item.radio) {
+                var selectWrapper = $('<span class="red-ui-treeList-icon"></span>');
+                var cb = $('<input class="red-ui-treeList-radio" type="radio">').prop('name', item.radio).prop('checked',item.selected).appendTo(selectWrapper);
+                cb.on('click', function(e) {
+                    e.stopPropagation();
+                });
+                cb.on('change', function(e) {
+                    item.selected = this.checked;
+                    that._selected.forEach(function(selectedItem) {
+                        if (selectedItem.radio === item.radio) {
+                            selectedItem.treeList.label.removeClass("selected");
+                            selectedItem.selected = false;
+                            that._selected.delete(selectedItem);
+                        }
+                    })
+                    if (item.selected) {
+                        that._selected.add(item);
+                    } else {
+                        that._selected.delete(item);
+                    }
+                    label.toggleClass("selected",this.checked);
+                    that._trigger("select",e,item);
+                })
+                if (!item.children) {
+                    label.on("click", function(e) {
+                        e.stopPropagation();
+                        cb.trigger("click");
+                        that._topList.find(".focus").removeClass("focus")
+                        label.addClass('focus')
                     })
                 }
                 item.treeList.select = function(v) {
@@ -620,6 +714,7 @@
                     }
                 }
                 selectWrapper.appendTo(label)
+                item.treeList.radio = cb;
             } else {
                 label.on("click", function(e) {
                     if (!that.options.multi) {
@@ -627,10 +722,14 @@
                     }
                     label.addClass("selected");
                     that._selected.add(item);
+                    that._topList.find(".focus").removeClass("focus")
+                    label.addClass('focus')
 
                     that._trigger("select",e,item)
                 })
                 label.on("dblclick", function(e) {
+                    that._topList.find(".focus").removeClass("focus")
+                    label.addClass('focus')
                     if (!item.children) {
                         that._trigger("confirm",e,item);
                     }
@@ -778,6 +877,9 @@
             if (item.treeList.label) {
                 item.treeList.label.addClass("selected");
             }
+
+            that._topList.find(".focus").removeClass("focus");
+
             if (triggerEvent !== false) {
                 this._trigger("select",null,item)
             }
@@ -785,6 +887,9 @@
         clearSelection: function() {
             this._selected.forEach(function(item) {
                 item.selected = false;
+                if (item.treeList.checkbox) {
+                    item.treeList.checkbox.prop('checked',false)
+                }
                 if (item.treeList.label) {
                     item.treeList.label.removeClass("selected")
                 }

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  **/
 (function($) {
-    var contextParse = function(v) {
-        var parts = RED.utils.parseContextKey(v);
+    var contextParse = function(v,defaultStore) {
+        var parts = RED.utils.parseContextKey(v, defaultStore&&defaultStore.value);
         return {
             option: parts.store,
             value: parts.key
@@ -32,25 +32,154 @@
             return v;
         }
     }
+    var contextLabel =  function(container,value) {
+        var that = this;
+        container.css("pointer-events","none");
+        container.css("flex-grow",0);
+        container.css("position",'relative');
+        container.css("overflow",'visible');
+        $('<div></div>').text(value).css({
+            position: "absolute",
+            bottom:"-2px",
+            right: "5px",
+            "font-size": "0.7em",
+            opacity: 0.3
+        }).appendTo(container);
+        this.elementDiv.show();
+    }
     var mapDeprecatedIcon = function(icon) {
         if (/^red\/images\/typedInput\/.+\.png$/.test(icon)) {
             icon = icon.replace(/.png$/,".svg");
         }
         return icon;
     }
+
+    var autoComplete = function(options) {
+        function getMatch(value, searchValue) {
+            const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
+            const len = idx > -1 ? searchValue.length : 0;
+            return {
+                index: idx,
+                found: idx > -1,
+                pre: value.substring(0,idx),
+                match: value.substring(idx,idx+len),
+                post: value.substring(idx+len),
+            }
+        }
+        function generateSpans(match) {
+            const els = [];
+            if(match.pre) { els.push($('<span/>').text(match.pre)); }
+            if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
+            if(match.post) { els.push($('<span/>').text(match.post)); }
+            return els;
+        }
+        return function(val) {
+            var matches = [];
+            options.forEach(opt => {
+                const optVal = opt.value;
+                const optSrc = (opt.source||[]).join(",");
+                const valMatch = getMatch(optVal, val);
+                const srcMatch = getMatch(optSrc, val);
+                if (valMatch.found || srcMatch.found) {
+                    const element = $('<div>',{style: "display: flex"});
+                    const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                    valEl.append(generateSpans(valMatch));
+                    valEl.appendTo(element);
+                    if (optSrc) {
+                        const optEl = $('<div>').css({ "font-size": "0.8em" });
+                        optEl.append(generateSpans(srcMatch));
+                        optEl.appendTo(element);
+                    }
+                    matches.push({ 
+                        value: optVal, 
+                        label: element, 
+                        i: (valMatch.found ? valMatch.index : srcMatch.index) 
+                    });
+                }
+            })
+            matches.sort(function(A,B){return A.i-B.i})
+            return matches;
+        }
+    }
+
+    // This is a hand-generated list of completions for the core nodes (based on the node help html).
+    var msgCompletions = [
+        { value: "payload" },
+        { value: "topic", source: ["mqtt","inject","rbe"] },
+        { value: "action", source: ["mqtt"] },
+        { value: "complete", source: ["join"] },
+        { value: "contentType", source: ["mqtt"] },
+        { value: "cookies", source: ["http request","http response"] },
+        { value: "correlationData", source: ["mqtt"] },
+        { value: "delay", source: ["delay","trigger"] },
+        { value: "encoding", source: ["file"] },
+        { value: "error", source: ["catch"] },
+        { value: "error.message", source: ["catch"] },
+        { value: "error.source", source: ["catch"] },
+        { value: "error.source.id", source: ["catch"] },
+        { value: "error.source.type", source: ["catch"] },
+        { value: "error.source.name", source: ["catch"] },
+        { value: "filename", source: ["file","file in"] },
+        { value: "flush", source: ["delay"] },
+        { value: "followRedirects", source: ["http request"] },
+        { value: "headers", source: ["http response","http request"] },
+        { value: "host", source: ["tcp request","http request"] },
+        { value: "ip", source: ["udp out"] },
+        { value: "kill", source: ["exec"] },
+        { value: "messageExpiryInterval", source: ["mqtt"] },
+        { value: "method", source: ["http request"] },
+        { value: "options", source: ["xml"] },
+        { value: "parts", source: ["split","join","batch","sort"] },
+        { value: "pid", source: ["exec"] },
+        { value: "port", source: ["tcp request"," udp out"] },
+        { value: "qos", source: ["mqtt"] },
+        { value: "rate", source: ["delay"] },
+        { value: "rejectUnauthorized", source: ["http request"] },
+        { value: "req", source: ["http in"]},
+        { value: "req.body", source: ["http in"]},
+        { value: "req.headers", source: ["http in"]},
+        { value: "req.query", source: ["http in"]},
+        { value: "req.params", source: ["http in"]},
+        { value: "req.cookies", source: ["http in"]},
+        { value: "req.files", source: ["http in"]},
+        { value: "requestTimeout", source: ["http request"] },
+        { value: "reset", source: ["delay","trigger","join","rbe"] },
+        { value: "responseCookies", source: ["http request"] },
+        { value: "responseTopic", source: ["mqtt"] },
+        { value: "responseURL", source: ["http request"] },
+        { value: "restartTimeout", source: ["join"] },
+        { value: "retain", source: ["mqtt"] },
+        { value: "schema", source: ["json"] },
+        { value: "select", source: ["html"] },
+        { value: "statusCode", source: ["http response","http request"] },
+        { value: "status", source: ["status"] },
+        { value: "status.text", source: ["status"] },
+        { value: "status.source", source: ["status"] },
+        { value: "status.source.type", source: ["status"] },
+        { value: "status.source.id", source: ["status"] },
+        { value: "status.source.name", source: ["status"] },
+        { value: "target", source: ["link call"] },
+        { value: "template", source: ["template"] },
+        { value: "toFront", source: ["delay"] },
+        { value: "url", source: ["http request"] },
+        { value: "userProperties", source: ["mqtt"] },
+        { value: "_session", source: ["websocket out","tcp out"] },
+    ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
-            export: contextExport
+            export: contextExport,
+            valueLabel: contextLabel
         },
         global: {value:"global",label:"global.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
-            export: contextExport
+            export: contextExport,
+            valueLabel: contextLabel
         },
         str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
         num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
@@ -69,6 +198,8 @@
                 }
                 RED.editor.editJSON({
                     value: value,
+                    stateId: RED.editor.generateViewStateId("typedInput", that, "json"),
+                    focus: true,
                     complete: function(v) {
                         var value = v;
                         try {
@@ -91,6 +222,8 @@
                 var that = this;
                 RED.editor.editExpression({
                     value: this.value().replace(/\t/g,"\n"),
+                    stateId: RED.editor.generateViewStateId("typedInput", that, "jsonata"),
+                    focus: true,
                     complete: function(v) {
                         that.value(v.replace(/\n/g,"\t"));
                     }
@@ -105,6 +238,8 @@
                 var that = this;
                 RED.editor.editBuffer({
                     value: this.value(),
+                    stateId: RED.editor.generateViewStateId("typedInput", that, "bin"),
+                    focus: true,
                     complete: function(v) {
                         that.value(v);
                     }
@@ -173,6 +308,7 @@
             valueLabel: function(container,value) {
                 var that = this;
                 container.css("pointer-events","none");
+                container.css("flex-grow",0);
                 this.elementDiv.hide();
                 var buttons = $('<div>').css({
                     position: "absolute",
@@ -184,22 +320,25 @@
                     width:"20px"
                 }).appendTo(buttons).on("click", function(evt) {
                     evt.preventDefault();
+                    var cursorPosition = that.input[0].selectionStart;
                     var currentType = that.input.attr("type");
                     if (currentType === "text") {
                         that.input.attr("type","password");
                         eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
                         setTimeout(function() {
                             that.input.focus();
+                            that.input[0].setSelectionRange(cursorPosition, cursorPosition);
                         },50);
                     } else {
                         that.input.attr("type","text");
                         eyeCon.removeClass("fa-eye").addClass("fa-eye-slash");
                         setTimeout(function() {
                             that.input.focus();
+                            that.input[0].setSelectionRange(cursorPosition, cursorPosition);
                         },50);
                     }
                 }).hide();
-                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-1px").appendTo(eyeButton);
+                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-2px").appendTo(eyeButton);
 
                 if (value === "__PWRD__") {
                     var innerContainer = $('<div><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i></div>').css({
@@ -244,6 +383,47 @@
             }
         }
     };
+
+    // For a type with options, check value is a valid selection
+    // If !opt.multiple, returns the valid option object
+    // if opt.multiple, returns an array of valid option objects
+    // If not valid, returns null;
+
+    function isOptionValueValid(opt, currentVal) {
+        if (!opt.multiple) {
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
+                if (typeof op === "string" && op === currentVal) {
+                    return {value:currentVal}
+                } else if (op.value === currentVal) {
+                    return op;
+                }
+            }
+        } else {
+            // Check to see if value is a valid csv of
+            // options.
+            var currentValues = {};
+            var selected = [];
+            currentVal.split(",").forEach(function(v) {
+                if (v) {
+                    currentValues[v] = true;
+                }
+            });
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
+                var val = typeof op === "string" ? op : op.value;
+                if (currentValues.hasOwnProperty(val)) {
+                    delete currentValues[val];
+                    selected.push(typeof op === "string" ? {value:op} : op.value)
+                }
+            }
+            if (!$.isEmptyObject(currentValues)) {
+                return null;
+            }
+            return selected
+        }
+    }
+
     var nlsd = false;
 
     $.widget( "nodered.typedInput", {
@@ -258,6 +438,14 @@
                 var contextStores = RED.settings.context.stores;
                 var contextOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
+                }).sort(function(A,B) {
+                    if (A.value === RED.settings.context.default) {
+                        return -1;
+                    } else if (B.value === RED.settings.context.default) {
+                        return 1;
+                    } else {
+                        return A.value.localeCompare(B.value);
+                    }
                 })
                 if (contextOptions.length < 2) {
                     allOptions.flow.options = [];
@@ -269,7 +457,8 @@
             }
             nlsd = true;
             var that = this;
-
+            this.identifier = this.element.attr('id') || "TypedInput-"+Math.floor(Math.random()*100);
+            if (this.options.debug) { console.log(this.identifier,"Create",{defaultType:this.options.default, value:this.element.val()}) }
             this.disarmClick = false;
             this.input = $('<input class="red-ui-typedInput-input" type="text"></input>');
             this.input.insertAfter(this.element);
@@ -284,7 +473,7 @@
                 this.input.css('width','100%');
                 this.uiSelect.width(m[1]);
                 this.uiWidth = null;
-            } else {
+            } else if (this.uiWidth !== 0){
                 this.uiSelect.width(this.uiWidth);
             }
             ["Right","Left"].forEach(function(d) {
@@ -299,12 +488,18 @@
             });
 
             this.defaultInputType = this.input.attr('type');
+            // Used to remember selections per-type to restore them when switching between types
+            this.oldValues = {};
 
             this.uiSelect.addClass("red-ui-typedInput-container");
 
             this.element.attr('type','hidden');
 
-            this.options.types = this.options.types||Object.keys(allOptions);
+            if (!this.options.types && this.options.type) {
+                this.options.types = [this.options.type]
+            } else {
+                this.options.types = this.options.types||Object.keys(allOptions);
+            }
 
             this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
             $('<i class="red-ui-typedInput-icon fa fa-caret-down"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
@@ -334,9 +529,22 @@
             this.input.on('change', function() {
                 that.validate();
                 that.element.val(that.value());
-                that.element.trigger('change',that.propertyType,that.value());
+                that.element.trigger('change',[that.propertyType,that.value()]);
+            });
+            this.input.on('keyup', function(evt) {
+                that.validate();
+                that.element.val(that.value());
+                that.element.trigger('keyup',evt);
+            });
+            this.input.on('paste', function(evt) {
+                that.validate();
+                that.element.val(that.value());
+                that.element.trigger('paste',evt);
             });
             this.input.on('keydown', function(evt) {
+                if (that.typeMap[that.propertyType].autoComplete) {
+                    return
+                }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
                     evt.stopPropagation();
                 }
@@ -354,14 +562,19 @@
                 evt.stopPropagation();
             }).on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
+            }).on('blur', function() {
+                var opt = that.typeMap[that.propertyType];
+                if (opt.hasValue === false) {
+                    that.uiSelect.removeClass('red-ui-typedInput-focus');
+                }
             })
 
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
             this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
-            RED.popover.tooltip(this.optionSelectLabel,function() {
-                return that.optionValue;
-            });
+            // RED.popover.tooltip(this.optionSelectLabel,function() {
+            //     return that.optionValue;
+            // });
             this.optionSelectTrigger.on("click", function(event) {
                 event.preventDefault();
                 event.stopPropagation();
@@ -380,7 +593,9 @@
 
             this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
             this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
-            this.type(this.options.default||this.typeList[0].value);
+
+            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
+            this.typeChanged = !!this.options.default;
         }catch(err) {
             console.log(err.stack);
         }
@@ -403,7 +618,11 @@
                 });
 
                 this._showMenu(this.optionMenu,this.optionSelectTrigger);
-                var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
+                var targetValue = this.optionValue;
+                if (this.optionValue === null || this.optionValue === undefined) {
+                    targetValue = this.value();
+                }
+                var selectedOption = this.optionMenu.find("[value='"+targetValue+"']");
                 if (selectedOption.length === 0) {
                     selectedOption = this.optionMenu.children(":first");
                 }
@@ -456,7 +675,7 @@
                     if (opt.icon.indexOf("<") === 0) {
                         $(opt.icon).prependTo(op);
                     } else if (opt.icon.indexOf("/") !== -1) {
-                        $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+                        $('<i>',{class:"red-ui-typedInput-icon", style:"mask-image: url("+opt.icon+"); -webkit-mask-image: url("+opt.icon+");"}).prependTo(op);
                     } else {
                         $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
                     }
@@ -527,7 +746,7 @@
             var height = relativeTo.height();
             var menuHeight = menu.height();
             var top = (height+pos.top);
-            if (top+menuHeight > $(window).height()) {
+            if (top+menuHeight-$(document).scrollTop() > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
             if (top < 0) {
@@ -574,34 +793,43 @@
         _updateOptionSelectLabel: function(o) {
             var opt = this.typeMap[this.propertyType];
             this.optionSelectLabel.empty();
+            if (opt.hasValue) {
+                this.valueLabelContainer.empty();
+                this.valueLabelContainer.show();
+            } else {
+                this.valueLabelContainer.hide();
+            }
             if (this.typeMap[this.propertyType].valueLabel) {
                 if (opt.multiple) {
-                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
+                    this.typeMap[this.propertyType].valueLabel.call(this,opt.hasValue?this.valueLabelContainer:this.optionSelectLabel,o);
                 } else {
-                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
+                    this.typeMap[this.propertyType].valueLabel.call(this,opt.hasValue?this.valueLabelContainer:this.optionSelectLabel,o.value);
                 }
-            } else if (!opt.multiple) {
-                if (o.icon) {
-                    if (o.icon.indexOf("<") === 0) {
-                        $(o.icon).prependTo(this.optionSelectLabel);
-                    } else if (o.icon.indexOf("/") !== -1) {
-                        // url
-                        $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+            }
+            if (!this.typeMap[this.propertyType].valueLabel || opt.hasValue) {
+                if (!opt.multiple) {
+                    if (o.icon) {
+                        if (o.icon.indexOf("<") === 0) {
+                            $(o.icon).prependTo(this.optionSelectLabel);
+                        } else if (o.icon.indexOf("/") !== -1) {
+                            // url
+                            $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+                        } else {
+                            // icon class
+                            $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                        }
+                    } else if (o.label) {
+                        this.optionSelectLabel.text(o.label);
                     } else {
-                        // icon class
-                        $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                        this.optionSelectLabel.text(o.value);
+                    }
+                    if (opt.hasValue) {
+                        this.optionValue = o.value;
+                        this.input.trigger('change',[this.propertyType,this.value()]);
                     }
-                } else if (o.label) {
-                    this.optionSelectLabel.text(o.label);
                 } else {
-                    this.optionSelectLabel.text(o.value);
+                    this.optionSelectLabel.text(o.length+" selected");
                 }
-                if (opt.hasValue) {
-                    this.optionValue = o.value;
-                    this.input.trigger('change',this.propertyType,this.value());
-                }
-            } else {
-                this.optionSelectLabel.text(o.length+" selected");
             }
         },
         _destroy: function() {
@@ -615,6 +843,7 @@
             var that = this;
             var currentType = this.type();
             this.typeMap = {};
+            var firstCall = (this.typeList === undefined);
             this.typeList = types.map(function(opt) {
                 var result;
                 if (typeof opt === 'string') {
@@ -625,6 +854,13 @@
                 that.typeMap[result.value] = result;
                 return result;
             });
+            if (this.typeList.length < 2) {
+                this.selectTrigger.attr("tabindex", -1)
+                this.selectTrigger.on("mousedown.red-ui-typedInput-focus-block", function(evt) { evt.preventDefault(); })
+            } else {
+                this.selectTrigger.attr("tabindex", 0)
+                this.selectTrigger.off("mousedown.red-ui-typedInput-focus-block")
+            }
             this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
             this.selectTrigger.find(".fa-caret-down").toggle(this.typeList.length > 1)
             if (this.menu) {
@@ -632,10 +868,19 @@
             }
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                this.type(this.typeList[0].value);
+                if (!firstCall) {
+                    this.type(this.typeList[0].value);
+                }
             } else {
                 this.propertyType = null;
-                this.type(currentType);
+                if (!firstCall) {
+                    this.type(currentType);
+                }
+            }
+            if (this.typeList.length === 1 && !this.typeList[0].icon && (!this.typeList[0].label || this.typeList[0].showLabel === false)) {
+                this.selectTrigger.hide()
+            } else {
+                this.selectTrigger.show()
             }
         },
         width: function(desiredWidth) {
@@ -646,7 +891,10 @@
         },
         value: function(value) {
             var that = this;
-            var opt = this.typeMap[this.propertyType];
+            // If the default type has been set to an invalid type, then on first
+            // creation, the current propertyType will not exist. Default to an
+            // empty object on the assumption the corrent type will be set shortly
+            var opt = this.typeMap[this.propertyType] || {};
             if (!arguments.length) {
                 var v = this.input.val();
                 if (opt.export) {
@@ -654,27 +902,38 @@
                 }
                 return v;
             } else {
+                if (this.options.debug) { console.log(this.identifier,"----- SET VALUE ------",value) }
                 var selectedOption = [];
+                var valueToCheck = value;
                 if (opt.options) {
-                    var checkValues = [value];
+                    if (opt.hasValue && opt.parse) {
+                        var parts = opt.parse(value);
+                        if (this.options.debug) { console.log(this.identifier,"new parse",parts) }
+                        value = parts.value;
+                        valueToCheck = parts.option || parts.value;
+                    }
+
+                    var checkValues = [valueToCheck];
                     if (opt.multiple) {
                         selectedOption = [];
-                        checkValues = value.split(",");
+                        checkValues = valueToCheck.split(",");
                     }
-                    checkValues.forEach(function(value) {
+                    checkValues.forEach(function(valueToCheck) {
                         for (var i=0;i<opt.options.length;i++) {
                             var op = opt.options[i];
                             if (typeof op === "string") {
-                                if (op === value || op === ""+value) {
+                                if (op === valueToCheck || op === ""+valueToCheck) {
                                     selectedOption.push(that.activeOptions[op]);
                                     break;
                                 }
-                            } else if (op.value === value) {
+                            } else if (op.value === valueToCheck) {
                                 selectedOption.push(op);
                                 break;
                             }
                         }
                     })
+                    if (this.options.debug) { console.log(this.identifier,"set value to",value) }
+
                     this.input.val(value);
                     if (!opt.multiple) {
                         if (selectedOption.length === 0) {
@@ -691,7 +950,7 @@
                         opt.valueLabel.call(this,this.valueLabelContainer,value);
                     }
                 }
-                this.input.trigger('change',this.type(),value);
+                this.input.trigger('change',[this.type(),value]);
             }
         },
         type: function(type) {
@@ -699,9 +958,64 @@
                 return this.propertyType;
             } else {
                 var that = this;
+                if (this.options.debug) { console.log(this.identifier,"----- SET TYPE -----",type) }
+                var previousValue = null;
                 var opt = this.typeMap[type];
                 if (opt && this.propertyType !== type) {
+                    // If previousType is !null, then this is a change of the type, rather than the initialisation
+                    var previousType = this.typeMap[this.propertyType];
+                    previousValue = this.input.val();
+
+                    if (previousType && this.typeChanged) {
+                        if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
+                        if (previousType.options && opt.hasValue !== true) {
+                            this.oldValues[previousType.value] = previousValue;
+                        } else if (previousType.hasValue === false) {
+                            this.oldValues[previousType.value] = previousValue;
+                        } else {
+                            this.oldValues["_"] = previousValue;
+                        }
+                        if ((opt.options && opt.hasValue !== true) || opt.hasValue === false) {
+                            if (this.oldValues.hasOwnProperty(opt.value)) {
+                                if (this.options.debug) { console.log(this.identifier,"restored previous (1)",this.oldValues[opt.value]) }
+                                this.input.val(this.oldValues[opt.value]);
+                            } else if (opt.options) {
+                                // No old value for the option type.
+                                // It is possible code has called 'value' then 'type'
+                                // to set the selected option. This is what the Inject/Switch/Change
+                                // nodes did before 2.1.
+                                // So we need to be careful to not reset the value if it is a valid option.
+                                var validOptions = isOptionValueValid(opt,previousValue);
+                                if (this.options.debug) { console.log(this.identifier,{previousValue,opt,validOptions}) }
+                                if ((previousValue || previousValue === '') && validOptions) {
+                                    if (this.options.debug) { console.log(this.identifier,"restored previous (2)") }
+                                    this.input.val(previousValue);
+                                } else {
+                                    if (typeof opt.default === "string") {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (3)",opt.default) }
+                                        this.input.val(opt.default);
+                                    } else if (Array.isArray(opt.default)) {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (4)",opt.default.join(",")) }
+                                        this.input.val(opt.default.join(","))
+                                    } else {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (5)") }
+                                        this.input.val("");
+                                    }
+                                }
+                            } else {
+                                if (this.options.debug) { console.log(this.identifier,"restored default/blank",opt.default||"") }
+                                this.input.val(opt.default||"")
+                            }
+                        } else {
+                            if (this.options.debug) { console.log(this.identifier,"restored old/default/blank") }
+                            this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
+                        }
+                        if (previousType.autoComplete) {
+                            this.input.autoComplete("destroy");
+                        }
+                    }
                     this.propertyType = type;
+                    this.typeChanged = true;
                     if (this.typeField) {
                         this.typeField.val(type);
                     }
@@ -712,10 +1026,7 @@
                             $(opt.icon).prependTo(this.selectLabel);
                         }
                         else if (opt.icon.indexOf("/") !== -1) {
-                            image = new Image();
-                            image.name = opt.icon;
-                            image.src = mapDeprecatedIcon(opt.icon);
-                            $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
+                            $('<i>',{class:"red-ui-typedInput-icon", style:"mask-image: url("+opt.icon+"); -webkit-mask-image: url("+opt.icon+"); margin-right: 4px;height: 18px;width:13px"}).prependTo(this.selectLabel);
                         }
                         else {
                             $('<i>',{class:"red-ui-typedInput-icon "+opt.icon,style:"min-width: 13px; margin-right: 4px;"}).prependTo(this.selectLabel);
@@ -724,6 +1035,11 @@
                     if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
                         this.selectLabel.text(opt.label);
                     }
+                    if (opt.label) {
+                        this.selectTrigger.attr("title",opt.label);
+                    } else {
+                        this.selectTrigger.attr("title","");
+                    }
                     if (opt.hasValue === false) {
                         this.selectTrigger.addClass("red-ui-typedInput-full-width");
                     } else {
@@ -765,22 +1081,12 @@
 
                             var op;
                             if (!opt.hasValue) {
-                                var validValue = false;
-                                var currentVal = this.input.val();
+                                // Check the value is valid for the available options
+                                var validValues = isOptionValueValid(opt,this.input.val());
                                 if (!opt.multiple) {
-                                    for (var i=0;i<opt.options.length;i++) {
-                                        op = opt.options[i];
-                                        if (typeof op === "string" && op === currentVal) {
-                                            that._updateOptionSelectLabel({value:currentVal});
-                                            validValue = true;
-                                            break;
-                                        } else if (op.value === currentVal) {
-                                            that._updateOptionSelectLabel(op);
-                                            validValue = true;
-                                            break;
-                                        }
-                                    }
-                                    if (!validValue) {
+                                    if (validValues) {
+                                        that._updateOptionSelectLabel(validValues)
+                                    } else {
                                         op = opt.options[0];
                                         if (typeof op === "string") {
                                             this.value(op);
@@ -791,27 +1097,19 @@
                                         }
                                     }
                                 } else {
-                                    // Check to see if value is a valid csv of
-                                    // options.
-                                    var currentValues = {};
-                                    currentVal.split(",").forEach(function(v) {
-                                        if (v) {
-                                            currentValues[v] = true;
-                                        }
-                                    });
-                                    for (var i=0;i<opt.options.length;i++) {
-                                        op = opt.options[i];
-                                        delete currentValues[op.value||op];
-                                    }
-                                    if (!$.isEmptyObject(currentValues)) {
-                                        // Invalid, set to default/empty
-                                        this.value((opt.default||[]).join(","));
+                                    if (!validValues) {
+                                        validValues = (opt.default || []).map(function(v) {
+                                            return typeof v === "string"?v:v.value
+                                        });
+                                        this.value(validValues.join(","));
                                     }
+                                    that._updateOptionSelectLabel(validValues);
                                 }
                             } else {
                                 var selectedOption = this.optionValue||opt.options[0];
                                 if (opt.parse) {
-                                    var parts = opt.parse(this.input.val());
+                                    var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
+                                    var parts = opt.parse(this.input.val(),selectedOptionObj);
                                     if (parts.option) {
                                         selectedOption = parts.option;
                                         if (!this.activeOptions.hasOwnProperty(selectedOption)) {
@@ -835,6 +1133,7 @@
                                         this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
                                     }
                                 } else if (selectedOption) {
+                                    if (this.options.debug) { console.log(this.identifier,"HERE",{optionValue:selectedOption.value}) }
                                     this.optionValue = selectedOption.value;
                                     this._updateOptionSelectLabel(selectedOption);
                                 } else {
@@ -856,7 +1155,7 @@
                             });
                         }
                         this._trigger("typechange",null,this.propertyType);
-                        this.input.trigger('change',this.propertyType,this.value());
+                        this.input.trigger('change',[this.propertyType,this.value()]);
                     } else {
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.hide();
@@ -867,22 +1166,26 @@
                             this.input.attr('type',this.defaultInputType)
                         }
                         if (opt.hasValue === false) {
-                            this.oldValue = this.input.val();
-                            this.input.val("");
                             this.elementDiv.hide();
                             this.valueLabelContainer.hide();
                         } else if (opt.valueLabel) {
+                            // Reset any CSS the custom label may have set
+                            this.valueLabelContainer.css("pointer-events","");
+                            this.valueLabelContainer.css("flex-grow",1);
+                            this.valueLabelContainer.css("overflow","hidden");
                             this.valueLabelContainer.show();
                             this.valueLabelContainer.empty();
                             this.elementDiv.hide();
                             opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                         } else {
-                            if (this.oldValue !== undefined) {
-                                this.input.val(this.oldValue);
-                                delete this.oldValue;
-                            }
                             this.valueLabelContainer.hide();
                             this.elementDiv.show();
+                            if (opt.autoComplete) {
+                                this.input.autoComplete({
+                                    search: opt.autoComplete,
+                                    minLength: 0
+                                })
+                            }
                         }
                         if (this.optionExpandButton) {
                             if (opt.expand) {
@@ -923,7 +1226,7 @@
                             }
                         }
                         this._trigger("typechange",null,this.propertyType);
-                        this.input.trigger('change',this.propertyType,this.value());
+                        this.input.trigger('change',[this.propertyType,this.value()]);
                     }
                 }
             }
@@ -954,6 +1257,22 @@
         },
         hide: function() {
             this.uiSelect.hide();
+        },
+        disable: function(val) {
+            if(val === undefined || !!val ) {
+                this.uiSelect.attr("disabled", "disabled");
+            } else {
+                this.uiSelect.attr("disabled", null); //remove attr
+            }
+        },
+        enable: function() {
+            this.uiSelect.attr("disabled", null); //remove attr
+        },
+        disabled: function() {
+            return this.uiSelect.attr("disabled") === "disabled";
+        },
+        focus: function() {
+            this.input.focus();
         }
     });
 })(jQuery);

packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js

@@ -0,0 +1,203 @@
+RED.contextMenu = (function () {
+
+    let menu;
+    function createMenu() {
+        // menu = RED.popover.menu({
+        //     options: [
+        //         {
+        //             label: 'delete selection',
+        //             onselect: function() {
+        //                 RED.actions.invoke('core:delete-selection')
+        //                 RED.view.focus()
+        //             }
+        //         },
+        //         { label: 'world' }
+        //     ],
+        //     width: 200,
+        // })
+    }
+
+    function disposeMenu() {
+        $(document).off("mousedown.red-ui-workspace-context-menu");
+        if (menu) {
+            menu.remove();
+        }
+        menu = null;
+    }
+    function show(options) {
+        if (menu) {
+            menu.remove()
+        }
+
+        const selection = RED.view.selection()
+        const noSelection = !selection || Object.keys(selection).length === 0
+        const hasSelection = (selection.nodes && selection.nodes.length > 0);
+        const hasMultipleSelection = hasSelection && selection.nodes.length > 1;
+        const virtulLinks = (selection.links && selection.links.filter(e => !!e.link)) || [];
+        const wireLinks = (selection.links && selection.links.filter(e => !e.link)) || [];
+        const hasLinks = wireLinks.length > 0;
+        const isSingleLink = !hasSelection && hasLinks && wireLinks.length === 1
+        const isMultipleLinks = !hasSelection && hasLinks && wireLinks.length > 1
+        const canDelete = hasSelection || hasLinks
+        const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
+
+        const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
+        const offset = $("#red-ui-workspace-chart").offset()
+
+        let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
+        let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()
+
+        if (RED.view.snapGrid) {
+            const gridSize = RED.view.gridSize()
+            addX = gridSize * Math.floor(addX / gridSize)
+            addY = gridSize * Math.floor(addY / gridSize)
+        }
+
+        const menuItems = [
+            { onselect: 'core:show-action-list', onpostselect: function () { } },
+            {
+                label: RED._("contextMenu.insert"),
+                options: [
+                    {
+                        label: RED._("contextMenu.node"),
+                        onselect: function () {
+                            RED.view.showQuickAddDialog({
+                                position: [addX, addY],
+                                touchTrigger: true,
+                                splice: isSingleLink ? selection.links[0] : undefined,
+                                // spliceMultiple: isMultipleLinks
+                            })
+                        }
+                    },
+                    (hasLinks) ? { // has least 1 wire selected
+                        label: RED._("contextMenu.junction"),
+                        onselect: 'core:split-wires-with-junctions',
+                        disabled: !hasLinks
+                    } : {
+                        label: RED._("contextMenu.junction"),
+                        onselect: function () {
+                            const nn = {
+                                _def: { defaults: {} },
+                                type: 'junction',
+                                z: RED.workspaces.active(),
+                                id: RED.nodes.id(),
+                                x: addX,
+                                y: addY,
+                                w: 0, h: 0,
+                                outputs: 1,
+                                inputs: 1,
+                                dirty: true
+                            }
+                            const historyEvent = {
+                                dirty: RED.nodes.dirty(),
+                                t: 'add',
+                                junctions: [nn]
+                            }
+                            RED.nodes.addJunction(nn);
+                            RED.history.push(historyEvent);
+                            RED.nodes.dirty(true);
+                            RED.view.select({nodes: [nn] });
+                            RED.view.redraw(true)
+                        }
+                    },
+                    {
+                        label: RED._("contextMenu.linkNodes"),
+                        onselect: 'core:split-wire-with-link-nodes',
+                        disabled: !hasLinks
+                    }
+                ]
+
+
+
+            }
+        ]
+
+        menuItems.push(
+            null,
+            { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
+            { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
+            null,
+            { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !hasSelection },
+            { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
+            { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !RED.view.clipboard() },
+            { onselect: 'core:delete-selection', disabled: !canDelete },
+            { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
+            { onselect: 'core:select-all-nodes' }
+        )
+
+        if (hasSelection) {
+            menuItems.push(
+                null,
+                isGroup ?
+                    { onselect: 'core:ungroup-selection', disabled: !isGroup }
+                    : { onselect: 'core:group-selection', disabled: !hasSelection }
+            )
+            if (canRemoveFromGroup) {
+                menuItems.push({ onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") })
+            }
+
+        }
+
+        var direction = "right";
+        var MENU_WIDTH = 500; // can not use menu width here
+        if ((options.x -$(document).scrollLeft()) >
+            ($(window).width() -MENU_WIDTH)) {
+            direction = "left";
+        }
+        
+        menu = RED.menu.init({
+            direction: direction,
+            onpreselect: function() {
+                disposeMenu()
+            },
+            onpostselect: function () {
+                RED.view.focus()
+            },
+            options: menuItems
+        });
+
+        menu.attr("id", "red-ui-workspace-context-menu");
+        menu.css({
+            position: "absolute"
+        })
+        menu.appendTo("body");
+
+        // TODO: prevent the menu from overflowing the window.
+
+        var top = options.y
+        var left = options.x
+
+        if (top + menu.height() - $(document).scrollTop() > $(window).height()) {
+            top -= (top + menu.height()) - $(window).height() + 22;
+        }
+        if (left + menu.width() - $(document).scrollLeft() > $(window).width()) {
+            left -= (left + menu.width()) - $(window).width() + 18;
+        }
+        menu.css({
+            top: top + "px",
+            left: left + "px"
+        })
+        $(".red-ui-menu.red-ui-menu-dropdown").hide();
+        $(document).on("mousedown.red-ui-workspace-context-menu", function (evt) {
+            if (menu && menu[0].contains(evt.target)) {
+                return
+            }
+            disposeMenu()
+        });
+        menu.show();
+        // set focus to first item so that pressing escape key closes the menu
+        $("#red-ui-workspace-context-menu :first(ul) > a").trigger("focus")
+
+    }
+    // Allow escape key hook and other editor events to close context menu
+    RED.keyboard.add("red-ui-workspace-context-menu", "escape", function () { RED.contextMenu.hide() })
+    RED.events.on("editor:open", function () { RED.contextMenu.hide() });
+    RED.events.on("search:open", function () { RED.contextMenu.hide() });
+    RED.events.on("type-search:open", function () { RED.contextMenu.hide() });
+    RED.events.on("actionList:open", function () { RED.contextMenu.hide() });
+    RED.events.on("view:selection-changed", function () { RED.contextMenu.hide() });
+    return {
+        show: show,
+        hide: disposeMenu
+    }
+})()

packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js

@@ -63,16 +63,18 @@ RED.deploy = (function() {
               '</a>'+
               '<a id="red-ui-header-button-deploy-options" class="red-ui-deploy-button" href="#"><i class="fa fa-caret-down"></i></a>'+
               '</span></li>').prependTo(".red-ui-header-toolbar");
-              RED.menu.init({id:"red-ui-header-button-deploy-options",
-                  options: [
-                      {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
-                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
-                      null,
-                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
-
-                  ]
-              });
+            const mainMenuItems = [
+                    {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+                    {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+                    {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+                    null
+            ]
+            if (RED.settings.runtimeState && RED.settings.runtimeState.ui === true) {
+                mainMenuItems.push({id:"deploymenu-item-runtime-start", icon:"red/images/start.svg",label:RED._("deploy.startFlows"),sublabel:RED._("deploy.startFlowsDesc"),onselect:"core:start-flows", visible:false})
+                mainMenuItems.push({id:"deploymenu-item-runtime-stop", icon:"red/images/stop.svg",label:RED._("deploy.stopFlows"),sublabel:RED._("deploy.stopFlowsDesc"),onselect:"core:stop-flows", visible:false})
+            }
+            mainMenuItems.push({id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"})
+            RED.menu.init({id:"red-ui-header-button-deploy-options", options: mainMenuItems });
         } else if (type == "simple") {
             var label = options.label || RED._("deploy.deploy");
             var icon = 'red/images/deploy-full-o.svg';
@@ -100,6 +102,10 @@ RED.deploy = (function() {
 
         RED.actions.add("core:deploy-flows",save);
         if (type === "default") {
+            if (RED.settings.runtimeState && RED.settings.runtimeState.ui === true) {
+                RED.actions.add("core:stop-flows",function() { stopStartFlows("stop") });
+                RED.actions.add("core:start-flows",function() { stopStartFlows("start") });
+            }
             RED.actions.add("core:restart-flows",restart);
             RED.actions.add("core:set-deploy-type-to-full",function() { RED.menu.setSelected("deploymenu-item-full",true);});
             RED.actions.add("core:set-deploy-type-to-modified-flows",function() { RED.menu.setSelected("deploymenu-item-flow",true); });
@@ -270,18 +276,73 @@ RED.deploy = (function() {
     function sanitize(html) {
         return html.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")
     }
-    function restart() {
-        var startTime = Date.now();
-        $(".red-ui-deploy-button-content").css('opacity',0);
-        $(".red-ui-deploy-button-spinner").show();
-        var deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled");
-        $("#red-ui-header-button-deploy").addClass("disabled");
-        deployInflight = true;
+
+    function shadeShow() {
         $("#red-ui-header-shade").show();
         $("#red-ui-editor-shade").show();
         $("#red-ui-palette-shade").show();
         $("#red-ui-sidebar-shade").show();
-
+    }
+    function shadeHide() {
+        $("#red-ui-header-shade").hide();
+        $("#red-ui-editor-shade").hide();
+        $("#red-ui-palette-shade").hide();
+        $("#red-ui-sidebar-shade").hide();
+    }
+    function deployButtonSetBusy(){
+        $(".red-ui-deploy-button-content").css('opacity',0);
+        $(".red-ui-deploy-button-spinner").show();
+        $("#red-ui-header-button-deploy").addClass("disabled");
+    }
+    function deployButtonClearBusy(){
+        $(".red-ui-deploy-button-content").css('opacity',1);
+        $(".red-ui-deploy-button-spinner").hide();
+    }
+    function stopStartFlows(state) {
+        const startTime = Date.now()
+        const deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled")
+        deployInflight = true
+        deployButtonSetBusy()
+        shadeShow()
+        $.ajax({
+            url:"flows/state",
+            type: "POST",
+            data: {state: state}
+        }).done(function(data,textStatus,xhr) {
+            if (deployWasEnabled) {
+                $("#red-ui-header-button-deploy").removeClass("disabled")
+            }
+        }).fail(function(xhr,textStatus,err) {
+            if (deployWasEnabled) {
+                $("#red-ui-header-button-deploy").removeClass("disabled")
+            }
+            if (xhr.status === 401) {
+                RED.notify(RED._("notification.error", { message: RED._("user.notAuthorized") }), "error")
+            } else if (xhr.responseText) {
+                const errorDetail = { message: err ? (err + "") : "" }
+                try {
+                    errorDetail.message = JSON.parse(xhr.responseText).message
+                } finally {
+                    errorDetail.message = errorDetail.message || xhr.responseText
+                }
+                RED.notify(RED._("notification.error", errorDetail), "error")
+            } else {
+                RED.notify(RED._("notification.error", { message: RED._("deploy.errors.noResponse") }), "error")
+            }
+        }).always(function() {
+            const delta = Math.max(0, 300 - (Date.now() - startTime))
+            setTimeout(function () {
+                deployButtonClearBusy()
+                shadeHide()
+                deployInflight = false
+            }, delta);
+        });
+    }
+    function restart() {
+        var startTime = Date.now();
+        var deployWasEnabled = !$("#red-ui-header-button-deploy").hasClass("disabled");
+        deployInflight = true;
+        deployButtonSetBusy();
         $.ajax({
             url:"flows",
             type: "POST",
@@ -307,204 +368,244 @@ RED.deploy = (function() {
                 RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
             }
         }).always(function() {
-            deployInflight = false;
             var delta = Math.max(0,300-(Date.now()-startTime));
             setTimeout(function() {
-                $(".red-ui-deploy-button-content").css('opacity',1);
-                $(".red-ui-deploy-button-spinner").hide();
-                $("#red-ui-header-shade").hide();
-                $("#red-ui-editor-shade").hide();
-                $("#red-ui-palette-shade").hide();
-                $("#red-ui-sidebar-shade").hide();
+                deployButtonClearBusy();
+                deployInflight = false;
             },delta);
         });
     }
-    function save(skipValidation,force) {
-        if (!$("#red-ui-header-button-deploy").hasClass("disabled")) {
-            if (!RED.user.hasPermission("flows.write")) {
-                RED.notify(RED._("user.errors.deploy"),"error");
+    function save(skipValidation, force) {
+        if ($("#red-ui-header-button-deploy").hasClass("disabled")) {
+            return; //deploy is disabled
+        }
+        if ($("#red-ui-header-shade").is(":visible")) {
+            return; //deploy is shaded
+        }
+        if (!RED.user.hasPermission("flows.write")) {
+            RED.notify(RED._("user.errors.deploy"), "error");
+            return;
+        }
+        let hasUnusedConfig = false;
+        if (!skipValidation) {
+            let hasUnknown = false;
+            let hasInvalid = false;
+            const unknownNodes = [];
+            const invalidNodes = [];
+
+            RED.nodes.eachConfig(function (node) {
+                if (node.valid === undefined) {
+                    RED.editor.validateNode(node);
+                }
+                if (!node.valid && !node.d) {
+                    invalidNodes.push(getNodeInfo(node));
+                }
+                if (node.type === "unknown") {
+                    if (unknownNodes.indexOf(node.name) == -1) {
+                        unknownNodes.push(node.name);
+                    }
+                }
+            });
+            RED.nodes.eachNode(function (node) {
+                if (!node.valid && !node.d) {
+                    invalidNodes.push(getNodeInfo(node));
+                }
+                if (node.type === "unknown") {
+                    if (unknownNodes.indexOf(node.name) == -1) {
+                        unknownNodes.push(node.name);
+                    }
+                }
+            });
+            hasUnknown = unknownNodes.length > 0;
+            hasInvalid = invalidNodes.length > 0;
+
+            const unusedConfigNodes = [];
+            RED.nodes.eachConfig(function (node) {
+                if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
+                    unusedConfigNodes.push(getNodeInfo(node));
+                    hasUnusedConfig = true;
+                }
+            });
+
+            let showWarning = false;
+            let notificationMessage;
+            let notificationButtons = [];
+            let notification;
+            if (hasUnknown && !ignoreDeployWarnings.unknown) {
+                showWarning = true;
+                notificationMessage = "<p>" + RED._('deploy.confirm.unknown') + "</p>" +
+                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(unknownNodes).map(function (n) { return sanitize(n) }).join("</li><li>") + "</li></ul><p>" +
+                    RED._('deploy.confirm.confirm') +
+                    "</p>";
+
+                notificationButtons = [
+                    {
+                        text: RED._("deploy.unknownNodesButton"),
+                        class: "pull-left",
+                        click: function() {
+                            notification.close();
+                            RED.actions.invoke("core:search","type:unknown ");
+                        }
+                    },
+                    {
+                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                        text: RED._("deploy.confirm.button.confirm"),
+                        class: "primary",
+                        click: function () {
+                            save(true);
+                            notification.close();
+                        }
+                    }
+                ];
+            } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
+                showWarning = true;
+                invalidNodes.sort(sortNodeInfo);
+
+                notificationMessage = "<p>" + RED._('deploy.confirm.improperlyConfigured') + "</p>" +
+                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(invalidNodes.map(function (A) { return sanitize((A.tab ? "[" + A.tab + "] " : "") + A.label + " (" + A.type + ")") })).join("</li><li>") + "</li></ul><p>" +
+                    RED._('deploy.confirm.confirm') +
+                    "</p>";
+                notificationButtons = [
+                    {
+                        text: RED._("deploy.invalidNodesButton"),
+                        class: "pull-left",
+                        click: function() {
+                            notification.close();
+                            RED.actions.invoke("core:search","is:invalid ");
+                        }
+                    },
+                    {
+                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                        text: RED._("deploy.confirm.button.confirm"),
+                        class: "primary",
+                        click: function () {
+                            save(true);
+                            notification.close();
+                        }
+                    }
+                ];
+            }
+            if (showWarning) {
+                notificationButtons.unshift(
+                    {
+                        text: RED._("common.label.cancel"),
+                        click: function () {
+                            notification.close();
+                        }
+                    }
+                );
+                notification = RED.notify(notificationMessage, {
+                    modal: true,
+                    fixed: true,
+                    buttons: notificationButtons
+                });
                 return;
             }
-            if (!skipValidation) {
-                var hasUnknown = false;
-                var hasInvalid = false;
-                var hasUnusedConfig = false;
-
-                var unknownNodes = [];
-                var invalidNodes = [];
-
-                RED.nodes.eachNode(function(node) {
-                    if (!node.valid && !node.d) {
-                        invalidNodes.push(getNodeInfo(node));
-                    }
-                    if (node.type === "unknown") {
-                        if (unknownNodes.indexOf(node.name) == -1) {
-                            unknownNodes.push(node.name);
-                        }
-                    }
-                });
-                hasUnknown = unknownNodes.length > 0;
-                hasInvalid = invalidNodes.length > 0;
-
-                var unusedConfigNodes = [];
-                RED.nodes.eachConfig(function(node) {
-                    if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
-                        unusedConfigNodes.push(getNodeInfo(node));
-                        hasUnusedConfig = true;
-                    }
-                });
-
-                var showWarning = false;
-                var notificationMessage;
-                var notificationButtons = [];
-                var notification;
-                if (hasUnknown && !ignoreDeployWarnings.unknown) {
-                    showWarning = true;
-                    notificationMessage = "<p>"+RED._('deploy.confirm.unknown')+"</p>"+
-                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-
-                    notificationButtons= [
-                        {
-                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
-                } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
-                    showWarning = true;
-                    invalidNodes.sort(sortNodeInfo);
-
-                    notificationMessage = "<p>"+RED._('deploy.confirm.improperlyConfigured')+"</p>"+
-                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-                    notificationButtons= [
-                        {
-                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
-                }
-                if (showWarning) {
-                    notificationButtons.unshift(
-                        {
-                            text: RED._("common.label.cancel"),
-                            click: function() {
-                                notification.close();
-                            }
-                        }
-                    );
-                    notification = RED.notify(notificationMessage,{
-                        modal: true,
-                        fixed: true,
-                        buttons:notificationButtons
-                    });
-                    return;
-                }
-            }
-
-            var nns = RED.nodes.createCompleteNodeSet();
-
-            var startTime = Date.now();
-            $(".red-ui-deploy-button-content").css('opacity',0);
-            $(".red-ui-deploy-button-spinner").show();
-            $("#red-ui-header-button-deploy").addClass("disabled");
-
-            var data = {flows:nns};
-
-            if (!force) {
-                data.rev = RED.nodes.version();
-            }
-
-            deployInflight = true;
-            $("#red-ui-header-shade").show();
-            $("#red-ui-editor-shade").show();
-            $("#red-ui-palette-shade").show();
-            $("#red-ui-sidebar-shade").show();
-            $.ajax({
-                url:"flows",
-                type: "POST",
-                data: JSON.stringify(data),
-                contentType: "application/json; charset=utf-8",
-                headers: {
-                    "Node-RED-Deployment-Type":deploymentType
-                }
-            }).done(function(data,textStatus,xhr) {
-                RED.nodes.dirty(false);
-                RED.nodes.version(data.rev);
-                RED.nodes.originalFlow(nns);
-                if (hasUnusedConfig) {
-                    RED.notify(
-                    '<p>'+RED._("deploy.successfulDeploy")+'</p>'+
-                    '<p>'+RED._("deploy.unusedConfigNodes")+' <a href="#" onclick="RED.sidebar.config.show(true); return false;">'+RED._("deploy.unusedConfigNodesLink")+'</a></p>',"success",false,6000);
-                } else {
-                    RED.notify('<p>'+RED._("deploy.successfulDeploy")+'</p>',"success");
-                }
-                RED.nodes.eachNode(function(node) {
-                    if (node.changed) {
-                        node.dirty = true;
-                        node.changed = false;
-                    }
-                    if (node.moved) {
-                        node.dirty = true;
-                        node.moved = false;
-                    }
-                    if(node.credentials) {
-                        delete node.credentials;
-                    }
-                });
-                RED.nodes.eachConfig(function (confNode) {
-                    confNode.changed = false;
-                    if (confNode.credentials) {
-                        delete confNode.credentials;
-                    }
-                });
-                RED.nodes.eachSubflow(function(subflow) {
-                    subflow.changed = false;
-                });
-                RED.nodes.eachWorkspace(function(ws) {
-                    ws.changed = false;
-                });
-                // Once deployed, cannot undo back to a clean state
-                RED.history.markAllDirty();
-                RED.view.redraw();
-                RED.events.emit("deploy");
-            }).fail(function(xhr,textStatus,err) {
-                RED.nodes.dirty(true);
-                $("#red-ui-header-button-deploy").removeClass("disabled");
-                if (xhr.status === 401) {
-                    RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error");
-                } else if (xhr.status === 409) {
-                    resolveConflict(nns, true);
-                } else if (xhr.responseText) {
-                    RED.notify(RED._("deploy.deployFailed",{message:xhr.responseText}),"error");
-                } else {
-                    RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
-                }
-            }).always(function() {
-                deployInflight = false;
-                var delta = Math.max(0,300-(Date.now()-startTime));
-                setTimeout(function() {
-                    $(".red-ui-deploy-button-content").css('opacity',1);
-                    $(".red-ui-deploy-button-spinner").hide();
-                    $("#red-ui-header-shade").hide();
-                    $("#red-ui-editor-shade").hide();
-                    $("#red-ui-palette-shade").hide();
-                    $("#red-ui-sidebar-shade").hide();
-                },delta);
-            });
         }
+
+        const nns = RED.nodes.createCompleteNodeSet();
+        const startTime = Date.now();
+
+        deployButtonSetBusy();
+        const data = { flows: nns };
+        if (!force) {
+            data.rev = RED.nodes.version();
+        }
+
+        deployInflight = true;
+        shadeShow();
+        $.ajax({
+            url: "flows",
+            type: "POST",
+            data: JSON.stringify(data),
+            contentType: "application/json; charset=utf-8",
+            headers: {
+                "Node-RED-Deployment-Type": deploymentType
+            }
+        }).done(function (data, textStatus, xhr) {
+            RED.nodes.dirty(false);
+            RED.nodes.version(data.rev);
+            RED.nodes.originalFlow(nns);
+            if (hasUnusedConfig) {
+                let notification;
+                const opts = {
+                    type: "success",
+                    fixed: false,
+                    timeout: 6000,
+                    buttons: [
+                        {
+                            text: RED._("deploy.unusedConfigNodesButton"),
+                            class: "pull-left",
+                            click: function() {
+                                notification.close();
+                                RED.actions.invoke("core:search","is:config is:unused ");
+                            }
+                        },
+                        {
+                            text: RED._("common.label.close"),
+                            class: "primary",
+                            click: function () {
+                                save(true);
+                                notification.close();
+                            }
+                        }
+                    ]
+                }
+                notification = RED.notify(
+                    '<p>' + RED._("deploy.successfulDeploy") + '</p>' +
+                    '<p>' + RED._("deploy.unusedConfigNodes") + '</p>', opts);
+            } else {
+                RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
+            }
+            RED.nodes.eachNode(function (node) {
+                if (node.changed) {
+                    node.dirty = true;
+                    node.changed = false;
+                }
+                if (node.moved) {
+                    node.dirty = true;
+                    node.moved = false;
+                }
+                if (node.credentials) {
+                    delete node.credentials;
+                }
+            });
+            RED.nodes.eachConfig(function (confNode) {
+                confNode.changed = false;
+                if (confNode.credentials) {
+                    delete confNode.credentials;
+                }
+            });
+            RED.nodes.eachSubflow(function (subflow) {
+                subflow.changed = false;
+            });
+            RED.nodes.eachWorkspace(function (ws) {
+                ws.changed = false;
+            });
+            // Once deployed, cannot undo back to a clean state
+            RED.history.markAllDirty();
+            RED.view.redraw();
+            RED.events.emit("deploy");
+        }).fail(function (xhr, textStatus, err) {
+            RED.nodes.dirty(true);
+            $("#red-ui-header-button-deploy").removeClass("disabled");
+            if (xhr.status === 401) {
+                RED.notify(RED._("deploy.deployFailed", { message: RED._("user.notAuthorized") }), "error");
+            } else if (xhr.status === 409) {
+                resolveConflict(nns, true);
+            } else if (xhr.responseText) {
+                RED.notify(RED._("deploy.deployFailed", { message: xhr.responseText }), "error");
+            } else {
+                RED.notify(RED._("deploy.deployFailed", { message: RED._("deploy.errors.noResponse") }), "error");
+            }
+        }).always(function () {
+            const delta = Math.max(0, 300 - (Date.now() - startTime));
+            setTimeout(function () {
+                deployInflight = false;
+                deployButtonClearBusy()
+                shadeHide()
+            }, delta);
+        });
     }
     return {
         init: init,

packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js

@@ -0,0 +1,61 @@
+
+RED.diagnostics = (function () {
+
+    function init() {
+        if (RED.settings.get('diagnostics.ui', true) === false) {
+            return;
+        }
+        RED.actions.add("core:show-system-info", function () { show(); });
+    }
+
+    function show() {
+        $.ajax({
+            headers: {
+                "Accept": "application/json"
+            },
+            cache: false,
+            url: 'diagnostics',
+            success: function (data) {
+                var json = JSON.stringify(data || {}, "", 4);
+                if (json === "{}") {
+                    json = "{\n\n}";
+                }
+                RED.editor.editJSON({
+                    title: RED._('diagnostics.title'),
+                    value: json,
+                    requireValid: true,
+                    readOnly: true,
+                    toolbarButtons: [
+                        {
+                            text: RED._('clipboard.export.copy'),
+                            icon: 'fa fa-copy',
+                            click: function () {
+                                RED.clipboard.copyText(json, $(this), RED._('clipboard.copyMessageValue'))
+                            }
+                        },
+                        {
+                            text: RED._('clipboard.download'),
+                            icon: 'fa fa-download',
+                            click: function () {
+                                var element = document.createElement('a');
+                                element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(json));
+                                element.setAttribute('download', "system-info.json");
+                                element.style.display = 'none';
+                                document.body.appendChild(element);
+                                element.click();
+                                document.body.removeChild(element);
+                            }
+                        },
+                    ]
+                });
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                console.log("Unexpected error loading system info:", jqXHR.status, textStatus, errorThrown);
+            }
+        });
+    }
+
+    return {
+        init: init,
+    };
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/diff.js

@@ -554,6 +554,8 @@ RED.diff = (function() {
                     color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
+            } else if (node.type === "group") {
+                def = RED.group.def;
             } else {
                 def = {};
             }
@@ -763,16 +765,15 @@ RED.diff = (function() {
             }
         }
 
-
         if (node.hasOwnProperty('x')) {
             if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y) {
+                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
                     localChanged = true;
                     localChanges++;
                 }
             }
             if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
                     remoteChanged = true;
                     remoteChanges++;
                 }
@@ -790,7 +791,12 @@ RED.diff = (function() {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                 $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                 element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
-                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
+                var localPosition = {x:localNode.x,y:localNode.y};
+                if (localNode.hasOwnProperty('w')) {
+                    localPosition.w = localNode.w;
+                    localPosition.h = localNode.h;
+                }
+                propertyElements['local.position'] = RED.utils.createObjectElement(localPosition,
                     {
                         path: "position",
                         exposeApi: true,
@@ -811,7 +817,12 @@ RED.diff = (function() {
                 if (remoteNode) {
                     $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                     element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
-                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
+                    var remotePosition = {x:remoteNode.x,y:remoteNode.y};
+                    if (remoteNode.hasOwnProperty('w')) {
+                        remotePosition.w = remoteNode.w;
+                        remotePosition.h = remoteNode.h;
+                    }
+                    propertyElements['remote.position'] = RED.utils.createObjectElement(remotePosition,
                         {
                             path: "position",
                             exposeApi: true,
@@ -883,11 +894,11 @@ RED.diff = (function() {
                 }
             }
         }
-        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='w'&&p!=='h'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
         if (def.defaults) {
             properties = properties.concat(Object.keys(def.defaults));
         }
-        if (node.type !== 'tab') {
+        if (node.type !== 'tab' && node.type !== "group") {
             properties = properties.concat(['inputLabels','outputLabels']);
         }
         if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&
@@ -1376,6 +1387,7 @@ RED.diff = (function() {
 
     function mergeDiff(diff) {
         //console.log(diff);
+        var selectedTab = RED.workspaces.active();
         var appliedDiff = applyDiff(diff);
 
         var newConfig = appliedDiff.config;
@@ -1411,7 +1423,7 @@ RED.diff = (function() {
         // Restore the original flow so subsequent merge resolutions can properly
         // identify new-vs-old
         RED.nodes.originalFlow(originalFlow);
-        imported[0].forEach(function(n) {
+        imported.nodes.forEach(function(n) {
             if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
                 n.changed = true;
             }
@@ -1426,6 +1438,7 @@ RED.diff = (function() {
         RED.view.redraw(true);
         RED.palette.refresh();
         RED.workspaces.refresh();
+        RED.workspaces.show(selectedTab, true);
         RED.sidebar.config.refresh();
     }
 

packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js

@@ -47,6 +47,7 @@
     var definition = {
         show: function(options) {
             var value = options.value;
+            var onCancel = options.cancel;
             var onComplete = options.complete;
             var type = "_buffer"
             if ($("script[data-template-name='"+type+"']").length === 0) {
@@ -60,12 +61,14 @@
 
             var trayOptions = {
                 title: options.title,
+                focusElement: options.focusElement,
                 width: "inherit",
                 buttons: [
                     {
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
+                            if (onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -74,7 +77,8 @@
                         text: RED._("common.label.done"),
                         class: "primary",
                         click: function() {
-                            onComplete(JSON.stringify(bufferBinValue));
+                            bufferStringEditor.saveView();
+                            if (onComplete) { onComplete(JSON.stringify(bufferBinValue),null,bufferStringEditor); }
                             RED.tray.close();
                         }
                     }
@@ -86,19 +90,20 @@
                     }
                 },
                 open: function(tray) {
-                    var trayBody = tray.find('.red-ui-tray-body');
                     var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
-
                     bufferStringEditor = RED.editor.createEditor({
                         id: 'red-ui-editor-type-buffer-str',
-                        value: "",
+                        value: value||"",
+                        stateId: RED.editor.generateViewStateId("buffer", options, ""),
+                        focus: true,
                         mode:"ace/mode/text"
                     });
-                    bufferStringEditor.getSession().setValue(value||"",-1);
 
                     bufferBinEditor = RED.editor.createEditor({
                         id: 'red-ui-editor-type-buffer-bin',
                         value: "",
+                        stateId: false,
+                        focus: false,
                         mode:"ace/mode/text",
                         readOnly: true
                     });

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editor.js

@@ -0,0 +1,107 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+/**
+ * @namespace RED.editor.codeEditor
+ */
+ RED.editor.codeEditor = (function() {
+
+    const MONACO = "monaco";
+    const ACE = "ace";
+    const defaultEditor = MONACO;
+    const DEFAULT_SETTINGS = { lib: defaultEditor, options: {} };
+    var selectedCodeEditor = null;
+    var initialised = false;
+
+    function init() {
+        var codeEditorSettings = RED.editor.codeEditor.settings;
+        var editorChoice = codeEditorSettings.lib === MONACO ? MONACO : ACE;
+        try {
+            var browser = RED.utils.getBrowserInfo();
+            selectedCodeEditor = RED.editor.codeEditor[editorChoice];
+            //fall back to default code editor if there are any issues
+            if (!selectedCodeEditor || (editorChoice === MONACO && (browser.ie || !window.monaco))) {
+                selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
+            }
+            initialised = selectedCodeEditor.init();
+        } catch (error) {
+            selectedCodeEditor = null;
+            console.warn("Problem initialising '" + editorChoice + "' code editor", error);
+        }
+        if(!initialised) {
+            selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
+            initialised = selectedCodeEditor.init();
+        }
+    }
+
+    function create(options) {
+        //TODO: (quandry - for consideration)
+        // Below, I had to create a hidden element if options.id || options.element is not in the DOM
+        // I have seen 1 node calling  `this.editor = RED.editor.createEditor()` with an
+        // invalid (non existing html element selector) (e.g. node-red-contrib-components does this)
+        // This causes monaco to throw an error when attempting to hook up its events to the dom  & the rest of the 'oneditperapre'
+        // code is thus skipped.
+        // In ACE mode, creating an ACE editor (with an invalid ID) allows the editor to be created (but obviously there is no UI)
+        // Because one (or more) contrib nodes have left this bad code in place, how would we handle this?
+        // For compatibility, I have decided to create a hidden element so that at least an editor is created & errors do not occur.
+        // IMO, we should warn and exit as it is a coding error by the contrib author.
+
+        if (!options) {
+            console.warn("createEditor() options are missing");
+            options = {};
+        }
+
+        if (this.editor.type === MONACO) {
+            // compatibility (see above note)
+            if (!options.element && !options.id) {
+                options.id = 'node-backwards-compatability-dummy-editor';
+            }
+            options.element = options.element || $("#" + options.id)[0];
+            if (!options.element) {
+                console.warn("createEditor() options.element or options.id is not valid", options);
+                $("#dialog-form").append('<div id="' + options.id + '" style="display: none;" />');
+            }
+            return this.editor.create(options);
+        } else {
+            return this.editor.create(options);//fallback to ACE
+        }
+    }
+
+    return {
+        init: init,
+        /**
+         * Get editor settings object
+         * @memberof RED.editor.codeEditor
+         */
+        get settings() {
+          return RED.settings.get('codeEditor') || DEFAULT_SETTINGS;
+        },
+        /**
+         * Get user selected code editor
+         * @return {string} Returns
+         * @memberof RED.editor.codeEditor
+         */
+        get editor() {
+            return selectedCodeEditor;
+        },
+        /**
+         * Create a editor ui component
+         * @param {object} options - the editor options
+         * @memberof RED.editor.codeEditor
+         */
+        create: create
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/ace.js

@@ -0,0 +1,205 @@
+/*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+/**
+* @namespace RED.editor.codeEditor.ace
+*/
+RED.editor.codeEditor.ace = (function() {
+
+    const type = "ace";
+    var initialised = false;
+    var initOptions = {};
+
+    function init(options) {
+        initOptions = options || {}; 
+        initialised = true;
+        return initialised;
+    }
+
+    function create(options) {
+        var editorSettings = RED.editor.codeEditor.settings || {};
+        var el = options.element || $("#"+options.id)[0];
+        var toolbarRow = $("<div>").appendTo(el);
+        el = $("<div>").appendTo(el).addClass("red-ui-editor-text-container")[0];
+        var editor = window.ace.edit(el);
+        editor.setTheme(editorSettings.theme || initOptions.theme || "ace/theme/tomorrow");
+        var session = editor.getSession();
+        session.on("changeAnnotation", function () {
+            var annotations = session.getAnnotations() || [];
+            var i = annotations.length;
+            var len = annotations.length;
+            while (i--) {
+                if (/doctype first\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
+                else if (/Unexpected End of file\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
+            }
+            if (len > annotations.length) { session.setAnnotations(annotations); }
+        });
+        if (options.mode) {
+            session.setMode(options.mode);
+        }
+        if (options.foldStyle) {
+            session.setFoldStyle(options.foldStyle);
+        } else {
+            session.setFoldStyle('markbeginend');
+        }
+        if (options.options) {
+            editor.setOptions(options.options);
+        } else {
+            editor.setOptions({
+                enableBasicAutocompletion:true,
+                enableSnippets:true,
+                tooltipFollowsMouse: false
+            });
+        }
+        if (options.readOnly) {
+            editor.setOption('readOnly',options.readOnly);
+            editor.container.classList.add("ace_read-only");
+        }
+        if (options.hasOwnProperty('lineNumbers')) {
+            editor.renderer.setOption('showGutter',options.lineNumbers);
+        }
+        editor.$blockScrolling = Infinity;
+        if (options.value) {
+            session.setValue(options.value,-1);
+        }
+        if (options.globals) {
+            setTimeout(function() {
+                if (!!session.$worker) {
+                    session.$worker.send("setOptions", [{globals: options.globals, maxerr:1000}]);
+                }
+            },100);
+        }
+        if (!options.stateId && options.stateId !== false) {
+            options.stateId = RED.editor.generateViewStateId("ace", options, (options.mode || options.title).split("/").pop());
+        }
+        if (options.mode === 'ace/mode/markdown') {
+            $(el).addClass("red-ui-editor-text-container-toolbar");
+            editor.toolbar = RED.editor.customEditTypes['_markdown'].buildToolbar(toolbarRow,editor);
+            if (options.expandable !== false) {
+                var expandButton = $('<button type="button" class="red-ui-button" style="float: right;"><i class="fa fa-expand"></i></button>').appendTo(editor.toolbar);
+                RED.popover.tooltip(expandButton, RED._("markdownEditor.expand"));
+                expandButton.on("click", function(e) {
+                    e.preventDefault();
+                    var value = editor.getValue();
+                    RED.editor.editMarkdown({
+                        value: value,
+                        width: "Infinity",
+                        stateId: options.stateId,
+                        focus: true,
+                        cancel: function () {
+                            editor.focus();
+                        },
+                        complete: function(v,cursor) {
+                            editor.setValue(v, -1);
+                            setTimeout(function() {
+                                editor.restoreView();
+                                editor.focus();
+                            },300);
+                        }
+                    })
+                });
+            }
+            var helpButton = $('<button type="button" class="red-ui-editor-text-help red-ui-button red-ui-button-small"><i class="fa fa-question"></i></button>').appendTo($(el).parent());
+            RED.popover.create({
+                target: helpButton,
+                trigger: 'click',
+                size: "small",
+                direction: "left",
+                content: RED._("markdownEditor.format"),
+                autoClose: 50
+            });
+            session.setUseWrapMode(true);
+        }
+        editor._destroy = editor.destroy;
+        editor.destroy = function() {
+            try {
+                editor.saveView();
+                editor._initState = null;
+                this._destroy();
+            } catch (e) { }
+            $(el).remove();
+            $(toolbarRow).remove();
+        }
+        editor.on("blur", function () {
+            editor.focusMemory = false;
+            editor.saveView();
+        })
+        editor.on("focus", function () {
+            if (editor._initState) {
+                editor.restoreView(editor._initState);
+                editor._initState = null;
+            }
+        })
+        editor.getView = function () {
+            var session = editor.getSession();
+            return {
+                selection: session.selection.toJSON(),
+                scrollTop: session.getScrollTop(),
+                scrollLeft: session.getScrollLeft(),
+                options: session.getOptions()
+            }
+        }
+        editor.saveView = function () {
+            if (!options.stateId) { return; } //only possible if created with a unique stateId
+            window._editorStateAce = window._editorStateAce || {};
+            var state = editor.getView();
+            window._editorStateAce[options.stateId] = state;
+            return state;
+        }
+        editor.restoreView = function (state) {
+            if (!options.stateId) { return; } //only possible if created with a unique stateId
+            window._editorStateAce = window._editorStateAce || {};
+            var _state = state || window._editorStateAce[options.stateId];
+            if (!_state) { return; } //no view state available
+            try {
+                var session = editor.getSession();
+                session.setOptions(_state.options);
+                session.selection.fromJSON(_state.selection);
+                session.setScrollTop(_state.scrollTop);
+                session.setScrollLeft(_state.scrollLeft);
+                editor._initState = _state;
+            } catch (error) {
+                delete window._editorStateMonaco[options.stateId];
+            }
+        };
+        editor.restoreView();
+        editor.type = type;
+        return editor;
+    }
+
+    return {
+        /**
+         * Editor type
+         * @memberof RED.editor.codeEditor.ace
+         */
+         get type() { return type; },
+         /**
+          * Editor initialised
+         * @memberof RED.editor.codeEditor.ace
+         */
+        get initialised() { return initialised; },
+        /**
+         * Initialise code editor
+         * @param {object} options - initialisation options
+         * @memberof RED.editor.codeEditor.ace
+         */
+         init: init,
+         /**
+          * Create a code editor
+          * @param {object} options - the editor options
+          * @memberof RED.editor.codeEditor.ace
+          */
+         create: create
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js

@@ -1,4 +1,4 @@
-RED.colorPicker = (function() {
+RED.editor.colorPicker = RED.colorPicker = (function() {
 
     function create(options) {
         var color = options.value;

packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js

@@ -0,0 +1,625 @@
+RED.editor.envVarList = (function() {
+
+    var currentLocale = 'en-US';
+    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];
+
+    /**
+     * Create env var edit interface
+     * @param container - container
+     * @param node - subflow node
+     */
+    function buildPropertiesList(envContainer, node) {
+
+        var isTemplateNode = (node.type === "subflow");
+
+        envContainer
+            .css({
+                'min-height':'150px',
+                'min-width':'450px'
+            })
+            .editableList({
+                header: isTemplateNode?$('<div><div><div></div><div data-i18n="common.label.name"></div><div data-i18n="editor-tab.defaultValue"></div><div></div></div></div>'):undefined,
+                addItem: function(container, i, opt) {
+                    // If this is an instance node, these are properties unique to
+                    // this instance - ie opt.parent will not be defined.
+
+                    if (isTemplateNode) {
+                        container.addClass("red-ui-editor-subflow-env-editable")
+                    }
+
+                    var envRow = $('<div/>').appendTo(container);
+                    var nameField = null;
+                    var valueField = null;
+
+                    nameField = $('<input/>', {
+                        class: "node-input-env-name",
+                        type: "text",
+                        placeholder: RED._("common.label.name")
+                    }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
+                    valueField = $('<input/>',{
+                        style: "width:100%",
+                        class: "node-input-env-value",
+                        type: "text",
+                    }).attr("autocomplete","disable").appendTo(envRow);
+                    var types = (opt.ui && opt.ui.opts && opt.ui.opts.types);
+                    if (!types) {
+                        types = isTemplateNode ? DEFAULT_ENV_TYPE_LIST : DEFAULT_ENV_TYPE_LIST_INC_CRED;
+                    }
+                    valueField.typedInput({default:'str',types:types});
+                    valueField.typedInput('type', opt.type);
+                    if (opt.type === "cred") {
+                        if (opt.value) {
+                            valueField.typedInput('value', opt.value);
+                        } else if (node.credentials && node.credentials[opt.name]) {
+                            valueField.typedInput('value', node.credentials[opt.name]);
+                        } else if (node.credentials && node.credentials['has_'+opt.name]) {
+                            valueField.typedInput('value', "__PWRD__");
+                        } else {
+                            valueField.typedInput('value', "");
+                        }
+                    } else {
+                        valueField.typedInput('value', opt.value);
+                    }
+
+
+                    opt.nameField = nameField;
+                    opt.valueField = valueField;
+
+                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
+                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
+                    var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
+                    actionButton.on("click", function(evt) {
+                        evt.preventDefault();
+                        removeTip.close();
+                        container.parent().addClass("red-ui-editableList-item-deleting")
+                        container.fadeOut(300, function() {
+                            envContainer.editableList('removeItem',opt);
+                        });
+                    });
+
+                    if (isTemplateNode) {
+                        // Add the UI customisation row
+                        // if `opt.ui` does not exist, then apply defaults. If these
+                        // defaults do not change then they will get stripped off
+                        // before saving.
+                        if (opt.type === 'cred') {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "cred"
+                            }
+                            opt.ui.type = "cred";
+                        } else {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "input",
+                                opts: {types:DEFAULT_ENV_TYPE_LIST}
+                            }
+                        }
+                        opt.ui.label = opt.ui.label || {};
+                        opt.ui.type = opt.ui.type || "input";
+                        if ((opt.ui.type === "cred") &&
+                            opt.ui.opts &&
+                            opt.ui.opts.types) {
+                            opt.ui.type = "input";
+                        }
+
+                        var uiRow = $('<div/>').appendTo(container).hide();
+                        // save current info for reverting on cancel
+                        // var copy = $.extend(true, {}, ui);
+
+                         $('<a href="#"><i class="fa fa-angle-right"></a>').prependTo(envRow).on("click", function (evt) {
+                            evt.preventDefault();
+                            if ($(this).hasClass('expanded')) {
+                                uiRow.slideUp();
+                                $(this).removeClass('expanded');
+                            } else {
+                                uiRow.slideDown();
+                                $(this).addClass('expanded');
+                            }
+                        });
+
+                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
+                        nameField.trigger('change');
+                    }
+                },
+                sortable: ".red-ui-editableList-item-handle",
+                removable: false
+            });
+        var parentEnv = {};
+        var envList = [];
+        if (/^subflow:/.test(node.type)) {
+            var subflowDef = RED.nodes.subflow(node.type.substring(8));
+            if (subflowDef.env) {
+                subflowDef.env.forEach(function(env) {
+                    var item = {
+                        name:env.name,
+                        parent: {
+                            type: env.type,
+                            value: env.value,
+                            ui: env.ui
+                        }
+                    }
+                    envList.push(item);
+                    parentEnv[env.name] = item;
+                })
+            }
+        }
+
+        if (node.env) {
+            for (var i = 0; i < node.env.length; i++) {
+                var env = node.env[i];
+                if (parentEnv.hasOwnProperty(env.name)) {
+                    parentEnv[env.name].type = env.type;
+                    parentEnv[env.name].value = env.value;
+                } else {
+                    envList.push({
+                        name: env.name,
+                        type: env.type,
+                        value: env.value,
+                        ui: env.ui
+                    });
+                }
+            }
+        }
+        envList.forEach(function(env) {
+            if (env.parent && env.parent.ui && env.parent.ui.type === 'hide') {
+                return;
+            }
+            if (!isTemplateNode && env.parent) {
+                return;
+            }
+            envContainer.editableList('addItem', JSON.parse(JSON.stringify(env)));
+        });
+    }
+
+
+    /**
+     * Create UI edit interface for environment variable
+     * @param container - container
+     * @param env - env var definition
+     * @param nameField - name field of env var
+     * @param valueField - value field of env var
+     */
+     function buildEnvEditRow(container, ui, nameField, valueField) {
+         container.addClass("red-ui-editor-subflow-env-ui-row")
+         var topRow = $('<div></div>').appendTo(container);
+         $('<div></div>').appendTo(topRow);
+         $('<div>').text(RED._("editor.icon")).appendTo(topRow);
+         $('<div>').text(RED._("editor.label")).appendTo(topRow);
+         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);
+
+         var row = $('<div></div>').appendTo(container);
+         $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
+         var typeOptions = {
+             'input': {types:DEFAULT_ENV_TYPE_LIST},
+             'select': {opts:[]},
+             'spinner': {},
+             'cred': {}
+         };
+         if (ui.opts) {
+             typeOptions[ui.type] = ui.opts;
+         } else {
+             // Pick up the default values if not otherwise provided
+             ui.opts = typeOptions[ui.type];
+         }
+         var iconCell = $('<div></div>').appendTo(row);
+
+         var iconButton = $('<a href="#"></a>').appendTo(iconCell);
+         iconButton.on("click", function(evt) {
+             evt.preventDefault();
+             var icon = ui.icon || "";
+             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
+             RED.editor.iconPicker.show(iconButton, null, iconPath, true, function (newIcon) {
+                 iconButton.empty();
+                 var path = newIcon || "";
+                 var newPath = RED.utils.separateIconPath(path);
+                 if (newPath) {
+                     $('<i class="fa"></i>').addClass(newPath.file).appendTo(iconButton);
+                 }
+                 ui.icon = path;
+             });
+         })
+
+         if (ui.icon) {
+             var newPath = RED.utils.separateIconPath(ui.icon);
+             $('<i class="fa '+newPath.file+'"></i>').appendTo(iconButton);
+         }
+
+         var labelCell = $('<div></div>').appendTo(row);
+
+         var label = ui.label && ui.label[currentLocale] || "";
+         var labelInput = $('<input type="text">').val(label).appendTo(labelCell);
+         ui.labelField = labelInput;
+         labelInput.on('change', function(evt) {
+             ui.label = ui.label || {};
+             var val = $(this).val().trim();
+             if (val === "") {
+                 delete ui.label[currentLocale];
+             } else {
+                 ui.label[currentLocale] = val;
+             }
+         })
+         var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelCell);
+         RED.popover.tooltip(labelIcon,function() {
+             var langs = Object.keys(ui.label);
+             var content = $("<div>");
+             if (langs.indexOf(currentLocale) === -1) {
+                 langs.push(currentLocale);
+                 langs.sort();
+             }
+             langs.forEach(function(l) {
+                 var row = $('<div>').appendTo(content);
+                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row);
+                 $('<span>').text(ui.label[l]||"").appendTo(row);
+             });
+             return content;
+         })
+
+         nameField.on('change',function(evt) {
+            labelInput.attr("placeholder",$(this).val())
+        });
+
+        var inputCell = $('<div></div>').appendTo(row);
+        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+        if (ui.type === "input") {
+            inputCellInput.val(ui.opts.types.join(","));
+        }
+        var checkbox;
+        var selectBox;
+
+        inputCellInput.typedInput({
+            types: [
+                {
+                    value:"input",
+                    label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
+                        {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
+                        {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
+                        {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
+                        {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
+                        {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
+                        {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"},
+                        {value: "cred",label: RED._("editor.types.cred"),icon: "fa fa-lock"}
+                    ],
+                    default: DEFAULT_ENV_TYPE_LIST,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
+
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
+                        if (value.length) {
+                            value.forEach(function(v) {
+                                if (!/^fa /.test(v.icon)) {
+                                    $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                } else {
+                                    var s = $('<span>',{style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                    $("<i>",{class: v.icon}).appendTo(s);
+                                }
+                            })
+                        } else {
+                            $('<span class="red-ui-editor-subflow-env-input-type-placeholder"></span>').text(RED._("editor.selectType")).appendTo(input);
+                        }
+                    }
+                },
+                {
+                    value: "cred",
+                    label: RED._("typedInput.type.cred"), icon:"fa fa-lock", showLabel: false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type">').css({
+                            "border-top-right-radius": "4px",
+                            "border-bottom-right-radius": "4px"
+                        }).appendTo(container);
+                        $('<div class="placeholder-input">').html("&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;").appendTo(innerContainer);
+                    }
+                },
+                {
+                    value:"select",
+                    label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding","0");
+
+                        selectBox = $('<select></select>').appendTo(container);
+                        if (ui.opts && Array.isArray(ui.opts.opts)) {
+                            ui.opts.opts.forEach(function(o) {
+                                var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
+                                // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
+                                $('<option>').val(o.v).text(label).appendTo(selectBox);
+                            })
+                        }
+                        selectBox.on('change', function(evt) {
+                            var v = selectBox.val();
+                            // var parts = v.split(":");
+                            // var t = parts.shift();
+                            // v = parts.join(":");
+                            //
+                            // valueField.typedInput("type",'str')
+                            valueField.typedInput("value",v)
+                        });
+                        selectBox.val(valueField.typedInput("value"));
+                        // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        minWidth: 400,
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            var optList = $('<ol>').appendTo(content).editableList({
+                                header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
+                                addItem: function(row,index,itemData) {
+                                    var labelDiv = $('<div>').appendTo(row);
+                                    var label = lookupLabel(itemData.l, "", currentLocale);
+                                    itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
+                                    itemData.label.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            itemData.input.focus();
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                    var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
+                                    RED.popover.tooltip(labelIcon,function() {
+                                        return currentLocale;
+                                    })
+                                    itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
+
+                                    // Problem using a TI here:
+                                    //  - this is in a popout panel
+                                    //  - clicking the expand button in the TI will close the parent edit tray
+                                    //    and open the type editor.
+                                    //  - but it leaves the popout panel over the top.
+                                    //  - there is no way to get back to the popout panel after closing the type editor
+                                    //.typedInput({default:itemData.t||'str', types:DEFAULT_ENV_TYPE_LIST});
+                                    itemData.input.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            // Enter or Tab
+                                            var index = optList.editableList('indexOf',itemData);
+                                            var length = optList.editableList('length');
+                                            if (index + 1 === length) {
+                                                var newItem = {};
+                                                optList.editableList('addItem',newItem);
+                                                setTimeout(function() {
+                                                    if (newItem.label) {
+                                                        newItem.label.focus();
+                                                    }
+                                                },100)
+                                            } else {
+                                                var nextItem = optList.editableList('getItemAt',index+1);
+                                                if (nextItem.label) {
+                                                    nextItem.label.focus()
+                                                }
+                                            }
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                },
+                                sortable: true,
+                                removable: true,
+                                height: 160
+                            })
+                            if (ui.opts.opts.length > 0) {
+                                ui.opts.opts.forEach(function(o) {
+                                    optList.editableList('addItem',$.extend(true,{},o))
+                                })
+                            } else {
+                                optList.editableList('addItem',{})
+                            }
+                            return {
+                                onclose: function() {
+                                    var items = optList.editableList('items');
+                                    var vals = [];
+                                    items.each(function (i,el) {
+                                        var data = el.data('data');
+                                        var l = data.label.val().trim();
+                                        var v = data.input.val();
+                                        // var t = data.input.typedInput('type');
+                                        // var v = data.input.typedInput('value');
+                                        if (l.length > 0) {
+                                            data.l = data.l || {};
+                                            data.l[currentLocale] = l;
+                                        }
+                                        data.v = v;
+
+                                        if (l.length > 0 || v.length > 0) {
+                                            var val = {l:data.l,v:data.v};
+                                            // if (t !== 'str') {
+                                            //     val.t = t;
+                                            // }
+                                            vals.push(val);
+                                        }
+                                    });
+                                    ui.opts.opts = vals;
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"checkbox",
+                    label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        checkbox = $('<input type="checkbox">').appendTo(container);
+                        checkbox.on('change', function(evt) {
+                            valueField.typedInput('value',$(this).prop('checked')?"true":"false");
+                        })
+                        checkbox.prop('checked',valueField.typedInput('value')==="true");
+                    }
+                },
+                {
+                    value:"spinner",
+                    label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
+
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
+
+                        var min = ui.opts && ui.opts.min;
+                        var max = ui.opts && ui.opts.max;
+                        var label = "";
+                        if (min !== undefined && max !== undefined) {
+                            label = Math.min(min,max)+" - "+Math.max(min,max);
+                        } else if (min !== undefined) {
+                            label = "> "+min;
+                        } else if (max !== undefined) {
+                            label = "< "+max;
+                        }
+                        $('<span>').css("margin-left","15px").text(label).appendTo(input);
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            content.css("padding","8px 5px")
+                            var min = ui.opts.min;
+                            var max = ui.opts.max;
+                            var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            minInput.val(min);
+                            var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            maxInput.val(max);
+                            $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
+                            $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
+                            return {
+                                onclose: function() {
+                                    var min = minInput.val().trim();
+                                    var max = maxInput.val().trim();
+                                    if (min !== "") {
+                                        ui.opts.min = parseInt(min);
+                                    } else {
+                                        delete ui.opts.min;
+                                    }
+                                    if (max !== "") {
+                                        ui.opts.max = parseInt(max);
+                                    } else {
+                                        delete ui.opts.max;
+                                    }
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"none",
+                    label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
+                },
+                {
+                    value:"hide",
+                    label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
+                }
+            ],
+            default: 'none'
+        }).on("typedinputtypechange", function(evt,type) {
+            ui.type = $(this).typedInput("type");
+            ui.opts = typeOptions[ui.type];
+            if (ui.type === 'input') {
+                // In the case of 'input' type, the typedInput uses the multiple-option
+                // mode. Its value needs to be set to a comma-separately list of the
+                // selected options.
+                inputCellInput.typedInput('value',ui.opts.types.join(","))
+            } else {
+                // No other type cares about `value`, but doing this will
+                // force a refresh of the label now that `ui.opts` has
+                // been updated.
+                inputCellInput.typedInput('value',Date.now())
+            }
+
+            switch (ui.type) {
+                case 'input':
+                    valueField.typedInput('types',ui.opts.types);
+                    break;
+                case 'select':
+                    valueField.typedInput('types',['str']);
+                    break;
+                case 'checkbox':
+                    valueField.typedInput('types',['bool']);
+                    break;
+                case 'spinner':
+                    valueField.typedInput('types',['num']);
+                    break;
+                case 'cred':
+                    valueField.typedInput('types',['cred']);
+                    break;
+                default:
+                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
+            }
+            if (ui.type === 'checkbox') {
+                valueField.typedInput('type','bool');
+            } else if (ui.type === 'spinner') {
+                valueField.typedInput('type','num');
+            }
+            if (ui.type !== 'checkbox') {
+                checkbox = null;
+            }
+
+        }).on("change", function(evt,type) {
+            if (ui.type === 'input') {
+                var types = inputCellInput.typedInput('value');
+                ui.opts.types = (types === "") ? ["str"] : types.split(",");
+                valueField.typedInput('types',ui.opts.types);
+            }
+        });
+        valueField.on("change", function(evt) {
+            if (checkbox) {
+                checkbox.prop('checked',$(this).typedInput('value')==="true")
+            }
+        })
+        // Set the input to the right type. This will trigger the 'typedinputtypechange'
+        // event handler (just above ^^) to update the value if needed
+        inputCellInput.typedInput('type',ui.type)
+    }
+
+    function setLocale(l, list) {
+        currentLocale = l;
+        if (list) {
+            var items = list.editableList("items");
+            items.each(function (i, item) {
+                var entry = $(this).data('data');
+                var labelField = entry.ui.labelField;
+                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
+                if (labelField.timeout) {
+                    clearTimeout(labelField.timeout);
+                    delete labelField.timeout;
+                }
+                labelField.addClass("input-updated");
+                labelField.timeout = setTimeout(function() {
+                    delete labelField.timeout
+                    labelField.removeClass("input-updated");
+                },3000);
+            });
+        }
+    }
+
+    /**
+     * Lookup text for specific locale
+     * @param labels - dict of labels
+     * @param defaultLabel - fallback label if not found
+     * @param locale - target locale
+     * @returns {string} text for specified locale
+     */
+    function lookupLabel(labels, defaultLabel, locale) {
+        if (labels) {
+            if (labels[locale]) {
+                return labels[locale];
+            }
+            if (locale) {
+                var lang = locale.substring(0, 2);
+                if (labels[lang]) {
+                    return labels[lang];
+                }
+            }
+        }
+        return defaultLabel;
+    }
+
+    return {
+        create: buildPropertiesList,
+        setLocale: setLocale,
+        lookupLabel: lookupLabel,
+        DEFAULT_ENV_TYPE_LIST: DEFAULT_ENV_TYPE_LIST,
+        DEFAULT_ENV_TYPE_LIST_INC_CRED: DEFAULT_ENV_TYPE_LIST_INC_CRED
+    }
+})();