@google/adk 1.6.0 → 2.1.0

package/dist/esm/sessions/db/operations.js

@@ -6,6 +6,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -27,49 +28,282 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { logger } from "../../utils/logger.js";
+import { loadOptionalPeer } from "../../utils/optional_peer.js";
+import { redactUriPassword } from "../../utils/redact_uri.js";
 import {
   ENTITIES,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
   StorageMetadata
 } from "./schema.js";
+function driverPeer(packageName, scheme) {
+  return {
+    packageName,
+    feature: `DatabaseSessionService with a "${scheme}" connection string`
+  };
+}
+__name(driverPeer, "driverPeer");
+function safeDecode(value) {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return void 0;
+  }
+}
+__name(safeDecode, "safeDecode");
+function decodeOrRaw(raw) {
+  var _a;
+  return ((_a = safeDecode(raw)) != null ? _a : raw) || void 0;
+}
+__name(decodeOrRaw, "decodeOrRaw");
+function remainingParams(params, exclude) {
+  const result = {};
+  for (const [key, value] of params.entries()) {
+    if (!exclude.includes(key)) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+__name(remainingParams, "remainingParams");
+const RESERVED_OPTION_KEYS = [
+  "host",
+  "schema",
+  "socketPath",
+  "driver",
+  "entities",
+  "user",
+  "password",
+  "dbName",
+  "port",
+  "clientUrl",
+  "driverOptions"
+];
+function parseSocketUri(uri) {
+  var _a, _b;
+  const schemeEnd = uri.indexOf("://");
+  if (schemeEnd === -1) {
+    return null;
+  }
+  const afterScheme = uri.slice(schemeEnd + 3);
+  const authorityEnd = afterScheme.search(/[/?#]/);
+  const authorityRegion = authorityEnd === -1 ? afterScheme : afterScheme.slice(0, authorityEnd);
+  const rest = authorityEnd === -1 ? "" : afterScheme.slice(authorityEnd);
+  const atIndex = authorityRegion.lastIndexOf("@");
+  const rawUserinfo = atIndex === -1 ? void 0 : authorityRegion.slice(0, atIndex);
+  const rawAuthority = atIndex === -1 ? authorityRegion : authorityRegion.slice(atIndex + 1);
+  const restMatch = /^(\/[^?#]*)?(?:\?([^#]*))?/.exec(rest);
+  const rawPath = restMatch == null ? void 0 : restMatch[1];
+  const rawQuery = restMatch == null ? void 0 : restMatch[2];
+  const params = new URLSearchParams(rawQuery != null ? rawQuery : "");
+  const queryHost = params.get("host");
+  const decodedAuthority = (_a = safeDecode(rawAuthority)) != null ? _a : "";
+  let socketPath;
+  let dbNameOverride;
+  let matchedBareSocket = false;
+  if (queryHost == null ? void 0 : queryHost.startsWith("/")) {
+    socketPath = queryHost;
+    if (decodedAuthority && !decodedAuthority.startsWith("/")) {
+      logger.warn(
+        `Connection URI names host "${decodedAuthority}" but the ?host= parameter overrides it with the Unix socket "${queryHost}"; connecting to the socket instead. URI: ${redactUriPassword(uri)}`
+      );
+    }
+  } else if (decodedAuthority.startsWith("/")) {
+    socketPath = decodedAuthority;
+  } else if (!decodedAuthority && rawPath) {
+    const segments = rawPath.split("/");
+    const colonIndex = segments.findIndex((segment) => segment.includes(":"));
+    if (colonIndex !== -1) {
+      socketPath = segments.slice(0, colonIndex + 1).join("/");
+      dbNameOverride = segments[colonIndex + 1];
+      matchedBareSocket = true;
+    }
+  }
+  if (!socketPath) {
+    return null;
+  }
+  let user;
+  let password;
+  if (rawUserinfo) {
+    const colonIndex = rawUserinfo.indexOf(":");
+    const rawUser = colonIndex === -1 ? rawUserinfo : rawUserinfo.slice(0, colonIndex);
+    const rawPassword = colonIndex === -1 ? void 0 : rawUserinfo.slice(colonIndex + 1);
+    user = rawUser ? decodeOrRaw(rawUser) : void 0;
+    password = rawPassword ? decodeOrRaw(rawPassword) : void 0;
+  }
+  return {
+    socketPath,
+    user,
+    password,
+    dbName: matchedBareSocket ? dbNameOverride ? decodeOrRaw(dbNameOverride) : void 0 : rawPath ? decodeOrRaw(rawPath.slice(1)) : void 0,
+    schema: (_b = params.get("schema")) != null ? _b : void 0,
+    extraParams: remainingParams(params, RESERVED_OPTION_KEYS)
+  };
+}
+__name(parseSocketUri, "parseSocketUri");
+function buildPostgresOptions(uri, driver) {
+  let parsedUrl;
+  try {
+    parsedUrl = new URL(uri);
+  } catch {
+    parsedUrl = null;
+  }
+  if (parsedUrl) {
+    const queryHost = parsedUrl.searchParams.get("host");
+    const decodedHostname = parsedUrl.hostname ? safeDecode(parsedUrl.hostname) : void 0;
+    const socketPath = (queryHost == null ? void 0 : queryHost.startsWith("/")) ? queryHost : (decodedHostname == null ? void 0 : decodedHostname.startsWith("/")) ? decodedHostname : void 0;
+    if (socketPath) {
+      if ((queryHost == null ? void 0 : queryHost.startsWith("/")) && decodedHostname && !decodedHostname.startsWith("/")) {
+        logger.warn(
+          `Connection URI names host "${decodedHostname}" but the ?host= parameter overrides it with the Unix socket "${queryHost}"; connecting to the socket instead. URI: ${redactUriPassword(uri)}`
+        );
+      }
+      const schema = parsedUrl.searchParams.get("schema");
+      const extraParams = remainingParams(
+        parsedUrl.searchParams,
+        RESERVED_OPTION_KEYS
+      );
+      return {
+        entities: ENTITIES,
+        driver,
+        host: socketPath,
+        user: parsedUrl.username ? decodeOrRaw(parsedUrl.username) : void 0,
+        password: parsedUrl.password ? decodeOrRaw(parsedUrl.password) : void 0,
+        dbName: decodeOrRaw(parsedUrl.pathname.slice(1)),
+        ...parsedUrl.port ? { port: Number(parsedUrl.port) } : {},
+        ...schema ? { schema } : {},
+        driverOptions: extraParams
+      };
+    }
+    return { entities: ENTITIES, clientUrl: uri, driver };
+  }
+  const socket = parseSocketUri(uri);
+  if (socket) {
+    return {
+      entities: ENTITIES,
+      driver,
+      host: socket.socketPath,
+      user: socket.user,
+      password: socket.password,
+      dbName: socket.dbName,
+      ...socket.schema ? { schema: socket.schema } : {},
+      driverOptions: socket.extraParams
+    };
+  }
+  throw new Error(
+    `Unrecognized postgres connection URI: ${redactUriPassword(uri)}`
+  );
+}
+__name(buildPostgresOptions, "buildPostgresOptions");
+function buildMySqlFamilyOptions(uri, driver) {
+  let parsedUrl = null;
+  try {
+    parsedUrl = new URL(uri);
+  } catch {
+  }
+  if (parsedUrl) {
+    const queryHost = parsedUrl.searchParams.get("host");
+    const decodedHostname = parsedUrl.hostname ? safeDecode(parsedUrl.hostname) : void 0;
+    const socketPath = (queryHost == null ? void 0 : queryHost.startsWith("/")) ? queryHost : (decodedHostname == null ? void 0 : decodedHostname.startsWith("/")) ? decodedHostname : void 0;
+    if (socketPath) {
+      if ((queryHost == null ? void 0 : queryHost.startsWith("/")) && decodedHostname && !decodedHostname.startsWith("/")) {
+        logger.warn(
+          `Connection URI names host "${decodedHostname}" but the ?host= parameter overrides it with the Unix socket "${queryHost}"; connecting to the socket instead. URI: ${redactUriPassword(uri)}`
+        );
+      }
+      const schema = parsedUrl.searchParams.get("schema");
+      const extraParams = remainingParams(
+        parsedUrl.searchParams,
+        RESERVED_OPTION_KEYS
+      );
+      return {
+        entities: ENTITIES,
+        driver,
+        user: parsedUrl.username ? decodeOrRaw(parsedUrl.username) : void 0,
+        password: parsedUrl.password ? decodeOrRaw(parsedUrl.password) : void 0,
+        dbName: decodeOrRaw(parsedUrl.pathname.slice(1)),
+        driverOptions: {
+          socketPath,
+          ...schema ? { schema } : {},
+          ...extraParams
+        }
+      };
+    }
+    return { entities: ENTITIES, clientUrl: uri, driver };
+  }
+  const socket = parseSocketUri(uri);
+  if (socket) {
+    return {
+      entities: ENTITIES,
+      driver,
+      user: socket.user,
+      password: socket.password,
+      dbName: socket.dbName,
+      driverOptions: {
+        socketPath: socket.socketPath,
+        ...socket.schema ? { schema: socket.schema } : {},
+        ...socket.extraParams
+      }
+    };
+  }
+  throw new Error(
+    `Unrecognized MySQL/MariaDB connection URI: ${redactUriPassword(uri)}`
+  );
+}
+__name(buildMySqlFamilyOptions, "buildMySqlFamilyOptions");
 async function getConnectionOptionsFromUri(uri) {
-  let driver;
   if (uri.startsWith("postgres://") || uri.startsWith("postgresql://")) {
-    const { PostgreSqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/postgresql"), 1));
-    driver = PostgreSqlDriver;
-  } else if (uri.startsWith("mysql://")) {
-    const { MySqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mysql"), 1));
-    driver = MySqlDriver;
-  } else if (uri.startsWith("mariadb://")) {
-    const { MariaDbDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mariadb"), 1));
-    driver = MariaDbDriver;
-  } else if (uri.startsWith("sqlite://")) {
-    const { SqliteDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/sqlite"), 1));
-    driver = SqliteDriver;
-  } else if (uri.startsWith("mssql://")) {
-    const { MsSqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mssql"), 1));
-    driver = MsSqlDriver;
-  } else {
-    throw new Error(`Unsupported database URI: ${uri}`);
+    const { PostgreSqlDriver } = await loadOptionalPeer(
+      driverPeer("@mikro-orm/postgresql", "postgres"),
+      () => Promise.resolve().then(() => __toESM(require("@mikro-orm/postgresql"), 1))
+    );
+    return buildPostgresOptions(uri, PostgreSqlDriver);
+  }
+  if (uri.startsWith("mysql://")) {
+    const { MySqlDriver } = await loadOptionalPeer(
+      driverPeer("@mikro-orm/mysql", "mysql"),
+      () => Promise.resolve().then(() => __toESM(require("@mikro-orm/mysql"), 1))
+    );
+    return buildMySqlFamilyOptions(uri, MySqlDriver);
+  }
+  if (uri.startsWith("mariadb://")) {
+    const { MariaDbDriver } = await loadOptionalPeer(
+      driverPeer("@mikro-orm/mariadb", "mariadb"),
+      () => Promise.resolve().then(() => __toESM(require("@mikro-orm/mariadb"), 1))
+    );
+    return buildMySqlFamilyOptions(uri, MariaDbDriver);
   }
   if (uri.startsWith("sqlite://")) {
+    const { SqliteDriver } = await loadOptionalPeer(
+      driverPeer("@mikro-orm/sqlite", "sqlite"),
+      () => Promise.resolve().then(() => __toESM(require("@mikro-orm/sqlite"), 1))
+    );
     return {
       entities: ENTITIES,
       dbName: uri === "sqlite://:memory:" ? ":memory:" : uri.substring("sqlite://".length),
-      driver
+      driver: SqliteDriver
     };
   }
-  return {
-    entities: ENTITIES,
-    clientUrl: uri,
-    driver
-  };
+  if (uri.startsWith("mssql://")) {
+    const { MsSqlDriver } = await loadOptionalPeer(
+      driverPeer("@mikro-orm/mssql", "mssql"),
+      () => Promise.resolve().then(() => __toESM(require("@mikro-orm/mssql"), 1))
+    );
+    return {
+      entities: ENTITIES,
+      clientUrl: uri,
+      driver: MsSqlDriver
+    };
+  }
+  throw new Error(`Unsupported database URI: ${redactUriPassword(uri)}`);
 }
+__name(getConnectionOptionsFromUri, "getConnectionOptionsFromUri");
 async function ensureDatabaseCreated(orm) {
   await orm.schema.ensureDatabase();
-  await orm.schema.updateSchema({ safe: true });
+  await orm.schema.update({ safe: true });
 }
+__name(ensureDatabaseCreated, "ensureDatabaseCreated");
 async function validateDatabaseSchemaVersion(orm) {
   const em = orm.em.fork();
   const existing = await em.findOne(StorageMetadata, {
@@ -89,6 +323,7 @@ async function validateDatabaseSchemaVersion(orm) {
   });
   await em.persist(newVersion).flush();
 }
+__name(validateDatabaseSchemaVersion, "validateDatabaseSchemaVersion");
 export {
   ensureDatabaseCreated,
   getConnectionOptionsFromUri,

package/dist/esm/sessions/db/schema.js

@@ -1,21 +1,17 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Entity, JsonType, PrimaryKey, Property } from "@mikro-orm/core";
+import {
+  EntitySchema,
+  JsonType,
+  PrimaryKeyProp
+} from "@mikro-orm/core";
 import {
   transformToCamelCaseEvent,
   transformToSnakeCaseEvent
@@ -23,7 +19,8 @@ import {
 const SCHEMA_VERSION_KEY = "schema_version";
 const SCHEMA_VERSION_1_JSON = "1";
 const STORAGE_KEY_COLUMN_LENGTH = 191;
-class CamelCaseToSnakeCaseJsonType extends JsonType {
+const EVENT_TIMESTAMP_PRECISION = 6;
+const _CamelCaseToSnakeCaseJsonType = class _CamelCaseToSnakeCaseJsonType extends JsonType {
   convertToDatabaseValue(value) {
     return JSON.stringify(transformToSnakeCaseEvent(value));
   }
@@ -33,170 +30,127 @@ class CamelCaseToSnakeCaseJsonType extends JsonType {
     }
     return transformToCamelCaseEvent(value);
   }
-}
-let StorageMetadata = class {
 };
-__decorateClass([
-  PrimaryKey({ type: "string" })
-], StorageMetadata.prototype, "key", 2);
-__decorateClass([
-  Property({ type: "string" })
-], StorageMetadata.prototype, "value", 2);
-StorageMetadata = __decorateClass([
-  Entity({ tableName: "adk_internal_metadata" })
-], StorageMetadata);
-let StorageAppState = class {
+__name(_CamelCaseToSnakeCaseJsonType, "CamelCaseToSnakeCaseJsonType");
+let CamelCaseToSnakeCaseJsonType = _CamelCaseToSnakeCaseJsonType;
+const KEY_COLUMN = {
+  type: "string",
+  length: STORAGE_KEY_COLUMN_LENGTH,
+  primary: true
+};
+const _StorageMetadata = class _StorageMetadata {
+};
+__name(_StorageMetadata, "StorageMetadata");
+let StorageMetadata = _StorageMetadata;
+const storageMetadataSchema = new EntitySchema({
+  class: StorageMetadata,
+  tableName: "adk_internal_metadata",
+  properties: {
+    key: { type: "string", primary: true },
+    value: { type: "string" }
+  }
+});
+const _StorageAppState = class _StorageAppState {
   constructor() {
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageAppState.prototype, "appName", 2);
-__decorateClass([
-  Property({ type: "json" })
-], StorageAppState.prototype, "state", 2);
-__decorateClass([
-  Property({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: () => /* @__PURE__ */ new Date(),
-    onUpdate: () => /* @__PURE__ */ new Date()
-  })
-], StorageAppState.prototype, "updateTime", 2);
-StorageAppState = __decorateClass([
-  Entity({ tableName: "app_states" })
-], StorageAppState);
-PrimaryKey.name;
-let StorageUserState = class {
+__name(_StorageAppState, "StorageAppState");
+let StorageAppState = _StorageAppState;
+const storageAppStateSchema = new EntitySchema({
+  class: StorageAppState,
+  tableName: "app_states",
+  properties: {
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    state: { type: "json" },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
+      onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
+    }
+  }
+});
+PrimaryKeyProp;
+const _StorageUserState = class _StorageUserState {
   constructor() {
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageUserState.prototype, "appName", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageUserState.prototype, "userId", 2);
-__decorateClass([
-  Property({ type: "json" })
-], StorageUserState.prototype, "state", 2);
-__decorateClass([
-  Property({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: () => /* @__PURE__ */ new Date(),
-    onUpdate: () => /* @__PURE__ */ new Date()
-  })
-], StorageUserState.prototype, "updateTime", 2);
-StorageUserState = __decorateClass([
-  Entity({ tableName: "user_states" })
-], StorageUserState);
-PrimaryKey.name;
-let StorageSession = class {
+__name(_StorageUserState, "StorageUserState");
+let StorageUserState = _StorageUserState;
+const storageUserStateSchema = new EntitySchema({
+  class: StorageUserState,
+  tableName: "user_states",
+  properties: {
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    state: { type: "json" },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
+      onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
+    }
+  }
+});
+PrimaryKeyProp;
+const _StorageSession = class _StorageSession {
   constructor() {
     this.createTime = /* @__PURE__ */ new Date();
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__decorateClass([
-  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
-], StorageSession.prototype, "id", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageSession.prototype, "appName", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageSession.prototype, "userId", 2);
-__decorateClass([
-  Property({ type: "json" })
-], StorageSession.prototype, "state", 2);
-__decorateClass([
-  Property({
-    type: "datetime",
-    fieldName: "create_time",
-    onCreate: () => /* @__PURE__ */ new Date()
-  })
-], StorageSession.prototype, "createTime", 2);
-__decorateClass([
-  Property({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: () => /* @__PURE__ */ new Date()
-  })
-], StorageSession.prototype, "updateTime", 2);
-StorageSession = __decorateClass([
-  Entity({ tableName: "sessions" })
-], StorageSession);
-PrimaryKey.name;
-let StorageEvent = class {
+__name(_StorageSession, "StorageSession");
+let StorageSession = _StorageSession;
+const storageSessionSchema = new EntitySchema({
+  class: StorageSession,
+  tableName: "sessions",
+  properties: {
+    id: KEY_COLUMN,
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    state: { type: "json" },
+    createTime: {
+      type: "datetime",
+      fieldName: "create_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
+    },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
+    }
+  }
+});
+PrimaryKeyProp;
+const _StorageEvent = class _StorageEvent {
 };
-__decorateClass([
-  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
-], StorageEvent.prototype, "id", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "appName", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "userId", 2);
-__decorateClass([
-  PrimaryKey({
-    type: "string",
-    fieldName: "session_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "sessionId", 2);
-__decorateClass([
-  Property({ type: "string", fieldName: "invocation_id" })
-], StorageEvent.prototype, "invocationId", 2);
-__decorateClass([
-  Property({ type: "datetime" })
-], StorageEvent.prototype, "timestamp", 2);
-__decorateClass([
-  Property({ type: CamelCaseToSnakeCaseJsonType, fieldName: "event_data" })
-], StorageEvent.prototype, "eventData", 2);
-StorageEvent = __decorateClass([
-  Entity({ tableName: "events" })
-], StorageEvent);
+__name(_StorageEvent, "StorageEvent");
+let StorageEvent = _StorageEvent;
+const storageEventSchema = new EntitySchema({
+  class: StorageEvent,
+  tableName: "events",
+  properties: {
+    id: KEY_COLUMN,
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    sessionId: { ...KEY_COLUMN, fieldName: "session_id" },
+    invocationId: { type: "string", fieldName: "invocation_id" },
+    timestamp: { type: "datetime", length: EVENT_TIMESTAMP_PRECISION },
+    eventData: { type: CamelCaseToSnakeCaseJsonType, fieldName: "event_data" }
+  }
+});
 const ENTITIES = [
-  StorageMetadata,
-  StorageAppState,
-  StorageUserState,
-  StorageSession,
-  StorageEvent
+  storageMetadataSchema,
+  storageAppStateSchema,
+  storageUserStateSchema,
+  storageSessionSchema,
+  storageEventSchema
 ];
 export {
   ENTITIES,
+  EVENT_TIMESTAMP_PRECISION,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
   STORAGE_KEY_COLUMN_LENGTH,
@@ -204,5 +158,10 @@ export {
   StorageEvent,
   StorageMetadata,
   StorageSession,
-  StorageUserState
+  StorageUserState,
+  storageAppStateSchema,
+  storageEventSchema,
+  storageMetadataSchema,
+  storageSessionSchema,
+  storageUserStateSchema
 };