From f88936f03c142a72f763bd6c693d9b26d1eb1ecc Mon Sep 17 00:00:00 2001 From: thomashii Date: Sat, 15 May 2021 17:38:15 +0800 Subject: [PATCH] Migrated jael to jael2 --- packages/jael/angel_jael/pubspec.yaml | 46 ------------------- .../{angel_jael => angel_jael2}/.gitignore | 0 .../{angel_jael => angel_jael2}/AUTHORS.md | 0 .../{angel_jael => angel_jael2}/CHANGELOG.md | 0 .../jael/{angel_jael => angel_jael2}/LICENSE | 0 .../{angel_jael => angel_jael2}/README.md | 0 .../analysis_options.yaml | 0 .../example/main.dart | 0 .../example/views/index.jael | 0 .../example/views/layout.jael | 0 .../lib/angel_jael.dart | 0 .../{angel_jael => angel_jael2}/mono_pkg.yaml | 0 packages/jael/angel_jael2/pubspec.yaml | 22 +++++++++ .../test/all_test.dart | 0 packages/jael/jael/pubspec.yaml | 28 ----------- packages/jael/{jael => jael2}/.gitignore | 0 packages/jael/{jael => jael2}/AUTHORS.md | 0 packages/jael/{jael => jael2}/CHANGELOG.md | 0 packages/jael/{jael => jael2}/LICENSE | 0 packages/jael/{jael => jael2}/README.md | 17 ++++--- .../{jael => jael2}/analysis_options.yaml | 0 .../jael/{jael => jael2}/bin/jaelfmt.dart | 0 .../jael/{jael => jael2}/example/main.dart | 0 packages/jael/{jael => jael2}/lib/jael.dart | 0 .../{jael => jael2}/lib/src/ast/array.dart | 0 .../jael/{jael => jael2}/lib/src/ast/ast.dart | 0 .../{jael => jael2}/lib/src/ast/ast_node.dart | 0 .../lib/src/ast/attribute.dart | 0 .../{jael => jael2}/lib/src/ast/binary.dart | 0 .../{jael => jael2}/lib/src/ast/call.dart | 0 .../lib/src/ast/conditional.dart | 0 .../{jael => jael2}/lib/src/ast/document.dart | 0 .../{jael => jael2}/lib/src/ast/element.dart | 0 .../{jael => jael2}/lib/src/ast/error.dart | 0 .../lib/src/ast/expression.dart | 0 .../lib/src/ast/identifier.dart | 0 .../lib/src/ast/interpolation.dart | 0 .../jael/{jael => jael2}/lib/src/ast/map.dart | 0 .../{jael => jael2}/lib/src/ast/member.dart | 0 .../jael/{jael => jael2}/lib/src/ast/new.dart | 0 .../{jael => jael2}/lib/src/ast/number.dart | 0 .../{jael => jael2}/lib/src/ast/string.dart | 0 .../{jael => jael2}/lib/src/ast/token.dart | 0 .../{jael => jael2}/lib/src/formatter.dart | 0 .../{jael => jael2}/lib/src/renderer.dart | 0 .../lib/src/text/parselet/infix.dart | 0 .../lib/src/text/parselet/parselet.dart | 0 .../lib/src/text/parselet/prefix.dart | 0 .../{jael => jael2}/lib/src/text/parser.dart | 0 .../{jael => jael2}/lib/src/text/scanner.dart | 0 packages/jael/{jael => jael2}/mono_pkg.yaml | 0 packages/jael/jael2/pubspec.yaml | 19 ++++++++ .../test/render/custom_element_test.dart | 0 .../{jael => jael2}/test/render/dsx_test.dart | 0 .../test/render/render_test.dart | 0 .../{jael => jael2}/test/text/common.dart | 0 .../{jael => jael2}/test/text/scan_test.dart | 0 .../.gitignore | 0 .../analysis_options.yaml | 0 .../bin/jael_language_server.dart | 0 .../lib/jael_language_server.dart | 0 .../lib/src/analyzer.dart | 0 .../lib/src/object.dart | 0 .../protocol/language_server/interface.dart | 0 .../protocol/language_server/messages.dart | 0 .../protocol/language_server/messages.yaml | 0 .../src/protocol/language_server/server.dart | 0 .../protocol/language_server/wireformat.dart | 0 .../lib/src/server.dart | 0 .../mono_pkg.yaml | 0 .../pubspec.yaml | 0 .../.gitignore | 0 .../AUTHORS.md | 0 .../CHANGELOG.md | 0 .../LICENSE | 0 .../README.md | 0 .../analysis_options.yaml | 0 .../example/main.dart | 0 .../lib/jael_preprocessor.dart | 0 .../mono_pkg.yaml | 0 .../pubspec.yaml | 0 .../test/block_test.dart | 0 .../test/include_test.dart | 0 .../jael/{jael_web => jael2_web}/.gitignore | 0 packages/jael/{jael_web => jael2_web}/LICENSE | 0 .../jael/{jael_web => jael2_web}/README.md | 0 .../analysis_options.yaml | 0 .../jael/{jael_web => jael2_web}/build.yaml | 0 .../{jael_web => jael2_web}/example/main.dart | 0 .../example/main.g.dart | 0 .../example/stateful.dart | 0 .../example/stateful.g.dart | 0 .../example/using_components.dart | 0 .../example/using_components.g.dart | 0 .../{jael_web => jael2_web}/lib/builder.dart | 0 .../{jael_web => jael2_web}/lib/elements.dart | 0 .../{jael_web => jael2_web}/lib/jael_web.dart | 0 .../lib/src/builder/builder.dart | 0 .../lib/src/builder/util.dart | 0 .../lib/src/builder_node.dart | 0 .../lib/src/component.dart | 0 .../lib/src/dom_builder.dart | 0 .../lib/src/dom_node.dart | 0 .../lib/src/elements.dart | 0 .../{jael_web => jael2_web}/lib/src/fn.dart | 0 .../lib/src/jael_component.dart | 0 .../{jael_web => jael2_web}/mono_pkg.yaml | 0 .../jael/{jael_web => jael2_web}/pubspec.yaml | 0 108 files changed, 51 insertions(+), 81 deletions(-) delete mode 100644 packages/jael/angel_jael/pubspec.yaml rename packages/jael/{angel_jael => angel_jael2}/.gitignore (100%) rename packages/jael/{angel_jael => angel_jael2}/AUTHORS.md (100%) rename packages/jael/{angel_jael => angel_jael2}/CHANGELOG.md (100%) rename packages/jael/{angel_jael => angel_jael2}/LICENSE (100%) rename packages/jael/{angel_jael => angel_jael2}/README.md (100%) rename packages/jael/{angel_jael => angel_jael2}/analysis_options.yaml (100%) rename packages/jael/{angel_jael => angel_jael2}/example/main.dart (100%) rename packages/jael/{angel_jael => angel_jael2}/example/views/index.jael (100%) rename packages/jael/{angel_jael => angel_jael2}/example/views/layout.jael (100%) rename packages/jael/{angel_jael => angel_jael2}/lib/angel_jael.dart (100%) rename packages/jael/{angel_jael => angel_jael2}/mono_pkg.yaml (100%) create mode 100644 packages/jael/angel_jael2/pubspec.yaml rename packages/jael/{angel_jael => angel_jael2}/test/all_test.dart (100%) delete mode 100644 packages/jael/jael/pubspec.yaml rename packages/jael/{jael => jael2}/.gitignore (100%) rename packages/jael/{jael => jael2}/AUTHORS.md (100%) rename packages/jael/{jael => jael2}/CHANGELOG.md (100%) rename packages/jael/{jael => jael2}/LICENSE (100%) rename packages/jael/{jael => jael2}/README.md (57%) rename packages/jael/{jael => jael2}/analysis_options.yaml (100%) rename packages/jael/{jael => jael2}/bin/jaelfmt.dart (100%) rename packages/jael/{jael => jael2}/example/main.dart (100%) rename packages/jael/{jael => jael2}/lib/jael.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/array.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/ast.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/ast_node.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/attribute.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/binary.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/call.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/conditional.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/document.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/element.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/error.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/expression.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/identifier.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/interpolation.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/map.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/member.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/new.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/number.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/string.dart (100%) rename packages/jael/{jael => jael2}/lib/src/ast/token.dart (100%) rename packages/jael/{jael => jael2}/lib/src/formatter.dart (100%) rename packages/jael/{jael => jael2}/lib/src/renderer.dart (100%) rename packages/jael/{jael => jael2}/lib/src/text/parselet/infix.dart (100%) rename packages/jael/{jael => jael2}/lib/src/text/parselet/parselet.dart (100%) rename packages/jael/{jael => jael2}/lib/src/text/parselet/prefix.dart (100%) rename packages/jael/{jael => jael2}/lib/src/text/parser.dart (100%) rename packages/jael/{jael => jael2}/lib/src/text/scanner.dart (100%) rename packages/jael/{jael => jael2}/mono_pkg.yaml (100%) create mode 100644 packages/jael/jael2/pubspec.yaml rename packages/jael/{jael => jael2}/test/render/custom_element_test.dart (100%) rename packages/jael/{jael => jael2}/test/render/dsx_test.dart (100%) rename packages/jael/{jael => jael2}/test/render/render_test.dart (100%) rename packages/jael/{jael => jael2}/test/text/common.dart (100%) rename packages/jael/{jael => jael2}/test/text/scan_test.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/.gitignore (100%) rename packages/jael/{jael_language_server => jael2_language_server}/analysis_options.yaml (100%) rename packages/jael/{jael_language_server => jael2_language_server}/bin/jael_language_server.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/jael_language_server.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/analyzer.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/object.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/protocol/language_server/interface.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/protocol/language_server/messages.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/protocol/language_server/messages.yaml (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/protocol/language_server/server.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/protocol/language_server/wireformat.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/lib/src/server.dart (100%) rename packages/jael/{jael_language_server => jael2_language_server}/mono_pkg.yaml (100%) rename packages/jael/{jael_language_server => jael2_language_server}/pubspec.yaml (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/.gitignore (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/AUTHORS.md (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/CHANGELOG.md (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/LICENSE (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/README.md (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/analysis_options.yaml (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/example/main.dart (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/lib/jael_preprocessor.dart (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/mono_pkg.yaml (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/pubspec.yaml (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/test/block_test.dart (100%) rename packages/jael/{jael_preprocessor => jael2_preprocessor}/test/include_test.dart (100%) rename packages/jael/{jael_web => jael2_web}/.gitignore (100%) rename packages/jael/{jael_web => jael2_web}/LICENSE (100%) rename packages/jael/{jael_web => jael2_web}/README.md (100%) rename packages/jael/{jael_web => jael2_web}/analysis_options.yaml (100%) rename packages/jael/{jael_web => jael2_web}/build.yaml (100%) rename packages/jael/{jael_web => jael2_web}/example/main.dart (100%) rename packages/jael/{jael_web => jael2_web}/example/main.g.dart (100%) rename packages/jael/{jael_web => jael2_web}/example/stateful.dart (100%) rename packages/jael/{jael_web => jael2_web}/example/stateful.g.dart (100%) rename packages/jael/{jael_web => jael2_web}/example/using_components.dart (100%) rename packages/jael/{jael_web => jael2_web}/example/using_components.g.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/builder.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/elements.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/jael_web.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/builder/builder.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/builder/util.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/builder_node.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/component.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/dom_builder.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/dom_node.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/elements.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/fn.dart (100%) rename packages/jael/{jael_web => jael2_web}/lib/src/jael_component.dart (100%) rename packages/jael/{jael_web => jael2_web}/mono_pkg.yaml (100%) rename packages/jael/{jael_web => jael2_web}/pubspec.yaml (100%) diff --git a/packages/jael/angel_jael/pubspec.yaml b/packages/jael/angel_jael/pubspec.yaml deleted file mode 100644 index 683d640b..00000000 --- a/packages/jael/angel_jael/pubspec.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: angel_jael -version: 4.0.0 -description: Angel support for the Jael templating engine, similar to Blade or Liquid. -homepage: https://github.com/dukefirehawk/angel -publish_to: none -environment: - sdk: '>=2.12.0 <3.0.0' -dependencies: - angel_framework: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/framework - code_buffer: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/code_buffer - jael: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/jael/jael - jael_preprocessor: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/jael/jael_preprocessor - symbol_table: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/symbol_table - file: ^6.0.0 - -dev_dependencies: - angel_test: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/test - html: ^0.15.0 - test: ^1.17.3 -dependency_overrides: - web_socket_channel: ^2.0.0 - http: ^0.13.0 \ No newline at end of file diff --git a/packages/jael/angel_jael/.gitignore b/packages/jael/angel_jael2/.gitignore similarity index 100% rename from packages/jael/angel_jael/.gitignore rename to packages/jael/angel_jael2/.gitignore diff --git a/packages/jael/angel_jael/AUTHORS.md b/packages/jael/angel_jael2/AUTHORS.md similarity index 100% rename from packages/jael/angel_jael/AUTHORS.md rename to packages/jael/angel_jael2/AUTHORS.md diff --git a/packages/jael/angel_jael/CHANGELOG.md b/packages/jael/angel_jael2/CHANGELOG.md similarity index 100% rename from packages/jael/angel_jael/CHANGELOG.md rename to packages/jael/angel_jael2/CHANGELOG.md diff --git a/packages/jael/angel_jael/LICENSE b/packages/jael/angel_jael2/LICENSE similarity index 100% rename from packages/jael/angel_jael/LICENSE rename to packages/jael/angel_jael2/LICENSE diff --git a/packages/jael/angel_jael/README.md b/packages/jael/angel_jael2/README.md similarity index 100% rename from packages/jael/angel_jael/README.md rename to packages/jael/angel_jael2/README.md diff --git a/packages/jael/angel_jael/analysis_options.yaml b/packages/jael/angel_jael2/analysis_options.yaml similarity index 100% rename from packages/jael/angel_jael/analysis_options.yaml rename to packages/jael/angel_jael2/analysis_options.yaml diff --git a/packages/jael/angel_jael/example/main.dart b/packages/jael/angel_jael2/example/main.dart similarity index 100% rename from packages/jael/angel_jael/example/main.dart rename to packages/jael/angel_jael2/example/main.dart diff --git a/packages/jael/angel_jael/example/views/index.jael b/packages/jael/angel_jael2/example/views/index.jael similarity index 100% rename from packages/jael/angel_jael/example/views/index.jael rename to packages/jael/angel_jael2/example/views/index.jael diff --git a/packages/jael/angel_jael/example/views/layout.jael b/packages/jael/angel_jael2/example/views/layout.jael similarity index 100% rename from packages/jael/angel_jael/example/views/layout.jael rename to packages/jael/angel_jael2/example/views/layout.jael diff --git a/packages/jael/angel_jael/lib/angel_jael.dart b/packages/jael/angel_jael2/lib/angel_jael.dart similarity index 100% rename from packages/jael/angel_jael/lib/angel_jael.dart rename to packages/jael/angel_jael2/lib/angel_jael.dart diff --git a/packages/jael/angel_jael/mono_pkg.yaml b/packages/jael/angel_jael2/mono_pkg.yaml similarity index 100% rename from packages/jael/angel_jael/mono_pkg.yaml rename to packages/jael/angel_jael2/mono_pkg.yaml diff --git a/packages/jael/angel_jael2/pubspec.yaml b/packages/jael/angel_jael2/pubspec.yaml new file mode 100644 index 00000000..a14c3bf5 --- /dev/null +++ b/packages/jael/angel_jael2/pubspec.yaml @@ -0,0 +1,22 @@ +name: angel3_jael2 +version: 4.0.0 +description: Angel support for the Jael templating engine, similar to Blade or Liquid. +homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/angel_jael +publish_to: none +environment: + sdk: '>=2.12.0 <3.0.0' +dependencies: + angel3_framework: ^4.0.0 + angel3_code_buffer: ^2.0.0 + jael2: + jael2_preprocessor: + angel3_symbol_table: ^2.0.0 + file: ^6.0.0 + +dev_dependencies: + angel3_test: ^4.0.0 + html: ^0.15.0 + test: ^1.17.3 +dependency_overrides: + web_socket_channel: ^2.0.0 + http: ^0.13.0 \ No newline at end of file diff --git a/packages/jael/angel_jael/test/all_test.dart b/packages/jael/angel_jael2/test/all_test.dart similarity index 100% rename from packages/jael/angel_jael/test/all_test.dart rename to packages/jael/angel_jael2/test/all_test.dart diff --git a/packages/jael/jael/pubspec.yaml b/packages/jael/jael/pubspec.yaml deleted file mode 100644 index 2c92d643..00000000 --- a/packages/jael/jael/pubspec.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: jael -version: 4.0.0 -description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid. -homepage: https://docs.angel-dart.dev/packages/front-end/jael -publish_to: none -environment: - sdk: '>=2.12.0 <3.0.0' -dependencies: - args: ^2.0.0 - charcode: ^1.0.0 - code_buffer: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/code_buffer - source_span: ^1.0.0 - string_scanner: ^1.0.0 - symbol_table: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/symbol_table - collection: ^1.15.0 -dev_dependencies: - pedantic: ^1.11.0 - test: ^1.17.3 -executables: - jaelfmt: jaelfmt \ No newline at end of file diff --git a/packages/jael/jael/.gitignore b/packages/jael/jael2/.gitignore similarity index 100% rename from packages/jael/jael/.gitignore rename to packages/jael/jael2/.gitignore diff --git a/packages/jael/jael/AUTHORS.md b/packages/jael/jael2/AUTHORS.md similarity index 100% rename from packages/jael/jael/AUTHORS.md rename to packages/jael/jael2/AUTHORS.md diff --git a/packages/jael/jael/CHANGELOG.md b/packages/jael/jael2/CHANGELOG.md similarity index 100% rename from packages/jael/jael/CHANGELOG.md rename to packages/jael/jael2/CHANGELOG.md diff --git a/packages/jael/jael/LICENSE b/packages/jael/jael2/LICENSE similarity index 100% rename from packages/jael/jael/LICENSE rename to packages/jael/jael2/LICENSE diff --git a/packages/jael/jael/README.md b/packages/jael/jael2/README.md similarity index 57% rename from packages/jael/jael/README.md rename to packages/jael/jael2/README.md index d9bdcf9f..49445113 100644 --- a/packages/jael/jael/README.md +++ b/packages/jael/jael2/README.md @@ -1,6 +1,9 @@ -# jael -[![Pub](https://img.shields.io/pub/v/jael.svg)](https://pub.dartlang.org/packages/jael) -[![build status](https://travis-ci.org/angel-dart/jael.svg)](https://travis-ci.org/angel-dart/jael) +# angel3_jael_engine +[![version](https://img.shields.io/badge/pub-v4.0.0-brightgreen)](https://pub.dartlang.org/packages/jael3) +[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) +[![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) + +[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael/LICENSE) A simple server-side HTML templating engine for Dart. @@ -11,7 +14,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - jael: ^2.0.0 + jael3: ^4.0.0 ``` # API @@ -19,9 +22,9 @@ The core `jael` package exports classes for parsing Jael templates, an AST library, and a `Renderer` class that generates HTML on-the-fly. ```dart -import 'package:code_buffer/code_buffer.dart'; -import 'package:jael/jael.dart' as jael; -import 'package:symbol_table/symbol_table.dart'; +import 'package:angel3_code_buffer/code_buffer.dart'; +import 'package:jael3/jael.dart' as jael; +import 'package:angel3_symbol_table/symbol_table.dart'; void myFunction() { const template = ''' diff --git a/packages/jael/jael/analysis_options.yaml b/packages/jael/jael2/analysis_options.yaml similarity index 100% rename from packages/jael/jael/analysis_options.yaml rename to packages/jael/jael2/analysis_options.yaml diff --git a/packages/jael/jael/bin/jaelfmt.dart b/packages/jael/jael2/bin/jaelfmt.dart similarity index 100% rename from packages/jael/jael/bin/jaelfmt.dart rename to packages/jael/jael2/bin/jaelfmt.dart diff --git a/packages/jael/jael/example/main.dart b/packages/jael/jael2/example/main.dart similarity index 100% rename from packages/jael/jael/example/main.dart rename to packages/jael/jael2/example/main.dart diff --git a/packages/jael/jael/lib/jael.dart b/packages/jael/jael2/lib/jael.dart similarity index 100% rename from packages/jael/jael/lib/jael.dart rename to packages/jael/jael2/lib/jael.dart diff --git a/packages/jael/jael/lib/src/ast/array.dart b/packages/jael/jael2/lib/src/ast/array.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/array.dart rename to packages/jael/jael2/lib/src/ast/array.dart diff --git a/packages/jael/jael/lib/src/ast/ast.dart b/packages/jael/jael2/lib/src/ast/ast.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/ast.dart rename to packages/jael/jael2/lib/src/ast/ast.dart diff --git a/packages/jael/jael/lib/src/ast/ast_node.dart b/packages/jael/jael2/lib/src/ast/ast_node.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/ast_node.dart rename to packages/jael/jael2/lib/src/ast/ast_node.dart diff --git a/packages/jael/jael/lib/src/ast/attribute.dart b/packages/jael/jael2/lib/src/ast/attribute.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/attribute.dart rename to packages/jael/jael2/lib/src/ast/attribute.dart diff --git a/packages/jael/jael/lib/src/ast/binary.dart b/packages/jael/jael2/lib/src/ast/binary.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/binary.dart rename to packages/jael/jael2/lib/src/ast/binary.dart diff --git a/packages/jael/jael/lib/src/ast/call.dart b/packages/jael/jael2/lib/src/ast/call.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/call.dart rename to packages/jael/jael2/lib/src/ast/call.dart diff --git a/packages/jael/jael/lib/src/ast/conditional.dart b/packages/jael/jael2/lib/src/ast/conditional.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/conditional.dart rename to packages/jael/jael2/lib/src/ast/conditional.dart diff --git a/packages/jael/jael/lib/src/ast/document.dart b/packages/jael/jael2/lib/src/ast/document.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/document.dart rename to packages/jael/jael2/lib/src/ast/document.dart diff --git a/packages/jael/jael/lib/src/ast/element.dart b/packages/jael/jael2/lib/src/ast/element.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/element.dart rename to packages/jael/jael2/lib/src/ast/element.dart diff --git a/packages/jael/jael/lib/src/ast/error.dart b/packages/jael/jael2/lib/src/ast/error.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/error.dart rename to packages/jael/jael2/lib/src/ast/error.dart diff --git a/packages/jael/jael/lib/src/ast/expression.dart b/packages/jael/jael2/lib/src/ast/expression.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/expression.dart rename to packages/jael/jael2/lib/src/ast/expression.dart diff --git a/packages/jael/jael/lib/src/ast/identifier.dart b/packages/jael/jael2/lib/src/ast/identifier.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/identifier.dart rename to packages/jael/jael2/lib/src/ast/identifier.dart diff --git a/packages/jael/jael/lib/src/ast/interpolation.dart b/packages/jael/jael2/lib/src/ast/interpolation.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/interpolation.dart rename to packages/jael/jael2/lib/src/ast/interpolation.dart diff --git a/packages/jael/jael/lib/src/ast/map.dart b/packages/jael/jael2/lib/src/ast/map.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/map.dart rename to packages/jael/jael2/lib/src/ast/map.dart diff --git a/packages/jael/jael/lib/src/ast/member.dart b/packages/jael/jael2/lib/src/ast/member.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/member.dart rename to packages/jael/jael2/lib/src/ast/member.dart diff --git a/packages/jael/jael/lib/src/ast/new.dart b/packages/jael/jael2/lib/src/ast/new.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/new.dart rename to packages/jael/jael2/lib/src/ast/new.dart diff --git a/packages/jael/jael/lib/src/ast/number.dart b/packages/jael/jael2/lib/src/ast/number.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/number.dart rename to packages/jael/jael2/lib/src/ast/number.dart diff --git a/packages/jael/jael/lib/src/ast/string.dart b/packages/jael/jael2/lib/src/ast/string.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/string.dart rename to packages/jael/jael2/lib/src/ast/string.dart diff --git a/packages/jael/jael/lib/src/ast/token.dart b/packages/jael/jael2/lib/src/ast/token.dart similarity index 100% rename from packages/jael/jael/lib/src/ast/token.dart rename to packages/jael/jael2/lib/src/ast/token.dart diff --git a/packages/jael/jael/lib/src/formatter.dart b/packages/jael/jael2/lib/src/formatter.dart similarity index 100% rename from packages/jael/jael/lib/src/formatter.dart rename to packages/jael/jael2/lib/src/formatter.dart diff --git a/packages/jael/jael/lib/src/renderer.dart b/packages/jael/jael2/lib/src/renderer.dart similarity index 100% rename from packages/jael/jael/lib/src/renderer.dart rename to packages/jael/jael2/lib/src/renderer.dart diff --git a/packages/jael/jael/lib/src/text/parselet/infix.dart b/packages/jael/jael2/lib/src/text/parselet/infix.dart similarity index 100% rename from packages/jael/jael/lib/src/text/parselet/infix.dart rename to packages/jael/jael2/lib/src/text/parselet/infix.dart diff --git a/packages/jael/jael/lib/src/text/parselet/parselet.dart b/packages/jael/jael2/lib/src/text/parselet/parselet.dart similarity index 100% rename from packages/jael/jael/lib/src/text/parselet/parselet.dart rename to packages/jael/jael2/lib/src/text/parselet/parselet.dart diff --git a/packages/jael/jael/lib/src/text/parselet/prefix.dart b/packages/jael/jael2/lib/src/text/parselet/prefix.dart similarity index 100% rename from packages/jael/jael/lib/src/text/parselet/prefix.dart rename to packages/jael/jael2/lib/src/text/parselet/prefix.dart diff --git a/packages/jael/jael/lib/src/text/parser.dart b/packages/jael/jael2/lib/src/text/parser.dart similarity index 100% rename from packages/jael/jael/lib/src/text/parser.dart rename to packages/jael/jael2/lib/src/text/parser.dart diff --git a/packages/jael/jael/lib/src/text/scanner.dart b/packages/jael/jael2/lib/src/text/scanner.dart similarity index 100% rename from packages/jael/jael/lib/src/text/scanner.dart rename to packages/jael/jael2/lib/src/text/scanner.dart diff --git a/packages/jael/jael/mono_pkg.yaml b/packages/jael/jael2/mono_pkg.yaml similarity index 100% rename from packages/jael/jael/mono_pkg.yaml rename to packages/jael/jael2/mono_pkg.yaml diff --git a/packages/jael/jael2/pubspec.yaml b/packages/jael/jael2/pubspec.yaml new file mode 100644 index 00000000..69afad3f --- /dev/null +++ b/packages/jael/jael2/pubspec.yaml @@ -0,0 +1,19 @@ +name: jael2 +version: 4.0.0 +description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid. +homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael +environment: + sdk: '>=2.12.0 <3.0.0' +dependencies: + args: ^2.0.0 + charcode: ^1.0.0 + angel3_code_buffer: + angel3_symbol_table: + source_span: ^1.0.0 + string_scanner: ^1.0.0 + collection: ^1.15.0 +dev_dependencies: + pedantic: ^1.11.0 + test: ^1.17.4 +executables: + jaelfmt: jaelfmt \ No newline at end of file diff --git a/packages/jael/jael/test/render/custom_element_test.dart b/packages/jael/jael2/test/render/custom_element_test.dart similarity index 100% rename from packages/jael/jael/test/render/custom_element_test.dart rename to packages/jael/jael2/test/render/custom_element_test.dart diff --git a/packages/jael/jael/test/render/dsx_test.dart b/packages/jael/jael2/test/render/dsx_test.dart similarity index 100% rename from packages/jael/jael/test/render/dsx_test.dart rename to packages/jael/jael2/test/render/dsx_test.dart diff --git a/packages/jael/jael/test/render/render_test.dart b/packages/jael/jael2/test/render/render_test.dart similarity index 100% rename from packages/jael/jael/test/render/render_test.dart rename to packages/jael/jael2/test/render/render_test.dart diff --git a/packages/jael/jael/test/text/common.dart b/packages/jael/jael2/test/text/common.dart similarity index 100% rename from packages/jael/jael/test/text/common.dart rename to packages/jael/jael2/test/text/common.dart diff --git a/packages/jael/jael/test/text/scan_test.dart b/packages/jael/jael2/test/text/scan_test.dart similarity index 100% rename from packages/jael/jael/test/text/scan_test.dart rename to packages/jael/jael2/test/text/scan_test.dart diff --git a/packages/jael/jael_language_server/.gitignore b/packages/jael/jael2_language_server/.gitignore similarity index 100% rename from packages/jael/jael_language_server/.gitignore rename to packages/jael/jael2_language_server/.gitignore diff --git a/packages/jael/jael_language_server/analysis_options.yaml b/packages/jael/jael2_language_server/analysis_options.yaml similarity index 100% rename from packages/jael/jael_language_server/analysis_options.yaml rename to packages/jael/jael2_language_server/analysis_options.yaml diff --git a/packages/jael/jael_language_server/bin/jael_language_server.dart b/packages/jael/jael2_language_server/bin/jael_language_server.dart similarity index 100% rename from packages/jael/jael_language_server/bin/jael_language_server.dart rename to packages/jael/jael2_language_server/bin/jael_language_server.dart diff --git a/packages/jael/jael_language_server/lib/jael_language_server.dart b/packages/jael/jael2_language_server/lib/jael_language_server.dart similarity index 100% rename from packages/jael/jael_language_server/lib/jael_language_server.dart rename to packages/jael/jael2_language_server/lib/jael_language_server.dart diff --git a/packages/jael/jael_language_server/lib/src/analyzer.dart b/packages/jael/jael2_language_server/lib/src/analyzer.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/analyzer.dart rename to packages/jael/jael2_language_server/lib/src/analyzer.dart diff --git a/packages/jael/jael_language_server/lib/src/object.dart b/packages/jael/jael2_language_server/lib/src/object.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/object.dart rename to packages/jael/jael2_language_server/lib/src/object.dart diff --git a/packages/jael/jael_language_server/lib/src/protocol/language_server/interface.dart b/packages/jael/jael2_language_server/lib/src/protocol/language_server/interface.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/protocol/language_server/interface.dart rename to packages/jael/jael2_language_server/lib/src/protocol/language_server/interface.dart diff --git a/packages/jael/jael_language_server/lib/src/protocol/language_server/messages.dart b/packages/jael/jael2_language_server/lib/src/protocol/language_server/messages.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/protocol/language_server/messages.dart rename to packages/jael/jael2_language_server/lib/src/protocol/language_server/messages.dart diff --git a/packages/jael/jael_language_server/lib/src/protocol/language_server/messages.yaml b/packages/jael/jael2_language_server/lib/src/protocol/language_server/messages.yaml similarity index 100% rename from packages/jael/jael_language_server/lib/src/protocol/language_server/messages.yaml rename to packages/jael/jael2_language_server/lib/src/protocol/language_server/messages.yaml diff --git a/packages/jael/jael_language_server/lib/src/protocol/language_server/server.dart b/packages/jael/jael2_language_server/lib/src/protocol/language_server/server.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/protocol/language_server/server.dart rename to packages/jael/jael2_language_server/lib/src/protocol/language_server/server.dart diff --git a/packages/jael/jael_language_server/lib/src/protocol/language_server/wireformat.dart b/packages/jael/jael2_language_server/lib/src/protocol/language_server/wireformat.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/protocol/language_server/wireformat.dart rename to packages/jael/jael2_language_server/lib/src/protocol/language_server/wireformat.dart diff --git a/packages/jael/jael_language_server/lib/src/server.dart b/packages/jael/jael2_language_server/lib/src/server.dart similarity index 100% rename from packages/jael/jael_language_server/lib/src/server.dart rename to packages/jael/jael2_language_server/lib/src/server.dart diff --git a/packages/jael/jael_language_server/mono_pkg.yaml b/packages/jael/jael2_language_server/mono_pkg.yaml similarity index 100% rename from packages/jael/jael_language_server/mono_pkg.yaml rename to packages/jael/jael2_language_server/mono_pkg.yaml diff --git a/packages/jael/jael_language_server/pubspec.yaml b/packages/jael/jael2_language_server/pubspec.yaml similarity index 100% rename from packages/jael/jael_language_server/pubspec.yaml rename to packages/jael/jael2_language_server/pubspec.yaml diff --git a/packages/jael/jael_preprocessor/.gitignore b/packages/jael/jael2_preprocessor/.gitignore similarity index 100% rename from packages/jael/jael_preprocessor/.gitignore rename to packages/jael/jael2_preprocessor/.gitignore diff --git a/packages/jael/jael_preprocessor/AUTHORS.md b/packages/jael/jael2_preprocessor/AUTHORS.md similarity index 100% rename from packages/jael/jael_preprocessor/AUTHORS.md rename to packages/jael/jael2_preprocessor/AUTHORS.md diff --git a/packages/jael/jael_preprocessor/CHANGELOG.md b/packages/jael/jael2_preprocessor/CHANGELOG.md similarity index 100% rename from packages/jael/jael_preprocessor/CHANGELOG.md rename to packages/jael/jael2_preprocessor/CHANGELOG.md diff --git a/packages/jael/jael_preprocessor/LICENSE b/packages/jael/jael2_preprocessor/LICENSE similarity index 100% rename from packages/jael/jael_preprocessor/LICENSE rename to packages/jael/jael2_preprocessor/LICENSE diff --git a/packages/jael/jael_preprocessor/README.md b/packages/jael/jael2_preprocessor/README.md similarity index 100% rename from packages/jael/jael_preprocessor/README.md rename to packages/jael/jael2_preprocessor/README.md diff --git a/packages/jael/jael_preprocessor/analysis_options.yaml b/packages/jael/jael2_preprocessor/analysis_options.yaml similarity index 100% rename from packages/jael/jael_preprocessor/analysis_options.yaml rename to packages/jael/jael2_preprocessor/analysis_options.yaml diff --git a/packages/jael/jael_preprocessor/example/main.dart b/packages/jael/jael2_preprocessor/example/main.dart similarity index 100% rename from packages/jael/jael_preprocessor/example/main.dart rename to packages/jael/jael2_preprocessor/example/main.dart diff --git a/packages/jael/jael_preprocessor/lib/jael_preprocessor.dart b/packages/jael/jael2_preprocessor/lib/jael_preprocessor.dart similarity index 100% rename from packages/jael/jael_preprocessor/lib/jael_preprocessor.dart rename to packages/jael/jael2_preprocessor/lib/jael_preprocessor.dart diff --git a/packages/jael/jael_preprocessor/mono_pkg.yaml b/packages/jael/jael2_preprocessor/mono_pkg.yaml similarity index 100% rename from packages/jael/jael_preprocessor/mono_pkg.yaml rename to packages/jael/jael2_preprocessor/mono_pkg.yaml diff --git a/packages/jael/jael_preprocessor/pubspec.yaml b/packages/jael/jael2_preprocessor/pubspec.yaml similarity index 100% rename from packages/jael/jael_preprocessor/pubspec.yaml rename to packages/jael/jael2_preprocessor/pubspec.yaml diff --git a/packages/jael/jael_preprocessor/test/block_test.dart b/packages/jael/jael2_preprocessor/test/block_test.dart similarity index 100% rename from packages/jael/jael_preprocessor/test/block_test.dart rename to packages/jael/jael2_preprocessor/test/block_test.dart diff --git a/packages/jael/jael_preprocessor/test/include_test.dart b/packages/jael/jael2_preprocessor/test/include_test.dart similarity index 100% rename from packages/jael/jael_preprocessor/test/include_test.dart rename to packages/jael/jael2_preprocessor/test/include_test.dart diff --git a/packages/jael/jael_web/.gitignore b/packages/jael/jael2_web/.gitignore similarity index 100% rename from packages/jael/jael_web/.gitignore rename to packages/jael/jael2_web/.gitignore diff --git a/packages/jael/jael_web/LICENSE b/packages/jael/jael2_web/LICENSE similarity index 100% rename from packages/jael/jael_web/LICENSE rename to packages/jael/jael2_web/LICENSE diff --git a/packages/jael/jael_web/README.md b/packages/jael/jael2_web/README.md similarity index 100% rename from packages/jael/jael_web/README.md rename to packages/jael/jael2_web/README.md diff --git a/packages/jael/jael_web/analysis_options.yaml b/packages/jael/jael2_web/analysis_options.yaml similarity index 100% rename from packages/jael/jael_web/analysis_options.yaml rename to packages/jael/jael2_web/analysis_options.yaml diff --git a/packages/jael/jael_web/build.yaml b/packages/jael/jael2_web/build.yaml similarity index 100% rename from packages/jael/jael_web/build.yaml rename to packages/jael/jael2_web/build.yaml diff --git a/packages/jael/jael_web/example/main.dart b/packages/jael/jael2_web/example/main.dart similarity index 100% rename from packages/jael/jael_web/example/main.dart rename to packages/jael/jael2_web/example/main.dart diff --git a/packages/jael/jael_web/example/main.g.dart b/packages/jael/jael2_web/example/main.g.dart similarity index 100% rename from packages/jael/jael_web/example/main.g.dart rename to packages/jael/jael2_web/example/main.g.dart diff --git a/packages/jael/jael_web/example/stateful.dart b/packages/jael/jael2_web/example/stateful.dart similarity index 100% rename from packages/jael/jael_web/example/stateful.dart rename to packages/jael/jael2_web/example/stateful.dart diff --git a/packages/jael/jael_web/example/stateful.g.dart b/packages/jael/jael2_web/example/stateful.g.dart similarity index 100% rename from packages/jael/jael_web/example/stateful.g.dart rename to packages/jael/jael2_web/example/stateful.g.dart diff --git a/packages/jael/jael_web/example/using_components.dart b/packages/jael/jael2_web/example/using_components.dart similarity index 100% rename from packages/jael/jael_web/example/using_components.dart rename to packages/jael/jael2_web/example/using_components.dart diff --git a/packages/jael/jael_web/example/using_components.g.dart b/packages/jael/jael2_web/example/using_components.g.dart similarity index 100% rename from packages/jael/jael_web/example/using_components.g.dart rename to packages/jael/jael2_web/example/using_components.g.dart diff --git a/packages/jael/jael_web/lib/builder.dart b/packages/jael/jael2_web/lib/builder.dart similarity index 100% rename from packages/jael/jael_web/lib/builder.dart rename to packages/jael/jael2_web/lib/builder.dart diff --git a/packages/jael/jael_web/lib/elements.dart b/packages/jael/jael2_web/lib/elements.dart similarity index 100% rename from packages/jael/jael_web/lib/elements.dart rename to packages/jael/jael2_web/lib/elements.dart diff --git a/packages/jael/jael_web/lib/jael_web.dart b/packages/jael/jael2_web/lib/jael_web.dart similarity index 100% rename from packages/jael/jael_web/lib/jael_web.dart rename to packages/jael/jael2_web/lib/jael_web.dart diff --git a/packages/jael/jael_web/lib/src/builder/builder.dart b/packages/jael/jael2_web/lib/src/builder/builder.dart similarity index 100% rename from packages/jael/jael_web/lib/src/builder/builder.dart rename to packages/jael/jael2_web/lib/src/builder/builder.dart diff --git a/packages/jael/jael_web/lib/src/builder/util.dart b/packages/jael/jael2_web/lib/src/builder/util.dart similarity index 100% rename from packages/jael/jael_web/lib/src/builder/util.dart rename to packages/jael/jael2_web/lib/src/builder/util.dart diff --git a/packages/jael/jael_web/lib/src/builder_node.dart b/packages/jael/jael2_web/lib/src/builder_node.dart similarity index 100% rename from packages/jael/jael_web/lib/src/builder_node.dart rename to packages/jael/jael2_web/lib/src/builder_node.dart diff --git a/packages/jael/jael_web/lib/src/component.dart b/packages/jael/jael2_web/lib/src/component.dart similarity index 100% rename from packages/jael/jael_web/lib/src/component.dart rename to packages/jael/jael2_web/lib/src/component.dart diff --git a/packages/jael/jael_web/lib/src/dom_builder.dart b/packages/jael/jael2_web/lib/src/dom_builder.dart similarity index 100% rename from packages/jael/jael_web/lib/src/dom_builder.dart rename to packages/jael/jael2_web/lib/src/dom_builder.dart diff --git a/packages/jael/jael_web/lib/src/dom_node.dart b/packages/jael/jael2_web/lib/src/dom_node.dart similarity index 100% rename from packages/jael/jael_web/lib/src/dom_node.dart rename to packages/jael/jael2_web/lib/src/dom_node.dart diff --git a/packages/jael/jael_web/lib/src/elements.dart b/packages/jael/jael2_web/lib/src/elements.dart similarity index 100% rename from packages/jael/jael_web/lib/src/elements.dart rename to packages/jael/jael2_web/lib/src/elements.dart diff --git a/packages/jael/jael_web/lib/src/fn.dart b/packages/jael/jael2_web/lib/src/fn.dart similarity index 100% rename from packages/jael/jael_web/lib/src/fn.dart rename to packages/jael/jael2_web/lib/src/fn.dart diff --git a/packages/jael/jael_web/lib/src/jael_component.dart b/packages/jael/jael2_web/lib/src/jael_component.dart similarity index 100% rename from packages/jael/jael_web/lib/src/jael_component.dart rename to packages/jael/jael2_web/lib/src/jael_component.dart diff --git a/packages/jael/jael_web/mono_pkg.yaml b/packages/jael/jael2_web/mono_pkg.yaml similarity index 100% rename from packages/jael/jael_web/mono_pkg.yaml rename to packages/jael/jael2_web/mono_pkg.yaml diff --git a/packages/jael/jael_web/pubspec.yaml b/packages/jael/jael2_web/pubspec.yaml similarity index 100% rename from packages/jael/jael_web/pubspec.yaml rename to packages/jael/jael2_web/pubspec.yaml