@lwrjs/shared-utils 0.7.0-alpha.9 → 0.7.2

package/build/cjs/identity.cjs

@@ -212,8 +212,14 @@ function isExternalUrl(url) {
 function isBundleDefinition(definition) {
   return definition.bundleRecord !== void 0;
 }
+function validateSpecifier(specifer) {
+  return specifer.indexOf("../") < 0;
+}
 function getModuleIdentity(req) {
   const {specifier, signature = LATEST_SIGNATURE} = req.params;
+  if (validateSpecifier(specifier) === false) {
+    throw new Error("dot-dot-slash is not allowed for module specifier");
+  }
   const moduleId = explodeSpecifier(specifier);
   return {
     moduleId,
@@ -232,6 +238,9 @@ function getMappingIdentity(req) {
 }
 function getResourceIdentity(req) {
   const {specifier, signature = LATEST_SIGNATURE} = req.params;
+  if (validateSpecifier(specifier) === false) {
+    throw new Error("dot-dot-slash is not allowed for resource specifier");
+  }
   const resourceId = explodeSpecifier(specifier);
   return {
     resourceId,
@@ -241,6 +250,9 @@ function getResourceIdentity(req) {
 function getAssetIdentity(req) {
   const {signature = LATEST_SIGNATURE, assetType: type} = req.params;
   const [specifier] = req.originalUrl.split("?");
+  if (validateSpecifier(specifier) === false) {
+    throw new Error("dot-dot-slash is not allowed for asset specifier");
+  }
   return {
     assetId: {
       specifier,

package/build/cjs/urls.cjs

@@ -24,6 +24,7 @@ var __toModule = (module2) => {
 // packages/@lwrjs/shared-utils/src/urls.ts
 __markAsModule(exports);
 __export(exports, {
+  decodeViewPath: () => decodeViewPath,
   extractRequestParams: () => extractRequestParams,
   getClientBootstrapConfigurationRoutes: () => getClientBootstrapConfigurationRoutes,
   getClientBootstrapConfigurationUri: () => getClientBootstrapConfigurationUri,
@@ -34,11 +35,18 @@ var import_path_to_regexp = __toModule(require("path-to-regexp"));
 var CONFIG_SUFFIX = "/config.js";
 var SIGNATURE_SIGIL = "s";
 function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams, signature) {
-  const encodeUrl = encodeURIComponent(routeInfo.url);
+  const encodeUrl = `-${encodeURIComponent(routeInfo.url)}-`;
   const configUrlPrefix = getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams);
   const signatureSegment = signature ? `/${SIGNATURE_SIGIL}/${signature}` : "";
   return `${configUrlPrefix}/${encodeUrl}${signatureSegment}${CONFIG_SUFFIX}`;
 }
+function decodeViewPath(encodedViewPath) {
+  let decodePath = decodeURIComponent(encodedViewPath);
+  if (encodedViewPath.startsWith("-") && encodedViewPath.endsWith("-")) {
+    decodePath = decodePath.substring(1, decodePath.length - 1);
+  }
+  return decodePath;
+}
 function getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams) {
   const {apiVersion, format, basePath} = runtimeEnvironment;
   const {id} = routeInfo;

package/build/es/identity.js

@@ -279,8 +279,14 @@ export function isExternalUrl(url) {
 export function isBundleDefinition(definition) {
     return definition.bundleRecord !== undefined;
 }
+function validateSpecifier(specifer) {
+    return specifer.indexOf('../') < 0;
+}
 export function getModuleIdentity(req) {
     const { specifier, signature = LATEST_SIGNATURE } = req.params;
+    if (validateSpecifier(specifier) === false) {
+        throw new Error('dot-dot-slash is not allowed for module specifier');
+    }
     const moduleId = explodeSpecifier(specifier);
     return {
         moduleId,
@@ -299,6 +305,9 @@ export function getMappingIdentity(req) {
 }
 export function getResourceIdentity(req) {
     const { specifier, signature = LATEST_SIGNATURE } = req.params;
+    if (validateSpecifier(specifier) === false) {
+        throw new Error('dot-dot-slash is not allowed for resource specifier');
+    }
     const resourceId = explodeSpecifier(specifier);
     return {
         resourceId,
@@ -308,6 +317,9 @@ export function getResourceIdentity(req) {
 export function getAssetIdentity(req) {
     const { signature = LATEST_SIGNATURE, assetType: type } = req.params;
     const [specifier] = req.originalUrl.split('?');
+    if (validateSpecifier(specifier) === false) {
+        throw new Error('dot-dot-slash is not allowed for asset specifier');
+    }
     return {
         assetId: {
             specifier,

package/build/es/urls.d.ts

@@ -3,6 +3,7 @@ export declare function getClientBootstrapConfigurationUri(routeInfo: {
     id: string;
     url: string;
 }, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, signature?: string): string;
+export declare function decodeViewPath(encodedViewPath: string): string;
 export declare function getClientBootstrapConfigurationUriPrefix(routeInfo: {
     id: string;
 }, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): string;

package/build/es/urls.js

@@ -2,11 +2,21 @@ import { pathToRegexp } from 'path-to-regexp';
 const CONFIG_SUFFIX = '/config.js';
 const SIGNATURE_SIGIL = 's';
 export function getClientBootstrapConfigurationUri(routeInfo, runtimeEnvironment, runtimeParams, signature) {
-    const encodeUrl = encodeURIComponent(routeInfo.url);
+    // Add extra dashes around encoded path so when saved as static file leading and
+    // trailing slashes are preserved as file path.
+    const encodeUrl = `-${encodeURIComponent(routeInfo.url)}-`;
     const configUrlPrefix = getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams);
     const signatureSegment = signature ? `/${SIGNATURE_SIGIL}/${signature}` : '';
     return `${configUrlPrefix}/${encodeUrl}${signatureSegment}${CONFIG_SUFFIX}`;
 }
+export function decodeViewPath(encodedViewPath) {
+    let decodePath = decodeURIComponent(encodedViewPath);
+    // Remove surrounding dashes
+    if (encodedViewPath.startsWith('-') && encodedViewPath.endsWith('-')) {
+        decodePath = decodePath.substring(1, decodePath.length - 1);
+    }
+    return decodePath;
+}
 export function getClientBootstrapConfigurationUriPrefix(routeInfo, runtimeEnvironment, runtimeParams) {
     const { apiVersion, format, basePath } = runtimeEnvironment;
     const { id } = routeInfo;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.0-alpha.9",
+    "version": "0.7.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -44,13 +44,13 @@
         "winston": "^3.7.2"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.7.0-alpha.9",
-        "@lwrjs/types": "0.7.0-alpha.9",
+        "@lwrjs/diagnostics": "0.7.2",
+        "@lwrjs/types": "0.7.2",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
-        "node": ">=14.15.4 <17"
+        "node": ">=14.15.4 <19"
     },
-    "gitHead": "522665298cc74f1898da6ed018fa72504bd72645"
+    "gitHead": "1467a95aa5dcf6901e1122f6025ffd4f22237a3f"
 }