@api-client/ui 0.0.17 → 0.1.0

package/src/elements/amf/authorization/AmfOauth2.ts

@@ -1,29 +1,43 @@
 import { html, PropertyValues, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
 import {
-  RequestAuthorizationKind,
-  IOAuth2Authorization,
-  ApiDefinitions,
-  IRequestAuthorization,
-  AmfNamespace,
-  OAuth2DeliveryMethod,
-  IOauth2GrantType,
-  AmfShapes,
-  IApiCustomDomainProperty,
-  IOAuth2CustomParameter,
-} from '@api-client/core/browser.js'
+  type IRequestAuthorization,
+  Kind as RequestAuthorizationKind,
+} from '@api-client/core/models/RequestAuthorization.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
 import OAuth2Authorization, { oauth2GrantTypes } from '../../authorization/ui/OAuth2Authorization.js'
 import * as InputCache from '../../../amf/lib/InputCache.js'
 import { AmfParameters } from '../../../amf/lib/AmfParameters.js'
 import { Oauth2RamlCustomData } from '../../../amf/lib/Oauth2RamlCustomData.js'
 import { OperationParameter } from '../../../amf/types.js'
 import { AmfInputParser, BindingType } from '../../../amf/lib/AmfInputParser.js'
+import type {
+  IApiParameter,
+  IApiParametrizedSecurityScheme,
+  IApiSecurityOAuth2Flow,
+  IApiSecurityOAuth2Settings,
+  IApiSecurityScheme,
+  IApiSecurityScope,
+} from '@api-client/core/amf/definitions/Api.js'
+import type {
+  IOAuth2Authorization,
+  IOAuth2CustomParameter,
+  IOauth2GrantType,
+  OAuth2DeliveryMethod,
+} from '@api-client/core/models/Authorization.js'
+import type { IApiCustomDomainProperty } from '@api-client/core/amf/definitions/Base.js'
+import type {
+  IApiArrayNode,
+  IApiDataNodeUnion,
+  IApiObjectNode,
+  IApiScalarNode,
+} from '@api-client/core/amf/definitions/Shapes.js'
 
 export default class AmfOauth2 extends OAuth2Authorization {
   /**
    * The in-memory key where the values are stored.
    */
-  @property({ type: Object }) accessor security: ApiDefinitions.IApiParametrizedSecurityScheme | undefined
+  @property({ type: Object }) accessor security: IApiParametrizedSecurityScheme | undefined
 
   /**
    * @attribute
@@ -99,7 +113,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
       return
     }
     this.setupOAuthDeliveryMethod(scheme)
-    const config = scheme.settings as ApiDefinitions.IApiSecurityOAuth2Settings
+    const config = scheme.settings as IApiSecurityOAuth2Settings
     if (!config) {
       return
     }
@@ -139,7 +153,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
     return result
   }
 
-  setupOAuthDeliveryMethod(scheme?: ApiDefinitions.IApiSecurityScheme): void {
+  setupOAuthDeliveryMethod(scheme?: IApiSecurityScheme): void {
     const info = this.getOauth2DeliveryMethod(scheme)
 
     const auth = this.ensureConfig()
@@ -161,7 +175,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param info Security AMF model
    */
-  getOauth2DeliveryMethod(info?: ApiDefinitions.IApiSecurityScheme): { method: string; name: string } {
+  getOauth2DeliveryMethod(info?: IApiSecurityScheme): { method: string; name: string } {
     const result = {
       method: 'header',
       name: 'authorization',
@@ -267,7 +281,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param flows List of current flows loaded with the AMF model.
    * @returns True if current model should be treated as RAML's model.
    */
-  isRamlFlow(flows: ApiDefinitions.IApiSecurityOAuth2Flow[]): boolean {
+  isRamlFlow(flows: IApiSecurityOAuth2Flow[]): boolean {
     if (!Array.isArray(flows)) {
       return true
     }
@@ -288,7 +302,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param model AMF model describing settings of the security
    * scheme
    */
-  preFillAmfData(model: ApiDefinitions.IApiSecurityOAuth2Settings): void {
+  preFillAmfData(model: IApiSecurityOAuth2Settings): void {
     if (!model) {
       return
     }
@@ -329,11 +343,11 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param model AMF model describing settings of the security scheme
    * @returns The extension definition or null
    */
-  findOauth2CustomSettings(model: ApiDefinitions.IApiSecurityOAuth2Settings): IApiCustomDomainProperty | undefined {
+  findOauth2CustomSettings(model: IApiSecurityOAuth2Settings): IApiCustomDomainProperty | undefined {
     const { customDomainProperties = [] } = model
     const properties = ['accessTokenSettings', 'authorizationGrants', 'authorizationSettings']
     return customDomainProperties.find((prop) => {
-      const node = prop.extension as AmfShapes.IApiObjectNode
+      const node = prop.extension as IApiObjectNode
       if (!node.properties || !node.types.includes(AmfNamespace.aml.vocabularies.data.Object)) {
         return false
       }
@@ -357,17 +371,17 @@ export default class AmfOauth2 extends OAuth2Authorization {
     ) {
       return grans
     }
-    const typed = customProperty.extension as AmfShapes.IApiObjectNode
+    const typed = customProperty.extension as IApiObjectNode
     if (!typed.properties.authorizationGrants) {
       return grans
     }
-    const array = typed.properties.authorizationGrants as AmfShapes.IApiArrayNode
+    const array = typed.properties.authorizationGrants as IApiArrayNode
     const addedGrants: string[] = []
     array.members.forEach((g) => {
       if (!g.types.includes(AmfNamespace.aml.vocabularies.data.Scalar)) {
         return
       }
-      const scalar = g as AmfShapes.IApiScalarNode
+      const scalar = g as IApiScalarNode
       if (scalar.value) {
         addedGrants.push(scalar.value)
       }
@@ -392,7 +406,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param flows List of flows in the authorization description.
    */
-  preFillFlowData(flows: ApiDefinitions.IApiSecurityOAuth2Flow[]): void {
+  preFillFlowData(flows: IApiSecurityOAuth2Flow[]): void {
     const auth = this.ensureConfig()
     const config = auth.config as IOAuth2Authorization
     // first step is to select the right flow.
@@ -414,10 +428,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param flows List of flows to search in.
    * @param type Grant type
    */
-  flowForType(
-    flows: ApiDefinitions.IApiSecurityOAuth2Flow[],
-    type?: string
-  ): ApiDefinitions.IApiSecurityOAuth2Flow | undefined {
+  flowForType(flows: IApiSecurityOAuth2Flow[], type?: string): IApiSecurityOAuth2Flow | undefined {
     if (!type) {
       return undefined
     }
@@ -443,7 +454,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param flow A flow to process.
    * @returns List of scopes required by an endpoint / API.
    */
-  readFlowScopes(flow: ApiDefinitions.IApiSecurityOAuth2Flow): string[] | undefined {
+  readFlowScopes(flow: IApiSecurityOAuth2Flow): string[] | undefined {
     const { security } = this
     let scopes = this.readSecurityScopes(flow.scopes)
     if (scopes || !security) {
@@ -451,8 +462,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
     }
     // if scopes are not defined in the operation then they may be defined in
     // security settings.
-    const config =
-      security.scheme && (security.scheme.settings as ApiDefinitions.IApiSecurityOAuth2Settings | undefined)
+    const config = security.scheme && (security.scheme.settings as IApiSecurityOAuth2Settings | undefined)
     if (!config || !config.flows) {
       return undefined
     }
@@ -469,7 +479,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param flows List of flows to process.
    * @returns Grant types supported by this authorization.
    */
-  readFlowsTypes(flows: ApiDefinitions.IApiSecurityOAuth2Flow[]): string[] {
+  readFlowsTypes(flows: IApiSecurityOAuth2Flow[]): string[] {
     const grants: string[] = []
     flows.forEach((flow) => {
       let type = flow.flow
@@ -502,7 +512,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
     if (!security || !security.scheme || !security.scheme.settings) {
       return
     }
-    const config = security.scheme.settings as ApiDefinitions.IApiSecurityOAuth2Settings
+    const config = security.scheme.settings as IApiSecurityOAuth2Settings
     const { flows } = config
     if (!Array.isArray(flows) || this.isRamlFlow(flows)) {
       return
@@ -524,7 +534,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
   /**
    * Extracts scopes list from the security definition
    */
-  readSecurityScopes(scopes: ApiDefinitions.IApiSecurityScope[]): string[] | undefined {
+  readSecurityScopes(scopes: IApiSecurityScope[]): string[] | undefined {
     if (!scopes) {
       return undefined
     }
@@ -541,7 +551,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    * @param model Model for the security settings
    * @returns True if the security settings are annotated with PKCE extension
    */
-  readPkceValue(model: ApiDefinitions.IApiSecurityOAuth2Settings): boolean | undefined {
+  readPkceValue(model: IApiSecurityOAuth2Settings): boolean | undefined {
     const { customDomainProperties } = model
     if (!Array.isArray(customDomainProperties) || !customDomainProperties.length) {
       return undefined
@@ -550,7 +560,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
     if (!pkce) {
       return undefined
     }
-    const info = pkce.extension as AmfShapes.IApiScalarNode
+    const info = pkce.extension as IApiScalarNode
     if (info.dataType === AmfNamespace.w3.xmlSchema.boolean) {
       return info.value === 'true'
     }
@@ -626,19 +636,19 @@ export default class AmfOauth2 extends OAuth2Authorization {
     if (!customProperty || !customProperty.extension) {
       return
     }
-    const typed = customProperty.extension as AmfShapes.IApiObjectNode
-    const authSettings = typed.properties.authorizationSettings as AmfShapes.IApiObjectNode | undefined
-    const tokenSettings = typed.properties.accessTokenSettings as AmfShapes.IApiObjectNode | undefined
+    const typed = customProperty.extension as IApiObjectNode
+    const authSettings = typed.properties.authorizationSettings as IApiObjectNode | undefined
+    const tokenSettings = typed.properties.accessTokenSettings as IApiObjectNode | undefined
     if (authSettings) {
-      const qp = authSettings.properties.queryParameters as AmfShapes.IApiObjectNode | undefined
+      const qp = authSettings.properties.queryParameters as IApiObjectNode | undefined
       if (qp && qp.properties) {
         this.setupAuthRequestQueryParameters(qp.properties)
       }
     }
     if (tokenSettings) {
-      const qp = tokenSettings.properties.queryParameters as AmfShapes.IApiObjectNode | undefined
-      const headerParams = tokenSettings.properties.headers as AmfShapes.IApiObjectNode | undefined
-      const bodyParams = tokenSettings.properties.body as AmfShapes.IApiObjectNode | undefined
+      const qp = tokenSettings.properties.queryParameters as IApiObjectNode | undefined
+      const headerParams = tokenSettings.properties.headers as IApiObjectNode | undefined
+      const bodyParams = tokenSettings.properties.body as IApiObjectNode | undefined
       if (qp && qp.properties) {
         this.setupTokenRequestQueryParameters(qp.properties)
       }
@@ -654,7 +664,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
   /**
    * Appends a list of parameters to the list of rendered parameters
    */
-  appendToParams(list: ApiDefinitions.IApiParameter[], source: string): void {
+  appendToParams(list: IApiParameter[], source: string): void {
     const params = this.amfParameters.parametersValue
     if (Array.isArray(list)) {
       list.forEach((param) => {
@@ -675,7 +685,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param properties List of parameters from the annotation.
    */
-  setupAuthRequestQueryParameters(properties: Record<string, AmfShapes.IApiDataNodeUnion>): void {
+  setupAuthRequestQueryParameters(properties: Record<string, IApiDataNodeUnion>): void {
     const source = 'authQuery'
     this.amfParameters.parametersValue = this.amfParameters.parametersValue.filter((item) => item.source !== source)
     const factory = new Oauth2RamlCustomData()
@@ -688,7 +698,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param properties List of parameters from the annotation.
    */
-  setupTokenRequestQueryParameters(properties: Record<string, AmfShapes.IApiDataNodeUnion>): void {
+  setupTokenRequestQueryParameters(properties: Record<string, IApiDataNodeUnion>): void {
     const source = 'tokenQuery'
     this.amfParameters.parametersValue = this.amfParameters.parametersValue.filter((item) => item.source !== source)
     const factory = new Oauth2RamlCustomData()
@@ -701,7 +711,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param properties params List of parameters from the annotation.
    */
-  setupTokenRequestHeaders(properties: Record<string, AmfShapes.IApiDataNodeUnion>): void {
+  setupTokenRequestHeaders(properties: Record<string, IApiDataNodeUnion>): void {
     const source = 'tokenHeader'
     this.amfParameters.parametersValue = this.amfParameters.parametersValue.filter((item) => item.source !== source)
     const factory = new Oauth2RamlCustomData()
@@ -714,7 +724,7 @@ export default class AmfOauth2 extends OAuth2Authorization {
    *
    * @param properties params List of parameters from the annotation.
    */
-  setupTokenRequestBody(properties: Record<string, AmfShapes.IApiDataNodeUnion>): void {
+  setupTokenRequestBody(properties: Record<string, IApiDataNodeUnion>): void {
     const source = 'tokenBody'
     this.amfParameters.parametersValue = this.amfParameters.parametersValue.filter((item) => item.source !== source)
     const factory = new Oauth2RamlCustomData()

package/src/elements/amf/authorization/AmfOidc.ts

@@ -1,18 +1,21 @@
 import {
-  ApiDefinitions,
-  IOidcAuthorization,
-  IRequestAuthorization,
-  RequestAuthorizationKind,
-} from '@api-client/core/browser.js'
+  type IRequestAuthorization,
+  Kind as RequestAuthorizationKind,
+} from '@api-client/core/models/RequestAuthorization.js'
 import { PropertyValues } from 'lit'
 import { property } from 'lit/decorators.js'
 import OidcAuthorization from '../../authorization/ui/OidcAuthorization.js'
+import type { IOidcAuthorization } from '@api-client/core/models/Authorization.js'
+import type {
+  IApiParametrizedSecurityScheme,
+  IApiSecurityOpenIdConnectSettings,
+} from '@api-client/core/amf/definitions/Api.js'
 
 export default class AmfOidc extends OidcAuthorization {
   /**
    * The in-memory key where the values are stored.
    */
-  @property({ type: Object }) accessor security: ApiDefinitions.IApiParametrizedSecurityScheme | undefined
+  @property({ type: Object }) accessor security: IApiParametrizedSecurityScheme | undefined
 
   protected override willUpdate(cp: PropertyValues<this>): void {
     if (cp.has('security')) {
@@ -47,7 +50,7 @@ export default class AmfOidc extends OidcAuthorization {
     if (!scheme) {
       return
     }
-    const settings = scheme.settings as ApiDefinitions.IApiSecurityOpenIdConnectSettings | undefined
+    const settings = scheme.settings as IApiSecurityOpenIdConnectSettings | undefined
     if (!settings) {
       return
     }

package/src/elements/amf/authorization/AmfPassThrough.ts

@@ -1,22 +1,22 @@
 import { html, nothing, PropertyValues, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
 import {
-  RequestAuthorizationKind,
-  IPassThroughAuthorization,
-  ApiDefinitions,
-  IRequestAuthorization,
-  AmfNamespace,
-  AmfShapes,
-} from '@api-client/core/browser.js'
+  type IRequestAuthorization,
+  Kind as RequestAuthorizationKind,
+} from '@api-client/core/models/RequestAuthorization.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import type { IApiParameter, IApiParametrizedSecurityScheme } from '@api-client/core/amf/definitions/Api.js'
 import * as InputCache from '../../../amf/lib/InputCache.js'
 import { Authorization } from '../../authorization/ui/Authorization.js'
 import { AmfParameters } from '../../../amf/lib/AmfParameters.js'
+import type { IPassThroughAuthorization } from '@api-client/core/models/Authorization.js'
+import type { IApiNodeShape, IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
 
 export default class AmfPassThrough extends Authorization {
   /**
    * The in-memory key where the values are stored.
    */
-  @property({ type: Object }) accessor security: ApiDefinitions.IApiParametrizedSecurityScheme | undefined
+  @property({ type: Object }) accessor security: IApiParametrizedSecurityScheme | undefined
 
   protected amfParameters: AmfParameters
 
@@ -86,8 +86,8 @@ export default class AmfPassThrough extends Authorization {
     auth.config = this.serialize()
   }
 
-  appendQueryString(queryString: AmfShapes.IShapeUnion): void {
-    const object = queryString as AmfShapes.IApiNodeShape
+  appendQueryString(queryString: IShapeUnion): void {
+    const object = queryString as IApiNodeShape
     if (!object.properties || !object.properties.length) {
       return
     }
@@ -103,7 +103,7 @@ export default class AmfPassThrough extends Authorization {
         types: [AmfNamespace.aml.vocabularies.apiContract.Parameter],
         required: minCount > 0,
         customDomainProperties: [],
-      } as ApiDefinitions.IApiParameter
+      } as IApiParameter
     })
     this.appendToParams(list, 'query', true)
   }
@@ -114,7 +114,7 @@ export default class AmfPassThrough extends Authorization {
    * @param source
    * @param clear When set it clears the previously set parameters
    */
-  appendToParams(list: ApiDefinitions.IApiParameter[], source: 'header' | 'query', clear = false): void {
+  appendToParams(list: IApiParameter[], source: 'header' | 'query', clear = false): void {
     const { amfParameters } = this
     let params = amfParameters.parametersValue
     if (clear) {

package/src/elements/amf/authorization/AmfRamlCustom.ts

@@ -1,23 +1,23 @@
 import { html, nothing, PropertyValues, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import type { IApiParameter, IApiParametrizedSecurityScheme } from '@api-client/core/amf/definitions/Api.js'
 import {
-  RequestAuthorizationKind,
-  IRamlCustomAuthorization,
-  ApiDefinitions,
-  IRequestAuthorization,
-  AmfNamespace,
-  AmfShapes,
-} from '@api-client/core/browser.js'
+  type IRequestAuthorization,
+  Kind as RequestAuthorizationKind,
+} from '@api-client/core/models/RequestAuthorization.js'
 import { Authorization } from '../../authorization/ui/Authorization.js'
 import { AmfParameters } from '../../../amf/lib/AmfParameters.js'
 import * as InputCache from '../../../amf/lib/InputCache.js'
 import { OperationParameter } from '../../../amf/types.js'
+import type { IRamlCustomAuthorization } from '@api-client/core/models/Authorization.js'
+import type { IApiNodeShape, IApiPropertyShape, IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
 
 export default class AmfRamlCustom extends Authorization {
   /**
    * The in-memory key where the values are stored.
    */
-  @property({ type: Object }) accessor security: ApiDefinitions.IApiParametrizedSecurityScheme | undefined
+  @property({ type: Object }) accessor security: IApiParametrizedSecurityScheme | undefined
 
   protected amfParameters: AmfParameters
 
@@ -105,7 +105,7 @@ export default class AmfRamlCustom extends Authorization {
       })
     }
     if (!addedParameters && queryString) {
-      const shape = queryString as AmfShapes.IApiNodeShape
+      const shape = queryString as IApiNodeShape
       const { properties } = shape
       const binding = 'query'
       if (!properties) {
@@ -123,9 +123,9 @@ export default class AmfRamlCustom extends Authorization {
     auth.config = this.serialize()
   }
 
-  createParameterFromSchema(shape: AmfShapes.IShapeUnion, binding: string, source: string): OperationParameter {
+  createParameterFromSchema(shape: IShapeUnion, binding: string, source: string): OperationParameter {
     const { id, name } = shape
-    const constructed: ApiDefinitions.IApiParameter = {
+    const constructed: IApiParameter = {
       id,
       binding,
       schema: shape,
@@ -146,9 +146,9 @@ export default class AmfRamlCustom extends Authorization {
     }
   }
 
-  createParameterFromProperty(prop: AmfShapes.IApiPropertyShape, binding: string, source: string): OperationParameter {
+  createParameterFromProperty(prop: IApiPropertyShape, binding: string, source: string): OperationParameter {
     const { id, range, name, minCount = 0 } = prop
-    const constructed: ApiDefinitions.IApiParameter = {
+    const constructed: IApiParameter = {
       id,
       binding,
       schema: range,
@@ -165,7 +165,7 @@ export default class AmfRamlCustom extends Authorization {
       parameter: constructed,
       source,
       schemaId: prop.id,
-      schema: prop as AmfShapes.IShapeUnion,
+      schema: prop as IShapeUnion,
     }
   }
 

package/src/elements/authorization/OAuth2Authorize.ts

@@ -1,12 +1,9 @@
-import {
-  IOAuth2Authorization,
-  ITokenInfo,
-  OAuth2Authorization,
-  OauthProcessingOptions,
-  EventTypes as CoreEventTypes,
-  ContextEvent,
-} from '@api-client/core/browser.js'
 import { property } from 'lit/decorators.js'
+import { EventTypes as CoreEventTypes } from '@api-client/core/events/EventTypes.js'
+import type { IOAuth2Authorization, ITokenInfo } from '@api-client/core/models/Authorization.js'
+import type { ContextEvent } from '@api-client/core/events/BaseEvents.js'
+import type { OauthProcessingOptions } from '@api-client/core/authorization/types.js'
+import { OAuth2Authorization } from '@api-client/core/authorization/OAuth2Authorization.js'
 import ApiElement from '../ApiElement.js'
 
 export const authorizeHandler = Symbol('authorizeHandler')

package/src/elements/authorization/OidcAuthorize.ts

@@ -1,13 +1,9 @@
-import {
-  IOidcTokenError,
-  IOidcTokenInfo,
-  IOAuth2Authorization,
-  OidcAuthorization,
-  OauthProcessingOptions,
-  EventTypes as CoreEventTypes,
-  ContextEvent,
-} from '@api-client/core/browser.js'
 import { property } from 'lit/decorators.js'
+import { EventTypes as CoreEventTypes } from '@api-client/core/events/EventTypes.js'
+import type { IOAuth2Authorization, IOidcTokenError, IOidcTokenInfo } from '@api-client/core/models/Authorization.js'
+import type { ContextEvent } from '@api-client/core/events/BaseEvents.js'
+import type { OauthProcessingOptions } from '@api-client/core/authorization/types.js'
+import { OidcAuthorization } from '@api-client/core/authorization/OidcAuthorization.js'
 import ApiElement from '../ApiElement.js'
 
 export const authorizeHandler = Symbol('authorizeHandler')

package/src/elements/authorization/ui/ApiKeyAuthorization.ts

@@ -1,7 +1,7 @@
 import { html, nothing, TemplateResult } from 'lit'
-import { IApiKeyAuthorization } from '@api-client/core/browser.js'
 import { query } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
+import type { IApiKeyAuthorization } from '@api-client/core/models/Authorization.js'
 import { Authorization } from './Authorization.js'
 import Input from '../../../md/input/Input.js'
 import '../../../md/text-field/ui-text-field.js'

package/src/elements/authorization/ui/Authorization.ts

@@ -1,7 +1,7 @@
-import { IRequestAuthorization } from '@api-client/core/browser.js'
 import { html, nothing, TemplateResult } from 'lit'
 import { property, query } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js'
+import type { IRequestAuthorization } from '@api-client/core/models/RequestAuthorization.js'
 import ApiElement from '../../ApiElement.js'
 import { authTypeToLabel } from '../AuthLabels.js'
 import Input from '../../../md/input/Input.js'

package/src/elements/authorization/ui/BasicAuthorization.ts

@@ -1,6 +1,6 @@
 import { html, nothing, TemplateResult } from 'lit'
-import { IBasicAuthorization } from '@api-client/core/browser.js'
 import { live } from 'lit/directives/live.js'
+import type { IBasicAuthorization } from '@api-client/core/models/Authorization.js'
 import { Authorization } from './Authorization.js'
 import Input from '../../../md/input/Input.js'
 import '../../../md/text-field/ui-text-field.js'

package/src/elements/authorization/ui/BearerAuthorization.ts

@@ -1,6 +1,6 @@
 import { html, nothing, TemplateResult } from 'lit'
-import { IBearerAuthorization } from '@api-client/core/browser.js'
 import { live } from 'lit/directives/live.js'
+import type { IBearerAuthorization } from '@api-client/core/models/Authorization.js'
 import { Authorization } from './Authorization.js'
 import Input from '../../../md/input/Input.js'
 import '../../../md/text-field/ui-text-field.js'

package/src/elements/authorization/ui/CcAuthorization.ts

@@ -1,12 +1,4 @@
 import { html, nothing, TemplateResult } from 'lit'
-import {
-  ICCAuthorization,
-  HttpCertificate,
-  Events as CoreEvents,
-  CertificateFileKind,
-  ICertificate,
-  IFile,
-} from '@api-client/core/browser.js'
 import { state } from 'lit/decorators.js'
 import { Authorization } from './Authorization.js'
 import { Events } from '../../../events/Events.js'
@@ -14,6 +6,11 @@ import '../../../md/dropdown-list/ui-dropdown-list.js'
 import '../../../md/button/ui-filled-tonal-button.js'
 import '../../../md/icon-button/ui-icon-button.js'
 import '../../../md/icons/ui-icon.js'
+import type { ICCAuthorization } from '@api-client/core/models/Authorization.js'
+import type { IFile } from '@api-client/core/models/store/File.js'
+import { Events as CoreEvents } from '@api-client/core/events/Events.js'
+import type { HttpCertificate, ICertificate } from '@api-client/core/models/ClientCertificate.js'
+import { CertificateFileKind } from '@api-client/core/models/kinds.js'
 // import '../../../define/store/file-picker.js'
 
 export default class CcAuthorization extends Authorization {

package/src/elements/authorization/ui/NtlmAuthorization.ts

@@ -1,6 +1,6 @@
 import { html, nothing, TemplateResult } from 'lit'
-import { INtlmAuthorization } from '@api-client/core/browser.js'
 import { live } from 'lit/directives/live.js'
+import type { INtlmAuthorization } from '@api-client/core/models/Authorization.js'
 import { Authorization } from './Authorization.js'
 import Input from '../../../md/input/Input.js'
 import '../../../md/text-field/ui-text-field.js'

package/src/elements/authorization/ui/OAuth2Authorization.ts

@@ -1,12 +1,13 @@
 import {
-  IOAuth2Authorization,
-  IOauth2GrantType,
-  KnownGrants,
-  AuthorizationUtils,
-  OAuth2DeliveryMethod,
-  ITokenInfo,
-  Events as CoreEvents,
-} from '@api-client/core/browser.js'
+  CUSTOM_CREDENTIALS,
+  generateState,
+  readUrlValue,
+  validateRedirectUri,
+} from '@api-client/core/authorization/lib/Utils.js'
+import * as KnownGrants from '@api-client/core/authorization/lib/KnownGrants.js'
+import type { IOAuth2Authorization, IOauth2GrantType, ITokenInfo } from '@api-client/core/models/Authorization.js'
+import type { OAuth2DeliveryMethod } from '@api-client/core/models/Authorization.js'
+import { Events as CoreEvents } from '@api-client/core/events/Events.js'
 import { html, nothing, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
@@ -26,8 +27,6 @@ import '../../../md/icon-button/ui-icon-button.js'
 import '../../../md/checkbox/ui-checkbox.js'
 import '../../../md/icons/ui-icon.js'
 
-const { CUSTOM_CREDENTIALS, generateState, readUrlValue, validateRedirectUri } = AuthorizationUtils
-
 /**
  * List of OAuth 2.0 default response types.
  * This list can be extended by custom grants

package/src/elements/authorization/ui/OidcAuthorization.ts

@@ -2,17 +2,17 @@ import { html, nothing, PropertyValues, TemplateResult } from 'lit'
 import '@github/relative-time-element'
 import { state } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
-import {
+import { generateState } from '@api-client/core/authorization/lib/Utils.js'
+import * as KnownGrants from '@api-client/core/authorization/lib/KnownGrants.js'
+import type {
   IOauth2GrantType,
   IOauth2ResponseType,
   IOidcAuthorization,
   IOidcTokenError,
   IOidcTokenInfo,
-  KnownGrants,
-  IOpenIdProviderMetadata,
-  Events as CoreEvents,
-  AuthorizationUtils,
-} from '@api-client/core/browser.js'
+} from '@api-client/core/models/Authorization.js'
+import { Events as CoreEvents } from '@api-client/core/events/Events.js'
+import type { IOpenIdProviderMetadata } from '@api-client/core/authorization/types.js'
 import OAuth2Authorization from './OAuth2Authorization.js'
 import Input from '../../../md/input/Input.js'
 import '../../../md/icons/ui-icon.js'
@@ -130,7 +130,7 @@ export default class OidcAuthorization extends OAuth2Authorization {
     }
     this.authorizing = true
     const detail = this.serialize()
-    const stateParam = AuthorizationUtils.generateState()
+    const stateParam = generateState()
     detail.state = stateParam
 
     try {

package/src/elements/code/HttpSnippets.ts

@@ -1,7 +1,7 @@
-import { IHttpRequest } from '@api-client/core/browser.js'
 import { LitElement, TemplateResult, html, PropertyValues } from 'lit'
 import { property, state } from 'lit/decorators.js'
 import { unsafeHTML } from 'lit/directives/unsafe-html.js'
+import type { IHttpRequest } from '@api-client/core/models/HttpRequest.js'
 import CodeSnippet from '../../code-snippets/CodeSnippet.js'
 import CurlSnippet from '../../code-snippets/Bash/CurlSnippet.js'
 import CcurlSnippet from '../../code-snippets/C/CcurlSnippet.js'

package/src/elements/data-table/{internals/DataTable.ts → DataTable.ts}

@@ -3,8 +3,8 @@ import { html, LitElement, nothing, PropertyValues, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js'
 import { ref, createRef } from 'lit/directives/ref.js'
-import { dataAttr } from '../../../directives/data-attr.js'
-import { LiveData } from '../../../core/LiveData.js'
+import { dataAttr } from '../../directives/data-attr.js'
+import { LiveData } from '../../reactive/LiveData.js'
 
 import '@material/web/icon/icon.js'
 import '@material/web/menu/menu.js'