From dd4bb852c6e4fbea7a8177328b065a645bf7e101 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Thu, 11 Jan 2024 12:19:52 -0800 Subject: [PATCH] move bindings_generator/ to tool/generator/ (#138) --- .github/workflows/build.yml | 2 +- .gitignore | 6 +++--- README.md | 4 ++-- test/type_union_test.dart | 2 +- {bindings_generator => tool/generator}/README.md | 0 {bindings_generator => tool/generator}/banned_names.dart | 0 {bindings_generator => tool/generator}/dart_main.dart | 0 {bindings_generator => tool/generator}/filesystem_api.dart | 0 .../generator}/generate_bindings.dart | 0 .../generator}/js_type_supertypes.dart | 0 {bindings_generator => tool/generator}/main.mjs | 0 {bindings_generator => tool/generator}/package-lock.json | 0 {bindings_generator => tool/generator}/package.json | 0 {bindings_generator => tool/generator}/singletons.dart | 0 {bindings_generator => tool/generator}/translator.dart | 0 {bindings_generator => tool/generator}/type_aliases.dart | 0 {bindings_generator => tool/generator}/type_union.dart | 0 {bindings_generator => tool/generator}/util.dart | 0 {bindings_generator => tool/generator}/webidl_api.dart | 0 {bindings_generator => tool/generator}/webref_css_api.dart | 0 {bindings_generator => tool/generator}/webref_idl_api.dart | 0 tool/update_bindings.dart | 6 +++--- 22 files changed, 10 insertions(+), 10 deletions(-) rename {bindings_generator => tool/generator}/README.md (100%) rename {bindings_generator => tool/generator}/banned_names.dart (100%) rename {bindings_generator => tool/generator}/dart_main.dart (100%) rename {bindings_generator => tool/generator}/filesystem_api.dart (100%) rename {bindings_generator => tool/generator}/generate_bindings.dart (100%) rename {bindings_generator => tool/generator}/js_type_supertypes.dart (100%) rename {bindings_generator => tool/generator}/main.mjs (100%) rename {bindings_generator => tool/generator}/package-lock.json (100%) rename {bindings_generator => tool/generator}/package.json (100%) rename {bindings_generator => tool/generator}/singletons.dart (100%) rename {bindings_generator => tool/generator}/translator.dart (100%) rename {bindings_generator => tool/generator}/type_aliases.dart (100%) rename {bindings_generator => tool/generator}/type_union.dart (100%) rename {bindings_generator => tool/generator}/util.dart (100%) rename {bindings_generator => tool/generator}/webidl_api.dart (100%) rename {bindings_generator => tool/generator}/webref_css_api.dart (100%) rename {bindings_generator => tool/generator}/webref_idl_api.dart (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 507091a8..6ecc1289 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: run: dart pub get - name: Install Node dependencies run: npm install - working-directory: bindings_generator + working-directory: tool/generator - name: Run the generator run: dart tool/update_bindings.dart - name: Analyze code diff --git a/.gitignore b/.gitignore index 6fae96c1..dcebbe2b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ doc/api/ pubspec.lock -bindings_generator/*.js -bindings_generator/*.js.* -bindings_generator/node_modules/ +tool/generator/*.js +tool/generator/*.js.* +tool/generator/node_modules/ diff --git a/README.md b/README.md index 31f586bb..fe252a5e 100644 --- a/README.md +++ b/README.md @@ -40,5 +40,5 @@ Based on: - @webref/css [6.10.0](https://www.npmjs.com/package/@webref/css/v/6.10.0) -For instructions on re-generating the DOM bindings, see -[bindings_generator/README.md](bindings_generator/README.md). +For instructions on re-generating the DOM bindings, see the +[generator docs](tool/generator/README.md). diff --git a/test/type_union_test.dart b/test/type_union_test.dart index 282bf08d..a29032d6 100644 --- a/test/type_union_test.dart +++ b/test/type_union_test.dart @@ -4,7 +4,7 @@ import 'package:test/test.dart'; -import '../bindings_generator/type_union.dart'; +import '../tool/generator/type_union.dart'; void main() { test('Non-JS types', () { diff --git a/bindings_generator/README.md b/tool/generator/README.md similarity index 100% rename from bindings_generator/README.md rename to tool/generator/README.md diff --git a/bindings_generator/banned_names.dart b/tool/generator/banned_names.dart similarity index 100% rename from bindings_generator/banned_names.dart rename to tool/generator/banned_names.dart diff --git a/bindings_generator/dart_main.dart b/tool/generator/dart_main.dart similarity index 100% rename from bindings_generator/dart_main.dart rename to tool/generator/dart_main.dart diff --git a/bindings_generator/filesystem_api.dart b/tool/generator/filesystem_api.dart similarity index 100% rename from bindings_generator/filesystem_api.dart rename to tool/generator/filesystem_api.dart diff --git a/bindings_generator/generate_bindings.dart b/tool/generator/generate_bindings.dart similarity index 100% rename from bindings_generator/generate_bindings.dart rename to tool/generator/generate_bindings.dart diff --git a/bindings_generator/js_type_supertypes.dart b/tool/generator/js_type_supertypes.dart similarity index 100% rename from bindings_generator/js_type_supertypes.dart rename to tool/generator/js_type_supertypes.dart diff --git a/bindings_generator/main.mjs b/tool/generator/main.mjs similarity index 100% rename from bindings_generator/main.mjs rename to tool/generator/main.mjs diff --git a/bindings_generator/package-lock.json b/tool/generator/package-lock.json similarity index 100% rename from bindings_generator/package-lock.json rename to tool/generator/package-lock.json diff --git a/bindings_generator/package.json b/tool/generator/package.json similarity index 100% rename from bindings_generator/package.json rename to tool/generator/package.json diff --git a/bindings_generator/singletons.dart b/tool/generator/singletons.dart similarity index 100% rename from bindings_generator/singletons.dart rename to tool/generator/singletons.dart diff --git a/bindings_generator/translator.dart b/tool/generator/translator.dart similarity index 100% rename from bindings_generator/translator.dart rename to tool/generator/translator.dart diff --git a/bindings_generator/type_aliases.dart b/tool/generator/type_aliases.dart similarity index 100% rename from bindings_generator/type_aliases.dart rename to tool/generator/type_aliases.dart diff --git a/bindings_generator/type_union.dart b/tool/generator/type_union.dart similarity index 100% rename from bindings_generator/type_union.dart rename to tool/generator/type_union.dart diff --git a/bindings_generator/util.dart b/tool/generator/util.dart similarity index 100% rename from bindings_generator/util.dart rename to tool/generator/util.dart diff --git a/bindings_generator/webidl_api.dart b/tool/generator/webidl_api.dart similarity index 100% rename from bindings_generator/webidl_api.dart rename to tool/generator/webidl_api.dart diff --git a/bindings_generator/webref_css_api.dart b/tool/generator/webref_css_api.dart similarity index 100% rename from bindings_generator/webref_css_api.dart rename to tool/generator/webref_css_api.dart diff --git a/bindings_generator/webref_idl_api.dart b/tool/generator/webref_idl_api.dart similarity index 100% rename from bindings_generator/webref_idl_api.dart rename to tool/generator/webref_idl_api.dart diff --git a/tool/update_bindings.dart b/tool/update_bindings.dart index 3e480faf..78326c89 100644 --- a/tool/update_bindings.dart +++ b/tool/update_bindings.dart @@ -79,7 +79,7 @@ $_usage'''); // Run app with `node`. await _runProc( 'node', - ['main.mjs', '../lib/src'], + ['main.mjs', '../../lib/src'], workingDirectory: _bindingsGeneratorPath, ); @@ -93,7 +93,7 @@ $_usage'''); // Update readme. final readmeFile = File( - p.normalize(p.join(_bindingsGeneratorPath, '..', 'README.md')), + p.normalize(p.join(_bindingsGeneratorPath, '..', '..', 'README.md')), ); final sourceContent = readmeFile.readAsStringSync(); @@ -129,7 +129,7 @@ String _packageLockVersion(String package) { return webRefIdl['version'] as String; } -const _bindingsGeneratorPath = 'bindings_generator'; +final _bindingsGeneratorPath = p.join('tool', 'generator'); const _webRefIdl = '@webref/idl'; const _webRefCss = '@webref/css';