@colijnit/homedecorator 256.1.16 → 256.1.17

package/app/core/utils/file.utils.d.ts

@@ -1,5 +1,7 @@
 export declare class FileUtils {
     private static _cachedTextureUploads;
+    private static _filesDontExist;
+    private static _filesExist;
     static StripMimeStringFromDataUri(dataUri: string): string;
     static GetMimeStringFromDataUri(dataUri: string): string;
     /**

package/app/plugins/threedselector/threedselector/service/variation-cache.service.d.ts

@@ -18,6 +18,7 @@ export declare class VariationCacheService implements OnDestroy {
     preloadVariationsAsync(schema: string, fileNames: string[], articleAssetPath?: string): Promise<void>;
     loadVariation(schema: string, fileName: string): Promise<VariationSettings>;
     private _waitForVariationToLoad;
+    private _createSettingsForFileName;
     static ɵfac: i0.ɵɵFactoryDeclaration<VariationCacheService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<VariationCacheService>;
 }

package/bundles/colijnit-homedecorator.umd.js

@@ -94,7 +94,7 @@
   OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
   PERFORMANCE OF THIS SOFTWARE.
   ***************************************************************************** */
-  /* global Reflect, Promise, SuppressedError, Symbol */
+  /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
   var extendStatics = function (d, b) {
       extendStatics = Object.setPrototypeOf ||
           ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -230,8 +230,8 @@
   }
   function __generator(thisArg, body) {
       var _ = { label: 0, sent: function () { if (t[0] & 1)
-              throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
+              throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+      return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
       function verb(n) { return function (v) { return step([n, v]); }; }
       function step(op) {
           if (f)
@@ -386,7 +386,7 @@
       if (!Symbol.asyncIterator)
           throw new TypeError("Symbol.asyncIterator is not defined.");
       var g = generator.apply(thisArg, _arguments || []), i, q = [];
-      return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+      return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
       function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
       function verb(n, f) { if (g[n]) {
           i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); };
@@ -433,14 +433,24 @@
   }) : function (o, v) {
       o["default"] = v;
   };
+  var ownKeys = function (o) {
+      ownKeys = Object.getOwnPropertyNames || function (o) {
+          var ar = [];
+          for (var k in o)
+              if (Object.prototype.hasOwnProperty.call(o, k))
+                  ar[ar.length] = k;
+          return ar;
+      };
+      return ownKeys(o);
+  };
   function __importStar(mod) {
       if (mod && mod.__esModule)
           return mod;
       var result = {};
       if (mod != null)
-          for (var k in mod)
-              if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
-                  __createBinding(result, mod, k);
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++)
+              if (k[i] !== "default")
+                  __createBinding(result, mod, k[i]);
       __setModuleDefault(result, mod);
       return result;
   }
@@ -510,29 +520,49 @@
           env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
           env.hasError = true;
       }
+      var r, s = 0;
       function next() {
-          while (env.stack.length) {
-              var rec = env.stack.pop();
+          while (r = env.stack.pop()) {
               try {
-                  var result = rec.dispose && rec.dispose.call(rec.value);
-                  if (rec.async)
-                      return Promise.resolve(result).then(next, function (e) { fail(e); return next(); });
+                  if (!r.async && s === 1)
+                      return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                  if (r.dispose) {
+                      var result = r.dispose.call(r.value);
+                      if (r.async)
+                          return s |= 2, Promise.resolve(result).then(next, function (e) { fail(e); return next(); });
+                  }
+                  else
+                      s |= 1;
               }
               catch (e) {
                   fail(e);
               }
           }
+          if (s === 1)
+              return env.hasError ? Promise.reject(env.error) : Promise.resolve();
           if (env.hasError)
               throw env.error;
       }
       return next();
   }
+  function __rewriteRelativeImportExtension(path, preserveJsx) {
+      if (typeof path === "string" && /^\.\.?\//.test(path)) {
+          return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+              return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+          });
+      }
+      return path;
+  }
   var tslib_es6 = {
       __extends: __extends,
       __assign: __assign,
       __rest: __rest,
       __decorate: __decorate,
       __param: __param,
+      __esDecorate: __esDecorate,
+      __runInitializers: __runInitializers,
+      __propKey: __propKey,
+      __setFunctionName: __setFunctionName,
       __metadata: __metadata,
       __awaiter: __awaiter$1p,
       __generator: __generator,
@@ -555,6 +585,7 @@
       __classPrivateFieldIn: __classPrivateFieldIn,
       __addDisposableResource: __addDisposableResource,
       __disposeResources: __disposeResources,
+      __rewriteRelativeImportExtension: __rewriteRelativeImportExtension,
   };
 
   var MessageType;
