@celljs/core 4.1.0 → 4.2.0
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 +49 -62
- package/esm/browser/static-module.d.ts +1 -1
- package/esm/common/annotation/aspect.d.ts +2 -1
- package/esm/common/annotation/aspect.js.map +1 -1
- package/esm/common/annotation/autowired-provider.d.ts +0 -2
- package/esm/common/annotation/autowired-provider.js +4 -13
- package/esm/common/annotation/autowired-provider.js.map +1 -1
- package/esm/common/annotation/autowired.d.ts +1 -1
- package/esm/common/annotation/autowired.js +11 -3
- package/esm/common/annotation/autowired.js.map +1 -1
- package/esm/common/annotation/component.d.ts +4 -8
- package/esm/common/annotation/component.js +0 -6
- package/esm/common/annotation/component.js.map +1 -1
- package/esm/common/annotation/constant.d.ts +1 -1
- package/esm/common/annotation/constant.js +6 -3
- package/esm/common/annotation/constant.js.map +1 -1
- package/esm/common/annotation/detached/autowired-provider.js +2 -2
- package/esm/common/annotation/detached/autowired-provider.js.map +1 -1
- package/esm/common/annotation/index.d.ts +0 -6
- package/esm/common/annotation/index.js +0 -6
- package/esm/common/annotation/index.js.map +1 -1
- package/esm/common/annotation/named.d.ts +2 -1
- package/esm/common/annotation/named.js +5 -1
- package/esm/common/annotation/named.js.map +1 -1
- package/esm/common/annotation/optional.d.ts +2 -1
- package/esm/common/annotation/optional.js +5 -1
- package/esm/common/annotation/optional.js.map +1 -1
- package/esm/common/annotation/post-construct.d.ts +2 -1
- package/esm/common/annotation/post-construct.js +5 -1
- package/esm/common/annotation/post-construct.js.map +1 -1
- package/esm/common/annotation/tagged.d.ts +2 -1
- package/esm/common/annotation/tagged.js +6 -1
- package/esm/common/annotation/tagged.js.map +1 -1
- package/esm/common/annotation/value.d.ts +3 -2
- package/esm/common/annotation/value.js +7 -10
- package/esm/common/annotation/value.js.map +1 -1
- package/esm/common/aop/aop-proxy-factory.d.ts +6 -2
- package/esm/common/aop/aop-proxy-factory.js +44 -28
- package/esm/common/aop/aop-proxy-factory.js.map +1 -1
- package/esm/common/aop/class-filter.js +6 -6
- package/esm/common/aop/class-filter.js.map +1 -1
- package/esm/common/application/application-factory.d.ts +1 -1
- package/esm/common/application/application-factory.js +4 -4
- package/esm/common/application/application-factory.js.map +1 -1
- package/esm/common/container/auto-bind.d.ts +7 -3
- package/esm/common/container/auto-bind.js +49 -80
- package/esm/common/container/auto-bind.js.map +1 -1
- package/esm/common/container/container-error.d.ts +21 -0
- package/esm/common/container/container-error.js +22 -0
- package/esm/common/container/container-error.js.map +1 -0
- package/esm/common/container/container-provider.d.ts +5 -4
- package/esm/common/container/container-provider.js +2 -1
- package/esm/common/container/container-provider.js.map +1 -1
- package/esm/common/container/container-util.d.ts +5 -7
- package/esm/common/container/container-util.js +8 -19
- package/esm/common/container/container-util.js.map +1 -1
- package/esm/common/container/container.d.ts +104 -0
- package/esm/common/container/container.js +299 -0
- package/esm/common/container/container.js.map +1 -0
- package/esm/common/container/dynamic-container.d.ts +1 -1
- package/esm/common/container/dynamic-container.js +2 -2
- package/esm/common/container/dynamic-container.js.map +1 -1
- package/esm/common/container/index.d.ts +5 -6
- package/esm/common/container/index.js +5 -3
- package/esm/common/container/index.js.map +1 -1
- package/esm/common/container/injection.d.ts +40 -0
- package/esm/common/container/injection.js +109 -0
- package/esm/common/container/injection.js.map +1 -0
- package/esm/common/container/scope.d.ts +2 -3
- package/esm/common/container/scope.js +2 -3
- package/esm/common/container/scope.js.map +1 -1
- package/esm/common/el/application-expression-engine.d.ts +7 -0
- package/esm/common/{provider/provider-creator.js → el/application-expression-engine.js} +11 -11
- package/esm/common/el/application-expression-engine.js.map +1 -0
- package/esm/common/el/core-context-initializer.d.ts +3 -2
- package/esm/common/el/core-context-initializer.js +10 -8
- package/esm/common/el/core-context-initializer.js.map +1 -1
- package/esm/common/el/expression-compiler.d.ts +5 -4
- package/esm/common/el/expression-compiler.js +7 -6
- package/esm/common/el/expression-compiler.js.map +1 -1
- package/esm/common/el/expression-engine.d.ts +61 -0
- package/esm/common/el/expression-engine.js +459 -0
- package/esm/common/el/expression-engine.js.map +1 -0
- package/esm/common/el/expression-handler.d.ts +1 -2
- package/esm/common/el/expression-handler.js +1 -5
- package/esm/common/el/expression-handler.js.map +1 -1
- package/esm/common/el/expression-protocol.d.ts +3 -5
- package/esm/common/el/expression-protocol.js +0 -1
- package/esm/common/el/expression-protocol.js.map +1 -1
- package/esm/common/el/expression-util.d.ts +9 -8
- package/esm/common/el/expression-util.js +8 -9
- package/esm/common/el/expression-util.js.map +1 -1
- package/esm/common/el/index.d.ts +2 -1
- package/esm/common/el/index.js +2 -1
- package/esm/common/el/index.js.map +1 -1
- package/esm/common/provider/index.d.ts +0 -1
- package/esm/common/provider/index.js +0 -1
- package/esm/common/provider/index.js.map +1 -1
- package/esm/common/provider/provider-protocol.d.ts +5 -9
- package/esm/common/provider/provider-protocol.js +0 -1
- package/esm/common/provider/provider-protocol.js.map +1 -1
- package/esm/common/provider/provider-util.d.ts +1 -1
- package/esm/common/provider/provider-util.js +2 -2
- package/esm/common/provider/provider-util.js.map +1 -1
- package/esm/common/provider/provider.d.ts +7 -6
- package/esm/common/provider/provider.js +15 -26
- package/esm/common/provider/provider.js.map +1 -1
- package/esm/common/static-module.d.ts +1 -1
- package/esm/common/static-module.js +1 -1
- package/esm/common/static-module.js.map +1 -1
- package/esm/common/test/mock-logger.js +2 -13
- package/esm/common/test/mock-logger.js.map +1 -1
- package/esm/common/test/test-module.d.ts +1 -1
- package/esm/common/test/test-module.js +1 -1
- package/esm/common/test/test-module.js.map +1 -1
- package/esm/common/utils/annotation-util.js +2 -1
- package/esm/common/utils/annotation-util.js.map +1 -1
- package/esm/common/utils/proxy-util.d.ts +5 -2
- package/esm/common/utils/proxy-util.js +10 -28
- package/esm/common/utils/proxy-util.js.map +1 -1
- package/esm/node/static-module.d.ts +1 -1
- package/lib/browser/static-module.d.ts +1 -1
- package/lib/common/annotation/aspect.d.ts +2 -1
- package/lib/common/annotation/aspect.d.ts.map +1 -1
- package/lib/common/annotation/aspect.js.map +1 -1
- package/lib/common/annotation/autowired-provider.d.ts +0 -2
- package/lib/common/annotation/autowired-provider.d.ts.map +1 -1
- package/lib/common/annotation/autowired-provider.js +4 -14
- package/lib/common/annotation/autowired-provider.js.map +1 -1
- package/lib/common/annotation/autowired.d.ts +1 -1
- package/lib/common/annotation/autowired.d.ts.map +1 -1
- package/lib/common/annotation/autowired.js +11 -3
- package/lib/common/annotation/autowired.js.map +1 -1
- package/lib/common/annotation/component.d.ts +4 -8
- package/lib/common/annotation/component.d.ts.map +1 -1
- package/lib/common/annotation/component.js +0 -6
- package/lib/common/annotation/component.js.map +1 -1
- package/lib/common/annotation/constant.d.ts +1 -1
- package/lib/common/annotation/constant.d.ts.map +1 -1
- package/lib/common/annotation/constant.js +6 -3
- package/lib/common/annotation/constant.js.map +1 -1
- package/lib/common/annotation/detached/autowired-provider.js +2 -2
- package/lib/common/annotation/detached/autowired-provider.js.map +1 -1
- package/lib/common/annotation/index.d.ts +0 -6
- package/lib/common/annotation/index.d.ts.map +1 -1
- package/lib/common/annotation/index.js +0 -6
- package/lib/common/annotation/index.js.map +1 -1
- package/lib/common/annotation/named.d.ts +2 -1
- package/lib/common/annotation/named.d.ts.map +1 -1
- package/lib/common/annotation/named.js +6 -2
- package/lib/common/annotation/named.js.map +1 -1
- package/lib/common/annotation/optional.d.ts +2 -1
- package/lib/common/annotation/optional.d.ts.map +1 -1
- package/lib/common/annotation/optional.js +6 -2
- package/lib/common/annotation/optional.js.map +1 -1
- package/lib/common/annotation/post-construct.d.ts +2 -1
- package/lib/common/annotation/post-construct.d.ts.map +1 -1
- package/lib/common/annotation/post-construct.js +6 -2
- package/lib/common/annotation/post-construct.js.map +1 -1
- package/lib/common/annotation/tagged.d.ts +2 -1
- package/lib/common/annotation/tagged.d.ts.map +1 -1
- package/lib/common/annotation/tagged.js +7 -2
- package/lib/common/annotation/tagged.js.map +1 -1
- package/lib/common/annotation/value.d.ts +3 -2
- package/lib/common/annotation/value.d.ts.map +1 -1
- package/lib/common/annotation/value.js +7 -10
- package/lib/common/annotation/value.js.map +1 -1
- package/lib/common/aop/aop-proxy-factory.d.ts +6 -2
- package/lib/common/aop/aop-proxy-factory.d.ts.map +1 -1
- package/lib/common/aop/aop-proxy-factory.js +45 -29
- package/lib/common/aop/aop-proxy-factory.js.map +1 -1
- package/lib/common/aop/class-filter.js +7 -7
- package/lib/common/aop/class-filter.js.map +1 -1
- package/lib/common/application/application-factory.d.ts +1 -1
- package/lib/common/application/application-factory.d.ts.map +1 -1
- package/lib/common/application/application-factory.js +4 -4
- package/lib/common/application/application-factory.js.map +1 -1
- package/lib/common/container/assembly.spec.js +11 -11
- package/lib/common/container/assembly.spec.js.map +1 -1
- package/lib/common/container/auto-bind.d.ts +7 -3
- package/lib/common/container/auto-bind.d.ts.map +1 -1
- package/lib/common/container/auto-bind.js +49 -81
- package/lib/common/container/auto-bind.js.map +1 -1
- package/lib/common/container/container-error.d.ts +22 -0
- package/lib/common/container/container-error.d.ts.map +1 -0
- package/lib/common/container/container-error.js +26 -0
- package/lib/common/container/container-error.js.map +1 -0
- package/lib/common/container/container-provider.d.ts +5 -4
- package/lib/common/container/container-provider.d.ts.map +1 -1
- package/lib/common/container/container-provider.js +3 -2
- package/lib/common/container/container-provider.js.map +1 -1
- package/lib/common/container/container-util.d.ts +5 -7
- package/lib/common/container/container-util.d.ts.map +1 -1
- package/lib/common/container/container-util.js +8 -19
- package/lib/common/container/container-util.js.map +1 -1
- package/lib/common/container/container.d.ts +105 -0
- package/lib/common/container/container.d.ts.map +1 -0
- package/lib/common/container/container.js +305 -0
- package/lib/common/container/container.js.map +1 -0
- package/lib/common/container/container.spec.d.ts +2 -0
- package/lib/common/container/container.spec.d.ts.map +1 -0
- package/lib/common/container/container.spec.js +334 -0
- package/lib/common/container/container.spec.js.map +1 -0
- package/lib/common/container/dynamic-container.d.ts +1 -1
- package/lib/common/container/dynamic-container.d.ts.map +1 -1
- package/lib/common/container/dynamic-container.js +3 -3
- package/lib/common/container/dynamic-container.js.map +1 -1
- package/lib/common/container/index.d.ts +5 -6
- package/lib/common/container/index.d.ts.map +1 -1
- package/lib/common/container/index.js +5 -3
- package/lib/common/container/index.js.map +1 -1
- package/lib/common/container/injection.d.ts +41 -0
- package/lib/common/container/injection.d.ts.map +1 -0
- package/lib/common/container/injection.js +112 -0
- package/lib/common/container/injection.js.map +1 -0
- package/lib/common/container/scope.d.ts +2 -3
- package/lib/common/container/scope.d.ts.map +1 -1
- package/lib/common/container/scope.js +2 -3
- package/lib/common/container/scope.js.map +1 -1
- package/lib/common/el/application-expression-engine.d.ts +8 -0
- package/lib/common/el/application-expression-engine.d.ts.map +1 -0
- package/lib/common/el/application-expression-engine.js +22 -0
- package/lib/common/el/application-expression-engine.js.map +1 -0
- package/lib/common/el/core-context-initializer.d.ts +3 -2
- package/lib/common/el/core-context-initializer.d.ts.map +1 -1
- package/lib/common/el/core-context-initializer.js +9 -7
- package/lib/common/el/core-context-initializer.js.map +1 -1
- package/lib/common/el/expression-compiler.d.ts +5 -4
- package/lib/common/el/expression-compiler.d.ts.map +1 -1
- package/lib/common/el/expression-compiler.js +6 -5
- package/lib/common/el/expression-compiler.js.map +1 -1
- package/lib/common/el/expression-engine.d.ts +62 -0
- package/lib/common/el/expression-engine.d.ts.map +1 -0
- package/lib/common/el/expression-engine.js +465 -0
- package/lib/common/el/expression-engine.js.map +1 -0
- package/lib/common/el/expression-engine.spec.d.ts +2 -0
- package/lib/common/el/expression-engine.spec.d.ts.map +1 -0
- package/lib/common/el/expression-engine.spec.js +100 -0
- package/lib/common/el/expression-engine.spec.js.map +1 -0
- package/lib/common/el/expression-handler.d.ts +1 -2
- package/lib/common/el/expression-handler.d.ts.map +1 -1
- package/lib/common/el/expression-handler.js +0 -4
- package/lib/common/el/expression-handler.js.map +1 -1
- package/lib/common/el/expression-handler.spec.js +5 -6
- package/lib/common/el/expression-handler.spec.js.map +1 -1
- package/lib/common/el/expression-protocol.d.ts +3 -5
- package/lib/common/el/expression-protocol.d.ts.map +1 -1
- package/lib/common/el/expression-protocol.js +1 -2
- package/lib/common/el/expression-protocol.js.map +1 -1
- package/lib/common/el/expression-util.d.ts +9 -8
- package/lib/common/el/expression-util.d.ts.map +1 -1
- package/lib/common/el/expression-util.js +8 -9
- package/lib/common/el/expression-util.js.map +1 -1
- package/lib/common/el/index.d.ts +2 -1
- package/lib/common/el/index.d.ts.map +1 -1
- package/lib/common/el/index.js +2 -1
- package/lib/common/el/index.js.map +1 -1
- package/lib/common/el/value-and-el.spec.js +2 -2
- package/lib/common/el/value-and-el.spec.js.map +1 -1
- package/lib/common/provider/index.d.ts +0 -1
- package/lib/common/provider/index.d.ts.map +1 -1
- package/lib/common/provider/index.js +0 -1
- package/lib/common/provider/index.js.map +1 -1
- package/lib/common/provider/provider-protocol.d.ts +5 -9
- package/lib/common/provider/provider-protocol.d.ts.map +1 -1
- package/lib/common/provider/provider-protocol.js +1 -2
- package/lib/common/provider/provider-protocol.js.map +1 -1
- package/lib/common/provider/provider-util.d.ts +1 -1
- package/lib/common/provider/provider-util.d.ts.map +1 -1
- package/lib/common/provider/provider-util.js +2 -2
- package/lib/common/provider/provider-util.js.map +1 -1
- package/lib/common/provider/provider.d.ts +7 -6
- package/lib/common/provider/provider.d.ts.map +1 -1
- package/lib/common/provider/provider.js +16 -26
- package/lib/common/provider/provider.js.map +1 -1
- package/lib/common/static-module.d.ts +1 -1
- package/lib/common/static-module.js +2 -2
- package/lib/common/static-module.js.map +1 -1
- package/lib/common/test/mock-logger.d.ts.map +1 -1
- package/lib/common/test/mock-logger.js +2 -12
- package/lib/common/test/mock-logger.js.map +1 -1
- package/lib/common/test/test-module.d.ts +1 -1
- package/lib/common/test/test-module.d.ts.map +1 -1
- package/lib/common/test/test-module.js +2 -2
- package/lib/common/test/test-module.js.map +1 -1
- package/lib/common/utils/annotation-util.js +2 -1
- package/lib/common/utils/annotation-util.js.map +1 -1
- package/lib/common/utils/proxy-util.d.ts +5 -2
- package/lib/common/utils/proxy-util.d.ts.map +1 -1
- package/lib/common/utils/proxy-util.js +12 -30
- package/lib/common/utils/proxy-util.js.map +1 -1
- package/lib/node/static-module.d.ts +1 -1
- package/package.json +4 -6
- package/src/common/annotation/aspect.ts +2 -1
- package/src/common/annotation/autowired-provider.ts +4 -17
- package/src/common/annotation/autowired.ts +14 -6
- package/src/common/annotation/component.ts +6 -26
- package/src/common/annotation/constant.ts +10 -7
- package/src/common/annotation/detached/autowired-provider.ts +2 -2
- package/src/common/annotation/index.ts +0 -6
- package/src/common/annotation/named.ts +7 -1
- package/src/common/annotation/optional.ts +6 -1
- package/src/common/annotation/post-construct.ts +6 -1
- package/src/common/annotation/tagged.ts +8 -1
- package/src/common/annotation/value.ts +9 -11
- package/src/common/aop/aop-proxy-factory.ts +52 -30
- package/src/common/aop/class-filter.ts +6 -6
- package/src/common/application/application-factory.ts +4 -5
- package/src/common/container/assembly.spec.ts +7 -12
- package/src/common/container/auto-bind.ts +54 -85
- package/src/common/container/container-error.ts +31 -0
- package/src/common/container/container-provider.ts +9 -7
- package/src/common/container/container-util.ts +8 -19
- package/src/common/container/container.spec.ts +262 -0
- package/src/common/container/container.ts +363 -0
- package/src/common/container/dynamic-container.ts +2 -2
- package/src/common/container/index.ts +5 -7
- package/src/common/container/injection.ts +135 -0
- package/src/common/container/scope.ts +2 -1
- package/src/common/el/application-expression-engine.ts +9 -0
- package/src/common/el/core-context-initializer.ts +9 -8
- package/src/common/el/expression-compiler.ts +7 -6
- package/src/common/el/expression-engine.spec.ts +107 -0
- package/src/common/el/expression-engine.ts +487 -0
- package/src/common/el/expression-handler.spec.ts +6 -7
- package/src/common/el/expression-handler.ts +2 -5
- package/src/common/el/expression-protocol.ts +4 -8
- package/src/common/el/expression-util.ts +12 -13
- package/src/common/el/index.ts +3 -2
- package/src/common/el/value-and-el.spec.ts +2 -2
- package/src/common/provider/index.ts +0 -2
- package/src/common/provider/provider-protocol.ts +5 -11
- package/src/common/provider/provider-util.ts +3 -3
- package/src/common/provider/provider.ts +17 -29
- package/src/common/static-module.ts +1 -1
- package/src/common/test/mock-logger.ts +0 -2
- package/src/common/test/test-module.ts +1 -1
- package/src/common/utils/annotation-util.ts +2 -2
- package/src/common/utils/proxy-util.ts +8 -28
- package/esm/common/annotation/decorate.d.ts +0 -1
- package/esm/common/annotation/decorate.js +0 -2
- package/esm/common/annotation/decorate.js.map +0 -1
- package/esm/common/annotation/inject.d.ts +0 -1
- package/esm/common/annotation/inject.js +0 -2
- package/esm/common/annotation/inject.js.map +0 -1
- package/esm/common/annotation/injectable.d.ts +0 -1
- package/esm/common/annotation/injectable.js +0 -2
- package/esm/common/annotation/injectable.js.map +0 -1
- package/esm/common/annotation/pre-destroy.d.ts +0 -1
- package/esm/common/annotation/pre-destroy.js +0 -2
- package/esm/common/annotation/pre-destroy.js.map +0 -1
- package/esm/common/annotation/target-name.d.ts +0 -1
- package/esm/common/annotation/target-name.js +0 -2
- package/esm/common/annotation/target-name.js.map +0 -1
- package/esm/common/annotation/unmanaged.d.ts +0 -1
- package/esm/common/annotation/unmanaged.js +0 -2
- package/esm/common/annotation/unmanaged.js.map +0 -1
- package/esm/common/container/container-factory.d.ts +0 -4
- package/esm/common/container/container-factory.js +0 -9
- package/esm/common/container/container-factory.js.map +0 -1
- package/esm/common/el/jexl-engine-provider.d.ts +0 -5
- package/esm/common/el/jexl-engine-provider.js +0 -22
- package/esm/common/el/jexl-engine-provider.js.map +0 -1
- package/esm/common/provider/provider-creator.d.ts +0 -6
- package/esm/common/provider/provider-creator.js.map +0 -1
- package/lib/common/annotation/decorate.d.ts +0 -2
- package/lib/common/annotation/decorate.d.ts.map +0 -1
- package/lib/common/annotation/decorate.js +0 -6
- package/lib/common/annotation/decorate.js.map +0 -1
- package/lib/common/annotation/inject.d.ts +0 -2
- package/lib/common/annotation/inject.d.ts.map +0 -1
- package/lib/common/annotation/inject.js +0 -6
- package/lib/common/annotation/inject.js.map +0 -1
- package/lib/common/annotation/injectable.d.ts +0 -2
- package/lib/common/annotation/injectable.d.ts.map +0 -1
- package/lib/common/annotation/injectable.js +0 -6
- package/lib/common/annotation/injectable.js.map +0 -1
- package/lib/common/annotation/pre-destroy.d.ts +0 -2
- package/lib/common/annotation/pre-destroy.d.ts.map +0 -1
- package/lib/common/annotation/pre-destroy.js +0 -6
- package/lib/common/annotation/pre-destroy.js.map +0 -1
- package/lib/common/annotation/target-name.d.ts +0 -2
- package/lib/common/annotation/target-name.d.ts.map +0 -1
- package/lib/common/annotation/target-name.js +0 -6
- package/lib/common/annotation/target-name.js.map +0 -1
- package/lib/common/annotation/unmanaged.d.ts +0 -2
- package/lib/common/annotation/unmanaged.d.ts.map +0 -1
- package/lib/common/annotation/unmanaged.js +0 -6
- package/lib/common/annotation/unmanaged.js.map +0 -1
- package/lib/common/container/container-factory.d.ts +0 -5
- package/lib/common/container/container-factory.d.ts.map +0 -1
- package/lib/common/container/container-factory.js +0 -13
- package/lib/common/container/container-factory.js.map +0 -1
- package/lib/common/el/jexl-engine-provider.d.ts +0 -6
- package/lib/common/el/jexl-engine-provider.d.ts.map +0 -1
- package/lib/common/el/jexl-engine-provider.js +0 -25
- package/lib/common/el/jexl-engine-provider.js.map +0 -1
- package/lib/common/provider/provider-creator.d.ts +0 -7
- package/lib/common/provider/provider-creator.d.ts.map +0 -1
- package/lib/common/provider/provider-creator.js +0 -22
- package/lib/common/provider/provider-creator.js.map +0 -1
- package/src/common/annotation/decorate.ts +0 -1
- package/src/common/annotation/inject.ts +0 -1
- package/src/common/annotation/injectable.ts +0 -1
- package/src/common/annotation/pre-destroy.ts +0 -1
- package/src/common/annotation/target-name.ts +0 -1
- package/src/common/annotation/unmanaged.ts +0 -1
- package/src/common/container/container-factory.ts +0 -9
- package/src/common/el/jexl-engine-provider.ts +0 -18
- package/src/common/provider/provider-creator.ts +0 -12
|
@@ -0,0 +1,459 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The expression language of Cell: what `${...}` in the configuration, `@Value` and the security
|
|
3
|
+
* policies evaluate. Its grammar is the one of jexl 2, which Cell used before:
|
|
4
|
+
*
|
|
5
|
+
* - literals: `'text'`, `"text"`, `42`, `1.5`, `true`, `false`, `[a, b]`, `{ key: value }`;
|
|
6
|
+
* - names: `cell.server.port`, `list[0]`, `map['key']`, filters `users[.age > 18]` (`.age` is a
|
|
7
|
+
* property of each element); a missing property is `undefined`, never an error; a property of an
|
|
8
|
+
* array is the property of its first element;
|
|
9
|
+
* - operators, loosest first: `a ? b : c` and `a ?: b` (`b` when `a` is falsy), `||` and `&&` (same
|
|
10
|
+
* precedence, left to right), `== != > >= < <= in`, `+ -`, `* / //` (`//` rounds down), `% ^`
|
|
11
|
+
* (`^` is power), then `!` and `-` in front;
|
|
12
|
+
* - transforms `value|name(args)` and functions `name(args)`: only the ones added to the engine.
|
|
13
|
+
*
|
|
14
|
+
* Evaluation is synchronous. Expressions cannot call methods, so they only read what the context gives.
|
|
15
|
+
*/
|
|
16
|
+
/** An expression that cannot be parsed, or that uses a transform or function the engine does not have. */
|
|
17
|
+
export class ExpressionSyntaxError extends Error {
|
|
18
|
+
constructor(options) {
|
|
19
|
+
super(options.message);
|
|
20
|
+
this.name = 'ExpressionSyntaxError';
|
|
21
|
+
this.code = options.code;
|
|
22
|
+
this.hint = options.hint;
|
|
23
|
+
this.expression = options.expression;
|
|
24
|
+
this.position = options.position;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/** A compiled expression; evaluate it as many times as needed. */
|
|
28
|
+
export class Expression {
|
|
29
|
+
constructor(source, run) {
|
|
30
|
+
this.source = source;
|
|
31
|
+
this.run = run;
|
|
32
|
+
}
|
|
33
|
+
/** The value of the expression; names are properties of `context`. */
|
|
34
|
+
evaluate(context = {}) {
|
|
35
|
+
return this.run(context, context);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/** Compiles and evaluates expressions; holds the transforms and functions they may call. */
|
|
39
|
+
export class ExpressionEngine {
|
|
40
|
+
constructor() {
|
|
41
|
+
this.transforms = new Map();
|
|
42
|
+
this.functions = new Map();
|
|
43
|
+
this.cache = new Map();
|
|
44
|
+
}
|
|
45
|
+
/** `value|name(a, b)` calls `transform(value, a, b)`. */
|
|
46
|
+
addTransform(name, transform) {
|
|
47
|
+
this.transforms.set(name, transform);
|
|
48
|
+
return this;
|
|
49
|
+
}
|
|
50
|
+
addTransforms(transforms) {
|
|
51
|
+
for (const [name, transform] of Object.entries(transforms)) {
|
|
52
|
+
this.addTransform(name, transform);
|
|
53
|
+
}
|
|
54
|
+
return this;
|
|
55
|
+
}
|
|
56
|
+
/** `name(a, b)` calls `fn(a, b)`. */
|
|
57
|
+
addFunction(name, fn) {
|
|
58
|
+
this.functions.set(name, fn);
|
|
59
|
+
return this;
|
|
60
|
+
}
|
|
61
|
+
addFunctions(functions) {
|
|
62
|
+
for (const [name, fn] of Object.entries(functions)) {
|
|
63
|
+
this.addFunction(name, fn);
|
|
64
|
+
}
|
|
65
|
+
return this;
|
|
66
|
+
}
|
|
67
|
+
/** Compiles once per source text (the latest ones are kept). Throws an {@link ExpressionSyntaxError}. */
|
|
68
|
+
compile(source) {
|
|
69
|
+
let expression = this.cache.get(source);
|
|
70
|
+
if (!expression) {
|
|
71
|
+
expression = new Expression(source, new ExpressionParser(source, this).parse());
|
|
72
|
+
if (this.cache.size >= ExpressionEngine.CACHE_SIZE) {
|
|
73
|
+
this.cache.clear();
|
|
74
|
+
}
|
|
75
|
+
this.cache.set(source, expression);
|
|
76
|
+
}
|
|
77
|
+
return expression;
|
|
78
|
+
}
|
|
79
|
+
evaluate(source, context = {}) {
|
|
80
|
+
return this.compile(source).evaluate(context);
|
|
81
|
+
}
|
|
82
|
+
/** @internal what the compiled expressions call */
|
|
83
|
+
call(pool, name, args, source) {
|
|
84
|
+
const fn = (pool === 'transform' ? this.transforms : this.functions).get(name);
|
|
85
|
+
if (!fn) {
|
|
86
|
+
throw new ExpressionSyntaxError({
|
|
87
|
+
code: pool === 'transform' ? 'CELL_EL_UNKNOWN_TRANSFORM' : 'CELL_EL_UNKNOWN_FUNCTION',
|
|
88
|
+
message: `The ${pool} ${name} is not defined (in: ${source}).`,
|
|
89
|
+
hint: `Add it with addT${pool.slice(1)}('${name}', ...) on the ExpressionEngine of the application, or check its spelling.`,
|
|
90
|
+
expression: source
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
return fn(...args);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
ExpressionEngine.CACHE_SIZE = 1000;
|
|
97
|
+
/** Longest first, so that `//` is not `/`. */
|
|
98
|
+
const OPERATORS = ['//', '==', '!=', '>=', '<=', '&&', '||', '+', '-', '*', '/', '%', '^', '>', '<', '!'];
|
|
99
|
+
const PUNCTUATION = '.[]|{}:,()?';
|
|
100
|
+
const PRECEDENCE = {
|
|
101
|
+
'||': 10, '&&': 10,
|
|
102
|
+
'==': 20, '!=': 20, '>': 20, '>=': 20, '<': 20, '<=': 20, in: 20,
|
|
103
|
+
'+': 30, '-': 30,
|
|
104
|
+
'*': 40, '/': 40, '//': 40,
|
|
105
|
+
'%': 50, '^': 50
|
|
106
|
+
};
|
|
107
|
+
const BINARY = {
|
|
108
|
+
// eslint-disable-next-line eqeqeq
|
|
109
|
+
'==': (l, r) => l == r,
|
|
110
|
+
// eslint-disable-next-line eqeqeq
|
|
111
|
+
'!=': (l, r) => l != r,
|
|
112
|
+
'>': (l, r) => l > r,
|
|
113
|
+
'>=': (l, r) => l >= r,
|
|
114
|
+
'<': (l, r) => l < r,
|
|
115
|
+
'<=': (l, r) => l <= r,
|
|
116
|
+
in: (l, r) => typeof r === 'string' ? r.indexOf(l) !== -1 : Array.isArray(r) ? r.some(e => e === l) : false,
|
|
117
|
+
'+': (l, r) => l + r,
|
|
118
|
+
'-': (l, r) => l - r,
|
|
119
|
+
'*': (l, r) => l * r,
|
|
120
|
+
'/': (l, r) => l / r,
|
|
121
|
+
'//': (l, r) => Math.floor(l / r),
|
|
122
|
+
'%': (l, r) => l % r,
|
|
123
|
+
'^': (l, r) => Math.pow(l, r)
|
|
124
|
+
};
|
|
125
|
+
const IDENTIFIER_START = /[\p{L}_$]/u;
|
|
126
|
+
const IDENTIFIER_PART = /[\p{L}\p{N}_$]/u;
|
|
127
|
+
/** A recursive descent parser that compiles to closures: `(context, element) => value`. */
|
|
128
|
+
class ExpressionParser {
|
|
129
|
+
constructor(source, engine) {
|
|
130
|
+
this.source = source;
|
|
131
|
+
this.engine = engine;
|
|
132
|
+
this.index = 0;
|
|
133
|
+
/** Whether the expression being parsed reads `.name`: then a filter keeps the elements it is true for. */
|
|
134
|
+
this.relative = false;
|
|
135
|
+
this.tokens = this.tokenize();
|
|
136
|
+
}
|
|
137
|
+
parse() {
|
|
138
|
+
if (this.peek().type === 'end') {
|
|
139
|
+
return () => undefined;
|
|
140
|
+
}
|
|
141
|
+
const evaluate = this.ternary();
|
|
142
|
+
if (this.peek().type !== 'end') {
|
|
143
|
+
throw this.unexpected();
|
|
144
|
+
}
|
|
145
|
+
return evaluate;
|
|
146
|
+
}
|
|
147
|
+
ternary() {
|
|
148
|
+
const test = this.binary(0);
|
|
149
|
+
if (!this.accept('?')) {
|
|
150
|
+
return test;
|
|
151
|
+
}
|
|
152
|
+
const consequent = this.accept(':') ? undefined : this.ternaryThen();
|
|
153
|
+
const alternate = this.ternary();
|
|
154
|
+
if (!consequent) {
|
|
155
|
+
return (c, e) => test(c, e) || alternate(c, e);
|
|
156
|
+
}
|
|
157
|
+
return (c, e) => test(c, e) ? consequent(c, e) : alternate(c, e);
|
|
158
|
+
}
|
|
159
|
+
ternaryThen() {
|
|
160
|
+
const consequent = this.ternary();
|
|
161
|
+
this.expect(':');
|
|
162
|
+
return consequent;
|
|
163
|
+
}
|
|
164
|
+
/** Operators of `minPrecedence` or more, left to right. */
|
|
165
|
+
binary(minPrecedence) {
|
|
166
|
+
let left = this.unary();
|
|
167
|
+
for (;;) {
|
|
168
|
+
const token = this.peek();
|
|
169
|
+
const precedence = token.type === 'operator' ? PRECEDENCE[token.value] : undefined;
|
|
170
|
+
if (precedence === undefined || precedence < minPrecedence) {
|
|
171
|
+
return left;
|
|
172
|
+
}
|
|
173
|
+
this.index++;
|
|
174
|
+
const l = left;
|
|
175
|
+
const r = this.binary(precedence + 1);
|
|
176
|
+
if (token.value === '&&') {
|
|
177
|
+
left = (c, e) => l(c, e) && r(c, e);
|
|
178
|
+
}
|
|
179
|
+
else if (token.value === '||') {
|
|
180
|
+
left = (c, e) => l(c, e) || r(c, e);
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
const apply = BINARY[token.value];
|
|
184
|
+
left = (c, e) => apply(l(c, e), r(c, e));
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
unary() {
|
|
189
|
+
const token = this.peek();
|
|
190
|
+
if (token.type === 'operator' && (token.value === '!' || token.value === '-')) {
|
|
191
|
+
this.index++;
|
|
192
|
+
const operand = this.unary();
|
|
193
|
+
if (token.value === '!') {
|
|
194
|
+
return (c, e) => !operand(c, e);
|
|
195
|
+
}
|
|
196
|
+
return (c, e) => -operand(c, e);
|
|
197
|
+
}
|
|
198
|
+
return this.postfix(this.primary());
|
|
199
|
+
}
|
|
200
|
+
primary() {
|
|
201
|
+
const token = this.next();
|
|
202
|
+
switch (token.type) {
|
|
203
|
+
case 'number':
|
|
204
|
+
case 'string':
|
|
205
|
+
case 'boolean': {
|
|
206
|
+
const value = token.value;
|
|
207
|
+
return () => value;
|
|
208
|
+
}
|
|
209
|
+
case 'identifier': {
|
|
210
|
+
const name = token.value;
|
|
211
|
+
if (this.accept('(')) {
|
|
212
|
+
const args = this.list(')');
|
|
213
|
+
const { engine, source } = this;
|
|
214
|
+
return (c, e) => engine.call('function', name, args.map(arg => arg(c, e)), source);
|
|
215
|
+
}
|
|
216
|
+
return c => c === null || c === void 0 ? void 0 : c[name];
|
|
217
|
+
}
|
|
218
|
+
case 'punctuation':
|
|
219
|
+
switch (token.value) {
|
|
220
|
+
case '.': {
|
|
221
|
+
const name = this.identifier();
|
|
222
|
+
this.relative = true;
|
|
223
|
+
return (c, e) => e === null || e === void 0 ? void 0 : e[name];
|
|
224
|
+
}
|
|
225
|
+
case '(': {
|
|
226
|
+
const inner = this.ternary();
|
|
227
|
+
this.expect(')');
|
|
228
|
+
return inner;
|
|
229
|
+
}
|
|
230
|
+
case '[': {
|
|
231
|
+
const items = this.list(']');
|
|
232
|
+
return (c, e) => items.map(item => item(c, e));
|
|
233
|
+
}
|
|
234
|
+
case '{':
|
|
235
|
+
return this.object();
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
this.index--;
|
|
239
|
+
throw this.unexpected();
|
|
240
|
+
}
|
|
241
|
+
object() {
|
|
242
|
+
const entries = [];
|
|
243
|
+
while (!this.accept('}')) {
|
|
244
|
+
const key = this.next();
|
|
245
|
+
if (key.type !== 'identifier' && key.type !== 'string') {
|
|
246
|
+
this.index--;
|
|
247
|
+
throw this.unexpected('a key');
|
|
248
|
+
}
|
|
249
|
+
this.expect(':');
|
|
250
|
+
entries.push([key.value, this.ternary()]);
|
|
251
|
+
if (!this.accept(',')) {
|
|
252
|
+
this.expect('}');
|
|
253
|
+
break;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
return (c, e) => {
|
|
257
|
+
const result = {};
|
|
258
|
+
for (const [key, value] of entries) {
|
|
259
|
+
result[key] = value(c, e);
|
|
260
|
+
}
|
|
261
|
+
return result;
|
|
262
|
+
};
|
|
263
|
+
}
|
|
264
|
+
/** `.name`, `[filter]` and `|transform(args)` after an operand. */
|
|
265
|
+
postfix(subject) {
|
|
266
|
+
for (;;) {
|
|
267
|
+
if (this.accept('.')) {
|
|
268
|
+
const name = this.identifier();
|
|
269
|
+
const from = subject;
|
|
270
|
+
subject = (c, e) => {
|
|
271
|
+
let value = from(c, e);
|
|
272
|
+
if (value === undefined || value === null) {
|
|
273
|
+
return undefined;
|
|
274
|
+
}
|
|
275
|
+
if (Array.isArray(value)) {
|
|
276
|
+
value = value[0];
|
|
277
|
+
}
|
|
278
|
+
return value === null || value === void 0 ? void 0 : value[name];
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
else if (this.accept('[')) {
|
|
282
|
+
subject = this.filter(subject);
|
|
283
|
+
}
|
|
284
|
+
else if (this.accept('|')) {
|
|
285
|
+
const name = this.identifier();
|
|
286
|
+
const args = this.accept('(') ? this.list(')') : [];
|
|
287
|
+
const { engine, source } = this;
|
|
288
|
+
const from = subject;
|
|
289
|
+
subject = (c, e) => engine.call('transform', name, [from(c, e), ...args.map(arg => arg(c, e))], source);
|
|
290
|
+
}
|
|
291
|
+
else {
|
|
292
|
+
return subject;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
/**
|
|
297
|
+
* `subject[.x > 1]` keeps the elements the filter is true for; any other `subject[key]` is a property
|
|
298
|
+
* (the subject itself or nothing when the key is a boolean).
|
|
299
|
+
*/
|
|
300
|
+
filter(subject) {
|
|
301
|
+
const outer = this.relative;
|
|
302
|
+
this.relative = false;
|
|
303
|
+
const expression = this.ternary();
|
|
304
|
+
const relative = this.relative;
|
|
305
|
+
this.relative = outer;
|
|
306
|
+
this.expect(']');
|
|
307
|
+
if (relative) {
|
|
308
|
+
return (c, e) => {
|
|
309
|
+
const value = subject(c, e);
|
|
310
|
+
const elements = Array.isArray(value) ? value : value === undefined ? [] : [value];
|
|
311
|
+
return elements.filter(element => expression(c, element));
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
return (c, e) => {
|
|
315
|
+
const value = subject(c, e);
|
|
316
|
+
const key = expression(c, e);
|
|
317
|
+
if (typeof key === 'boolean') {
|
|
318
|
+
return key ? value : undefined;
|
|
319
|
+
}
|
|
320
|
+
return value === undefined || value === null ? undefined : value[key];
|
|
321
|
+
};
|
|
322
|
+
}
|
|
323
|
+
/** Comma separated expressions up to `close`; empty items are skipped, like jexl did. */
|
|
324
|
+
list(close) {
|
|
325
|
+
const items = [];
|
|
326
|
+
while (!this.accept(close)) {
|
|
327
|
+
if (this.accept(',')) {
|
|
328
|
+
continue;
|
|
329
|
+
}
|
|
330
|
+
items.push(this.ternary());
|
|
331
|
+
if (!this.accept(',')) {
|
|
332
|
+
this.expect(close);
|
|
333
|
+
break;
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
return items;
|
|
337
|
+
}
|
|
338
|
+
identifier() {
|
|
339
|
+
const token = this.next();
|
|
340
|
+
if (token.type !== 'identifier') {
|
|
341
|
+
this.index--;
|
|
342
|
+
throw this.unexpected('a name');
|
|
343
|
+
}
|
|
344
|
+
return token.value;
|
|
345
|
+
}
|
|
346
|
+
peek() {
|
|
347
|
+
return this.tokens[this.index];
|
|
348
|
+
}
|
|
349
|
+
next() {
|
|
350
|
+
const token = this.tokens[this.index];
|
|
351
|
+
if (token.type !== 'end') {
|
|
352
|
+
this.index++;
|
|
353
|
+
}
|
|
354
|
+
return token;
|
|
355
|
+
}
|
|
356
|
+
accept(punctuation) {
|
|
357
|
+
const token = this.tokens[this.index];
|
|
358
|
+
if (token.type === 'punctuation' && token.value === punctuation) {
|
|
359
|
+
this.index++;
|
|
360
|
+
return true;
|
|
361
|
+
}
|
|
362
|
+
return false;
|
|
363
|
+
}
|
|
364
|
+
expect(punctuation) {
|
|
365
|
+
if (!this.accept(punctuation)) {
|
|
366
|
+
throw this.unexpected(`'${punctuation}'`);
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
unexpected(expected) {
|
|
370
|
+
var _a;
|
|
371
|
+
var _b;
|
|
372
|
+
const token = this.peek();
|
|
373
|
+
const found = token.type === 'end' ? 'end of expression' : `'${this.source.slice(token.start, (_b = (_a = this.tokens[this.index + 1]) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : this.source.length).trim()}'`;
|
|
374
|
+
return this.syntaxError(token.start, `Unexpected ${found}${expected ? `, expected ${expected}` : ''}`);
|
|
375
|
+
}
|
|
376
|
+
syntaxError(position, message) {
|
|
377
|
+
return new ExpressionSyntaxError({
|
|
378
|
+
code: 'CELL_EL_SYNTAX',
|
|
379
|
+
message: `${message} at position ${position} of: ${this.source}`,
|
|
380
|
+
hint: 'Check quotes, brackets and operators; expressions are names, literals, operators, value|transform and function() calls.',
|
|
381
|
+
expression: this.source,
|
|
382
|
+
position
|
|
383
|
+
});
|
|
384
|
+
}
|
|
385
|
+
tokenize() {
|
|
386
|
+
const source = this.source;
|
|
387
|
+
const tokens = [];
|
|
388
|
+
const isDigit = (c) => c !== undefined && c >= '0' && c <= '9';
|
|
389
|
+
let i = 0;
|
|
390
|
+
while (i < source.length) {
|
|
391
|
+
const c = source[i];
|
|
392
|
+
const start = i;
|
|
393
|
+
if (/\s/.test(c)) {
|
|
394
|
+
i++;
|
|
395
|
+
}
|
|
396
|
+
else if (c === '\'' || c === '"') {
|
|
397
|
+
// Only \<quote> and \\ are escapes; any other backslash is kept (\d stays \d).
|
|
398
|
+
let value = '';
|
|
399
|
+
i++;
|
|
400
|
+
while (i < source.length && source[i] !== c) {
|
|
401
|
+
if (source[i] === '\\' && i + 1 < source.length) {
|
|
402
|
+
const next = source[i + 1];
|
|
403
|
+
value += next === c || next === '\\' ? next : '\\' + next;
|
|
404
|
+
i += 2;
|
|
405
|
+
}
|
|
406
|
+
else {
|
|
407
|
+
value += source[i++];
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
if (i >= source.length) {
|
|
411
|
+
throw this.syntaxError(start, 'Unterminated string');
|
|
412
|
+
}
|
|
413
|
+
i++;
|
|
414
|
+
tokens.push({ type: 'string', value, start });
|
|
415
|
+
}
|
|
416
|
+
else if (isDigit(c)) {
|
|
417
|
+
while (isDigit(source[i])) {
|
|
418
|
+
i++;
|
|
419
|
+
}
|
|
420
|
+
if (source[i] === '.' && isDigit(source[i + 1])) {
|
|
421
|
+
i++;
|
|
422
|
+
while (isDigit(source[i])) {
|
|
423
|
+
i++;
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
tokens.push({ type: 'number', value: parseFloat(source.slice(start, i)), start });
|
|
427
|
+
}
|
|
428
|
+
else if (IDENTIFIER_START.test(c)) {
|
|
429
|
+
while (i < source.length && IDENTIFIER_PART.test(source[i])) {
|
|
430
|
+
i++;
|
|
431
|
+
}
|
|
432
|
+
const word = source.slice(start, i);
|
|
433
|
+
if (word === 'true' || word === 'false') {
|
|
434
|
+
tokens.push({ type: 'boolean', value: word === 'true', start });
|
|
435
|
+
}
|
|
436
|
+
else {
|
|
437
|
+
tokens.push({ type: word === 'in' ? 'operator' : 'identifier', value: word, start });
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
else {
|
|
441
|
+
const operator = OPERATORS.find(op => source.startsWith(op, i));
|
|
442
|
+
if (operator) {
|
|
443
|
+
tokens.push({ type: 'operator', value: operator, start });
|
|
444
|
+
i += operator.length;
|
|
445
|
+
}
|
|
446
|
+
else if (PUNCTUATION.includes(c)) {
|
|
447
|
+
tokens.push({ type: 'punctuation', value: c, start });
|
|
448
|
+
i++;
|
|
449
|
+
}
|
|
450
|
+
else {
|
|
451
|
+
throw this.syntaxError(start, `Unexpected character '${c}'`);
|
|
452
|
+
}
|
|
453
|
+
}
|
|
454
|
+
}
|
|
455
|
+
tokens.push({ type: 'end', value: undefined, start: source.length });
|
|
456
|
+
return tokens;
|
|
457
|
+
}
|
|
458
|
+
}
|
|
459
|
+
//# sourceMappingURL=expression-engine.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expression-engine.js","sourceRoot":"","sources":["../../../src/common/el/expression-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ExpressionHandler, ExpressionContextProvider, ExpressionCompiler, ExpressionContext, ExpressionCompilerOptions } from './expression-protocol.js';
|
|
2
2
|
import { ExpressionUtil } from './expression-util.js';
|
|
3
3
|
/**
|
|
4
4
|
* Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
|
|
@@ -6,7 +6,6 @@ import { ExpressionUtil } from './expression-util.js';
|
|
|
6
6
|
* with the `eval` transform.
|
|
7
7
|
*/
|
|
8
8
|
export declare class ExpressionHandlerImpl implements ExpressionHandler {
|
|
9
|
-
protected readonly jexlEngineProvider: JexlEngineProvider<any>;
|
|
10
9
|
protected readonly expressionContextProvider: ExpressionContextProvider;
|
|
11
10
|
protected readonly expressionCompiler: ExpressionCompiler;
|
|
12
11
|
protected _ctx: ExpressionContext;
|
|
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { Component, Autowired } from '../annotation/index.js';
|
|
11
|
-
import {
|
|
11
|
+
import { ExpressionHandler, ExpressionContextProvider, ExpressionCompiler } from './expression-protocol.js';
|
|
12
12
|
import { ExpressionUtil } from './expression-util.js';
|
|
13
13
|
/**
|
|
14
14
|
* Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
|
|
@@ -37,10 +37,6 @@ let ExpressionHandlerImpl = class ExpressionHandlerImpl {
|
|
|
37
37
|
return { compiler: this.expressionCompiler, compilerOptions };
|
|
38
38
|
}
|
|
39
39
|
};
|
|
40
|
-
__decorate([
|
|
41
|
-
Autowired(JexlEngineProvider),
|
|
42
|
-
__metadata("design:type", Object)
|
|
43
|
-
], ExpressionHandlerImpl.prototype, "jexlEngineProvider", void 0);
|
|
44
40
|
__decorate([
|
|
45
41
|
Autowired(ExpressionContextProvider),
|
|
46
42
|
__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,kBAAkB,EAAgD,MAAM,uBAAuB,CAAC;AACvJ,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;GAIG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAUpB,UAAU,CAAC,GAAuB,EAAE,yBAAqD;QAC/F,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC;QAE1D,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,IAAI,EAAC,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,uBAAuB,CAAA,EAAE,CAAC;YACjF,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACd,cAAc,CAAC,qBAAqB,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,MAAM,CAAC,SAA0B,EAAE,GAAuB,EAAE,yBAAqD;QAC7G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;QACtE,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,OAAO,CAAC,eAA2C;QACzD,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,eAAe,EAAE,CAAC;IAClE,CAAC;CAEJ,CAAA;AA/BsB;IADlB,SAAS,CAAC,yBAAyB,CAAC;;wEACmC;AAGrD;IADlB,SAAS,CAAC,kBAAkB,CAAC;;iEAC4B;AANjD,qBAAqB;IADjC,SAAS,CAAC,iBAAiB,CAAC;GAChB,qBAAqB,CAkCjC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import type { Expression } from './expression-engine.js';
|
|
1
2
|
export declare const ExpressionCompiler: unique symbol;
|
|
2
3
|
export declare const ExpressionHandler: unique symbol;
|
|
3
4
|
export declare const ContextInitializer: unique symbol;
|
|
4
5
|
export declare const ExpressionContextProvider: unique symbol;
|
|
5
|
-
|
|
6
|
+
/** Splits a text into literal sections and compiled `${...}` expressions. */
|
|
6
7
|
export interface ExpressionCompiler {
|
|
7
|
-
compileSections(text: string, options?: ExpressionCompilerOptions):
|
|
8
|
+
compileSections(text: string, options?: ExpressionCompilerOptions): (string | Expression)[];
|
|
8
9
|
}
|
|
9
10
|
export interface ExpressionHandler {
|
|
10
11
|
handle(text: string | Object, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any;
|
|
@@ -27,6 +28,3 @@ export interface ContextInitializer {
|
|
|
27
28
|
export interface ExpressionContextProvider {
|
|
28
29
|
provide(): ExpressionContext;
|
|
29
30
|
}
|
|
30
|
-
export interface JexlEngineProvider<T> {
|
|
31
|
-
provide(): T;
|
|
32
|
-
}
|
|
@@ -2,5 +2,4 @@ export const ExpressionCompiler = Symbol('ExpressionCompiler');
|
|
|
2
2
|
export const ExpressionHandler = Symbol('ExpressionHandler');
|
|
3
3
|
export const ContextInitializer = Symbol('ContextInitializer');
|
|
4
4
|
export const ExpressionContextProvider = Symbol('ExpressionContextProvider');
|
|
5
|
-
export const JexlEngineProvider = Symbol('JexlEngineProvider');
|
|
6
5
|
//# sourceMappingURL=expression-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-protocol.js","sourceRoot":"","sources":["../../../src/common/el/expression-protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"expression-protocol.js","sourceRoot":"","sources":["../../../src/common/el/expression-protocol.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC"}
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import { ExpressionCompiler, ExpressionCompilerOptions, ExpressionContext } from './expression-protocol.js';
|
|
2
|
+
import { Expression, ExpressionEngine } from './expression-engine.js';
|
|
2
3
|
interface MiddleExpression {
|
|
3
|
-
expression:
|
|
4
|
+
expression: string | Expression;
|
|
4
5
|
nextText?: string;
|
|
5
6
|
}
|
|
6
7
|
/**
|
|
7
|
-
* Splits a text into literal sections and compiled `${...}` expressions
|
|
8
|
+
* Splits a text into literal sections and compiled `${...}` expressions. It has no dependency
|
|
8
9
|
* injection, so the build (@celljs/vite) and the runtime share it through `@celljs/core/el`.
|
|
9
10
|
*/
|
|
10
11
|
export declare class ExpressionSectionCompiler implements ExpressionCompiler {
|
|
11
|
-
protected readonly
|
|
12
|
-
protected static
|
|
13
|
-
/** @param
|
|
14
|
-
constructor(
|
|
12
|
+
protected readonly engine: () => ExpressionEngine;
|
|
13
|
+
protected static defaultEngine?: ExpressionEngine;
|
|
14
|
+
/** @param engine the runtime passes the ExpressionEngine of its container, which has the transforms */
|
|
15
|
+
constructor(engine?: () => ExpressionEngine);
|
|
15
16
|
private ESCAPE_CHAR;
|
|
16
17
|
private SPECIAL_CHAR;
|
|
17
18
|
private BRACKET_BEGIN;
|
|
18
19
|
private BRACKET_END;
|
|
19
20
|
protected getSpecialChar(opitons: Required<ExpressionCompilerOptions>): string;
|
|
20
21
|
protected equalsSpecialChar(opitons: Required<ExpressionCompilerOptions>, char: string): boolean;
|
|
21
|
-
compileSections(text: string, options: ExpressionCompilerOptions):
|
|
22
|
+
compileSections(text: string, options: ExpressionCompilerOptions): (string | Expression)[];
|
|
22
23
|
protected middleCompile(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
|
|
23
24
|
protected nextMiddleExpression(text: string, bracketBeginCharNum: number | undefined, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
|
|
24
25
|
protected nextString(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression;
|
|
@@ -40,7 +41,7 @@ export declare class ExpressionError extends Error {
|
|
|
40
41
|
*/
|
|
41
42
|
export declare namespace ExpressionUtil {
|
|
42
43
|
interface Options {
|
|
43
|
-
/** Defaults to an {@link ExpressionSectionCompiler} on a plain
|
|
44
|
+
/** Defaults to an {@link ExpressionSectionCompiler} on a plain {@link ExpressionEngine} (no transforms). */
|
|
44
45
|
compiler?: ExpressionCompiler;
|
|
45
46
|
compilerOptions?: ExpressionCompilerOptions;
|
|
46
47
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ExpressionEngine } from './expression-engine.js';
|
|
2
2
|
/**
|
|
3
|
-
* Splits a text into literal sections and compiled `${...}` expressions
|
|
3
|
+
* Splits a text into literal sections and compiled `${...}` expressions. It has no dependency
|
|
4
4
|
* injection, so the build (@celljs/vite) and the runtime share it through `@celljs/core/el`.
|
|
5
5
|
*/
|
|
6
6
|
export class ExpressionSectionCompiler {
|
|
7
|
-
/** @param
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
7
|
+
/** @param engine the runtime passes the ExpressionEngine of its container, which has the transforms */
|
|
8
|
+
constructor(engine = () => { var _a; return ((_a = ExpressionSectionCompiler.defaultEngine) !== null && _a !== void 0 ? _a : (ExpressionSectionCompiler.defaultEngine = new ExpressionEngine())); }) {
|
|
9
|
+
this.engine = engine;
|
|
10
10
|
this.ESCAPE_CHAR = '\\';
|
|
11
11
|
this.SPECIAL_CHAR = '$';
|
|
12
12
|
this.BRACKET_BEGIN = '{';
|
|
@@ -99,8 +99,7 @@ export class ExpressionSectionCompiler {
|
|
|
99
99
|
}
|
|
100
100
|
else if (options.bracketEnd === c) {
|
|
101
101
|
if (bracketBeginCharFound === 0 && bracketBeginCharNum === 1) {
|
|
102
|
-
const
|
|
103
|
-
const expression = jexlEngine.createExpression(section.join(''));
|
|
102
|
+
const expression = this.engine().compile(section.join(''));
|
|
104
103
|
let nextText;
|
|
105
104
|
if (i !== text.length - 1) {
|
|
106
105
|
nextText = text.substring(i + 1);
|
|
@@ -208,9 +207,9 @@ export var ExpressionUtil;
|
|
|
208
207
|
}
|
|
209
208
|
const c = typeof context === 'function' ? context() : context;
|
|
210
209
|
if (sections.length === 1) {
|
|
211
|
-
return sections[0].
|
|
210
|
+
return sections[0].evaluate(c);
|
|
212
211
|
}
|
|
213
|
-
return sections.map(section => (typeof section === 'string' ? section : section.
|
|
212
|
+
return sections.map(section => (typeof section === 'string' ? section : section.evaluate(c))).join('');
|
|
214
213
|
}
|
|
215
214
|
ExpressionUtil.evaluateText = evaluateText;
|
|
216
215
|
/**
|