fiftyone.pipeline.core 4.3.7 → 4.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/elementData.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/errorMessages.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/evidence.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/flowData.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/flowElement.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/helpers.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/index.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/jsonbundler.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fiftyone.pipeline.core",
3
- "version": "4.3.7",
3
+ "version": "4.4.1",
4
4
  "description": "Core library for the 51Degrees Pipeline API",
5
5
  "directories": {
6
6
  "test": "tests"
package/pipeline.js CHANGED
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -122,11 +122,17 @@ class PipelineBuilder {
122
122
  flowElements.push(new FlowElement(element.elementParameters));
123
123
  });
124
124
 
125
- flowElements = flowElements.concat(this.getJavaScriptElements());
125
+ flowElements = this.addRequiredElements(flowElements);
126
126
 
127
127
  return new Pipeline(flowElements);
128
128
  }
129
129
 
130
+ addRequiredElements(flowElements) {
131
+ return flowElements
132
+ .concat(this.getJavaScriptElements())
133
+ .concat(this.getHttpElements());
134
+ }
135
+
130
136
  /**
131
137
  * Internal function used to first check if the
132
138
  * JavaScript elements should be added to the pipeline
@@ -214,10 +220,7 @@ class PipelineBuilder {
214
220
  * @returns {Pipeline} The constructed Pipeline
215
221
  */
216
222
  build () {
217
- this.flowElements = this.flowElements
218
- .concat(this.getJavaScriptElements())
219
- .concat(this.getHttpElements());
220
-
223
+ this.flowElements = this.addRequiredElements(this.flowElements);
221
224
  return new Pipeline(this.flowElements);
222
225
  }
223
226
  }
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -23,6 +23,8 @@
23
23
  const FlowElement = require('./flowElement.js');
24
24
  const ElementDataDictionary = require('./elementDataDictionary.js');
25
25
  const AspectPropertyValue = require('./aspectPropertyValue');
26
+ // SetHeader source headers separator
27
+ const SOURCE_HEADER_SEPARATOR = ',';
26
28
 
27
29
  /**
28
30
  * @typedef {import('./pipeline')} Pipeline
@@ -130,19 +132,19 @@ const AspectPropertyValue = require('./aspectPropertyValue');
130
132
  getResponseHeaders(flowData) {
131
133
  const result = {};
132
134
  for (const [key, header] of Object.entries(this.headers)) {
133
- var headerValue = '';
135
+ var headerValue = new Set();
134
136
  header.properties.forEach(property => {
135
137
  var keys = property.split('.');
136
138
  var value = this.tryGetValue(flowData, keys[0], keys[1]);
137
139
  if (value !== undefined && value !== '') {
138
- if (headerValue.length > 0) {
139
- headerValue += ',';
140
- }
141
- headerValue += value;
140
+ value.split(SOURCE_HEADER_SEPARATOR).forEach((v) => {
141
+ headerValue.add(v);
142
+ });
142
143
  }
143
144
  });
144
- if (headerValue !== '') {
145
- result[header.name] = headerValue;
145
+ if (headerValue.size > 0) {
146
+ result[header.name] =
147
+ Array.from(headerValue).join(SOURCE_HEADER_SEPARATOR);
146
148
  }
147
149
  }
148
150
  return result;
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -17,7 +17,7 @@
17
17
  * If using the Work as, or as part of, a network application, by
18
18
  * including the attribution notice(s) required under Article 5 of the EUPL
19
19
  * in the end user terms of the application under an appropriate heading,
20
- such notice(s) shall fulfill the requirements of that article.
20
+ * such notice(s) shall fulfill the requirements of that article.
21
21
  * ********************************************************************* */
22
22
 
23
23
  const util = require('util');
