@shapediver/viewer.shared.services 2.6.5 → 2.7.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.
Files changed (15) hide show
  1. package/LICENSE +2 -2
  2. package/dist/converter/Converter.d.ts +4 -4
  3. package/dist/converter/Converter.d.ts.map +1 -1
  4. package/dist/converter/Converter.js +6 -4
  5. package/dist/converter/Converter.js.map +1 -1
  6. package/dist/logger/ShapeDiverViewerErrors.js +2 -1
  7. package/dist/logger/ShapeDiverViewerErrors.js.map +1 -1
  8. package/dist/settings-engine/SettingsEngine.d.ts +1 -1
  9. package/dist/settings-engine/SettingsEngine.d.ts.map +1 -1
  10. package/dist/settings-engine/SettingsEngine.js +20 -40
  11. package/dist/settings-engine/SettingsEngine.js.map +1 -1
  12. package/package.json +4 -4
  13. package/src/converter/Converter.ts +9 -7
  14. package/src/logger/ShapeDiverViewerErrors.ts +1 -1
  15. package/src/settings-engine/SettingsEngine.ts +19 -37
package/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Required Notice: Copyright 2021 ShapeDiver GmbH (https://www.shapediver.com)
1
+ Required Notice: Copyright 2023 ShapeDiver GmbH (https://www.shapediver.com)
2
2
 
3
3
  https://polyformproject.org/licenses/noncommercial/1.0.0
4
4
 
@@ -18,7 +18,7 @@ Notices
18
18
 
19
19
  You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms or the URL for them above, as well as copies of any plain-text lines beginning with Required Notice: that the licensor provided with the software. For example:
20
20
 
21
- Required Notice: Copyright 2021 ShapeDiver GmbH (https://www.shapediver.com)
21
+ Required Notice: Copyright 2023 ShapeDiver GmbH (https://www.shapediver.com)
22
22
 
23
23
  Changes and New Works License
24
24
 
package/dist/converter/Converter.d.ts CHANGED
@@ -8,9 +8,9 @@ export declare class Converter {
8
8
  * @param defColor
9
9
  */
10
10
  toHex8Color(color: any, defColorString?: string): string;
11
- toColorArray(color: string): number[];
12
- toAlpha(color: string): number;
13
- toThreeJsColorInput(color: string): string;
11
+ toColorArray(color: any): number[];
12
+ toAlpha(color: any): number;
13
+ toThreeJsColorInput(color: any): string;
14
14
  processSVG(blob: Blob): Promise<HTMLImageElement>;
15
15
  /**
16
16
  * This color converter is mostly left 'as-is' from viewer v2.
@@ -19,7 +19,7 @@ export declare class Converter {
19
19
  * @param color
20
20
  * @param defColor
21
21
  */
22
- toColor(color: any, defColorString?: string): string;
22
+ toHexColor(color: any, defColorString?: string): string;
23
23
  toVec3(point: any): vec3;
24
24
  responseToImage(response: HttpResponse<ArrayBuffer>): Promise<HTMLImageElement>;
25
25
  }
package/dist/converter/Converter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Converter.d.ts","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,WAAW,CAAA;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,qBACa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IAErF,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACI,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAOnE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAMrC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAM9B,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAMpC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6H9D;;;;;;OAMG;IACI,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAuF/D,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAalB,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiB/F"}
1
+ {"version":3,"file":"Converter.d.ts","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,WAAW,CAAA;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,qBACa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IAErF,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACI,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAOnE,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,EAAE;IAQlC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAM3B,mBAAmB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAMjC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6H9D;;;;;;OAMG;IACI,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,GAAE,MAAkB,GAAG,MAAM;IAuFlE,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAalB,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiB/F"}
package/dist/converter/Converter.js CHANGED
@@ -32,24 +32,26 @@ let Converter = class Converter {
32
32
  * @param defColor
33
33
  */
34
34
  toHex8Color(color, defColorString = '#199b9b') {
35
- const c = this.toColor(color, defColorString);
35
+ const c = this.toHexColor(color, defColorString);
36
36
  const tColor = new tinycolor_1.TinyColor(c);
37
37
  const cH8 = tColor.toHex8String();
38
38
  return cH8.replace('#', '0x');
39
39
  }
40
40
  toColorArray(color) {
41
+ if (typeof color !== 'string' || !color.startsWith("#"))
42
+ color = this.toHexColor(color);
41
43
  const tColor = new tinycolor_1.TinyColor(color);
42
44
  const rgb = tColor.toRgb();
43
45
  return [rgb.r / 255.0, rgb.g / 255.0, rgb.b / 255.0];
44
46
  }
45
47
  toAlpha(color) {
46
- const c = this.toColor(color);
48
+ const c = this.toHexColor(color);
47
49
  if (c.length <= 8)
48
50
  return 1;
49
51
  return parseInt(c.slice(c.length - 2, c.length), 16) / 255;
50
52
  }
51
53
  toThreeJsColorInput(color) {
52
- const c = this.toColor(color);
54
+ const c = this.toHexColor(color);
53
55
  return c.slice(0, c.length - 2);
54
56
  }
55
57
  processSVG(blob) {
@@ -162,7 +164,7 @@ let Converter = class Converter {
162
164
  * @param color
163
165
  * @param defColor
164
166
  */
165
- toColor(color, defColorString = '#199b9b') {
167
+ toHexColor(color, defColorString = '#199b9b') {
166
168
  if (!color || color === 'default')
167
169
  return defColorString;
168
170
  if (color.constructor === Float32Array)
package/dist/converter/Converter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Converter.js","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Converter.js","sourceRoot":"","sources":["../../src/converter/Converter.ts"],"names":[],"mappings":"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"}
package/dist/logger/ShapeDiverViewerErrors.js CHANGED
@@ -7,7 +7,8 @@ class ShapeDiverViewerUnknownError extends ShapeDiverError_1.ShapeDiverViewerErr
7
7
  super(ShapeDiverError_1.ShapeDiverViewerErrorType.UNKNOWN, 'An unknown error occurred.', message);
8
8
  this.message = message;
9
9
  this.errorObject = errorObject;
10
- Error.captureStackTrace(this, ShapeDiverViewerUnknownError);
10
+ if (Error.captureStackTrace !== undefined)
11
+ Error.captureStackTrace(this, ShapeDiverViewerUnknownError);
11
12
  }
12
13
  }
13
14
  exports.ShapeDiverViewerUnknownError = ShapeDiverViewerUnknownError;
package/dist/logger/ShapeDiverViewerErrors.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ShapeDiverViewerErrors.js","sourceRoot":"","sources":["../../src/logger/ShapeDiverViewerErrors.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ShapeDiverViewerErrors.js","sourceRoot":"","sources":["../../src/logger/ShapeDiverViewerErrors.ts"],"names":[],"mappings":"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"}
package/dist/settings-engine/SettingsEngine.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ISettingsV3_2 as ISettings } from '@shapediver/viewer.settings';
1
+ import { ISettingsV3_3 as ISettings } from '@shapediver/viewer.settings';
2
2
  declare type IARSettings = ISettings["ar"];
3
3
  declare type ICameraSettings = ISettings["camera"];
4
4
  declare type IEnvironmentSettings = ISettings["environment"];
package/dist/settings-engine/SettingsEngine.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,aAAa,IAAI,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAOtH,aAAK,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AACnC,aAAK,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC3C,aAAK,oBAAoB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AACrD,aAAK,4BAA4B,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;AACrE,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAC7C,aAAK,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AACzC,aAAK,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AACjD,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAE7C,qBAAa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;IACnD,OAAO,CAAC,iBAAiB,CAAgD;IAMzE,IAAW,EAAE,IAAI,WAAW,CAE3B;IAED,IAAW,MAAM,IAAI,eAAe,CAEnC;IAED,IAAW,WAAW,IAAI,oBAAoB,CAE7C;IAED,IAAW,mBAAmB,IAAI,4BAA4B,CAE7D;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,KAAK,IAAI,cAAc,CAEjC;IAED,IAAW,SAAS,IAAI,kBAAkB,CAEzC;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAEzC;IAED,IAAW,QAAQ,IAAI,SAAS,CAE/B;IAMM,sBAAsB,IAAI,GAAG;IAI7B,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG;IAmDtB,KAAK;IASZ,OAAO,CAAC,aAAa;CA2BxB"}
1
+ {"version":3,"file":"SettingsEngine.d.ts","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,aAAa,IAAI,SAAS,EAAY,MAAM,6BAA6B,CAAC;AAOhI,aAAK,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AACnC,aAAK,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC3C,aAAK,oBAAoB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AACrD,aAAK,4BAA4B,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;AACrE,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAC7C,aAAK,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AACzC,aAAK,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AACjD,aAAK,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAE7C,qBAAa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyB;IACnD,OAAO,CAAC,iBAAiB,CAAmB;IAM5C,IAAW,EAAE,IAAI,WAAW,CAE3B;IAED,IAAW,MAAM,IAAI,eAAe,CAEnC;IAED,IAAW,WAAW,IAAI,oBAAoB,CAE7C;IAED,IAAW,mBAAmB,IAAI,4BAA4B,CAE7D;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,KAAK,IAAI,cAAc,CAEjC;IAED,IAAW,SAAS,IAAI,kBAAkB,CAEzC;IAED,IAAW,OAAO,IAAI,gBAAgB,CAErC;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAEzC;IAED,IAAW,QAAQ,IAAI,SAAS,CAE/B;IAMM,sBAAsB,IAAI,GAAG;IAI7B,OAAO;;;IAoBP,YAAY,CAAC,IAAI,EAAE,GAAG;IAiCtB,KAAK;IASZ,OAAO,CAAC,aAAa;CA2BxB"}
package/dist/settings-engine/SettingsEngine.js CHANGED
@@ -11,8 +11,8 @@ class SettingsEngine {
11
11
  // #region Properties (8)
12
12
  this._eventEngine = tsyringe_1.container.resolve(EventEngine_1.EventEngine);
13
13
  this._logger = tsyringe_1.container.resolve(Logger_1.Logger);
14
- this._settings = (0, viewer_settings_1.DefaultsV3_2)();
15
- this._settings_version = '3.2';
14
+ this._settings = (0, viewer_settings_1.DefaultsV3_3)();
15
+ this._settings_version = '3.3';
16
16
  // #endregion Private Methods (1)
17
17
  }
18
18
  // #endregion Properties (8)
@@ -76,42 +76,22 @@ class SettingsEngine {
76
76
  }
77
77
  loadSettings(json) {
78
78
  if (JSON.stringify(json) !== JSON.stringify({})) {
79
- try {
80
- (0, viewer_settings_1.validate)(json, '1.0');
81
- this._settings_version = '1.0';
82
- this._settings = (0, viewer_settings_1.convert)(json, '3.2');
83
- this.cleanSettings(this._settings);
84
- return;
85
- }
86
- catch (e) { }
87
- try {
88
- (0, viewer_settings_1.validate)(json, '2.0');
89
- this._settings_version = '2.0';
90
- this._settings = (0, viewer_settings_1.convert)(json, '3.2');
91
- this.cleanSettings(this._settings);
92
- return;
93
- }
94
- catch (e) { }
95
- try {
96
- (0, viewer_settings_1.validate)(json, '3.0');
97
- this._settings_version = '3.0';
98
- this._settings = (0, viewer_settings_1.convert)(json, '3.2');
99
- this.cleanSettings(this._settings);
100
- return;
101
- }
102
- catch (e) { }
103
- try {
104
- (0, viewer_settings_1.validate)(json, '3.1');
105
- this._settings_version = '3.1';
106
- this._settings = (0, viewer_settings_1.convert)(json, '3.2');
107
- this.cleanSettings(this._settings);
108
- return;
79
+ const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2'];
80
+ for (let i = 0; i < prevVersions.length; i++) {
81
+ const v = prevVersions[i];
82
+ try {
83
+ (0, viewer_settings_1.validate)(json, v);
84
+ this._settings_version = v;
85
+ this._settings = (0, viewer_settings_1.convert)(json, '3.3');
86
+ this.cleanSettings(this._settings);
87
+ return;
88
+ }
89
+ catch (e) { }
109
90
  }
110
- catch (e) { }
111
91
  try {
112
- (0, viewer_settings_1.validate)(json, '3.2');
113
- this._settings_version = '3.2';
114
- this._settings = (0, viewer_settings_1.convert)(json, '3.2');
92
+ (0, viewer_settings_1.validate)(json, '3.3');
93
+ this._settings_version = '3.3';
94
+ this._settings = (0, viewer_settings_1.convert)(json, '3.3');
115
95
  this.cleanSettings(this._settings);
116
96
  return;
117
97
  }
@@ -121,14 +101,14 @@ class SettingsEngine {
121
101
  }
122
102
  }
123
103
  else {
124
- this._settings_version = '3.2';
125
- this._settings = (0, viewer_settings_1.DefaultsV3_2)();
104
+ this._settings_version = '3.3';
105
+ this._settings = (0, viewer_settings_1.DefaultsV3_3)();
126
106
  return;
127
107
  }
128
108
  }
129
109
  reset() {
130
- this._settings_version = '3.2';
131
- this._settings = (0, viewer_settings_1.DefaultsV3_2)();
110
+ this._settings_version = '3.3';
111
+ this._settings = (0, viewer_settings_1.DefaultsV3_3)();
132
112
  }
133
113
  // #endregion Public Methods (4)
134
114
  // #region Private Methods (1)
package/dist/settings-engine/SettingsEngine.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SettingsEngine.js","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SettingsEngine.js","sourceRoot":"","sources":["../../src/settings-engine/SettingsEngine.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/viewer.shared.services",
3
- "version": "2.6.5",
3
+ "version": "2.7.1",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "author": "Michael Oppitz <michael@shapediver.com>",
@@ -43,8 +43,8 @@
43
43
  "@sentry/browser": "^6.7.2",
44
44
  "@sentry/tracing": "^6.7.2",
45
45
  "@shapediver/sdk.geometry-api-sdk-v2": "1.2.3",
46
- "@shapediver/viewer.settings": "0.1.39",
47
- "@shapediver/viewer.shared.build-data": "2.6.5",
46
+ "@shapediver/viewer.settings": "0.2.0",
47
+ "@shapediver/viewer.shared.build-data": "2.7.1",
48
48
  "@types/dompurify": "^2.3.1",
49
49
  "@types/ua-parser-js": "^0.7.36",
50
50
  "@types/uuid": "^8.3.0",
@@ -55,5 +55,5 @@
55
55
  "ua-parser-js": "^0.7.28",
56
56
  "uuid": "^8.3.2"
57
57
  },
58
- "gitHead": "7de51352cf63478851346dc8f886ad996b14c3c2"
58
+ "gitHead": "be55cee0da7e6c40c1751770799c4fa40a0d942f"
59
59
  }
package/src/converter/Converter.ts CHANGED
@@ -17,26 +17,28 @@ export class Converter {
17
17
  * @param defColor
18
18
  */
19
19
  public toHex8Color(color: any, defColorString: string = '#199b9b'): string {
20
- const c = this.toColor(color, defColorString);
20
+ const c = this.toHexColor(color, defColorString);
21
21
  const tColor = new TinyColor(c);
22
22
  const cH8 = tColor.toHex8String();
23
23
  return cH8.replace('#', '0x');
24
24
  }
25
25
 
26
- public toColorArray(color: string): number[] {
26
+ public toColorArray(color: any): number[] {
27
+ if(typeof color !== 'string' || !color.startsWith("#"))
28
+ color = this.toHexColor(color);
27
29
  const tColor = new TinyColor(color);
28
30
  const rgb = tColor.toRgb()
29
31
  return [rgb.r / 255.0, rgb.g / 255.0, rgb.b / 255.0];
30
32
  }
31
33
 
32
- public toAlpha(color: string): number {
33
- const c = this.toColor(color);
34
+ public toAlpha(color: any): number {
35
+ const c = this.toHexColor(color);
34
36
  if (c.length <= 8) return 1;
35
37
  return parseInt(c.slice(c.length - 2, c.length), 16) / 255;
36
38
  }
37
39
 
38
- public toThreeJsColorInput(color: string): string {
39
- const c = this.toColor(color);
40
+ public toThreeJsColorInput(color: any): string {
41
+ const c = this.toHexColor(color);
40
42
  return c.slice(0, c.length - 2);
41
43
  }
42
44
 
@@ -173,7 +175,7 @@ export class Converter {
173
175
  * @param color
174
176
  * @param defColor
175
177
  */
176
- public toColor(color: any, defColorString: string = '#199b9b'): string {
178
+ public toHexColor(color: any, defColorString: string = '#199b9b'): string {
177
179
  if (!color || color === 'default') return defColorString;
178
180
 
179
181
  if (color.constructor === Float32Array)
package/src/logger/ShapeDiverViewerErrors.ts CHANGED
@@ -7,7 +7,7 @@ export class ShapeDiverViewerUnknownError extends ShapeDiverViewerError {
7
7
  public readonly errorObject: Error | unknown
8
8
  ) {
9
9
  super(ShapeDiverViewerErrorType.UNKNOWN, 'An unknown error occurred.', message);
10
- Error.captureStackTrace(this, ShapeDiverViewerUnknownError)
10
+ if(Error.captureStackTrace !== undefined) Error.captureStackTrace(this, ShapeDiverViewerUnknownError)
11
11
  }
12
12
  }
13
13
 
package/src/settings-engine/SettingsEngine.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { convert, validate, DefaultsV3_2 as Defaults, ISettingsV3_2 as ISettings } from '@shapediver/viewer.settings';
1
+ import { convert, validate, DefaultsV3_3 as Defaults, ISettingsV3_3 as ISettings, versions } from '@shapediver/viewer.settings';
2
2
  import { container, singleton } from 'tsyringe'
3
3
 
4
4
  import { EventEngine } from '../event-engine/EventEngine'
@@ -20,7 +20,7 @@ export class SettingsEngine {
20
20
  private readonly _eventEngine: EventEngine = <EventEngine>container.resolve(EventEngine);
21
21
  private readonly _logger: Logger = <Logger>container.resolve(Logger);
22
22
  private readonly _settings: ISettings = Defaults();
23
- private _settings_version: '1.0' | '2.0' | '3.0' | '3.1' | '3.2' = '3.2';
23
+ private _settings_version: versions = '3.3';
24
24
 
25
25
  // #endregion Properties (8)
26
26
 
@@ -96,42 +96,24 @@ export class SettingsEngine {
96
96
 
97
97
  public loadSettings(json: any) {
98
98
  if (JSON.stringify(json) !== JSON.stringify({})) {
99
- try {
100
- validate(json, '1.0');
101
- this._settings_version = '1.0';
102
- (<any>this._settings) = convert(json, '3.2');
103
- this.cleanSettings(this._settings);
104
- return;
105
- } catch (e) {}
106
-
107
- try {
108
- validate(json, '2.0');
109
- this._settings_version = '2.0';
110
- (<any>this._settings) = convert(json, '3.2');
111
- this.cleanSettings(this._settings);
112
- return;
113
- } catch (e) {}
114
-
115
- try {
116
- validate(json, '3.0');
117
- this._settings_version = '3.0';
118
- (<any>this._settings) = convert(json, '3.2');
119
- this.cleanSettings(this._settings);
120
- return;
121
- } catch (e) {}
122
99
 
123
- try {
124
- validate(json, '3.1');
125
- this._settings_version = '3.1';
126
- (<any>this._settings) = convert(json, '3.2');
127
- this.cleanSettings(this._settings);
128
- return;
129
- } catch (e) {}
100
+ const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2'];
101
+ for(let i = 0; i < prevVersions.length; i++) {
102
+ const v = prevVersions[i];
103
+
104
+ try {
105
+ validate(json, v as versions);
106
+ this._settings_version = v as versions;
107
+ (<any>this._settings) = convert(json, '3.3');
108
+ this.cleanSettings(this._settings);
109
+ return;
110
+ } catch (e) {}
111
+ }
130
112
 
131
113
  try {
132
- validate(json, '3.2');
133
- this._settings_version = '3.2';
134
- (<any>this._settings) = convert(json, '3.2');
114
+ validate(json, '3.3');
115
+ this._settings_version = '3.3';
116
+ (<any>this._settings) = convert(json, '3.3');
135
117
  this.cleanSettings(this._settings);
136
118
  return;
137
119
  } catch (e) {
@@ -139,14 +121,14 @@ export class SettingsEngine {
139
121
  throw this._logger.handleError(LOGGING_TOPIC.SETTINGS, `SettingsEngine.loadSettings`, error);
140
122
  }
141
123
  } else {
142
- this._settings_version = '3.2';
124
+ this._settings_version = '3.3';
143
125
  (<any>this._settings) = Defaults();
144
126
  return;
145
127
  }
146
128
  }
147
129
 
148
130
  public reset() {
149
- this._settings_version = '3.2';
131
+ this._settings_version = '3.3';
150
132
  (<any>this._settings) = Defaults();
151
133
  }
152
134