@rocicorp/zero 0.25.0-canary.1 → 0.25.0-canary.11

package/out/zero-cache/src/services/view-syncer/schema/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,GAGpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAC,SAAS,EAAe,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAe,EACf,EAAc,EACd,KAAc;IAEd,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEhC,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;QAC1E,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,4EAA4E;QAC5E,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YAC5B,MAAM,OAAO,GAA0B,EAAE,CAAC;YAC1C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,EAAE,CAE9B;+CACwC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CACpE,IAAI,CACL,EAAE,CAAC;gBACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,OAAO,CAAC,IAAI,CACV,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC;;+BAErC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAC3C,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,EAAE,CAAC,IAAI,EAAE,CAAC,gCAAgC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;YACjE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;YAC/D,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,wCAAwC,CAAC;QAC5E,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA;oBACM,EAAE,CAAC,MAAM,CAAC;6CACe,CAAC;YACxC,MAAM,EAAE,CAAA;oBACM,EAAE,CAAC,MAAM,CAAC;qDACuB,CAAC;QAClD,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;YACxE,MAAM,EAAE,CAAA,eAAe,EAAE,CACvB,MAAM,CACP,0CAA0C,CAAC;YAC5C,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,6BAA6B,CAAC;YAE/D,MAAM,EAAE,CAAA,sCAAsC,EAAE,CAC9C,MAAM,CACP,wBAAwB,CAAC;YAC1B,MAAM,EAAE,CAAA,0CAA0C,EAAE,CAClD,MAAM,CACP,4BAA4B,CAAC;QAChC,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CACvB,MAAM,CACP,8CAA8C,CAAC;QAClD,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAc;QAC/B,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qCAAqC,CAAC;QACzE,CAAC;KACF,CAAC;IAEF,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,+BAA+B,CAAC;YACjE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,gCAAgC,CAAC;YAClE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,iDAAiD,CAAC;QACrF,CAAC;KACF,CAAC;IAEF,MAAM,eAAe,GAAc;QACjC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,wBAAwB,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;YAChE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,kCAAkC,CAAC;YACpE,MAAM,EAAE,CAAA,wBAAwB,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC;YAClE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qCAAqC,CAAC;YACvE,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,gCAAgC,CAAC;QACpE,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,qEAAqE,CAAC;QACzG,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAA,eAAe,EAAE,CAAC,MAAM,CAAC,sEAAsE,CAAC;QAC1G,CAAC;KACF,CAAC;IAEF,MAAM,gBAAgB,GAAc;QAClC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,GAAG,CAAA;gDACiC,GAAG,CAAC,MAAM,CAAC;OACpD,CAAC;YAEF,2DAA2D;YAC3D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI;gBAC/B,CAAC,SAAS,EAAE,WAAW,CAAC;gBACxB,CAAC,SAAS,EAAE,WAAW,CAAC;gBACxB,CAAC,MAAM,EAAE,aAAa,CAAC;aACF,EAAE,CAAC;gBACxB,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC;gBACnD,MAAM,GAAG,CAAA;wBACO,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC;gBACpF,MAAM,GAAG,CAAA;wBACO,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,UAAU;;yBAErD,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC;;SAE7C,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,kEAAkE;QAClE,iEAAiE;QACjE,CAAC,EAAE,EAAC,cAAc,EAAE,CAAC,EAAC;QACtB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,CAAC,EAAE,aAAa;QAChB,mEAAmE;QACnE,iEAAiE;QACjE,sBAAsB;QACtB,EAAE,EAAE,cAAc;QAClB,0EAA0E;QAC1E,6BAA6B;QAC7B,EAAE,EAAE,eAAe;QACnB,EAAE,EAAE,gBAAgB;QACpB,gCAAgC;QAChC,EAAE,EAAE,gBAAgB;QACpB,kEAAkE;QAClE,+DAA+D;QAC/D,qBAAqB;QACrB,EAAE,EAAE,gBAAgB;KACrB,CAAC;IAEF,MAAM,mBAAmB,CACvB,GAAG,EACH,aAAa,EACb,SAAS,CAAC,KAAK,CAAC,EAChB,EAAE,EACF,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"init.js","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {PendingQuery, Row} from 'postgres';\nimport {\n  runSchemaMigrations,\n  type IncrementalMigrationMap,\n  type Migration,\n} from '../../../db/migration.ts';\nimport type {PostgresDB} from '../../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../../types/shards.ts';\nimport {createRowsVersionTable, setupCVRTables} from './cvr.ts';\n\nexport async function initViewSyncerSchema(\n  log: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<void> {\n  const schema = cvrSchema(shard);\n\n  const setupMigration: Migration = {\n    migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),\n    minSafeVersion: 1,\n  };\n\n  const migrateV1toV2: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"replicaVersion\" TEXT`;\n    },\n  };\n\n  const migrateV2ToV3: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx.unsafe(createRowsVersionTable(shard));\n    },\n\n    /** Populates the cvr.rowsVersion table with versions from cvr.instances. */\n    migrateData: async (lc, tx) => {\n      const pending: PendingQuery<Row[]>[] = [];\n      for await (const versions of tx<\n        {clientGroupID: string; version: string}[]\n      >`\n      SELECT \"clientGroupID\", \"version\" FROM ${tx(schema)}.instances`.cursor(\n        5000,\n      )) {\n        for (const version of versions) {\n          pending.push(\n            tx`INSERT INTO ${tx(schema)}.\"rowsVersion\" ${tx(version)} \n               ON CONFLICT (\"clientGroupID\")\n               DO UPDATE SET ${tx(version)}`.execute(),\n          );\n        }\n      }\n      lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);\n      await Promise.all(pending);\n    },\n  };\n\n  const migrateV3ToV4: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"owner\" TEXT`;\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"grantedAt\" TIMESTAMPTZ`;\n    },\n  };\n\n  const migrateV5ToV6: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`\n      ALTER TABLE ${tx(schema)}.\"rows\"\n        DROP CONSTRAINT fk_rows_client_group`;\n      await tx`\n      ALTER TABLE ${tx(schema)}.\"rowsVersion\"\n        DROP CONSTRAINT fk_rows_version_client_group`;\n    },\n  };\n\n  const migrateV6ToV7: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.desires ADD \"expiresAt\" TIMESTAMPTZ`;\n      await tx`ALTER TABLE ${tx(\n        schema,\n      )}.desires ADD \"inactivatedAt\" TIMESTAMPTZ`;\n      await tx`ALTER TABLE ${tx(schema)}.desires ADD \"ttl\" INTERVAL`;\n\n      await tx`CREATE INDEX desires_expires_at ON ${tx(\n        schema,\n      )}.desires (\"expiresAt\")`;\n      await tx`CREATE INDEX desires_inactivated_at ON ${tx(\n        schema,\n      )}.desires (\"inactivatedAt\")`;\n    },\n  };\n\n  const migrateV7ToV8: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(\n        schema,\n      )}.\"desires\" DROP CONSTRAINT fk_desires_client`;\n    },\n  };\n\n  const migrateV8ToV9: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"clientSchema\" JSONB`;\n    },\n  };\n\n  const migrateV9ToV10: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.queries ADD \"queryName\" TEXT`;\n      await tx`ALTER TABLE ${tx(schema)}.queries ADD \"queryArgs\" JSONB`;\n      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN \"clientAST\" DROP NOT NULL`;\n    },\n  };\n\n  const migrateV10ToV11: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;\n      await tx`ALTER TABLE ${tx(schema)}.desires DROP COLUMN \"expiresAt\"`;\n      await tx`DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;\n      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN \"patchVersion\"`;\n      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN \"deleted\"`;\n    },\n  };\n\n  const migratedV11ToV12: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN \"queryArgs\" TYPE JSON USING \"queryArgs\"::JSON`;\n    },\n  };\n\n  const migratedV12ToV13: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD COLUMN \"ttlClock\" DOUBLE PRECISION NOT NULL DEFAULT 0`;\n    },\n  };\n\n  const migratedV13ToV14: Migration = {\n    migrateSchema: async (_, sql) => {\n      await sql`\n        CREATE INDEX instances_last_active ON ${sql(schema)}.instances (\"lastActive\");\n      `;\n\n      // Update / add foreign key constraints to cascade deletes.\n      for (const [table, reference] of [\n        ['clients', 'instances'],\n        ['queries', 'instances'],\n        ['rows', 'rowsVersion'],\n      ] as [string, string][]) {\n        const constraint = sql(`fk_${table}_client_group`);\n        await sql`\n          ALTER TABLE ${sql(schema)}.${sql(table)} DROP CONSTRAINT IF EXISTS ${constraint}`;\n        await sql`\n          ALTER TABLE ${sql(schema)}.${sql(table)} ADD CONSTRAINT ${constraint}\n            FOREIGN KEY(\"clientGroupID\")\n            REFERENCES ${sql(schema)}.${sql(reference)} (\"clientGroupID\")\n            ON DELETE CASCADE;\n        `;\n      }\n    },\n  };\n\n  const migratedV14ToV15: Migration = {\n    migrateSchema: async (_, sql) => {\n      // Add new columns for storing inactivatedAt and ttl in milliseconds.\n      // This avoids postgres.js type conversion issues with TIMESTAMPTZ and INTERVAL.\n      await sql`ALTER TABLE ${sql(schema)}.desires \n        ADD COLUMN \"inactivatedAtMs\" DOUBLE PRECISION`;\n      await sql`ALTER TABLE ${sql(schema)}.desires \n        ADD COLUMN \"ttlMs\" DOUBLE PRECISION`;\n    },\n    // Migrate existing data: convert TIMESTAMPTZ to milliseconds for inactivatedAt\n    // and INTERVAL to milliseconds for ttl\n    // Note: EXTRACT(EPOCH FROM NULL) returns NULL, so NULL values are preserved\n    migrateData: async (lc, sql) => {\n      lc.info?.(\n        'Migrating desires.inactivatedAt to inactivatedAtMs and ttl to ttlMs',\n      );\n      await sql`\n        UPDATE ${sql(schema)}.desires\n        SET \"inactivatedAtMs\" = EXTRACT(EPOCH FROM \"inactivatedAt\") * 1000,\n            \"ttlMs\" = EXTRACT(EPOCH FROM \"ttl\") * 1000\n      `;\n    },\n  };\n\n  const schemaVersionMigrationMap: IncrementalMigrationMap = {\n    2: migrateV1toV2,\n    3: migrateV2ToV3,\n    4: migrateV3ToV4,\n    // v5 enables asynchronous row-record flushing, and thus relies on\n    // the logic that updates and checks the rowsVersion table in v3.\n    5: {minSafeVersion: 3},\n    6: migrateV5ToV6,\n    7: migrateV6ToV7,\n    8: migrateV7ToV8,\n    9: migrateV8ToV9,\n    // v10 adds queryName and queryArgs to the queries table to support\n    // custom queries. clientAST is now optional to support migrating\n    // off client queries.\n    10: migrateV9ToV10,\n    // V11 removes the deprecated queries.\"expiresAt\", clients.\"patchVersion\",\n    // clients.\"deleted\" columns.\n    11: migrateV10ToV11,\n    12: migratedV11ToV12,\n    // V13 adds instances.\"ttlClock\"\n    13: migratedV12ToV13,\n    // V14 adds an index on instances.\"lastActive\" and a FK constraint\n    // from rows.\"clientGroupID\" to rowsVersion.\"clientGroupID\" for\n    // garbage collection\n    14: migratedV13ToV14,\n    // V15 adds desires.\"inactivatedAtTTLClock\" to store TTLClock values\n    // directly as DOUBLE PRECISION, avoiding postgres.js TIMESTAMPTZ\n    // type conversion issues\n    15: migratedV14ToV15,\n  };\n\n  await runSchemaMigrations(\n    log,\n    'view-syncer',\n    cvrSchema(shard),\n    db,\n    setupMigration,\n    schemaVersionMigrationMap,\n  );\n}\n"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/view-syncer/schema/types.d.ts

