From 269963563f6cacd63efc5f69accc5c276371bd70 Mon Sep 17 00:00:00 2001 From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com> Date: Mon, 20 May 2024 10:51:08 +0200 Subject: [PATCH] Changed package name from groowt.view.web to groowt.view.component.web. --- web-view-components/build.gradle | 4 +-- .../asciidoc/componentTemplateSpec.asciidoc | 2 +- .../sketching/groovy/sketching/Greeter.groovy | 2 +- .../groovy/sketching/Greeters.groovy | 2 +- .../groovy/sketching/SimpleGreeter.wvc | 2 +- .../main/antlr/WebViewComponentsLexerBase.g4 | 2 +- .../web/BaseWebViewComponent.groovy | 2 +- .../web/DefaultWebViewComponentContext.groovy | 2 +- .../web/DefaultWebViewComponentScope.groovy | 8 +++--- .../web/WebViewComponentFactories.groovy | 2 +- .../web/lib/DelegatingWebViewComponent.java | 4 +-- .../view/{ => component}/web/lib/Echo.groovy | 2 +- .../{ => component}/web/lib/Fragment.groovy | 4 +-- .../view/component/web/lib/HtmlPage.groovy | 6 ++++ .../web/lib/IntrinsicHtml.groovy | 4 +-- .../web/util/ComponentConfigurator.groovy | 8 +++--- .../web/util/ConfigurableComponent.groovy | 4 +-- .../web/util/ContextConfigurator.groovy | 8 +++--- .../{ => component}/web/util/WithHtml.groovy | 2 +- .../groowt/view/web/lib/HtmlPage.groovy | 6 ---- .../web/AbstractWebViewComponent.java | 4 +-- .../web/ChildRenderException.java | 2 +- .../{ => component}/web/WebViewComponent.java | 2 +- .../web/WebViewComponentBugError.java | 2 +- .../web/WebViewComponentContext.java | 2 +- .../web/WebViewComponentScope.java | 2 +- .../MismatchedComponentTypeAnalysis.kt | 8 +++--- .../antlr/AbstractWebViewComponentsLexer.java | 4 +-- .../{ => component}/web/antlr/AntlrUtil.java | 2 +- .../web/antlr/GroovyTokenSourceIterable.kt | 2 +- .../web/antlr/LexerSemanticPredicates.kt | 2 +- .../{ => component}/web/antlr/LexerUtil.kt | 2 +- .../web/antlr/MergedGroovyCodeToken.kt | 6 ++-- .../web/antlr/PairCounter.java | 4 +-- .../{ => component}/web/antlr/ParserUtil.kt | 4 +-- .../web/antlr/SimplePairCounter.kt | 2 +- .../{ => component}/web/antlr/TokenList.java | 6 ++-- .../{ => component}/web/antlr/TokenUtil.kt | 6 ++-- .../web/antlr/WebViewComponentsLexer.java | 4 +-- .../web/antlr/WebViewComponentsTokenStream.kt | 2 +- .../{ => component}/web/ast/AstBuilder.java | 8 +++--- .../web/ast/DefaultAstBuilder.java | 4 +-- .../web/ast/DefaultAstBuilderVisitor.java | 14 +++++----- .../web/ast/DefaultNodeFactory.java | 10 +++---- .../{ => component}/web/ast/NodeFactory.java | 6 ++-- .../{ => component}/web/ast/NodeUtil.java | 12 ++++---- .../view/{ => component}/web/ast/NodeUtil.kt | 10 +++---- .../web/ast/extension/ExtensionUtil.java | 4 +-- .../ast/extension/GStringNodeExtension.java | 4 +-- .../ast/extension/GStringPathExtension.java | 10 +++---- .../extension/GStringScriptletExtension.java | 8 +++--- .../extension/GroovyCodeNodeExtension.java | 8 +++--- .../web/ast/extension/HasExtensionOneOf.java | 2 +- .../web/ast/extension/HasExtensions.java | 2 +- .../extension/IterableHasExtensionOneOf.java | 2 +- .../ast/extension/IterableHasExtensions.java | 2 +- .../web/ast/extension/NodeExtension.java | 7 +++++ .../ast/extension/NodeExtensionContainer.java | 4 +-- .../ast/extension/NodeExtensionFactory.java | 4 +-- .../web/ast/extension/SelfNode.java | 2 +- .../extension/SelfNodeRegistryExtension.java | 4 +-- .../SimpleNodeExtensionContainer.java | 6 ++-- .../extension/SimpleNodeExtensionFactory.java | 6 ++-- .../web/ast/node/AbstractLeafNode.java | 10 +++---- .../web/ast/node/AbstractTreeNode.java | 8 +++--- .../web/ast/node/AttrNode.java | 6 ++-- .../web/ast/node/BodyChildNode.java | 4 +-- .../web/ast/node/BodyNode.java | 6 ++-- .../web/ast/node/BooleanValueAttrNode.java | 6 ++-- .../web/ast/node/ClassComponentTypeNode.java | 8 +++--- .../web/ast/node/ClosureValueNode.java | 10 +++---- .../web/ast/node/CompilationUnitNode.java | 6 ++-- .../web/ast/node/ComponentArgsNode.java | 6 ++-- .../ast/node/ComponentConstructorNode.java | 10 +++---- .../web/ast/node/ComponentNode.java | 6 ++-- .../web/ast/node/ComponentTypeNode.java | 8 +++--- .../web/ast/node/ComponentValueNode.java | 6 ++-- .../web/ast/node/DollarReferenceNode.java | 10 +++---- .../web/ast/node/DollarScriptletNode.java | 10 +++---- .../web/ast/node/EmptyClosureValueNode.java | 8 +++--- .../web/ast/node/FragmentComponentNode.java | 6 ++-- .../web/ast/node/GStringBodyTextNode.java | 8 +++--- .../web/ast/node/GStringValueNode.java | 10 +++---- .../web/ast/node/JStringBodyTextNode.java | 6 ++-- .../web/ast/node/JStringValueNode.java | 6 ++-- .../{ => component}/web/ast/node/KeyNode.java | 8 +++--- .../web/ast/node/KeyValueAttrNode.java | 6 ++-- .../web/ast/node/LeafNode.java | 2 +- .../{ => component}/web/ast/node/Node.java | 12 ++++---- .../web/ast/node/PlainScriptletNode.java | 10 +++---- .../web/ast/node/PreambleNode.java | 10 +++---- .../web/ast/node/StringComponentTypeNode.java | 8 +++--- .../web/ast/node/TreeNode.java | 2 +- .../web/ast/node/TypedComponentNode.java | 6 ++-- .../web/ast/node/ValueNode.java | 2 +- .../compiler/AnonymousWebViewComponent.java | 4 +-- ...faultWebViewComponentTemplateCompiler.java | 18 ++++++------ ...ebViewComponentCompileErrorsException.java | 2 +- ...ViewComponentTemplateCompileException.java | 6 ++-- .../WebViewComponentTemplateCompileUnit.java | 2 +- .../WebViewComponentTemplateCompiler.java | 2 +- .../groovyc/DelegatingWvcParserPlugin.java | 28 +++++++++---------- .../web/groovyc/WvcParserPluginFactory.java | 2 +- .../runtime/DefaultSourceMapDeserializer.java | 10 +++---- .../runtime/DefaultWebViewRenderContext.java | 4 +-- .../WebViewComponentRenderContext.java | 4 +-- .../AppendOrAddStatementFactory.java | 6 ++-- .../web/transpile/BodyTranspiler.java | 8 +++--- .../web/transpile/ComponentTranspiler.java | 6 ++-- .../DefaultAppendOrAddStatementFactory.java | 6 ++-- .../web/transpile/DefaultBodyTranspiler.java | 8 +++--- .../transpile/DefaultComponentTranspiler.java | 19 +++++++------ .../transpile/DefaultGStringTranspiler.java | 24 ++++++++-------- .../transpile/DefaultGroovyTranspiler.java | 28 +++++++++---------- .../transpile/DefaultJStringTranspiler.java | 6 ++-- .../transpile/DefaultSourceMapSerializer.java | 4 +-- .../DefaultTranspilerConfiguration.java | 4 +-- .../transpile/DefaultValueNodeTranspiler.java | 14 +++++----- .../web/transpile/GStringTranspiler.java | 4 +-- .../web/transpile/GroovyTranspiler.java | 6 ++-- .../web/transpile/JStringTranspiler.java | 6 ++-- .../web/transpile/PositionSetter.java | 6 ++-- .../web/transpile/SimplePositionSetter.java | 8 +++--- .../web/transpile/SourceMap.java | 4 +-- .../web/transpile/SourceMapDeserializer.java | 2 +- .../web/transpile/SourceMapSerializer.java | 2 +- .../transpile/TranspilerConfiguration.java | 2 +- .../web/transpile/TranspilerUtil.java | 10 +++---- .../web/transpile/ValueNodeTranspiler.java | 6 ++-- .../transpile/WebViewComponentModuleNode.java | 2 +- .../WebViewComponentReaderSource.java | 4 +-- .../transpile/WebViewComponentSourceUnit.java | 2 +- .../transpile/groovy/GroovyPrettyPrinter.java | 2 +- .../web/transpile/groovy/GroovyUtil.java | 4 +-- .../web/transpile/groovy/GroovyUtil.kt | 2 +- .../CachingComponentClassNodeResolver.java | 6 ++-- ...ClassLoaderComponentClassNodeResolver.java | 4 +-- .../resolve/ComponentClassNodeResolver.java | 6 ++-- .../ModuleNodeComponentClassNodeResolver.java | 4 +-- .../web/transpile/resolve/ResolveUtil.java | 2 +- .../web/util/AbstractClosedRange.java | 2 +- .../{ => component}/web/util/ClosedRange.java | 2 +- .../web/util/ComparableClosedRange.java | 2 +- .../web/util/ComparatorClosedRange.java | 2 +- .../{ => component}/web/util/EmptyRange.java | 2 +- .../web/util/EmptyTokenRange.java | 2 +- .../web/util/FilteringIterable.java | 2 +- .../web/util/FilteringIterator.java | 2 +- .../web/util/MappingIterable.java | 2 +- .../web/util/MappingIterator.java | 2 +- .../{ => component}/web/util/OpenRange.java | 2 +- .../view/{ => component}/web/util/Range.java | 2 +- .../web/util/RangeIterator.java | 2 +- .../web/util/SimpleRangeIterator.java | 2 +- .../web/util/SimpleTokenRange.java | 2 +- .../web/util/SourcePosition.java | 2 +- .../{ => component}/web/util/TokenRange.java | 4 +-- .../view/web/ast/extension/NodeExtension.java | 7 ----- .../groovyc/GroovycConfigurationScript.groovy | 3 ++ .../web/lib/EchoTemplateNoChildren.gst | 0 .../web/lib/EchoTemplateWithChildren.gst | 0 .../groovyc/GroovycConfigurationScript.groovy | 1 - .../web/BaseWebViewComponentTests.groovy | 4 +-- .../web/SimpleWebViewComponentTests.groovy | 4 +-- .../antlr/WebViewComponentsLexerTests.java | 4 +-- .../antlr/WebViewComponentsParserTests.java | 2 +- .../WebViewComponentsTokenStreamTests.groovy | 8 +++--- .../web/ast/DefaultAstBuilderTests.java | 6 ++-- .../ast/DefaultAstBuilderVisitorTests.groovy | 14 +++++----- .../web/ast/DefaultNodeFactoryTests.java | 4 +-- .../{ => component}/web/lib/EchoTests.groovy | 2 +- .../web/lib/FragmentTests.groovy | 8 +++--- .../web/lib/IntrinsicHtmlTests.groovy | 3 +- .../DefaultBodyTranspilerTests.java | 10 +++---- .../DefaultGStringTranspilerTests.java | 10 +++---- .../DefaultGroovyTranspilerTests.java | 6 ++-- .../transpiler/resolve/ResolveUtilTests.java | 4 +-- .../web/antlr/mergesGroovyTokens.gst | 0 .../lib/AbstractWebViewComponentTests.groovy | 4 +-- .../web/lib/WithContext.groovy | 8 +++--- .../web/ast/AstBuilderTests.java | 6 ++-- .../web/ast/NodeFactoryTests.java | 8 +++--- .../web/transpiler/BodyTranspilerTests.java | 22 +++++++-------- .../transpiler/GStringTranspilerTests.java | 18 ++++++------ .../web/transpiler/GroovyTranspilerTests.java | 22 +++++++-------- .../web/tools/AbstractTreeFileMaker.groovy | 2 +- .../web/tools/AstFileMaker.groovy | 22 +++++++-------- .../web/tools/AstFileMakerCli.groovy | 2 +- .../web/tools/ConvertToGroovy.groovy | 6 ++-- .../web/tools/ParseTreeFileMaker.groovy | 8 ++++-- .../web/tools/ParseTreeFileMakerCli.groovy | 2 +- .../web/tools/RunTemplate.groovy | 10 +++---- .../web/tools/SourceFileProcessor.groovy | 2 +- .../web/tools/SourceFileProcessorSpec.groovy | 2 +- .../web/tools/inspectNodes.groovy | 6 ++-- .../{ => component}/web/tools/LexerTool.kt | 6 ++-- .../{ => component}/web/tools/ParserTool.kt | 10 +++---- .../{ => component}/web/tools/ToolUtil.kt | 2 +- 198 files changed, 566 insertions(+), 560 deletions(-) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/BaseWebViewComponent.groovy (97%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/DefaultWebViewComponentContext.groovy (93%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/DefaultWebViewComponentScope.groovy (80%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/WebViewComponentFactories.groovy (95%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/lib/DelegatingWebViewComponent.java (80%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/lib/Echo.groovy (96%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/lib/Fragment.groovy (70%) create mode 100644 web-view-components/src/main/groovy/groowt/view/component/web/lib/HtmlPage.groovy rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/lib/IntrinsicHtml.groovy (96%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/util/ComponentConfigurator.groovy (76%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/util/ConfigurableComponent.groovy (85%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/util/ContextConfigurator.groovy (76%) rename web-view-components/src/main/groovy/groowt/view/{ => component}/web/util/WithHtml.groovy (95%) delete mode 100644 web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy rename web-view-components/src/main/java/groowt/view/{ => component}/web/AbstractWebViewComponent.java (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ChildRenderException.java (80%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/WebViewComponent.java (92%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/WebViewComponentBugError.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/WebViewComponentContext.java (78%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/WebViewComponentScope.java (84%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/analysis/MismatchedComponentTypeAnalysis.kt (89%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/AbstractWebViewComponentsLexer.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/AntlrUtil.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/GroovyTokenSourceIterable.kt (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/LexerSemanticPredicates.kt (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/LexerUtil.kt (83%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/MergedGroovyCodeToken.kt (86%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/PairCounter.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/ParserUtil.kt (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/SimplePairCounter.kt (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/TokenList.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/TokenUtil.kt (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/WebViewComponentsLexer.java (91%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/antlr/WebViewComponentsTokenStream.kt (99%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/AstBuilder.java (56%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/DefaultAstBuilder.java (82%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/DefaultAstBuilderVisitor.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/DefaultNodeFactory.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/NodeFactory.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/NodeUtil.java (87%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/NodeUtil.kt (71%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/ExtensionUtil.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/GStringNodeExtension.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/GStringPathExtension.java (69%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/GStringScriptletExtension.java (63%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/GroovyCodeNodeExtension.java (85%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/HasExtensionOneOf.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/HasExtensions.java (87%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/IterableHasExtensionOneOf.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/IterableHasExtensions.java (88%) create mode 100644 web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtension.java rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/NodeExtensionContainer.java (73%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/NodeExtensionFactory.java (63%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/SelfNode.java (87%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/SelfNodeRegistryExtension.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/SimpleNodeExtensionContainer.java (89%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/extension/SimpleNodeExtensionFactory.java (91%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/AbstractLeafNode.java (86%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/AbstractTreeNode.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/AttrNode.java (76%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/BodyChildNode.java (82%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/BodyNode.java (83%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/BooleanValueAttrNode.java (72%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ClassComponentTypeNode.java (77%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ClosureValueNode.java (83%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/CompilationUnitNode.java (84%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ComponentArgsNode.java (90%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ComponentConstructorNode.java (84%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ComponentNode.java (79%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ComponentTypeNode.java (77%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ComponentValueNode.java (79%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/DollarReferenceNode.java (74%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/DollarScriptletNode.java (75%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/EmptyClosureValueNode.java (80%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/FragmentComponentNode.java (78%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/GStringBodyTextNode.java (80%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/GStringValueNode.java (81%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/JStringBodyTextNode.java (76%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/JStringValueNode.java (76%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/KeyNode.java (71%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/KeyValueAttrNode.java (78%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/LeafNode.java (55%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/Node.java (57%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/PlainScriptletNode.java (83%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/PreambleNode.java (81%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/StringComponentTypeNode.java (69%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/TreeNode.java (85%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/TypedComponentNode.java (79%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/ast/node/ValueNode.java (82%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/AnonymousWebViewComponent.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/DefaultWebViewComponentTemplateCompiler.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/MultipleWebViewComponentCompileErrorsException.java (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/WebViewComponentTemplateCompileException.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/WebViewComponentTemplateCompileUnit.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/compiler/WebViewComponentTemplateCompiler.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/groovyc/DelegatingWvcParserPlugin.java (91%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/groovyc/WvcParserPluginFactory.java (89%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/runtime/DefaultSourceMapDeserializer.java (84%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/runtime/DefaultWebViewRenderContext.java (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/runtime/WebViewComponentRenderContext.java (89%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/AppendOrAddStatementFactory.java (75%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/BodyTranspiler.java (68%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/ComponentTranspiler.java (57%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultAppendOrAddStatementFactory.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultBodyTranspiler.java (92%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultComponentTranspiler.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultGStringTranspiler.java (92%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultGroovyTranspiler.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultJStringTranspiler.java (90%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultSourceMapSerializer.java (90%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultTranspilerConfiguration.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/DefaultValueNodeTranspiler.java (91%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/GStringTranspiler.java (61%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/GroovyTranspiler.java (73%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/JStringTranspiler.java (64%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/PositionSetter.java (67%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/SimplePositionSetter.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/SourceMap.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/SourceMapDeserializer.java (78%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/SourceMapSerializer.java (70%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/TranspilerConfiguration.java (77%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/TranspilerUtil.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/ValueNodeTranspiler.java (53%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/WebViewComponentModuleNode.java (99%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/WebViewComponentReaderSource.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/WebViewComponentSourceUnit.java (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/groovy/GroovyPrettyPrinter.java (99%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/groovy/GroovyUtil.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/groovy/GroovyUtil.kt (79%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/resolve/CachingComponentClassNodeResolver.java (91%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/resolve/ClassLoaderComponentClassNodeResolver.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/resolve/ComponentClassNodeResolver.java (84%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/resolve/ModuleNodeComponentClassNodeResolver.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/transpile/resolve/ResolveUtil.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/AbstractClosedRange.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/ClosedRange.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/ComparableClosedRange.java (92%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/ComparatorClosedRange.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/EmptyRange.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/EmptyTokenRange.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/FilteringIterable.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/FilteringIterator.java (98%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/MappingIterable.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/MappingIterator.java (94%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/OpenRange.java (95%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/Range.java (80%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/RangeIterator.java (88%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/SimpleRangeIterator.java (96%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/SimpleTokenRange.java (93%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/SourcePosition.java (97%) rename web-view-components/src/main/java/groowt/view/{ => component}/web/util/TokenRange.java (91%) delete mode 100644 web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java create mode 100644 web-view-components/src/main/resources/groowt/view/component/web/groovyc/GroovycConfigurationScript.groovy rename web-view-components/src/main/resources/groowt/view/{ => component}/web/lib/EchoTemplateNoChildren.gst (100%) rename web-view-components/src/main/resources/groowt/view/{ => component}/web/lib/EchoTemplateWithChildren.gst (100%) delete mode 100644 web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/BaseWebViewComponentTests.groovy (93%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/SimpleWebViewComponentTests.groovy (93%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/antlr/WebViewComponentsLexerTests.java (93%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/antlr/WebViewComponentsParserTests.java (99%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/antlr/WebViewComponentsTokenStreamTests.groovy (88%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/ast/DefaultAstBuilderTests.java (87%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/ast/DefaultAstBuilderVisitorTests.groovy (86%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/ast/DefaultNodeFactoryTests.java (84%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/lib/EchoTests.groovy (93%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/lib/FragmentTests.groovy (82%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/lib/IntrinsicHtmlTests.groovy (93%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/transpiler/DefaultBodyTranspilerTests.java (54%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/transpiler/DefaultGStringTranspilerTests.java (51%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/transpiler/DefaultGroovyTranspilerTests.java (71%) rename web-view-components/src/test/groovy/groowt/view/{ => component}/web/transpiler/resolve/ResolveUtilTests.java (75%) rename web-view-components/src/test/resources/groowt/view/{ => component}/web/antlr/mergesGroovyTokens.gst (100%) rename web-view-components/src/testFixtures/groovy/groowt/view/{ => component}/web/lib/AbstractWebViewComponentTests.groovy (91%) rename web-view-components/src/testFixtures/groovy/groowt/view/{ => component}/web/lib/WithContext.groovy (71%) rename web-view-components/src/testFixtures/java/groowt/view/{ => component}/web/ast/AstBuilderTests.java (95%) rename web-view-components/src/testFixtures/java/groowt/view/{ => component}/web/ast/NodeFactoryTests.java (97%) rename web-view-components/src/testFixtures/java/groowt/view/{ => component}/web/transpiler/BodyTranspilerTests.java (86%) rename web-view-components/src/testFixtures/java/groowt/view/{ => component}/web/transpiler/GStringTranspilerTests.java (85%) rename web-view-components/src/testFixtures/java/groowt/view/{ => component}/web/transpiler/GroovyTranspilerTests.java (78%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/AbstractTreeFileMaker.groovy (96%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/AstFileMaker.groovy (86%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/AstFileMakerCli.groovy (95%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/ConvertToGroovy.groovy (95%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/ParseTreeFileMaker.groovy (90%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/ParseTreeFileMakerCli.groovy (95%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/RunTemplate.groovy (87%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/SourceFileProcessor.groovy (69%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/SourceFileProcessorSpec.groovy (98%) rename web-view-components/src/tools/groovy/groowt/view/{ => component}/web/tools/inspectNodes.groovy (88%) rename web-view-components/src/tools/kotlin/groowt/view/{ => component}/web/tools/LexerTool.kt (64%) rename web-view-components/src/tools/kotlin/groowt/view/{ => component}/web/tools/ParserTool.kt (57%) rename web-view-components/src/tools/kotlin/groowt/view/{ => component}/web/tools/ToolUtil.kt (98%) diff --git a/web-view-components/build.gradle b/web-view-components/build.gradle index 1681d4b..3f65f61 100644 --- a/web-view-components/build.gradle +++ b/web-view-components/build.gradle @@ -97,8 +97,8 @@ java { } ext { - antlrPackageName = 'groowt.view.web.antlr' - toolsPackageName = 'groowt.view.web.tools' + antlrPackageName = 'groowt.view.component.web.antlr' + toolsPackageName = 'groowt.view.component.web.tools' } groowtAntlr { diff --git a/web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc b/web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc index babdbdf..060463a 100644 --- a/web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc +++ b/web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc @@ -11,7 +11,7 @@ package com.jessebrault.website import groowt.view.component.ComponentTemplate import groowt.view.component.context.ComponentContext import groowt.view.component.runtime.* -import groowt.view.web.WebViewComponent +import groowt.view.component.web.WebViewComponent import groowt.view.web.lib.* import groowt.view.web.runtime.* diff --git a/web-view-components/sketching/groovy/sketching/Greeter.groovy b/web-view-components/sketching/groovy/sketching/Greeter.groovy index f5266af..ee6e8d0 100644 --- a/web-view-components/sketching/groovy/sketching/Greeter.groovy +++ b/web-view-components/sketching/groovy/sketching/Greeter.groovy @@ -1,6 +1,6 @@ package sketching -import groowt.view.web.BaseWebViewComponent +import groowt.view.component.web.BaseWebViewComponent class Greeter extends BaseWebViewComponent { diff --git a/web-view-components/sketching/groovy/sketching/Greeters.groovy b/web-view-components/sketching/groovy/sketching/Greeters.groovy index 3123193..d5d561d 100644 --- a/web-view-components/sketching/groovy/sketching/Greeters.groovy +++ b/web-view-components/sketching/groovy/sketching/Greeters.groovy @@ -1,6 +1,6 @@ package sketching -import groowt.view.web.BaseWebViewComponent +import groowt.view.component.web.BaseWebViewComponent class Greeters { diff --git a/web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc b/web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc index ee2ee55..2b4d83f 100644 --- a/web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc +++ b/web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc @@ -1,7 +1,7 @@ --- package sketching -import groowt.view.web.BaseWebViewComponent +import groowt.view.component.web.BaseWebViewComponent class Greeter extends BaseWebViewComponent { String target diff --git a/web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 b/web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 index 13b86be..ec068ba 100644 --- a/web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 +++ b/web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 @@ -17,7 +17,7 @@ tokens { @header { import java.util.Set; - import static groowt.view.web.antlr.LexerSemanticPredicates.*; + import static groowt.view.component.web.antlr.LexerSemanticPredicates.*; } @members { diff --git a/web-view-components/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/BaseWebViewComponent.groovy similarity index 97% rename from web-view-components/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/BaseWebViewComponent.groovy index be84900..ac405ed 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/BaseWebViewComponent.groovy @@ -1,4 +1,4 @@ -package groowt.view.web +package groowt.view.component.web import groowt.view.component.AbstractViewComponent import groowt.view.component.ComponentTemplate diff --git a/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentContext.groovy similarity index 93% rename from web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentContext.groovy index 9b3d3cf..3a5d3d7 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentContext.groovy @@ -1,4 +1,4 @@ -package groowt.view.web +package groowt.view.component.web import groowt.view.component.context.ComponentScope import groowt.view.component.context.DefaultComponentContext diff --git a/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentScope.groovy similarity index 80% rename from web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentScope.groovy index 64bd00f..e73bc43 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/DefaultWebViewComponentScope.groovy @@ -1,11 +1,11 @@ -package groowt.view.web +package groowt.view.component.web import groowt.view.component.context.DefaultComponentScope -import groowt.view.web.lib.Echo -import groowt.view.web.lib.IntrinsicHtml +import groowt.view.component.web.lib.Echo +import groowt.view.component.web.lib.IntrinsicHtml import org.codehaus.groovy.runtime.InvokerHelper -import static groowt.view.web.WebViewComponentFactories.withAttr +import static WebViewComponentFactories.withAttr class DefaultWebViewComponentScope extends DefaultComponentScope implements WebViewComponentScope { diff --git a/web-view-components/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/WebViewComponentFactories.groovy similarity index 95% rename from web-view-components/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/WebViewComponentFactories.groovy index 86caa7d..f6d288d 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/WebViewComponentFactories.groovy @@ -1,4 +1,4 @@ -package groowt.view.web +package groowt.view.component.web import groovy.transform.stc.ClosureParams import groovy.transform.stc.FromString diff --git a/web-view-components/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java b/web-view-components/src/main/groovy/groowt/view/component/web/lib/DelegatingWebViewComponent.java similarity index 80% rename from web-view-components/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java rename to web-view-components/src/main/groovy/groowt/view/component/web/lib/DelegatingWebViewComponent.java index 3b65e31..f4f9830 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java +++ b/web-view-components/src/main/groovy/groowt/view/component/web/lib/DelegatingWebViewComponent.java @@ -1,7 +1,7 @@ -package groowt.view.web.lib; +package groowt.view.component.web.lib; import groowt.view.View; -import groowt.view.web.BaseWebViewComponent; +import groowt.view.component.web.BaseWebViewComponent; import java.io.IOException; import java.io.Writer; diff --git a/web-view-components/src/main/groovy/groowt/view/web/lib/Echo.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/lib/Echo.groovy similarity index 96% rename from web-view-components/src/main/groovy/groowt/view/web/lib/Echo.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/lib/Echo.groovy index 416e21e..52a5ebf 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/lib/Echo.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/lib/Echo.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib import groowt.view.View import groowt.view.component.runtime.DefaultComponentWriter diff --git a/web-view-components/src/main/groovy/groowt/view/web/lib/Fragment.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/lib/Fragment.groovy similarity index 70% rename from web-view-components/src/main/groovy/groowt/view/web/lib/Fragment.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/lib/Fragment.groovy index 7c6431b..557078e 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/lib/Fragment.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/lib/Fragment.groovy @@ -1,6 +1,6 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib -import groowt.view.web.BaseWebViewComponent +import groowt.view.component.web.BaseWebViewComponent final class Fragment extends BaseWebViewComponent { diff --git a/web-view-components/src/main/groovy/groowt/view/component/web/lib/HtmlPage.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/lib/HtmlPage.groovy new file mode 100644 index 0000000..8e08480 --- /dev/null +++ b/web-view-components/src/main/groovy/groowt/view/component/web/lib/HtmlPage.groovy @@ -0,0 +1,6 @@ +package groowt.view.component.web.lib + +import groowt.view.component.web.BaseWebViewComponent +import groowt.view.component.web.util.ConfigurableComponent + +class HtmlPage extends BaseWebViewComponent implements ConfigurableComponent {} diff --git a/web-view-components/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/lib/IntrinsicHtml.groovy similarity index 96% rename from web-view-components/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/lib/IntrinsicHtml.groovy index f41d830..cf7c3fa 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/lib/IntrinsicHtml.groovy @@ -1,11 +1,11 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib import groowt.view.View import groowt.view.component.ComponentRenderException import groowt.view.component.context.ComponentContext import groowt.view.component.context.ComponentScope.TypeAndFactory import groowt.view.component.factory.ComponentFactory -import groowt.view.web.util.WithHtml +import groowt.view.component.web.util.WithHtml class IntrinsicHtml extends DelegatingWebViewComponent implements WithHtml { diff --git a/web-view-components/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/util/ComponentConfigurator.groovy similarity index 76% rename from web-view-components/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/util/ComponentConfigurator.groovy index 9c94983..a921068 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/util/ComponentConfigurator.groovy @@ -1,9 +1,9 @@ -package groowt.view.web.util +package groowt.view.component.web.util import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType -import groowt.view.web.WebViewComponent -import groowt.view.web.WebViewComponentContext +import groowt.view.component.web.WebViewComponent +import groowt.view.component.web.WebViewComponentContext class ComponentConfigurator { @@ -15,7 +15,7 @@ class ComponentConfigurator { void context( @DelegatesTo(ContextConfigurator) - @ClosureParams(value = SimpleType, options = 'groowt.view.web.WebViewComponentContext') + @ClosureParams(value = SimpleType, options = 'groowt.view.component.web.WebViewComponentContext') Closure configureContext ) { //noinspection GroovyAssignabilityCheck diff --git a/web-view-components/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/util/ConfigurableComponent.groovy similarity index 85% rename from web-view-components/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/util/ConfigurableComponent.groovy index 73a0823..74097f4 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/util/ConfigurableComponent.groovy @@ -1,9 +1,9 @@ -package groowt.view.web.util +package groowt.view.component.web.util import groovy.transform.SelfType import groovy.transform.stc.ClosureParams import groovy.transform.stc.FromString -import groowt.view.web.WebViewComponent +import groowt.view.component.web.WebViewComponent @SelfType(WebViewComponent) trait ConfigurableComponent { diff --git a/web-view-components/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/util/ContextConfigurator.groovy similarity index 76% rename from web-view-components/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/util/ContextConfigurator.groovy index cda56d2..848376b 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/util/ContextConfigurator.groovy @@ -1,9 +1,9 @@ -package groowt.view.web.util +package groowt.view.component.web.util import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType -import groowt.view.web.DefaultWebViewComponentScope -import groowt.view.web.WebViewComponentContext +import groowt.view.component.web.DefaultWebViewComponentScope +import groowt.view.component.web.WebViewComponentContext class ContextConfigurator { @@ -15,7 +15,7 @@ class ContextConfigurator { void rootScope( @DelegatesTo(DefaultWebViewComponentScope) - @ClosureParams(value = SimpleType, options = 'groowt.view.web.WebViewComponentScope') + @ClosureParams(value = SimpleType, options = 'groowt.view.component.web.WebViewComponentScope') Closure configureRootScope ) { //noinspection GroovyAssignabilityCheck diff --git a/web-view-components/src/main/groovy/groowt/view/web/util/WithHtml.groovy b/web-view-components/src/main/groovy/groowt/view/component/web/util/WithHtml.groovy similarity index 95% rename from web-view-components/src/main/groovy/groowt/view/web/util/WithHtml.groovy rename to web-view-components/src/main/groovy/groowt/view/component/web/util/WithHtml.groovy index b09c534..520377e 100644 --- a/web-view-components/src/main/groovy/groowt/view/web/util/WithHtml.groovy +++ b/web-view-components/src/main/groovy/groowt/view/component/web/util/WithHtml.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.util +package groowt.view.component.web.util trait WithHtml { diff --git a/web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy b/web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy deleted file mode 100644 index 24fff19..0000000 --- a/web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy +++ /dev/null @@ -1,6 +0,0 @@ -package groowt.view.web.lib - -import groowt.view.web.BaseWebViewComponent -import groowt.view.web.util.ConfigurableComponent - -class HtmlPage extends BaseWebViewComponent implements ConfigurableComponent {} diff --git a/web-view-components/src/main/java/groowt/view/web/AbstractWebViewComponent.java b/web-view-components/src/main/java/groowt/view/component/web/AbstractWebViewComponent.java similarity index 96% rename from web-view-components/src/main/java/groowt/view/web/AbstractWebViewComponent.java rename to web-view-components/src/main/java/groowt/view/component/web/AbstractWebViewComponent.java index 6be19bf..77b8be5 100644 --- a/web-view-components/src/main/java/groowt/view/web/AbstractWebViewComponent.java +++ b/web-view-components/src/main/java/groowt/view/component/web/AbstractWebViewComponent.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; import groovy.lang.Closure; import groowt.view.component.AbstractViewComponent; @@ -7,7 +7,7 @@ import groowt.view.component.compiler.ComponentTemplateCompileUnit; import groowt.view.component.compiler.source.ComponentTemplateSource; import groowt.view.component.runtime.ComponentWriter; import groowt.view.component.runtime.DefaultComponentWriter; -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit; +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit; import java.io.IOException; import java.io.Writer; diff --git a/web-view-components/src/main/java/groowt/view/web/ChildRenderException.java b/web-view-components/src/main/java/groowt/view/component/web/ChildRenderException.java similarity index 80% rename from web-view-components/src/main/java/groowt/view/web/ChildRenderException.java rename to web-view-components/src/main/java/groowt/view/component/web/ChildRenderException.java index ef0058c..3e33ddb 100644 --- a/web-view-components/src/main/java/groowt/view/web/ChildRenderException.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ChildRenderException.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; public class ChildRenderException extends RuntimeException { diff --git a/web-view-components/src/main/java/groowt/view/web/WebViewComponent.java b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponent.java similarity index 92% rename from web-view-components/src/main/java/groowt/view/web/WebViewComponent.java rename to web-view-components/src/main/java/groowt/view/component/web/WebViewComponent.java index 8a4d82e..48a258b 100644 --- a/web-view-components/src/main/java/groowt/view/web/WebViewComponent.java +++ b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponent.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; import groowt.view.component.ViewComponent; import groowt.view.component.runtime.ComponentWriter; diff --git a/web-view-components/src/main/java/groowt/view/web/WebViewComponentBugError.java b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentBugError.java similarity index 95% rename from web-view-components/src/main/java/groowt/view/web/WebViewComponentBugError.java rename to web-view-components/src/main/java/groowt/view/component/web/WebViewComponentBugError.java index 7c3122e..b86649b 100644 --- a/web-view-components/src/main/java/groowt/view/web/WebViewComponentBugError.java +++ b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentBugError.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; public class WebViewComponentBugError extends RuntimeException { diff --git a/web-view-components/src/main/java/groowt/view/web/WebViewComponentContext.java b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentContext.java similarity index 78% rename from web-view-components/src/main/java/groowt/view/web/WebViewComponentContext.java rename to web-view-components/src/main/java/groowt/view/component/web/WebViewComponentContext.java index 422e6f4..b4c80b9 100644 --- a/web-view-components/src/main/java/groowt/view/web/WebViewComponentContext.java +++ b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentContext.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; import groowt.view.component.context.ComponentContext; diff --git a/web-view-components/src/main/java/groowt/view/web/WebViewComponentScope.java b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentScope.java similarity index 84% rename from web-view-components/src/main/java/groowt/view/web/WebViewComponentScope.java rename to web-view-components/src/main/java/groowt/view/component/web/WebViewComponentScope.java index 5f6753d..926492d 100644 --- a/web-view-components/src/main/java/groowt/view/web/WebViewComponentScope.java +++ b/web-view-components/src/main/java/groowt/view/component/web/WebViewComponentScope.java @@ -1,4 +1,4 @@ -package groowt.view.web; +package groowt.view.component.web; import groowt.view.component.context.ComponentScope; diff --git a/web-view-components/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt b/web-view-components/src/main/java/groowt/view/component/web/analysis/MismatchedComponentTypeAnalysis.kt similarity index 89% rename from web-view-components/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt rename to web-view-components/src/main/java/groowt/view/component/web/analysis/MismatchedComponentTypeAnalysis.kt index e2fe8e9..9e62556 100644 --- a/web-view-components/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/analysis/MismatchedComponentTypeAnalysis.kt @@ -1,9 +1,9 @@ @file:JvmName("MismatchedComponentTypeAnalysis") -package groowt.view.web.analysis +package groowt.view.component.web.analysis -import groowt.view.web.antlr.WebViewComponentsParser.ComponentTypeContext -import groowt.view.web.antlr.WebViewComponentsParser.ComponentWithChildrenContext -import groowt.view.web.util.SourcePosition +import groowt.view.component.web.antlr.WebViewComponentsParser.ComponentTypeContext +import groowt.view.component.web.antlr.WebViewComponentsParser.ComponentWithChildrenContext +import groowt.view.component.web.util.SourcePosition import org.antlr.v4.runtime.ParserRuleContext import org.antlr.v4.runtime.Token import org.antlr.v4.runtime.tree.ParseTree diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java b/web-view-components/src/main/java/groowt/view/component/web/antlr/AbstractWebViewComponentsLexer.java similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java rename to web-view-components/src/main/java/groowt/view/component/web/antlr/AbstractWebViewComponentsLexer.java index 5e3ef10..15657ec 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/AbstractWebViewComponentsLexer.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; @@ -15,7 +15,7 @@ import java.util.LinkedList; import java.util.function.Function; import java.util.stream.Collectors; -import static groowt.view.web.antlr.TokenUtil.escapeChars; +import static groowt.view.component.web.antlr.TokenUtil.escapeChars; public abstract class AbstractWebViewComponentsLexer extends Lexer { diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/AntlrUtil.java b/web-view-components/src/main/java/groowt/view/component/web/antlr/AntlrUtil.java similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/antlr/AntlrUtil.java rename to web-view-components/src/main/java/groowt/view/component/web/antlr/AntlrUtil.java index 7351654..fa09680 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/AntlrUtil.java +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/AntlrUtil.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/GroovyTokenSourceIterable.kt similarity index 96% rename from web-view-components/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/GroovyTokenSourceIterable.kt index f84a011..da231e3 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/GroovyTokenSourceIterable.kt @@ -1,4 +1,4 @@ -package groowt.view.web.antlr +package groowt.view.component.web.antlr import org.antlr.v4.runtime.Token import org.antlr.v4.runtime.TokenSource diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/LexerSemanticPredicates.kt similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/LexerSemanticPredicates.kt index de66060..fba4806 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/LexerSemanticPredicates.kt @@ -1,5 +1,5 @@ @file:JvmName("LexerSemanticPredicates") -package groowt.view.web.antlr +package groowt.view.component.web.antlr import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/LexerUtil.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/LexerUtil.kt similarity index 83% rename from web-view-components/src/main/java/groowt/view/web/antlr/LexerUtil.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/LexerUtil.kt index 8da23a6..ed3ab26 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/LexerUtil.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/LexerUtil.kt @@ -1,5 +1,5 @@ @file:JvmName("LexerUtil") -package groowt.view.web.antlr +package groowt.view.component.web.antlr import org.antlr.v4.runtime.CharStream import org.antlr.v4.runtime.Token diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/MergedGroovyCodeToken.kt similarity index 86% rename from web-view-components/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/MergedGroovyCodeToken.kt index 92dd803..8cec222 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/MergedGroovyCodeToken.kt @@ -1,7 +1,7 @@ -package groowt.view.web.antlr +package groowt.view.component.web.antlr -import groowt.view.web.antlr.WebViewComponentsLexer.DEFAULT_TOKEN_CHANNEL -import groowt.view.web.antlr.WebViewComponentsLexer.GroovyCode +import groowt.view.component.web.antlr.WebViewComponentsLexer.DEFAULT_TOKEN_CHANNEL +import groowt.view.component.web.antlr.WebViewComponentsLexer.GroovyCode import org.antlr.v4.runtime.CharStream import org.antlr.v4.runtime.Token import org.antlr.v4.runtime.TokenSource diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/PairCounter.java b/web-view-components/src/main/java/groowt/view/component/web/antlr/PairCounter.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/antlr/PairCounter.java rename to web-view-components/src/main/java/groowt/view/component/web/antlr/PairCounter.java index fbf7be0..5b2ac2c 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/PairCounter.java +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/PairCounter.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; public interface PairCounter { @@ -18,4 +18,4 @@ public interface PairCounter { int getStackSize(); void clear(); -} \ No newline at end of file +} diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/ParserUtil.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/ParserUtil.kt similarity index 97% rename from web-view-components/src/main/java/groowt/view/web/antlr/ParserUtil.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/ParserUtil.kt index 3ff54ed..29290be 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/ParserUtil.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/ParserUtil.kt @@ -1,7 +1,7 @@ @file:JvmName("ParserUtil") -package groowt.view.web.antlr +package groowt.view.component.web.antlr -import groowt.view.web.antlr.WebViewComponentsParser.CompilationUnitContext +import groowt.view.component.web.antlr.WebViewComponentsParser.CompilationUnitContext import org.antlr.v4.runtime.* import org.antlr.v4.runtime.tree.ErrorNode import org.antlr.v4.runtime.tree.ParseTree diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/SimplePairCounter.kt similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/SimplePairCounter.kt index e63496d..226527a 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/SimplePairCounter.kt @@ -1,4 +1,4 @@ -package groowt.view.web.antlr +package groowt.view.component.web.antlr import org.antlr.v4.runtime.Lexer import org.antlr.v4.runtime.misc.IntegerStack diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/TokenList.java b/web-view-components/src/main/java/groowt/view/component/web/antlr/TokenList.java similarity index 95% rename from web-view-components/src/main/java/groowt/view/web/antlr/TokenList.java rename to web-view-components/src/main/java/groowt/view/component/web/antlr/TokenList.java index 0fb52fe..e9f9936 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/TokenList.java +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/TokenList.java @@ -1,7 +1,7 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; -import groowt.view.web.util.RangeIterator; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.util.RangeIterator; +import groowt.view.component.web.util.TokenRange; import org.antlr.v4.runtime.Token; import org.jetbrains.annotations.Nullable; diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/TokenUtil.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/TokenUtil.kt similarity index 95% rename from web-view-components/src/main/java/groowt/view/web/antlr/TokenUtil.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/TokenUtil.kt index 470a456..fdf700b 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/TokenUtil.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/TokenUtil.kt @@ -1,8 +1,8 @@ @file:JvmName("TokenUtil") -package groowt.view.web.antlr +package groowt.view.component.web.antlr -import groowt.view.web.antlr.WebViewComponentsLexer.GStringParts -import groowt.view.web.antlr.WebViewComponentsLexer.GroovyTokens +import groowt.view.component.web.antlr.WebViewComponentsLexer.GStringParts +import groowt.view.component.web.antlr.WebViewComponentsLexer.GroovyTokens import org.antlr.v4.runtime.Token fun isGroovyTokenType(token: Token) = isGroovyTokenType(token.type) diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java b/web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsLexer.java similarity index 91% rename from web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java rename to web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsLexer.java index 3a177f6..c392394 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsLexer.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; import org.antlr.v4.runtime.CharStream; @@ -14,4 +14,4 @@ public class WebViewComponentsLexer extends WebViewComponentsLexerBase { return (PositionAdjustingLexerATNSimulator) this.getInterpreter(); } -} \ No newline at end of file +} diff --git a/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt b/web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsTokenStream.kt similarity index 99% rename from web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt rename to web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsTokenStream.kt index 17ec407..c219735 100644 --- a/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/antlr/WebViewComponentsTokenStream.kt @@ -1,4 +1,4 @@ -package groowt.view.web.antlr +package groowt.view.component.web.antlr import org.antlr.v4.runtime.* import org.antlr.v4.runtime.misc.Interval diff --git a/web-view-components/src/main/java/groowt/view/web/ast/AstBuilder.java b/web-view-components/src/main/java/groowt/view/component/web/ast/AstBuilder.java similarity index 56% rename from web-view-components/src/main/java/groowt/view/web/ast/AstBuilder.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/AstBuilder.java index 427879d..967f21a 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/AstBuilder.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/AstBuilder.java @@ -1,8 +1,8 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.WebViewComponentsParser.CompilationUnitContext; -import groowt.view.web.ast.node.CompilationUnitNode; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.antlr.WebViewComponentsParser.CompilationUnitContext; +import groowt.view.component.web.ast.node.CompilationUnitNode; +import groowt.view.component.web.ast.node.Node; import org.antlr.v4.runtime.ParserRuleContext; public interface AstBuilder { diff --git a/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilder.java similarity index 82% rename from web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilder.java index f25e880..caa529c 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilder.java @@ -1,6 +1,6 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; import org.antlr.v4.runtime.ParserRuleContext; public class DefaultAstBuilder implements AstBuilder { diff --git a/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilderVisitor.java similarity index 97% rename from web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilderVisitor.java index 2462b24..6b61491 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultAstBuilderVisitor.java @@ -1,11 +1,11 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.MergedGroovyCodeToken; -import groowt.view.web.antlr.TokenUtil; -import groowt.view.web.antlr.WebViewComponentsParser; -import groowt.view.web.antlr.WebViewComponentsParserBaseVisitor; -import groowt.view.web.ast.node.*; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.antlr.MergedGroovyCodeToken; +import groowt.view.component.web.antlr.TokenUtil; +import groowt.view.component.web.antlr.WebViewComponentsParser; +import groowt.view.component.web.antlr.WebViewComponentsParserBaseVisitor; +import groowt.view.component.web.ast.node.*; +import groowt.view.component.web.util.TokenRange; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java similarity index 97% rename from web-view-components/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java index 99d80b3..fae89e0 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java @@ -1,12 +1,12 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; import groowt.util.di.DefaultRegistryObjectFactory; import groowt.util.di.Registry; import groowt.util.di.RegistryObjectFactory; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.extension.*; -import groowt.view.web.ast.node.*; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.extension.*; +import groowt.view.component.web.ast.node.*; +import groowt.view.component.web.util.TokenRange; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/NodeFactory.java b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeFactory.java similarity index 94% rename from web-view-components/src/main/java/groowt/view/web/ast/NodeFactory.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/NodeFactory.java index 8519ba6..e7efa43 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/NodeFactory.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeFactory.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.ast.node.*; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.ast.node.*; +import groowt.view.component.web.util.TokenRange; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.java b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.java similarity index 87% rename from web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.java index c880631..71936f4 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.java @@ -1,10 +1,10 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.extension.NodeExtension; -import groowt.view.web.ast.node.LeafNode; -import groowt.view.web.ast.node.Node; -import groowt.view.web.ast.node.TreeNode; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.extension.NodeExtension; +import groowt.view.component.web.ast.node.LeafNode; +import groowt.view.component.web.ast.node.Node; +import groowt.view.component.web.ast.node.TreeNode; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.kt b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.kt similarity index 71% rename from web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.kt rename to web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.kt index b5a4402..fe947ab 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.kt +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/NodeUtil.kt @@ -1,9 +1,9 @@ -package groowt.view.web.ast +package groowt.view.component.web.ast -import groowt.view.web.antlr.TokenList -import groowt.view.web.antlr.formatToken -import groowt.view.web.ast.node.LeafNode -import groowt.view.web.ast.node.Node +import groowt.view.component.web.antlr.TokenList +import groowt.view.component.web.antlr.formatToken +import groowt.view.component.web.ast.node.LeafNode +import groowt.view.component.web.ast.node.Node fun formatSingleNode(node: Node, sb: StringBuilder, indentTimes: Int, indent: String, tokenList: TokenList) { sb.append(indent.repeat(indentTimes)) diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/ExtensionUtil.java similarity index 93% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/ExtensionUtil.java index 21008b4..0aa7210 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/ExtensionUtil.java @@ -1,10 +1,10 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.filters.FilterHandler; import groowt.util.di.filters.FilterHandlers; import groowt.util.di.filters.IterableFilterHandler; import groowt.util.di.filters.IterableFilterHandlers; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; import java.util.Arrays; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringNodeExtension.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringNodeExtension.java index 95d7275..704c9ed 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringNodeExtension.java @@ -1,6 +1,6 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; import org.antlr.v4.runtime.Token; import java.util.List; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java similarity index 69% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java index 0af8c57..b5602c3 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java @@ -1,9 +1,9 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.annotation.Given; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.node.Node; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.node.Node; +import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; public non-sealed class GStringPathExtension extends GStringNodeExtension { @@ -18,4 +18,4 @@ public non-sealed class GStringPathExtension extends GStringNodeExtension { return "$" + super.getAsValidEmbeddableCode(); } -} \ No newline at end of file +} diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java similarity index 63% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java index 6dadf67..04a1653 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java @@ -1,9 +1,9 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.annotation.Given; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.node.Node; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.node.Node; +import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; public non-sealed class GStringScriptletExtension extends GStringNodeExtension { diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java similarity index 85% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java index 6aca38d..2513c78 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java @@ -1,9 +1,9 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.annotation.Given; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.node.Node; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.node.Node; +import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; import org.antlr.v4.runtime.Token; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensionOneOf.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensionOneOf.java index 2271f74..2979a19 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensionOneOf.java @@ -1,4 +1,4 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.filters.Filter; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensions.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensions.java similarity index 87% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensions.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensions.java index 1e37aea..cda702e 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensions.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/HasExtensions.java @@ -1,4 +1,4 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.filters.Filter; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensionOneOf.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensionOneOf.java index 1f8795f..2e9cc8c 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensionOneOf.java @@ -1,4 +1,4 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.filters.IterableFilter; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensions.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensions.java index 28ce676..b7f1bfd 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/IterableHasExtensions.java @@ -1,4 +1,4 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.filters.IterableFilter; diff --git a/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtension.java new file mode 100644 index 0000000..82f9b14 --- /dev/null +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtension.java @@ -0,0 +1,7 @@ +package groowt.view.component.web.ast.extension; + +import groowt.view.component.web.ast.node.Node; + +public interface NodeExtension { + Node getSelf(); +} diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionContainer.java similarity index 73% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionContainer.java index 95e80e3..c023f98 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionContainer.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.extensible.ExtensionContainer; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; public interface NodeExtensionContainer extends ExtensionContainer { E createExtension(Class extensionClass, Node self, Object... givenArgs); diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionFactory.java similarity index 63% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionFactory.java index a6fd5cf..03e85b8 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/NodeExtensionFactory.java @@ -1,6 +1,6 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; @FunctionalInterface public interface NodeExtensionFactory { diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNode.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNode.java similarity index 87% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNode.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNode.java index c64ae58..e0b1c14 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNode.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNode.java @@ -1,4 +1,4 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import jakarta.inject.Qualifier; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java similarity index 93% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java index a7c7932..f66bd37 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.di.*; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; import org.jetbrains.annotations.Nullable; import java.lang.annotation.Annotation; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionContainer.java similarity index 89% rename from web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java rename to web-view-components/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionContainer.java index b2e3396..c8c50a4 100644 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java +++ b/web-view-components/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionContainer.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast.extension; +package groowt.view.component.web.ast.extension; import groowt.util.extensible.AbstractExtensionContainer; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.ast.node.Node; public class SimpleNodeExtensionContainer extends AbstractExtensionContainer implements NodeExtensionContainer { @@ -22,4 +22,4 @@ public class SimpleNodeExtensionContainer extends AbstractExtensionContainer extends Range { diff --git a/web-view-components/src/main/java/groowt/view/web/util/ComparableClosedRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/ComparableClosedRange.java similarity index 92% rename from web-view-components/src/main/java/groowt/view/web/util/ComparableClosedRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/ComparableClosedRange.java index 97df0cf..f25328f 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/ComparableClosedRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/ComparableClosedRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; public final class ComparableClosedRange> extends AbstractClosedRange { diff --git a/web-view-components/src/main/java/groowt/view/web/util/ComparatorClosedRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/ComparatorClosedRange.java similarity index 94% rename from web-view-components/src/main/java/groowt/view/web/util/ComparatorClosedRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/ComparatorClosedRange.java index 4dba49e..1a64349 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/ComparatorClosedRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/ComparatorClosedRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import java.util.Comparator; diff --git a/web-view-components/src/main/java/groowt/view/web/util/EmptyRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/EmptyRange.java similarity index 97% rename from web-view-components/src/main/java/groowt/view/web/util/EmptyRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/EmptyRange.java index 449760e..ec9f67e 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/EmptyRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/EmptyRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.NotNull; diff --git a/web-view-components/src/main/java/groowt/view/web/util/EmptyTokenRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/EmptyTokenRange.java similarity index 94% rename from web-view-components/src/main/java/groowt/view/web/util/EmptyTokenRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/EmptyTokenRange.java index 579a69c..d89cfd4 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/EmptyTokenRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/EmptyTokenRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.antlr.v4.runtime.Token; diff --git a/web-view-components/src/main/java/groowt/view/web/util/FilteringIterable.java b/web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterable.java similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/util/FilteringIterable.java rename to web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterable.java index 5cbbbff..0d648ef 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/FilteringIterable.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterable.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.NotNull; diff --git a/web-view-components/src/main/java/groowt/view/web/util/FilteringIterator.java b/web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterator.java similarity index 98% rename from web-view-components/src/main/java/groowt/view/web/util/FilteringIterator.java rename to web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterator.java index 8e431f3..b7db50e 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/FilteringIterator.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/FilteringIterator.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/web-view-components/src/main/java/groowt/view/web/util/MappingIterable.java b/web-view-components/src/main/java/groowt/view/component/web/util/MappingIterable.java similarity index 93% rename from web-view-components/src/main/java/groowt/view/web/util/MappingIterable.java rename to web-view-components/src/main/java/groowt/view/component/web/util/MappingIterable.java index fc811db..ed71ea4 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/MappingIterable.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/MappingIterable.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.NotNull; diff --git a/web-view-components/src/main/java/groowt/view/web/util/MappingIterator.java b/web-view-components/src/main/java/groowt/view/component/web/util/MappingIterator.java similarity index 94% rename from web-view-components/src/main/java/groowt/view/web/util/MappingIterator.java rename to web-view-components/src/main/java/groowt/view/component/web/util/MappingIterator.java index deef34b..e6529b7 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/MappingIterator.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/MappingIterator.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import java.util.Iterator; import java.util.function.Function; diff --git a/web-view-components/src/main/java/groowt/view/web/util/OpenRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/OpenRange.java similarity index 95% rename from web-view-components/src/main/java/groowt/view/web/util/OpenRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/OpenRange.java index 1218760..01ab6e8 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/OpenRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/OpenRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.NotNull; diff --git a/web-view-components/src/main/java/groowt/view/web/util/Range.java b/web-view-components/src/main/java/groowt/view/component/web/util/Range.java similarity index 80% rename from web-view-components/src/main/java/groowt/view/web/util/Range.java rename to web-view-components/src/main/java/groowt/view/component/web/util/Range.java index e0479dc..17c6e1d 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/Range.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/Range.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; public interface Range { boolean isInRange(T item); diff --git a/web-view-components/src/main/java/groowt/view/web/util/RangeIterator.java b/web-view-components/src/main/java/groowt/view/component/web/util/RangeIterator.java similarity index 88% rename from web-view-components/src/main/java/groowt/view/web/util/RangeIterator.java rename to web-view-components/src/main/java/groowt/view/component/web/util/RangeIterator.java index ad60a96..2ab002f 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/RangeIterator.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/RangeIterator.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.Nullable; diff --git a/web-view-components/src/main/java/groowt/view/web/util/SimpleRangeIterator.java b/web-view-components/src/main/java/groowt/view/component/web/util/SimpleRangeIterator.java similarity index 96% rename from web-view-components/src/main/java/groowt/view/web/util/SimpleRangeIterator.java rename to web-view-components/src/main/java/groowt/view/component/web/util/SimpleRangeIterator.java index 9b3537b..1649078 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/SimpleRangeIterator.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/SimpleRangeIterator.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.jetbrains.annotations.Nullable; diff --git a/web-view-components/src/main/java/groowt/view/web/util/SimpleTokenRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/SimpleTokenRange.java similarity index 93% rename from web-view-components/src/main/java/groowt/view/web/util/SimpleTokenRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/SimpleTokenRange.java index 7e71ff4..c96ac4d 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/SimpleTokenRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/SimpleTokenRange.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.antlr.v4.runtime.Token; diff --git a/web-view-components/src/main/java/groowt/view/web/util/SourcePosition.java b/web-view-components/src/main/java/groowt/view/component/web/util/SourcePosition.java similarity index 97% rename from web-view-components/src/main/java/groowt/view/web/util/SourcePosition.java rename to web-view-components/src/main/java/groowt/view/component/web/util/SourcePosition.java index fd3a159..b5b8c60 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/SourcePosition.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/SourcePosition.java @@ -1,4 +1,4 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; import org.antlr.v4.runtime.Token; diff --git a/web-view-components/src/main/java/groowt/view/web/util/TokenRange.java b/web-view-components/src/main/java/groowt/view/component/web/util/TokenRange.java similarity index 91% rename from web-view-components/src/main/java/groowt/view/web/util/TokenRange.java rename to web-view-components/src/main/java/groowt/view/component/web/util/TokenRange.java index 50f84d2..e0bf74f 100644 --- a/web-view-components/src/main/java/groowt/view/web/util/TokenRange.java +++ b/web-view-components/src/main/java/groowt/view/component/web/util/TokenRange.java @@ -1,6 +1,6 @@ -package groowt.view.web.util; +package groowt.view.component.web.util; -import groowt.view.web.antlr.TokenList; +import groowt.view.component.web.antlr.TokenList; import org.antlr.v4.runtime.Token; import java.util.stream.Collectors; diff --git a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java deleted file mode 100644 index feb82a0..0000000 --- a/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java +++ /dev/null @@ -1,7 +0,0 @@ -package groowt.view.web.ast.extension; - -import groowt.view.web.ast.node.Node; - -public interface NodeExtension { - Node getSelf(); -} \ No newline at end of file diff --git a/web-view-components/src/main/resources/groowt/view/component/web/groovyc/GroovycConfigurationScript.groovy b/web-view-components/src/main/resources/groowt/view/component/web/groovyc/GroovycConfigurationScript.groovy new file mode 100644 index 0000000..650b24a --- /dev/null +++ b/web-view-components/src/main/resources/groowt/view/component/web/groovyc/GroovycConfigurationScript.groovy @@ -0,0 +1,3 @@ +package groowt.view.component.web.groovyc + +configuration.pluginFactory = new WvcParserPluginFactory() diff --git a/web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst b/web-view-components/src/main/resources/groowt/view/component/web/lib/EchoTemplateNoChildren.gst similarity index 100% rename from web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst rename to web-view-components/src/main/resources/groowt/view/component/web/lib/EchoTemplateNoChildren.gst diff --git a/web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst b/web-view-components/src/main/resources/groowt/view/component/web/lib/EchoTemplateWithChildren.gst similarity index 100% rename from web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst rename to web-view-components/src/main/resources/groowt/view/component/web/lib/EchoTemplateWithChildren.gst diff --git a/web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy b/web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy deleted file mode 100644 index 357d2f6..0000000 --- a/web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy +++ /dev/null @@ -1 +0,0 @@ -configuration.pluginFactory = new groowt.view.web.groovyc.WvcParserPluginFactory() diff --git a/web-view-components/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/BaseWebViewComponentTests.groovy similarity index 93% rename from web-view-components/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/BaseWebViewComponentTests.groovy index 00f974f..2416a59 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/BaseWebViewComponentTests.groovy @@ -1,6 +1,6 @@ -package groowt.view.web +package groowt.view.component.web -import groowt.view.web.lib.AbstractWebViewComponentTests +import groowt.view.component.web.lib.AbstractWebViewComponentTests import org.junit.jupiter.api.Test class BaseWebViewComponentTests extends AbstractWebViewComponentTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/SimpleWebViewComponentTests.groovy similarity index 93% rename from web-view-components/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/SimpleWebViewComponentTests.groovy index e241db5..e41da03 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/SimpleWebViewComponentTests.groovy @@ -1,6 +1,6 @@ -package groowt.view.web +package groowt.view.component.web -import groowt.view.web.lib.AbstractWebViewComponentTests +import groowt.view.component.web.lib.AbstractWebViewComponentTests import org.junit.jupiter.api.Test class SimpleWebViewComponentTests extends AbstractWebViewComponentTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsLexerTests.java similarity index 93% rename from web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsLexerTests.java index ac79031..b9842ac 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsLexerTests.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.Token; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import java.util.stream.Collectors; -import static groowt.view.web.antlr.WebViewComponentsLexer.*; +import static groowt.view.component.web.antlr.WebViewComponentsLexer.*; import static org.junit.jupiter.api.Assertions.*; public class WebViewComponentsLexerTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsParserTests.java similarity index 99% rename from web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsParserTests.java index 2159bd5..723627d 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsParserTests.java @@ -1,4 +1,4 @@ -package groowt.view.web.antlr; +package groowt.view.component.web.antlr; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; diff --git a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsTokenStreamTests.groovy similarity index 88% rename from web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsTokenStreamTests.groovy index 8554e3d..0a3533b 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/antlr/WebViewComponentsTokenStreamTests.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.antlr +package groowt.view.component.web.antlr import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType @@ -7,9 +7,9 @@ import org.antlr.v4.runtime.CharStreams import org.antlr.v4.runtime.Token import org.junit.jupiter.api.Test -import static groowt.view.web.antlr.TokenUtil.getTokenName -import static groowt.view.web.antlr.WebViewComponentsLexer.GroovyCode -import static groowt.view.web.antlr.WebViewComponentsLexer.PreambleBreak +import static groowt.view.component.web.antlr.TokenUtil.getTokenName +import static groowt.view.component.web.antlr.WebViewComponentsLexer.GroovyCode +import static groowt.view.component.web.antlr.WebViewComponentsLexer.PreambleBreak import static org.antlr.v4.runtime.Recognizer.EOF import static org.junit.jupiter.api.Assertions.* diff --git a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderTests.java similarity index 87% rename from web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderTests.java index f6baeee..8bdf732 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderTests.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.ParserUtil; -import groowt.view.web.antlr.TokenList; +import groowt.view.component.web.antlr.ParserUtil; +import groowt.view.component.web.antlr.TokenList; import java.io.File; import java.nio.file.Path; diff --git a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderVisitorTests.groovy similarity index 86% rename from web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderVisitorTests.groovy index 232ac8b..d4875e9 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultAstBuilderVisitorTests.groovy @@ -1,16 +1,16 @@ -package groowt.view.web.ast +package groowt.view.component.web.ast import groovy.transform.stc.ClosureParams import groovy.transform.stc.FirstParam -import groowt.view.web.antlr.TokenList -import groowt.view.web.antlr.WebViewComponentsLexer -import groowt.view.web.antlr.WebViewComponentsParser -import groowt.view.web.antlr.WebViewComponentsTokenStream -import groowt.view.web.ast.node.* +import groowt.view.component.web.antlr.TokenList +import groowt.view.component.web.antlr.WebViewComponentsLexer +import groowt.view.component.web.antlr.WebViewComponentsParser +import groowt.view.component.web.antlr.WebViewComponentsTokenStream +import groowt.view.component.web.ast.node.* import org.antlr.v4.runtime.CharStreams import org.junit.jupiter.api.Test -import static groowt.view.web.antlr.WebViewComponentsParser.CompilationUnitContext +import static groowt.view.component.web.antlr.WebViewComponentsParser.CompilationUnitContext import static org.junit.jupiter.api.Assertions.* class DefaultAstBuilderVisitorTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultNodeFactoryTests.java similarity index 84% rename from web-view-components/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultNodeFactoryTests.java index b48d3b8..07b7abd 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/ast/DefaultNodeFactoryTests.java @@ -1,6 +1,6 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.TokenList; +import groowt.view.component.web.antlr.TokenList; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/web-view-components/src/test/groovy/groowt/view/web/lib/EchoTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/lib/EchoTests.groovy similarity index 93% rename from web-view-components/src/test/groovy/groowt/view/web/lib/EchoTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/lib/EchoTests.groovy index 56b4c21..0ecb9f3 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/lib/EchoTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/lib/EchoTests.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib import org.junit.jupiter.api.Test diff --git a/web-view-components/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/lib/FragmentTests.groovy similarity index 82% rename from web-view-components/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/lib/FragmentTests.groovy index 648d84d..ddff900 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/lib/FragmentTests.groovy @@ -1,8 +1,8 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib -import groowt.view.web.BaseWebViewComponent -import groowt.view.web.WebViewComponentContext -import groowt.view.web.WebViewComponentScope +import groowt.view.component.web.BaseWebViewComponent +import groowt.view.component.web.WebViewComponentContext +import groowt.view.component.web.WebViewComponentScope import org.junit.jupiter.api.Test class FragmentTests extends AbstractWebViewComponentTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy b/web-view-components/src/test/groovy/groowt/view/component/web/lib/IntrinsicHtmlTests.groovy similarity index 93% rename from web-view-components/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy rename to web-view-components/src/test/groovy/groowt/view/component/web/lib/IntrinsicHtmlTests.groovy index 1d64189..979e7e8 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy +++ b/web-view-components/src/test/groovy/groowt/view/component/web/lib/IntrinsicHtmlTests.groovy @@ -1,4 +1,5 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib + import org.junit.jupiter.api.Test diff --git a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultBodyTranspilerTests.java similarity index 54% rename from web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultBodyTranspilerTests.java index da762ba..647bea4 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultBodyTranspilerTests.java @@ -1,9 +1,9 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit; -import groowt.view.web.transpile.DefaultTranspilerConfiguration; -import groowt.view.web.transpile.TranspilerConfiguration; -import groowt.view.web.transpile.resolve.CachingComponentClassNodeResolver; +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit; +import groowt.view.component.web.transpile.DefaultTranspilerConfiguration; +import groowt.view.component.web.transpile.TranspilerConfiguration; +import groowt.view.component.web.transpile.resolve.CachingComponentClassNodeResolver; import org.codehaus.groovy.ast.ModuleNode; public class DefaultBodyTranspilerTests extends BodyTranspilerTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGStringTranspilerTests.java similarity index 51% rename from web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGStringTranspilerTests.java index 91cda1a..c719454 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGStringTranspilerTests.java @@ -1,9 +1,9 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; -import groowt.view.web.transpile.DefaultGStringTranspiler; -import groowt.view.web.transpile.DefaultJStringTranspiler; -import groowt.view.web.transpile.GStringTranspiler; -import groowt.view.web.transpile.SimplePositionSetter; +import groowt.view.component.web.transpile.DefaultGStringTranspiler; +import groowt.view.component.web.transpile.DefaultJStringTranspiler; +import groowt.view.component.web.transpile.GStringTranspiler; +import groowt.view.component.web.transpile.SimplePositionSetter; public class DefaultGStringTranspilerTests extends GStringTranspilerTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGroovyTranspilerTests.java similarity index 71% rename from web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGroovyTranspilerTests.java index 88d583c..9c1ab2d 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/DefaultGroovyTranspilerTests.java @@ -1,8 +1,8 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; import groovy.lang.Tuple2; -import groowt.view.web.transpile.DefaultGroovyTranspiler; -import groowt.view.web.transpile.GroovyTranspiler; +import groowt.view.component.web.transpile.DefaultGroovyTranspiler; +import groowt.view.component.web.transpile.GroovyTranspiler; import org.codehaus.groovy.control.CompilationUnit; public class DefaultGroovyTranspilerTests extends GroovyTranspilerTests { diff --git a/web-view-components/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/resolve/ResolveUtilTests.java similarity index 75% rename from web-view-components/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java rename to web-view-components/src/test/groovy/groowt/view/component/web/transpiler/resolve/ResolveUtilTests.java index a1be720..391f4c6 100644 --- a/web-view-components/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java +++ b/web-view-components/src/test/groovy/groowt/view/component/web/transpiler/resolve/ResolveUtilTests.java @@ -1,8 +1,8 @@ -package groowt.view.web.transpiler.resolve; +package groowt.view.component.web.transpiler.resolve; import org.junit.jupiter.api.Test; -import static groowt.view.web.transpile.resolve.ResolveUtil.convertCanonicalNameToBinaryName; +import static groowt.view.component.web.transpile.resolve.ResolveUtil.convertCanonicalNameToBinaryName; import static org.junit.jupiter.api.Assertions.*; public class ResolveUtilTests { diff --git a/web-view-components/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst b/web-view-components/src/test/resources/groowt/view/component/web/antlr/mergesGroovyTokens.gst similarity index 100% rename from web-view-components/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst rename to web-view-components/src/test/resources/groowt/view/component/web/antlr/mergesGroovyTokens.gst diff --git a/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy b/web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/AbstractWebViewComponentTests.groovy similarity index 91% rename from web-view-components/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy rename to web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/AbstractWebViewComponentTests.groovy index d1bc6c9..e7874bf 100644 --- a/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy +++ b/web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/AbstractWebViewComponentTests.groovy @@ -1,11 +1,11 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib import groowt.view.component.compiler.DefaultComponentTemplateCompilerConfiguration import groowt.view.component.compiler.SimpleComponentTemplateClassFactory import groowt.view.component.compiler.source.ComponentTemplateSource import groowt.view.component.context.ComponentContext import groowt.view.component.runtime.DefaultComponentWriter -import groowt.view.web.compiler.DefaultWebViewComponentTemplateCompiler +import groowt.view.component.web.compiler.DefaultWebViewComponentTemplateCompiler import static org.junit.jupiter.api.Assertions.assertEquals diff --git a/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy b/web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/WithContext.groovy similarity index 71% rename from web-view-components/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy rename to web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/WithContext.groovy index 375c624..a30710c 100644 --- a/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy +++ b/web-view-components/src/testFixtures/groovy/groowt/view/component/web/lib/WithContext.groovy @@ -1,14 +1,14 @@ -package groowt.view.web.lib +package groowt.view.component.web.lib import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType -import groowt.view.web.DefaultWebViewComponentContext -import groowt.view.web.WebViewComponentContext +import groowt.view.component.web.DefaultWebViewComponentContext +import groowt.view.component.web.WebViewComponentContext trait WithContext { WebViewComponentContext context( - @ClosureParams(value = SimpleType, options = 'groowt.view.web.WebViewComponentContext') + @ClosureParams(value = SimpleType, options = 'groowt.view.component.web.WebViewComponentContext') @DelegatesTo(value = WebViewComponentContext) Closure configure = { configureContext(it) } ) { diff --git a/web-view-components/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java b/web-view-components/src/testFixtures/java/groowt/view/component/web/ast/AstBuilderTests.java similarity index 95% rename from web-view-components/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java rename to web-view-components/src/testFixtures/java/groowt/view/component/web/ast/AstBuilderTests.java index 7cea76d..eebac54 100644 --- a/web-view-components/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java +++ b/web-view-components/src/testFixtures/java/groowt/view/component/web/ast/AstBuilderTests.java @@ -1,7 +1,7 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.node.Node; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.node.Node; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; diff --git a/web-view-components/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java b/web-view-components/src/testFixtures/java/groowt/view/component/web/ast/NodeFactoryTests.java similarity index 97% rename from web-view-components/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java rename to web-view-components/src/testFixtures/java/groowt/view/component/web/ast/NodeFactoryTests.java index c208305..2af5519 100644 --- a/web-view-components/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java +++ b/web-view-components/src/testFixtures/java/groowt/view/component/web/ast/NodeFactoryTests.java @@ -1,8 +1,8 @@ -package groowt.view.web.ast; +package groowt.view.component.web.ast; -import groowt.view.web.ast.extension.GStringNodeExtension; -import groowt.view.web.ast.node.*; -import groowt.view.web.util.TokenRange; +import groowt.view.component.web.ast.extension.GStringNodeExtension; +import groowt.view.component.web.ast.node.*; +import groowt.view.component.web.util.TokenRange; import org.antlr.v4.runtime.Token; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/BodyTranspilerTests.java similarity index 86% rename from web-view-components/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/BodyTranspilerTests.java index 921e04e..cb04bfb 100644 --- a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java +++ b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/BodyTranspilerTests.java @@ -1,15 +1,15 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; -import groowt.view.web.antlr.ParserUtil; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.DefaultAstBuilder; -import groowt.view.web.ast.DefaultNodeFactory; -import groowt.view.web.ast.node.BodyNode; -import groowt.view.web.ast.node.CompilationUnitNode; -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit; -import groowt.view.web.transpile.BodyTranspiler; -import groowt.view.web.transpile.TranspilerConfiguration; -import groowt.view.web.transpile.TranspilerUtil; +import groowt.view.component.web.antlr.ParserUtil; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.DefaultAstBuilder; +import groowt.view.component.web.ast.DefaultNodeFactory; +import groowt.view.component.web.ast.node.BodyNode; +import groowt.view.component.web.ast.node.CompilationUnitNode; +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit; +import groowt.view.component.web.transpile.BodyTranspiler; +import groowt.view.component.web.transpile.TranspilerConfiguration; +import groowt.view.component.web.transpile.TranspilerUtil; import org.codehaus.groovy.ast.ModuleNode; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.MethodCallExpression; diff --git a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GStringTranspilerTests.java similarity index 85% rename from web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GStringTranspilerTests.java index 5683912..0b22cfc 100644 --- a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java +++ b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GStringTranspilerTests.java @@ -1,13 +1,13 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; -import groowt.view.web.antlr.ParserUtil; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.DefaultAstBuilder; -import groowt.view.web.ast.DefaultNodeFactory; -import groowt.view.web.ast.node.BodyNode; -import groowt.view.web.ast.node.CompilationUnitNode; -import groowt.view.web.ast.node.GStringBodyTextNode; -import groowt.view.web.transpile.GStringTranspiler; +import groowt.view.component.web.antlr.ParserUtil; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.DefaultAstBuilder; +import groowt.view.component.web.ast.DefaultNodeFactory; +import groowt.view.component.web.ast.node.BodyNode; +import groowt.view.component.web.ast.node.CompilationUnitNode; +import groowt.view.component.web.ast.node.GStringBodyTextNode; +import groowt.view.component.web.transpile.GStringTranspiler; import org.codehaus.groovy.ast.expr.ClosureExpression; import org.codehaus.groovy.ast.expr.GStringExpression; import org.codehaus.groovy.ast.expr.VariableExpression; diff --git a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GroovyTranspilerTests.java similarity index 78% rename from web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GroovyTranspilerTests.java index 2872192..346cf6e 100644 --- a/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java +++ b/web-view-components/src/testFixtures/java/groowt/view/component/web/transpiler/GroovyTranspilerTests.java @@ -1,18 +1,18 @@ -package groowt.view.web.transpiler; +package groowt.view.component.web.transpiler; import groovy.lang.Tuple2; import groowt.view.component.compiler.ComponentTemplateCompileException; import groowt.view.component.compiler.DefaultComponentTemplateCompilerConfiguration; import groowt.view.component.compiler.source.StringSource; -import groowt.view.web.BaseWebViewComponent; -import groowt.view.web.antlr.ParserUtil; -import groowt.view.web.antlr.TokenList; -import groowt.view.web.ast.DefaultAstBuilder; -import groowt.view.web.ast.DefaultNodeFactory; -import groowt.view.web.ast.node.CompilationUnitNode; -import groowt.view.web.compiler.AnonymousWebViewComponent; -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit; -import groowt.view.web.transpile.GroovyTranspiler; +import groowt.view.component.web.BaseWebViewComponent; +import groowt.view.component.web.antlr.ParserUtil; +import groowt.view.component.web.antlr.TokenList; +import groowt.view.component.web.ast.DefaultAstBuilder; +import groowt.view.component.web.ast.DefaultNodeFactory; +import groowt.view.component.web.ast.node.CompilationUnitNode; +import groowt.view.component.web.compiler.AnonymousWebViewComponent; +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit; +import groowt.view.component.web.transpile.GroovyTranspiler; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilePhase; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ public abstract class GroovyTranspilerTests { new WebViewComponentTemplateCompileUnit( AnonymousWebViewComponent.class, new StringSource(source, null), - "groowt.view.web.transpiler" + "groowt.view.component.web.transpiler" ), cuNode, "Template" + source.hashCode() diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AbstractTreeFileMaker.groovy similarity index 96% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/AbstractTreeFileMaker.groovy index 542b4e2..8fc79c1 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AbstractTreeFileMaker.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import java.util.regex.Pattern diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMaker.groovy similarity index 86% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMaker.groovy index 4c9fe03..3d87333 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMaker.groovy @@ -1,15 +1,13 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import groovy.transform.InheritConstructors import groovy.transform.MapConstructor -import groowt.view.web.analysis.MismatchedComponentTypeAnalysis -import groowt.view.web.antlr.AntlrUtil -import groowt.view.web.antlr.ParserUtil -import groowt.view.web.antlr.TokenList -import groowt.view.web.ast.DefaultAstBuilder -import groowt.view.web.ast.DefaultNodeFactory -import groowt.view.web.ast.NodeUtil -import groowt.view.web.ast.node.Node +import groowt.view.component.web.antlr.AntlrUtil +import groowt.view.component.web.antlr.TokenList +import groowt.view.component.web.ast.DefaultAstBuilder +import groowt.view.component.web.ast.DefaultNodeFactory +import groowt.view.component.web.ast.NodeUtil +import groowt.view.component.web.ast.node.Node import org.jetbrains.annotations.Nullable import static groowt.view.web.antlr.WebViewComponentsParser.CompilationUnitContext @@ -80,7 +78,7 @@ final class AstFileMaker extends AbstractTreeFileMaker { private BuildResult build(File sourceFile) { try { - def parseResult = ParserUtil.parseCompilationUnit(sourceFile) + def parseResult = groowt.view.component.web.antlr.ParserUtil.parseCompilationUnit(sourceFile) def cuContext = parseResult.compilationUnitContext @@ -88,7 +86,7 @@ final class AstFileMaker extends AbstractTreeFileMaker { if (!errorCollector.isEmpty()) { def message = 'There were parsing/lexing errors: \n' + errorCollector.all.collect { - ParserUtil.formatTree(parseResult.parser, it, true) + '\n' + groowt.view.component.web.antlr.ParserUtil.formatTree(parseResult.parser, it, true) + '\n' } return new BuildFailure( compilationUnitContext: cuContext, @@ -96,7 +94,7 @@ final class AstFileMaker extends AbstractTreeFileMaker { ) } - def mismatchedTypeErrors = MismatchedComponentTypeAnalysis.check(cuContext) + def mismatchedTypeErrors = groowt.view.component.web.analysis.MismatchedComponentTypeAnalysis.check(cuContext) if (!mismatchedTypeErrors.isEmpty()) { def message = 'There were mismatched type errors: \n' + mismatchedTypeErrors.collect { diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMakerCli.groovy similarity index 95% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMakerCli.groovy index aa766ef..fb840e9 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/AstFileMakerCli.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import picocli.CommandLine diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ConvertToGroovy.groovy similarity index 95% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/ConvertToGroovy.groovy index 2b0e09f..69c2cf2 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ConvertToGroovy.groovy @@ -1,11 +1,11 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import groovy.console.ui.AstNodeToScriptVisitor import groowt.view.component.compiler.source.ComponentTemplateSource import groowt.view.component.compiler.util.GroovyClassWriter import groowt.view.component.compiler.util.SimpleGroovyClassWriter -import groowt.view.web.compiler.AnonymousWebViewComponent -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit +import groowt.view.component.web.compiler.AnonymousWebViewComponent +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit import picocli.CommandLine import java.util.concurrent.Callable diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMaker.groovy similarity index 90% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMaker.groovy index 22a89f5..96753ee 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMaker.groovy @@ -1,8 +1,12 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import groovy.transform.InheritConstructors +import groowt.view.component.web.antlr.AntlrUtil +import groowt.view.component.web.antlr.AntlrUtil.ParseErrorCollector +import groowt.view.component.web.antlr.ParserUtil +import groowt.view.component.web.antlr.WebViewComponentsLexer +import groowt.view.component.web.antlr.WebViewComponentsTokenStream import groowt.view.web.antlr.* -import groowt.view.web.antlr.AntlrUtil.ParseErrorCollector import groowt.view.web.antlr.WebViewComponentsParser.CompilationUnitContext import org.antlr.v4.runtime.CharStreams diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMakerCli.groovy similarity index 95% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMakerCli.groovy index 6040656..acd1a13 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/ParseTreeFileMakerCli.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import picocli.CommandLine import picocli.CommandLine.Command diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/RunTemplate.groovy similarity index 87% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/RunTemplate.groovy index a2ec627..8a17d39 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/RunTemplate.groovy @@ -1,12 +1,12 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import groowt.view.component.ComponentTemplate import groowt.view.component.compiler.SimpleComponentTemplateClassFactory import groowt.view.component.compiler.source.ComponentTemplateSource -import groowt.view.web.BaseWebViewComponent -import groowt.view.web.DefaultWebViewComponentContext -import groowt.view.web.compiler.AnonymousWebViewComponent -import groowt.view.web.compiler.WebViewComponentTemplateCompileUnit +import groowt.view.component.web.BaseWebViewComponent +import groowt.view.component.web.DefaultWebViewComponentContext +import groowt.view.component.web.compiler.AnonymousWebViewComponent +import groowt.view.component.web.compiler.WebViewComponentTemplateCompileUnit import picocli.CommandLine import picocli.CommandLine.Command import picocli.CommandLine.Option diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessor.groovy similarity index 69% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessor.groovy index cdf1c45..f5ba17a 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessor.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools @FunctionalInterface interface SourceFileProcessor { diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessorSpec.groovy similarity index 98% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessorSpec.groovy index 01f5685..abbb714 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/SourceFileProcessorSpec.groovy @@ -1,4 +1,4 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools import picocli.CommandLine diff --git a/web-view-components/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/inspectNodes.groovy similarity index 88% rename from web-view-components/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy rename to web-view-components/src/tools/groovy/groowt/view/component/web/tools/inspectNodes.groovy index 60b0afb..745ab22 100644 --- a/web-view-components/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy +++ b/web-view-components/src/tools/groovy/groowt/view/component/web/tools/inspectNodes.groovy @@ -1,9 +1,9 @@ -package groowt.view.web.tools +package groowt.view.component.web.tools -import groowt.view.web.transpile.groovy.GroovyUtil +import groowt.view.component.web.transpile.groovy.GroovyUtil import org.codehaus.groovy.ast.ImportNode -import static groowt.view.web.transpile.groovy.GroovyUtil.formatGroovy +import static groowt.view.component.web.transpile.groovy.GroovyUtil.formatGroovy def src = ''' import some.Thing diff --git a/web-view-components/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/LexerTool.kt similarity index 64% rename from web-view-components/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt rename to web-view-components/src/tools/kotlin/groowt/view/component/web/tools/LexerTool.kt index 83434fe..6b43aba 100644 --- a/web-view-components/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt +++ b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/LexerTool.kt @@ -1,8 +1,8 @@ @file:JvmName("LexerTool") -package groowt.view.web.tools +package groowt.view.component.web.tools -import groowt.view.web.antlr.formatToken -import groowt.view.web.antlr.runLexerAllTokens +import groowt.view.component.web.antlr.formatToken +import groowt.view.component.web.antlr.runLexerAllTokens fun main(args: Array) { val options = processArgs(args) diff --git a/web-view-components/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ParserTool.kt similarity index 57% rename from web-view-components/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt rename to web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ParserTool.kt index 3a17b6e..e8b0b11 100644 --- a/web-view-components/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt +++ b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ParserTool.kt @@ -1,10 +1,10 @@ @file:JvmName("ParserTool") -package groowt.view.web.tools +package groowt.view.component.web.tools -import groowt.view.web.antlr.WebViewComponentsLexer -import groowt.view.web.antlr.WebViewComponentsTokenStream -import groowt.view.web.antlr.formatTree -import groowt.view.web.antlr.parseCompilationUnit +import groowt.view.component.web.antlr.WebViewComponentsLexer +import groowt.view.component.web.antlr.WebViewComponentsTokenStream +import groowt.view.component.web.antlr.formatTree +import groowt.view.component.web.antlr.parseCompilationUnit fun main(args: Array) { val options = processArgs(args) diff --git a/web-view-components/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ToolUtil.kt similarity index 98% rename from web-view-components/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt rename to web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ToolUtil.kt index c75ece0..268f57b 100644 --- a/web-view-components/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt +++ b/web-view-components/src/tools/kotlin/groowt/view/component/web/tools/ToolUtil.kt @@ -1,5 +1,5 @@ @file:JvmName("ToolUtil") -package groowt.view.web.tools +package groowt.view.component.web.tools import org.antlr.v4.runtime.CharStream import org.antlr.v4.runtime.CharStreams