@configura/web-api 2.1.0-alpha.2 → 2.2.0-alpha.0

package/dist/CatalogueAPI.d.ts

@@ -32,7 +32,7 @@ export interface DtoApplicationAreasResponse {
     applicationAreas: Array<DtoApplicationArea>;
     uuid: string;
 }
-/** AuthorizeResponse */
+/** AuthorizeResponse - The response to an authorize request. It contains an endpoint, a session token and an API session. The endpoint is the URL to access the API. The secret token is used to validate each request to the API. The API session contains information about the user's catalogue access. */
 export interface DtoAuthorizeResponse {
     endpoint: string;
     secretToken: string;
@@ -466,7 +466,7 @@ export interface DtoProductResponse {
     uuid: string;
     notes?: Array<DtoNote>;
 }
-/** RefreshSessionTokenResponse */
+/** RefreshSessionTokenResponse - The response to a refresh session token request. It contains a new API session. */
 export interface DtoRefreshSessionTokenResponse {
     apiSession: DtoCatalogueAPISession;
 }

package/dist/CatalogueAPI.js

@@ -9,29 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-export const dtoExportFormatNames = [
-    "glb",
-    "gltf",
-    "fbx",
-    "dwg",
-    "cmdrw",
-    "cmfav",
-    "cmsym",
-];
-export const dtoExportStatusStatusNames = [
-    "pending",
-    "running",
-    "finished",
-    "failed",
-];
+export const dtoExportFormatNames = ["glb", "gltf", "fbx", "dwg", "cmdrw", "cmfav", "cmsym"];
+export const dtoExportStatusStatusNames = ["pending", "running", "finished", "failed"];
 export const dtoNoteSeverityNames = ["Information", "Critical", "Warning"];
 export const dtoRenderFormatNames = ["jpg", "png"];
-export const dtoRenderStatusStatusNames = [
-    "pending",
-    "running",
-    "finished",
-    "failed",
-];
+export const dtoRenderStatusStatusNames = ["pending", "running", "finished", "failed"];
 export const dtoSyncGroupMethodsNames = ["pull", "push", "twoWay"];
 export class DtoAPIError extends Error {
 }
@@ -50,9 +32,7 @@ export class CatalogueAPI {
         }
     }
     hasFeature(feature) {
-        return (this.auth !== undefined &&
-            this.auth.apiSession.features !== undefined &&
-            this.auth.apiSession.features.indexOf(feature) > -1);
+        return this.auth !== undefined && this.auth.apiSession.features !== undefined && this.auth.apiSession.features.indexOf(feature) > -1;
     }
     fetch(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -66,7 +46,7 @@ export class CatalogueAPI {
                 response = yield this._fetch(url, options);
                 body = yield response.text();
                 const parsed = JSON.parse(body);
-                if ("error" in parsed) {
+                if (parsed && typeof parsed === "object" && "error" in parsed) {
                     err = new DtoAPIError(parsed.error);
                     err.body = body;
                     err.status = response.status;

package/dist/CfgProduct.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 import { AggregatedLoadingObservable, assert, assertDefined, augmentErrorMessage, compareArrays, count, Observable, toLengthUnit, } from "@configura/web-utilities";
 import { CfgMeasureDefinition } from "./CfgMeasure.js";
 import { ProductConfigurationBubbleMode } from "./productConfiguration/CfgOption.js";
@@ -17,9 +18,9 @@ import { SyncGroupsHandler } from "./syncGroups/SyncGroupsHandler.js";
 import { compareCfgProductData, correctDefaultsOnCatalogueParams, isSameCatalogueParams, isSameProductRef, makeProductKey, } from "./utilitiesCatalogueData.js";
 import { CfgProdConfParts, convertDtoProductConfToV1, isAdditionalProductConfiguration, isProductConf, } from "./utilitiesConfiguration.js";
 function completeSettings(incompleteSettings) {
-    var _a;
+    var _b;
     return {
-        strictSelectOneSelectionCount: (_a = incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.strictSelectOneSelectionCount) !== null && _a !== void 0 ? _a : false,
+        strictSelectOneSelectionCount: (_b = incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.strictSelectOneSelectionCount) !== null && _b !== void 0 ? _b : false,
         syncGroupsApplyMode: incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.syncGroupsApplyMode,
     };
 }
@@ -53,7 +54,7 @@ function isDescriptionMatch(l, r) {
  */
 export class _CfgProductInternal {
     constructor(initSuccess, initFail, _productLoaderRaw, prodParams, settings, optional, selected, rootFeatureRefs, rawFeatures, notes, uuid, _rawUnit, _rawProductData, apiSelection, apiConstraints, loadingObservable, parent, root, _additionalProductRef, _syncGroupHandler) {
-        var _a;
+        var _b;
         this._productLoaderRaw = _productLoaderRaw;
         this.prodParams = prodParams;
         this.settings = settings;
@@ -70,11 +71,11 @@ export class _CfgProductInternal {
         this.changeObservable = new Observable();
         /** Mark this and its descendants as destroyed and remove all listeners */
         this.destroy = () => {
-            var _a;
+            var _b;
             this._destroyed = true;
             this.changeObservable.stopAllListen();
             this.configuration.stopAllListenForChange();
-            for (const additionalProduct of (_a = this.additionalProducts) !== null && _a !== void 0 ? _a : []) {
+            for (const additionalProduct of (_b = this.additionalProducts) !== null && _b !== void 0 ? _b : []) {
                 additionalProduct.destroy();
             }
         };
@@ -152,7 +153,7 @@ export class _CfgProductInternal {
             }
         });
         this.getDtoConf = (include) => {
-            var _a;
+            var _b;
             const conf = {};
             const features = this.configuration._internal.getDtoConf((include & CfgProdConfParts.ExtendedData) === CfgProdConfParts.ExtendedData);
             if (0 < features.length) {
@@ -166,7 +167,7 @@ export class _CfgProductInternal {
             // so no need to store it for additional products.
             if ((include & CfgProdConfParts.SyncGroupState) === CfgProdConfParts.SyncGroupState &&
                 this.parent === undefined) {
-                conf.syncGroupState = (_a = this.syncGroupHandler) === null || _a === void 0 ? void 0 : _a.getCompactSyncGroupState();
+                conf.syncGroupState = (_b = this.syncGroupHandler) === null || _b === void 0 ? void 0 : _b.getCompactSyncGroupState();
             }
             const additionalProducts = this.additionalProducts;
             if (0 < additionalProducts.length) {
@@ -256,7 +257,7 @@ export class _CfgProductInternal {
             assert(!sourceProductAdditionalProducts ||
                 additionalProductsCount === sourceProductAdditionalProducts.length, `Passed sourceProduct does not have the same number of additional products as this.`);
             if ((yield Promise.all(apiSelectionAdditionalProducts.map((apiSelectionAdditionalProduct) => __awaiter(this, void 0, void 0, function* () {
-                var _b;
+                var _c;
                 const refKey = apiSelectionAdditionalProduct.refKey;
                 assertDefined(refKey, "Additional product api configurations must have refKey.");
                 const i = additionalProducts.findIndex((a) => refKey === a.refKey);
@@ -264,7 +265,7 @@ export class _CfgProductInternal {
                 let sourceProductAdditionalProduct = undefined;
                 if (sourceProductAdditionalProducts !== undefined) {
                     sourceProductAdditionalProduct =
-                        (_b = sourceProductAdditionalProducts.find((a) => refKey === a.refKey)) === null || _b === void 0 ? void 0 : _b._internal;
+                        (_c = sourceProductAdditionalProducts.find((a) => refKey === a.refKey)) === null || _c === void 0 ? void 0 : _c._internal;
                     assertDefined(sourceProductAdditionalProduct, "Additional product not found in sourceProduct");
                 }
                 const additionalProduct = additionalProducts.splice(i, 1)[0]; // Splicing like this is okay because this is done synchronous. The setCon. is what is async.
@@ -454,10 +455,10 @@ export class _CfgProductInternal {
                     change = true;
                 }
                 const newAdditionalProducts = yield Promise.all(additionalProductRefs.map((p) => (() => __awaiter(this, void 0, void 0, function* () {
-                    var _c;
+                    var _d;
                     const additionalProductRef = p.prodRef;
                     const refKey = additionalProductRef.refKey;
-                    const additionalProductInitialProductConfiguration = (_c = initialProductConfiguration === null || initialProductConfiguration === void 0 ? void 0 : initialProductConfiguration.additionalProducts) === null || _c === void 0 ? void 0 : _c.find((aP) => refKey === aP.refKey);
+                    const additionalProductInitialProductConfiguration = (_d = initialProductConfiguration === null || initialProductConfiguration === void 0 ? void 0 : initialProductConfiguration.additionalProducts) === null || _d === void 0 ? void 0 : _d.find((aP) => refKey === aP.refKey);
                     if (initialProductConfiguration !== undefined &&
                         additionalProductInitialProductConfiguration === undefined) {
                         console.warn(`Did not find initial product configuration for additional product with refKey ${refKey}`);
@@ -480,7 +481,7 @@ export class _CfgProductInternal {
             }
         });
         this.root = root !== null && root !== void 0 ? root : this;
-        this.key = makeProductKey(Object.assign(Object.assign({}, prodParams), { partNumber: (_a = _additionalProductRef === null || _additionalProductRef === void 0 ? void 0 : _additionalProductRef.refKey) !== null && _a !== void 0 ? _a : prodParams.partNumber }));
+        this.key = makeProductKey(Object.assign(Object.assign({}, prodParams), { partNumber: (_b = _additionalProductRef === null || _additionalProductRef === void 0 ? void 0 : _additionalProductRef.refKey) !== null && _b !== void 0 ? _b : prodParams.partNumber }));
         this._selected = optional ? selected : undefined;
         this.isAdditionalProduct = _additionalProductRef !== undefined;
         if (notes !== undefined) {
@@ -500,10 +501,10 @@ export class _CfgProductInternal {
     clone(parent, root) {
         return __awaiter(this, void 0, void 0, function* () {
             const product = yield new Promise((initSuccess, initFail) => {
-                var _a;
+                var _b;
                 const p = new _CfgProductInternal(() => {
                     initSuccess(p);
-                }, initFail, this._productLoaderRaw, this.prodParams, this.settings, this.optional, this.selected, this._configuration.rootFeatureRefs, this._configuration.rawFeatures, this._notes.values(), this.uuid, this._rawUnit, this._rawProductData, this.configuration._internal.getApiSelection(), this.configuration._internal.getApiConstrained(), new AggregatedLoadingObservable(), parent, root, this._additionalProductRef, (_a = this._syncGroupHandler) === null || _a === void 0 ? void 0 : _a.clone());
+                }, initFail, this._productLoaderRaw, this.prodParams, this.settings, this.optional, this.selected, this._configuration.rootFeatureRefs, this._configuration.rawFeatures, this._notes.values(), this.uuid, this._rawUnit, this._rawProductData, this.configuration._internal.getApiSelection(), this.configuration._internal.getApiConstrained(), new AggregatedLoadingObservable(), parent, root, this._additionalProductRef, (_b = this._syncGroupHandler) === null || _b === void 0 ? void 0 : _b.clone());
             });
             for (const additionalProduct of this.additionalProducts) {
                 product.additionalProducts.push(CfgProduct._makeNewRefFrom(yield additionalProduct._internal.clone(product, root || product)));
@@ -550,20 +551,20 @@ export class _CfgProductInternal {
         }
     }
     get notes() {
-        var _a;
-        return this.getNotes((_a = this.rawProductData.noteRefs) !== null && _a !== void 0 ? _a : []);
+        var _b;
+        return this.getNotes((_b = this.rawProductData.noteRefs) !== null && _b !== void 0 ? _b : []);
     }
     get miscFiles() {
-        var _a;
-        return (_a = this._rawProductData.miscFiles) !== null && _a !== void 0 ? _a : [];
+        var _b;
+        return (_b = this._rawProductData.miscFiles) !== null && _b !== void 0 ? _b : [];
     }
     get hasRootFeaturesChanged() {
         return (this._configuration._internal.hasRootFeaturesChanged ||
             this.additionalProducts.some((p) => p._internal.hasRootFeaturesChanged));
     }
     get description() {
-        var _a, _b;
-        return (_b = (_a = this._additionalProductRef) === null || _a === void 0 ? void 0 : _a.refDescription) !== null && _b !== void 0 ? _b : this._rawProductData.description;
+        var _b, _c;
+        return (_c = (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.refDescription) !== null && _c !== void 0 ? _c : this._rawProductData.description;
     }
     get rootNodeSources() {
         return this._rawProductData.models;
@@ -581,25 +582,25 @@ export class _CfgProductInternal {
         return this._rawProductData.partsData.prices;
     }
     get measureDefinitions() {
-        var _a;
+        var _b;
         if (this._measureDefinitions === undefined) {
-            this._measureDefinitions = ((_a = this._rawProductData.measurements) !== null && _a !== void 0 ? _a : [])
+            this._measureDefinitions = ((_b = this._rawProductData.measurements) !== null && _b !== void 0 ? _b : [])
                 .map((m) => CfgMeasureDefinition.make(m))
                 .filter((m) => m !== undefined);
         }
         return this._measureDefinitions;
     }
     get refKey() {
-        var _a;
-        return (_a = this._additionalProductRef) === null || _a === void 0 ? void 0 : _a.refKey;
+        var _b;
+        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.refKey;
     }
     get transform() {
-        var _a;
-        return (_a = this._additionalProductRef) === null || _a === void 0 ? void 0 : _a.transform;
+        var _b;
+        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.transform;
     }
     get anchor() {
-        var _a;
-        return (_a = this._additionalProductRef) === null || _a === void 0 ? void 0 : _a.anchor;
+        var _b;
+        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.anchor;
     }
     /** @throws an error if the actual unit sent by the server was not a LengthUnit */
     get unit() {
@@ -697,8 +698,8 @@ export class _CfgProductInternal {
         return this.root._syncGroupHandler;
     }
     get syncGroupsVerboseLogging() {
-        var _a, _b;
-        return (_b = (_a = this.syncGroupHandler) === null || _a === void 0 ? void 0 : _a.verboseLogging) !== null && _b !== void 0 ? _b : false;
+        var _b, _c;
+        return (_c = (_b = this.syncGroupHandler) === null || _b === void 0 ? void 0 : _b.verboseLogging) !== null && _c !== void 0 ? _c : false;
     }
     /**
      * Set to true to get verbose sync state changes logged to the console.
@@ -711,6 +712,7 @@ export class _CfgProductInternal {
         syncGroupHandler.verboseLogging = v;
     }
 }
+_a = _CfgProductInternal;
 _CfgProductInternal.make = (productLoaderRaw, productLoaderForGroupedLoad, // Used when instantiating the current product
 prodParams, settings, optional, loadingObservable, parent, root, additionalProductRef, initialProductConfiguration) => __awaiter(void 0, void 0, void 0, function* () {
     // Wrap with cache will make getProduct for this function call use the same server call
@@ -750,13 +752,13 @@ prodParams, settings, optional, loadingObservable, parent, root, additionalProdu
         const { productData, rootFeatureRefs, features: rawFeatures, notes, uuid, unit, } = productResponse;
         const initiallySelected = !optional || (initialProductConfigurationV1 === null || initialProductConfigurationV1 === void 0 ? void 0 : initialProductConfigurationV1.selected) === true;
         const product = yield new Promise((initSuccess, initFail) => {
-            var _a;
+            var _b;
             const p = new _CfgProductInternal(() => {
                 // We absolutely do not want anyone to assign to this._configuration. So we want that field private.
                 // But we can not set the api selection synchronously. And the product configuration needs "this". So we use this callback.
                 // Feel free to find a nicer more readable solution :)
                 initSuccess(p);
-            }, initFail, productLoaderRaw, prodParams, settings, optional, initiallySelected, rootFeatureRefs !== null && rootFeatureRefs !== void 0 ? rootFeatureRefs : [], rawFeatures, notes === null || notes === void 0 ? void 0 : notes.values(), uuid, unit, productData, (_a = productData.partsData.selOptions) !== null && _a !== void 0 ? _a : [], productData.partsData.constrOptions, loadingObservable, parent, root, additionalProductRef, syncGroupHandler);
+            }, initFail, productLoaderRaw, prodParams, settings, optional, initiallySelected, rootFeatureRefs !== null && rootFeatureRefs !== void 0 ? rootFeatureRefs : [], rawFeatures, notes === null || notes === void 0 ? void 0 : notes.values(), uuid, unit, productData, (_b = productData.partsData.selOptions) !== null && _b !== void 0 ? _b : [], productData.partsData.constrOptions, loadingObservable, parent, root, additionalProductRef, syncGroupHandler);
         });
         yield product._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, initialProductConfigurationV1);
         product._initialClone = yield product.clone();

package/dist/io/CfgIOProdConfConnector.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 import { convertDtoProductConfToV1 } from "../utilitiesConfiguration.js";
 export const isCfgProdConfMessage = (data) => typeof data === "object" && data !== null && "version" in data && "conf" in data;
 export const isCfgProdConfMessageV1 = (data) => isCfgProdConfMessage(data) && data.version === "1.0";
@@ -31,7 +32,7 @@ export class CfgIOProdConfConnector {
         this._stopListenToMessage = undefined;
         this._stopListenToProdConf = undefined;
         this.setProduct = (product) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _b, _c;
             const currentProduct = this._product;
             const newProduct = product;
             this._product = newProduct;
@@ -42,8 +43,8 @@ export class CfgIOProdConfConnector {
                 return;
             }
             if (currentProduct !== undefined) {
-                (_a = this._stopListenToMessage) === null || _a === void 0 ? void 0 : _a.call(this);
-                (_b = this._stopListenToProdConf) === null || _b === void 0 ? void 0 : _b.call(this);
+                (_b = this._stopListenToMessage) === null || _b === void 0 ? void 0 : _b.call(this);
+                (_c = this._stopListenToProdConf) === null || _c === void 0 ? void 0 : _c.call(this);
             }
             if (newProduct === undefined) {
                 return;
@@ -72,9 +73,9 @@ export class CfgIOProdConfConnector {
         _ioManager.addWarningSupplier(this);
     }
     destroy() {
-        var _a, _b;
-        (_a = this._stopListenToMessage) === null || _a === void 0 ? void 0 : _a.call(this);
-        (_b = this._stopListenToProdConf) === null || _b === void 0 ? void 0 : _b.call(this);
+        var _b, _c;
+        (_b = this._stopListenToMessage) === null || _b === void 0 ? void 0 : _b.call(this);
+        (_c = this._stopListenToProdConf) === null || _c === void 0 ? void 0 : _c.call(this);
         this._ioManager.removeWarningSupplier(this);
     }
     getWarnings() {
@@ -105,6 +106,7 @@ export class CfgIOProdConfConnector {
         };
     }
 }
+_a = CfgIOProdConfConnector;
 CfgIOProdConfConnector.makeMessage = (conf, initial, sendVersions) => {
     const result = [];
     if ((sendVersions & CfgProdConfMessageVersions.V1dot0) ===

package/dist/productConfiguration/productParamsGenerator.js

@@ -29,18 +29,32 @@ export function generateProductConfigurations(api, lang, catalogues, filters, se
                 const productEntries = productRefs.entries();
                 for (const [productIndex, prdRef] of productEntries) {
                     const startTime = performance.now();
-                    const product = yield __await(CfgProduct.make(api, Object.assign(Object.assign({}, catalogueParams), { partNumber: prdRef.partNr }), settings));
-                    const getProductDuration = performance.now() - startTime;
-                    yield yield __await({
-                        applicationAreasResponse,
-                        catalogueCount,
-                        catalogueIndex,
-                        catalogueParams,
-                        getProductDuration,
-                        product,
-                        productCount,
-                        productIndex,
-                    });
+                    try {
+                        const product = yield __await(CfgProduct.make(api, Object.assign(Object.assign({}, catalogueParams), { partNumber: prdRef.partNr }), settings));
+                        const getProductDuration = performance.now() - startTime;
+                        yield yield __await({
+                            applicationAreasResponse,
+                            catalogueCount,
+                            catalogueIndex,
+                            catalogueParams,
+                            getProductDuration,
+                            product,
+                            productCount,
+                            productIndex,
+                        });
+                    }
+                    catch (e) {
+                        const err = e;
+                        // Product load error, for example missing CmSym files.
+                        // Safe to continue loading the next product.
+                        const split = err.message.indexOf(", request ID: ");
+                        if (split > -1) {
+                            // The request ID part of the error from the server is mostly just spam and
+                            // makes it harder to read list of errors, so remove it.
+                            err.message = err.message.slice(0, split);
+                        }
+                        yield yield __await(toError(e));
+                    }
                 }
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "2.1.0-alpha.2",
+	"version": "2.2.0-alpha.0",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -17,13 +17,13 @@
 	"devDependencies": {
 		"@types/jest": "^26.0.23",
 		"del-cli": "^3.0.0",
-		"typescript": "4.2"
+		"typescript": "4.5"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "2.1.0-alpha.2"
+		"@configura/web-utilities": "2.2.0-alpha.0"
 	},
-	"gitHead": "0aa712ce445c807477b8ce42dc43285c7c086fcd"
+	"gitHead": "b01f3df9b902478356fb957c7b85ec6e3f2c5e9c"
 }