clone msg for every single line output

(this may not be desired)
Add tests to ensure properties go trhough

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!--
+## 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:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Reproducable 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

@@ -0,0 +1,17 @@
+---
+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

@@ -1,61 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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/PULL_REQUEST_TEMPLATE.md

@@ -29,6 +29,6 @@ the [forum](https://discourse.nodered.org) or
 <!-- Put an `x` in the boxes that apply -->
 
 - [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
-- [ ] For non-bugfix PRs, I have discussed this change on the forum/slack team.
+- [ ] For non-bugfix PRs, I have discussed this change on the mailing list/slack team.
 - [ ] I have run `grunt` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality

.github/scripts/update-node-red-docker.js

@@ -1,29 +0,0 @@
-const fs = require("fs");
-
-const newVersion = require("../../package.json").version;
-
-if (process.env.GITHUB_REF !== "refs/tags/"+newVersion) {
-    console.log(`GITHUB_REF doesn't match the package.json version: ${process.env.GITHUB_REF} !== ${newVersion}`);
-    process.exit(0);
-}
-
-if (!/^\d+\.\d+\.\d+$/.test(newVersion)) {
-    console.log(`Not updating for a non-stable release - ${newVersion}`);
-    process.exit(0);
-}
-
-const currentVersion = require("../../../node-red-docker/package.json").version;
-
-console.log(`Update from ${currentVersion} to ${newVersion}`)
-
-updateFile(__dirname+"/../../../node-red-docker/package.json", currentVersion, newVersion);
-updateFile(__dirname+"/../../../node-red-docker/docker-custom/package.json", currentVersion, newVersion);
-updateFile(__dirname+"/../../../node-red-docker/README.md", currentVersion, newVersion);
-
-console.log(`::set-env name=newVersion::${newVersion}`);
-
-function updateFile(path,from,to) {
-    let contents = fs.readFileSync(path,"utf8");
-    contents = contents.replace(new RegExp(from.replace(/\./g,"\\."),"g"), to);
-    fs.writeFileSync(path, contents);
-}

.github/scripts/update-node-red-website.js

@@ -1,18 +0,0 @@
-const fs = require("fs");
-
-const newVersion = require("../../package.json").version;
-
-if (process.env.GITHUB_REF !== "refs/tags/"+newVersion) {
-    console.log(`GITHUB_REF doesn't match the package.json version: ${process.env.GITHUB_REF} !== ${newVersion}`);
-    process.exit(0);
-}
-
-if (!/^\d+\.\d+\.\d+$/.test(newVersion)) {
-    console.log(`Not updating for a non-stable release - ${newVersion}`);
-    process.exit(0);
-}
-
-const path = __dirname+"/../../../node-red.github.io/index.html";
-let contents = fs.readFileSync(path, "utf8");
-contents = contents.replace(/<span class="node-red-latest-version">v\d+\.\d+\.\d+<\/span>/, `<span class="node-red-latest-version">v${newVersion}<\/span>` );
-fs.writeFileSync(path, contents);

.github/workflows/release.yml

@@ -1,59 +0,0 @@
-name: Publish Release
-env:
-  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-on:
-  release:
-    types: [published]
-
-jobs:
-  generate:
-    name: 'Update node-red-docker image'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out node-red repository
-        uses: actions/checkout@v2
-        with:
-            path: 'node-red'
-      - name: Check out node-red-docker repository
-        uses: actions/checkout@v2
-        with:
-            repository: 'node-red/node-red-docker'
-            path: 'node-red-docker'
-      - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
-        with:
-            repository: 'node-red/node-red.github.io'
-            path: 'node-red.github.io'
-      - uses: actions/setup-node@v1
-        with:
-            node-version: '12'
-      - run: node ./node-red/.github/scripts/update-node-red-docker.js
-      - name: Create Docker Pull Request
-        uses: peter-evans/create-pull-request@v2
-        with:
-          token: ${{ secrets.NR_REPO_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          path: 'node-red-docker'
-          commit-message: 'Bump to ${{ env.newVersion }}'
-          title: '🚀 Update to Node-RED ${{ env.newVersion }} release'
-          body: |
-            Updates the Node-RED Docker repo for the ${{ env.newVersion }} release.
-
-            Once this is merged, you will need to create a new release with the tag `v${{ env.newVersion }}`.
-
-            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
-      - run: node ./node-red/.github/scripts/update-node-red-website.js
-      - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v2
-        with:
-          token: ${{ secrets.NR_REPO_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          path: 'node-red.github.io'
-          commit-message: 'Bump to ${{ env.newVersion }}'
-          title: '🚀 Update to Node-RED ${{ env.newVersion }} release'
-          body: |
-            Updates the Node-RED Website repo for the ${{ env.newVersion }} release.
-
-            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary

.github/workflows/tests.yml

@@ -1,30 +0,0 @@
-name: Run tests
-
-on:
-  push:
-    branches: [ master, dev ]
-  pull_request:
-    branches: [ master, dev ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12, 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,9 +7,7 @@
 .sessions.json
 .settings
 .tern-project
-.i18n-editor-metadata
 *.backup
-*.bak
 *_cred*
 coverage
 credentials.json
@@ -24,6 +22,3 @@ packages/node_modules/@node-red/editor-client/public
 !test/**/node_modules
 docs
 !packages/node_modules/**/docs
-.vscode
-.nyc_output
-sync.ffs_db

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: node_js
+matrix:
+  include:
+    - 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
+      before_script:
+        - npm install -g istanbul coveralls
+    - node_js: "8"

API.md

@@ -1,12 +1,8 @@
-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 Modules
+---
 
+Node-RED provides a set of node modules that implement different parts of the
+application.
 
 Module | Description
 -------|-------
@@ -14,6 +10,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](@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/registry | the internal node registry
+@node-red/nodes | the default set of core nodes
 @node-red/editor-client | the client-side resources of the Node-RED editor application

CONTRIBUTING.md

@@ -38,18 +38,13 @@ 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 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.
+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.
 
+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,34 +16,22 @@
 
 var path = require("path");
 var fs = require("fs-extra");
-var sass = require("sass");
+var sass = require("node-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');
-    if (browserstack) {
-        process.env.BROWSERSTACK = true;
-    }
     var nonHeadless = grunt.option('non-headless');
     if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = true;
+        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: pkg,
+        pkg: grunt.file.readJSON('package.json'),
         paths: {
             dist: ".dist"
         },
@@ -55,8 +43,8 @@ module.exports = function(grunt) {
                 ui: 'bdd',
                 reporter: 'spec'
             },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ['test/**/*_spec.js'] },
+            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         webdriver: {
@@ -64,19 +52,19 @@ module.exports = function(grunt) {
                 configFile: 'test/editor/wdio.conf.js'
             }
         },
-        nyc: {
+        mocha_istanbul: {
             options: {
-                cwd: '.',
-                include: ['packages/node_modules/**'],
-                excludeNodeModules: false,
-                exclude: ['packages/node_modules/@node-red/editor-client/**'],
-                reporter: ['lcov', 'html','text-summary'],
-                reportDir: 'coverage',
-                all: true
+                globals: ['expect'],
+                timeout: 3000,
+                ignoreLeaks: false,
+                ui: 'bdd',
+                reportFormats: ['lcov','html'],
+                print: 'both',
+                istanbulOptions: ['--no-default-excludes', '-i','**/packages/node_modules/**']
             },
-            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'] }
+            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"]}
         },
         jshint: {
             options: {
@@ -92,20 +80,20 @@ module.exports = function(grunt) {
                 //"loopfunc": true, // allow functions to be defined in loops
                 //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
             },
-            // all: [
-            //     'Gruntfile.js',
-            //     'red.js',
-            //     'packages/**/*.js'
-            // ],
-            // core: {
-            //     files: {
-            //         src: [
-            //             'Gruntfile.js',
-            //             'red.js',
-            //             'packages/**/*.js',
-            //         ]
-            //     }
-            // },
+            all: [
+                'Gruntfile.js',
+                'red.js',
+                'packages/**/*.js'
+            ],
+            core: {
+                files: {
+                    src: [
+                        'Gruntfile.js',
+                        'red.js',
+                        'packages/**/*.js',
+                    ]
+                }
+            },
             nodes: {
                 files: {
                     src: [ 'nodes/core/*/*.js' ]
@@ -113,7 +101,7 @@ module.exports = function(grunt) {
             },
             editor: {
                 files: {
-                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
+                    src: [ 'editor/js/**/*.js' ]
                 }
             },
             tests: {
@@ -133,11 +121,9 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
-                    "packages/node_modules/@node-red/editor-client/src/js/polyfills.js",
                     "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",
@@ -145,7 +131,6 @@ module.exports = function(grunt) {
                     "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",
@@ -162,7 +147,6 @@ 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/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/diff.js",
@@ -170,21 +154,16 @@ module.exports = function(grunt) {
                     "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",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
                     "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",
@@ -194,30 +173,25 @@ module.exports = function(grunt) {
                     "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",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/group.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js",
                     "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/tour/*.js"
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
                 ],
                 dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
             },
             vendor: {
                 files: {
                     "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.4.1.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "node_modules/marked/marked.min.js",
-                        "node_modules/dompurify/dist/purify.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                        "node_modules/i18next/i18next.min.js",
-                        "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
-                        "node_modules/jquery-i18next/jquery-i18next.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/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",
@@ -290,9 +264,7 @@ 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/types/node",
-                    "packages/node_modules/@node-red/editor-client/public/types/node-red",
+                    "packages/node_modules/@node-red/editor-client/public/vendor"
                 ]
             },
             release: {
@@ -328,12 +300,6 @@ 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'
@@ -388,24 +354,11 @@ module.exports = function(grunt) {
                         src: [
                             'ace/**',
                             'jquery/css/base/**',
-                            'font-awesome/**',
-                            'monaco/dist/**',
-                            'monaco/types/extraLibs.js',
-                            'monaco/style.css',
-                            'monaco/monaco-bootstrap.js'
+                            'font-awesome/**'
                         ],
                         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: '**',
@@ -431,12 +384,6 @@ 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/'
                     }
                 ]
             }
@@ -495,16 +442,13 @@ 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/registry/lib/index.js'
+                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js'
                 ],
                 options: {
                     destination: 'docs',
-                    configure: './jsdoc.json',
-                    fred: "hi there"
+                    configure: './jsdoc.json'
                 }
             },
             _editor: {
@@ -548,10 +492,12 @@ 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');
     }
@@ -559,31 +505,11 @@ 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 OpenJS Foundation and other contributors, https://openjsf.org/\n"+
+            " * Copyright JS Foundation and other contributors, http://js.foundation\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"+
@@ -660,16 +586,11 @@ 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','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']);
-
+        ['build','verifyPackageDependencies','jshint:editor','mocha_istanbul:all']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
-        ['build','nyc:core']);
+        ['build','mocha_istanbul:core']);
 
     grunt.registerTask('test-editor',
         'Runs code style check on editor code',
@@ -687,16 +608,12 @@ module.exports = function(grunt) {
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
-        ['build','nyc:nodes']);
+        ['build','mocha_istanbul: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']);
-
     grunt.registerTask('dev',
         'Developer mode: run node-red, watch for source changes and build/restart',
         ['build','setDevEnv','concurrent:dev']);
@@ -712,7 +629,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('coverage',
         'Run Istanbul code test coverage task',
-        ['build','nyc:all']);
+        ['build','mocha_istanbul:all']);
 
     grunt.registerTask('docs',
         'Generates API documentation',

LICENSE

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright JS Foundation and other contributors, http://js.foundation
 
                                  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](http://openjsf.org).
+Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
 
-It is maintained by:
+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)
 
- * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
- * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
- * And many others...
 
 
 ## Copyright and license
 
-Copyright OpenJS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).
+Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).

SECURITY.md

@@ -1,5 +1,13 @@
 # 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": "2.2.2",
+    "version": "1.0.2",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -13,8 +13,6 @@
         "start": "node packages/node_modules/node-red/red.js",
         "test": "grunt",
         "build": "grunt build",
-        "dev": "grunt dev",
-        "build-dev": "grunt build-dev",
         "docs": "grunt docs"
     },
     "contributors": [
@@ -26,100 +24,91 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.7.0",
-        "acorn-walk": "8.2.0",
-        "ajv": "8.10.0",
-        "async-mutex": "0.3.2",
+        "ajv": "6.10.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.1",
-        "cheerio": "1.0.0-rc.10",
+        "body-parser": "1.19.0",
+        "cheerio": "0.22.0",
         "clone": "2.1.2",
         "content-type": "1.0.4",
-        "cookie": "0.4.2",
-        "cookie-parser": "1.4.6",
+        "cookie": "0.4.0",
+        "cookie-parser": "1.4.4",
         "cors": "2.8.5",
-        "cronosjs": "1.7.1",
-        "denque": "2.0.1",
-        "express": "4.17.2",
-        "express-session": "1.17.2",
-        "form-data": "4.0.0",
-        "fs-extra": "10.0.0",
+        "cron": "1.7.1",
+        "denque": "1.4.1",
+        "express": "4.17.1",
+        "express-session": "1.16.2",
+        "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
-        "got": "11.8.3",
         "hash-sum": "2.0.0",
-        "hpagent": "0.1.2",
-        "https-proxy-agent": "5.0.0",
-        "i18next": "21.6.11",
-        "iconv-lite": "0.6.3",
+        "https-proxy-agent": "2.2.3",
+        "i18next": "15.1.2",
+        "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
-        "js-yaml": "3.14.1",
+        "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.6",
-        "lodash.clonedeep": "^4.5.0",
+        "jsonata": "1.7.0",
         "media-typer": "1.1.0",
-        "memorystore": "1.6.7",
-        "mime": "3.0.0",
-        "moment-timezone": "0.5.34",
-        "mqtt": "4.3.5",
-        "multer": "1.4.4",
-        "mustache": "4.2.0",
-        "node-red-admin": "^2.2.3",
-        "nopt": "5.0.0",
-        "oauth2orize": "1.11.1",
+        "memorystore": "1.6.1",
+        "mime": "2.4.4",
+        "mqtt": "2.18.8",
+        "multer": "1.4.2",
+        "mustache": "3.0.2",
+        "node-red-node-rbe": "^0.2.5",
+        "node-red-node-sentiment": "^0.1.4",
+        "node-red-node-tail": "^0.0.3",
+        "nopt": "4.0.1",
+        "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
-        "passport": "0.5.2",
+        "passport": "0.4.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.3",
-        "semver": "7.3.5",
-        "tar": "6.1.11",
-        "tough-cookie": "4.0.0",
-        "uglify-js": "3.15.1",
-        "uuid": "8.3.2",
-        "ws": "7.5.6",
-        "xml2js": "0.4.23"
+        "raw-body": "2.4.1",
+        "request": "2.88.0",
+        "semver": "6.3.0",
+        "uglify-js": "3.6.0",
+        "when": "3.7.8",
+        "ws": "6.2.1",
+        "xml2js": "0.4.19"
     },
     "optionalDependencies": {
-        "bcrypt": "5.0.1"
+        "bcrypt": "3.0.6"
     },
     "devDependencies": {
-        "dompurify": "2.3.5",
-        "grunt": "1.4.1",
+        "grunt": "~1.0.4",
         "grunt-chmod": "~1.1.1",
-        "grunt-cli": "~1.4.3",
-        "grunt-concurrent": "3.0.0",
+        "grunt-cli": "~1.3.2",
+        "grunt-concurrent": "~2.3.1",
         "grunt-contrib-clean": "~2.0.0",
-        "grunt-contrib-compress": "2.0.0",
+        "grunt-contrib-compress": "~1.5.0",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
-        "grunt-contrib-jshint": "3.1.1",
-        "grunt-contrib-uglify": "5.0.1",
+        "grunt-contrib-jshint": "~2.1.0",
+        "grunt-contrib-uglify": "~4.0.1",
         "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-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-npm-command": "~0.1.2",
         "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
-        "grunt-simple-nyc": "^3.0.1",
-        "i18next-http-backend": "1.3.2",
-        "jquery-i18next": "1.2.1",
+        "http-proxy": "^1.16.2",
+        "istanbul": "0.4.5",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "4.0.12",
         "minami": "1.2.3",
-        "mocha": "9.2.0",
-        "node-red-node-test-helper": "^0.2.7",
-        "nodemon": "2.0.15",
-        "proxy": "^1.0.2",
-        "sass": "1.49.7",
-        "should": "13.2.3",
-        "sinon": "11.1.2",
+        "mocha": "^5.2.0",
+        "mosca": "^2.8.3",
+        "node-red-node-test-helper": "^0.2.3",
+        "node-sass": "^4.13.0",
+        "should": "^8.4.0",
+        "sinon": "1.17.7",
         "stoppable": "^1.1.0",
-        "supertest": "6.2.2"
+        "supertest": "3.4.2"
     },
     "engines": {
-        "node": ">=12"
+        "node": ">=8"
     }
 }

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

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

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

@@ -21,33 +21,20 @@ var flows = require("./flows");
 var flow = require("./flow");
 var context = require("./context");
 var auth = require("../auth");
-var info = require("./settings");
-var plugins = require("./plugins");
 
 var apiUtil = require("../util");
 
 module.exports = {
-    init: function(settings,runtimeAPI) {
+    init: function(runtimeAPI) {
         flows.init(runtimeAPI);
         flow.init(runtimeAPI);
         nodes.init(runtimeAPI);
         context.init(runtimeAPI);
-        info.init(settings,runtimeAPI);
-        plugins.init(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);
@@ -60,16 +47,7 @@ module.exports = {
 
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,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.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);
@@ -89,12 +67,6 @@ module.exports = {
         // adminApp.delete("/context/:scope(node|flow)/:id",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
         adminApp.delete("/context/:scope(node|flow)/:id/*",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
 
-        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);
-
         return adminApp;
     }
 }

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

@@ -33,9 +33,6 @@ 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);
             })
@@ -47,23 +44,11 @@ module.exports = {
             user: req.user,
             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);
         })
     },
@@ -95,9 +80,6 @@ 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) {
@@ -167,9 +149,6 @@ 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) {
@@ -184,9 +163,6 @@ 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

@@ -1,44 +0,0 @@
-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/admin/settings.js

@@ -1,72 +0,0 @@
-/**
- * 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.
- **/
-var apiUtils = require("../util");
-var runtimeAPI;
-var settings;
-var theme = require("../editor/theme");
-var clone = require("clone");
-
-var i18n = require("@node-red/util").i18n
-
-function extend(target, source) {
-    var keys = Object.keys(source);
-    var i = keys.length;
-    while(i--) {
-        var value = source[keys[i]]
-        var type = typeof value;
-        if (type === 'string' || type === 'number' || type === 'boolean' || Array.isArray(value)) {
-            target[keys[i]] = value;
-        } else if (value === null) {
-            if (target.hasOwnProperty(keys[i])) {
-                delete target[keys[i]];
-            }
-        } else {
-            // Object
-            if (target.hasOwnProperty(keys[i])) {
-                target[keys[i]] = extend(target[keys[i]],value);
-            } else {
-                target[keys[i]] = value;
-            }
-        }
-    }
-    return target;
-}
-
-module.exports = {
-    init: function(_settings,_runtimeAPI) {
-        runtimeAPI = _runtimeAPI;
-        settings = _settings;
-    },
-    runtimeSettings: function(req,res) {
-        var opts = {
-            user: req.user
-        }
-        runtimeAPI.settings.getRuntimeSettings(opts).then(function(result) {
-            if (!settings.disableEditor) {
-                result.editorTheme = result.editorTheme||{};
-                var themeSettings = theme.settings();
-                if (themeSettings) {
-                    // result.editorTheme may already exist with the palette
-                    // disabled. Need to merge that into the receive settings
-                    result.editorTheme = extend(clone(themeSettings),result.editorTheme);
-                }
-                result.editorTheme.languages = i18n.availableLanguages("editor");
-            }
-            res.json(result);
-        });
-    },
-
-}

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

@@ -36,7 +36,6 @@ var log = require("@node-red/util").log; // TODO: separate module
 passport.use(strategies.bearerStrategy.BearerStrategy);
 passport.use(strategies.clientPasswordStrategy.ClientPasswordStrategy);
 passport.use(strategies.anonymousStrategy);
-passport.use(strategies.tokensStrategy);
 
 var server = oauth2orize.createServer();
 
@@ -61,7 +60,7 @@ function init(_settings,storage) {
 function needsPermission(permission) {
     return function(req,res,next) {
         if (settings && settings.adminAuth) {
-            return passport.authenticate(['bearer','tokens','anon'],{ session: false })(req,res,function() {
+            return passport.authenticate(['bearer','anon'],{ session: false })(req,res,function() {
                 if (!req.user) {
                     return next();
                 }
@@ -90,7 +89,7 @@ function getToken(req,res,next) {
     return server.token()(req,res,next);
 }
 
-async function login(req,res) {
+function login(req,res) {
     var response = {};
     if (settings.adminAuth) {
         var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
@@ -101,10 +100,7 @@ async function login(req,res) {
             }
         } else if (mergedAdminAuth.type === "strategy") {
 
-            var urlPrefix = (settings.httpAdminRoot||"").replace(/\/$/,"");
-            if (urlPrefix.length > 0) {
-                urlPrefix += "/";
-            }
+            var urlPrefix = (settings.httpAdminRoot==='/')?"":settings.httpAdminRoot;
             response = {
                 "type":"strategy",
                 "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]
@@ -116,9 +112,8 @@ async function login(req,res) {
                 response.prompts[0].image = theme.serveFile('/login/',mergedAdminAuth.strategy.image);
             }
         }
-        let themeContext = await theme.context();
-        if (themeContext.login && themeContext.login.image) {
-            response.image = themeContext.login.image;
+        if (theme.context().login && theme.context().login.image) {
+            response.image = theme.context().login.image;
         }
     }
     res.json(response);
@@ -141,7 +136,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",user,username:user.username,scope:user.permissions});
+                log.audit({event: "auth.login",username:user.username,scope:user.permissions});
                 user.tokens = tokens;
                 done(null,user);
             });
@@ -173,38 +168,31 @@ 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);
-                }
-            };
 
-            options.verify.apply(null,args);
-        } else {
-            var profile = arguments[arguments.length - 2];
-            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);
+            }
+
         }
-    };
-    // 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,
-            failureMessage: true,
-            failureRedirect: settings.httpAdminRoot
-        }),
-        completeGenerateStrategyAuth,
-        handleStrategyError
+        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
+        completeGenerateStrategyAuth
     );
 
     var callbackMethodFunc = adminApp.get;
@@ -212,13 +200,8 @@ function genericStrategy(adminApp,strategy) {
         callbackMethodFunc = adminApp.post;
     }
     callbackMethodFunc.call(adminApp,'/auth/strategy/callback',
-        passport.authenticate(strategy.name, {
-            session:false,
-            failureMessage: true,
-            failureRedirect: settings.httpAdminRoot
-        }),
-        completeGenerateStrategyAuth,
-        handleStrategyError
+        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
+        completeGenerateStrategyAuth
     );
 
 }
@@ -228,13 +211,6 @@ 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

@@ -93,7 +93,7 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                     return logEntry.user !== username;
                 });
                 Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
+                    log.audit({event: "auth.login",username:username,client:client.id,scope:scope});
                     done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
                 });
             } else {
@@ -123,60 +123,9 @@ AnonymousStrategy.prototype.authenticate = function(req) {
     });
 }
 
-
-function authenticateUserToken(req) {
-    return new Promise( (resolve,reject) => {
-        var token = null;
-        var tokenHeader = Users.tokenHeader();
-        if (Users.tokenHeader() === null) {
-            // No custom user token provided. Fail the request
-            reject();
-            return;
-        } else if (Users.tokenHeader() === 'authorization') {
-            if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
-                token = req.headers.authorization.split(' ')[1];
-            }
-        } else {
-            token = req.headers[Users.tokenHeader()];
-        }
-        if (token) {
-            Users.tokens(token).then(function(user) {
-                if (user) {
-                    resolve(user);
-                } else {
-                    reject();
-                }
-            }).catch(reject);
-        } else {
-            reject();
-        }
-    });
-}
-
-
-function TokensStrategy() {
-  passport.Strategy.call(this);
-  this.name = 'tokens';
-}
-util.inherits(TokensStrategy, passport.Strategy);
-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);
-    });
-}
-
-
-
 module.exports = {
     bearerStrategy: bearerStrategy,
     clientPasswordStrategy: clientPasswordStrategy,
     passwordTokenExchange: passwordTokenExchange,
-    anonymousStrategy: new AnonymousStrategy(),
-    tokensStrategy: new TokensStrategy(),
-    authenticateUserToken: authenticateUserToken
+    anonymousStrategy: new AnonymousStrategy()
 }

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

@@ -14,7 +14,15 @@
  * limitations under the License.
  **/
 
-const crypto = require("crypto");
+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("");
+}
+
 
 var storage;
 var sessionExpiryTime
@@ -107,7 +115,7 @@ module.exports = {
     },
     create: function(user,client,scope) {
         return loadSessions().then(function() {
-            var accessToken = crypto.randomBytes(128).toString('base64');
+            var accessToken = generateToken(128);
 
             var accessTokenExpiresAt = Date.now() + (sessionExpiryTime*1000);
 

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

@@ -59,9 +59,7 @@ function getDefaultUser() {
 var api = {
     get: get,
     authenticate: authenticate,
-    default: getDefaultUser,
-    tokens: getDefaultUser,
-    tokenHeader: null
+    default: getDefaultUser
 }
 
 function init(config) {
@@ -107,14 +105,6 @@ function init(config) {
     } else {
         api.default = getDefaultUser;
     }
-    if (config.tokens && typeof config.tokens === "function") {
-        api.tokens = config.tokens;
-        if (config.tokenHeader && typeof config.tokenHeader === "string") {
-            api.tokenHeader = config.tokenHeader.toLowerCase();
-        } else {
-            api.tokenHeader = "authorization";
-        }
-    }
 }
 function cleanUser(user) {
     if (user && user.hasOwnProperty('password')) {
@@ -128,7 +118,5 @@ module.exports = {
     init: init,
     get: function(username) { return api.get(username).then(cleanUser)},
     authenticate: function() { return api.authenticate.apply(null, arguments) },
-    default: function() { return api.default(); },
-    tokens: function(token) { return api.tokens(token); },
-    tokenHeader: function() { return api.tokenHeader }
+    default: function() { return api.default(); }
 };

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

@@ -16,13 +16,11 @@
 
 var ws = require("ws");
 var url = require("url");
-const crypto = require("crypto");
 
 var log = require("@node-red/util").log; // TODO: separate module
 var Tokens;
 var Users;
 var Permissions;
-var Strategies;
 
 var server;
 var settings;
@@ -33,6 +31,8 @@ var activeConnections = [];
 
 var anonymousUser;
 
+var retained = {};
+
 var heartbeatTimer;
 var lastSentTime;
 
@@ -44,7 +44,6 @@ function init(_server,_settings,_runtimeAPI) {
     Tokens.onSessionExpiry(handleSessionExpiry);
     Users = require("../auth/users");
     Permissions = require("../auth/permissions");
-    Strategies = require("../auth/strategies");
 
 }
 function handleSessionExpiry(session) {
@@ -55,19 +54,26 @@ 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 = crypto.randomBytes(32).toString('base64');
+function CommsConnection(ws) {
+    this.session = generateSession(32);
     this.ws = ws;
     this.stack = [];
-    this.user = user;
+    this.user = null;
     this.lastSentTime = 0;
     var self = this;
 
     log.audit({event: "comms.open"});
     log.trace("comms.open "+self.session);
-    var preAuthed = !!user;
-    var pendingAuth = !this.user && (settings.adminAuth != null);
+    var pendingAuth = (settings.adminAuth != null);
 
     if (!pendingAuth) {
         addActiveConnection(self);
@@ -124,16 +130,8 @@ function CommsConnection(ws, user) {
                             }
                         });
                     } else {
-                        Users.tokens(msg.auth).then(function(user) {
-                            if (user) {
-                                self.user = user;
-                                log.audit({event: "comms.auth",user:self.user});
-                                completeConnection(user.permissions,msg.auth,true);
-                            } else {
-                                log.audit({event: "comms.auth.fail"});
-                                completeConnection(null,null,false);
-                            }
-                        });
+                        log.audit({event: "comms.auth.fail"});
+                        completeConnection(null,null,false);
                     }
                 });
             } else {
@@ -158,31 +156,25 @@ 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.splice(0,50)));
+                self.ws.send(JSON.stringify(self.stack));
                 self.lastSentTime = Date.now();
             } catch(err) {
                 removeActiveConnection(self);
                 log.warn(log._("comms.error-send",{message:err.toString()}));
             }
             delete self._xmitTimer;
-            if (self.stack.length > 0) {
-                self._queueSend();
-            }
+            self.stack = [];
         },50);
     }
 }
 
