@api-client/core 0.19.32 → 0.19.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.19.32",
+  "version": "0.19.34",
   "license": "UNLICENSED",
   "exports": {
     "./browser.js": {

package/src/data/DataExtractor.ts

@@ -9,7 +9,7 @@ import { XmlReader } from './XmlReader.js'
 import { UrlEncodedReader } from './UrlEncodedReader.js'
 import { CookieParser } from '../cookies/CookieParser.js'
 
-type DataInput =
+export type DataInput =
   | HttpRequest
   | SentRequest
   | IHttpRequest

package/src/mocking/lib/User.ts

@@ -1,6 +1,7 @@
 import { faker } from '@faker-js/faker'
 import { nanoid } from '../../nanoid.js'
-import { UserSchema, Kind as UserKind } from '../../models/store/User.js'
+import { UserSchema } from '../../models/store/User.js'
+import { UserKind } from '../../models/kinds.js'
 
 export interface UserInitSchema {
   noEmail?: boolean

package/src/modeling/ai/DataDomainDelta.ts

@@ -1,4 +1,4 @@
-import type { DataDomain } from '@api-client/core/modeling/DataDomain.js'
+import type { DataDomain } from '../DataDomain.js'
 import type {
   AiDataModelSchema,
   AiDomainAssociation,
@@ -10,16 +10,10 @@ import type {
   AiDomainPropertyDelta,
   AiDomainSemantic,
 } from './types.js'
-import type {
-  DomainAssociation,
-  DomainEntity,
-  DomainEntitySchema,
-  DomainModel,
-  DomainProperty,
-} from '@api-client/core/modeling/index.js'
-import { nanoid } from '@api-client/core/nanoid.js'
-import { type SemanticType, SemanticScope, DataSemantics } from '@api-client/core/modeling/Semantics.js'
-import { DomainEntityKind, DomainPropertyKind, DomainAssociationKind } from '@api-client/core/models/kinds.js'
+import type { DomainAssociation, DomainEntity, DomainEntitySchema, DomainModel, DomainProperty } from '../index.js'
+import { nanoid } from '../../nanoid.js'
+import { type SemanticType, SemanticScope, DataSemantics } from '../Semantics.js'
+import { DomainEntityKind, DomainPropertyKind, DomainAssociationKind } from '../../models/kinds.js'
 
 /**
  * Normalizes the delta by removing duplicates. For example, when the model

package/src/models/store/CustomDomain.ts

@@ -36,7 +36,7 @@ export interface CustomDomainSchema {
   updatedAt: number
 }
 
-export class CustomDomainModel implements CustomDomainSchema {
+export class CustomDomain implements CustomDomainSchema {
   id: string
   orgId: string
   domain: string
@@ -64,7 +64,7 @@ export class CustomDomainModel implements CustomDomainSchema {
   }
 
   constructor(state?: Partial<CustomDomainSchema>) {
-    const init = CustomDomainModel.createSchema(state)
+    const init = CustomDomain.createSchema(state)
     this.id = init.id
     this.orgId = init.orgId
     this.domain = init.domain

package/src/models/store/DeploymentCustomDomain.ts

@@ -40,7 +40,7 @@ export interface DeploymentCustomDomainSchema {
   updatedAt: number
 }
 
-export class DeploymentCustomDomainModel implements DeploymentCustomDomainSchema {
+export class DeploymentCustomDomain implements DeploymentCustomDomainSchema {
   id: string
   deploymentId: string
   customDomainId: string
@@ -63,7 +63,7 @@ export class DeploymentCustomDomainModel implements DeploymentCustomDomainSchema
   }
 
   constructor(state?: Partial<DeploymentCustomDomainSchema>) {
-    const init = DeploymentCustomDomainModel.createSchema(state)
+    const init = DeploymentCustomDomain.createSchema(state)
     this.id = init.id
     this.deploymentId = init.deploymentId
     this.customDomainId = init.customDomainId

package/src/models/store/File.ts

@@ -2,10 +2,10 @@ import { nanoid } from '../../nanoid.js'
 import { PermissionSchema, Permission, PermissionRole } from './Permission.js'
 import { ModificationSchema } from './Modification.js'
 import { DeletionSchema } from './Deletion.js'
-import { UserSchema, Kind as UserKind } from './User.js'
+import { UserSchema } from './User.js'
 import { ThingSchema, Thing } from '../Thing.js'
 import { CapabilitiesSchema } from './Capabilities.js'
-import { FolderKind } from '../kinds.js'
+import { FolderKind, UserKind } from '../kinds.js'
 // this causes error
 // import { Kind as FolderKind } from '../Folder.js';
 

package/src/models/store/User.ts

@@ -1,5 +1,6 @@
 import type { DeletionSchema } from './Deletion.js'
 import type { UserOrganizationGrantType } from './Organization.js'
+import { UserKind } from '../kinds.js'
 
 export interface EmailSchema {
   /**
@@ -34,8 +35,6 @@ export interface UserPictureSchema {
  */
 export type IUserPicture = UserPictureSchema
 
-export const Kind = 'Core#User'
-
 export type UserStatus = 'active' | 'deleted' | 'suspended' | 'pending'
 
 /**
@@ -47,7 +46,7 @@ export type UserStatus = 'active' | 'deleted' | 'suspended' | 'pending'
  * identity providers. However, this is not exposed to the user through the API.
  */
 export interface UserSchema {
-  kind: typeof Kind
+  kind: typeof UserKind
   /**
    * The data store key of the user.
    */
@@ -59,7 +58,7 @@ export interface UserSchema {
   /**
    * When available the email of the user.
    */
-  email: IEmail[]
+  email: EmailSchema[]
   /**
    * The user picture to render.
    */

package/src/sdk/DeploymentsSdk.ts

@@ -141,13 +141,15 @@ export class DeploymentsSdk extends SdkBase {
       return this.processListResponse<DeploymentSchema>(result, 'Unable to list environment deployments for an API. ')
     },
 
-    listAllForEnvironment: async (
+    listForEnvironment: async (
       oid: string,
       apiId: string,
       env: DeploymentEnvironment,
+      options: ContextListOptions = {},
       request: SdkOptions = {}
     ): Promise<ContextListResult<DeploymentSchema>> => {
       const url = this.sdk.getUrl(RouteBuilder.deploymentsApisForEnv(oid, apiId, env))
+      this.sdk.appendListOptions(url, options)
       const { token = this.sdk.token } = request
       const result = await this.sdk.http.get(url.toString(), { token })
       return this.processListResponse<DeploymentSchema>(result, 'Unable to list environment deployments for an API. ')

package/src/sdk/GroupsSdk.ts

@@ -1,4 +1,4 @@
-import { ContextListOptions, ContextListResult } from '../browser.js'
+import type { ContextListOptions, ContextListResult } from '../events/BaseEvents.js'
 import { Exception } from '../exceptions/exception.js'
 import type { GroupSchema } from '../models/store/Group.js'
 import { RouteBuilder } from './RouteBuilder.js'

package/src/sdk/StoreSdkNode.ts

@@ -4,17 +4,6 @@ import { Sdk } from './Sdk.js'
 import { Http } from './Http.js'
 import { WsClient } from './WsClient.js'
 
-export type { IStoreResponse, IStoreRequestOptions } from './SdkBase.js'
-export type { IMetaCreateOptions, IMediaCreateOptions, IFileCreateOptions, ListFileKind } from './FilesSdk.js'
-export type {
-  IJwtInfo,
-  IJwtUser,
-  RegistrationInfoSchema,
-  OrganizationRegistrationInfoSchema,
-  OrganizationAddUserInfoSchema,
-} from './UsersSdk.js'
-export type { DataCatalogListOptions } from './DataCatalogSdk.js'
-
 /**
  * NodeJS API for API Client's net-store module.
  */

package/src/sdk/StoreSdkWeb.ts

@@ -4,19 +4,8 @@ import { Sdk } from './Sdk.js'
 import { Http } from './Http.js'
 import { WsClient } from './WsClient.js'
 
-export type { IStoreResponse, IStoreRequestOptions } from './SdkBase.js'
-export type { IMetaCreateOptions, IMediaCreateOptions, IFileCreateOptions, ListFileKind } from './FilesSdk.js'
-export type {
-  IJwtInfo,
-  IJwtUser,
-  RegistrationInfoSchema,
-  OrganizationRegistrationInfoSchema,
-  OrganizationAddUserInfoSchema,
-} from './UsersSdk.js'
-export type { DataCatalogListOptions } from './DataCatalogSdk.js'
-
 /**
- * NodeJS API for API Client's net-store module.
+ * API Client's web store module.
  */
 export class StoreSdk extends Sdk {
   http: Http = new HttpWeb(this)

package/tests/unit/authorization/SecurityProcessor.spec.ts

@@ -1,5 +1,6 @@
 import { test } from '@japa/runner'
-import { SecurityProcessor, IOidcTokenInfo, HttpRequest, IHttpRequest, Property } from '../../../src/index.js'
+import { SecurityProcessor } from '../../../src/authorization/index.js'
+import { IOidcTokenInfo, HttpRequest, IHttpRequest, Property } from '../../../src/models/index.js'
 
 test.group('applyBasicAuth()', (group) => {
   let request: IHttpRequest

package/tests/unit/data/JmesparthReader.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { JmespathReader } from '../../../src/index.js'
+import { JmespathReader } from '../../../src/data/index.js'
 
 test.group('JmespathReader', () => {
   test('returns a value for a simple path', async ({ assert }) => {

package/tests/unit/data/JsonReader.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { JsonReader } from '../../../src/index.js'
+import { JsonReader } from '../../../src/data/index.js'
 
 test.group('JsonReader', () => {
   test('returns a value for a simple path', async ({ assert }) => {

package/tests/unit/data/PayloadPointer.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { PayloadPointer } from '../../../src/index.js'
+import { PayloadPointer } from '../../../src/data/index.js'
 
 test.group('PayloadPointer', () => {
   test('returns a value for a json - exact match', async ({ assert }) => {

package/tests/unit/data/RequestDataExtractor.spec.ts

@@ -1,12 +1,8 @@
 import { test } from '@japa/runner'
-import {
-  RequestDataExtractor,
-  HttpRequestKind,
-  IHttpRequest,
-  HttpResponseKind,
-  IHttpResponse,
-  HttpResponse,
-} from '../../../src/index.js'
+import { RequestDataExtractor } from '../../../src/data/index.js'
+import { HttpRequestKind, IHttpRequest, IHttpResponse, HttpResponse } from '../../../src/models/index.js'
+import { Kinds } from '../../../src/index.js'
+
 import { FlowSourceEnum, FlowRequestDataEnum, FlowResponseDataEnum } from '../../../src/models/http-flows/HttpFlows.js'
 
 test.group('constructor()', () => {
@@ -34,13 +30,13 @@ test.group('constructor()', () => {
         method: 'GET',
       },
       {
-        kind: HttpResponseKind,
+        kind: Kinds.HttpResponseKind,
         status: 200,
       }
     )
     assert.typeOf(instance.response, 'object', 'has the object')
     const response = instance.response as HttpResponse
-    assert.equal(response.kind, HttpResponseKind, 'has the HttpResponse instance')
+    assert.equal(response.kind, Kinds.HttpResponseKind, 'has the HttpResponse instance')
   })
 })
 
@@ -190,7 +186,7 @@ test.group('response headers', (group) => {
     }
     response = {
       status: 200,
-      kind: HttpResponseKind,
+      kind: Kinds.HttpResponseKind,
       headers: 'x-t1: true\naccept: text/plain',
     }
   })
@@ -238,7 +234,7 @@ test.group('status extraction', (group) => {
     }
     response = {
       status: 200,
-      kind: HttpResponseKind,
+      kind: Kinds.HttpResponseKind,
     }
   })
 
@@ -282,7 +278,7 @@ test.group('data source selection', (group) => {
     }
     response = {
       status: 200,
-      kind: HttpResponseKind,
+      kind: Kinds.HttpResponseKind,
       payload: 'response-payload',
     }
   })

package/tests/unit/data/UrlEncodedReader.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { UrlEncodedReader } from '../../../src/index.js'
+import { UrlEncodedReader } from '../../../src/data/index.js'
 
 test.group('UrlEncodedReader', () => {
   test('returns a value for a simple path', async ({ assert }) => {

package/tests/unit/data/XmlReader.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { XmlReader } from '../../../src/index.js'
+import { XmlReader } from '../../../src/data/index.js'
 
 test.group('XmlReader', () => {
   const cities = `

package/tests/unit/mocking/current/Certificates.spec.ts

@@ -2,7 +2,7 @@ import { test } from '@japa/runner'
 import sinon from 'sinon'
 import { Certificates } from '../../../../src/mocking/lib/Certificates.js'
 import { Certificate, IPemCertificate } from '../../../../src/models/ClientCertificate.js'
-import type { HttpCertificate } from '../../../../src/index.js'
+import { HttpCertificate } from '../../../../src/models/index.js'
 
 test.group('certificate()', (group) => {
   let certs: Certificates

package/tests/unit/mocking/current/HostRules.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@japa/runner'
 import sinon from 'sinon'
 import { HostRules } from '../../../../src/mocking/lib/HostRules.js'
-import type { IHostRule } from '../../../../src/index.js'
+import { IHostRule } from '../../../../src/models/index.js'
 
 test.group('rule()', (group) => {
   let rules: HostRules

package/tests/unit/mocking/current/Urls.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@japa/runner'
 import sinon from 'sinon'
 import { Url } from '../../../../src/mocking/lib/Url.js'
-import type { IUrl } from '../../../../src/index.js'
+import type { IUrl } from '../../../../src/models/index.js'
 
 test.group('url()', (group) => {
   let urls: Url

package/tests/unit/mocking/current/User.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@japa/runner'
 import { User } from '../../../../src/mocking/lib/User.js'
-import { Kind as UserKind } from '../../../../src/models/store/User.js'
-import type { UserSchema } from '../../../../src/index.js'
+import { UserKind } from '../../../../src/models/kinds.js'
+import type { UserSchema } from '../../../../src/models/index.js'
 
 test.group('user()', (group) => {
   let user: User

package/tests/unit/modeling/ai/DataDomainDelta.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { DataDomain } from '../../../../src/index.js'
+import { DataDomain } from '../../../../src/modeling/index.js'
 import { SemanticType } from '../../../../src/modeling/Semantics.js'
 import { DataDomainDelta } from '../../../../src/modeling/ai/DataDomainDelta.js'
 import type { AiDomainDelta } from '../../../../src/modeling/ai/types.js'

package/tests/unit/modeling/ai/DomainSerialization.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@japa/runner'
 import { serializeDomainForAi, serializeEntity } from '../../../../src/modeling/ai/DomainSerialization.js'
-import { DataDomain } from '../../../../src/index.js'
+import { DataDomain } from '../../../../src/modeling/index.js'
 import { SemanticType } from '../../../../src/modeling/Semantics.js'
 
 test.group('DomainSerialization', () => {

package/tests/unit/modeling/ai/tools/DataDomain.tools.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@japa/runner'
 import { explain_schema, get_entity_details } from '../../../../../src/modeling/ai/tools/DataDomain.tools.js'
-import { DataDomain } from '../../../../../src/index.js'
+import { DataDomain } from '../../../../../src/modeling/index.js'
 import type { ToolConfig } from '../../../../../src/modeling/ai/tools/config.js'
 
 test.group('DataDomain.tools', () => {

package/tests/unit/modeling/amf/shape_generator.spec.ts

@@ -8,7 +8,7 @@ import {
   DomainModel,
   DomainAssociation,
   DomainProperty,
-} from '../../../../src/index.js'
+} from '../../../../src/modeling/index.js'
 
 test.group('entity()', (group) => {
   let root: DataDomain

package/tests/unit/modeling/api_model.spec.ts

@@ -1,16 +1,15 @@
 import { test } from '@japa/runner'
 import {
   ApiModel,
-  ApiModelKind,
   DataDomain,
   type RolesBasedAccessControl,
   type ApiModelSchema,
   type ExposedEntitySchema,
   type ApiContact,
   type ApiLicense,
-  ExposedEntityKind,
   ExposedEntity,
-} from '../../../src/index.js'
+} from '../../../src/modeling/index.js'
+import { ApiModelKind, ExposedEntityKind } from '../../../src/models/index.js'
 import { AllowPublicAccessRule } from '../../../src/modeling/rules/AllowPublic.js'
 import { RateLimitingConfiguration } from '../../../src/modeling/rules/RateLimitingConfiguration.js'
 import { ReadActionSchema } from '../../../src/modeling/index.js'

package/tests/unit/modeling/api_model_expose_entity.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { ApiModel, DataDomain, type ExposedEntity } from '../../../src/index.js'
+import { ApiModel, DataDomain, type ExposedEntity } from '../../../src/modeling/index.js'
 
 function findRootExposedEntity(model: ApiModel, entityKey: string) {
   for (const e of model.exposes.values()) {

package/tests/unit/modeling/api_model_remove_entity.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { ApiModel, DataDomain } from '../../../src/index.js'
+import { ApiModel, DataDomain } from '../../../src/modeling/index.js'
 
 test.group('ApiModel.removeEntity()', () => {
   test('removes an existing entity', ({ assert }) => {

package/tests/unit/modeling/data_domain.spec.ts

@@ -7,7 +7,8 @@ import {
   DomainPropertyKind,
   DomainAssociationKind,
 } from '../../../src/models/kinds.js'
-import { Thing, DataDomain, DomainNamespace, DomainModel } from '../../../src/index.js'
+import { DataDomain, DomainNamespace, DomainModel } from '../../../src/modeling/index.js'
+import { Thing } from '../../../src/models/index.js'
 
 test.group('DataDomain', () => {
   test('constructor sets default values', ({ assert }) => {

package/tests/unit/modeling/data_domain_change_observers.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { DataDomain, DataFormat } from '../../../src/index.js'
+import { DataDomain, DataFormat } from '../../../src/modeling/index.js'
 import { SemanticType } from '../../../src/modeling/Semantics.js'
 
 test.group('DataDomain change observers', (g) => {

package/tests/unit/modeling/data_domain_serialization.spec.ts

@@ -1,12 +1,12 @@
 import { test } from '@japa/runner'
 import {
   DomainAssociationKind,
-  DataDomain,
   DomainEntityKind,
   DomainModelKind,
   DomainNamespaceKind,
   DomainPropertyKind,
-} from '../../../src/index.js'
+} from '../../../src/models/index.js'
+import { DataDomain } from '../../../src/modeling/index.js'
 
 test.group('DataDomain Serialization and Deserialization', () => {
   test('should serialize and deserialize an empty DataDomain', ({ assert }) => {

package/tests/unit/modeling/definitions/phone.spec.ts

@@ -17,7 +17,7 @@ test.group('Phone Semantic Configuration', () => {
   test('should create semantic with custom config', ({ assert }) => {
     const config: PhoneConfig = {
       allowedCountries: ['US', 'CA'],
-      format: 'E.164',
+      format: 'international',
       requireVerification: true,
     }
     const semantic = createPhoneSemantic(config)