@@ -229,6 +229,10 @@ test('build from config', done => {
229
229
  configPipelineFlowData.process().then(function () {
230
230
  expect(configPipelineFlowData.get('configTest')
231
231
  .get('built')).toBe('hello_world');
232
+ expect(configPipeline.getElement('sequence')).not.toBe(undefined);
233
+ expect(configPipeline.getElement('jsonbundler')).not.toBe(undefined);
234
+ expect(configPipeline.getElement('javascriptbuilder')).not.toBe(undefined);
235
+ expect(configPipeline.getElement('set-headers')).not.toBe(undefined);
232
236
 
233
237
  done();
234
238
  });
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
package/tests/jsoutput.js CHANGED
@@ -1,3 +1,25 @@
1
+ /* *********************************************************************
2
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
+ *
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
+ *
9
+ * If a copy of the EUPL was not distributed with this file, You can obtain
10
+ * one at https://opensource.org/licenses/EUPL-1.2.
11
+ *
12
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
13
+ * amended by the European Commission) shall be deemed incompatible for
14
+ * the purposes of the Work and the provisions of the compatibility
15
+ * clause in Article 5 of the EUPL shall not apply.
16
+ *
17
+ * If using the Work as, or as part of, a network application, by
18
+ * including the attribution notice(s) required under Article 5 of the EUPL
19
+ * in the end user terms of the application under an appropriate heading,
20
+ * such notice(s) shall fulfill the requirements of that article.
21
+ * ********************************************************************* */
22
+
1
23
  fiftyoneDegreesManager = function() {
2
24
  'use-strict';
3
25
  var json = {"nullValueReasons":{"testengine.four":"This property is not available"},"javascriptProperties":["testengine.three"],"testengine":{"one":1,"two":2,"three":"console.log('ok')","four":null}};
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -1,10 +1,10 @@
1
1
  /* *********************************************************************
2
2
  * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
3
- * Copyright 2019 51 Degrees Mobile Experts Limited, 5 Charlotte Close,
4
- * Caversham, Reading, Berkshire, United Kingdom RG4 7BY.
3
+ * Copyright 2022 51 Degrees Mobile Experts Limited, Davidson House,
4
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
5
5
  *
6
- * This Original Work is licensed under the European Union Public Licence (EUPL)
7
- * v.1.2 and is subject to its terms as set out below.
6
+ * This Original Work is licensed under the European Union Public Licence
7
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
8
8
  *
9
9
  * If a copy of the EUPL was not distributed with this file, You can obtain
10
10
  * one at https://opensource.org/licenses/EUPL-1.2.
@@ -33,6 +33,8 @@ const testValue = new AspectPropertyValue(null, 'test')
33
33
  const browserValue = new AspectPropertyValue(null, 'SEC-CH-UA,SEC-CH-UA-Full-Version')
34
34
  const platformValue = new AspectPropertyValue(null, 'SEC-CH-UA-Platform,SEC-CH-UA-Platform-Version')
35
35
  const hardwareValue = new AspectPropertyValue(null, 'SEC-CH-UA-Model,SEC-CH-UA-Mobile,SEC-CH-UA-Arch')
36
+ // Value which contains at least one duplicate value from each of other SetHeader values.
37
+ const duplicateValue = new AspectPropertyValue(null, 'SEC-CH-UA,SEC-CH-UA-Platform,SEC-CH-UA-Model')
36
38
 
37
39
  // Set up the properties in the element.
38
40
  setup.device.properties["SetHeaderBrowserAccept-CH"] = {
@@ -81,6 +83,9 @@ each([
81
83
  ["Set multiple headers.",
82
84
  { "SetHeaderBrowserAccept-CH": browserValue, "SetHeaderHardwareSomeOtherHeader": platformValue},
83
85
  { "Accept-CH": browserValue.value, "SomeOtherHeader": platformValue.value}],
86
+ ["Properties with duplicate values.",
87
+ { "SetHeaderPlatformAccept-CH": platformValue, "SetHeaderHardwareAccept-CH": duplicateValue},
88
+ { "Accept-CH": "SEC-CH-UA-Platform,SEC-CH-UA-Platform-Version,SEC-CH-UA,SEC-CH-UA-Model"}],
84
89
  ])
85
90
  .test('testGetResponseHeaderValue - %s', async (name, device, expectedHeaders) => {
86
91
  // Set up a mock repsonse object to collect the headers which are