@configura/web-api 2.0.0-alpha.10 → 2.0.0-alpha.11

package/dist/io/CfgHistoryToProdConfConnector.d.ts

@@ -1,8 +1,8 @@
 import { DtoProductConfiguration } from "../CatalogueAPI.js";
 import { CfgHistoryManager, CfgHistoryManagerSendData } from "./CfgHistoryManager.js";
 import { CfgIOProdConfConnector, CfgProdConfMessage } from "./CfgIOProdConfConnector.js";
-export declare function dtoConfToString(conf: DtoProductConfiguration): string;
-export declare function stringToDtoConf(conf: string): DtoProductConfiguration;
+export declare const dtoConfToCompactString: (conf: DtoProductConfiguration) => string;
+export declare const compactStringToDtoConf: (versionAndConf: string) => DtoProductConfiguration;
 /**
  * Instantiating this will make the browser history (and URL) update with the product configuration.
  */

package/dist/io/CfgHistoryToProdConfConnector.js

@@ -1,30 +1,75 @@
 import { CfgHistoryManager } from "./CfgHistoryManager.js";
 import { CfgIOProdConfConnector, CfgProdConfMessageVersions, STAGE_PROD_CONF_MESSAGE_KEY, } from "./CfgIOProdConfConnector.js";
+const versionedRegex = /^v(\d+)(.+)$/;
 const jsonKeyRegex = /"([^"]+)":/g;
-const keyMap = [
-    ["configuration", "cn"],
-    ["additionalProducts", "as"],
-    ["prodParams", "pp"],
-    ["refKey", "rk"],
-    ["selected", "se"],
-    ["features", "fs"],
-    ["code", "cd"],
-    ["options", "os"],
-    ["numericValue", "nu"],
-    ["groupCode", "gc"],
-    ["unit", "un"],
-];
-// todo: Could be worth making faster
-const toCompact = (key) => { var _a, _b; return (_b = (_a = keyMap.find((i) => i[0] === key)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : key; };
-const toExpanded = (key) => { var _a, _b; return (_b = (_a = keyMap.find((i) => i[1] === key)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : key; };
-export function dtoConfToString(conf) {
-    const stringified = JSON.stringify(conf, undefined, "");
-    return stringified.replace(jsonKeyRegex, (_, key) => `"${toCompact(key)}":`);
-}
-export function stringToDtoConf(conf) {
-    const expandedKeys = conf.replace(jsonKeyRegex, (_, key) => `"${toExpanded(key)}":`);
-    return JSON.parse(expandedKeys);
+const swapIntoUrlAdaptedRegex = /[{}"]/g;
+const swapFromUrlAdaptedRegex = /[-~_]/g;
+const shortToLong = new Map();
+const longToShort = new Map();
+// The replacement scheme here assumes this will only be used for keys
+// in DtoProductConfiguration and the knowledge that it contains no one
+// one char keys.
+for (const [long, short] of [
+    ["configuration", "c"],
+    ["additionalProducts", "a"],
+    ["prodParams", "p"],
+    ["refKey", "r"],
+    ["selected", "s"],
+    ["features", "f"],
+    ["code", "d"],
+    ["options", "o"],
+    ["numericValue", "n"],
+    ["groupCode", "g"],
+    ["unit", "u"],
+]) {
+    shortToLong.set(short, long);
+    longToShort.set(long, short);
 }
+/**
+ * As certain chars are abundant in JSON but less abundant in the actual data
+ * we swap these so that frequent characters do not need to be URL-encoded.
+ */
+const jsonStringSwapCharsForUrl = (data) => data.replace(swapIntoUrlAdaptedRegex, (char) => {
+    switch (char) {
+        case "{":
+            return "~";
+        case "}":
+            return "-";
+        case '"':
+            return "_";
+        default:
+            throw new Error(`Unexpected char "${char}" in swap for URL`);
+    }
+});
+const jsonStringSwapCharsFromUrl = (data) => data.replace(swapFromUrlAdaptedRegex, (char) => {
+    switch (char) {
+        case "~":
+            return "{";
+        case "-":
+            return "}";
+        case "_":
+            return '"';
+        default:
+            throw new Error(`Unexpected char "${char}" in swap from URL`);
+    }
+});
+const compactDtoConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => { var _a; return `"${(_a = longToShort.get(key)) !== null && _a !== void 0 ? _a : key}":`; });
+const expandDtoConfJsonKeys = (data) => data.replace(jsonKeyRegex, (_, key) => { var _a; return `"${(_a = shortToLong.get(key)) !== null && _a !== void 0 ? _a : key}":`; });
+export const dtoConfToCompactString = (conf) => "v1" + jsonStringSwapCharsForUrl(compactDtoConfJsonKeys(JSON.stringify(conf, undefined, "")));
+export const compactStringToDtoConf = (versionAndConf) => {
+    const match = versionedRegex.exec(versionAndConf);
+    if (match === null) {
+        throw new Error("Could not match version string");
+    }
+    const [, version, conf] = match;
+    if (version !== "1") {
+        throw new Error("Unknown packed URL version");
+    }
+    if (conf === "") {
+        throw new Error("No conf found");
+    }
+    return JSON.parse(expandDtoConfJsonKeys(jsonStringSwapCharsFromUrl(conf)));
+};
 /**
  * Instantiating this will make the browser history (and URL) update with the product configuration.
  */
@@ -44,12 +89,12 @@ export class CfgHistoryToProdConfConnector extends CfgIOProdConfConnector {
         if (s === undefined) {
             return undefined;
         }
-        return stringToDtoConf(s);
+        return compactStringToDtoConf(s);
     }
     makeSendData(conf, initial) {
         return {
             message: CfgIOProdConfConnector.makeMessage(conf, initial, CfgProdConfMessageVersions.V2dot0),
-            qsKeyValues: new Map([[STAGE_PROD_CONF_MESSAGE_KEY, dtoConfToString(conf)]]),
+            qsKeyValues: new Map([[STAGE_PROD_CONF_MESSAGE_KEY, dtoConfToCompactString(conf)]]),
             useHistoryPush: this._useHistoryPush,
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "2.0.0-alpha.10",
+	"version": "2.0.0-alpha.11",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "2.0.0-alpha.10"
+		"@configura/web-utilities": "2.0.0-alpha.11"
 	},
-	"gitHead": "77f9cbe7521be3fd58a139bdc93167a349ef384f"
+	"gitHead": "a57e59802cbbcb61f2a49b64dcefeb7123679478"
 }