tidied up ts generation code

Author: ndbroadbent

.prettierignore

@@ -5,10 +5,8 @@ tasks/
 site/.next
 site/out
 
-site/lib/log-generation/sample-data.ts
-site/lib/log-generation/log-fields.json
-site/lib/log-generation/log-types.ts
-site/lib/log-generation/sorbet-*.json
+site/generated/
+
 site/public/coverage
 site/public/yard
 

schemas/log_sources/active_storage.yml

@@ -16,7 +16,8 @@ events:
       MimeType: String
       Size: Integer
       Metadata: 'T::Hash[String, T.untyped]'
-      DurationMs: Float
+      DurationMs:
+        type: Float
       Checksum: String
 
   Download:

scripts/export_typescript_types.rb

@@ -26,6 +26,7 @@ class FieldSpec < T::Struct
   const :type, String
   const :sorbet_type, String
   const :required, T::Boolean
+  const :sample_type, T.nilable(String)
 end
 
 class EventSpec < T::Struct
@@ -98,13 +99,15 @@ def normalize_fields(fields_hash, default_required)
     if spec.is_a?(String)
       type = spec
       required = default_required
+      sample_type = nil
     else
       type = spec.fetch(:type)
       required = spec.key?(:required) ? T.cast(spec[:required], T::Boolean) : default_required
+      sample_type = T.let(spec[:sample_type]&.to_s, T.nilable(String))
     end
     enum_name = /\A[A-Z]/.match?(key) ? key : camelize(key)
     prop_name = snake_case(enum_name)
-    fields << FieldSpec.new(enum_name: enum_name, prop_name: prop_name, type: type, sorbet_type: type_to_sorbet(type), required: T.let(required, T::Boolean))
+    fields << FieldSpec.new(enum_name: enum_name, prop_name: prop_name, type: type, sorbet_type: type_to_sorbet(type), required: T.let(required, T::Boolean), sample_type: sample_type)
   end
   fields
 end

scripts/generate_log_structs.rb

@@ -41,13 +41,9 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-# Exported log types and keys (generated by ./scripts/export_typescript_types.rb)
-lib/log-generation/log-types.ts
-lib/log-generation/log-fields.json
-lib/log-generation/sorbet-enums.json
-lib/log-generation/sorbet-log-structs.json
-
 # Generated HTML - YARD docs, coverage reports, etc.
 public/yard/
 public/coverage/
-lib/log-generation/generated/
+
+# Sorbet => TS/JSON
+generated/

scripts/generate_typescript_structs.rb

@@ -1 +1,2 @@
 lib/log-generation/generated/
+generated/logstruct/

site/.gitignore

@@ -3,7 +3,7 @@ import { EditPageLink } from '@/components/edit-page-link';
 import { RubyCodeExample } from '@/components/ruby-code-example';
 import { HeadingWithAnchor } from '@/components/heading-with-anchor';
 import { LogGenerator } from '@/lib/log-generation';
-import { AllLogTypes, Event } from '@/lib/log-generation/generated/log-types';
+import { AllLogTypes, Event } from '@/generated/logstruct';
 import { getCodeExample } from '@/lib/codeExamples';
 import {
   getEventsForLogType,

site/.prettierignore

@@ -4,7 +4,7 @@ import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import { cn } from '@/lib/utils';
 import { NestedDocNavItem } from '@/components/nested-doc-nav-item';
-import { AllLogTypes } from '@/lib/log-generation/generated/log-types';
+import { AllLogTypes } from '@/generated/logstruct';
 import { getLogTypeInfo, getTitleId } from '@/lib/integration-helpers';
 
 interface DocNavItemProps {

site/app/docs/integrations/page.tsx

@@ -17,9 +17,7 @@ interface EnumData {
 const getEnumsData = cache(async (): Promise<EnumData> => {
   try {
     // Use dynamic import to load the JSON file
-    const data = await import(
-      '@/lib/log-generation/generated/sorbet-enums.json'
-    );
+    const data = await import('@/generated/logstruct/sorbet-enums.json');
     return data.default as EnumData;
   } catch (error) {
     console.error('Error loading enums data:', error);