@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/analyze-query/src/bin-analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin-analyze.js","sources":["../../../../analyze-query/src/bin-analyze.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport chalk from 'chalk';\nimport fs from 'node:fs';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {testLogConfig} from '../../otel/src/test-log-config.ts';\nimport {colorConsole, createLogContext} from '../../shared/src/logging.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {\n  appOptions,\n  shardOptions,\n  ZERO_ENV_VAR_PREFIX,\n  zeroOptions,\n} from '../../zero-cache/src/config/zero-config.ts';\nimport {\n  computeZqlSpecs,\n  mustGetTableSpec,\n} from '../../zero-cache/src/db/lite-tables.ts';\nimport {\n  deployPermissionsOptions,\n  loadSchemaAndPermissions,\n} from '../../zero-cache/src/scripts/permissions.ts';\nimport {pgClient} from '../../zero-cache/src/types/pg.ts';\nimport {getShardID, upstreamSchema} from '../../zero-cache/src/types/shards.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport {type AST} from '../../zero-protocol/src/ast.ts';\nimport {clientSchemaFrom} from '../../zero-schema/src/builder/schema-builder.ts';\nimport {clientToServer} from '../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {\n  Debug,\n  runtimeDebugFlags,\n} from '../../zql/src/builder/debug-delegate.ts';\nimport type {Source} from '../../zql/src/ivm/source.ts';\nimport {QueryDelegateBase} from '../../zql/src/query/query-delegate-base.ts';\nimport {newQuery} from '../../zql/src/query/query-impl.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {PullRow, Query} from '../../zql/src/query/query.ts';\nimport {Database} from '../../zqlite/src/db.ts';\nimport {TableSource} from '../../zqlite/src/table-source.ts';\nimport {explainQueries} from './explain-queries.ts';\nimport {runAst} from './run-ast.ts';\n\nconst options = {\n  schema: deployPermissionsOptions.schema,\n  replicaFile: {\n    ...zeroOptions.replica.file,\n    desc: [`File path to the SQLite replica to test queries against.`],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'AST for the query to be analyzed.  Only one of ast/query/hash should be provided.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      `Query to be analyzed in the form of: table.where(...).related(...).etc. `,\n      `Only one of ast/query/hash should be provided.`,\n    ],\n  },\n  hash: {\n    type: v.string().optional(),\n    desc: [\n      `Hash of the query to be analyzed. This is used to look up the query in the database. `,\n      `Only one of ast/query/hash should be provided.`,\n      `You should run this script from the directory containing your .env file to reduce the amount of`,\n      `configuration required. The .env file should contain the connection URL to the CVR database.`,\n    ],\n  },\n  applyPermissions: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to apply permissions (from your schema file) to the provided query.',\n    ],\n  },\n  authData: {\n    type: v.string().optional(),\n    desc: [\n      'JSON encoded payload of the auth data.',\n      'This will be used to fill permission variables if the \"applyPermissions\" option is set',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to output the rows which were read from the replica in order to execute the analyzed query. ',\n      'If the same row is read more than once it will be logged once for each time it was read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to output the rows which would be synced to the client for the analyzed query.',\n    ],\n  },\n  cvr: {\n    db: {\n      type: v.string().optional(),\n      desc: [\n        'Connection URL to the CVR database. If using --hash, either this or --upstream-db',\n        'must be specified.',\n      ],\n    },\n  },\n  upstream: {\n    db: {\n      desc: [\n        `Connection URL to the \"upstream\" authoritative postgres database. If using --hash, `,\n        'either this or --cvr-db must be specified.',\n      ],\n      type: v.string().optional(),\n    },\n    type: zeroOptions.upstream.type,\n  },\n  app: appOptions,\n  shard: shardOptions,\n  log: {\n    ...logOptions,\n    level: logLevel.default('error'),\n  },\n};\n\nconst cfg = parseOptions(options, {\n  // the command line parses drops all text after the first newline\n  // so we need to replace newlines with spaces\n  // before parsing\n  argv: process.argv.slice(2).map(s => s.replaceAll('\\n', ' ')),\n  envNamePrefix: ZERO_ENV_VAR_PREFIX,\n  description: [\n    {\n      header: 'analyze-query',\n      content: `Analyze a ZQL query and show information about how it runs against a SQLite replica.\n\n  analyze-query uses the same environment variables and flags as zero-cache-dev. If run from your development environment, it will pick up your ZERO_REPLICA_FILE, ZERO_SCHEMA_PATH, and other env vars automatically.\n\n  If run in another environment (e.g., production) you will have to specify these flags. In particular, you must have a copy of the appropriate Zero schema file to give to the --schema-path flag.`,\n    },\n    {\n      header: 'Examples',\n      content: `# In development\n  npx analyze-query --query='issue.related(\"comments\").limit(10)'\n  npx analyze-query --ast='\\\\{\"table\": \"artist\",\"limit\": 10\\\\}'\n  npx analyze-query --hash=1234567890\n\n  # In production\n  # First copy schema.ts to your production environment, then run:\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --ast='\\\\{\"table\": \"artist\",\"limit\": 10\\\\}'\n\n  # cvr-db is required when using the hash option.\n  # It is typically the same as your upstream db.\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --cvr-db='postgres://user:pass@host:port/db' \\\\\n    --hash=1234567890\n  `,\n    },\n  ],\n});\nconst config = {\n  ...cfg,\n  cvr: {\n    ...cfg.cvr,\n    db: cfg.cvr.db ?? cfg.upstream.db,\n  },\n};\n\nruntimeDebugFlags.trackRowCountsVended = true;\nruntimeDebugFlags.trackRowsVended = config.outputVendedRows;\n\nconst lc = createLogContext({\n  log: config.log,\n});\n\nif (!fs.existsSync(config.replicaFile)) {\n  colorConsole.error(`Replica file ${config.replicaFile} does not exist`);\n  process.exit(1);\n}\nconst db = new Database(lc, config.replicaFile);\n\nconst {schema, permissions} = await loadSchemaAndPermissions(\n  config.schema.path,\n);\nconst clientSchema = clientSchemaFrom(schema).clientSchema;\n\nconst sources = new Map<string, TableSource>();\nconst clientToServerMapper = clientToServer(schema.tables);\nconst debug = new Debug();\nconst tableSpecs = computeZqlSpecs(lc, db);\n\nclass AnalyzeQueryDelegate extends QueryDelegateBase {\n  readonly debug = debug;\n  readonly defaultQueryComplete = true;\n\n  getSource(serverTableName: string): Source | undefined {\n    let source = sources.get(serverTableName);\n    if (source) {\n      return source;\n    }\n    const tableSpec = mustGetTableSpec(tableSpecs, serverTableName);\n    const {primaryKey} = tableSpec.tableSpec;\n\n    source = new TableSource(\n      lc,\n      testLogConfig,\n      db,\n      serverTableName,\n      tableSpec.zqlSpec,\n      primaryKey,\n    );\n\n    sources.set(serverTableName, source);\n    return source;\n  }\n}\n\nconst host = new AnalyzeQueryDelegate();\n\nlet result: AnalyzeQueryResult;\n\nif (config.ast) {\n  // the user likely has a transformed AST since the wire and storage formats are the transformed AST\n  result = await runAst(lc, clientSchema, JSON.parse(config.ast), true, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n} else if (config.query) {\n  result = await runQuery(config.query);\n} else if (config.hash) {\n  result = await runHash(config.hash);\n} else {\n  colorConsole.error('No query or AST or hash provided');\n  process.exit(1);\n}\n\nfunction runQuery(queryString: string): Promise<AnalyzeQueryResult> {\n  const z = {\n    query: Object.fromEntries(\n      Object.entries(schema.tables).map(([name]) => [\n        name,\n        newQuery(schema, name),\n      ]),\n    ),\n  };\n\n  const f = new Function('z', `return z.query.${queryString};`);\n  const q: Query<Schema, string, PullRow<string, Schema>> = f(z);\n\n  const ast = asQueryInternals(q).ast;\n  return runAst(lc, clientSchema, ast, false, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n}\n\nasync function runHash(hash: string) {\n  const cvrDB = pgClient(\n    lc,\n    must(config.cvr.db, 'CVR DB must be provided when using the hash option'),\n  );\n\n  const rows = await cvrDB`select \"clientAST\", \"internal\" from ${cvrDB(\n    upstreamSchema(getShardID(config)) + '/cvr',\n  )}.\"queries\" where \"queryHash\" = ${must(hash)} limit 1;`;\n  await cvrDB.end();\n\n  colorConsole.log('ZQL from Hash:');\n  const ast = rows[0].clientAST as AST;\n  colorConsole.log(await formatOutput(ast.table + astToZQL(ast)));\n\n  return runAst(lc, clientSchema, ast, true, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n}\n\nif (config.outputSyncedRows) {\n  colorConsole.log(chalk.blue.bold('=== Synced Rows: ===\\n'));\n  for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n    colorConsole.log(chalk.bold(table + ':'), rows);\n  }\n}\n\ncolorConsole.log(chalk.blue.bold('=== Query Stats: ===\\n'));\ncolorConsole.log(chalk.bold('total synced rows:'), result.syncedRowCount);\nshowStats();\nif (config.outputVendedRows) {\n  colorConsole.log(chalk.blue.bold('=== JS Row Scan Values: ===\\n'));\n  for (const source of sources.values()) {\n    colorConsole.log(\n      chalk.bold(`${source.tableSchema.name}:`),\n      debug.getVendedRows()?.[source.tableSchema.name] ?? {},\n    );\n  }\n}\n\ncolorConsole.log(chalk.blue.bold('\\n=== Rows Scanned (by SQLite): ===\\n'));\nconst nvisitCounts = debug.getNVisitCounts();\nlet totalNVisit = 0;\nfor (const [table, queries] of Object.entries(nvisitCounts)) {\n  colorConsole.log(chalk.bold(`${table}:`), queries);\n  for (const count of Object.values(queries)) {\n    totalNVisit += count;\n  }\n}\ncolorConsole.log(\n  chalk.bold('total rows scanned:'),\n  colorRowsConsidered(totalNVisit),\n);\n\ncolorConsole.log(chalk.blue.bold('\\n\\n=== Query Plans: ===\\n'));\nconst plans = explainQueries(debug.getVendedRowCounts() ?? {}, db);\nfor (const [query, plan] of Object.entries(plans)) {\n  colorConsole.log(chalk.bold('query'), query);\n  colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n  colorConsole.log('\\n');\n}\n\nfunction showStats() {\n  let totalRowsConsidered = 0;\n  for (const source of sources.values()) {\n    const values = Object.values(\n      debug.getVendedRowCounts()?.[source.tableSchema.name] ?? {},\n    );\n    for (const v of values) {\n      totalRowsConsidered += v;\n    }\n    colorConsole.log(\n      chalk.bold(source.tableSchema.name + ' vended:'),\n      debug.getVendedRowCounts()?.[source.tableSchema.name] ?? {},\n    );\n  }\n\n  colorConsole.log(\n    chalk.bold('Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsConsidered),\n  );\n  colorConsole.log(\n    chalk.bold('time:'),\n    colorTime(result.end - result.start),\n    'ms',\n  );\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return chalk.green(duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return chalk.yellow(duration.toFixed(2) + 'ms');\n  }\n  return chalk.red(duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return chalk.green(n.toString());\n  } else if (n < 10000) {\n    return chalk.yellow(n.toString());\n  }\n  return chalk.red(n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return chalk.yellow(row);\n    }\n    return chalk.red(row);\n  }\n  return chalk.green(row);\n}\n"],"names":["v.string","v.boolean","v"],"mappings":"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"}
+{"version":3,"file":"bin-analyze.js","sources":["../../../../analyze-query/src/bin-analyze.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport chalk from 'chalk';\nimport fs from 'node:fs';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {testLogConfig} from '../../otel/src/test-log-config.ts';\nimport {colorConsole, createLogContext} from '../../shared/src/logging.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {\n  appOptions,\n  shardOptions,\n  ZERO_ENV_VAR_PREFIX,\n  zeroOptions,\n} from '../../zero-cache/src/config/zero-config.ts';\nimport {\n  computeZqlSpecs,\n  mustGetTableSpec,\n} from '../../zero-cache/src/db/lite-tables.ts';\nimport {\n  deployPermissionsOptions,\n  loadSchemaAndPermissions,\n} from '../../zero-cache/src/scripts/permissions.ts';\nimport {pgClient} from '../../zero-cache/src/types/pg.ts';\nimport {getShardID, upstreamSchema} from '../../zero-cache/src/types/shards.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport {type AST} from '../../zero-protocol/src/ast.ts';\nimport {clientSchemaFrom} from '../../zero-schema/src/builder/schema-builder.ts';\nimport {clientToServer} from '../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {\n  Debug,\n  runtimeDebugFlags,\n} from '../../zql/src/builder/debug-delegate.ts';\nimport type {Source} from '../../zql/src/ivm/source.ts';\nimport {QueryDelegateBase} from '../../zql/src/query/query-delegate-base.ts';\nimport {newQuery} from '../../zql/src/query/query-impl.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {PullRow, Query} from '../../zql/src/query/query.ts';\nimport {Database} from '../../zqlite/src/db.ts';\nimport {TableSource} from '../../zqlite/src/table-source.ts';\nimport {explainQueries} from './explain-queries.ts';\nimport {runAst} from './run-ast.ts';\n\nconst options = {\n  schema: deployPermissionsOptions.schema,\n  replicaFile: {\n    ...zeroOptions.replica.file,\n    desc: [`File path to the SQLite replica to test queries against.`],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'AST for the query to be analyzed.  Only one of ast/query/hash should be provided.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      `Query to be analyzed in the form of: table.where(...).related(...).etc. `,\n      `Only one of ast/query/hash should be provided.`,\n    ],\n  },\n  hash: {\n    type: v.string().optional(),\n    desc: [\n      `Hash of the query to be analyzed. This is used to look up the query in the database. `,\n      `Only one of ast/query/hash should be provided.`,\n      `You should run this script from the directory containing your .env file to reduce the amount of`,\n      `configuration required. The .env file should contain the connection URL to the CVR database.`,\n    ],\n  },\n  applyPermissions: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to apply permissions (from your schema file) to the provided query.',\n    ],\n  },\n  authData: {\n    type: v.string().optional(),\n    desc: [\n      'JSON encoded payload of the auth data.',\n      'This will be used to fill permission variables if the \"applyPermissions\" option is set',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to output the rows which were read from the replica in order to execute the analyzed query. ',\n      'If the same row is read more than once it will be logged once for each time it was read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Whether to output the rows which would be synced to the client for the analyzed query.',\n    ],\n  },\n  cvr: {\n    db: {\n      type: v.string().optional(),\n      desc: [\n        'Connection URL to the CVR database. If using --hash, either this or --upstream-db',\n        'must be specified.',\n      ],\n    },\n  },\n  upstream: {\n    db: {\n      desc: [\n        `Connection URL to the \"upstream\" authoritative postgres database. If using --hash, `,\n        'either this or --cvr-db must be specified.',\n      ],\n      type: v.string().optional(),\n    },\n    type: zeroOptions.upstream.type,\n  },\n  app: appOptions,\n  shard: shardOptions,\n  log: {\n    ...logOptions,\n    level: logLevel.default('error'),\n  },\n};\n\nconst cfg = parseOptions(options, {\n  // the command line parses drops all text after the first newline\n  // so we need to replace newlines with spaces\n  // before parsing\n  argv: process.argv.slice(2).map(s => s.replaceAll('\\n', ' ')),\n  envNamePrefix: ZERO_ENV_VAR_PREFIX,\n  description: [\n    {\n      header: 'analyze-query',\n      content: `Analyze a ZQL query and show information about how it runs against a SQLite replica.\n\n  analyze-query uses the same environment variables and flags as zero-cache-dev. If run from your development environment, it will pick up your ZERO_REPLICA_FILE, ZERO_SCHEMA_PATH, and other env vars automatically.\n\n  If run in another environment (e.g., production) you will have to specify these flags. In particular, you must have a copy of the appropriate Zero schema file to give to the --schema-path flag.`,\n    },\n    {\n      header: 'Examples',\n      content: `# In development\n  npx analyze-query --query='issue.related(\"comments\").limit(10)'\n  npx analyze-query --ast='\\\\{\"table\": \"artist\",\"limit\": 10\\\\}'\n  npx analyze-query --hash=1234567890\n\n  # In production\n  # First copy schema.ts to your production environment, then run:\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --ast='\\\\{\"table\": \"artist\",\"limit\": 10\\\\}'\n\n  # cvr-db is required when using the hash option.\n  # It is typically the same as your upstream db.\n  npx analyze-query \\\\\n    --schema-path='./schema.ts' \\\\\n    --replica-file='/path/to/replica.db' \\\\\n    --cvr-db='postgres://user:pass@host:port/db' \\\\\n    --hash=1234567890\n  `,\n    },\n  ],\n});\nconst config = {\n  ...cfg,\n  cvr: {\n    ...cfg.cvr,\n    db: cfg.cvr.db ?? cfg.upstream.db,\n  },\n};\n\nruntimeDebugFlags.trackRowCountsVended = true;\nruntimeDebugFlags.trackRowsVended = config.outputVendedRows;\n\nconst lc = createLogContext({\n  log: config.log,\n});\n\nif (!fs.existsSync(config.replicaFile)) {\n  colorConsole.error(`Replica file ${config.replicaFile} does not exist`);\n  process.exit(1);\n}\nconst db = new Database(lc, config.replicaFile);\n\nconst {schema, permissions} = await loadSchemaAndPermissions(\n  config.schema.path,\n);\nconst clientSchema = clientSchemaFrom(schema).clientSchema;\n\nconst sources = new Map<string, TableSource>();\nconst clientToServerMapper = clientToServer(schema.tables);\nconst debug = new Debug();\nconst tableSpecs = computeZqlSpecs(lc, db);\n\nclass AnalyzeQueryDelegate extends QueryDelegateBase {\n  readonly debug = debug;\n  readonly defaultQueryComplete = true;\n\n  getSource(serverTableName: string): Source | undefined {\n    let source = sources.get(serverTableName);\n    if (source) {\n      return source;\n    }\n    const tableSpec = mustGetTableSpec(tableSpecs, serverTableName);\n    const {primaryKey} = tableSpec.tableSpec;\n\n    source = new TableSource(\n      lc,\n      testLogConfig,\n      db,\n      serverTableName,\n      tableSpec.zqlSpec,\n      primaryKey,\n    );\n\n    sources.set(serverTableName, source);\n    return source;\n  }\n}\n\nconst host = new AnalyzeQueryDelegate();\n\nlet result: AnalyzeQueryResult;\n\nif (config.ast) {\n  // the user likely has a transformed AST since the wire and storage formats are the transformed AST\n  result = await runAst(lc, clientSchema, JSON.parse(config.ast), true, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n} else if (config.query) {\n  result = await runQuery(config.query);\n} else if (config.hash) {\n  result = await runHash(config.hash);\n} else {\n  colorConsole.error('No query or AST or hash provided');\n  process.exit(1);\n}\n\nfunction runQuery(queryString: string): Promise<AnalyzeQueryResult> {\n  const z = {\n    query: Object.fromEntries(\n      Object.entries(schema.tables).map(([name]) => [\n        name,\n        newQuery(schema, name),\n      ]),\n    ),\n  };\n\n  const f = new Function('z', `return z.query.${queryString};`);\n  const q: Query<string, Schema, PullRow<string, Schema>> = f(z);\n\n  const ast = asQueryInternals(q).ast;\n  return runAst(lc, clientSchema, ast, false, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n}\n\nasync function runHash(hash: string) {\n  const cvrDB = pgClient(\n    lc,\n    must(config.cvr.db, 'CVR DB must be provided when using the hash option'),\n  );\n\n  const rows = await cvrDB`select \"clientAST\", \"internal\" from ${cvrDB(\n    upstreamSchema(getShardID(config)) + '/cvr',\n  )}.\"queries\" where \"queryHash\" = ${must(hash)} limit 1;`;\n  await cvrDB.end();\n\n  colorConsole.log('ZQL from Hash:');\n  const ast = rows[0].clientAST as AST;\n  colorConsole.log(await formatOutput(ast.table + astToZQL(ast)));\n\n  return runAst(lc, clientSchema, ast, true, {\n    applyPermissions: config.applyPermissions,\n    authData: config.authData,\n    clientToServerMapper,\n    permissions,\n    syncedRows: config.outputSyncedRows,\n    db,\n    tableSpecs,\n    host,\n  });\n}\n\nif (config.outputSyncedRows) {\n  colorConsole.log(chalk.blue.bold('=== Synced Rows: ===\\n'));\n  for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n    colorConsole.log(chalk.bold(table + ':'), rows);\n  }\n}\n\ncolorConsole.log(chalk.blue.bold('=== Query Stats: ===\\n'));\ncolorConsole.log(chalk.bold('total synced rows:'), result.syncedRowCount);\nshowStats();\nif (config.outputVendedRows) {\n  colorConsole.log(chalk.blue.bold('=== JS Row Scan Values: ===\\n'));\n  for (const source of sources.values()) {\n    colorConsole.log(\n      chalk.bold(`${source.tableSchema.name}:`),\n      debug.getVendedRows()?.[source.tableSchema.name] ?? {},\n    );\n  }\n}\n\ncolorConsole.log(chalk.blue.bold('\\n=== Rows Scanned (by SQLite): ===\\n'));\nconst nvisitCounts = debug.getNVisitCounts();\nlet totalNVisit = 0;\nfor (const [table, queries] of Object.entries(nvisitCounts)) {\n  colorConsole.log(chalk.bold(`${table}:`), queries);\n  for (const count of Object.values(queries)) {\n    totalNVisit += count;\n  }\n}\ncolorConsole.log(\n  chalk.bold('total rows scanned:'),\n  colorRowsConsidered(totalNVisit),\n);\n\ncolorConsole.log(chalk.blue.bold('\\n\\n=== Query Plans: ===\\n'));\nconst plans = explainQueries(debug.getVendedRowCounts() ?? {}, db);\nfor (const [query, plan] of Object.entries(plans)) {\n  colorConsole.log(chalk.bold('query'), query);\n  colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n  colorConsole.log('\\n');\n}\n\nfunction showStats() {\n  let totalRowsConsidered = 0;\n  for (const source of sources.values()) {\n    const values = Object.values(\n      debug.getVendedRowCounts()?.[source.tableSchema.name] ?? {},\n    );\n    for (const v of values) {\n      totalRowsConsidered += v;\n    }\n    colorConsole.log(\n      chalk.bold(source.tableSchema.name + ' vended:'),\n      debug.getVendedRowCounts()?.[source.tableSchema.name] ?? {},\n    );\n  }\n\n  colorConsole.log(\n    chalk.bold('Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsConsidered),\n  );\n  colorConsole.log(\n    chalk.bold('time:'),\n    colorTime(result.end - result.start),\n    'ms',\n  );\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return chalk.green(duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return chalk.yellow(duration.toFixed(2) + 'ms');\n  }\n  return chalk.red(duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return chalk.green(n.toString());\n  } else if (n < 10000) {\n    return chalk.yellow(n.toString());\n  }\n  return chalk.red(n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return chalk.yellow(row);\n    }\n    return chalk.red(row);\n  }\n  return chalk.green(row);\n}\n"],"names":["v.string","v.boolean","v"],"mappings":"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"}

package/out/analyze-query/src/run-ast.d.ts

@@ -2,11 +2,11 @@ import type { LogContext } from '@rocicorp/logger';
 import type { LiteAndZqlSpec } from '../../zero-cache/src/db/specs.ts';
 import type { AnalyzeQueryResult } from '../../zero-protocol/src/analyze-query-result.ts';
 import type { AST } from '../../zero-protocol/src/ast.ts';
+import type { ClientSchema } from '../../zero-protocol/src/client-schema.ts';
 import type { PermissionsConfig } from '../../zero-schema/src/compiled-permissions.ts';
 import type { NameMapper } from '../../zero-schema/src/name-mapper.ts';
 import { type BuilderDelegate } from '../../zql/src/builder/builder.ts';
 import type { Database } from '../../zqlite/src/db.ts';
-import type { ClientSchema } from '../../zero-protocol/src/client-schema.ts';
 export type RunAstOptions = {
     applyPermissions?: boolean | undefined;
     authData?: string | undefined;

package/out/analyze-query/src/run-ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iDAAiD,CAAC;AACxF,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AAIxD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,kBAAkB,CAAC,CA2F7B"}
+{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iDAAiD,CAAC;AACxF,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AAExD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAG3E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,kBAAkB,CAAC,CA6F7B"}

package/out/analyze-query/src/run-ast.js

@@ -2,7 +2,6 @@ import { astToZQL } from "../../ast-to-zql/src/ast-to-zql.js";
 import { formatOutput } from "../../ast-to-zql/src/format.js";
 import { assert } from "../../shared/src/asserts.js";
 import { must } from "../../shared/src/must.js";
-import { sleep } from "../../shared/src/sleep.js";
 import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer.js";
 import { hydrate } from "../../zero-cache/src/services/view-syncer/pipeline-driver.js";
 import { mapAST } from "../../zero-protocol/src/ast.js";
@@ -25,6 +24,9 @@ async function runAst(lc, clientSchema, ast, isTransformed, options) {
     ast = mapAST(ast, must(clientToServerMapper));
   }
   if (options.applyPermissions) {
+    result.warnings.push(
+      "Permissions are deprecated and will be removed in an upcoming release. See: https://zero.rocicorp.dev/docs/auth."
+    );
     const authData = options.authData ? JSON.parse(options.authData) : {};
     if (!options.authData) {
       result.warnings.push(
@@ -35,7 +37,10 @@ async function runAst(lc, clientSchema, ast, isTransformed, options) {
       lc,
       "clientGroupIDForAnalyze",
       ast,
-      must(permissions),
+      must(
+        permissions,
+        "Permissions are required when applyPermissions is true"
+      ),
       authData,
       false
     ).transformedAst;
@@ -47,13 +52,10 @@ async function runAst(lc, clientSchema, ast, isTransformed, options) {
   const rowsByTable = {};
   const seenByTable = /* @__PURE__ */ new Set();
   for (const rowChange of hydrate(pipeline, hashOfAST(ast), clientSchema)) {
-    assert(rowChange.type === "add");
-    if (syncedRowCount % 10 === 0) {
-      await Promise.resolve();
-    }
-    if (syncedRowCount % 100 === 0) {
-      await sleep(1);
+    if (rowChange === "yield") {
+      continue;
     }
+    assert(rowChange.type === "add");
     let rows = rowsByTable[rowChange.table];
     const s = rowChange.table + "." + JSON.stringify(rowChange.row);
     if (seenByTable.has(s)) {

package/out/analyze-query/src/run-ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-ast.js","sources":["../../../../analyze-query/src/run-ast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {assert} from '../../shared/src/asserts.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {sleep} from '../../shared/src/sleep.ts';\nimport {transformAndHashQuery} from '../../zero-cache/src/auth/read-authorizer.ts';\nimport type {LiteAndZqlSpec} from '../../zero-cache/src/db/specs.ts';\nimport {hydrate} from '../../zero-cache/src/services/view-syncer/pipeline-driver.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport {mapAST} from '../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../zero-protocol/src/data.ts';\nimport {hashOfAST} from '../../zero-protocol/src/query-hash.ts';\nimport type {PermissionsConfig} from '../../zero-schema/src/compiled-permissions.ts';\nimport type {NameMapper} from '../../zero-schema/src/name-mapper.ts';\nimport {\n  buildPipeline,\n  type BuilderDelegate,\n} from '../../zql/src/builder/builder.ts';\nimport type {Database} from '../../zqlite/src/db.ts';\nimport type {ClientSchema} from '../../zero-protocol/src/client-schema.ts';\n\nexport type RunAstOptions = {\n  applyPermissions?: boolean | undefined;\n  authData?: string | undefined;\n  clientToServerMapper?: NameMapper | undefined;\n  db: Database;\n  host: BuilderDelegate;\n  permissions?: PermissionsConfig | undefined;\n  syncedRows?: boolean | undefined;\n  tableSpecs: Map<string, LiteAndZqlSpec>;\n  vendedRows?: boolean | undefined;\n};\n\nexport async function runAst(\n  lc: LogContext,\n  clientSchema: ClientSchema,\n  ast: AST,\n  isTransformed: boolean,\n  options: RunAstOptions,\n): Promise<AnalyzeQueryResult> {\n  const {clientToServerMapper, permissions, host} = options;\n  const result: AnalyzeQueryResult = {\n    warnings: [],\n    syncedRows: undefined,\n    syncedRowCount: 0,\n    start: 0,\n    end: 0,\n    afterPermissions: undefined,\n    readRows: undefined,\n    readRowCountsByQuery: {},\n    readRowCount: undefined,\n  };\n\n  if (!isTransformed) {\n    // map the AST to server names if not already transformed\n    ast = mapAST(ast, must(clientToServerMapper));\n  }\n  if (options.applyPermissions) {\n    const authData = options.authData ? JSON.parse(options.authData) : {};\n    if (!options.authData) {\n      result.warnings.push(\n        'No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.',\n      );\n    }\n    ast = transformAndHashQuery(\n      lc,\n      'clientGroupIDForAnalyze',\n      ast,\n      must(permissions),\n      authData,\n      false,\n    ).transformedAst;\n    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));\n  }\n  const pipeline = buildPipeline(ast, host, 'query-id');\n\n  const start = performance.now();\n\n  let syncedRowCount = 0;\n  const rowsByTable: Record<string, Row[]> = {};\n  const seenByTable: Set<string> = new Set();\n  for (const rowChange of hydrate(pipeline, hashOfAST(ast), clientSchema)) {\n    assert(rowChange.type === 'add');\n\n    // yield to other tasks to avoid blocking for too long\n    if (syncedRowCount % 10 === 0) {\n      await Promise.resolve();\n    }\n    if (syncedRowCount % 100 === 0) {\n      await sleep(1);\n    }\n\n    let rows: Row[] = rowsByTable[rowChange.table];\n    const s = rowChange.table + '.' + JSON.stringify(rowChange.row);\n    if (seenByTable.has(s)) {\n      continue; // skip duplicates\n    }\n    syncedRowCount++;\n    seenByTable.add(s);\n    if (options.syncedRows) {\n      if (!rows) {\n        rows = [];\n        rowsByTable[rowChange.table] = rows;\n      }\n      rows.push(rowChange.row);\n    }\n  }\n\n  const end = performance.now();\n  if (options.syncedRows) {\n    result.syncedRows = rowsByTable;\n  }\n  result.start = start;\n  result.end = end;\n\n  // Always include the count of synced and vended rows.\n  result.syncedRowCount = syncedRowCount;\n  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};\n  let readRowCount = 0;\n  for (const c of Object.values(result.readRowCountsByQuery)) {\n    for (const v of Object.values(c)) {\n      readRowCount += v;\n    }\n  }\n  result.readRowCount = readRowCount;\n\n  if (options.vendedRows) {\n    result.readRows = host.debug?.getVendedRows();\n  }\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;AAmCA,eAAsB,OACpB,IACA,cACA,KACA,eACA,SAC6B;AAC7B,QAAM,EAAC,sBAAsB,aAAa,KAAA,IAAQ;AAClD,QAAM,SAA6B;AAAA,IACjC,UAAU,CAAA;AAAA,IACV,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,OAAO;AAAA,IACP,KAAK;AAAA,IACL,kBAAkB;AAAA,IAClB,UAAU;AAAA,IACV,sBAAsB,CAAA;AAAA,IACtB,cAAc;AAAA,EAAA;AAGhB,MAAI,CAAC,eAAe;AAElB,UAAM,OAAO,KAAK,KAAK,oBAAoB,CAAC;AAAA,EAC9C;AACA,MAAI,QAAQ,kBAAkB;AAC5B,UAAM,WAAW,QAAQ,WAAW,KAAK,MAAM,QAAQ,QAAQ,IAAI,CAAA;AACnE,QAAI,CAAC,QAAQ,UAAU;AACrB,aAAO,SAAS;AAAA,QACd;AAAA,MAAA;AAAA,IAEJ;AACA,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,KAAK,WAAW;AAAA,MAChB;AAAA,MACA;AAAA,IAAA,EACA;AACF,WAAO,mBAAmB,MAAM,aAAa,IAAI,QAAQ,SAAS,GAAG,CAAC;AAAA,EACxE;AACA,QAAM,WAAW,cAAc,KAAK,MAAM,UAAU;AAEpD,QAAM,QAAQ,YAAY,IAAA;AAE1B,MAAI,iBAAiB;AACrB,QAAM,cAAqC,CAAA;AAC3C,QAAM,kCAA+B,IAAA;AACrC,aAAW,aAAa,QAAQ,UAAU,UAAU,GAAG,GAAG,YAAY,GAAG;AACvE,WAAO,UAAU,SAAS,KAAK;AAG/B,QAAI,iBAAiB,OAAO,GAAG;AAC7B,YAAM,QAAQ,QAAA;AAAA,IAChB;AACA,QAAI,iBAAiB,QAAQ,GAAG;AAC9B,YAAM,MAAM,CAAC;AAAA,IACf;AAEA,QAAI,OAAc,YAAY,UAAU,KAAK;AAC7C,UAAM,IAAI,UAAU,QAAQ,MAAM,KAAK,UAAU,UAAU,GAAG;AAC9D,QAAI,YAAY,IAAI,CAAC,GAAG;AACtB;AAAA,IACF;AACA;AACA,gBAAY,IAAI,CAAC;AACjB,QAAI,QAAQ,YAAY;AACtB,UAAI,CAAC,MAAM;AACT,eAAO,CAAA;AACP,oBAAY,UAAU,KAAK,IAAI;AAAA,MACjC;AACA,WAAK,KAAK,UAAU,GAAG;AAAA,IACzB;AAAA,EACF;AAEA,QAAM,MAAM,YAAY,IAAA;AACxB,MAAI,QAAQ,YAAY;AACtB,WAAO,aAAa;AAAA,EACtB;AACA,SAAO,QAAQ;AACf,SAAO,MAAM;AAGb,SAAO,iBAAiB;AACxB,SAAO,uBAAuB,KAAK,OAAO,mBAAA,KAAwB,CAAA;AAClE,MAAI,eAAe;AACnB,aAAW,KAAK,OAAO,OAAO,OAAO,oBAAoB,GAAG;AAC1D,eAAW,KAAK,OAAO,OAAO,CAAC,GAAG;AAChC,sBAAgB;AAAA,IAClB;AAAA,EACF;AACA,SAAO,eAAe;AAEtB,MAAI,QAAQ,YAAY;AACtB,WAAO,WAAW,KAAK,OAAO,cAAA;AAAA,EAChC;AACA,SAAO;AACT;"}
+{"version":3,"file":"run-ast.js","sources":["../../../../analyze-query/src/run-ast.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {assert} from '../../shared/src/asserts.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {transformAndHashQuery} from '../../zero-cache/src/auth/read-authorizer.ts';\nimport type {LiteAndZqlSpec} from '../../zero-cache/src/db/specs.ts';\nimport {hydrate} from '../../zero-cache/src/services/view-syncer/pipeline-driver.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport {mapAST} from '../../zero-protocol/src/ast.ts';\nimport type {ClientSchema} from '../../zero-protocol/src/client-schema.ts';\nimport type {Row} from '../../zero-protocol/src/data.ts';\nimport {hashOfAST} from '../../zero-protocol/src/query-hash.ts';\nimport type {PermissionsConfig} from '../../zero-schema/src/compiled-permissions.ts';\nimport type {NameMapper} from '../../zero-schema/src/name-mapper.ts';\nimport {\n  buildPipeline,\n  type BuilderDelegate,\n} from '../../zql/src/builder/builder.ts';\nimport type {Database} from '../../zqlite/src/db.ts';\n\nexport type RunAstOptions = {\n  applyPermissions?: boolean | undefined;\n  authData?: string | undefined;\n  clientToServerMapper?: NameMapper | undefined;\n  db: Database;\n  host: BuilderDelegate;\n  permissions?: PermissionsConfig | undefined;\n  syncedRows?: boolean | undefined;\n  tableSpecs: Map<string, LiteAndZqlSpec>;\n  vendedRows?: boolean | undefined;\n};\n\nexport async function runAst(\n  lc: LogContext,\n  clientSchema: ClientSchema,\n  ast: AST,\n  isTransformed: boolean,\n  options: RunAstOptions,\n): Promise<AnalyzeQueryResult> {\n  const {clientToServerMapper, permissions, host} = options;\n  const result: AnalyzeQueryResult = {\n    warnings: [],\n    syncedRows: undefined,\n    syncedRowCount: 0,\n    start: 0,\n    end: 0,\n    afterPermissions: undefined,\n    readRows: undefined,\n    readRowCountsByQuery: {},\n    readRowCount: undefined,\n  };\n\n  if (!isTransformed) {\n    // map the AST to server names if not already transformed\n    ast = mapAST(ast, must(clientToServerMapper));\n  }\n  if (options.applyPermissions) {\n    result.warnings.push(\n      'Permissions are deprecated and will be removed in an upcoming release. See: https://zero.rocicorp.dev/docs/auth.',\n    );\n\n    const authData = options.authData ? JSON.parse(options.authData) : {};\n    if (!options.authData) {\n      result.warnings.push(\n        'No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.',\n      );\n    }\n    ast = transformAndHashQuery(\n      lc,\n      'clientGroupIDForAnalyze',\n      ast,\n      must(\n        permissions,\n        'Permissions are required when applyPermissions is true',\n      ),\n      authData,\n      false,\n    ).transformedAst;\n    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));\n  }\n  const pipeline = buildPipeline(ast, host, 'query-id');\n\n  const start = performance.now();\n\n  let syncedRowCount = 0;\n  const rowsByTable: Record<string, Row[]> = {};\n  const seenByTable: Set<string> = new Set();\n  for (const rowChange of hydrate(pipeline, hashOfAST(ast), clientSchema)) {\n    if (rowChange === 'yield') {\n      continue;\n    }\n    assert(rowChange.type === 'add');\n\n    let rows: Row[] = rowsByTable[rowChange.table];\n    const s = rowChange.table + '.' + JSON.stringify(rowChange.row);\n    if (seenByTable.has(s)) {\n      continue; // skip duplicates\n    }\n    syncedRowCount++;\n    seenByTable.add(s);\n    if (options.syncedRows) {\n      if (!rows) {\n        rows = [];\n        rowsByTable[rowChange.table] = rows;\n      }\n      rows.push(rowChange.row);\n    }\n  }\n\n  const end = performance.now();\n  if (options.syncedRows) {\n    result.syncedRows = rowsByTable;\n  }\n  result.start = start;\n  result.end = end;\n\n  // Always include the count of synced and vended rows.\n  result.syncedRowCount = syncedRowCount;\n  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};\n  let readRowCount = 0;\n  for (const c of Object.values(result.readRowCountsByQuery)) {\n    for (const v of Object.values(c)) {\n      readRowCount += v;\n    }\n  }\n  result.readRowCount = readRowCount;\n\n  if (options.vendedRows) {\n    result.readRows = host.debug?.getVendedRows();\n  }\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;AAkCA,eAAsB,OACpB,IACA,cACA,KACA,eACA,SAC6B;AAC7B,QAAM,EAAC,sBAAsB,aAAa,KAAA,IAAQ;AAClD,QAAM,SAA6B;AAAA,IACjC,UAAU,CAAA;AAAA,IACV,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,OAAO;AAAA,IACP,KAAK;AAAA,IACL,kBAAkB;AAAA,IAClB,UAAU;AAAA,IACV,sBAAsB,CAAA;AAAA,IACtB,cAAc;AAAA,EAAA;AAGhB,MAAI,CAAC,eAAe;AAElB,UAAM,OAAO,KAAK,KAAK,oBAAoB,CAAC;AAAA,EAC9C;AACA,MAAI,QAAQ,kBAAkB;AAC5B,WAAO,SAAS;AAAA,MACd;AAAA,IAAA;AAGF,UAAM,WAAW,QAAQ,WAAW,KAAK,MAAM,QAAQ,QAAQ,IAAI,CAAA;AACnE,QAAI,CAAC,QAAQ,UAAU;AACrB,aAAO,SAAS;AAAA,QACd;AAAA,MAAA;AAAA,IAEJ;AACA,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE;AAAA,QACA;AAAA,MAAA;AAAA,MAEF;AAAA,MACA;AAAA,IAAA,EACA;AACF,WAAO,mBAAmB,MAAM,aAAa,IAAI,QAAQ,SAAS,GAAG,CAAC;AAAA,EACxE;AACA,QAAM,WAAW,cAAc,KAAK,MAAM,UAAU;AAEpD,QAAM,QAAQ,YAAY,IAAA;AAE1B,MAAI,iBAAiB;AACrB,QAAM,cAAqC,CAAA;AAC3C,QAAM,kCAA+B,IAAA;AACrC,aAAW,aAAa,QAAQ,UAAU,UAAU,GAAG,GAAG,YAAY,GAAG;AACvE,QAAI,cAAc,SAAS;AACzB;AAAA,IACF;AACA,WAAO,UAAU,SAAS,KAAK;AAE/B,QAAI,OAAc,YAAY,UAAU,KAAK;AAC7C,UAAM,IAAI,UAAU,QAAQ,MAAM,KAAK,UAAU,UAAU,GAAG;AAC9D,QAAI,YAAY,IAAI,CAAC,GAAG;AACtB;AAAA,IACF;AACA;AACA,gBAAY,IAAI,CAAC;AACjB,QAAI,QAAQ,YAAY;AACtB,UAAI,CAAC,MAAM;AACT,eAAO,CAAA;AACP,oBAAY,UAAU,KAAK,IAAI;AAAA,MACjC;AACA,WAAK,KAAK,UAAU,GAAG;AAAA,IACzB;AAAA,EACF;AAEA,QAAM,MAAM,YAAY,IAAA;AACxB,MAAI,QAAQ,YAAY;AACtB,WAAO,aAAa;AAAA,EACtB;AACA,SAAO,QAAQ;AACf,SAAO,MAAM;AAGb,SAAO,iBAAiB;AACxB,SAAO,uBAAuB,KAAK,OAAO,mBAAA,KAAwB,CAAA;AAClE,MAAI,eAAe;AACnB,aAAW,KAAK,OAAO,OAAO,OAAO,oBAAoB,GAAG;AAC1D,eAAW,KAAK,OAAO,OAAO,CAAC,GAAG;AAChC,sBAAgB;AAAA,IAClB;AAAA,EACF;AACA,SAAO,eAAe;AAEtB,MAAI,QAAQ,YAAY;AACtB,WAAO,WAAW,KAAK,OAAO,cAAA;AAAA,EAChC;AACA,SAAO;AACT;"}

package/out/otel/src/log-options.d.ts

@@ -1,4 +1,4 @@
-import { type Config } from '../../shared/src/options.ts';
+import { type Config } from '../../shared/src/options-types.ts';
 import * as v from '../../shared/src/valita.ts';
 export declare const logLevel: v.Type<"error" | "debug" | "info" | "warn">;
 export declare const logOptions: {

package/out/otel/src/log-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-options.d.ts","sourceRoot":"","sources":["../../../../otel/src/log-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAEhD,eAAO,MAAM,QAAQ,6CAAmD,CAAC;AAEzE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;CA+BtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC"}
+{"version":3,"file":"log-options.d.ts","sourceRoot":"","sources":["../../../../otel/src/log-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAEhD,eAAO,MAAM,QAAQ,6CAAmD,CAAC;AAEzE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;CA+BtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC"}

package/out/otel/src/log-options.js

@@ -1,4 +1,3 @@
-import "../../shared/src/options.js";
 import { literalUnion } from "../../shared/src/valita.js";
 import { number } from "@badrap/valita";
 const logLevel = literalUnion("debug", "info", "warn", "error");

package/out/otel/src/log-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-options.js","sources":["../../../../otel/src/log-options.ts"],"sourcesContent":["import {type Config} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\n\nexport const logLevel = v.literalUnion('debug', 'info', 'warn', 'error');\n\nexport const logOptions = {\n  level: logLevel.default('info'),\n\n  format: {\n    type: v.literalUnion('text', 'json').default('text'),\n    desc: [\n      `Use {bold text} for developer-friendly console logging`,\n      `and {bold json} for consumption by structured-logging services`,\n    ],\n  },\n\n  slowRowThreshold: {\n    type: v.number().default(2),\n    desc: [\n      `The number of ms a row must take to fetch from table-source before it is considered slow.`,\n    ],\n  },\n\n  slowHydrateThreshold: {\n    type: v.number().default(100),\n    desc: [\n      `The number of milliseconds a query hydration must take to print a slow warning.`,\n    ],\n  },\n\n  ivmSampling: {\n    type: v.number().default(5000),\n    desc: [\n      `How often to collect IVM metrics. 1 out of N requests will be sampled where N is this value.`,\n    ],\n  },\n};\n\nexport type LogConfig = Config<typeof logOptions>;\n"],"names":["v.literalUnion","v.number"],"mappings":";;;AAGO,MAAM,WAAWA,aAAe,SAAS,QAAQ,QAAQ,OAAO;AAEhE,MAAM,aAAa;AAAA,EACxB,OAAO,SAAS,QAAQ,MAAM;AAAA,EAE9B,QAAQ;AAAA,IACN,MAAMA,aAAe,QAAQ,MAAM,EAAE,QAAQ,MAAM;AAAA,IACnD,MAAM;AAAA,MACJ;AAAA,MACA;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,kBAAkB;AAAA,IAChB,MAAMC,OAAE,EAAS,QAAQ,CAAC;AAAA,IAC1B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,sBAAsB;AAAA,IACpB,MAAMA,OAAE,EAAS,QAAQ,GAAG;AAAA,IAC5B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,aAAa;AAAA,IACX,MAAMA,OAAE,EAAS,QAAQ,GAAI;AAAA,IAC7B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAEJ;"}
+{"version":3,"file":"log-options.js","sources":["../../../../otel/src/log-options.ts"],"sourcesContent":["import {type Config} from '../../shared/src/options-types.ts';\nimport * as v from '../../shared/src/valita.ts';\n\nexport const logLevel = v.literalUnion('debug', 'info', 'warn', 'error');\n\nexport const logOptions = {\n  level: logLevel.default('info'),\n\n  format: {\n    type: v.literalUnion('text', 'json').default('text'),\n    desc: [\n      `Use {bold text} for developer-friendly console logging`,\n      `and {bold json} for consumption by structured-logging services`,\n    ],\n  },\n\n  slowRowThreshold: {\n    type: v.number().default(2),\n    desc: [\n      `The number of ms a row must take to fetch from table-source before it is considered slow.`,\n    ],\n  },\n\n  slowHydrateThreshold: {\n    type: v.number().default(100),\n    desc: [\n      `The number of milliseconds a query hydration must take to print a slow warning.`,\n    ],\n  },\n\n  ivmSampling: {\n    type: v.number().default(5000),\n    desc: [\n      `How often to collect IVM metrics. 1 out of N requests will be sampled where N is this value.`,\n    ],\n  },\n};\n\nexport type LogConfig = Config<typeof logOptions>;\n"],"names":["v.literalUnion","v.number"],"mappings":";;AAGO,MAAM,WAAWA,aAAe,SAAS,QAAQ,QAAQ,OAAO;AAEhE,MAAM,aAAa;AAAA,EACxB,OAAO,SAAS,QAAQ,MAAM;AAAA,EAE9B,QAAQ;AAAA,IACN,MAAMA,aAAe,QAAQ,MAAM,EAAE,QAAQ,MAAM;AAAA,IACnD,MAAM;AAAA,MACJ;AAAA,MACA;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,kBAAkB;AAAA,IAChB,MAAMC,OAAE,EAAS,QAAQ,CAAC;AAAA,IAC1B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,sBAAsB;AAAA,IACpB,MAAMA,OAAE,EAAS,QAAQ,GAAG;AAAA,IAC5B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,aAAa;AAAA,IACX,MAAMA,OAAE,EAAS,QAAQ,GAAI;AAAA,IAC7B,MAAM;AAAA,MACJ;AAAA,IAAA;AAAA,EACF;AAEJ;"}

package/out/replicache/src/persist/idb-databases-store.d.ts

@@ -1,4 +1,5 @@
 import type { CreateStore } from '../kv/store.ts';
+export declare const PROFILE_ID_KEY = "profileId";
 export type IndexedDBName = string;
 export type IndexedDBDatabase = {
     readonly name: IndexedDBName;

package/out/replicache/src/persist/idb-databases-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idb-databases-store.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/persist/idb-databases-store.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAS7D,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,IAAI,EAAE,aAAa,GAAG,iBAAiB,CAAC;CACnD,CAAC;AA0BF,qBAAa,iBAAiB;;gBAGhB,aAAa,EAAE,WAAW;IAItC,WAAW,CAAC,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAIpE,qBAAqB,CACnB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,uBAAuB,CAAC;IAgBnC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9D,YAAY,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAIhD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;CAYhC"}
+{"version":3,"file":"idb-databases-store.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/persist/idb-databases-store.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAM7D,eAAO,MAAM,cAAc,cAAc,CAAC;AAG1C,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,IAAI,EAAE,aAAa,GAAG,iBAAiB,CAAC;CACnD,CAAC;AA0BF,qBAAa,iBAAiB;;gBAGhB,aAAa,EAAE,WAAW;IAItC,WAAW,CAAC,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAIpE,qBAAqB,CACnB,EAAE,EAAE,iBAAiB,GACpB,OAAO,CAAC,uBAAuB,CAAC;IAgBnC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9D,YAAY,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAIhD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;CAwBhC"}

package/out/replicache/src/persist/idb-databases-store.js

@@ -1,4 +1,5 @@
 import { assertString, assertObject, assert, assertNumber } from "../../../shared/src/asserts.js";
+import { getBrowserGlobal } from "../../../shared/src/browser-env.js";
 import { deepFreeze } from "../frozen-json.js";
 import { withWrite, withRead } from "../with-transactions.js";
 import { getIDBDatabasesDBName } from "./idb-databases-store-db-name.js";
@@ -70,8 +71,17 @@ class IDBDatabasesStore {
     return withWrite(this.#kvStore, async (write) => {
       let profileId = await write.get(PROFILE_ID_KEY);
       if (profileId === void 0) {
-        profileId = `p${makeClientID()}`;
+        const maybeLocalStorage = getBrowserGlobal("localStorage");
+        if (maybeLocalStorage) {
+          profileId = maybeLocalStorage.getItem(PROFILE_ID_KEY) ?? void 0;
+        }
+        if (profileId === void 0) {
+          profileId = `p${makeClientID()}`;
+        }
         await write.put(PROFILE_ID_KEY, profileId);
+        if (maybeLocalStorage) {
+          maybeLocalStorage.setItem(PROFILE_ID_KEY, profileId);
+        }
       }
       assertString(profileId);
       return profileId;
@@ -87,6 +97,7 @@ async function getDatabases(read) {
   return dbRecord;
 }
 export {
-  IDBDatabasesStore
+  IDBDatabasesStore,
+  PROFILE_ID_KEY
 };
 //# sourceMappingURL=idb-databases-store.js.map

package/out/replicache/src/persist/idb-databases-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"idb-databases-store.js","sources":["../../../../../replicache/src/persist/idb-databases-store.ts"],"sourcesContent":["import {\n  assert,\n  assertNumber,\n  assertObject,\n  assertString,\n} from '../../../shared/src/asserts.ts';\nimport {deepFreeze} from '../frozen-json.ts';\nimport type {CreateStore, Read, Store} from '../kv/store.ts';\nimport {withRead, withWrite} from '../with-transactions.ts';\nimport {getIDBDatabasesDBName} from './idb-databases-store-db-name.ts';\nimport {makeClientID} from './make-client-id.ts';\n\nconst DBS_KEY = 'dbs';\nconst PROFILE_ID_KEY = 'profileId';\n\n// TODO: make an opaque type\nexport type IndexedDBName = string;\n\nexport type IndexedDBDatabase = {\n  readonly name: IndexedDBName;\n  readonly replicacheName: string;\n  readonly replicacheFormatVersion: number;\n  readonly schemaVersion: string;\n  readonly lastOpenedTimestampMS?: number;\n};\n\nexport type IndexedDBDatabaseRecord = {\n  readonly [name: IndexedDBName]: IndexedDBDatabase;\n};\n\nfunction assertIndexedDBDatabaseRecord(\n  value: unknown,\n): asserts value is IndexedDBDatabaseRecord {\n  assertObject(value);\n  for (const [name, db] of Object.entries(value)) {\n    assertString(name);\n    assertIndexedDBDatabase(db);\n    assert(name === db.name);\n  }\n}\n\nfunction assertIndexedDBDatabase(\n  value: unknown,\n): asserts value is IndexedDBDatabase {\n  assertObject(value);\n  assertString(value.name);\n  assertString(value.replicacheName);\n  assertNumber(value.replicacheFormatVersion);\n  assertString(value.schemaVersion);\n  if (value.lastOpenedTimestampMS !== undefined) {\n    assertNumber(value.lastOpenedTimestampMS);\n  }\n}\n\nexport class IDBDatabasesStore {\n  readonly #kvStore: Store;\n\n  constructor(createKVStore: CreateStore) {\n    this.#kvStore = createKVStore(getIDBDatabasesDBName());\n  }\n\n  putDatabase(db: IndexedDBDatabase): Promise<IndexedDBDatabaseRecord> {\n    return this.#putDatabase({...db, lastOpenedTimestampMS: Date.now()});\n  }\n\n  putDatabaseForTesting(\n    db: IndexedDBDatabase,\n  ): Promise<IndexedDBDatabaseRecord> {\n    return this.#putDatabase(db);\n  }\n\n  #putDatabase(db: IndexedDBDatabase): Promise<IndexedDBDatabaseRecord> {\n    return withWrite(this.#kvStore, async write => {\n      const oldDbRecord = await getDatabases(write);\n      const dbRecord = {\n        ...oldDbRecord,\n        [db.name]: db,\n      };\n      await write.put(DBS_KEY, dbRecord);\n      return dbRecord;\n    });\n  }\n\n  clearDatabases(): Promise<void> {\n    return withWrite(this.#kvStore, write => write.del(DBS_KEY));\n  }\n\n  deleteDatabases(names: Iterable<IndexedDBName>): Promise<void> {\n    return withWrite(this.#kvStore, async write => {\n      const oldDbRecord = await getDatabases(write);\n      const dbRecord = {\n        ...oldDbRecord,\n      };\n      for (const name of names) {\n        delete dbRecord[name];\n      }\n      await write.put(DBS_KEY, dbRecord);\n    });\n  }\n\n  getDatabases(): Promise<IndexedDBDatabaseRecord> {\n    return withRead(this.#kvStore, getDatabases);\n  }\n\n  close(): Promise<void> {\n    return this.#kvStore.close();\n  }\n\n  getProfileID(): Promise<string> {\n    return withWrite(this.#kvStore, async write => {\n      let profileId = await write.get(PROFILE_ID_KEY);\n      if (profileId === undefined) {\n        // Profile id is 'p' followed by a random number.\n        profileId = `p${makeClientID()}`;\n        await write.put(PROFILE_ID_KEY, profileId);\n      }\n      assertString(profileId);\n      return profileId;\n    });\n  }\n}\n\nasync function getDatabases(read: Read): Promise<IndexedDBDatabaseRecord> {\n  let dbRecord = await read.get(DBS_KEY);\n  if (!dbRecord) {\n    dbRecord = deepFreeze({});\n  }\n  assertIndexedDBDatabaseRecord(dbRecord);\n  return dbRecord;\n}\n"],"names":[],"mappings":";;;;;AAYA,MAAM,UAAU;AAChB,MAAM,iBAAiB;AAiBvB,SAAS,8BACP,OAC0C;AAC1C,eAAa,KAAK;AAClB,aAAW,CAAC,MAAM,EAAE,KAAK,OAAO,QAAQ,KAAK,GAAG;AAC9C,iBAAa,IAAI;AACjB,4BAAwB,EAAE;AAC1B,WAAO,SAAS,GAAG,IAAI;AAAA,EACzB;AACF;AAEA,SAAS,wBACP,OACoC;AACpC,eAAa,KAAK;AAClB,eAAa,MAAM,IAAI;AACvB,eAAa,MAAM,cAAc;AACjC,eAAa,MAAM,uBAAuB;AAC1C,eAAa,MAAM,aAAa;AAChC,MAAI,MAAM,0BAA0B,QAAW;AAC7C,iBAAa,MAAM,qBAAqB;AAAA,EAC1C;AACF;AAEO,MAAM,kBAAkB;AAAA,EACpB;AAAA,EAET,YAAY,eAA4B;AACtC,SAAK,WAAW,cAAc,uBAAuB;AAAA,EACvD;AAAA,EAEA,YAAY,IAAyD;AACnE,WAAO,KAAK,aAAa,EAAC,GAAG,IAAI,uBAAuB,KAAK,IAAA,GAAM;AAAA,EACrE;AAAA,EAEA,sBACE,IACkC;AAClC,WAAO,KAAK,aAAa,EAAE;AAAA,EAC7B;AAAA,EAEA,aAAa,IAAyD;AACpE,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,YAAM,cAAc,MAAM,aAAa,KAAK;AAC5C,YAAM,WAAW;AAAA,QACf,GAAG;AAAA,QACH,CAAC,GAAG,IAAI,GAAG;AAAA,MAAA;AAEb,YAAM,MAAM,IAAI,SAAS,QAAQ;AACjC,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,iBAAgC;AAC9B,WAAO,UAAU,KAAK,UAAU,WAAS,MAAM,IAAI,OAAO,CAAC;AAAA,EAC7D;AAAA,EAEA,gBAAgB,OAA+C;AAC7D,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,YAAM,cAAc,MAAM,aAAa,KAAK;AAC5C,YAAM,WAAW;AAAA,QACf,GAAG;AAAA,MAAA;AAEL,iBAAW,QAAQ,OAAO;AACxB,eAAO,SAAS,IAAI;AAAA,MACtB;AACA,YAAM,MAAM,IAAI,SAAS,QAAQ;AAAA,IACnC,CAAC;AAAA,EACH;AAAA,EAEA,eAAiD;AAC/C,WAAO,SAAS,KAAK,UAAU,YAAY;AAAA,EAC7C;AAAA,EAEA,QAAuB;AACrB,WAAO,KAAK,SAAS,MAAA;AAAA,EACvB;AAAA,EAEA,eAAgC;AAC9B,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,UAAI,YAAY,MAAM,MAAM,IAAI,cAAc;AAC9C,UAAI,cAAc,QAAW;AAE3B,oBAAY,IAAI,cAAc;AAC9B,cAAM,MAAM,IAAI,gBAAgB,SAAS;AAAA,MAC3C;AACA,mBAAa,SAAS;AACtB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;AAEA,eAAe,aAAa,MAA8C;AACxE,MAAI,WAAW,MAAM,KAAK,IAAI,OAAO;AACrC,MAAI,CAAC,UAAU;AACb,eAAW,WAAW,EAAE;AAAA,EAC1B;AACA,gCAA8B,QAAQ;AACtC,SAAO;AACT;"}
+{"version":3,"file":"idb-databases-store.js","sources":["../../../../../replicache/src/persist/idb-databases-store.ts"],"sourcesContent":["import {\n  assert,\n  assertNumber,\n  assertObject,\n  assertString,\n} from '../../../shared/src/asserts.ts';\nimport {getBrowserGlobal} from '../../../shared/src/browser-env.ts';\nimport {deepFreeze} from '../frozen-json.ts';\nimport type {CreateStore, Read, Store} from '../kv/store.ts';\nimport {withRead, withWrite} from '../with-transactions.ts';\nimport {getIDBDatabasesDBName} from './idb-databases-store-db-name.ts';\nimport {makeClientID} from './make-client-id.ts';\n\nconst DBS_KEY = 'dbs';\nexport const PROFILE_ID_KEY = 'profileId';\n\n// TODO: make an opaque type\nexport type IndexedDBName = string;\n\nexport type IndexedDBDatabase = {\n  readonly name: IndexedDBName;\n  readonly replicacheName: string;\n  readonly replicacheFormatVersion: number;\n  readonly schemaVersion: string;\n  readonly lastOpenedTimestampMS?: number;\n};\n\nexport type IndexedDBDatabaseRecord = {\n  readonly [name: IndexedDBName]: IndexedDBDatabase;\n};\n\nfunction assertIndexedDBDatabaseRecord(\n  value: unknown,\n): asserts value is IndexedDBDatabaseRecord {\n  assertObject(value);\n  for (const [name, db] of Object.entries(value)) {\n    assertString(name);\n    assertIndexedDBDatabase(db);\n    assert(name === db.name);\n  }\n}\n\nfunction assertIndexedDBDatabase(\n  value: unknown,\n): asserts value is IndexedDBDatabase {\n  assertObject(value);\n  assertString(value.name);\n  assertString(value.replicacheName);\n  assertNumber(value.replicacheFormatVersion);\n  assertString(value.schemaVersion);\n  if (value.lastOpenedTimestampMS !== undefined) {\n    assertNumber(value.lastOpenedTimestampMS);\n  }\n}\n\nexport class IDBDatabasesStore {\n  readonly #kvStore: Store;\n\n  constructor(createKVStore: CreateStore) {\n    this.#kvStore = createKVStore(getIDBDatabasesDBName());\n  }\n\n  putDatabase(db: IndexedDBDatabase): Promise<IndexedDBDatabaseRecord> {\n    return this.#putDatabase({...db, lastOpenedTimestampMS: Date.now()});\n  }\n\n  putDatabaseForTesting(\n    db: IndexedDBDatabase,\n  ): Promise<IndexedDBDatabaseRecord> {\n    return this.#putDatabase(db);\n  }\n\n  #putDatabase(db: IndexedDBDatabase): Promise<IndexedDBDatabaseRecord> {\n    return withWrite(this.#kvStore, async write => {\n      const oldDbRecord = await getDatabases(write);\n      const dbRecord = {\n        ...oldDbRecord,\n        [db.name]: db,\n      };\n      await write.put(DBS_KEY, dbRecord);\n      return dbRecord;\n    });\n  }\n\n  clearDatabases(): Promise<void> {\n    return withWrite(this.#kvStore, write => write.del(DBS_KEY));\n  }\n\n  deleteDatabases(names: Iterable<IndexedDBName>): Promise<void> {\n    return withWrite(this.#kvStore, async write => {\n      const oldDbRecord = await getDatabases(write);\n      const dbRecord = {\n        ...oldDbRecord,\n      };\n      for (const name of names) {\n        delete dbRecord[name];\n      }\n      await write.put(DBS_KEY, dbRecord);\n    });\n  }\n\n  getDatabases(): Promise<IndexedDBDatabaseRecord> {\n    return withRead(this.#kvStore, getDatabases);\n  }\n\n  close(): Promise<void> {\n    return this.#kvStore.close();\n  }\n\n  getProfileID(): Promise<string> {\n    return withWrite(this.#kvStore, async write => {\n      let profileId = await write.get(PROFILE_ID_KEY);\n      if (profileId === undefined) {\n        // Not in the kv store. Try localStorage in case we are using a non persistent kv store.\n        const maybeLocalStorage = getBrowserGlobal('localStorage');\n        if (maybeLocalStorage) {\n          profileId = maybeLocalStorage.getItem(PROFILE_ID_KEY) ?? undefined;\n        }\n\n        if (profileId === undefined) {\n          // Profile id is 'p' followed by a random number.\n          profileId = `p${makeClientID()}`;\n        }\n\n        await write.put(PROFILE_ID_KEY, profileId);\n        if (maybeLocalStorage) {\n          maybeLocalStorage.setItem(PROFILE_ID_KEY, profileId);\n        }\n      }\n      assertString(profileId);\n      return profileId;\n    });\n  }\n}\n\nasync function getDatabases(read: Read): Promise<IndexedDBDatabaseRecord> {\n  let dbRecord = await read.get(DBS_KEY);\n  if (!dbRecord) {\n    dbRecord = deepFreeze({});\n  }\n  assertIndexedDBDatabaseRecord(dbRecord);\n  return dbRecord;\n}\n"],"names":[],"mappings":";;;;;;AAaA,MAAM,UAAU;AACT,MAAM,iBAAiB;AAiB9B,SAAS,8BACP,OAC0C;AAC1C,eAAa,KAAK;AAClB,aAAW,CAAC,MAAM,EAAE,KAAK,OAAO,QAAQ,KAAK,GAAG;AAC9C,iBAAa,IAAI;AACjB,4BAAwB,EAAE;AAC1B,WAAO,SAAS,GAAG,IAAI;AAAA,EACzB;AACF;AAEA,SAAS,wBACP,OACoC;AACpC,eAAa,KAAK;AAClB,eAAa,MAAM,IAAI;AACvB,eAAa,MAAM,cAAc;AACjC,eAAa,MAAM,uBAAuB;AAC1C,eAAa,MAAM,aAAa;AAChC,MAAI,MAAM,0BAA0B,QAAW;AAC7C,iBAAa,MAAM,qBAAqB;AAAA,EAC1C;AACF;AAEO,MAAM,kBAAkB;AAAA,EACpB;AAAA,EAET,YAAY,eAA4B;AACtC,SAAK,WAAW,cAAc,uBAAuB;AAAA,EACvD;AAAA,EAEA,YAAY,IAAyD;AACnE,WAAO,KAAK,aAAa,EAAC,GAAG,IAAI,uBAAuB,KAAK,IAAA,GAAM;AAAA,EACrE;AAAA,EAEA,sBACE,IACkC;AAClC,WAAO,KAAK,aAAa,EAAE;AAAA,EAC7B;AAAA,EAEA,aAAa,IAAyD;AACpE,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,YAAM,cAAc,MAAM,aAAa,KAAK;AAC5C,YAAM,WAAW;AAAA,QACf,GAAG;AAAA,QACH,CAAC,GAAG,IAAI,GAAG;AAAA,MAAA;AAEb,YAAM,MAAM,IAAI,SAAS,QAAQ;AACjC,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,iBAAgC;AAC9B,WAAO,UAAU,KAAK,UAAU,WAAS,MAAM,IAAI,OAAO,CAAC;AAAA,EAC7D;AAAA,EAEA,gBAAgB,OAA+C;AAC7D,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,YAAM,cAAc,MAAM,aAAa,KAAK;AAC5C,YAAM,WAAW;AAAA,QACf,GAAG;AAAA,MAAA;AAEL,iBAAW,QAAQ,OAAO;AACxB,eAAO,SAAS,IAAI;AAAA,MACtB;AACA,YAAM,MAAM,IAAI,SAAS,QAAQ;AAAA,IACnC,CAAC;AAAA,EACH;AAAA,EAEA,eAAiD;AAC/C,WAAO,SAAS,KAAK,UAAU,YAAY;AAAA,EAC7C;AAAA,EAEA,QAAuB;AACrB,WAAO,KAAK,SAAS,MAAA;AAAA,EACvB;AAAA,EAEA,eAAgC;AAC9B,WAAO,UAAU,KAAK,UAAU,OAAM,UAAS;AAC7C,UAAI,YAAY,MAAM,MAAM,IAAI,cAAc;AAC9C,UAAI,cAAc,QAAW;AAE3B,cAAM,oBAAoB,iBAAiB,cAAc;AACzD,YAAI,mBAAmB;AACrB,sBAAY,kBAAkB,QAAQ,cAAc,KAAK;AAAA,QAC3D;AAEA,YAAI,cAAc,QAAW;AAE3B,sBAAY,IAAI,cAAc;AAAA,QAChC;AAEA,cAAM,MAAM,IAAI,gBAAgB,SAAS;AACzC,YAAI,mBAAmB;AACrB,4BAAkB,QAAQ,gBAAgB,SAAS;AAAA,QACrD;AAAA,MACF;AACA,mBAAa,SAAS;AACtB,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;AAEA,eAAe,aAAa,MAA8C;AACxE,MAAI,WAAW,MAAM,KAAK,IAAI,OAAO;AACrC,MAAI,CAAC,UAAU;AACb,eAAW,WAAW,EAAE;AAAA,EAC1B;AACA,gCAA8B,QAAQ;AACtC,SAAO;AACT;"}

package/out/shared/src/deep-merge.d.ts

@@ -2,15 +2,17 @@ type Simplify<T> = {
     [K in keyof T]: T[K];
 } & {};
 type IsPlainObject<T> = T extends object ? T extends Function | readonly unknown[] ? false : true : false;
-type MergeValue<A, B> = IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? DeepMerge<A & {}, B & {}> : B : B;
+type IsLeaf<T, Leaf> = [T] extends [Leaf] ? true : false;
+type MergeValue<A, B, Leaf> = IsLeaf<A, Leaf> extends true ? B : IsLeaf<B, Leaf> extends true ? B : IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? DeepMerge<A & {}, B & {}, Leaf> : B : B;
 /**
  * Type-level deep merge of two object types. Properties from B override
  * properties from A. When both A[K] and B[K] are objects (not arrays or
  * functions), they are recursively merged.
  */
-export type DeepMerge<A, B> = Simplify<Omit<A, keyof B> & {
-    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K]> : B[K];
+export type DeepMerge<A, B, Leaf = never> = Simplify<Omit<A, keyof B> & {
+    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K], Leaf> : B[K];
 }>;
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 /**
  * Deep merges two objects. Properties from `b` override properties from `a`.
  * Nested objects are recursively merged.
@@ -21,6 +23,6 @@ export type DeepMerge<A, B> = Simplify<Omit<A, keyof B> & {
  *   as a leaf (not recursed into). Defaults to checking if the value is not a
  *   plain object.
  */
-export declare function deepMerge<A extends Record<string, unknown>, B extends Record<string, unknown>>(a: A, b: B, isLeaf?: (value: unknown) => boolean): DeepMerge<A, B>;
+export declare function deepMerge<A extends Record<string, unknown>, B extends Record<string, unknown>, Leaf = never>(a: A, b: B, isLeaf?: (value: unknown) => boolean): DeepMerge<A, B, Leaf>;
 export {};
 //# sourceMappingURL=deep-merge.d.ts.map

package/out/shared/src/deep-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../../../shared/src/deep-merge.ts"],"names":[],"mappings":"AACA,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,EAAE,CAAC;AAG/C,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACpC,CAAC,SAAS,QAAQ,GAAG,SAAS,OAAO,EAAE,GACrC,KAAK,GACL,IAAI,GACN,KAAK,CAAC;AAGV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAClB,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GACzB,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,GACzB,CAAC,GACH,CAAC,CAAC;AAER;;;;GAIG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CACpC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClE,CACF,CAAC;AAMF;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAgC,GAC3D,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAyBjB"}
+{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../../../shared/src/deep-merge.ts"],"names":[],"mappings":"AACA,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,EAAE,CAAC;AAG/C,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACpC,CAAC,SAAS,QAAQ,GAAG,SAAS,OAAO,EAAE,GACrC,KAAK,GACL,IAAI,GACN,KAAK,CAAC;AAEV,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEzD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,IACxB,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,IAAI,GACxB,CAAC,GACD,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,IAAI,GAC1B,CAAC,GACD,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAC/B,CAAC,GACH,CAAC,CAAC;AAEZ;;;;GAIG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,KAAK,IAAI,QAAQ,CAClD,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACxE,CACF,CAAC;AAEF,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAElC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,IAAI,GAAG,KAAK,EAEZ,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAgC,GAC3D,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CA6BvB"}

package/out/shared/src/deep-merge.js

@@ -22,6 +22,7 @@ function deepMerge(a, b, isLeaf = (v) => !isPlainObject(v)) {
   return result;
 }
 export {
-  deepMerge
+  deepMerge,
+  isPlainObject
 };
 //# sourceMappingURL=deep-merge.js.map

package/out/shared/src/deep-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"deep-merge.js","sources":["../../../../shared/src/deep-merge.ts"],"sourcesContent":["// Force TypeScript to evaluate/flatten a type\ntype Simplify<T> = {[K in keyof T]: T[K]} & {};\n\n// Helper to check if T is a plain object (not array or function)\ntype IsPlainObject<T> = T extends object\n  ? T extends Function | readonly unknown[]\n    ? false\n    : true\n  : false;\n\n// Merge when both are plain objects, otherwise B wins\ntype MergeValue<A, B> =\n  IsPlainObject<A> extends true\n    ? IsPlainObject<B> extends true\n      ? DeepMerge<A & {}, B & {}>\n      : B\n    : B;\n\n/**\n * Type-level deep merge of two object types. Properties from B override\n * properties from A. When both A[K] and B[K] are objects (not arrays or\n * functions), they are recursively merged.\n */\nexport type DeepMerge<A, B> = Simplify<\n  Omit<A, keyof B> & {\n    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K]> : B[K];\n  }\n>;\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null;\n}\n\n/**\n * Deep merges two objects. Properties from `b` override properties from `a`.\n * Nested objects are recursively merged.\n *\n * @param a - The base object.\n * @param b - The object to merge into `a`.\n * @param isLeaf - Optional predicate to determine if a value should be treated\n *   as a leaf (not recursed into). Defaults to checking if the value is not a\n *   plain object.\n */\nexport function deepMerge<\n  A extends Record<string, unknown>,\n  B extends Record<string, unknown>,\n>(\n  a: A,\n  b: B,\n  isLeaf: (value: unknown) => boolean = v => !isPlainObject(v),\n): DeepMerge<A, B> {\n  const result: Record<string, unknown> = {};\n\n  // Copy all keys from a\n  for (const key of Object.keys(a)) {\n    result[key] = a[key];\n  }\n\n  // Merge/override with keys from b\n  for (const key of Object.keys(b)) {\n    const aVal = a[key];\n    const bVal = b[key];\n\n    if (key in a && !isLeaf(aVal) && !isLeaf(bVal)) {\n      result[key] = deepMerge(\n        aVal as Record<string, unknown>,\n        bVal as Record<string, unknown>,\n        isLeaf,\n      );\n    } else {\n      result[key] = bVal;\n    }\n  }\n\n  return result as DeepMerge<A, B>;\n}\n"],"names":[],"mappings":"AA6BA,SAAS,cAAc,OAAkD;AACvE,SAAO,OAAO,UAAU,YAAY,UAAU;AAChD;AAYO,SAAS,UAId,GACA,GACA,SAAsC,OAAK,CAAC,cAAc,CAAC,GAC1C;AACjB,QAAM,SAAkC,CAAA;AAGxC,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,WAAO,GAAG,IAAI,EAAE,GAAG;AAAA,EACrB;AAGA,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,UAAM,OAAO,EAAE,GAAG;AAClB,UAAM,OAAO,EAAE,GAAG;AAElB,QAAI,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG;AAC9C,aAAO,GAAG,IAAI;AAAA,QACZ;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL,aAAO,GAAG,IAAI;AAAA,IAChB;AAAA,EACF;AAEA,SAAO;AACT;"}
+{"version":3,"file":"deep-merge.js","sources":["../../../../shared/src/deep-merge.ts"],"sourcesContent":["// Force TypeScript to evaluate/flatten a type\ntype Simplify<T> = {[K in keyof T]: T[K]} & {};\n\n// Helper to check if T is a plain object (not array or function)\ntype IsPlainObject<T> = T extends object\n  ? T extends Function | readonly unknown[]\n    ? false\n    : true\n  : false;\n\ntype IsLeaf<T, Leaf> = [T] extends [Leaf] ? true : false;\n\ntype MergeValue<A, B, Leaf> =\n  IsLeaf<A, Leaf> extends true\n    ? B\n    : IsLeaf<B, Leaf> extends true\n      ? B\n      : IsPlainObject<A> extends true\n        ? IsPlainObject<B> extends true\n          ? DeepMerge<A & {}, B & {}, Leaf>\n          : B\n        : B;\n\n/**\n * Type-level deep merge of two object types. Properties from B override\n * properties from A. When both A[K] and B[K] are objects (not arrays or\n * functions), they are recursively merged.\n */\nexport type DeepMerge<A, B, Leaf = never> = Simplify<\n  Omit<A, keyof B> & {\n    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K], Leaf> : B[K];\n  }\n>;\n\nexport function isPlainObject(\n  value: unknown,\n): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null;\n}\n\n/**\n * Deep merges two objects. Properties from `b` override properties from `a`.\n * Nested objects are recursively merged.\n *\n * @param a - The base object.\n * @param b - The object to merge into `a`.\n * @param isLeaf - Optional predicate to determine if a value should be treated\n *   as a leaf (not recursed into). Defaults to checking if the value is not a\n *   plain object.\n */\nexport function deepMerge<\n  A extends Record<string, unknown>,\n  B extends Record<string, unknown>,\n  Leaf = never,\n>(\n  a: A,\n  b: B,\n  isLeaf: (value: unknown) => boolean = v => !isPlainObject(v),\n): DeepMerge<A, B, Leaf> {\n  const result: Record<string, unknown> = {};\n\n  // Copy all keys from a\n  for (const key of Object.keys(a)) {\n    result[key] = a[key];\n  }\n\n  // Merge/override with keys from b\n  for (const key of Object.keys(b)) {\n    const aVal = a[key];\n    const bVal = b[key];\n\n    if (key in a && !isLeaf(aVal) && !isLeaf(bVal)) {\n      result[key] = deepMerge<\n        Record<string, unknown>,\n        Record<string, unknown>,\n        Leaf\n      >(\n        aVal as Record<string, unknown>,\n        bVal as Record<string, unknown>,\n        isLeaf,\n      );\n    } else {\n      result[key] = bVal;\n    }\n  }\n\n  return result as DeepMerge<A, B, Leaf>;\n}\n"],"names":[],"mappings":"AAkCO,SAAS,cACd,OACkC;AAClC,SAAO,OAAO,UAAU,YAAY,UAAU;AAChD;AAYO,SAAS,UAKd,GACA,GACA,SAAsC,OAAK,CAAC,cAAc,CAAC,GACpC;AACvB,QAAM,SAAkC,CAAA;AAGxC,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,WAAO,GAAG,IAAI,EAAE,GAAG;AAAA,EACrB;AAGA,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,UAAM,OAAO,EAAE,GAAG;AAClB,UAAM,OAAO,EAAE,GAAG;AAElB,QAAI,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG;AAC9C,aAAO,GAAG,IAAI;AAAA,QAKZ;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL,aAAO,GAAG,IAAI;AAAA,IAChB;AAAA,EACF;AAEA,SAAO;AACT;"}

package/out/shared/src/iterables.d.ts

@@ -9,6 +9,5 @@ declare class IterWrapper<T> implements Iterable<T> {
     filter(p: (t: T, index: number) => boolean): IterWrapper<T>;
 }
 export declare function wrapIterable<T>(iter: Iterable<T>): IterWrapper<T>;
-export declare function mergeIterables<T>(iterables: Iterable<T>[], comparator: (l: T, r: T) => number, distinct?: boolean): IterableIterator<T>;
 export {};
 //# sourceMappingURL=iterables.d.ts.map

package/out/shared/src/iterables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"iterables.d.ts","sourceRoot":"","sources":["../../../../shared/src/iterables.ts"],"names":[],"mappings":"AAEA,wBAAiB,aAAa,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,2BAIxD;AAwBD,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAK3D;AAED,wBAAiB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAOzD;AAKD,cAAM,WAAW,CAAC,CAAC,CAAE,YAAW,QAAQ,CAAC,CAAC,CAAC;IACzC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACN,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAI7B,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIjB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAIrD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC;CAG5D;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAEjE;AAED,wBAAiB,cAAc,CAAC,CAAC,EAC/B,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EACxB,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,EAClC,QAAQ,UAAQ,GACf,gBAAgB,CAAC,CAAC,CAAC,CAoCrB"}
+{"version":3,"file":"iterables.d.ts","sourceRoot":"","sources":["../../../../shared/src/iterables.ts"],"names":[],"mappings":"AAAA,wBAAiB,aAAa,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,2BAIxD;AAwBD,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAK3D;AAED,wBAAiB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAOzD;AAKD,cAAM,WAAW,CAAC,CAAC,CAAE,YAAW,QAAQ,CAAC,CAAC,CAAC;IACzC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACN,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAI7B,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIjB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAIrD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC;CAG5D;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAEjE"}

package/out/shared/src/iterables.js

@@ -1,4 +1,3 @@
-import { assert } from "./asserts.js";
 function* joinIterables(...iters) {
   for (const iter of iters) {
     yield* iter;
@@ -44,41 +43,8 @@ class IterWrapper {
 function wrapIterable(iter) {
   return new IterWrapper(iter);
 }
-function* mergeIterables(iterables, comparator, distinct = false) {
-  const iterators = iterables.map((i) => i[Symbol.iterator]());
-  try {
-    const current = iterators.map((i) => i.next());
-    let lastYielded;
-    while (current.some((c) => !c.done)) {
-      const min = current.reduce(
-        (acc, c, i) => {
-          if (c.done) {
-            return acc;
-          }
-          if (acc === void 0 || comparator(c.value, acc[0]) < 0) {
-            return [c.value, i];
-          }
-          return acc;
-        },
-        void 0
-      );
-      assert(min !== void 0, "min is undefined");
-      current[min[1]] = iterators[min[1]].next();
-      if (lastYielded !== void 0 && distinct && comparator(lastYielded, min[0]) === 0) {
-        continue;
-      }
-      lastYielded = min[0];
-      yield min[0];
-    }
-  } finally {
-    for (const it of iterators) {
-      it.return?.();
-    }
-  }
-}
 export {
   joinIterables,
-  mergeIterables,
   once,
   wrapIterable
 };

package/out/shared/src/iterables.js.map

@@ -1 +1 @@
-{"version":3,"file":"iterables.js","sources":["../../../../shared/src/iterables.ts"],"sourcesContent":["import {assert} from './asserts.ts';\n\nexport function* joinIterables<T>(...iters: Iterable<T>[]) {\n  for (const iter of iters) {\n    yield* iter;\n  }\n}\n\nfunction* filterIter<T>(\n  iter: Iterable<T>,\n  p: (t: T, index: number) => boolean,\n): Iterable<T> {\n  let index = 0;\n  for (const t of iter) {\n    if (p(t, index++)) {\n      yield t;\n    }\n  }\n}\n\nfunction* mapIter<T, U>(\n  iter: Iterable<T>,\n  f: (t: T, index: number) => U,\n): Iterable<U> {\n  let index = 0;\n  for (const t of iter) {\n    yield f(t, index++);\n  }\n}\n\nexport function first<T>(stream: Iterable<T>): T | undefined {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  it.return?.();\n  return value;\n}\n\nexport function* once<T>(stream: Iterable<T>): Iterable<T> {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  if (value !== undefined) {\n    yield value;\n  }\n  it.return?.();\n}\n\n// TODO(arv): Use ES2024 Iterable.from when available\n// https://github.com/tc39/proposal-iterator-helpers\n\nclass IterWrapper<T> implements Iterable<T> {\n  iter: Iterable<T>;\n  constructor(iter: Iterable<T>) {\n    this.iter = iter;\n  }\n\n  [Symbol.iterator]() {\n    return this.iter[Symbol.iterator]();\n  }\n\n  map<U>(f: (t: T, index: number) => U): IterWrapper<U> {\n    return new IterWrapper(mapIter(this.iter, f));\n  }\n\n  filter(p: (t: T, index: number) => boolean): IterWrapper<T> {\n    return new IterWrapper(filterIter(this.iter, p));\n  }\n}\n\nexport function wrapIterable<T>(iter: Iterable<T>): IterWrapper<T> {\n  return new IterWrapper(iter);\n}\n\nexport function* mergeIterables<T>(\n  iterables: Iterable<T>[],\n  comparator: (l: T, r: T) => number,\n  distinct = false,\n): IterableIterator<T> {\n  const iterators = iterables.map(i => i[Symbol.iterator]());\n  try {\n    const current = iterators.map(i => i.next());\n    let lastYielded: T | undefined;\n    while (current.some(c => !c.done)) {\n      const min = current.reduce(\n        (acc: [T, number] | undefined, c, i): [T, number] | undefined => {\n          if (c.done) {\n            return acc;\n          }\n          if (acc === undefined || comparator(c.value, acc[0]) < 0) {\n            return [c.value, i];\n          }\n          return acc;\n        },\n        undefined,\n      );\n\n      assert(min !== undefined, 'min is undefined');\n      current[min[1]] = iterators[min[1]].next();\n      if (\n        lastYielded !== undefined &&\n        distinct &&\n        comparator(lastYielded, min[0]) === 0\n      ) {\n        continue;\n      }\n      lastYielded = min[0];\n      yield min[0];\n    }\n  } finally {\n    for (const it of iterators) {\n      it.return?.();\n    }\n  }\n}\n"],"names":[],"mappings":";AAEO,UAAU,iBAAoB,OAAsB;AACzD,aAAW,QAAQ,OAAO;AACxB,WAAO;AAAA,EACT;AACF;AAEA,UAAU,WACR,MACA,GACa;AACb,MAAI,QAAQ;AACZ,aAAW,KAAK,MAAM;AACpB,QAAI,EAAE,GAAG,OAAO,GAAG;AACjB,YAAM;AAAA,IACR;AAAA,EACF;AACF;AAEA,UAAU,QACR,MACA,GACa;AACb,MAAI,QAAQ;AACZ,aAAW,KAAK,MAAM;AACpB,UAAM,EAAE,GAAG,OAAO;AAAA,EACpB;AACF;AASO,UAAU,KAAQ,QAAkC;AACzD,QAAM,KAAK,OAAO,OAAO,QAAQ,EAAA;AACjC,QAAM,EAAC,MAAA,IAAS,GAAG,KAAA;AACnB,MAAI,UAAU,QAAW;AACvB,UAAM;AAAA,EACR;AACA,KAAG,SAAA;AACL;AAKA,MAAM,YAAsC;AAAA,EAC1C;AAAA,EACA,YAAY,MAAmB;AAC7B,SAAK,OAAO;AAAA,EACd;AAAA,EAEA,CAAC,OAAO,QAAQ,IAAI;AAClB,WAAO,KAAK,KAAK,OAAO,QAAQ,EAAA;AAAA,EAClC;AAAA,EAEA,IAAO,GAA+C;AACpD,WAAO,IAAI,YAAY,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,EAC9C;AAAA,EAEA,OAAO,GAAqD;AAC1D,WAAO,IAAI,YAAY,WAAW,KAAK,MAAM,CAAC,CAAC;AAAA,EACjD;AACF;AAEO,SAAS,aAAgB,MAAmC;AACjE,SAAO,IAAI,YAAY,IAAI;AAC7B;AAEO,UAAU,eACf,WACA,YACA,WAAW,OACU;AACrB,QAAM,YAAY,UAAU,IAAI,CAAA,MAAK,EAAE,OAAO,QAAQ,GAAG;AACzD,MAAI;AACF,UAAM,UAAU,UAAU,IAAI,CAAA,MAAK,EAAE,MAAM;AAC3C,QAAI;AACJ,WAAO,QAAQ,KAAK,CAAA,MAAK,CAAC,EAAE,IAAI,GAAG;AACjC,YAAM,MAAM,QAAQ;AAAA,QAClB,CAAC,KAA8B,GAAG,MAA+B;AAC/D,cAAI,EAAE,MAAM;AACV,mBAAO;AAAA,UACT;AACA,cAAI,QAAQ,UAAa,WAAW,EAAE,OAAO,IAAI,CAAC,CAAC,IAAI,GAAG;AACxD,mBAAO,CAAC,EAAE,OAAO,CAAC;AAAA,UACpB;AACA,iBAAO;AAAA,QACT;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,QAAQ,QAAW,kBAAkB;AAC5C,cAAQ,IAAI,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,EAAE,KAAA;AACpC,UACE,gBAAgB,UAChB,YACA,WAAW,aAAa,IAAI,CAAC,CAAC,MAAM,GACpC;AACA;AAAA,MACF;AACA,oBAAc,IAAI,CAAC;AACnB,YAAM,IAAI,CAAC;AAAA,IACb;AAAA,EACF,UAAA;AACE,eAAW,MAAM,WAAW;AAC1B,SAAG,SAAA;AAAA,IACL;AAAA,EACF;AACF;"}
+{"version":3,"file":"iterables.js","sources":["../../../../shared/src/iterables.ts"],"sourcesContent":["export function* joinIterables<T>(...iters: Iterable<T>[]) {\n  for (const iter of iters) {\n    yield* iter;\n  }\n}\n\nfunction* filterIter<T>(\n  iter: Iterable<T>,\n  p: (t: T, index: number) => boolean,\n): Iterable<T> {\n  let index = 0;\n  for (const t of iter) {\n    if (p(t, index++)) {\n      yield t;\n    }\n  }\n}\n\nfunction* mapIter<T, U>(\n  iter: Iterable<T>,\n  f: (t: T, index: number) => U,\n): Iterable<U> {\n  let index = 0;\n  for (const t of iter) {\n    yield f(t, index++);\n  }\n}\n\nexport function first<T>(stream: Iterable<T>): T | undefined {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  it.return?.();\n  return value;\n}\n\nexport function* once<T>(stream: Iterable<T>): Iterable<T> {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  if (value !== undefined) {\n    yield value;\n  }\n  it.return?.();\n}\n\n// TODO(arv): Use ES2024 Iterable.from when available\n// https://github.com/tc39/proposal-iterator-helpers\n\nclass IterWrapper<T> implements Iterable<T> {\n  iter: Iterable<T>;\n  constructor(iter: Iterable<T>) {\n    this.iter = iter;\n  }\n\n  [Symbol.iterator]() {\n    return this.iter[Symbol.iterator]();\n  }\n\n  map<U>(f: (t: T, index: number) => U): IterWrapper<U> {\n    return new IterWrapper(mapIter(this.iter, f));\n  }\n\n  filter(p: (t: T, index: number) => boolean): IterWrapper<T> {\n    return new IterWrapper(filterIter(this.iter, p));\n  }\n}\n\nexport function wrapIterable<T>(iter: Iterable<T>): IterWrapper<T> {\n  return new IterWrapper(iter);\n}\n"],"names":[],"mappings":"AAAO,UAAU,iBAAoB,OAAsB;AACzD,aAAW,QAAQ,OAAO;AACxB,WAAO;AAAA,EACT;AACF;AAEA,UAAU,WACR,MACA,GACa;AACb,MAAI,QAAQ;AACZ,aAAW,KAAK,MAAM;AACpB,QAAI,EAAE,GAAG,OAAO,GAAG;AACjB,YAAM;AAAA,IACR;AAAA,EACF;AACF;AAEA,UAAU,QACR,MACA,GACa;AACb,MAAI,QAAQ;AACZ,aAAW,KAAK,MAAM;AACpB,UAAM,EAAE,GAAG,OAAO;AAAA,EACpB;AACF;AASO,UAAU,KAAQ,QAAkC;AACzD,QAAM,KAAK,OAAO,OAAO,QAAQ,EAAA;AACjC,QAAM,EAAC,MAAA,IAAS,GAAG,KAAA;AACnB,MAAI,UAAU,QAAW;AACvB,UAAM;AAAA,EACR;AACA,KAAG,SAAA;AACL;AAKA,MAAM,YAAsC;AAAA,EAC1C;AAAA,EACA,YAAY,MAAmB;AAC7B,SAAK,OAAO;AAAA,EACd;AAAA,EAEA,CAAC,OAAO,QAAQ,IAAI;AAClB,WAAO,KAAK,KAAK,OAAO,QAAQ,EAAA;AAAA,EAClC;AAAA,EAEA,IAAO,GAA+C;AACpD,WAAO,IAAI,YAAY,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,EAC9C;AAAA,EAEA,OAAO,GAAqD;AAC1D,WAAO,IAAI,YAAY,WAAW,KAAK,MAAM,CAAC,CAAC;AAAA,EACjD;AACF;AAEO,SAAS,aAAgB,MAAmC;AACjE,SAAO,IAAI,YAAY,IAAI;AAC7B;"}

package/out/shared/src/options-types.d.ts

@@ -0,0 +1,113 @@
+import type * as v from './valita.ts';
+type RequiredOptionType = v.Type<string> | v.Type<number> | v.Type<boolean> | v.Type<string[]> | v.Type<number[]> | v.Type<boolean[]>;
+type OptionalOptionType = v.Optional<string> | v.Optional<number> | v.Optional<boolean> | v.Optional<string[]> | v.Optional<number[]> | v.Optional<boolean[]>;
+type OptionType = RequiredOptionType | OptionalOptionType;
+export type WrappedOptionType = {
+    type: OptionType;
+    /** Description lines to be displayed in --help. */
+    desc?: string[];
+    /** Logged as a warning when parsed. */
+    deprecated?: string[];
+    /** One-character alias for getopt-style short flags, e.g. -m */
+    alias?: string;
+    /**
+     * Exclude this flag from --help text. Used for internal flags.
+     * Deprecated options are hidden by default.
+     */
+    hidden?: boolean;
+};
+export type Option = OptionType | WrappedOptionType;
+export type Group = Record<string, Option>;
+/**
+ * # Options
+ *
+ * An `Options` object specifies of a set of (possibly grouped) configuration
+ * values that are parsed from environment variables and/or command line flags.
+ *
+ * Each option is represented by a `valita` schema object. The `Options`
+ * type supports one level of grouping for organizing related options.
+ *
+ * ```ts
+ * {
+ *   port: v.number().default(8080),
+ *
+ *   numWorkers: v.number(),
+ *
+ *   log: {
+ *     level: v.union(v.literal('debug'), v.literal('info'), ...),
+ *     format: v.union(v.literal('text'), v.literal('json')).default('text'),
+ *   }
+ * }
+ * ```
+ *
+ * {@link parseOptions()} will use an `Options` object to populate a {@link Config}
+ * instance of the corresponding shape, consulting SNAKE_CASE environment variables
+ * and/or camelCase command line flags, with flags taking precedence, based on the field
+ * (and group) names:
+ *
+ * | Option          | Flag          | Env         |
+ * | --------------  | ------------- | ----------- |
+ * | port            | --port        | PORT        |
+ * | numWorkers      | --num-workers | NUM_WORKERS |
+ * | log: { level }  | --log-level   | LOG_LEVEL   |
+ * | log: { format } | --log-format  | LOG_FORMAT  |
+ *
+ * `Options` supports:
+ * * primitive valita types `string`, `number`, `boolean`
+ * * single-type arrays or tuples of primitives
+ * * optional values
+ * * default values
+ *
+ * ### Additional Flag Configuration
+ *
+ * {@link parseOptions()} will generate a usage guide that is displayed for
+ * the `--help` or `-h` flags, displaying the flag name, env name, value
+ * type (or enumeration), and default values based on the valita schema.
+ *
+ * For additional configuration, each object can instead by represented by
+ * a {@link WrappedOptionType}, where the valita schema is held in the `type`
+ * field, along with additional optional fields:
+ * * `desc` for documentation displayed in `--help`
+ * * `alias` for getopt-style short flags like `-m`
+ */
+export type Options = Record<string, Group | Option>;
+/** Unwrap the Value type from an Option<V>. */
+type ValueOf<T extends Option> = T extends v.Optional<infer V> ? V | undefined : T extends v.Type<infer V> ? V : T extends WrappedOptionType ? ValueOf<T['type']> : never;
+type Required = RequiredOptionType | (WrappedOptionType & {
+    type: RequiredOptionType;
+});
+type Optional = OptionalOptionType | (WrappedOptionType & {
+    type: OptionalOptionType;
+});
+type ConfigGroup<G extends Group> = {
+    [P in keyof G as G[P] extends Required ? P : never]: ValueOf<G[P]>;
+} & {
+    [P in keyof G as G[P] extends Optional ? P : never]?: ValueOf<G[P]>;
+};
+/**
+ * A Config is an object containing values parsed from an {@link Options} object.
+ *
+ * Example:
+ *
+ * ```ts
+ * {
+ *   port: number;
+ *
+ *   numWorkers: number;
+ *
+ *   // The "log" group
+ *   log: {
+ *     level: 'debug' | 'info' | 'warn' | 'error';
+ *     format: 'text' | 'json'
+ *   };
+ *   ...
+ * }
+ * ```
+ */
+export type Config<O extends Options> = {
+    [P in keyof O as O[P] extends Required | Group ? P : never]: O[P] extends Required ? ValueOf<O[P]> : O[P] extends Group ? ConfigGroup<O[P]> : never;
+} & {
+    [P in keyof O as O[P] extends Optional ? P : never]?: O[P] extends Optional ? ValueOf<O[P]> : never;
+};
+export {};
+//# sourceMappingURL=options-types.d.ts.map

package/out/shared/src/options-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"options-types.d.ts","sourceRoot":"","sources":["../../../../shared/src/options-types.ts"],"names":[],"mappings":"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"}