-
 CommsConnection.prototype.subscribe = function(topic) {
     runtimeAPI.comms.subscribe({
         user: this.user,
@@ -199,8 +191,8 @@ function start() {
             var commsPath = settings.httpAdminRoot || "/";
             commsPath = (commsPath.slice(0,1) != "/" ? "/":"") + commsPath + (commsPath.slice(-1) == "/" ? "":"/") + "comms";
             wsServer = new ws.Server({ noServer: true });
-            wsServer.on('connection',function(ws, request, user) {
-                var commsConnection = new CommsConnection(ws, user);
+            wsServer.on('connection',function(ws) {
+                var commsConnection = new CommsConnection(ws);
             });
             wsServer.on('error', function(err) {
                 log.warn(log._("comms.error-server",{message:err.toString()}));
@@ -209,26 +201,8 @@ function start() {
             server.on('upgrade', function upgrade(request, socket, head) {
                 const pathname = url.parse(request.url).pathname;
                 if (pathname === commsPath) {
-                    if (Users.tokenHeader() !== null && request.headers[Users.tokenHeader()]) {
-                        // The user has provided custom token handling. For the websocket,
-                        // the token could be provided in two ways:
-                        //  - as an http header (only possible with a reverse proxy setup)
-                        //  - passed over the connected websock in an auth packet
-                        // If the header is present, verify the token. If not, use the auth
-                        // packet over the connected socket
-                        //
-                        Strategies.authenticateUserToken(request).then(user => {
-                            wsServer.handleUpgrade(request, socket, head, function done(ws) {
-                                wsServer.emit('connection', ws, request, user);
-                            });
-                        }).catch(err => {
-                            log.audit({event: "comms.auth.fail"});
-                            socket.destroy();
-                        })
-                        return
-                    }
                     wsServer.handleUpgrade(request, socket, head, function done(ws) {
-                        wsServer.emit('connection', ws, request, null);
+                        wsServer.emit('connection', ws, request);
                     });
                 }
                 // Don't destroy the socket as other listeners may want to handle the

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

@@ -64,12 +64,10 @@ module.exports = {
                     }
                 });
             }
-            var defaultServerSettings = {
-                "x-powered-by": false
-            }
-            var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
-            for (var eOption in serverSettings) {
-                editorApp.set(eOption, serverSettings[eOption]);
+            if (settings.httpServerOptions) {
+                for (var eOption in settings.httpServerOptions) {
+                    editorApp.set(eOption, settings.httpServerOptions[eOption]);
+                }
             }
             editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
 
@@ -77,10 +75,8 @@ 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, runtimeAPI);
+            theme.init(settings);
             editorApp.use("/theme",theme.app());
             editorApp.use("/",ui.editorResources);
 
@@ -92,14 +88,13 @@ module.exports = {
             // Locales
             var locales = require("./locales");
             locales.init(runtimeAPI);
-            editorApp.get(/^\/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
+            editorApp.get(/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
 
             // 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);
+            editorApp.get(/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
+            editorApp.post(/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
 
 
             // Credentials
@@ -108,7 +103,7 @@ module.exports = {
             editorApp.get('/credentials/:type/:id', needsPermission("credentials.read"),credentials.get,apiUtil.errorHandler);
 
             // Settings
-            //  Main /settings route is an admin route - see lib/admin/settings.js
+            editorApp.get("/settings",needsPermission("settings.read"),info.runtimeSettings,apiUtil.errorHandler);
             // User Settings
             editorApp.get("/settings/user",needsPermission("settings.read"),info.userSettings,apiUtil.errorHandler);
             // User Settings

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

@@ -17,6 +17,7 @@
 var apiUtils = require("../util");
 var fs = require('fs');
 var fspath = require('path');
+var when = require('when');
 
 var runtimeAPI;
 
@@ -24,17 +25,6 @@ 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,19 +39,15 @@ 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(){
-            i18n.i.changeLanguage(prevLang, function() {
-                var catalog = loadResource(lang, namespace);
-                res.json(catalog||{});
-            });
+            var catalog = loadResource(lang, namespace);
+            res.json(catalog||{});
         });
+        i18n.i.changeLanguage(prevLang);
     }
 }

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

@@ -122,7 +122,6 @@ 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) {
@@ -138,7 +137,6 @@ 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/settings.js

@@ -16,12 +16,56 @@
 var apiUtils = require("../util");
 var runtimeAPI;
 var sshkeys = require("./sshkeys");
+var theme = require("./theme");
+var clone = require("clone");
+
+var i18n = require("@node-red/util").i18n
+
+function extend(target, source) {
+    var keys = Object.keys(source);
+    var i = keys.length;
+    while(i--) {
+        var value = source[keys[i]]
+        var type = typeof value;
+        if (type === 'string' || type === 'number' || type === 'boolean' || Array.isArray(value)) {
+            target[keys[i]] = value;
+        } else if (value === null) {
+            if (target.hasOwnProperty(keys[i])) {
+                delete target[keys[i]];
+            }
+        } else {
+            // Object
+            if (target.hasOwnProperty(keys[i])) {
+                target[keys[i]] = extend(target[keys[i]],value);
+            } else {
+                target[keys[i]] = value;
+            }
+        }
+    }
+    return target;
+}
 
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
         sshkeys.init(runtimeAPI);
     },
+    runtimeSettings: function(req,res) {
+        var opts = {
+            user: req.user
+        }
+        runtimeAPI.settings.getRuntimeSettings(opts).then(function(result) {
+            result.editorTheme = result.editorTheme||{};
+            var themeSettings = theme.settings();
+            if (themeSettings) {
+                // result.editorTheme may already exist with the palette
+                // disabled. Need to merge that into the receive settings
+                result.editorTheme = extend(clone(themeSettings),result.editorTheme);
+            }
+            result.editorTheme.languages = i18n.availableLanguages("editor");
+            res.json(result);
+        });
+    },
     userSettings: function(req, res) {
         var opts = {
             user: req.user

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

@@ -18,6 +18,14 @@ 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,20 +24,16 @@ var defaultContext = {
     page: {
         title: "Node-RED",
         favicon: "favicon.ico",
-        tabicon: {
-            icon: "red/images/node-red-icon-black.svg",
-            colour: "#8f0000"
-        },
-        version: require(path.join(__dirname,"../../package.json")).version
+        tabicon: "red/images/node-red-icon-black.svg"
     },
     header: {
         title: "Node-RED",
         image: "red/images/node-red.svg"
     },
     asset: {
-        red: "red/red.min.js",
-        main: "red/main.min.js",
-        vendorMonaco: ""
+        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",
+
     }
 };
 
@@ -45,10 +41,6 @@ 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) {
@@ -66,7 +58,7 @@ function serveFile(app,baseUrl,file) {
     }
 }
 
-function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
+function serveFilesFromTheme(themeValue, themeApp, directory) {
     var result = [];
     if (themeValue) {
         var array = themeValue;
@@ -75,14 +67,7 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
         }
 
         for (var i=0;i<array.length;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);
+            var url = serveFile(themeApp,directory,array[i]);
             if (url) {
                 result.push(url);
             }
@@ -92,17 +77,10 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
 }
 
 module.exports = {
-    init: function(settings, _runtimeAPI) {
-        runtimeAPI = _runtimeAPI;
+    init: function(settings) {
         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 = ((theme.codeEditor || {}).lib === "monaco") ? "vendor/monaco/monaco-bootstrap.js" : "";
-        activeTheme = theme.theme;
     },
 
     app: function() {
@@ -131,25 +109,13 @@ module.exports = {
             }
 
             if (theme.page.tabicon) {
-                let icon = theme.page.tabicon.icon || theme.page.tabicon
-                url = serveFile(themeApp,"/tabicon/", icon)
+                url = serveFile(themeApp,"/tabicon/",theme.page.tabicon)
                 if (url) {
-                    themeContext.page.tabicon.icon = url;
-                }
-                if (theme.page.tabicon.colour) {
-                    themeContext.page.tabicon.colour = theme.page.tabicon.colour
+                    themeContext.page.tabicon = url;
                 }
             }
 
             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) {
@@ -203,9 +169,7 @@ module.exports = {
                 }
             }
         }
-        themeApp.get("/", async function(req,res) {
-            const themePluginList = await runtimeAPI.plugins.getPluginsByType({type:"node-red-theme"});
-            themeContext.themes = themePluginList.map(theme => theme.id);
+        themeApp.get("/", function(req,res) {
             res.json(themeContext);
         })
 
@@ -221,54 +185,10 @@ 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: 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 || [])
-                }
-                if(theme.codeEditor) {
-                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
-                }
-            }
-            activeThemeInitialised = true;
-        }
+    context: function() {
         return themeContext;
     },
     settings: function() {

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

@@ -68,39 +68,8 @@ module.exports = {
             apiUtils.rejectHandler(req,res,err);
         })
     },
-
-    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()
-        }));
+    editor: function(req,res) {
+        res.send(Mustache.render(editorTemplate,theme.context()));
     },
     editorResources: express.static(path.join(editorClientDir,'public'))
 };

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

@@ -28,6 +28,7 @@ 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");
@@ -58,20 +59,6 @@ function init(settings,_server,storage,runtimeAPI) {
         });
         adminApp.use(corsHandler);
 
-        if (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';
@@ -90,8 +77,6 @@ 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);
         }
@@ -108,7 +93,7 @@ function init(settings,_server,storage,runtimeAPI) {
             adminApp.use(corsHandler);
         }
 
-        var adminApiApp = require("./admin").init(settings, runtimeAPI);
+        var adminApiApp = require("./admin").init(runtimeAPI);
         adminApp.use(adminApiApp);
     } else {
         adminApp = null;
@@ -120,9 +105,11 @@ function init(settings,_server,storage,runtimeAPI) {
  * @return {Promise} resolves when the application is ready to handle requests
  * @memberof @node-red/editor-api
  */
-async function start() {
+function start() {
     if (editor) {
         return editor.start();
+    } else {
+        return when.resolve();
     }
 }
 
@@ -131,10 +118,11 @@ async function start() {
  * @return {Promise} resolves when the application is stopped
  * @memberof @node-red/editor-api
  */
-async function stop() {
+function stop() {
     if (editor) {
         editor.stop();
     }
+    return when.resolve();
 }
 module.exports = {
     init: init,

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

@@ -43,20 +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 = {
+        res.status(err.status||400).json({
             code: err.code||"unexpected_error",
             message: err.message||err.toString()
-        };
-        // Handle auth failures on a specific remote
-        // TODO: don't hardcode this here - allow users of rejectHandler to identify extra props to send
-        if (err.remote) {
-            response.remote = err.remote;
-        }
-        res.status(err.status||400).json(response);
+        });
     },
     getRequestLogObject: function(req) {
         return {

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.2.2",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,25 +16,25 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.2.2",
-        "@node-red/editor-client": "2.2.2",
+        "@node-red/util": "1.0.2",
+        "@node-red/editor-client": "1.0.2",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.1",
+        "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.17.2",
-        "express": "4.17.2",
-        "memorystore": "1.6.7",
-        "mime": "3.0.0",
-        "multer": "1.4.4",
-        "mustache": "4.2.0",
-        "oauth2orize": "1.11.1",
+        "express-session": "1.16.2",
+        "express": "4.17.1",
+        "memorystore": "1.6.1",
+        "mime": "2.4.4",
+        "mustache": "3.0.2",
+        "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.5.2",
-        "ws": "7.5.6"
+        "passport": "0.4.0",
+        "when": "3.7.8",
+        "ws": "6.2.1"
     },
     "optionalDependencies": {
-        "bcrypt": "5.0.1"
+        "bcrypt": "3.0.6"
     }
 }

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

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright JS Foundation and other contributors, http://js.foundation
 
                                  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": "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"
-    }
-}
+  "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."
+  }
+}

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

@@ -1,274 +1,222 @@
 {
-    "$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."
-    }
-}
+  "$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\"."
+  }
+}

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

@@ -14,56 +14,17 @@
             "back": "Back",
             "next": "Next",
             "clone": "Clone project",
-            "cont": "Continue",
-            "style": "Style",
-            "line": "Outline",
-            "fill": "Fill",
-            "label": "Label",
-            "color": "Color",
-            "position": "Position",
-            "enable": "Enable",
-            "disable": "Disable",
-            "upload": "Upload"
-        },
-        "type": {
-            "string": "string",
-            "number": "number",
-            "boolean": "boolean",
-            "array": "array",
-            "buffer": "buffer",
-            "object": "object",
-            "jsonString": "JSON string",
-            "undefined": "undefined",
-            "null": "null"
+            "cont": "Continue"
         }
     },
-    "event": {
-        "loadPlugins": "Loading Plugins",
-        "loadPalette": "Loading Palette",
-        "loadNodeCatalogs": "Loading Node catalogs",
-        "loadNodes": "Loading Nodes __count__",
-        "loadFlows": "Loading Flows",
-        "importFlows": "Adding Flows to workspace",
-        "importError": "<p>Error adding flows</p><p>__message__</p>",
-        "loadingProject": "Loading project"
-    },
     "workspace": {
         "defaultName": "Flow __number__",
         "editFlow": "Edit flow: __name__",
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
-        "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",
+        "addFlow": "Add Flow",
+        "listFlows": "List Flows",
         "status": "Status",
         "enabled": "Enabled",
         "disabled":"Disabled",
@@ -75,8 +36,6 @@
             "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",
@@ -94,7 +53,6 @@
             "palette": {
                 "show": "Show palette"
             },
-            "edit": "Edit",
             "settings": "Settings",
             "userSettings": "User Settings",
             "nodes": "Nodes",
@@ -117,43 +75,19 @@
             "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",
-            "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"
+            "showNodeLabelDefault": "Show label of newly added nodes"
         }
     },
     "actions": {
         "toggle-navigator": "Toggle navigator",
         "zoom-out": "Zoom out",
         "zoom-reset": "Reset zoom",
-        "zoom-in": "Zoom in",
-        "search-flows": "Search flows",
-        "search-prev": "Previous",
-        "search-next": "Next",
-        "search-counter": "\"__term__\" __result__ of __count__"
+        "zoom-in": "Zoom in"
     },
     "user": {
         "loggedInAs": "Logged in as __name__",
@@ -175,7 +109,6 @@
             "nodeActionDisabled": "node actions disabled",
             "nodeActionDisabledSubflow": "node actions disabled within subflow",
             "missing-types": "<p>Flows stopped due to missing node types.</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>",
@@ -227,14 +160,10 @@
         "node_plural": "__count__ nodes",
         "configNode": "__count__ configuration node",
         "configNode_plural": "__count__ configuration nodes",
-        "group": "__count__ group",
-        "group_plural": "__count__ groups",
         "flow": "__count__ flow",
         "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",
@@ -242,19 +171,11 @@
         "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",
         "nodeCopied_plural": "__count__ nodes copied",
-        "groupCopied": "__count__ group copied",
-        "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",
@@ -269,19 +190,13 @@
         },
         "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",
@@ -371,21 +286,8 @@
         "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"
@@ -395,13 +297,6 @@
             "multipleInputsToSelection": "<strong>Cannot create subflow</strong>: multiple inputs to selection"
         }
     },
-    "group": {
-        "editGroup": "Edit group: __name__",
-        "errors": {
-            "cannotCreateDiffGroups": "Cannot create group using nodes from different groups",
-            "cannotAddSubflowPorts": "Cannot add subflow ports to a group"
-        }
-    },
     "editor": {
         "configEdit": "Edit",
         "configAdd": "Add",
@@ -431,8 +326,6 @@
         "locale": "Select UI Language",
         "icon": "Icon",
         "inputType": "Input type",
-        "selectType": "select types...",
-        "loadCredentials": "Loading node credentials",
         "inputs" : {
             "input": "input",
             "select": "select",
@@ -447,8 +340,7 @@
             "bool": "bool",
             "json": "JSON",
             "bin": "buffer",
-            "env": "env variable",
-            "cred": "credential"
+            "env": "env variable"
         },
         "menu": {
             "input": "input",
@@ -467,8 +359,7 @@
         },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
-            "invalidProperties": "Invalid properties:",
-            "credentialLoadFailed": "Failed to load node credentials"
+            "invalidProperties": "Invalid properties:"
         }
     },
     "keyboard": {
@@ -480,9 +371,8 @@
         "unassigned": "Unassigned",
         "global": "global",
         "workspace": "workspace",
-        "selectAll": "Select all",
-        "selectNone": "Select none",
-        "selectAllConnected": "Select connected",
+        "selectAll": "Select all nodes",
+        "selectAllConnected": "Select all connected nodes",
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
         "deleteSelected": "Delete selected nodes or link",
@@ -495,14 +385,10 @@
         "copyNode": "Copy selected nodes",
         "cutNode": "Cut selected nodes",
         "pasteNode": "Paste nodes",
-        "copyGroupStyle": "Copy group style",
-        "pasteGroupStyle": "Paste group style",
-        "undoChange": "Undo",
-        "redoChange": "Redo",
+        "undoChange": "Undo the last change performed",
         "searchBox": "Open search box",
         "managePalette": "Manage palette",
-        "actionList": "Action list",
-        "splitWiresWithLinks": "Split selection with Link nodes"
+        "actionList":"Action list"
     },
     "library": {
         "library": "Library",
@@ -554,8 +440,7 @@
             "nodeEnabled_plural": "Nodes enabled:",
             "nodeDisabled": "Node disabled:",
             "nodeDisabled_plural": "Nodes disabled:",
-            "nodeUpgraded": "Node module __module__ upgraded to version __version__",
-            "unknownNodeRegistered": "Error loading node: <ul><li>__type__<br>__error__</li></ul>"
+            "nodeUpgraded": "Node module __module__ upgraded to version __version__"
         },
         "editor": {
             "title": "Manage palette",
@@ -602,8 +487,6 @@
             "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>",
@@ -639,12 +522,11 @@
     },
     "sidebar": {
         "info": {
-            "name": "Information",
+            "name": "Node information",
             "tabName": "Name",
             "label": "info",
             "node": "Node",
             "type": "Type",
-            "group": "Group",
             "module": "Module",
             "id": "ID",
             "status": "Status",
@@ -667,22 +549,7 @@
             "nodeHelp": "Node Help",
             "none":"None",
             "arrayItems": "__count__ items",
-            "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"
-        },
-        "help": {
-            "name": "Help",
-            "label": "help",
-            "search": "Search help",
-            "nodeHelp": "Node Help",
-            "showHelp": "Show help",
-            "showInOutline": "Show in outline",
-            "showTopics": "Show topics",
-            "noHelp": "No help topic selected"
+            "showTips":"You can open the tips from the settings panel"
         },
         "config": {
             "name": "Configuration nodes",
@@ -735,6 +602,7 @@
                 "removeFromProject": "remove from project",
                 "addToProject": "add to project",
                 "files": "Files",
+                "package": "Package",
                 "flow": "Flow",
                 "credentials": "Credentials",
                 "package":"Package",
@@ -773,12 +641,6 @@
                 "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",
@@ -884,28 +746,15 @@
             "bin": "buffer",
             "date": "timestamp",
             "jsonata": "expression",
-            "env": "env variable",
-            "cred": "credential"
+            "env": "env variable"
         }
     },
     "editableList": {
-        "add": "add",
-        "addTitle": "add an item"
+        "add": "add"
     },
     "search": {
-        "history": "Search history",
-        "clear": "clear all",
         "empty": "No matches found",
-        "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"
-        }
+        "addNode": "add a node..."
     },
     "expressionEditor": {
         "functions": "Functions",
@@ -926,9 +775,6 @@
             "eval": "Error evaluating expression:\n  __message__"
         }
     },
-    "monaco": {
-        "setTheme": "Set theme"
-    },
     "jsEditor": {
         "title": "JavaScript editor"
     },
@@ -946,14 +792,10 @@
         "copyPath": "Copy path to item",
         "expandItems": "Expand items",
         "collapseItems": "Collapse items",
-        "duplicate": "Duplicate",
-        "error": {
-            "invalidJSON": "Invalid JSON: "
-        }
+        "duplicate": "Duplicate"
     },
     "markdownEditor": {
         "title": "Markdown editor",
-        "expand": "Expand",
         "format": "Formatted with markdown",
         "heading1": "Heading 1",
         "heading2": "Heading 2",
@@ -1101,8 +943,7 @@
             "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",
-            "clearContext": "Clear context when switching projects"
+            "unexpected_error": "unexpected_error"
         },
         "delete": {
             "confirm": "Are you sure you want to delete this project?"
@@ -1121,8 +962,7 @@
             "passphrase": "Passphrase",
             "retry": "Retry",
             "update-failed": "Failed to update auth",
-            "unhandled": "Unhandled error response",
-            "host-key-verify-failed": "<p>Host key verification failed.</p><p>The repository host key could not be verified. Please update your <code>known_hosts</code> file and try again.</p>"
+            "unhandled": "Unhandled error response"
         },
         "create-branch-list": {
             "invalid": "Invalid branch",
@@ -1143,24 +983,16 @@
     "editor-tab": {
         "properties": "Properties",
         "envProperties": "Environment Variables",
-        "module": "Module Properties",
         "description": "Description",
         "appearance": "Appearance",
         "preview": "UI Preview",
         "defaultValue": "Default value"
     },
-    "tourGuide": {
-        "takeATour": "Take a tour",
-        "start": "Start",
-        "next": "Next"
-    },
     "languages" : {
         "de": "German",
         "en-US": "English",
         "ja": "Japanese",
         "ko": "Korean",
-        "ru": "Russian",
-        "zh-CN": "Chinese(Simplified)",
-        "zh-TW": "Chinese(Traditional)"
+        "zh-CN": "Chinese(Simplified)"
     }
 }

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

@@ -52,8 +52,8 @@
         "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":"$[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"
+        "args":"",
+        "desc":"Generates a timestamp in ISO 8601 compatible format and returns it as a string."
     },
     "$base64encode": {
         "args":"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, [, 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."
+        "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."
     },
     "$formatNumber": {
         "args": "number, picture [, options]",
@@ -243,32 +243,24 @@
         "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"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "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\"`"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "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\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "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=шеллы\"`"
     },
     "$distinct": {
         "args": "array",
         "desc": "Returns an array with duplicate values removed from `array`"
-    },
-    "$type": {
-        "args": "value",
-        "desc": "Returns the type of `value` as a string. If `value` is undefined, this will return `undefined`"
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "Gets a date object using the Moment library."
     }
 }

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

@@ -14,39 +14,9 @@
             "back": "戻る",
             "next": "進む",
             "clone": "プロジェクトをクローン",
-            "cont": "続ける",
-            "style": "形式",
-            "line": "線",
-            "fill": "塗りつぶし",
-            "label": "ラベル",
-            "color": "色",
-            "position": "配置",
-            "enable": "有効",
-            "disable": "無効",
-            "upload": "アップロード"
-        },
-        "type": {
-            "string": "文字列",
-            "number": "数値",
-            "boolean": "真偽値",
-            "array": "配列",
-            "buffer": "バッファ",
-            "object": "オブジェクト",
-            "jsonString": "JSON文字列",
-            "undefined": "undefined",
-            "null": "null"
+            "cont": "続ける"
         }
     },
-    "event": {
-        "loadPlugins": "プラグインを読み込み中",
-        "loadPalette": "パレットを読み込み中",
-        "loadNodeCatalogs": "ノードカタログを読み込み中",
-        "loadNodes": "ノードを読み込み中 __count__",
-        "loadFlows": "フローを読み込み中",
-        "importFlows": "ワークスペースにフローを追加中",
-        "importError": "<p>フロー追加エラー</p><p>__message__</p>",
-        "loadingProject": "プロジェクトを読み込み中"
-    },
     "workspace": {
         "defaultName": "フロー __number__",
         "editFlow": "フローを編集: __name__",
@@ -54,16 +24,7 @@
         "delete": "本当に '__label__' を削除しますか？",
         "dropFlowHere": "ここにフローをドロップしてください",
         "addFlow": "フローの追加",
-        "addFlowToRight": "右側にフローを追加",
-        "hideFlow": "フローを非表示",
-        "hideOtherFlows": "他のフローを非表示",
-        "showAllFlows": "全てのフローを表示",
-        "hideAllFlows": "全てのフローを非表示",
-        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
-        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
-        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
         "listFlows": "フロー一覧",
-        "listSubflows": "サブフロー一覧",
         "status": "状態",
         "enabled": "有効",
         "disabled": "無効",
@@ -75,8 +36,6 @@
             "view": {
                 "view": "表示",
                 "grid": "グリッド",
-                "storeZoom": "読み込み時に拡大/縮小のレベルを復元",
-                "storePosition": "読み込み時にスクロール位置を復元",
                 "showGrid": "グリッドを表示",
                 "snapGrid": "ノードの配置を補助",
                 "gridSize": "グリッドの大きさ",
@@ -94,12 +53,11 @@
             "palette": {
                 "show": "パレットを表示"
             },
-            "edit": "編集",
             "settings": "設定",
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
-            "displayStatus": "ノードのステータスを表示",
-            "displayConfig": "設定ノード",
+            "displayStatus": "ノードの状態を表示",
+            "displayConfig": "ノードの設定",
             "import": "読み込み",
             "export": "書き出し",
             "search": "ノードを検索",
@@ -117,32 +75,12 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
-            "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
-            "showNodeLabelDefault": "追加したノードのラベルを表示",
-            "codeEditor": "コードエディタ",
-            "groups": "グループ",
-            "groupSelection": "選択部分をグループ化",
-            "ungroupSelection": "選択部分をグループ解除",
-            "groupMergeSelection": "選択部分をマージ",
-            "groupRemoveSelection": "グループから削除",
-            "arrange": "配置",
-            "alignLeft": "左揃え",
-            "alignCenter": "左右中央揃え",
-            "alignRight": "右揃え",
-            "alignTop": "上揃え",
-            "alignMiddle": "上下中央揃え",
-            "alignBottom": "下揃え",
-            "distributeHorizontally": "左右に整列",
-            "distributeVertically": "上下に整列",
-            "moveToBack": "最背面へ移動",
-            "moveToFront": "最前面へ移動",
-            "moveBackwards": "背面へ移動",
-            "moveForwards": "前面へ移動"
+            "showNodeLabelDefault": "追加したノードのラベルを表示"
         }
     },
     "actions": {
@@ -171,7 +109,6 @@
             "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>",
@@ -223,34 +160,22 @@
         "node_plural": "__count__ 個のノード",
         "configNode": "__count__ 個の設定ノード",
         "configNode_plural": "__count__ 個の設定ノード",
-        "group": "__count__ 個のグループ",
-        "group_plural": "__count__ 個のグループ",
         "flow": "__count__ 個のフロー",
         "flow_plural": "__count__ 個のフロー",
         "subflow": "__count__ 個のサブフロー",
         "subflow_plural": "__count__ 個のサブフロー",
-        "replacedNodes": "置換された __count__ 個のノード",
-        "replacedNodes_plural": "置換された __count__ 個のノード",
-        "pasteNodes": "JSON形式のフローデータを貼り付け",
-        "selectFile": "読み込むファイルを選択",
-        "importNodes": "フローを読み込み",
-        "exportNodes": "フローを書き出し",
+        "pasteNodes": "JSON形式のフローデータを貼り付けてください",
+        "selectFile": "読み込むファイルを選択してください",
+        "importNodes": "フローをクリップボートから読み込み",
+        "exportNodes": "フローをクリップボードへ書き出し",
         "download": "ダウンロード",
         "importUnrecognised": "認識できない型が読み込まれました:",
         "importUnrecognised_plural": "認識できない型が読み込まれました:",
-        "importDuplicate": "重複したノードを読み込みました:",
-        "importDuplicate_plural": "重複したノードを読み込みました:",
         "nodesExported": "クリップボードへフローを書き出しました",
         "nodesImported": "読み込みました:",
         "nodeCopied": "__count__ 個のノードをコピーしました",
         "nodeCopied_plural": "__count__ 個のノードをコピーしました",
-        "groupCopied": "__count__ 個のグループをコピーしました",
-        "groupCopied_plural": "__count__ 個のグループをコピーしました",
-        "groupStyleCopied": "グループの形式をコピーしました",
         "invalidFlow": "不正なフロー: __message__",
-        "recoveredNodes": "復旧したノード",
-        "recoveredNodesInfo": "このフロー内のノードは読み込み時に、有効なフローIDがありませんでした。これらフローIDは、フローに追加されているため、復元または削除できます。",
-        "recoveredNodesNotification": "<p>有効なフローIDを持たないノードが読み込まれました</p><p>これらノードは '__flowName__' という新しいフローへ追加されました。</p>",
         "export": {
             "selected": "選択したフロー",
             "current": "現在のタブ",
@@ -265,19 +190,13 @@
         },
         "import": {
             "import": "読み込み先",
-            "importSelected": "選択したノードを読み込み",
-            "importCopy": "コピーを読み込み",
-            "viewNodes": "ノードを参照...",
             "newFlow": "新規のタブ",
-            "replace": "置換",
             "errors": {
                 "notArray": "JSON形式の配列ではありません",
                 "itemNotObject": "不正なフロー - __index__ 番目の要素はノードオブジェクトではありません",
                 "missingId": "不正なフロー - __index__ 番目の要素に'id'プロパティがありません",
                 "missingType": "不正なフロー - __index__ 番目の要素に'type'プロパティがありません"
-            },
-            "conflictNotification1": "読み込もうとしているノードのいくつかは、既にワークスペース内に存在しています。",
-            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。"
+            }
         },
         "copyMessagePath": "パスをコピーしました",
         "copyMessageValue": "値をコピーしました",
