Just some more circular dep cleanup

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2025-06-25 10:10:49 +02:00
parent 129cf06d8c
commit 3507fcdf89
35 changed files with 102 additions and 85 deletions
+1 -1
View File
@@ -21,5 +21,5 @@
*/
export * from './integration';
export * from './policy';
export * from './types';
export type { PermissionRule, PermissionRuleset } from './types';
export { ServerPermissionClient } from './ServerPermissionClient';
@@ -30,9 +30,8 @@ import {
PermissionCriteria,
PolicyDecision,
} from '@backstage/plugin-permission-common';
import { PermissionRule, PermissionRuleset } from '../types';
import { NoInfer, PermissionRule, PermissionRuleset } from '../types';
import {
NoInfer,
createGetRule,
isAndCriteria,
isNotCriteria,
@@ -18,10 +18,9 @@ import {
PermissionCriteria,
PermissionRuleParams,
} from '@backstage/plugin-permission-common';
import { PermissionRule } from '../types';
import { NoInfer, PermissionRule } from '../types';
import { z } from 'zod';
import { PermissionResourceRef } from './createPermissionResourceRef';
import { NoInfer } from './util';
/**
* @public
@@ -22,14 +22,6 @@ import {
} from '@backstage/plugin-permission-common';
import { PermissionRule } from '../types';
/**
* Prevent use of type parameter from contributing to type inference.
*
* https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-980401795
* @ignore
*/
export type NoInfer<T> = T extends infer S ? S : never;
/**
* Utility function used to parse a PermissionCriteria
* @param criteria - a PermissionCriteria
+9 -1
View File
@@ -19,7 +19,15 @@ import type {
PermissionRuleParams,
} from '@backstage/plugin-permission-common';
import { z } from 'zod';
import { NoInfer } from './integration/util';
/**
* Prevent use of type parameter from contributing to type inference.
*
* https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-980401795
*
* @ignore
*/
export type NoInfer<T> = T extends infer S ? S : never;
/**
* A conditional rule that can be provided in an