@@ -2783,14 +2814,14 @@
           }
           if (obj.hasOwnProperty('assetPath')) {
               this.settings.assetPath = obj['assetPath'];
-              if (this.settings.assetPath[this.settings.assetPath.length - 1] !== '/') {
+              if (!this.settings.assetPath[this.settings.assetPath.length - 1].endsWith('/')) {
                   this.settings.assetPath += '/';
               }
               this.settings.threeDAssetPath = this.settings.assetPath;
           }
           if (obj.hasOwnProperty('threeDAssetPath')) {
               this.settings.threeDAssetPath = obj['threeDAssetPath'];
-              if (this.settings.threeDAssetPath[this.settings.threeDAssetPath.length - 1] !== '/') {
+              if (!this.settings.threeDAssetPath[this.settings.threeDAssetPath.length - 1].endsWith('/')) {
                   this.settings.threeDAssetPath += '/';
               }
           }
@@ -4423,13 +4454,24 @@
                   switch (_a.label) {
                       case 0:
                           _a.trys.push([0, 2, , 3]);
-                          return [4 /*yield*/, fetch(url, { method: 'OPTIONS' })];
+                          if (this._filesDontExist.indexOf(url) > -1) { // no need to check again
+                              return [2 /*return*/, false];
+                          }
+                          if (this._filesExist.indexOf(url) > -1) { // no need to check again
+                              return [2 /*return*/, true];
+                          }
+                          return [4 /*yield*/, fetch(url, { method: 'HEAD' })];
                       case 1:
                           response = _a.sent();
-                          return [2 /*return*/, response.ok];
+                          if (response.ok && response.status === 200) {
+                              this._filesExist.push(url);
+                              return [2 /*return*/, true];
+                          }
+                          this._filesDontExist.push(url);
+                          return [2 /*return*/, false];
                       case 2:
                           error_1 = _a.sent();
-                          // console.warn('Error checking URL status:', error);
+                          this._filesDontExist.push(url);
                           return [2 /*return*/, false];
                       case 3: return [2 /*return*/];
                   }
@@ -4621,7 +4663,9 @@
       };
       return FileUtils;
   }());
-  FileUtils._cachedTextureUploads = new Map();
+  FileUtils._cachedTextureUploads = new Map();
+  FileUtils._filesDontExist = [];
+  FileUtils._filesExist = [];
 
   var __awaiter$1f = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
       function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -16168,8 +16212,8 @@
   /* tslint:disable */
   var VersionInfo = {
       application: "Homedecorator",
-      appVersion: "256.1.13",
-      revision: "115041"
+      appVersion: "256.1.15",
+      revision: "115403"
   };
   /* tslint:enable */
 