@@ -296,7 +215,7 @@
         "successfulDeploy": "デプロイが成功しました",
         "successfulRestart": "フローの再起動が成功しました",
         "deployFailed": "デプロイが失敗しました: __message__",
-        "unusedConfigNodes": "使われていない設定ノードがあります。",
+        "unusedConfigNodes": "使われていない「ノードの設定」があります。",
         "unusedConfigNodesLink": "設定を参照する",
         "errors": {
             "noResponse": "サーバの応答がありません"
@@ -367,21 +286,8 @@
         "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": "環境変数を削除"
@@ -391,13 +297,6 @@
             "multipleInputsToSelection": "<strong>サブフローを作成できません</strong>: 複数の入力が選択されています"
         }
     },
-    "group": {
-        "editGroup": "__name__ グループを編集",
-        "errors": {
-            "cannotCreateDiffGroups": "異なるグループのノードを使用してグループを作成することはできません",
-            "cannotAddSubflowPorts": "グループにサブフローの端子を追加できません"
-        }
-    },
     "editor": {
         "configEdit": "編集",
         "configAdd": "追加",
@@ -405,9 +304,9 @@
         "configDelete": "削除",
         "nodesUse": "__count__ 個のノードが、この設定を使用しています",
         "nodesUse_plural": "__count__ 個のノードが、この設定を使用しています",
-        "addNewConfig": "新規に __type__ 設定ノードを追加",
+        "addNewConfig": "新規に __type__ ノードの設定を追加",
         "editNode": "__type__ ノードを編集",
-        "editConfig": "__type__ 設定ノードを編集",
+        "editConfig": "__type__ ノードの設定を編集",
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
@@ -427,8 +326,6 @@
         "locale": "UI言語の選択",
         "icon": "記号",
         "inputType": "入力形式",
-        "selectType": "形式選択...",
-        "loadCredentials": "ノードの認証情報を読み込み中",
         "inputs": {
             "input": "入力",
             "select": "メニュー",
@@ -443,8 +340,7 @@
             "bool": "真偽",
             "json": "JSON",
             "bin": "バッファ",
-            "env": "環境変数",
-            "cred": "認証情報"
+            "env": "環境変数"
         },
         "menu": {
             "input": "入力",
@@ -463,8 +359,7 @@
         },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
-            "invalidProperties": "プロパティが不正です:",
-            "credentialLoadFailed": "ノードの認証情報の読み込みに失敗"
+            "invalidProperties": "プロパティが不正です:"
         }
     },
     "keyboard": {
@@ -477,8 +372,7 @@
         "global": "グローバル",
         "workspace": "ワークスペース",
         "selectAll": "全てのノードを選択",
-        "selectNone": "選択を外す",
-        "selectAllConnected": "接続されたノードを選択",
+        "selectAllConnected": "接続された全てのノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
         "deleteSelected": "選択したノードや接続を削除",
@@ -488,13 +382,10 @@
         "moveNode": "選択したノードを移動(移動量大)",
         "toggleSidebar": "サイドバーの表示/非表示",
         "togglePalette": "パレットの表示/非表示",
-        "copyNode": "ノードをコピー",
-        "cutNode": "ノードを切り取り",
+        "copyNode": "選択したノードをコピー",
+        "cutNode": "選択したノードを切り取り",
         "pasteNode": "ノードを貼り付け",
-        "copyGroupStyle": "グループ様式をコピー",
-        "pasteGroupStyle": "グループ様式を貼り付け",
         "undoChange": "変更操作を戻す",
-        "redoChange": "変更操作をやり直し",
         "searchBox": "ノードを検索",
         "managePalette": "パレットの管理",
         "actionList": "動作一覧"
@@ -549,15 +440,14 @@
             "nodeEnabled_plural": "ノードを有効化しました:",
             "nodeDisabled": "ノードを無効化しました:",
             "nodeDisabled_plural": "ノードを無効化しました:",
-            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました",
-            "unknownNodeRegistered": "ノードの読み込みエラー: <ul><li>__type__<br>__error__</li></ul>"
+            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました"
         },
         "editor": {
             "title": "パレットの管理",
             "palette": "パレット",
             "times": {
-                "seconds": "数秒前",
-                "minutes": "数分前",
+                "seconds": "秒前",
+                "minutes": "分前",
                 "minutesV": "__count__ 分前",
                 "hoursV": "__count__ 時間前",
                 "hoursV_plural": "__count__ 時間前",
@@ -597,8 +487,6 @@
             "sortAZ": "辞書順",
             "sortRecent": "日付順",
             "more": "+ さらに __count__ 個",
-            "upload": "モジュールのtgzファイルをアップロード",
-            "refresh": "モジュールリスト更新",
             "errors": {
                 "catalogLoadFailed": "<p>ノードのカタログの読み込みに失敗しました。</p><p>詳細はブラウザのコンソールを確認してください。</p>",
                 "installFailed": "<p>追加処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
@@ -639,7 +527,6 @@
             "label": "情報",
             "node": "ノード",
             "type": "型",
-            "group": "グループ",
             "module": "モジュール",
             "id": "ID",
             "status": "状態",
@@ -662,26 +549,11 @@
             "nodeHelp": "ノードのヘルプ",
             "none": "なし",
             "arrayItems": "__count__ 要素",
-            "showTips": "設定からヒントを表示できます",
-            "outline": "アウトライン",
-            "empty": "空",
-            "globalConfig": "グローバル設定ノード",
-            "triggerAction": "アクションを実行",
-            "find": "ワークスペース内を検索"
-        },
-        "help": {
-            "name": "ヘルプ",
-            "label": "ヘルプ",
-            "search": "ヘルプを検索",
-            "nodeHelp": "ノードヘルプ",
-            "showHelp": "ヘルプを表示",
-            "showInOutline": "アウトラインに表示",
-            "showTopics": "トピックを表示",
-            "noHelp": "ヘルプのトピックが未選択"
+            "showTips": "設定からヒントを表示できます"
         },
         "config": {
-            "name": "設定ノードを表示",
-            "label": "設定ノード",
+            "name": "ノードの設定を表示",
+            "label": "ノードの設定",
             "global": "全てのフロー上",
             "none": "なし",
             "subflows": "サブフロー",
@@ -730,9 +602,9 @@
                 "removeFromProject": "プロジェクトから削除",
                 "addToProject": "プロジェクトへ追加",
                 "files": "ファイル",
+                "package": "パッケージ",
                 "flow": "フロー",
                 "credentials": "認証情報",
-                "package": "パッケージ",
                 "packageCreate": "変更が保存された時にファイルが作成されます",
                 "fileNotExist": "ファイルが存在しません",
                 "selectFile": "ファイルを選択",
@@ -768,12 +640,6 @@
                 "committerTip": "システムのデフォルトを使用する場合、空白のままにしてください",
                 "userName": "ユーザ名",
                 "email": "メールアドレス",
-                "workflow": "ワークフロー",
-                "workfowTip": "望ましいgitワークフローを選択してください",
-                "workflowManual": "手動",
-                "workflowManualTip": "全ての変更は「履歴」サイドバー内で手動でコミットする必要があります",
-                "workflowAuto": "自動",
-                "workflowAutoTip": "変更はデプロイの度に自動的にコミットされます",
                 "sshKeys": "SSH キー",
                 "sshKeysTip": "gitリポジトリへのセキュアな接続を作成できます。",
                 "add": "キーを追加",
@@ -879,27 +745,15 @@
             "bin": "バッファ",
             "date": "日時",
             "jsonata": "JSONata式",
-            "env": "環境変数",
-            "cred": "認証情報"
+            "env": "環境変数"
         }
     },
     "editableList": {
-        "add": "追加",
-        "addTitle": "要素を追加"
+        "add": "追加"
     },
     "search": {
-        "history": "検索履歴",
-        "clear": "全て削除",
         "empty": "一致したものが見つかりませんでした",
-        "addNode": "ノードを追加...",
-        "options": {
-            "configNodes": "設定ノード",
-            "unusedConfigNodes": "未使用の設定ノード",
-            "invalidNodes": "不正なノード",
-            "uknownNodes": "未知のノード",
-            "unusedSubflows": "未使用のサブフロー",
-            "hiddenFlows": "非表示のフロー"
-        }
+        "addNode": "ノードを追加..."
     },
     "expressionEditor": {
         "functions": "関数",
@@ -920,9 +774,6 @@
             "eval": "表現評価エラー:\n  __message__"
         }
     },
-    "monaco": {
-        "setTheme": "テーマを設定:"
-    },
     "jsEditor": {
         "title": "JavaScriptエディタ"
     },
@@ -940,14 +791,10 @@
         "copyPath": "要素のパスをコピー",
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
-        "duplicate": "複製",
-        "error": {
-            "invalidJSON": "不正なJSON: "
-        }
+        "duplicate": "複製"
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
-        "expand": "拡大",
         "format": "マークダウン形式で記述",
         "heading1": "見出しレベル1",
         "heading2": "見出しレベル2",
@@ -1095,8 +942,7 @@
             "not-git": "Gitリポジトリではありません",
             "no-resource": "リポジトリが見つかりません",
             "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。",
-            "unexpected_error": "予期しないエラー",
-            "clearContext": "プロジェクトを切り替る際にコンテキストを初期化"
+            "unexpected_error": "予期しないエラー"
         },
         "delete": {
             "confirm": "プロジェクトを削除しても良いですか?"
@@ -1115,8 +961,7 @@
             "passphrase": "パスフレーズ",
             "retry": "リトライ",
             "update-failed": "認証の更新に失敗しました",
-            "unhandled": "エラー応答が処理されませんでした",
-            "host-key-verify-failed": "<p>ホストキーの検証に失敗</p><p>リポジトリのホストキーを検証できませんでした。<code>known_hosts</code>ファイルを更新して、もう一度試してください。</p>"
+            "unhandled": "エラー応答が処理されませんでした"
         },
         "create-branch-list": {
             "invalid": "不正なブランチ",
@@ -1137,156 +982,16 @@
     "editor-tab": {
         "properties": "プロパティ",
         "envProperties": "環境変数",
-        "module": "モジュールプロパティ",
         "description": "説明",
         "appearance": "外観",
         "preview": "UIプレビュー",
         "defaultValue": "デフォルト値"
     },
-    "tourGuide": {
-        "takeATour": "ツアーを開始",
-        "start": "開始",
-        "next": "次へ"
-    },
     "languages": {
         "de": "ドイツ語",
         "en-US": "英語",
         "ja": "日本語",
         "ko": "韓国語",
-        "ru": "ロシア語",
-        "zh-CN": "中国語(簡体)",
-        "zh-TW": "中国語(繁体)"
-    },
-    "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-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": "ノードを複数に接続",
-        "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": "検索",
-        "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": "ナビゲータ表示切替"
+        "zh-CN": "中国語(簡体)"
     }
 }

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

@@ -1,7 +1,7 @@
 {
     "$string": {
-        "args": "arg[, prettify]",
-        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。`prettify`が真の場合、JSONを整形出力します。フィールドを1行毎に出力。フィールドのネスト深さによってインデントを行います。"
+        "args": "arg",
+        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。"
     },
     "$length": {
         "args": "str",
@@ -52,8 +52,8 @@
         "desc": "文字列 `str` からパターン `pattern` を検索し、置換文字列 `replacement` に置き換えます。\n\n任意の引数 `limit` には、置換回数の上限値を指定します。"
     },
     "$now": {
-        "args": "$[picture [, timezone]]",
-        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。pictureおよびtimezoneパラメータが指定されている場合、現在時刻を`$fromMillis()`関数の説明に従ってフォーマットします。"
+        "args": "",
+        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。"
     },
     "$base64encode": {
         "args": "string",
@@ -185,7 +185,7 @@
     },
     "$reduce": {
         "args": "array, function [, init]",
-        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。関数`function`のシグネチャは`myfunc($accumulator, $value[, $index[, $array]])`という形式でなければなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
+        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
     },
     "$flowContext": {
         "args": "string",
@@ -200,8 +200,8 @@
         "desc": "文字数が引数 `width` の絶対値以上となるよう、必要に応じて追加文字を付け足した `string` のコピーを返します。\n\n`width` が正の値の場合、文字列の右側に追加文字を付け足します。もし負の値の場合、文字列の左側に追加文字を付け足します。\n\n任意の引数 `char` には、本関数で用いる追加文字を指定します。もし追加文字を指定しない場合は、既定値として空白文字を使用します。"
     },
     "$fromMillis": {
-        "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の東、負の差分は西のタイムゾーンとなります。"
+        "args": "number",
+        "desc": "Unixエポック(1 January, 1970 UTC)からの経過ミリ秒を表す数値を、ISO 8601形式のタイムスタンプの文字列に変換します。"
     },
     "$formatNumber": {
         "args": "number, picture [, options]",
@@ -230,45 +230,5 @@
     "$parseInteger": {
         "args": "string, picture",
         "desc": "`picture`文字列の指定に従って、`string`パラメータを整数(JSON数値)に変換します。`picture`文字列は`$formatInteger`と同じ形式です。"
-    },
-    "$error": {
-        "args": "[str]",
-        "desc": "メッセージを指定して例外を送出します。メッセージ`str`を省略した場合は`$error() function evaluated`をメッセージとします。"
-    },
-    "$assert": {
-        "args": "arg, str",
-        "desc": "`arg`が真の場合、undefinedを返します。偽の場合、`str`をメッセージとする例外を送出します。"
-    },
-    "$single": {
-        "args": "array, function",
-        "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
-    },
-    "$encodeUrlComponent": {
-        "args": "str",
-        "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
-    },
-    "$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\"`"
-    },
-    "$decodeUrlComponent": {
-        "args": "str",
-        "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
-    },
-    "$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=шеллы\"`"
-    },
-    "$distinct": {
-        "args": "array",
-        "desc": "配列`array`から重複要素を削除した配列を返します。"
-    },
-    "$type": {
-        "args": "value",
-        "desc": "`value` の型を文字列として返します。もし `value` が未定義の場合、 `undefined` が返されます。"
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "Momentライブラリを使用して日付オブジェクトを取得します。"
     }
 }

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

@@ -56,7 +56,7 @@
       "displayConfig": "설정노드 보기",
       "import": "가져오기",
       "export": "내보내기",
-      "search": "플로우 검색",
+      "search": "플로우 겅색",
       "searchInput": "플로우 검색",
       "subflows": "보조 플로우",
       "createSubflow": "보조 플로우 생성",

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

