@dremio/js-sdk 0.10.0 → 0.11.1

package/dist/oss/scripts/ScriptErrors.js

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const scriptNotFoundError = (id) => ({
+import { Problem, ValidationProblem } from "../../common/Problem.js";
+export const scriptNotFoundError = (id) => new Problem({
     meta: {
         provided: {
             id,
@@ -22,16 +23,12 @@ export const scriptNotFoundError = (id) => ({
     title: "The script could not be found or you do not have permission to view it",
     type: "https://api.dremio.dev/problems/scripts/not-found",
 });
-export const duplicateScriptNameError = (name) => ({
-    errors: [
-        {
-            detail: "A script with this name already exists",
-            pointer: "#/name",
-            type: "https://api.dremio.dev/problems/validation/field-conflict",
-            value: name,
-        },
-    ],
-    title: "There was a problem validating the content of the request",
-    type: "https://api.dremio.dev/problems/validation-problem",
-});
+export const duplicateScriptNameError = (name) => new ValidationProblem([
+    {
+        detail: "A script with this name already exists",
+        pointer: "#/name",
+        type: "https://api.dremio.dev/problems/validation/field-conflict",
+        value: name,
+    },
+]);
 //# sourceMappingURL=ScriptErrors.js.map

package/dist/oss/scripts/ScriptErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptErrors.js","sourceRoot":"","sources":["../../../src/oss/scripts/ScriptErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAE,EAAE,CAChD,CAAC;IACC,IAAI,EAAE;QACJ,QAAQ,EAAE;YACR,EAAE;SACH;KACF;IACD,KAAK,EAAE,wEAAwE;IAC/E,IAAI,EAAE,mDAAmD;CAC1D,CAA4B,CAAC;AAEhC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAE,EAAE,CACvD,CAAC;IACC,MAAM,EAAE;QACN;YACE,MAAM,EAAE,wCAAwC;YAChD,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,2DAA2D;YACjE,KAAK,EAAE,IAAI;SACZ;KACF;IACD,KAAK,EAAE,2DAA2D;IAClE,IAAI,EAAE,oDAAoD;CAC3D,CAAsC,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 type { Problem, ValidationProblem } from \"../../common/Problem.ts\";\n\nexport const scriptNotFoundError = (id: string) =>\n  ({\n    meta: {\n      provided: {\n        id,\n      },\n    },\n    title: \"The script could not be found or you do not have permission to view it\",\n    type: \"https://api.dremio.dev/problems/scripts/not-found\",\n  }) as const satisfies Problem;\n\nexport const duplicateScriptNameError = (name: string) =>\n  ({\n    errors: [\n      {\n        detail: \"A script with this name already exists\",\n        pointer: \"#/name\",\n        type: \"https://api.dremio.dev/problems/validation/field-conflict\",\n        value: name,\n      },\n    ],\n    title: \"There was a problem validating the content of the request\",\n    type: \"https://api.dremio.dev/problems/validation-problem\",\n  }) as const satisfies ValidationProblem;\n"]}
+{"version":3,"file":"ScriptErrors.js","sourceRoot":"","sources":["../../../src/oss/scripts/ScriptErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAE,EAAE,CAChD,IAAI,OAAO,CAAC;IACV,IAAI,EAAE;QACJ,QAAQ,EAAE;YACR,EAAE;SACH;KACF;IACD,KAAK,EAAE,wEAAwE;IAC/E,IAAI,EAAE,mDAAmD;CAC1D,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAE,EAAE,CACvD,IAAI,iBAAiB,CAAC;IACpB;QACE,MAAM,EAAE,wCAAwC;QAChD,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,2DAA2D;QACjE,KAAK,EAAE,IAAI;KACZ;CACF,CAAC,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 { Problem, ValidationProblem } from \"../../common/Problem.js\";\n\nexport const scriptNotFoundError = (id: string) =>\n  new Problem({\n    meta: {\n      provided: {\n        id,\n      },\n    },\n    title: \"The script could not be found or you do not have permission to view it\",\n    type: \"https://api.dremio.dev/problems/scripts/not-found\",\n  });\n\nexport const duplicateScriptNameError = (name: string) =>\n  new ValidationProblem([\n    {\n      detail: \"A script with this name already exists\",\n      pointer: \"#/name\",\n      type: \"https://api.dremio.dev/problems/validation/field-conflict\",\n      value: name,\n    },\n  ]);\n"]}

package/dist/oss/scripts/ScriptsResource.d.ts

@@ -1,8 +1,8 @@
 import type { ResourceConfig, SonarV3Config } from "../../common/Config.ts";
 import { Script, type ScriptEntity } from "./Script.ts";
-import { Ok, Err } from "ts-results-es";
 import type { Query } from "../../common/Query.ts";
 import type { SignalParam } from "../../common/Params.ts";
+import { Problem } from "../../common/Problem.ts";
 export declare class ScriptsResource {
     #private;
     constructor(config: ResourceConfig & SonarV3Config);
@@ -10,15 +10,23 @@ export declare class ScriptsResource {
     list(): {
         data({ signal }?: SignalParam): AsyncGenerator<Script, void, unknown>;
     };
-    retrieve(id: string, { signal }?: SignalParam): Promise<Err<unknown> | Ok<Script>>;
+    retrieve(id: string, { signal }?: SignalParam): Promise<import("ts-results-es").Result<Script, import("../index.ts").HttpError | Problem<"https://api.dremio.dev/problems/scripts/not-found", {
+        provided: {
+            id: string;
+        };
+    }>>>;
     store(properties: {
         name: string;
         query: Query;
-    }): Promise<Err<unknown> | Ok<Script>>;
+    }): Promise<import("ts-results-es").Result<Script, import("../../common/Problem.ts").ValidationProblem | import("../index.ts").HttpError>>;
 }
-export declare const listScripts: <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) => ({ signal }?: SignalParam) => Promise<S[]>;
-export declare const retrieveScript: <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) => (id: string, { signal }?: SignalParam) => Promise<Err<unknown> | Ok<S>>;
+export declare const listScripts: <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) => ({ signal }?: SignalParam) => Promise<import("ts-results-es").Result<S[], import("../index.ts").HttpError>>;
+export declare const retrieveScript: <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) => (id: string, { signal }?: SignalParam) => Promise<import("ts-results-es").Result<S, import("../index.ts").HttpError | Problem<"https://api.dremio.dev/problems/scripts/not-found", {
+    provided: {
+        id: string;
+    };
+}>>>;
 export declare const storeScript: <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) => (properties: {
     name: string;
     query: Query;
-}) => Promise<Err<unknown> | Ok<S>>;
+}) => Promise<import("ts-results-es").Result<S, import("../../common/Problem.ts").ValidationProblem | import("../index.ts").HttpError>>;