@@ -23325,7 +23369,7 @@
       VariationUtils.LoadVariation = function (assetPath, url, fileName, includeVariationFolder) {
           if (includeVariationFolder === void 0) { includeVariationFolder = true; }
           return __awaiter$O(this, void 0, void 0, function () {
-              var id, variationUrl, response, compressed, err_1, mute;
+              var id, variationUrl, fileExists, response, compressed, err_1, mute;
               return __generator(this, function (_a) {
                   switch (_a.label) {
                       case 0:
@@ -23339,23 +23383,29 @@
                           variationUrl = url + (includeVariationFolder ? '/variation' : '') + "/" + fileName;
                           _a.label = 1;
                       case 1:
-                          _a.trys.push([1, 5, , 6]);
-                          return [4 /*yield*/, fetch(variationUrl)];
+                          _a.trys.push([1, 8, , 9]);
+                          return [4 /*yield*/, FileUtils.DoesFileExist(variationUrl)];
                       case 2:
+                          fileExists = _a.sent();
+                          if (!!fileExists) return [3 /*break*/, 3];
+                          return [2 /*return*/, null];
+                      case 3: return [4 /*yield*/, fetch(variationUrl)];
+                      case 4:
                           response = _a.sent();
                           if (!response.ok) {
                               return [2 /*return*/, null];
                           }
                           return [4 /*yield*/, response.blob()];
-                      case 3:
+                      case 5:
                           compressed = _a.sent();
                           return [4 /*yield*/, VariationUtils.GetVariationSettingsFromFile(id, compressed)];
-                      case 4: return [2 /*return*/, _a.sent()];
-                      case 5:
+                      case 6: return [2 /*return*/, _a.sent()];
+                      case 7: return [3 /*break*/, 9];
+                      case 8:
                           err_1 = _a.sent();
                           mute = err_1;
                           return [2 /*return*/, null];
-                      case 6: return [2 /*return*/];
+                      case 9: return [2 /*return*/];
                   }
               });
           });
@@ -24041,19 +24091,8 @@
           if (articleAssetPath === void 0) { articleAssetPath = ''; }
           fileNames.forEach(function (fileName) {
               if (fileName && !_this.get(fileName)) {
-                  var settings_1 = new VariationSettings();
-                  settings_1.id = fileName;
-                  settings_1.loading = true;
-                  _this._variations.push(settings_1);
-                  var assetPath = _this._settingsService.settings.assetPath;
-                  if (!assetPath.endsWith('/')) {
-                      assetPath += '/';
-                  }
-                  var threeDAssetPath = articleAssetPath ? articleAssetPath : _this._settingsService.settings.threeDAssetPath;
-                  if (!threeDAssetPath.endsWith('/')) {
-                      threeDAssetPath += '/';
-                  }
-                  VariationUtils.LoadVariation(assetPath, threeDAssetPath + schema, fileName).then(function (variationSettings) {
+                  var settings_1 = _this._createSettingsForFileName(fileName);
+                  VariationUtils.LoadVariation(_this._settingsService.settings.assetPath, (articleAssetPath ? articleAssetPath : _this._settingsService.settings.threeDAssetPath) + schema, fileName).then(function (variationSettings) {
                       settings_1.loading = false;
                       settings_1.loaded.next(variationSettings);
                       if (variationSettings) {
@@ -24074,20 +24113,9 @@
                           promises = [];
                           fileNames.forEach(function (fileName) {
                               if (fileName && !_this.get(fileName)) {
-                                  var settings_2 = new VariationSettings();
-                                  settings_2.id = fileName;
-                                  settings_2.loading = true;
-                                  _this._variations.push(settings_2);
-                                  var assetPath_1 = _this._settingsService.settings.assetPath;
-                                  if (!assetPath_1.endsWith('/')) {
-                                      assetPath_1 += '/';
-                                  }
-                                  var threeDAssetPath_1 = articleAssetPath ? articleAssetPath : _this._settingsService.settings.threeDAssetPath;
-                                  if (!threeDAssetPath_1.endsWith('/')) {
-                                      threeDAssetPath_1 += '/';
-                                  }
+                                  var settings_2 = _this._createSettingsForFileName(fileName);
                                   promises.push(new Promise(function (resolve) {
-                                      VariationUtils.LoadVariation(assetPath_1, threeDAssetPath_1 + schema, fileName).then(function (variationSettings) {
+                                      VariationUtils.LoadVariation(_this._settingsService.settings.assetPath, (articleAssetPath ? articleAssetPath : _this._settingsService.settings.threeDAssetPath) + schema, fileName).then(function (variationSettings) {
                                           settings_2.loading = false;
                                           settings_2.loaded.next(variationSettings);
                                           if (variationSettings) {
@@ -24133,6 +24161,13 @@
               });
           });
       };
+      VariationCacheService.prototype._createSettingsForFileName = function (fileName) {
+          var settings = new VariationSettings();
+          settings.id = fileName;
+          settings.loading = true;
+          this._variations.push(settings);
+          return settings;
+      };
       return VariationCacheService;
   }());
   VariationCacheService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: VariationCacheService, deps: [{ token: HomedecoratorSettingsService }, { token: PresetsService }, { token: ItemService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -24258,12 +24293,8 @@
                   switch (_a.label) {
                       case 0:
                           url = VariationUtils.GetUrl(assetPath, schema, id);
-                          return [4 /*yield*/, FileUtils.DoesFileExist(url)];
-                      case 1:
-                          if (!_a.sent()) return [3 /*break*/, 3];
                           return [4 /*yield*/, this._variationCacheService.loadVariation(schema, id)];
-                      case 2: return [2 /*return*/, _a.sent()];
-                      case 3: return [2 /*return*/];
+                      case 1: return [2 /*return*/, _a.sent()];
                   }
               });
           });
@@ -24409,7 +24440,8 @@
                                                                   switch (_b.label) {
                                                                       case 0:
                                                                           newVariation = new Variation();
-                                                                          newVariation.decoId = parseFloat(variations[j].id);
+                                                                          newVariation.decoId = variations[j] instanceof Variation ? variations[j].decoId : parseFloat(variations[j].id);
+                                                                          newVariation.node = variations[j] instanceof Variation ? variations[j].node : variations[j].nodeId;
                                                                           newVariation.brandId = variations[j].brandId;
                                                                           newVariation.optionText = variations[j].optionText;
                                                                           newVariation.gameObjectName = variations[j].gameObjectName;
@@ -26900,7 +26932,7 @@
           var len = this.selections.length;
           var _loop_3 = function (i) {
               // const id: string = this.selections[i].artNodeIdDeco;
-              var deco = this_2._iOne.decoNodes.find(function (d) { return d.id === _this.selections[i].artNodeIdDeco; });
+              var deco = this_2._iOne.decoNodes.find(function (d) { return d.nodeId === _this.selections[i].node; });
               if (!deco) {
                   deco = new decoNode.DecoNode();
               }
@@ -27136,7 +27168,7 @@
                       break;
                   }
                   currentLevel = selection.presentationLevel;
-                  if (selection.hdecoGameObject) {
+                  if (currentLevel === 1 && selection.hdecoGameObject) {
                       return selection.hdecoGameObject;
                   }
               }
@@ -27394,44 +27426,36 @@
       BuildFurnitureService.prototype._preloadMaterial = function (answer) {
           var _this = this;
           if (answer.elementType === decoNodeType_enum.DecoNodeType.Variation && answer.gameObject) {
-              var variationDecoNode_1 = new decoNode.DecoNode();
-              variationDecoNode_1.gameObjectName = answer.gameObject;
-              var adjustablesClone_1 = this._adjustables.map(function (s) { return Object.assign({}, s); });
+              var variations = this._getVariations();
+              var variationDecoNode_1 = variations.find(function (v) { return ((v.parentId && answer.parentArticleDecoId && v.parentId.toString() === answer.parentArticleDecoId.toString()) ||
+                  // @ts-ignore
+                  (v.parentId && answer.parentNodeId && v.parentId.toString() === answer.parentNodeId.toString())); });
+              if (!variationDecoNode_1 || !this.currentCustomFloorGroup) {
+                  return;
+              }
+              var affectedSelections = [];
               if (this._genericSelection) {
-                  if (this.currentCustomFloorGroup) {
-                      adjustablesClone_1.forEach(function (selection) { return selection.variations = [variationDecoNode_1]; });
-                      this._variationCacheService.preloadVariationsAsync(adjustablesClone_1[0].schema, [variationDecoNode_1.gameObjectName], this.articleAssetPath)
-                          .then(function () {
-                          _this._variationService.loadVariation(_this.articleAssetPath, adjustablesClone_1, '', _this.currentCustomFloorGroup, true)
-                              .then(function () { return _this._sceneService.needsRender = true; });
-                      });
-                  }
-                  else {
-                      this._adjustables.forEach(function (selection) { return selection.variations = [variationDecoNode_1]; });
-                  }
+                  affectedSelections = this._adjustables;
               }
               else {
                   var currentSelection_1 = ObjectUtils.GetSelectionFromSelectedObject(this._activeChildElement);
-                  if (currentSelection_1) {
-                      if (this.currentCustomFloorGroup) {
-                          var selectionFromAdjustables = adjustablesClone_1
-                              .find(function (selection) { return selection.nodeId === currentSelection_1.nodeId; });
-                          if (selectionFromAdjustables) {
-                              selectionFromAdjustables.variations = [variationDecoNode_1];
-                              this._variationCacheService.preloadVariationsAsync(adjustablesClone_1[0].schema, [variationDecoNode_1.gameObjectName], this.articleAssetPath)
-                                  .then(function () {
-                                  _this._variationService.loadVariation(_this.articleAssetPath, adjustablesClone_1, '', _this.currentCustomFloorGroup, true)
-                                      .then(function () { return _this._sceneService.needsRender = true; });
-                              });
-                          }
-                      }
-                      else {
-                          var selectionFromAdjustables = this._adjustables
-                              .find(function (selection) { return selection.nodeId === currentSelection_1.nodeId; });
-                          selectionFromAdjustables.variations = [variationDecoNode_1];
-                      }
-                  }
+                  affectedSelections = [this._adjustables.find(function (selection) { return selection.nodeId === currentSelection_1.nodeId; })];
+              }
+              var adjustablesClone_1 = affectedSelections && affectedSelections.length > 0 ? affectedSelections.map(function (s) { return Object.assign({}, s); }) : [];
+              if (adjustablesClone_1.length === 0) {
+                  return;
               }
+              adjustablesClone_1.forEach(function (selection) {
+                  var variation = selection.variations.find(function (v) { return v.decoId.toString() === variationDecoNode_1.id.toString() && v.node.toString() === variationDecoNode_1.nodeId.toString(); });
+                  if (variation) {
+                      variation.gameObjectName = answer.gameObject;
+                  }
+              });
+              this._variationCacheService.preloadVariationsAsync(adjustablesClone_1[0].schema, [answer.gameObject], this.articleAssetPath)
+                  .then(function () {
+                  _this._variationService.loadVariation(_this.articleAssetPath, adjustablesClone_1, '', _this.currentCustomFloorGroup, true)
+                      .then(function () { return _this._sceneService.needsRender = true; });
+              });
           }
       };
       return BuildFurnitureService;
@@ -28390,7 +28414,7 @@
           set: function (value) {
               this._article = value;
               if (this._article) {
-                  this._buildFurnitureService.articleAssetPath = this._article.contentDeliveryUrl;
+                  this._buildFurnitureService.articleAssetPath = this._article.contentDeliveryUrl + (!this._article.contentDeliveryUrl.endsWith('/') ? '/' : '');
               }
               this.articleLoaded.next(this._article);
           },