@dremio/js-sdk 0.46.1 → 0.48.0

package/dist/cloud/catalog/EnterpriseCatalogResource.d.ts

@@ -1,5 +1,5 @@
 import { AsyncResult } from "ts-results-es";
-import type { SonarV2Config, SonarV3Config, XHRConfig } from "../../common/Config.ts";
+import type { SonarV2Config, SonarV3Config, V3Config, XHRConfig } from "../../common/Config.ts";
 import type { SignalParam } from "../../common/Params.ts";
 import { baseRetrieve, baseRetrieveByPath } from "../../enterprise/catalog/catalogRetrieve.js";
 import type { CatalogSearchParams } from "../../enterprise/catalog/catalogSearch/CatalogSearchParams.ts";
@@ -10,7 +10,7 @@ export declare class EnterpriseCatalogResource {
     #private;
     retrieve: ReturnType<typeof baseRetrieve>;
     retrieveByPath: ReturnType<typeof baseRetrieveByPath>;
-    constructor(config: SonarV2Config & SonarV3Config & XHRConfig);
+    constructor(config: SonarV2Config & SonarV3Config & XHRConfig & V3Config);
     list(): {
         data(): AsyncGenerator<EnterpriseFunctionCatalogReference | EnterpriseHomeCatalogReference | EnterpriseSourceCatalogReference | EnterpriseSpaceCatalogReference, void, unknown>;
     };

package/dist/cloud/catalog/EnterpriseCatalogResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseCatalogResource.js","sourceRoot":"","sources":["../../../src/cloud/catalog/EnterpriseCatalogResource.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { AsyncResult } from \"ts-results-es\";\nimport type { SonarV2Config, SonarV3Config, XHRConfig } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { catalogReferenceFromProperties } from \"../../enterprise/catalog/catalogReferenceFromProperties.ts\";\nimport { baseRetrieve, baseRetrieveByPath } from \"../../enterprise/catalog/catalogRetrieve.js\";\nimport type { CatalogSearchParams } from \"../../enterprise/catalog/catalogSearch/CatalogSearchParams.ts\";\nimport { createCatalogSearch } from \"../../enterprise/catalog/catalogSearch/createCatalogSearch.js\";\nimport { catalogReferenceEntityToProperties } from \"../../oss/catalog/CatalogReferences/utils/catalogReferenceEntityToProperties.ts\";\nimport type {\n  EnterpriseFunctionCatalogReference,\n  EnterpriseHomeCatalogReference,\n  EnterpriseSourceCatalogReference,\n  EnterpriseSpaceCatalogReference,\n} from \"../interfaces.ts\";\nimport { FileUpload, uploadExtensionSchema } from \"./FileUpload.ts\";\nimport * as z from \"zod/mini\";\n\nexport class EnterpriseCatalogResource {\n  #config: SonarV2Config & SonarV3Config & XHRConfig;\n  #catalogSearch: ReturnType<typeof createCatalogSearch>;\n\n  retrieve: ReturnType<typeof baseRetrieve>;\n  retrieveByPath: ReturnType<typeof baseRetrieveByPath>;\n\n  constructor(config: SonarV2Config & SonarV3Config & XHRConfig) {\n    this.#config = config;\n    this.retrieve = baseRetrieve(config);\n    this.retrieveByPath = baseRetrieveByPath(config);\n    this.#catalogSearch = createCatalogSearch(\n      this.#config,\n      this._catalogReferenceFromEntity.bind(this),\n    );\n  }\n\n  list() {\n    const getRoot = () =>\n      this.#config\n        .sonarV3Request(\"catalog\")\n        .map((res) => res.json() as Promise<{ data: unknown[] }>)\n        .map((response) =>\n          response.data.map(\n            (entity: unknown) =>\n              catalogReferenceFromProperties(\n                catalogReferenceEntityToProperties(entity),\n                this.#config,\n                this.retrieveByPath,\n              ) as\n                | EnterpriseFunctionCatalogReference\n                | EnterpriseHomeCatalogReference\n                | EnterpriseSourceCatalogReference\n                | EnterpriseSpaceCatalogReference,\n          ),\n        )\n        .promise.then((result) => result.unwrap());\n    return {\n      async *data() {\n        yield* await getRoot();\n      },\n    };\n  }\n\n  copyFromObjectStore({\n    extension,\n    path,\n    sourceName,\n  }: {\n    extension: z.infer<typeof uploadExtensionSchema>;\n    path: string[];\n    sourceName: string;\n  }) {\n    return this.#config\n      .sonarV3Request(`uploads/${sourceName}`, {\n        body: JSON.stringify({\n          extension,\n          pathComponents: path,\n        }),\n        headers: {\n          Accept: \"text/plain\",\n          \"Content-Type\": \"application/json\",\n        },\n        keepalive: true,\n        method: \"POST\",\n      })\n      .map((res) => res.text())\n      .map((id) => new FileUpload(this.#config, id));\n  }\n\n  upload(fileStream: ReadableStream, extension: z.infer<typeof uploadExtensionSchema>) {\n    return new AsyncResult(\n      (async () => {\n        const body = new FormData();\n        body.set(\"file\", await new Response(fileStream).blob());\n        body.set(\"extension\", extension);\n\n        return this.#config\n          .sonarV3Request(\"uploads\", {\n            body,\n            headers: {\n              Accept: \"text/plain\",\n            },\n            keepalive: true,\n            method: \"POST\",\n          })\n          .map((res) => res.text())\n          .map((id) => new FileUpload(this.#config, id)).promise;\n      })(),\n    );\n  }\n\n  uploadXHR(\n    file: Blob,\n    extension: z.infer<typeof uploadExtensionSchema>,\n    options: { onProgress?: (e: ProgressEvent<XMLHttpRequestEventTarget>) => void } = {},\n  ) {\n    const body = new FormData();\n    body.set(\"file\", file);\n    body.set(\"extension\", extension);\n    return this.#config\n      .xhr(\n        \"POST\",\n        this.#config.sonarV3URL(\"uploads\").toString(),\n        { Accept: \"text/plain\" },\n        body,\n        (xhr) => {\n          if (typeof options.onProgress === \"function\") {\n            xhr.upload.addEventListener(\"progress\", options.onProgress);\n          }\n        },\n      )\n      .map((xhr) => {\n        if (typeof options.onProgress === \"function\") {\n          xhr.upload.removeEventListener(\"progress\", options.onProgress);\n        }\n        return new FileUpload(this.#config, xhr.responseText);\n      });\n  }\n\n  search(params: CatalogSearchParams) {\n    const getPage = ({ pageParam, signal }: { pageParam?: string } & SignalParam = {}) =>\n      this.#catalogSearch(params, { pageParam, signal });\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        const firstPageResult = await getPage({ signal }).promise;\n        if (firstPageResult.isErr()) {\n          throw firstPageResult.error;\n        }\n        const firstPage = firstPageResult.value;\n        yield* firstPage.data;\n        let nextPageToken = firstPage.nextPageToken;\n        while (nextPageToken && !signal?.aborted) {\n          const nextPageResult = await getPage({ pageParam: nextPageToken, signal }).promise;\n          if (nextPageResult.isErr()) {\n            throw nextPageResult.error;\n          }\n          const nextPage = nextPageResult.value;\n          yield* nextPage.data;\n          nextPageToken = nextPage.nextPageToken;\n        }\n      },\n      getPage,\n    };\n  }\n\n  _catalogReferenceFromEntity(entity: unknown) {\n    return catalogReferenceFromProperties(\n      catalogReferenceEntityToProperties(entity),\n      this.#config,\n      this.retrieveByPath,\n    );\n  }\n}\n"]}
+{"version":3,"file":"EnterpriseCatalogResource.js","sourceRoot":"","sources":["../../../src/cloud/catalog/EnterpriseCatalogResource.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { AsyncResult } from \"ts-results-es\";\nimport type { SonarV2Config, SonarV3Config, V3Config, XHRConfig } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { catalogReferenceFromProperties } from \"../../enterprise/catalog/catalogReferenceFromProperties.ts\";\nimport { baseRetrieve, baseRetrieveByPath } from \"../../enterprise/catalog/catalogRetrieve.js\";\nimport type { CatalogSearchParams } from \"../../enterprise/catalog/catalogSearch/CatalogSearchParams.ts\";\nimport { createCatalogSearch } from \"../../enterprise/catalog/catalogSearch/createCatalogSearch.js\";\nimport { catalogReferenceEntityToProperties } from \"../../oss/catalog/CatalogReferences/utils/catalogReferenceEntityToProperties.ts\";\nimport type {\n  EnterpriseFunctionCatalogReference,\n  EnterpriseHomeCatalogReference,\n  EnterpriseSourceCatalogReference,\n  EnterpriseSpaceCatalogReference,\n} from \"../interfaces.ts\";\nimport { FileUpload, uploadExtensionSchema } from \"./FileUpload.ts\";\nimport * as z from \"zod/mini\";\n\nexport class EnterpriseCatalogResource {\n  #config: SonarV2Config & SonarV3Config & XHRConfig;\n  #catalogSearch: ReturnType<typeof createCatalogSearch>;\n\n  retrieve: ReturnType<typeof baseRetrieve>;\n  retrieveByPath: ReturnType<typeof baseRetrieveByPath>;\n\n  constructor(config: SonarV2Config & SonarV3Config & XHRConfig & V3Config) {\n    this.#config = config;\n    this.retrieve = baseRetrieve(config);\n    this.retrieveByPath = baseRetrieveByPath(config);\n    this.#catalogSearch = createCatalogSearch(\n      this.#config,\n      this._catalogReferenceFromEntity.bind(this),\n    );\n  }\n\n  list() {\n    const getRoot = () =>\n      this.#config\n        .sonarV3Request(\"catalog\")\n        .map((res) => res.json() as Promise<{ data: unknown[] }>)\n        .map((response) =>\n          response.data.map(\n            (entity: unknown) =>\n              catalogReferenceFromProperties(\n                catalogReferenceEntityToProperties(entity),\n                this.#config,\n                this.retrieveByPath,\n              ) as\n                | EnterpriseFunctionCatalogReference\n                | EnterpriseHomeCatalogReference\n                | EnterpriseSourceCatalogReference\n                | EnterpriseSpaceCatalogReference,\n          ),\n        )\n        .promise.then((result) => result.unwrap());\n    return {\n      async *data() {\n        yield* await getRoot();\n      },\n    };\n  }\n\n  copyFromObjectStore({\n    extension,\n    path,\n    sourceName,\n  }: {\n    extension: z.infer<typeof uploadExtensionSchema>;\n    path: string[];\n    sourceName: string;\n  }) {\n    return this.#config\n      .sonarV3Request(`uploads/${sourceName}`, {\n        body: JSON.stringify({\n          extension,\n          pathComponents: path,\n        }),\n        headers: {\n          Accept: \"text/plain\",\n          \"Content-Type\": \"application/json\",\n        },\n        keepalive: true,\n        method: \"POST\",\n      })\n      .map((res) => res.text())\n      .map((id) => new FileUpload(this.#config, id));\n  }\n\n  upload(fileStream: ReadableStream, extension: z.infer<typeof uploadExtensionSchema>) {\n    return new AsyncResult(\n      (async () => {\n        const body = new FormData();\n        body.set(\"file\", await new Response(fileStream).blob());\n        body.set(\"extension\", extension);\n\n        return this.#config\n          .sonarV3Request(\"uploads\", {\n            body,\n            headers: {\n              Accept: \"text/plain\",\n            },\n            keepalive: true,\n            method: \"POST\",\n          })\n          .map((res) => res.text())\n          .map((id) => new FileUpload(this.#config, id)).promise;\n      })(),\n    );\n  }\n\n  uploadXHR(\n    file: Blob,\n    extension: z.infer<typeof uploadExtensionSchema>,\n    options: { onProgress?: (e: ProgressEvent<XMLHttpRequestEventTarget>) => void } = {},\n  ) {\n    const body = new FormData();\n    body.set(\"file\", file);\n    body.set(\"extension\", extension);\n    return this.#config\n      .xhr(\n        \"POST\",\n        this.#config.sonarV3URL(\"uploads\").toString(),\n        { Accept: \"text/plain\" },\n        body,\n        (xhr) => {\n          if (typeof options.onProgress === \"function\") {\n            xhr.upload.addEventListener(\"progress\", options.onProgress);\n          }\n        },\n      )\n      .map((xhr) => {\n        if (typeof options.onProgress === \"function\") {\n          xhr.upload.removeEventListener(\"progress\", options.onProgress);\n        }\n        return new FileUpload(this.#config, xhr.responseText);\n      });\n  }\n\n  search(params: CatalogSearchParams) {\n    const getPage = ({ pageParam, signal }: { pageParam?: string } & SignalParam = {}) =>\n      this.#catalogSearch(params, { pageParam, signal });\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        const firstPageResult = await getPage({ signal }).promise;\n        if (firstPageResult.isErr()) {\n          throw firstPageResult.error;\n        }\n        const firstPage = firstPageResult.value;\n        yield* firstPage.data;\n        let nextPageToken = firstPage.nextPageToken;\n        while (nextPageToken && !signal?.aborted) {\n          const nextPageResult = await getPage({ pageParam: nextPageToken, signal }).promise;\n          if (nextPageResult.isErr()) {\n            throw nextPageResult.error;\n          }\n          const nextPage = nextPageResult.value;\n          yield* nextPage.data;\n          nextPageToken = nextPage.nextPageToken;\n        }\n      },\n      getPage,\n    };\n  }\n\n  _catalogReferenceFromEntity(entity: unknown) {\n    return catalogReferenceFromProperties(\n      catalogReferenceEntityToProperties(entity),\n      this.#config,\n      this.retrieveByPath,\n    );\n  }\n}\n"]}

