Improve name handling for bundled schemas

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/ir/ir_symbol.cc

@@ -1,10 +1,54 @@
 #include <sourcemeta/codegen/ir.h>
 
+#include <sourcemeta/core/uri.h>
+
 #include <algorithm> // std::ranges::reverse
 #include <cassert>   // assert
-#include <string>    // std::string
+#include <sstream>   // std::istringstream
+#include <string>    // std::string, std::getline
 #include <vector>    // std::vector
 
+namespace {
+
+// If the input looks like an absolute URI, extract its path segments.
+// Otherwise, add the input as a single segment.
+// Note: segments are added in reverse order because the caller reverses
+// the entire result at the end.
+auto push_token_segments(std::vector<std::string> &result,
+                         const std::string &value) -> void {
+  try {
+    const sourcemeta::core::URI uri{value};
+    if (uri.is_absolute()) {
+      const auto path{uri.path()};
+      if (path.has_value() && !path->empty()) {
+        std::vector<std::string> segments;
+        std::istringstream stream{std::string{path.value()}};
+        std::string segment;
+        while (std::getline(stream, segment, '/')) {
+          if (!segment.empty()) {
+            segments.emplace_back(segment);
+          }
+        }
+
+        // Reverse segments since the caller will reverse the entire result
+        std::ranges::reverse(segments);
+        for (const auto &path_segment : segments) {
+          result.emplace_back(path_segment);
+        }
+
+        return;
+      }
+    }
+    // NOLINTNEXTLINE(bugprone-empty-catch)
+  } catch (const sourcemeta::core::URIParseError &) {
+    // Not a valid URI, fall through to default behavior
+  }
+
+  result.emplace_back(value);
+}
+
+} // namespace
+
 namespace sourcemeta::codegen {
 
 auto symbol(const sourcemeta::core::SchemaFrame &frame,
@@ -29,14 +73,14 @@ auto symbol(const sourcemeta::core::SchemaFrame &frame,
     if (segments_skipped >= 2) {
       const auto &last_token{current_pointer.back()};
       if (last_token.is_property()) {
-        result.emplace_back(last_token.to_property());
+        push_token_segments(result, last_token.to_property());
       } else {
         result.emplace_back(std::to_string(last_token.to_index()));
       }
     } else {
       const auto &token{current_pointer.back()};
       if (token.is_property()) {
-        result.emplace_back(token.to_property());
+        push_token_segments(result, token.to_property());
       } else {
         result.emplace_back(std::to_string(token.to_index()));
       }

test/e2e/typescript/2020-12/bundled_schema/expected.d.ts

@@ -1,35 +1,35 @@
-export type ApiResponseMeta = ApiResponseHttpsexamplecomschemasmetadata;
+export type ApiResponseMeta = ApiResponseSchemasMetadata;
 
-export type ApiResponseData = ApiResponseHttpsexamplecomschemasuser;
+export type ApiResponseData = ApiResponseSchemasUser;
 
 export type ApiResponseAdditionalProperties = never;
 
-export type ApiResponseHttpsexamplecomschemasuserName = string;
+export type ApiResponseSchemasUserName = string;
 
-export type ApiResponseHttpsexamplecomschemasuserId = number;
+export type ApiResponseSchemasUserId = number;
 
-export type ApiResponseHttpsexamplecomschemasuserEmail = ApiResponseHttpsexamplecomschemasemail;
+export type ApiResponseSchemasUserEmail = ApiResponseSchemasEmail;
 
-export type ApiResponseHttpsexamplecomschemasuserAdditionalProperties = never;
+export type ApiResponseSchemasUserAdditionalProperties = never;
 
-export interface ApiResponseHttpsexamplecomschemasuser {
-  "id": ApiResponseHttpsexamplecomschemasuserId;
-  "name": ApiResponseHttpsexamplecomschemasuserName;
-  "email"?: ApiResponseHttpsexamplecomschemasuserEmail;
+export interface ApiResponseSchemasUser {
+  "id": ApiResponseSchemasUserId;
+  "name": ApiResponseSchemasUserName;
+  "email"?: ApiResponseSchemasUserEmail;
 }
 
-export type ApiResponseHttpsexamplecomschemasmetadataVersion = number;
+export type ApiResponseSchemasMetadataVersion = number;
 
-export type ApiResponseHttpsexamplecomschemasmetadataTimestamp = string;
+export type ApiResponseSchemasMetadataTimestamp = string;
 
-export type ApiResponseHttpsexamplecomschemasmetadataAdditionalProperties = never;
+export type ApiResponseSchemasMetadataAdditionalProperties = never;
 
-export interface ApiResponseHttpsexamplecomschemasmetadata {
-  "timestamp"?: ApiResponseHttpsexamplecomschemasmetadataTimestamp;
-  "version"?: ApiResponseHttpsexamplecomschemasmetadataVersion;
+export interface ApiResponseSchemasMetadata {
+  "timestamp"?: ApiResponseSchemasMetadataTimestamp;
+  "version"?: ApiResponseSchemasMetadataVersion;
 }
 
-export type ApiResponseHttpsexamplecomschemasemail = string;
+export type ApiResponseSchemasEmail = string;
 
 export interface ApiResponse {
   "data": ApiResponseData;

test/e2e/typescript/2020-12/bundled_schema/test.ts

@@ -1,8 +1,8 @@
 import {
   ApiResponse,
-  ApiResponseHttpsexamplecomschemasuser,
-  ApiResponseHttpsexamplecomschemasmetadata,
-  ApiResponseHttpsexamplecomschemasemail
+  ApiResponseSchemasUser,
+  ApiResponseSchemasMetadata,
+  ApiResponseSchemasEmail
 } from "./expected";
 
 
@@ -29,26 +29,26 @@ const minimalResponse: ApiResponse = {
 };
 
 // Valid: user object directly
-const user: ApiResponseHttpsexamplecomschemasuser = {
+const user: ApiResponseSchemasUser = {
   id: 42,
   name: "Test User"
 };
 
 // Valid: user with email
-const userWithEmail: ApiResponseHttpsexamplecomschemasuser = {
+const userWithEmail: ApiResponseSchemasUser = {
   id: 42,
   name: "Test User",
   email: "test@example.com"
 };
 
 // Valid: metadata object
-const metadata: ApiResponseHttpsexamplecomschemasmetadata = {
+const metadata: ApiResponseSchemasMetadata = {
   timestamp: "2024-01-15",
   version: 2
 };
 
 // Valid: email is just a string
-const email: ApiResponseHttpsexamplecomschemasemail = "user@domain.com";
+const email: ApiResponseSchemasEmail = "user@domain.com";
 
 // Invalid: missing required field 'data'
 // @ts-expect-error - data is required