@@ -483,7 +483,7 @@ export declare const patchSchema: v.ObjectType<{
 export declare const putRowPatchSchema: v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op" | "rowVersion"> & {
+}, "type" | "op" | "id" | "rowVersion"> & {
     type: v.Type<"row">;
     op: v.Type<"put">;
     id: v.ObjectType<{
@@ -497,7 +497,7 @@ export type PutRowPatch = v.Infer<typeof putRowPatchSchema>;
 export declare const delRowPatchSchema: v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op"> & {
+}, "type" | "op" | "id"> & {
     type: v.Type<"row">;
     op: v.Type<"del">;
     id: v.ObjectType<{
@@ -510,7 +510,7 @@ export type DelRowPatch = v.Infer<typeof delRowPatchSchema>;
 export declare const rowPatchSchema: v.UnionType<[v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op" | "rowVersion"> & {
+}, "type" | "op" | "id" | "rowVersion"> & {
     type: v.Type<"row">;
     op: v.Type<"put">;
     id: v.ObjectType<{
@@ -522,7 +522,7 @@ export declare const rowPatchSchema: v.UnionType<[v.ObjectType<Omit<{
 }, undefined>, v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op"> & {
+}, "type" | "op" | "id"> & {
     type: v.Type<"row">;
     op: v.Type<"del">;
     id: v.ObjectType<{

package/out/zero-cache/src/services/view-syncer/schema/types.js

@@ -1,288 +1,296 @@
 import { jsonValueSchema } from "../../../../../shared/src/bigint-json.js";
 import { jsonSchema } from "../../../../../shared/src/json-schema.js";
-import * as v from "../../../../../shared/src/valita.js";
+import { readonly, literalUnion } from "../../../../../shared/src/valita.js";
 import { astSchema } from "../../../../../zero-protocol/src/ast.js";
-import { versionFromLexi, versionToLexi } from "../../../types/lexi-version.js";
+import { versionToLexi, versionFromLexi } from "../../../types/lexi-version.js";
 import { ttlClockSchema } from "../ttl-clock.js";
-export const cvrVersionSchema = v.object({
-    /**
-     * The database `stateVersion` with which the rows in the CVR are consistent.
-     */
-    stateVersion: v.string(), // LexiVersion
-    /**
-     * `minorVersion` is subversion of `stateVersion` that is initially absent for each
-     * `stateVersion`, and incremented for configuration changes that affect the contents
-     * of the CVR such as:
-     *
-     * * query set changes
-     * * query transformation changes (which may happen for changes
-     *   in server-side logic or authorization policies)
-     *
-     * Such configuration changes are always correlated with a change to one or more
-     * `/meta/...` records in the CVR, often (but not always) with corresponding
-     * patches in `/patches/meta/...`.
-     *
-     * When the `stateVersion` moves forward, the `minorVersion` is reset to absent.
-     * In this manner it behaves like the analogous concept in semantic versioning.
-     */
-    minorVersion: v.number().optional(),
+import { object, number, string, array, literal, record, union } from "@badrap/valita";
+const cvrVersionSchema = object({
+  /**
+   * The database `stateVersion` with which the rows in the CVR are consistent.
+   */
+  stateVersion: string(),
+  // LexiVersion
+  /**
+   * `minorVersion` is subversion of `stateVersion` that is initially absent for each
+   * `stateVersion`, and incremented for configuration changes that affect the contents
+   * of the CVR such as:
+   *
+   * * query set changes
+   * * query transformation changes (which may happen for changes
+   *   in server-side logic or authorization policies)
+   *
+   * Such configuration changes are always correlated with a change to one or more
+   * `/meta/...` records in the CVR, often (but not always) with corresponding
+   * patches in `/patches/meta/...`.
+   *
+   * When the `stateVersion` moves forward, the `minorVersion` is reset to absent.
+   * In this manner it behaves like the analogous concept in semantic versioning.
+   */
+  minorVersion: number().optional()
 });
-export const EMPTY_CVR_VERSION = {
-    stateVersion: versionToLexi(0),
+const EMPTY_CVR_VERSION = {
+  stateVersion: versionToLexi(0)
 };
-export function oneAfter(v) {
-    return v === null
-        ? { stateVersion: versionToLexi(0) }
-        : {
-            stateVersion: v.stateVersion,
-            minorVersion: (v.minorVersion ?? 0) + 1,
-        };
+function oneAfter(v2) {
+  return v2 === null ? { stateVersion: versionToLexi(0) } : {
+    stateVersion: v2.stateVersion,
+    minorVersion: (v2.minorVersion ?? 0) + 1
+  };
 }
-export function cmpVersions(a, b) {
-    return a === null && b === null
-        ? 0
-        : a === null
-            ? -1
-            : b === null
-                ? 1
-                : a.stateVersion < b.stateVersion
-                    ? -1
-                    : a.stateVersion > b.stateVersion
-                        ? 1
-                        : (a.minorVersion ?? 0) - (b.minorVersion ?? 0);
+function cmpVersions(a, b) {
+  return a === null && b === null ? 0 : a === null ? -1 : b === null ? 1 : a.stateVersion < b.stateVersion ? -1 : a.stateVersion > b.stateVersion ? 1 : (a.minorVersion ?? 0) - (b.minorVersion ?? 0);
 }
-export function maxVersion(a, b) {
-    return !b ? a : cmpVersions(b, a) > 0 ? b : a;
+function maxVersion(a, b) {
+  return !b ? a : cmpVersions(b, a) > 0 ? b : a;
 }
-export function versionToCookie(v) {
-    return versionString(v);
+function versionToCookie(v2) {
+  return versionString(v2);
 }
-export function versionToNullableCookie(v) {
-    return v === null ? null : versionToCookie(v);
+function versionToNullableCookie(v2) {
+  return v2 === null ? null : versionToCookie(v2);
 }
-export function cookieToVersion(cookie) {
-    if (cookie === null) {
-        return null;
-    }
-    return versionFromString(cookie);
+function cookieToVersion(cookie) {
+  if (cookie === null) {
+    return null;
+  }
+  return versionFromString(cookie);
 }
-// Last Active tracking.
-export const cvrIDSchema = v.object({ id: v.string() });
-const cvrRecordSchema = v.object({
-    /**
-     * CVR records store the CVRVersion at which the record was last patched into
-     * the CVR, which corresponds with a patch row that is cleaned up when the
-     * record is changed (updated, deleted, and re-added in the case of rows).
-     *
-     * Tombstones are stored for row records but not for config records. This means
-     * that "orphaned" delete patches for config records may exist, and therefore
-     * scans of config patches must always run until the end of the list. On the
-     * contrary, for row patches, the row record tombstones allow cleanup of delete
-     * patches.
-     */
-    patchVersion: cvrVersionSchema,
+object({ id: string() });
+const cvrRecordSchema = object({
+  /**
+   * CVR records store the CVRVersion at which the record was last patched into
+   * the CVR, which corresponds with a patch row that is cleaned up when the
+   * record is changed (updated, deleted, and re-added in the case of rows).
+   *
+   * Tombstones are stored for row records but not for config records. This means
+   * that "orphaned" delete patches for config records may exist, and therefore
+   * scans of config patches must always run until the end of the list. On the
+   * contrary, for row patches, the row record tombstones allow cleanup of delete
+   * patches.
+   */
+  patchVersion: cvrVersionSchema
 });
-export const clientRecordSchema = v.object({
-    /** The client ID, of which there can be multiple for a client group view. */
-    id: v.string(),
-    /** The client's desired query IDs. Patch information is stored in the QueryRecord. */
-    desiredQueryIDs: v.array(v.string()),
+object({
+  /** The client ID, of which there can be multiple for a client group view. */
+  id: string(),
+  /** The client's desired query IDs. Patch information is stored in the QueryRecord. */
+  desiredQueryIDs: array(string())
 });
-export const baseQueryRecordSchema = v.object({
-    /** The client-specified ID used to identify this query. Typically a hash. */
-    id: v.string(),
-    /**
-     * The hash of the query after server-side transformations, which include:
-     *
-     * * Normalization (which may differ from what the client does)
-     * * Query "expansion" to include primary keys and query-execution-related columns
-     * * Authorization transforms
-     *
-     * Transformations depend on conditions that are independent of the db state version,
-     * such as server-side logic and authorization policies. As such, the version of a CVR
-     * version may need to be advanced independent of db state changes. This is done
-     * via the `minorVersion` counter of the CVRVersion object, which is used to account
-     * for both changes to the query set and changes to query transformations (which are
-     * effectively remove-old-query + add-new-query).
-     *
-     * Note that the transformed AST itself is **not** stored, as the result of the previous
-     * transformation is not useful in and of itself. If the current transformation results in
-     * a different hash than that of the transformation used for the last version of the CVR,
-     * it is simply handled by invalidating the existing rows, re-executed the query with
-     * the new transformation, and advancing the CVR's `minorVersion` and this query's
-     * `transformationVersion`.
-     *
-     * Note that the transformationHash is only stored when the query has reached the "gotten"
-     * state. If the query is in the "desired" but not yet "gotten" state, the field is absent.
-     */
-    transformationHash: v.string().optional(),
-    /**
-     * The CVR version corresponding to the `transformationHash`. This essentially tracks when
-     * this version of the query was effectively added to the CVR (as opposed to the
-     * `patchVersion`, which is simply when the client was notified that its query was added
-     * to the gotten set). Catchup of clients from old CVR versions require executing all
-     * queries with a newer `transformationVersion`.
-     */
-    transformationVersion: cvrVersionSchema.optional(),
+const baseQueryRecordSchema = object({
+  /** The client-specified ID used to identify this query. Typically a hash. */
+  id: string(),
+  /**
+   * The hash of the query after server-side transformations, which include:
+   *
+   * * Normalization (which may differ from what the client does)
+   * * Query "expansion" to include primary keys and query-execution-related columns
+   * * Authorization transforms
+   *
+   * Transformations depend on conditions that are independent of the db state version,
+   * such as server-side logic and authorization policies. As such, the version of a CVR
+   * version may need to be advanced independent of db state changes. This is done
+   * via the `minorVersion` counter of the CVRVersion object, which is used to account
+   * for both changes to the query set and changes to query transformations (which are
+   * effectively remove-old-query + add-new-query).
+   *
+   * Note that the transformed AST itself is **not** stored, as the result of the previous
+   * transformation is not useful in and of itself. If the current transformation results in
+   * a different hash than that of the transformation used for the last version of the CVR,
+   * it is simply handled by invalidating the existing rows, re-executed the query with
+   * the new transformation, and advancing the CVR's `minorVersion` and this query's
+   * `transformationVersion`.
+   *
+   * Note that the transformationHash is only stored when the query has reached the "gotten"
+   * state. If the query is in the "desired" but not yet "gotten" state, the field is absent.
+   */
+  transformationHash: string().optional(),
+  /**
+   * The CVR version corresponding to the `transformationHash`. This essentially tracks when
+   * this version of the query was effectively added to the CVR (as opposed to the
+   * `patchVersion`, which is simply when the client was notified that its query was added
+   * to the gotten set). Catchup of clients from old CVR versions require executing all
+   * queries with a newer `transformationVersion`.
+   */
+  transformationVersion: cvrVersionSchema.optional()
 });
-/**
- * Internal queries track rows in the database for internal use, such as the
- * `lastMutationID`s in the `zero.clients` table. They participate in the standard
- * invalidation / update logic for row contents, but not in the desired/got or
- * size-based quota logic for client-requested queries.
- */
-export const internalQueryRecordSchema = baseQueryRecordSchema.extend({
-    type: v.literal('internal'),
-    ast: astSchema,
+const internalQueryRecordSchema = baseQueryRecordSchema.extend({
+  type: literal("internal"),
+  ast: astSchema
 });
-const clientStateSchema = v.object({
-    /**
-     * The time at which the query was last inactivated. If this undefined or
-     * missing then the query is active.
-     *
-     * Desired queries are always active and have an undefined inactivatedAt.
-     */
-    inactivatedAt: ttlClockSchema.optional(),
-    /**
-     * TTL, time to live in milliseconds. If the query is not updated within this
-     * time. The time to live is the time after it has become inactive. Negative
-     * values are treated as `'forever'`.
-     *
-     * We do clamp this to a maximum of 10 minutes, so that queries do not
-     * live for a very long time in the CVR.
-     */
-    ttl: v.number(),
-    /**
-     * The version at which the client state changed (i.e. individual `patchVersion`s).
-     */
-    version: cvrVersionSchema,
+const clientStateSchema = object({
+  /**
+   * The time at which the query was last inactivated. If this undefined or
+   * missing then the query is active.
+   *
+   * Desired queries are always active and have an undefined inactivatedAt.
+   */
+  inactivatedAt: ttlClockSchema.optional(),
+  /**
+   * TTL, time to live in milliseconds. If the query is not updated within this
+   * time. The time to live is the time after it has become inactive. Negative
+   * values are treated as `'forever'`.
+   *
+   * We do clamp this to a maximum of 10 minutes, so that queries do not
+   * live for a very long time in the CVR.
+   */
+  ttl: number(),
+  /**
+   * The version at which the client state changed (i.e. individual `patchVersion`s).
+   */
+  version: cvrVersionSchema
 });
 const externalQueryRecordSchema = baseQueryRecordSchema.extend({
-    /**
-     * The client state for this query, which includes the inactivatedAt, ttl and
-     * version. The client state is stored in a record with the client ID as the
-     * key.
-     */
-    clientState: v.record(clientStateSchema),
-    // For queries, the `patchVersion` indicates when query was added to the got set,
-    // and is absent if not yet gotten.
-    patchVersion: cvrVersionSchema.optional(),
+  /**
+   * The client state for this query, which includes the inactivatedAt, ttl and
+   * version. The client state is stored in a record with the client ID as the
+   * key.
+   */
+  clientState: record(clientStateSchema),
+  // For queries, the `patchVersion` indicates when query was added to the got set,
+  // and is absent if not yet gotten.
+  patchVersion: cvrVersionSchema.optional()
 });
-export const clientQueryRecordSchema = externalQueryRecordSchema.extend({
-    type: v.literal('client'),
-    /** The original AST as supplied by the client. */
-    ast: astSchema,
+const clientQueryRecordSchema = externalQueryRecordSchema.extend({
+  type: literal("client"),
+  /** The original AST as supplied by the client. */
+  ast: astSchema
 });
-export const customQueryRecordSchema = externalQueryRecordSchema.extend({
-    type: v.literal('custom'),
-    name: v.string(),
-    args: v.readonly(v.array(jsonSchema)),
+const customQueryRecordSchema = externalQueryRecordSchema.extend({
+  type: literal("custom"),
+  name: string(),
+  args: readonly(array(jsonSchema))
 });
-export const queryRecordSchema = v.union(clientQueryRecordSchema, customQueryRecordSchema, internalQueryRecordSchema);
-export const rowIDSchema = v.object({
-    schema: v.string(),
-    table: v.string(),
-    rowKey: v.record(jsonValueSchema),
+union(
+  clientQueryRecordSchema,
+  customQueryRecordSchema,
+  internalQueryRecordSchema
+);
+const rowIDSchema = object({
+  schema: string(),
+  table: string(),
+  rowKey: record(jsonValueSchema)
 });
-export const rowRecordSchema = cvrRecordSchema.extend({
-    id: rowIDSchema,
-    rowVersion: v.string(), // '_0_version' of the row
-    // query hashes => refCount, or `null` for a row that was removed from the
-    // view (i.e. tombstone).
-    refCounts: v.record(v.number()).nullable(),
+cvrRecordSchema.extend({
+  id: rowIDSchema,
+  rowVersion: string(),
+  // '_0_version' of the row
+  // query hashes => refCount, or `null` for a row that was removed from the
+  // view (i.e. tombstone).
+  refCounts: record(number()).nullable()
 });
-export const patchSchema = v.object({
-    type: v.literalUnion('row', 'query'),
-    op: v.literalUnion('put', 'del'),
+const patchSchema = object({
+  type: literalUnion("row", "query"),
+  op: literalUnion("put", "del")
 });
-export const putRowPatchSchema = patchSchema.extend({
-    type: v.literal('row'),
-    op: v.literal('put'),
-    id: rowIDSchema,
-    rowVersion: v.string(), // '_0_version' of the row
+const putRowPatchSchema = patchSchema.extend({
+  type: literal("row"),
+  op: literal("put"),
+  id: rowIDSchema,
+  rowVersion: string()
+  // '_0_version' of the row
 });
-export const delRowPatchSchema = patchSchema.extend({
-    type: v.literal('row'),
-    op: v.literal('del'),
-    id: rowIDSchema,
+const delRowPatchSchema = patchSchema.extend({
+  type: literal("row"),
+  op: literal("del"),
+  id: rowIDSchema
 });
-export const rowPatchSchema = v.union(putRowPatchSchema, delRowPatchSchema);
-export const queryPatchSchema = patchSchema.extend({
-    type: v.literal('query'),
-    id: v.string(),
-    clientID: v.string().optional(), // defined for "desired", undefined for "got"
+union(putRowPatchSchema, delRowPatchSchema);
+patchSchema.extend({
+  type: literal("query"),
+  id: string(),
+  clientID: string().optional()
+  // defined for "desired", undefined for "got"
 });
-export const metadataPatchSchema = queryPatchSchema;
-export function versionString(v) {
-    // The separator (e.g. ":") needs to be lexicographically greater than the
-    // storage key path separator (e.g. "/") so that "01/row-hash" is less than "01:01/row-hash".
-    // In particular, the traditional separator for major.minor versions (".") does not
-    // satisfy this quality.
-    return v.minorVersion
-        ? `${v.stateVersion}:${versionToLexi(v.minorVersion)}`
-        : v.stateVersion;
+function versionString(v2) {
+  return v2.minorVersion ? `${v2.stateVersion}:${versionToLexi(v2.minorVersion)}` : v2.stateVersion;
 }
-export function versionFromString(str) {
-    const parts = str.split(':');
-    const stateVersion = parts[0];
-    switch (parts.length) {
-        case 1: {
-            versionFromLexi(stateVersion); // Purely for validation.
-            return { stateVersion };
-        }
-        case 2: {
-            const minorVersion = versionFromLexi(parts[1]);
-            if (minorVersion > BigInt(Number.MAX_SAFE_INTEGER)) {
-                throw new Error(`minorVersion ${parts[1]} exceeds max safe integer`);
-            }
-            return { stateVersion, minorVersion: Number(minorVersion) };
-        }
-        default:
-            throw new TypeError(`Invalid version string ${str}`);
+function versionFromString(str) {
+  const parts = str.split(":");
+  const stateVersion = parts[0];
+  switch (parts.length) {
+    case 1: {
+      versionFromLexi(stateVersion);
+      return { stateVersion };
     }
-}
-export function queryRecordToQueryRow(clientGroupID, query) {
-    switch (query.type) {
-        case 'internal':
-            return {
-                clientGroupID,
-                queryHash: query.id,
-                clientAST: query.ast,
-                queryName: null,
-                queryArgs: null,
-                patchVersion: null,
-                transformationHash: query.transformationHash ?? null,
-                transformationVersion: maybeVersionString(query.transformationVersion),
-                internal: true,
-                deleted: false, // put vs del "got" query
-            };
-        case 'client':
-            return {
-                clientGroupID,
-                queryHash: query.id,
-                clientAST: query.ast,
-                queryName: null,
-                queryArgs: null,
-                patchVersion: maybeVersionString(query.patchVersion),
-                transformationHash: query.transformationHash ?? null,
-                transformationVersion: maybeVersionString(query.transformationVersion),
-                internal: null,
-                deleted: false, // put vs del "got" query
-            };
-        case 'custom':
-            return {
-                clientGroupID,
-                queryHash: query.id,
-                clientAST: null,
-                queryName: query.name,
-                queryArgs: query.args,
-                patchVersion: maybeVersionString(query.patchVersion),
-                transformationHash: query.transformationHash ?? null,
-                transformationVersion: maybeVersionString(query.transformationVersion),
-                internal: null,
-                deleted: false, // put vs del "got" query
-            };
+    case 2: {
+      const minorVersion = versionFromLexi(parts[1]);
+      if (minorVersion > BigInt(Number.MAX_SAFE_INTEGER)) {
+        throw new Error(`minorVersion ${parts[1]} exceeds max safe integer`);
+      }
+      return { stateVersion, minorVersion: Number(minorVersion) };
     }
+    default:
+      throw new TypeError(`Invalid version string ${str}`);
+  }
 }
-export const maybeVersionString = (v) => v ? versionString(v) : null;
-//# sourceMappingURL=types.js.map
+function queryRecordToQueryRow(clientGroupID, query) {
+  switch (query.type) {
+    case "internal":
+      return {
+        clientGroupID,
+        queryHash: query.id,
+        clientAST: query.ast,
+        queryName: null,
+        queryArgs: null,
+        patchVersion: null,
+        transformationHash: query.transformationHash ?? null,
+        transformationVersion: maybeVersionString(query.transformationVersion),
+        internal: true,
+        deleted: false
+        // put vs del "got" query
+      };
+    case "client":
+      return {
+        clientGroupID,
+        queryHash: query.id,
+        clientAST: query.ast,
+        queryName: null,
+        queryArgs: null,
+        patchVersion: maybeVersionString(query.patchVersion),
+        transformationHash: query.transformationHash ?? null,
+        transformationVersion: maybeVersionString(query.transformationVersion),
+        internal: null,
+        deleted: false
+        // put vs del "got" query
+      };
+    case "custom":
+      return {
+        clientGroupID,
+        queryHash: query.id,
+        clientAST: null,
+        queryName: query.name,
+        queryArgs: query.args,
+        patchVersion: maybeVersionString(query.patchVersion),
+        transformationHash: query.transformationHash ?? null,
+        transformationVersion: maybeVersionString(query.transformationVersion),
+        internal: null,
+        deleted: false
+        // put vs del "got" query
+      };
+  }
+}
+const maybeVersionString = (v2) => v2 ? versionString(v2) : null;
+export {
+  EMPTY_CVR_VERSION,
+  baseQueryRecordSchema,
+  clientQueryRecordSchema,
+  cmpVersions,
+  cookieToVersion,
+  customQueryRecordSchema,
+  cvrVersionSchema,
+  delRowPatchSchema,
+  internalQueryRecordSchema,
+  maxVersion,
+  maybeVersionString,
+  oneAfter,
+  patchSchema,
+  putRowPatchSchema,
+  queryRecordToQueryRow,
+  rowIDSchema,
+  versionFromString,
+  versionString,
+  versionToCookie,
+  versionToNullableCookie
+};
+//# sourceMappingURL=types.js.map