package/dist/cloud/users/CloudUser.js

@@ -20,7 +20,7 @@ import { EnterpriseUser, } from "../../enterprise/users/EnterpriseUser.js";
 export class CloudUser extends EnterpriseUser {
 }
 export const cloudUserEntityToProperties = (entity) => ({
-    email: entity.email?.length > 0 ? entity.email : entity.name,
+    email: entity.name,
     familyName: entity.lastName || null,
     givenName: entity.firstName || null,
     id: entity.id,

package/dist/cloud/users/CloudUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloudUser.js","sourceRoot":"","sources":["../../../src/cloud/users/CloudUser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAEf,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,cAAc;CAAG;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,MAAW,EAAE,EAAE,CACzD,CAAC;IACC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI;IAC5D,UAAU,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC,EAAE;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;IAC7C,QAAQ,EAAE,MAAM,CAAC,IAAI;CACtB,CAA6B,CAAC","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  EnterpriseUser,\n  type EnterpriseUserProperties,\n} from \"../../enterprise/users/EnterpriseUser.ts\";\n\n/**\n * @deprecated\n */\nexport class CloudUser extends EnterpriseUser {}\n\nexport const cloudUserEntityToProperties = (entity: any) =>\n  ({\n    email: entity.email?.length > 0 ? entity.email : entity.name,\n    familyName: entity.lastName || null,\n    givenName: entity.firstName || null,\n    id: entity.id,\n    status: entity.active ? \"ACTIVE\" : \"INACTIVE\",\n    username: entity.name,\n  }) as EnterpriseUserProperties;\n"]}
+{"version":3,"file":"CloudUser.js","sourceRoot":"","sources":["../../../src/cloud/users/CloudUser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,GAEf,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,cAAc;CAAG;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,MAAW,EAAE,EAAE,CACzD,CAAC;IACC,KAAK,EAAE,MAAM,CAAC,IAAI;IAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC,EAAE;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;IAC7C,QAAQ,EAAE,MAAM,CAAC,IAAI;CACtB,CAA6B,CAAC","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  EnterpriseUser,\n  type EnterpriseUserProperties,\n} from \"../../enterprise/users/EnterpriseUser.ts\";\n\n/**\n * @deprecated\n */\nexport class CloudUser extends EnterpriseUser {}\n\nexport const cloudUserEntityToProperties = (entity: any) =>\n  ({\n    email: entity.name,\n    familyName: entity.lastName || null,\n    givenName: entity.firstName || null,\n    id: entity.id,\n    status: entity.active ? \"ACTIVE\" : \"INACTIVE\",\n    username: entity.name,\n  }) as EnterpriseUserProperties;\n"]}

