@pikku/inspector 0.12.8 → 0.12.9

package/src/utils/resolve-versions.test.ts

@@ -215,6 +215,147 @@ describe('resolveLatestVersions', () => {
     assert.strictEqual(errors.length, 0)
   })
 
+  test('exposedMeta propagates all versions when base name is exposed', () => {
+    const state = makeState({
+      'createUser@v1': {
+        pikkuFuncId: 'createUser@v1',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 1,
+      },
+      createUser: {
+        pikkuFuncId: 'createUser',
+        inputSchemaName: null,
+        outputSchemaName: null,
+      },
+    })
+    state.rpc.exposedMeta['createUser'] = 'createUser'
+    state.rpc.internalFiles.set('createUser@v1', {
+      path: '/src/user.ts',
+      exportedName: 'createUserV1',
+    })
+    const { logger } = makeLogger()
+
+    resolveLatestVersions(state, logger)
+
+    assert.strictEqual(state.rpc.exposedMeta['createUser'], 'createUser@v2')
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v1'], 'createUser@v1')
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v2'], 'createUser@v2')
+  })
+
+  test('exposedFiles propagated for versioned exposed functions', () => {
+    const state = makeState({
+      'createUser@v1': {
+        pikkuFuncId: 'createUser@v1',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 1,
+      },
+      createUser: {
+        pikkuFuncId: 'createUser',
+        inputSchemaName: null,
+        outputSchemaName: null,
+      },
+    })
+    state.rpc.exposedMeta['createUser'] = 'createUser'
+    state.rpc.internalFiles.set('createUser@v1', {
+      path: '/src/user-v1.ts',
+      exportedName: 'createUserV1',
+    })
+    state.rpc.internalFiles.set('createUser', {
+      path: '/src/user.ts',
+      exportedName: 'createUser',
+    })
+    const { logger } = makeLogger()
+
+    resolveLatestVersions(state, logger)
+
+    assert.ok(state.rpc.exposedFiles.has('createUser@v1'))
+    assert.strictEqual(
+      state.rpc.exposedFiles.get('createUser@v1')!.exportedName,
+      'createUserV1'
+    )
+    assert.ok(state.rpc.exposedFiles.has('createUser@v2'))
+  })
+
+  test('exposedMeta unchanged when base name is not exposed', () => {
+    const state = makeState({
+      'createUser@v1': {
+        pikkuFuncId: 'createUser@v1',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 1,
+      },
+      createUser: {
+        pikkuFuncId: 'createUser',
+        inputSchemaName: null,
+        outputSchemaName: null,
+      },
+    })
+    const { logger } = makeLogger()
+
+    resolveLatestVersions(state, logger)
+
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v1'], undefined)
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v2'], undefined)
+  })
+
+  test('exposedMeta propagates when only explicit versions exist', () => {
+    const state = makeState({
+      'createUser@v1': {
+        pikkuFuncId: 'createUser@v1',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 1,
+      },
+      'createUser@v2': {
+        pikkuFuncId: 'createUser@v2',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 2,
+      },
+    })
+    state.rpc.exposedMeta['createUser'] = 'createUser@v1'
+    const { logger } = makeLogger()
+
+    resolveLatestVersions(state, logger)
+
+    assert.strictEqual(state.rpc.exposedMeta['createUser'], 'createUser@v2')
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v1'], 'createUser@v1')
+    assert.strictEqual(state.rpc.exposedMeta['createUser@v2'], 'createUser@v2')
+  })
+
+  test('updates HTTP meta pikkuFuncId when renaming unversioned', () => {
+    const state = makeState({
+      'createUser@v1': {
+        pikkuFuncId: 'createUser@v1',
+        inputSchemaName: null,
+        outputSchemaName: null,
+        version: 1,
+      },
+      createUser: {
+        pikkuFuncId: 'createUser',
+        inputSchemaName: null,
+        outputSchemaName: null,
+      },
+    })
+    ;(state as any).http = {
+      meta: {
+        post: {
+          '/api/users': { pikkuFuncId: 'createUser', route: '/api/users' },
+        },
+      },
+    }
+    const { logger } = makeLogger()
+
+    resolveLatestVersions(state, logger)
+
+    assert.strictEqual(
+      (state as any).http.meta.post['/api/users'].pikkuFuncId,
+      'createUser@v2'
+    )
+  })
+
   test('renames files entries when renaming unversioned to versioned', () => {
     const state = makeState({
       'createUser@v1': {

package/src/utils/resolve-versions.ts

@@ -91,6 +91,8 @@ export function resolveLatestVersions(
       if (state.rpc.exposedMeta[baseName] === oldId) {
         state.rpc.exposedMeta[baseName] = newId
       }
+
+      updateWiringReferences(state, oldId, newId)
     } else {
       const latest = group.explicit.reduce((a, b) =>
         a.version > b.version ? a : b
@@ -98,8 +100,43 @@ export function resolveLatestVersions(
       state.rpc.internalMeta[baseName] = latest.id
     }
 
+    if (state.rpc.exposedMeta[baseName]) {
+      const latestId = state.rpc.internalMeta[baseName]!
+      state.rpc.exposedMeta[baseName] = latestId
+      for (const entry of group.explicit) {
+        state.rpc.exposedMeta[entry.id] = entry.id
+        const fileEntry = state.rpc.internalFiles.get(entry.id)
+        if (fileEntry) {
+          state.rpc.exposedFiles.set(entry.id, fileEntry)
+        }
+      }
+      if (group.unversioned) {
+        state.rpc.exposedMeta[latestId] = latestId
+        const fileEntry = state.rpc.internalFiles.get(latestId)
+        if (fileEntry) {
+          state.rpc.exposedFiles.set(latestId, fileEntry)
+        }
+      }
+    }
+
     for (const entry of group.explicit) {
       state.rpc.invokedFunctions.add(entry.id)
     }
   }
 }
+
+function updateWiringReferences(
+  state: InspectorState,
+  oldId: string,
+  newId: string
+): void {
+  if (state.http) {
+    for (const methods of Object.values(state.http.meta)) {
+      for (const meta of Object.values(methods)) {
+        if (meta.pikkuFuncId === oldId) {
+          meta.pikkuFuncId = newId
+        }
+      }
+    }
+  }
+}