@stacksjs/stx 0.2.95 → 0.2.97
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/dist/a11y.js +598 -2
- package/dist/analytics.js +159 -2
- package/dist/analyzer.js +240 -2
- package/dist/animation.js +688 -2
- package/dist/app-shell.js +220 -2
- package/dist/app.js +79 -2
- package/dist/assets.js +155 -2
- package/dist/ast.js +630 -2
- package/dist/async-components.js +428 -2
- package/dist/auth.js +12 -2
- package/dist/broadcasting.js +102 -2
- package/dist/browser-composables.js +565 -2
- package/dist/build-assets.js +29 -2
- package/dist/build-mode-detector.js +50 -2
- package/dist/build-optimizer.js +433 -2
- package/dist/build-views.js +180 -2
- package/dist/build.js +33 -2
- package/dist/builtins/drawer.js +37 -2
- package/dist/builtins/escape.js +3 -2
- package/dist/builtins/icon.js +83 -2
- package/dist/builtins/index.js +34 -2
- package/dist/builtins/modal.js +38 -2
- package/dist/builtins/safe-image.js +51 -2
- package/dist/builtins/stx-image.js +200 -2
- package/dist/builtins/stx-link.js +41 -2
- package/dist/builtins/stx-loading-indicator.js +35 -2
- package/dist/builtins/suspense.js +24 -2
- package/dist/builtins/toast.js +42 -2
- package/dist/builtins/tooltip.js +106 -2
- package/dist/builtins/transition-group.js +22 -2
- package/dist/bundle-analyzer/collector.js +233 -2
- package/dist/bundle-analyzer/index.js +82 -2
- package/dist/bundle-analyzer/report.js +318 -2
- package/dist/bundle-analyzer/treemap.js +594 -2
- package/dist/caching.js +131 -2
- package/dist/cli.js +11317 -10982
- package/dist/client/directive.js +14 -2
- package/dist/client/index.js +2 -2
- package/dist/client-helpers.js +312 -2
- package/dist/client-script-bundler.js +216 -6
- package/dist/client-script.js +754 -2
- package/dist/client.js +73 -4
- package/dist/component-hmr.js +585 -2
- package/dist/component-library.d.ts +6 -0
- package/dist/component-library.js +683 -0
- package/dist/component-processing.js +613 -2
- package/dist/component-registry.js +90 -2
- package/dist/component-renderer.js +660 -2
- package/dist/components.js +213 -2
- package/dist/composables/index.js +220 -2
- package/dist/composables/use-battery.js +101 -2
- package/dist/composables/use-broadcast-channel.js +80 -2
- package/dist/composables/use-channel.js +124 -2
- package/dist/composables/use-clipboard.js +79 -2
- package/dist/composables/use-color-mode.js +131 -2
- package/dist/composables/use-cookie.js +86 -2
- package/dist/composables/use-device-orientation.js +181 -2
- package/dist/composables/use-event-listener.js +27 -2
- package/dist/composables/use-event-source.js +166 -2
- package/dist/composables/use-eye-dropper.js +142 -2
- package/dist/composables/use-fetch.js +223 -2
- package/dist/composables/use-fullscreen.js +110 -2
- package/dist/composables/use-geolocation.js +101 -2
- package/dist/composables/use-idle.js +182 -2
- package/dist/composables/use-intersection-observer.js +168 -2
- package/dist/composables/use-keyboard.js +224 -2
- package/dist/composables/use-media-query.js +62 -2
- package/dist/composables/use-meta.js +48 -2
- package/dist/composables/use-mouse.js +286 -2
- package/dist/composables/use-mutation-observer.js +129 -2
- package/dist/composables/use-network.js +85 -2
- package/dist/composables/use-notification.js +94 -2
- package/dist/composables/use-permissions.js +132 -2
- package/dist/composables/use-query.js +0 -1
- package/dist/composables/use-resize-observer.js +157 -2
- package/dist/composables/use-router.js +51 -2
- package/dist/composables/use-share.js +104 -2
- package/dist/composables/use-speech.js +294 -2
- package/dist/composables/use-storage.js +130 -2
- package/dist/composables/use-text-selection.js +205 -4
- package/dist/composables/use-timer.js +183 -2
- package/dist/composables/use-utilities.js +176 -2
- package/dist/composables/use-wake-lock.js +122 -2
- package/dist/composables/use-websocket.js +165 -2
- package/dist/composables/use-window.js +163 -2
- package/dist/composables.js +552 -2
- package/dist/composition-api.js +190 -2
- package/dist/computed.js +376 -8
- package/dist/conditionals.js +599 -2
- package/dist/config.js +751 -2
- package/dist/craft-bridge.js +432 -2
- package/dist/craft-compiler.js +810 -2
- package/dist/craft-components.js +945 -2
- package/dist/craft-entry.js +5 -2
- package/dist/craft-ssr.js +559 -2
- package/dist/csp.js +220 -2
- package/dist/csrf.js +38 -2
- package/dist/custom-directives.js +136 -2
- package/dist/defer.js +156 -2
- package/dist/deploy/config-generators.js +214 -2
- package/dist/deploy/index.js +203 -2
- package/dist/deploy/netlify.js +167 -2
- package/dist/dev-server/crosswind.js +379 -2
- package/dist/dev-server/index.js +7 -2
- package/dist/dev-server/keyboard-shortcuts.js +81 -2
- package/dist/dev-server/native-window.js +91 -2
- package/dist/dev-server/port-utils.js +40 -2
- package/dist/dev-server/serve-app.js +682 -2
- package/dist/dev-server/serve-file.js +439 -2
- package/dist/dev-server/serve-markdown.js +281 -2
- package/dist/dev-server/serve-multi.js +579 -2
- package/dist/dev-server/terminal-colors.js +45 -2
- package/dist/dev-server/theme-selector.js +111 -2
- package/dist/dev-server/types.js +43 -2
- package/dist/dev-server.js +4 -2
- package/dist/devtools.js +462 -18
- package/dist/directive-api.js +355 -2
- package/dist/docs.js +567 -2
- package/dist/doctor.js +123 -2
- package/dist/document-shell.js +105 -2
- package/dist/dynamic-components.js +78 -2
- package/dist/edge-runtime.js +539 -2
- package/dist/env.js +9 -2
- package/dist/error-boundaries.js +62 -12
- package/dist/error-handling.js +1 -2
- package/dist/errors/codes.js +97 -2
- package/dist/errors/formatter.js +196 -2
- package/dist/errors/index.js +44 -2
- package/dist/errors/logger.js +250 -2
- package/dist/errors/sanitizer.js +181 -2
- package/dist/errors/types.js +86 -2
- package/dist/events.js +382 -2
- package/dist/expressions.js +650 -2
- package/dist/formatter.js +265 -2
- package/dist/forms-validation.js +510 -4
- package/dist/forms.js +709 -2
- package/dist/head.js +224 -2
- package/dist/heatmap.js +566 -2
- package/dist/hot-reload.js +367 -2
- package/dist/html-masking.js +73 -2
- package/dist/hydration-runtime.js +195 -2
- package/dist/hydration.js +654 -2
- package/dist/i18n.js +633 -2
- package/dist/image-optimization/auto-sibling.js +88 -2
- package/dist/image-optimization/build-plugin.js +241 -2
- package/dist/image-optimization/component.js +244 -2
- package/dist/image-optimization/directive.js +203 -2
- package/dist/image-optimization/index.js +54 -2
- package/dist/image-optimization/processor.js +262 -2
- package/dist/image-optimization/serve.js +102 -2
- package/dist/includes.js +733 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.js +134 -2
- package/dist/init.js +505 -2
- package/dist/inline-assets.js +82 -2
- package/dist/interactive.js +383 -2
- package/dist/internal-markdown.js +141 -2
- package/dist/island-chunking.js +52 -2
- package/dist/js-ts.js +57 -2
- package/dist/jsx-runtime.js +289 -2
- package/dist/keep-alive.js +421 -2
- package/dist/lazy-loader.js +245 -2
- package/dist/loading-indicator.js +322 -2
- package/dist/loops.js +643 -2
- package/dist/manifest.js +31 -2
- package/dist/markdown.js +68 -2
- package/dist/media/client/blur-up.js +217 -2
- package/dist/media/client/index.js +53 -2
- package/dist/media/client/lazy-load.js +283 -2
- package/dist/media/client/upload-handler.js +354 -2
- package/dist/media/image/component.js +574 -2
- package/dist/media/image/directive.js +160 -2
- package/dist/media/image/editing.js +193 -2
- package/dist/media/image/index.js +80 -2
- package/dist/media/image/placeholder.js +188 -2
- package/dist/media/image/processor/cache.js +51 -2
- package/dist/media/image/processor/index.js +3 -2
- package/dist/media/image/processor/optimizer.js +202 -2
- package/dist/media/image/processor/responsive.js +162 -2
- package/dist/media/image/srcset.js +194 -2
- package/dist/media/index.js +198 -2
- package/dist/media/manager/embed.js +253 -2
- package/dist/media/protected/component.js +235 -2
- package/dist/media/protected/index.js +20 -2
- package/dist/media/protected/signature.js +205 -2
- package/dist/media/shared/cache.js +132 -2
- package/dist/media/shared/hash.js +35 -2
- package/dist/media/shared/index.js +2 -2
- package/dist/media/types.js +0 -1
- package/dist/media/upload/component.js +320 -2
- package/dist/media/upload/index.js +1 -2
- package/dist/media/video/directive.js +142 -2
- package/dist/media/video/index.js +583 -2
- package/dist/media/video/processor/cache.js +52 -2
- package/dist/media/video/processor/index.js +4 -2
- package/dist/media/video/processor/streaming.js +197 -2
- package/dist/media/video/processor/thumbnail.js +134 -2
- package/dist/media/video/processor/transcoder.js +283 -2
- package/dist/method-spoofing.js +17 -2
- package/dist/middleware.js +40 -2
- package/dist/misc-directives.js +222 -2
- package/dist/native-build.js +511 -2
- package/dist/parser/directive-parser.js +239 -2
- package/dist/parser/expression-parser.js +358 -2
- package/dist/parser/index.js +23 -2
- package/dist/parser/tokenizer.js +534 -2
- package/dist/partial-hydration.js +427 -2
- package/dist/performance-utils.js +430 -2
- package/dist/placeholder.js +35 -2
- package/dist/plugin-system.js +214 -2
- package/dist/plugin.js +173 -2
- package/dist/precompiler.js +660 -81
- package/dist/process.js +711 -2
- package/dist/production-build.js +596 -2
- package/dist/production-builder.js +132 -2
- package/dist/production-server.js +188 -2
- package/dist/props.js +224 -2
- package/dist/public-env.js +19 -2
- package/dist/pwa/audit.js +255 -2
- package/dist/pwa/directives.js +332 -2
- package/dist/pwa/icons.js +109 -2
- package/dist/pwa/index.js +47 -2
- package/dist/pwa/inject.js +102 -2
- package/dist/pwa/manifest.js +186 -2
- package/dist/pwa/offline.js +259 -2
- package/dist/pwa/precache.js +116 -2
- package/dist/pwa/service-worker.js +860 -2
- package/dist/pwa/workbox-strategies.js +167 -2
- package/dist/pwa/workbox.js +382 -2
- package/dist/pwa.js +427 -427
- package/dist/reactive-bindings.js +266 -2
- package/dist/reactive.js +569 -2
- package/dist/reactivity.js +559 -2
- package/dist/release.js +1 -2
- package/dist/render.js +165 -2
- package/dist/route-middleware.js +17 -2
- package/dist/router.js +9 -2
- package/dist/routes.js +14 -2
- package/dist/runtime-injection.js +120 -2
- package/dist/runtime.js +94 -2
- package/dist/safe-evaluator.js +444 -2
- package/dist/scaffolding.js +897 -2
- package/dist/screenshot.js +87 -2
- package/dist/script-classifier.js +32 -2
- package/dist/script-validation.js +158 -2
- package/dist/seo.js +457 -2
- package/dist/serve.js +237 -2
- package/dist/server-bindings.js +108 -2
- package/dist/server-components.js +338 -11
- package/dist/signal-processing.js +946 -2
- package/dist/signals-api.js +154 -2
- package/dist/signals.js +5287 -2
- package/dist/site-builder/build.js +224 -2
- package/dist/site-builder/i18n.js +140 -2
- package/dist/site-builder/index.js +15 -2
- package/dist/site-builder/robots.js +26 -2
- package/dist/site-builder/router.js +27 -2
- package/dist/site-builder/seo.js +36 -2
- package/dist/site-builder/sitemap.js +26 -2
- package/dist/site-builder/theme.js +33 -2
- package/dist/site-builder/types.js +0 -1
- package/dist/slots.js +201 -2
- package/dist/source-maps.js +350 -2
- package/dist/spa-shell.js +34 -2
- package/dist/ssg.js +389 -389
- package/dist/ssr.js +355 -2
- package/dist/state-management.js +533 -2
- package/dist/store-imports.js +13 -2
- package/dist/store-loader.js +72 -5
- package/dist/stores-client.js +132 -2
- package/dist/story/addons.js +261 -2
- package/dist/story/analytics.js +235 -2
- package/dist/story/auto-stories.js +158 -2
- package/dist/story/bookmarks.js +277 -2
- package/dist/story/bun-test.js +102 -2
- package/dist/story/cli.js +155 -2
- package/dist/story/collect/analyzer.js +305 -2
- package/dist/story/collect/index.js +27 -2
- package/dist/story/collect/parser.js +129 -2
- package/dist/story/collect/scanner.js +101 -2
- package/dist/story/collect/tree.js +110 -2
- package/dist/story/commands/build.js +172 -2
- package/dist/story/commands/dev.js +78 -2
- package/dist/story/commands/index.js +3 -2
- package/dist/story/commands/preview.js +56 -2
- package/dist/story/compiled-output.js +151 -2
- package/dist/story/composition.js +261 -2
- package/dist/story/config-watcher.js +67 -2
- package/dist/story/config.js +64 -2
- package/dist/story/context.js +27 -2
- package/dist/story/controls/index.js +320 -2
- package/dist/story/crosswind.js +189 -2
- package/dist/story/desktop-preview.js +105 -2
- package/dist/story/docs-generator.js +186 -2
- package/dist/story/errors.js +239 -2
- package/dist/story/figma-export.js +224 -2
- package/dist/story/generator.js +165 -2
- package/dist/story/hmr.js +131 -2
- package/dist/story/hot-swap.js +207 -2
- package/dist/story/index.js +49 -2
- package/dist/story/interactions.js +225 -2
- package/dist/story/keyboard-shortcuts.js +345 -2
- package/dist/story/output.js +153 -2
- package/dist/story/performance.js +252 -2
- package/dist/story/presets.js +289 -2
- package/dist/story/props-validation.js +215 -2
- package/dist/story/renderer.js +209 -2
- package/dist/story/search-index.js +106 -2
- package/dist/story/search.js +140 -2
- package/dist/story/server.js +965 -2
- package/dist/story/setup.js +78 -2
- package/dist/story/snapshots.js +170 -2
- package/dist/story/testing.js +163 -2
- package/dist/story/theme.js +170 -2
- package/dist/story/types.js +0 -2
- package/dist/story/ui/code-panel.js +175 -2
- package/dist/story/ui/controls-panel.js +168 -2
- package/dist/story/ui/index.js +4 -2
- package/dist/story/ui/navigation.js +250 -2
- package/dist/story/ui/preview.js +251 -2
- package/dist/story/visual-testing.js +247 -2
- package/dist/streaming.js +537 -2
- package/dist/strict-lint.js +288 -2
- package/dist/style-scoping.js +50 -2
- package/dist/suspense.js +398 -2
- package/dist/teleport.js +109 -2
- package/dist/template-compiler.js +63 -2
- package/dist/template-hydrator.js +82 -2
- package/dist/template-tag-balance.js +93 -2
- package/dist/testing.js +581 -2
- package/dist/transitions.js +443 -2
- package/dist/type-checker.js +581 -2
- package/dist/types/component-types.d.ts +54 -0
- package/dist/types/component-types.js +0 -1
- package/dist/types/config-types.js +0 -1
- package/dist/types/context-types.js +0 -1
- package/dist/types/csp-types.js +0 -1
- package/dist/types/directive-types.js +3 -2
- package/dist/types/index.d.ts +5 -0
- package/dist/types/index.js +1 -2
- package/dist/types/pwa-types.js +0 -1
- package/dist/types.js +1 -2
- package/dist/typescript-templates.js +386 -4
- package/dist/utils.js +942 -2
- package/dist/validator.js +171 -2
- package/dist/variable-extractor.js +1094 -2
- package/dist/view-composers.js +29 -2
- package/dist/virtual-scrolling.js +454 -2
- package/dist/visual-editor.js +688 -28
- package/dist/vue-template.js +475 -2
- package/dist/web-components/css-scoping.js +177 -2
- package/dist/web-components/index.js +13 -2
- package/dist/web-components/reactive-generator.js +121 -56
- package/dist/web-components.js +1447 -2
- package/dist/x-element.js +17 -5
- package/package.json +5 -6
- package/dist/chunk-04n64bnt.js +0 -5
- package/dist/chunk-06w68hyg.js +0 -7
- package/dist/chunk-07y6m5xx.js +0 -3
- package/dist/chunk-095s3972.js +0 -99
- package/dist/chunk-09k66d8a.js +0 -3
- package/dist/chunk-0a61y94n.js +0 -24
- package/dist/chunk-0b9w2w1y.js +0 -1
- package/dist/chunk-0dx4q6yq.js +0 -3
- package/dist/chunk-0dz85jrp.js +0 -3
- package/dist/chunk-0jd0pndq.js +0 -3
- package/dist/chunk-0p0nyq50.js +0 -6
- package/dist/chunk-0p1h3p3w.js +0 -3
- package/dist/chunk-0qakwen3.js +0 -1
- package/dist/chunk-0qnz93q2.js +0 -3
- package/dist/chunk-10debkj5.js +0 -71
- package/dist/chunk-15nesxgt.js +0 -5224
- package/dist/chunk-1sr54zp8.js +0 -3
- package/dist/chunk-1v49fwr5.js +0 -3
- package/dist/chunk-1xz0w746.js +0 -1539
- package/dist/chunk-1z5nhbjt.js +0 -90
- package/dist/chunk-1zgsgk4b.js +0 -1
- package/dist/chunk-20swzkx3.js +0 -216
- package/dist/chunk-27zsyhrd.js +0 -4
- package/dist/chunk-29y0hk5z.js +0 -3
- package/dist/chunk-2cdvw21b.js +0 -274
- package/dist/chunk-2j21d3ka.js +0 -161
- package/dist/chunk-2jxbwnkz.js +0 -2
- package/dist/chunk-31dr4bys.js +0 -6
- package/dist/chunk-35faj94w.js +0 -15
- package/dist/chunk-39gm08bn.js +0 -39
- package/dist/chunk-3a4qsygv.js +0 -51
- package/dist/chunk-3te20hqw.js +0 -3
- package/dist/chunk-43t7faps.js +0 -24
- package/dist/chunk-44hd3kab.js +0 -1
- package/dist/chunk-47kpewks.js +0 -71
- package/dist/chunk-4aj7ftqb.js +0 -1
- package/dist/chunk-4d2y57k7.js +0 -3
- package/dist/chunk-4deg33rw.js +0 -57
- package/dist/chunk-4k7d8p8d.js +0 -188
- package/dist/chunk-4qcy5tx6.js +0 -53
- package/dist/chunk-4x7kae4j.js +0 -3
- package/dist/chunk-55nwdnsd.js +0 -3
- package/dist/chunk-55yp0q8t.js +0 -201
- package/dist/chunk-5f43yz6z.js +0 -12
- package/dist/chunk-5shey2e4.js +0 -3
- package/dist/chunk-6b5k6w2q.js +0 -7
- package/dist/chunk-6djzdes9.js +0 -14
- package/dist/chunk-6e4c6g46.js +0 -3
- package/dist/chunk-6eqbxcrd.js +0 -8
- package/dist/chunk-7074g241.js +0 -3
- package/dist/chunk-7b6s3g65.js +0 -179
- package/dist/chunk-7cgmq685.js +0 -33
- package/dist/chunk-7dkz6z2s.js +0 -3
- package/dist/chunk-7ed3tean.js +0 -3
- package/dist/chunk-7gd339hd.js +0 -109
- package/dist/chunk-7j5e8sdj.js +0 -3
- package/dist/chunk-7n8g0nfn.js +0 -38
- package/dist/chunk-7sqdeqsw.js +0 -1
- package/dist/chunk-80g54ncj.js +0 -3
- package/dist/chunk-8a5bxece.js +0 -4
- package/dist/chunk-8ahwt6a4.js +0 -721
- package/dist/chunk-8b3z0zd5.js +0 -8
- package/dist/chunk-8dhdpa5h.js +0 -4
- package/dist/chunk-8n9nnqr6.js +0 -3
- package/dist/chunk-8qc1bsym.js +0 -3
- package/dist/chunk-8va64c9n.js +0 -3
- package/dist/chunk-8vtm0m84.js +0 -3
- package/dist/chunk-8xj7c3mf.js +0 -8
- package/dist/chunk-988dw6q3.js +0 -9
- package/dist/chunk-9b6cec0v.js +0 -321
- package/dist/chunk-9cf97f9p.js +0 -3
- package/dist/chunk-9ecv8aqj.js +0 -14
- package/dist/chunk-9eq3ht5f.js +0 -8
- package/dist/chunk-9jtj77jx.js +0 -3
- package/dist/chunk-9t14se2t.js +0 -83
- package/dist/chunk-9wmq2272.js +0 -3
- package/dist/chunk-9zbk5zx5.js +0 -57
- package/dist/chunk-a2g2qb2y.js +0 -386
- package/dist/chunk-a3hyn4we.js +0 -79
- package/dist/chunk-a87qqft6.js +0 -194
- package/dist/chunk-ah88wzbg.js +0 -10
- package/dist/chunk-akf1r75r.js +0 -102
- package/dist/chunk-amaa1bev.js +0 -2
- package/dist/chunk-avx8aydt.js +0 -3
- package/dist/chunk-ay9qf4zj.js +0 -6
- package/dist/chunk-aywxfqev.js +0 -3
- package/dist/chunk-azkegjd8.js +0 -61
- package/dist/chunk-b77wjyn7.js +0 -84
- package/dist/chunk-baf1hfwh.js +0 -231
- package/dist/chunk-bdk6g1vj.js +0 -3
- package/dist/chunk-bhqgmyqw.js +0 -36
- package/dist/chunk-bk3j0n82.js +0 -341
- package/dist/chunk-bndmdahk.js +0 -3
- package/dist/chunk-bpgg59wa.js +0 -3
- package/dist/chunk-bs3gmfxz.js +0 -5
- package/dist/chunk-bxc7kjsk.js +0 -32
- package/dist/chunk-c7jg8w13.js +0 -3
- package/dist/chunk-ckxjqqn9.js +0 -3
- package/dist/chunk-cn8az1b4.js +0 -1
- package/dist/chunk-d0zjtdw4.js +0 -29
- package/dist/chunk-d1qh1x2g.js +0 -3
- package/dist/chunk-djddhmcc.js +0 -60
- package/dist/chunk-dqn9gyhb.js +0 -21
- package/dist/chunk-drjq2zwg.js +0 -3
- package/dist/chunk-dvfs1h3c.js +0 -117
- package/dist/chunk-e2q9c5vq.js +0 -8
- package/dist/chunk-e98v1bc6.js +0 -12
- package/dist/chunk-ejayeex8.js +0 -2
- package/dist/chunk-ejh8fyak.js +0 -3
- package/dist/chunk-ek2w6zvy.js +0 -4
- package/dist/chunk-ewa88139.js +0 -6
- package/dist/chunk-fjk3x41y.js +0 -3
- package/dist/chunk-frg705zq.js +0 -302
- package/dist/chunk-fzm3y0r3.js +0 -267
- package/dist/chunk-g1vt329s.js +0 -21
- package/dist/chunk-g4ps1dj8.js +0 -140
- package/dist/chunk-gkzq8zw4.js +0 -23
- package/dist/chunk-gz5fmp3q.js +0 -3
- package/dist/chunk-h0hjy0kn.js +0 -292
- package/dist/chunk-h5jxydqq.js +0 -147
- package/dist/chunk-h5wa62ek.js +0 -145
- package/dist/chunk-h7aq56qj.js +0 -28
- package/dist/chunk-h82kjdr4.js +0 -83
- package/dist/chunk-hbehnm18.js +0 -3
- package/dist/chunk-hbgxbgam.js +0 -58
- package/dist/chunk-hc2mf5h6.js +0 -4
- package/dist/chunk-hjm2xab3.js +0 -3
- package/dist/chunk-hjv76kcw.js +0 -1
- package/dist/chunk-hrnnh4tq.js +0 -142
- package/dist/chunk-ht43ds42.js +0 -236
- package/dist/chunk-hxx3za24.js +0 -62
- package/dist/chunk-hy8820vc.js +0 -6
- package/dist/chunk-j447q024.js +0 -28
- package/dist/chunk-j58vh0w6.js +0 -314
- package/dist/chunk-j8tn8enq.js +0 -3
- package/dist/chunk-jc0fc4ht.js +0 -11
- package/dist/chunk-jcs0ymw7.js +0 -3
- package/dist/chunk-jjamhxpm.js +0 -139
- package/dist/chunk-jjb05d21.js +0 -3
- package/dist/chunk-jjdq01dv.js +0 -128
- package/dist/chunk-jnmgm2xw.js +0 -5
- package/dist/chunk-jpndqst5.js +0 -3
- package/dist/chunk-jt0ezawy.js +0 -351
- package/dist/chunk-jz73j3qs.js +0 -169
- package/dist/chunk-k21df0pg.js +0 -10
- package/dist/chunk-k848dzsa.js +0 -429
- package/dist/chunk-kdfe4t91.js +0 -3
- package/dist/chunk-keawsbpn.js +0 -5
- package/dist/chunk-kgym7ch9.js +0 -8
- package/dist/chunk-khdn7jwe.js +0 -3
- package/dist/chunk-km25cwz6.js +0 -3
- package/dist/chunk-knm8a8yx.js +0 -398
- package/dist/chunk-krqn0ddk.js +0 -3
- package/dist/chunk-ktkmvaa8.js +0 -1
- package/dist/chunk-kx6eb6ma.js +0 -4
- package/dist/chunk-kypas8vy.js +0 -4
- package/dist/chunk-m167kjhv.js +0 -4
- package/dist/chunk-m491r0rj.js +0 -358
- package/dist/chunk-m8448qby.js +0 -11
- package/dist/chunk-mgj88zeq.js +0 -64
- package/dist/chunk-mhgk632d.js +0 -3
- package/dist/chunk-mv4fb50w.js +0 -1
- package/dist/chunk-n5kg7fpx.js +0 -7
- package/dist/chunk-n98x35xd.js +0 -8
- package/dist/chunk-n9dhs1dw.js +0 -106
- package/dist/chunk-nd9rmddh.js +0 -6
- package/dist/chunk-ngxfwzq3.js +0 -3
- package/dist/chunk-nhv099jv.js +0 -19
- package/dist/chunk-nm15ccsg.js +0 -5
- package/dist/chunk-npfmdb6y.js +0 -71
- package/dist/chunk-nvwb4x04.js +0 -3
- package/dist/chunk-nw34xajc.js +0 -8
- package/dist/chunk-p077sw22.js +0 -3
- package/dist/chunk-p1h8065h.js +0 -3
- package/dist/chunk-p3e0cqtt.js +0 -34
- package/dist/chunk-p3fpb79v.js +0 -477
- package/dist/chunk-p52yzjq6.js +0 -498
- package/dist/chunk-p73meypx.js +0 -134
- package/dist/chunk-pa9zb7ty.js +0 -4
- package/dist/chunk-payfb24w.js +0 -207
- package/dist/chunk-pcm1vd8w.js +0 -3
- package/dist/chunk-pcntd9h4.js +0 -3
- package/dist/chunk-pg1fvqb9.js +0 -167
- package/dist/chunk-psc3wfcf.js +0 -1115
- package/dist/chunk-pznnww6k.js +0 -6
- package/dist/chunk-q6zhd9yf.js +0 -3
- package/dist/chunk-qa59zejf.js +0 -246
- package/dist/chunk-qvrbjpdc.js +0 -3
- package/dist/chunk-qygvvygy.js +0 -12
- package/dist/chunk-r0jcmpv6.js +0 -68
- package/dist/chunk-r5m9xtm7.js +0 -3
- package/dist/chunk-rh80q1nd.js +0 -1
- package/dist/chunk-rkffm9sy.js +0 -128
- package/dist/chunk-rpx5fa65.js +0 -3
- package/dist/chunk-rqxf5hns.js +0 -3
- package/dist/chunk-rtr974rc.js +0 -30
- package/dist/chunk-rvptcndz.js +0 -3
- package/dist/chunk-rw26rpek.js +0 -171
- package/dist/chunk-rw7937v4.js +0 -19
- package/dist/chunk-rwrv9wbf.js +0 -3
- package/dist/chunk-rz2ec6g7.js +0 -347
- package/dist/chunk-s6ja2bdg.js +0 -66
- package/dist/chunk-scpkdrdb.js +0 -4
- package/dist/chunk-shv88d2d.js +0 -10
- package/dist/chunk-t0c9wvpr.js +0 -3
- package/dist/chunk-tffh3b1e.js +0 -35
- package/dist/chunk-tg2f1mzq.js +0 -11
- package/dist/chunk-trfswy66.js +0 -77
- package/dist/chunk-tzwtg722.js +0 -3
- package/dist/chunk-v7f8jj15.js +0 -4
- package/dist/chunk-v8j49spx.js +0 -3
- package/dist/chunk-v97390pe.js +0 -1
- package/dist/chunk-vcr5pzpx.js +0 -233
- package/dist/chunk-veeerpwa.js +0 -3
- package/dist/chunk-vg5kt6az.js +0 -4
- package/dist/chunk-vgv7jvyz.js +0 -219
- package/dist/chunk-vjbefncc.js +0 -3
- package/dist/chunk-vmxjghsm.js +0 -3
- package/dist/chunk-vw7vqd76.js +0 -3
- package/dist/chunk-vx22he47.js +0 -1
- package/dist/chunk-w3b6m427.js +0 -45
- package/dist/chunk-wazkqv7n.js +0 -3
- package/dist/chunk-wf7zrjsw.js +0 -138
- package/dist/chunk-wfg2gm11.js +0 -3
- package/dist/chunk-wg9k6h8w.js +0 -12
- package/dist/chunk-wkz2vwkr.js +0 -81
- package/dist/chunk-wvef3ngh.js +0 -127
- package/dist/chunk-wvf31nzs.js +0 -3
- package/dist/chunk-x05nxhyv.js +0 -262
- package/dist/chunk-x0770gt9.js +0 -4
- package/dist/chunk-x24s4heg.js +0 -1166
- package/dist/chunk-x3r64r0c.js +0 -6
- package/dist/chunk-x5g9w4hh.js +0 -5
- package/dist/chunk-xgkv66q5.js +0 -2230
- package/dist/chunk-xqq1vxb6.js +0 -1
- package/dist/chunk-xs03kc1h.js +0 -196
- package/dist/chunk-xv34zbp4.js +0 -3
- package/dist/chunk-xw36p73h.js +0 -90
- package/dist/chunk-xyg1r5w0.js +0 -4
- package/dist/chunk-xys2sxh6.js +0 -16
- package/dist/chunk-y0qg6rrv.js +0 -3
- package/dist/chunk-y1k17c8b.js +0 -21
- package/dist/chunk-y5xz0jc4.js +0 -141
- package/dist/chunk-y6xsqe9a.js +0 -10
- package/dist/chunk-yb1t2h8h.js +0 -11
- package/dist/chunk-ygvyc6wv.js +0 -90
- package/dist/chunk-yj4x5ehw.js +0 -21
- package/dist/chunk-yn38c15w.js +0 -4
- package/dist/chunk-ynhngsdh.js +0 -3
- package/dist/chunk-yrsb6j3z.js +0 -3
- package/dist/chunk-yywfvfph.js +0 -2
- package/dist/chunk-zcxzdrn7.js +0 -5
- package/dist/chunk-zen6ax1y.js +0 -27
- package/dist/chunk-zf2pek72.js +0 -3
- package/dist/chunk-zk3d0jjf.js +0 -7
- package/dist/chunk-zy3rp1ab.js +0 -93
package/dist/loops.js
CHANGED
|
@@ -1,2 +1,643 @@
|
|
|
1
|
-
|
|
2
|
-
import{
|
|
1
|
+
import { processConditionals } from "./conditionals.js";
|
|
2
|
+
import { ErrorCodes, inlineError } from "./error-handling.js";
|
|
3
|
+
import { processExpressions } from "./expressions.js";
|
|
4
|
+
import { findDirectiveBlocks, findMatchingDelimiter } from "./parser/index.js";
|
|
5
|
+
import { createSafeFunction, isExpressionSafe, isForExpressionSafe, sanitizeExpression, safeEvaluate, safeEvaluateObject } from "./safe-evaluator.js";
|
|
6
|
+
const DEFAULT_MAX_WHILE_ITERATIONS = 1000, DEFAULT_USE_ALT_LOOP_VARIABLE = !1;
|
|
7
|
+
function preEvaluateComponentProps(content, ctx) {
|
|
8
|
+
const componentPat = /@component\s*\(/g;
|
|
9
|
+
let result = content, match;
|
|
10
|
+
const replacements = [];
|
|
11
|
+
while ((match = componentPat.exec(result)) !== null) {
|
|
12
|
+
const cStart = match.index, openP = cStart + match[0].length - 1;
|
|
13
|
+
let d = 1, p = openP + 1;
|
|
14
|
+
while (p < result.length && d > 0) {
|
|
15
|
+
if (result[p] === "(")
|
|
16
|
+
d++;
|
|
17
|
+
else if (result[p] === ")") {
|
|
18
|
+
d--;
|
|
19
|
+
if (d === 0)
|
|
20
|
+
break;
|
|
21
|
+
}
|
|
22
|
+
p++;
|
|
23
|
+
}
|
|
24
|
+
if (d !== 0)
|
|
25
|
+
continue;
|
|
26
|
+
const innerArgs = result.substring(openP + 1, p), directiveEnd = p + 1, pathMatch = innerArgs.match(/^\s*['"]([^'"]+)['"]/);
|
|
27
|
+
if (!pathMatch)
|
|
28
|
+
continue;
|
|
29
|
+
const componentPath = pathMatch[1], afterPath = innerArgs.slice(pathMatch[0].length), propsMatch = afterPath.match(/^\s*,\s*/);
|
|
30
|
+
if (!propsMatch)
|
|
31
|
+
continue;
|
|
32
|
+
const propsString = afterPath.slice(propsMatch[0].length).trim();
|
|
33
|
+
if (!propsString)
|
|
34
|
+
continue;
|
|
35
|
+
try {
|
|
36
|
+
const evaluated = safeEvaluateObject(propsString, ctx), serialized = JSON.stringify(evaluated), replacement = `@component('${componentPath}', ${serialized})`;
|
|
37
|
+
replacements.push({ start: cStart, end: directiveEnd, replacement });
|
|
38
|
+
} catch {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
for (let i = replacements.length - 1;i >= 0; i--) {
|
|
43
|
+
const { start, end, replacement } = replacements[i];
|
|
44
|
+
result = result.substring(0, start) + replacement + result.substring(end);
|
|
45
|
+
}
|
|
46
|
+
return result;
|
|
47
|
+
}
|
|
48
|
+
function replaceWithBalancedParens(template, directive, callback) {
|
|
49
|
+
let result = template;
|
|
50
|
+
const pattern = new RegExp(`${directive.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\(`);
|
|
51
|
+
let match;
|
|
52
|
+
while ((match = pattern.exec(result)) !== null) {
|
|
53
|
+
const start = match.index, openParen = start + match[0].length - 1;
|
|
54
|
+
let depth = 1, pos = openParen + 1, inStr = null, esc = !1;
|
|
55
|
+
while (pos < result.length && depth > 0) {
|
|
56
|
+
const c = result[pos];
|
|
57
|
+
if (esc) {
|
|
58
|
+
esc = !1;
|
|
59
|
+
pos++;
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
if (c === "\\" && inStr) {
|
|
63
|
+
esc = !0;
|
|
64
|
+
pos++;
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
if (inStr) {
|
|
68
|
+
if (c === inStr)
|
|
69
|
+
inStr = null;
|
|
70
|
+
pos++;
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
if (c === '"' || c === "'" || c === "`") {
|
|
74
|
+
inStr = c;
|
|
75
|
+
pos++;
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
if (c === "(")
|
|
79
|
+
depth++;
|
|
80
|
+
else if (c === ")") {
|
|
81
|
+
depth--;
|
|
82
|
+
if (depth === 0)
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
pos++;
|
|
86
|
+
}
|
|
87
|
+
if (depth !== 0)
|
|
88
|
+
break;
|
|
89
|
+
const expr = result.substring(openParen + 1, pos), replacement = callback(expr);
|
|
90
|
+
result = result.substring(0, start) + replacement + result.substring(pos + 1);
|
|
91
|
+
}
|
|
92
|
+
return result;
|
|
93
|
+
}
|
|
94
|
+
function processPropBindings(content, context) {
|
|
95
|
+
let result = content;
|
|
96
|
+
result = result.replace(/:([a-zA-Z_][a-zA-Z0-9_-]*)(?=\s+[^=]|\s*\/?>|\s*$)/g, (match, propName) => {
|
|
97
|
+
if (propName in context)
|
|
98
|
+
return `:${propName}="${propName}"`;
|
|
99
|
+
return match;
|
|
100
|
+
});
|
|
101
|
+
result = result.replace(/:([a-zA-Z_][a-zA-Z0-9_-]*)\s*=\s*"([^"]*)"/g, (match, propName, expression) => {
|
|
102
|
+
try {
|
|
103
|
+
const contextKeys = Object.keys(context), contextValues = Object.values(context);
|
|
104
|
+
sanitizeExpression(expression);
|
|
105
|
+
const value = createSafeFunction(expression, contextKeys)(...contextValues), serialized = JSON.stringify(value), encoded = Buffer.from(serialized, "utf8").toString("base64");
|
|
106
|
+
return `__stx_${propName}="${encoded}"`;
|
|
107
|
+
} catch (error) {
|
|
108
|
+
return match;
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
return result;
|
|
112
|
+
}
|
|
113
|
+
const BREAK_MARKER = "<!--__STX_BREAK__-->", CONTINUE_MARKER = "<!--__STX_CONTINUE__-->";
|
|
114
|
+
function processConditionalLoopControl(content, context) {
|
|
115
|
+
let result = content;
|
|
116
|
+
result = replaceWithBalancedParens(result, "@break", (condition) => {
|
|
117
|
+
try {
|
|
118
|
+
const boolExpr = `!!(${condition.trim()})`;
|
|
119
|
+
let shouldBreak;
|
|
120
|
+
if (isExpressionSafe(boolExpr)) {
|
|
121
|
+
const condFn = createSafeFunction(boolExpr, Object.keys(context));
|
|
122
|
+
shouldBreak = Boolean(condFn(...Object.values(context)));
|
|
123
|
+
} else
|
|
124
|
+
shouldBreak = Boolean(safeEvaluate(boolExpr, context));
|
|
125
|
+
return shouldBreak ? BREAK_MARKER : "";
|
|
126
|
+
} catch {
|
|
127
|
+
return "";
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
result = replaceWithBalancedParens(result, "@continue", (condition) => {
|
|
131
|
+
try {
|
|
132
|
+
const boolExpr = `!!(${condition.trim()})`;
|
|
133
|
+
let shouldContinue;
|
|
134
|
+
if (isExpressionSafe(boolExpr)) {
|
|
135
|
+
const condFn = createSafeFunction(boolExpr, Object.keys(context));
|
|
136
|
+
shouldContinue = Boolean(condFn(...Object.values(context)));
|
|
137
|
+
} else
|
|
138
|
+
shouldContinue = Boolean(safeEvaluate(boolExpr, context));
|
|
139
|
+
return shouldContinue ? CONTINUE_MARKER : "";
|
|
140
|
+
} catch {
|
|
141
|
+
return "";
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
return result;
|
|
145
|
+
}
|
|
146
|
+
function processUnconditionalLoopControl(content) {
|
|
147
|
+
let result = content;
|
|
148
|
+
result = result.replace(/@break(?!\()/g, BREAK_MARKER);
|
|
149
|
+
result = result.replace(/@continue(?!\()/g, CONTINUE_MARKER);
|
|
150
|
+
return result;
|
|
151
|
+
}
|
|
152
|
+
function checkAndCleanBreak(content) {
|
|
153
|
+
const hasBreak = content.includes(BREAK_MARKER), cleanContent = hasBreak ? content.substring(0, content.indexOf(BREAK_MARKER)) : content;
|
|
154
|
+
return { hasBreak, content: cleanContent };
|
|
155
|
+
}
|
|
156
|
+
function checkAndCleanContinue(content) {
|
|
157
|
+
const hasContinue = content.includes(CONTINUE_MARKER), cleanContent = hasContinue ? content.substring(0, content.indexOf(CONTINUE_MARKER)) : content;
|
|
158
|
+
return { hasContinue, content: cleanContent };
|
|
159
|
+
}
|
|
160
|
+
function convertLoopControlToJS(content) {
|
|
161
|
+
let result = content;
|
|
162
|
+
result = replaceWithBalancedParens(result, "@break", (condition) => {
|
|
163
|
+
const trimmed = condition.trim();
|
|
164
|
+
if (!isForExpressionSafe(trimmed))
|
|
165
|
+
return "";
|
|
166
|
+
return `\`; if (${trimmed}) { break; } result += \``;
|
|
167
|
+
});
|
|
168
|
+
result = replaceWithBalancedParens(result, "@continue", (condition) => {
|
|
169
|
+
const trimmed = condition.trim();
|
|
170
|
+
if (!isForExpressionSafe(trimmed))
|
|
171
|
+
return "";
|
|
172
|
+
return `\`; if (${trimmed}) { continue; } result += \``;
|
|
173
|
+
});
|
|
174
|
+
result = result.replace(/@break(?!\()/g, "`; break; result += `");
|
|
175
|
+
result = result.replace(/@continue(?!\()/g, "`; continue; result += `");
|
|
176
|
+
return result;
|
|
177
|
+
}
|
|
178
|
+
function findOutermostForelse(template) {
|
|
179
|
+
const forelseRegex = /@forelse\s*\(/g;
|
|
180
|
+
let match;
|
|
181
|
+
const foreachEvents = [], foreachOpenScan = /@foreach\s*\(/g, foreachCloseScan = /@endforeach/g;
|
|
182
|
+
let scanM;
|
|
183
|
+
while ((scanM = foreachOpenScan.exec(template)) !== null)
|
|
184
|
+
foreachEvents.push({ pos: scanM.index, delta: 1 });
|
|
185
|
+
while ((scanM = foreachCloseScan.exec(template)) !== null)
|
|
186
|
+
foreachEvents.push({ pos: scanM.index, delta: -1 });
|
|
187
|
+
foreachEvents.sort((a, b) => a.pos - b.pos);
|
|
188
|
+
const depthAtEvent = [];
|
|
189
|
+
let runningDepth = 0;
|
|
190
|
+
for (const ev of foreachEvents) {
|
|
191
|
+
runningDepth += ev.delta;
|
|
192
|
+
depthAtEvent.push({ pos: ev.pos, depth: runningDepth });
|
|
193
|
+
}
|
|
194
|
+
function getForeachDepthAt(position) {
|
|
195
|
+
let lo = 0, hi = depthAtEvent.length - 1, result = 0;
|
|
196
|
+
while (lo <= hi) {
|
|
197
|
+
const mid = lo + hi >> 1;
|
|
198
|
+
if (depthAtEvent[mid].pos <= position) {
|
|
199
|
+
result = depthAtEvent[mid].depth;
|
|
200
|
+
lo = mid + 1;
|
|
201
|
+
} else
|
|
202
|
+
hi = mid - 1;
|
|
203
|
+
}
|
|
204
|
+
return result;
|
|
205
|
+
}
|
|
206
|
+
while ((match = forelseRegex.exec(template)) !== null) {
|
|
207
|
+
if (getForeachDepthAt(match.index) > 0)
|
|
208
|
+
continue;
|
|
209
|
+
const forelseStart = match.index, openParen = match.index + match[0].length - 1;
|
|
210
|
+
let parenDepth = 1, pos = openParen + 1, closeParen = -1;
|
|
211
|
+
while (pos < template.length && parenDepth > 0) {
|
|
212
|
+
if (template[pos] === "(")
|
|
213
|
+
parenDepth++;
|
|
214
|
+
else if (template[pos] === ")") {
|
|
215
|
+
parenDepth--;
|
|
216
|
+
if (parenDepth === 0) {
|
|
217
|
+
closeParen = pos;
|
|
218
|
+
break;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
pos++;
|
|
222
|
+
}
|
|
223
|
+
if (closeParen === -1)
|
|
224
|
+
continue;
|
|
225
|
+
const params = template.substring(openParen + 1, closeParen), asIndex = params.indexOf(" as ");
|
|
226
|
+
if (asIndex === -1)
|
|
227
|
+
continue;
|
|
228
|
+
const arrayExpr = params.substring(0, asIndex).trim(), itemVar = params.substring(asIndex + 4).trim(), contentStart = closeParen + 1;
|
|
229
|
+
let depth = 1, searchPos = contentStart;
|
|
230
|
+
const nestedForelseRegex = /@forelse\s*\(/g, endForelseRegex = /@endforelse/g;
|
|
231
|
+
let endForelsePos = -1;
|
|
232
|
+
while (depth > 0 && searchPos < template.length) {
|
|
233
|
+
nestedForelseRegex.lastIndex = searchPos;
|
|
234
|
+
endForelseRegex.lastIndex = searchPos;
|
|
235
|
+
const nextOpen = nestedForelseRegex.exec(template), nextClose = endForelseRegex.exec(template);
|
|
236
|
+
if (!nextClose)
|
|
237
|
+
break;
|
|
238
|
+
if (nextOpen && nextOpen.index < nextClose.index) {
|
|
239
|
+
depth++;
|
|
240
|
+
searchPos = nextOpen.index + nextOpen[0].length;
|
|
241
|
+
} else {
|
|
242
|
+
depth--;
|
|
243
|
+
if (depth === 0) {
|
|
244
|
+
endForelsePos = nextClose.index;
|
|
245
|
+
break;
|
|
246
|
+
}
|
|
247
|
+
searchPos = nextClose.index + 11;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
if (endForelsePos === -1)
|
|
251
|
+
continue;
|
|
252
|
+
const fullContent = template.substring(contentStart, endForelsePos), fullEnd = endForelsePos + 11;
|
|
253
|
+
let emptyPos = -1, nestedDepth = 0, searchI = 0;
|
|
254
|
+
while (searchI < fullContent.length) {
|
|
255
|
+
const atPos = fullContent.indexOf("@", searchI);
|
|
256
|
+
if (atPos === -1)
|
|
257
|
+
break;
|
|
258
|
+
const remaining = fullContent.substring(atPos);
|
|
259
|
+
if (/^@forelse\s*\(/.test(remaining)) {
|
|
260
|
+
nestedDepth++;
|
|
261
|
+
searchI = atPos + 1;
|
|
262
|
+
} else if (remaining.startsWith("@endforelse")) {
|
|
263
|
+
nestedDepth--;
|
|
264
|
+
searchI = atPos + 11;
|
|
265
|
+
} else if (nestedDepth === 0 && remaining.startsWith("@empty")) {
|
|
266
|
+
if (fullContent.length <= atPos + 6 || !/[a-z]/i.test(fullContent[atPos + 6])) {
|
|
267
|
+
emptyPos = atPos;
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
270
|
+
searchI = atPos + 1;
|
|
271
|
+
} else
|
|
272
|
+
searchI = atPos + 1;
|
|
273
|
+
}
|
|
274
|
+
if (emptyPos === -1)
|
|
275
|
+
continue;
|
|
276
|
+
return {
|
|
277
|
+
start: forelseStart,
|
|
278
|
+
end: fullEnd,
|
|
279
|
+
arrayExpr,
|
|
280
|
+
itemVar,
|
|
281
|
+
foreachContent: fullContent.substring(0, emptyPos),
|
|
282
|
+
emptyContent: fullContent.substring(emptyPos + 6)
|
|
283
|
+
};
|
|
284
|
+
}
|
|
285
|
+
return null;
|
|
286
|
+
}
|
|
287
|
+
function processForelse(template, context) {
|
|
288
|
+
let output = template;
|
|
289
|
+
while (!0) {
|
|
290
|
+
const found = findOutermostForelse(output);
|
|
291
|
+
if (!found)
|
|
292
|
+
break;
|
|
293
|
+
const { start, end, arrayExpr, itemVar, foreachContent, emptyContent } = found;
|
|
294
|
+
try {
|
|
295
|
+
let array;
|
|
296
|
+
if (isExpressionSafe(arrayExpr))
|
|
297
|
+
array = createSafeFunction(arrayExpr, Object.keys(context))(...Object.values(context));
|
|
298
|
+
else
|
|
299
|
+
array = safeEvaluate(arrayExpr, context);
|
|
300
|
+
let replacement;
|
|
301
|
+
if (!Array.isArray(array) || array.length === 0)
|
|
302
|
+
replacement = emptyContent;
|
|
303
|
+
else
|
|
304
|
+
replacement = `@foreach (${arrayExpr} as ${itemVar})${foreachContent}@endforeach`;
|
|
305
|
+
output = output.substring(0, start) + replacement + output.substring(end);
|
|
306
|
+
} catch (error) {
|
|
307
|
+
const errMsg = error instanceof Error ? error.message : String(error), replacement = inlineError("Forelse", `Error in @forelse(${arrayExpr} as ${itemVar}): ${errMsg}`, ErrorCodes.EVALUATION_ERROR);
|
|
308
|
+
output = output.substring(0, start) + replacement + output.substring(end);
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
return output;
|
|
312
|
+
}
|
|
313
|
+
export function processLoops(template, context, filePath, options) {
|
|
314
|
+
let output = template;
|
|
315
|
+
output = processForelse(output, context);
|
|
316
|
+
function findMatchingForeach(template) {
|
|
317
|
+
const foreachRegex = /@foreach\s*\(/g;
|
|
318
|
+
let match;
|
|
319
|
+
while ((match = foreachRegex.exec(template)) !== null) {
|
|
320
|
+
const foreachStart = match.index, openParen = match.index + match[0].length - 1;
|
|
321
|
+
let parenDepth = 1, pos = openParen + 1, closeParen = -1;
|
|
322
|
+
while (pos < template.length && parenDepth > 0) {
|
|
323
|
+
if (template[pos] === "(")
|
|
324
|
+
parenDepth++;
|
|
325
|
+
else if (template[pos] === ")") {
|
|
326
|
+
parenDepth--;
|
|
327
|
+
if (parenDepth === 0) {
|
|
328
|
+
closeParen = pos;
|
|
329
|
+
break;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
pos++;
|
|
333
|
+
}
|
|
334
|
+
if (closeParen === -1)
|
|
335
|
+
continue;
|
|
336
|
+
const params = template.substring(openParen + 1, closeParen), asIndex = params.indexOf(" as ");
|
|
337
|
+
if (asIndex === -1)
|
|
338
|
+
continue;
|
|
339
|
+
const start = foreachStart, arrayExpr = params.substring(0, asIndex), itemVar = params.substring(asIndex + 4), contentStart = closeParen + 1;
|
|
340
|
+
let depth = 1, searchPos = contentStart;
|
|
341
|
+
const nestedForeachRegex = /@foreach\s*\(/g, endforeachRegex = /@endforeach/g;
|
|
342
|
+
while (depth > 0 && searchPos < template.length) {
|
|
343
|
+
nestedForeachRegex.lastIndex = searchPos;
|
|
344
|
+
endforeachRegex.lastIndex = searchPos;
|
|
345
|
+
const nextForeach = nestedForeachRegex.exec(template), nextEndforeach = endforeachRegex.exec(template);
|
|
346
|
+
if (!nextEndforeach)
|
|
347
|
+
break;
|
|
348
|
+
if (nextForeach && nextForeach.index < nextEndforeach.index) {
|
|
349
|
+
depth++;
|
|
350
|
+
searchPos = nextForeach.index + nextForeach[0].length;
|
|
351
|
+
} else {
|
|
352
|
+
depth--;
|
|
353
|
+
if (depth === 0) {
|
|
354
|
+
const content = template.substring(contentStart, nextEndforeach.index), end = nextEndforeach.index + 11;
|
|
355
|
+
return { start, end, arrayExpr, itemVar, content };
|
|
356
|
+
}
|
|
357
|
+
searchPos = nextEndforeach.index + 11;
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
return null;
|
|
362
|
+
}
|
|
363
|
+
function processForeachWithContext(template, ctx) {
|
|
364
|
+
let result = template;
|
|
365
|
+
while (!0) {
|
|
366
|
+
const match = findMatchingForeach(result);
|
|
367
|
+
if (!match)
|
|
368
|
+
break;
|
|
369
|
+
const { start, end, arrayExpr, itemVar, content } = match;
|
|
370
|
+
try {
|
|
371
|
+
const trimmedArrayExpr = arrayExpr.trim();
|
|
372
|
+
let array;
|
|
373
|
+
if (isExpressionSafe(trimmedArrayExpr))
|
|
374
|
+
array = createSafeFunction(trimmedArrayExpr, Object.keys(ctx))(...Object.values(ctx));
|
|
375
|
+
else
|
|
376
|
+
array = safeEvaluate(trimmedArrayExpr, ctx);
|
|
377
|
+
let isObjectEntries = !1;
|
|
378
|
+
if (!Array.isArray(array))
|
|
379
|
+
if (array instanceof Map) {
|
|
380
|
+
array = Array.from(array);
|
|
381
|
+
isObjectEntries = !0;
|
|
382
|
+
} else if (array instanceof Set)
|
|
383
|
+
array = Array.from(array);
|
|
384
|
+
else if (typeof array === "string")
|
|
385
|
+
array = Array.from(array);
|
|
386
|
+
else if (array && typeof array === "object" && !(array instanceof Date) && !(array instanceof RegExp)) {
|
|
387
|
+
array = Object.entries(array);
|
|
388
|
+
isObjectEntries = !0;
|
|
389
|
+
} else {
|
|
390
|
+
const errorMsg = inlineError("Foreach", `Error in @foreach: ${trimmedArrayExpr} is not iterable`, ErrorCodes.TYPE_ERROR);
|
|
391
|
+
result = result.substring(0, start) + errorMsg + result.substring(end);
|
|
392
|
+
continue;
|
|
393
|
+
}
|
|
394
|
+
const _useAltLoopVar = options?.loops?.useAltLoopVariable ?? DEFAULT_USE_ALT_LOOP_VARIABLE, trimmedItemVar = itemVar.trim();
|
|
395
|
+
let indexName = null, itemName, commaIsValueIndex = !1;
|
|
396
|
+
if (trimmedItemVar.includes("=>")) {
|
|
397
|
+
const parts = trimmedItemVar.split("=>").map((p) => p.trim());
|
|
398
|
+
if (parts.length === 2 && parts[0] && parts[1]) {
|
|
399
|
+
indexName = parts[0];
|
|
400
|
+
itemName = parts[1];
|
|
401
|
+
} else
|
|
402
|
+
itemName = trimmedItemVar;
|
|
403
|
+
} else if (!trimmedItemVar.startsWith("[") && !trimmedItemVar.startsWith("{") && trimmedItemVar.includes(",")) {
|
|
404
|
+
const parts = trimmedItemVar.split(",").map((p) => p.trim());
|
|
405
|
+
if (parts.length === 2 && parts[0] && parts[1]) {
|
|
406
|
+
itemName = parts[0];
|
|
407
|
+
indexName = parts[1];
|
|
408
|
+
commaIsValueIndex = !0;
|
|
409
|
+
} else
|
|
410
|
+
itemName = trimmedItemVar;
|
|
411
|
+
} else
|
|
412
|
+
itemName = trimmedItemVar;
|
|
413
|
+
let loopResult = "";
|
|
414
|
+
const items = array;
|
|
415
|
+
for (let index = 0;index < items.length; index++) {
|
|
416
|
+
const item = items[index], loopContext = {
|
|
417
|
+
index,
|
|
418
|
+
iteration: index + 1,
|
|
419
|
+
first: index === 0,
|
|
420
|
+
last: index === items.length - 1,
|
|
421
|
+
count: items.length
|
|
422
|
+
}, itemContext = {
|
|
423
|
+
...ctx,
|
|
424
|
+
loop: loopContext,
|
|
425
|
+
$loop: loopContext
|
|
426
|
+
};
|
|
427
|
+
if (itemName.startsWith("[") && itemName.endsWith("]")) {
|
|
428
|
+
const destructuredNames = itemName.slice(1, -1).split(",").map((n) => n.trim());
|
|
429
|
+
if (Array.isArray(item))
|
|
430
|
+
destructuredNames.forEach((name, i) => {
|
|
431
|
+
if (name)
|
|
432
|
+
itemContext[name] = item[i];
|
|
433
|
+
});
|
|
434
|
+
else
|
|
435
|
+
itemContext[itemName] = item;
|
|
436
|
+
} else
|
|
437
|
+
itemContext[itemName] = item;
|
|
438
|
+
if (indexName)
|
|
439
|
+
if (!commaIsValueIndex && isObjectEntries && Array.isArray(item) && item.length === 2) {
|
|
440
|
+
itemContext[indexName] = item[0];
|
|
441
|
+
itemContext[itemName] = item[1];
|
|
442
|
+
} else
|
|
443
|
+
itemContext[indexName] = index;
|
|
444
|
+
let processedContent = processConditionalLoopControl(content, itemContext), continueCheck = checkAndCleanContinue(processedContent);
|
|
445
|
+
if (continueCheck.hasContinue) {
|
|
446
|
+
loopResult += continueCheck.content;
|
|
447
|
+
continue;
|
|
448
|
+
}
|
|
449
|
+
let breakCheck = checkAndCleanBreak(processedContent);
|
|
450
|
+
if (breakCheck.hasBreak) {
|
|
451
|
+
loopResult += breakCheck.content;
|
|
452
|
+
break;
|
|
453
|
+
}
|
|
454
|
+
processedContent = processForelse(processedContent, itemContext);
|
|
455
|
+
processedContent = processForeachWithContext(processedContent, itemContext);
|
|
456
|
+
processedContent = processConditionals(processedContent, itemContext, filePath);
|
|
457
|
+
processedContent = processUnconditionalLoopControl(processedContent);
|
|
458
|
+
breakCheck = checkAndCleanBreak(processedContent);
|
|
459
|
+
if (breakCheck.hasBreak) {
|
|
460
|
+
loopResult += breakCheck.content;
|
|
461
|
+
break;
|
|
462
|
+
}
|
|
463
|
+
continueCheck = checkAndCleanContinue(processedContent);
|
|
464
|
+
if (continueCheck.hasContinue) {
|
|
465
|
+
loopResult += continueCheck.content;
|
|
466
|
+
continue;
|
|
467
|
+
}
|
|
468
|
+
processedContent = processExpressions(processedContent, itemContext, filePath);
|
|
469
|
+
processedContent = processPropBindings(processedContent, itemContext);
|
|
470
|
+
processedContent = preEvaluateComponentProps(processedContent, itemContext);
|
|
471
|
+
loopResult += processedContent;
|
|
472
|
+
}
|
|
473
|
+
result = result.substring(0, start) + loopResult + result.substring(end);
|
|
474
|
+
} catch (error) {
|
|
475
|
+
const errorMsg = inlineError("Foreach", `Error in @foreach(${arrayExpr.trim()} as ${itemVar.trim()}): ${error instanceof Error ? error.message : String(error)}`, ErrorCodes.EVALUATION_ERROR);
|
|
476
|
+
result = result.substring(0, start) + errorMsg + result.substring(end);
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
return result;
|
|
480
|
+
}
|
|
481
|
+
output = processForeachWithContext(output, context);
|
|
482
|
+
output = processForLoops(output, context, filePath, options);
|
|
483
|
+
const maxWhileIterations = options?.loops?.maxWhileIterations ?? DEFAULT_MAX_WHILE_ITERATIONS;
|
|
484
|
+
output = processWhileLoops(output, context, maxWhileIterations);
|
|
485
|
+
return output;
|
|
486
|
+
}
|
|
487
|
+
function validateForExpression(expr) {
|
|
488
|
+
return isForExpressionSafe(expr);
|
|
489
|
+
}
|
|
490
|
+
function processForLoops(template, context, filePath, options) {
|
|
491
|
+
let output = template, processedAny = !0;
|
|
492
|
+
while (processedAny) {
|
|
493
|
+
processedAny = !1;
|
|
494
|
+
const forMatch = output.match(/@for\s*\(/);
|
|
495
|
+
if (!forMatch || forMatch.index === void 0)
|
|
496
|
+
break;
|
|
497
|
+
const startPos = forMatch.index, openParenPos = startPos + forMatch[0].length - 1, closeParenPos = findMatchingDelimiter(output, "(", ")", openParenPos);
|
|
498
|
+
if (closeParenPos === -1)
|
|
499
|
+
break;
|
|
500
|
+
const forExpr = output.slice(openParenPos + 1, closeParenPos), _contentStart = closeParenPos + 1, forBlocks = findDirectiveBlocks(output.slice(startPos), "for", "endfor");
|
|
501
|
+
if (forBlocks.length === 0)
|
|
502
|
+
break;
|
|
503
|
+
const content = forBlocks[0].content, endPos = startPos + forBlocks[0].end;
|
|
504
|
+
if (!validateForExpression(forExpr)) {
|
|
505
|
+
const errorMsg = inlineError("For", `Unsafe expression in @for: ${forExpr}`, ErrorCodes.UNSAFE_EXPRESSION);
|
|
506
|
+
output = output.substring(0, startPos) + errorMsg + output.substring(endPos);
|
|
507
|
+
processedAny = !0;
|
|
508
|
+
continue;
|
|
509
|
+
}
|
|
510
|
+
try {
|
|
511
|
+
const iterVarNames = parseForIterVarNames(forExpr), containsNestedDirectives = /@(?:for|foreach|if|unless)\s*\(/.test(content);
|
|
512
|
+
if (iterVarNames.length > 0 && containsNestedDirectives) {
|
|
513
|
+
const result = renderForLoopWithRecursion({
|
|
514
|
+
forExpr,
|
|
515
|
+
content,
|
|
516
|
+
iterVarNames,
|
|
517
|
+
context,
|
|
518
|
+
filePath,
|
|
519
|
+
options
|
|
520
|
+
});
|
|
521
|
+
output = output.substring(0, startPos) + result + output.substring(endPos);
|
|
522
|
+
processedAny = !0;
|
|
523
|
+
continue;
|
|
524
|
+
}
|
|
525
|
+
const loopKeys = Object.keys(context), loopValues = Object.values(context);
|
|
526
|
+
let processedContent = content.replace(/`/g, "\\`").replace(/\$\{/g, "\\${").replace(/\{\{([^}]+)\}\}/g, (_match, expr) => {
|
|
527
|
+
return `\${${expr}}`;
|
|
528
|
+
});
|
|
529
|
+
processedContent = convertLoopControlToJS(processedContent);
|
|
530
|
+
const result = Function(...loopKeys, `
|
|
531
|
+
let result = '';
|
|
532
|
+
for (${forExpr}) {
|
|
533
|
+
result += \`${processedContent}\`;
|
|
534
|
+
}
|
|
535
|
+
return result;
|
|
536
|
+
`)(...loopValues);
|
|
537
|
+
output = output.substring(0, startPos) + result + output.substring(endPos);
|
|
538
|
+
processedAny = !0;
|
|
539
|
+
} catch (error) {
|
|
540
|
+
const errorMsg = inlineError("For", `Error in @for(${forExpr}): ${error instanceof Error ? error.message : String(error)}`, ErrorCodes.EVALUATION_ERROR);
|
|
541
|
+
output = output.substring(0, startPos) + errorMsg + output.substring(endPos);
|
|
542
|
+
processedAny = !0;
|
|
543
|
+
}
|
|
544
|
+
}
|
|
545
|
+
return output;
|
|
546
|
+
}
|
|
547
|
+
function parseForIterVarNames(expr) {
|
|
548
|
+
const trimmed = expr.trim(), destructureMatch = trimmed.match(/^(?:const|let|var)\s+(\[[^\]]+\]|\{[^}]+\})\s+(?:of|in)\s+/);
|
|
549
|
+
if (destructureMatch) {
|
|
550
|
+
const inner = destructureMatch[1];
|
|
551
|
+
return inner.slice(1, -1).split(",").map((part) => {
|
|
552
|
+
const piece = part.trim();
|
|
553
|
+
if (!piece)
|
|
554
|
+
return "";
|
|
555
|
+
const colon = piece.indexOf(":");
|
|
556
|
+
if (colon >= 0 && inner.startsWith("{")) {
|
|
557
|
+
const aliasRaw = piece.slice(colon + 1).trim(), eq = aliasRaw.indexOf("=");
|
|
558
|
+
return (eq >= 0 ? aliasRaw.slice(0, eq) : aliasRaw).trim();
|
|
559
|
+
}
|
|
560
|
+
const eq = piece.indexOf("="), name = (eq >= 0 ? piece.slice(0, eq) : piece).trim();
|
|
561
|
+
return /^[A-Za-z_$][\w$]*$/.test(name) ? name : "";
|
|
562
|
+
}).filter(Boolean);
|
|
563
|
+
}
|
|
564
|
+
const ofInMatch = trimmed.match(/^(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s+(?:of|in)\s+/);
|
|
565
|
+
if (ofInMatch)
|
|
566
|
+
return [ofInMatch[1]];
|
|
567
|
+
const cStyleMatch = trimmed.match(/^(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=[^;]*;/);
|
|
568
|
+
if (cStyleMatch)
|
|
569
|
+
return [cStyleMatch[1]];
|
|
570
|
+
return [];
|
|
571
|
+
}
|
|
572
|
+
function renderForLoopWithRecursion(args) {
|
|
573
|
+
const { forExpr, content, iterVarNames, context, filePath, options } = args, contextKeys = Object.keys(context), contextValues = Object.values(context), captureFn = Function(...contextKeys, "__pushIter", `
|
|
574
|
+
for (${forExpr}) {
|
|
575
|
+
__pushIter([${iterVarNames.join(", ")}])
|
|
576
|
+
}
|
|
577
|
+
`), captured = [];
|
|
578
|
+
captureFn(...contextValues, (vals) => {
|
|
579
|
+
captured.push(vals);
|
|
580
|
+
});
|
|
581
|
+
const fp = filePath ?? "inline.stx";
|
|
582
|
+
let rendered = "";
|
|
583
|
+
for (const values of captured) {
|
|
584
|
+
const iterContext = { ...context };
|
|
585
|
+
iterVarNames.forEach((name, idx) => {
|
|
586
|
+
iterContext[name] = values[idx];
|
|
587
|
+
});
|
|
588
|
+
let chunk = processForLoops(content, iterContext, filePath, options);
|
|
589
|
+
chunk = processConditionals(chunk, iterContext, fp);
|
|
590
|
+
chunk = processExpressions(chunk, iterContext, fp);
|
|
591
|
+
rendered += chunk;
|
|
592
|
+
}
|
|
593
|
+
return rendered;
|
|
594
|
+
}
|
|
595
|
+
function processWhileLoops(template, context, maxIterations) {
|
|
596
|
+
let output = template, processedAny = !0;
|
|
597
|
+
while (processedAny) {
|
|
598
|
+
processedAny = !1;
|
|
599
|
+
const whileMatch = output.match(/@while\s*\(/);
|
|
600
|
+
if (!whileMatch || whileMatch.index === void 0)
|
|
601
|
+
break;
|
|
602
|
+
const startPos = whileMatch.index, openParenPos = startPos + whileMatch[0].length - 1, closeParenPos = findMatchingDelimiter(output, "(", ")", openParenPos);
|
|
603
|
+
if (closeParenPos === -1)
|
|
604
|
+
break;
|
|
605
|
+
const condition = output.slice(openParenPos + 1, closeParenPos), whileBlocks = findDirectiveBlocks(output.slice(startPos), "while", "endwhile");
|
|
606
|
+
if (whileBlocks.length === 0)
|
|
607
|
+
break;
|
|
608
|
+
const content = whileBlocks[0].content, endPos = startPos + whileBlocks[0].end;
|
|
609
|
+
if (!validateForExpression(condition)) {
|
|
610
|
+
const errorMsg = inlineError("While", `Unsafe expression in @while: ${condition}`, ErrorCodes.UNSAFE_EXPRESSION);
|
|
611
|
+
output = output.substring(0, startPos) + errorMsg + output.substring(endPos);
|
|
612
|
+
processedAny = !0;
|
|
613
|
+
continue;
|
|
614
|
+
}
|
|
615
|
+
try {
|
|
616
|
+
const loopKeys = Object.keys(context), loopValues = Object.values(context);
|
|
617
|
+
let processedContent = content.replace(/`/g, "\\`").replace(/\$\{/g, "\\${").replace(/\{\{([^}]+)\}\}/g, (_match, expr) => {
|
|
618
|
+
return `\${${expr}}`;
|
|
619
|
+
});
|
|
620
|
+
processedContent = convertLoopControlToJS(processedContent);
|
|
621
|
+
const result = Function(...loopKeys, `
|
|
622
|
+
let result = '';
|
|
623
|
+
let maxIterations = ${maxIterations}; // Configurable safety limit
|
|
624
|
+
let counter = 0;
|
|
625
|
+
while (${condition} && counter < maxIterations) {
|
|
626
|
+
counter++;
|
|
627
|
+
result += \`${processedContent}\`;
|
|
628
|
+
}
|
|
629
|
+
if (counter > maxIterations) {
|
|
630
|
+
result += '<!-- [While Error [1104]]: Maximum iterations (${maxIterations}) exceeded in while loop. Configure via options.loops.maxWhileIterations -->';
|
|
631
|
+
}
|
|
632
|
+
return result;
|
|
633
|
+
`)(...loopValues);
|
|
634
|
+
output = output.substring(0, startPos) + result + output.substring(endPos);
|
|
635
|
+
processedAny = !0;
|
|
636
|
+
} catch (error) {
|
|
637
|
+
const errorMsg = inlineError("While", `Error in @while(${condition}): ${error instanceof Error ? error.message : String(error)}`, ErrorCodes.EVALUATION_ERROR);
|
|
638
|
+
output = output.substring(0, startPos) + errorMsg + output.substring(endPos);
|
|
639
|
+
processedAny = !0;
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
return output;
|
|
643
|
+
}
|
package/dist/manifest.js
CHANGED
|
@@ -1,2 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
import
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
export function generateManifest(routes, assets, outputDir) {
|
|
4
|
+
return {
|
|
5
|
+
version: 1,
|
|
6
|
+
buildTime: new Date().toISOString(),
|
|
7
|
+
routes,
|
|
8
|
+
assets,
|
|
9
|
+
outputDir
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export function writeManifest(manifest, outputDir) {
|
|
13
|
+
const manifestPath = path.join(outputDir, "manifest.json");
|
|
14
|
+
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
|
|
15
|
+
}
|
|
16
|
+
export function loadManifest(outputDir) {
|
|
17
|
+
const manifestPath = path.join(outputDir, "manifest.json");
|
|
18
|
+
if (!fs.existsSync(manifestPath))
|
|
19
|
+
return null;
|
|
20
|
+
try {
|
|
21
|
+
const content = fs.readFileSync(manifestPath, "utf-8"), manifest = JSON.parse(content);
|
|
22
|
+
if (manifest.version !== 1) {
|
|
23
|
+
console.warn(`[stx] Manifest version mismatch: expected 1, got ${manifest.version}`);
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
return manifest;
|
|
27
|
+
} catch (error) {
|
|
28
|
+
console.warn("[stx] Failed to load manifest:", error);
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
}
|