@resistdesign/voltra 3.0.0-alpha.46 → 3.0.0-alpha.47

package/api/index.js

@@ -1,6 +1,6 @@
 import { TypeInfoORMUpdateOperators, ITEM_RELATIONSHIP_DAC_RESOURCE_NAME, ComparisonOperators } from '../chunk-RUNXRISF.js';
-import { getNoErrorDescriptor, getErrorDescriptor, ERROR_MESSAGE_CONSTANTS, validateTypeOperationAllowed, getValidityValue, validateTypeInfoValue, validateTypeInfoFieldValue } from '../chunk-YCTVEW2I.js';
-import { mergeStringPaths, getPathString, getPathArray } from '../chunk-WNFRDIBW.js';
+import { getNoErrorDescriptor, getErrorDescriptor, ERROR_MESSAGE_CONSTANTS, validateTypeOperationAllowed, getValidityValue, validateTypeInfoValue, validateTypeInfoFieldValue } from '../chunk-3HVYVX3S.js';
+import { mergeStringPaths, getPathString, getPathArray } from '../chunk-2JDOM6PB.js';
 import '../chunk-I2KLQ2HA.js';
 import { QueryCommand, PutItemCommand, ConditionalCheckFailedException, GetItemCommand, BatchGetItemCommand, BatchWriteItemCommand, DynamoDBClient, UpdateItemCommand, DeleteItemCommand, ScanCommand } from '@aws-sdk/client-dynamodb';
 import { marshall, unmarshall } from '@aws-sdk/util-dynamodb';

package/app/index.js

@@ -1,9 +1,9 @@
-export { createEasyLayout, getEasyLayoutTemplateDetails, getPascalCaseAreaName } from '../chunk-CMH6L5QQ.js';
+export { createEasyLayout, getEasyLayoutTemplateDetails, getPascalCaseAreaName } from '../chunk-QXYUXJKM.js';
 export { computeTrackPixels } from '../chunk-TJFTWPXQ.js';
-export { AutoForm, AutoFormView, Route, RouteContext, RouteContextConsumer, RouteContextProvider, RouteProvider, buildHistoryPath, buildQueryString, buildRoutePath, canUseBrowserHistory, computeAreaBounds, createAutoField, createBrowserRouteAdapter, createFormRenderer, createHistoryBackHandler, createManualRouteAdapter, createMemoryHistory, createNativeRouteAdapter, createRouteAdapterFromHistory, createUniversalAdapter, defaultTranslateValidationErrorCode, getFieldKind, parseHistoryPath, parseTemplate, resolveSuite, useFormEngine, useRouteContext, validateAreas, wrapRouteAdapterWithPathResolver } from '../chunk-44BMFTKD.js';
+export { AutoForm, AutoFormView, Route, RouteContext, RouteContextConsumer, RouteContextProvider, RouteProvider, buildHistoryPath, buildQueryString, buildRoutePath, canUseBrowserHistory, computeAreaBounds, createAutoField, createBrowserRouteAdapter, createFormRenderer, createHistoryBackHandler, createManualRouteAdapter, createMemoryHistory, createNativeRouteAdapter, createRouteAdapterFromHistory, createUniversalAdapter, defaultTranslateValidationErrorCode, getFieldKind, parseHistoryPath, parseTemplate, resolveSuite, useFormEngine, useRouteContext, validateAreas, wrapRouteAdapterWithPathResolver } from '../chunk-UD2ALOCE.js';
 import '../chunk-RUNXRISF.js';
-import '../chunk-YCTVEW2I.js';
-import { mergeStringPaths, PATH_DELIMITER } from '../chunk-WNFRDIBW.js';
+import '../chunk-3HVYVX3S.js';
+import { mergeStringPaths, PATH_DELIMITER } from '../chunk-2JDOM6PB.js';
 import '../chunk-I2KLQ2HA.js';
 import { createContext, useContext, useRef, useMemo, useCallback, useState, useEffect } from 'react';
 import { jsx } from 'react/jsx-runtime';

package/app/utils/Route.d.ts