@@ -1,23 +0,0 @@
-{
-    "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

@@ -1,274 +0,0 @@
-{
-    "$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/jsonata.json

@@ -1,15 +1,15 @@
 {
     "$string": {
         "args": "arg",
-        "desc": "通过以下的类型转换规则将参数 *arg* 转换成字符串:\n\n - 字符串不转换。\n -函数转换成空的字符串。\n - JSON的值无法用数字表示所以用无限大或者NaN（非数）表示。\n - 用 `JSON.stringify` 函数将其他值转换成JSON字符串。"
+        "desc": "通过以下的类型转换规则将参数*arg*转换成字符串:\n\n - 字符串不转换。\n -函数转换成空的字符串。\n - JSON的值无法用数字表示所以用无限大或者NaN（非数）表示。\n - 用’JSON.stringify’函数将其他值转换成JSON字符串。"
     },
     "$length": {
         "args": "str",
-        "desc": "输出字符串 `str` 的字数。如果 `str` 不是字符串，抛出错误。"
+        "desc": "输出字符串’str’的字数。如果’str’不是字符串，抛出错误。"
     },
     "$substring": {
         "args": "str, start[, length]",
-        "desc": "输出 `start` 位置后的的首次出现的包括 `str` 的子字符串。 如果 `length` 被指定，那么的字符串中将只包括前 `length` 个文字。如果 `start` 是负数则输出从 `str` 末尾开始的 `length` 个文字"
+        "desc": "输出`start`位置后的的首次出现的包括`str`的子字符串。 如果`length`被指定，那么的字符串中将只包括前`length`个文字。如果`start`是负数则输出从`str`末尾开始的`length`个文字"
     },
     "$substringBefore": {
         "args": "str, chars",
@@ -17,11 +17,11 @@
     },
     "$substringAfter": {
         "args": "str, chars",
-        "desc": "输出 `str` 中首次出现的 `chars` 之后的子字符串，如果 `str` 中不包括 `chars` 则输出 `str` 。"
+        "desc": "输出’str’中首次出现的’chars’之后的子字符串，如果’str’中不包括’chars’则输出’str’。"
     },
     "$uppercase": {
         "args": "str",
-        "desc": "将 `str` 中的所有字母变为大写后输出。"
+        "desc": "`将’str’中的所有字母变为大写后输出。"
     },
     "$lowercase": {
         "args": "str",
@@ -29,27 +29,27 @@
     },
     "$trim": {
         "args": "str",
-        "desc": "将以下步骤应用于 `str` 来去除所有空白文字并实现标准化。\n\n – 将全部tab制表符、回车键、换行字符用空白代替。\n- 将连续的空白文字变成一个空白文字。\n- 消除开头和末尾的空白文字。\n\n如果 `str` 没有被指定(即在无输入参数的情况下调用本函数)，将上下文的值作为 `str` 来使用。 如果 `str` 不是字符串则抛出错误。"
+        "desc": "将以下步骤应用于`str`来去除所有空白文字并实现标准化。\n\n – 将全部tab制表符、回车键、换行字符用空白代替。\n- 将连续的空白文字变成一个空白文字。\n- 消除开头和末尾的空白文字。\n\n如果`str`没有被指定(即在无输入参数的情况下调用本函数)，将上下文的值作为`str`来使用。 如果`str` 不是字符串则抛出错误。"
     },
     "$contains": {
         "args": "str, pattern",
-        "desc": "字符串 `str` 和 `pattern` 匹配的话输出 `true` ，不匹配的情况下输出 `false` 。 不指定 `str` 的情况下(比如用一个参数调用本函数时)、将上下文的值作为 `str` 来使用。参数 `pattern` 可以为字符串或正则表达。"
+        "desc": "字符串`str` 和 `pattern`匹配的话输出`true`，不匹配的情况下输出 `false`。 不指定`str`的情况下(比如用一个参数调用本函数时)、将上下文的值作为`str`来使用。参数 `pattern`可以为字符串或正则表达。"
     },
     "$split": {
         "args": "str[, separator][, limit]",
-        "desc": "将参数 `str` 分解成由子字符串组成的数组。 如果 `str` 不是字符串抛出错误。可以省略的参数 `separator` 中指定字符串 `str` 的分隔符。分隔符可以是文字或正则表达式。在不指定 `separator` 的情况下、将分隔符看作空的字符串并把 `str` 拆分成由单个字母组成的数组。如果 `separator` 不是字符串则抛出错误。在可省略的参数 `limit` 中指定分割后的子字符串的最大个数。超出个数的子字符串将被舍弃。如果 `limit` 没有被指定，`str` 将不考虑子字符串的个数而将字符串完全分隔。如果 `limit` 是负数则抛出错误。"
+        "desc": "将参数`str`分解成由子字符串组成的数组。 如果`str`不是字符串抛出错误。可以省略的参数 `separator`中指定字符串`str`的分隔符。分隔符可以是文字或正则表达式。在不指定`separator`的情况下、将分隔符看作空的字符串并把`str`拆分成由单个字母组成的数组。如果`separator`不是字符串则抛出错误。在可省略的参数`limit`中指定分割后的子字符串的最大个数。超出个数的子字符串将被舍弃。如果`limit`没有被指定，`str` 将不考虑子字符串的个数而将字符串完全分隔。如果`limit`是负数则抛出错误。"
     },
     "$join": {
         "args": "array[, separator]",
-        "desc": "用可以省略的参数 `separator` 来把多个字符串连接。如果 `array` 不是字符串则抛出错误。 如果没有指定 `separator` ，则用空字符串来连接字符(即字符串之间没有 `separator` )。 如果 `separator` 不是字符则抛出错误。"
+        "desc": "用可以省略的参数 `separator`来把多个字符串连接。如果`array`不是字符串则抛出错误。 如果没有指定`separator`，则用空字符串来连接字符(即字符串之间没有`separator`)。 如果`separator`不是字符则抛出错误。"
     },
     "$match": {
         "args": "str, pattern [, limit]",
-        "desc": "对字符串 `str` 使用正则表达式 `pattern` 并输出与 `str` 相匹配的部分信息。"
+        "desc": "对字符串`str`使用正则表达式`pattern`并输出与`str`相匹配的部分信息。"
     },
     "$replace": {
         "args": "str, pattern, replacement [, limit]",
-        "desc": "在字符串 `str` 中搜索 `pattern` 并用 `replacement` 来替换。\n\n可选参数 `limit` 用来指定替换次数的上限。"
+        "desc": "在字符串`str`中搜索`pattern`并用`replacement`来替换。\n\n可选参数`limit`用来指定替换次数的上限。"
     },
     "$now": {
         "args": "",
@@ -65,31 +65,31 @@
     },
     "$number": {
         "args": "arg",
-        "desc": "用下述的规则将参数 `arg` 转换为数值。:\n\n – 数值不做转换。\n – 将字符串中合法的JSON数値表示转换成数値。\n – 其他形式的值则抛出错误。"
+        "desc": "用下述的规则将参数 `arg`转换为数值。:\n\n – 数值不做转换。\n – 将字符串中合法的JSON数値表示转换成数値。\n – 其他形式的值则抛出错误。"
     },
     "$abs": {
         "args": "number",
-        "desc": "输出参数 `number` 的绝对值。"
+        "desc": "输出参数`number`的绝对值。"
     },
     "$floor": {
         "args": "number",
-        "desc": "输出比 `number` 的值小的最大整数。"
+        "desc": "输出比`number`的值小的最大整数。"
     },
     "$ceil": {
         "args": "number",
-        "desc": "输出比 `number` 的值大的最小整数。"
+        "desc": "输出比`number`的值大的最小整数。"
     },
     "$round": {
         "args": "number [, precision]",
-        "desc": "输出四舍五入后的参数 `number` 。可省略的参数 `precision` 指定四舍五入后小数点下的位数。"
+        "desc": "输出四舍五入后的参数`number`。可省略的参数 `precision`指定四舍五入后小数点下的位数。"
     },
     "$power": {
         "args": "base, exponent",
-        "desc": "输出底数 `base` 的 `exponent` 次幂。"
+        "desc": "输出底数`base`的`exponent`次幂。"
     },
     "$sqrt": {
         "args": "number",
-        "desc": "输出参数 `number` 的平方根。"
+        "desc": "输出参数 `number`的平方根。"
     },
     "$random": {
         "args": "",
@@ -97,35 +97,35 @@
     },
     "$millis": {
         "args": "",
-        "desc": "返回从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。在同一个表达式的测试中所有对 `$millis()` 的调用将会返回相同的值。"
+        "desc": "返回从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。在同一个表达式的测试中所有对`$millis()`的调用将会返回相同的值。"
     },
     "$sum": {
         "args": "array",
-        "desc": "输出数组 `array` 的总和。如果 `array` 不是数值则抛出错误。"
+        "desc": "输出数组`array`的总和。如果`array`不是数值则抛出错误。"
     },
     "$max": {
         "args": "array",
-        "desc": "输出数组 `array` 的最大值。如果 `array` 不是数值则抛出错误。"
+        "desc": "输出数组`array`的最大值。如果`array`不是数值则抛出错误。"
     },
     "$min": {
         "args": "array",
-        "desc": "输出数组 `array` 的最小值。如果 `array` 不是数值则抛出错误。。"
+        "desc": "输出数组`array`的最小值。如果`array`不是数值则抛出错误。。"
     },
     "$average": {
         "args": "array",
-        "desc": "输出数组 `array` 的平均数。如果 `array` 不是数值则抛出错误。。"
+        "desc": "输出数组`array`的平均数。如果`array`不是数值则抛出错误。。"
     },
     "$boolean": {
         "args": "arg",
-        "desc": "用下述规则将数据转换成布尔值。:\n\n - 不转换布尔值 `Boolean` 。\n – 将空的字符串 `string` 转换为 `false` \n – 将不为空的字符串 `string` 转换为 `true` \n – 将为0的数字 `number` 转换成 `false` \n –将不为0的数字 `number` 转换成 `true` \n –将 `null` 转换成 `false` \n –将空的数组 `array` 转换成 `false` \n –如果数组 `array` 中含有可以转换成 `true` 的要素则转换成 `true` \n –如果 `array` 中没有可转换成 `true` 的要素则转换成 `false` \n – 空的对象 `object` 转换成 `false` \n – 非空的对象 `object` 转换成 `true` \n –将函数 `function` 转换成 `false` "
+        "desc": "用下述规则将数据转换成布尔值。:\n\n - 不转换布尔值`Boolean`。\n – 将空的字符串`string`转换为`false`\n – 将不为空的字符串`string`转换为`true`\n – 将为0的数字`number`转换成`false`\n –将不为0的数字`number`转换成`true`\n –将`null`转换成`false`\n –将空的数组`array`转换成`false`\n –如果数组`array`中含有可以转换成`true`的要素则转换成`true`\n –如果`array`中没有可转换成`true`的要素则转换成`false`\n – 空的对象`object`转换成`false`\n – 非空的对象`object`转换成`true`\n –将函数`function`转换成`false`"
     },
     "$not": {
         "args": "arg",
-        "desc": "输出做取反运算后的布尔值。首先将 `arg` 转换为布尔值。"
+        "desc": "输出做取反运算后的布尔值。首先将`arg`转换为布尔值。"
     },
     "$exists": {
         "args": "arg",
-        "desc": "如果算式 `arg` 的值存在则输出 `true` 。如果算式的值不存在(比如指向不存在区域的引用)则输出 `false` 。"
+        "desc": "如果算式`arg`的值存在则输出`true`。如果算式的值不存在(比如指向不存在区域的引用)则输出`false`。"
     },
     "$count": {
         "args": "array",
@@ -137,15 +137,15 @@
     },
     "$sort": {
         "args": "array [, function]",
-        "desc": "输出排序后的数组 `array` 。\n\n如果使用了比较函数 `function` ，则下述两个参数需要被指定。\n\n `function(left, right)` \n\n该比较函数是为了比较left和right两个值而被排序算法调用的。如果用户希望left的值被置于right的值之后，那么该函数必须输出布尔值 `true` 来表示位置交换。而在不需要位置交换时函数必须输出 `false` 。"
+        "desc": "输出排序后的数组`array`。\n\n如果使用了比较函数`function`，则下述两个参数需要被指定。\n\n`function(left, right)`\n\n该比较函数是为了比较left和right两个值而被排序算法调用的。如果用户希望left的值被置于right的值之后，那么该函数必须输出布尔值`true`来表示位置交换。而在不需要位置交换时函数必须输出`false`。"
     },
     "$reverse": {
         "args": "array",
-        "desc": "输出倒序后的数组 `array` 。"
+        "desc": "输出倒序后的数组`array`。"
     },
     "$shuffle": {
         "args": "array",
-        "desc": "输出随机排序后的数组 `array` 。"
+        "desc": "输出随机排序后的数组 `array`。"
     },
     "$zip": {
         "args": "array, ...",
@@ -157,35 +157,35 @@
     },
     "$lookup": {
         "args": "object, key",
-        "desc": "输出对象中与参数 `key` 对应的值。如果第一个参数 `object` 是数组，那么数组中所有的对象都将被搜索并输出这些对象中与参数 `key` 对应的值。"
+        "desc": "输出对象中与参数`key`对应的值。如果第一个参数`object`是数组，那么数组中所有的对象都将被搜索并输出这些对象中与参数`key`对应的值。"
     },
     "$spread": {
         "args": "object",
-        "desc": "将对象中的键值对分隔成每个要素中只含有一个键值对的数组。如果参数 `object` 是数组，那么返回值的数组中包含所有对象中的键值对。"
+        "desc": "将对象中的键值对分隔成每个要素中只含有一个键值对的数组。如果参数`object`是数组，那么返回值的数组中包含所有对象中的键值对。"
     },
     "$merge": {
         "args": "array<object>",
-        "desc": "将输入数组 `objects` 中所有的键值对合并到一个 `object` 中并返回。如果输入数组的要素中含有重复的键，则返回的 `object` 中将只包含数组中最后出现要素的值。如果输入数组中包括对象以外的元素，则抛出错误。"
+        "desc": "将输入数组`objects`中所有的键值对合并到一个`object`中并返回。如果输入数组的要素中含有重复的键，则返回的`object`中将只包含数组中最后出现要素的值。如果输入数组中包括对象以外的元素，则抛出错误。"
     },
     "$sift": {
         "args": "object, function",
-        "desc": "输出参数 `object` 中符合 `function` 的键值对。\n\n `function` 必须含有下述参数。\n\n `function(value [, key [, object]])` "
+        "desc": "输出参数`object`中符合`function`的键值对。\n\n`function`必须含有下述参数。\n\n`function(value [, key [, object]])`"
     },
     "$each": {
         "args": "object, function",
-        "desc": "将函数 `function` 应用于 `object` 中的所有键值对并输出由所有返回值组成的数组。"
+        "desc": "将函数`function`应用于`object`中的所有键值对并输出由所有返回值组成的数组。"
     },
     "$map": {
         "args": "array, function",
-        "desc": "将函数 `function` 应用于数组 `array` 中所有的值并输出由返回值组成的数组。\n\n `function` 中必须含有下述参数。\n\n`function(value [, index [, array]])` "
+        "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]])`"
+        "desc": "输出数组`array`中符合函数`function`条件的值组成的数组。\n\n`function`必须包括下述参数。\n\n`function(value [, index [, array]])`"
     },
     "$reduce": {
         "args": "array, function [, init]",
-        "desc": "将 `function` 依次应用于数组中的各要素值。 其中，前一个要素值的计算结果将参与到下一次的函数运算中。。\n\n函数 `function` 接受两个参数并作为中缀表示法中的操作符。\n\n可省略的参数 `init` 将作为运算的初始值。"
+        "desc": "将`function`依次应用于数组中的各要素值。 其中，前一个要素值的计算结果将参与到下一次的函数运算中。。\n\n函数`function`接受两个参数并作为中缀表示法中的操作符。\n\n可省略的参数`init`将作为运算的初始值。"
     },
     "$flowContext": {
         "args": "string",
@@ -197,7 +197,7 @@
     },
     "$pad": {
         "args": "string, width [, char]",
-        "desc": "根据需要，向字符串 `string` 的副本中填充文字使该字符串的字数达到 `width` 的绝对值并返回填充文字后的字符串。\n\n如果 `width` 的值为正，则向字符串 `string` 的右侧填充文字，如果 `width` 为负，则向字符串 `string` 的左侧填充文字。\n\n可选参数 `char` 用来指定填充的文字。如果未指定该参数，则填充空白文字。"
+        "desc": "根据需要，向字符串`string`的副本中填充文字使该字符串的字数达到`width`的绝对值并返回填充文字后的字符串。\n\n如果`width`的值为正，则向字符串`string`的右侧填充文字，如果`width`为负，则向字符串`string`的左侧填充文字。\n\n可选参数`char`用来指定填充的文字。如果未指定该参数，则填充空白文字。"
     },
     "$fromMillis": {
         "args": "number",
@@ -205,70 +205,14 @@
     },
     "$formatNumber": {
         "args": "number, picture [, options]",
-        "desc": "将 `number` 转换成具有 `picture` 所指定的数值格式的字符串。\n\n此函数的功能与XPath F&O 3.1规格中定义的XPath/XQuery函数的fn:format-number功能相一致。参数 `picture` 用于指定数值的转换格式，其语法与fn:format-number中的定义一致。\n\n可选的第三参数 `options` 用来覆盖默认的局部环境格式，如小数点分隔符。如果指定该参数，那么该参数必须是包含name/value对的对象，并且name/value对必须符合XPath F&O 3.1规格中记述的数值格式。"
+        "desc": "将`number`转换成具有`picture`所指定的数值格式的字符串。\n\n此函数的功能与XPath F&O 3.1规格中定义的XPath/XQuery函数的fn:format-number功能相一致。参数`picture`用于指定数值的转换格式，其语法与fn:format-number中的定义一致。\n\n可选的第三参数`options`用来覆盖默认的局部环境格式，如小数点分隔符。如果指定该参数，那么该参数必须是包含name/value对的对象，并且name/value对必须符合XPath F&O 3.1规格中记述的数值格式。"
     },
     "$formatBase": {
         "args": "number [, radix]",
-        "desc": "将 `number` 变换为以参数 `radix` 的值为基数形式的字符串。如果不指定 `radix` 的值，则默认基数为10。指定的 `radix` 值必须在2～36之间，否则抛出错误。"
+        "desc": "将`number`变换为以参数`radix`的值为基数形式的字符串。如果不指定`radix`的值，则默认基数为10。指定的`radix`值必须在2～36之间，否则抛出错误。"
     },
     "$toMillis": {
         "args": "timestamp",
-        "desc": "将ISO 8601格式的字符串 `timestamp` 转换为从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。如果该字符串的格式不正确，则抛出错误。"
-    },
-    "$env": {
-        "args": "arg",
-        "desc": "返回环境变量的值。\n\n这是Node-RED定义的函数。"
-    },
-    "$eval": {
-        "args": "expr [, context]",
-        "desc": "使用当前上下文来作为评估依据，分析并评估字符串 `expr` ，其中包含文字JSON或JSONata表达式。"
-    },
-    "$formatInteger": {
-        "args": "number, picture",
-        "desc": "将“数字”转换为字符串，并将其格式化为“图片”字符串指定的整数表示形式。图片字符串参数定义了数字的格式，并具有与XPath F&O 3.1 规范中的fn：format-integer相同的语法。"
-    },
-    "$parseInteger": {
-        "args": "string, picture",
-        "desc": "使用“图片”字符串指定的格式将“字符串”参数的内容解析为整数（作为JSON数字）。图片字符串参数与$formatInteger格式相同。."
-    },
-    "$error": {
-        "args": "[str]",
-        "desc": "引发错误并显示一条消息。 可选的 `str` 将替代$error()函数评估的默认消息。"
-    },
-    "$assert": {
-        "args": "arg, str",
-        "desc": "如果 `arg` 为真，则该函数返回。 如果arg为假，则抛出带有str的异常作为异常消息。"
-    },
-    "$single": {
-        "args": "array, function",
-        "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数： `function（value [，index [，array []]]）` 其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
-    },
-    "$encodeUrlComponent": {
-        "args": "str",
-        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例： `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
-    },
-    "$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\"`"
-    },
-    "$decodeUrlComponent": {
-        "args": "str",
-        "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
-    },
-    "$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=шеллы\"`"
-    },
-    "$distinct": {
-        "args": "array",
-        "desc": "返回一个数组，其中重复的值已从 `数组` 中删除"
-    },
-    "$type": {
-        "args": "value",
-        "desc": "以字符串形式返回 `值` 的类型。 如果该 `值` 未定义，则将返回 `未定义` "
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "使用Moment库获取日期对象。"
+        "desc": "将ISO 8601格式的字符串`timestamp`转换为从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。如果该字符串的格式不正确，则抛出错误。"
     }
 }

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

@@ -1,23 +0,0 @@
-{
-    "info": {
-        "tip0" : "您可以用 {{core:delete-selection}} 刪除選擇的節點或連結。",
-        "tip1" : "{{core:search}} 可以在流程內搜索節點。",
-        "tip2": "{{core:toggle-sidebar}} 可以顯示或隱藏邊側欄。",
-        "tip3": "您可以在 {{core:manage-palette}} 中管理節點的控制台。",
-        "tip4": "側邊欄中會列出流程中所有的配置節點。您可以通過功能表或者 {{core:show-config-tab}} 來訪問這些節點。",
-        "tip5": "您可以在設定中選擇顯示或隱藏這些提示。",
-        "tip6": "您可以用[left] [up] [down] [right]鍵來移動被選中的節點。按住[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/zh-TW/jsonata.json

@@ -1,274 +0,0 @@
-{
-    "$string": {
-        "args": "arg",
-        "desc": "通過以下的類型轉換規則將參數*arg*轉換成字串:\n\n - 字串不轉換。\n -函數轉換成空的字串。\n - JSON的值無法用數字表示所以用無限大或者NaN（非數）表示。\n - 用’JSON.stringify’函數將其他值轉換成JSON字串。"
-    },
-    "$length": {
-        "args": "str",
-        "desc": "輸出字串’str’的字數。如果’str’不是字串，拋出錯誤。"
-    },
-    "$substring": {
-        "args": "str, start[, length]",
-        "desc": "輸出`start`位置後的的首次出現的包括`str`的子字串。 如果`length`被指定，那麼的字串中將只包括前`length`個文字。如果`start`是負數則輸出從`str`末尾開始的`length`個文字"
-    },
-    "$substringBefore": {
-        "args": "str, chars",
-        "desc": "輸出’str’中首次出現的’chars’之前的子字串，如果’str’中不包括’chars’則輸出’str’。"
-    },
-    "$substringAfter": {
-        "args": "str, chars",
-        "desc": "輸出’str’中首次出現的’chars’之後的子字串，如果’str’中不包括’chars’則輸出’str’。"
-    },
-    "$uppercase": {
-        "args": "str",
-        "desc": "`將’str’中的所有字母變為大寫後輸出。"
-    },
-    "$lowercase": {
-        "args": "str",
-        "desc": "將’str’中的所有字母變為小寫後輸出。"
-    },
-    "$trim": {
-        "args": "str",
-        "desc": "將以下步驟應用於`str`來去除所有空白文字並實現標準化。\n\n – 將全部tab定位字元、Enter鍵、換行字元用空白代替。\n- 將連續的空白文字變成一個空白文字。\n- 消除開頭和末尾的空白文字。\n\n如果`str`沒有被指定(即在無輸入參數的情況下調用本函數)，將上下文的值作為`str`來使用。 如果`str` 不是字串則拋出錯誤。"
-    },
-    "$contains": {
-        "args": "str, pattern",
-        "desc": "字串`str` 和 `pattern`匹配的話輸出`true`，不匹配的情況下輸出 `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`來把多個字元串連接。如果`array`不是字串則拋出錯誤。 如果沒有指定`separator`，則用空字串來連接字元(即字串之間沒有`separator`)。 如果`separator`不是字元則拋出錯誤。"
-    },
-    "$match": {
-        "args": "str, pattern [, limit]",
-        "desc": "對字串`str`使用規則運算式`pattern`並輸出與`str`相匹配的部分資訊。"
-    },
-    "$replace": {
-        "args": "str, pattern, replacement [, limit]",
-        "desc": "在字串`str`中搜索`pattern`並用`replacement`來替換。\n\n可選參數`limit`用來指定替換次數的上限。"
-    },
-    "$now": {
-        "args": "",
-        "desc": "生成ISO 8601互換格式的時刻，並作為字串輸出。"
-    },
-    "$base64encode": {
-        "args": "string",
-        "desc": "將ASCII格式的字串轉換為Base 64格式。將字串中的文字視作二進位形式的資料處理。包含URI編碼在內的字串文字必須在0x00到0xFF的範圍內，否則不會被支持。"
-    },
-    "$base64decode": {
-        "args": "string",
-        "desc": "用UTF-8內碼表將Base 64形式二進位值轉換為字串。"
-    },
-    "$number": {
-        "args": "arg",
-        "desc": "用下述的規則將參數 `arg`轉換為數值。:\n\n – 數值不做轉換。\n – 將字串中合法的JSON數値表示轉換成數値。\n – 其他形式的值則拋出錯誤。"
-    },
-    "$abs": {
-        "args": "number",
-        "desc": "輸出參數`number`的絕對值。"
-    },
-    "$floor": {
-        "args": "number",
-        "desc": "輸出比`number`的值小的最大整數。"
-    },
-    "$ceil": {
-        "args": "number",
-        "desc": "輸出比`number`的值大的最小整數。"
-    },
-    "$round": {
-        "args": "number [, precision]",
-        "desc": "輸出四捨五入後的參數`number`。可省略的參數 `precision`指定四捨五入後小數點下的位數。"
-    },
-    "$power": {
-        "args": "base, exponent",
-        "desc": "輸出底數`base`的`exponent`次冪。"
-    },
-    "$sqrt": {
-        "args": "number",
-        "desc": "輸出參數 `number`的平方根。"
-    },
-    "$random": {
-        "args": "",
-        "desc": "輸出比0大，比1小的偽亂數。"
-    },
-    "$millis": {
-        "args": "",
-        "desc": "返回從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。在同一個運算式的測試中所有對`$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 - 不轉換布林值`Boolean`。\n – 將空的字串`string`轉換為`false`\n – 將不為空的字串`string`轉換為`true`\n – 將為0的數位`number`轉換成`false`\n –將不為0的數位`number`轉換成`true`\n –將`null`轉換成`false`\n –將空的陣列`array`轉換成`false`\n –如果陣列`array`中含有可以轉換成`true`的要素則轉換成`true`\n –如果`array`中沒有可轉換成`true`的要素則轉換成`false`\n – 空的物件`object`轉換成`false`\n – 非空的物件`object`轉換成`true`\n –將函數`function`轉換成`false`"
-    },
-    "$not": {
-        "args": "arg",
-        "desc": "輸出做反轉運算後的布林值。首先將`arg`轉換為布林值。"
-    },
-    "$exists": {
-        "args": "arg",
-        "desc": "如果算式`arg`的值存在則輸出`true`。如果算式的值不存在(比如指向不存在區域的引用)則輸出`false`。"
-    },
-    "$count": {
-        "args": "array",
-        "desc": "輸出陣列中的元素數。"
-    },
-    "$append": {
-        "args": "array, array",
-        "desc": "將兩個陣列連接。"
-    },
-    "$sort": {
-        "args": "array [, function]",
-        "desc": "輸出排序後的陣列`array`。\n\n如果使用了比較函數`function`，則下述兩個參數需要被指定。\n\n`function(left, right)`\n\n該比較函數是為了比較left和right兩個值而被排序演算法調用的。如果使用者希望left的值被置於right的值之後，那麼該函數必須輸出布林值`true`來表示位置交換。而在不需要位置交換時函數必須輸出`false`。"
-    },
-    "$reverse": {
-        "args": "array",
-        "desc": "輸出倒序後的陣列`array`。"
-    },
-    "$shuffle": {
-        "args": "array",
-        "desc": "輸出隨機排序後的陣列 `array`。"
-    },
-    "$zip": {
-        "args": "array, ...",
-        "desc": "將陣列中的值按索引順序打包後輸出。"
-    },
-    "$keys": {
-        "args": "object",
-        "desc": "輸出由物件內的鍵組成的陣列。如果參數是物件的陣列則輸出由所有物件中的鍵去重後組成的佇列。"
-    },
-    "$lookup": {
-        "args": "object, key",
-        "desc": "輸出對象中與參數`key`對應的值。如果第一個參數`object`是陣列，那麼陣列中所有的物件都將被搜索並輸出這些物件中與參數`key`對應的值。"
-    },
-    "$spread": {
-        "args": "object",
-        "desc": "將物件中的鍵值對分隔成每個要素中只含有一個鍵值對的陣列。如果參數`object`是陣列，那麼返回值的陣列中包含所有物件中的鍵值對。"
-    },
-    "$merge": {
-        "args": "array<object>",
-        "desc": "將輸入陣列`objects`中所有的鍵值對合併到一個`object`中並返回。如果輸入陣列的要素中含有重複的鍵，則返回的`object`中將只包含陣列中最後出現要素的值。如果輸入陣列中包括物件以外的元素，則拋出錯誤。"
-    },
-    "$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函數`function`接受兩個參數並作為中綴標記法中的操作符。\n\n可省略的參數`init`將作為運算的初始值。"
-    },
-    "$flowContext": {
-        "args": "string",
-        "desc": "獲取流上下文(流等級的上下文，可以讓所有節點共用)的屬性。"
-    },
-    "$globalContext": {
-        "args": "string",
-        "desc": "獲取全域上下文的屬性。"
-    },
-    "$pad": {
-        "args": "string, width [, char]",
-        "desc": "根據需要，向字串`string`的副本中填充文字使該字串的字數達到`width`的絕對值並返回填充文字後的字串。\n\n如果`width`的值為正，則向字串`string`的右側填充文字，如果`width`為負，則向字串`string`的左側填充文字。\n\n可選參數`char`用來指定填充的文字。如果未指定該參數，則填充空白文字。"
-    },
-    "$fromMillis": {
-        "args": "number",
-        "desc": "將表示從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數的數值轉換成ISO 8601形式時間戳記的字串。"
-    },
-    "$formatNumber": {
-        "args": "number, picture [, options]",
-        "desc": "將`number`轉換成具有`picture`所指定的數值格式的字串。\n\n此函數的功能與XPath F&O 3.1規格中定義的XPath/XQuery函數的fn:format-number功能相一致。參數`picture`用於指定數值的轉換格式，其語法與fn:format-number中的定義一致。\n\n可選的第三參數`options`用來覆蓋預設的局部環境格式，如小數點分隔符號。如果指定該參數，那麼該參數必須是包含name/value對的物件，並且name/value對必須符合XPath F&O 3.1規格中記述的數值格式。"
-    },
-    "$formatBase": {
-        "args": "number [, radix]",
-        "desc": "將`number`變換為以參數`radix`的值為基數形式的字串。如果不指定`radix`的值，則默認基數為10。指定的`radix`值必須在2～36之間，否則拋出錯誤。"
-    },
-    "$toMillis": {
-        "args": "timestamp",
-        "desc": "將ISO 8601格式的字串`timestamp`轉換為從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。如果該字串的格式不正確，則拋出錯誤。"
-    },
-    "$env": {
-        "args": "arg",
-        "desc": "返回環境變量的值。\n\n這是Node-RED定義的函數。"
-    },
-    "$eval": {
-        "args": "expr [, context]",
-        "desc": "使用當前上下文來作為評估依據，分析並評估字符串`expr`，其中包含文字JSON或JSONata表達式。"
-    },
-    "$formatInteger": {
-        "args": "number, picture",
-        "desc": "將“數字”轉換為字符串，並將其格式化為“圖片”字符串指定的整數表示形式。圖片字符串參數定義了數字的格式，並具有與XPath F&O 3.1 規範中的fn：format-integer相同的語法。"
-    },
-    "$parseInteger": {
-        "args": "string, picture",
-        "desc": "使用“圖片”字符串指定的格式將“字符串”參數的內容解析為整數（作為JSON數字）。圖片字符串參數與$formatInteger格式相同。."
-    },
-    "$error": {
-        "args": "[str]",
-        "desc": "引發錯誤並顯示一條消息。 可選的`str`將替代$error()函數評估的默認消息。"
-    },
-    "$assert": {
-        "args": "arg, str",
-        "desc": "如果`arg`為真，則該函數返回。 如果arg為假，則拋出帶有str的異常作為異常消息。"
-    },
-    "$single": {
-        "args": "array, function",
-        "desc": "返回滿足參數function謂語的array參數中的唯一值 (比如：傳遞值時，函數返回布林值“true”)。如果匹配值的數量不唯一時，則拋出異常。\n\n應在以下簽名中提供函數：`function（value [，index [，array []]]）`其中value是數組的每個輸入，index是該值的位置，整個數組作為第三個參數傳遞。"
-    },
-    "$encodeUrlComponent": {
-        "args": "str",
-        "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）組件進行編碼。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
-    },
-    "$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\"`"
-    },
-    "$decodeUrlComponent": {
-        "args": "str",
-        "desc": "解碼以前由encodeUrlComponent創建的統一資源定位器（URL）組件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
-    },
-    "$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=шеллы\"`"
-    },
-    "$distinct": {
-        "args": "array",
-        "desc": "返回一個數組，其中重復的值已從`數組`中刪除"
-    },
-    "$type": {
-        "args": "value",
-        "desc": "以字符串形式返回`值`的類型。 如果該`值`未定義，則將返回`未定義`"
-    },
-    "$moment": {
-        "args": "[str]",
-        "desc": "使用Moment庫獲取日期對象。"
-    }
-}

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

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

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

@@ -1,4 +1,5 @@
-;                (function() {
+ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText=undefined,t.scope="nrjavascript"});
+                (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,12 +76,13 @@ oop.inherits(NRJavaScriptWorker, Mirror);
 
 (function() {
     this.setOptions = function(options) {
-        this.options = {
+        this.options = options || {
             // undef: true,
             // unused: true,
-            esversion: 9,
+            esnext: true,
+            moz: true,
             devel: true,
-            browser: false,
+            browser: true,
             node: true,
             laxcomma: true,
             laxbreak: true,
@@ -91,17 +92,8 @@ oop.inherits(NRJavaScriptWorker, Mirror);
             maxerr: 100,
             expr: true,
             multistr: true,
-            strict: false,
-            sub: true,
-            asi: true
+            globalstrict: true
         };
-        if (options) {
-            for (var opt in options) {
-                if (options.hasOwnProperty(opt)) {
-                    this.options[opt] = options.opt;
-                }
-            }
-        }
         this.doc.getValue() && this.deferredUpdate.schedule(100);
     };
 
@@ -127,8 +119,6 @@ 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}";
 
@@ -148,7 +138,6 @@ 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);
@@ -177,62 +166,9 @@ 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: Math.max(0,line),
+                row: error.line-2,
                 column: error.character-1,
                 text: error.reason,
                 type: type,

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

@@ -1 +0,0 @@
-<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/js/events.js

@@ -32,19 +32,14 @@
              }
          }
      }
-     function emit() {
-         var evt = arguments[0]
-         var args = Array.prototype.slice.call(arguments,1);
-         if (RED.events.DEBUG) {
-             console.warn(evt,args);
-         }
+     function emit(evt,arg) {
          if (handlers[evt]) {
              for (var i=0;i<handlers[evt].length;i++) {
                  try {
-                     handlers[evt][i].apply(null, args);
+                     handlers[evt][i](arg);
                  } catch(err) {
-                     console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
-                     console.warn(err);
+                     console.log("RED.events.emit error: ["+evt+"] "+(err.toString()));
+                     console.log(err);
                  }
              }
 

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

@@ -808,7 +808,17 @@ RED.nodes.fontAwesome = (function() {
         "fa-youtube": "\uf167",
     };
 
-    var iconList = Object.keys(iconMap);
+    var iconList = [];
+    var isUsed = {};
+    Object.keys(iconMap).forEach(function(icon) {
+        var unicode = iconMap[icon];
+        // skip icons with a same unicode
+        if (isUsed[unicode] !== true) {
+            iconList.push(icon);
+            isUsed[unicode] = true;
+        }
+    });
+    isUsed = undefined;
 
     return {
         getIconUnicode: function(name) {

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

@@ -13,11 +13,6 @@
  * 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 = [];
@@ -26,7 +21,6 @@ RED.history = (function() {
         var i;
         var len;
         var node;
-        var group;
         var subflow;
         var modifiedTabs = {};
         var inverseEv;
@@ -42,43 +36,25 @@ RED.history = (function() {
                     inverseEv.events.push(r);
                 }
             } else if (ev.t == 'replace') {
-                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);
-                } 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()
+                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;
                     }
-                }
+                })
+
+                RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
                 inverseEv = {
                     t: "delete",
-                    dirty: RED.nodes.dirty()
                 };
                 if (ev.nodes) {
                     inverseEv.nodes = [];
@@ -89,14 +65,6 @@ RED.history = (function() {
                         }
                         inverseEv.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
-                        if (node.g) {
-                            var group = RED.nodes.group(node.g);
-                            var index = group.nodes.indexOf(node);
-                            if (index !== -1) {
-                                group.nodes.splice(index,1);
-                                RED.group.markDirty(group);
-                            }
-                        }
                     }
                 }
                 if (ev.links) {
@@ -106,34 +74,6 @@ 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--) {
-                        group = ev.groups[i];
-                        modifiedTabs[group.z] = true;
-                        // The order of groups is important
-                        //  - to invert the action, the order is reversed
-                        inverseEv.groups.unshift(group);
-                        RED.nodes.removeGroup(group);
-                    }
-                }
                 if (ev.workspaces) {
                     inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
@@ -182,8 +122,7 @@ RED.history = (function() {
 
             } else if (ev.t == "delete") {
                 inverseEv = {
-                    t: "add",
-                    dirty: RED.nodes.dirty()
+                    t: "add"
                 };
                 if (ev.workspaces) {
                     inverseEv.workspaces = [];
@@ -247,61 +186,19 @@ RED.history = (function() {
                     RED.nodes.filterNodes({type:"subflow:"+subflow.id}).forEach(function(n) {
                         n.inputs = subflow.in.length;
                         n.outputs = subflow.out.length;
+                        while (n.outputs > n.ports.length) {
+                            n.ports.push(n.ports.length);
+                        }
                         n.resize = true;
                         n.dirty = true;
                     });
                 }
-                if (ev.groups) {
-                    inverseEv.groups = [];
-                    var groupsToAdd = {};
-                    ev.groups.forEach(function(g) { groupsToAdd[g.id] = g; });
-                    for (i = ev.groups.length - 1;i>=0;i--) {
-                        RED.nodes.addGroup(ev.groups[i])
-                        modifiedTabs[ev.groups[i].z] = true;
-                        // The order of groups is important
-                        //  - to invert the action, the order is reversed
-                        inverseEv.groups.unshift(ev.groups[i]);
-                        if (ev.groups[i].g) {
-                            if (!groupsToAdd[ev.groups[i].g]) {
-                                group = RED.nodes.group(ev.groups[i].g);
-                            } else {
-                                group = groupsToAdd[ev.groups[i].g];
-                            }
-                            if (group.nodes.indexOf(ev.groups[i]) === -1) {
-                                group.nodes.push(ev.groups[i]);
-                            }
-                            RED.group.markDirty(ev.groups[i])
-                        }
-                    }
-                }
                 if (ev.nodes) {
                     inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
                         inverseEv.nodes.push(ev.nodes[i].id);
-                        if (ev.nodes[i].g) {
-                            group = RED.nodes.group(ev.nodes[i].g);
-                            if (group.nodes.indexOf(ev.nodes[i]) === -1) {
-                                group.nodes.push(ev.nodes[i]);
-                            }
-                            RED.group.markDirty(group)
-                        }
-                    }
-                }
-                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) {
@@ -330,22 +227,18 @@ RED.history = (function() {
                                 }
                                 node.dirty = true;
                             }
-                            RED.events.emit("nodes:change",node);
                         }
                     }
-                }
-                if (subflow) {
-                    RED.events.emit("subflows:change", subflow);
+
                 }
             } else if (ev.t == "move") {
                 inverseEv = {
                     t: 'move',
-                    nodes: [],
-                    dirty: RED.nodes.dirty()
+                    nodes: []
                 };
                 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.n.moved};
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
                     inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
@@ -367,63 +260,29 @@ RED.history = (function() {
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
-                if (ev.addToGroup) {
-                    RED.group.removeFromGroup(ev.addToGroup,ev.nodes.map(function(n) { return n.n }),false);
-                    inverseEv.removeFromGroup = ev.addToGroup;
-                } else if (ev.removeFromGroup) {
-                    RED.group.addToGroup(ev.removeFromGroup,ev.nodes.map(function(n) { return n.n }));
-                    inverseEv.addToGroup = ev.removeFromGroup;
-                }
             } else if (ev.t == "edit") {
                 inverseEv = {
                     t: "edit",
-                    changes: {},
-                    changed: ev.node.changed,
-                    dirty: RED.nodes.dirty()
+                    changes: {}
                 };
                 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 property is a reference to another node or nodes.
-                            var nodeList = ev.node[i];
-                            if (!Array.isArray(nodeList)) {
-                                nodeList = [nodeList];
+                            // 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);
                             }
-                            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];
+                            var newConfigNode = RED.nodes.node(ev.changes[i]);
+                            if (newConfigNode) {
+                                newConfigNode.users.push(ev.node);
                             }
-                            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];
                     }
                 }
-                var eventType;
-                switch(ev.node.type) {
-                    case 'tab': eventType = "flows"; break;
-                    case 'group': eventType = "groups"; break;
-                    case 'subflow': eventType = "subflows"; break;
-                    default: eventType = "nodes"; break;
-                }
-                eventType += ":change";
-                RED.events.emit(eventType,ev.node);
-
-
                 if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
                     $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
@@ -483,7 +342,6 @@ RED.history = (function() {
                             }
                         }
                     }
-                    ev.node.__outputs = inverseEv.changes.outputs;
                     RED.editor.updateNodeProperties(ev.node,outputMap);
                     RED.editor.validateNode(ev.node);
                 }
