@dremio/js-sdk 0.10.0 → 0.11.0

package/dist/oss/catalog/catalogErrors.js

@@ -13,22 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const emptyPathError = {
-    errors: [
-        {
-            detail: "`path` parameter is required and cannot be empty",
-            pointer: "#/path",
-            type: "https://api.dremio.dev/problems/validation/min-length",
-        },
-    ],
-    title: "There was a problem validating the content of the request",
-    type: "https://api.dremio.dev/problems/validation-problem",
-};
+import { Problem, ValidationProblem } from "../../common/Problem.js";
+export const emptyPathError = new ValidationProblem([
+    {
+        detail: "`path` parameter is required and cannot be empty",
+        pointer: "#/path",
+        type: "https://api.dremio.dev/problems/validation/min-length",
+    },
+]);
 /**
  * Generic problem for when we don't know what specifically caused the retrieval
  * to fail.
  */
-export const unableToRetrieveProblem = (internalErrorMessage) => ({
+export const unableToRetrieveProblem = (internalErrorMessage) => new Problem({
     detail: internalErrorMessage,
     title: "We were unable to fetch details for this catalog object",
     type: "https://api.dremio.dev/problems/catalog/failed-to-retrieve",

package/dist/oss/catalog/catalogErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalogErrors.js","sourceRoot":"","sources":["../../../src/oss/catalog/catalogErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,MAAM,EAAE;QACN;YACE,MAAM,EAAE,kDAAkD;YAC1D,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,uDAAuD;SAC9D;KACF;IACD,KAAK,EAAE,2DAA2D;IAClE,IAAI,EAAE,oDAAoD;CACtB,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,oBAA6B,EAAE,EAAE,CACvE,CAAC;IACC,MAAM,EAAE,oBAAoB;IAC5B,KAAK,EAAE,yDAAyD;IAChE,IAAI,EAAE,4DAA4D;CACnE,CAA4B,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 emptyPathError = {\n  errors: [\n    {\n      detail: \"`path` parameter is required and cannot be empty\",\n      pointer: \"#/path\",\n      type: \"https://api.dremio.dev/problems/validation/min-length\",\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\n/**\n * Generic problem for when we don't know what specifically caused the retrieval\n * to fail.\n */\nexport const unableToRetrieveProblem = (internalErrorMessage?: string) =>\n  ({\n    detail: internalErrorMessage,\n    title: \"We were unable to fetch details for this catalog object\",\n    type: \"https://api.dremio.dev/problems/catalog/failed-to-retrieve\",\n  }) as const satisfies Problem;\n"]}
+{"version":3,"file":"catalogErrors.js","sourceRoot":"","sources":["../../../src/oss/catalog/catalogErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,iBAAiB,CAAC;IAClD;QACE,MAAM,EAAE,kDAAkD;QAC1D,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,uDAAuD;KAC9D;CACF,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,oBAA6B,EAAE,EAAE,CACvE,IAAI,OAAO,CAAC;IACV,MAAM,EAAE,oBAAoB;IAC5B,KAAK,EAAE,yDAAyD;IAChE,IAAI,EAAE,4DAA4D;CACnE,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 emptyPathError = new ValidationProblem([\n  {\n    detail: \"`path` parameter is required and cannot be empty\",\n    pointer: \"#/path\",\n    type: \"https://api.dremio.dev/problems/validation/min-length\",\n  },\n]);\n\n/**\n * Generic problem for when we don't know what specifically caused the retrieval\n * to fail.\n */\nexport const unableToRetrieveProblem = (internalErrorMessage?: string) =>\n  new Problem({\n    detail: internalErrorMessage,\n    title: \"We were unable to fetch details for this catalog object\",\n    type: \"https://api.dremio.dev/problems/catalog/failed-to-retrieve\",\n  });\n"]}

package/dist/oss/catalog/catalogRetrieve.d.ts

@@ -1,6 +1,7 @@
 import { type Result } from "ts-results-es";
 import type { SonarV3Config } from "../../common/Config.ts";
+import { HttpError } from "../../common/HttpError.ts";
 import type { CatalogObject } from "./CatalogObjects/index.ts";
 import type { Problem } from "../../common/Problem.ts";
-export declare const baseRetrieve: (config: SonarV3Config) => (key: string) => Promise<Result<CatalogObject, Problem>>;
-export declare const baseRetrieveByPath: (config: SonarV3Config) => (key: string[]) => Promise<Result<CatalogObject, Problem>>;
+export declare const baseRetrieve: (config: SonarV3Config) => (key: string) => Promise<Result<CatalogObject, Problem<string, undefined> | HttpError>>;
+export declare const baseRetrieveByPath: (config: SonarV3Config) => (key: string[]) => Promise<Result<CatalogObject, Problem<string, undefined> | HttpError>>;

package/dist/oss/catalog/catalogRetrieve.js

@@ -24,6 +24,7 @@ export const baseRetrieve = (config) => batch(async (ids) => {
         const id = Array.from(ids).at(0);
         return config
             .sonarV3Request(`catalog/${id}?maxChildren=0`)
+            .promise.then((result) => result.unwrap())
             .then((res) => res.json())
             .then((response) => {
             results.set(id, Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)));
@@ -31,7 +32,7 @@ export const baseRetrieve = (config) => batch(async (ids) => {
         })
             .catch((e) => {
             if (e instanceof HttpError) {
-                results.set(id, Err(e.body));
+                results.set(id, Err(e));
             }
             else {
                 results.set(id, Err(unableToRetrieveProblem()));
@@ -50,6 +51,7 @@ export const baseRetrieve = (config) => batch(async (ids) => {
         headers: { "Content-Type": "application/json" },
         method: "POST",
     })
+        .promise.then((result) => result.unwrap())
         .then((res) => res.json())
         .then((response) => response.data))).then((chunks) => chunks.flat());
     for (const catalogItem of catalogItems) {
@@ -74,6 +76,7 @@ export const baseRetrieveByPath = (config) => batch(async (paths) => {
         const path = Array.from(paths).at(0);
         return config
             .sonarV3Request(`catalog/by-path/${path.map(encodeURIComponent).join("/")}?maxChildren=0`)
+            .promise.then((result) => result.unwrap())
             .then((res) => res.json())
             .then((response) => {
             results.set(path, Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)));
@@ -81,7 +84,7 @@ export const baseRetrieveByPath = (config) => batch(async (paths) => {
         })
             .catch((e) => {
             if (e instanceof HttpError) {
-                results.set(path, Err(e.body));
+                results.set(path, Err(e));
             }
             else {
                 results.set(path, Err(unableToRetrieveProblem()));
@@ -100,6 +103,7 @@ export const baseRetrieveByPath = (config) => batch(async (paths) => {
         headers: { "Content-Type": "application/json" },
         method: "POST",
     })
+        .promise.then((result) => result.unwrap())
         .then((res) => res.json())
         .then((response) => response.data))).then((chunks) => chunks.flat());
     for (const catalogItem of catalogItems) {

package/dist/oss/catalog/catalogRetrieve.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalogRetrieve.js","sourceRoot":"","sources":["../../../src/oss/catalog/catalogRetrieve.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 { batch } from \"../../common/batch.ts\";\nimport { Err, Ok, type Result } from \"ts-results-es\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport { catalogObjectFromEntity } from \"./CatalogObjects/utils/catalogObjectFromEntity.ts\";\nimport { HttpError } from \"../../common/HttpError.ts\";\nimport { unableToRetrieveProblem } from \"./catalogErrors.ts\";\nimport type { CatalogObject } from \"./CatalogObjects/index.ts\";\nimport type { Problem } from \"../../common/Problem.ts\";\n\nexport const baseRetrieve = (config: SonarV3Config) =>\n  batch(async (ids: Set<string>) => {\n    const results = new Map<string, Result<CatalogObject, Problem>>();\n\n    if (ids.size === 1) {\n      const id = Array.from(ids).at(0)!;\n      return config\n        .sonarV3Request(`catalog/${id}?maxChildren=0`)\n        .then((res) => res.json())\n        .then((response) => {\n          results.set(\n            id,\n            Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)),\n          );\n          return results;\n        })\n        .catch((e) => {\n          if (e instanceof HttpError) {\n            results.set(id, Err(e.body));\n          } else {\n            results.set(id, Err(unableToRetrieveProblem()));\n          }\n\n          return results;\n        });\n    }\n\n    const idsArray = Array.from(ids);\n    const chunks = [];\n\n    while (idsArray.length > 0) {\n      chunks.push(idsArray.splice(0, Math.min(50, idsArray.length)));\n    }\n\n    const catalogItems = await Promise.all(\n      chunks.map((chunk) =>\n        config\n          .sonarV3Request(`catalog/by-ids?maxChildren=0`, {\n            body: JSON.stringify(chunk),\n            headers: { \"Content-Type\": \"application/json\" },\n            method: \"POST\",\n          })\n          .then((res) => res.json())\n          .then((response) => response.data),\n      ),\n    ).then((chunks) => chunks.flat());\n\n    for (const catalogItem of catalogItems) {\n      results.set(\n        catalogItem.id,\n        Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(catalogItem)),\n      );\n    }\n\n    for (const id of ids) {\n      if (!results.has(id)) {\n        results.set(id, Err(unableToRetrieveProblem()));\n      }\n    }\n\n    return results;\n  });\n\nexport const baseRetrieveByPath = (config: SonarV3Config) =>\n  batch(async (paths: Set<string[]>) => {\n    const results = new Map<string[], Result<CatalogObject, Problem>>();\n\n    // Because the key is a reference type (array), we need to store the\n    // original path reference\n    const originalKeyRef = new Map<string, string[]>();\n    for (const key of paths) {\n      originalKeyRef.set(JSON.stringify(key), key);\n    }\n\n    if (paths.size === 1) {\n      const path = Array.from(paths).at(0)!;\n      return config\n        .sonarV3Request(`catalog/by-path/${path.map(encodeURIComponent).join(\"/\")}?maxChildren=0`)\n        .then((res) => res.json())\n        .then((response) => {\n          results.set(\n            path,\n            Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)),\n          );\n          return results;\n        })\n        .catch((e) => {\n          if (e instanceof HttpError) {\n            results.set(path, Err(e.body));\n          } else {\n            results.set(path, Err(unableToRetrieveProblem()));\n          }\n          return results;\n        });\n    }\n\n    const pathsArray = Array.from(paths);\n    const chunks = [];\n\n    while (pathsArray.length > 0) {\n      chunks.push(pathsArray.splice(0, Math.min(50, pathsArray.length)));\n    }\n\n    const catalogItems = await Promise.all(\n      chunks.map((chunk) =>\n        config\n          .sonarV3Request(`catalog/by-paths?maxChildren=0`, {\n            body: JSON.stringify(chunk),\n            headers: { \"Content-Type\": \"application/json\" },\n            method: \"POST\",\n          })\n          .then((res) => res.json())\n          .then((response) => response.data),\n      ),\n    ).then((chunks) => chunks.flat());\n\n    for (const catalogItem of catalogItems) {\n      const resolved = catalogObjectFromEntity(config, baseRetrieveByPath(config))(catalogItem);\n      const originalKey = originalKeyRef.get(JSON.stringify(resolved.path));\n      if (originalKey) {\n        results.set(originalKey, Ok(resolved));\n      }\n    }\n\n    for (const path of paths) {\n      if (!results.has(path)) {\n        results.set(path, Err(unableToRetrieveProblem()));\n      }\n    }\n\n    return results;\n  });\n"]}
+{"version":3,"file":"catalogRetrieve.js","sourceRoot":"","sources":["../../../src/oss/catalog/catalogRetrieve.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 { batch } from \"../../common/batch.ts\";\nimport { Err, Ok, type Result } from \"ts-results-es\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport { catalogObjectFromEntity } from \"./CatalogObjects/utils/catalogObjectFromEntity.ts\";\nimport { HttpError } from \"../../common/HttpError.ts\";\nimport { unableToRetrieveProblem } from \"./catalogErrors.ts\";\nimport type { CatalogObject } from \"./CatalogObjects/index.ts\";\nimport type { Problem } from \"../../common/Problem.ts\";\n\nexport const baseRetrieve = (config: SonarV3Config) =>\n  batch(async (ids: Set<string>) => {\n    const results = new Map<string, Result<CatalogObject, HttpError | Problem>>();\n\n    if (ids.size === 1) {\n      const id = Array.from(ids).at(0)!;\n      return config\n        .sonarV3Request(`catalog/${id}?maxChildren=0`)\n        .promise.then((result) => result.unwrap())\n        .then((res) => res.json())\n        .then((response) => {\n          results.set(\n            id,\n            Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)),\n          );\n          return results;\n        })\n        .catch((e) => {\n          if (e instanceof HttpError) {\n            results.set(id, Err(e));\n          } else {\n            results.set(id, Err(unableToRetrieveProblem()));\n          }\n\n          return results;\n        });\n    }\n\n    const idsArray = Array.from(ids);\n    const chunks = [];\n\n    while (idsArray.length > 0) {\n      chunks.push(idsArray.splice(0, Math.min(50, idsArray.length)));\n    }\n\n    const catalogItems = await Promise.all(\n      chunks.map((chunk) =>\n        config\n          .sonarV3Request(`catalog/by-ids?maxChildren=0`, {\n            body: JSON.stringify(chunk),\n            headers: { \"Content-Type\": \"application/json\" },\n            method: \"POST\",\n          })\n          .promise.then((result) => result.unwrap())\n          .then((res) => res.json())\n          .then((response) => response.data),\n      ),\n    ).then((chunks) => chunks.flat());\n\n    for (const catalogItem of catalogItems) {\n      results.set(\n        catalogItem.id,\n        Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(catalogItem)),\n      );\n    }\n\n    for (const id of ids) {\n      if (!results.has(id)) {\n        results.set(id, Err(unableToRetrieveProblem()));\n      }\n    }\n\n    return results;\n  });\n\nexport const baseRetrieveByPath = (config: SonarV3Config) =>\n  batch(async (paths: Set<string[]>) => {\n    const results = new Map<string[], Result<CatalogObject, HttpError | Problem>>();\n\n    // Because the key is a reference type (array), we need to store the\n    // original path reference\n    const originalKeyRef = new Map<string, string[]>();\n    for (const key of paths) {\n      originalKeyRef.set(JSON.stringify(key), key);\n    }\n\n    if (paths.size === 1) {\n      const path = Array.from(paths).at(0)!;\n      return config\n        .sonarV3Request(`catalog/by-path/${path.map(encodeURIComponent).join(\"/\")}?maxChildren=0`)\n        .promise.then((result) => result.unwrap())\n        .then((res) => res.json())\n        .then((response) => {\n          results.set(\n            path,\n            Ok(catalogObjectFromEntity(config, baseRetrieveByPath(config))(response)),\n          );\n          return results;\n        })\n        .catch((e) => {\n          if (e instanceof HttpError) {\n            results.set(path, Err(e));\n          } else {\n            results.set(path, Err(unableToRetrieveProblem()));\n          }\n          return results;\n        });\n    }\n\n    const pathsArray = Array.from(paths);\n    const chunks = [];\n\n    while (pathsArray.length > 0) {\n      chunks.push(pathsArray.splice(0, Math.min(50, pathsArray.length)));\n    }\n\n    const catalogItems = await Promise.all(\n      chunks.map((chunk) =>\n        config\n          .sonarV3Request(`catalog/by-paths?maxChildren=0`, {\n            body: JSON.stringify(chunk),\n            headers: { \"Content-Type\": \"application/json\" },\n            method: \"POST\",\n          })\n          .promise.then((result) => result.unwrap())\n          .then((res) => res.json())\n          .then((response) => response.data),\n      ),\n    ).then((chunks) => chunks.flat());\n\n    for (const catalogItem of catalogItems) {\n      const resolved = catalogObjectFromEntity(config, baseRetrieveByPath(config))(catalogItem);\n      const originalKey = originalKeyRef.get(JSON.stringify(resolved.path));\n      if (originalKey) {\n        results.set(originalKey, Ok(resolved));\n      }\n    }\n\n    for (const path of paths) {\n      if (!results.has(path)) {\n        results.set(path, Err(unableToRetrieveProblem()));\n      }\n    }\n\n    return results;\n  });\n"]}

package/dist/oss/index.d.ts

@@ -1,6 +1,4 @@
-import { createRequest } from "../common/createRequest.ts";
 import type { Config } from "../common/Config.ts";
-import { Resources } from "./resources.ts";
 export declare const Dremio: (config: Config) => {
     _request: import("../common/Config.ts").RequestFn;
     _sonarResourceConfig: {
@@ -12,11 +10,11 @@ export declare const Dremio: (config: Config) => {
         } | undefined;
         origin: string;
         request: import("../common/Config.ts").RequestFn;
-        sonarV2Request: (path: string, init: RequestInit | undefined) => Promise<Response>;
-        sonarV3Request: (path: string, init: RequestInit | undefined) => Promise<Response>;
+        sonarV2Request: (path: string, init: RequestInit | undefined) => import("ts-results-es").AsyncResult<Response, import("../common/HttpError.ts").HttpError>;
+        sonarV3Request: (path: string, init: RequestInit | undefined) => import("ts-results-es").AsyncResult<Response, import("../common/HttpError.ts").HttpError>;
     };
-    _sonarV2Request: (path: string, init: RequestInit | undefined) => Promise<Response>;
-    _sonarV3Request: (path: string, init: RequestInit | undefined) => Promise<Response>;
+    _sonarV2Request: (path: string, init: RequestInit | undefined) => import("ts-results-es").AsyncResult<Response, import("../common/HttpError.ts").HttpError>;
+    _sonarV3Request: (path: string, init: RequestInit | undefined) => import("ts-results-es").AsyncResult<Response, import("../common/HttpError.ts").HttpError>;
     catalog: import("./catalog/CatalogResource.ts").CatalogResource;
     jobs: import("./jobs/JobsResource.ts").JobsResource;
     scripts: import("./scripts/ScriptsResource.ts").ScriptsResource;
@@ -25,4 +23,3 @@ export declare const Dremio: (config: Config) => {
 export * from "../common/sharedExports.ts";
 export * from "./credentials/index.ts";
 export * from "./interfaces.ts";
-export { createRequest, Resources as _Resources };

package/dist/oss/index.js

@@ -38,5 +38,4 @@ export const Dremio = (config) => {
 export * from "../common/sharedExports.js";
 export * from "./credentials/index.js";
 export * from "./interfaces.js";
-export { createRequest, Resources as _Resources };
 //# sourceMappingURL=index.js.map

package/dist/oss/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/oss/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO;QACP,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,IAAI,CAAC;QAC/D,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,IAAI,CAAC;KACR,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE;IACvC,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO;QACL,GAAG,SAAS,CAAC,mBAAmB,CAAC;QACjC,QAAQ,EAAE,mBAAmB,CAAC,OAAO;QACrC,oBAAoB,EAAE,mBAAmB;QACzC,eAAe,EAAE,mBAAmB,CAAC,cAAc;QACnD,eAAe,EAAE,mBAAmB,CAAC,cAAc;KACpD,CAAC;AACJ,CAAC,CAAC;AAEF,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,SAAS,IAAI,UAAU,EAAE,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 { createRequest } from \"../common/createRequest.ts\";\nimport type { Config, ResourceConfig, SonarV2Config, SonarV3Config } from \"../common/Config.ts\";\nimport { Resources } from \"./resources.ts\";\n\nconst getSonarResourceConfig = (config: Config) => {\n  const request = createRequest(config);\n  return {\n    logger: config.logger,\n    origin: config.origin,\n    request,\n    sonarV2Request: (path, init) => request(`/apiv2/${path}`, init),\n    sonarV3Request: (path, init) => request(`/api/v3/${path}`, init),\n  } satisfies ResourceConfig & SonarV2Config & SonarV3Config;\n};\n\nexport const Dremio = (config: Config) => {\n  const sonarResourceConfig = getSonarResourceConfig(config);\n  return {\n    ...Resources(sonarResourceConfig),\n    _request: sonarResourceConfig.request,\n    _sonarResourceConfig: sonarResourceConfig,\n    _sonarV2Request: sonarResourceConfig.sonarV2Request,\n    _sonarV3Request: sonarResourceConfig.sonarV3Request,\n  };\n};\n\nexport * from \"../common/sharedExports.ts\";\nexport * from \"./credentials/index.ts\";\nexport * from \"./interfaces.ts\";\nexport { createRequest, Resources as _Resources };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/oss/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO;QACP,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,IAAI,CAAC;QAC/D,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,IAAI,CAAC;KACR,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE;IACvC,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO;QACL,GAAG,SAAS,CAAC,mBAAmB,CAAC;QACjC,QAAQ,EAAE,mBAAmB,CAAC,OAAO;QACrC,oBAAoB,EAAE,mBAAmB;QACzC,eAAe,EAAE,mBAAmB,CAAC,cAAc;QACnD,eAAe,EAAE,mBAAmB,CAAC,cAAc;KACpD,CAAC;AACJ,CAAC,CAAC;AAEF,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,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 { createRequest } from \"../common/createRequest.ts\";\nimport type { Config, ResourceConfig, SonarV2Config, SonarV3Config } from \"../common/Config.ts\";\nimport { Resources } from \"./resources.ts\";\n\nconst getSonarResourceConfig = (config: Config) => {\n  const request = createRequest(config);\n  return {\n    logger: config.logger,\n    origin: config.origin,\n    request,\n    sonarV2Request: (path, init) => request(`/apiv2/${path}`, init),\n    sonarV3Request: (path, init) => request(`/api/v3/${path}`, init),\n  } satisfies ResourceConfig & SonarV2Config & SonarV3Config;\n};\n\nexport const Dremio = (config: Config) => {\n  const sonarResourceConfig = getSonarResourceConfig(config);\n  return {\n    ...Resources(sonarResourceConfig),\n    _request: sonarResourceConfig.request,\n    _sonarResourceConfig: sonarResourceConfig,\n    _sonarV2Request: sonarResourceConfig.sonarV2Request,\n    _sonarV3Request: sonarResourceConfig.sonarV3Request,\n  };\n};\n\nexport * from \"../common/sharedExports.ts\";\nexport * from \"./credentials/index.ts\";\nexport * from \"./interfaces.ts\";\n"]}

package/dist/oss/jobs/Job.d.ts

@@ -32,15 +32,15 @@ export declare class Job {
             };
             readonly totalRows: number;
         }, void, unknown>;
-        metadata: ({ signal }?: SignalParam) => Promise<Err<unknown> | Ok<{
+        metadata: ({ signal }?: SignalParam) => Promise<Result<{
             schema: import("./utils/JobResultsResponse.ts").JobResultsSchema<string>;
             totalRows: number;
-        }>>;
+        }, import("../index.ts").HttpError>>;
         slice: <T extends Record<string, unknown> = Record<string, unknown>>(start?: number, end?: number, { signal }?: SignalParam) => Promise<Err<unknown> | Ok<T[]>>;
     };
     /**
      * @returns A `Job` instance once it's reached a settled state
      */
     retrieveSettled(): Promise<Job>;
-    cancel(): Promise<Err<any> | Ok<undefined>>;
+    cancel(): Promise<Result<undefined, import("../index.ts").HttpError>>;
 }

package/dist/oss/jobs/Job.js

@@ -103,9 +103,9 @@ export class Job {
         while (hasMore && offset < stopAfterOffset) {
             // Make batch_size dynamic to allow for requesting a smaller final page
             const batch_size = Math.min(MAX_BATCH_SIZE, stopAfterOffset - offset);
-            const batch = await this.#config
+            const batch = (await this.#config
                 .sonarV3Request(`job/${this.id}/results?offset=${offset}&limit=${batch_size}`, { signal })
-                .then((res) => res.json());
+                .map((res) => res.json()).promise).unwrap();
             offset += batch.rows.length;
             hasMore = batch.rows.length === batch_size;
             if (batch.rows.length) {
@@ -125,12 +125,11 @@ export class Job {
     async #metadata({ signal } = {}) {
         return this.#config
             .sonarV3Request(`job/${this.id}/results?offset=0&limit=0`, { signal })
-            .then((res) => res.json())
-            .then((response) => Ok({
+            .map((res) => res.json())
+            .map((response) => ({
             schema: response.schema,
             totalRows: response.rowCount,
-        }))
-            .catch((e) => Err(e));
+        })).promise;
     }
     async #slice(start = 0, end = Infinity, { signal } = {}) {
         try {
@@ -144,14 +143,13 @@ export class Job {
             return Err(e);
         }
     }
-    async cancel() {
+    cancel() {
         return this.#config
             .sonarV3Request(`job/${this.id}/cancel`, {
             keepalive: true,
             method: "POST",
         })
-            .then(() => Ok(undefined))
-            .catch((e) => Err(e));
+            .map(() => undefined).promise;
     }
 }
 const MAX_BATCH_SIZE = 500;

package/dist/oss/jobs/Job.js.map

@@ -1 +1 @@
-{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../../src/oss/jobs/Job.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 { SonarV3Config } from \"../../common/Config.ts\";\nimport { Err, Ok, Result } from \"ts-results-es\";\nimport { lastValueFrom, map, of, switchMap, type Observable } from \"rxjs\";\nimport type { JobResultsResponse } from \"./utils/JobResultsResponse.ts\";\nimport { mapRowsToColumns } from \"./utils/mapRowsToColumns.ts\";\nimport { mapRowData } from \"./utils/mapRowData.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport type { JobProperties } from \"./utils/jobEntityToProperties.ts\";\n\nexport class Job {\n  readonly acceleration: JobProperties[\"acceleration\"];\n  readonly cancellationReason: JobProperties[\"cancellationReason\"];\n  readonly errorMessage?: string;\n  readonly endedAt: JobProperties[\"endedAt\"];\n  readonly id: JobProperties[\"id\"];\n  readonly problem: JobProperties[\"problem\"];\n  readonly queryType: JobProperties[\"queryType\"];\n  readonly resourceSchedulingEndedAt: JobProperties[\"resourceSchedulingEndedAt\"];\n  readonly resourceSchedulingStartedAt: JobProperties[\"resourceSchedulingStartedAt\"];\n  readonly rowCount: JobProperties[\"rowCount\"];\n  readonly startedAt: JobProperties[\"startedAt\"];\n  readonly state: JobProperties[\"state\"];\n\n  public readonly observer: Observable<Job>;\n  #config: SonarV3Config;\n\n  constructor(\n    properties: JobProperties,\n    config: SonarV3Config,\n    observe: (id: string) => Observable<Result<Job, unknown>>,\n  ) {\n    this.acceleration = properties.acceleration;\n    this.cancellationReason = properties.cancellationReason;\n    this.endedAt = properties.endedAt;\n    this.id = properties.id;\n    this.problem = properties.problem;\n    this.queryType = properties.queryType;\n    this.resourceSchedulingEndedAt = properties.resourceSchedulingEndedAt;\n    this.resourceSchedulingStartedAt = properties.resourceSchedulingStartedAt;\n    this.rowCount = properties.rowCount;\n    this.startedAt = properties.startedAt;\n    this.state = properties.state;\n    this.#config = config;\n    this.observer = of(this).pipe(\n      switchMap((job) => {\n        if (!job.settled) {\n          return observe(this.id).pipe(\n            map((result) => {\n              if (result.isErr()) {\n                throw result.error;\n              }\n              return result.value;\n            }),\n          );\n        } else {\n          return of(job);\n        }\n      }),\n    );\n\n    if (properties.errorMessage) {\n      this.errorMessage = properties.errorMessage;\n    }\n  }\n\n  get settled() {\n    return (\n      this.state === \"COMPLETED\" ||\n      this.state === \"FAILED\" ||\n      this.state === \"INVALID_STATE\" ||\n      this.state === \"CANCELED\"\n    );\n  }\n\n  get results() {\n    return {\n      jsonBatches: this.#jsonBatches.bind(this),\n      metadata: this.#metadata.bind(this),\n      slice: this.#slice.bind(this),\n    };\n  }\n\n  /**\n   * @returns A `Job` instance once it's reached a settled state\n   */\n  retrieveSettled() {\n    return lastValueFrom(this.observer);\n  }\n\n  async *#jsonBatches<T extends Record<string, unknown> = Record<string, unknown>>(\n    args: { limit?: number; offset?: number } = {},\n    { signal }: SignalParam = {},\n  ) {\n    if (typeof args.limit === \"number\" && args.limit < 0) {\n      throw new Error(\"Limit cannot be negative\");\n    }\n\n    if (typeof args.offset === \"number\" && args.offset < 0) {\n      throw new Error(\"Offset cannot be negative\");\n    }\n\n    // Wait for job to enter a settled state before attempting to fetch batches\n    if (!this.settled) {\n      await this.retrieveSettled();\n    }\n\n    const limitArg = args.limit ?? Infinity;\n    const offsetArg = args.offset || 0;\n\n    // Tracks whether there are more rows available from the job results endpoint\n    let hasMore = true;\n\n    // Tracks the currently requested offset. If the offset arg is provided, start from there instead of 0.\n    let offset = offsetArg;\n\n    // Keeps track of the total number of rows that need to be loaded\n    const stopAfterOffset = limitArg + offsetArg;\n\n    while (hasMore && offset < stopAfterOffset) {\n      // Make batch_size dynamic to allow for requesting a smaller final page\n      const batch_size = Math.min(MAX_BATCH_SIZE, stopAfterOffset - offset);\n\n      const batch = await this.#config\n        .sonarV3Request(`job/${this.id}/results?offset=${offset}&limit=${batch_size}`, { signal })\n        .then((res) => res.json() as Promise<JobResultsResponse<T>>);\n\n      offset += batch.rows.length;\n      hasMore = batch.rows.length === batch_size;\n\n      if (batch.rows.length) {\n        const schema = { fields: batch.schema };\n        mapRowData(batch.rows, batch.schema);\n        yield {\n          get columns() {\n            return mapRowsToColumns(batch);\n          },\n          rows: batch.rows,\n          schema,\n          totalRows: batch.rowCount,\n        } as const;\n      }\n    }\n  }\n\n  async #metadata({ signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`job/${this.id}/results?offset=0&limit=0`, { signal })\n      .then((res) => res.json() as Promise<JobResultsResponse>)\n      .then((response) =>\n        Ok({\n          schema: response.schema,\n          totalRows: response.rowCount,\n        }),\n      )\n      .catch((e: unknown) => Err(e));\n  }\n\n  async #slice<T extends Record<string, unknown> = Record<string, unknown>>(\n    start: number = 0,\n    end: number = Infinity,\n    { signal }: SignalParam = {},\n  ) {\n    try {\n      const rows: T[] = [];\n      for await (const batch of this.#jsonBatches<T>(\n        { limit: end - start, offset: start },\n        { signal },\n      )) {\n        rows.push(...batch.rows);\n      }\n      return Ok(rows);\n    } catch (e: unknown) {\n      return Err(e);\n    }\n  }\n\n  async cancel() {\n    return this.#config\n      .sonarV3Request(`job/${this.id}/cancel`, {\n        keepalive: true,\n        method: \"POST\",\n      })\n      .then(() => Ok(undefined))\n      .catch((e) => Err(e));\n  }\n}\n\nconst MAX_BATCH_SIZE = 500;\n"]}
+{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../../src/oss/jobs/Job.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 { SonarV3Config } from \"../../common/Config.ts\";\nimport { Err, Ok, Result } from \"ts-results-es\";\nimport { lastValueFrom, map, of, switchMap, type Observable } from \"rxjs\";\nimport type { JobResultsResponse } from \"./utils/JobResultsResponse.ts\";\nimport { mapRowsToColumns } from \"./utils/mapRowsToColumns.ts\";\nimport { mapRowData } from \"./utils/mapRowData.ts\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport type { JobProperties } from \"./utils/jobEntityToProperties.ts\";\n\nexport class Job {\n  readonly acceleration: JobProperties[\"acceleration\"];\n  readonly cancellationReason: JobProperties[\"cancellationReason\"];\n  readonly errorMessage?: string;\n  readonly endedAt: JobProperties[\"endedAt\"];\n  readonly id: JobProperties[\"id\"];\n  readonly problem: JobProperties[\"problem\"];\n  readonly queryType: JobProperties[\"queryType\"];\n  readonly resourceSchedulingEndedAt: JobProperties[\"resourceSchedulingEndedAt\"];\n  readonly resourceSchedulingStartedAt: JobProperties[\"resourceSchedulingStartedAt\"];\n  readonly rowCount: JobProperties[\"rowCount\"];\n  readonly startedAt: JobProperties[\"startedAt\"];\n  readonly state: JobProperties[\"state\"];\n\n  public readonly observer: Observable<Job>;\n  #config: SonarV3Config;\n\n  constructor(\n    properties: JobProperties,\n    config: SonarV3Config,\n    observe: (id: string) => Observable<Result<Job, unknown>>,\n  ) {\n    this.acceleration = properties.acceleration;\n    this.cancellationReason = properties.cancellationReason;\n    this.endedAt = properties.endedAt;\n    this.id = properties.id;\n    this.problem = properties.problem;\n    this.queryType = properties.queryType;\n    this.resourceSchedulingEndedAt = properties.resourceSchedulingEndedAt;\n    this.resourceSchedulingStartedAt = properties.resourceSchedulingStartedAt;\n    this.rowCount = properties.rowCount;\n    this.startedAt = properties.startedAt;\n    this.state = properties.state;\n    this.#config = config;\n    this.observer = of(this).pipe(\n      switchMap((job) => {\n        if (!job.settled) {\n          return observe(this.id).pipe(\n            map((result) => {\n              if (result.isErr()) {\n                throw result.error;\n              }\n              return result.value;\n            }),\n          );\n        } else {\n          return of(job);\n        }\n      }),\n    );\n\n    if (properties.errorMessage) {\n      this.errorMessage = properties.errorMessage;\n    }\n  }\n\n  get settled() {\n    return (\n      this.state === \"COMPLETED\" ||\n      this.state === \"FAILED\" ||\n      this.state === \"INVALID_STATE\" ||\n      this.state === \"CANCELED\"\n    );\n  }\n\n  get results() {\n    return {\n      jsonBatches: this.#jsonBatches.bind(this),\n      metadata: this.#metadata.bind(this),\n      slice: this.#slice.bind(this),\n    };\n  }\n\n  /**\n   * @returns A `Job` instance once it's reached a settled state\n   */\n  retrieveSettled() {\n    return lastValueFrom(this.observer);\n  }\n\n  async *#jsonBatches<T extends Record<string, unknown> = Record<string, unknown>>(\n    args: { limit?: number; offset?: number } = {},\n    { signal }: SignalParam = {},\n  ) {\n    if (typeof args.limit === \"number\" && args.limit < 0) {\n      throw new Error(\"Limit cannot be negative\");\n    }\n\n    if (typeof args.offset === \"number\" && args.offset < 0) {\n      throw new Error(\"Offset cannot be negative\");\n    }\n\n    // Wait for job to enter a settled state before attempting to fetch batches\n    if (!this.settled) {\n      await this.retrieveSettled();\n    }\n\n    const limitArg = args.limit ?? Infinity;\n    const offsetArg = args.offset || 0;\n\n    // Tracks whether there are more rows available from the job results endpoint\n    let hasMore = true;\n\n    // Tracks the currently requested offset. If the offset arg is provided, start from there instead of 0.\n    let offset = offsetArg;\n\n    // Keeps track of the total number of rows that need to be loaded\n    const stopAfterOffset = limitArg + offsetArg;\n\n    while (hasMore && offset < stopAfterOffset) {\n      // Make batch_size dynamic to allow for requesting a smaller final page\n      const batch_size = Math.min(MAX_BATCH_SIZE, stopAfterOffset - offset);\n\n      const batch = (\n        await this.#config\n          .sonarV3Request(`job/${this.id}/results?offset=${offset}&limit=${batch_size}`, { signal })\n          .map((res) => res.json() as Promise<JobResultsResponse<T>>).promise\n      ).unwrap();\n\n      offset += batch.rows.length;\n      hasMore = batch.rows.length === batch_size;\n\n      if (batch.rows.length) {\n        const schema = { fields: batch.schema };\n        mapRowData(batch.rows, batch.schema);\n        yield {\n          get columns() {\n            return mapRowsToColumns(batch);\n          },\n          rows: batch.rows,\n          schema,\n          totalRows: batch.rowCount,\n        } as const;\n      }\n    }\n  }\n\n  async #metadata({ signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`job/${this.id}/results?offset=0&limit=0`, { signal })\n      .map((res) => res.json() as Promise<JobResultsResponse>)\n      .map((response) => ({\n        schema: response.schema,\n        totalRows: response.rowCount,\n      })).promise;\n  }\n\n  async #slice<T extends Record<string, unknown> = Record<string, unknown>>(\n    start: number = 0,\n    end: number = Infinity,\n    { signal }: SignalParam = {},\n  ) {\n    try {\n      const rows: T[] = [];\n      for await (const batch of this.#jsonBatches<T>(\n        { limit: end - start, offset: start },\n        { signal },\n      )) {\n        rows.push(...batch.rows);\n      }\n      return Ok(rows);\n    } catch (e: unknown) {\n      return Err(e);\n    }\n  }\n\n  cancel() {\n    return this.#config\n      .sonarV3Request(`job/${this.id}/cancel`, {\n        keepalive: true,\n        method: \"POST\",\n      })\n      .map(() => undefined).promise;\n  }\n}\n\nconst MAX_BATCH_SIZE = 500;\n"]}

package/dist/oss/jobs/JobsResource.d.ts

@@ -1,18 +1,17 @@
 import type { SonarV3Config } from "../../common/Config.ts";
 import { Job } from "./Job.ts";
 import { Query } from "../../common/Query.ts";
-import { Err, Ok } from "ts-results-es";
 import type { SignalParam } from "../../common/Params.ts";
 import { type JobEntity } from "./utils/jobEntityToProperties.ts";
 export declare class JobsResource {
     #private;
     constructor(config: SonarV3Config);
     _jobFromEntity(id: string, entity: JobEntity): Job;
-    create(query: Query): Promise<Err<unknown> | Ok<string>>;
+    create(query: Query): Promise<import("ts-results-es").Result<string, import("../index.ts").HttpError>>;
     /**
      * A convenience method to combine job creation and retrieval
      */
-    createAndRetrieve(query: Query): Promise<import("ts-results-es").Result<Job, unknown>>;
-    observe(id: string): import("rxjs").Observable<Err<unknown> | Ok<Job>>;
-    retrieve(id: string, { signal }?: SignalParam): Promise<Err<unknown> | Ok<Job>>;
+    createAndRetrieve(query: Query): Promise<import("ts-results-es").Result<Job, import("../index.ts").HttpError>>;
+    observe(id: string): import("rxjs").Observable<import("ts-results-es").Result<Job, import("../index.ts").HttpError>>;
+    retrieve(id: string, { signal }?: SignalParam): Promise<import("ts-results-es").Result<Job, import("../index.ts").HttpError>>;
 }

package/dist/oss/jobs/JobsResource.js

@@ -15,7 +15,7 @@
  */
 import { Job } from "./Job.js";
 import { Query } from "../../common/Query.js";
-import { Err, Ok, AsyncResult } from "ts-results-es";
+import { AsyncResult } from "ts-results-es";
 import { concatMap, shareReplay, takeWhile, timer } from "rxjs";
 import { fromAbortable } from "../../common/fromAbortable.js";
 import { jobEntityToProperties } from "./utils/jobEntityToProperties.js";
@@ -41,9 +41,8 @@ export class JobsResource {
             keepalive: true,
             method: "POST",
         })
-            .then((res) => res.json())
-            .then((response) => Ok(response.id))
-            .catch((e) => Err(e));
+            .map((response) => response.json())
+            .map((response) => response.id).promise;
     }
     /**
      * A convenience method to combine job creation and retrieval
@@ -79,9 +78,8 @@ export class JobsResource {
     retrieve(id, { signal } = {}) {
         return this.#config
             .sonarV3Request(`job/${id}`, { signal })
-            .then((res) => res.json())
-            .then((entity) => Ok(this._jobFromEntity(id, entity)))
-            .catch((e) => Err(e));
+            .map((res) => res.json())
+            .map((entity) => this._jobFromEntity(id, entity)).promise;
     }
 }
 //# sourceMappingURL=JobsResource.js.map

package/dist/oss/jobs/JobsResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"JobsResource.js","sourceRoot":"","sources":["../../../src/oss/jobs/JobsResource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAkB,MAAM,kCAAkC,CAAC;AAEzF,MAAM,OAAO,YAAY;IACvB,OAAO,CAAgB;IAEvB,YAAY,MAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,EAAU,EAAE,MAAiB;QAC1C,OAAO,IAAI,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,CAAC,KAAY;QACjB,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,KAAK,EAAE;YACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;YACF,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,MAAM;SACf,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAA6B,CAAC;aACpD,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACnC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAY;QAC5B,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9F,CAAC;IAED,OAAO,CAAC,EAAU;QAChB;;;WAGG;QACH,OAAO,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI;QACxB;;;;WAIG;QACH,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7E;;WAEG;QACH,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5E;;;WAGG;QACH,WAAW,CAAC;YACV,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,IAAI;SACf,CAAC,CACH,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,EAAU,EAAE,EAAE,MAAM,KAAkB,EAAE;QAC/C,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACvC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAwB,CAAC;aAC/C,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;aACrD,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 type { SonarV3Config } from \"../../common/Config.ts\";\nimport { Job } from \"./Job.ts\";\nimport { Query } from \"../../common/Query.ts\";\nimport { Err, Ok, AsyncResult } from \"ts-results-es\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { concatMap, shareReplay, takeWhile, timer } from \"rxjs\";\nimport { fromAbortable } from \"../../common/fromAbortable.ts\";\nimport { jobEntityToProperties, type JobEntity } from \"./utils/jobEntityToProperties.ts\";\n\nexport class JobsResource {\n  #config: SonarV3Config;\n\n  constructor(config: SonarV3Config) {\n    this.#config = config;\n  }\n\n  _jobFromEntity(id: string, entity: JobEntity): Job {\n    return new Job(jobEntityToProperties(id, entity), this.#config, this.observe.bind(this));\n  }\n\n  create(query: Query) {\n    return this.#config\n      .sonarV3Request(`sql`, {\n        body: JSON.stringify({\n          context: query.context,\n          sql: query.sql,\n        }),\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\",\n        },\n        keepalive: true,\n        method: \"POST\",\n      })\n      .then((res) => res.json() as Promise<{ id: string }>)\n      .then((response) => Ok(response.id))\n      .catch((e: unknown) => Err(e));\n  }\n\n  /**\n   * A convenience method to combine job creation and retrieval\n   */\n  createAndRetrieve(query: Query) {\n    return new AsyncResult(this.create(query)).andThen((jobId) => this.retrieve(jobId)).promise;\n  }\n\n  observe(id: string) {\n    /**\n     * Check every 1000ms for job status changes. 1000ms may seem too frequent,\n     * but it helps keep the client feeling snappy, especially for jobs that complete quickly.\n     */\n    return timer(0, 1000).pipe(\n      /**\n       * Use `concatMap` instead of `switchMap` to avoid a situation where the call takes longer than\n       * 1000ms (possibly due to network conditions or API slowdowns) which would cause switchMap to\n       * constantly cancel unfinished requests (in which case, no requests would ever complete)\n       */\n      concatMap(() => fromAbortable(({ signal }) => this.retrieve(id, { signal }))),\n      /**\n       * Continue polling until the job has reached a settled state\n       */\n      takeWhile((jobResult) => jobResult.isOk() && !jobResult.value.settled, true),\n      /**\n       * Reuse the same polling for multiple subscribers, buffering only the latest result.\n       * Make sure to unsubscribe from the source to stop polling when there are no subscribers (refCount: true)\n       */\n      shareReplay({\n        bufferSize: 1,\n        refCount: true,\n      }),\n    );\n  }\n\n  retrieve(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`job/${id}`, { signal })\n      .then((res) => res.json() as Promise<JobEntity>)\n      .then((entity) => Ok(this._jobFromEntity(id, entity)))\n      .catch((e: unknown) => Err(e));\n  }\n}\n"]}
+{"version":3,"file":"JobsResource.js","sourceRoot":"","sources":["../../../src/oss/jobs/JobsResource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAkB,MAAM,kCAAkC,CAAC;AAEzF,MAAM,OAAO,YAAY;IACvB,OAAO,CAAgB;IAEvB,YAAY,MAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,EAAU,EAAE,MAAiB;QAC1C,OAAO,IAAI,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,CAAC,KAAY;QACjB,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,KAAK,EAAE;YACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;YACF,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,MAAM;SACf,CAAC;aACD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAA6B,CAAC;aAC7D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAY;QAC5B,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9F,CAAC;IAED,OAAO,CAAC,EAAU;QAChB;;;WAGG;QACH,OAAO,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI;QACxB;;;;WAIG;QACH,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7E;;WAEG;QACH,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC;QAC5E;;;WAGG;QACH,WAAW,CAAC;YACV,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,IAAI;SACf,CAAC,CACH,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,EAAU,EAAE,EAAE,MAAM,KAAkB,EAAE;QAC/C,OAAO,IAAI,CAAC,OAAO;aAChB,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACvC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAwB,CAAC;aAC9C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,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 type { SonarV3Config } from \"../../common/Config.ts\";\nimport { Job } from \"./Job.ts\";\nimport { Query } from \"../../common/Query.ts\";\nimport { AsyncResult } from \"ts-results-es\";\nimport type { SignalParam } from \"../../common/Params.ts\";\nimport { concatMap, shareReplay, takeWhile, timer } from \"rxjs\";\nimport { fromAbortable } from \"../../common/fromAbortable.ts\";\nimport { jobEntityToProperties, type JobEntity } from \"./utils/jobEntityToProperties.ts\";\n\nexport class JobsResource {\n  #config: SonarV3Config;\n\n  constructor(config: SonarV3Config) {\n    this.#config = config;\n  }\n\n  _jobFromEntity(id: string, entity: JobEntity): Job {\n    return new Job(jobEntityToProperties(id, entity), this.#config, this.observe.bind(this));\n  }\n\n  create(query: Query) {\n    return this.#config\n      .sonarV3Request(`sql`, {\n        body: JSON.stringify({\n          context: query.context,\n          sql: query.sql,\n        }),\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\",\n        },\n        keepalive: true,\n        method: \"POST\",\n      })\n      .map((response) => response.json() as Promise<{ id: string }>)\n      .map((response) => response.id).promise;\n  }\n\n  /**\n   * A convenience method to combine job creation and retrieval\n   */\n  createAndRetrieve(query: Query) {\n    return new AsyncResult(this.create(query)).andThen((jobId) => this.retrieve(jobId)).promise;\n  }\n\n  observe(id: string) {\n    /**\n     * Check every 1000ms for job status changes. 1000ms may seem too frequent,\n     * but it helps keep the client feeling snappy, especially for jobs that complete quickly.\n     */\n    return timer(0, 1000).pipe(\n      /**\n       * Use `concatMap` instead of `switchMap` to avoid a situation where the call takes longer than\n       * 1000ms (possibly due to network conditions or API slowdowns) which would cause switchMap to\n       * constantly cancel unfinished requests (in which case, no requests would ever complete)\n       */\n      concatMap(() => fromAbortable(({ signal }) => this.retrieve(id, { signal }))),\n      /**\n       * Continue polling until the job has reached a settled state\n       */\n      takeWhile((jobResult) => jobResult.isOk() && !jobResult.value.settled, true),\n      /**\n       * Reuse the same polling for multiple subscribers, buffering only the latest result.\n       * Make sure to unsubscribe from the source to stop polling when there are no subscribers (refCount: true)\n       */\n      shareReplay({\n        bufferSize: 1,\n        refCount: true,\n      }),\n    );\n  }\n\n  retrieve(id: string, { signal }: SignalParam = {}) {\n    return this.#config\n      .sonarV3Request(`job/${id}`, { signal })\n      .map((res) => res.json() as Promise<JobEntity>)\n      .map((entity) => this._jobFromEntity(id, entity)).promise;\n  }\n}\n"]}

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

@@ -1,4 +1,3 @@
-import { Err, Ok } from "ts-results-es";
 import { Query } from "../../common/Query.ts";
 import type { SonarV3Config } from "../../common/Config.ts";
 import { Temporal } from "temporal-polyfill";
@@ -12,17 +11,8 @@ export declare class Script {
     readonly name: ScriptProperties["name"];
     readonly query: ScriptProperties["query"];
     constructor(properties: ScriptProperties, config: SonarV3Config);
-    delete(): Promise<Err<unknown> | Ok<undefined>>;
-    save(properties: ScriptPatchableProperties): Promise<Err<{
-        readonly errors: [{
-            readonly detail: "A script with this name already exists";
-            readonly pointer: "#/name";
-            readonly type: "https://api.dremio.dev/problems/validation/field-conflict";
-            readonly value: string;
-        }];
-        readonly title: "There was a problem validating the content of the request";
-        readonly type: "https://api.dremio.dev/problems/validation-problem";
-    }> | Err<import("../index.ts").Problem> | Ok<Script>>;
+    delete(): Promise<import("ts-results-es").Result<void, import("../index.ts").HttpError>>;
+    save(properties: ScriptPatchableProperties): Promise<import("ts-results-es").Result<Script, import("../../common/Problem.ts").ValidationProblem | import("../index.ts").HttpError>>;
 }
 export declare const scriptEntityToProperties: (entity: ScriptEntity) => {
     createdAt: Temporal.Instant;
@@ -53,13 +43,4 @@ export declare const createScriptPatchedFields: (properties: ScriptPatchableProp
     content?: string;
     context?: string[];
 };
-export declare const saveScript: (id: string, config: SonarV3Config) => (body: Record<string, any>) => Promise<Ok<ScriptEntity> | Err<{
-    readonly errors: [{
-        readonly detail: "A script with this name already exists";
-        readonly pointer: "#/name";
-        readonly type: "https://api.dremio.dev/problems/validation/field-conflict";
-        readonly value: string;
-    }];
-    readonly title: "There was a problem validating the content of the request";
-    readonly type: "https://api.dremio.dev/problems/validation-problem";
-}> | Err<import("../index.ts").Problem>>;
+export declare const saveScript: (id: string, config: SonarV3Config) => (body: Record<string, any>) => import("ts-results-es").AsyncResult<ScriptEntity, import("../../common/Problem.ts").ValidationProblem | import("../index.ts").HttpError>;

package/dist/oss/scripts/Script.js

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Err, Ok } from "ts-results-es";
 import { Query } from "../../common/Query.js";
-import { HttpError } from "../../common/HttpError.js";
 import { duplicateScriptNameError } from "./ScriptErrors.js";
 import { Temporal } from "temporal-polyfill";
+import { Problem } from "../../common/Problem.js";
 export class Script {
     createdAt;
     createdBy;
@@ -37,17 +36,17 @@ export class Script {
         this.query = properties.query;
         this.#config = config;
     }
-    async delete() {
+    delete() {
         return this.#config
             .sonarV3Request(`scripts/${this.id}`, {
             keepalive: true,
             method: "DELETE",
         })
-            .then(() => Ok(undefined))
-            .catch((e) => Err(e));
+            .map(() => undefined).promise;
     }
-    async save(properties) {
-        return saveScript(this.id, this.#config)(properties).then((result) => result.map((value) => new Script(scriptEntityToProperties(value), this.#config)));
+    save(properties) {
+        return saveScript(this.id, this.#config)(properties).map((entity) => new Script(scriptEntityToProperties(entity), this.#config))
+            .promise;
     }
 }
 export const scriptEntityToProperties = (entity) => ({
@@ -80,16 +79,13 @@ export const saveScript = (id, config) => (body) => {
         keepalive: true,
         method: "PATCH",
     })
-        .then((res) => res.json())
-        .then((entity) => Ok(entity))
-        .catch((e) => {
-        if (e instanceof HttpError) {
-            if (e.body.detail?.includes("Cannot reuse the same script name")) {
-                return Err(duplicateScriptNameError(body["name"]));
-            }
-            return Err(e.body);
+        .map((response) => response.json())
+        .mapErr((err) => {
+        if (err.body instanceof Problem &&
+            err.body.detail?.includes("Cannot reuse the same script name")) {
+            return duplicateScriptNameError(body["name"]);
         }
-        throw e;
+        return err;
     });
 };
 //# sourceMappingURL=Script.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Script.js","sourceRoot":"","sources":["../../../src/oss/scripts/Script.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 { Err, Ok } from \"ts-results-es\";\nimport { Query } from \"../../common/Query.ts\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport { HttpError } from \"../../common/HttpError.ts\";\nimport { duplicateScriptNameError } from \"./ScriptErrors.ts\";\nimport { Temporal } from \"temporal-polyfill\";\n\nexport class Script {\n  readonly createdAt: ScriptProperties[\"createdAt\"];\n  readonly createdBy: ScriptProperties[\"createdBy\"];\n  readonly id: ScriptProperties[\"id\"];\n  readonly modifiedAt: ScriptProperties[\"modifiedAt\"];\n  readonly modifiedBy: ScriptProperties[\"modifiedBy\"];\n  readonly name: ScriptProperties[\"name\"];\n  readonly query: ScriptProperties[\"query\"];\n  #config: SonarV3Config;\n\n  constructor(properties: ScriptProperties, config: SonarV3Config) {\n    this.createdAt = properties.createdAt;\n    this.createdBy = properties.createdBy;\n    this.id = properties.id;\n    this.modifiedAt = properties.modifiedAt;\n    this.modifiedBy = properties.modifiedBy;\n    this.name = properties.name;\n    this.query = properties.query;\n    this.#config = config;\n  }\n\n  async delete() {\n    return this.#config\n      .sonarV3Request(`scripts/${this.id}`, {\n        keepalive: true,\n        method: \"DELETE\",\n      })\n      .then(() => Ok(undefined))\n      .catch((e: unknown) => Err(e));\n  }\n\n  async save(properties: ScriptPatchableProperties) {\n    return saveScript(\n      this.id,\n      this.#config,\n    )(properties).then((result) =>\n      result.map((value) => new Script(scriptEntityToProperties(value), this.#config)),\n    );\n  }\n}\n\nexport const scriptEntityToProperties = (entity: ScriptEntity) => ({\n  createdAt: Temporal.Instant.from(entity.createdAt),\n  createdBy: entity.createdBy,\n  id: entity.id,\n  modifiedAt: Temporal.Instant.from(entity.modifiedAt),\n  modifiedBy: entity.modifiedBy,\n  name: entity.name,\n  query: new Query(entity.content, entity.context),\n});\n\nexport type ScriptEntity = {\n  content: string;\n  context: string[];\n  createdAt: string;\n  createdBy: string;\n  id: string;\n  modifiedAt: string;\n  modifiedBy: string;\n  name: string;\n};\n\nexport type ScriptPatchableProperties = {\n  name?: ScriptProperties[\"name\"];\n  query?: ScriptProperties[\"query\"];\n};\n\nexport type ScriptProperties = ReturnType<typeof scriptEntityToProperties>;\n\nexport const createScriptPatchedFields = (properties: ScriptPatchableProperties) => {\n  const patchedFields = {} as {\n    name?: string;\n    content?: string;\n    context?: string[];\n  };\n  if (properties.name) {\n    patchedFields.name = properties.name;\n  }\n  if (properties.query) {\n    patchedFields.content = properties.query.sql;\n    patchedFields.context = properties.query.context;\n  }\n  return patchedFields;\n};\n\nexport const saveScript = (id: string, config: SonarV3Config) => (body: Record<string, any>) => {\n  return config\n    .sonarV3Request(`scripts/${id}`, {\n      body: JSON.stringify(body),\n      headers: {\n        \"Content-Type\": \"application/json\",\n      },\n      keepalive: true,\n      method: \"PATCH\",\n    })\n    .then((res) => res.json())\n    .then((entity: ScriptEntity) => Ok(entity))\n    .catch((e: unknown) => {\n      if (e instanceof HttpError) {\n        if (e.body.detail?.includes(\"Cannot reuse the same script name\")) {\n          return Err(duplicateScriptNameError(body[\"name\"]));\n        }\n        return Err(e.body);\n      }\n\n      throw e;\n    });\n};\n"]}
+{"version":3,"file":"Script.js","sourceRoot":"","sources":["../../../src/oss/scripts/Script.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 { Query } from \"../../common/Query.ts\";\nimport type { SonarV3Config } from \"../../common/Config.ts\";\nimport { duplicateScriptNameError } from \"./ScriptErrors.ts\";\nimport { Temporal } from \"temporal-polyfill\";\nimport { Problem } from \"../../common/Problem.ts\";\n\nexport class Script {\n  readonly createdAt: ScriptProperties[\"createdAt\"];\n  readonly createdBy: ScriptProperties[\"createdBy\"];\n  readonly id: ScriptProperties[\"id\"];\n  readonly modifiedAt: ScriptProperties[\"modifiedAt\"];\n  readonly modifiedBy: ScriptProperties[\"modifiedBy\"];\n  readonly name: ScriptProperties[\"name\"];\n  readonly query: ScriptProperties[\"query\"];\n  #config: SonarV3Config;\n\n  constructor(properties: ScriptProperties, config: SonarV3Config) {\n    this.createdAt = properties.createdAt;\n    this.createdBy = properties.createdBy;\n    this.id = properties.id;\n    this.modifiedAt = properties.modifiedAt;\n    this.modifiedBy = properties.modifiedBy;\n    this.name = properties.name;\n    this.query = properties.query;\n    this.#config = config;\n  }\n\n  delete() {\n    return this.#config\n      .sonarV3Request(`scripts/${this.id}`, {\n        keepalive: true,\n        method: \"DELETE\",\n      })\n      .map(() => undefined as void).promise;\n  }\n\n  save(properties: ScriptPatchableProperties) {\n    return saveScript(\n      this.id,\n      this.#config,\n    )(properties).map((entity) => new Script(scriptEntityToProperties(entity), this.#config))\n      .promise;\n  }\n}\n\nexport const scriptEntityToProperties = (entity: ScriptEntity) => ({\n  createdAt: Temporal.Instant.from(entity.createdAt),\n  createdBy: entity.createdBy,\n  id: entity.id,\n  modifiedAt: Temporal.Instant.from(entity.modifiedAt),\n  modifiedBy: entity.modifiedBy,\n  name: entity.name,\n  query: new Query(entity.content, entity.context),\n});\n\nexport type ScriptEntity = {\n  content: string;\n  context: string[];\n  createdAt: string;\n  createdBy: string;\n  id: string;\n  modifiedAt: string;\n  modifiedBy: string;\n  name: string;\n};\n\nexport type ScriptPatchableProperties = {\n  name?: ScriptProperties[\"name\"];\n  query?: ScriptProperties[\"query\"];\n};\n\nexport type ScriptProperties = ReturnType<typeof scriptEntityToProperties>;\n\nexport const createScriptPatchedFields = (properties: ScriptPatchableProperties) => {\n  const patchedFields = {} as {\n    name?: string;\n    content?: string;\n    context?: string[];\n  };\n  if (properties.name) {\n    patchedFields.name = properties.name;\n  }\n  if (properties.query) {\n    patchedFields.content = properties.query.sql;\n    patchedFields.context = properties.query.context;\n  }\n  return patchedFields;\n};\n\nexport const saveScript = (id: string, config: SonarV3Config) => (body: Record<string, any>) => {\n  return config\n    .sonarV3Request(`scripts/${id}`, {\n      body: JSON.stringify(body),\n      headers: {\n        \"Content-Type\": \"application/json\",\n      },\n      keepalive: true,\n      method: \"PATCH\",\n    })\n    .map((response) => response.json() as Promise<ScriptEntity>)\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(body[\"name\"]);\n      }\n      return err;\n    });\n};\n"]}

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

@@ -1,19 +1,7 @@
-export declare const scriptNotFoundError: (id: string) => {
-    readonly meta: {
-        readonly provided: {
-            readonly id: string;
-        };
+import { Problem, ValidationProblem } from "../../common/Problem.js";
+export declare const scriptNotFoundError: (id: string) => Problem<"https://api.dremio.dev/problems/scripts/not-found", {
+    provided: {
+        id: string;
     };
-    readonly title: "The script could not be found or you do not have permission to view it";
-    readonly type: "https://api.dremio.dev/problems/scripts/not-found";
-};
-export declare const duplicateScriptNameError: (name: string) => {
-    readonly errors: [{
-        readonly detail: "A script with this name already exists";
-        readonly pointer: "#/name";
-        readonly type: "https://api.dremio.dev/problems/validation/field-conflict";
-        readonly value: string;
-    }];
-    readonly title: "There was a problem validating the content of the request";
-    readonly type: "https://api.dremio.dev/problems/validation-problem";
-};
+}>;
+export declare const duplicateScriptNameError: (name: string) => ValidationProblem;