package/dist/cloud/users/User.d.ts

@@ -1,16 +1,16 @@
 import * as z from "zod/mini";
 import type { userPropertiesCodec } from "./userPropertiesCodec.ts";
-import type { V2Config } from "../../common/Config.ts";
+import type { V3Config } from "../../common/Config.ts";
 export declare class User implements z.output<typeof userPropertiesCodec> {
     #private;
     readonly email: string | null;
     readonly familyName: string | null;
     readonly givenName: string | null;
     readonly id: string;
-    readonly roles: z.output<typeof userPropertiesCodec>["roles"];
+    readonly identityType: z.output<typeof userPropertiesCodec>["identityType"];
     readonly status: z.output<typeof userPropertiesCodec>["status"];
     readonly username: string;
-    constructor(config: V2Config, properties: z.output<typeof userPropertiesCodec>);
+    constructor(config: V3Config, properties: z.output<typeof userPropertiesCodec>);
     get displayName(): string;
     get initials(): string;
 }

package/dist/cloud/users/User.js

@@ -21,7 +21,7 @@ export class User {
     familyName;
     givenName;
     id;
-    roles;
+    identityType;
     status;
     username;
     constructor(config, properties) {
@@ -30,7 +30,7 @@ export class User {
         this.familyName = properties.familyName;
         this.givenName = properties.givenName;
         this.id = properties.id;
-        this.roles = properties.roles;
+        this.identityType = properties.identityType;
         this.status = properties.status;
         this.username = properties.username;
     }

package/dist/cloud/users/User.js.map

@@ -1 +1 @@
-{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/cloud/users/User.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAI9B,MAAM,OAAO,IAAI;IACf,2DAA2D;IAClD,OAAO,CAAW;IAClB,KAAK,CAAgB;IACrB,UAAU,CAAgB;IAC1B,SAAS,CAAgB;IACzB,EAAE,CAAS;IACX,KAAK,CAAgD;IACrD,MAAM,CAAiD;IACvD,QAAQ,CAAS;IAE1B,YAAY,MAAgB,EAAE,UAAgD;QAC5E,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QACtC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,IAAI,WAAW;QACb,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;CACF","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\nimport type { userPropertiesCodec } from \"./userPropertiesCodec.ts\";\nimport type { V2Config } from \"../../common/Config.ts\";\n\nexport class User implements z.output<typeof userPropertiesCodec> {\n  // eslint-disable-next-line no-unused-private-class-members\n  readonly #config: V2Config;\n  readonly email: string | null;\n  readonly familyName: string | null;\n  readonly givenName: string | null;\n  readonly id: string;\n  readonly roles: z.output<typeof userPropertiesCodec>[\"roles\"];\n  readonly status: z.output<typeof userPropertiesCodec>[\"status\"];\n  readonly username: string;\n\n  constructor(config: V2Config, properties: z.output<typeof userPropertiesCodec>) {\n    this.#config = config;\n    this.email = properties.email;\n    this.familyName = properties.familyName;\n    this.givenName = properties.givenName;\n    this.id = properties.id;\n    this.roles = properties.roles;\n    this.status = properties.status;\n    this.username = properties.username;\n  }\n\n  get displayName(): string {\n    if (this.givenName || this.familyName) {\n      return [this.givenName, this.familyName].filter(Boolean).join(\" \");\n    }\n\n    if (this.username) {\n      return this.username;\n    }\n\n    if (this.email) {\n      return this.email;\n    }\n\n    return this.id;\n  }\n\n  get initials(): string {\n    if (this.givenName && this.familyName) {\n      return this.givenName.charAt(0) + this.familyName.charAt(0);\n    }\n\n    return this.displayName.slice(0, 2);\n  }\n}\n"]}
+{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/cloud/users/User.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAI9B,MAAM,OAAO,IAAI;IACf,2DAA2D;IAClD,OAAO,CAAW;IAClB,KAAK,CAAgB;IACrB,UAAU,CAAgB;IAC1B,SAAS,CAAgB;IACzB,EAAE,CAAS;IACX,YAAY,CAAuD;IACnE,MAAM,CAAiD;IACvD,QAAQ,CAAS;IAE1B,YAAY,MAAgB,EAAE,UAAgD;QAC5E,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QACtC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,IAAI,WAAW;QACb,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;CACF","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\nimport type { userPropertiesCodec } from \"./userPropertiesCodec.ts\";\nimport type { V3Config } from \"../../common/Config.ts\";\n\nexport class User implements z.output<typeof userPropertiesCodec> {\n  // eslint-disable-next-line no-unused-private-class-members\n  readonly #config: V3Config;\n  readonly email: string | null;\n  readonly familyName: string | null;\n  readonly givenName: string | null;\n  readonly id: string;\n  readonly identityType: z.output<typeof userPropertiesCodec>[\"identityType\"];\n  readonly status: z.output<typeof userPropertiesCodec>[\"status\"];\n  readonly username: string;\n\n  constructor(config: V3Config, properties: z.output<typeof userPropertiesCodec>) {\n    this.#config = config;\n    this.email = properties.email;\n    this.familyName = properties.familyName;\n    this.givenName = properties.givenName;\n    this.id = properties.id;\n    this.identityType = properties.identityType;\n    this.status = properties.status;\n    this.username = properties.username;\n  }\n\n  get displayName(): string {\n    if (this.givenName || this.familyName) {\n      return [this.givenName, this.familyName].filter(Boolean).join(\" \");\n    }\n\n    if (this.username) {\n      return this.username;\n    }\n\n    if (this.email) {\n      return this.email;\n    }\n\n    return this.id;\n  }\n\n  get initials(): string {\n    if (this.givenName && this.familyName) {\n      return this.givenName.charAt(0) + this.familyName.charAt(0);\n    }\n\n    return this.displayName.slice(0, 2);\n  }\n}\n"]}

