@intuned/browser-dev 2.2.3-unify-sdks.23 → 2.2.3-unify-sdks.24

package/dist/ai/export.d.ts

@@ -1,15 +1,14 @@
 import { Locator, Page } from "playwright-core";
 import { JSONSchema7TypeName } from "json-schema";
-
 /**
  * Base schema interface that all JSON schema types extend from.
  * Provides common properties like type and description.
  *
- * @interface BaseSchema
+ * @interface BasicSchema
  */
-export interface BaseSchema {
+export interface BasicSchema {
   /** The JSON schema type(s) for this schema definition */
-  type: JSONSchema7TypeName | JSONSchema7TypeName[];
+  type: "string" | "number" | "integer" | "boolean" | "array" | "object";
   /** Optional description of what this schema represents */
   description?: string;
 }
@@ -18,7 +17,7 @@ export interface BaseSchema {
  * Schema definition for string values with validation constraints.
  *
  * @interface StringSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const nameSchema: StringSchema = {
@@ -30,7 +29,7 @@ export interface BaseSchema {
  * };
  * ```
  */
-export interface StringSchema extends BaseSchema {
+export interface StringSchema extends BasicSchema {
   /** Must be "string" for string schemas */
   type: "string";
   /** Array of allowed string values (enumeration) */
@@ -47,7 +46,7 @@ export interface StringSchema extends BaseSchema {
  * Schema definition for numeric values (numbers and integers) with validation constraints.
  *
  * @interface NumberSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const ageSchema: NumberSchema = {
@@ -58,7 +57,7 @@ export interface StringSchema extends BaseSchema {
  * };
  * ```
  */
-export interface NumberSchema extends BaseSchema {
+export interface NumberSchema extends BasicSchema {
   /** Must be "number" or "integer" for numeric schemas */
   type: "number" | "integer";
   /** Number must be a multiple of this value */
@@ -77,7 +76,7 @@ export interface NumberSchema extends BaseSchema {
  * Schema definition for boolean values.
  *
  * @interface BooleanSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const isActiveSchema: BooleanSchema = {
@@ -86,7 +85,7 @@ export interface NumberSchema extends BaseSchema {
  * };
  * ```
  */
-export interface BooleanSchema extends BaseSchema {
+export interface BooleanSchema extends BasicSchema {
   /** Must be "boolean" for boolean schemas */
   type: "boolean";
 }
@@ -95,7 +94,7 @@ export interface BooleanSchema extends BaseSchema {
  * Schema definition for array values with item validation and constraints.
  *
  * @interface ArraySchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const tagsSchema: ArraySchema = {
@@ -108,11 +107,11 @@ export interface BooleanSchema extends BaseSchema {
  * };
  * ```
  */
-export interface ArraySchema extends BaseSchema {
+export interface ArraySchema extends BasicSchema {
   /** Must be "array" for array schemas */
   type: "array";
   /** Schema definition for array items */
-  items: JSONSchema;
+  items: JsonSchema;
   /** Maximum number of items allowed */
   maxItems?: number;
   /** Minimum number of items required */
@@ -125,7 +124,7 @@ export interface ArraySchema extends BaseSchema {
  * Schema definition for object values with property validation and constraints.
  *
  * @interface ObjectSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const userSchema: ObjectSchema = {
@@ -140,11 +139,11 @@ export interface ArraySchema extends BaseSchema {
  * };
  * ```
  */
-export interface ObjectSchema extends BaseSchema {
+export interface ObjectSchema extends BasicSchema {
   /** Must be "object" for object schemas */
   type: "object";
   /** Schema definitions for object properties */
-  properties: { [key: string]: JSONSchema };
+  properties: Record<string, JsonSchema>;
   /** Array of required property names */
   required?: string[];
   /** Maximum number of properties allowed */
@@ -152,6 +151,7 @@ export interface ObjectSchema extends BaseSchema {
   /** Minimum number of properties required */
   minProperties?: number;
 }
+
 /**
  * Extract structured data from web pages using AI-powered content analysis.
  *
@@ -163,7 +163,7 @@ export interface ObjectSchema extends BaseSchema {
  * @param {Page | Locator} [options.source] - Playwright Page object to extract data from the entire page or Locator object to extract data from a specific element
  * @param {SUPPORTED_MODELS} [options.model] - AI model to use for extraction (e.g., "gpt-4", "claude-3"), see [SUPPORTED_MODELS](../type-aliases/SUPPORTED_MODELS) for all supported models.
  * @param {string} [options.strategy] - Type of extraction: "HTML", "IMAGE", or "MARKDOWN"
- * @param {JSONSchema} options.dataSchema - [JSONSchema](../interfaces/JSONSchema) defining the structure of the data to extract
+ * @param {JsonSchema} options.dataSchema - [JsonSchema](../interfaces/JsonSchema) defining the structure of the data to extract
  * @param {string} [options.prompt] - Optional prompt to guide the extraction process and provide more context
  * @param {string} [options.apiKey] - Optional API key for AI extraction (if provided, will not be billed to your account)s
  * @param {boolean} [options.enableDomMatching=false] - Whether to disable DOM element matching during extraction. Defaults to False. When set to false, all types in the schema must be strings to match with the DOM elements. The extracted resultes will be matched with the DOM elements and returned, then will be cached in a smart fashion so that the next time the same data is extracted, the result will be returned from the cache even if the DOM has minor changes.
@@ -267,7 +267,7 @@ export interface ObjectSchema extends BaseSchema {
  */
 export declare function extractStructuredData(options: {
   source: Page | Locator;
-  dataSchema: JSONSchema;
+  dataSchema: JsonSchema;
   prompt?: string;
   strategy?: "IMAGE" | "MARKDOWN" | "HTML";
   model?: SUPPORTED_MODELS;
@@ -369,10 +369,10 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  * - ArraySchema: For array validation with item constraints
  * - ObjectSchema: For object validation with property constraints
  *
- * @type JSONSchema
+ * @type JsonSchema
  * @example
  * ```typescript String Schema
- * const stringSchema: JSONSchema = {
+ * const stringSchema: JsonSchema = {
  *   type: "string",
  *   minLength: 3,
  *   maxLength: 50,
@@ -382,7 +382,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Number Schema
- * const numberSchema: JSONSchema = {
+ * const numberSchema: JsonSchema = {
  *   type: "number",
  *   minimum: 0,
  *   maximum: 100,
@@ -392,7 +392,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Array Schema
- * const arraySchema: JSONSchema = {
+ * const arraySchema: JsonSchema = {
  *   type: "array",
  *   items: {
  *     type: "string"
@@ -405,7 +405,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Object Schema
- * const objectSchema: JSONSchema = {
+ * const objectSchema: JsonSchema = {
  *   type: "object",
  *   properties: {
  *     name: { type: "string" },
@@ -664,11 +664,9 @@ export declare function isPageLoaded(
  * LoadingStatus is a union of true, false, and "Dont know".
  */
 export type LoadingStatus = true | false | "Dont know";
-
-export type JSONSchema =
+export type JsonSchema =
   | StringSchema
   | NumberSchema
   | BooleanSchema
   | ArraySchema
-  | ObjectSchema
-  | BaseSchema;
+  | ObjectSchema;

package/dist/ai/extractStructuredDataUsingAi.js

@@ -19,7 +19,7 @@ var _ai = require("ai");
 var _loadRuntime = require("../common/loadRuntime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function extractStructuredDataUsingAi(page, input) {
-  var _getExecutionContext, _getExecutionContext2, _getExecutionContext3, _result$usage6;
+  var _getExecutionContext, _getExecutionContext2, _getExecutionContext3;
   const {
     apiKey,
     enableDomMatching,
@@ -54,7 +54,6 @@ async function extractStructuredDataUsingAi(page, input) {
   let result;
   while (currentRetry < maxRetries) {
     try {
-      var _result$usage, _result$usage4;
       result = await (0, _ai.generateText)({
         model: gatewayModel,
         messages: messagesHistory,
@@ -63,7 +62,12 @@ async function extractStructuredDataUsingAi(page, input) {
         maxRetries,
         headers
       });
-      accumulatedTokens += ((_result$usage = result.usage) === null || _result$usage === void 0 ? void 0 : _result$usage.totalTokens) ?? 0;
+      if (!apiKey) {
+        accumulatedTokens += result.response.headers["x-ai-cost-in-cents"];
+      } else {
+        var _result$usage;
+        accumulatedTokens += ((_result$usage = result.usage) === null || _result$usage === void 0 ? void 0 : _result$usage.totalTokens) ?? 0;
+      }
       const toolCall = result.toolCalls[0] ?? null;
       let extractedData = toolCall.input;
       const isArray = jsonSchema.type === "array";
@@ -94,8 +98,11 @@ async function extractStructuredDataUsingAi(page, input) {
         continue;
       }
       if (!enableDomMatching) {
-        var _result$usage2;
-        _Logger.logger.info(`Total LLM Tokens: ${(_result$usage2 = result.usage) === null || _result$usage2 === void 0 ? void 0 : _result$usage2.totalTokens}`);
+        if (!apiKey) {
+          _Logger.logger.info(`Total LLM Cost: ${accumulatedTokens}`);
+        } else {
+          _Logger.logger.info(`Total LLM Tokens: ${accumulatedTokens}`);
+        }
         return (0, _neverthrow.ok)({
           result: extractedData,
           xpathMapping: {}
@@ -105,8 +112,11 @@ async function extractStructuredDataUsingAi(page, input) {
         dataStructure: extractedData
       });
       if (!stringsToMatch || stringsToMatch.length === 0) {
-        var _result$usage3;
-        _Logger.logger.info(`Total LLM Tokens: ${(_result$usage3 = result.usage) === null || _result$usage3 === void 0 ? void 0 : _result$usage3.totalTokens}`);
+        if (!apiKey) {
+          _Logger.logger.info(`Total LLM Cost: ${accumulatedTokens}`);
+        } else {
+          _Logger.logger.info(`Total LLM Tokens: ${accumulatedTokens}`);
+        }
         return (0, _neverthrow.ok)({
           result: [],
           xpathMapping: {}
@@ -124,21 +134,32 @@ async function extractStructuredDataUsingAi(page, input) {
         stringReplacements[key] = (value === null || value === void 0 ? void 0 : value.matchText) || null;
       });
       const matchesData = await (0, _validateSchema.recursivelyReplaceStrings)(extractedData, stringReplacements);
-      _Logger.logger.info(`Total LLM Tokens: ${(_result$usage4 = result.usage) === null || _result$usage4 === void 0 ? void 0 : _result$usage4.totalTokens}`);
+      if (!apiKey) {
+        _Logger.logger.info(`Total LLM Cost: ${accumulatedTokens}`);
+      } else {
+        _Logger.logger.info(`Total LLM Tokens: ${accumulatedTokens}`);
+      }
       return (0, _neverthrow.ok)({
         result: matchesData,
         xpathMapping
       });
     } catch (error) {
-      var _result$usage5;
       _Logger.logger.error("Error during AI extraction", {
         error,
         model
       });
-      _Logger.logger.info(`Total LLM Tokens: ${(_result$usage5 = result.usage) === null || _result$usage5 === void 0 ? void 0 : _result$usage5.totalTokens}`);
+      if (!apiKey) {
+        _Logger.logger.info(`Total LLM Cost: ${accumulatedTokens}`);
+      } else {
+        _Logger.logger.info(`Total LLM Tokens: ${accumulatedTokens}`);
+      }
       return (0, _neverthrow.err)(Errors.invalidExtractionResult(error instanceof Error ? error.message : "Unknown error during extraction"));
     }
   }
-  _Logger.logger.info(`Total LLM Tokens: ${(_result$usage6 = result.usage) === null || _result$usage6 === void 0 ? void 0 : _result$usage6.totalTokens}`);
+  if (!apiKey) {
+    _Logger.logger.info(`Total LLM Cost: ${accumulatedTokens}`);
+  } else {
+    _Logger.logger.info(`Total LLM Tokens: ${accumulatedTokens}`);
+  }
   return (0, _neverthrow.err)(Errors.maxRetriesExceeded(`Max retries of ${maxRetries} exceeded for extraction`));
 }

package/dist/ai/index.d.ts

@@ -1,15 +1,14 @@
 import { Locator, Page } from "playwright-core";
 import { JSONSchema7TypeName } from "json-schema";
-
 /**
  * Base schema interface that all JSON schema types extend from.
  * Provides common properties like type and description.
  *
- * @interface BaseSchema
+ * @interface BasicSchema
  */
-export interface BaseSchema {
+export interface BasicSchema {
   /** The JSON schema type(s) for this schema definition */
-  type: JSONSchema7TypeName | JSONSchema7TypeName[];
+  type: "string" | "number" | "integer" | "boolean" | "array" | "object";
   /** Optional description of what this schema represents */
   description?: string;
 }
@@ -18,7 +17,7 @@ export interface BaseSchema {
  * Schema definition for string values with validation constraints.
  *
  * @interface StringSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const nameSchema: StringSchema = {
@@ -30,7 +29,7 @@ export interface BaseSchema {
  * };
  * ```
  */
-export interface StringSchema extends BaseSchema {
+export interface StringSchema extends BasicSchema {
   /** Must be "string" for string schemas */
   type: "string";
   /** Array of allowed string values (enumeration) */
@@ -47,7 +46,7 @@ export interface StringSchema extends BaseSchema {
  * Schema definition for numeric values (numbers and integers) with validation constraints.
  *
  * @interface NumberSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const ageSchema: NumberSchema = {
@@ -58,7 +57,7 @@ export interface StringSchema extends BaseSchema {
  * };
  * ```
  */
-export interface NumberSchema extends BaseSchema {
+export interface NumberSchema extends BasicSchema {
   /** Must be "number" or "integer" for numeric schemas */
   type: "number" | "integer";
   /** Number must be a multiple of this value */
@@ -77,7 +76,7 @@ export interface NumberSchema extends BaseSchema {
  * Schema definition for boolean values.
  *
  * @interface BooleanSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const isActiveSchema: BooleanSchema = {
@@ -86,7 +85,7 @@ export interface NumberSchema extends BaseSchema {
  * };
  * ```
  */
-export interface BooleanSchema extends BaseSchema {
+export interface BooleanSchema extends BasicSchema {
   /** Must be "boolean" for boolean schemas */
   type: "boolean";
 }
@@ -95,7 +94,7 @@ export interface BooleanSchema extends BaseSchema {
  * Schema definition for array values with item validation and constraints.
  *
  * @interface ArraySchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const tagsSchema: ArraySchema = {
@@ -108,11 +107,11 @@ export interface BooleanSchema extends BaseSchema {
  * };
  * ```
  */
-export interface ArraySchema extends BaseSchema {
+export interface ArraySchema extends BasicSchema {
   /** Must be "array" for array schemas */
   type: "array";
   /** Schema definition for array items */
-  items: JSONSchema;
+  items: JsonSchema;
   /** Maximum number of items allowed */
   maxItems?: number;
   /** Minimum number of items required */
@@ -125,7 +124,7 @@ export interface ArraySchema extends BaseSchema {
  * Schema definition for object values with property validation and constraints.
  *
  * @interface ObjectSchema
- * @extends BaseSchema
+ * @extends BasicSchema
  * @example
  * ```typescript
  * const userSchema: ObjectSchema = {
@@ -140,11 +139,11 @@ export interface ArraySchema extends BaseSchema {
  * };
  * ```
  */
-export interface ObjectSchema extends BaseSchema {
+export interface ObjectSchema extends BasicSchema {
   /** Must be "object" for object schemas */
   type: "object";
   /** Schema definitions for object properties */
-  properties: { [key: string]: JSONSchema };
+  properties: Record<string, JsonSchema>;
   /** Array of required property names */
   required?: string[];
   /** Maximum number of properties allowed */
@@ -152,6 +151,7 @@ export interface ObjectSchema extends BaseSchema {
   /** Minimum number of properties required */
   minProperties?: number;
 }
+
 /**
  * Extract structured data from web pages using AI-powered content analysis.
  *
@@ -163,7 +163,7 @@ export interface ObjectSchema extends BaseSchema {
  * @param {Page | Locator} [options.source] - Playwright Page object to extract data from the entire page or Locator object to extract data from a specific element
  * @param {SUPPORTED_MODELS} [options.model] - AI model to use for extraction (e.g., "gpt-4", "claude-3"), see [SUPPORTED_MODELS](../type-aliases/SUPPORTED_MODELS) for all supported models.
  * @param {string} [options.strategy] - Type of extraction: "HTML", "IMAGE", or "MARKDOWN"
- * @param {JSONSchema} options.dataSchema - [JSONSchema](../interfaces/JSONSchema) defining the structure of the data to extract
+ * @param {JsonSchema} options.dataSchema - [JsonSchema](../interfaces/JsonSchema) defining the structure of the data to extract
  * @param {string} [options.prompt] - Optional prompt to guide the extraction process and provide more context
  * @param {string} [options.apiKey] - Optional API key for AI extraction (if provided, will not be billed to your account)s
  * @param {boolean} [options.enableDomMatching=false] - Whether to disable DOM element matching during extraction. Defaults to False. When set to false, all types in the schema must be strings to match with the DOM elements. The extracted resultes will be matched with the DOM elements and returned, then will be cached in a smart fashion so that the next time the same data is extracted, the result will be returned from the cache even if the DOM has minor changes.
@@ -267,7 +267,7 @@ export interface ObjectSchema extends BaseSchema {
  */
 export declare function extractStructuredData(options: {
   source: Page | Locator;
-  dataSchema: JSONSchema;
+  dataSchema: JsonSchema;
   prompt?: string;
   strategy?: "IMAGE" | "MARKDOWN" | "HTML";
   model?: SUPPORTED_MODELS;
@@ -369,10 +369,10 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  * - ArraySchema: For array validation with item constraints
  * - ObjectSchema: For object validation with property constraints
  *
- * @type JSONSchema
+ * @type JsonSchema
  * @example
  * ```typescript String Schema
- * const stringSchema: JSONSchema = {
+ * const stringSchema: JsonSchema = {
  *   type: "string",
  *   minLength: 3,
  *   maxLength: 50,
@@ -382,7 +382,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Number Schema
- * const numberSchema: JSONSchema = {
+ * const numberSchema: JsonSchema = {
  *   type: "number",
  *   minimum: 0,
  *   maximum: 100,
@@ -392,7 +392,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Array Schema
- * const arraySchema: JSONSchema = {
+ * const arraySchema: JsonSchema = {
  *   type: "array",
  *   items: {
  *     type: "string"
@@ -405,7 +405,7 @@ type SUPPORTED_MODELS = SUPPORTED_CLAUDE_MODELS | SUPPORTED_OPENAI_MODELS;
  *
  * @example
  * ```typescript Object Schema
- * const objectSchema: JSONSchema = {
+ * const objectSchema: JsonSchema = {
  *   type: "object",
  *   properties: {
  *     name: { type: "string" },
@@ -664,11 +664,9 @@ export declare function isPageLoaded(
  * LoadingStatus is a union of true, false, and "Dont know".
  */
 export type LoadingStatus = true | false | "Dont know";
-
-export type JSONSchema =
+export type JsonSchema =
   | StringSchema
   | NumberSchema
   | BooleanSchema
   | ArraySchema
-  | ObjectSchema
-  | BaseSchema;
+  | ObjectSchema;

package/dist/ai/tests/testCheckAllTypesAreStrings.spec.js

@@ -33,19 +33,13 @@ var _validators = require("../validators");
     };
     (0, _extendedTest.expect)((0, _validators.checkAllTypesAreStrings)(schema)).toBe(true);
   });
-  (0, _extendedTest.test)("should return false for array of mixed types", async () => {
+  (0, _extendedTest.test)("should return true for array with no items constraint", async () => {
     const schema = {
       type: "array",
       items: {
-        type: "number"
+        type: "string"
       }
     };
-    (0, _extendedTest.expect)((0, _validators.checkAllTypesAreStrings)(schema)).toBe(false);
-  });
-  (0, _extendedTest.test)("should return true for array with no items constraint", async () => {
-    const schema = {
-      type: "array"
-    };
     (0, _extendedTest.expect)((0, _validators.checkAllTypesAreStrings)(schema)).toBe(true);
   });
   (0, _extendedTest.test)("should return true for object with all string properties", async () => {
@@ -80,7 +74,9 @@ var _validators = require("../validators");
   });
   (0, _extendedTest.test)("should return true for object with no properties", async () => {
     const schema = {
-      type: "object"
+      type: "object",
+      properties: {},
+      required: []
     };
     (0, _extendedTest.expect)((0, _validators.checkAllTypesAreStrings)(schema)).toBe(true);
   });

package/dist/ai/tests/testExtractStructuredData.spec.js

@@ -173,11 +173,10 @@ const userProfileTemplate = `
               required: ["title", "price", "stock"]
             }
           },
-          prompt: getPromptVariation(sharedPrompts.htmlStrategy),
+          prompt: "extract product information including title, price, stock status, and rating pls",
           enableDomMatching: true,
           strategy: "HTML",
-          model: "claude-3-5-sonnet-20240620",
-          apiKey: process.env.ANTHROPIC_API_KEY
+          model: "o4-mini"
         });
         (0, _extendedTest.expect)(Array.isArray(data)).toBe(true);
         (0, _extendedTest.expect)(data.length).toBe(3);

package/dist/ai/types/types.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "ArraySchema", {
     return _export.ArraySchema;
   }
 });
-Object.defineProperty(exports, "BaseSchema", {
+Object.defineProperty(exports, "BasicSchema", {
   enumerable: true,
   get: function () {
-    return _export.BaseSchema;
+    return _export.BasicSchema;
   }
 });
 Object.defineProperty(exports, "BooleanSchema", {
@@ -21,10 +21,10 @@ Object.defineProperty(exports, "BooleanSchema", {
     return _export.BooleanSchema;
   }
 });
-Object.defineProperty(exports, "JSONSchema", {
+Object.defineProperty(exports, "JsonSchema", {
   enumerable: true,
   get: function () {
-    return _export.JSONSchema;
+    return _export.JsonSchema;
   }
 });
 Object.defineProperty(exports, "NumberSchema", {

package/dist/ai/validators.js

@@ -118,21 +118,19 @@ function checkAllTypesAreStrings(schema) {
     return true;
   }
   if (schema.type === "array") {
-    const arraySchema = schema;
-    if (!arraySchema.items) {
+    if (!schema.items) {
       return true;
     }
-    if (Array.isArray(arraySchema.items)) {
-      return arraySchema.items.every(item => checkAllTypesAreStrings(item));
+    if (Array.isArray(schema.items)) {
+      return schema.items.every(item => checkAllTypesAreStrings(item));
     }
-    return checkAllTypesAreStrings(arraySchema.items);
+    return checkAllTypesAreStrings(schema.items);
   }
   if (schema.type === "object") {
-    const objectSchema = schema;
-    if (!objectSchema.properties) {
+    if (!schema.properties) {
       return true;
     }
-    return Object.values(objectSchema.properties).every(prop => checkAllTypesAreStrings(prop));
+    return Object.values(schema.properties).every(prop => checkAllTypesAreStrings(prop));
   }
   return false;
 }

package/dist/helpers/export.d.ts

@@ -1023,7 +1023,7 @@ export type Trigger = string | Locator | ((page: Page) => Promise<void>);
  * const attachment = await uploadFileToS3(file, { s3Configs: s3Config });
  *
  * // Use with download operations
- * const downloadedFile = await downloadFromPageToS3(page, url, { s3Configs: s3Config });
+ * const downloadedFile = await saveFileToS3(page, url, { s3Configs: s3Config });
  * ```
  */
 export interface S3Configs {
@@ -1090,73 +1090,6 @@ export interface S3UploadOptions {
  */
 export type S3UploadableFile = Download | Uint8Array | Buffer | ReadStream;
 
-/**
- * Downloads a file from a web page and uploads it to S3 storage.
- * This function supports three different ways to trigger a download:
- *     - By URL
- *     - By clicking on a Playwright locator
- *     - By executing a callback function that takes a Playwright page as an argument and uses it to initiate the download.
- * @param {Page} page - The Playwright Page object.
- * @param {Trigger} trigger - [Trigger](../type-aliases/Trigger) to use for downloading the file.
- * @param {number} [timeoutInMs] - The timeout in milliseconds for the download operation. Default = 5000
- * @param {S3UploadOptions} uploadOptions - [S3UploadOptions](../interfaces/S3UploadOptions) for uploading the file to S3.
- * @returns {Promise<Attachment>} A promise that resolves to an [Attachment](../interfaces/Attachment) object containing the uploaded file's details.
- *
- * @example
- * ```typescript URL Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- *
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *     region: 'us-west-1',
- *      }
- * };
- * const uploadedFile = await downloadFromPageToS3(page, "https://sandbox.intuned.dev/pdfs", uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- *
- * @example
- * ```typescript Locator Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *     region: 'us-west-1',
- *   }
- * };
- * const uploadedFile = await downloadFromPageToS3(page, page.locator("[href='/download/file.pdf']"), uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- *
- * @example
- * ```typescript Callback Function Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *   region: 'us-west-1',
- * }
- *  };
- * const uploadedFile = await downloadFromPageToS3(page, async (page) => {
- *   await page.locator("button:has-text('Download')").click();
- * }, uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- * @note
- * - If a URL is provided as the trigger, a new page will be created and closed after the download is complete.
- * - If a locator is provided as the trigger, the page will be used to click the element and initiate the download.
- * - If a callback function is provided as the trigger, the function will be called with the page object as an argument and will be responsible for initiating the download.
- */
-export declare function downloadFromPageToS3(
-  page: Page,
-  trigger: Trigger,
-  uploadOptions: S3UploadOptions,
-  timeoutInMs?: number
-): Promise<Attachment>;
 /**
  * Downloads a file from a web page and uploads it to S3 storage.
  * This function supports three different ways to trigger a download:

package/dist/helpers/index.d.ts

@@ -1023,7 +1023,7 @@ export type Trigger = string | Locator | ((page: Page) => Promise<void>);
  * const attachment = await uploadFileToS3(file, { s3Configs: s3Config });
  *
  * // Use with download operations
- * const downloadedFile = await downloadFromPageToS3(page, url, { s3Configs: s3Config });
+ * const downloadedFile = await saveFileToS3(page, url, { s3Configs: s3Config });
  * ```
  */
 export interface S3Configs {
@@ -1090,73 +1090,6 @@ export interface S3UploadOptions {
  */
 export type S3UploadableFile = Download | Uint8Array | Buffer | ReadStream;
 
-/**
- * Downloads a file from a web page and uploads it to S3 storage.
- * This function supports three different ways to trigger a download:
- *     - By URL
- *     - By clicking on a Playwright locator
- *     - By executing a callback function that takes a Playwright page as an argument and uses it to initiate the download.
- * @param {Page} page - The Playwright Page object.
- * @param {Trigger} trigger - [Trigger](../type-aliases/Trigger) to use for downloading the file.
- * @param {number} [timeoutInMs] - The timeout in milliseconds for the download operation. Default = 5000
- * @param {S3UploadOptions} uploadOptions - [S3UploadOptions](../interfaces/S3UploadOptions) for uploading the file to S3.
- * @returns {Promise<Attachment>} A promise that resolves to an [Attachment](../interfaces/Attachment) object containing the uploaded file's details.
- *
- * @example
- * ```typescript URL Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- *
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *     region: 'us-west-1',
- *      }
- * };
- * const uploadedFile = await downloadFromPageToS3(page, "https://sandbox.intuned.dev/pdfs", uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- *
- * @example
- * ```typescript Locator Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *     region: 'us-west-1',
- *   }
- * };
- * const uploadedFile = await downloadFromPageToS3(page, page.locator("[href='/download/file.pdf']"), uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- *
- * @example
- * ```typescript Callback Function Download and Upload
- * import { downloadFromPageToS3 } from "@intuned/browser";
- * import { S3UploadOptions } from "@intuned/sdk/types";
- * const uploadOptions: S3UploadOptions = {
- *   s3Configs: {
- *     bucket: 'my-bucket',
- *   region: 'us-west-1',
- * }
- *  };
- * const uploadedFile = await downloadFromPageToS3(page, async (page) => {
- *   await page.locator("button:has-text('Download')").click();
- * }, uploadOptions);
- * console.log(uploadedFile.getS3Key());
- * ```
- * @note
- * - If a URL is provided as the trigger, a new page will be created and closed after the download is complete.
- * - If a locator is provided as the trigger, the page will be used to click the element and initiate the download.
- * - If a callback function is provided as the trigger, the function will be called with the page object as an argument and will be responsible for initiating the download.
- */
-export declare function downloadFromPageToS3(
-  page: Page,
-  trigger: Trigger,
-  uploadOptions: S3UploadOptions,
-  timeoutInMs?: number
-): Promise<Attachment>;
 /**
  * Downloads a file from a web page and uploads it to S3 storage.
  * This function supports three different ways to trigger a download:

package/dist/helpers/waitForNetworkIdle.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.waitForNetworkIdle = waitForNetworkIdle;
 var _locatorHelpers = require("../common/locatorHelpers");
+var _Logger = require("../common/Logger");
 function waitForNetworkIdle(funcOrOptions) {
   if (funcOrOptions && typeof funcOrOptions === "object" && "page" in funcOrOptions) {
     const {
@@ -151,7 +152,7 @@ async function waitForNetworkIdleCore({
   const timeoutPromise = new Promise(resolve => {
     setTimeout(() => {
       var _networkSettledResolv2;
-      console.log("waiting for network to settle timed out");
+      _Logger.logger.info("waiting for network to settle timed out");
       isTimeout = true;
       (_networkSettledResolv2 = networkSettledResolve) === null || _networkSettledResolv2 === void 0 || _networkSettledResolv2();
       resolve();
@@ -162,17 +163,17 @@ async function waitForNetworkIdleCore({
     actionDone = true;
     await new Promise(resolve => setTimeout(resolve, 500));
     await maybeSettle();
-    console.log("-- Start waiting for network to settle... --");
+    _Logger.logger.info("-- Start waiting for network to settle... --");
     let shouldContinue = true;
     while (shouldContinue) {
-      console.log(`waiting for network to settle, ${requestCounter} requests pending`);
+      _Logger.logger.info(`waiting for network to settle, ${requestCounter} requests pending`);
       await Promise.race([networkSettledPromise, timeoutPromise]);
       await new Promise(resolve => setTimeout(resolve, 500));
       if (actionDone && requestCounter <= maxInflightRequests || isTimeout) {
         if (isTimeout) {
-          console.log("Exiting due to timeout, network did not settle");
+          _Logger.logger.info("Exiting due to timeout, network did not settle");
         } else {
-          console.log("network settled, no pending requests");
+          _Logger.logger.info("network settled, no pending requests");
         }
         shouldContinue = false;
       } else {
@@ -181,7 +182,7 @@ async function waitForNetworkIdleCore({
         });
       }
     }
-    console.log("-- Finished waiting for network to settle --");
+    _Logger.logger.info("-- Finished waiting for network to settle --");
     return result;
   } finally {
     page.off("request", onRequest);

package/dist/index.d.js

@@ -3,80 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "downloadFile", {
-  enumerable: true,
-  get: function () {
-    return _downloadFile.downloadFile;
-  }
-});
-Object.defineProperty(exports, "filterEmptyValues", {
-  enumerable: true,
-  get: function () {
-    return _filterEmptyValues.filterEmptyValues;
-  }
-});
-Object.defineProperty(exports, "goToUrl", {
-  enumerable: true,
-  get: function () {
-    return _gotoUrl.goToUrl;
-  }
-});
-Object.defineProperty(exports, "processDate", {
-  enumerable: true,
-  get: function () {
-    return _processDate.processDate;
-  }
-});
-Object.defineProperty(exports, "resolveUrl", {
-  enumerable: true,
-  get: function () {
-    return _resolveUrl.resolveUrl;
-  }
-});
-Object.defineProperty(exports, "sanitizeHtml", {
-  enumerable: true,
-  get: function () {
-    return _sanitizeHtml.sanitizeHtml;
-  }
-});
-Object.defineProperty(exports, "saveFileToS3", {
-  enumerable: true,
-  get: function () {
-    return _saveFileToS.saveFileToS3;
-  }
-});
-Object.defineProperty(exports, "uploadFileToS3", {
-  enumerable: true,
-  get: function () {
-    return _uploadFileToS.uploadFileToS3;
-  }
-});
-Object.defineProperty(exports, "validateDataUsingSchema", {
-  enumerable: true,
-  get: function () {
-    return _validateDataUsingSchema.validateDataUsingSchema;
-  }
-});
-Object.defineProperty(exports, "waitForDomSettled", {
-  enumerable: true,
-  get: function () {
-    return _waitForDomSettled.waitForDomSettled;
-  }
-});
-Object.defineProperty(exports, "waitForNetworkIdle", {
-  enumerable: true,
-  get: function () {
-    return _waitForNetworkIdle.waitForNetworkIdle;
-  }
-});
-var _sanitizeHtml = require("./helpers/sanitizeHtml");
-var _downloadFile = require("./helpers/downloadFile");
-var _saveFileToS = require("./helpers/saveFileToS3");
-var _filterEmptyValues = require("./helpers/filterEmptyValues");
-var _gotoUrl = require("./helpers/gotoUrl");
-var _processDate = require("./helpers/processDate");
-var _resolveUrl = require("./helpers/resolveUrl");
-var _uploadFileToS = require("./helpers/uploadFileToS3");
-var _validateDataUsingSchema = require("./helpers/validateDataUsingSchema");
-var _waitForDomSettled = require("./helpers/waitForDomSettled");
-var _waitForNetworkIdle = require("./helpers/waitForNetworkIdle");
+var _export = require("./helpers/export");
+Object.keys(_export).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _export[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _export[key];
+    }
+  });
+});

package/dist/index.d.ts

@@ -1,11 +1,13 @@
-export { sanitizeHtml } from "./helpers/sanitizeHtml";
-export { downloadFile } from "./helpers/downloadFile";
-export { saveFileToS3 } from "./helpers/saveFileToS3";
-export { filterEmptyValues } from "./helpers/filterEmptyValues";
-export { goToUrl } from "./helpers/gotoUrl";
-export { processDate } from "./helpers/processDate";
-export { resolveUrl } from "./helpers/resolveUrl";
-export { uploadFileToS3 } from "./helpers/uploadFileToS3";
-export { validateDataUsingSchema } from "./helpers/validateDataUsingSchema";
-export { waitForDomSettled } from "./helpers/waitForDomSettled";
-export { waitForNetworkIdle } from "./helpers/waitForNetworkIdle";
+export * from "./helpers/export";
+
+export type {
+  DataObject,
+  DataInput,
+  Attachment,
+  Trigger,
+  S3Configs,
+  S3UploadOptions,
+  S3UploadableFile,
+  AttachmentType,
+  SanitizeHtmlOptions,
+} from "./helpers/export";

package/dist/index.js

@@ -3,82 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "downloadFile", {
-  enumerable: true,
-  get: function () {
-    return _helpers.downloadFile;
-  }
-});
-Object.defineProperty(exports, "extractMarkdown", {
-  enumerable: true,
-  get: function () {
-    return _helpers.extractMarkdown;
-  }
-});
-Object.defineProperty(exports, "filterEmptyValues", {
-  enumerable: true,
-  get: function () {
-    return _helpers.filterEmptyValues;
-  }
-});
-Object.defineProperty(exports, "goToUrl", {
-  enumerable: true,
-  get: function () {
-    return _helpers.goToUrl;
-  }
-});
-Object.defineProperty(exports, "processDate", {
-  enumerable: true,
-  get: function () {
-    return _helpers.processDate;
-  }
-});
-Object.defineProperty(exports, "resolveUrl", {
-  enumerable: true,
-  get: function () {
-    return _helpers.resolveUrl;
-  }
-});
-Object.defineProperty(exports, "sanitizeHtml", {
-  enumerable: true,
-  get: function () {
-    return _helpers.sanitizeHtml;
-  }
-});
-Object.defineProperty(exports, "saveFileToS3", {
-  enumerable: true,
-  get: function () {
-    return _helpers.saveFileToS3;
-  }
-});
-Object.defineProperty(exports, "scrollToLoadContent", {
-  enumerable: true,
-  get: function () {
-    return _helpers.scrollToLoadContent;
-  }
-});
-Object.defineProperty(exports, "uploadFileToS3", {
-  enumerable: true,
-  get: function () {
-    return _helpers.uploadFileToS3;
-  }
-});
-Object.defineProperty(exports, "validateDataUsingSchema", {
-  enumerable: true,
-  get: function () {
-    return _helpers.validateDataUsingSchema;
-  }
-});
-Object.defineProperty(exports, "waitForDomSettled", {
-  enumerable: true,
-  get: function () {
-    return _helpers.waitForDomSettled;
-  }
-});
-Object.defineProperty(exports, "waitForNetworkIdle", {
-  enumerable: true,
-  get: function () {
-    return _helpers.waitForNetworkIdle;
-  }
-});
-var _helpers = require("./helpers");
+var _helpers = require("./helpers");
+Object.keys(_helpers).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _helpers[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _helpers[key];
+    }
+  });
+});

package/dist/intunedServices/ApiGateway/aiApiGateway.js

@@ -8,6 +8,8 @@ var _getModelProvider = require("../../common/getModelProvider");
 var _Anthropic = require("./providers/Anthropic");
 var _OpenAI = require("./providers/OpenAI");
 var _Gemini = require("./providers/Gemini");
+var _dotenv = require("dotenv");
+(0, _dotenv.config)();
 class APIGateway {
   constructor() {
     this.config = this.getDefaultConfig();
@@ -39,10 +41,20 @@ class APIGateway {
       apiKey,
       extraHeaders
     } = options;
-    if (apiKey) {
+    let apiKeyToUse = apiKey;
+    if (apiKey === undefined) {
+      if (model.toLowerCase().includes("anthropic")) {
+        apiKeyToUse = process.env.ANTHROPIC_API_KEY;
+      } else if (model.toLowerCase().includes("openai")) {
+        apiKeyToUse = process.env.OPENAI_API_KEY;
+      } else if (model.toLowerCase().includes("google")) {
+        apiKeyToUse = process.env.GOOGLE_API_KEY;
+      }
+    }
+    if (apiKeyToUse) {
       return {
         model,
-        apiKey,
+        apiKey: apiKeyToUse,
         extraHeaders,
         baseUrl: undefined
       };

package/dist/optimized-extractors/listExtractionHelpers/__tests__/dynamicListExtractor.spec.js

@@ -195,7 +195,7 @@ const booksTemplate = `
       (0, _extendedTest.expect)(fifthResult.isOk()).toBe(true);
       const appendedBooks = fifthResult._unsafeUnwrap();
       (0, _extendedTest.expect)(appendedBooks).toHaveLength(4);
-      console.log("All cache behavior tests completed successfully!");
+      _Logger.logger.info("All cache behavior tests completed successfully!");
       const outsideTemplate = appendedTemplate + `
         <div class="outside-books-list">
           <div class="book-page">
@@ -210,7 +210,7 @@ const booksTemplate = `
       (0, _extendedTest.expect)(sixthResult.isOk()).toBe(true);
       const outsideBooks = sixthResult._unsafeUnwrap();
       (0, _extendedTest.expect)(outsideBooks).toHaveLength(4);
-      console.log("All cache behavior tests completed successfully!");
+      _Logger.logger.info("All cache behavior tests completed successfully!");
     });
     (0, _extendedTest.test)("should handle cache size limit correctly", async ({
       page

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/browser-dev",
-  "version": "2.2.3-unify-sdks.23",
+  "version": "2.2.3-unify-sdks.24",
   "description": "runner package for intuned functions",
   "types": "./dist/index.d.ts",
   "typesVersions": {

package/dist/ai-extractors/jsonSchema.d.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

package/dist/ai-extractors/jsonSchema.d.ts

@@ -1,49 +0,0 @@
-export interface BasicSchema {
-  type: string;
-  description?: string;
-}
-
-export interface StringSchema extends BasicSchema {
-  type: "string";
-  enum?: string[];
-  maxLength?: number;
-  minLength?: number;
-  pattern?: string;
-}
-
-export interface NumberSchema extends BasicSchema {
-  type: "number" | "integer";
-  multipleOf?: number;
-  maximum?: number;
-  exclusiveMaximum?: number;
-  minimum?: number;
-  exclusiveMinimum?: number;
-}
-
-export interface BooleanSchema extends BasicSchema {
-  type: "boolean";
-}
-
-export interface ArraySchema extends BasicSchema {
-  type: "array";
-  items: JsonSchema;
-  maxItems?: number;
-  minItems?: number;
-  uniqueItems?: boolean;
-}
-
-export interface ObjectSchema extends BasicSchema {
-  type: "object";
-  properties: Record<string, JsonSchema>;
-  required?: string[];
-
-  maxProperties?: number;
-  minProperties?: number;
-}
-
-export type JsonSchema =
-  | StringSchema
-  | NumberSchema
-  | BooleanSchema
-  | ArraySchema
-  | ObjectSchema;