@rocicorp/zero 1.11.0-canary.1 → 1.11.0-canary.2

package/out/zql/src/query/runnable-query-impl.js

@@ -2,8 +2,28 @@ import { tableAST } from "../../../zero-protocol/src/ast.js";
 import { defaultFormat } from "../../../zero-types/src/format.js";
 import { QueryImpl } from "./query-impl.js";
 //#region ../zql/src/query/runnable-query-impl.ts
+/**
+* Runnable roots are interned per delegate *and* schema -- a query is only
+* interchangeable with another if it would run against the same delegate. See
+* `query-transitions.ts` for why roots need to be shared at all.
+*/
+var rootsByDelegate = /* @__PURE__ */ new WeakMap();
 function newRunnableQuery(delegate, schema, table) {
-	return new RunnableQueryImpl(delegate, schema, table, tableAST(table), defaultFormat, void 0);
+	let bySchema = rootsByDelegate.get(delegate);
+	if (!bySchema) {
+		bySchema = /* @__PURE__ */ new WeakMap();
+		rootsByDelegate.set(delegate, bySchema);
+	}
+	let roots = bySchema.get(schema);
+	if (!roots) {
+		roots = /* @__PURE__ */ new Map();
+		bySchema.set(schema, roots);
+	}
+	const existing = roots.get(table)?.deref();
+	if (existing) return existing;
+	const created = new RunnableQueryImpl(delegate, schema, table, tableAST(table), defaultFormat, void 0);
+	roots.set(table, new WeakRef(created));
+	return created;
 }
 var RunnableQueryImpl = class RunnableQueryImpl extends QueryImpl {
 	#delegate;

package/out/zql/src/query/runnable-query-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"runnable-query-impl.js","names":["#delegate"],"sources":["../../../../../zql/src/query/runnable-query-impl.ts"],"sourcesContent":["import {\n  tableAST,\n  type NormalizedAST,\n  type System,\n} from '../../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {defaultFormat} from '../ivm/default-format.ts';\nimport type {Format, ViewFactory} from '../ivm/view.ts';\nimport type {CustomQueryID} from './named.ts';\nimport type {QueryDelegate} from './query-delegate.ts';\nimport {QueryImpl} from './query-impl.ts';\nimport type {\n  HumanReadable,\n  MaterializeOptions,\n  PreloadOptions,\n  PullRow,\n  Query,\n  RunOptions,\n} from './query.ts';\nimport type {TTL} from './ttl.ts';\nimport type {TypedView} from './typed-view.ts';\n\nexport function newRunnableQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n>(\n  delegate: QueryDelegate,\n  schema: TSchema,\n  table: TTable,\n): Query<TTable, TSchema> {\n  return new RunnableQueryImpl(\n    delegate,\n    schema,\n    table,\n    tableAST(table),\n    defaultFormat,\n    undefined,\n  );\n}\n\nexport class RunnableQueryImpl<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n  TReturn = PullRow<TTable, TSchema>,\n>\n  extends QueryImpl<TTable, TSchema, TReturn>\n  implements Query<TTable, TSchema, TReturn>\n{\n  readonly #delegate: QueryDelegate;\n\n  constructor(\n    delegate: QueryDelegate,\n    schema: TSchema,\n    tableName: TTable,\n    ast: NormalizedAST = tableAST(tableName),\n    format: Format = defaultFormat,\n    system: System = 'client',\n    customQueryID?: CustomQueryID,\n    currentJunction?: string,\n  ) {\n    super(\n      schema,\n      tableName,\n      ast,\n      format,\n      system,\n      customQueryID,\n      currentJunction,\n      (tableName, ast, format, customQueryID, currentJunction) =>\n        new RunnableQueryImpl(\n          delegate,\n          schema,\n          tableName,\n          ast,\n          format,\n          system,\n          customQueryID,\n          currentJunction,\n        ),\n    );\n    this.#delegate = delegate;\n  }\n\n  override run(options?: RunOptions): Promise<HumanReadable<TReturn>> {\n    // The type arguments on the delegate calls in this class are written out\n    // because tsc 7.0.2 fails to infer them in some program layouts (the\n    // packages/zero declaration build, apps/zero-throughput): inference\n    // collapses TSchema to its constraint and the call misreports as a\n    // TS2345 assignability error. Explicit arguments are inert where\n    // inference works and correct where it does not.\n    return this.#delegate.run<TTable, TSchema, TReturn>(this, options);\n  }\n\n  override preload(options?: PreloadOptions): {\n    cleanup: () => void;\n    complete: Promise<void>;\n  } {\n    return this.#delegate.preload<TTable, TSchema, TReturn>(this, options);\n  }\n\n  override materialize(ttl?: TTL): TypedView<HumanReadable<TReturn>>;\n  override materialize<T>(\n    factory: ViewFactory<TTable, TSchema, TReturn, T>,\n    ttl?: TTL,\n  ): T;\n  override materialize<T>(\n    factory?: unknown,\n    ttl?: unknown,\n  ): T | TypedView<HumanReadable<TReturn>> {\n    let actualFactory: ViewFactory<TTable, TSchema, TReturn, T> | undefined;\n    let options: MaterializeOptions | undefined;\n\n    if (typeof factory === 'function') {\n      actualFactory = factory as ViewFactory<TTable, TSchema, TReturn, T>;\n      options = {ttl: ttl as TTL | undefined};\n    } else {\n      actualFactory = undefined;\n      options = {ttl: factory as TTL | undefined};\n    }\n\n    return this.#delegate.materialize<TTable, TSchema, TReturn, T>(\n      this,\n      actualFactory,\n      options,\n    );\n  }\n}\n"],"mappings":";;;;AAsBA,SAAgB,iBAId,UACA,QACA,OACwB;CACxB,OAAO,IAAI,kBACT,UACA,QACA,OACA,SAAS,KAAK,GACd,eACA,KAAA,CACF;AACF;AAEA,IAAa,oBAAb,MAAa,0BAKH,UAEV;CACE;CAEA,YACE,UACA,QACA,WACA,MAAqB,SAAS,SAAS,GACvC,SAAiB,eACjB,SAAiB,UACjB,eACA,iBACA;EACA,MACE,QACA,WACA,KACA,QACA,QACA,eACA,kBACC,WAAW,KAAK,QAAQ,eAAe,oBACtC,IAAI,kBACF,UACA,QACA,WACA,KACA,QACA,QACA,eACA,eACF,CACJ;EACA,KAAKA,YAAY;CACnB;CAEA,IAAa,SAAuD;EAOlE,OAAO,KAAKA,UAAU,IAA8B,MAAM,OAAO;CACnE;CAEA,QAAiB,SAGf;EACA,OAAO,KAAKA,UAAU,QAAkC,MAAM,OAAO;CACvE;CAOA,YACE,SACA,KACuC;EACvC,IAAI;EACJ,IAAI;EAEJ,IAAI,OAAO,YAAY,YAAY;GACjC,gBAAgB;GAChB,UAAU,EAAM,IAAsB;EACxC,OAAO;GACL,gBAAgB,KAAA;GAChB,UAAU,EAAC,KAAK,QAA0B;EAC5C;EAEA,OAAO,KAAKA,UAAU,YACpB,MACA,eACA,OACF;CACF;AACF"}
+{"version":3,"file":"runnable-query-impl.js","names":["#delegate"],"sources":["../../../../../zql/src/query/runnable-query-impl.ts"],"sourcesContent":["import {\n  tableAST,\n  type NormalizedAST,\n  type System,\n} from '../../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {defaultFormat} from '../ivm/default-format.ts';\nimport type {Format, ViewFactory} from '../ivm/view.ts';\nimport type {CustomQueryID} from './named.ts';\nimport type {QueryDelegate} from './query-delegate.ts';\nimport {QueryImpl} from './query-impl.ts';\nimport type {\n  HumanReadable,\n  MaterializeOptions,\n  PreloadOptions,\n  PullRow,\n  Query,\n  RunOptions,\n} from './query.ts';\nimport type {TTL} from './ttl.ts';\nimport type {TypedView} from './typed-view.ts';\n\n/**\n * Runnable roots are interned per delegate *and* schema -- a query is only\n * interchangeable with another if it would run against the same delegate. See\n * `query-transitions.ts` for why roots need to be shared at all.\n */\nconst rootsByDelegate = new WeakMap<\n  QueryDelegate,\n  // oxlint-disable-next-line no-explicit-any\n  WeakMap<Schema, Map<string, WeakRef<RunnableQueryImpl<any, any, any>>>>\n>();\n\nexport function newRunnableQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n>(\n  delegate: QueryDelegate,\n  schema: TSchema,\n  table: TTable,\n): Query<TTable, TSchema> {\n  let bySchema = rootsByDelegate.get(delegate);\n  if (!bySchema) {\n    bySchema = new WeakMap();\n    rootsByDelegate.set(delegate, bySchema);\n  }\n  let roots = bySchema.get(schema);\n  if (!roots) {\n    roots = new Map();\n    bySchema.set(schema, roots);\n  }\n\n  const existing = roots.get(table)?.deref();\n  if (existing) {\n    return existing as RunnableQueryImpl<TTable, TSchema>;\n  }\n\n  const created = new RunnableQueryImpl<TTable, TSchema>(\n    delegate,\n    schema,\n    table,\n    tableAST(table),\n    defaultFormat,\n    undefined,\n  );\n  roots.set(table, new WeakRef(created));\n  return created;\n}\n\nexport class RunnableQueryImpl<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n  TReturn = PullRow<TTable, TSchema>,\n>\n  extends QueryImpl<TTable, TSchema, TReturn>\n  implements Query<TTable, TSchema, TReturn>\n{\n  readonly #delegate: QueryDelegate;\n\n  constructor(\n    delegate: QueryDelegate,\n    schema: TSchema,\n    tableName: TTable,\n    ast: NormalizedAST = tableAST(tableName),\n    format: Format = defaultFormat,\n    system: System = 'client',\n    customQueryID?: CustomQueryID,\n    currentJunction?: string,\n  ) {\n    super(\n      schema,\n      tableName,\n      ast,\n      format,\n      system,\n      customQueryID,\n      currentJunction,\n      (tableName, ast, format, customQueryID, currentJunction) =>\n        new RunnableQueryImpl(\n          delegate,\n          schema,\n          tableName,\n          ast,\n          format,\n          system,\n          customQueryID,\n          currentJunction,\n        ),\n    );\n    this.#delegate = delegate;\n  }\n\n  override run(options?: RunOptions): Promise<HumanReadable<TReturn>> {\n    // The type arguments on the delegate calls in this class are written out\n    // because tsc 7.0.2 fails to infer them in some program layouts (the\n    // packages/zero declaration build, apps/zero-throughput): inference\n    // collapses TSchema to its constraint and the call misreports as a\n    // TS2345 assignability error. Explicit arguments are inert where\n    // inference works and correct where it does not.\n    return this.#delegate.run<TTable, TSchema, TReturn>(this, options);\n  }\n\n  override preload(options?: PreloadOptions): {\n    cleanup: () => void;\n    complete: Promise<void>;\n  } {\n    return this.#delegate.preload<TTable, TSchema, TReturn>(this, options);\n  }\n\n  override materialize(ttl?: TTL): TypedView<HumanReadable<TReturn>>;\n  override materialize<T>(\n    factory: ViewFactory<TTable, TSchema, TReturn, T>,\n    ttl?: TTL,\n  ): T;\n  override materialize<T>(\n    factory?: unknown,\n    ttl?: unknown,\n  ): T | TypedView<HumanReadable<TReturn>> {\n    let actualFactory: ViewFactory<TTable, TSchema, TReturn, T> | undefined;\n    let options: MaterializeOptions | undefined;\n\n    if (typeof factory === 'function') {\n      actualFactory = factory as ViewFactory<TTable, TSchema, TReturn, T>;\n      options = {ttl: ttl as TTL | undefined};\n    } else {\n      actualFactory = undefined;\n      options = {ttl: factory as TTL | undefined};\n    }\n\n    return this.#delegate.materialize<TTable, TSchema, TReturn, T>(\n      this,\n      actualFactory,\n      options,\n    );\n  }\n}\n"],"mappings":";;;;;;;;;AA2BA,IAAM,kCAAkB,IAAI,QAI1B;AAEF,SAAgB,iBAId,UACA,QACA,OACwB;CACxB,IAAI,WAAW,gBAAgB,IAAI,QAAQ;CAC3C,IAAI,CAAC,UAAU;EACb,2BAAW,IAAI,QAAQ;EACvB,gBAAgB,IAAI,UAAU,QAAQ;CACxC;CACA,IAAI,QAAQ,SAAS,IAAI,MAAM;CAC/B,IAAI,CAAC,OAAO;EACV,wBAAQ,IAAI,IAAI;EAChB,SAAS,IAAI,QAAQ,KAAK;CAC5B;CAEA,MAAM,WAAW,MAAM,IAAI,KAAK,GAAG,MAAM;CACzC,IAAI,UACF,OAAO;CAGT,MAAM,UAAU,IAAI,kBAClB,UACA,QACA,OACA,SAAS,KAAK,GACd,eACA,KAAA,CACF;CACA,MAAM,IAAI,OAAO,IAAI,QAAQ,OAAO,CAAC;CACrC,OAAO;AACT;AAEA,IAAa,oBAAb,MAAa,0BAKH,UAEV;CACE;CAEA,YACE,UACA,QACA,WACA,MAAqB,SAAS,SAAS,GACvC,SAAiB,eACjB,SAAiB,UACjB,eACA,iBACA;EACA,MACE,QACA,WACA,KACA,QACA,QACA,eACA,kBACC,WAAW,KAAK,QAAQ,eAAe,oBACtC,IAAI,kBACF,UACA,QACA,WACA,KACA,QACA,QACA,eACA,eACF,CACJ;EACA,KAAKA,YAAY;CACnB;CAEA,IAAa,SAAuD;EAOlE,OAAO,KAAKA,UAAU,IAA8B,MAAM,OAAO;CACnE;CAEA,QAAiB,SAGf;EACA,OAAO,KAAKA,UAAU,QAAkC,MAAM,OAAO;CACvE;CAOA,YACE,SACA,KACuC;EACvC,IAAI;EACJ,IAAI;EAEJ,IAAI,OAAO,YAAY,YAAY;GACjC,gBAAgB;GAChB,UAAU,EAAM,IAAsB;EACxC,OAAO;GACL,gBAAgB,KAAA;GAChB,UAAU,EAAC,KAAK,QAA0B;EAC5C;EAEA,OAAO,KAAKA,UAAU,YACpB,MACA,eACA,OACF;CACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocicorp/zero",
-  "version": "1.11.0-canary.1",
+  "version": "1.11.0-canary.2",
   "description": "Zero is a web framework for serverless web development.",
   "homepage": "https://zero.rocicorp.dev",
   "bugs": {