@google/gemini-cli-core 0.1.9-nightly.250708.a4097ae6 → 0.1.9-nightly.250709.c8cf954e

package/dist/src/utils/schemaValidator.js

@@ -3,48 +3,60 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as ajv from 'ajv';
+const ajValidator = new ajv.Ajv();
 /**
  * Simple utility to validate objects against JSON Schemas
  */
 export class SchemaValidator {
     /**
-     * Validates data against a JSON schema
-     * @param schema JSON Schema to validate against
-     * @param data Data to validate
-     * @returns True if valid, false otherwise
+     * Returns null if the data confroms to the schema described by schema (or if schema
+     *  is null). Otherwise, returns a string describing the error.
      */
     static validate(schema, data) {
-        // This is a simplified implementation
-        // In a real application, you would use a library like Ajv for proper validation
-        // Check for required fields
-        if (schema.required && Array.isArray(schema.required)) {
-            const required = schema.required;
-            const dataObj = data;
-            for (const field of required) {
-                if (dataObj[field] === undefined) {
-                    console.error(`Missing required field: ${field}`);
-                    return false;
-                }
-            }
+        if (!schema) {
+            return null;
+        }
+        if (typeof data !== 'object' || data === null) {
+            return 'Value of params must be an object';
+        }
+        const validate = ajValidator.compile(this.toObjectSchema(schema));
+        const valid = validate(data);
+        if (!valid && validate.errors) {
+            return ajValidator.errorsText(validate.errors, { dataVar: 'params' });
         }
-        // Check property types if properties are defined
-        if (schema.properties && typeof schema.properties === 'object') {
-            const properties = schema.properties;
-            const dataObj = data;
-            for (const [key, prop] of Object.entries(properties)) {
-                if (dataObj[key] !== undefined && prop.type) {
-                    const expectedType = prop.type;
-                    const actualType = Array.isArray(dataObj[key])
-                        ? 'array'
-                        : typeof dataObj[key];
-                    if (expectedType !== actualType) {
-                        console.error(`Type mismatch for property "${key}": expected ${expectedType}, got ${actualType}`);
-                        return false;
-                    }
-                }
+        return null;
+    }
+    /**
+     * Converts @google/genai's Schema to an object compatible with avj.
+     * This is necessry because it represents Types as an Enum (with
+     * UPPERCASE values) and minItems and minLength as strings, when they should be numbers.
+     */
+    static toObjectSchema(schema) {
+        const newSchema = { ...schema };
+        if (newSchema.anyOf && Array.isArray(newSchema.anyOf)) {
+            newSchema.anyOf = newSchema.anyOf.map((v) => this.toObjectSchema(v));
+        }
+        if (newSchema.items) {
+            newSchema.items = this.toObjectSchema(newSchema.items);
+        }
+        if (newSchema.properties && typeof newSchema.properties === 'object') {
+            const newProperties = {};
+            for (const [key, value] of Object.entries(newSchema.properties)) {
+                newProperties[key] = this.toObjectSchema(value);
             }
+            newSchema.properties = newProperties;
+        }
+        if (newSchema.type) {
+            newSchema.type = String(newSchema.type).toLowerCase();
+        }
+        if (newSchema.minItems) {
+            newSchema.minItems = Number(newSchema.minItems);
+        }
+        if (newSchema.minLength) {
+            newSchema.minLength = Number(newSchema.minLength);
         }
-        return true;
+        return newSchema;
     }
 }
 //# sourceMappingURL=schemaValidator.js.map

package/dist/src/utils/schemaValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaValidator.js","sourceRoot":"","sources":["../../../src/utils/schemaValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,MAA+B,EAAE,IAAa;QAC5D,sCAAsC;QACtC,gFAAgF;QAEhF,4BAA4B;QAC5B,IAAI,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAoB,CAAC;YAC7C,MAAM,OAAO,GAAG,IAA+B,CAAC;YAEhD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;oBACjC,OAAO,CAAC,KAAK,CAAC,2BAA2B,KAAK,EAAE,CAAC,CAAC;oBAClD,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,IAAI,MAAM,CAAC,UAAU,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,UAA+C,CAAC;YAC1E,MAAM,OAAO,GAAG,IAA+B,CAAC;YAEhD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrD,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;oBAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC5C,CAAC,CAAC,OAAO;wBACT,CAAC,CAAC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;oBAExB,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;wBAChC,OAAO,CAAC,KAAK,CACX,+BAA+B,GAAG,eAAe,YAAY,SAAS,UAAU,EAAE,CACnF,CAAC;wBACF,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"schemaValidator.js","sourceRoot":"","sources":["../../../src/utils/schemaValidator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;AAElC;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,MAA0B,EAAE,IAAa;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC9C,OAAO,mCAAmC,CAAC;QAC7C,CAAC;QACD,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,cAAc,CAAC,MAAc;QAC1C,MAAM,SAAS,GAA4B,EAAE,GAAG,MAAM,EAAE,CAAC;QACzD,IAAI,SAAS,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;YACpB,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,SAAS,CAAC,UAAU,IAAI,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YACrE,MAAM,aAAa,GAA4B,EAAE,CAAC;YAClD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChE,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,KAAe,CAAC,CAAC;YAC5D,CAAC;YACD,SAAS,CAAC,UAAU,GAAG,aAAa,CAAC;QACvC,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;YACnB,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,CAAC;QACD,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;YACxB,SAAS,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}