@soundscript/soundscript 0.1.13 → 0.1.15
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/package.json +15 -6
- package/project-transform/index.js +2 -0
- package/project-transform/index.ts +8 -0
- package/project-transform/src/annotation_syntax.js +948 -0
- package/project-transform/src/annotation_syntax.ts +1217 -0
- package/project-transform/src/build_package.js +475 -0
- package/project-transform/src/build_package.ts +683 -0
- package/project-transform/src/bundled/portable-web-globals.d.ts +153 -0
- package/project-transform/src/bundled/runtime_externs.js +220 -0
- package/project-transform/src/bundled/runtime_externs.ts +237 -0
- package/project-transform/src/bundled/sound-libs/lib.decorators.d.ts +385 -0
- package/project-transform/src/bundled/sound-libs/lib.decorators.legacy.d.ts +22 -0
- package/project-transform/src/bundled/sound-libs/lib.dom.asynciterable.d.ts +42 -0
- package/project-transform/src/bundled/sound-libs/lib.dom.d.ts +39440 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.collection.d.ts +149 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.core.d.ts +657 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.d.ts +28 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.generator.d.ts +77 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.iterable.d.ts +616 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.promise.d.ts +80 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.proxy.d.ts +128 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.reflect.d.ts +144 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.symbol.d.ts +46 -0
- package/project-transform/src/bundled/sound-libs/lib.es2015.symbol.wellknown.d.ts +170 -0
- package/project-transform/src/bundled/sound-libs/lib.es2016.array.include.d.ts +116 -0
- package/project-transform/src/bundled/sound-libs/lib.es2016.d.ts +21 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.arraybuffer.d.ts +21 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.d.ts +26 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.date.d.ts +31 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.object.d.ts +49 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.string.d.ts +45 -0
- package/project-transform/src/bundled/sound-libs/lib.es2017.typedarrays.d.ts +53 -0
- package/project-transform/src/bundled/sound-libs/lib.es2018.asyncgenerator.d.ts +77 -0
- package/project-transform/src/bundled/sound-libs/lib.es2018.asynciterable.d.ts +57 -0
- package/project-transform/src/bundled/sound-libs/lib.es2018.d.ts +24 -0
- package/project-transform/src/bundled/sound-libs/lib.es2018.promise.d.ts +30 -0
- package/project-transform/src/bundled/sound-libs/lib.es2018.regexp.d.ts +37 -0
- package/project-transform/src/bundled/sound-libs/lib.es2019.array.d.ts +79 -0
- package/project-transform/src/bundled/sound-libs/lib.es2019.d.ts +24 -0
- package/project-transform/src/bundled/sound-libs/lib.es2019.object.d.ts +47 -0
- package/project-transform/src/bundled/sound-libs/lib.es2019.string.d.ts +37 -0
- package/project-transform/src/bundled/sound-libs/lib.es2019.symbol.d.ts +24 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.bigint.d.ts +765 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.d.ts +27 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.date.d.ts +42 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.number.d.ts +28 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.promise.d.ts +49 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.string.d.ts +44 -0
- package/project-transform/src/bundled/sound-libs/lib.es2020.symbol.wellknown.d.ts +41 -0
- package/project-transform/src/bundled/sound-libs/lib.es2021.d.ts +23 -0
- package/project-transform/src/bundled/sound-libs/lib.es2021.promise.d.ts +48 -0
- package/project-transform/src/bundled/sound-libs/lib.es2021.string.d.ts +33 -0
- package/project-transform/src/bundled/sound-libs/lib.es2021.weakref.d.ts +78 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.array.d.ts +121 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.d.ts +25 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.error.d.ts +75 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.object.d.ts +26 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.regexp.d.ts +39 -0
- package/project-transform/src/bundled/sound-libs/lib.es2022.string.d.ts +25 -0
- package/project-transform/src/bundled/sound-libs/lib.es2023.array.d.ts +924 -0
- package/project-transform/src/bundled/sound-libs/lib.es2023.collection.d.ts +21 -0
- package/project-transform/src/bundled/sound-libs/lib.es2023.d.ts +22 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.arraybuffer.d.ts +65 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.collection.d.ts +29 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.d.ts +26 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.object.d.ts +33 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.promise.d.ts +35 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.regexp.d.ts +25 -0
- package/project-transform/src/bundled/sound-libs/lib.es2024.string.d.ts +29 -0
- package/project-transform/src/bundled/sound-libs/lib.es5.d.ts +4924 -0
- package/project-transform/src/bundled/sound_stdlib.js +142 -0
- package/project-transform/src/bundled/sound_stdlib.ts +180 -0
- package/project-transform/src/checker/analyze_project.js +1361 -0
- package/project-transform/src/checker/analyze_project.ts +2246 -0
- package/project-transform/src/checker/diagnostics.js +112 -0
- package/project-transform/src/checker/diagnostics.ts +222 -0
- package/project-transform/src/checker/engine/context.js +235 -0
- package/project-transform/src/checker/engine/context.ts +340 -0
- package/project-transform/src/checker/engine/diagnostic_codes.js +72 -0
- package/project-transform/src/checker/engine/diagnostic_codes.ts +95 -0
- package/project-transform/src/checker/engine/facts.js +35 -0
- package/project-transform/src/checker/engine/facts.ts +48 -0
- package/project-transform/src/checker/engine/types.js +1 -0
- package/project-transform/src/checker/engine/types.ts +485 -0
- package/project-transform/src/checker/proof_escape_hatch_diagnostics.js +104 -0
- package/project-transform/src/checker/proof_escape_hatch_diagnostics.ts +173 -0
- package/project-transform/src/checker/rules/async_surface.js +231 -0
- package/project-transform/src/checker/rules/async_surface.ts +335 -0
- package/project-transform/src/checker/rules/class_lifecycle.js +798 -0
- package/project-transform/src/checker/rules/class_lifecycle.ts +1276 -0
- package/project-transform/src/checker/rules/directive_validation.js +571 -0
- package/project-transform/src/checker/rules/directive_validation.ts +938 -0
- package/project-transform/src/checker/rules/directives.js +23 -0
- package/project-transform/src/checker/rules/directives.ts +25 -0
- package/project-transform/src/checker/rules/flow.js +202 -0
- package/project-transform/src/checker/rules/flow.ts +333 -0
- package/project-transform/src/checker/rules/flow_facts.js +601 -0
- package/project-transform/src/checker/rules/flow_facts.ts +978 -0
- package/project-transform/src/checker/rules/flow_invalidation.js +1119 -0
- package/project-transform/src/checker/rules/flow_invalidation.ts +2150 -0
- package/project-transform/src/checker/rules/flow_shared.js +2822 -0
- package/project-transform/src/checker/rules/flow_shared.ts +4383 -0
- package/project-transform/src/checker/rules/foreign_boundary.js +120 -0
- package/project-transform/src/checker/rules/foreign_boundary.ts +196 -0
- package/project-transform/src/checker/rules/foreign_projection.js +279 -0
- package/project-transform/src/checker/rules/foreign_projection.ts +425 -0
- package/project-transform/src/checker/rules/generated_helpers.js +13 -0
- package/project-transform/src/checker/rules/generated_helpers.ts +18 -0
- package/project-transform/src/checker/rules/index.js +35 -0
- package/project-transform/src/checker/rules/index.ts +49 -0
- package/project-transform/src/checker/rules/namespace_object.js +845 -0
- package/project-transform/src/checker/rules/namespace_object.ts +1224 -0
- package/project-transform/src/checker/rules/non_ordinary_recovery.js +1328 -0
- package/project-transform/src/checker/rules/non_ordinary_recovery.ts +2391 -0
- package/project-transform/src/checker/rules/null_prototype.js +3 -0
- package/project-transform/src/checker/rules/null_prototype.ts +6 -0
- package/project-transform/src/checker/rules/overloads.js +181 -0
- package/project-transform/src/checker/rules/overloads.ts +317 -0
- package/project-transform/src/checker/rules/predicate_verification.js +691 -0
- package/project-transform/src/checker/rules/predicate_verification.ts +1088 -0
- package/project-transform/src/checker/rules/prototype_hardening.js +237 -0
- package/project-transform/src/checker/rules/prototype_hardening.ts +343 -0
- package/project-transform/src/checker/rules/receiver_discipline.js +263 -0
- package/project-transform/src/checker/rules/receiver_discipline.ts +356 -0
- package/project-transform/src/checker/rules/relations.js +6861 -0
- package/project-transform/src/checker/rules/relations.ts +12158 -0
- package/project-transform/src/checker/rules/resolved_builtins.js +274 -0
- package/project-transform/src/checker/rules/resolved_builtins.ts +438 -0
- package/project-transform/src/checker/rules/trust.js +217 -0
- package/project-transform/src/checker/rules/trust.ts +301 -0
- package/project-transform/src/checker/rules/type_guards.js +173 -0
- package/project-transform/src/checker/rules/type_guards.ts +257 -0
- package/project-transform/src/checker/rules/universal.js +17 -0
- package/project-transform/src/checker/rules/universal.ts +22 -0
- package/project-transform/src/checker/rules/unsafe_value_origin.js +80 -0
- package/project-transform/src/checker/rules/unsafe_value_origin.ts +125 -0
- package/project-transform/src/checker/rules/unsound_imports.js +218 -0
- package/project-transform/src/checker/rules/unsound_imports.ts +301 -0
- package/project-transform/src/checker/rules/unsound_syntax.js +1695 -0
- package/project-transform/src/checker/rules/unsound_syntax.ts +2540 -0
- package/project-transform/src/checker/rules/value_types.js +206 -0
- package/project-transform/src/checker/rules/value_types.ts +407 -0
- package/project-transform/src/checker/timing.js +43 -0
- package/project-transform/src/checker/timing.ts +78 -0
- package/project-transform/src/checker/unsupported_feature_messages.js +337 -0
- package/project-transform/src/checker/unsupported_feature_messages.ts +531 -0
- package/project-transform/src/cli.js +892 -0
- package/project-transform/src/cli.ts +1476 -0
- package/project-transform/src/compiler/compile_project.js +319 -0
- package/project-transform/src/compiler/compile_project.ts +508 -0
- package/project-transform/src/compiler/errors.js +10 -0
- package/project-transform/src/compiler/errors.ts +29 -0
- package/project-transform/src/compiler/ir.js +1 -0
- package/project-transform/src/compiler/ir.ts +1526 -0
- package/project-transform/src/compiler/lower.js +30550 -0
- package/project-transform/src/compiler/lower.ts +43645 -0
- package/project-transform/src/compiler/lower_arrays.js +140 -0
- package/project-transform/src/compiler/lower_arrays.ts +190 -0
- package/project-transform/src/compiler/lower_strings.js +121 -0
- package/project-transform/src/compiler/lower_strings.ts +198 -0
- package/project-transform/src/compiler/lower_tagged.js +329 -0
- package/project-transform/src/compiler/lower_tagged.ts +427 -0
- package/project-transform/src/compiler/lower_views.js +171 -0
- package/project-transform/src/compiler/lower_views.ts +251 -0
- package/project-transform/src/compiler/object_keys.js +25 -0
- package/project-transform/src/compiler/object_keys.ts +35 -0
- package/project-transform/src/compiler/runtime_ir.js +30 -0
- package/project-transform/src/compiler/runtime_ir.ts +727 -0
- package/project-transform/src/compiler/tagged_boundary.js +18 -0
- package/project-transform/src/compiler/tagged_boundary.ts +37 -0
- package/project-transform/src/compiler/toolchain.js +170 -0
- package/project-transform/src/compiler/toolchain.ts +229 -0
- package/project-transform/src/compiler/unicode_case_data.js +2102 -0
- package/project-transform/src/compiler/unicode_case_data.ts +2112 -0
- package/project-transform/src/compiler/wasm_js_host_runtime.js +656 -0
- package/project-transform/src/compiler/wasm_js_host_runtime.ts +762 -0
- package/project-transform/src/compiler/wat_arrays.js +3132 -0
- package/project-transform/src/compiler/wat_arrays.ts +3768 -0
- package/project-transform/src/compiler/wat_emitter.js +17952 -0
- package/project-transform/src/compiler/wat_emitter.ts +22812 -0
- package/project-transform/src/compiler/wat_strings.js +129 -0
- package/project-transform/src/compiler/wat_strings.ts +187 -0
- package/project-transform/src/compiler/wat_tagged.js +548 -0
- package/project-transform/src/compiler/wat_tagged.ts +674 -0
- package/project-transform/src/compiler_generator_runner.js +153 -0
- package/project-transform/src/compiler_generator_runner.ts +171 -0
- package/project-transform/src/compiler_object_test_helpers.js +69 -0
- package/project-transform/src/compiler_object_test_helpers.ts +96 -0
- package/project-transform/src/compiler_promise_runner.js +2116 -0
- package/project-transform/src/compiler_promise_runner.ts +2184 -0
- package/project-transform/src/compiler_test_helpers.js +854 -0
- package/project-transform/src/compiler_test_helpers.ts +1087 -0
- package/project-transform/src/config.js +568 -0
- package/project-transform/src/config.ts +892 -0
- package/project-transform/src/diagnostic_metadata.js +67 -0
- package/project-transform/src/diagnostic_metadata.ts +99 -0
- package/project-transform/src/diagnostic_reference.js +1368 -0
- package/project-transform/src/diagnostic_reference.ts +1523 -0
- package/project-transform/src/editor_diagnostics_worker.js +176 -0
- package/project-transform/src/editor_diagnostics_worker.ts +250 -0
- package/project-transform/src/editor_projection.js +224 -0
- package/project-transform/src/editor_projection.ts +421 -0
- package/project-transform/src/frontend/builtin_expanded_program_test_cleanup.js +47 -0
- package/project-transform/src/frontend/builtin_expanded_program_test_cleanup.ts +72 -0
- package/project-transform/src/frontend/builtin_macro_support.js +842 -0
- package/project-transform/src/frontend/builtin_macro_support.ts +1386 -0
- package/project-transform/src/frontend/builtin_macros.js +409 -0
- package/project-transform/src/frontend/builtin_macros.ts +542 -0
- package/project-transform/src/frontend/component_poc_runtime.js +279 -0
- package/project-transform/src/frontend/component_poc_runtime.ts +372 -0
- package/project-transform/src/frontend/css_macro.js +148 -0
- package/project-transform/src/frontend/css_macro.ts +222 -0
- package/project-transform/src/frontend/derive_macros.js +2072 -0
- package/project-transform/src/frontend/derive_macros.ts +3188 -0
- package/project-transform/src/frontend/embedded_fragment_support.js +106 -0
- package/project-transform/src/frontend/embedded_fragment_support.ts +172 -0
- package/project-transform/src/frontend/error_normalization.js +403 -0
- package/project-transform/src/frontend/error_normalization.ts +832 -0
- package/project-transform/src/frontend/error_stdlib_support.js +1 -0
- package/project-transform/src/frontend/error_stdlib_support.ts +6 -0
- package/project-transform/src/frontend/expand_project.js +169 -0
- package/project-transform/src/frontend/expand_project.ts +248 -0
- package/project-transform/src/frontend/format_soundscript.js +297 -0
- package/project-transform/src/frontend/format_soundscript.ts +582 -0
- package/project-transform/src/frontend/graphql_macro.js +174 -0
- package/project-transform/src/frontend/graphql_macro.ts +253 -0
- package/project-transform/src/frontend/hash_context.js +83 -0
- package/project-transform/src/frontend/hash_context.ts +113 -0
- package/project-transform/src/frontend/hkt_macro.js +448 -0
- package/project-transform/src/frontend/hkt_macro.ts +897 -0
- package/project-transform/src/frontend/import_binding_usage.js +190 -0
- package/project-transform/src/frontend/import_binding_usage.ts +277 -0
- package/project-transform/src/frontend/macro_advanced_backend_adapter.js +58 -0
- package/project-transform/src/frontend/macro_advanced_backend_adapter.ts +123 -0
- package/project-transform/src/frontend/macro_advanced_context.js +826 -0
- package/project-transform/src/frontend/macro_advanced_context.ts +1102 -0
- package/project-transform/src/frontend/macro_advanced_output.js +21 -0
- package/project-transform/src/frontend/macro_advanced_output.ts +41 -0
- package/project-transform/src/frontend/macro_api.js +353 -0
- package/project-transform/src/frontend/macro_api.ts +1722 -0
- package/project-transform/src/frontend/macro_api_internal.js +35 -0
- package/project-transform/src/frontend/macro_api_internal.ts +80 -0
- package/project-transform/src/frontend/macro_api_module_support.js +39 -0
- package/project-transform/src/frontend/macro_api_module_support.ts +65 -0
- package/project-transform/src/frontend/macro_backend_adapter.js +272 -0
- package/project-transform/src/frontend/macro_backend_adapter.ts +420 -0
- package/project-transform/src/frontend/macro_context.js +816 -0
- package/project-transform/src/frontend/macro_context.ts +1105 -0
- package/project-transform/src/frontend/macro_debug.js +99 -0
- package/project-transform/src/frontend/macro_debug.ts +157 -0
- package/project-transform/src/frontend/macro_definition_support.js +28 -0
- package/project-transform/src/frontend/macro_definition_support.ts +73 -0
- package/project-transform/src/frontend/macro_errors.js +40 -0
- package/project-transform/src/frontend/macro_errors.ts +70 -0
- package/project-transform/src/frontend/macro_expander.js +919 -0
- package/project-transform/src/frontend/macro_expander.ts +1611 -0
- package/project-transform/src/frontend/macro_factory_support.js +176 -0
- package/project-transform/src/frontend/macro_factory_support.ts +263 -0
- package/project-transform/src/frontend/macro_host_ast_internal.js +64 -0
- package/project-transform/src/frontend/macro_host_ast_internal.ts +109 -0
- package/project-transform/src/frontend/macro_index.js +27 -0
- package/project-transform/src/frontend/macro_index.ts +50 -0
- package/project-transform/src/frontend/macro_loader.js +281 -0
- package/project-transform/src/frontend/macro_loader.ts +506 -0
- package/project-transform/src/frontend/macro_operand_semantics.js +838 -0
- package/project-transform/src/frontend/macro_operand_semantics.ts +1489 -0
- package/project-transform/src/frontend/macro_output.js +54 -0
- package/project-transform/src/frontend/macro_output.ts +123 -0
- package/project-transform/src/frontend/macro_parser.js +611 -0
- package/project-transform/src/frontend/macro_parser.ts +832 -0
- package/project-transform/src/frontend/macro_resolver.js +69 -0
- package/project-transform/src/frontend/macro_resolver.ts +125 -0
- package/project-transform/src/frontend/macro_rewrite.js +285 -0
- package/project-transform/src/frontend/macro_rewrite.ts +442 -0
- package/project-transform/src/frontend/macro_runtime_support.js +232 -0
- package/project-transform/src/frontend/macro_runtime_support.ts +324 -0
- package/project-transform/src/frontend/macro_scanner.js +393 -0
- package/project-transform/src/frontend/macro_scanner.ts +455 -0
- package/project-transform/src/frontend/macro_semantic_backend_adapter.js +87 -0
- package/project-transform/src/frontend/macro_semantic_backend_adapter.ts +166 -0
- package/project-transform/src/frontend/macro_semantic_context.js +5 -0
- package/project-transform/src/frontend/macro_semantic_context.ts +12 -0
- package/project-transform/src/frontend/macro_semantic_output.js +24 -0
- package/project-transform/src/frontend/macro_semantic_output.ts +47 -0
- package/project-transform/src/frontend/macro_semantic_types.js +1 -0
- package/project-transform/src/frontend/macro_semantic_types.ts +98 -0
- package/project-transform/src/frontend/macro_semantics.js +1172 -0
- package/project-transform/src/frontend/macro_semantics.ts +1502 -0
- package/project-transform/src/frontend/macro_site_kind_support.js +164 -0
- package/project-transform/src/frontend/macro_site_kind_support.ts +255 -0
- package/project-transform/src/frontend/macro_syntax_internal.js +1950 -0
- package/project-transform/src/frontend/macro_syntax_internal.ts +3338 -0
- package/project-transform/src/frontend/macro_templates.js +57 -0
- package/project-transform/src/frontend/macro_templates.ts +143 -0
- package/project-transform/src/frontend/macro_test_helpers.js +82 -0
- package/project-transform/src/frontend/macro_test_helpers.ts +136 -0
- package/project-transform/src/frontend/macro_types.js +1 -0
- package/project-transform/src/frontend/macro_types.ts +103 -0
- package/project-transform/src/frontend/macro_vm.js +39 -0
- package/project-transform/src/frontend/macro_vm.ts +113 -0
- package/project-transform/src/frontend/match_macro.js +885 -0
- package/project-transform/src/frontend/match_macro.ts +1220 -0
- package/project-transform/src/frontend/numeric_normalization.js +824 -0
- package/project-transform/src/frontend/numeric_normalization.ts +1380 -0
- package/project-transform/src/frontend/numeric_prelude.js +278 -0
- package/project-transform/src/frontend/numeric_prelude.ts +370 -0
- package/project-transform/src/frontend/project_frontend.js +2396 -0
- package/project-transform/src/frontend/project_frontend.ts +3776 -0
- package/project-transform/src/frontend/project_macro_support.js +1401 -0
- package/project-transform/src/frontend/project_macro_support.ts +2137 -0
- package/project-transform/src/frontend/sql_macro.js +175 -0
- package/project-transform/src/frontend/sql_macro.ts +254 -0
- package/project-transform/src/frontend/sql_stdlib_support.js +1 -0
- package/project-transform/src/frontend/sql_stdlib_support.ts +6 -0
- package/project-transform/src/frontend/std_package_support.js +228 -0
- package/project-transform/src/frontend/std_package_support.ts +400 -0
- package/project-transform/src/frontend/value_normalization.js +306 -0
- package/project-transform/src/frontend/value_normalization.ts +599 -0
- package/project-transform/src/lsp/project_service.js +4771 -0
- package/project-transform/src/lsp/project_service.ts +7580 -0
- package/project-transform/src/lsp/protocol.js +9 -0
- package/project-transform/src/lsp/protocol.ts +38 -0
- package/project-transform/src/lsp/server.js +355 -0
- package/project-transform/src/lsp/server.ts +671 -0
- package/project-transform/src/lsp/session.js +49 -0
- package/project-transform/src/lsp/session.ts +48 -0
- package/project-transform/src/lsp/timing.js +43 -0
- package/project-transform/src/lsp/timing.ts +76 -0
- package/project-transform/src/lsp/transport.js +205 -0
- package/project-transform/src/lsp/transport.ts +253 -0
- package/project-transform/src/lsp_main.js +5 -0
- package/project-transform/src/lsp_main.ts +7 -0
- package/project-transform/src/macros.d.ts +1 -0
- package/project-transform/src/macros.js +1 -0
- package/project-transform/src/macros.ts +1 -0
- package/project-transform/src/main.js +24 -0
- package/project-transform/src/main.ts +28 -0
- package/project-transform/src/platform/host.js +264 -0
- package/project-transform/src/platform/host.ts +343 -0
- package/project-transform/src/platform/path.js +8 -0
- package/project-transform/src/platform/path.ts +20 -0
- package/project-transform/src/public_macro_api/macro_api.d.ts +1054 -0
- package/project-transform/src/public_macro_api/macro_semantic_types.d.ts +66 -0
- package/project-transform/src/public_macro_api/macro_types.d.ts +70 -0
- package/project-transform/src/run_program.js +14 -0
- package/project-transform/src/run_program.ts +33 -0
- package/project-transform/src/runtime/materialize.js +371 -0
- package/project-transform/src/runtime/materialize.ts +502 -0
- package/project-transform/src/runtime/on_demand.js +203 -0
- package/project-transform/src/runtime/on_demand.ts +305 -0
- package/project-transform/src/runtime/source_maps.js +205 -0
- package/project-transform/src/runtime/source_maps.ts +297 -0
- package/project-transform/src/runtime/transform.js +148 -0
- package/project-transform/src/runtime/transform.ts +295 -0
- package/project-transform/src/service/types.js +1 -0
- package/project-transform/src/service/types.ts +22 -0
- package/project-transform/src/soundscript_packages.js +477 -0
- package/project-transform/src/soundscript_packages.ts +754 -0
- package/project-transform/src/soundscript_runtime_specifiers.js +88 -0
- package/project-transform/src/soundscript_runtime_specifiers.ts +96 -0
- package/project-transform/src/stdlib/async.d.ts +81 -0
- package/project-transform/src/stdlib/async.js +213 -0
- package/project-transform/src/stdlib/async.ts +315 -0
- package/project-transform/src/stdlib/codec.d.ts +32 -0
- package/project-transform/src/stdlib/codec.js +30 -0
- package/project-transform/src/stdlib/codec.ts +76 -0
- package/project-transform/src/stdlib/compare.d.ts +28 -0
- package/project-transform/src/stdlib/compare.js +115 -0
- package/project-transform/src/stdlib/compare.ts +151 -0
- package/project-transform/src/stdlib/css.d.ts +16 -0
- package/project-transform/src/stdlib/css.js +9 -0
- package/project-transform/src/stdlib/css.ts +28 -0
- package/project-transform/src/stdlib/debug.d.ts +2 -0
- package/project-transform/src/stdlib/debug.js +9 -0
- package/project-transform/src/stdlib/debug.ts +10 -0
- package/project-transform/src/stdlib/decode.d.ts +86 -0
- package/project-transform/src/stdlib/decode.js +254 -0
- package/project-transform/src/stdlib/decode.ts +390 -0
- package/project-transform/src/stdlib/derive.d.ts +6 -0
- package/project-transform/src/stdlib/derive.js +7 -0
- package/project-transform/src/stdlib/derive.ts +7 -0
- package/project-transform/src/stdlib/encode.d.ts +100 -0
- package/project-transform/src/stdlib/encode.js +130 -0
- package/project-transform/src/stdlib/encode.ts +259 -0
- package/project-transform/src/stdlib/failures.d.ts +23 -0
- package/project-transform/src/stdlib/failures.js +41 -0
- package/project-transform/src/stdlib/failures.ts +64 -0
- package/project-transform/src/stdlib/fetch.d.ts +67 -0
- package/project-transform/src/stdlib/fetch.js +5 -0
- package/project-transform/src/stdlib/fetch.ts +11 -0
- package/project-transform/src/stdlib/graphql.d.ts +16 -0
- package/project-transform/src/stdlib/graphql.js +9 -0
- package/project-transform/src/stdlib/graphql.ts +28 -0
- package/project-transform/src/stdlib/hash.d.ts +34 -0
- package/project-transform/src/stdlib/hash.js +110 -0
- package/project-transform/src/stdlib/hash.ts +188 -0
- package/project-transform/src/stdlib/hkt.d.ts +40 -0
- package/project-transform/src/stdlib/hkt.js +3 -0
- package/project-transform/src/stdlib/hkt.ts +41 -0
- package/project-transform/src/stdlib/index.d.ts +9 -0
- package/project-transform/src/stdlib/index.js +15 -0
- package/project-transform/src/stdlib/index.ts +23 -0
- package/project-transform/src/stdlib/json.d.ts +125 -0
- package/project-transform/src/stdlib/json.js +764 -0
- package/project-transform/src/stdlib/json.ts +1034 -0
- package/project-transform/src/stdlib/match.d.ts +11 -0
- package/project-transform/src/stdlib/match.js +13 -0
- package/project-transform/src/stdlib/match.ts +26 -0
- package/project-transform/src/stdlib/numerics.d.ts +523 -0
- package/project-transform/src/stdlib/numerics.js +1356 -0
- package/project-transform/src/stdlib/numerics.ts +1937 -0
- package/project-transform/src/stdlib/random.d.ts +19 -0
- package/project-transform/src/stdlib/random.js +3 -0
- package/project-transform/src/stdlib/random.ts +5 -0
- package/project-transform/src/stdlib/result.d.ts +68 -0
- package/project-transform/src/stdlib/result.js +139 -0
- package/project-transform/src/stdlib/result.ts +248 -0
- package/project-transform/src/stdlib/sql.d.ts +22 -0
- package/project-transform/src/stdlib/sql.js +23 -0
- package/project-transform/src/stdlib/sql.ts +53 -0
- package/project-transform/src/stdlib/text.d.ts +24 -0
- package/project-transform/src/stdlib/text.js +3 -0
- package/project-transform/src/stdlib/text.ts +4 -0
- package/project-transform/src/stdlib/thunk.d.ts +2 -0
- package/project-transform/src/stdlib/thunk.js +9 -0
- package/project-transform/src/stdlib/thunk.ts +15 -0
- package/project-transform/src/stdlib/typeclasses.d.ts +57 -0
- package/project-transform/src/stdlib/typeclasses.js +78 -0
- package/project-transform/src/stdlib/typeclasses.ts +173 -0
- package/project-transform/src/stdlib/url.d.ts +37 -0
- package/project-transform/src/stdlib/url.js +3 -0
- package/project-transform/src/stdlib/url.ts +4 -0
- package/project-transform/src/stdlib/value.d.ts +9 -0
- package/project-transform/src/stdlib/value.js +104 -0
- package/project-transform/src/stdlib/value.ts +133 -0
- package/project-transform/src/test_installed_stdlib.js +147 -0
- package/project-transform/src/test_installed_stdlib.ts +245 -0
- package/project-transform/src/test_macro_package_fixture.js +50 -0
- package/project-transform/src/test_macro_package_fixture.ts +68 -0
- package/project-transform/src/value_deep_safe.js +191 -0
- package/project-transform/src/value_deep_safe.ts +273 -0
|
@@ -0,0 +1,324 @@
|
|
|
1
|
+
import ts from 'typescript';
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
builtinRuntimeImportSpecifier,
|
|
5
|
+
isBuiltinRuntimeModuleSpecifier,
|
|
6
|
+
} from '../soundscript_runtime_specifiers.ts';
|
|
7
|
+
import { dirname, join, normalize, relative } from '../platform/path.ts';
|
|
8
|
+
import type { MacroRuntimeImportRequest } from './macro_output.ts';
|
|
9
|
+
import type { PreparedProgram } from './project_frontend.ts';
|
|
10
|
+
|
|
11
|
+
interface PackageRuntimeMetadata {
|
|
12
|
+
readonly name?: string;
|
|
13
|
+
readonly ordinaryExports: ReadonlySet<string>;
|
|
14
|
+
readonly packageJsonPath: string;
|
|
15
|
+
readonly packageRoot: string;
|
|
16
|
+
readonly soundscriptExports: ReadonlyMap<string, string>;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function extractSoundscriptSourceTarget(value: unknown): string | null {
|
|
20
|
+
if (typeof value === 'string') {
|
|
21
|
+
return value;
|
|
22
|
+
}
|
|
23
|
+
if (!value || typeof value !== 'object') {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
const source = (value as Record<string, unknown>).source;
|
|
27
|
+
return typeof source === 'string' ? source : null;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export interface MacroRuntimeImportResolver {
|
|
31
|
+
resolve(
|
|
32
|
+
request: Pick<MacroRuntimeImportRequest, 'exportName' | 'kind'> & { specifier: string },
|
|
33
|
+
): MacroRuntimeImportRequest;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function normalizePath(fileName: string): string {
|
|
37
|
+
const normalized = normalize(fileName);
|
|
38
|
+
return ts.sys.useCaseSensitiveFileNames ? normalized : normalized.toLowerCase();
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function findNearestPackageJson(
|
|
42
|
+
startFileName: string,
|
|
43
|
+
host: ts.ModuleResolutionHost,
|
|
44
|
+
): string | null {
|
|
45
|
+
let currentDirectory = dirname(startFileName);
|
|
46
|
+
const visited = new Set<string>();
|
|
47
|
+
|
|
48
|
+
while (!visited.has(normalizePath(currentDirectory))) {
|
|
49
|
+
visited.add(normalizePath(currentDirectory));
|
|
50
|
+
const packageJsonPath = join(currentDirectory, 'package.json');
|
|
51
|
+
if (host.fileExists(packageJsonPath)) {
|
|
52
|
+
return packageJsonPath;
|
|
53
|
+
}
|
|
54
|
+
const parentDirectory = dirname(currentDirectory);
|
|
55
|
+
if (parentDirectory === currentDirectory) {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
currentDirectory = parentDirectory;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function readPackageRuntimeMetadata(
|
|
65
|
+
startFileName: string,
|
|
66
|
+
host: ts.ModuleResolutionHost,
|
|
67
|
+
): PackageRuntimeMetadata | null {
|
|
68
|
+
const packageJsonPath = findNearestPackageJson(startFileName, host);
|
|
69
|
+
if (!packageJsonPath) {
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
const packageJsonText = host.readFile(packageJsonPath);
|
|
74
|
+
if (!packageJsonText) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
let parsed: unknown;
|
|
79
|
+
try {
|
|
80
|
+
parsed = JSON.parse(packageJsonText);
|
|
81
|
+
} catch {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if (!parsed || typeof parsed !== 'object') {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
const record = parsed as Record<string, unknown>;
|
|
90
|
+
const packageRoot = dirname(packageJsonPath);
|
|
91
|
+
const ordinaryExports = collectOrdinaryExportSubpaths(record.exports);
|
|
92
|
+
const soundscriptExports = new Map<string, string>();
|
|
93
|
+
const soundscript = record.soundscript;
|
|
94
|
+
if (soundscript && typeof soundscript === 'object') {
|
|
95
|
+
const exportsRecord = (soundscript as Record<string, unknown>).exports;
|
|
96
|
+
if (exportsRecord && typeof exportsRecord === 'object') {
|
|
97
|
+
for (const [subpath, target] of Object.entries(exportsRecord as Record<string, unknown>)) {
|
|
98
|
+
const sourceTarget = extractSoundscriptSourceTarget(target);
|
|
99
|
+
if (!sourceTarget) {
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
soundscriptExports.set(
|
|
103
|
+
subpath,
|
|
104
|
+
normalize(
|
|
105
|
+
sourceTarget.startsWith('/') ? sourceTarget : join(packageRoot, sourceTarget),
|
|
106
|
+
),
|
|
107
|
+
);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
return {
|
|
113
|
+
name: typeof record.name === 'string' && record.name.length > 0 ? record.name : undefined,
|
|
114
|
+
ordinaryExports,
|
|
115
|
+
packageJsonPath,
|
|
116
|
+
packageRoot,
|
|
117
|
+
soundscriptExports,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
function exportShapeHasStringTarget(value: unknown): boolean {
|
|
122
|
+
if (typeof value === 'string') {
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
if (Array.isArray(value)) {
|
|
126
|
+
return value.some((entry) => exportShapeHasStringTarget(entry));
|
|
127
|
+
}
|
|
128
|
+
if (!value || typeof value !== 'object') {
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
return Object.values(value).some((entry) => exportShapeHasStringTarget(entry));
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
function collectOrdinaryExportSubpaths(exportsField: unknown): ReadonlySet<string> {
|
|
135
|
+
const subpaths = new Set<string>();
|
|
136
|
+
if (typeof exportsField === 'string' || Array.isArray(exportsField)) {
|
|
137
|
+
if (exportShapeHasStringTarget(exportsField)) {
|
|
138
|
+
subpaths.add('.');
|
|
139
|
+
}
|
|
140
|
+
return subpaths;
|
|
141
|
+
}
|
|
142
|
+
if (!exportsField || typeof exportsField !== 'object') {
|
|
143
|
+
return subpaths;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
const entries = Object.entries(exportsField as Record<string, unknown>);
|
|
147
|
+
const hasSubpathKeys = entries.some(([key]) => key.startsWith('.'));
|
|
148
|
+
if (hasSubpathKeys) {
|
|
149
|
+
for (const [key, value] of entries) {
|
|
150
|
+
if (key.startsWith('.') && exportShapeHasStringTarget(value)) {
|
|
151
|
+
subpaths.add(key);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
return subpaths;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
if (exportShapeHasStringTarget(exportsField)) {
|
|
158
|
+
subpaths.add('.');
|
|
159
|
+
}
|
|
160
|
+
return subpaths;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
function createModuleResolutionHost(preparedProgram: PreparedProgram): ts.ModuleResolutionHost {
|
|
164
|
+
const baseHost = preparedProgram.preparedHost.host;
|
|
165
|
+
return {
|
|
166
|
+
directoryExists: baseHost.directoryExists?.bind(baseHost),
|
|
167
|
+
fileExists: baseHost.fileExists.bind(baseHost),
|
|
168
|
+
getCurrentDirectory: baseHost.getCurrentDirectory?.bind(baseHost) ??
|
|
169
|
+
(() => ts.sys.getCurrentDirectory()),
|
|
170
|
+
getDirectories: baseHost.getDirectories?.bind(baseHost),
|
|
171
|
+
readFile: baseHost.readFile.bind(baseHost),
|
|
172
|
+
realpath: baseHost.realpath?.bind(baseHost),
|
|
173
|
+
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
function sanitizeSpecifierForIdentifier(specifier: string): string {
|
|
178
|
+
return specifier.replace(/[^A-Za-z0-9_$]+/gu, '_').replace(/^_+/u, '');
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
function fnv1a(text: string, seed = 0x811c9dc5): number {
|
|
182
|
+
let hash = seed >>> 0;
|
|
183
|
+
for (let index = 0; index < text.length; index += 1) {
|
|
184
|
+
hash ^= text.charCodeAt(index);
|
|
185
|
+
hash = Math.imul(hash, 0x01000193) >>> 0;
|
|
186
|
+
}
|
|
187
|
+
return hash >>> 0;
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
function createLocalName(
|
|
191
|
+
kind: MacroRuntimeImportRequest['kind'],
|
|
192
|
+
specifier: string,
|
|
193
|
+
exportName?: string,
|
|
194
|
+
): string {
|
|
195
|
+
const hint = exportName ?? (sanitizeSpecifierForIdentifier(specifier) || 'runtime');
|
|
196
|
+
return `__sts_runtime_${kind}_${hint}_${
|
|
197
|
+
fnv1a(`${kind}\u0000${specifier}\u0000${exportName ?? ''}`)
|
|
198
|
+
.toString(16)
|
|
199
|
+
}`;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
function toRelativeModuleSpecifier(fromFileName: string, toFileName: string): string {
|
|
203
|
+
const raw = relative(dirname(fromFileName), toFileName).replaceAll('\\', '/');
|
|
204
|
+
return raw.startsWith('.') ? raw : `./${raw}`;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
function resolveRelativeRuntimeFile(
|
|
208
|
+
containingFileName: string,
|
|
209
|
+
specifier: string,
|
|
210
|
+
host: ts.ModuleResolutionHost,
|
|
211
|
+
): string | null {
|
|
212
|
+
const basePath = normalize(join(dirname(containingFileName), specifier));
|
|
213
|
+
const candidates = [
|
|
214
|
+
basePath,
|
|
215
|
+
`${basePath}.ts`,
|
|
216
|
+
`${basePath}.tsx`,
|
|
217
|
+
`${basePath}.sts`,
|
|
218
|
+
`${basePath}.js`,
|
|
219
|
+
`${basePath}.mjs`,
|
|
220
|
+
`${basePath}.cjs`,
|
|
221
|
+
join(basePath, 'index.ts'),
|
|
222
|
+
join(basePath, 'index.tsx'),
|
|
223
|
+
join(basePath, 'index.sts'),
|
|
224
|
+
join(basePath, 'index.js'),
|
|
225
|
+
];
|
|
226
|
+
for (const candidate of candidates) {
|
|
227
|
+
if (host.fileExists(candidate)) {
|
|
228
|
+
return normalize(candidate);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
return null;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
function publicSpecifierForPackageSubpath(packageName: string, subpath: string): string {
|
|
235
|
+
return subpath === '.' ? packageName : `${packageName}/${subpath.replace(/^\.\/?/u, '')}`;
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
export function createMacroRuntimeImportResolver(
|
|
239
|
+
preparedProgram: PreparedProgram,
|
|
240
|
+
sourceFileName: string,
|
|
241
|
+
macroModuleFileName: string,
|
|
242
|
+
): MacroRuntimeImportResolver {
|
|
243
|
+
const resolutionHost = createModuleResolutionHost(preparedProgram);
|
|
244
|
+
|
|
245
|
+
return {
|
|
246
|
+
resolve(request) {
|
|
247
|
+
if (!request.specifier.startsWith('.')) {
|
|
248
|
+
if (isBuiltinRuntimeModuleSpecifier(request.specifier)) {
|
|
249
|
+
const specifier = builtinRuntimeImportSpecifier(request.specifier) ?? request.specifier;
|
|
250
|
+
return {
|
|
251
|
+
exportName: request.exportName,
|
|
252
|
+
kind: request.kind,
|
|
253
|
+
localName: createLocalName(request.kind, specifier, request.exportName),
|
|
254
|
+
specifier,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
throw new Error(
|
|
258
|
+
`Runtime macro imports must stay within the defining package. Re-export "${request.specifier}" through the macro package and import that local subpath instead.`,
|
|
259
|
+
);
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
const resolvedModule = ts.resolveModuleName(
|
|
263
|
+
request.specifier,
|
|
264
|
+
macroModuleFileName,
|
|
265
|
+
preparedProgram.options,
|
|
266
|
+
resolutionHost,
|
|
267
|
+
preparedProgram.preparedHost.reuseState.moduleResolutionCache,
|
|
268
|
+
).resolvedModule;
|
|
269
|
+
const runtimeFileName = resolvedModule?.resolvedFileName
|
|
270
|
+
? normalize(resolvedModule.resolvedFileName)
|
|
271
|
+
: resolveRelativeRuntimeFile(macroModuleFileName, request.specifier, resolutionHost);
|
|
272
|
+
if (!runtimeFileName) {
|
|
273
|
+
throw new Error(
|
|
274
|
+
`Could not resolve runtime import "${request.specifier}" from macro module "${macroModuleFileName}".`,
|
|
275
|
+
);
|
|
276
|
+
}
|
|
277
|
+
const macroPackage = readPackageRuntimeMetadata(macroModuleFileName, resolutionHost);
|
|
278
|
+
const runtimePackage = readPackageRuntimeMetadata(runtimeFileName, resolutionHost);
|
|
279
|
+
if (
|
|
280
|
+
macroPackage &&
|
|
281
|
+
runtimePackage &&
|
|
282
|
+
normalizePath(macroPackage.packageJsonPath) !==
|
|
283
|
+
normalizePath(runtimePackage.packageJsonPath)
|
|
284
|
+
) {
|
|
285
|
+
throw new Error(
|
|
286
|
+
`Runtime macro imports must stay within the defining package. "${request.specifier}" resolves outside the macro package.`,
|
|
287
|
+
);
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
let specifier = toRelativeModuleSpecifier(sourceFileName, runtimeFileName);
|
|
291
|
+
if (macroPackage?.name && macroPackage.soundscriptExports.size > 0) {
|
|
292
|
+
let publishedSubpath: string | null = null;
|
|
293
|
+
for (const [subpath, targetFileName] of macroPackage.soundscriptExports.entries()) {
|
|
294
|
+
if (normalizePath(targetFileName) !== normalizePath(runtimeFileName)) {
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
publishedSubpath = subpath;
|
|
298
|
+
break;
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
if (!publishedSubpath) {
|
|
302
|
+
throw new Error(
|
|
303
|
+
`Runtime macro import "${request.specifier}" must resolve to a subpath published in package.json#soundscript.exports for package "${macroPackage.name}".`,
|
|
304
|
+
);
|
|
305
|
+
}
|
|
306
|
+
if (!macroPackage.ordinaryExports.has(publishedSubpath)) {
|
|
307
|
+
throw new Error(
|
|
308
|
+
`Runtime macro import "${request.specifier}" resolves to "${
|
|
309
|
+
publicSpecifierForPackageSubpath(macroPackage.name, publishedSubpath)
|
|
310
|
+
}", but that subpath is not published through package.json#exports.`,
|
|
311
|
+
);
|
|
312
|
+
}
|
|
313
|
+
specifier = publicSpecifierForPackageSubpath(macroPackage.name, publishedSubpath);
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
return {
|
|
317
|
+
exportName: request.exportName,
|
|
318
|
+
kind: request.kind,
|
|
319
|
+
localName: createLocalName(request.kind, specifier, request.exportName),
|
|
320
|
+
specifier,
|
|
321
|
+
};
|
|
322
|
+
},
|
|
323
|
+
};
|
|
324
|
+
}
|