feat: support combined anonymous instances and OP#13 schema traits validation

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globaltypesystem/gts-ts",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "TypeScript library for working with GTS (Global Type System) identifiers and JSON/JSON Schema artifacts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/gts.ts

@@ -15,6 +15,7 @@ import {
 const GTS_NAMESPACE = uuidv5('gts', uuidv5.URL);
 
 const SEGMENT_TOKEN_REGEX = /^[a-z_][a-z0-9_]*$/;
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 
 export class Gts {
   static parseGtsID(id: string): GtsID {
@@ -40,6 +41,7 @@ export class Gts {
     }
 
     // Add any remaining content (instance without trailing ~)
+    // This could be a regular instance segment or a UUID tail
     if (current) {
       parts.push(current);
     }
@@ -60,6 +62,7 @@ export class Gts {
       verMinor: undefined,
       isType: false,
       isWildcard: false,
+      isUuidTail: false,
     };
 
     let workingSegment = seg.segment;
@@ -385,10 +388,6 @@ export class Gts {
       throw new InvalidGtsIDError(id, 'Must be lower case');
     }
 
-    if (raw.includes('-')) {
-      throw new InvalidGtsIDError(id, "Must not contain '-'");
-    }
-
     if (!raw.startsWith(GTS_PREFIX)) {
       throw new InvalidGtsIDError(id, `Does not start with '${GTS_PREFIX}'`);
     }
@@ -426,6 +425,33 @@ export class Gts {
         continue;
       }
 
+      // Check if this is a UUID tail (last part, no tilde, matches UUID format)
+      if (i > 0 && i === parts.length - 1 && !part.endsWith('~') && UUID_REGEX.test(part)) {
+        // UUID tail segment for combined anonymous instances
+        const seg: GtsIDSegment = {
+          num: i + 1,
+          offset,
+          segment: part,
+          vendor: '',
+          package: '',
+          namespace: '',
+          type: '',
+          verMajor: 0,
+          verMinor: undefined,
+          isType: false,
+          isWildcard: false,
+          isUuidTail: true,
+        };
+        gtsId.segments.push(seg);
+        offset += part.length;
+        continue;
+      }
+
+      // Regular segments must not contain hyphens
+      if (part.includes('-')) {
+        throw new InvalidGtsIDError(id, "Must not contain '-'");
+      }
+
       const segment = this.parseSegment(i + 1, offset, part);
       gtsId.segments.push(segment);
       offset += part.length;
@@ -437,9 +463,10 @@ export class Gts {
     }
 
     // v0.7: Single-segment instance IDs are prohibited (skip for wildcard patterns)
+    // Exception: combined anonymous instances (UUID tail) are always valid
     if (!allowWildcard && !raw.includes('*')) {
       const lastSegment = gtsId.segments[gtsId.segments.length - 1];
-      if (!lastSegment.isType && gtsId.segments.length === 1) {
+      if (!lastSegment.isType && !lastSegment.isUuidTail && gtsId.segments.length === 1) {
         throw new InvalidGtsIDError(
           id,
           'Single-segment instance IDs are prohibited. Instance IDs must be chained with a type segment (e.g., gts.vendor.pkg.ns.type.v1~instance.segment.v1)'
@@ -509,6 +536,14 @@ export class Gts {
         return true;
       }
 
+      // Non-wildcard UUID tail - compare raw segment string
+      if (pSeg.isUuidTail) {
+        if (pSeg.segment !== cSeg.segment) {
+          return false;
+        }
+        continue;
+      }
+
       // Non-wildcard segment - all fields must match
       if (pSeg.vendor !== cSeg.vendor) {
         return false;

src/index.ts

@@ -92,6 +92,28 @@ export class GTS {
   castInstance(fromId: string, toSchemaId: string): CastResult {
     return GtsCast.castInstance(this.store, fromId, toSchemaId);
   }
+
+  validateEntity(id: string): ValidationResult & { entity_type: string } {
+    const entity = this.store.get(id);
+    if (!entity) {
+      return { id, ok: false, error: `Entity not found: ${id}`, entity_type: 'unknown' };
+    }
+
+    if (entity.isSchema) {
+      const result = this.store.validateSchemaAgainstParent(id);
+      if (!result.ok) {
+        return { ...result, entity_type: 'schema' };
+      }
+      const traitsResult = this.store.validateEntityTraits(id);
+      if (!traitsResult.ok) {
+        return { ...traitsResult, entity_type: 'schema' };
+      }
+      return { ...result, entity_type: 'schema' };
+    } else {
+      const result = this.store.validateInstance(id);
+      return { ...result, entity_type: 'instance' };
+    }
+  }
 }
 
 export default GTS;

src/server/server.ts

@@ -614,18 +614,7 @@ export class GtsServer {
       return { ok: false, error: 'Missing required field: entity_id or gts_id' };
     }
 
-    const entity = this.store['store'].get(id);
-    if (!entity) {
-      return { ok: false, error: `Entity not found: ${id}` };
-    }
-
-    if (entity.isSchema) {
-      const result = this.store['store'].validateSchemaAgainstParent(id);
-      return { ...result, entity_type: 'schema' };
-    } else {
-      const result = this.store.validateInstance(id);
-      return { ...result, entity_type: 'instance' };
-    }
+    return this.store.validateEntity(id);
   }
 
   // OpenAPI Specification