@google/adk 0.6.0 → 0.6.1

package/dist/web/utils/gemini_schema_util.js

@@ -1,3 +1,34 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -26,22 +57,50 @@ function toGeminiType(mcpType) {
       return Type.ARRAY;
     case "object":
       return Type.OBJECT;
+    case "null":
+      return Type.NULL;
     default:
       return Type.TYPE_UNSPECIFIED;
   }
 }
+const getTypeFromArrayItem = (mcpType) => {
+  var _a, _b;
+  if (typeof mcpType === "string") {
+    return mcpType.toLowerCase();
+  }
+  return (_b = (_a = mcpType == null ? void 0 : mcpType.type) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+};
 function toGeminiSchema(mcpSchema) {
   if (!mcpSchema) {
     return void 0;
   }
   function recursiveConvert(mcp) {
-    if (!mcp.type && mcp.anyOf && Array.isArray(mcp.anyOf)) {
-      const nonNullOption = mcp.anyOf.find((opt) => {
-        const t = opt.type;
-        return t !== "null" && t !== "NULL";
-      });
-      if (nonNullOption) {
-        mcp = nonNullOption;
+    var _a;
+    const sourceType = (_a = mcp.anyOf) != null ? _a : mcp.type;
+    let isNullable = false;
+    let nonNullTypes;
+    if (Array.isArray(sourceType)) {
+      nonNullTypes = sourceType.filter(
+        (t) => getTypeFromArrayItem(t) !== "null"
+      );
+      isNullable = sourceType.some(
+        (t) => getTypeFromArrayItem(t) === "null"
+      );
+      if (nonNullTypes.length === 1) {
+        const nonNullType = nonNullTypes[0];
+        if (typeof nonNullType === "object") {
+          mcp = nonNullType;
+        } else {
+          const _b = mcp, { type: _removed, anyOf: _removedAnyOf } = _b, rest = __objRest(_b, ["type", "anyOf"]);
+          mcp = __spreadProps(__spreadValues({}, rest), { type: nonNullType });
+        }
+      } else if (nonNullTypes.length === 0 && isNullable) {
+        const _c = mcp, { type: _removed, anyOf: _removedAnyOf } = _c, rest = __objRest(_c, ["type", "anyOf"]);
+        mcp = __spreadProps(__spreadValues({}, rest), { type: "null" });
+      } else if (typeof mcp.anyOf === "undefined") {
+        const anyOfItems = mcp.type.map((t) => ({ type: t }));
+        const _d = mcp, { type: _removed } = _d, rest = __objRest(_d, ["type"]);
+        mcp = __spreadProps(__spreadValues({}, rest), { anyOf: anyOfItems });
       }
     }
     if (!mcp.type) {
@@ -49,13 +108,25 @@ function toGeminiSchema(mcpSchema) {
         mcp.type = "object";
       } else if (mcp.items) {
         mcp.type = "array";
+      } else if (isNullable) {
+        mcp.type = "null";
       }
     }
     const geminiType = toGeminiType(mcp.type);
-    const geminiSchema = {
-      type: geminiType,
-      description: mcp.description
-    };
+    const geminiSchema = {};
+    if (mcp.anyOf) {
+      geminiSchema.anyOf = mcp.anyOf.map(
+        (item) => recursiveConvert(item)
+      );
+    } else {
+      geminiSchema.type = geminiType;
+    }
+    if (mcp.description) {
+      geminiSchema.description = mcp.description;
+    }
+    if (isNullable && mcp.type !== "null") {
+      geminiSchema.nullable = true;
+    }
     if (geminiType === Type.OBJECT) {
       geminiSchema.properties = {};
       if (mcp.properties) {
@@ -65,7 +136,9 @@ function toGeminiSchema(mcpSchema) {
           );
         }
       }
-      geminiSchema.required = mcp.required;
+      if (mcp.required) {
+        geminiSchema.required = mcp.required;
+      }
     } else if (geminiType === Type.ARRAY) {
       if (mcp.items) {
         geminiSchema.items = recursiveConvert(mcp.items);

package/dist/web/version.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "0.6.0";
+const version = "0.6.1";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
   "dependencies": {
     "@a2a-js/sdk": "^0.3.10",
     "@google/genai": "^1.37.0",
-    "@mikro-orm/core": "^6.6.6",
+    "@mikro-orm/core": "^6.6.10",
     "@mikro-orm/reflection": "^6.6.6",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "express": "^4.22.1",