Meta+LibWeb: Port MediaFeatureID.h/cpp generators to invoke_generator()

Meta/Lagom/Tools/CodeGenerators/LibWeb/CMakeLists.txt

@@ -1,7 +1,6 @@
 set(SOURCES "") # avoid pulling SOURCES from parent scope
 
-lagom_tool(Generate_CSS_MediaFeatureID_h   SOURCES Generate_CSS_MediaFeatureID_h.cpp LIBS LagomMain)
+lagom_tool(GenerateCSSMediaFeatureID       SOURCES GenerateCSSMediaFeatureID.cpp LIBS LagomMain)
-lagom_tool(Generate_CSS_MediaFeatureID_cpp SOURCES Generate_CSS_MediaFeatureID_cpp.cpp LIBS LagomMain)
 lagom_tool(Generate_CSS_PropertyID_h       SOURCES Generate_CSS_PropertyID_h.cpp LIBS LagomMain)
 lagom_tool(Generate_CSS_PropertyID_cpp     SOURCES Generate_CSS_PropertyID_cpp.cpp LIBS LagomMain)
 lagom_tool(Generate_CSS_ValueID_h          SOURCES Generate_CSS_ValueID_h.cpp LIBS LagomMain)

Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp

@@ -7,18 +7,85 @@
 #include "GeneratorUtil.h"
 #include <AK/SourceGenerator.h>
 #include <AK/StringBuilder.h>
+#include <LibCore/ArgsParser.h>
 #include <LibMain/Main.h>
 
+ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::Stream::File& file);
+ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::Stream::File& file);
+
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-    if (arguments.argc != 2) {
+    StringView generated_header_path;
-        warnln("usage: {} <path/to/CSS/MediaFeatures.json", arguments.strings[0]);
+    StringView generated_implementation_path;
-        return 1;
+    StringView media_features_json_path;
-    }
 
-    auto json = TRY(read_entire_file_as_json(arguments.strings[1]));
+    Core::ArgsParser args_parser;
+    args_parser.add_option(generated_header_path, "Path to the MediaFeatureID header file to generate", "generated-header-path", 'h', "generated-header-path");
+    args_parser.add_option(generated_implementation_path, "Path to the MediaFeatureID implementation file to generate", "generated-implementation-path", 'c', "generated-implementation-path");
+    args_parser.add_option(media_features_json_path, "Path to the JSON file to read from", "json-path", 'j', "json-path");
+    args_parser.parse(arguments);
+
+    auto json = TRY(read_entire_file_as_json(media_features_json_path));
     VERIFY(json.is_object());
+    auto media_feature_data = json.as_object();
 
