@configura/web-api 3.0.0-alpha.1 → 3.0.0-alpha.3

package/dist/utilitiesConfiguration.js

@@ -20,17 +20,16 @@ let hasInformedAboutProdParams = false;
 let hasInformedAboutGroupCode = false;
 let hasInformedAboutUnit = false;
 export const convertDtoProductConfToV1 = (conf, silenceWarnings = false) => {
-    var _a, _b;
     if (!silenceWarnings && conf.prodParams !== undefined && !hasInformedAboutProdParams) {
         hasInformedAboutProdParams = true;
         console.info("Incoming DtoProductConf contains prodParams. These will be ignored.");
     }
     const result = {
-        selOptions: ((_a = conf.features) !== null && _a !== void 0 ? _a : []).map((f) => ({
+        selOptions: (conf.features ?? []).map((f) => ({
             code: "!~!",
             next: convertDtoFeatureConfToApiSelection(f, silenceWarnings),
         })),
-        additionalProducts: ((_b = conf.additionalProducts) !== null && _b !== void 0 ? _b : []).map((p) => convertDtoProductConfToV1(p, silenceWarnings)),
+        additionalProducts: (conf.additionalProducts ?? []).map((p) => convertDtoProductConfToV1(p, silenceWarnings)),
         selected: true,
     };
     if (isDtoProductConfAdditional(conf)) {
@@ -39,7 +38,7 @@ export const convertDtoProductConfToV1 = (conf, silenceWarnings = false) => {
     }
     return result;
 };
-export const convertDtoFeatureConfsToSelOptions = (features, silenceWarnings = false) => (features !== null && features !== void 0 ? features : []).map((f) => ({
+export const convertDtoFeatureConfsToSelOptions = (features, silenceWarnings = false) => (features ?? []).map((f) => ({
     code: "!~!",
     next: convertDtoFeatureConfToApiSelection(f, silenceWarnings),
 }));
@@ -54,14 +53,14 @@ const convertDtoFeatureConfToApiSelection = (feature, silenceWarnings) => {
         console.info("Incoming DtoFeature contains a unit. It will be ignored.");
     }
     const result = {};
-    for (const option of (options !== null && options !== void 0 ? options : []).filter((o) => o.selected)) {
+    for (const option of (options ?? []).filter((o) => o.selected)) {
         result[option.code] = convertDtoOptionConfToSelectedOption(option, silenceWarnings);
     }
     return result;
 };
 const convertDtoOptionConfToSelectedOption = (option, silenceWarnings) => {
     const { features, code, numericValue } = option;
-    const selectionTrees = (features !== null && features !== void 0 ? features : []).map((f) => convertDtoFeatureConfToApiSelection(f, silenceWarnings));
+    const selectionTrees = (features ?? []).map((f) => convertDtoFeatureConfToApiSelection(f, silenceWarnings));
     const mergedSelectionTree = {};
     let anyItems = false;
     for (const selectionTree of selectionTrees) {
@@ -137,8 +136,8 @@ const jsonStringSwapCharsForUrl = (data) => data.replace(swapForUrlAdaptedRegex,
             throw new Error(`Unexpected char "${char}" in swap for URL`);
     }
 });
-const compactDtoProductConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => { var _a; return `"${(_a = longToShort.get(key)) !== null && _a !== void 0 ? _a : key}":`; });
-const expandDtoProductConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => { var _a; return `"${(_a = shortToLong.get(key)) !== null && _a !== void 0 ? _a : key}":`; });
+const compactDtoProductConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => `"${longToShort.get(key) ?? key}":`);
+const expandDtoProductConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => `"${shortToLong.get(key) ?? key}":`);
 /**
  * Serializes and compacts the configuration into a format especially suited for URLs
  */
@@ -162,10 +161,9 @@ export const compactStringToDtoProductConf = (versionAndConf) => {
     return JSON.parse(expandDtoProductConfJsonKeys(jsonStringSwapCharsForUrl(conf)));
 };
 export const stripExtendedDataFromDtoProductConf = (conf, toStrip) => {
-    var _a, _b;
     const stripped = {
-        features: (_a = conf.features) === null || _a === void 0 ? void 0 : _a.map((f) => stripExtendedDataFromDtoFeatureConf(f, toStrip)),
-        additionalProducts: (_b = conf.additionalProducts) === null || _b === void 0 ? void 0 : _b.map(stripExtendedDataFromDtoAdditionalProductConfiguration),
+        features: conf.features?.map((f) => stripExtendedDataFromDtoFeatureConf(f, toStrip)),
+        additionalProducts: conf.additionalProducts?.map(stripExtendedDataFromDtoAdditionalProductConfiguration),
     };
     if ((toStrip & CfgProdConfParts.SyncGroupState) !== CfgProdConfParts.SyncGroupState) {
         stripped.syncGroupState = conf.syncGroupState;
@@ -175,12 +173,15 @@ export const stripExtendedDataFromDtoProductConf = (conf, toStrip) => {
     }
     return stripped;
 };
-const stripExtendedDataFromDtoAdditionalProductConfiguration = (conf, toStrip) => (Object.assign(Object.assign({}, stripExtendedDataFromDtoProductConf(conf, toStrip)), { refKey: conf.refKey, selected: conf.selected }));
+const stripExtendedDataFromDtoAdditionalProductConfiguration = (conf, toStrip) => ({
+    ...stripExtendedDataFromDtoProductConf(conf, toStrip),
+    refKey: conf.refKey,
+    selected: conf.selected,
+});
 const stripExtendedDataFromDtoFeatureConf = (conf, toStrip) => {
-    var _a;
     const stripped = {
         code: conf.code,
-        options: (_a = conf.options) === null || _a === void 0 ? void 0 : _a.map((o) => stripExtendedDataFromDtoOptionConf(o, toStrip)),
+        options: conf.options?.map((o) => stripExtendedDataFromDtoOptionConf(o, toStrip)),
     };
     if ((toStrip & CfgProdConfParts.ExtendedData) !== CfgProdConfParts.ExtendedData) {
         // Keep in sync with getDtoConf in CfgFeature
@@ -189,12 +190,9 @@ const stripExtendedDataFromDtoFeatureConf = (conf, toStrip) => {
     }
     return stripped;
 };
-const stripExtendedDataFromDtoOptionConf = (conf, toStrip) => {
-    var _a;
-    return ({
-        code: conf.code,
-        selected: conf.selected,
-        numericValue: conf.numericValue,
-        features: (_a = conf.features) === null || _a === void 0 ? void 0 : _a.map((f) => stripExtendedDataFromDtoFeatureConf(f, toStrip)),
-    });
-};
+const stripExtendedDataFromDtoOptionConf = (conf, toStrip) => ({
+    code: conf.code,
+    selected: conf.selected,
+    numericValue: conf.numericValue,
+    features: conf.features?.map((f) => stripExtendedDataFromDtoFeatureConf(f, toStrip)),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "3.0.0-alpha.1",
+	"version": "3.0.0-alpha.3",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "3.0.0-alpha.1"
+		"@configura/web-utilities": "3.0.0-alpha.3"
 	},
-	"gitHead": "0d18e1a05f913a1367cba0293ee61c5a3320a509"
+	"gitHead": "4332ed866e78584bfa40bf2d6a3258108dc4093c"
 }