fix(utils): keep a property named $ref in makeLocalDefs

packages/utils/json-schema.test.ts

@@ -63,6 +63,25 @@ describe('json-schema utility functions', () => {
     })
   })
 
+  it('should keep a property named $ref when making local definitions', async () => {
+    const schema = makeLocalDefs({
+      'http://test.com/schema1': {
+        type: 'object',
+        properties: {
+          ref: { $ref: 'http://test.com/schema2' }
+        }
+      },
+      'http://test.com/schema2': {
+        type: 'object',
+        properties: {
+          $ref: { type: 'string', format: 'uri-reference' }
+        }
+      }
+    }, 'http://test.com/schema1')
+    assert.equal(schema.properties.ref.$ref, '#/$defs/schema2')
+    assert.deepEqual(schema.$defs.schema2.properties.$ref, { type: 'string', format: 'uri-reference' })
+  })
+
   it('should transform absolute references to local definitions', async () => {
     const schema = makeLocalDefs({
       'http://test.com/schema1': {

packages/utils/json-schema.ts

@@ -227,7 +227,8 @@ const recurseLocalDefs = (
 ) => {
   if (!schemaFragment) throw new Error('failed to resolve ' + schemaId)
   for (const [key, value] of Object.entries(schemaFragment)) {
-    if (key === '$ref') {
+    // a non-string $ref is a property named "$ref" (OpenAPI 3.1 meta-schema), not a reference
+    if (key === '$ref' && typeof value === 'string') {
       if (schemaId !== originalSchemaId || !value.startsWith('#')) {
         let fullId
         try {
@@ -236,7 +237,7 @@ const recurseLocalDefs = (
           throw new Error(`Failed to normalize URL ${value} from ${schemaId}`)
         }
         const [refSchemaId, refSchemaPath] = fullId.split('#')
-        const refName = value.split('/').pop()
+        const refName = value.slice(value.lastIndexOf('/') + 1)
         if (!localDefsSchemas[refName]) {
           let refSchema = schemas[refSchemaId]
           if (!refSchema) throw new Error('failed to resolve schema ' + refSchemaId)