npm - @rocicorp/zero - Versions diffs - 0.25.0-canary.8 → 0.25.0-canary.9 - Mend

@rocicorp/zero 0.25.0-canary.8 → 0.25.0-canary.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (272) hide show

package/out/zero-server/src/queries/process-queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"process-queries.js","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n transformRequestMessageSchema,\n type TransformRequestMessage,\n type TransformResponseBody,\n type TransformResponseMessage,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/*\n Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n \n This function will call `cb` in parallel for each query found in the request.\n \n If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@linkcode handleTransformRequest} instead.\n /\nexport function handleGetQueriesRequest<S extends Schema>(\n cb: (\n name: string,\n args: readonly ReadonlyJSONValue[],\n ) => MaybePromise<{query: AnyQuery} \| AnyQuery>,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n logLevel: LogLevel = 'info',\n): Promise<TransformResponseMessage> {\n const lc = createLogContext(logLevel).withContext('GetQueries');\n return transform(cb, schema, requestOrJsonBody, lc, 'get');\n}\n\nasync function transform<S extends Schema>(\n cb: (\n name: string,\n args: readonly ReadonlyJSONValue[],\n ) => MaybePromise<{query: AnyQuery} \| AnyQuery>,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n lc: LogContext,\n apiName: 'get' \| 'transform',\n): Promise<TransformResponseMessage> {\n let parsed: TransformRequestMessage;\n let queryIDs: string[] = [];\n try {\n let body: ReadonlyJSONValue;\n if (requestOrJsonBody instanceof Request) {\n body = await requestOrJsonBody.json();\n } else {\n body = requestOrJsonBody;\n }\n\n parsed = v.parse(body, transformRequestMessageSchema);\n\n queryIDs = parsed[1].map(r => r.id);\n } catch (error) {\n lc.error?.(`Failed to parse ${apiName} queries request`, error);\n\n const message = `Failed to parse ~~get~~ queries request: ${getErrorMessage(error)}`;\n const details = getErrorDetails(error);\n\n return [\n 'transformFailed',\n {\n kind: ErrorKind.TransformFailed,\n origin: ErrorOrigin.Server,\n reason: ErrorReason.Parse,\n message,\n queryIDs,\n ...(details ? {details} : {}),\n },\n ];\n }\n\n try {\n const nameMapper = clientToServer(schema.tables);\n\n const responses: TransformResponseBody = await Promise.all(\n parsed[1].map(async req => {\n let finalQuery: AnyQuery;\n try {\n const result = await cb(req.name, req.args);\n finalQuery = 'query' in result ? result.query : result;\n } catch (error) {\n const message = getErrorMessage(error);\n const details = getErrorDetails(error);\n\n return {\n error: error instanceof QueryParseError ? 'parse' : 'app',\n id: req.id,\n name: req.name,\n message,\n ...(details ? {details} : {}),\n };\n }\n\n try {\n const q = asQueryInternals(finalQuery);\n const ast = mapAST(q.ast, nameMapper);\n\n return {\n id: req.id,\n name: req.name,\n ast,\n };\n } catch (error) {\n lc.error?.('Failed to map AST', error);\n throw error;\n }\n }),\n );\n\n return ['transformed', responses];\n } catch (e) {\n const message = getErrorMessage(e);\n const details = getErrorDetails(e);\n\n return [\n 'transformFailed',\n {\n kind: ErrorKind.TransformFailed,\n origin: ErrorOrigin.Server,\n reason: ErrorReason.Internal,\n message,\n queryIDs,\n ...(details ? {details} : {}),\n },\n ];\n }\n}\n\n/\n Processes a transform request by invoking the provided callback for each query.\n * The callback should return a Query that is the transformed result.\n \n This function will call `transformQuery` in parallel for each query found in the request.\n \n @param transformQuery - Callback function that takes a query name and args, and returns a Query\n * @param schema - The Zero schema\n * @param requestOrJsonBody - Either a Request object or the JSON body directly\n * @param logLevel - Logging level (defaults to 'info')\n * @returns A Promise that resolves to a TransformResponseMessage\n /\nexport function handleTransformRequest<S extends Schema>(\n transformQuery: TransformQueryFunction,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n logLevel: LogLevel = 'info',\n) {\n const lc = createLogContext(logLevel).withContext('TransformRequest');\n return transform(\n (name, argsArray) => transformQuery(name, argsArray[0]),\n schema,\n requestOrJsonBody,\n lc,\n 'transform',\n );\n}\n\n/\n A function that transforms a query by name and arguments into a Query object.\n \n @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type TransformQueryFunction = (\n name: string,\n args: ReadonlyJSONValue \| undefined,\n) => AnyQuery;\n"],"names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"mappings":";;;;;;;;;;;AA+BO,SAAS,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,YAAY;AAC9D,SAAO,UAAU,IAAI,QAAQ,mBAAmB,IAAI,KAAK;AAC3D;AAEA,eAAe,UACb,IAIA,QACA,mBACA,IACA,SACmC;AACnC,MAAI;AACJ,MAAI,WAAqB,CAAA;AACzB,MAAI;AACF,QAAI;AACJ,QAAI,6BAA6B,SAAS;AACxC,aAAO,MAAM,kBAAkB,KAAA;AAAA,IACjC,OAAO;AACL,aAAO;AAAA,IACT;AAEA,aAASA,MAAQ,MAAM,6BAA6B;AAEpD,eAAW,OAAO,CAAC,EAAE,IAAI,CAAA,MAAK,EAAE,EAAE;AAAA,EACpC,SAAS,OAAO;AACd,OAAG,QAAQ,mBAAmB,OAAO,oBAAoB,KAAK;AAE9D,UAAM,UAAU,~~wCAAwC~~,gBAAgB,KAAK,CAAC;~~AAC9E~~,UAAM,UAAU,gBAAgB,KAAK;AAErC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMC;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQC;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AAEA,MAAI;AACF,UAAM,aAAa,eAAe,OAAO,MAAM;AAE/C,UAAM,YAAmC,MAAM,QAAQ;AAAA,MACrD,OAAO,CAAC,EAAE,IAAI,OAAM,QAAO;AACzB,YAAI;AACJ,YAAI;AACF,gBAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,IAAI;AAC1C,uBAAa,WAAW,SAAS,OAAO,QAAQ;AAAA,QAClD,SAAS,OAAO;AACd,gBAAM,UAAU,gBAAgB,KAAK;AACrC,gBAAM,UAAU,gBAAgB,KAAK;AAErC,iBAAO;AAAA,YACL,OAAO,iBAAiB,kBAAkB,UAAU;AAAA,YACpD,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,YACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,UAAC;AAAA,QAE/B;AAEA,YAAI;AACF,gBAAM,IAAI,iBAAiB,UAAU;AACrC,gBAAM,MAAM,OAAO,EAAE,KAAK,UAAU;AAEpC,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,UAAA;AAAA,QAEJ,SAAS,OAAO;AACd,aAAG,QAAQ,qBAAqB,KAAK;AACrC,gBAAM;AAAA,QACR;AAAA,MACF,CAAC;AAAA,IAAA;AAGH,WAAO,CAAC,eAAe,SAAS;AAAA,EAClC,SAAS,GAAG;AACV,UAAM,UAAU,gBAAgB,CAAC;AACjC,UAAM,UAAU,gBAAgB,CAAC;AAEjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMF;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQE;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AACF;AAcO,SAAS,uBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,kBAAkB;AACpE,SAAO;AAAA,IACL,CAAC,MAAM,cAAc,eAAe,MAAM,UAAU,CAAC,CAAC;AAAA,IACtD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}
1	+ {"version":3,"file":"process-queries.js","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n transformRequestMessageSchema,\n type TransformRequestMessage,\n type TransformResponseBody,\n type TransformResponseMessage,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/*\n Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n \n This function will call `cb` in parallel for each query found in the request.\n \n If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@linkcode handleTransformRequest} instead.\n /\nexport function handleGetQueriesRequest<S extends Schema>(\n cb: (\n name: string,\n args: readonly ReadonlyJSONValue[],\n ) => MaybePromise<{query: AnyQuery} \| AnyQuery>,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n logLevel: LogLevel = 'info',\n): Promise<TransformResponseMessage> {\n const lc = createLogContext(logLevel).withContext('GetQueries');\n return transform(cb, schema, requestOrJsonBody, lc, 'get');\n}\n\nasync function transform<S extends Schema>(\n cb: (\n name: string,\n args: readonly ReadonlyJSONValue[],\n ) => MaybePromise<{query: AnyQuery} \| AnyQuery>,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n lc: LogContext,\n apiName: 'get' \| 'transform',\n): Promise<TransformResponseMessage> {\n let parsed: TransformRequestMessage;\n let queryIDs: string[] = [];\n try {\n let body: ReadonlyJSONValue;\n if (requestOrJsonBody instanceof Request) {\n body = await requestOrJsonBody.json();\n } else {\n body = requestOrJsonBody;\n }\n\n parsed = v.parse(body, transformRequestMessageSchema);\n\n queryIDs = parsed[1].map(r => r.id);\n } catch (error) {\n lc.error?.(`Failed to parse ${apiName} queries request`, error);\n\n const message = `Failed to parse ${apiName} queries request: ${getErrorMessage(error)}`;\n const details = getErrorDetails(error);\n\n return [\n 'transformFailed',\n {\n kind: ErrorKind.TransformFailed,\n origin: ErrorOrigin.Server,\n reason: ErrorReason.Parse,\n message,\n queryIDs,\n ...(details ? {details} : {}),\n },\n ];\n }\n\n try {\n const nameMapper = clientToServer(schema.tables);\n\n const responses: TransformResponseBody = await Promise.all(\n parsed[1].map(async req => {\n let finalQuery: AnyQuery;\n try {\n const result = await cb(req.name, req.args);\n finalQuery = 'query' in result ? result.query : result;\n } catch (error) {\n const message = getErrorMessage(error);\n const details = getErrorDetails(error);\n\n return {\n error: error instanceof QueryParseError ? 'parse' : 'app',\n id: req.id,\n name: req.name,\n message,\n ...(details ? {details} : {}),\n };\n }\n\n try {\n const q = asQueryInternals(finalQuery);\n const ast = mapAST(q.ast, nameMapper);\n\n return {\n id: req.id,\n name: req.name,\n ast,\n };\n } catch (error) {\n lc.error?.('Failed to map AST', error);\n throw error;\n }\n }),\n );\n\n return ['transformed', responses];\n } catch (e) {\n const message = getErrorMessage(e);\n const details = getErrorDetails(e);\n\n return [\n 'transformFailed',\n {\n kind: ErrorKind.TransformFailed,\n origin: ErrorOrigin.Server,\n reason: ErrorReason.Internal,\n message,\n queryIDs,\n ...(details ? {details} : {}),\n },\n ];\n }\n}\n\n/\n Processes a transform request by invoking the provided callback for each query.\n * The callback should return a Query that is the transformed result.\n \n This function will call `transformQuery` in parallel for each query found in the request.\n \n @param transformQuery - Callback function that takes a query name and args, and returns a Query\n * @param schema - The Zero schema\n * @param requestOrJsonBody - Either a Request object or the JSON body directly\n * @param logLevel - Logging level (defaults to 'info')\n * @returns A Promise that resolves to a TransformResponseMessage\n /\nexport function handleTransformRequest<S extends Schema>(\n transformQuery: TransformQueryFunction,\n schema: S,\n requestOrJsonBody: Request \| ReadonlyJSONValue,\n logLevel: LogLevel = 'info',\n) {\n const lc = createLogContext(logLevel).withContext('TransformRequest');\n return transform(\n (name, argsArray) => transformQuery(name, argsArray[0]),\n schema,\n requestOrJsonBody,\n lc,\n 'transform',\n );\n}\n\n/\n A function that transforms a query by name and arguments into a Query object.\n \n @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type TransformQueryFunction = (\n name: string,\n args: ReadonlyJSONValue \| undefined,\n) => AnyQuery;\n"],"names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"mappings":";;;;;;;;;;;AA+BO,SAAS,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,YAAY;AAC9D,SAAO,UAAU,IAAI,QAAQ,mBAAmB,IAAI,KAAK;AAC3D;AAEA,eAAe,UACb,IAIA,QACA,mBACA,IACA,SACmC;AACnC,MAAI;AACJ,MAAI,WAAqB,CAAA;AACzB,MAAI;AACF,QAAI;AACJ,QAAI,6BAA6B,SAAS;AACxC,aAAO,MAAM,kBAAkB,KAAA;AAAA,IACjC,OAAO;AACL,aAAO;AAAA,IACT;AAEA,aAASA,MAAQ,MAAM,6BAA6B;AAEpD,eAAW,OAAO,CAAC,EAAE,IAAI,CAAA,MAAK,EAAE,EAAE;AAAA,EACpC,SAAS,OAAO;AACd,OAAG,QAAQ,mBAAmB,OAAO,oBAAoB,KAAK;AAE9D,UAAM,UAAU,mBAAmB,OAAO,qBAAqB,gBAAgB,KAAK,CAAC;AACrF,UAAM,UAAU,gBAAgB,KAAK;AAErC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMC;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQC;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AAEA,MAAI;AACF,UAAM,aAAa,eAAe,OAAO,MAAM;AAE/C,UAAM,YAAmC,MAAM,QAAQ;AAAA,MACrD,OAAO,CAAC,EAAE,IAAI,OAAM,QAAO;AACzB,YAAI;AACJ,YAAI;AACF,gBAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,IAAI;AAC1C,uBAAa,WAAW,SAAS,OAAO,QAAQ;AAAA,QAClD,SAAS,OAAO;AACd,gBAAM,UAAU,gBAAgB,KAAK;AACrC,gBAAM,UAAU,gBAAgB,KAAK;AAErC,iBAAO;AAAA,YACL,OAAO,iBAAiB,kBAAkB,UAAU;AAAA,YACpD,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,YACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,UAAC;AAAA,QAE/B;AAEA,YAAI;AACF,gBAAM,IAAI,iBAAiB,UAAU;AACrC,gBAAM,MAAM,OAAO,EAAE,KAAK,UAAU;AAEpC,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,UAAA;AAAA,QAEJ,SAAS,OAAO;AACd,aAAG,QAAQ,qBAAqB,KAAK;AACrC,gBAAM;AAAA,QACR;AAAA,MACF,CAAC;AAAA,IAAA;AAGH,WAAO,CAAC,eAAe,SAAS;AAAA,EAClC,SAAS,GAAG;AACV,UAAM,UAAU,gBAAgB,CAAC;AACjC,UAAM,UAAU,gBAAgB,CAAC;AAEjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMF;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQE;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AACF;AAcO,SAAS,uBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,kBAAkB;AACpE,SAAO;AAAA,IACL,CAAC,MAAM,cAAc,eAAe,MAAM,UAAU,CAAC,CAAC;AAAA,IACtD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}

