@mapples/types 1.6.0-beta.20260930095028 → 1.6.0-beta.20261001084831

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,11 +1,28 @@
1
1
  # @mapples/types
2
2
 
3
- ## 1.6.0-beta.20260930095028
3
+ ## 1.6.0-beta.20261001084831
4
4
 
5
5
  ### Minor Changes
6
6
 
7
+ - 35e9ba6: Creator behaviour runs in the exported app.
8
+ - `@mapples/app`: `MapplesApp` mounts the behaviour runtime (`MapplesRuntime`) — action bus, project variables (`vars.*`) with the `mapples:setState` handler, the API runtime (`api.*`, real requests via `fetch` with secrets from `EXPO_PUBLIC_MAPPLES_SECRET_<NAME>`, or a custom `transport`) with the `mapples:request` handler, the focused route's params, and `RouterActionHandler`, which drives expo-router with the same `toNavigationCommand` semantics as Play (navigate pushes; guard redirects, `replace` and sign-in into a guarded area reset the history). It reads `mapples/navigation.ts`, `mapples/api.ts` and `mapples/variables.ts` through `mapplesResolver` (new `mapples::navigation|api|variables` modules). CLI-generated layouts wrap screens with `mapplesScreens(...)` (`MapplesScreen`: params, on-enter action, guard + fallback, page-scoped variables; `RouteGuard` for a route entering a nested navigator) and render tab/drawer icons with `RouteIcon`. New peers: `@mapples/action`, `@mapples/navigation`, `@mapples/request`, `@mapples/state`, `rxjs`; `expo-router` is no longer optional.
9
+ - `@mapples/render`: `useElementBindings` / `useActionHandlers` — the one implementation of data bindings, `_visible`, asset refs and actions — shared by `RenderComponent` and the new `MapplesElement`, which `babel-plugin-mapples-sid` renders every element carrying `$data` / `$actions` / `$refs` through.
10
+ - `@mapples/navigation`: exports `RouteScreen` / `RouteGuard`; a screen's blur no longer wipes the params the next focused screen already published (on-enter requests reading `route.*` could stall); Play's navigators take header visibility, titles and tab/drawer labels from the shared `routeHeaderVisible` / `routeTitle` / `routeItemLabel` (a route entering a nested navigator no longer draws a second header); `entersGuardFromFallback` also counts the guards on the nested initial route chain a navigate lands on, so signing in to a route whose nested area is guarded resets the history in Play and the exported app.
11
+ - `@mapples/state`: `ActiveRouteState.releaseParams`.
12
+ - `@mapples/types`: `routeHeaderVisible`, `routeTitle`, `routeItemLabel` — the header/title/label rules the canvas frame chrome and the generated layouts share (a route entering a nested navigator draws no header of its own).
13
+ - `@mapples/style`: styled styles accept a `boxShadow` object `{ x, y, radius, color }` in their types, as the styler already rendered it.
14
+ - `@mapples/sid-ast`: a newly added attribute (a binding's `$data`) goes right after the last attribute — no double space, and the space before `/>` stays.
15
+ - `@mapplesorg/canvas`: frame chrome follows the shared header rule (no `Auth`/`Auth` double header); switching an action's type drops the previous type's `staticData` keys (no stale `pageUuid` on a set-variable action).
16
+
7
17
  - b1b8560: Header options now apply to every navigator type, and their default is explicit. A tabs or drawer navigator draws a header of its own, but only a stack's options were mapped — so a navigator nested in a stack always stacked a second header under its parent's with nothing that could turn it off. `resolveNavigatorHeader` and `navigatorHeaderVisible` expose the navigator default (`visible` unset means shown), so an editor can present a plain on/off instead of a tri-state that reads "off" while the header is up; route-level `visible` stays tri-state, because unset there means "inherit the navigator". `NavigationDocument.canvas` carries editor-only canvas preferences, ignored by the runtime the same way `NavigatorNode.canvas` is.
8
18
  - 7339399: Designed navigator chrome. A tabs navigator's `TabBarOptions.componentUuid` and a drawer's `DrawerOptions.componentUuid` name a saved component that renders the bar or the drawer content, and `TabBarOptions.native` asks the exported app for expo-router's `NativeTabs`. `@mapples/render` carries the contract (`NavigatorChromeContext`, `useNavigatorChrome`): the navigator's routes as items with a label, an active flag and an icon renderer, plus `select`, `close` and the safe-area insets. Two new `@mapples/components` elements read it — `TabBarItems` (one tab per route, pill, labels, badges' tones) and `DrawerItems` (one row per route) — and show a notice when the component is not a navigator's design yet; `@mapples/components` now peers on `@mapples/render`. `@mapples/navigation` mounts a design through `TabBarHost` / `DrawerContentHost` (React Navigation's `tabBar` / `drawerContent`, reading only their props so an exported app uses them as-is) when `MapplesNavigation` is given the `chrome` map, and keeps `visible: false` working for a custom bar. The Creator canvas draws a designed tab bar on every screen frame with its measured height as the bottom inset, a platform-styled placeholder for a native bar, frames a chrome master on the components surface at the chrome's shape with the navigator's routes flowing in, and labels storyboard sections with their design. `create_navigator_chrome` creates and assigns a starter design; `set_navigator_options` accepts the new fields.
19
+ - 35e9ba6: Guards on navigator routes, built-in glyph tab icons, and storyboard placement fixes (RC #16, #20, #21, #22, #33, #34).
20
+ - `@mapples/types`: a guard on a route that enters a nested navigator protects the whole section; the validator rejects a fallback inside the guarded section (`navigatorRouteIds`). Tab / drawer icons accept a built-in glyph, `ref(glyph:<family>:<name>)` (`buildGlyphRef` / `parseGlyphRef`), besides an icon asset.
21
+ - `@mapples/navigation`: navigator routes honour their guard (`RouteGuard`); guard redirects reset the history instead of pushing (`replace` on `mapples:navigate`), and navigating from a guard's fallback into the area it guards (sign in → signed-in area) resets it too, so no back arrow leads into or out of a protected area. `ref(glyph:…)` icons render through the host's registered `Icon` component.
22
+ - `@mapples/components`: a `TabBarItems` / `BottomNavigationBar` item without an icon is a label-only tab (pill behind the label) instead of an empty pill.
23
+ - `@mapplesorg/canvas`: frames and designed bars draw glyph tab icons; a stock bar's tab without an icon is label-only, not a grey square; the frame tab bar no longer asks the project typography for the editor's `caption` / `overline` variants; guarded sections get a "Guarded" chip and an amber arrow to their fallback; placing a section or screen from the palette commits the drawn cells of its container, so the new item lands where it was clicked instead of pushing unplaced neighbours around; zoom-to-fit includes sections; `IconNameGrid` is exported.
24
+ - `@mapplesorg/ai-tools`: `set_route_guard` covers navigator routes; `set_route_options` takes glyph refs for `tabIcon` / `drawerIcon`.
25
+
9
26
  - 6f37bab: API responses move to their own `@mapples/state` context (`ApiStateContextProvider`, `useApiState`), so `api.*` bindings resolve inside a nested `StateProvider` — a list row, a scoped data state — the way `vars.*` does; `validateApiDocument` now rejects a state key outside the `api.` namespace (`STATE_KEY_NAMESPACE`, `API_NAMESPACE`) and no longer reads an environment variable's `{{name}}` as the path token `{name`; it also rejects a request name that can't be a binding-path segment (`REQUEST_NAME_INVALID`, `API_REQUEST_NAME_PATTERN`) and an empty path (`PATH_EMPTY`). `@mapples/request` performs calls through a pluggable `RequestTransport` (`transport` prop, `createFetchTransport`), which receives `auth` unresolved so a forwarding transport never holds a secret. The runtime no longer fails silently: an unknown `requestId`, a path token that resolves to nothing, an undefined `{{variable}}`, a relative path without a base URL and an unconfigured secret all throw (`onRequestError` receives the resolution errors), an unresolved `state` source is no longer sent as the string `N/A`, and `event` sources read the event's first argument instead of the `staticData`-merged payload. `RequestProvider` drops its `state` prop.
10
27
  - b1b8560: Routes carry a flow of their own: a `path` with `:token` params (`/product/:id`), an `onEnter` action emitted on every focus, and an access `guard` with a fallback route. Params travel on the navigate action as literals or value sources (`data` reads the pressed list row, `state` any binding), land in a new `route.*` state namespace the screen binds, and reach root-mounted handlers through `ActiveRouteProvider` — so a request bound to `route.id` loads the product page. `resolveValueSource` is shared by the request and navigation runtimes, and the new `data` source kind reads an action's resolved data. The navigate action form gets one source field per route param, the AI catalog `set_route_path` / `set_route_guard` / `set_route_on_enter` and `add_connection` params.
11
28
  - a6c5872: All `@mapples/*` runtime packages now share one version and are versioned and published together from `mapplesorg/mapples-kit`; `mapples-open-kit` is a read-only mirror of the source.
@@ -151,9 +151,17 @@ export interface RouteNode {
151
151
  * the user to {@link guardFallbackRouteId} instead. Meant for "signed in"
152
152
  * style checks — a screen waiting for its data binds `api.<name>.loading`,
153
153
  * a guard on the response would bounce the user before the request settles.
154
+ *
155
+ * On a route that enters a nested navigator the guard protects that whole
156
+ * area — every screen under it (expo-router's `Stack.Protected` around the
157
+ * group). The fallback must then lie outside the guarded area.
154
158
  */
155
159
  guard?: string;
156
- /** Id of the route shown when {@link guard} fails. Required with a guard. */
160
+ /**
161
+ * Id of the route shown when {@link guard} fails. Required with a guard;
162
+ * never the guarded route itself nor, for a navigator route, a route
163
+ * inside the navigator it guards.
164
+ */
157
165
  guardFallbackRouteId?: string;
158
166
  /**
159
167
  * An action emitted each time the screen gains focus, with the route's
@@ -312,18 +320,62 @@ export interface DrawerOptions {
312
320
  * Per-screen option overrides. Extends {@link HeaderOptions} (each field
313
321
  * optional) and adds tab/drawer item presentation for the screen.
314
322
  *
315
- * Icon fields accept a reference of the form `ref(icon:<uuid>:<name>)`.
323
+ * Icon fields accept an uploaded icon asset, `ref(icon:<uuid>:<name>)`, or a
324
+ * built-in font glyph, `ref(glyph:<family>:<name>)` (see {@link buildGlyphRef}).
316
325
  *
317
326
  * @interface ScreenOptions
318
327
  */
319
328
  export interface ScreenOptions extends Partial<HeaderOptions> {
320
- /** Tab bar icon — `ref(icon:<uuid>:<name>)`. */
329
+ /** Tab bar icon — `ref(icon:<uuid>:<name>)` or `ref(glyph:<family>:<name>)`. */
321
330
  tabIcon?: string;
322
331
  /** Tab bar label override. */
323
332
  tabLabel?: string;
324
- /** Drawer icon — `ref(icon:<uuid>:<name>)`. */
333
+ /** Drawer icon — `ref(icon:<uuid>:<name>)` or `ref(glyph:<family>:<name>)`. */
325
334
  drawerIcon?: string;
326
335
  /** Drawer label override. */
327
336
  drawerLabel?: string;
328
337
  }
338
+ /**
339
+ * A built-in font glyph used as a tab / drawer icon: the icon family's key as
340
+ * `@mapples/ui` persists it (`ionicons`, `material-icons`, …) and the glyph's
341
+ * name in that family — the same pair an `Icon` element renders
342
+ * (`iconStyle` + `iconName`).
343
+ *
344
+ * @interface GlyphRef
345
+ */
346
+ export interface GlyphRef {
347
+ family: string;
348
+ name: string;
349
+ }
350
+ /**
351
+ * The `ref(glyph:<family>:<name>)` string a {@link ScreenOptions} icon field
352
+ * stores for a built-in glyph. The family is pinned in the ref (rather than
353
+ * following the project's icon family) so the exported app can import the
354
+ * one font it names.
355
+ */
356
+ export declare const buildGlyphRef: (family: string, name: string) => string;
357
+ /** The family and glyph of a `ref(glyph:…)` string, or `null` if it isn't one. */
358
+ export declare const parseGlyphRef: (value?: string) => GlyphRef | null;
359
+ /**
360
+ * Whether a route's screen shows its navigator's header. The route's own
361
+ * `visible` wins. Otherwise a route that enters a nested navigator shows
362
+ * none — the nested navigator draws the header of the screen inside it, and
363
+ * drawing the parent's too stacks two bars (`Auth` over `Sign in`) — and a
364
+ * page route follows its navigator (shown unless the navigator turns it off).
365
+ *
366
+ * The one rule the canvas frame chrome and the exported app's generated
367
+ * layouts (the `mapples` CLI mirrors it) both apply.
368
+ */
369
+ export declare const routeHeaderVisible: (navigator: NavigatorNode, route: RouteNode) => boolean;
370
+ /**
371
+ * The title a route's screen shows in its header: the route's own, else the
372
+ * navigator's, else the route name.
373
+ */
374
+ export declare const routeTitle: (navigator: NavigatorNode, route: RouteNode) => string;
375
+ /**
376
+ * The label a route's tab or drawer item shows: the route's `tabLabel` /
377
+ * `drawerLabel`, else the route name — never the header title, which a
378
+ * navigator-wide title would otherwise put on every item.
379
+ */
380
+ export declare const routeItemLabel: (kind: "tabs" | "drawer", route: RouteNode) => string;
329
381
  //# sourceMappingURL=navigation.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"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"}
@@ -41,4 +41,45 @@ const ROUTE_PATH_PATTERN = new RegExp(`^\\/?${ROUTE_SEGMENT}(?:\\/${ROUTE_SEGMEN
41
41
  * or trailing slash is tolerated (the CLI strips them).
42
42
  */
43
43
  export const isValidRoutePath = (path) => ROUTE_PATH_PATTERN.test(path);
44
+ const GLYPH_REF_PATTERN = /^ref\(glyph:([^:()]+):([^()]+)\)$/;
45
+ /**
46
+ * The `ref(glyph:<family>:<name>)` string a {@link ScreenOptions} icon field
47
+ * stores for a built-in glyph. The family is pinned in the ref (rather than
48
+ * following the project's icon family) so the exported app can import the
49
+ * one font it names.
50
+ */
51
+ export const buildGlyphRef = (family, name) => `ref(glyph:${family}:${name})`;
52
+ /** The family and glyph of a `ref(glyph:…)` string, or `null` if it isn't one. */
53
+ export const parseGlyphRef = (value) => {
54
+ if (!value)
55
+ return null;
56
+ const match = GLYPH_REF_PATTERN.exec(value);
57
+ return match ? { family: match[1], name: match[2] } : null;
58
+ };
59
+ /**
60
+ * Whether a route's screen shows its navigator's header. The route's own
61
+ * `visible` wins. Otherwise a route that enters a nested navigator shows
62
+ * none — the nested navigator draws the header of the screen inside it, and
63
+ * drawing the parent's too stacks two bars (`Auth` over `Sign in`) — and a
64
+ * page route follows its navigator (shown unless the navigator turns it off).
65
+ *
66
+ * The one rule the canvas frame chrome and the exported app's generated
67
+ * layouts (the `mapples` CLI mirrors it) both apply.
68
+ */
69
+ export const routeHeaderVisible = (navigator, route) => route.options?.visible ??
70
+ (route.target.kind === 'navigator'
71
+ ? false
72
+ : (navigator.options?.header?.visible ?? true));
73
+ /**
74
+ * The title a route's screen shows in its header: the route's own, else the
75
+ * navigator's, else the route name.
76
+ */
77
+ export const routeTitle = (navigator, route) => route.options?.title ?? navigator.options?.header?.title ?? route.name;
78
+ /**
79
+ * The label a route's tab or drawer item shows: the route's `tabLabel` /
80
+ * `drawerLabel`, else the route name — never the header title, which a
81
+ * navigator-wide title would otherwise put on every item.
82
+ */
83
+ export const routeItemLabel = (kind, route) => (kind === 'tabs' ? route.options?.tabLabel : route.options?.drawerLabel) ??
84
+ route.name;
44
85
  //# sourceMappingURL=navigation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA4KH;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AAEvC;;;GAGG;AACH,MAAM,wBAAwB,GAC5B,yFAAyF,CAAC;AAE5F;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAa,EAAY,EAAE;IACzD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,yEAAyE;AACzE,MAAM,aAAa,GACjB,gGAAgG,CAAC;AAEnG,MAAM,kBAAkB,GAAG,IAAI,MAAM,CACnC,QAAQ,aAAa,SAAS,aAAa,SAAS,CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAW,EAAE,CACxD,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAoLH;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AAEvC;;;GAGG;AACH,MAAM,wBAAwB,GAC5B,yFAAyF,CAAC;AAE5F;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAa,EAAY,EAAE;IACzD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,yEAAyE;AACzE,MAAM,aAAa,GACjB,gGAAgG,CAAC;AAEnG,MAAM,kBAAkB,GAAG,IAAI,MAAM,CACnC,QAAQ,aAAa,SAAS,aAAa,SAAS,CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAW,EAAE,CACxD,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAqJhC,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,IAAY,EAAU,EAAE,CACpE,aAAa,MAAM,IAAI,IAAI,GAAG,CAAC;AAEjC,kFAAkF;AAClF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAmB,EAAE;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAAwB,EACxB,KAAgB,EACP,EAAE,CACX,KAAK,CAAC,OAAO,EAAE,OAAO;IACtB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;QAChC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,SAAwB,EACxB,KAAgB,EACR,EAAE,CACV,KAAK,CAAC,OAAO,EAAE,KAAK,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC;AAEzE;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,IAAuB,EACvB,KAAgB,EACR,EAAE,CACV,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC;IACxE,KAAK,CAAC,IAAI,CAAC"}
@@ -1,4 +1,4 @@
1
- import { NavigationDocument } from './navigation';
1
+ import { NavigationDocument, NavigatorNode } from './navigation';
2
2
  /**
3
3
  * Codes for the invariants enforced by {@link validateNavigationDocument}.
4
4
  *
@@ -9,7 +9,8 @@ import { NavigationDocument } from './navigation';
9
9
  * - `DUPLICATE_ROUTE_NAME` — two routes share a name within one navigator.
10
10
  * - `PRESENTATION_NOT_STACK` — a `presentation` is set on a non-stack navigator's route.
11
11
  * - `ROUTE_PATH_INVALID` — a route `path` has a malformed segment.
12
- * - `GUARD_FALLBACK_INVALID` — a guarded route names no fallback, itself, or an absent route.
12
+ * - `GUARD_FALLBACK_INVALID` — a guarded route names no fallback, itself, an absent route,
13
+ * or (on a navigator route) a route inside the area it guards.
13
14
  */
14
15
  export type NavigationValidationCode = 'ROOT_MISSING' | 'NAVIGATOR_TARGET_MISSING' | 'NAVIGATOR_CYCLE' | 'INITIAL_ROUTE_INVALID' | 'DUPLICATE_ROUTE_NAME' | 'PRESENTATION_NOT_STACK' | 'ROUTE_PATH_INVALID' | 'GUARD_FALLBACK_INVALID';
15
16
  /**
@@ -50,7 +51,8 @@ export interface NavigationValidationResult {
50
51
  * - route names are unique within their parent navigator;
51
52
  * - `presentation` is only set on routes whose parent navigator is a `stack`;
52
53
  * - a route `path`, when set, is made of literal, `(group)` or `:param` segments;
53
- * - a guarded route names a fallback route that exists and is not itself.
54
+ * - a guarded route names a fallback route that exists, is not itself and,
55
+ * for a navigator route, lies outside the navigator it guards.
54
56
  *
55
57
  * The check is exhaustive: all violations are collected rather than failing on
56
58
  * the first.
@@ -59,4 +61,10 @@ export interface NavigationValidationResult {
59
61
  * @returns A {@link NavigationValidationResult} listing any violations.
60
62
  */
61
63
  export declare function validateNavigationDocument(doc: NavigationDocument): NavigationValidationResult;
64
+ /**
65
+ * Every route id under a navigator, nested navigators' routes included — the
66
+ * area a guard on the route entering it protects. Cycle-safe (cycles are
67
+ * reported separately).
68
+ */
69
+ export declare function navigatorRouteIds(navigatorId: string, navigators: Record<string, NavigatorNode>): Set<string>;
62
70
  //# sourceMappingURL=navigationValidator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"navigationValidator.d.ts","sourceRoot":"","sources":["../src/navigationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAEnB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,wBAAwB,GAChC,cAAc,GACd,0BAA0B,GAC1B,iBAAiB,GACjB,uBAAuB,GACvB,sBAAsB,GACtB,wBAAwB,GACxB,oBAAoB,GACpB,wBAAwB,CAAC;AAE7B;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,uCAAuC;IACvC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,0BAA0B;IACzC,2CAA2C;IAC3C,KAAK,EAAE,OAAO,CAAC;IACf,uCAAuC;IACvC,MAAM,EAAE,yBAAyB,EAAE,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,kBAAkB,GACtB,0BAA0B,CA2B5B"}
1
+ {"version":3,"file":"navigationValidator.d.ts","sourceRoot":"","sources":["../src/navigationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,aAAa,EACd,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,wBAAwB,GAChC,cAAc,GACd,0BAA0B,GAC1B,iBAAiB,GACjB,uBAAuB,GACvB,sBAAsB,GACtB,wBAAwB,GACxB,oBAAoB,GACpB,wBAAwB,CAAC;AAE7B;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,uCAAuC;IACvC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,0BAA0B;IACzC,2CAA2C;IAC3C,KAAK,EAAE,OAAO,CAAC;IACf,uCAAuC;IACvC,MAAM,EAAE,yBAAyB,EAAE,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,kBAAkB,GACtB,0BAA0B,CA2B5B;AAoGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACxC,GAAG,CAAC,MAAM,CAAC,CAeb"}
@@ -11,7 +11,8 @@ import { isValidRoutePath, } from './navigation';
11
11
  * - route names are unique within their parent navigator;
12
12
  * - `presentation` is only set on routes whose parent navigator is a `stack`;
13
13
  * - a route `path`, when set, is made of literal, `(group)` or `:param` segments;
14
- * - a guarded route names a fallback route that exists and is not itself.
14
+ * - a guarded route names a fallback route that exists, is not itself and,
15
+ * for a navigator route, lies outside the navigator it guards.
15
16
  *
16
17
  * The check is exhaustive: all violations are collected rather than failing on
17
18
  * the first.
@@ -77,15 +78,21 @@ function validateNavigator(navigator, navigators, parentCount, errors) {
77
78
  });
78
79
  }
79
80
  // A guard with nowhere to go, or one that sends the user back to the
80
- // guarded screen, loops the navigator.
81
+ // guarded screen — or into the area a navigator route guards — loops
82
+ // the navigator.
81
83
  if (route.guard !== undefined) {
82
84
  const fallback = route.guardFallbackRouteId;
83
85
  const exists = !!fallback &&
84
86
  Object.values(navigators).some((candidate) => (candidate.routes ?? []).some((other) => other.id === fallback));
85
- if (!fallback || fallback === route.id || !exists) {
87
+ const inside = !!fallback &&
88
+ route.target.kind === 'navigator' &&
89
+ navigatorRouteIds(route.target.navigatorId, navigators).has(fallback);
90
+ if (!fallback || fallback === route.id || !exists || inside) {
86
91
  errors.push({
87
92
  code: 'GUARD_FALLBACK_INVALID',
88
- message: `Guarded route "${route.name}" needs a fallback route other than itself`,
93
+ message: inside
94
+ ? `Guarded route "${route.name}" sends the user to a route inside the area it guards`
95
+ : `Guarded route "${route.name}" needs a fallback route other than itself`,
89
96
  navigatorId: navigator.id,
90
97
  routeId: route.id,
91
98
  });
@@ -117,6 +124,28 @@ function validateNavigator(navigator, navigators, parentCount, errors) {
117
124
  });
118
125
  }
119
126
  }
127
+ /**
128
+ * Every route id under a navigator, nested navigators' routes included — the
129
+ * area a guard on the route entering it protects. Cycle-safe (cycles are
130
+ * reported separately).
131
+ */
132
+ export function navigatorRouteIds(navigatorId, navigators) {
133
+ const ids = new Set();
134
+ const visit = (id, seen) => {
135
+ const navigator = navigators[id];
136
+ if (!navigator || seen.has(id))
137
+ return;
138
+ seen.add(id);
139
+ for (const route of navigator.routes ?? []) {
140
+ ids.add(route.id);
141
+ if (route.target.kind === 'navigator') {
142
+ visit(route.target.navigatorId, seen);
143
+ }
144
+ }
145
+ };
146
+ visit(navigatorId, new Set());
147
+ return ids;
148
+ }
120
149
  /** Flag any navigator targeted by more than one route (not a tree). */
121
150
  function detectSharedChildren(parentCount, errors) {
122
151
  for (const [navigatorId, count] of Object.entries(parentCount)) {
@@ -1 +1 @@
1
- {"version":3,"file":"navigationValidator.js","sourceRoot":"","sources":["../src/navigationValidator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigationValidator.js","sourceRoot":"","sources":["../src/navigationValidator.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,12 @@ export type VariableScope =
26
26
  export declare const VARIABLE_NAME_PATTERN: RegExp;
27
27
  /** The namespace prefix variables resolve under in bindings/conditions. */
28
28
  export declare const VARIABLES_NAMESPACE = "vars";
29
+ /**
30
+ * The `mapples:setState` ops that make sense for each variable type. The
31
+ * state handler coerces anything else (a toggled string becomes `false`, an
32
+ * incremented one `NaN`), so authoring surfaces only offer these.
33
+ */
34
+ export declare const VARIABLE_OPS_BY_TYPE: Record<VariableValueType, ReadonlySet<string>>;
29
35
  export interface VariableDefinition {
30
36
  /** Stable uuid — survives renames. */
31
37
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,mDAAmD;AACnD,MAAM,MAAM,iBAAiB,GACzB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,CAAC;AAEZ,iDAAiD;AACjD,MAAM,MAAM,aAAa;AACvB,wDAAwD;AACtD;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE;AACjB,0DAA0D;GACxD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,QAA6B,CAAC;AAEhE,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IACjC,sCAAsC;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,aAAa,CAAC;IACrB,+DAA+D;IAC/D,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,CAAC,CAAC;IACX,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC/C;AAED,wEAAwE;AACxE,eAAO,MAAM,sBAAsB,QAAO,iBAGxC,CAAC;AAEH,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,GAAI,UAAU,kBAAkB,KAAG,MACtB,CAAC"}
1
+ {"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,mDAAmD;AACnD,MAAM,MAAM,iBAAiB,GACzB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,OAAO,CAAC;AAEZ,iDAAiD;AACjD,MAAM,MAAM,aAAa;AACvB,wDAAwD;AACtD;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE;AACjB,0DAA0D;GACxD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,QAA6B,CAAC;AAEhE,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAE1C;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CACvC,iBAAiB,EACjB,WAAW,CAAC,MAAM,CAAC,CAOpB,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,sCAAsC;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,aAAa,CAAC;IACrB,+DAA+D;IAC/D,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,CAAC,CAAC;IACX,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC/C;AAED,wEAAwE;AACxE,eAAO,MAAM,sBAAsB,QAAO,iBAGxC,CAAC;AAEH,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,GAAI,UAAU,kBAAkB,KAAG,MACtB,CAAC"}
package/dist/variables.js CHANGED
@@ -13,6 +13,18 @@
13
13
  export const VARIABLE_NAME_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
14
14
  /** The namespace prefix variables resolve under in bindings/conditions. */
15
15
  export const VARIABLES_NAMESPACE = 'vars';
16
+ /**
17
+ * The `mapples:setState` ops that make sense for each variable type. The
18
+ * state handler coerces anything else (a toggled string becomes `false`, an
19
+ * incremented one `NaN`), so authoring surfaces only offer these.
20
+ */
21
+ export const VARIABLE_OPS_BY_TYPE = {
22
+ string: new Set(['set', 'clear']),
23
+ number: new Set(['set', 'increment', 'decrement', 'clear']),
24
+ boolean: new Set(['set', 'toggle', 'clear']),
25
+ object: new Set(['set', 'clear']),
26
+ array: new Set(['set', 'append', 'clear']),
27
+ };
16
28
  /** An empty document, used before a project has saved any variables. */
17
29
  export const emptyVariablesDocument = () => ({
18
30
  version: 1,
@@ -1 +1 @@
1
- {"version":3,"file":"variables.js","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAEhE,2EAA2E;AAC3E,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAsB1C,wEAAwE;AACxE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAsB,EAAE,CAAC,CAAC;IAC9D,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,wEAAwE;AACxE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAA4B,EAAU,EAAE,CACxE,GAAG,mBAAmB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC"}
1
+ {"version":3,"file":"variables.js","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAEhE,2EAA2E;AAC3E,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAE1C;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAG7B;IACF,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3D,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5C,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAsBF,wEAAwE;AACxE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAsB,EAAE,CAAC,CAAC;IAC9D,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,wEAAwE;AACxE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAA4B,EAAU,EAAE,CACxE,GAAG,mBAAmB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mapples/types",
3
- "version": "1.6.0-beta.20260930095028",
3
+ "version": "1.6.0-beta.20261001084831",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "scripts": {