package/dist/oss/scripts/ScriptsResource.js

@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 import { Script, scriptEntityToProperties } from "./Script.js";
-import { Ok, Err } from "ts-results-es";
-import { HttpError } from "../../common/HttpError.js";
-import { isProblem } from "../../common/Problem.js";
 import { duplicateScriptNameError, scriptNotFoundError } from "./ScriptErrors.js";
+import { Problem } from "../../common/Problem.js";
 export class ScriptsResource {
     #config;
     constructor(config) {
@@ -30,7 +28,7 @@ export class ScriptsResource {
         const l = listScripts(this.#config, this._scriptFromEntity.bind(this));
         return {
             async *data({ signal } = {}) {
-                yield* await l({ signal });
+                yield* (await l({ signal })).unwrap();
             },
         };
     }
@@ -42,17 +40,17 @@ export class ScriptsResource {
     }
 }
 export const listScripts = ({ sonarV3Request }, _scriptFromEntity) => ({ signal } = {}) => sonarV3Request("scripts?maxResults=1000", { signal })
-    .then((res) => res.json())
-    .then((response) => response.data.map((entity) => _scriptFromEntity(entity)));
+    .map((response) => response.json())
+    .map((response) => response.data.map((entity) => _scriptFromEntity(entity))).promise;
 export const retrieveScript = ({ sonarV3Request }, _scriptFromEntity) => (id, { signal } = {}) => sonarV3Request(`scripts/${id}`, { signal })
-    .then((res) => res.json())
-    .then((entity) => Ok(_scriptFromEntity(entity)))
-    .catch((e) => {
-    if (e instanceof HttpError && e.status === 404) {
-        return Err(scriptNotFoundError(id));
+    .map((response) => response.json())
+    .map((entity) => _scriptFromEntity(entity))
+    .mapErr((err) => {
+    if (err.status === 404) {
+        return scriptNotFoundError(id);
     }
-    return Err(e);
-});
+    return err;
+}).promise;
 export const storeScript = ({ sonarV3Request }, _scriptFromEntity) => (properties) => {
     const { query, ...rest } = properties;
     return sonarV3Request("scripts", {
@@ -67,14 +65,14 @@ export const storeScript = ({ sonarV3Request }, _scriptFromEntity) => (propertie
         keepalive: true,
         method: "POST",
     })
-        .then((res) => res.json())
-        .then((entity) => Ok(_scriptFromEntity(entity)))
-        .catch((e) => {
-        if (e instanceof HttpError && isProblem(e.body)) {
-            if (e.body.detail?.includes("Cannot reuse the same script name"))
-                return Err(duplicateScriptNameError(properties.name));
+        .map((response) => response.json())
+        .map((entity) => _scriptFromEntity(entity))
+        .mapErr((err) => {
+        if (err.body instanceof Problem &&
+            err.body.detail?.includes("Cannot reuse the same script name")) {
+            return duplicateScriptNameError(properties.name);
         }
-        return Err(e);
-    });
+        return err;
+    }).promise;
 };
 //# sourceMappingURL=ScriptsResource.js.map

package/dist/oss/scripts/ScriptsResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptsResource.js","sourceRoot":"","sources":["../../../src/oss/scripts/ScriptsResource.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 type { ResourceConfig, SonarV3Config } from \"../../common/Config.ts\";\nimport { Script, scriptEntityToProperties, type ScriptEntity } from \"./Script.ts\";\nimport { Ok, Err } from \"ts-results-es\";\nimport { HttpError } from \"../../common/HttpError.ts\";\nimport { isProblem } from \"../../common/Problem.ts\";\nimport type { Query } from \"../../common/Query.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { duplicateScriptNameError, scriptNotFoundError } from \"./ScriptErrors.ts\";\n\nexport class ScriptsResource {\n  #config: ResourceConfig & SonarV3Config;\n\n  constructor(config: ResourceConfig & SonarV3Config) {\n    this.#config = config;\n  }\n\n  _scriptFromEntity(entity: ScriptEntity) {\n    return new Script(scriptEntityToProperties(entity), this.#config);\n  }\n\n  list() {\n    const l = listScripts(this.#config, this._scriptFromEntity.bind(this));\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        yield* await l({ signal });\n      },\n    };\n  }\n\n  retrieve(id: string, { signal }: SignalParam = {}) {\n    return retrieveScript(this.#config, this._scriptFromEntity.bind(this))(id, { signal });\n  }\n\n  store(properties: { name: string; query: Query }) {\n    return storeScript(this.#config, this._scriptFromEntity.bind(this))(properties);\n  }\n}\n\nexport const listScripts =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  ({ signal }: SignalParam = {}) =>\n    sonarV3Request(\"scripts?maxResults=1000\", { signal })\n      .then((res) => res.json() as Promise<{ data: E[] }>)\n      .then((response) => response.data.map((entity) => _scriptFromEntity(entity)));\n\nexport const retrieveScript =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  (id: string, { signal }: SignalParam = {}) =>\n    sonarV3Request(`scripts/${id}`, { signal })\n      .then((res) => res.json() as Promise<E>)\n      .then((entity) => Ok(_scriptFromEntity(entity)))\n      .catch((e: unknown) => {\n        if (e instanceof HttpError && e.status === 404) {\n          return Err(scriptNotFoundError(id));\n        }\n        return Err(e);\n      });\n\nexport const storeScript =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  (properties: { name: string; query: Query }) => {\n    const { query, ...rest } = properties;\n    return sonarV3Request(\"scripts\", {\n      body: JSON.stringify({\n        ...rest,\n        content: query.sql,\n        context: query.context,\n      }),\n      headers: {\n        \"Content-Type\": \"application/json\",\n      },\n      keepalive: true,\n      method: \"POST\",\n    })\n      .then((res) => res.json() as Promise<E>)\n      .then((entity) => Ok(_scriptFromEntity(entity)))\n      .catch((e: unknown) => {\n        if (e instanceof HttpError && isProblem(e.body)) {\n          if (e.body.detail?.includes(\"Cannot reuse the same script name\"))\n            return Err(duplicateScriptNameError(properties.name));\n        }\n        return Err(e);\n      });\n  };\n"]}
+{"version":3,"file":"ScriptsResource.js","sourceRoot":"","sources":["../../../src/oss/scripts/ScriptsResource.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 type { ResourceConfig, SonarV3Config } from \"../../common/Config.ts\";\nimport { Script, scriptEntityToProperties, type ScriptEntity } from \"./Script.ts\";\nimport type { Query } from \"../../common/Query.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { duplicateScriptNameError, scriptNotFoundError } from \"./ScriptErrors.ts\";\nimport { Problem } from \"../../common/Problem.ts\";\n\nexport class ScriptsResource {\n  #config: ResourceConfig & SonarV3Config;\n\n  constructor(config: ResourceConfig & SonarV3Config) {\n    this.#config = config;\n  }\n\n  _scriptFromEntity(entity: ScriptEntity) {\n    return new Script(scriptEntityToProperties(entity), this.#config);\n  }\n\n  list() {\n    const l = listScripts(this.#config, this._scriptFromEntity.bind(this));\n    return {\n      async *data({ signal }: SignalParam = {}) {\n        yield* (await l({ signal })).unwrap();\n      },\n    };\n  }\n\n  retrieve(id: string, { signal }: SignalParam = {}) {\n    return retrieveScript(this.#config, this._scriptFromEntity.bind(this))(id, { signal });\n  }\n\n  store(properties: { name: string; query: Query }) {\n    return storeScript(this.#config, this._scriptFromEntity.bind(this))(properties);\n  }\n}\n\nexport const listScripts =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  ({ signal }: SignalParam = {}) =>\n    sonarV3Request(\"scripts?maxResults=1000\", { signal })\n      .map((response) => response.json() as Promise<{ data: E[] }>)\n      .map((response) => response.data.map((entity) => _scriptFromEntity(entity))).promise;\n\nexport const retrieveScript =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  (id: string, { signal }: SignalParam = {}) =>\n    sonarV3Request(`scripts/${id}`, { signal })\n      .map((response) => response.json() as Promise<E>)\n      .map((entity) => _scriptFromEntity(entity))\n      .mapErr((err) => {\n        if (err.status === 404) {\n          return scriptNotFoundError(id);\n        }\n        return err;\n      }).promise;\n\nexport const storeScript =\n  <E, S>({ sonarV3Request }: SonarV3Config, _scriptFromEntity: (entity: E) => S) =>\n  (properties: { name: string; query: Query }) => {\n    const { query, ...rest } = properties;\n    return sonarV3Request(\"scripts\", {\n      body: JSON.stringify({\n        ...rest,\n        content: query.sql,\n        context: query.context,\n      }),\n      headers: {\n        \"Content-Type\": \"application/json\",\n      },\n      keepalive: true,\n      method: \"POST\",\n    })\n      .map((response) => response.json() as Promise<E>)\n      .map((entity) => _scriptFromEntity(entity))\n      .mapErr((err) => {\n        if (\n          err.body instanceof Problem &&\n          err.body.detail?.includes(\"Cannot reuse the same script name\")\n        ) {\n          return duplicateScriptNameError(properties.name);\n        }\n\n        return err;\n      }).promise;\n  };\n"]}

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

@@ -1,4 +1,3 @@
-import { Err, Ok } from "ts-results-es";
 import { User, type UserEntity } from "./User.ts";
 import type { SonarV3Config } from "../../common/Config.ts";
 import type { SignalParam } from "../../common/Params.ts";
@@ -6,6 +5,6 @@ export declare class UsersResource {
     #private;
     constructor(config: SonarV3Config);
     _userFromEntity(entity: UserEntity): User;
-    retrieveById(id: string, { signal }?: SignalParam): Promise<Err<unknown> | Ok<User>>;
-    retrieveByName(name: string, { signal }?: SignalParam): Promise<Err<unknown> | Ok<User>>;
+    retrieveById(id: string, { signal }?: SignalParam): Promise<import("ts-results-es").Result<User, import("../index.ts").HttpError>>;
+    retrieveByName(name: string, { signal }?: SignalParam): Promise<import("ts-results-es").Result<User, import("../index.ts").HttpError>>;
 }

package/dist/oss/users/UsersResource.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Err, Ok } from "ts-results-es";
 import { User, userEntityToProperties } from "./User.js";
 export class UsersResource {
     #config;
@@ -26,16 +25,14 @@ export class UsersResource {
     retrieveById(id, { signal } = {}) {
         return this.#config
             .sonarV3Request(`user/${id}`, { signal })
-            .then((res) => res.json())
-            .then((entity) => Ok(this._userFromEntity(entity)))
-            .catch((e) => Err(e));
+            .map((response) => response.json())
+            .map((entity) => this._userFromEntity(entity)).promise;
     }
     retrieveByName(name, { signal } = {}) {
         return this.#config
             .sonarV3Request(`user/by-name/${name}`, { signal })
-            .then((res) => res.json())
-            .then((entity) => Ok(this._userFromEntity(entity)))
-            .catch((e) => Err(e));
+            .map((response) => response.json())
+            .map((entity) => this._userFromEntity(entity)).promise;
     }
 }
 //# sourceMappingURL=UsersResource.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"UsersResource.js","sourceRoot":"","sources":["../../../src/oss/users/UsersResource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAmB,MAAM,WAAW,CAAC;AAI1E,MAAM,OAAO,aAAa;IACxB,OAAO,CAAgB;IAEvB,YAAY,MAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,eAAe,CAAC,MAAkB;QAChC,OAAO,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,EAAE,MAAM,KAAkB,EAAE;QACnD,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAyB,CAAC;aAChD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,EAAE,MAAM,KAAkB,EAAE;QACvD,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,gBAAgB,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aAClD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAyB,CAAC;aAChD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,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 { Err, Ok } from \"ts-results-es\";\nimport { User, userEntityToProperties, type UserEntity } from \"./User.ts\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\n\nexport class UsersResource {\n  #config: SonarV3Config;\n\n  constructor(config: SonarV3Config) {\n    this.#config = config;\n  }\n\n  _userFromEntity(entity: UserEntity) {\n    return new User(userEntityToProperties(entity));\n  }\n\n  retrieveById(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`user/${id}`, { signal })\n      .then((res) => res.json() as Promise<UserEntity>)\n      .then((entity) => Ok(this._userFromEntity(entity)))\n      .catch((e: unknown) => Err(e));\n  }\n\n  retrieveByName(name: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`user/by-name/${name}`, { signal })\n      .then((res) => res.json() as Promise<UserEntity>)\n      .then((entity) => Ok(this._userFromEntity(entity)))\n      .catch((e: unknown) => Err(e));\n  }\n}\n"]}
+{"version":3,"file":"UsersResource.js","sourceRoot":"","sources":["../../../src/oss/users/UsersResource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAmB,MAAM,WAAW,CAAC;AAI1E,MAAM,OAAO,aAAa;IACxB,OAAO,CAAgB;IAEvB,YAAY,MAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,eAAe,CAAC,MAAkB;QAChC,OAAO,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,EAAE,MAAM,KAAkB,EAAE;QACnD,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAyB,CAAC;aACzD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3D,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,EAAE,MAAM,KAAkB,EAAE;QACvD,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,gBAAgB,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aAClD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAyB,CAAC;aACzD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3D,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 { User, userEntityToProperties, type UserEntity } from \"./User.ts\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\n\nexport class UsersResource {\n  #config: SonarV3Config;\n\n  constructor(config: SonarV3Config) {\n    this.#config = config;\n  }\n\n  _userFromEntity(entity: UserEntity) {\n    return new User(userEntityToProperties(entity));\n  }\n\n  retrieveById(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`user/${id}`, { signal })\n      .map((response) => response.json() as Promise<UserEntity>)\n      .map((entity) => this._userFromEntity(entity)).promise;\n  }\n\n  retrieveByName(name: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`user/by-name/${name}`, { signal })\n      .map((response) => response.json() as Promise<UserEntity>)\n      .map((entity) => this._userFromEntity(entity)).promise;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dremio/js-sdk",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "JavaScript library for the Dremio API",
   "keywords": [
     "dremio",