+    auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write));
+    auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write));
+
+    TRY(generate_header_file(media_feature_data, *generated_header_file));
+    TRY(generate_implementation_file(media_feature_data, *generated_implementation_file));
+
+    return 0;
+}
+
+ErrorOr<void> generate_header_file(JsonObject& media_feature_data, Core::Stream::File& file)
+{
+    StringBuilder builder;
+    SourceGenerator generator { builder };
+    generator.append(R"~~~(#pragma once
+
+#include <AK/StringView.h>
+#include <AK/Traits.h>
+#include <LibWeb/CSS/ValueID.h>
+
+namespace Web::CSS {
+
+enum class MediaFeatureValueType {
+    Boolean,
+    Integer,
+    Length,
+    Ratio,
+    Resolution,
+};
+
+enum class MediaFeatureID {)~~~");
+
+    media_feature_data.for_each_member([&](auto& name, auto&) {
+        auto member_generator = generator.fork();
+        member_generator.set("name:titlecase", title_casify(name));
+        member_generator.append(R"~~~(
+    @name:titlecase@,)~~~");
+    });
+
+    generator.append(R"~~~(
+};
+
+Optional<MediaFeatureID> media_feature_id_from_string(StringView);
+char const* string_from_media_feature_id(MediaFeatureID);
+
+bool media_feature_type_is_range(MediaFeatureID);
+bool media_feature_accepts_type(MediaFeatureID, MediaFeatureValueType);
+bool media_feature_accepts_identifier(MediaFeatureID, ValueID);
+
+}
+)~~~");
+
+    TRY(file.write(generator.as_string_view().bytes()));
+    return {};
+}
+
+ErrorOr<void> generate_implementation_file(JsonObject& media_feature_data, Core::Stream::File& file)
+{
     StringBuilder builder;
     SourceGenerator generator { builder };
     generator.append(R"~~~(#include <LibWeb/CSS/MediaFeatureID.h>
@@ -28,7 +95,7 @@ namespace Web::CSS {
 Optional<MediaFeatureID> media_feature_id_from_string(StringView string)
 {)~~~");
 
-    json.as_object().for_each_member([&](auto& name, auto&) {
+    media_feature_data.for_each_member([&](auto& name, auto&) {
         auto member_generator = generator.fork();
         member_generator.set("name", name);
         member_generator.set("name:titlecase", title_casify(name));
@@ -46,7 +113,7 @@ char const* string_from_media_feature_id(MediaFeatureID media_feature_id)
 {
     switch (media_feature_id) {)~~~");
 
-    json.as_object().for_each_member([&](auto& name, auto&) {
+    media_feature_data.for_each_member([&](auto& name, auto&) {
         auto member_generator = generator.fork();
         member_generator.set("name", name);
         member_generator.set("name:titlecase", title_casify(name));
@@ -64,7 +131,7 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id)
 {
     switch (media_feature_id) {)~~~");
 
-    json.as_object().for_each_member([&](auto& name, auto& value) {
+    media_feature_data.for_each_member([&](auto& name, auto& value) {
         VERIFY(value.is_object());
         auto& feature = value.as_object();
 
@@ -88,7 +155,7 @@ bool media_feature_accepts_type(MediaFeatureID media_feature_id, MediaFeatureVal
 {
     switch (media_feature_id) {)~~~");
 
-    json.as_object().for_each_member([&](auto& name, auto& member) {
+    media_feature_data.for_each_member([&](auto& name, auto& member) {
         VERIFY(member.is_object());
         auto& feature = member.as_object();
 
@@ -166,7 +233,7 @@ bool media_feature_accepts_identifier(MediaFeatureID media_feature_id, ValueID i
 {
     switch (media_feature_id) {)~~~");
 
-    json.as_object().for_each_member([&](auto& name, auto& member) {
+    media_feature_data.for_each_member([&](auto& name, auto& member) {
         VERIFY(member.is_object());
         auto& feature = member.as_object();
 
@@ -221,7 +288,6 @@ bool media_feature_accepts_identifier(MediaFeatureID media_feature_id, ValueID i
 }
 )~~~");
 
-    outln("{}", generator.as_string_view());
+    TRY(file.write(generator.as_string_view().bytes()));
-
+    return {};
-    return 0;
 }

Meta/Lagom/Tools/CodeGenerators/LibWeb/Generate_CSS_MediaFeatureID_h.cpp

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include "GeneratorUtil.h"
-#include <AK/SourceGenerator.h>
-#include <AK/StringBuilder.h>
-#include <LibMain/Main.h>
-
-ErrorOr<int> serenity_main(Main::Arguments arguments)
-{
-    if (arguments.argc != 2) {
-        warnln("usage: {} <path/to/CSS/MediaFeatures.json", arguments.strings[0]);
-        return 1;
-    }
-
-    auto json = TRY(read_entire_file_as_json(arguments.strings[1]));
-    VERIFY(json.is_object());
-
-    StringBuilder builder;
-    SourceGenerator generator { builder };
-    generator.append(R"~~~(#pragma once
-
-#include <AK/StringView.h>
-#include <AK/Traits.h>
-#include <LibWeb/CSS/ValueID.h>
-
-namespace Web::CSS {
-
-enum class MediaFeatureValueType {
-    Boolean,
-    Integer,
-    Length,
-    Ratio,
-    Resolution,
-};
-
-enum class MediaFeatureID {)~~~");
-
-    json.as_object().for_each_member([&](auto& name, auto&) {
-        auto member_generator = generator.fork();
-        member_generator.set("name:titlecase", title_casify(name));
-        member_generator.append(R"~~~(
-    @name:titlecase@,)~~~");
-    });
-
-    generator.append(R"~~~(
-};
-
-Optional<MediaFeatureID> media_feature_id_from_string(StringView);
-char const* string_from_media_feature_id(MediaFeatureID);
-
-bool media_feature_type_is_range(MediaFeatureID);
-bool media_feature_accepts_type(MediaFeatureID, MediaFeatureValueType);
-bool media_feature_accepts_identifier(MediaFeatureID, ValueID);
-
-}
-)~~~");
-
-    outln("{}", generator.as_string_view());
-
-    return 0;
-}

Userland/Libraries/LibWeb/CMakeLists.txt

@@ -602,31 +602,15 @@ libweb_js_wrapper(XHR/ProgressEvent)
 libweb_js_wrapper(XHR/XMLHttpRequest)
 libweb_js_wrapper(XHR/XMLHttpRequestEventTarget)
 
-add_custom_command(
+invoke_generator(
-    OUTPUT CSS/MediaFeatureID.h
+    "MediaFeatureID"
-    COMMAND ${CMAKE_COMMAND} -E make_directory CSS
+    Lagom::GenerateCSSMediaFeatureID
-    COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_MediaFeatureID_h>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/MediaFeatures.json" > CSS/MediaFeatureID.h.tmp
+    "${CMAKE_CURRENT_SOURCE_DIR}/CSS/MediaFeatures.json"
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/MediaFeatureID.h.tmp CSS/MediaFeatureID.h
+    ""
-    COMMAND "${CMAKE_COMMAND}" -E remove CSS/MediaFeatureID.h.tmp
+    "CSS/MediaFeatureID.h"
-    VERBATIM
+    "CSS/MediaFeatureID.cpp"
-    DEPENDS Lagom::Generate_CSS_MediaFeatureID_h
+    arguments -j "${CMAKE_CURRENT_SOURCE_DIR}/CSS/MediaFeatures.json"
-    MAIN_DEPENDENCY CSS/MediaFeatures.json
 )
-add_custom_target(generate_MediaFeatureID.h DEPENDS CSS/MediaFeatureID.h)
-add_dependencies(all_generated generate_MediaFeatureID.h)
-
-add_custom_command(
-    OUTPUT CSS/MediaFeatureID.cpp
-    COMMAND ${CMAKE_COMMAND} -E make_directory CSS
-    COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_MediaFeatureID_cpp>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/MediaFeatures.json" > CSS/MediaFeatureID.cpp.tmp
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/MediaFeatureID.cpp.tmp CSS/MediaFeatureID.cpp
-    COMMAND "${CMAKE_COMMAND}" -E remove CSS/MediaFeatureID.cpp.tmp
-    VERBATIM
-    DEPENDS Lagom::Generate_CSS_MediaFeatureID_cpp
-    MAIN_DEPENDENCY CSS/MediaFeatures.json
-)
-add_custom_target(generate_MediaFeatureID.cpp DEPENDS CSS/MediaFeatureID.cpp)
-add_dependencies(all_generated generate_MediaFeatureID.cpp)
 
 add_custom_command(
     OUTPUT CSS/PropertyID.h