@instantdb/core 0.22.88-experimental.drewh-ssr.20248787082.1 → 0.22.88-experimental.drewh-entity-caching.20248787059.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instantdb/core",
-  "version": "0.22.88-experimental.drewh-ssr.20248787082.1",
+  "version": "0.22.88-experimental.drewh-entity-caching.20248787059.1",
   "description": "Instant's core local abstraction",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/core",
   "repository": {
@@ -53,7 +53,7 @@
   "dependencies": {
     "mutative": "^1.0.10",
     "uuid": "^11.1.0",
-    "@instantdb/version": "0.22.88-experimental.drewh-ssr.20248787082.1"
+    "@instantdb/version": "0.22.88-experimental.drewh-entity-caching.20248787059.1"
   },
   "scripts": {
     "test": "vitest",

package/src/Reactor.js

@@ -319,17 +319,7 @@ export default class Reactor {
     this._oauthCallbackResponse = this._oauthLoginInit();
 
     // kick off a request to cache it
-    this.getCurrentUser().then((userInfo) => {
-      this.syncUserToEndpoint(userInfo.user);
-    });
-
-    setInterval(
-      async () => {
-        const currentUser = await this.getCurrentUser();
-        this.syncUserToEndpoint(currentUser.user);
-      },
-      1000 * 60 * 20,
-    );
+    this.getCurrentUser();
 
     NetworkListener.getIsOnline().then((isOnline) => {
       this._isOnline = isOnline;
@@ -523,42 +513,6 @@ export default class Reactor {
     }
   }
 
-  /**
-   * Does the same thing as add-query-ok
-   * but called as a result of receiving query info from ssr
-   * @param {any} q
-   * @param {{ triples: any; pageInfo: any; }} result
-   * @param {boolean} enableCardinalityInference
-   */
-  _addQueryData(q, result, enableCardinalityInference) {
-    if (!this.attrs) {
-      throw new Error('Attrs in reactor have not been set');
-    }
-    const queryHash = weakHash(q);
-    const store = s.createStore(
-      this.attrs,
-      result.triples,
-      enableCardinalityInference,
-      this._linkIndex,
-      this.config.useDateObjects,
-    );
-    this.querySubs.updateInPlace((prev) => {
-      prev[queryHash] = {
-        result: {
-          store,
-          pageInfo: result.pageInfo,
-          processedTxId: undefined,
-          isExternal: true,
-        },
-        q,
-      };
-    });
-    this._cleanupPendingMutationsQueries();
-    this.notifyOne(queryHash);
-    this.notifyOneQueryOnce(queryHash);
-    this._cleanupPendingMutationsTimeout();
-  }
-
   _handleReceive(connId, msg) {
     // opt-out, enabled by default if schema
     const enableCardinalityInference =
@@ -1192,7 +1146,7 @@ export default class Reactor {
   }
 
   /** Runs instaql on a query and a store */
-  dataForQuery(hash, applyOptimistic = true) {
+  dataForQuery(hash) {
     const errorMessage = this._errorMessage;
     if (errorMessage) {
       return { error: errorMessage };
@@ -1216,16 +1170,17 @@ export default class Reactor {
       return cached;
     }
 
-    let store = result.store;
-    const { pageInfo, aggregate, processedTxId } = result;
+    const { store, pageInfo, aggregate, processedTxId } = result;
     const mutations = this._rewriteMutationsSorted(
       store.attrs,
       pendingMutations,
     );
-    if (applyOptimistic) {
-      store = this._applyOptimisticUpdates(store, mutations, processedTxId);
-    }
-    const resp = instaql({ store: store, pageInfo, aggregate }, q);
+    const newStore = this._applyOptimisticUpdates(
+      store,
+      mutations,
+      processedTxId,
+    );
+    const resp = instaql({ store: newStore, pageInfo, aggregate }, q);
 
     return { data: resp, querySubVersion, pendingMutationsVersion };
   }
@@ -1957,27 +1912,7 @@ export default class Reactor {
     }
   }
 
-  async syncUserToEndpoint(user) {
-    if (this.config.cookieEndpoint) {
-      try {
-        fetch(this.config.cookieEndpoint + '/sync-auth', {
-          method: 'POST',
-          body: JSON.stringify({
-            user: user,
-          }),
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        });
-      } catch (error) {
-        console.error('Error syncing user with external endpoint', error);
-      }
-    }
-  }
-
   updateUser(newUser) {
-    this.syncUserToEndpoint(newUser);
-
     const newV = { error: undefined, user: newUser };
     this._currentUserCached = { isLoading: false, ...newV };
     this._dataForQueryCache = {};

package/src/index.ts

@@ -20,13 +20,10 @@ import {
   validateTransactions,
   TransactionValidationError,
 } from './transactionValidation.ts';
-
 import {
   StorageInterface,
   type StorageInterfaceStoreName,
 } from './utils/PersistedObject.ts';
-import { createInstantRouteHandler } from './createRouteHandler.ts';
-import { parseSchemaFromJSON } from './parseSchemaFromJSON.ts';
 
 import type {
   PresenceOpts,
@@ -106,7 +103,6 @@ import type {
 } from './schemaTypes.ts';
 import type { InstantRules } from './rulesTypes.ts';
 import type { UploadFileResponse, DeleteFileResponse } from './StorageAPI.ts';
-import { FrameworkClient, type FrameworkConfig } from './framework.ts';
 
 import type {
   ExchangeCodeForTokenParams,
@@ -157,7 +153,6 @@ export type InstantConfig<
   appId: string;
   schema?: S;
   websocketURI?: string;
-  cookieEndpoint?: string;
   apiURI?: string;
   devtool?: boolean | DevtoolConfig;
   verbose?: boolean;
@@ -907,9 +902,7 @@ export {
   validateQuery,
   QueryValidationError,
   validateTransactions,
-  parseSchemaFromJSON,
   TransactionValidationError,
-  FrameworkClient,
 
   // error
   InstantAPIError,
@@ -1025,7 +1018,6 @@ export {
 
   // SSE
   type EventSourceType,
-  type FrameworkConfig,
 
   // sync table types
   type SyncTableCallback,
@@ -1042,5 +1034,4 @@ export {
   // storage (e.g. indexeddb) interface
   StorageInterface,
   type StorageInterfaceStoreName,
-  createInstantRouteHandler,
 };

package/src/store.ts

@@ -677,11 +677,16 @@ export function getTriples(store, [e, a, v]) {
   }
 }
 
+const cache = {};
+
 export function getAsObject(
   store: Store,
   attrs: Map<string, InstantDBAttr> | undefined,
   e: string,
 ) {
+  if (cache[e]) {
+    return cache[e];
+  }
   const obj = {};
 
   if (!attrs) {
@@ -695,6 +700,7 @@ export function getAsObject(
       obj[label] = triple[2];
     }
   }
+  cache[e] = obj;
 
   return obj;
 }

package/__tests__/src/serializeSchema.test.ts

@@ -1,123 +0,0 @@
-import { expect, test } from 'vitest';
-import { i } from '../../src/schema';
-import { parseSchemaFromJSON } from '../../src/parseSchemaFromJSON';
-import { InstantSchemaDef } from '../../src/schemaTypes';
-
-const schema = i.schema({
-  entities: {
-    users: i.entity({
-      name: i.string(),
-      email: i.string().indexed().unique(),
-      bio: i.string().optional(),
-      // this is a convenient way to typecheck custom JSON fields
-      // though we should probably have a backend solution for this
-      stuff: i.json<{ custom: string }>(),
-      junk: i.any(),
-    }),
-    posts: i.entity({
-      title: i.string().optional(),
-      body: i.string(),
-    }),
-    comments: i.entity({
-      body: i.string().indexed(),
-      likes: i.number(),
-    }),
-
-    birthdays: i.entity({
-      date: i.date(),
-      message: i.string(),
-      prizes: i.json<string | number>(),
-    }),
-  },
-  links: {
-    usersPosts: {
-      forward: {
-        on: 'users',
-        has: 'many',
-        label: 'posts',
-      },
-      reverse: {
-        on: 'posts',
-        has: 'one',
-        label: 'author',
-      },
-    },
-    postsComments: {
-      forward: {
-        on: 'posts',
-        has: 'many',
-        label: 'comments',
-      },
-      reverse: {
-        on: 'comments',
-        has: 'one',
-        label: 'post',
-      },
-    },
-    friendships: {
-      forward: {
-        on: 'users',
-        has: 'many',
-        label: 'friends',
-      },
-      reverse: {
-        on: 'users',
-        has: 'many',
-        label: '_friends',
-      },
-    },
-    referrals: {
-      forward: {
-        on: 'users',
-        has: 'many',
-        label: 'referred',
-      },
-      reverse: {
-        on: 'users',
-        has: 'one',
-        label: 'referrer',
-      },
-    },
-  },
-  rooms: {
-    chat: {
-      presence: i.entity({
-        name: i.string(),
-        status: i.string(),
-      }),
-      topics: {
-        sendEmoji: i.entity({
-          emoji: i.string(),
-        }),
-      },
-    },
-  },
-});
-
-type AnySchema = InstantSchemaDef<any, any, any>;
-
-// compare schemas by stringifying them with json and comparing the strings
-const compareSchemas = (schema1: AnySchema, schema2: AnySchema) => {
-  expect(JSON.stringify(schema1, null, 2)).toBe(
-    JSON.stringify(schema2, null, 2),
-  );
-};
-
-test('ability to parse stringified schema into real schema object', () => {
-  const stringified = JSON.stringify(schema, null, 2);
-  const parsed = JSON.parse(stringified);
-  console.log(stringified);
-
-  const otherSide = parseSchemaFromJSON(parsed);
-
-  compareSchemas(schema, otherSide);
-
-  expect(schema.entities.comments.links).toEqual(
-    otherSide.entities.comments.links,
-  );
-  expect(schema.entities.comments.asType).toEqual(
-    otherSide.entities.comments.asType,
-  );
-
-  expect(schema).toStrictEqual(otherSide);
-});

package/dist/commonjs/createRouteHandler.d.ts

@@ -1,8 +0,0 @@
-export declare const createInstantRouteHandler: (config: {
-    appId: string;
-    apiURI?: string;
-}) => {
-    GET: (_req: Request) => Promise<Response>;
-    POST: (req: Request) => Promise<Response>;
-};
-//# sourceMappingURL=createRouteHandler.d.ts.map

package/dist/commonjs/createRouteHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createRouteHandler.d.ts","sourceRoot":"","sources":["../../src/createRouteHandler.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;gBAqBqB,OAAO;gBAMP,OAAO;CAa5B,CAAC"}

package/dist/commonjs/createRouteHandler.js

@@ -1,57 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInstantRouteHandler = void 0;
-const createInstantRouteHandler = (config) => {
-    function handleUserSync(req) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const body = yield req.json();
-            if (body.user && body.user.refresh_token) {
-                return new Response('sync', {
-                    headers: {
-                        // 7 day expiry
-                        'Set-Cookie': `instant_user=${JSON.stringify(body.user)}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,
-                    },
-                });
-            }
-            else {
-                return new Response('sync', {
-                    headers: {
-                        // remove the cookie (some browsers)
-                        'Set-Cookie': `instant_user=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=-1`,
-                    },
-                });
-            }
-        });
-    }
-    return {
-        GET: (_req) => __awaiter(void 0, void 0, void 0, function* () {
-            return new Response('Method not allowed', {
-                status: 405,
-                statusText: 'Method Not Allowed',
-            });
-        }),
-        POST: (req) => __awaiter(void 0, void 0, void 0, function* () {
-            const url = new URL(req.url);
-            const pathname = url.pathname;
-            const route = pathname.split('/')[pathname.split('/').length - 1];
-            switch (route) {
-                case 'sync-auth':
-                    return yield handleUserSync(req);
-            }
-            return new Response('Route not found', {
-                status: 404,
-            });
-        }),
-    };
-};
-exports.createInstantRouteHandler = createInstantRouteHandler;
-//# sourceMappingURL=createRouteHandler.js.map

package/dist/commonjs/createRouteHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createRouteHandler.js","sourceRoot":"","sources":["../../src/createRouteHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAO,MAAM,yBAAyB,GAAG,CAAC,MAGzC,EAAE,EAAE;IACH,SAAe,cAAc,CAAC,GAAY;;YACxC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACzC,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE;oBAC1B,OAAO,EAAE;wBACP,eAAe;wBACf,YAAY,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,6DAA6D;qBACrH;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE;oBAC1B,OAAO,EAAE;wBACP,oCAAoC;wBACpC,YAAY,EAAE,sEAAsE;qBACrF;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KAAA;IAED,OAAO;QACL,GAAG,EAAE,CAAO,IAAa,EAAE,EAAE;YAC3B,OAAO,IAAI,QAAQ,CAAC,oBAAoB,EAAE;gBACxC,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,oBAAoB;aACjC,CAAC,CAAC;QACL,CAAC,CAAA;QACD,IAAI,EAAE,CAAO,GAAY,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAClE,QAAQ,KAAK,EAAE,CAAC;gBACd,KAAK,WAAW;oBACd,OAAO,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;YACrC,CAAC;YACD,OAAO,IAAI,QAAQ,CAAC,iBAAiB,EAAE;gBACrC,MAAM,EAAE,GAAG;aACZ,CAAC,CAAC;QACL,CAAC,CAAA;KACF,CAAC;AACJ,CAAC,CAAC;AA3CW,QAAA,yBAAyB,6BA2CpC","sourcesContent":["export const createInstantRouteHandler = (config: {\n  appId: string;\n  apiURI?: string;\n}) => {\n  async function handleUserSync(req: Request) {\n    const body = await req.json();\n    if (body.user && body.user.refresh_token) {\n      return new Response('sync', {\n        headers: {\n          // 7 day expiry\n          'Set-Cookie': `instant_user=${JSON.stringify(body.user)}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,\n        },\n      });\n    } else {\n      return new Response('sync', {\n        headers: {\n          // remove the cookie (some browsers)\n          'Set-Cookie': `instant_user=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=-1`,\n        },\n      });\n    }\n  }\n\n  return {\n    GET: async (_req: Request) => {\n      return new Response('Method not allowed', {\n        status: 405,\n        statusText: 'Method Not Allowed',\n      });\n    },\n    POST: async (req: Request) => {\n      const url = new URL(req.url);\n      const pathname = url.pathname;\n      const route = pathname.split('/')[pathname.split('/').length - 1];\n      switch (route) {\n        case 'sync-auth':\n          return await handleUserSync(req);\n      }\n      return new Response('Route not found', {\n        status: 404,\n      });\n    },\n  };\n};\n"]}

package/dist/commonjs/framework.d.ts

@@ -1,77 +0,0 @@
-import { InstantCoreDatabase, InstantDBAttr } from './index.ts';
-import { RuleParams } from './schemaTypes.ts';
-export declare const isServer: boolean;
-export type FrameworkConfig = {
-    token?: string | null;
-    db: InstantCoreDatabase<any, any>;
-};
-type QueryPromise = {
-    type: 'http';
-    triples: any;
-    attrs: any;
-    queryHash: any;
-    query: any;
-    pageInfo?: any;
-} | {
-    type: 'session';
-    queryResult: any;
-};
-export declare class FrameworkClient {
-    private params;
-    private db;
-    resultMap: Map<string, {
-        status: 'pending' | 'success' | 'error';
-        type: 'http' | 'session';
-        promise?: Promise<QueryPromise> | null;
-        data?: any;
-        error?: any;
-    }>;
-    private queryResolvedCallbacks;
-    constructor(params: FrameworkConfig);
-    subscribe: (callback: (result: {
-        triples: any;
-        attrs: any;
-        queryHash: string;
-        pageInfo?: any;
-    }) => void) => void;
-    addQueryResult: (queryKey: string, value: any) => void;
-    query: (_query: any, opts?: {
-        ruleParams: RuleParams;
-    }) => {
-        type: "http" | "session";
-        status: "pending" | "success" | "error";
-        promise?: Promise<QueryPromise>;
-        data?: any;
-        error?: any;
-    };
-    getExistingResultForQuery: (_query: any, opts?: {
-        ruleParams: RuleParams;
-    }) => {
-        status: "pending" | "success" | "error";
-        type: "http" | "session";
-        promise?: Promise<QueryPromise> | null;
-        data?: any;
-        error?: any;
-    } | undefined;
-    completeIsomorphic: (query: any, triples: any[], attrs: InstantDBAttr[], pageInfo?: any) => {
-        data: any;
-        pageInfo?: any;
-        aggregate?: any;
-    };
-    hashQuery: (_query: any, opts?: {
-        ruleParams: RuleParams;
-    }) => {
-        hash: string;
-        query: any;
-    };
-    getTriplesAndAttrsForQuery: (query: any) => Promise<{
-        triples: any[];
-        attrs: InstantDBAttr[];
-        query: any;
-        queryHash: string;
-        type: "http";
-        pageInfo?: any;
-    }>;
-}
-export {};
-//# sourceMappingURL=framework.d.ts.map

package/dist/commonjs/framework.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"framework.d.ts","sourceRoot":"","sources":["../../src/framework.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,aAAa,EAEd,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,eAAO,MAAM,QAAQ,SAAwD,CAAC;AAE9E,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,EAAE,EAAE,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC;AAEF,KAAK,YAAY,GACb;IACE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC;AAEN,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,EAAE,CAAgC;IACnC,SAAS,EAAE,GAAG,CACnB,MAAM,EACN;QACE,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;QACxC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QACvC,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,CACF,CAAa;IAEd,OAAO,CAAC,sBAAsB,CAMX;gBAEP,MAAM,EAAE,eAAe;IAe5B,SAAS,GACd,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,GAAG,CAAC;QACb,KAAK,EAAE,GAAG,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;KAChB,KAAK,IAAI,UAGV;IAGK,cAAc,GAAI,UAAU,MAAM,EAAE,OAAO,GAAG,UAoBnD;IAEK,KAAK,GACV,QAAQ,GAAG,EACX,OAAO;QACL,UAAU,EAAE,UAAU,CAAC;KACxB,KACA;QACD,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;QACxC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAChC,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,CA2DC;IAEK,yBAAyB,GAC9B,QAAQ,GAAG,EACX,OAAO;QACL,UAAU,EAAE,UAAU,CAAC;KACxB;gBA7IS,SAAS,GAAG,SAAS,GAAG,OAAO;cACjC,MAAM,GAAG,SAAS;kBACd,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI;eAC/B,GAAG;gBACF,GAAG;kBA6Ib;IAEK,kBAAkB,GACvB,OAAO,GAAG,EACV,SAAS,GAAG,EAAE,EACd,OAAO,aAAa,EAAE,EACtB,WAAW,GAAG;;;;MAyBd;IAEK,SAAS,GACd,QAAQ,GAAG,EACX,OAAO;QACL,UAAU,EAAE,UAAU,CAAC;KACxB,KACA;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAM7B;IAEK,0BAA0B,GAC/B,OAAO,GAAG,KACT,OAAO,CAAC;QACT,OAAO,EAAE,GAAG,EAAE,CAAC;QACf,KAAK,EAAE,aAAa,EAAE,CAAC;QACvB,KAAK,EAAE,GAAG,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,GAAG,CAAC;KAChB,CAAC,CA0CA;CACH"}