package/dist/cloud/users/UsersResource.d.ts

@@ -1,30 +1,44 @@
-import type { V2Config } from "../../common/Config.ts";
+import * as z from "zod/mini";
+import type { V3Config } from "../../common/Config.ts";
 import type { SignalParam } from "../../common/Params.ts";
 import { User } from "./User.ts";
+import type { identityTypeSchema } from "./userPropertiesCodec.js";
+type CreateUserParams = {
+    name: string;
+    identityType?: z.output<typeof identityTypeSchema>;
+    description?: string;
+};
+type UpdateUserParams = {
+    firstName?: string;
+    lastName?: string;
+};
 export declare class UsersResource {
     #private;
-    constructor(config: V2Config);
-    /**
-     * @deprecated
-     */
-    _list(): {
+    constructor(config: V3Config);
+    list(params?: {
+        filter?: string;
+        maxResults?: number;
+        orderBy?: string;
+    }): {
         data({ signal }?: SignalParam): AsyncGenerator<User, void, unknown>;
-        getPage: ({ limit, offset, signal }: {
-            limit: number;
-            offset: number;
+        getPage: ({ pageToken, signal }?: {
+            pageToken?: string;
         } & SignalParam) => import("ts-results-es").AsyncResult<{
             data: User[];
-            itemsPerPage: number;
-            startIndex: number;
+            nextPageToken?: string;
             totalResults: number;
         }, import("../index.ts").HttpError>;
     };
-    /**
-     * @deprecated
-     */
-    _retrieveById(id: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
-    /**
-     * @deprecated
-     */
-    _retrieveByUsername(username: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
+    create(params: CreateUserParams, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
+    retrieveById(id: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
+    retrieveByName(name: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
+    update(id: string, params: UpdateUserParams, { signal }?: SignalParam): import("ts-results-es").AsyncResult<User, import("../index.ts").HttpError>;
+    delete(id: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<Response, import("../index.ts").HttpError>;
+    listParentRoles(userId: string, params?: {
+        maxResults?: number;
+        pageToken?: string;
+    }, { signal }?: SignalParam): import("ts-results-es").AsyncResult<Response, import("../index.ts").HttpError>;
+    addParentRole(userId: string, roleId: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<Response, import("../index.ts").HttpError>;
+    removeParentRole(userId: string, roleId: string, { signal }?: SignalParam): import("ts-results-es").AsyncResult<Response, import("../index.ts").HttpError>;
 }
+export {};

package/dist/cloud/users/UsersResource.js

@@ -21,14 +21,24 @@ export class UsersResource {
     constructor(config) {
         this.#config = config;
     }
-    /**
-     * @deprecated
-     */
-    _list() {
-        const getPage = ({ limit, offset, signal }) => this.#config
-            .v2Request(
-        // startIndex for this API must be >= 1
-        `user?${new URLSearchParams({ count: String(limit), startIndex: String(offset + 1) }).toString()}`, { headers: { Accept: "application/json" }, signal })
+    list(params) {
+        const buildQuery = (extra) => {
+            const query = new URLSearchParams();
+            if (params?.filter)
+                query.set("filter", params.filter);
+            if (params?.maxResults)
+                query.set("maxResults", String(params.maxResults));
+            if (params?.orderBy)
+                query.set("orderBy", params.orderBy);
+            if (extra?.pageToken)
+                query.set("pageToken", extra.pageToken);
+            return query;
+        };
+        const getPage = ({ pageToken, signal } = {}) => this.#config
+            .v3Request(`users?${buildQuery({ pageToken })}`, {
+            headers: { Accept: "application/json" },
+            signal,
+        })
             .map((res) => res.json())
             .map((page) => ({
             ...page,
@@ -36,50 +46,102 @@ export class UsersResource {
         }));
         return {
             async *data({ signal } = {}) {
-                const USERS_PAGE_SIZE = 100;
-                let offset = 0;
-                const firstPageResult = await getPage({ limit: USERS_PAGE_SIZE, offset, signal }).promise;
+                const firstPageResult = await getPage({ signal }).promise;
                 if (firstPageResult.isErr()) {
                     throw firstPageResult.error;
                 }
                 let currentPage = firstPageResult.value;
                 yield* currentPage.data;
-                while (currentPage.totalResults > offset - 1 + USERS_PAGE_SIZE) {
-                    offset += USERS_PAGE_SIZE;
-                    currentPage = await getPage({ limit: USERS_PAGE_SIZE, offset, signal }).promise.then((result) => result.unwrap());
+                while (currentPage.nextPageToken) {
+                    currentPage = await getPage({
+                        pageToken: currentPage.nextPageToken,
+                        signal,
+                    }).promise.then((result) => result.unwrap());
                     yield* currentPage.data;
                 }
             },
             getPage,
         };
     }
-    /**
-     * @deprecated
-     */
-    _retrieveById(id, { signal } = {}) {
+    create(params, { signal } = {}) {
         return this.#config
-            .v2Request(`user/${id}`, {
+            .v3Request("users", {
+            body: JSON.stringify(params),
             headers: {
                 Accept: "application/json",
+                "Content-Type": "application/json",
             },
+            method: "POST",
+            signal,
+        })
+            .map((res) => res.json())
+            .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));
+    }
+    retrieveById(id, { signal } = {}) {
+        return this.#config
+            .v3Request(`users/${id}`, {
+            headers: { Accept: "application/json" },
+            signal,
+        })
+            .map((res) => res.json())
+            .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));
+    }
+    retrieveByName(name, { signal } = {}) {
+        return this.#config
+            .v3Request(`users/names/${name}`, {
+            headers: { Accept: "application/json" },
             signal,
         })
             .map((res) => res.json())
             .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));
     }
-    /**
-     * @deprecated
-     */
-    _retrieveByUsername(username, { signal } = {}) {
+    update(id, params, { signal } = {}) {
         return this.#config
-            .v2Request(`user/by-name/${username}`, {
+            .v3Request(`users/${id}`, {
+            body: JSON.stringify(params),
             headers: {
                 Accept: "application/json",
+                "Content-Type": "application/json",
             },
+            method: "PUT",
             signal,
         })
             .map((res) => res.json())
             .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));
     }
+    delete(id, { signal } = {}) {
+        return this.#config.v3Request(`users/${id}`, {
+            method: "DELETE",
+            signal,
+        });
+    }
+    listParentRoles(userId, params, { signal } = {}) {
+        const query = new URLSearchParams();
+        if (params?.maxResults)
+            query.set("maxResults", String(params.maxResults));
+        if (params?.pageToken)
+            query.set("pageToken", params.pageToken);
+        return this.#config.v3Request(`users/${userId}/parent-roles?${query}`, {
+            headers: { Accept: "application/json" },
+            signal,
+        });
+    }
+    addParentRole(userId, roleId, { signal } = {}) {
+        return this.#config.v3Request(`users/${userId}/parent-roles`, {
+            body: JSON.stringify({ id: roleId }),
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+            },
+            method: "POST",
+            signal,
+        });
+    }
+    removeParentRole(userId, roleId, { signal } = {}) {
+        return this.#config.v3Request(`users/${userId}/parent-roles/${roleId}`, {
+            method: "DELETE",
+            signal,
+        });
+    }
 }
 //# sourceMappingURL=UsersResource.js.map

package/dist/cloud/users/UsersResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"UsersResource.js","sourceRoot":"","sources":["../../../src/cloud/users/UsersResource.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\nimport type { V2Config } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { userPropertiesCodec } from \"./userPropertiesCodec.js\";\nimport { User } from \"./User.ts\";\n\nexport class UsersResource {\n  #config: V2Config;\n\n  constructor(config: V2Config) {\n    this.#config = config;\n  }\n\n  /**\n   * @deprecated\n   */\n  _list() {\n    const getPage = ({ limit, offset, signal }: { limit: number; offset: number } & SignalParam) =>\n      this.#config\n        .v2Request(\n          // startIndex for this API must be >= 1\n          `user?${new URLSearchParams({ count: String(limit), startIndex: String(offset + 1) }).toString()}`,\n          { headers: { Accept: \"application/json\" }, signal },\n        )\n        .map(\n          (res) =>\n            res.json() as Promise<{\n              data: z.input<typeof userPropertiesCodec>[];\n              itemsPerPage: number;\n              startIndex: number;\n              totalResults: number;\n            }>,\n        )\n        .map((page) => ({\n          ...page,\n          data: page.data.map(\n            (entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)),\n          ),\n        }));\n\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        const USERS_PAGE_SIZE = 100;\n        let offset = 0;\n        const firstPageResult = await getPage({ limit: USERS_PAGE_SIZE, offset, signal }).promise;\n        if (firstPageResult.isErr()) {\n          throw firstPageResult.error;\n        }\n        let currentPage = firstPageResult.value;\n        yield* currentPage.data;\n        while (currentPage.totalResults > offset - 1 + USERS_PAGE_SIZE) {\n          offset += USERS_PAGE_SIZE;\n          currentPage = await getPage({ limit: USERS_PAGE_SIZE, offset, signal }).promise.then(\n            (result) => result.unwrap(),\n          );\n          yield* currentPage.data;\n        }\n      },\n      getPage,\n    };\n  }\n\n  /**\n   * @deprecated\n   */\n  _retrieveById(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .v2Request(`user/${id}`, {\n        headers: {\n          Accept: \"application/json\",\n        },\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n\n  /**\n   * @deprecated\n   */\n  _retrieveByUsername(username: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .v2Request(`user/by-name/${username}`, {\n        headers: {\n          Accept: \"application/json\",\n        },\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n}\n"]}
+{"version":3,"file":"UsersResource.js","sourceRoot":"","sources":["../../../src/cloud/users/UsersResource.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\nimport type { V3Config } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { userPropertiesCodec } from \"./userPropertiesCodec.js\";\nimport { User } from \"./User.ts\";\nimport type { identityTypeSchema } from \"./userPropertiesCodec.js\";\n\ntype PaginatedUserListResponse = {\n  data: z.input<typeof userPropertiesCodec>[];\n  nextPageToken?: string;\n  totalResults: number;\n};\n\ntype CreateUserParams = {\n  name: string;\n  identityType?: z.output<typeof identityTypeSchema>;\n  description?: string;\n};\n\ntype UpdateUserParams = {\n  firstName?: string;\n  lastName?: string;\n};\n\nexport class UsersResource {\n  #config: V3Config;\n\n  constructor(config: V3Config) {\n    this.#config = config;\n  }\n\n  list(params?: { filter?: string; maxResults?: number; orderBy?: string }) {\n    const buildQuery = (extra?: { pageToken?: string }) => {\n      const query = new URLSearchParams();\n      if (params?.filter) query.set(\"filter\", params.filter);\n      if (params?.maxResults) query.set(\"maxResults\", String(params.maxResults));\n      if (params?.orderBy) query.set(\"orderBy\", params.orderBy);\n      if (extra?.pageToken) query.set(\"pageToken\", extra.pageToken);\n      return query;\n    };\n\n    const getPage = ({ pageToken, signal }: { pageToken?: string } & SignalParam = {}) =>\n      this.#config\n        .v3Request(`users?${buildQuery({ pageToken })}`, {\n          headers: { Accept: \"application/json\" },\n          signal,\n        })\n        .map((res) => res.json() as Promise<PaginatedUserListResponse>)\n        .map((page) => ({\n          ...page,\n          data: page.data.map(\n            (entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)),\n          ),\n        }));\n\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        const firstPageResult = await getPage({ signal }).promise;\n        if (firstPageResult.isErr()) {\n          throw firstPageResult.error;\n        }\n        let currentPage = firstPageResult.value;\n        yield* currentPage.data;\n        while (currentPage.nextPageToken) {\n          currentPage = await getPage({\n            pageToken: currentPage.nextPageToken,\n            signal,\n          }).promise.then((result) => result.unwrap());\n          yield* currentPage.data;\n        }\n      },\n      getPage,\n    };\n  }\n\n  create(params: CreateUserParams, { signal }: SignalParam = {}) {\n    return this.#config\n      .v3Request(\"users\", {\n        body: JSON.stringify(params),\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\",\n        },\n        method: \"POST\",\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n\n  retrieveById(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .v3Request(`users/${id}`, {\n        headers: { Accept: \"application/json\" },\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n\n  retrieveByName(name: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .v3Request(`users/names/${name}`, {\n        headers: { Accept: \"application/json\" },\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n\n  update(id: string, params: UpdateUserParams, { signal }: SignalParam = {}) {\n    return this.#config\n      .v3Request(`users/${id}`, {\n        body: JSON.stringify(params),\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\",\n        },\n        method: \"PUT\",\n        signal,\n      })\n      .map((res) => res.json() as Promise<z.input<typeof userPropertiesCodec>>)\n      .map((entity) => new User(this.#config, z.decode(userPropertiesCodec, entity)));\n  }\n\n  delete(id: string, { signal }: SignalParam = {}) {\n    return this.#config.v3Request(`users/${id}`, {\n      method: \"DELETE\",\n      signal,\n    });\n  }\n\n  listParentRoles(\n    userId: string,\n    params?: { maxResults?: number; pageToken?: string },\n    { signal }: SignalParam = {},\n  ) {\n    const query = new URLSearchParams();\n    if (params?.maxResults) query.set(\"maxResults\", String(params.maxResults));\n    if (params?.pageToken) query.set(\"pageToken\", params.pageToken);\n\n    return this.#config.v3Request(`users/${userId}/parent-roles?${query}`, {\n      headers: { Accept: \"application/json\" },\n      signal,\n    });\n  }\n\n  addParentRole(userId: string, roleId: string, { signal }: SignalParam = {}) {\n    return this.#config.v3Request(`users/${userId}/parent-roles`, {\n      body: JSON.stringify({ id: roleId }),\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/json\",\n      },\n      method: \"POST\",\n      signal,\n    });\n  }\n\n  removeParentRole(userId: string, roleId: string, { signal }: SignalParam = {}) {\n    return this.#config.v3Request(`users/${userId}/parent-roles/${roleId}`, {\n      method: \"DELETE\",\n      signal,\n    });\n  }\n}\n"]}

package/dist/cloud/users/userPropertiesCodec.d.ts

@@ -1,40 +1,30 @@
 import * as z from "zod/mini";
+export declare const identityTypeSchema: z.ZodMiniEnum<{
+    REGULAR_USER: "REGULAR_USER";
+    SERVICE_USER: "SERVICE_USER";
+}>;
 export declare const userPropertiesCodec: z.ZodMiniCodec<z.ZodMiniObject<{
-    email: z.ZodMiniString<string>;
-    firstName: z.ZodMiniString<string>;
+    active: z.ZodMiniBoolean<boolean>;
+    firstName: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
     id: z.ZodMiniString<string>;
-    lastName: z.ZodMiniString<string>;
-    roles: z.ZodMiniArray<z.ZodMiniObject<{
-        id: z.ZodMiniString<string>;
-        name: z.ZodMiniString<string>;
-        type: z.ZodMiniEnum<{
-            INTERNAL: "INTERNAL";
-            EXTERNAL: "EXTERNAL";
-            SYSTEM: "SYSTEM";
-        }>;
-    }, z.core.$strip>>;
-    status: z.ZodMiniEnum<{
-        ACTIVE: "ACTIVE";
-        INACTIVE: "INACTIVE";
-    }>;
-    username: z.ZodMiniString<string>;
+    identityType: z.ZodMiniOptional<z.ZodMiniEnum<{
+        REGULAR_USER: "REGULAR_USER";
+        SERVICE_USER: "SERVICE_USER";
+    }>>;
+    lastName: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+    name: z.ZodMiniString<string>;
 }, z.core.$strip>, z.ZodMiniObject<{
+    email: z.ZodMiniNullable<z.ZodMiniString<string>>;
+    familyName: z.ZodMiniNullable<z.ZodMiniString<string>>;
+    givenName: z.ZodMiniNullable<z.ZodMiniString<string>>;
     id: z.ZodMiniString<string>;
+    identityType: z.ZodMiniOptional<z.ZodMiniEnum<{
+        REGULAR_USER: "REGULAR_USER";
+        SERVICE_USER: "SERVICE_USER";
+    }>>;
     status: z.ZodMiniEnum<{
         ACTIVE: "ACTIVE";
         INACTIVE: "INACTIVE";
     }>;
     username: z.ZodMiniString<string>;
-    roles: z.ZodMiniArray<z.ZodMiniObject<{
-        id: z.ZodMiniString<string>;
-        name: z.ZodMiniString<string>;
-        type: z.ZodMiniEnum<{
-            INTERNAL: "INTERNAL";
-            EXTERNAL: "EXTERNAL";
-            SYSTEM: "SYSTEM";
-        }>;
-    }, z.core.$strip>>;
-    email: z.ZodMiniNullable<z.ZodMiniString<string>>;
-    familyName: z.ZodMiniNullable<z.ZodMiniString<string>>;
-    givenName: z.ZodMiniNullable<z.ZodMiniString<string>>;
 }, z.core.$strip>>;

package/dist/cloud/users/userPropertiesCodec.js

@@ -14,43 +14,43 @@
  * limitations under the License.
  */
 import * as z from "zod/mini";
+export const identityTypeSchema = z.enum(["REGULAR_USER", "SERVICE_USER"]);
 const userPropertiesInSchema = z.object({
-    email: z.string(),
-    firstName: z.string(),
+    active: z.boolean(),
+    firstName: z.optional(z.nullable(z.string())),
     id: z.string().check(z.minLength(1)),
-    lastName: z.string(),
-    roles: z.array(z.object({
-        id: z.string(),
-        name: z.string(),
-        type: z.enum(["INTERNAL", "EXTERNAL", "SYSTEM"]),
-    })),
-    status: z.enum(["ACTIVE", "INACTIVE"]),
-    username: z.string().check(z.trim(), z.minLength(1)),
+    identityType: z.optional(identityTypeSchema),
+    lastName: z.optional(z.nullable(z.string())),
+    name: z.string(),
 });
-export const userPropertiesCodec = z.codec(userPropertiesInSchema, z.extend(z.omit(userPropertiesInSchema, {
-    email: true,
-    firstName: true,
-    lastName: true,
-}), {
-    email: z.nullable(z.string().check(z.email())),
+export const userPropertiesCodec = z.codec(userPropertiesInSchema, z.object({
+    email: z.nullable(z.string()),
     familyName: z.nullable(z.string().check(z.trim())),
     givenName: z.nullable(z.string().check(z.trim())),
+    id: z.string().check(z.minLength(1)),
+    identityType: z.optional(identityTypeSchema),
+    status: z.enum(["ACTIVE", "INACTIVE"]),
+    username: z.string().check(z.trim(), z.minLength(1)),
 }), {
     decode(v) {
         return {
-            ...v,
-            email: v.email || null,
+            email: v.name || null,
             familyName: v.lastName || null,
             givenName: v.firstName || null,
+            id: v.id,
+            identityType: v.identityType,
+            status: v.active ? "ACTIVE" : "INACTIVE",
+            username: v.name,
         };
     },
     encode(v) {
-        const { email, familyName, givenName, ...rest } = v;
         return {
-            ...rest,
-            email: email || "",
-            firstName: givenName || "",
-            lastName: familyName || "",
+            active: v.status === "ACTIVE",
+            firstName: v.givenName || undefined,
+            id: v.id,
+            identityType: v.identityType,
+            lastName: v.familyName || undefined,
+            name: v.username,
         };
     },
 });

package/dist/cloud/users/userPropertiesCodec.js.map

@@ -1 +1 @@
-{"version":3,"file":"userPropertiesCodec.js","sourceRoot":"","sources":["../../../src/cloud/users/userPropertiesCodec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;QACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;QACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;KACjD,CAAC,CACH;IACD,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CACxC,sBAAsB,EACtB,CAAC,CAAC,MAAM,CACN,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE;IAC7B,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,IAAI;CACf,CAAC,EACF;IACE,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9C,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;CAClD,CACF,EACD;IACE,MAAM,CAAC,CAAC;QACN,OAAO;YACL,GAAG,CAAC;YACJ,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI;YACtB,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;YAC9B,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,CAAC;QACN,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;QACpD,OAAO;YACL,GAAG,IAAI;YACP,KAAK,EAAE,KAAK,IAAI,EAAE;YAClB,SAAS,EAAE,SAAS,IAAI,EAAE;YAC1B,QAAQ,EAAE,UAAU,IAAI,EAAE;SAC3B,CAAC;IACJ,CAAC;CACF,CACF,CAAC","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\n\nconst userPropertiesInSchema = z.object({\n  email: z.string(),\n  firstName: z.string(),\n  id: z.string().check(z.minLength(1)),\n  lastName: z.string(),\n  roles: z.array(\n    z.object({\n      id: z.string(),\n      name: z.string(),\n      type: z.enum([\"INTERNAL\", \"EXTERNAL\", \"SYSTEM\"]),\n    }),\n  ),\n  status: z.enum([\"ACTIVE\", \"INACTIVE\"]),\n  username: z.string().check(z.trim(), z.minLength(1)),\n});\n\nexport const userPropertiesCodec = z.codec(\n  userPropertiesInSchema,\n  z.extend(\n    z.omit(userPropertiesInSchema, {\n      email: true,\n      firstName: true,\n      lastName: true,\n    }),\n    {\n      email: z.nullable(z.string().check(z.email())),\n      familyName: z.nullable(z.string().check(z.trim())),\n      givenName: z.nullable(z.string().check(z.trim())),\n    },\n  ),\n  {\n    decode(v) {\n      return {\n        ...v,\n        email: v.email || null,\n        familyName: v.lastName || null,\n        givenName: v.firstName || null,\n      };\n    },\n    encode(v) {\n      const { email, familyName, givenName, ...rest } = v;\n      return {\n        ...rest,\n        email: email || \"\",\n        firstName: givenName || \"\",\n        lastName: familyName || \"\",\n      };\n    },\n  },\n);\n"]}
+{"version":3,"file":"userPropertiesCodec.js","sourceRoot":"","sources":["../../../src/cloud/users/userPropertiesCodec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;AAE3E,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACnB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACpC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAC5C,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CACxC,sBAAsB,EACtB,CAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACjD,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACpC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAC5C,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC,EACF;IACE,MAAM,CAAC,CAAC;QACN,OAAO;YACL,KAAK,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;YACrB,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;YAC9B,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI;YAC9B,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,YAAY,EAAE,CAAC,CAAC,YAAY;YAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,QAAkB,CAAC,CAAC,CAAE,UAAoB;YAC9D,QAAQ,EAAE,CAAC,CAAC,IAAI;SACjB,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,CAAC;QACN,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,QAAQ;YAC7B,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS;YACnC,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,YAAY,EAAE,CAAC,CAAC,YAAY;YAC5B,QAAQ,EAAE,CAAC,CAAC,UAAU,IAAI,SAAS;YACnC,IAAI,EAAE,CAAC,CAAC,QAAQ;SACjB,CAAC;IACJ,CAAC;CACF,CACF,CAAC","sourcesContent":["/*\n * Copyright (C) 2024-2025 Dremio Corporation\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as z from \"zod/mini\";\n\nexport const identityTypeSchema = z.enum([\"REGULAR_USER\", \"SERVICE_USER\"]);\n\nconst userPropertiesInSchema = z.object({\n  active: z.boolean(),\n  firstName: z.optional(z.nullable(z.string())),\n  id: z.string().check(z.minLength(1)),\n  identityType: z.optional(identityTypeSchema),\n  lastName: z.optional(z.nullable(z.string())),\n  name: z.string(),\n});\n\nexport const userPropertiesCodec = z.codec(\n  userPropertiesInSchema,\n  z.object({\n    email: z.nullable(z.string()),\n    familyName: z.nullable(z.string().check(z.trim())),\n    givenName: z.nullable(z.string().check(z.trim())),\n    id: z.string().check(z.minLength(1)),\n    identityType: z.optional(identityTypeSchema),\n    status: z.enum([\"ACTIVE\", \"INACTIVE\"]),\n    username: z.string().check(z.trim(), z.minLength(1)),\n  }),\n  {\n    decode(v) {\n      return {\n        email: v.name || null,\n        familyName: v.lastName || null,\n        givenName: v.firstName || null,\n        id: v.id,\n        identityType: v.identityType,\n        status: v.active ? (\"ACTIVE\" as const) : (\"INACTIVE\" as const),\n        username: v.name,\n      };\n    },\n    encode(v) {\n      return {\n        active: v.status === \"ACTIVE\",\n        firstName: v.givenName || undefined,\n        id: v.id,\n        identityType: v.identityType,\n        lastName: v.familyName || undefined,\n        name: v.username,\n      };\n    },\n  },\n);\n"]}

package/dist/enterprise/ai/conversations/AgentConversation.js

@@ -91,7 +91,7 @@ export class AgentConversation {
             });
             if (attempt.isErr() &&
                 isProblem(attempt.error.body) &&
-                attempt.error.body.title === "https://api.dremio.dev/problems/concurrent-modification") {
+                attempt.error.body.type === "https://api.dremio.dev/problems/concurrent-modification") {
                 const remoteResult = await retrieveConversation(this.#config)(this.id);
                 if (remoteResult.isOk()) {
                     const remote = new AgentConversation(this.#config, remoteResult.value);