tailwind_dsl 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c311546f3112011590192afd6386ca3e097366b4e32a7d4bdaf90eb2e50bb888
-  data.tar.gz: c0720bf9fc432e6931772d819afebfb4e2fa2aa583bcfb36adf8fc18294f1538
+  metadata.gz: 5c203889b4310594acefe53d47df83e002a6b824cb29dacaeb94e79b54f31da3
+  data.tar.gz: 5904e14763b77cb30a64c6aab0df1bbe50dca9137c5d78b95e3b0a1a1cea1df4
 SHA512:
-  metadata.gz: 28c7d5f434fb96350a3bac05180d9e1efc58e3172efc5a9b36c6e14e93359e88c5c3f87ecb14177c7e5a02000f1001871e1b7d388f465572b743ed5b21f7f39c
-  data.tar.gz: 96b446cb33fbb4a976d5187f205357df2439e2699cf37c9d3b886f1734efe3661823ba255923070197155d1eff68ba0335c0af577cccad2c212e27c36bb94ccf
+  metadata.gz: 7afe62703ff5c4cce8f5298821df980f00c0625e9b389f393e41349a016e9c463f04cbed97c15d71826d57dde9b9b1874ec9ec8b61f1ccbb120ac748cae71e30
+  data.tar.gz: 1933129c10fb231930cc6ada1525dba92b2b361729965b82712b0fa7bcf4b401bb0cc8e1039e8d2e1ad4cd1551a9d2c8f0e81940c09d055d66f3e26811f99ce5

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.0.15](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.14...v0.0.15) (2022-10-18)
+
+
+### Bug Fixes
+
+* refactor argument names ([3cb3a86](https://github.com/klueless-io/tailwind_dsl/commit/3cb3a869970fbe5a58afe5f1dc0cecf76b615433))
+
+## [0.0.14](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.13...v0.0.14) (2022-10-18)
+
+
+### Bug Fixes
+
+* refactor sample data directories ([23e4efb](https://github.com/klueless-io/tailwind_dsl/commit/23e4efb2863643cfbc8744e656a873900a421572))
+* refactor sample data directories ([4017917](https://github.com/klueless-io/tailwind_dsl/commit/401791784e51fbe771c841294a4ad837f99c8ec9))
+* start working on component model extractor ([929292d](https://github.com/klueless-io/tailwind_dsl/commit/929292dcdae8d79ccd12e2eae30d3e6710bac3f2))
+
 ## [0.0.13](https://github.com/klueless-io/tailwind_dsl/compare/v0.0.12...v0.0.13) (2022-10-18)
 
 

data/lib/tailwind_dsl/etl/component_models/extractor.rb

@@ -5,17 +5,22 @@ module TailwindDsl
     module ComponentModels
       # Extract component models by reading the cleansed component HTML and then using GPT3 to infer both the data/model structure.
       class Extractor
-        attr_reader :uikit
+        attr_reader :components
         attr_reader :target_root_path
         attr_reader :batch_size
+        attr_reader :batch_left
         attr_reader :use_prompt
+        attr_reader :filter_design_system
+        attr_reader :dry_run
 
-        def initialize(uikit, target_root_path, batch_size: 1, use_prompt: false, filter_design_system: nil)
-          @uikit = uikit
+        def initialize(components, target_root_path, **args)
+          @components = components
           @target_root_path = target_root_path
-          @batch_size = batch_size
+          @batch_size = args[:batch_size] || 1
           @batch_left = batch_size
-          @use_prompt = use_prompt
+          @use_prompt = args[:use_prompt] || false
+          @filter_design_system = args[:filter_design_system] || nil
+          @dry_run = args[:dry_run] || false
         end
 
         # Goal:       Extract the next (batch_size) component models using GPT3 and save them to target_root_path
@@ -28,15 +33,35 @@ module TailwindDsl
         #             if :use_prompt is true then display the input/output files and ask if you wish to process the component or skip.
         #             process the component by calling the GPT3 API and save the results to the target folder.
 
-        def extract; end
+        def extract
+          filter_components.each do |component|
+            puts "Processing: #{component.design_system.name} -> #{component.group.key} -> #{component.name} -> remaining#: #{batch_left}"
+            # component_model_path = File.join(target_root_path, component.design_system.name, component.group_hierarchy, "#{component.name}.model.rb")
+            # next if File.exist?(component_model_path)
 
-        # def components
-        #   @components ||= uikit.design_systems.map do |design_system|
-        #     design_system.components.map do |component|
-        #       Component.new(design_system, component, source_root_path, target_root_path)
-        #     end
-        #   end.flatten
-        # end
+            # if use_prompt
+            #   puts "Input: #{component.cleansed_html_path}"
+            #   puts "Output: #{component_model_path}"
+            #   puts 'Process? (y/n)'
+            #   next unless STDIN.gets.chomp == 'y'
+            # end
+
+            # puts "Processing: #{component_model_path}"
+            @batch_left -= 1
+            break if batch_left.zero?
+
+            next if dry_run
+
+            # model = Gpt3::ComponentModel.new(component.cleansed_html_path)
+            # model.save(component_model_path)
+          end
+        end
+
+        def filter_components
+          return components unless filter_design_system
+
+          components.select { |component| component.design_system.name == filter_design_system }
+        end
       end
     end
   end

data/lib/tailwind_dsl/etl/component_structures/generator.rb

@@ -21,7 +21,9 @@ module TailwindDsl
         # .gsub(/(\n\s*\n)+/, "\n")
         attr_reader :uikit
         attr_reader :components
+        # Location for raw components
         attr_reader :source_root_path
+        # Location for component structures
         attr_reader :target_root_path
         attr_reader :reset_root_path
 
@@ -54,18 +56,19 @@ module TailwindDsl
 
         def query_components
           RawComponentQuery.query(uikit,
-                                  raw_component_root_path: source_root_path,
-                                  component_structure_root_path: target_root_path).records
+                                  source_root_path: source_root_path,
+                                  target_root_path: target_root_path)
+                           .components
         end
 
         def process_components
           @components.each do |component|
-            unless File.exist?(component.absolute_path.source_file)
-              puts "Source file does not exist: #{component.absolute_path.source_file}"
+            unless File.exist?(component.absolute.source_file)
+              puts "Source file does not exist: #{component.absolute.source_file}"
               next
             end
 
-            # puts "DSN: #{component.design_system.name}, GRP: #{component.group.type}, FILE: #{component.relative_path.source_file}"
+            # puts "DSN: #{component.design_system.name}, GRP: #{component.group.type}, FILE: #{component.relative.source_file}"
 
             process_component(component)
           end
@@ -115,23 +118,23 @@ module TailwindDsl
           # rules:
           # if the html file exists, then read the settings file, if the settings has html overwrite, then overwrite the html file
           # overwrite = true
-          FileUtils.cp_r(component.absolute_path.source_file, component.absolute_path.target_html_file, remove_destination: true) # if overwrite
+          FileUtils.cp_r(component.absolute.source_file, component.absolute.target_html_file, remove_destination: true) # if overwrite
         end
 
         def create_clean_html_file(component)
-          html = File.read(component.absolute_path.source_file) || ''
+          html = File.read(component.absolute.source_file) || ''
           component.captured_comment_list = html.scan(COMMENT_REGEX)
           component.captured_comment_text = component.captured_comment_list.join("\n")
 
           html = html.gsub(COMMENT_REGEX, '').gsub(BLANK_LINE_REGEX, "\n").lstrip
 
-          File.write(component.absolute_path.target_clean_html_file, html)
+          File.write(component.absolute.target_clean_html_file, html)
         end
 
         def create_tailwind_config_file(component)
           component.captured_tailwind_config = extract_tailwind_config(component)
 
-          File.write(component.absolute_path.target_tailwind_config_file, component.captured_tailwind_config) if component.captured_tailwind_config
+          File.write(component.absolute.target_tailwind_config_file, component.captured_tailwind_config) if component.captured_tailwind_config
         end
 
         def create_settings_file(component)
@@ -167,7 +170,7 @@ module TailwindDsl
             tailwind_config: tailwind_config_settings(component.captured_tailwind_config)
           }
 
-          File.write(component.absolute_path.target_settings_file, JSON.pretty_generate(settings))
+          File.write(component.absolute.target_settings_file, JSON.pretty_generate(settings))
         end
 
         def extract_tailwind_config(component)

data/lib/tailwind_dsl/etl/component_structures/raw_component_query.rb

@@ -8,8 +8,6 @@ module TailwindDsl
       # This is a two pass process:
       #  1. Query the raw component folder for all files that match the pattern and build up a graph with required information
       #  2. Flatten the graph into a list of rows
-      #
-      # If you need to debug, then pass in the debug flag and it will output the graph to the console
       class RawComponentQuery
         DesignSystem = Struct.new(
           :name,
@@ -35,95 +33,101 @@ module TailwindDsl
           :target_astro_file, keyword_init: true
         )
 
-        class Record
+        class Component
+          attr_reader :name
           attr_reader :design_system
           attr_reader :group
-          attr_reader :absolute_path
-          attr_reader :relative_path
+          attr_reader :absolute
+          attr_reader :relative
 
           # Storage buckets for data that is extracted from the source file
           attr_accessor :captured_comment_text
           attr_accessor :captured_comment_list
           attr_accessor :captured_tailwind_config
 
-          def initialize(design_system:, group:, absolute_path:, relative_path:)
+          def initialize(name:, design_system:, group:, absolute:, relative:)
+            @name = name
             @design_system = design_system
             @group = group
-            @absolute_path = absolute_path
-            @relative_path = relative_path
+            @absolute = absolute
+            @relative = relative
           end
 
           def to_h
             {
+              name: name,
               design_system: design_system.to_h,
               group: group.to_h,
-              absolute_path: absolute_path.to_h,
-              relative_path: relative_path.to_h
+              absolute: absolute.to_h,
+              relative: relative.to_h
             }
           end
         end
 
         attr_reader :uikit
-        attr_reader :raw_component_root_path
-        attr_reader :component_structure_root_path
+        # Location for raw components
+        attr_reader :source_root_path
+        # Location for component structures
+        attr_reader :target_root_path
         attr_reader :current_design_system
-        attr_reader :debug
-        attr_reader :records
+        attr_reader :components
 
         def initialize(uikit, **args)
           @uikit = uikit
-          @raw_component_root_path = args[:raw_component_root_path] || raise(ArgumentError, 'Missing raw_component_root_path')
-          @component_structure_root_path = args[:component_structure_root_path] || raise(ArgumentError, 'Missing component_structure_root_path')
-          @debug = args[:debug] || false
+          @source_root_path = args[:source_root_path] || raise(ArgumentError, 'Missing source_root_path')
+          @target_root_path = args[:target_root_path] || raise(ArgumentError, 'Missing target_root_path')
         end
 
         class << self
-          def query(uikit, raw_component_root_path:, component_structure_root_path:, debug: false)
-            instance = new(uikit, raw_component_root_path: raw_component_root_path, component_structure_root_path: component_structure_root_path, debug: debug)
+          def query(uikit, source_root_path:, target_root_path:)
+            instance = new(uikit, source_root_path: source_root_path, target_root_path: target_root_path)
             instance.call
           end
         end
 
         def call
-          @records = build_records
+          @components = build_components
 
           self
         end
 
-        # Flattened list of records in hash format
+        # Flattened list of components in hash format
         # @return [Array<Hash>] list
         def to_h
-          records.map(&:to_h)
+          components.map(&:to_h)
         end
 
         private
 
-        def build_records
+        # rubocop:disable Metrics/AbcSize
+        def build_components
           uikit.design_systems.flat_map do |design_system|
             @current_design_system = design_system
             design_system.groups.flat_map do |group|
               group.files.map do |file|
-                Record.new(
+                Component.new(
+                  name: file.file_name_only,
                   design_system: DesignSystem.new(**map_design_system),
                   group: Group.new(**map_group(group)),
-                  absolute_path: FilePath.new(**map_absolute_file(file)),
-                  relative_path: FilePath.new(**map_relative_file(file))
+                  absolute: FilePath.new(**map_absolute_file(file)),
+                  relative: FilePath.new(**map_relative_file(file))
                 )
               end
             end
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def design_system_name
           current_design_system.name
         end
 
         def source_path
-          File.join(raw_component_root_path, design_system_name)
+          File.join(source_root_path, design_system_name)
         end
 
         def target_path
-          File.join(component_structure_root_path, design_system_name)
+          File.join(target_root_path, design_system_name)
         end
 
         def map_design_system

data/lib/tailwind_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindDsl
-  VERSION = '0.0.14'
+  VERSION = '0.0.16'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tailwind_dsl",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "tailwind_dsl",
-      "version": "0.0.14",
+      "version": "0.0.16",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind_dsl",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Tailwind DSL will build tailwind websites useing Domain Specific Language conventions",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdlet