@ecopages/core 0.2.0-alpha.52 → 0.2.0-alpha.54
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/README.md +2 -3
- package/package.json +97 -182
- package/src/adapters/abstract/application-adapter.test.ts +218 -0
- package/src/adapters/abstract/application-adapter.ts +379 -0
- package/src/adapters/abstract/router-adapter.ts +30 -0
- package/src/adapters/abstract/server-adapter.ts +79 -0
- package/src/adapters/bun/client-bridge.ts +62 -0
- package/src/adapters/bun/create-app.ts +214 -0
- package/src/adapters/bun/hmr-manager.test.ts +265 -0
- package/src/adapters/bun/hmr-manager.ts +88 -0
- package/src/adapters/bun/index.ts +2 -0
- package/src/adapters/bun/runtime-host.ts +76 -0
- package/src/adapters/bun/server-adapter.ts +605 -0
- package/src/adapters/bun/static-preview-host.ts +70 -0
- package/src/adapters/create-app.test.ts +10 -0
- package/src/adapters/create-app.ts +91 -0
- package/src/adapters/index.ts +2 -0
- package/src/adapters/node/create-app.test.ts +76 -0
- package/src/adapters/node/create-app.ts +116 -0
- package/src/adapters/node/http-request-bridge.test.ts +146 -0
- package/src/adapters/node/http-request-bridge.ts +176 -0
- package/src/adapters/node/node-client-bridge.test.ts +198 -0
- package/src/adapters/node/node-client-bridge.ts +79 -0
- package/src/adapters/node/node-hmr-manager.test.ts +374 -0
- package/src/adapters/node/node-hmr-manager.ts +72 -0
- package/src/adapters/node/runtime-host.test.ts +49 -0
- package/src/adapters/node/runtime-host.ts +113 -0
- package/src/adapters/node/server-adapter-dependencies.ts +28 -0
- package/src/adapters/node/server-adapter.test.ts +84 -0
- package/src/adapters/node/server-adapter.ts +423 -0
- package/src/adapters/node/static-content-server.test.ts +60 -0
- package/src/adapters/node/static-content-server.ts +239 -0
- package/src/adapters/node/static-preview-host.test.ts +89 -0
- package/src/adapters/node/static-preview-host.ts +101 -0
- package/src/adapters/shared/api-response.test.ts +97 -0
- package/src/adapters/shared/api-response.ts +104 -0
- package/src/adapters/shared/application-adapter.ts +199 -0
- package/src/adapters/shared/define-api-handler.ts +66 -0
- package/src/adapters/shared/explicit-static-render-preparation.ts +58 -0
- package/src/adapters/shared/explicit-static-route-matcher.test.ts +381 -0
- package/src/adapters/shared/explicit-static-route-matcher.ts +131 -0
- package/src/adapters/shared/file-route-middleware-pipeline.test.ts +85 -0
- package/src/adapters/shared/file-route-middleware-pipeline.ts +118 -0
- package/src/adapters/shared/fs-server-response-factory.test.ts +176 -0
- package/src/adapters/shared/fs-server-response-factory.ts +96 -0
- package/src/adapters/shared/fs-server-response-matcher.test.ts +311 -0
- package/src/adapters/shared/fs-server-response-matcher.ts +240 -0
- package/src/adapters/shared/hmr-entrypoint-registrar.ts +149 -0
- package/src/adapters/shared/hmr-html-response.ts +54 -0
- package/src/adapters/shared/hmr-manager.contract.test.ts +228 -0
- package/src/adapters/shared/hmr-manager.dispatch.test.ts +229 -0
- package/src/adapters/shared/render-context.test.ts +244 -0
- package/src/adapters/shared/render-context.ts +161 -0
- package/src/adapters/shared/runtime-app-bootstrap.test.ts +96 -0
- package/src/adapters/shared/runtime-app-bootstrap.ts +72 -0
- package/src/adapters/shared/runtime-host.ts +11 -0
- package/src/adapters/shared/server-adapter.test.ts +130 -0
- package/src/adapters/shared/server-adapter.ts +571 -0
- package/src/adapters/shared/server-route-handler.test.ts +112 -0
- package/src/adapters/shared/server-route-handler.ts +153 -0
- package/src/adapters/shared/server-static-builder.test.ts +338 -0
- package/src/adapters/shared/server-static-builder.ts +170 -0
- package/src/adapters/shared/shared-hmr-manager.ts +298 -0
- package/src/adapters/shared/static-preview-host.ts +12 -0
- package/src/build/README.md +57 -73
- package/src/build/browser-runtime-manifest.test.ts +121 -0
- package/src/build/browser-runtime-manifest.ts +105 -0
- package/src/build/browser-runtime-plugin-helpers.test.ts +49 -0
- package/src/build/browser-runtime-plugin-helpers.ts +37 -0
- package/src/build/browser-runtime-plugin.test.ts +256 -0
- package/src/build/browser-runtime-plugin.ts +306 -0
- package/src/build/build-adapter.test.ts +463 -0
- package/src/build/build-adapter.ts +788 -0
- package/src/build/build-manifest.ts +79 -0
- package/src/build/build-types.ts +83 -0
- package/src/build/rolldown-build-adapter.test.ts +352 -0
- package/src/build/rolldown-build-adapter.ts +363 -0
- package/src/build/rolldown-plugin-bridge.test.ts +256 -0
- package/src/build/rolldown-plugin-bridge.ts +309 -0
- package/src/build/runtime-build-executor.test.ts +130 -0
- package/src/build/runtime-build-executor.ts +37 -0
- package/src/build/runtime-build-output-normalizer.ts +137 -0
- package/src/build/serialized-build-executor.test.ts +96 -0
- package/src/build/serialized-build-executor.ts +90 -0
- package/src/build/server-side-css-shim-plugin.ts +77 -0
- package/src/cache/index.ts +6 -0
- package/src/cache/module-parse-cache.test.ts +73 -0
- package/src/cache/module-parse-cache.ts +137 -0
- package/src/config/README.md +1 -1
- package/src/config/config-builder.test.ts +456 -0
- package/src/config/config-builder.ts +728 -0
- package/src/config/config-builder.typecheck.test.ts +96 -0
- package/src/config/{constants.d.ts → constants.ts} +22 -13
- package/src/dev/host-runtime.ts +34 -0
- package/src/dev/sc-server.ts +143 -0
- package/src/eco/eco.browser.test.ts +43 -0
- package/src/eco/eco.browser.ts +137 -0
- package/src/eco/eco.test.ts +781 -0
- package/src/eco/eco.ts +262 -0
- package/src/eco/eco.types.ts +293 -0
- package/src/eco/eco.utils.test.ts +219 -0
- package/src/eco/eco.utils.ts +5 -0
- package/src/eco/global-injector-map.test.ts +42 -0
- package/src/eco/global-injector-map.ts +112 -0
- package/src/eco/lazy-injector-map.test.ts +66 -0
- package/src/eco/lazy-injector-map.ts +120 -0
- package/src/eco/module-dependencies.test.ts +30 -0
- package/src/eco/module-dependencies.ts +75 -0
- package/src/errors/http-error.test.ts +134 -0
- package/src/errors/http-error.ts +72 -0
- package/src/errors/index.ts +3 -0
- package/src/errors/locals-access-error.ts +7 -0
- package/src/global/app-logger.ts +4 -0
- package/src/global/utils.test.ts +12 -0
- package/src/hmr/client/__screenshots__/hmr-runtime.test.browser.ts/HMR-Runtime-HMR-Server-Integration-should-have-HMR-script-injected-in-page-1.png +0 -0
- package/src/hmr/client/__screenshots__/hmr-runtime.test.browser.ts/HMR-Runtime-HMR-Server-Integration-should-load-fixture-app-page-1.png +0 -0
- package/src/hmr/client/__screenshots__/hmr-runtime.test.browser.ts/HMR-Runtime-WebSocket-Connection-should-connect-to-correct-HMR-endpoint-1.png +0 -0
- package/src/hmr/client/hmr-runtime.ts +162 -0
- package/src/hmr/hmr-strategy.test.ts +124 -0
- package/src/hmr/hmr-strategy.ts +177 -0
- package/src/hmr/hmr.postcss.test.e2e.ts +41 -0
- package/src/hmr/hmr.test.e2e.ts +66 -0
- package/src/hmr/strategies/default-hmr-strategy.ts +60 -0
- package/src/hmr/strategies/js-hmr-strategy.test.ts +344 -0
- package/src/hmr/strategies/js-hmr-strategy.ts +307 -0
- package/src/index.browser.ts +3 -0
- package/src/index.ts +15 -0
- package/src/integrations/ghtml/ghtml-renderer.test.ts +253 -0
- package/src/integrations/ghtml/ghtml-renderer.ts +87 -0
- package/src/integrations/ghtml/ghtml.constants.ts +1 -0
- package/src/integrations/ghtml/ghtml.plugin.ts +28 -0
- package/src/plugins/alias-resolver-cache.test.ts +110 -0
- package/src/plugins/alias-resolver-cache.ts +145 -0
- package/src/plugins/alias-resolver-plugin.test.ts +41 -0
- package/src/plugins/alias-resolver-plugin.ts +75 -0
- package/src/plugins/eco-component-meta-plugin.test.ts +421 -0
- package/src/plugins/eco-component-meta-plugin.ts +518 -0
- package/src/plugins/foreign-jsx-override-plugin.test.ts +65 -0
- package/src/plugins/foreign-jsx-override-plugin.ts +76 -0
- package/src/plugins/integration-plugin.test.ts +151 -0
- package/src/plugins/integration-plugin.ts +344 -0
- package/src/plugins/processor.test.ts +148 -0
- package/src/plugins/processor.ts +257 -0
- package/src/plugins/{runtime-capability.d.ts → runtime-capability.ts} +8 -3
- package/src/plugins/source-transform.test.ts +82 -0
- package/src/plugins/source-transform.ts +123 -0
- package/src/route-renderer/orchestration/component-render-context.ts +338 -0
- package/src/route-renderer/orchestration/declared-ownership-graph.ts +62 -0
- package/src/route-renderer/orchestration/foreign-subtree-execution.service.ts +431 -0
- package/src/route-renderer/orchestration/integration-renderer.test.ts +2251 -0
- package/src/route-renderer/orchestration/integration-renderer.ts +1384 -0
- package/src/route-renderer/orchestration/ownership-planning.service.ts +97 -0
- package/src/route-renderer/orchestration/ownership-validation.service.ts +76 -0
- package/src/route-renderer/orchestration/processed-asset-dedupe.ts +29 -0
- package/src/route-renderer/orchestration/queued-foreign-subtree-resolution.service.test.ts +435 -0
- package/src/route-renderer/orchestration/queued-foreign-subtree-resolution.service.ts +310 -0
- package/src/route-renderer/orchestration/render-output.utils.ts +310 -0
- package/src/route-renderer/orchestration/route-render-orchestrator.prepare-render-options.test.ts +1365 -0
- package/src/route-renderer/orchestration/route-render-orchestrator.test.ts +267 -0
- package/src/route-renderer/orchestration/route-render-orchestrator.ts +879 -0
- package/src/route-renderer/orchestration/template-serialization.test.ts +110 -0
- package/src/route-renderer/orchestration/template-serialization.ts +117 -0
- package/src/route-renderer/page-loading/component-dependency-collection.ts +202 -0
- package/src/route-renderer/page-loading/declared-asset-collection.ts +153 -0
- package/src/route-renderer/page-loading/dependency-resolver.test.ts +761 -0
- package/src/route-renderer/page-loading/dependency-resolver.ts +144 -0
- package/src/route-renderer/page-loading/ecopages-virtual-imports.ts +75 -0
- package/src/route-renderer/page-loading/lazy-entry-collection.ts +167 -0
- package/src/route-renderer/page-loading/lazy-trigger-planning.ts +74 -0
- package/src/route-renderer/page-loading/module-declaration-aggregation.ts +60 -0
- package/src/route-renderer/page-loading/module-declaration-scripts.ts +16 -0
- package/src/route-renderer/page-loading/page-dependency-bundling.ts +244 -0
- package/src/route-renderer/page-loading/page-module-loader.test.ts +183 -0
- package/src/route-renderer/page-loading/page-module-loader.ts +184 -0
- package/src/route-renderer/route-renderer.ts +133 -0
- package/src/router/client/link-intent.test.browser.ts +51 -0
- package/src/router/client/link-intent.ts +92 -0
- package/src/router/client/navigation-coordinator.test.ts +237 -0
- package/src/router/client/navigation-coordinator.ts +453 -0
- package/src/router/server/route-registry.test.ts +176 -0
- package/src/router/server/route-registry.ts +382 -0
- package/src/services/assets/asset-processing-service/asset-dependency-keys.ts +66 -0
- package/src/services/assets/asset-processing-service/asset-processing.service.test.ts +473 -0
- package/src/services/assets/asset-processing-service/asset-processing.service.ts +344 -0
- package/src/services/assets/asset-processing-service/asset.factory.test.ts +63 -0
- package/src/services/assets/asset-processing-service/asset.factory.ts +105 -0
- package/src/services/assets/asset-processing-service/assets.types.ts +128 -0
- package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.test.ts +74 -0
- package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.ts +98 -0
- package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.test.ts +67 -0
- package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.ts +78 -0
- package/src/services/assets/asset-processing-service/grouped-content-bundles.ts +104 -0
- package/src/services/assets/asset-processing-service/index.ts +6 -0
- package/src/services/assets/asset-processing-service/page-package.test.ts +135 -0
- package/src/services/assets/asset-processing-service/page-package.ts +103 -0
- package/src/services/assets/asset-processing-service/{processor.interface.d.ts → processor.interface.ts} +10 -5
- package/src/services/assets/asset-processing-service/processor.registry.ts +18 -0
- package/src/services/assets/asset-processing-service/processors/base/base-processor.test.ts +59 -0
- package/src/services/assets/asset-processing-service/processors/base/base-processor.ts +83 -0
- package/src/services/assets/asset-processing-service/processors/base/base-script-processor.ts +173 -0
- package/src/services/assets/asset-processing-service/processors/index.ts +5 -0
- package/src/services/assets/asset-processing-service/processors/script/content-script.processor.test.ts +188 -0
- package/src/services/assets/asset-processing-service/processors/script/content-script.processor.ts +138 -0
- package/src/services/assets/asset-processing-service/processors/script/file-script.processor.test.ts +326 -0
- package/src/services/assets/asset-processing-service/processors/script/file-script.processor.ts +116 -0
- package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.test.ts +270 -0
- package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.ts +145 -0
- package/src/services/assets/asset-processing-service/processors/stylesheet/content-stylesheet.processor.test.ts +261 -0
- package/src/services/assets/asset-processing-service/processors/stylesheet/content-stylesheet.processor.ts +72 -0
- package/src/services/assets/asset-processing-service/processors/stylesheet/file-stylesheet.processor.ts +83 -0
- package/src/services/assets/asset-processing-service/ungrouped-dependency-processing.ts +65 -0
- package/src/services/assets/browser-bundle.service.test.ts +66 -0
- package/src/services/assets/browser-bundle.service.ts +109 -0
- package/src/services/cache/cache.types.ts +126 -0
- package/src/services/cache/index.ts +18 -0
- package/src/services/cache/memory-cache-store.test.ts +225 -0
- package/src/services/cache/memory-cache-store.ts +130 -0
- package/src/services/cache/page-cache-service.test.ts +175 -0
- package/src/services/cache/page-cache-service.ts +202 -0
- package/src/services/cache/page-request-cache-coordinator.service.test.ts +79 -0
- package/src/services/cache/page-request-cache-coordinator.service.ts +131 -0
- package/src/services/html/html-rewriter-provider.service.test.ts +183 -0
- package/src/services/html/html-rewriter-provider.service.ts +105 -0
- package/src/services/html/html-transformer.service.test.ts +544 -0
- package/src/services/html/html-transformer.service.ts +369 -0
- package/src/services/invalidation/development-invalidation.service.test.ts +87 -0
- package/src/services/invalidation/development-invalidation.service.ts +262 -0
- package/src/services/module-loading/app-module-loader.service.ts +9 -0
- package/src/services/module-loading/app-server-module-transpiler.service.test.ts +297 -0
- package/src/services/module-loading/app-server-module-transpiler.service.ts +168 -0
- package/src/services/module-loading/host-module-loader-registry.ts +15 -0
- package/src/services/module-loading/{module-loading-types.d.ts → module-loading-types.ts} +1 -0
- package/src/services/module-loading/page-module-import.service.test.ts +652 -0
- package/src/services/module-loading/page-module-import.service.ts +302 -0
- package/src/services/module-loading/server-module-transpiler.service.test.ts +242 -0
- package/src/services/module-loading/server-module-transpiler.service.ts +104 -0
- package/src/services/module-loading/source-module-support.ts +19 -0
- package/src/services/runtime-state/dev-graph.service.ts +217 -0
- package/src/services/runtime-state/entrypoint-dependency-graph.service.ts +136 -0
- package/src/services/runtime-state/server-invalidation-state.service.ts +68 -0
- package/src/services/validation/schema-validation-service.test.ts +223 -0
- package/src/services/validation/schema-validation-service.ts +204 -0
- package/src/services/validation/{standard-schema.types.d.ts → standard-schema.types.ts} +20 -17
- package/src/static-site-generator/static-site-generator.test.ts +408 -0
- package/src/static-site-generator/static-site-generator.ts +445 -0
- package/src/types/internal-types.ts +243 -0
- package/src/types/public-types.ts +1508 -0
- package/src/utils/deep-merge.test.ts +114 -0
- package/src/utils/deep-merge.ts +47 -0
- package/src/utils/hash.ts +5 -0
- package/src/utils/html-escaping.ts +9 -0
- package/src/utils/invariant.test.ts +22 -0
- package/src/utils/invariant.ts +15 -0
- package/src/utils/locals-utils.ts +37 -0
- package/src/utils/parse-cli-args.test.ts +69 -0
- package/src/utils/parse-cli-args.ts +105 -0
- package/src/utils/path-utils.module.ts +14 -0
- package/src/utils/path-utils.test.ts +15 -0
- package/src/utils/resolve-work-dir.ts +45 -0
- package/src/utils/runtime.ts +44 -0
- package/src/utils/server-utils.module.ts +67 -0
- package/src/utils/server-utils.test.ts +38 -0
- package/src/watchers/project-watcher.integration.test.ts +337 -0
- package/src/watchers/project-watcher.test-helpers.ts +42 -0
- package/src/watchers/project-watcher.test.ts +768 -0
- package/src/watchers/project-watcher.ts +357 -0
- package/src/adapters/abstract/application-adapter.d.ts +0 -194
- package/src/adapters/abstract/application-adapter.js +0 -121
- package/src/adapters/abstract/router-adapter.d.ts +0 -26
- package/src/adapters/abstract/router-adapter.js +0 -5
- package/src/adapters/abstract/server-adapter.d.ts +0 -69
- package/src/adapters/abstract/server-adapter.js +0 -15
- package/src/adapters/bun/client-bridge.d.ts +0 -34
- package/src/adapters/bun/client-bridge.js +0 -48
- package/src/adapters/bun/create-app.d.ts +0 -60
- package/src/adapters/bun/create-app.js +0 -140
- package/src/adapters/bun/hmr-manager.d.ts +0 -47
- package/src/adapters/bun/hmr-manager.js +0 -58
- package/src/adapters/bun/index.d.ts +0 -2
- package/src/adapters/bun/index.js +0 -8
- package/src/adapters/bun/runtime-host.d.ts +0 -52
- package/src/adapters/bun/runtime-host.js +0 -56
- package/src/adapters/bun/server-adapter.d.ts +0 -216
- package/src/adapters/bun/server-adapter.js +0 -445
- package/src/adapters/bun/static-preview-host.d.ts +0 -28
- package/src/adapters/bun/static-preview-host.js +0 -45
- package/src/adapters/create-app.d.ts +0 -20
- package/src/adapters/create-app.js +0 -66
- package/src/adapters/index.d.ts +0 -2
- package/src/adapters/index.js +0 -8
- package/src/adapters/node/create-app.d.ts +0 -24
- package/src/adapters/node/create-app.js +0 -92
- package/src/adapters/node/http-request-bridge.d.ts +0 -57
- package/src/adapters/node/http-request-bridge.js +0 -118
- package/src/adapters/node/node-client-bridge.d.ts +0 -26
- package/src/adapters/node/node-client-bridge.js +0 -66
- package/src/adapters/node/node-hmr-manager.d.ts +0 -52
- package/src/adapters/node/node-hmr-manager.js +0 -49
- package/src/adapters/node/runtime-host.d.ts +0 -57
- package/src/adapters/node/runtime-host.js +0 -92
- package/src/adapters/node/server-adapter-dependencies.d.ts +0 -19
- package/src/adapters/node/server-adapter-dependencies.js +0 -18
- package/src/adapters/node/server-adapter.d.ts +0 -138
- package/src/adapters/node/server-adapter.js +0 -315
- package/src/adapters/node/static-content-server.d.ts +0 -60
- package/src/adapters/node/static-content-server.js +0 -194
- package/src/adapters/node/static-preview-host.d.ts +0 -55
- package/src/adapters/node/static-preview-host.js +0 -68
- package/src/adapters/shared/api-response.d.ts +0 -52
- package/src/adapters/shared/api-response.js +0 -96
- package/src/adapters/shared/application-adapter.d.ts +0 -18
- package/src/adapters/shared/application-adapter.js +0 -90
- package/src/adapters/shared/define-api-handler.d.ts +0 -25
- package/src/adapters/shared/define-api-handler.js +0 -15
- package/src/adapters/shared/explicit-static-render-preparation.d.ts +0 -25
- package/src/adapters/shared/explicit-static-render-preparation.js +0 -26
- package/src/adapters/shared/explicit-static-route-matcher.d.ts +0 -41
- package/src/adapters/shared/explicit-static-route-matcher.js +0 -101
- package/src/adapters/shared/file-route-middleware-pipeline.d.ts +0 -62
- package/src/adapters/shared/file-route-middleware-pipeline.js +0 -90
- package/src/adapters/shared/fs-server-response-factory.d.ts +0 -23
- package/src/adapters/shared/fs-server-response-factory.js +0 -81
- package/src/adapters/shared/fs-server-response-matcher.d.ts +0 -75
- package/src/adapters/shared/fs-server-response-matcher.js +0 -186
- package/src/adapters/shared/hmr-entrypoint-registrar.d.ts +0 -55
- package/src/adapters/shared/hmr-entrypoint-registrar.js +0 -87
- package/src/adapters/shared/hmr-html-response.d.ts +0 -22
- package/src/adapters/shared/hmr-html-response.js +0 -33
- package/src/adapters/shared/render-context.d.ts +0 -16
- package/src/adapters/shared/render-context.js +0 -93
- package/src/adapters/shared/runtime-app-bootstrap.d.ts +0 -26
- package/src/adapters/shared/runtime-app-bootstrap.js +0 -46
- package/src/adapters/shared/runtime-host.d.ts +0 -12
- package/src/adapters/shared/runtime-host.js +0 -0
- package/src/adapters/shared/server-adapter.d.ts +0 -108
- package/src/adapters/shared/server-adapter.js +0 -436
- package/src/adapters/shared/server-route-handler.d.ts +0 -89
- package/src/adapters/shared/server-route-handler.js +0 -111
- package/src/adapters/shared/server-static-builder.d.ts +0 -71
- package/src/adapters/shared/server-static-builder.js +0 -100
- package/src/adapters/shared/shared-hmr-manager.d.ts +0 -59
- package/src/adapters/shared/shared-hmr-manager.js +0 -241
- package/src/adapters/shared/static-preview-host.d.ts +0 -10
- package/src/adapters/shared/static-preview-host.js +0 -0
- package/src/build/browser-runtime-import-rewrite-plugin.d.ts +0 -26
- package/src/build/browser-runtime-import-rewrite-plugin.js +0 -165
- package/src/build/browser-runtime-manifest.d.ts +0 -31
- package/src/build/browser-runtime-manifest.js +0 -61
- package/src/build/build-adapter.d.ts +0 -247
- package/src/build/build-adapter.js +0 -671
- package/src/build/build-manifest.d.ts +0 -33
- package/src/build/build-manifest.js +0 -52
- package/src/build/build-types.d.ts +0 -57
- package/src/build/build-types.js +0 -0
- package/src/build/dev-build-coordinator.d.ts +0 -72
- package/src/build/dev-build-coordinator.js +0 -154
- package/src/build/esbuild-build-adapter.d.ts +0 -79
- package/src/build/esbuild-build-adapter.js +0 -521
- package/src/build/runtime-build-executor.d.ts +0 -14
- package/src/build/runtime-build-executor.js +0 -22
- package/src/build/runtime-specifier-alias-plugin.d.ts +0 -15
- package/src/build/runtime-specifier-alias-plugin.js +0 -31
- package/src/config/config-builder.d.ts +0 -252
- package/src/config/config-builder.js +0 -598
- package/src/config/constants.js +0 -25
- package/src/dev/host-runtime.d.ts +0 -10
- package/src/dev/host-runtime.js +0 -24
- package/src/dev/sc-server.d.ts +0 -30
- package/src/dev/sc-server.js +0 -111
- package/src/eco/eco.browser.d.ts +0 -2
- package/src/eco/eco.browser.js +0 -88
- package/src/eco/eco.d.ts +0 -9
- package/src/eco/eco.js +0 -119
- package/src/eco/eco.types.d.ts +0 -233
- package/src/eco/eco.types.js +0 -0
- package/src/eco/eco.utils.d.ts +0 -1
- package/src/eco/eco.utils.js +0 -10
- package/src/eco/global-injector-map.d.ts +0 -16
- package/src/eco/global-injector-map.js +0 -80
- package/src/eco/lazy-injector-map.d.ts +0 -8
- package/src/eco/lazy-injector-map.js +0 -70
- package/src/eco/module-dependencies.d.ts +0 -18
- package/src/eco/module-dependencies.js +0 -49
- package/src/errors/http-error.d.ts +0 -31
- package/src/errors/http-error.js +0 -50
- package/src/errors/index.d.ts +0 -3
- package/src/errors/index.js +0 -6
- package/src/errors/locals-access-error.d.ts +0 -4
- package/src/errors/locals-access-error.js +0 -9
- package/src/global/app-logger.d.ts +0 -2
- package/src/global/app-logger.js +0 -6
- package/src/hmr/client/hmr-runtime.d.ts +0 -5
- package/src/hmr/client/hmr-runtime.js +0 -117
- package/src/hmr/hmr-strategy.d.ts +0 -162
- package/src/hmr/hmr-strategy.js +0 -44
- package/src/hmr/hmr.postcss.test.e2e.d.ts +0 -1
- package/src/hmr/hmr.postcss.test.e2e.js +0 -31
- package/src/hmr/hmr.test.e2e.d.ts +0 -1
- package/src/hmr/hmr.test.e2e.js +0 -43
- package/src/hmr/strategies/default-hmr-strategy.d.ts +0 -43
- package/src/hmr/strategies/default-hmr-strategy.js +0 -34
- package/src/hmr/strategies/js-hmr-strategy.d.ts +0 -134
- package/src/hmr/strategies/js-hmr-strategy.js +0 -173
- package/src/index.browser.d.ts +0 -3
- package/src/index.browser.js +0 -4
- package/src/index.d.ts +0 -6
- package/src/index.js +0 -21
- package/src/integrations/ghtml/ghtml-renderer.d.ts +0 -16
- package/src/integrations/ghtml/ghtml-renderer.js +0 -57
- package/src/integrations/ghtml/ghtml.constants.d.ts +0 -1
- package/src/integrations/ghtml/ghtml.constants.js +0 -4
- package/src/integrations/ghtml/ghtml.plugin.d.ts +0 -16
- package/src/integrations/ghtml/ghtml.plugin.js +0 -20
- package/src/plugins/alias-resolver-plugin.d.ts +0 -3
- package/src/plugins/alias-resolver-plugin.js +0 -61
- package/src/plugins/eco-component-meta-plugin.d.ts +0 -108
- package/src/plugins/eco-component-meta-plugin.js +0 -175
- package/src/plugins/foreign-jsx-override-plugin.d.ts +0 -33
- package/src/plugins/foreign-jsx-override-plugin.js +0 -41
- package/src/plugins/integration-plugin.d.ts +0 -230
- package/src/plugins/integration-plugin.js +0 -201
- package/src/plugins/processor.d.ts +0 -97
- package/src/plugins/processor.js +0 -141
- package/src/plugins/runtime-capability.js +0 -0
- package/src/plugins/source-transform.d.ts +0 -46
- package/src/plugins/source-transform.js +0 -71
- package/src/route-renderer/orchestration/component-render-context.d.ts +0 -97
- package/src/route-renderer/orchestration/component-render-context.js +0 -147
- package/src/route-renderer/orchestration/declared-ownership-graph.d.ts +0 -18
- package/src/route-renderer/orchestration/declared-ownership-graph.js +0 -34
- package/src/route-renderer/orchestration/foreign-subtree-execution.service.d.ts +0 -110
- package/src/route-renderer/orchestration/foreign-subtree-execution.service.js +0 -233
- package/src/route-renderer/orchestration/integration-renderer.d.ts +0 -534
- package/src/route-renderer/orchestration/integration-renderer.js +0 -991
- package/src/route-renderer/orchestration/ownership-planning.service.d.ts +0 -24
- package/src/route-renderer/orchestration/ownership-planning.service.js +0 -63
- package/src/route-renderer/orchestration/ownership-validation.service.d.ts +0 -29
- package/src/route-renderer/orchestration/ownership-validation.service.js +0 -53
- package/src/route-renderer/orchestration/processed-asset-dedupe.d.ts +0 -3
- package/src/route-renderer/orchestration/processed-asset-dedupe.js +0 -27
- package/src/route-renderer/orchestration/queued-foreign-subtree-resolution.service.d.ts +0 -91
- package/src/route-renderer/orchestration/queued-foreign-subtree-resolution.service.js +0 -170
- package/src/route-renderer/orchestration/render-output.utils.d.ts +0 -66
- package/src/route-renderer/orchestration/render-output.utils.js +0 -171
- package/src/route-renderer/orchestration/route-render-orchestrator.d.ts +0 -156
- package/src/route-renderer/orchestration/route-render-orchestrator.js +0 -577
- package/src/route-renderer/orchestration/template-serialization.d.ts +0 -38
- package/src/route-renderer/orchestration/template-serialization.js +0 -45
- package/src/route-renderer/page-loading/component-dependency-collection.d.ts +0 -37
- package/src/route-renderer/page-loading/component-dependency-collection.js +0 -132
- package/src/route-renderer/page-loading/declared-asset-collection.d.ts +0 -24
- package/src/route-renderer/page-loading/declared-asset-collection.js +0 -106
- package/src/route-renderer/page-loading/dependency-resolver.d.ts +0 -35
- package/src/route-renderer/page-loading/dependency-resolver.js +0 -115
- package/src/route-renderer/page-loading/ecopages-virtual-imports.d.ts +0 -11
- package/src/route-renderer/page-loading/ecopages-virtual-imports.js +0 -57
- package/src/route-renderer/page-loading/lazy-entry-collection.d.ts +0 -45
- package/src/route-renderer/page-loading/lazy-entry-collection.js +0 -105
- package/src/route-renderer/page-loading/lazy-trigger-planning.d.ts +0 -19
- package/src/route-renderer/page-loading/lazy-trigger-planning.js +0 -40
- package/src/route-renderer/page-loading/module-declaration-aggregation.d.ts +0 -5
- package/src/route-renderer/page-loading/module-declaration-aggregation.js +0 -33
- package/src/route-renderer/page-loading/module-declaration-scripts.d.ts +0 -3
- package/src/route-renderer/page-loading/module-declaration-scripts.js +0 -18
- package/src/route-renderer/page-loading/page-dependency-bundling.d.ts +0 -13
- package/src/route-renderer/page-loading/page-dependency-bundling.js +0 -137
- package/src/route-renderer/page-loading/page-module-loader.d.ts +0 -90
- package/src/route-renderer/page-loading/page-module-loader.js +0 -127
- package/src/route-renderer/route-renderer.d.ts +0 -69
- package/src/route-renderer/route-renderer.js +0 -80
- package/src/router/client/link-intent.js +0 -34
- package/src/router/client/link-intent.test.browser.d.ts +0 -1
- package/src/router/client/link-intent.test.browser.js +0 -43
- package/src/router/client/navigation-coordinator.d.ts +0 -169
- package/src/router/client/navigation-coordinator.js +0 -215
- package/src/router/server/route-registry.d.ts +0 -78
- package/src/router/server/route-registry.js +0 -262
- package/src/services/assets/asset-processing-service/asset-dependency-keys.d.ts +0 -3
- package/src/services/assets/asset-processing-service/asset-dependency-keys.js +0 -56
- package/src/services/assets/asset-processing-service/asset-processing.service.d.ts +0 -103
- package/src/services/assets/asset-processing-service/asset-processing.service.js +0 -285
- package/src/services/assets/asset-processing-service/asset.factory.d.ts +0 -17
- package/src/services/assets/asset-processing-service/asset.factory.js +0 -82
- package/src/services/assets/asset-processing-service/assets.types.d.ts +0 -103
- package/src/services/assets/asset-processing-service/assets.types.js +0 -0
- package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.d.ts +0 -57
- package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.js +0 -49
- package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.d.ts +0 -20
- package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.js +0 -41
- package/src/services/assets/asset-processing-service/grouped-content-bundles.d.ts +0 -30
- package/src/services/assets/asset-processing-service/grouped-content-bundles.js +0 -65
- package/src/services/assets/asset-processing-service/index.d.ts +0 -6
- package/src/services/assets/asset-processing-service/index.js +0 -6
- package/src/services/assets/asset-processing-service/page-package.d.ts +0 -6
- package/src/services/assets/asset-processing-service/page-package.js +0 -80
- package/src/services/assets/asset-processing-service/processor.interface.js +0 -6
- package/src/services/assets/asset-processing-service/processor.registry.d.ts +0 -8
- package/src/services/assets/asset-processing-service/processor.registry.js +0 -15
- package/src/services/assets/asset-processing-service/processors/base/base-processor.d.ts +0 -24
- package/src/services/assets/asset-processing-service/processors/base/base-processor.js +0 -65
- package/src/services/assets/asset-processing-service/processors/base/base-script-processor.d.ts +0 -22
- package/src/services/assets/asset-processing-service/processors/base/base-script-processor.js +0 -136
- package/src/services/assets/asset-processing-service/processors/index.d.ts +0 -5
- package/src/services/assets/asset-processing-service/processors/index.js +0 -5
- package/src/services/assets/asset-processing-service/processors/script/content-script.processor.d.ts +0 -6
- package/src/services/assets/asset-processing-service/processors/script/content-script.processor.js +0 -120
- package/src/services/assets/asset-processing-service/processors/script/file-script.processor.d.ts +0 -9
- package/src/services/assets/asset-processing-service/processors/script/file-script.processor.js +0 -97
- package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.d.ts +0 -42
- package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.js +0 -126
- package/src/services/assets/asset-processing-service/processors/stylesheet/content-stylesheet.processor.d.ts +0 -8
- package/src/services/assets/asset-processing-service/processors/stylesheet/content-stylesheet.processor.js +0 -59
- package/src/services/assets/asset-processing-service/processors/stylesheet/file-stylesheet.processor.d.ts +0 -9
- package/src/services/assets/asset-processing-service/processors/stylesheet/file-stylesheet.processor.js +0 -69
- package/src/services/assets/asset-processing-service/ungrouped-dependency-processing.d.ts +0 -18
- package/src/services/assets/asset-processing-service/ungrouped-dependency-processing.js +0 -45
- package/src/services/assets/browser-bundle.service.d.ts +0 -73
- package/src/services/assets/browser-bundle.service.js +0 -41
- package/src/services/cache/cache.types.d.ts +0 -107
- package/src/services/cache/cache.types.js +0 -0
- package/src/services/cache/index.d.ts +0 -7
- package/src/services/cache/index.js +0 -7
- package/src/services/cache/memory-cache-store.d.ts +0 -42
- package/src/services/cache/memory-cache-store.js +0 -98
- package/src/services/cache/page-cache-service.d.ts +0 -70
- package/src/services/cache/page-cache-service.js +0 -152
- package/src/services/cache/page-request-cache-coordinator.service.d.ts +0 -75
- package/src/services/cache/page-request-cache-coordinator.service.js +0 -109
- package/src/services/html/html-rewriter-provider.service.d.ts +0 -40
- package/src/services/html/html-rewriter-provider.service.js +0 -68
- package/src/services/html/html-transformer.service.d.ts +0 -96
- package/src/services/html/html-transformer.service.js +0 -287
- package/src/services/invalidation/development-invalidation.service.d.ts +0 -74
- package/src/services/invalidation/development-invalidation.service.js +0 -190
- package/src/services/module-loading/app-module-loader.service.d.ts +0 -7
- package/src/services/module-loading/app-module-loader.service.js +0 -0
- package/src/services/module-loading/app-server-module-transpiler.service.d.ts +0 -24
- package/src/services/module-loading/app-server-module-transpiler.service.js +0 -151
- package/src/services/module-loading/host-module-loader-registry.d.ts +0 -4
- package/src/services/module-loading/host-module-loader-registry.js +0 -15
- package/src/services/module-loading/module-loading-types.js +0 -0
- package/src/services/module-loading/node-bootstrap-plugin.d.ts +0 -38
- package/src/services/module-loading/node-bootstrap-plugin.js +0 -215
- package/src/services/module-loading/page-module-import.service.d.ts +0 -95
- package/src/services/module-loading/page-module-import.service.js +0 -191
- package/src/services/module-loading/server-module-transpiler.service.d.ts +0 -63
- package/src/services/module-loading/server-module-transpiler.service.js +0 -64
- package/src/services/module-loading/source-module-support.d.ts +0 -5
- package/src/services/module-loading/source-module-support.js +0 -8
- package/src/services/runtime-state/dev-graph.service.d.ts +0 -118
- package/src/services/runtime-state/dev-graph.service.js +0 -162
- package/src/services/runtime-state/entrypoint-dependency-graph.service.d.ts +0 -41
- package/src/services/runtime-state/entrypoint-dependency-graph.service.js +0 -85
- package/src/services/runtime-state/server-invalidation-state.service.d.ts +0 -26
- package/src/services/runtime-state/server-invalidation-state.service.js +0 -35
- package/src/services/validation/schema-validation-service.d.ts +0 -122
- package/src/services/validation/schema-validation-service.js +0 -101
- package/src/services/validation/standard-schema.types.js +0 -0
- package/src/static-site-generator/static-site-generator.d.ts +0 -104
- package/src/static-site-generator/static-site-generator.js +0 -316
- package/src/types/internal-types.d.ts +0 -232
- package/src/types/internal-types.js +0 -0
- package/src/types/public-types.d.ts +0 -1307
- package/src/types/public-types.js +0 -0
- package/src/utils/deep-merge.d.ts +0 -14
- package/src/utils/deep-merge.js +0 -32
- package/src/utils/hash.d.ts +0 -1
- package/src/utils/hash.js +0 -7
- package/src/utils/html-escaping.d.ts +0 -7
- package/src/utils/html-escaping.js +0 -6
- package/src/utils/html.js +0 -4
- package/src/utils/invariant.d.ts +0 -5
- package/src/utils/invariant.js +0 -11
- package/src/utils/locals-utils.d.ts +0 -15
- package/src/utils/locals-utils.js +0 -24
- package/src/utils/parse-cli-args.d.ts +0 -27
- package/src/utils/parse-cli-args.js +0 -62
- package/src/utils/path-utils.module.d.ts +0 -5
- package/src/utils/path-utils.module.js +0 -14
- package/src/utils/resolve-work-dir.d.ts +0 -11
- package/src/utils/resolve-work-dir.js +0 -31
- package/src/utils/runtime.d.ts +0 -11
- package/src/utils/runtime.js +0 -40
- package/src/utils/server-utils.module.d.ts +0 -19
- package/src/utils/server-utils.module.js +0 -56
- package/src/watchers/project-watcher.d.ts +0 -136
- package/src/watchers/project-watcher.js +0 -275
- package/src/watchers/project-watcher.test-helpers.d.ts +0 -4
- package/src/watchers/project-watcher.test-helpers.js +0 -52
- /package/src/utils/{html.d.ts → html.ts} +0 -0
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
2
|
+
import { createRenderContext } from './render-context.ts';
|
|
3
|
+
import type { IntegrationPlugin } from '../../plugins/integration-plugin.ts';
|
|
4
|
+
import type { IntegrationRenderer } from '../../route-renderer/orchestration/integration-renderer.ts';
|
|
5
|
+
import type { EcoFunctionComponent } from '../../types/public-types.ts';
|
|
6
|
+
|
|
7
|
+
describe('createRenderContext', () => {
|
|
8
|
+
const RenderToResponse = vi.fn(() => Promise.resolve(new Response('rendered')));
|
|
9
|
+
const rendererModules = {
|
|
10
|
+
integrationManifestModuleId: 'virtual:ecopages/integration-manifest.ts',
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
const Renderer = {
|
|
14
|
+
name: '-renderer',
|
|
15
|
+
renderToResponse: RenderToResponse,
|
|
16
|
+
} as unknown as IntegrationRenderer;
|
|
17
|
+
|
|
18
|
+
const ExplicitRenderer = {
|
|
19
|
+
name: 'explicit-renderer',
|
|
20
|
+
renderToResponse: RenderToResponse,
|
|
21
|
+
} as unknown as IntegrationRenderer;
|
|
22
|
+
|
|
23
|
+
const InitializeRenderer = vi.fn(() => Renderer);
|
|
24
|
+
|
|
25
|
+
const Plugin = {
|
|
26
|
+
name: '-integration',
|
|
27
|
+
initializeRenderer: InitializeRenderer,
|
|
28
|
+
} as unknown as IntegrationPlugin;
|
|
29
|
+
|
|
30
|
+
const ExplicitInitializeRenderer = vi.fn(() => ExplicitRenderer);
|
|
31
|
+
|
|
32
|
+
const ExplicitPlugin = {
|
|
33
|
+
name: 'explicit-renderer',
|
|
34
|
+
initializeRenderer: ExplicitInitializeRenderer,
|
|
35
|
+
} as unknown as IntegrationPlugin;
|
|
36
|
+
|
|
37
|
+
const ViewFn = ((props: { foo: string }) => `<div>${props.foo}</div>`) as EcoFunctionComponent<
|
|
38
|
+
{ foo: string },
|
|
39
|
+
string
|
|
40
|
+
>;
|
|
41
|
+
ViewFn.config = {
|
|
42
|
+
__eco: {
|
|
43
|
+
id: 'test',
|
|
44
|
+
file: '/some/dir/-view.ts',
|
|
45
|
+
integration: '-integration',
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
const renderContext = createRenderContext({
|
|
50
|
+
integrations: [Plugin, ExplicitPlugin],
|
|
51
|
+
rendererModules,
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it('should create a render context with methods', () => {
|
|
55
|
+
expect(renderContext.importServerModule).toBeDefined();
|
|
56
|
+
expect(renderContext.renderServerModule).toBeDefined();
|
|
57
|
+
expect(renderContext.render).toBeDefined();
|
|
58
|
+
expect(renderContext.renderPartial).toBeDefined();
|
|
59
|
+
expect(renderContext.json).toBeDefined();
|
|
60
|
+
expect(renderContext.html).toBeDefined();
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('should delegate importServerModule to the active render-context loader', async () => {
|
|
64
|
+
const ImportServerModule = vi.fn(async (filePath: string) => ({ filePath }));
|
|
65
|
+
const delegatedContext = createRenderContext({
|
|
66
|
+
integrations: [Plugin, ExplicitPlugin],
|
|
67
|
+
rendererModules,
|
|
68
|
+
importServerModule: ImportServerModule,
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
const result = await delegatedContext.importServerModule('/tmp/view.kita.tsx');
|
|
72
|
+
|
|
73
|
+
expect(ImportServerModule).toHaveBeenCalledWith('/tmp/view.kita.tsx');
|
|
74
|
+
expect(result).toEqual({ filePath: '/tmp/view.kita.tsx' });
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('should accept file URLs for importServerModule', async () => {
|
|
78
|
+
const ImportServerModule = vi.fn(async (filePath: string) => ({ filePath }));
|
|
79
|
+
const delegatedContext = createRenderContext({
|
|
80
|
+
integrations: [Plugin, ExplicitPlugin],
|
|
81
|
+
rendererModules,
|
|
82
|
+
importServerModule: ImportServerModule,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
const result = await delegatedContext.importServerModule(new URL('file:///tmp/view.kita.tsx'));
|
|
86
|
+
|
|
87
|
+
expect(ImportServerModule).toHaveBeenCalledWith('/tmp/view.kita.tsx');
|
|
88
|
+
expect(result).toEqual({ filePath: '/tmp/view.kita.tsx' });
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
it('should import and render a default-exported server view in one call', async () => {
|
|
92
|
+
RenderToResponse.mockClear();
|
|
93
|
+
const importedView = (() => '<div></div>') as EcoFunctionComponent<{ slug: string }, string>;
|
|
94
|
+
importedView.config = {
|
|
95
|
+
__eco: {
|
|
96
|
+
id: 'imported-view',
|
|
97
|
+
file: '/tmp/imported-view.kita.tsx',
|
|
98
|
+
integration: '-integration',
|
|
99
|
+
},
|
|
100
|
+
};
|
|
101
|
+
|
|
102
|
+
const ImportServerModule = vi.fn(async (_filePath: string) => ({ default: importedView }));
|
|
103
|
+
const delegatedContext = createRenderContext({
|
|
104
|
+
integrations: [Plugin, ExplicitPlugin],
|
|
105
|
+
rendererModules,
|
|
106
|
+
importServerModule: ImportServerModule,
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
await delegatedContext.renderServerModule('/tmp/view.kita.tsx', { slug: 'release' });
|
|
110
|
+
|
|
111
|
+
expect(ImportServerModule).toHaveBeenCalledWith('/tmp/view.kita.tsx');
|
|
112
|
+
expect(RenderToResponse).toHaveBeenCalledWith(
|
|
113
|
+
importedView,
|
|
114
|
+
{ slug: 'release' },
|
|
115
|
+
{
|
|
116
|
+
partial: false,
|
|
117
|
+
status: undefined,
|
|
118
|
+
headers: undefined,
|
|
119
|
+
},
|
|
120
|
+
);
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
it('should accept file URLs for renderServerModule', async () => {
|
|
124
|
+
RenderToResponse.mockClear();
|
|
125
|
+
const importedView = (() => '<div></div>') as EcoFunctionComponent<{ slug: string }, string>;
|
|
126
|
+
importedView.config = {
|
|
127
|
+
__eco: {
|
|
128
|
+
id: 'imported-view-url',
|
|
129
|
+
file: '/tmp/imported-view-url.kita.tsx',
|
|
130
|
+
integration: '-integration',
|
|
131
|
+
},
|
|
132
|
+
};
|
|
133
|
+
|
|
134
|
+
const ImportServerModule = vi.fn(async (_filePath: string) => ({ default: importedView }));
|
|
135
|
+
const delegatedContext = createRenderContext({
|
|
136
|
+
integrations: [Plugin, ExplicitPlugin],
|
|
137
|
+
rendererModules,
|
|
138
|
+
importServerModule: ImportServerModule,
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
await delegatedContext.renderServerModule(new URL('file:///tmp/view.kita.tsx'), { slug: 'release' });
|
|
142
|
+
|
|
143
|
+
expect(ImportServerModule).toHaveBeenCalledWith('/tmp/view.kita.tsx');
|
|
144
|
+
expect(RenderToResponse).toHaveBeenCalledWith(
|
|
145
|
+
importedView,
|
|
146
|
+
{ slug: 'release' },
|
|
147
|
+
{
|
|
148
|
+
partial: false,
|
|
149
|
+
status: undefined,
|
|
150
|
+
headers: undefined,
|
|
151
|
+
},
|
|
152
|
+
);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
describe('render', () => {
|
|
156
|
+
it('should call renderer.renderToResponse with partial: false', async () => {
|
|
157
|
+
RenderToResponse.mockClear();
|
|
158
|
+
InitializeRenderer.mockClear();
|
|
159
|
+
ExplicitInitializeRenderer.mockClear();
|
|
160
|
+
const props = { foo: 'bar' };
|
|
161
|
+
const options = { status: 201, headers: { 'X-Custom': '1' } };
|
|
162
|
+
|
|
163
|
+
const response = await renderContext.render(ViewFn, props, options);
|
|
164
|
+
|
|
165
|
+
expect(InitializeRenderer).toHaveBeenCalledWith({ rendererModules });
|
|
166
|
+
expect(RenderToResponse).toHaveBeenCalledWith(ViewFn, props, {
|
|
167
|
+
partial: false,
|
|
168
|
+
status: 201,
|
|
169
|
+
headers: { 'X-Custom': '1' },
|
|
170
|
+
});
|
|
171
|
+
expect(response instanceof Response).toBe(true);
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it('should throw if view integration is unknown', async () => {
|
|
175
|
+
const badViewFn = (() => '<div></div>') as EcoFunctionComponent<{}, string>;
|
|
176
|
+
badViewFn.config = { __eco: { id: 'test', file: '/bad-view.ts', integration: 'unknown' } };
|
|
177
|
+
await expect(renderContext.render(badViewFn, {})).rejects.toThrow('No integration found for: unknown');
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
it('should throw if view integration is missing', async () => {
|
|
181
|
+
const badViewFn = (() => '<div></div>') as EcoFunctionComponent<{}, string>;
|
|
182
|
+
badViewFn.config = { __eco: undefined };
|
|
183
|
+
await expect(renderContext.render(badViewFn, {})).rejects.toThrow('Cannot determine integration for view');
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
it('should prefer explicit config.integration over injected metadata', async () => {
|
|
187
|
+
RenderToResponse.mockClear();
|
|
188
|
+
InitializeRenderer.mockClear();
|
|
189
|
+
ExplicitInitializeRenderer.mockClear();
|
|
190
|
+
|
|
191
|
+
const explicitViewFn = (() => '<div></div>') as EcoFunctionComponent<{}, string>;
|
|
192
|
+
explicitViewFn.config = {
|
|
193
|
+
integration: 'explicit-renderer',
|
|
194
|
+
__eco: { id: 'test', file: '/some/file.tsx', integration: '-integration' },
|
|
195
|
+
};
|
|
196
|
+
|
|
197
|
+
await renderContext.render(explicitViewFn, {});
|
|
198
|
+
|
|
199
|
+
expect(ExplicitInitializeRenderer).toHaveBeenCalled();
|
|
200
|
+
expect(InitializeRenderer).not.toHaveBeenCalled();
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
describe('renderPartial', () => {
|
|
205
|
+
it('should call renderer.renderToResponse with partial: true', async () => {
|
|
206
|
+
RenderToResponse.mockClear();
|
|
207
|
+
const props = { foo: 'bar' };
|
|
208
|
+
const options = { status: 200 };
|
|
209
|
+
|
|
210
|
+
await renderContext.renderPartial(ViewFn, props, options);
|
|
211
|
+
|
|
212
|
+
expect(InitializeRenderer).toHaveBeenCalled();
|
|
213
|
+
expect(RenderToResponse).toHaveBeenCalledWith(ViewFn, props, {
|
|
214
|
+
partial: true,
|
|
215
|
+
status: 200,
|
|
216
|
+
headers: undefined,
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
});
|
|
220
|
+
|
|
221
|
+
describe('json', () => {
|
|
222
|
+
it('should return a JSON response', async () => {
|
|
223
|
+
const data = { hello: 'world' };
|
|
224
|
+
const response = renderContext.json(data);
|
|
225
|
+
expect(response.headers.get('Content-Type')).toContain('application/json');
|
|
226
|
+
expect(await response.json()).toEqual(data);
|
|
227
|
+
});
|
|
228
|
+
|
|
229
|
+
it('should support custom status and headers', async () => {
|
|
230
|
+
const response = renderContext.json({}, { status: 201, headers: { 'X-Test': 'true' } });
|
|
231
|
+
expect(response.status).toBe(201);
|
|
232
|
+
expect(response.headers.get('X-Test')).toBe('true');
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
describe('html', () => {
|
|
237
|
+
it('should return an HTML response', async () => {
|
|
238
|
+
const html = '<div>hello</div>';
|
|
239
|
+
const response = renderContext.html(html);
|
|
240
|
+
expect(response.headers.get('Content-Type')).toContain('text/html');
|
|
241
|
+
expect(await response.text()).toBe(html);
|
|
242
|
+
});
|
|
243
|
+
});
|
|
244
|
+
});
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { fileURLToPath } from 'node:url';
|
|
2
|
+
import type {
|
|
3
|
+
EcoComponent,
|
|
4
|
+
EcoPageComponent,
|
|
5
|
+
RenderContext,
|
|
6
|
+
RenderOptions,
|
|
7
|
+
ResponseOptions,
|
|
8
|
+
} from '../../types/public-types.ts';
|
|
9
|
+
import type {
|
|
10
|
+
IntegrationRenderer,
|
|
11
|
+
RenderToResponseContext,
|
|
12
|
+
} from '../../route-renderer/orchestration/integration-renderer.ts';
|
|
13
|
+
import type { AnyIntegrationPlugin } from '../../plugins/integration-plugin.ts';
|
|
14
|
+
import { invariant } from '../../utils/invariant.ts';
|
|
15
|
+
|
|
16
|
+
export interface CreateRenderContextOptions {
|
|
17
|
+
integrations: AnyIntegrationPlugin[];
|
|
18
|
+
rendererModules?: unknown;
|
|
19
|
+
importServerModule?: (filePath: string) => Promise<unknown>;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function resolveServerModulePath(filePath: string | URL): string {
|
|
23
|
+
return filePath instanceof URL ? fileURLToPath(filePath) : filePath;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Merges request locals into component props as a dedicated 'locals' property.
|
|
28
|
+
* This prevents naming conflicts and maintains type safety by keeping locals
|
|
29
|
+
* separate from other props.
|
|
30
|
+
*
|
|
31
|
+
* @param props - The original component props
|
|
32
|
+
* @param locals - Optional request-scoped locals from middleware
|
|
33
|
+
* @returns Props with locals merged in, or original props if no locals provided
|
|
34
|
+
*/
|
|
35
|
+
function mergePropsWithLocals<P>(props: P, locals: Record<string, unknown> | undefined): P {
|
|
36
|
+
if (!locals || typeof props !== 'object' || props === null) {
|
|
37
|
+
return props;
|
|
38
|
+
}
|
|
39
|
+
return { ...(props as Record<string, unknown>), locals } as P;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Creates a render context for route handlers.
|
|
44
|
+
* Provides render(), renderPartial(), json(), and html() methods that can be used
|
|
45
|
+
* within route handlers to generate responses.
|
|
46
|
+
*
|
|
47
|
+
* @param options - Configuration options including available integrations
|
|
48
|
+
* @returns A RenderContext object with methods for rendering views and creating responses
|
|
49
|
+
*/
|
|
50
|
+
export function createRenderContext(options: CreateRenderContextOptions): RenderContext {
|
|
51
|
+
const { integrations } = options;
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Resolves the appropriate renderer for a given view component based on its integration.
|
|
55
|
+
* Throws an error if the integration cannot be determined or is not found.
|
|
56
|
+
*/
|
|
57
|
+
const getRendererForView = <P>(view: EcoComponent<P>): IntegrationRenderer => {
|
|
58
|
+
const integrationName = view.config?.integration ?? view.config?.__eco?.integration;
|
|
59
|
+
invariant(
|
|
60
|
+
!!integrationName,
|
|
61
|
+
'Cannot determine integration for view. Set view.config.integration explicitly or ensure the view is defined with eco.page() in a file with a recognized extension.',
|
|
62
|
+
);
|
|
63
|
+
|
|
64
|
+
const integration = integrations.find((i) => i.name === integrationName);
|
|
65
|
+
invariant(!!integration, `No integration found for: ${integrationName}`);
|
|
66
|
+
|
|
67
|
+
return integration.initializeRenderer({
|
|
68
|
+
rendererModules: options.rendererModules,
|
|
69
|
+
}) as IntegrationRenderer;
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
const renderContext: RenderContext = {
|
|
73
|
+
importServerModule: async <T = unknown>(filePath: string | URL) => {
|
|
74
|
+
invariant(!!options.importServerModule, 'Server module importing is not available in this render context.');
|
|
75
|
+
return (await options.importServerModule(resolveServerModulePath(filePath))) as T;
|
|
76
|
+
},
|
|
77
|
+
|
|
78
|
+
async renderServerModule<P = Record<string, unknown>>(
|
|
79
|
+
this: { locals?: Record<string, unknown> } | undefined,
|
|
80
|
+
filePath: string | URL,
|
|
81
|
+
props?: P,
|
|
82
|
+
renderOptions?: RenderOptions,
|
|
83
|
+
): Promise<Response> {
|
|
84
|
+
const module = await renderContext.importServerModule<{ default: EcoPageComponent<P> }>(filePath);
|
|
85
|
+
const view = module.default as EcoComponent<P>;
|
|
86
|
+
const locals = (this as { locals?: Record<string, unknown> } | undefined)?.locals;
|
|
87
|
+
const mergedProps = mergePropsWithLocals<P>(props ?? ({} as P), locals);
|
|
88
|
+
|
|
89
|
+
const renderer = getRendererForView(view);
|
|
90
|
+
const ctx: RenderToResponseContext = {
|
|
91
|
+
partial: false,
|
|
92
|
+
status: renderOptions?.status,
|
|
93
|
+
headers: renderOptions?.headers,
|
|
94
|
+
};
|
|
95
|
+
|
|
96
|
+
return await renderer.renderToResponse(view, mergedProps, ctx);
|
|
97
|
+
},
|
|
98
|
+
|
|
99
|
+
async render<P>(
|
|
100
|
+
this: { locals?: Record<string, unknown> } | undefined,
|
|
101
|
+
view: EcoComponent<P>,
|
|
102
|
+
props?: P,
|
|
103
|
+
renderOptions?: RenderOptions,
|
|
104
|
+
): Promise<Response> {
|
|
105
|
+
const locals = (this as { locals?: Record<string, unknown> } | undefined)?.locals;
|
|
106
|
+
const mergedProps = mergePropsWithLocals<P>(props ?? ({} as P), locals);
|
|
107
|
+
|
|
108
|
+
const renderer = getRendererForView(view);
|
|
109
|
+
const ctx: RenderToResponseContext = {
|
|
110
|
+
partial: false,
|
|
111
|
+
status: renderOptions?.status,
|
|
112
|
+
headers: renderOptions?.headers,
|
|
113
|
+
};
|
|
114
|
+
return renderer.renderToResponse(view, mergedProps, ctx);
|
|
115
|
+
},
|
|
116
|
+
|
|
117
|
+
async renderPartial<P>(
|
|
118
|
+
this: { locals?: Record<string, unknown> } | undefined,
|
|
119
|
+
view: EcoComponent<P>,
|
|
120
|
+
props: P,
|
|
121
|
+
renderOptions?: RenderOptions,
|
|
122
|
+
): Promise<Response> {
|
|
123
|
+
const locals = (this as { locals?: Record<string, unknown> } | undefined)?.locals;
|
|
124
|
+
const mergedProps = mergePropsWithLocals<P>(props, locals);
|
|
125
|
+
|
|
126
|
+
const renderer = getRendererForView(view);
|
|
127
|
+
const ctx: RenderToResponseContext = {
|
|
128
|
+
partial: true,
|
|
129
|
+
status: renderOptions?.status,
|
|
130
|
+
headers: renderOptions?.headers,
|
|
131
|
+
};
|
|
132
|
+
return renderer.renderToResponse(view, mergedProps, ctx);
|
|
133
|
+
},
|
|
134
|
+
|
|
135
|
+
json(data: unknown, responseOptions?: ResponseOptions): Response {
|
|
136
|
+
const headers = new Headers({ 'Content-Type': 'application/json; charset=utf-8' });
|
|
137
|
+
if (responseOptions?.headers) {
|
|
138
|
+
const incomingHeaders = new Headers(responseOptions.headers);
|
|
139
|
+
incomingHeaders.forEach((value, key) => headers.set(key, value));
|
|
140
|
+
}
|
|
141
|
+
return new Response(JSON.stringify(data), {
|
|
142
|
+
status: responseOptions?.status ?? 200,
|
|
143
|
+
headers,
|
|
144
|
+
});
|
|
145
|
+
},
|
|
146
|
+
|
|
147
|
+
html(content: string, responseOptions?: ResponseOptions): Response {
|
|
148
|
+
const headers = new Headers({ 'Content-Type': 'text/html; charset=utf-8' });
|
|
149
|
+
if (responseOptions?.headers) {
|
|
150
|
+
const incomingHeaders = new Headers(responseOptions.headers);
|
|
151
|
+
incomingHeaders.forEach((value, key) => headers.set(key, value));
|
|
152
|
+
}
|
|
153
|
+
return new Response(content, {
|
|
154
|
+
status: responseOptions?.status ?? 200,
|
|
155
|
+
headers,
|
|
156
|
+
});
|
|
157
|
+
},
|
|
158
|
+
};
|
|
159
|
+
|
|
160
|
+
return renderContext;
|
|
161
|
+
}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { describe, it } from 'vitest';
|
|
3
|
+
import { resolveRuntimeBinding, resolveServeRuntimeOrigin, resolveStaticRuntimeMode } from './runtime-app-bootstrap.ts';
|
|
4
|
+
|
|
5
|
+
describe('resolveServeRuntimeOrigin', () => {
|
|
6
|
+
it('normalizes hostname and port into an origin string', () => {
|
|
7
|
+
assert.equal(
|
|
8
|
+
resolveServeRuntimeOrigin({
|
|
9
|
+
hostname: '127.0.0.1',
|
|
10
|
+
port: '4567',
|
|
11
|
+
}),
|
|
12
|
+
'http://127.0.0.1:4567',
|
|
13
|
+
);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it('wraps bare IPv6 hostnames so the origin stays valid', () => {
|
|
17
|
+
assert.equal(
|
|
18
|
+
resolveServeRuntimeOrigin({
|
|
19
|
+
hostname: '::1',
|
|
20
|
+
port: 4567,
|
|
21
|
+
}),
|
|
22
|
+
'http://[::1]:4567',
|
|
23
|
+
);
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
describe('runtime app bootstrap', () => {
|
|
28
|
+
it('prefers CLI binding values over environment values', () => {
|
|
29
|
+
const binding = resolveRuntimeBinding({
|
|
30
|
+
cliArgs: {
|
|
31
|
+
preview: false,
|
|
32
|
+
build: false,
|
|
33
|
+
start: false,
|
|
34
|
+
dev: true,
|
|
35
|
+
port: 4321,
|
|
36
|
+
hostname: '127.0.0.1',
|
|
37
|
+
reactFastRefresh: undefined,
|
|
38
|
+
},
|
|
39
|
+
serverOptions: {
|
|
40
|
+
custom: true,
|
|
41
|
+
},
|
|
42
|
+
env: {
|
|
43
|
+
ECOPAGES_PORT: '9999',
|
|
44
|
+
ECOPAGES_HOSTNAME: 'env-host',
|
|
45
|
+
} as NodeJS.ProcessEnv,
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
assert.equal(binding.preferredPort, 4321);
|
|
49
|
+
assert.equal(binding.preferredHostname, '127.0.0.1');
|
|
50
|
+
assert.equal(binding.runtimeOrigin, 'http://127.0.0.1:4321');
|
|
51
|
+
assert.deepEqual(binding.serveOptions, {
|
|
52
|
+
port: 4321,
|
|
53
|
+
hostname: '127.0.0.1',
|
|
54
|
+
custom: true,
|
|
55
|
+
});
|
|
56
|
+
assert.equal(binding.watch, true);
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it('skips the runtime server only when build or preview does not require fetch', () => {
|
|
60
|
+
const withoutFetchRuntime = resolveStaticRuntimeMode({
|
|
61
|
+
appConfig: {
|
|
62
|
+
integrations: [{ staticBuildStep: 'render' }],
|
|
63
|
+
} as any,
|
|
64
|
+
cliArgs: {
|
|
65
|
+
preview: true,
|
|
66
|
+
build: false,
|
|
67
|
+
start: false,
|
|
68
|
+
dev: false,
|
|
69
|
+
port: undefined,
|
|
70
|
+
hostname: undefined,
|
|
71
|
+
reactFastRefresh: undefined,
|
|
72
|
+
},
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
assert.equal(withoutFetchRuntime.requiresFetchRuntime, false);
|
|
76
|
+
assert.equal(withoutFetchRuntime.canBuildWithoutRuntimeServer, true);
|
|
77
|
+
|
|
78
|
+
const withFetchRuntime = resolveStaticRuntimeMode({
|
|
79
|
+
appConfig: {
|
|
80
|
+
integrations: [{ staticBuildStep: 'fetch' }],
|
|
81
|
+
} as any,
|
|
82
|
+
cliArgs: {
|
|
83
|
+
preview: false,
|
|
84
|
+
build: true,
|
|
85
|
+
start: false,
|
|
86
|
+
dev: false,
|
|
87
|
+
port: undefined,
|
|
88
|
+
hostname: undefined,
|
|
89
|
+
reactFastRefresh: undefined,
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
assert.equal(withFetchRuntime.requiresFetchRuntime, true);
|
|
94
|
+
assert.equal(withFetchRuntime.canBuildWithoutRuntimeServer, false);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from '../../config/constants.ts';
|
|
2
|
+
import type { ReturnParseCliArgs } from '../../utils/parse-cli-args.ts';
|
|
3
|
+
import type { EcoPagesAppConfig } from '../../types/internal-types.ts';
|
|
4
|
+
|
|
5
|
+
export type RuntimeBinding = {
|
|
6
|
+
preferredPort: number;
|
|
7
|
+
preferredHostname: string;
|
|
8
|
+
runtimeOrigin: string;
|
|
9
|
+
serveOptions: Record<string, unknown>;
|
|
10
|
+
watch: boolean;
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
export type StaticRuntimeMode = {
|
|
14
|
+
requiresFetchRuntime: boolean;
|
|
15
|
+
canBuildWithoutRuntimeServer: boolean;
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
function normalizeOriginHostname(hostname: string): string {
|
|
19
|
+
if (hostname.includes(':') && !hostname.startsWith('[') && !hostname.endsWith(']')) {
|
|
20
|
+
return `[${hostname}]`;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return hostname;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function resolveServeRuntimeOrigin(serveOptions: { hostname?: string; port?: number | string }): string {
|
|
27
|
+
const hostname = normalizeOriginHostname(String(serveOptions.hostname ?? DEFAULT_ECOPAGES_HOSTNAME));
|
|
28
|
+
const port = Number(serveOptions.port ?? DEFAULT_ECOPAGES_PORT);
|
|
29
|
+
|
|
30
|
+
return `http://${hostname}:${port}`;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export function resolveRuntimeBinding(options: {
|
|
34
|
+
cliArgs: ReturnParseCliArgs;
|
|
35
|
+
serverOptions?: Record<string, unknown>;
|
|
36
|
+
env?: NodeJS.ProcessEnv;
|
|
37
|
+
}): RuntimeBinding {
|
|
38
|
+
const env = options.env ?? process.env;
|
|
39
|
+
const preferredPort =
|
|
40
|
+
options.cliArgs.port ?? (env.ECOPAGES_PORT ? Number(env.ECOPAGES_PORT) : undefined) ?? DEFAULT_ECOPAGES_PORT;
|
|
41
|
+
const preferredHostname = options.cliArgs.hostname ?? env.ECOPAGES_HOSTNAME ?? DEFAULT_ECOPAGES_HOSTNAME;
|
|
42
|
+
|
|
43
|
+
return {
|
|
44
|
+
preferredPort,
|
|
45
|
+
preferredHostname,
|
|
46
|
+
runtimeOrigin: resolveServeRuntimeOrigin({
|
|
47
|
+
hostname: preferredHostname,
|
|
48
|
+
port: preferredPort,
|
|
49
|
+
}),
|
|
50
|
+
serveOptions: {
|
|
51
|
+
port: preferredPort,
|
|
52
|
+
hostname: preferredHostname,
|
|
53
|
+
...(options.serverOptions ?? {}),
|
|
54
|
+
},
|
|
55
|
+
watch: options.cliArgs.dev,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export function resolveStaticRuntimeMode(options: {
|
|
60
|
+
appConfig: EcoPagesAppConfig;
|
|
61
|
+
cliArgs: ReturnParseCliArgs;
|
|
62
|
+
}): StaticRuntimeMode {
|
|
63
|
+
const requiresFetchRuntime = options.appConfig.integrations.some(
|
|
64
|
+
(integration) => integration.staticBuildStep === 'fetch',
|
|
65
|
+
);
|
|
66
|
+
const canBuildWithoutRuntimeServer = (options.cliArgs.build || options.cliArgs.preview) && !requiresFetchRuntime;
|
|
67
|
+
|
|
68
|
+
return {
|
|
69
|
+
requiresFetchRuntime,
|
|
70
|
+
canBuildWithoutRuntimeServer,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface RuntimeHost<TServer, TServeOptions> {
|
|
2
|
+
start(options: RuntimeHostStartOptions<TServeOptions>): Promise<TServer>;
|
|
3
|
+
stop(server: TServer, options?: { force?: boolean }): Promise<void>;
|
|
4
|
+
getOrigin(server: TServer, fallbackServeOptions: TServeOptions): string;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export interface RuntimeHostStartOptions<TServeOptions> {
|
|
8
|
+
serveOptions: TServeOptions;
|
|
9
|
+
handleRequest(request: Request): Promise<Response>;
|
|
10
|
+
onError(error: Error): Promise<void> | void;
|
|
11
|
+
}
|