@@ -84,7 +84,15 @@ export declare const buildQueryString: (query?: RouteQuery) => string;
  */
 export declare const buildRoutePath: (segments: Array<string | number>, query?: RouteQuery) => string;
 /**
- * Access values for the current Route.
+ * Access values for the current `Route`.
+ *
+ * `parentPath` is the consumer-facing route pattern for the currently matched
+ * parent route chain, expressed as plain slash-delimited segments such as
+ * `app/books/:id`.
+ *
+ * `parentPathInternal` carries the same logical route pattern in the
+ * JSON-serialized segment format used by the shared routing internals. Most
+ * consumers should prefer `parentPath`.
  */
 export type RouteContextType = {
     /**
@@ -92,9 +100,17 @@ export type RouteContextType = {
      */
     currentWindowPath: string;
     /**
-     * The parent path for this route level.
+     * Consumer-facing parent route pattern for this route level.
+     *
+     * Example: `app/books/:id`
      */
     parentPath: string;
+    /**
+     * Internal parent route pattern used by routing utilities and matcher logic.
+     *
+     * Example: `"app"/"books"/":id"`
+     */
+    parentPathInternal: string;
     /**
      * Aggregated route params from parent and current routes.
      */
@@ -116,6 +132,10 @@ export declare const RouteContextProvider: import("react").Provider<RouteContext
 /**
  * Access Route path and parameter information.
  *
+ * Use `parentPath` for app-facing route logic. `parentPathInternal` is exposed
+ * so advanced integrations can align with the internal routing helpers when
+ * needed.
+ *
  * @returns The current route context.
  */
 export declare const useRouteContext: () => RouteContextType;

package/build/index.js

@@ -1,4 +1,4 @@
-import { getPotentialJSONValue, getPathArray } from '../chunk-WNFRDIBW.js';
+import { getPotentialJSONValue, getPathArray } from '../chunk-2JDOM6PB.js';
 import '../chunk-I2KLQ2HA.js';
 import { SyntaxKind, isLiteralTypeNode, isStringLiteral, isNumericLiteral, createSourceFile, ScriptTarget } from 'typescript';
 

package/{chunk-WNFRDIBW.js → chunk-2JDOM6PB.js}

@@ -33,6 +33,23 @@ var mergeStringPaths = (path1, path2, delimiter = PATH_DELIMITER, filterEmptyOut
   useJson,
   uriEncodeParts
 );
+var resolvePath = (currentPath, newPath) => {
+  const newSegments = getPathArray(newPath, PATH_DELIMITER, true);
+  let currentSegments = getPathArray(currentPath, PATH_DELIMITER, true);
+  if (newPath.startsWith("/")) {
+    currentSegments = [];
+  }
+  newSegments.forEach((segment) => {
+    if (segment === "..") {
+      if (currentSegments.length > 0) {
+        currentSegments.pop();
+      }
+    } else if (segment !== ".") {
+      currentSegments.push(segment);
+    }
+  });
+  return "/" + currentSegments.join("/");
+};
 var splitRoutePathParts = (rawPath) => {
   let path = rawPath;
   let hash = "";
@@ -118,4 +135,4 @@ var getParamsAndTestPath = (path, testPath, exact = false) => {
   }
 };
 
-export { PATH_DELIMITER, getParamsAndTestPath, getPathArray, getPathString, getPotentialJSONValue, mergeStringPaths, resolveRouteAdapterPath };
+export { PATH_DELIMITER, getParamsAndTestPath, getPathArray, getPathString, getPotentialJSONValue, mergeStringPaths, resolvePath, resolveRouteAdapterPath };

package/{chunk-YCTVEW2I.js → chunk-3HVYVX3S.js}

@@ -1,4 +1,4 @@
-import { getPathString } from './chunk-WNFRDIBW.js';
+import { getPathString } from './chunk-2JDOM6PB.js';
 
 // src/common/TypeParsing/TypeInfo.ts
 var TypeOperation = /* @__PURE__ */ ((TypeOperation2) => {

package/{chunk-CMH6L5QQ.js → chunk-QXYUXJKM.js}

@@ -1,4 +1,4 @@
-import { parseTemplate, validateAreas } from './chunk-44BMFTKD.js';
+import { parseTemplate, validateAreas } from './chunk-UD2ALOCE.js';
 
 // src/app/utils/EasyLayout.tsx
 var getPascalCaseAreaName = (area) => {

package/{chunk-44BMFTKD.js → chunk-UD2ALOCE.js}

@@ -1,5 +1,5 @@
-import { getErrorDescriptor, getNoErrorDescriptor, validateTypeInfoDataItem, getArrayItemErrorMap, getErrorDescriptors, ERROR_MESSAGE_CONSTANTS } from './chunk-YCTVEW2I.js';
-import { resolveRouteAdapterPath, getPathString, mergeStringPaths, getParamsAndTestPath } from './chunk-WNFRDIBW.js';
+import { getErrorDescriptor, getNoErrorDescriptor, validateTypeInfoDataItem, getArrayItemErrorMap, getErrorDescriptors, ERROR_MESSAGE_CONSTANTS } from './chunk-3HVYVX3S.js';
+import { resolveRouteAdapterPath, getPathString, mergeStringPaths, getParamsAndTestPath, getPathArray, PATH_DELIMITER } from './chunk-2JDOM6PB.js';
 import { createContext, useContext, useMemo, useState, useEffect, useCallback, createElement, useRef } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
@@ -540,9 +540,17 @@ var buildRoutePath = (segments, query) => {
   const queryString = query ? buildQueryString(query) : "";
   return queryString ? `${basePath}?${queryString}` : basePath;
 };
+var getReadableRoutePath = (path) => getPathString(
+  getPathArray(path, PATH_DELIMITER, true, true, true, false),
+  PATH_DELIMITER,
+  true,
+  false,
+  false
+);
 var RouteContext = createContext({
   currentWindowPath: "",
   parentPath: "",
+  parentPathInternal: "",
   params: {},
   isTopLevel: true
 });
@@ -646,6 +654,7 @@ var RouteProvider = ({
     () => ({
       currentWindowPath: currentPath,
       parentPath: "",
+      parentPathInternal: "",
       params: {},
       isTopLevel: true,
       adapter: normalizedAdapter
@@ -666,6 +675,7 @@ var RouteMatcher = ({
   const {
     currentWindowPath = "",
     parentPath = "",
+    parentPathInternal = "",
     params: parentParams = {},
     adapter
   } = useRouteContext();
@@ -685,7 +695,10 @@ var RouteMatcher = ({
   const matchedRoute = useMemo(
     () => {
       for (const routePathConfig of normalizedPaths) {
-        const fullPath = mergeStringPaths(parentPath, routePathConfig.path);
+        const fullPath = mergeStringPaths(
+          parentPathInternal,
+          routePathConfig.path
+        );
         const newParams = getParamsAndTestPath(
           targetCurrentPath,
           fullPath,
@@ -700,7 +713,7 @@ var RouteMatcher = ({
       }
       return null;
     },
-    [targetCurrentPath, parentPath, normalizedPaths]
+    [targetCurrentPath, parentPathInternal, normalizedPaths]
   );
   const params = useMemo(
     () => ({
@@ -712,12 +725,13 @@ var RouteMatcher = ({
   const newRouteContext = useMemo(
     () => ({
       currentWindowPath: targetCurrentPath,
-      parentPath: matchedRoute?.fullPath ?? parentPath,
+      parentPath: getReadableRoutePath(matchedRoute?.fullPath ?? parentPathInternal),
+      parentPathInternal: matchedRoute?.fullPath ?? parentPathInternal,
       params,
       isTopLevel: false,
       adapter
     }),
-    [targetCurrentPath, matchedRoute, parentPath, params, adapter]
+    [targetCurrentPath, matchedRoute, parentPathInternal, params, adapter]
   );
   useEffect(() => {
     if (onParamsChange) {

package/common/index.d.ts

@@ -7,10 +7,12 @@
  * Import from the common subpath only:
  * ```ts
  * import {
+ *   getPathArray,
  *   getPathString,
  *   getSimpleId,
  * } from "@resistdesign/voltra/common";
  *
+ * const segments = getPathArray("/users/42", "/", true, true, false, false);
  * const path = getPathString(["users", 42], "/", true, false);
  * const id = getSimpleId();
  * ```
@@ -28,6 +30,11 @@ export type * from "./HelperTypes";
  * @group Command Line
  */
 export * from "./CommandLine";
+/**
+ * @category common
+ * @group Routing
+ */
+export * from "./Routing";
 /**
  * @category common
  * @group Type Parsing

package/common/index.js

@@ -1,6 +1,6 @@
 export { ComparisonOperators, ITEM_RELATIONSHIP_DAC_RESOURCE_NAME, LogicalOperators, OperationGroup, RelationshipOperation, TypeInfoORMAPIRoutePaths, TypeInfoORMServiceError, TypeInfoORMUpdateOperators } from '../chunk-RUNXRISF.js';
-export { DENIED_TYPE_OPERATIONS, ERROR_MESSAGE_CONSTANTS, INVALID_CUSTOM_TYPE, PRIMITIVE_ERROR_MESSAGE_CONSTANTS, RelationshipValidationType, TYPE_KEYWORD_ERROR_MESSAGE_CONSTANTS, TYPE_KEYWORD_VALIDATORS, TypeOperation, getArrayItemErrorMap, getErrorDescriptor, getErrorDescriptors, getNoErrorDescriptor, getValidityValue, hasValue, isArrayErrorDescriptorCollection, validateArrayOfTypeInfoFieldValues, validateCustomType, validateKeywordType, validateTypeInfoDataItem, validateTypeInfoFieldOperationAllowed, validateTypeInfoFieldValue, validateTypeInfoValue, validateTypeOperationAllowed, validateValueMatchesPattern } from '../chunk-YCTVEW2I.js';
-import '../chunk-WNFRDIBW.js';
+export { DENIED_TYPE_OPERATIONS, ERROR_MESSAGE_CONSTANTS, INVALID_CUSTOM_TYPE, PRIMITIVE_ERROR_MESSAGE_CONSTANTS, RelationshipValidationType, TYPE_KEYWORD_ERROR_MESSAGE_CONSTANTS, TYPE_KEYWORD_VALIDATORS, TypeOperation, getArrayItemErrorMap, getErrorDescriptor, getErrorDescriptors, getNoErrorDescriptor, getValidityValue, hasValue, isArrayErrorDescriptorCollection, validateArrayOfTypeInfoFieldValues, validateCustomType, validateKeywordType, validateTypeInfoDataItem, validateTypeInfoFieldOperationAllowed, validateTypeInfoFieldValue, validateTypeInfoValue, validateTypeOperationAllowed, validateValueMatchesPattern } from '../chunk-3HVYVX3S.js';
+export { PATH_DELIMITER, getParamsAndTestPath, getPathArray, getPathString, getPotentialJSONValue, mergeStringPaths, resolvePath, resolveRouteAdapterPath } from '../chunk-2JDOM6PB.js';
 import '../chunk-I2KLQ2HA.js';
 
 // src/common/CommandLine/collectRequiredEnvironmentVariables.ts

package/native/index.js

@@ -1,7 +1,7 @@
 import { computeTrackPixels } from '../chunk-TJFTWPXQ.js';
-import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, createBrowserRouteAdapter, Route, createRouteAdapterFromHistory } from '../chunk-44BMFTKD.js';
-import { ERROR_MESSAGE_CONSTANTS } from '../chunk-YCTVEW2I.js';
-import '../chunk-WNFRDIBW.js';
+import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, createBrowserRouteAdapter, Route, createRouteAdapterFromHistory } from '../chunk-UD2ALOCE.js';
+import { ERROR_MESSAGE_CONSTANTS } from '../chunk-3HVYVX3S.js';
+import '../chunk-2JDOM6PB.js';
 import '../chunk-I2KLQ2HA.js';
 import { createElement, useMemo, useRef } from 'react';
 import { Text, View, Platform, Switch, TextInput, Pressable, BackHandler } from 'react-native';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resistdesign/voltra",
-  "version": "3.0.0-alpha.46",
+  "version": "3.0.0-alpha.47",
   "description": "With our powers combined!",
   "homepage": "https://voltra.app",
   "repository": "git@github.com:resistdesign/voltra.git",

package/web/index.js

@@ -1,7 +1,7 @@
-import { createEasyLayout } from '../chunk-CMH6L5QQ.js';
-import { createFormRenderer, AutoFormView, AutoForm, createBrowserRouteAdapter, Route } from '../chunk-44BMFTKD.js';
-import { ERROR_MESSAGE_CONSTANTS } from '../chunk-YCTVEW2I.js';
-import '../chunk-WNFRDIBW.js';
+import { createEasyLayout } from '../chunk-QXYUXJKM.js';
+import { createFormRenderer, AutoFormView, AutoForm, createBrowserRouteAdapter, Route } from '../chunk-UD2ALOCE.js';
+import { ERROR_MESSAGE_CONSTANTS } from '../chunk-3HVYVX3S.js';
+import '../chunk-2JDOM6PB.js';
 import { __export, __reExport } from '../chunk-I2KLQ2HA.js';
 import { createElement, useCallback, useRef } from 'react';
 import * as styledBase from 'styled-components';