@@ -512,9 +370,7 @@ RED.history = (function() {
                 if (ev.nodes) {
                     inverseEv.movedNodes = [];
                     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.forEach(function(n) {
+                    RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.dirty = true;
@@ -555,9 +411,6 @@ RED.history = (function() {
                 if (ev.subflow) {
                     RED.nodes.addSubflow(ev.subflow.subflow);
                     inverseEv.subflow = ev.subflow;
-                    if (ev.subflow.subflow.g) {
-                        RED.group.addToGroup(RED.nodes.group(ev.subflow.subflow.g),ev.subflow.subflow);
-                    }
                 }
                 if (ev.subflows) {
                     inverseEv.nodes = [];
@@ -569,9 +422,6 @@ RED.history = (function() {
                 if (ev.movedNodes) {
                     ev.movedNodes.forEach(function(nid) {
                         nn = RED.nodes.node(nid);
-                        if (!nn) {
-                            nn = RED.nodes.group(nid);
-                        }
                         nn.x -= ev.subflow.offsetX;
                         nn.y -= ev.subflow.offsetY;
                         nn.dirty = true;
@@ -585,7 +435,7 @@ RED.history = (function() {
                         RED.nodes.addLink(ev.links[i]);
                     }
                 }
-                if (ev.createdLinks) {
+                if  (ev.createdLinks) {
                     inverseEv.removedLinks = [];
                     for (i=0;i<ev.createdLinks.length;i++) {
                         inverseEv.removedLinks.push(ev.createdLinks[i]);
@@ -595,77 +445,11 @@ RED.history = (function() {
             } else if (ev.t == "reorder") {
                 inverseEv = {
                     t: 'reorder',
-                    dirty: RED.nodes.dirty()
+                    order: RED.nodes.getWorkspaceOrder()
                 };
-                if (ev.workspaces) {
-                    inverseEv.workspaces = {
-                        from: ev.workspaces.to,
-                        to: ev.workspaces.from
-                    }
-                    RED.workspaces.order(ev.workspaces.from);
+                if (ev.order) {
+                    RED.workspaces.order(ev.order);
                 }
-                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 = {
-                    t: "ungroup",
-                    dirty: RED.nodes.dirty(),
-                    groups: []
-                }
-                if (ev.groups) {
-                    for (i=0;i<ev.groups.length;i++) {
-                        inverseEv.groups.push(ev.groups[i]);
-                        RED.group.ungroup(ev.groups[i]);
-                    }
-                }
-            } else if (ev.t == "ungroup") {
-                inverseEv = {
-                    t: "createGroup",
-                    dirty: RED.nodes.dirty(),
-                    groups: []
-                }
-                if (ev.groups) {
-                    for (i=0;i<ev.groups.length;i++) {
-                        inverseEv.groups.push(ev.groups[i]);
-                        var nodes = ev.groups[i].nodes.slice();
-                        ev.groups[i].nodes = [];
-                        RED.nodes.addGroup(ev.groups[i]);
-                        RED.group.addToGroup(ev.groups[i],nodes);
-                    }
-                }
-            } else if (ev.t == "addToGroup") {
-                inverseEv = {
-                    t: "removeFromGroup",
-                    dirty: RED.nodes.dirty(),
-                    group: ev.group,
-                    nodes: ev.nodes,
-                    reparent: ev.reparent
-                }
-                if (ev.nodes) {
-                    RED.group.removeFromGroup(ev.group,ev.nodes,(ev.hasOwnProperty('reparent')&&ev.hasOwnProperty('reparent')!==undefined)?ev.reparent:true);
-                }
-            } else if (ev.t == "removeFromGroup") {
-                inverseEv = {
-                    t: "addToGroup",
-                    dirty: RED.nodes.dirty(),
-                    group: ev.group,
-                    nodes: ev.nodes,
-                    reparent: ev.reparent
-                }
-                if (ev.nodes) {
-                    RED.group.addToGroup(ev.group,ev.nodes);
-                }
-            }
-
-            if(ev.callback && typeof ev.callback === 'function') {
-                inverseEv.callback = ev.callback;
-                ev.callback(ev);
             }
 
             Object.keys(modifiedTabs).forEach(function(id) {
@@ -676,8 +460,9 @@ RED.history = (function() {
             });
 
             RED.nodes.dirty(ev.dirty);
-            RED.view.updateActive();
             RED.view.select(null);
+            RED.view.redraw(true);
+            RED.palette.refresh();
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
@@ -697,17 +482,12 @@ RED.history = (function() {
         list: function() {
             return undoHistory;
         },
-        listRedo: function() {
-            return redoHistory;
-        },
         depth: function() {
             return undoHistory.length;
         },
         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();
@@ -715,24 +495,13 @@ 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();
@@ -742,8 +511,6 @@ 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

@@ -1,156 +0,0 @@
-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,69 +18,53 @@ RED.i18n = (function() {
 
     var apiRootUrl;
 
-    function detectLanguage() {
-        return navigator.language
-    }
-
     return {
         init: function(options, done) {
             apiRootUrl = options.apiRootUrl||"";
-            var preferredLanguage = localStorage.getItem("editor-language") || detectLanguage();
+            var preferredLanguage = localStorage.getItem("editor-language");
             var opts = {
-                compatibilityJSON: 'v3',
-                backend: {
-                    loadPath: apiRootUrl+'locales/__ns__?lng=__lng__',
+                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
+                dynamicLoad: false,
+                load:'current',
+                ns: {
+                    namespaces: ["editor","node-red","jsonata","infotips"],
+                    defaultNs: "editor"
                 },
-                lng: 'en-US',
-                // debug: true,
-                preload:['en-US'],
-                ns: ["editor","node-red","jsonata","infotips"],
-                defaultNS: "editor",
                 fallbackLng: ['en-US'],
-                returnObjects: true,
-                keySeparator: ".",
-                nsSeparator: ":",
-                interpolation: {
-                    unescapeSuffix: 'HTML',
-                    escapeValue: false,
-                    prefix: '__',
-                    suffix: '__'
-                }
+                useCookie: false,
+                returnObjectTrees: true
             };
             if (preferredLanguage) {
                 opts.lng = preferredLanguage;
             }
-
-            i18next.use(i18nextHttpBackend).init(opts,function() {
+            i18n.init(opts,function() {
                 done();
             });
-            jqueryI18next.init(i18next, $, { handleName: 'i18n' });
-
-
             RED["_"] = function() {
-                var v = i18next.t.apply(i18next,arguments);
+                var v = i18n.t.apply(null,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 = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
+            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             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 'en-US'
+            return 'end-US'
         },
         loadNodeCatalog: function(namespace,done) {
-            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
                 $.ajax({
@@ -90,7 +74,7 @@ RED.i18n = (function() {
                     cache: false,
                     url: apiRootUrl+'nodes/'+namespace+'/messages?lng='+lang,
                     success: function(data) {
-                        i18next.addResourceBundle(lang,namespace,data);
+                        i18n.addResourceBundle(lang,namespace,data);
                         toLoad--;
                         if (toLoad === 0) {
                             done();
@@ -102,7 +86,7 @@ RED.i18n = (function() {
         },
 
         loadNodeCatalogs: function(done) {
-            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {
@@ -115,7 +99,7 @@ RED.i18n = (function() {
                     success: function(data) {
                         var namespaces = Object.keys(data);
                         namespaces.forEach(function(ns) {
-                            i18next.addResourceBundle(lang,ns,data[ns]);
+                            i18n.addResourceBundle(lang,ns,data[ns]);
                         });
                         toLoad--;
                         if (toLoad === 0) {
@@ -124,32 +108,6 @@ 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,14 +3,13 @@
         "alt-shift-p":"core:manage-palette",
         "ctrl-f": "core:search",
         "ctrl-shift-f": "core:list-flows",
-        "ctrl-+": "core:zoom-in",
+        "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 x": "core:show-context-tab",
@@ -25,9 +24,7 @@
         "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",
-        "alt-w": "core:hide-flow",
-        "alt-shift-w": "core:show-last-hidden-flow"
+        "ctrl-shift-p":"core:show-action-list"
     },
     "red-ui-sidebar-node-config": {
         "backspace": "core:delete-config-selection",
@@ -38,62 +35,24 @@
     },
     "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",
-        "s": "core:scroll-view-down",
-        "a": "core:scroll-view-left",
-        "shift-w": "core:step-view-up",
-        "shift-d": "core:step-view-right",
-        "shift-s": "core:step-view-down",
-        "shift-a": "core:step-view-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",
+        "up": "core:move-selection-up",
+        "right": "core:move-selection-right",
+        "down": "core:move-selection-down",
+        "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-[": "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",
-        "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"
-
+        "ctrl-shift-j": "core:show-previous-tab",
+        "ctrl-shift-k": "core:show-next-tab"
      }
 }

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

@@ -1,46 +0,0 @@
-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

@@ -1,56 +0,0 @@
-(function() {
-    var isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
-
-    if (isIE11) {
-        // IE11 DOMTokenList.toggle does not support the two-argument variety
-        window.DOMTokenList.prototype.toggle = function(cl,bo) {
-            if (arguments.length === 1) {
-                bo = !this.contains(cl);
-            }
-            this[!!bo?"add":"remove"](cl);
-        }
-
-        // IE11 does not provide classList on SVGElements
-        if (! ("classList" in SVGElement.prototype)) {
-            Object.defineProperty(SVGElement.prototype, 'classList', Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'classList'));
-        }
-
-        // IE11 does not provide children on SVGElements
-        if (! ("children" in SVGElement.prototype)) {
-            Object.defineProperty(SVGElement.prototype, 'children', Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'children'));
-        }
-
-        Array.from = function() {
-            if (arguments.length > 1) {
-                throw new Error("Node-RED's IE11 Array.from polyfill doesn't support multiple arguments");
-            }
-            var arrayLike = arguments[0]
-            var result = [];
-            if (arrayLike.forEach) {
-                arrayLike.forEach(function(i) {
-                    result.push(i);
-                })
-            } else {
-                for (var i=0;i<arrayLike.length;i++) {
-                    result.push(arrayList[i]);
-                }
-            }
-            return result;
-        }
-
-        if (new Set([0]).size === 0) {
-            // IE does not support passing an iterable to Set constructor
-            var _Set = Set;
-            /*global Set:true */
-            Set = function Set(iterable) {
-                var set = new _Set();
-                if (iterable) {
-                    iterable.forEach(set.add, set);
-                }
-                return set;
-            };
-            Set.prototype = _Set.prototype;
-            Set.prototype.constructor = Set;
-        }
-    }
-})();

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

@@ -15,65 +15,19 @@
  **/
 var RED = (function() {
 
-
-    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) {
+    function appendNodeConfig(nodeConfig,done) {
         done = done || function(){};
+        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
         var moduleId;
-        if (moduleIdMatch) {
-            moduleId = moduleIdMatch[1];
-            RED._loadingModule = moduleId;
+        if (m) {
+            moduleId = m[1];
         } else {
             moduleId = "unknown";
         }
         try {
             var hasDeferred = false;
-            var nodeConfigEls = $("<div>"+config+"</div>");
+
+            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
             var scripts = nodeConfigEls.find("script");
             var scriptCount = scripts.length;
             scripts.each(function(i,el) {
@@ -84,15 +38,14 @@ var RED = (function() {
                     newScript.onload = function() {
                         scriptCount--;
                         if (scriptCount === 0) {
-                            $(targetContainer).append(nodeConfigEls);
-                            delete RED._loadingModule;
+                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
                             done()
                         }
                     }
                     if ($(el).attr('type') === "module") {
                         newScript.type = "module";
                     }
-                    $(targetContainer).append(newScript);
+                    $("#red-ui-editor-node-configs").append(newScript);
                     newScript.src = RED.settings.apiRootUrl+srcUrl;
                     hasDeferred = true;
                 } else {
@@ -108,8 +61,7 @@ var RED = (function() {
                 }
             })
             if (!hasDeferred) {
-                $(targetContainer).append(nodeConfigEls);
-                delete RED._loadingModule;
+                $("#red-ui-editor-node-configs").append(nodeConfigEls);
                 done();
             }
         } catch(err) {
@@ -118,30 +70,11 @@ 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)
         $.ajax({
             headers: {
                 "Accept":"application/json"
@@ -150,7 +83,6 @@ var RED = (function() {
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
-                loader.reportProgress(RED._("event.loadNodeCatalogs"), 25)
                 RED.i18n.loadNodeCatalogs(function() {
                     loadIconList(loadNodes);
                 });
@@ -175,8 +107,7 @@ var RED = (function() {
     }
 
     function loadNodes() {
-        loader.reportProgress(RED._("event.loadNodes",{count:""}), 30)
-        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
 
         $.ajax({
             headers: {
@@ -187,21 +118,16 @@ var RED = (function() {
             url: 'nodes',
             success: function(data) {
                 var configs = data.trim().split(/(?=<!-- --- \[red-module:\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) {
                         $("#red-ui-editor").i18n();
                         $("#red-ui-palette > .red-ui-palette-spinner").hide();
                         $(".red-ui-palette-scroll").removeClass("hide");
                         $("#red-ui-palette-search").removeClass("hide");
-                        if (RED.settings.theme("projects.enabled",false)) {
-                            RED.projects.refresh(function(activeProject) {
-                                loadFlows(function() {
+                        loadFlows(function() {
+                            if (RED.settings.theme("projects.enabled",false)) {
+                                RED.projects.refresh(function(activeProject) {
                                     RED.sidebar.info.refresh()
-                                    var showProjectWelcome = false;
                                     if (!activeProject) {
                                         // Projects enabled but no active project
                                         RED.menu.setDisabled('menu-item-projects-open',true);
@@ -209,19 +135,17 @@ var RED = (function() {
                                         if (activeProject === false) {
                                             // User previously decline the migration to projects.
                                         } else { // null/undefined
-                                            showProjectWelcome = true;
+                                            RED.projects.showStartup();
                                         }
                                     }
-                                    completeLoad(showProjectWelcome);
+                                    completeLoad();
                                 });
-                            });
-                        } else {
-                            loadFlows(function() {
+                            } else {
                                 // Projects disabled by the user
                                 RED.sidebar.info.refresh()
                                 completeLoad();
-                            });
-                        }
+                            }
+                        });
                     } else {
                         var config = configs.shift();
                         appendNodeConfig(config,stepConfig);
@@ -233,7 +157,6 @@ var RED = (function() {
     }
 
     function loadFlows(done) {
-        loader.reportProgress(RED._("event.loadFlows"),80 )
         $.ajax({
             headers: {
                 "Accept":"application/json",
@@ -244,26 +167,11 @@ var RED = (function() {
                 if (nodes) {
                     var currentHash = window.location.hash;
                     RED.nodes.version(nodes.rev);
-                    loader.reportProgress(RED._("event.importFlows"),90 )
-                    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.active() === 0 && RED.workspaces.count() > 0) {
-                            RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0])
-                        }
-                    } catch(err) {
-                        console.warn(err);
-                        RED.notify(
-                            RED._("event.importError", {message: err.message}),
-                            {
-                                fixed: true,
-                                type: 'error'
-                            }
-                        );
+                    RED.nodes.import(nodes.flows);
+                    RED.nodes.dirty(false);
+                    RED.view.redraw(true);
+                    if (/^#flow\/.+$/.test(currentHash)) {
+                        RED.workspaces.show(currentHash.substring(6));
                     }
                 }
                 done();
@@ -271,7 +179,7 @@ var RED = (function() {
         });
     }
 
-    function completeLoad(showProjectWelcome) {
+    function completeLoad() {
         var persistentNotifications = {};
         RED.comms.subscribe("notification/#",function(topic,msg) {
             var parts = topic.split("/");
@@ -285,7 +193,6 @@ var RED = (function() {
                 return;
             }
             if (notificationId === "project-update") {
-                loader.start(RED._("event.loadingProject"), 0);
                 RED.nodes.clear();
                 RED.history.clear();
                 RED.view.redraw(true);
@@ -301,8 +208,7 @@ var RED = (function() {
                             "revert": RED._("notification.project.revert", {project: msg.project}),
                             "merge-complete": RED._("notification.project.merge-complete")
                         }[msg.action];
-                        loader.end()
-                        RED.notify($("<p>").text(message));
+                        RED.notify("<p>"+message+"</p>");
                         RED.sidebar.info.refresh()
                     });
                 });
@@ -319,7 +225,6 @@ var RED = (function() {
                     id: notificationId
                 }
                 if (notificationId === "runtime-state") {
-                    RED.events.emit("runtime-state",msg);
                     if (msg.error === "safe-mode") {
                         options.buttons = [
                             {
@@ -341,7 +246,7 @@ var RED = (function() {
                                     }
                                 }
                             ]
-                            // } else if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
+                            // } else if (RED.settings.theme('palette.editable') !== false) {
                         } else {
                             options.buttons = [
                                 {
@@ -352,16 +257,6 @@ 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
@@ -452,22 +347,19 @@ var RED = (function() {
             } else if (persistentNotifications.hasOwnProperty(notificationId)) {
                 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") && /^[a-zA-Z]/.test(msg.text)) {
                     msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
                 }
                 node.status = msg;
                 node.dirtyStatus = true;
                 node.dirty = true;
-                RED.view.redrawStatus(node);
+                RED.view.redraw();
             }
         });
         RED.comms.subscribe("notification/node/#",function(topic,msg) {
@@ -475,109 +367,75 @@ var RED = (function() {
             var typeList;
             var info;
             if (topic == "notification/node/added") {
-                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);
-                                }
-                            });
+                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);
                         });
                     });
-                    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();
-                })
+                });
+                if (addedTypes.length) {
+                    typeList = "<ul><li>"+addedTypes.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.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        typeList = "<ul><li>"+m.types.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) {
-                    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");
-                                }
-                            });
-                        }
-                    });
+                    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");
+                        });
+                    }
                 }
             } else if (topic == "notification/node/disabled") {
                 if (msg.types) {
                     RED.nodes.disableNodeSet(msg.id);
-                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
                     RED.notify(RED._("palette.event.nodeDisabled", {count:msg.types.length})+typeList,"success");
                 }
             } else if (topic == "notification/node/upgraded") {
                 RED.notify(RED._("palette.event.nodeUpgraded", {module:msg.module,version:msg.version}),"success");
                 RED.nodes.registry.setModulePendingUpdated(msg.module,msg.version);
             }
+            // Refresh flow library to ensure any examples are updated
+            RED.library.loadFlowLibrary();
         });
         RED.comms.subscribe("event-log/#", function(topic,payload) {
             var id = topic.substring(9);
             RED.eventLog.log(id,payload);
         });
-
-        $(".red-ui-header-toolbar").show();
-
-        RED.sidebar.show(":first", true);
-
-        setTimeout(function() {
-            loader.end();
-            checkFirstRun(function() {
-                if (showProjectWelcome) {
-                    RED.projects.showStartup();
-                }
-            });
-        },100);
     }
 
-    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 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.info.set(aboutHeader+marked(data));
+            RED.sidebar.info.show();
+        });
     }
 
     function buildMainMenu() {
@@ -589,25 +447,6 @@ 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},
@@ -615,25 +454,6 @@ 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"});
@@ -654,16 +474,8 @@ var RED = (function() {
             {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"},
             {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:"core:convert-to-subflow"},
         ]});
-        menuOptions.push({id:"menu-item-group",label:RED._("menu.label.groups"), options: [
-            {id:"menu-item-group-group",label:RED._("menu.label.groupSelection"),disabled:true,onselect:"core:group-selection"},
-            {id:"menu-item-group-ungroup",label:RED._("menu.label.ungroupSelection"),disabled:true,onselect:"core:ungroup-selection"},
-            null,
-            {id:"menu-item-group-merge",label:RED._("menu.label.groupMergeSelection"),disabled:true,onselect:"core:merge-selection-to-group"},
-            {id:"menu-item-group-remove",label:RED._("menu.label.groupRemoveSelection"),disabled:true,onselect:"core:remove-selection-from-group"}
-        ]});
-
         menuOptions.push(null);
-        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
+        if (RED.settings.theme('palette.editable') !== false) {
             menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
             menuOptions.push(null);
         }
@@ -687,6 +499,7 @@ var RED = (function() {
     }
 
     function loadEditor() {
+
         RED.workspaces.init();
         RED.statusBar.init();
         RED.view.init();
@@ -694,10 +507,11 @@ var RED = (function() {
         RED.user.init();
         RED.notifications.init();
         RED.library.init();
+        RED.keyboard.init();
         RED.palette.init();
         RED.eventLog.init();
 
-        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
+        if (RED.settings.theme('palette.editable') !== false) {
             RED.palette.editor.init();
         } else {
             console.log("Palette editor disabled");
@@ -712,7 +526,6 @@ var RED = (function() {
         }
 
         RED.subflow.init();
-        RED.group.init();
         RED.clipboard.init();
         RED.search.init();
         RED.actionList.init();
@@ -722,17 +535,19 @@ var RED = (function() {
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
 
-        RED.keyboard.init(buildMainMenu);
+        buildMainMenu();
 
         RED.nodes.init();
         RED.comms.connect();
 
         $("#red-ui-main-container").show();
+        $(".red-ui-header-toolbar").show();
 
-        loadPluginList();
+        RED.actions.add("core:show-about", showAbout);
+
+        loadNodeList();
     }
 
-
     function buildEditor(options) {
         var header = $('<div id="red-ui-header"></div>').appendTo(options.target);
         var logo = $('<span class="red-ui-header-logo"></span>').appendTo(header);
@@ -745,13 +560,8 @@ 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);
-
-        loader.init().appendTo("#red-ui-main-container");
-        loader.start("...",0);
-
         $.getJSON(options.apiRootUrl+"theme", function(theme) {
             if (theme.header) {
                 if (theme.header.url) {
@@ -764,12 +574,9 @@ 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) {
@@ -777,7 +584,7 @@ var RED = (function() {
             throw new Error("RED already initialised");
         }
         initialised = true;
-        if(window.ace) { window.ace.require("ace/ext/language_tools"); }
+        ace.require("ace/ext/language_tools");
         options = options || {};
         options.apiRootUrl = options.apiRootUrl || "";
         if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) {
@@ -787,45 +594,12 @@ var RED = (function() {
         options.target.addClass("red-ui-editor");
 
         buildEditor(options);
-
         RED.i18n.init(options, function() {
-            RED.settings.init(options, function() {
-                if (knownThemes) {
-                    RED.settings.editorTheme = RED.settings.editorTheme || {};
-                    RED.settings.editorTheme.themes = knownThemes;
-                }
-                loadEditor();
-            });
+            RED.settings.init(options, loadEditor);
         })
     }
 
-    var loader = {
-        init: function() {
-            var wrapper = $('<div id="red-ui-loading-progress"></div>').hide();
-            var container = $('<div>').appendTo(wrapper);
-            var label = $('<div>',{class:"red-ui-loading-bar-label"}).appendTo(container);
-            var bar = $('<div>',{class:"red-ui-loading-bar"}).appendTo(container);
-            var fill =$('<span>').appendTo(bar);
-            return wrapper;
-        },
-        start: function(text, prcnt) {
-            if (text) {
-                loader.reportProgress(text,prcnt)
-            }
-            $("#red-ui-loading-progress").show();
-        },
-        reportProgress: function(text, prcnt) {
-            $(".red-ui-loading-bar-label").text(text);
-            $(".red-ui-loading-bar span").width(prcnt+"%")
-        },
-        end: function() {
-            $("#red-ui-loading-progress").hide();
-            loader.reportProgress("",0);
-        }
-    }
-
     return {
-        init: init,
-        loader: loader
+        init: init
     }
 })();

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

@@ -19,6 +19,7 @@ RED.settings = (function () {
 
     var loadedSettings = {};
     var userSettings = {};
+    var settingsDirty = false;
     var pendingSave;
 
     var hasLocalStorage = function () {
@@ -55,12 +56,12 @@ RED.settings = (function () {
         if (key === "auth-tokens") {
             return JSON.parse(localStorage.getItem(key));
         } else {
-            var v;
-            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) {
+            try {
+                var v = RED.utils.getMessageProperty(userSettings,key);
+                if (v === undefined) {
+                    v = defaultIfUndefined;
+                }
+            } catch(err) {
                 v = defaultIfUndefined;
             }
             return v;
@@ -125,7 +126,7 @@ RED.settings = (function () {
         load(done);
     }
 
-    var refreshSettings = function(done) {
+    var load = function(done) {
         $.ajax({
             headers: {
                 "Accept": "application/json"
@@ -135,23 +136,6 @@ 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");
                 }
@@ -159,13 +143,22 @@ RED.settings = (function () {
                 console.groupCollapsed("Versions");
                 console.log("jQuery",$().jquery)
                 console.log("jQuery UI",$.ui.version);
-                if(window.ace) { console.log("ACE",ace.version); }
-                if(window.monaco) { console.log("MONACO",monaco.version || "unknown"); }
+                console.log("ACE",ace.version);
                 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) {
@@ -226,28 +219,14 @@ 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,
-        setLocal: setLocal,
-        getLocal: getLocal,
-        removeLocal: removeLocal
+        theme: theme
     }
 })();

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

@@ -151,6 +151,7 @@ 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();
@@ -160,19 +161,18 @@ 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) {
-                var Akey = A.label;
-                var Bkey = B.label;
-                return Akey.localeCompare(Bkey);
+                return A.id.localeCompare(B.id);
             });
             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,6 +185,7 @@ RED.actionList = (function() {
 
     function hide() {
         if (visible) {
+            RED.keyboard.remove("escape");
             visible = false;
             $("#red-ui-header-shade").hide();
             $("#red-ui-editor-shade").hide();
@@ -214,9 +215,6 @@ 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,78 +1,28 @@
 RED.actions = (function() {
     var actions = {
 
-    };
+    }
 
-    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 addAction(name,handler) {
+        actions[name] = handler;
     }
     function removeAction(name) {
         delete actions[name];
     }
     function getAction(name) {
-        return actions[name].handler;
+        return actions[name];
     }
-    function invokeAction() {
-        var args = Array.prototype.slice.call(arguments);
-        var name = args.shift();
+    function invokeAction(name,args) {
         if (actions.hasOwnProperty(name)) {
-            var handler = actions[name].handler;
-            handler.apply(null, args);
+            actions[name](args);
         }
     }
     function listActions() {
         var result = [];
-        var missing = [];
         Object.keys(actions).forEach(function(action) {
-            var def = actions[action];
             var shortcut = RED.keyboard.getShortcut(action);
-            var isUser = false;
-            if (shortcut) {
-                isUser = shortcut.user;
-            } else {
-                isUser = !!RED.keyboard.getUserShortcut(action);
-            }
-            if (!def.label) {
-                var name = action;
-                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();
-                        }
-                    });
-                    missing.push(key);
-                }
-                def.label = label;
-            }
-            //console.log("; missing:", missing);
-
-            result.push({
-                id:action,
-                scope:shortcut?shortcut.scope:undefined,
-                key:shortcut?shortcut.key:undefined,
-                user:isUser,
-                label: def.label,
-                options: def.options,
-            });
-        });
+            result.push({id:action,scope:shortcut?shortcut.scope:undefined,key:shortcut?shortcut.key:undefined,user:shortcut?shortcut.user:undefined})
+        })
         return result;
     }
     return {

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

@@ -1,115 +0,0 @@
-(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
- *
- * 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() {
-            var that = this;
-            this.completionMenuShown = false;
-            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) {
-            var that = this;
-            if (val.trim() === "") {
-                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) {
-                var 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();
-            }
-        }
-    });
-})(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.states = [
+            this.options = [
                 $('<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.states[1].show();
+                this.options[1].show();
             } else {
-                this.states[0].show();
+                this.options[0].show();
             }
 
             this.element.on("change", function() {
                 if (this.checked) {
-                    that.states[0].hide();
-                    that.states[1].show();
-                    that.states[2].hide();
+                    that.options[0].hide();
+                    that.options[1].show();
+                    that.options[2].hide();
                 } else {
-                    that.states[1].hide();
-                    that.states[0].show();
-                    that.states[2].hide();
+                    that.options[1].hide();
+                    that.options[0].show();
+                    that.options[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.states[0].hide();
-                    this.states[1].show();
-                    this.states[2].hide();
+                    this.options[0].hide();
+                    this.options[1].show();
+                    this.options[2].hide();
                 } else if (state === false) {
-                    this.states[2].hide();
-                    this.states[1].hide();
-                    this.states[0].show();
+                    this.options[2].hide();
+                    this.options[1].hide();
+                    this.options[0].show();
                 } else if (state === null) {
-                    this.states[0].hide();
-                    this.states[1].hide();
-                    this.states[2].show();
+                    this.options[0].hide();
+                    this.options[1].hide();
+                    this.options[2].show();
                 }
                 if (!suppressEvent) {
                     this.element.trigger('change',null);

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

@@ -18,7 +18,6 @@
 /**
  * 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
@@ -34,7 +33,7 @@
  * methods:
  *   - addItem(itemData)
  *   - insertItemAt : function(data,index) - add an item at the specified index
- *   - removeItem(itemData, detach) - remove the item. Optionally detach to preserve any event handlers on the item's label
+ *   - removeItem(itemData)
  *   - getItemAt(index)
  *   - indexOf(itemData)
  *   - width(width)
@@ -68,64 +67,30 @@
                 this.topContainer.addClass(this.options.class);
             }
 
-            var buttons = this.options.buttons || [];
-
             if (this.options.addButton !== false) {
-                var addLabel, addTitle;
+                var addLabel;
                 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';
                     }
                 }
-                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)
+                $('<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)
                     .on("click", function(evt) {
                         evt.preventDefault();
-                        if (button.click !== undefined) {
-                            button.click(evt);
-                        }
+                        that.addItem({});
                     });
-
-                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');
                     }
                 })
@@ -218,7 +183,7 @@
             if (this.options.resizeItem) {
                 var that = this;
                 this.element.children().each(function(i) {
-                    that.options.resizeItem($(this).children(".red-ui-editableList-item-content"),i);
+                    that.options.resizeItem($(this).find(".red-ui-editableList-item-content"),i);
                 });
             }
         },
@@ -258,7 +223,7 @@
                 var items = this.element.children();
                 var that = this;
                 items.sort(function(A,B) {
-                    return that.activeSort($(A).children(".red-ui-editableList-item-content").data('data'),$(B).children(".red-ui-editableList-item-content").data('data'));
+                    return that.activeSort($(A).find(".red-ui-editableList-item-content").data('data'),$(B).find(".red-ui-editableList-item-content").data('data'));
                 });
                 $.each(items,function(idx,li) {
                     that.element.append(li);
@@ -294,28 +259,6 @@
             var that = this;
             data = data || {};
             var li = $('<li>');
-            var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
-            row.data('data',data);
-            if (this.options.sortable === true) {
-                $('<i class="red-ui-editableList-item-handle fa fa-bars"></i>').appendTo(li);
-                li.addClass("red-ui-editableList-item-sortable");
-            }
-            if (this.options.removable) {
-                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(li);
-                $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
-                li.addClass("red-ui-editableList-item-removable");
-                deleteButton.on("click", function(evt) {
-                    evt.preventDefault();
-                    var data = row.data('data');
-                    li.addClass("red-ui-editableList-item-deleting")
-                    li.fadeOut(300, function() {
-                        $(this).remove();
-                        if (that.options.removeItem) {
-                            that.options.removeItem(data);
-                        }
-                    });
-                });
-            }
             var added = false;
             if (this.activeSort) {
                 var items = this.items();
@@ -338,9 +281,31 @@
                     li.insertBefore(this.element.children().eq(index));
                 }
             }
+            var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
+            row.data('data',data);
+            if (this.options.sortable === true) {
+                $('<i class="red-ui-editableList-item-handle fa fa-bars"></i>').appendTo(li);
+                li.addClass("red-ui-editableList-item-sortable");
+            }
+            if (this.options.removable) {
+                var deleteButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(li);
+                $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
+                li.addClass("red-ui-editableList-item-removable");
+                deleteButton.on("click", function(evt) {
+                    evt.preventDefault();
+                    var data = row.data('data');
+                    li.addClass("red-ui-editableList-item-deleting")
+                    li.fadeOut(300, function() {
+                        $(this).remove();
+                        if (that.options.removeItem) {
+                            that.options.removeItem(data);
+                        }
+                    });
+                });
+            }
             if (this.options.addItem) {
                 var index = that.element.children().length-1;
-                // setTimeout(function() {
+                setTimeout(function() {
                     that.options.addItem(row,index,data);
                     if (that.activeFilter) {
                         try {
@@ -356,7 +321,7 @@
                             that.uiContainer.scrollTop(that.element.height());
                         },0);
                     }
-                // },0);
+                },0);
             }
         },
         addItem: function(data) {
@@ -367,21 +332,17 @@
                 this.addItem(items[i]);
             }
         },
-        removeItem: function(data,detach) {
+        removeItem: function(data) {
             var items = this.element.children().filter(function(f) {
-                return data === $(this).children(".red-ui-editableList-item-content").data('data');
+                return data === $(this).find(".red-ui-editableList-item-content").data('data');
             });
-            if (detach) {
-                items.detach();
-            } else {
-                items.remove();
-            }
+            items.remove();
             if (this.options.removeItem) {
                 this.options.removeItem(data);
             }
         },
         items: function() {
-            return this.element.children().map(function(i) { return $(this).children(".red-ui-editableList-item-content"); });
+            return this.element.children().map(function(i) { return $(this).find(".red-ui-editableList-item-content"); });
         },
         empty: function() {
             this.element.empty();
@@ -404,14 +365,14 @@
         },
         show: function(item) {
             var items = this.element.children().filter(function(f) {
-                return item === $(this).children(".red-ui-editableList-item-content").data('data');
+                return item === $(this).find(".red-ui-editableList-item-content").data('data');
             });
             if (items.length > 0) {
                 this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
             }
         },
         getItem: function(li) {
-            var el = li.children(".red-ui-editableList-item-content");
+            var el = li.find(".red-ui-editableList-item-content");
             if (el.length) {
                 return el.data('data');
             } else {

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

@@ -82,19 +82,12 @@ RED.menu = (function() {
                 linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
                                '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
             } else {
-                linkContent += '<span class="red-ui-menu-label"><span>'+opt.label+'</span></span>'
+                linkContent += '<span class="red-ui-menu-label">'+opt.label+'</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;
 
@@ -165,7 +158,7 @@ RED.menu = (function() {
                             activeMenu = null;
                             topMenu.hide();
                         });
-                        $(".red-ui-menu.red-ui-menu-dropdown").hide();
+                        $(".red-ui-menu").hide();
                         topMenu.show();
                     }
                 })
@@ -283,22 +276,6 @@ 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,
@@ -307,7 +284,6 @@ RED.menu = (function() {
         setDisabled: setDisabled,
         addItem: addItem,
         removeItem: removeItem,
-        setAction: setAction,
-        refreshShortcuts: refreshShortcuts
+        setAction: setAction
     }
 })();

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

@@ -29,10 +29,6 @@ RED.panels = (function() {
         if (!vertical) {
             container.addClass("red-ui-panels-horizontal");
         }
-
-        $(children[0]).addClass("red-ui-panel");
-        $(children[1]).addClass("red-ui-panel");
-
         var separator = $('<div class="red-ui-panels-separator"></div>').insertAfter(children[0]);
         var startPosition;
         var panelSizes = [];
@@ -56,11 +52,11 @@ RED.panels = (function() {
                     var newSizes = [panelSizes[0]+delta,panelSizes[1]-delta];
                     if (vertical) {
                         $(children[0]).height(newSizes[0]);
-                        // $(children[1]).height(newSizes[1]);
+                        $(children[1]).height(newSizes[1]);
                         ui.position.top -= delta;
                     } else {
                         $(children[0]).width(newSizes[0]);
-                        // $(children[1]).width(newSizes[1]);
+                        $(children[1]).width(newSizes[1]);
                         ui.position.left -= delta;
                     }
                     if (options.resize) {
@@ -75,9 +71,6 @@ RED.panels = (function() {
 
         var panel = {
             ratio: function(ratio) {
-                if (ratio === undefined) {
-                    return panelRatio;
-                }
                 panelRatio = ratio;
                 modifiedSizes = true;
                 if (ratio === 0 || ratio === 1) {
@@ -106,10 +99,10 @@ RED.panels = (function() {
                     panelSizes = [topPanelSize,bottomPanelSize];
                     if (vertical) {
                         $(children[0]).outerHeight(panelSizes[0]);
-                        // $(children[1]).outerHeight(panelSizes[1]);
+                        $(children[1]).outerHeight(panelSizes[1]);
                     } else {
                         $(children[0]).outerWidth(panelSizes[0]);
-                        // $(children[1]).outerWidth(panelSizes[1]);
+                        $(children[1]).outerWidth(panelSizes[1]);
                     }
                 }
                 if (options.resize) {

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

@@ -13,138 +13,24 @@
  * 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": {
-            x: 12,
-            y: 12
+            top: 10,
+            topTop: 30,
+            leftRight: 17,
+            leftLeft: 25,
+            leftBottom: 8,
+            leftTop: 11
         },
         "small": {
-            x:8,
-            y:8
+            top: 6,
+            topTop: 20,
+            leftRight: 8,
+            leftLeft: 26,
+            leftBottom: 8,
+            leftTop: 9
         }
     }
     function createPopover(options) {
@@ -155,9 +41,7 @@ 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);
         }
@@ -165,8 +49,6 @@ RED.popover = (function() {
         var timer = null;
         var active;
         var div;
-        var contentDiv;
-        var currentStyle;
 
         var openPopup = function(instant) {
             if (active) {
@@ -176,10 +58,6 @@ 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);
                 }
@@ -189,45 +67,75 @@ RED.popover = (function() {
                         return;
                     }
                     if (typeof result === 'string') {
-                        contentDiv.text(result);
+                        div.text(result);
                     } else {
-                        contentDiv.append(result);
+                        div.append(result);
                     }
                 } else {
-                    contentDiv.html(content);
+                    div.html(content);
+                }
+                if (width !== "auto") {
+                    div.width(width);
                 }
                 div.appendTo("body");
 
-                movePopup({target,direction,width,maxWidth});
+                var targetPos = target.offset();
+                var targetWidth = target.outerWidth();
+                var targetHeight = target.outerHeight();
+                var divHeight = div.height();
+                var divWidth = div.width();
 
+                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);
                 }
-                if (options.trigger !== 'manual') {
-                    target.data("red-ui-popover",res)
-                }
+                target.data("red-ui-popover",res)
                 if (options.tooltip) {
                     div.on("mousedown", function(evt) {
                         closePopup(true);
                     });
                 }
-                if (trigger === 'hover' && options.interactive) {
-                    div.on('mouseenter', function(e) {
-                        clearTimeout(timer);
-                        active = true;
-                    })
-                    div.on('mouseleave', function(e) {
-                        if (timer) {
-                            clearTimeout(timer);
-                        }
-                        if (active) {
-                            timer = setTimeout(function() {
-                                active = false;
-                                closePopup();
-                            },delay.hide);
-                        }
-                    })
-                }
                 if (instant) {
                     div.show();
                 } else {
@@ -235,104 +143,6 @@ 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) {
@@ -350,22 +160,11 @@ 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);
-                if (!active) {
-                    active = true;
-                    timer = setTimeout(openPopup,delay.show);
-                }
+                active = true;
+                timer = setTimeout(openPopup,delay.show);
             });
             target.on('mouseleave disabled', function(e) {
                 if (timer) {
@@ -417,10 +216,8 @@ RED.popover = (function() {
             },autoClose);
         }
         var res = {
-            get element() { return div },
             setContent: function(_content) {
                 content = _content;
-
                 return res;
             },
             open: function (instant) {
@@ -432,10 +229,6 @@ RED.popover = (function() {
                 active = false;
                 closePopup(instant);
                 return res;
-            },
-            move: function(options) {
-                movePopup(options);
-                return
             }
         }
         return res;
@@ -445,17 +238,18 @@ RED.popover = (function() {
     return {
         create: createPopover,
         tooltip: function(target,content, action) {
-            var label = function() {
-                var label = content;
-                if (action) {
+            var label = content;
+            if (action) {
+                label = function() {
+                    var label = content;
                     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;
             }
-            var popover = RED.popover.create({
+            return RED.popover.create({
                 tooltip: true,
                 target:target,
                 trigger: "hover",
@@ -464,191 +258,60 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
-            popover.setContent = function(newContent) {
-                content = newContent;
-            }
-            popover.setAction = function(newAction) {
-                action = newAction;
-            }
-            return popover;
-
-        },
-        menu: function(options) {
-            var list = $('<ul class="red-ui-menu"></ul>');
-            if (options.style === 'compact') {
-                list.addClass("red-ui-menu-compact");
-            }
-            var menuOptions = options.options || [];
-            var first;
-
-            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();
-                        if (evt.keyCode === 40) {
-                            evt.preventDefault();
-                            // DOWN
-                            if (currentItem.length > 0) {
-                                if (currentItem.index() === menuOptions.length-1) {
-                                    // Wrap to top of list
-                                    list.children().first().children().first().focus();
-                                } else {
-                                    currentItem.next().children().first().focus();
-                                }
-                            } else {
-                                list.children().first().children().first().focus();
-                            }
-                        } else if (evt.keyCode === 38) {
-                            evt.preventDefault();
-                            // UP
-                            if (currentItem.length > 0) {
-                                if (currentItem.index() === 0) {
-                                    // Wrap to bottom of list
-                                    list.children().last().children().first().focus();
-                                } else {
-                                    currentItem.prev().children().first().focus();
-                                }
-                            } else {
-                                list.children().last().children().first().focus();
-                            }
-                        } else if (evt.keyCode === 27) {
-                            // 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();
-                    })
-                    opts.onclose = function() {
-                        $(document).off("keydown.red-ui-menu");
-                        if (options.onclose) {
-                            options.onclose(true);
-                        }
-                    }
-                    container.show(opts);
-                },
-                hide: function(cancelled) {
-                    $(document).off("keydown.red-ui-menu");
-                    container.hide(options.disposeOnClose);
-                    if (options.onclose) {
-                        options.onclose(cancelled);
-                    }
-                }
-            }
-            menu.options(menuOptions);
-            return menu;
         },
         panel: function(content) {
             var panel = $('<div class="red-ui-editor-dialog red-ui-popover-panel"></div>');
             panel.css({ display: "none" });
             panel.appendTo(document.body);
             content.appendTo(panel);
+            var closeCallback;
 
-            function hide(dispose) {
+            function hide() {
                 $(document).off("mousedown.red-ui-popover-panel-close");
-                $(document).off("keydown.red-ui-popover-panel-close");
                 panel.hide();
                 panel.css({
                     height: "auto"
                 });
-                if (dispose !== false) {
-                    panel.remove();
-                }
+                panel.remove();
             }
             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 align = options.align || "left";
 
                 var pos = target.offset();
                 var targetWidth = target.width();
-                var targetHeight = target.outerHeight();
+                var targetHeight = target.height();
                 var panelHeight = panel.height();
                 var panelWidth = panel.width();
 
-                var top = (targetHeight+pos.top) + offset[1];
-                if (top+panelHeight-$(document).scrollTop() > $(window).height()) {
+                var top = (targetHeight+pos.top);
+                if (top+panelHeight > $(window).height()) {
                     top -= (top+panelHeight)-$(window).height() + 5;
                 }
                 if (top < 0) {
-                    panel.height(panelHeight+top)
+                    panelHeight.height(panelHeight+top)
                     top = 0;
                 }
-                if (align === "right") {
+                if (align === "left") {
                     panel.css({
                         top: top+"px",
-                        left: (pos.left+offset[0])+"px",
+                        left: (pos.left)+"px",
                     });
-                } else if (align === "left") {
+                } else if(align === "right") {
                     panel.css({
                         top: top+"px",
-                        left: (pos.left-panelWidth+offset[0])+"px",
+                        left: (pos.left-panelWidth)+"px",
                     });
                 }
                 panel.slideDown(100);
 
-                $(document).on("keydown.red-ui-popover-panel-close", function(event) {
-                    if (event.keyCode === 27) {
-                        // ESCAPE
-                        if (closeCallback) {
-                            closeCallback();
-                        }
-                        hide(options.dispose);
-                    }
-                });
-
                 $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
-                    var hitCloseButton = closeButton && $(event.target).closest(closeButton).length;
-                    if(!hitCloseButton && !$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
                         if (closeCallback) {
                             closeCallback();
                         }
-                        hide(options.dispose);
+                        hide();
                     }
                     // if ($(event.target).closest(target).length) {
                     //     event.preventDefault();

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

@@ -39,16 +39,8 @@
             this.uiContainer = this.element.wrap("<div>").parent();
             this.uiContainer.addClass("red-ui-searchBox-container");
 
-            if (this.options.style === "compact") {
-                this.uiContainer.addClass("red-ui-searchBox-compact");
-            }
-
-            if (this.element.parents("form").length === 0) {
-                var form = this.element.wrap("<form>").parent();
-                form.addClass("red-ui-searchBox-form");
-            }
             $('<i class="fa fa-search"></i>').prependTo(this.uiContainer);
-            this.clearButton = $('<a class="red-ui-searchBox-clear" href="#"><i class="fa fa-times"></i></a>').appendTo(this.uiContainer);
+            this.clearButton = $('<a href="#"><i class="fa fa-times"></i></a>').appendTo(this.uiContainer);
             this.clearButton.on("click",function(e) {
                 e.preventDefault();
                 that.element.val("");
@@ -56,62 +48,6 @@
                 that.element.trigger("focus");
             });
 
-            if (this.options.options) {
-                this.uiContainer.addClass("red-ui-searchBox-has-options");
-                this.optsButton = $('<a class="red-ui-searchBox-opts" href="#"><i class="fa fa-caret-down"></i></a>').appendTo(this.uiContainer);
-                var menuShown = false;
-                this.optsMenu = RED.popover.menu({
-                    style: this.options.style,
-                    options: this.options.options.map(function(opt) {
-                        return {
-                            label: opt.label,
-                            onselect: function() {
-                                that.element.val(opt.value+" ");
-                                that._change(opt.value,true);
-                            }
-                        }
-                    }),
-                    onclose: function(cancelled) {
-                        menuShown = false;
-                        that.element.trigger("focus");
-                    },
-                    disposeOnClose: false
-                });
-
-                var showMenu = function() {
-                    menuShown = true;
-                    that.optsMenu.show({
-                        target: that.optsButton,
-                        align: "left",
-                        offset: [that.optsButton.width()-2,-1],
-                        dispose: false
-                    })
-                }
-                this.optsButton.on("click",function(e) {
-                    e.preventDefault();
-                    if (!menuShown) {
-                        showMenu();
-                    } else {
-                        // TODO: This doesn't quite work because the panel's own
-                        // mousedown handler triggers a close before this click
-                        // handler fires.
-                        that.optsMenu.hide(true);
-                    }
-                });
-                this.optsButton.on("keydown",function(e) {
-                    if (!menuShown && e.keyCode === 40) {
-                        //DOWN
-                        showMenu();
-                    }
-                });
-                this.element.on("keydown",function(e) {
-                    if (!menuShown && e.keyCode === 40) {
-                        //DOWN
-                        showMenu();
-                    }
-                });
-            }
-
             this.resultCount = $('<span>',{class:"red-ui-searchBox-resultCount hide"}).appendTo(this.uiContainer);
 
             this.element.val("");
@@ -119,9 +55,6 @@
                 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,8 +29,7 @@ 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();
@@ -38,7 +37,6 @@ 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);
@@ -76,8 +74,6 @@ 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) {
@@ -97,78 +93,17 @@ 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",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);
-                }
-            })
+            scrollContainer.on("scroll",updateScroll);
             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, evt.shiftKey?('-='+scrollContainer.scrollLeft()):'-=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=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,evt.shiftKey?('+='+(scrollContainer[0].scrollWidth - scrollContainer.width()-scrollContainer.scrollLeft())):'+=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
         }
 
         if (options.collapsible) {
@@ -197,11 +132,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});
@@ -218,7 +153,7 @@ RED.tabs = (function() {
                     if (collapsibleMenu.is(":visible")) {
                         $(document).off("click.red-ui-tabmenu");
                     } else {
-                        $(".red-ui-menu.red-ui-menu-dropdown").hide();
+                        $(".red-ui-menu").hide();
                         $(document).on("click.red-ui-tabmenu", function(evt) {
                             $(document).off("click.red-ui-tabmenu");
                             collapsibleMenu.hide();
@@ -272,11 +207,6 @@ 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;
@@ -288,7 +218,7 @@ RED.tabs = (function() {
             var thisTab = $(this).parent();
             var fireSelectionChanged = false;
             if (options.onselect) {
-                if (evt.metaKey || evt.ctrlKey) {
+                if (evt.metaKey) {
                     if (thisTab.hasClass("selected")) {
                         thisTab.removeClass("selected");
                         if (thisTab[0] !== currentTab[0]) {
@@ -386,12 +316,6 @@ 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"});
@@ -417,13 +341,13 @@ RED.tabs = (function() {
             }
         }
         function activatePreviousTab() {
-            var previous = findPreviousVisibleTab();
+            var previous = ul.find("li.active").prev();
             if (previous.length > 0) {
                 activateTab(previous.find("a"));
             }
         }
         function activateNextTab() {
-            var next = findNextVisibleTab();
+            var next = ul.find("li.active").next();
             if (next.length > 0) {
                 activateTab(next.find("a"));
             }
@@ -433,47 +357,29 @@ RED.tabs = (function() {
             if (options.vertical) {
                 return;
             }
-            var allTabs = ul.find("li.red-ui-tab");
-            var tabs = allTabs.filter(":not(.hide-tab)");
-            var hiddenTabs = allTabs.filter(".hide-tab");
+            var tabs = ul.find("li.red-ui-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;
-                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
+                if (tabWidth < 198) {
+                    var delta = 198 - tabWidth;
                     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 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")) {
+                    if (!b.hasClass("red-ui-tab-link-button-pinned")) {
                         b.hide();
                     }
-                    tabWidth = Math.max(minTabWidth,width - collapsedButtonsRow.width()-10);
+                    tabWidth = width - collapsedButtonsRow.width()-10;
                 } else {
-                    if (visibleCount !== availableCount) {
-                        if (visibleCount < 6) {
-                            tabWidth = minTabWidth;
-                        } else {
-                            tabWidth = maxTabWidth;
-                        }
-                    }
-                    var space = width - tabWidth - collapsedButtonsRow.width();
+                    var space = width - 198 - 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});
 
@@ -503,7 +409,6 @@ 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();
@@ -524,7 +429,6 @@ 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(); })
@@ -544,19 +448,12 @@ RED.tabs = (function() {
             }
             var li = ul.find("a[href='#"+id+"']").parent();
             if (li.hasClass("active")) {
-                var tab = findPreviousVisibleTab(li);
+                var tab = li.prev();
                 if (tab.length === 0) {
-                    tab = findNextVisibleTab(li);
-                }
-                if (tab.length > 0) {
-                    activateTab(tab.find("a"));
-                } else {
-                    if (options.onchange) {
-                        options.onchange(null);
-                    }
+                    tab = li.next();
                 }
+                activateTab(tab.find("a"));
             }
-
             li.remove();
             if (tabs[id].pinned) {
                 pinnedTabsCount--;
@@ -572,76 +469,7 @@ RED.tabs = (function() {
             }
         }
 
-        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 =  {
+        return {
             addTab: function(tab,targetIndex) {
                 if (options.onselect) {
                     var selection = ul.find("li.red-ui-tab.selected");
@@ -665,8 +493,8 @@ RED.tabs = (function() {
                 li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
                 li.data("tabId",tab.id);
 
-                if (options.maximumTabWidth || tab.maximumTabWidth) {
-                    li.css("maxWidth",(options.maximumTabWidth || tab.maximumTabWidth) +"px");
+                if (options.maximumTabWidth) {
+                    li.css("maxWidth",options.maximumTabWidth+"px");
                 }
                 var link = $("<a/>",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
                 if (tab.icon) {
@@ -703,101 +531,17 @@ 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")
@@ -807,18 +551,6 @@ 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);
@@ -826,17 +558,14 @@ 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 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 && !options.collapsible) {
+                if (options.onreorder) {
                     var originalTabOrder;
                     var tabDragIndex;
                     var tabElements = [];
@@ -923,9 +652,6 @@ RED.tabs = (function() {
                     collapsibleMenu.remove();
                     collapsibleMenu = null;
                 }
-                if (preferredOrder) {
-                    tabAPI.order(preferredOrder);
-                }
             },
             removeTab: removeTab,
             activateTab: activateTab,
@@ -933,40 +659,24 @@ RED.tabs = (function() {
             previousTab: activatePreviousTab,
             resize: updateTabWidths,
             count: function() {
-                return ul.find("li.red-ui-tab:not(.hide)").length;
-            },
-            activeIndex: function() {
-                return ul.find("li.active").index()
+                return ul.find("li.red-ui-tab").length;
             },
             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,
-            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');}));
+                if (existingTabOrder.length !== order.length) {
+                    return
+                }
                 var i;
                 var match = true;
                 for (i=0;i<order.length;i++) {
@@ -982,41 +692,12 @@ 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++) {
-                    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();
+                    existingTabMap[order[i]].appendTo(ul);
                 }
             }
+
         }
-        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.hasOwnProperty('enabledIcon')?this.options.enabledIcon : "fa-check-square-o";
-            var disabledIcon = this.options.hasOwnProperty('disabledIcon')?this.options.disabledIcon : "fa-square-o";
+            var enabledIcon = this.options.enabledIcon || "fa-check-square-o";
+            var 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,41 +46,25 @@
             this.element.on("focus", function() {
                 that.button.focus();
             });
-            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");
-            }
-
+            this.button = $('<button type="button" class="red-ui-toggleButton '+baseClass+' toggle single"><i class="fa"></i> <span></span></button>');
             if (this.options.class) {
                 this.button.addClass(this.options.class)
             }
             this.element.after(this.button);
-
-            if (enabledIcon && disabledIcon) {
-                this.buttonIcon = $('<i class="fa"></i>').prependTo(this.button);
-            }
+            this.buttonIcon = this.button.find("i");
+            this.buttonLabel = this.button.find("span");
 
             // Quick hack to find the maximum width of the button
             this.button.addClass("selected");
-            if (this.buttonIcon) {
-                this.buttonIcon.addClass(enabledIcon);
-            }
-            if (this.buttonLabel) {
-                this.buttonLabel.text(enabledLabel);
-            }
+            this.buttonIcon.addClass(enabledIcon);
+            this.buttonLabel.text(enabledLabel);
             var width = this.button.width();
             this.button.removeClass("selected");
-            if (this.buttonIcon) {
-                this.buttonIcon.removeClass(enabledIcon);
-                that.buttonIcon.addClass(disabledIcon);
-            }
-            if (this.buttonLabel) {
-                that.buttonLabel.text(disabledLabel);
-            }
+            this.buttonIcon.removeClass(enabledIcon);
+            that.buttonIcon.addClass(disabledIcon);
+            that.buttonLabel.text(disabledLabel);
             width = Math.max(width,this.button.width());
-            if (this.buttonIcon) {
-                this.buttonIcon.removeClass(disabledIcon);
-            }
+            this.buttonIcon.removeClass(disabledIcon);
 
             // Fix the width of the button so it doesn't jump around when toggled
             if (width > 0) {
@@ -89,7 +73,7 @@
 
             this.button.on("click",function(e) {
                 e.stopPropagation();
-                if (!that.state) {
+                if (that.buttonIcon.hasClass(disabledIcon)) {
                     that.element.prop("checked",!invertState);
                 } else {
                     that.element.prop("checked",invertState);
@@ -100,24 +84,14 @@
             this.element.on("change", function(e) {
                 if ($(this).prop("checked") !== invertState) {
                     that.button.addClass("selected");
-                    that.state = true;
-                    if (that.buttonIcon) {
-                        that.buttonIcon.addClass(enabledIcon);
-                        that.buttonIcon.removeClass(disabledIcon);
-                    }
-                    if (that.buttonLabel) {
-                        that.buttonLabel.text(enabledLabel);
-                    }
+                    that.buttonIcon.addClass(enabledIcon);
+                    that.buttonIcon.removeClass(disabledIcon);
+                    that.buttonLabel.text(enabledLabel);
                 } else {
                     that.button.removeClass("selected");
-                    that.state = false;
-                    if (that.buttonIcon) {
-                        that.buttonIcon.addClass(disabledIcon);
-                        that.buttonIcon.removeClass(enabledIcon);
-                    }
-                    if (that.buttonLabel) {
-                        that.buttonLabel.text(disabledLabel);
-                    }
+                    that.buttonIcon.addClass(disabledIcon);
+                    that.buttonIcon.removeClass(enabledIcon);
+                    that.buttonLabel.text(disabledLabel);
                 }
             })
             this.element.trigger("change");

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

@@ -24,14 +24,10 @@
  *   - 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
- *   - clearSelection - clears the selected items
- *   - filter(filterFunc) - filters the tree using the provided function
+ *
  * events:
  *   - treelistselect : function(event, item) {}
  *   - treelistconfirm : function(event,item) {}
@@ -43,9 +39,7 @@
  *         label: 'Local', // label for the item
  *         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
+ *         selected: true/false, // (optional) if present, display checkbox accordingly
  *         children: [] | function(done,item) // (optional) an array of child items, or a function
  *                                       // that will call the `done` callback with an array
  *                                       // of child items
@@ -53,7 +47,6 @@
  *         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.
  *     }
  * ]
  *
@@ -66,11 +59,11 @@
  * properties and functions:
  *
  *   item.parent - set to the parent item
- *   item.depth - the depth in the tree (0 == root)
  *   item.treeList.container
  *   item.treeList.label - the label element for the item
+ *   item.treeList.depth - the depth in the tree (0 == root)
  *   item.treeList.parentList  - the editableList instance this item is in
- *   item.treeList.remove(detach) - removes the item from the tree. Optionally detach to preserve any event handlers on the item's label
+ *   item.treeList.remove() - removes the item from the tree
  *   item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
  *                                                 removing the UI decoration etc.
  *                                                 detachChildElements - any children with custom
@@ -85,8 +78,8 @@
  *                                            Optionally selects the item after adding.
  *   item.treeList.expand(done) - expands the parent item to show children. Optional 'done' callback.
  *   item.treeList.collapse() - collapse the parent item to hide children.
- *   item.treeList.sortChildren(sortFunction) - does a one-time sort of the children using sortFunction
- *   item.treeList.replaceElement(element) - replace the custom element for the item
+ *
+ *
  *
  *
  */
@@ -94,107 +87,74 @@
     $.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 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')
-                    }
+                var selected = that._topList.find(".selected").parent().data('data');
+                if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) {
+                    that.select(that._data[0]);
                     return;
                 }
                 var target;
                 switch(evt.keyCode) {
-                    case 32: // SPACE
                     case 13: // ENTER
-                        if (evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey) {
-                            return
-                        }
-                        evt.preventDefault();
-                        evt.stopPropagation();
-                        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()
+                        if (selected.children) {
+                            if (selected.treeList.container.hasClass("expanded")) {
+                                selected.treeList.collapse()
                             } else {
-                                focussed.treeList.expand()
+                                selected.treeList.expand()
                             }
                         } else {
-                            that._trigger("confirm",null,focussed)
+                            that._trigger("confirm",null,selected)
                         }
+
                     break;
                     case 37: // LEFT
-                        evt.preventDefault();
-                        evt.stopPropagation();
-                        if (focussed.children&& focussed.treeList.container.hasClass("expanded")) {
-                            focussed.treeList.collapse()
-                        } else if (focussed.parent) {
-                            target = focussed.parent;
+                        if (selected.children&& selected.treeList.container.hasClass("expanded")) {
+                            selected.treeList.collapse()
+                        } else if (selected.parent) {
+                            target = selected.parent;
                         }
                     break;
                     case 38: // UP
-                        evt.preventDefault();
-                        evt.stopPropagation();
-                        target = that._getPreviousSibling(focussed);
+                        target = that._getPreviousSibling(selected);
                         if (target) {
                             target = that._getLastDescendant(target);
                         }
-                        if (!target && focussed.parent) {
-                            target = focussed.parent;
+                        if (!target && selected.parent) {
+                            target = selected.parent;
                         }
                     break;
                     case 39: // RIGHT
-                        evt.preventDefault();
-                        evt.stopPropagation();
-                        if (focussed.children) {
-                            if (!focussed.treeList.container.hasClass("expanded")) {
-                                focussed.treeList.expand()
+                        if (selected.children) {
+                            if (!selected.treeList.container.hasClass("expanded")) {
+                                selected.treeList.expand()
                             }
                         }
                     break
                     case 40: //DOWN
-                        evt.preventDefault();
-                        evt.stopPropagation();
-                        if (focussed.children && Array.isArray(focussed.children) && focussed.children.length > 0 && focussed.treeList.container.hasClass("expanded")) {
-                            target = focussed.children[0];
+                        if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) {
+                            target = selected.children[0];
                         } else {
-                            target = that._getNextSibling(focussed);
-                            while (!target && focussed.parent) {
-                                focussed = focussed.parent;
-                                target = that._getNextSibling(focussed);
+                            target = that._getNextSibling(selected);
+                            while (!target && selected.parent) {
+                                selected = selected.parent;
+                                target = that._getNextSibling(selected);
                             }
                         }
                     break
                 }
                 if (target) {
-                    if (autoSelect) {
-                        that.select(target);
-                    } else {
-                        that._topList.find(".focus").removeClass("focus")
-                    }
-                    target.treeList.label.addClass('focus')
+                    that.select(target);
                 }
             });
             this._data = [];
-            this._items = {};
-            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
@@ -208,9 +168,6 @@
                     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';
@@ -258,7 +215,7 @@
                 return candidates[index+1];
             }
         },
-        _addChildren: function(container,parent,children,depth,onCompleteChildren) {
+        _addChildren: function(container,parent,children,depth) {
             var that = this;
             var subtree = $('<ol class="red-ui-treeList-list">').appendTo(container).editableList({
                 connectWith: ".red-ui-treeList-sortable",
@@ -287,38 +244,15 @@
                         that._trigger("changeparent",null,evt);
                     });
                     that._trigger("sort",null,parent);
-                },
-                filter: parent.treeList.childFilter
+                }
             });
             if (!!that.options.sortable) {
                 subtree.addClass('red-ui-treeList-sortable');
             }
-            var sliceSize = 30;
-            var index = 0;
-            var addSlice = function() {
-                var start = index;
-                for (var i=0;i<sliceSize;i++) {
-                    index = start+i;
-                    if (index === children.length) {
-                        setTimeout(function() {
-                            if (onCompleteChildren) {
-                                onCompleteChildren();
-                            }
-                        },10);
-                        return;
-                    }
-                    children[index].parent = parent;
-                    subtree.editableList('addItem',children[index])
-                }
-                index++;
-                if (index < children.length) {
-                    setTimeout(function() {
-                        addSlice();
-                    },10);
-                }
+            for (var i=0;i<children.length;i++) {
+                children[i].parent = parent;
+                subtree.editableList('addItem',children[i])
             }
-            addSlice();
-            subtree.hide()
             return subtree;
         },
         _fixDepths: function(parent,child) {
@@ -339,8 +273,7 @@
             }
             if (child.depth !== parent.depth+1) {
                 child.depth = parent.depth+1;
-                // 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));
+                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
                 child.treeList.labelPadding.width(labelPaddingWidth+'px');
                 if (child.element) {
                     $(child.element).css({
@@ -356,202 +289,23 @@
             }
             return reparentedEvent;
         },
-        _initItem: function(item,depth) {
-            if (item.treeList) {
-                return;
-            }
+        _addSubtree: function(parentList, container, item, depth) {
             var that = this;
-            this._items[item.id] = item;
             item.treeList = {};
-            item.depth = depth;
-            item.treeList.remove = function(detach) {
-                if (item.treeList.parentList) {
-                    item.treeList.parentList.editableList('removeItem',item,detach);
-                }
+            item.treeList.depth = depth;
+            item.treeList.container = container;
+
+            item.treeList.parentList = parentList;
+            item.treeList.remove = function() {
+                parentList.editableList('removeItem',item);
                 if (item.parent) {
                     var index = item.parent.children.indexOf(item);
                     item.parent.children.splice(index,1)
                     that._trigger("sort",null,item.parent);
                 }
-                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;
-                item.children.splice(position,0,newItem);
-                var processChildren = function(parent,i) {
-                    that._initItem(i,parent.depth+1)
-                    i.parent = parent;
-                    if (i.children && typeof i.children !== 'function') {
-                        i.children.forEach(function(item) {
-                            processChildren(i, item, parent.depth+2)
-                        });
-                    }
-                }
-                processChildren(item,newItem);
-
-                if (!item.deferBuild && item.treeList.childList) {
-                    item.treeList.childList.editableList('insertItemAt',newItem,position)
-                    if (select) {
-                        setTimeout(function() {
-                            that.select(newItem)
-                        },100);
-                    }
-                    that._trigger("sort",null,item);
-
-                    if (that.activeFilter) {
-                        that.filter(that.activeFilter);
-                    }
-                }
-            }
-            item.treeList.addChild = function(newItem,select) {
-                item.treeList.insertChildAt(newItem,item.children.length,select);
-            }
-            item.treeList.expand = function(done) {
-                if (!item.children) {
-                    if (done) { done(false) }
-                    return;
-                }
-                if (!item.treeList.container) {
-                    item.expanded = true;
-                    if (done) { done(false) }
-                    return;
-                }
-                var container = item.treeList.container;
-                if (container.hasClass("expanded")) {
-                    if (done) { done(false) }
-                    return;
-                }
-
-                if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
-                    container.addClass('built');
-                    var childrenAdded = false;
-                    var spinner;
-                    var startTime = 0;
-                    var started = Date.now();
-                    var completeBuild = function(children) {
-                        childrenAdded = true;
-                        item.treeList.childList = that._addChildren(container,item,children,depth, function() {
-                            if (done) { done(true) }
-                            that._trigger("childrenloaded",null,item)
-                        });
-                        var delta = Date.now() - startTime;
-                        if (delta < 400) {
-                            setTimeout(function() {
-                                item.treeList.childList.slideDown('fast');
-                                if (spinner) {
-                                    spinner.remove();
-                                }
-                            },400-delta);
-                        } else {
-                            item.treeList.childList.slideDown('fast');
-                            if (spinner) {
-                                spinner.remove();
-                            }
-                        }
-                        item.expanded = true;
-                    }
-                    if (typeof item.children === 'function') {
-                        item.children(completeBuild,item);
-                    } else {
-                        delete item.deferBuild;
-                        completeBuild(item.children);
-                    }
-                    if (!childrenAdded) {
-                        startTime = Date.now();
-                        spinner = $('<div class="red-ui-treeList-spinner">').css({
-                            "background-position": (35+depth*20)+'px 50%'
-                        }).appendTo(container);
-                    }
-
-                } else {
-                    if (that._loadingData || item.children.length > 20) {
-                        item.treeList.childList.show();
-                    } else {
-                        item.treeList.childList.slideDown('fast');
-                    }
-                    item.expanded = true;
-                    if (done) { done(!that._loadingData) }
-                }
-                container.addClass("expanded");
-            }
-            item.treeList.collapse = function() {
-                if (item.collapsible === false) {
-                    return
-                }
-                if (!item.children) {
-                    return;
-                }
-                item.expanded = false;
-                if (item.treeList.container) {
-                    if (item.children.length < 20) {
-                        item.treeList.childList.slideUp('fast');
-                    } else {
-                        item.treeList.childList.hide();
-                    }
-                    item.treeList.container.removeClass("expanded");
-                }
-            }
-            item.treeList.sortChildren = function(sortFunc) {
-                if (!item.children) {
-                    return;
-                }
-                item.children.sort(sortFunc);
-                if (item.treeList.childList) {
-                    // Do a one-off sort of the list, which means calling sort twice:
-                    // 1. first with the desired sort function
-                    item.treeList.childList.editableList('sort',sortFunc);
-                    // 2. and then with null to remove it
-                    item.treeList.childList.editableList('sort',null);
-                }
-            }
-            item.treeList.replaceElement = function (element) {
-                if (item.element) {
-                    if (item.treeList.container) {
-                        $(item.element).remove();
-                        $(element).appendTo(item.treeList.label);
-                        // 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)"
-                        })
-                    }
-                    item.element = element;
-                }
             }
 
-            if (item.children && typeof item.children !== "function") {
-                item.children.forEach(function(i) {
-                    that._initItem(i,depth+1);
-                })
-            }
-        },
-        _addSubtree: function(parentList, container, item, depth) {
-            var that = this;
-            this._initItem(item,depth);
-            // item.treeList = {};
-            // item.treeList.depth = depth;
-            item.treeList.container = container;
-
-            item.treeList.parentList = parentList;
-
-            var label = $("<div>",{class:"red-ui-treeList-label"});
-            label.appendTo(container);
+            var label = $("<div>",{class:"red-ui-treeList-label"}).appendTo(container);
             item.treeList.label = label;
             if (item.class) {
                 label.addClass(item.class);
@@ -562,12 +316,9 @@
                 }).appendTo(label)
 
             }
-
-            var labelPaddingWidth = ((item.gutter&&!item.gutter.hasClass("red-ui-treeList-gutter-float"))?item.gutter.width()+2:0)+(depth*20);
-
+            var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
             item.treeList.labelPadding = $('<span>').css({
                 display: "inline-block",
-                "flex-shrink": 0,
                 width:  labelPaddingWidth+'px'
             }).appendTo(label);
 
@@ -606,14 +357,13 @@
                 treeListIcon.off("click.red-ui-treeList-expand");
                 delete item.children;
                 container.removeClass("expanded");
-                delete item.expanded;
             }
             item.treeList.makeParent = function(children) {
                 if (treeListIcon.children().length) {
                     // Already a parent because we've got the angle-right icon
                     return;
                 }
-                $('<i class="fa fa-angle-right" />').toggleClass("hide",item.collapsible === false).appendTo(treeListIcon);
+                $('<i class="fa fa-angle-right" />').appendTo(treeListIcon);
                 treeListIcon.on("click.red-ui-treeList-expand", function(e) {
                         e.stopPropagation();
                         e.preventDefault();
@@ -635,28 +385,104 @@
                 })
                 if (!item.children) {
                     item.children = children||[];
-                    item.treeList.childList = that._addChildren(container,item,item.children,depth);
+                    item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
                 }
             }
+            item.treeList.insertChildAt = function(newItem,position,select) {
+                newItem.parent = item;
+                item.children.splice(position,0,newItem);
+
+                if (!item.deferBuild) {
+                    item.treeList.childList.editableList('insertItemAt',newItem,position)
+                    if (select) {
+                        setTimeout(function() {
+                            that.select(newItem)
+                        },100);
+                    }
+                    that._trigger("sort",null,item);
+                }
+            }
+            item.treeList.addChild = function(newItem,select) {
+                item.treeList.insertChildAt(newItem,item.children.length,select);
+            }
+            item.treeList.expand = function(done) {
+                if (!item.children) {
+                    return;
+                }
+                if (container.hasClass("expanded")) {
+                    done && done();
+                    return;
+                }
+                if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
+                    container.addClass('built');
+                    var childrenAdded = false;
+                    var spinner;
+                    var startTime = 0;
+                    var completeBuild = function(children) {
+                        childrenAdded = true;
+                        item.treeList.childList = that._addChildren(container,item,children,depth).hide();
+                        var delta = Date.now() - startTime;
+                        if (delta < 400) {
+                            setTimeout(function() {
+                                item.treeList.childList.slideDown('fast');
+                                if (spinner) {
+                                    spinner.remove();
+                                }
+                            },400-delta);
+                        } else {
+                            item.treeList.childList.slideDown('fast');
+                            if (spinner) {
+                                spinner.remove();
+                            }
+                        }
+                        done && done();
+                        that._trigger("childrenloaded",null,item)
+                    }
+                    if (typeof item.children === 'function') {
+                        item.children(completeBuild,item);
+                    } else {
+                        delete item.deferBuild;
+                        completeBuild(item.children);
+                    }
+                    if (!childrenAdded) {
+                        startTime = Date.now();
+                        spinner = $('<div class="red-ui-treeList-spinner">').css({
+                            "background-position": (35+depth*20)+'px 50%'
+                        }).appendTo(container);
+                    }
+
+                } else {
+                    if (that._loadingData) {
+                        item.treeList.childList.show();
+                    } else {
+                        item.treeList.childList.slideDown('fast');
+                    }
+                    done && done();
+                }
+                container.addClass("expanded");
+            }
+            item.treeList.collapse = function() {
+                if (!item.children) {
+                    return;
+                }
+                item.treeList.childList.slideUp('fast');
+                container.removeClass("expanded");
+            }
 
             var treeListIcon = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
             if (item.children) {
                 item.treeList.makeParent();
             }
 
-            if (item.checkbox) {
-                var selectWrapper = $('<span class="red-ui-treeList-icon"></span>');
+            if (item.hasOwnProperty('selected')) {
+                var selectWrapper = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
                 var cb = $('<input class="red-ui-treeList-checkbox" type="checkbox">').prop('checked',item.selected).appendTo(selectWrapper);
+                label.toggleClass("selected",item.selected);
                 cb.on('click', function(e) {
                     e.stopPropagation();
                 });
                 cb.on('change', function(e) {
                     item.selected = this.checked;
-                    if (item.selected) {
-                        that._selected.add(item);
-                    } else {
-                        that._selected.delete(item);
-                    }
                     label.toggleClass("selected",this.checked);
                     that._trigger("select",e,item);
                 })
@@ -664,8 +490,6 @@
                     label.on("click", function(e) {
                         e.stopPropagation();
                         cb.trigger("click");
-                        that._topList.find(".focus").removeClass("focus")
-                        label.addClass('focus')
                     })
                 }
                 item.treeList.select = function(v) {
@@ -673,89 +497,20 @@
                         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) {
-                    if (v !== item.selected) {
-                        cb.trigger("click");
-                    }
-                }
-                selectWrapper.appendTo(label)
-                item.treeList.radio = cb;
             } else {
                 label.on("click", function(e) {
-                    if (!that.options.multi) {
-                        that.clearSelection();
-                    }
+                    that._topList.find(".selected").removeClass("selected");
                     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);
                     }
                 })
-                item.treeList.select = function(v) {
-                    if (!that.options.multi) {
-                        that.clearSelection();
-                    }
-                    label.toggleClass("selected",v);
-                    if (v) {
-                        that._selected.add(item);
-                        that._trigger("select",null,item)
-                    } else {
-                        that._selected.delete(item);
-                    }
-                    that.reveal(item);
-                }
-            }
-            label.toggleClass("selected",!!item.selected);
-            if (item.selected) {
-                that._selected.add(item);
             }
             if (item.icon) {
-                if (typeof item.icon === "string") {
-                    $('<span class="red-ui-treeList-icon"><i class="'+item.icon+'" /></span>').appendTo(label);
-                } else {
-                    $('<span class="red-ui-treeList-icon">').appendTo(label).append(item.icon);
-                }
+                $('<span class="red-ui-treeList-icon"><i class="'+item.icon+'" /></span>').appendTo(label);
             }
             if (item.hasOwnProperty('label') || item.hasOwnProperty('sublabel')) {
                 if (item.hasOwnProperty('label')) {
@@ -773,13 +528,12 @@
             }
             if (item.children) {
                 if (Array.isArray(item.children) && !item.deferBuild) {
-                    item.treeList.childList = that._addChildren(container,item,item.children,depth);
+                    item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
                 }
                 if (item.expanded) {
                     item.treeList.expand();
                 }
             }
-            // label.appendTo(container);
         },
         empty: function() {
             this._topList.editableList('empty');
@@ -788,7 +542,6 @@
             var that = this;
             if (items !== undefined) {
                 this._data = items;
-                this._items = {};
                 this._topList.editableList('empty');
                 this._loadingData = true;
                 for (var i=0; i<items.length;i++) {
@@ -803,155 +556,33 @@
                 return this._data;
             }
         },
-        show: function(item, done) {
-            if (typeof item === "string") {
-                item = this._items[item]
-            }
-            if (!item) {
-                return;
-            }
-            var that = this;
-            var stack = [];
-            var i = item;
-            while(i) {
-                stack.unshift(i);
-                i = i.parent;
-            }
-            var isOpening = false;
-            var handleStack = function(opening) {
-                isOpening = isOpening ||opening
-                var item = stack.shift();
-                if (stack.length === 0) {
-                    setTimeout(function() {
-                        that.reveal(item);
-                        if (done) { done(); }
-                    },isOpening?200:0);
-                } else {
-                    item.treeList.expand(handleStack)
+        show: function(id) {
+            for (var i=0;i<this._data.length;i++) {
+                if (this._data[i].id === id) {
+                    this._topList.editableList('show',this._data[i]);
                 }
             }
-            handleStack();
         },
-        reveal: function(item) {
-            if (typeof item === "string") {
-                item = this._items[item]
-            }
-            if (!item) {
-                return;
-            }
-            var listOffset = this._topList.offset().top;
-            var itemOffset = item.treeList.label.offset().top;
-            var scrollTop = this._topList.parent().scrollTop();
-            itemOffset -= listOffset+scrollTop;
-            var treeHeight = this._topList.parent().height();
-            var itemHeight = item.treeList.label.outerHeight();
-            if (itemOffset < itemHeight/2) {
-                this._topList.parent().scrollTop(scrollTop+itemOffset-itemHeight/2-itemHeight)
-            } else if (itemOffset+itemHeight > treeHeight) {
-                this._topList.parent().scrollTop(scrollTop+((itemOffset+2.5*itemHeight)-treeHeight));
-            }
-        },
-        select: function(item, triggerEvent, deselectExisting) {
-            var that = this;
-            if (!this.options.multi && deselectExisting !== false) {
-                this.clearSelection();
-            }
-            if (Array.isArray(item)) {
-                item.forEach(function(i) {
-                    that.select(i,triggerEvent,false);
-                })
-                return;
-            }
-            if (typeof item === "string") {
-                item = this._items[item]
-            }
-            if (!item) {
-                return;
-            }
-            // this.show(item.id);
-            item.selected = true;
-            this._selected.add(item);
+        select: function(item) {
+            this._topList.find(".selected").removeClass("selected");
+            item.treeList.label.addClass("selected");
+            this._trigger("select",null,item)
 
-            if (item.treeList.label) {
-                item.treeList.label.addClass("selected");
-            }
-
-            that._topList.find(".focus").removeClass("focus");
-
-            if (triggerEvent !== false) {
-                this._trigger("select",null,item)
-            }
-        },
-        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")
-                }
-            });
-            this._selected.clear();
         },
         selected: function() {
-            var selected = [];
-            this._selected.forEach(function(item) {
-                selected.push(item);
-            })
+            var s = this._topList.find(".selected");
             if (this.options.multi) {
-                return selected;
+                var res = [];
+                s.each(function() {
+                    res.push($(this).parent().data('data'));
+                })
+                return res;
             }
-            if (selected.length) {
-                return selected[0]
+            if (s.length) {
+                return s.parent().data('data');
             } else {
-                // TODO: This may be a bug.. it causes the call to return itself
-                // not undefined.
                 return undefined;
             }
-        },
-        filter: function(filterFunc) {
-            this.activeFilter = filterFunc;
-            var totalCount = 0;
-            var filter = function(item) {
-                var matchCount = 0;
-                if (filterFunc && filterFunc(item)) {
-                    matchCount++;
-                    totalCount++;
-                }
-                var childCount = 0;
-                if (item.children && typeof item.children !== "function") {
-                    if (item.treeList.childList) {
-                        childCount = item.treeList.childList.editableList('filter', filter);
-                    } else {
-                        item.treeList.childFilter = filter;
-                        if (filterFunc) {
-                            item.children.forEach(function(i) {
-                                if (filter(i)) {
-                                    childCount++;
-                                }
-                            })
-
-                        }
-                    }
-                    matchCount += childCount;
-                    if (filterFunc && childCount > 0) {
-                        setTimeout(function() {
-                            item.treeList.expand();
-                        },10);
-                    }
-                }
-                if (!filterFunc) {
-                    totalCount++;
-                    return true
-                }
-                return matchCount > 0
-            }
-            this._topList.editableList('filter', filter);
-            return totalCount;
-        },
-        get: function(id) {
-            return this._items[id] || null;
         }
     });
 

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,defaultStore) {
-        var parts = RED.utils.parseContextKey(v, defaultStore&&defaultStore.value);
+    var contextParse = function(v) {
+        var parts = RED.utils.parseContextKey(v);
         return {
             option: parts.store,
             value: parts.key
@@ -32,122 +32,25 @@
             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) {
-        return function(val) {
-            var matches = [];
-            options.forEach(opt => {
-                let v = opt.value;
-                var i = v.toLowerCase().indexOf(val.toLowerCase());
-                if (i > -1) {
-                    var pre = v.substring(0,i);
-                    var matchedVal = v.substring(i,i+val.length);
-                    var post = v.substring(i+val.length)
-
-                    var el = $('<div/>',{style:"white-space:nowrap; overflow: hidden; flex-grow:1"});
-                    $('<span/>').text(pre).appendTo(el);
-                    $('<span/>',{style:"font-weight: bold"}).text(matchedVal).appendTo(el);
-                    $('<span/>').text(post).appendTo(el);
-
-                    var element = $('<div>',{style: "display: flex"});
-                    el.appendTo(element);
-                    if (opt.source) {
-                        $('<div>').css({
-                            "font-size": "0.8em"
-                        }).text(opt.source.join(",")).appendTo(element);
-                    }
-
-                    matches.push({
-                        value: v,
-                        label: element,
-                        i:i
-                    })
-                }
-            })
-            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: "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: "complete", source: ["join"] },
-        { value: "contentType", source: ["mqtt"] },
-        { value: "cookies", source: ["http in","http request"] },
-        { value: "correlationData", source: ["mqtt"] },
-        { value: "delay", source: ["delay","trigger"] },
-        { value: "encoding", source: ["file"] },
-        { value: "error", source: ["catch"] },
-        { value: "filename", source: ["file","file in"] },
-        { value: "flush", source: ["delay"] },
-        { value: "followRedirects", source: ["http request"] },
-        { value: "headers", source: ["http in"," http request"] },
-        { value: "kill", source: ["exec"] },
-        { value: "messageExpiryInterval", source: ["mqtt"] },
-        { value: "method", source: ["http-request"] },
-        { value: "options", source: ["xml"] },
-        { value: "parts", source: ["split","join"] },
-        { value: "pid", source: ["exec"] },
-        { value: "qos", source: ["mqtt"] },
-        { value: "rate", source: ["delay"] },
-        { value: "rejectUnauthorized", source: ["http request"] },
-        { value: "requestTimeout", source: ["http request"] },
-        { value: "reset", source: ["delay","trigger","join","rbe"] },
-        { value: "responseTopic", source: ["mqtt"] },
-        { value: "restartTimeout", source: ["join"] },
-        { value: "retain", source: ["mqtt"] },
-        { value: "select", source: ["html"] },
-        { value: "statusCode", source: ["http in"] },
-        { value: "template", source: ["template"] },
-        { value: "toFront", source: ["delay"] },
-        { value: "topic", source: ["inject","mqtt","rbe"] },
-        { value: "url", source: ["http request"] },
-        { value: "userProperties", source: ["mqtt"] }
-    ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
-            export: contextExport,
-            valueLabel: contextLabel
+            export: contextExport
         },
         global: {value:"global",label:"global.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
-            export: contextExport,
-            valueLabel: contextLabel
+            export: contextExport
         },
         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]+)?$/},
@@ -261,131 +164,8 @@
                     }
                 })
             }
-        },
-        cred:{
-            value:"cred",
-            label:"credential",
-            icon:"fa fa-lock",
-            inputType: "password",
-            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",
-                    right:"6px",
-                    top: "6px",
-                    "pointer-events":"all"
-                }).appendTo(container);
-                var eyeButton = $('<button type="button" class="red-ui-button red-ui-button-small"></button>').css({
-                    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","-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({
-                        padding:"6px 6px",
-                        borderRadius:"4px"
-                    }).addClass("red-ui-typedInput-value-label-inactive").appendTo(container);
-                    var editButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-pencil"></i></button>').appendTo(buttons).on("click", function(evt) {
-                        evt.preventDefault();
-                        innerContainer.hide();
-                        container.css("background","none");
-                        container.css("pointer-events","none");
-                        that.input.val("");
-                        that.element.val("");
-                        that.elementDiv.show();
-                        editButton.hide();
-                        cancelButton.show();
-                        eyeButton.show();
-                        setTimeout(function() {
-                            that.input.focus();
-                        },50);
-                    });
-                    var cancelButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').css("margin-left","3px").appendTo(buttons).on("click", function(evt) {
-                        evt.preventDefault();
-                        innerContainer.show();
-                        container.css("background","");
-                        that.input.val("__PWRD__");
-                        that.element.val("__PWRD__");
-                        that.elementDiv.hide();
-                        editButton.show();
-                        cancelButton.hide();
-                        eyeButton.hide();
-                        that.input.attr("type","password");
-                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
-
-                    }).hide();
-                } else {
-                    container.css("background","none");
-                    container.css("pointer-events","none");
-                    this.elementDiv.show();
-                    eyeButton.show();
-                }
-            }
         }
     };
-
-    // 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", {
@@ -400,14 +180,6 @@
                 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 = [];
@@ -419,8 +191,7 @@
             }
             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);
@@ -435,7 +206,7 @@
                 this.input.css('width','100%');
                 this.uiSelect.width(m[1]);
                 this.uiWidth = null;
-            } else if (this.uiWidth !== 0){
+            } else {
                 this.uiSelect.width(this.uiWidth);
             }
             ["Right","Left"].forEach(function(d) {
@@ -449,19 +220,11 @@
                 that.input.attr(d,m);
             });
 
-            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');
 
-            if (!this.options.types && this.options.type) {
-                this.options.types = [this.options.type]
-            } else {
-                this.options.types = this.options.types||Object.keys(allOptions);
-            }
+            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);
@@ -491,22 +254,9 @@
             this.input.on('change', function() {
                 that.validate();
                 that.element.val(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);
+                that.element.trigger('change',that.propertyType,that.value());
             });
             this.input.on('keydown', function(evt) {
-                if (that.typeMap[that.propertyType].autoComplete) {
-                    return
-                }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
                     evt.stopPropagation();
                 }
@@ -524,19 +274,14 @@
                 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();
@@ -555,9 +300,7 @@
 
             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.typeField.val() || this.options.default||this.typeList[0].value);
-            this.typeChanged = !!this.options.default;
+            this.type(this.options.default||this.typeList[0].value);
         }catch(err) {
             console.log(err.stack);
         }
@@ -580,11 +323,7 @@
                 });
 
                 this._showMenu(this.optionMenu,this.optionSelectTrigger);
-                var targetValue = this.optionValue;
-                if (this.optionValue === null || this.optionValue === undefined) {
-                    targetValue = this.value();
-                }
-                var selectedOption = this.optionMenu.find("[value='"+targetValue+"']");
+                var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
                 if (selectedOption.length === 0) {
                     selectedOption = this.optionMenu.children(":first");
                 }
@@ -630,9 +369,6 @@
                 if (opt.label) {
                     op.text(opt.label);
                 }
-                if (opt.title) {
-                    op.prop('title', opt.title)
-                }
                 if (opt.icon) {
                     if (opt.icon.indexOf("<") === 0) {
                         $(opt.icon).prependTo(op);
@@ -708,7 +444,7 @@
             var height = relativeTo.height();
             var menuHeight = menu.height();
             var top = (height+pos.top);
-            if (top+menuHeight-$(document).scrollTop() > $(window).height()) {
+            if (top+menuHeight > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
             if (top < 0) {
@@ -752,46 +488,88 @@
                 done(labelWidth);
             }
         },
+        _resize: function() {
+            var that = this;
+            if (this.uiWidth !== null) {
+                this.uiSelect.width(this.uiWidth);
+            }
+            var type = this.typeMap[this.propertyType];
+            if (type && type.hasValue === false) {
+                this.selectTrigger.addClass("red-ui-typedInput-full-width");
+            } else {
+                this.selectTrigger.removeClass("red-ui-typedInput-full-width");
+                this._getLabelWidth(this.selectTrigger, function(labelWidth) {
+                    that.elementDiv.css('left',labelWidth+"px");
+                    that.valueLabelContainer.css('left',labelWidth+"px");
+                    if (that.optionExpandButton.shown) {
+                        that.elementDiv.css('right',"22px");
+                        that.valueLabelContainer.css('right',"22px");
+                    } else {
+                        that.elementDiv.css('right','0');
+                        that.valueLabelContainer.css('right','0');
+                        that.input.css({
+                            'border-top-right-radius': '4px',
+                            'border-bottom-right-radius': '4px'
+                        });
+                    }
+                    if (that.optionSelectTrigger) {
+                        if (type && type.options && type.hasValue === true) {
+                            that.optionSelectLabel.css({'left':'auto'})
+                            that._getLabelWidth(that.optionSelectLabel, function(lw) {
+                                that.optionSelectTrigger.css({'width':(23+lw)+"px"});
+                                that.elementDiv.css('right',(23+lw)+"px");
+                                that.input.css({
+                                    'border-top-right-radius': 0,
+                                    'border-bottom-right-radius': 0
+                                });
+                            });
+                        } else {
+                            that.optionSelectLabel.css({'left':'0'})
+                            that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+                            if (!that.optionExpandButton.shown) {
+                                that.elementDiv.css({'right':0});
+                                that.input.css({
+                                    'border-top-right-radius': '4px',
+                                    'border-bottom-right-radius': '4px'
+                                });
+                            }
+                        }
+                    }
+                });
+            }
+        },
         _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,opt.hasValue?this.valueLabelContainer:this.optionSelectLabel,o);
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
                 } else {
-                    this.typeMap[this.propertyType].valueLabel.call(this,opt.hasValue?this.valueLabelContainer:this.optionSelectLabel,o.value);
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
                 }
-            }
-            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 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 {
-                        this.optionSelectLabel.text(o.value);
-                    }
-                    if (opt.hasValue) {
-                        this.optionValue = o.value;
-                        this.input.trigger('change',[this.propertyType,this.value()]);
+                        // icon class
+                        $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
                     }
+                } else if (o.label) {
+                    this.optionSelectLabel.text(o.label);
                 } else {
-                    this.optionSelectLabel.text(o.length+" selected");
+                    this.optionSelectLabel.text(o.value);
                 }
+                if (opt.hasValue) {
+                    this.optionValue = o.value;
+                    this._resize();
+                    this.input.trigger('change',this.propertyType,this.value());
+                }
+            } else {
+                this.optionSelectLabel.text(o.length+" selected");
             }
         },
         _destroy: function() {
@@ -805,7 +583,6 @@
             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') {
@@ -816,13 +593,6 @@
                 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) {
@@ -830,33 +600,20 @@
             }
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                if (!firstCall) {
-                    this.type(this.typeList[0].value);
-                }
+                this.type(this.typeList[0].value);
             } else {
                 this.propertyType = null;
-                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()
+                this.type(currentType);
             }
+            setTimeout(function() {that._resize();},0);
         },
         width: function(desiredWidth) {
             this.uiWidth = desiredWidth;
-            if (this.uiWidth !== null) {
-                this.uiSelect.width(this.uiWidth);
-            }
+            this._resize();
         },
         value: function(value) {
             var that = this;
-            // 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] || {};
+            var opt = this.typeMap[this.propertyType];
             if (!arguments.length) {
                 var v = this.input.val();
                 if (opt.export) {
@@ -864,38 +621,27 @@
                 }
                 return v;
             } else {
-                if (this.options.debug) { console.log(this.identifier,"----- SET VALUE ------",value) }
                 var selectedOption = [];
-                var valueToCheck = value;
                 if (opt.options) {
-                    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];
+                    var checkValues = [value];
                     if (opt.multiple) {
                         selectedOption = [];
-                        checkValues = valueToCheck.split(",");
+                        checkValues = value.split(",");
                     }
-                    checkValues.forEach(function(valueToCheck) {
+                    checkValues.forEach(function(value) {
                         for (var i=0;i<opt.options.length;i++) {
                             var op = opt.options[i];
                             if (typeof op === "string") {
-                                if (op === valueToCheck || op === ""+valueToCheck) {
+                                if (op === value || op === ""+value) {
                                     selectedOption.push(that.activeOptions[op]);
                                     break;
                                 }
-                            } else if (op.value === valueToCheck) {
+                            } else if (op.value === value) {
                                 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) {
@@ -912,7 +658,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) {
@@ -920,64 +666,9 @@
                 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);
                     }
@@ -989,28 +680,19 @@
                         }
                         else if (opt.icon.indexOf("/") !== -1) {
                             image = new Image();
+                            image.onload = function() { that._resize(); }
+                            image.onerror = function() { that._resize(); }
                             image.name = opt.icon;
                             image.src = mapDeprecatedIcon(opt.icon);
                             $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                         }
                         else {
-                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon,style:"min-width: 13px; margin-right: 4px;"}).prependTo(this.selectLabel);
+                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
                         }
                     }
                     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 {
-                        this.selectTrigger.removeClass("red-ui-typedInput-full-width");
-                    }
-
                     if (this.optionMenu) {
                         this.optionMenu.remove();
                         this.optionMenu = null;
@@ -1021,13 +703,11 @@
                             this.optionExpandButton.shown = false;
                         }
                         if (this.optionSelectTrigger) {
-                            this.optionSelectTrigger.css({"display":"inline-flex"});
+                            this.optionSelectTrigger.show();
                             if (!opt.hasValue) {
-                                this.optionSelectTrigger.css({"flex-grow":1})
                                 this.elementDiv.hide();
                                 this.valueLabelContainer.hide();
                             } else {
-                                this.optionSelectTrigger.css({"flex-grow":0})
                                 this.elementDiv.show();
                                 this.valueLabelContainer.hide();
                             }
@@ -1046,12 +726,22 @@
 
                             var op;
                             if (!opt.hasValue) {
-                                // Check the value is valid for the available options
-                                var validValues = isOptionValueValid(opt,this.input.val());
+                                var validValue = false;
+                                var currentVal = this.input.val();
                                 if (!opt.multiple) {
-                                    if (validValues) {
-                                        that._updateOptionSelectLabel(validValues)
-                                    } else {
+                                    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) {
                                         op = opt.options[0];
                                         if (typeof op === "string") {
                                             this.value(op);
@@ -1062,19 +752,27 @@
                                         }
                                     }
                                 } else {
-                                    if (!validValues) {
-                                        validValues = (opt.default || []).map(function(v) {
-                                            return typeof v === "string"?v:v.value
-                                        });
-                                        this.value(validValues.join(","));
+                                    // 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(","));
                                     }
-                                    that._updateOptionSelectLabel(validValues);
                                 }
                             } else {
                                 var selectedOption = this.optionValue||opt.options[0];
                                 if (opt.parse) {
-                                    var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
-                                    var parts = opt.parse(this.input.val(),selectedOptionObj);
+                                    var parts = opt.parse(this.input.val());
                                     if (parts.option) {
                                         selectedOption = parts.option;
                                         if (!this.activeOptions.hasOwnProperty(selectedOption)) {
@@ -1098,7 +796,6 @@
                                         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 {
@@ -1120,36 +817,28 @@
                             });
                         }
                         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();
                         }
-                        if (opt.inputType) {
-                            this.input.attr('type',opt.inputType)
-                        } else {
-                            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());
+                            this.elementDiv.hide();
                         } 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
-                                })
-                            }
                         }
                         if (this.optionExpandButton) {
                             if (opt.expand) {
@@ -1180,7 +869,7 @@
                                         panel.show({
                                             target:that.optionExpandButton,
                                             onclose:content.onclose,
-                                            align: "left"
+                                            align: "right"
                                         });
                                     }
                                 })
@@ -1190,7 +879,10 @@
                             }
                         }
                         this._trigger("typechange",null,this.propertyType);
-                        this.input.trigger('change',[this.propertyType,this.value()]);
+                        this.input.trigger('change',this.propertyType,this.value());
+                    }
+                    if (!image) {
+                        this._resize();
                     }
                 }
             }
@@ -1218,25 +910,10 @@
         },
         show: function() {
             this.uiSelect.show();
+            this._resize();
         },
         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/deploy.js

@@ -108,7 +108,7 @@ RED.deploy = (function() {
 
 
 
-        RED.events.on('workspace:dirty',function(state) {
+        RED.events.on('nodes:change',function(state) {
             if (state.dirty) {
                 window.onbeforeunload = function() {
                     return RED._("deploy.confirm.undeployedChanges");
@@ -333,21 +333,9 @@ RED.deploy = (function() {
                 var unknownNodes = [];
                 var 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) {
+                    hasInvalid = hasInvalid || !node.valid;
+                    if (!node.valid) {
                         invalidNodes.push(getNodeInfo(node));
                     }
                     if (node.type === "unknown") {
@@ -357,7 +345,6 @@ RED.deploy = (function() {
                     }
                 });
                 hasUnknown = unknownNodes.length > 0;
-                hasInvalid = invalidNodes.length > 0;
 
                 var unusedConfigNodes = [];
                 RED.nodes.eachConfig(function(node) {

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

@@ -554,8 +554,6 @@ RED.diff = (function() {
                     color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
-            } else if (node.type === "group") {
-                def = RED.group.def;
             } else {
                 def = {};
             }
@@ -765,15 +763,16 @@ RED.diff = (function() {
             }
         }
 
+
         if (node.hasOwnProperty('x')) {
             if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
+                if (localNode.x !== node.x || localNode.y !== node.y) {
                     localChanged = true;
                     localChanges++;
                 }
             }
             if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
                     remoteChanged = true;
                     remoteChanges++;
                 }
@@ -791,12 +790,7 @@ 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);
-                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,
+                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
                     {
                         path: "position",
                         exposeApi: true,
@@ -817,12 +811,7 @@ 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);
-                    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,
+                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
                         {
                             path: "position",
                             exposeApi: true,
@@ -894,11 +883,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!=='w'&&p!=='h'&&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!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
         if (def.defaults) {
             properties = properties.concat(Object.keys(def.defaults));
         }
-        if (node.type !== 'tab' && node.type !== "group") {
+        if (node.type !== 'tab') {
             properties = properties.concat(['inputLabels','outputLabels']);
         }
         if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&
@@ -1040,9 +1029,9 @@ RED.diff = (function() {
         }
 
         var localSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-local"}).on("click", function(e) { e.stopPropagation();}).appendTo(localDiv);
-        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-local",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
+        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
         var remoteSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-remote"}).on("click", function(e) { e.stopPropagation();}).appendTo(remoteDiv);
-        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-remote",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
+        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
         if (state === 'local') {
             localRadio.prop('checked',true);
         } else if (state === 'remote') {
@@ -1387,7 +1376,6 @@ RED.diff = (function() {
 
     function mergeDiff(diff) {
         //console.log(diff);
-        var selectedTab = RED.workspaces.active();
         var appliedDiff = applyDiff(diff);
 
         var newConfig = appliedDiff.config;
@@ -1423,7 +1411,7 @@ RED.diff = (function() {
         // Restore the original flow so subsequent merge resolutions can properly
         // identify new-vs-old
         RED.nodes.originalFlow(originalFlow);
-        imported.nodes.forEach(function(n) {
+        imported[0].forEach(function(n) {
             if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
                 n.changed = true;
             }
@@ -1438,7 +1426,6 @@ 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

@@ -15,7 +15,7 @@
  **/
 (function() {
 
-    var template = '<script type="text/x-red" data-template-name="_buffer"><div id="red-ui-editor-type-buffer-panels"><div id="red-ui-editor-type-buffer-panel-str" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><button class="red-ui-editor-type-buffer-type red-ui-button red-ui-button-small"><i class="fa fa-exclamation-circle"></i> <span id="red-ui-editor-type-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="red-ui-editor-type-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></button></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="red-ui-editor-type-buffer-str"></div></div></div><div id="red-ui-editor-type-buffer-panel-bin" class="red-ui-panel"><div class="form-row node-text-editor-row" style="margin-top: 10px; margin-bottom:0;"><div class="node-text-editor" id="red-ui-editor-type-buffer-bin"></div></div></div></div></script>';
+    var template = '<script type="text/x-red" data-template-name="_buffer"><div id="red-ui-editor-type-buffer-panels"><div id="red-ui-editor-type-buffer-panel-str" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><button class="red-ui-editor-type-buffer-type red-ui-button red-ui-button-small"><i class="fa fa-exclamation-circle"></i> <span id="red-ui-editor-type-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="red-ui-editor-type-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></button></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="red-ui-editor-type-buffer-str"></div></div></div><div id="red-ui-editor-type-buffer-panel-bin" class="red-ui-panel"><div class="form-row node-text-editor-row" style="margin-top: 10px"><div class="node-text-editor" id="red-ui-editor-type-buffer-bin"></div></div></div></div></script>';
 
     function stringToUTF8Array(str) {
         var data = [];
@@ -187,7 +187,8 @@
 
                     $(".red-ui-editor-type-buffer-type").on("click", function(e) {
                         e.preventDefault();
-                        RED.sidebar.help.set(RED._("bufferEditor.modeDesc"));
+                        RED.sidebar.info.set(RED._("bufferEditor.modeDesc"));
+                        RED.sidebar.info.show();
                     })
 
 

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

@@ -1,107 +0,0 @@
-/**
- * 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 = ACE;
-    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

@@ -1,153 +0,0 @@
-/*
-* 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.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",
-                        cursor: editor.getCursorPosition(),
-                        complete: function(v,cursor) {
-                            editor.setValue(v, -1);
-                            editor.gotoLine(cursor.row+1,cursor.column,false);
-                            setTimeout(function() {
-                                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 {
-                this._destroy();
-            } catch (e) { }
-            $(el).remove();
-            $(toolbarRow).remove();
-        }
-        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,209 +0,0 @@
-RED.editor.colorPicker = RED.colorPicker = (function() {
-
-    function create(options) {
-        var color = options.value;
-        var id = options.id;
-        var colorPalette = options.palette || [];
-        var width = options.cellWidth || 30;
-        var height = options.cellHeight || 30;
-        var margin = options.cellMargin || 2;
-        var perRow = options.cellPerRow || 6;
-
-        var container = $("<div>",{style:"display:inline-block"});
-        var colorHiddenInput = $("<input/>", { id: id, type: "hidden", value: color }).appendTo(container);
-        var opacityHiddenInput = $("<input/>", { id: id+"-opacity", type: "hidden", value: options.hasOwnProperty('opacity')?options.opacity:"1" }).appendTo(container);
-
-        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(container);
-        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
-
-        var colorDispContainer = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
-        $('<div>',{class:"red-ui-color-picker-cell-none"}).appendTo(colorDispContainer);
-        var colorDisp = $('<div>',{class:"red-ui-color-picker-swatch"}).appendTo(colorDispContainer);
-
-
-        var refreshDisplay = function(color) {
-            if (color === "none") {
-                colorDisp.addClass('red-ui-color-picker-cell-none').css({
-                    "background-color": "",
-                    opacity: 1
-                });
-                colorDispContainer.css({
-                    "border-color":""
-                })
-            } else {
-                var opacity = parseFloat(opacityHiddenInput.val())
-                colorDisp.removeClass('red-ui-color-picker-cell-none').css({
-                    "background-color": color,
-                    "opacity": opacity
-                });
-                var border = RED.utils.getDarkerColor(color);
-                if (border[0] === '#') {
-                    border += Math.round(255*Math.floor(opacity*100)/100).toString(16);
-                } else {
-                    border = "";
-                }
-
-                colorDispContainer.css({
-                    "border-color": border
-                })
-            }
-            if (options.hasOwnProperty('opacity')) {
-                $(".red-ui-color-picker-opacity-slider-overlay").css({
-                    "background-image": "linear-gradient(90deg, transparent 0%, "+color+" 100%)"
-                })
-            }
-
-
-        }
-
-        colorButton.on("click", function (e) {
-            var numColors = colorPalette.length;
-
-            var picker = $("<div/>", {
-                class: "red-ui-color-picker"
-            }).css({
-                width: ((width+margin+margin)*perRow)+"px",
-                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
-            });
-            var count = 0;
-            var row = null;
-            row = $("<div/>").appendTo(picker);
-
-            var colorInput = $('<input>',{
-                type:"text",
-                value:colorHiddenInput.val()
-            }).appendTo(row);
-            var focusTarget = colorInput;
-            colorInput.on("change", function (e) {
-                var color = colorInput.val();
-                colorHiddenInput.val(color).trigger('change');
-                refreshDisplay(color);
-            });
-            // if (options.hasOwnProperty('opacity')) {
-            //     var sliderContainer = $("<div>",{class:"red-ui-color-picker-opacity-slider"
-            // }
-
-            if (options.none) {
-                row = $("<div/>").appendTo(picker);
-                var button = $("<button/>", {
-                    class:"red-ui-color-picker-cell red-ui-color-picker-cell-none"
-                }).css({
-                    width: width+"px",
-                    height: height+"px",
-                    margin: margin+"px"
-                }).appendTo(row);
-                button.on("click",  function (e) {
-                    e.preventDefault();
-                    colorInput.val("none");
-                    colorInput.trigger("change");
-                });
-            }
-
-
-            colorPalette.forEach(function (col) {
-                if ((count % perRow) == 0) {
-                    row = $("<div/>").appendTo(picker);
-                }
-                var button = $("<button/>", {
-                    class:"red-ui-color-picker-cell"
-                }).css({
-                    width: width+"px",
-                    height: height+"px",
-                    margin: margin+"px",
-                    backgroundColor: col,
-                    "border-color": RED.utils.getDarkerColor(col)
-                }).appendTo(row);
-                button.on("click",  function (e) {
-                    e.preventDefault();
-                    // colorPanel.hide();
-                    colorInput.val(col);
-                    colorInput.trigger("change");
-                });
-                count++;
-            });
-            if (options.none || options.hasOwnProperty('opacity')) {
-                row = $("<div/>").appendTo(picker);
-                // if (options.none) {
-                //     var button = $("<button/>", {
-                //         class:"red-ui-color-picker-cell red-ui-color-picker-cell-none"
-                //     }).css({
-                //         width: width+"px",
-                //         height: height+"px",
-                //         margin: margin+"px"
-                //     }).appendTo(row);
-                //     button.on("click",  function (e) {
-                //         e.preventDefault();
-                //         colorPanel.hide();
-                //         selector.val("none");
-                //         selector.trigger("change");
-                //     });
-                // }
-                if (options.hasOwnProperty('opacity')) {
-                    var sliderContainer = $("<div>",{class:"red-ui-color-picker-opacity-slider"}).appendTo(row);
-                    sliderContainer.on("mousedown", function(evt) {
-                        if (evt.target === sliderHandle[0]) {
-                            return;
-                        }
-                        var v = evt.offsetX/sliderContainer.width();
-                        sliderHandle.css({
-                            left: ( v*(sliderContainer.width() - sliderHandle.outerWidth()))+"px"
-                        });
-                        v = Math.floor(100*v)
-                        opacityHiddenInput.val(v/100)
-                        opacityLabel.text(v+"%");
-                        refreshDisplay(colorHiddenInput.val());
-                    })
-                     $("<div>",{class:"red-ui-color-picker-opacity-slider-overlay"}).appendTo(sliderContainer);
-                    var sliderHandle = $("<div>",{class:"red-ui-color-picker-opacity-slider-handle red-ui-button red-ui-button-small"}).appendTo(sliderContainer).draggable({
-                        containment: "parent",
-                        axis: "x",
-                        drag: function( event, ui ) {
-                            var v = Math.max(0,ui.position.left/($(this).parent().width()-$(this).outerWidth()));
-                            // Odd bug that if it is loaded with a non-0 value, the first time
-                            // it is dragged it ranges -1 to 99. But every other time, its 0 to 100.
-                            // The Math.max above makes the -1 disappear. The follow hack ensures
-                            // it always maxes out at a 100, at the cost of not allowing 99% exactly.
-                            v = Math.floor(100*v)
-                            if ( v === 99 ) {
-                                v = 100;
-                            }
-                            // console.log("uip",ui.position.left);
-                            opacityHiddenInput.val(v/100)
-                            opacityLabel.text(v+"%");
-                            refreshDisplay(colorHiddenInput.val());
-                        }
-                    });
-                    var opacityLabel = $('<small></small>').appendTo(row);
-                    setTimeout(function() {
-                        sliderHandle.css({
-                            left: (parseFloat(opacityHiddenInput.val())*(sliderContainer.width() - sliderHandle.outerWidth()))+"px"
-                        })
-                        opacityLabel.text(Math.floor(opacityHiddenInput.val()*100)+"%");
-                    },50);
-                }
-            }
-
-            var colorPanel = RED.popover.panel(picker);
-            setTimeout(function() {
-                refreshDisplay(colorHiddenInput.val())
-            },50);
-            colorPanel.show({
-                target: colorButton,
-                onclose: function() {
-                    colorButton.focus();
-                }
-            })
-            if (focusTarget) {
-                focusTarget.focus();
-            }
-        });
-        setTimeout(function() {
-            refreshDisplay(colorHiddenInput.val())
-        },50);
-        return container;
-    }
-
-    return {
-        create: create
-    }
-})();

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

@@ -1,616 +0,0 @@
-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)
-                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
-                    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";
-
-                        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
-    }
-})();

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

@@ -102,7 +102,7 @@
                         var f = $(this).val();
                         var args = RED._('jsonata:'+f+".args",{defaultValue:''});
                         var title = "<h5>"+f+"("+args+")</h5>";
-                        var body = RED.utils.renderMarkdown(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
+                        var body = marked(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
                         $("#red-ui-editor-type-expression-help").html(title+"<p>"+body+"</p>");
 
                     })
@@ -121,75 +121,73 @@
                     var currentFunctionMarker = null;
 
                     expressionEditor.getSession().setValue(value||"",-1);
-                    //ace only (monaco has jsonata tokeniser)
-                    if(expressionEditor.type == "ace") {
-                        expressionEditor.on("changeSelection", function() {
-                            var c = expressionEditor.getCursorPosition();
-                            var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
-                            if (token !== currentToken || (token && /paren/.test(token.type) && c.column !== currentTokenPos)) {
-                                currentToken = token;
-                                var r,p;
-                                var scopedFunction = null;
-                                if (token && token.type === 'keyword') {
+                    expressionEditor.on("changeSelection", function() {
+                        var c = expressionEditor.getCursorPosition();
+                        var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
+                        if (token !== currentToken || (token && /paren/.test(token.type) && c.column !== currentTokenPos)) {
+                            currentToken = token;
+                            var r,p;
+                            var scopedFunction = null;
+                            if (token && token.type === 'keyword') {
+                                r = c.row;
+                                scopedFunction = token;
+                            } else {
+                                var depth = 0;
+                                var next = false;
+                                if (token) {
+                                    if (token.type === 'paren.rparen') {
+                                        // If this is a block of parens ')))', set
+                                        // depth to offset against the cursor position
+                                        // within the block
+                                        currentTokenPos = c.column;
+                                        depth = c.column - (token.start + token.value.length);
+                                    }
                                     r = c.row;
-                                    scopedFunction = token;
+                                    p = token.index;
                                 } else {
-                                    var depth = 0;
-                                    var next = false;
-                                    if (token) {
-                                        if (token.type === 'paren.rparen') {
-                                            // If this is a block of parens ')))', set
-                                            // depth to offset against the cursor position
-                                            // within the block
-                                            currentTokenPos = c.column;
-                                            depth = c.column - (token.start + token.value.length);
-                                        }
-                                        r = c.row;
-                                        p = token.index;
-                                    } else {
-                                        r = c.row-1;
-                                        p = -1;
-                                    }
-                                    while ( scopedFunction === null && r > -1) {
-                                        var rowTokens = expressionEditor.getSession().getTokens(r);
-                                        if (p === -1) {
-                                            p = rowTokens.length-1;
-                                        }
-                                        while (p > -1) {
-                                            var type = rowTokens[p].type;
-                                            if (next) {
-                                                if (type === 'keyword') {
-                                                    scopedFunction = rowTokens[p];
-                                                    // console.log("HIT",scopedFunction);
-                                                    break;
-                                                }
-                                                next = false;
-                                            }
-                                            if (type === 'paren.lparen') {
-                                                depth-=rowTokens[p].value.length;
-                                            } else if (type === 'paren.rparen') {
-                                                depth+=rowTokens[p].value.length;
-                                            }
-                                            if (depth < 0) {
-                                                next = true;
-                                                depth = 0;
-                                            }
-                                            // console.log(r,p,depth,next,rowTokens[p]);
-                                            p--;
-                                        }
-                                        if (!scopedFunction) {
-                                            r--;
-                                        }
-                                    }
+                                    r = c.row-1;
+                                    p = -1;
                                 }
-                                expressionEditor.session.removeMarker(currentFunctionMarker);
-                                if (scopedFunction) {
-                                //console.log(token,.map(function(t) { return t.type}));
-                                    funcSelect.val(scopedFunction.value).trigger("change");
+                                while ( scopedFunction === null && r > -1) {
+                                    var rowTokens = expressionEditor.getSession().getTokens(r);
+                                    if (p === -1) {
+                                        p = rowTokens.length-1;
+                                    }
+                                    while (p > -1) {
+                                        var type = rowTokens[p].type;
+                                        if (next) {
+                                            if (type === 'keyword') {
+                                                scopedFunction = rowTokens[p];
+                                                // console.log("HIT",scopedFunction);
+                                                break;
+                                            }
+                                            next = false;
+                                        }
+                                        if (type === 'paren.lparen') {
+                                            depth-=rowTokens[p].value.length;
+                                        } else if (type === 'paren.rparen') {
+                                            depth+=rowTokens[p].value.length;
+                                        }
+                                        if (depth < 0) {
+                                            next = true;
+                                            depth = 0;
+                                        }
+                                        // console.log(r,p,depth,next,rowTokens[p]);
+                                        p--;
+                                    }
+                                    if (!scopedFunction) {
+                                        r--;
+                                    }
                                 }
                             }
-                        });
-                    }
+                            expressionEditor.session.removeMarker(currentFunctionMarker);
+                            if (scopedFunction) {
+                            //console.log(token,.map(function(t) { return t.type}));
+                                funcSelect.val(scopedFunction.value).trigger("change");
+                            }
+                        }
+                    });
+
                     dialogForm.i18n();
                     $("#red-ui-editor-type-expression-func-insert").on("click", function(e) {
                         e.preventDefault();
@@ -209,7 +207,6 @@
                         }
                         expressionEditor.getSession().setValue(v||"",-1);
                     });
-                    funcSelect.change();
 
                     var tabs = RED.tabs.create({
                         element: $("#red-ui-editor-type-expression-tabs"),
@@ -239,7 +236,8 @@
                     var changeTimer;
                     $(".red-ui-editor-type-expression-legacy").on("click", function(e) {
                         e.preventDefault();
-                        RED.sidebar.help.set(RED._("expressionEditor.compatModeDesc"));
+                        RED.sidebar.info.set(RED._("expressionEditor.compatModeDesc"));
+                        RED.sidebar.info.show();
                     })
                     var testExpression = function() {
                         var value = testDataEditor.getValue();
@@ -247,7 +245,7 @@
                         var currentExpression = expressionEditor.getValue();
                         var expr;
                         var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
+                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                         $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                         try {
                             expr = jsonata(currentExpression);
@@ -319,9 +317,9 @@
                             var p2 = $("#red-ui-editor-type-expression-panel-info > .form-row > div:first-child");
                             p2Height -= p2.outerHeight(true) + 20;
                             $(".red-ui-editor-type-expression-tab-content").height(p2Height);
-                            $("#red-ui-editor-type-expression-test-data").css("height",(p2Height-25)+"px");
+                            $("#red-ui-editor-type-expression-test-data").css("height",(p2Height-5)+"px");
                             testDataEditor.resize();
-                            $("#red-ui-editor-type-expression-test-result").css("height",(p2Height-25)+"px");
+                            $("#red-ui-editor-type-expression-test-result").css("height",(p2Height-5)+"px");
                             testResultEditor.resize();
                         }
                     });
@@ -345,7 +343,6 @@
                     }
                     expressionEditor.destroy();
                     testDataEditor.destroy();
-                    testResultEditor.destroy();
                 },
                 show: function() {}
             }