package/out/zero-server/src/zql-database.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,KAAK,EACV,YAAY,~~EAIb~~,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;~~AACtC~~,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;IAE3D,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBAQ1C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IAgEb,GAAG,CAAC,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EACpD,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}
1	+ {"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,KAAK,EACV,YAAY,EAGb,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;IAE3D,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBAQ1C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IAgEb,GAAG,CAAC,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EACpD,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}

package/out/zero-server/src/zql-database.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { formatPg, sql } from "../../z2s/src/sql.js";
-import { createBuilder } from "../../zql/src/query/named.js";
+import { createBuilder } from "../../zql/src/query/create-builder.js";
 import { makeSchemaCRUD, makeServerTransaction } from "./custom.js";
 class ZQLDatabase {
   connection;

package/out/zero-server/src/zql-database.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"zql-database.js","sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {\n DBConnection,\n DBTransaction,\n SchemaCRUD,\n ~~SchemaQuery,\n~~} from '../../zql/src/mutate/custom.ts';\nimport {createBuilder} from '../../zql/src/query/~~named~~.ts';\nimport type {\n HumanReadable,\n Query,\n RunOptions,\n} from '../../zql/src/query/query.ts';\nimport type {TransactionImpl} from './custom.ts';\nimport {makeSchemaCRUD, makeServerTransaction} from './custom.ts';\nimport type {\n Database,\n TransactionProviderHooks,\n TransactionProviderInput,\n} from './process-mutations.ts';\n\n/*\n Implements a Database for use with PushProcessor that is backed by Postgres.\n \n This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<S extends Schema, WrappedTransaction>\n implements Database<TransactionImpl<S, WrappedTransaction>>\n{\n readonly connection: DBConnection<WrappedTransaction>;\n readonly #mutate: (\n dbTransaction: DBTransaction<WrappedTransaction>,\n serverSchema: ServerSchema,\n ) => SchemaCRUD<S>;\n readonly #query: SchemaQuery<S>;\n readonly #schema: S;\n\n constructor(connection: DBConnection<WrappedTransaction>, schema: S) {\n this.connection = connection;\n this.#mutate = makeSchemaCRUD(schema);\n this.#query = createBuilder(schema);\n this.#schema = schema;\n }\n\n transaction<R>(\n callback: (\n tx: TransactionImpl<S, WrappedTransaction>,\n transactionHooks: TransactionProviderHooks,\n ) => MaybePromise<R>,\n transactionInput?: TransactionProviderInput,\n ): Promise<R> {\n // Icky hack. This is just here to have user not have to do this.\n // These interfaces need to be factored better.\n const {\n upstreamSchema = '',\n clientGroupID = '',\n clientID = '',\n mutationID = 0,\n } = transactionInput ?? {};\n return this.connection.transaction(async dbTx => {\n const zeroTx = await this.#makeServerTransaction(\n dbTx,\n clientID,\n mutationID,\n );\n\n return callback(zeroTx, {\n async updateClientMutationID() {\n const formatted = formatPg(\n sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n VALUES (${clientGroupID}, ${clientID}, ${1})\n ON CONFLICT (\"clientGroupID\", \"clientID\")\n DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n RETURNING \"lastMutationID\"`,\n );\n\n const [{lastMutationID}] = (await dbTx.query(\n formatted.text,\n formatted.values,\n )) as {lastMutationID: bigint}[];\n\n return {lastMutationID};\n },\n\n async writeMutationResult(result) {\n const formatted = formatPg(\n sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n result.result,\n )}::text::json)`,\n );\n await dbTx.query(formatted.text, formatted.values);\n },\n });\n });\n }\n\n async #makeServerTransaction(\n dbTx: DBTransaction<WrappedTransaction>,\n clientID: string,\n mutationID: number,\n ) {\n return await makeServerTransaction(\n dbTx,\n clientID,\n mutationID,\n this.#schema,\n this.#mutate,\n this.#query,\n );\n }\n\n run<TTable extends keyof S['tables'] & string, TReturn>(\n query: Query<S, TTable, TReturn>,\n options?: RunOptions,\n ): Promise<HumanReadable<TReturn>> {\n return this.transaction(tx => tx.run(query, options));\n }\n}\n"],"names":[],"mappings":";;;AA+BO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAIA;AAAA,EACA;AAAA,EAET,YAAY,YAA8C,QAAW;AACnE,SAAK,aAAa;AAClB,SAAK,UAAU,eAAe,MAAM;AACpC,SAAK,SAAS,cAAc,MAAM;AAClC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,uBACJ,MACA,UACA,YACA;AACA,WAAO,MAAM;AAAA,MACX;AAAA,MACA;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}
1	+ {"version":3,"file":"zql-database.js","sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {\n DBConnection,\n DBTransaction,\n SchemaCRUD,\n} from '../../zql/src/mutate/custom.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {\n HumanReadable,\n Query,\n RunOptions,\n} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\nimport type {TransactionImpl} from './custom.ts';\nimport {makeSchemaCRUD, makeServerTransaction} from './custom.ts';\nimport type {\n Database,\n TransactionProviderHooks,\n TransactionProviderInput,\n} from './process-mutations.ts';\n\n/*\n Implements a Database for use with PushProcessor that is backed by Postgres.\n \n This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<S extends Schema, WrappedTransaction>\n implements Database<TransactionImpl<S, WrappedTransaction>>\n{\n readonly connection: DBConnection<WrappedTransaction>;\n readonly #mutate: (\n dbTransaction: DBTransaction<WrappedTransaction>,\n serverSchema: ServerSchema,\n ) => SchemaCRUD<S>;\n readonly #query: SchemaQuery<S>;\n readonly #schema: S;\n\n constructor(connection: DBConnection<WrappedTransaction>, schema: S) {\n this.connection = connection;\n this.#mutate = makeSchemaCRUD(schema);\n this.#query = createBuilder(schema);\n this.#schema = schema;\n }\n\n transaction<R>(\n callback: (\n tx: TransactionImpl<S, WrappedTransaction>,\n transactionHooks: TransactionProviderHooks,\n ) => MaybePromise<R>,\n transactionInput?: TransactionProviderInput,\n ): Promise<R> {\n // Icky hack. This is just here to have user not have to do this.\n // These interfaces need to be factored better.\n const {\n upstreamSchema = '',\n clientGroupID = '',\n clientID = '',\n mutationID = 0,\n } = transactionInput ?? {};\n return this.connection.transaction(async dbTx => {\n const zeroTx = await this.#makeServerTransaction(\n dbTx,\n clientID,\n mutationID,\n );\n\n return callback(zeroTx, {\n async updateClientMutationID() {\n const formatted = formatPg(\n sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n VALUES (${clientGroupID}, ${clientID}, ${1})\n ON CONFLICT (\"clientGroupID\", \"clientID\")\n DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n RETURNING \"lastMutationID\"`,\n );\n\n const [{lastMutationID}] = (await dbTx.query(\n formatted.text,\n formatted.values,\n )) as {lastMutationID: bigint}[];\n\n return {lastMutationID};\n },\n\n async writeMutationResult(result) {\n const formatted = formatPg(\n sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n result.result,\n )}::text::json)`,\n );\n await dbTx.query(formatted.text, formatted.values);\n },\n });\n });\n }\n\n async #makeServerTransaction(\n dbTx: DBTransaction<WrappedTransaction>,\n clientID: string,\n mutationID: number,\n ) {\n return await makeServerTransaction(\n dbTx,\n clientID,\n mutationID,\n this.#schema,\n this.#mutate,\n this.#query,\n );\n }\n\n run<TTable extends keyof S['tables'] & string, TReturn>(\n query: Query<S, TTable, TReturn>,\n options?: RunOptions,\n ): Promise<HumanReadable<TReturn>> {\n return this.transaction(tx => tx.run(query, options));\n }\n}\n"],"names":[],"mappings":";;;AA+BO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAIA;AAAA,EACA;AAAA,EAET,YAAY,YAA8C,QAAW;AACnE,SAAK,aAAa;AAClB,SAAK,UAAU,eAAe,MAAM;AACpC,SAAK,SAAS,cAAc,MAAM;AAClC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,uBACJ,MACA,UACA,YACA;AACA,WAAO,MAAM;AAAA,MACX;AAAA,MACA;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}

package/out/zero-solid/src/use-query.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { type Accessor } from 'solid-js';
 import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
 import type { Schema } from '../../zero-types/src/schema.ts';
-import type { HumanReadable, Query } from '../../zql/src/query/query.ts';
+import type { HumanReadable, ToQuery } from '../../zql/src/query/query.ts';
 import { type TTL } from '../../zql/src/query/ttl.ts';
 export type QueryResult<TReturn> = readonly [
     Accessor<HumanReadable<TReturn>>,
@@ -19,6 +19,6 @@ export type UseQueryOptions = {
 /**
  * @deprecated Use {@linkcode useQuery} instead.
  */
-export declare function createQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(querySignal: Accessor<Query<TSchema, TTable, TReturn>>, options?: CreateQueryOptions | Accessor<CreateQueryOptions>): QueryResult<TReturn>;
-export declare function useQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(querySignal: Accessor<Query<TSchema, TTable, TReturn>>, options?: UseQueryOptions | Accessor<UseQueryOptions>): QueryResult<TReturn>;
+export declare function createQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>, options?: CreateQueryOptions | Accessor<CreateQueryOptions>): QueryResult<TReturn>;
+export declare function useQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>, options?: UseQueryOptions | Accessor<UseQueryOptions>): QueryResult<TReturn>;
 //# sourceMappingURL=use-query.d.ts.map

package/out/zero-solid/src/use-query.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAA0C~~,KAAK,QAAQ,~~EAAC~~,MAAM,UAAU,CAAC;~~AAIhF~~,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,aAAa,EAAE,~~KAAK~~,EAAC,MAAM,8BAA8B,CAAC;~~AACvE~~,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;~~AASpE~~,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC;CAClC,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,~~EAEP~~,WAAW,EAAE,QAAQ,CAAC,~~KAAK~~,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,~~EACtD~~,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,~~EAEP~~,WAAW,EAAE,QAAQ,CAAC,~~KAAK~~,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,~~EACtD~~,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,~~CA0EtB~~"}
1	+ {"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,aAAa,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;AAIpE,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC;CAClC,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,CAsDtB"}

package/out/zero-solid/src/use-query.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { createSignal, createComputed, onCleanup } from "solid-js";
+import { createSignal, createMemo, untrack, onCleanup, createEffect, on } from "solid-js";
 import { createStore } from "solid-js/store";
 import { bindingsForZero } from "../../zero-client/src/client/bindings.js";
 import { DEFAULT_TTL_MS } from "../../zql/src/query/ttl.js";
@@ -19,45 +19,34 @@ function useQuery(querySignal, options) {
   const refetch = () => {
     setRefetchKey((k) => k + 1);
   };
-  let view = void 0;
-  createComputed(
-    ([
-      prevView,
-      prevClientID,
-      prevQuery,
-      prevQueryHash,
-      prevTtl,
-      prevRefetchKey
-    ]) => {
-      const zero = useZero()();
-      const currentRefetchKey = refetchKey();
-      const { clientID } = zero;
-      const query = querySignal();
-      const bindings = bindingsForZero(zero);
-      const queryHash = bindings.hash(query);
-      const ttl = normalize(options)?.ttl ?? DEFAULT_TTL_MS;
-      if (!prevView || clientID !== prevClientID || prevRefetchKey !== currentRefetchKey || query !== prevQuery && (clientID === void 0 || queryHash !== prevQueryHash)) {
-        if (prevView) {
-          prevView.destroy();
-        }
-        view = bindings.materialize(
-          query,
-          createSolidViewFactory(setState, refetch),
-          { ttl }
-        );
-      } else {
-        view = prevView;
-        if (ttl !== prevTtl) {
-          view.updateTTL(ttl);
-        }
-      }
-      return [view, clientID, query, queryHash, ttl, currentRefetchKey];
-    },
-    [void 0, void 0, void 0, void 0, void 0, initialRefetchKey]
+  const zero = useZero();
+  const query = createMemo(
+    () => querySignal().toQuery(zero().context)
   );
-  onCleanup(() => {
-    view?.destroy();
+  const bindings = createMemo(() => bindingsForZero(zero()));
+  const hash = createMemo(() => bindings().hash(query()));
+  const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);
+  const initialTTL = ttl();
+  const view = createMemo(() => {
+    hash();
+    refetchKey();
+    const b = bindings();
+    const q = untrack(query);
+    const v = b.materialize(q, createSolidViewFactory(setState, refetch), {
+      ttl: initialTTL
+    });
+    onCleanup(() => v.destroy());
+    return v;
   });
+  createEffect(
+    on(
+      ttl,
+      (currentTTL) => {
+        view().updateTTL(currentTTL);
+      },
+      { defer: true }
+    )
+  );
   return [() => state[0][""], () => state[1]];
 }
 function normalize(options) {

package/out/zero-solid/src/use-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-query.js","sources":["../../../../zero-solid/src/use-query.ts"],"sourcesContent":["import {~~createComputed,~~ createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {createStore} from 'solid-js/store';\nimport ~~type~~ {~~ClientID} from '../../replicache/src/sync/ids.ts';\nimport {~~bindingsForZero} from '../../zero-client/src/client/bindings.ts';\nimport type {QueryResultDetails} from '../../zero-client/src/types/query-result.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {HumanReadable, ~~Query~~} from '../../zql/src/query/query.ts';\nimport {DEFAULT_TTL_MS, type TTL} from '../../zql/src/query/ttl.ts';\nimport {\n createSolidViewFactory~~,\n~~ UNKNOWN~~,\n type~~ ~~SolidView,\n~~ type State~~,\n~~} from './solid-view.ts';\nimport {useZero} from './use-zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n Accessor<HumanReadable<TReturn>>,\n Accessor<QueryResultDetails & {}>,\n];\n\n// Deprecated in 0.22\n/*\n @deprecated Use {@linkcode UseQueryOptions} instead.\n /\nexport type CreateQueryOptions = {\n ttl?: TTL \| undefined;\n};\n\nexport type UseQueryOptions = {\n ttl?: TTL \| undefined;\n};\n\n// Deprecated in 0.22\n/\n @deprecated Use {@linkcode useQuery} instead.\n */\nexport function createQuery<\n TSchema extends Schema,\n TTable extends keyof TSchema['tables'] & string,\n TReturn,\n>(\n querySignal: Accessor<~~Query~~<TSchema, TTable, TReturn>>,\n options?: CreateQueryOptions \| Accessor<CreateQueryOptions>,\n): QueryResult<TReturn> {\n return useQuery(querySignal, options);\n}\n\nexport function useQuery<\n TSchema extends Schema,\n TTable extends keyof TSchema['tables'] & string,\n TReturn,\n>(\n querySignal: Accessor<~~Query~~<TSchema, TTable, TReturn>>,\n options?: UseQueryOptions \| Accessor<UseQueryOptions>,\n): QueryResult<TReturn> {\n const [state, setState] = createStore<State>([\n {\n '': undefined,\n },\n UNKNOWN,\n ]);\n const initialRefetchKey = 0;\n const [refetchKey, setRefetchKey] = createSignal(initialRefetchKey);\n\n const refetch = () => {\n setRefetchKey(k => k + 1);\n };\n\n ~~let~~ ~~view:~~ ~~SolidView \| undefined~~ = ~~undefined~~;\n\n // ~~Wrap~~ in in ~~createComputed to ensure a new view is created if the querySignal changes.\~~n ~~createComputed<\n~~ ~~[\n SolidView~~ \| ~~undefined~~,\n ~~ClientID \| undefined,\~~n ~~Query<TSchema,~~ ~~TTable,~~ ~~TReturn>~~ ~~\| undefined,\n string \| undefined,\n TTL \| undefined,\n number,\n ]\n >~~(\n (~~[\n prevView,\n prevClientID,\n prevQuery,\n prevQueryHash,\n prevTtl,\n prevRefetchKey,\n ]~~) => {\n const ~~zero~~ = ~~useZero~~()();\n const ~~currentRefetchKey~~ = ~~refetchKey~~(); // ~~depend~~ on ~~refetchKey to force re-evaluation~~\n const ~~{clientID}~~ = ~~zero~~;\n const ~~query~~ = ~~querySignal~~()~~;\n const~~ ~~bindings~~ ~~= bindingsForZero(zero);\~~n ~~const~~ ~~queryHash~~ = ~~bindings.~~hash~~(query);\n const~~ ~~ttl~~ = ~~normalize(options)?.ttl~~ ?? ~~DEFAULT_TTL_MS;\n if~~ ~~(\n !prevView~~ ~~\|\|\n clientID~~ ~~!==~~ ~~prevClientID~~ ~~\|\|\~~n ~~prevRefetchKey~~ ~~!== currentRefetchKey \|\|\n (~~query ~~!==~~ ~~prevQuery~~ ~~&&\n (clientID~~ ~~===~~ ~~undefined~~ \|\| ~~queryHash~~ ~~!== prevQueryHash~~))\n ) {\n if (~~prevView~~) ~~{\n prevView.destroy~~();\n }\n ~~view~~ = ~~bindings~~.materialize(~~\n query,\n~~ createSolidViewFactory(setState, refetch),\n {ttl},\n );\n ~~} else {~~\n ~~view = prevView;\n if~~ (~~ttl~~ ~~!==~~ ~~prevTtl) {\n view~~.~~updateTTL~~(~~ttl~~);\n }\n }\n\n ~~return~~ ~~[view,~~ ~~clientID,~~ ~~query,~~ ~~queryHash,~~ ~~ttl,~~ ~~currentRefetchKey];\n },\n [undefined,~~ ~~undefined,~~ ~~undefined, undefined, undefined, initialRefetchKey],\~~n ~~);\~~n\n ~~onCleanup(()~~ => {\n view~~?.destroy~~();\n });\n\n return [() => state[0][''] as HumanReadable<TReturn>, () => state[1]];\n}\n\nfunction normalize<T>(options?: T \| Accessor<T \| undefined>): T \| undefined {\n return typeof options === 'function' ? (options as Accessor<T>)() : options;\n}\n"],"names":[],"mappings":";;;;;;~~AAqCO~~,SAAS,~~YAKd~~,aACA,SACsB;AACtB,SAAO,SAAS,aAAa,OAAO;AACtC;AAEO,SAAS,~~SAKd~~,aACA,SACsB;AACtB,QAAM,CAAC,OAAO,QAAQ,IAAI,YAAmB;AAAA,IAC3C;AAAA,MACE,IAAI;AAAA,IAAA;AAAA,IAEN;AAAA,EAAA,CACD;AACD,QAAM,oBAAoB;AAC1B,QAAM,CAAC,YAAY,aAAa,IAAI,aAAa,iBAAiB;AAElE,QAAM,UAAU,MAAM;AACpB,kBAAc,CAAA,MAAK,IAAI,CAAC;AAAA,EAC1B;AAEA,~~MAAI~~,~~OAA8B~~;~~AAGlC;AAAA~~,~~IAUE~~,~~CAAC~~;AAAA,~~MACC;AAAA~~,~~MACA;AAAA~~,~~MACA;AAAA~~,~~MACA;AAAA~~,~~MACA;AAAA~~,~~MACA~~;AAAA,~~IAAA,MACI~~;~~AACJ~~,~~YAAM~~,~~OAAO~~,~~UAAQ;AACrB~~,~~YAAM~~,~~oBAAoB~~,~~WAAA;AAC1B~~,~~YAAM~~,~~EAAC,aAAY~~;~~AACnB~~,~~YAAM~~,~~QAAQ~~,~~YAAA;AACd,YAAM,~~WAAW,~~gBAAgB~~,~~IAAI;AACrC~~,~~YAAM~~,~~YAAY~~,~~SAAS~~,~~KAAK~~,~~KAAK~~;~~AACrC~~,~~YAAM~~,MAAM,UAAU,OAAO,GAAG,OAAO;~~AACvC~~,~~UACE~~,~~CAAC,YACD,~~aAAa,~~gBACb~~,~~mBAAmB~~,~~qBAClB~~,~~UAAU~~,~~cACR~~,~~aAAa~~,~~UAAa,cAAc,gBAC3C~~;AACA,~~YAAI~~,~~UAAU~~;~~AACZ~~,~~mBAAS~~,~~QAAA;AAAA~~,~~QACX~~;~~AACA~~,~~eAAO~~,~~SAAS;AAAA~~,~~UACd;AAAA~~,~~UACA~~,uBAAuB,UAAU,OAAO;AAAA,~~UACxC~~,~~EAAC,IAAA~~;AAAA,~~QAAG;AAAA~~,~~MAER,OAAO~~;~~AACL~~,~~eAAO;AACP~~,~~YAAI~~,~~QAAQ~~,SAAS;~~AACnB~~,~~eAAK~~,~~UAAU~~,~~GAAG~~;AAAA,~~QACpB~~;AAAA,~~MACF~~;~~AAEA~~,~~aAAO~~,~~CAAC~~,~~MAAM~~,~~UAAU~~,~~OAAO~~,~~WAAW~~,~~KAAK,iBAAiB~~;AAAA,~~IAClE~~;AAAA,~~IACA~~,~~CAAC~~,~~QAAW~~,~~QAAW,QAAW,QAAW,QAAW,iBAAiB~~;AAAA,~~EAAA~~;~~AAG3E,YAAU,MAAM;AACd,UAAM,QAAA;~~AAAA,~~EACR,CAAC~~;~~AAED~~,SAAO,CAAC,MAAM,MAAM,CAAC,EAAE,EAAE,GAA6B,MAAM,MAAM,CAAC,CAAC;AACtE;AAEA,SAAS,UAAa,SAAsD;AAC1E,SAAO,OAAO,YAAY,aAAc,QAAA,IAA4B;AACtE;"}
1	+ {"version":3,"file":"use-query.js","sources":["../../../../zero-solid/src/use-query.ts"],"sourcesContent":["import {\n createEffect,\n createMemo,\n createSignal,\n on,\n onCleanup,\n untrack,\n type Accessor,\n} from 'solid-js';\nimport {createStore} from 'solid-js/store';\nimport {bindingsForZero} from '../../zero-client/src/client/bindings.ts';\nimport type {QueryResultDetails} from '../../zero-client/src/types/query-result.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {HumanReadable, ToQuery} from '../../zql/src/query/query.ts';\nimport {DEFAULT_TTL_MS, type TTL} from '../../zql/src/query/ttl.ts';\nimport {createSolidViewFactory, UNKNOWN, type State} from './solid-view.ts';\nimport {useZero} from './use-zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n Accessor<HumanReadable<TReturn>>,\n Accessor<QueryResultDetails & {}>,\n];\n\n// Deprecated in 0.22\n/*\n @deprecated Use {@linkcode UseQueryOptions} instead.\n /\nexport type CreateQueryOptions = {\n ttl?: TTL \| undefined;\n};\n\nexport type UseQueryOptions = {\n ttl?: TTL \| undefined;\n};\n\n// Deprecated in 0.22\n/\n @deprecated Use {@linkcode useQuery} instead.\n */\nexport function createQuery<\n TSchema extends Schema,\n TTable extends keyof TSchema['tables'] & string,\n TReturn,\n TContext,\n>(\n querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>,\n options?: CreateQueryOptions \| Accessor<CreateQueryOptions>,\n): QueryResult<TReturn> {\n return useQuery(querySignal, options);\n}\n\nexport function useQuery<\n TSchema extends Schema,\n TTable extends keyof TSchema['tables'] & string,\n TReturn,\n TContext,\n>(\n querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>,\n options?: UseQueryOptions \| Accessor<UseQueryOptions>,\n): QueryResult<TReturn> {\n const [state, setState] = createStore<State>([\n {\n '': undefined,\n },\n UNKNOWN,\n ]);\n const initialRefetchKey = 0;\n const [refetchKey, setRefetchKey] = createSignal(initialRefetchKey);\n\n const refetch = () => {\n setRefetchKey(k => k + 1);\n };\n\n const zero = useZero();\n\n const query = createMemo(() =>\n querySignal().toQuery(zero().context as TContext),\n );\n const bindings = createMemo(() => bindingsForZero(zero()));\n const hash = createMemo(() => bindings().hash(query()));\n const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);\n\n const initialTTL = ttl();\n\n const view = createMemo(() => {\n // Depend on hash instead of query to avoid recreating the view when the\n // query object changes but the hash is the same.\n hash();\n refetchKey();\n const b = bindings();\n const q = untrack(query);\n\n const v = b.materialize(q, createSolidViewFactory(setState, refetch), {\n ttl: initialTTL,\n });\n\n onCleanup(() => v.destroy());\n\n return v;\n });\n\n // Update TTL on existing view when it changes.\n createEffect(\n on(\n ttl,\n currentTTL => {\n view().updateTTL(currentTTL);\n },\n {defer: true},\n ),\n );\n\n return [() => state[0][''] as HumanReadable<TReturn>, () => state[1]];\n}\n\nfunction normalize<T>(options?: T \| Accessor<T \| undefined>): T \| undefined {\n return typeof options === 'function' ? (options as Accessor<T>)() : options;\n}\n"],"names":[],"mappings":";;;;;;AAuCO,SAAS,YAMd,aACA,SACsB;AACtB,SAAO,SAAS,aAAa,OAAO;AACtC;AAEO,SAAS,SAMd,aACA,SACsB;AACtB,QAAM,CAAC,OAAO,QAAQ,IAAI,YAAmB;AAAA,IAC3C;AAAA,MACE,IAAI;AAAA,IAAA;AAAA,IAEN;AAAA,EAAA,CACD;AACD,QAAM,oBAAoB;AAC1B,QAAM,CAAC,YAAY,aAAa,IAAI,aAAa,iBAAiB;AAElE,QAAM,UAAU,MAAM;AACpB,kBAAc,CAAA,MAAK,IAAI,CAAC;AAAA,EAC1B;AAEA,QAAM,OAAO,QAAA;AAEb,QAAM,QAAQ;AAAA,IAAW,MACvB,YAAA,EAAc,QAAQ,KAAA,EAAO,OAAmB;AAAA,EAAA;AAElD,QAAM,WAAW,WAAW,MAAM,gBAAgB,KAAA,CAAM,CAAC;AACzD,QAAM,OAAO,WAAW,MAAM,SAAA,EAAW,KAAK,MAAA,CAAO,CAAC;AACtD,QAAM,MAAM,WAAW,MAAM,UAAU,OAAO,GAAG,OAAO,cAAc;AAEtE,QAAM,aAAa,IAAA;AAEnB,QAAM,OAAO,WAAW,MAAM;AAG5B,SAAA;AACA,eAAA;AACA,UAAM,IAAI,SAAA;AACV,UAAM,IAAI,QAAQ,KAAK;AAEvB,UAAM,IAAI,EAAE,YAAY,GAAG,uBAAuB,UAAU,OAAO,GAAG;AAAA,MACpE,KAAK;AAAA,IAAA,CACN;AAED,cAAU,MAAM,EAAE,SAAS;AAE3B,WAAO;AAAA,EACT,CAAC;AAGD;AAAA,IACE;AAAA,MACE;AAAA,MACA,CAAA,eAAc;AACZ,aAAA,EAAO,UAAU,UAAU;AAAA,MAC7B;AAAA,MACA,EAAC,OAAO,KAAA;AAAA,IAAI;AAAA,EACd;AAGF,SAAO,CAAC,MAAM,MAAM,CAAC,EAAE,EAAE,GAA6B,MAAM,MAAM,CAAC,CAAC;AACtE;AAEA,SAAS,UAAa,SAAsD;AAC1E,SAAO,OAAO,YAAY,aAAc,QAAA,IAA4B;AACtE;"}

package/out/zero-solid/src/use-zero-connection-state.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero-connection-state.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero-connection-state.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAA0B~~,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;~~AAChE~~,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAGhF;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,QAAQ,CAAC,eAAe,CAAC,~~CAYlE~~"}
1	+ {"version":3,"file":"use-zero-connection-state.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero-connection-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAGhF;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,QAAQ,CAAC,eAAe,CAAC,CAclE"}

package/out/zero-solid/src/use-zero-connection-state.js CHANGED Viewed

@@ -1,12 +1,14 @@
-import { createSignal, onCleanup } from "solid-js";
+import { createSignal, createEffect, onCleanup } from "solid-js";
 import { useZero } from "./use-zero.js";
 function useZeroConnectionState() {
-  const zero = useZero()();
+  const zero = useZero();
   const [connectionState, setConnectionState] = createSignal(
-    zero.connection.state.current
+    zero().connection.state.current
   );
-  const unsubscribe = zero.connection.state.subscribe(setConnectionState);
-  onCleanup(unsubscribe);
+  createEffect(() => {
+    const unsubscribe = zero().connection.state.subscribe(setConnectionState);
+    onCleanup(unsubscribe);
+  });
   return connectionState;
 }
 export {

package/out/zero-solid/src/use-zero-connection-state.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero-connection-state.js","sources":["../../../../zero-solid/src/use-zero-connection-state.ts"],"sourcesContent":["import {createSignal, onCleanup, type Accessor} from 'solid-js';\nimport type {ConnectionState} from '../../zero-client/src/client/connection.ts';\nimport {useZero} from './use-zero.ts';\n\n/*\n Tracks the connection status of the current Zero instance.\n \n @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useZeroConnectionState(): Accessor<ConnectionState> {\n const zero = useZero()();\n\n const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n zero.connection.state.current,\n );\n\n const unsubscribe = zero.connection.state.subscribe(setConnectionState);\n\n onCleanup(unsubscribe);\n\n return connectionState;\n}\n"],"names":[],"mappings":";;AAUO,SAAS,yBAAoD;AAClE,QAAM,OAAO,~~UAAQ~~;~~AAErB~~,QAAM,CAAC,iBAAiB,kBAAkB,IAAI;AAAA,IAC5C,~~KAAK~~,WAAW,MAAM;AAAA,EAAA;~~AAGxB~~,~~QAAM~~,cAAc,~~KAAK~~,WAAW,MAAM,UAAU,kBAAkB;~~AAEtE~~,~~YAAU~~,WAAW;~~AAErB~~,SAAO;AACT;"}
1	+ {"version":3,"file":"use-zero-connection-state.js","sources":["../../../../zero-solid/src/use-zero-connection-state.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport type {ConnectionState} from '../../zero-client/src/client/connection.ts';\nimport {useZero} from './use-zero.ts';\n\n/*\n Tracks the connection status of the current Zero instance.\n \n @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useZeroConnectionState(): Accessor<ConnectionState> {\n const zero = useZero();\n\n const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n zero().connection.state.current,\n );\n\n createEffect(() => {\n const unsubscribe = zero().connection.state.subscribe(setConnectionState);\n\n onCleanup(unsubscribe);\n });\n\n return connectionState;\n}\n"],"names":[],"mappings":";;AAUO,SAAS,yBAAoD;AAClE,QAAM,OAAO,QAAA;AAEb,QAAM,CAAC,iBAAiB,kBAAkB,IAAI;AAAA,IAC5C,KAAA,EAAO,WAAW,MAAM;AAAA,EAAA;AAG1B,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA,EAAO,WAAW,MAAM,UAAU,kBAAkB;AAExE,cAAU,WAAW;AAAA,EACvB,CAAC;AAED,SAAO;AACT;"}

package/out/zero-solid/src/use-zero-online.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero-online.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero-online.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAA0B~~,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;~~AAGhE~~;;;;;GAKG;AACH,wBAAgB,aAAa,IAAI,QAAQ,CAAC,OAAO,CAAC,~~CAUjD~~"}
1	+ {"version":3,"file":"use-zero-online.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero-online.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAG9E;;;;;GAKG;AACH,wBAAgB,aAAa,IAAI,QAAQ,CAAC,OAAO,CAAC,CAYjD"}

package/out/zero-solid/src/use-zero-online.js CHANGED Viewed

@@ -1,10 +1,12 @@
-import { createSignal, onCleanup } from "solid-js";
+import { createSignal, createEffect, onCleanup } from "solid-js";
 import { useZero } from "./use-zero.js";
 function useZeroOnline() {
-  const zero = useZero()();
-  const [online, setOnline] = createSignal(zero.online);
-  const unsubscribe = zero.onOnline(setOnline);
-  onCleanup(unsubscribe);
+  const zero = useZero();
+  const [online, setOnline] = createSignal(zero().online);
+  createEffect(() => {
+    const unsubscribe = zero().onOnline(setOnline);
+    onCleanup(unsubscribe);
+  });
   return online;
 }
 export {

package/out/zero-solid/src/use-zero-online.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero-online.js","sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/*\n Tracks the online status of the current Zero instance.\n \n @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@linkcode useZeroConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n const zero = useZero()();\n\n const [online, setOnline] = createSignal<boolean>(zero.online);\n\n const unsubscribe = zero.onOnline(setOnline);\n\n onCleanup(unsubscribe);\n\n return online;\n}\n"],"names":[],"mappings":";;AASO,SAAS,gBAAmC;AACjD,QAAM,OAAO,~~UAAQ~~;~~AAErB~~,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAsB,~~KAAK~~,MAAM;~~AAE7D~~,~~QAAM~~,cAAc,~~KAAK~~,SAAS,SAAS;~~AAE3C~~,~~YAAU~~,WAAW;~~AAErB~~,SAAO;AACT;"}
1	+ {"version":3,"file":"use-zero-online.js","sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/*\n Tracks the online status of the current Zero instance.\n \n @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@linkcode useZeroConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n const zero = useZero();\n\n const [online, setOnline] = createSignal<boolean>(zero().online);\n\n createEffect(() => {\n const unsubscribe = zero().onOnline(setOnline);\n\n onCleanup(unsubscribe);\n });\n\n return online;\n}\n"],"names":[],"mappings":";;AASO,SAAS,gBAAmC;AACjD,QAAM,OAAO,QAAA;AAEb,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAsB,KAAA,EAAO,MAAM;AAE/D,eAAa,MAAM;AACjB,UAAM,cAAc,OAAO,SAAS,SAAS;AAE7C,cAAU,WAAW;AAAA,EACvB,CAAC;AAED,SAAO;AACT;"}

package/out/zero-solid/src/use-zero.d.ts CHANGED Viewed

@@ -3,12 +3,13 @@ import type { CustomMutatorDefs } from '../../zero-client/src/client/custom.ts';
 import type { ZeroOptions } from '../../zero-client/src/client/options.ts';
 import { Zero } from '../../zero-client/src/client/zero.ts';
 import type { Schema } from '../../zero-types/src/schema.ts';
-export declare function createZero<S extends Schema, MD extends CustomMutatorDefs, Context>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context>;
-export declare function useZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => Zero<S, MD, Context>;
-export declare function createUseZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => () => Zero<S, MD, Context, undefined>;
-export declare function ZeroProvider<S extends Schema, MD extends CustomMutatorDefs | undefined, Context>(props: {
+import type { AnyMutatorRegistry } from '../../zql/src/mutate/mutator-registry.ts';
+export declare function createZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context>;
+export declare function useZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => Zero<S, MD, Context>;
+export declare function createUseZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => () => Zero<S, MD, Context>;
+export declare function ZeroProvider<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined, Context>(props: {
     children: JSX.Element;
-    init?: (zero: Zero<S, MD>) => void;
+    init?: (zero: Zero<S, MD, Context>) => void;
 } & ({
     zero: Zero<S, MD, Context>;
 } | ZeroOptions<S, MD, Context>)): JSX.Element;

package/out/zero-solid/src/use-zero.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,GAAG,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;~~AAS3D~~,wBAAgB,UAAU,CACxB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,~~EAC5B~~,OAAO,~~EACP~~,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAM5D;AAED,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~EACpD~~,OAAO,GAAG,OAAO,KACd,MAAM,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAO9B;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~EACpD~~,OAAO,GAAG,OAAO,~~iDAGlB~~;AAED,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,~~EACxC~~,OAAO,EAEP,KAAK,EAAE;~~IAAC~~,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;~~IAAC~~,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,~~CAAA~~;~~CAAC~~,GAAG,~~CACjE~~;IACE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;CAC5B,GACD,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAC9B,~~eAqDF~~"}
1	+ {"version":3,"file":"use-zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,GAAG,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AASjF,wBAAgB,UAAU,CACxB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,EACjB,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAM5D;AAED,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,KACd,MAAM,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAO9B;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,sCAGlB;AAED,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,EAC7D,OAAO,EAEP,KAAK,EAAE;IACL,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC7C,GAAG,CACA;IACE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;CAC5B,GACD,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAC9B,eAsDF"}

package/out/zero-solid/src/use-zero.js CHANGED Viewed

@@ -1,8 +1,6 @@
 import { createContext, batch, useContext, createMemo, splitProps, untrack, onCleanup, createEffect } from "solid-js";
 import { Zero } from "../../zero-client/src/client/zero.js";
-const ZeroContext = createContext(
-  void 0
-);
+const ZeroContext = createContext(void 0);
 const NO_AUTH_SET = Symbol();
 function createZero(options) {
   const opts = {
@@ -37,9 +35,7 @@ function ZeroProvider(props) {
     onCleanup(() => createdZero.close());
     return createdZero;
   });
-  const auth = createMemo(
-    () => "auth" in props ? props.auth : NO_AUTH_SET
-  );
+  const auth = createMemo(() => "auth" in props ? props.auth : NO_AUTH_SET);
   let prevAuth = NO_AUTH_SET;
   createEffect(() => {
     const currentZero = zero();

package/out/zero-solid/src/use-zero.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-zero.js","sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n batch,\n createContext,\n createEffect,\n createMemo,\n onCleanup,\n splitProps,\n untrack,\n useContext,\n type Accessor,\n type JSX,\n} from 'solid-js';\nimport type {CustomMutatorDefs} from '../../zero-client/src/client/custom.ts';\nimport type {ZeroOptions} from '../../zero-client/src/client/options.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\n\n// oxlint-disable-next-line no-explicit-any\~~nconst ZeroContext = createContext<~~Accessor<Zero<any, any, any>> \| undefined>(\n undefined~~,\n~~);\n\nconst NO_AUTH_SET = Symbol();\n\nexport function createZero<\n S extends Schema,\n MD extends CustomMutatorDefs,\n Context,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n const opts = {\n ...options,\n batchViewUpdates: batch,\n };\n return new Zero(opts);\n}\n\nexport function useZero<\n S extends Schema,\n MD extends CustomMutatorDefs \| undefined = undefined,\n Context = unknown,\n>(): () => Zero<S, MD, Context> {\n const zero = useContext(ZeroContext);\n\n if (zero === undefined) {\n throw new Error('useZero must be used within a ZeroProvider');\n }\n return zero;\n}\n\nexport function createUseZero<\n S extends Schema,\n MD extends CustomMutatorDefs \| undefined = undefined,\n Context = unknown,\n>() {\n return () => useZero<S, MD, Context>();\n}\n\nexport function ZeroProvider<\n S extends Schema,\n MD extends CustomMutatorDefs \| undefined,\n Context,\n>(\n props: {children: JSX.Element; init?: (zero: Zero<S, MD>) => void} & (\n \| {\n zero: Zero<S, MD, Context>;\n }\n \| ZeroOptions<S, MD, Context>\n ),\n) {\n const zero = createMemo(() => {\n if ('zero' in props) {\n return props.zero;\n }\n\n const [, options] = splitProps(props, ['children', 'auth']);\n\n const authValue = untrack(() => props.auth);\n const createdZero = new Zero({\n ...options,\n ...(authValue !== undefined ? {auth: authValue} : {}),\n batchViewUpdates: batch,\n });\n options.init?.(createdZero);\n onCleanup(() => createdZero.close());\n return createdZero;\n });\n\n const auth = createMemo<typeof NO_AUTH_SET \| ZeroOptions<S, MD>['auth']>(\n () => ('auth' in props ? props.auth : NO_AUTH_SET)~~,\n~~ );\n\n let prevAuth: typeof NO_AUTH_SET \| ZeroOptions<S, MD>['auth'] = NO_AUTH_SET;\n\n createEffect(() => {\n const currentZero = zero();\n if (!currentZero) {\n return;\n }\n\n const currentAuth = auth();\n\n if (prevAuth === NO_AUTH_SET) {\n prevAuth = currentAuth;\n return;\n }\n\n if (currentAuth !== prevAuth) {\n prevAuth = currentAuth;\n void currentZero.connection.connect({\n auth: currentAuth === NO_AUTH_SET ? undefined : currentAuth,\n });\n }\n });\n\n return ZeroContext.Provider({\n value: zero,\n get children() {\n return props.children;\n },\n });\n}\n"],"names":[],"mappings":";;AAkBA,MAAM,cAAc~~;AAAA~~,~~EAClB~~;~~AACF;AAEA~~,MAAM,cAAc,OAAA;AAEb,SAAS,WAId,SAA4D;AAC5D,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,kBAAkB;AAAA,EAAA;AAEpB,SAAO,IAAI,KAAK,IAAI;AACtB;AAEO,SAAS,UAIgB;AAC9B,QAAM,OAAO,WAAW,WAAW;AAEnC,MAAI,SAAS,QAAW;AACtB,UAAM,IAAI,MAAM,4CAA4C;AAAA,EAC9D;AACA,SAAO;AACT;AAEO,SAAS,gBAIZ;AACF,SAAO,MAAM,QAAA;AACf;AAEO,SAAS,aAKd,~~OAMA~~;AACA,QAAM,OAAO,WAAW,MAAM;AAC5B,QAAI,UAAU,OAAO;AACnB,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,CAAA,EAAG,OAAO,IAAI,WAAW,OAAO,CAAC,YAAY,MAAM,CAAC;AAE1D,UAAM,YAAY,QAAQ,MAAM,MAAM,IAAI;AAC1C,UAAM,cAAc,IAAI,KAAK;AAAA,MAC3B,GAAG;AAAA,MACH,GAAI,cAAc,SAAY,EAAC,MAAM,UAAA,IAAa,CAAA;AAAA,MAClD,kBAAkB;AAAA,IAAA,CACnB;AACD,YAAQ,OAAO,WAAW;AAC1B,cAAU,MAAM,YAAY,OAAO;AACnC,WAAO;AAAA,EACT,CAAC;AAED,QAAM,OAAO~~;AAAA~~,~~IACX~~,MAAO,UAAU,QAAQ,MAAM,OAAO~~;AAAA~~,~~EAAA~~;~~AAGxC~~,MAAI,~~WAA4D~~;~~AAEhE~~,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA;AACpB,QAAI,CAAC,aAAa;AAChB;AAAA,IACF;AAEA,UAAM,cAAc,KAAA;AAEpB,QAAI,aAAa,aAAa;AAC5B,iBAAW;AACX;AAAA,IACF;AAEA,QAAI,gBAAgB,UAAU;AAC5B,iBAAW;AACX,WAAK,YAAY,WAAW,QAAQ;AAAA,QAClC,MAAM,gBAAgB,cAAc,SAAY;AAAA,MAAA,CACjD;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,YAAY,SAAS;AAAA,IAC1B,OAAO;AAAA,IACP,IAAI,WAAW;AACb,aAAO,MAAM;AAAA,IACf;AAAA,EAAA,CACD;AACH;"}
1	+ {"version":3,"file":"use-zero.js","sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n batch,\n createContext,\n createEffect,\n createMemo,\n onCleanup,\n splitProps,\n untrack,\n useContext,\n type Accessor,\n type JSX,\n} from 'solid-js';\nimport type {CustomMutatorDefs} from '../../zero-client/src/client/custom.ts';\nimport type {ZeroOptions} from '../../zero-client/src/client/options.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\n\nconst ZeroContext = createContext<\n // oxlint-disable-next-line no-explicit-any\n Accessor<Zero<any, any, any>> \| undefined\n>(undefined);\n\nconst NO_AUTH_SET = Symbol();\n\nexport function createZero<\n S extends Schema,\n MD extends AnyMutatorRegistry \| CustomMutatorDefs \| undefined = undefined,\n Context = unknown,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n const opts = {\n ...options,\n batchViewUpdates: batch,\n };\n return new Zero(opts);\n}\n\nexport function useZero<\n S extends Schema,\n MD extends AnyMutatorRegistry \| CustomMutatorDefs \| undefined = undefined,\n Context = unknown,\n>(): () => Zero<S, MD, Context> {\n const zero = useContext(ZeroContext);\n\n if (zero === undefined) {\n throw new Error('useZero must be used within a ZeroProvider');\n }\n return zero;\n}\n\nexport function createUseZero<\n S extends Schema,\n MD extends AnyMutatorRegistry \| CustomMutatorDefs \| undefined = undefined,\n Context = unknown,\n>() {\n return () => useZero<S, MD, Context>();\n}\n\nexport function ZeroProvider<\n S extends Schema,\n MD extends AnyMutatorRegistry \| CustomMutatorDefs \| undefined,\n Context,\n>(\n props: {\n children: JSX.Element;\n init?: (zero: Zero<S, MD, Context>) => void;\n } & (\n \| {\n zero: Zero<S, MD, Context>;\n }\n \| ZeroOptions<S, MD, Context>\n ),\n) {\n const zero = createMemo(() => {\n if ('zero' in props) {\n return props.zero;\n }\n\n const [, options] = splitProps(props, ['children', 'auth']);\n\n const authValue = untrack(() => props.auth);\n const createdZero = new Zero({\n ...options,\n ...(authValue !== undefined ? {auth: authValue} : {}),\n batchViewUpdates: batch,\n });\n options.init?.(createdZero);\n onCleanup(() => createdZero.close());\n return createdZero;\n });\n\n const auth = createMemo<\n typeof NO_AUTH_SET \| ZeroOptions<S, MD, Context>['auth']\n >(() => ('auth' in props ? props.auth : NO_AUTH_SET));\n\n let prevAuth: typeof NO_AUTH_SET \| ZeroOptions<S, MD, Context>['auth'] =\n NO_AUTH_SET;\n\n createEffect(() => {\n const currentZero = zero();\n if (!currentZero) {\n return;\n }\n\n const currentAuth = auth();\n\n if (prevAuth === NO_AUTH_SET) {\n prevAuth = currentAuth;\n return;\n }\n\n if (currentAuth !== prevAuth) {\n prevAuth = currentAuth;\n void currentZero.connection.connect({\n auth: currentAuth === NO_AUTH_SET ? undefined : currentAuth,\n });\n }\n });\n\n return ZeroContext.Provider({\n value: zero,\n get children() {\n return props.children;\n },\n });\n}\n"],"names":[],"mappings":";;AAkBA,MAAM,cAAc,cAGlB,MAAS;AAEX,MAAM,cAAc,OAAA;AAEb,SAAS,WAId,SAA4D;AAC5D,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,kBAAkB;AAAA,EAAA;AAEpB,SAAO,IAAI,KAAK,IAAI;AACtB;AAEO,SAAS,UAIgB;AAC9B,QAAM,OAAO,WAAW,WAAW;AAEnC,MAAI,SAAS,QAAW;AACtB,UAAM,IAAI,MAAM,4CAA4C;AAAA,EAC9D;AACA,SAAO;AACT;AAEO,SAAS,gBAIZ;AACF,SAAO,MAAM,QAAA;AACf;AAEO,SAAS,aAKd,OASA;AACA,QAAM,OAAO,WAAW,MAAM;AAC5B,QAAI,UAAU,OAAO;AACnB,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,CAAA,EAAG,OAAO,IAAI,WAAW,OAAO,CAAC,YAAY,MAAM,CAAC;AAE1D,UAAM,YAAY,QAAQ,MAAM,MAAM,IAAI;AAC1C,UAAM,cAAc,IAAI,KAAK;AAAA,MAC3B,GAAG;AAAA,MACH,GAAI,cAAc,SAAY,EAAC,MAAM,UAAA,IAAa,CAAA;AAAA,MAClD,kBAAkB;AAAA,IAAA,CACnB;AACD,YAAQ,OAAO,WAAW;AAC1B,cAAU,MAAM,YAAY,OAAO;AACnC,WAAO;AAAA,EACT,CAAC;AAED,QAAM,OAAO,WAEX,MAAO,UAAU,QAAQ,MAAM,OAAO,WAAY;AAEpD,MAAI,WACF;AAEF,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA;AACpB,QAAI,CAAC,aAAa;AAChB;AAAA,IACF;AAEA,UAAM,cAAc,KAAA;AAEpB,QAAI,aAAa,aAAa;AAC5B,iBAAW;AACX;AAAA,IACF;AAEA,QAAI,gBAAgB,UAAU;AAC5B,iBAAW;AACX,WAAK,YAAY,WAAW,QAAQ;AAAA,QAClC,MAAM,gBAAgB,cAAc,SAAY;AAAA,MAAA,CACjD;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,YAAY,SAAS;AAAA,IAC1B,OAAO;AAAA,IACP,IAAI,WAAW;AACb,aAAO,MAAM;AAAA,IACf;AAAA,EAAA,CACD;AACH;"}

package/out/zql/src/builder/builder.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ import { type FilterInput } from '../ivm/filter-operators.ts';
 import type { Input, InputBase, Storage } from '../ivm/operator.ts';
 import type { Source, SourceInput } from '../ivm/source.ts';
 import type { ConnectionCostModel } from '../planner/planner-connection.ts';
+import type { PlanDebugger } from '../planner/planner-debug.ts';
 import type { DebugDelegate } from './debug-delegate.ts';
 import { type NoSubqueryCondition } from './filter.ts';
 export type StaticQueryParameters = {
@@ -79,7 +80,7 @@ export interface BuilderDelegate {
  * const sink = new MySink(input);
  * ```
  */
-export declare function buildPipeline(ast: AST, delegate: BuilderDelegate, queryID: string, costModel?: ConnectionCostModel, lc?: LogContext): Input;
+export declare function buildPipeline(ast: AST, delegate: BuilderDelegate, queryID: string, costModel?: ConnectionCostModel, lc?: LogContext, planDebugger?: PlanDebugger): Input;
 export declare function bindStaticParameters(ast: AST, staticQueryParameters: StaticQueryParameters | undefined): AST;
 /**
  * Checks if a condition tree contains any NOT EXISTS operations.

package/out/zql/src/builder/builder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EACV,GAAG,EAGH,SAAS,EAIT,WAAW,EAEX,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAI1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAE1E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAkB,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClD,KAAK,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/C;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAElD,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAEnE,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAEhE;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,mBAAmB,EAC/B,EAAE,CAAC,EAAE,UAAU,~~GACd~~,KAAK,CAsBP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AAyBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAsB5D;AA+PD,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,WAAW,CAsCb;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,WAAW,6EAa7D;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,GACnB,SAAS,IAAI,mBAAmB,CAQlC;AAqHD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAgBN;AA8CD,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,SAAS,GACd,OAAO,CAUT;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,SAAS,SAAS,EAAE,EAChC,SAAS,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,OAAO,uCAYrC"}
1	+ {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EACV,GAAG,EAGH,SAAS,EAIT,WAAW,EAEX,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAI1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAE1E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAkB,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClD,KAAK,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/C;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAElD,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAEnE,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAEhE;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,mBAAmB,EAC/B,EAAE,CAAC,EAAE,UAAU,EACf,YAAY,CAAC,EAAE,YAAY,GAC1B,KAAK,CAsBP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AAyBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAsB5D;AA+PD,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,WAAW,CAsCb;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,WAAW,6EAa7D;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,GACnB,SAAS,IAAI,mBAAmB,CAQlC;AAqHD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAgBN;AA8CD,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,SAAS,GACd,OAAO,CAUT;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,SAAS,SAAS,EAAE,EAChC,SAAS,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,OAAO,uCAYrC"}

package/out/zql/src/builder/builder.js CHANGED Viewed

@@ -15,7 +15,7 @@ import { UnionFanOut } from "../ivm/union-fan-out.js";
 import { planQuery } from "../planner/planner-builder.js";
 import { completeOrdering } from "../query/complete-ordering.js";
 import { createPredicate } from "./filter.js";
-function buildPipeline(ast, delegate, queryID, costModel, lc) {
+function buildPipeline(ast, delegate, queryID, costModel, lc, planDebugger) {
   ast = delegate.mapAst ? delegate.mapAst(ast) : ast;
   ast = completeOrdering(
     ast,
@@ -23,10 +23,11 @@ function buildPipeline(ast, delegate, queryID, costModel, lc) {
   );
   if (costModel) {
     try {
-      ast = planQuery(ast, costModel);
+      ast = planQuery(ast, costModel, planDebugger);
     } catch (e) {
       if (e instanceof PlannerException) {
-        `Query planner failed (${e.kind}), falling back to unoptimized query: ${e.message}`;
+        const message = `Query planner failed (${e.kind}), falling back to unoptimized query: ${e.message}`;
+        lc?.warn?.(message);
       } else {
         throw e;
       }