@rocicorp/zero 0.25.0 → 0.26.0-canary.0

package/out/zero-server/src/schema.js

@@ -1,29 +1,34 @@
 import { assert } from "../../shared/src/asserts.js";
 import { must } from "../../shared/src/must.js";
-import { formatPg, sql } from "../../z2s/src/sql.js";
-import * as PostgresTypeClass from "../../zero-cache/src/db/postgres-type-class-enum.js";
+import { sql, formatPg } from "../../z2s/src/sql.js";
+import { Enum } from "../../zero-cache/src/db/postgres-type-class-enum.js";
 import { dataTypeToZqlValueType } from "../../zero-cache/src/types/pg-data-type.js";
-export async function getServerSchema(dbTransaction, schema) {
-    const schemaTablePairs = Object.values(schema.tables).map(({ name, serverName }) => {
-        let schemaTablePair = ['public', serverName ?? name];
-        if (serverName) {
-            const firstPeriod = serverName.indexOf('.');
-            if (firstPeriod > -1) {
-                schemaTablePair = [
-                    serverName.substring(0, firstPeriod),
-                    serverName.substring(firstPeriod + 1, serverName.length),
-                ];
-            }
+async function getServerSchema(dbTransaction, schema) {
+  const schemaTablePairs = Object.values(schema.tables).map(
+    ({ name, serverName }) => {
+      let schemaTablePair = ["public", serverName ?? name];
+      if (serverName) {
+        const firstPeriod = serverName.indexOf(".");
+        if (firstPeriod > -1) {
+          schemaTablePair = [
+            serverName.substring(0, firstPeriod),
+            serverName.substring(firstPeriod + 1, serverName.length)
+          ];
         }
-        return schemaTablePair;
-    });
-    if (schemaTablePairs.length === 0) {
-        return {}; // No pairs to query for
+      }
+      return schemaTablePair;
     }
-    // Cast all inputs to text and all outputs to text to avoid
-    // any conversions customer's DBTransaction impl has on other types.
-    const inClause = sql.join(schemaTablePairs.map(([schema, table]) => sql `(${schema}::text, ${table}::text)`), ',');
-    const query = sql `
+  );
+  if (schemaTablePairs.length === 0) {
+    return {};
+  }
+  const inClause = sql.join(
+    schemaTablePairs.map(
+      ([schema2, table]) => sql`(${schema2}::text, ${table}::text)`
+    ),
+    ","
+  );
+  const query = sql`
       SELECT
           c.table_schema::text AS schema,
           c.table_name::text AS table,
@@ -47,113 +52,120 @@ export async function getServerSchema(dbTransaction, schema) {
       WHERE
           (c.table_schema, c.table_name) IN (${inClause})
     `;
-    const { text, values } = formatPg(query);
-    const results = (await dbTransaction.query(text, values));
-    const serverSchema = {};
-    for (const row of results) {
-        const tableName = row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;
-        let tableSchema = serverSchema[tableName];
-        if (!tableSchema) {
-            tableSchema = {};
-            serverSchema[tableName] = tableSchema;
-        }
-        const isArray = row.elemTyptype !== null;
-        const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;
-        let type = row.dataType.toLowerCase();
-        if (isArray) {
-            type = must(row.elemTypname);
-        }
-        else if (isEnum) {
-            type = row.typename;
-        }
-        if ((type === 'bpchar' ||
-            type === 'character' ||
-            type === 'character varying' ||
-            type === 'varchar') &&
-            row.length) {
-            type = `${type}(${row.length})`;
-        }
-        if ((type === 'numeric' || type === 'decimal') &&
-            row.precision !== null &&
-            row.scale !== null) {
-            type = `${type}(${row.precision}, ${row.scale})`;
-        }
-        tableSchema[row.column] = {
-            type,
-            isEnum,
-            isArray,
-        };
+  const { text, values } = formatPg(query);
+  const results = await dbTransaction.query(
+    text,
+    values
+  );
+  const serverSchema = {};
+  for (const row of results) {
+    const tableName = row.schema === "public" ? row.table : `${row.schema}.${row.table}`;
+    let tableSchema = serverSchema[tableName];
+    if (!tableSchema) {
+      tableSchema = {};
+      serverSchema[tableName] = tableSchema;
+    }
+    const isArray = row.elemTyptype !== null;
+    const isEnum = (row.elemTyptype ?? row.typtype) === Enum;
+    let type = row.dataType.toLowerCase();
+    if (isArray) {
+      type = must(row.elemTypname);
+    } else if (isEnum) {
+      type = row.typename;
+    }
+    if ((type === "bpchar" || type === "character" || type === "character varying" || type === "varchar") && row.length) {
+      type = `${type}(${row.length})`;
     }
-    const errors = checkSchemasAreCompatible(schema, serverSchema);
-    assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));
-    return serverSchema;
+    if ((type === "numeric" || type === "decimal") && row.precision !== null && row.scale !== null) {
+      type = `${type}(${row.precision}, ${row.scale})`;
+    }
+    tableSchema[row.column] = {
+      type,
+      isEnum,
+      isArray
+    };
+  }
+  const errors = checkSchemasAreCompatible(schema, serverSchema);
+  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));
+  return serverSchema;
 }
 function makeSchemaIncompatibleErrorMessage(errors) {
-    if (errors.length === 0) {
-        return 'No schema incompatibilities found.';
-    }
-    const messages = [];
-    for (const error of errors) {
-        switch (error.type) {
-            case 'missingTable':
-                messages.push(`Table "${error.table}" is defined in your zero schema but does not exist in the database.`);
-                break;
-            case 'missingColumn':
-                messages.push(`Column "${error.column}" in table "${error.table}" is defined in your zero schema but does not exist in the database.`);
-                break;
-            case 'typeError':
-                messages.push(`Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`);
-                break;
-        }
+  if (errors.length === 0) {
+    return "No schema incompatibilities found.";
+  }
+  const messages = [];
+  for (const error of errors) {
+    switch (error.type) {
+      case "missingTable":
+        messages.push(
+          `Table "${error.table}" is defined in your zero schema but does not exist in the database.`
+        );
+        break;
+      case "missingColumn":
+        messages.push(
+          `Column "${error.column}" in table "${error.table}" is defined in your zero schema but does not exist in the database.`
+        );
+        break;
+      case "typeError":
+        messages.push(
+          `Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === void 0 ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`
+        );
+        break;
     }
-    return [
-        'Schema incompatibility detected between your zero schema definition and the database:',
-        '',
-        ...messages.map(msg => `  - ${msg}`),
-        '',
-        'Please update your schema definition to match the database or migrate your database to match the schema.',
-    ].join('\n');
+  }
+  return [
+    "Schema incompatibility detected between your zero schema definition and the database:",
+    "",
+    ...messages.map((msg) => `  - ${msg}`),
+    "",
+    "Please update your schema definition to match the database or migrate your database to match the schema."
+  ].join("\n");
 }
-export function checkSchemasAreCompatible(schema, serverSchema) {
-    const errors = [];
-    // Check that all tables in schema exist in serverSchema
-    for (const table of Object.values(schema.tables)) {
-        const serverTableName = table.serverName ?? table.name;
-        if (!serverSchema[serverTableName]) {
-            errors.push({
-                type: 'missingTable',
-                table: serverTableName,
-            });
-            continue;
-        }
-        // Check that all columns in the table exist in serverSchema
-        for (const [columnName, column] of Object.entries(table.columns)) {
-            const serverColumnName = column.serverName ?? columnName;
-            if (!serverSchema[serverTableName][serverColumnName]) {
-                errors.push({
-                    type: 'missingColumn',
-                    table: serverTableName,
-                    column: serverColumnName,
-                });
-                continue;
-            }
-            // Check type compatibility
-            const serverColumn = serverSchema[serverTableName][serverColumnName];
-            const declaredType = column.type;
-            const pgType = serverColumn.type;
-            const requiredType = dataTypeToZqlValueType(pgType, serverColumn.isEnum, serverColumn.isArray);
-            if (requiredType !== declaredType) {
-                errors.push({
-                    type: 'typeError',
-                    table: serverTableName,
-                    column: serverColumnName,
-                    pgType,
-                    declaredType,
-                    requiredType,
-                });
-            }
-        }
+function checkSchemasAreCompatible(schema, serverSchema) {
+  const errors = [];
+  for (const table of Object.values(schema.tables)) {
+    const serverTableName = table.serverName ?? table.name;
+    if (!serverSchema[serverTableName]) {
+      errors.push({
+        type: "missingTable",
+        table: serverTableName
+      });
+      continue;
+    }
+    for (const [columnName, column] of Object.entries(table.columns)) {
+      const serverColumnName = column.serverName ?? columnName;
+      if (!serverSchema[serverTableName][serverColumnName]) {
+        errors.push({
+          type: "missingColumn",
+          table: serverTableName,
+          column: serverColumnName
+        });
+        continue;
+      }
+      const serverColumn = serverSchema[serverTableName][serverColumnName];
+      const declaredType = column.type;
+      const pgType = serverColumn.type;
+      const requiredType = dataTypeToZqlValueType(
+        pgType,
+        serverColumn.isEnum,
+        serverColumn.isArray
+      );
+      if (requiredType !== declaredType) {
+        errors.push({
+          type: "typeError",
+          table: serverTableName,
+          column: serverColumnName,
+          pgType,
+          declaredType,
+          requiredType
+        });
+      }
     }
-    return errors;
+  }
+  return errors;
 }
-//# sourceMappingURL=schema.js.map
+export {
+  checkSchemasAreCompatible,
+  getServerSchema
+};
+//# sourceMappingURL=schema.js.map

package/out/zero-server/src/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {DBTransaction} from '../../zql/src/mutate/custom.ts';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  dbTransaction: DBTransaction<unknown>,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  const query = sql`\n      SELECT\n          c.table_schema::text AS schema,\n          c.table_name::text AS table,\n          c.column_name::text AS column,\n          c.data_type::text AS \"dataType\",\n          c.character_maximum_length AS length,\n          c.numeric_precision AS precision,\n          c.numeric_scale AS scale,\n          t.typtype::text AS typtype,\n          t.typname::text AS typename,\n          CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          information_schema.columns c\n      JOIN\n          pg_catalog.pg_type t ON c.udt_name = t.typname\n      LEFT JOIN\n          pg_catalog.pg_type et ON t.typelem = et.oid\n      JOIN\n          pg_catalog.pg_namespace n ON t.typnamespace = n.oid\n      WHERE\n          (c.table_schema, c.table_name) IN (${inClause})\n    `;\n  const {text, values} = formatPg(query);\n  const results: Iterable<ServerSchemaRow> = (await dbTransaction.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(row.elemTypname);\n    } else if (isEnum) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"names":["schema","PostgresTypeClass.Enum"],"mappings":"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"}

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

@@ -1,6 +1,8 @@
+import type { MaybePromise } from '../../shared/src/types.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
 import type { DBConnection } from '../../zql/src/mutate/custom.ts';
-import { TransactionImpl } from './custom.ts';
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
+import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
+import { type TransactionImpl } from './custom.ts';
 import type { Database, TransactionProviderHooks, TransactionProviderInput } from './process-mutations.ts';
 /**
  * Implements a Database for use with PushProcessor that is backed by Postgres.
@@ -9,10 +11,11 @@ import type { Database, TransactionProviderHooks, TransactionProviderInput } fro
  * writing data that the Zero client does, so that mutator functions can be
  * shared across client and server.
  */
-export declare class ZQLDatabase<S extends Schema, WrappedTransaction> implements Database<TransactionImpl<S, WrappedTransaction>> {
+export declare class ZQLDatabase<TSchema extends Schema, TWrappedTransaction> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {
     #private;
-    readonly connection: DBConnection<WrappedTransaction>;
-    constructor(connection: DBConnection<WrappedTransaction>, schema: S);
-    transaction<R>(callback: (tx: TransactionImpl<S, WrappedTransaction>, transactionHooks: TransactionProviderHooks) => Promise<R>, transactionInput?: TransactionProviderInput): Promise<R>;
+    readonly connection: DBConnection<TWrappedTransaction>;
+    constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema);
+    transaction<R>(callback: (tx: TransactionImpl<TSchema, TWrappedTransaction>, transactionHooks: TransactionProviderHooks) => MaybePromise<R>, transactionInput?: TransactionProviderInput): Promise<R>;
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TTable, TSchema, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
 //# sourceMappingURL=zql-database.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAIb,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAiB,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAE5E,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;IAE3D,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBAW1C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,OAAO,CAAC,CAAC,CAAC,EACf,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;CAqDd"}
+{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAgB,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,mBAAmB,CAClE,YAAW,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;;IAElE,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;gBAG3C,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO;IAK1E,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IAyDb,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}

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

@@ -1,57 +1,62 @@
 import { formatPg, sql } from "../../z2s/src/sql.js";
-import { makeSchemaQuery } from "./query.js";
-import { makeSchemaCRUD, TransactionImpl } from "./custom.js";
-import { makeServerTransaction } from "./custom.js";
-/**
- * Implements a Database for use with PushProcessor that is backed by Postgres.
- *
- * This implementation also implements the same ZQL interfaces for reading and
- * writing data that the Zero client does, so that mutator functions can be
- * shared across client and server.
- */
-export class ZQLDatabase {
-    connection;
-    #mutate;
-    #query;
-    #schema;
-    constructor(connection, schema) {
-        this.connection = connection;
-        this.#mutate = makeSchemaCRUD(schema);
-        this.#query = makeSchemaQuery(schema);
-        this.#schema = schema;
-    }
-    transaction(callback, transactionInput) {
-        if (!transactionInput) {
-            // Icky hack. This is just here to have user not have to do this.
-            // These interfaces need to be factored better.
-            transactionInput = {
-                upstreamSchema: undefined,
-                clientGroupID: undefined,
-                clientID: undefined,
-                mutationID: undefined,
-            };
-        }
-        return this.connection.transaction(async (dbTx) => {
-            const zeroTx = await makeServerTransaction(dbTx, transactionInput.clientID, transactionInput.mutationID, this.#schema, this.#mutate, this.#query);
-            return callback(zeroTx, {
-                async updateClientMutationID() {
-                    const formatted = formatPg(sql `INSERT INTO ${sql.ident(transactionInput.upstreamSchema)}.clients 
+import { CRUDMutatorFactory } from "./custom.js";
+class ZQLDatabase {
+  connection;
+  #crudFactory;
+  constructor(connection, schema) {
+    this.connection = connection;
+    this.#crudFactory = new CRUDMutatorFactory(schema);
+  }
+  transaction(callback, transactionInput) {
+    const {
+      upstreamSchema = "",
+      clientGroupID = "",
+      clientID = "",
+      mutationID = 0
+    } = transactionInput ?? {};
+    return this.connection.transaction(async (dbTx) => {
+      const zeroTx = await this.#makeServerTransaction(
+        dbTx,
+        clientID,
+        mutationID
+      );
+      return callback(zeroTx, {
+        async updateClientMutationID() {
+          const formatted = formatPg(
+            sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients 
                     as current ("clientGroupID", "clientID", "lastMutationID")
-                        VALUES (${transactionInput.clientGroupID}, ${transactionInput.clientID}, ${1})
+                        VALUES (${clientGroupID}, ${clientID}, ${1})
                     ON CONFLICT ("clientGroupID", "clientID")
                     DO UPDATE SET "lastMutationID" = current."lastMutationID" + 1
-                    RETURNING "lastMutationID"`);
-                    const [{ lastMutationID }] = (await dbTx.query(formatted.text, formatted.values));
-                    return { lastMutationID };
-                },
-                async writeMutationResult(result) {
-                    const formatted = formatPg(sql `INSERT INTO ${sql.ident(transactionInput.upstreamSchema)}.mutations
+                    RETURNING "lastMutationID"`
+          );
+          const [{ lastMutationID }] = await dbTx.query(
+            formatted.text,
+            formatted.values
+          );
+          return { lastMutationID };
+        },
+        async writeMutationResult(result) {
+          const formatted = formatPg(
+            sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations
                     ("clientGroupID", "clientID", "mutationID", "result")
-                VALUES (${transactionInput.clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(result.result)}::text::json)`);
-                    await dbTx.query(formatted.text, formatted.values);
-                },
-            });
-        });
-    }
+                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(
+              result.result
+            )}::text::json)`
+          );
+          await dbTx.query(formatted.text, formatted.values);
+        }
+      });
+    });
+  }
+  #makeServerTransaction(dbTx, clientID, mutationID) {
+    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);
+  }
+  run(query, options) {
+    return this.transaction((tx) => tx.run(query, options));
+  }
 }
-//# sourceMappingURL=zql-database.js.map
+export {
+  ZQLDatabase
+};
+//# sourceMappingURL=zql-database.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"zql-database.js","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,QAAQ,EAAE,GAAG,EAAC,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAC;AAOlD;;;;;;GAMG;AACH,MAAM,OAAO,WAAW;IAGb,UAAU,CAAmC;IAC7C,OAAO,CAGG;IACV,MAAM,CAGK;IACX,OAAO,CAAI;IAEpB,YAAY,UAA4C,EAAE,MAAS;QACjE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,WAAW,CACT,QAGe,EACf,gBAA2C;QAE3C,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,iEAAiE;YACjE,+CAA+C;YAC/C,gBAAgB,GAAG;gBACjB,cAAc,EAAE,SAA8B;gBAC9C,aAAa,EAAE,SAA8B;gBAC7C,QAAQ,EAAE,SAA8B;gBACxC,UAAU,EAAE,SAA8B;aAC3C,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC9C,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,IAAI,EACJ,gBAAgB,CAAC,QAAQ,EACzB,gBAAgB,CAAC,UAAU,EAC3B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,CACZ,CAAC;YAEF,OAAO,QAAQ,CAAC,MAAM,EAAE;gBACtB,KAAK,CAAC,sBAAsB;oBAC1B,MAAM,SAAS,GAAG,QAAQ,CACxB,GAAG,CAAA,eAAe,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC;;kCAEtC,gBAAgB,CAAC,aAAa,KAAK,gBAAgB,CAAC,QAAQ,KAAK,CAAC;;;+CAGrD,CACpC,CAAC;oBAEF,MAAM,CAAC,EAAC,cAAc,EAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAC1C,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,MAAM,CACjB,CAA+B,CAAC;oBAEjC,OAAO,EAAC,cAAc,EAAC,CAAC;gBAC1B,CAAC;gBAED,KAAK,CAAC,mBAAmB,CAAC,MAAM;oBAC9B,MAAM,SAAS,GAAG,QAAQ,CACxB,GAAG,CAAA,eAAe,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC;;0BAE9C,gBAAgB,CAAC,aAAa,KAAK,MAAM,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,SAAS,CACjG,MAAM,CAAC,MAAM,CACd,eAAe,CACrB,CAAC;oBACF,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;gBACrD,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"zql-database.js","sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {DBConnection, DBTransaction} from '../../zql/src/mutate/custom.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.ts';\nimport type {\n  Database,\n  TransactionProviderHooks,\n  TransactionProviderInput,\n} from './process-mutations.ts';\n\n/**\n * Implements a Database for use with PushProcessor that is backed by Postgres.\n *\n * This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<TSchema extends Schema, TWrappedTransaction>\n  implements Database<TransactionImpl<TSchema, TWrappedTransaction>>\n{\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(schema);\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<TSchema, TWrappedTransaction>,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ): Promise<R> {\n    // Icky hack. This is just here to have user not have to do this.\n    // These interfaces need to be factored better.\n    const {\n      upstreamSchema = '',\n      clientGroupID = '',\n      clientID = '',\n      mutationID = 0,\n    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      const zeroTx = await this.#makeServerTransaction(\n        dbTx,\n        clientID,\n        mutationID,\n      );\n\n      return callback(zeroTx, {\n        async updateClientMutationID() {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n                    as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n                        VALUES (${clientGroupID}, ${clientID}, ${1})\n                    ON CONFLICT (\"clientGroupID\", \"clientID\")\n                    DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n                    RETURNING \"lastMutationID\"`,\n          );\n\n          const [{lastMutationID}] = (await dbTx.query(\n            formatted.text,\n            formatted.values,\n          )) as {lastMutationID: bigint}[];\n\n          return {lastMutationID};\n        },\n\n        async writeMutationResult(result) {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n                    (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n                  result.result,\n                )}::text::json)`,\n          );\n          await dbTx.query(formatted.text, formatted.values);\n        },\n      });\n    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ) {\n    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.transaction(tx => tx.run(query, options));\n  }\n}\n"],"names":[],"mappings":";;AAuBO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAET,YAAY,YAA+C,QAAiB;AAC1E,SAAK,aAAa;AAClB,SAAK,eAAe,IAAI,mBAAmB,MAAM;AAAA,EACnD;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,uBACE,MACA,UACA,YACA;AACA,WAAO,KAAK,aAAa,kBAAkB,MAAM,UAAU,UAAU;AAAA,EACvE;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}

package/out/zero-solid/src/bindings.d.ts

@@ -0,0 +1,2 @@
+export * from '../../zero-client/src/client/bindings.ts';
+//# sourceMappingURL=bindings.d.ts.map

package/out/zero-solid/src/bindings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/bindings.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC"}

package/out/zero-solid/src/mod.d.ts

@@ -1,13 +1,5 @@
-export type { Expand } from '../../shared/src/expand.ts';
-export type { ConnectionState } from '../../zero-client/src/client/connection-manager.ts';
-export { ConnectionStatus } from '../../zero-client/src/client/connection-status.ts';
-export type { AuthError, NeedsAuthReason, ZeroError, ZeroErrorKind, } from '../../zero-client/src/client/error.ts';
-export type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
-export type { PrimaryKey } from '../../zero-protocol/src/primary-key.ts';
-export type { HumanReadable } from '../../zql/src/query/query.ts';
-export type { ResultType } from '../../zql/src/query/typed-view.ts';
+export { useConnectionState } from './use-connection-state.ts';
 export { createQuery, useQuery, type CreateQueryOptions, type UseQueryOptions, } from './use-query.ts';
-export { useZeroConnectionState } from './use-zero-connection-state.ts';
 export { useZeroOnline } from './use-zero-online.ts';
 export { createUseZero, createZero, useZero, ZeroProvider } from './use-zero.ts';
 //# sourceMappingURL=mod.d.ts.map

package/out/zero-solid/src/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,YAAY,EACV,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,YAAY,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,YAAY,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}

package/out/zero-solid/src/solid-view.d.ts

@@ -1,7 +1,5 @@
 import { type SetStoreFunction } from 'solid-js/store';
-import { type Change, type Entry, type Format, type Input, type Output, type Query, type Schema, type TTL } from '../../zero-client/src/mod.js';
-import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
-import type { ErroredQuery } from '../../zero-protocol/src/custom-queries.ts';
+import { type Change, type Entry, type ErroredQuery, type Format, type Input, type Output, type Query, type QueryResultDetails, type Schema, type TTL } from './zero.ts';
 export type State = [Entry, QueryResultDetails];
 export declare const COMPLETE: QueryResultDetails;
 export declare const UNKNOWN: QueryResultDetails;
@@ -9,8 +7,8 @@ export declare class SolidView implements Output {
     #private;
     constructor(input: Input, onTransactionCommit: (cb: () => void) => void, format: Format, onDestroy: () => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void, setState: SetStoreFunction<State>, retry: () => void);
     destroy(): void;
-    push(change: Change): void;
+    push(change: Change): readonly never[];
     updateTTL(ttl: TTL): void;
 }
-export declare function createSolidViewFactory(setState: SetStoreFunction<State>, retry?: () => void): <TSchema extends Schema, TTable extends keyof TSchema["tables"] & string, TReturn>(_query: Query<TSchema, TTable, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
+export declare function createSolidViewFactory(setState: SetStoreFunction<State>, retry?: () => void): <TTable extends keyof TSchema["tables"] & string, TSchema extends Schema, TReturn>(_query: Query<TTable, TSchema, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
 //# sourceMappingURL=solid-view.d.ts.map

package/out/zero-solid/src/solid-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EAGT,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAG5E,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,EAAE,MAAM,IAAI;IAiEnB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoD1B,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,UAEC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}
+{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAQzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,kBAAkB,EACvB,KAAK,MAAM,EAEX,KAAK,GAAG,EACT,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,EAAE,MAAM,IAAI;IAiEnB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM;IAqDnB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,SAAS,MAAM,EACtB,OAAO,UAEC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}