@rocicorp/zero 0.18.2025032800 → 0.18.2025040200
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/analyze-query/src/bin.d.ts +2 -0
- package/out/analyze-query/src/bin.d.ts.map +1 -0
- package/out/analyze-query/src/bin.js +178 -0
- package/out/analyze-query/src/bin.js.map +1 -0
- package/out/{chunk-3S3SDA44.js → chunk-CT4LRQ5P.js} +242 -78
- package/out/chunk-CT4LRQ5P.js.map +7 -0
- package/out/{chunk-NBZURO2P.js → chunk-R7QLNPBS.js} +16 -109
- package/out/{chunk-NBZURO2P.js.map → chunk-R7QLNPBS.js.map} +3 -3
- package/out/inspector-RYBBQ63M.js +394 -0
- package/out/inspector-RYBBQ63M.js.map +7 -0
- package/out/otel/src/test-log-config.d.ts +8 -0
- package/out/otel/src/test-log-config.d.ts.map +1 -0
- package/out/otel/src/test-log-config.js +8 -0
- package/out/otel/src/test-log-config.js.map +1 -0
- package/out/replicache/src/replicache-impl.d.ts.map +1 -1
- package/out/replicache/src/replicache-options.d.ts +12 -0
- package/out/replicache/src/replicache-options.d.ts.map +1 -1
- package/out/shared/src/browser-env.d.ts +2 -0
- package/out/shared/src/browser-env.d.ts.map +1 -1
- package/out/shared/src/deep-merge.d.ts +6 -0
- package/out/shared/src/deep-merge.d.ts.map +1 -0
- package/out/shared/src/logging-test-utils.d.ts +12 -0
- package/out/shared/src/logging-test-utils.d.ts.map +1 -0
- package/out/shared/src/logging-test-utils.js +21 -0
- package/out/shared/src/logging-test-utils.js.map +1 -0
- package/out/solid.js +2 -2
- package/out/solid.js.map +2 -2
- package/out/z2s/src/compiler.d.ts +5 -4
- package/out/z2s/src/compiler.d.ts.map +1 -1
- package/out/z2s/src/compiler.js +86 -59
- package/out/z2s/src/compiler.js.map +1 -1
- package/out/z2s/src/schema.d.ts +11 -0
- package/out/z2s/src/schema.d.ts.map +1 -0
- package/out/z2s/src/schema.js +2 -0
- package/out/z2s/src/schema.js.map +1 -0
- package/out/z2s/src/sql.d.ts +7 -4
- package/out/z2s/src/sql.d.ts.map +1 -1
- package/out/z2s/src/sql.js +111 -66
- package/out/z2s/src/sql.js.map +1 -1
- package/out/zero/src/analyze-query.d.ts +3 -0
- package/out/zero/src/analyze-query.d.ts.map +1 -0
- package/out/zero/src/analyze-query.js +3 -0
- package/out/zero/src/analyze-query.js.map +1 -0
- package/out/zero-cache/src/db/migration-lite.d.ts.map +1 -1
- package/out/zero-cache/src/db/migration-lite.js +12 -0
- package/out/zero-cache/src/db/migration-lite.js.map +1 -1
- package/out/zero-cache/src/db/specs.d.ts +1 -1
- package/out/zero-cache/src/server/main.d.ts.map +1 -1
- package/out/zero-cache/src/server/main.js +17 -1
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts +5 -5
- package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts +2 -2
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts +1 -1
- package/out/zero-cache/src/services/change-source/replica-schema.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/replica-schema.js +10 -1
- package/out/zero-cache/src/services/change-source/replica-schema.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.js +10 -6
- package/out/zero-cache/src/services/mutagen/pusher.js.map +1 -1
- package/out/zero-cache/src/services/replicator/schema/change-log.d.ts.map +1 -1
- package/out/zero-cache/src/services/replicator/schema/change-log.js +17 -16
- package/out/zero-cache/src/services/replicator/schema/change-log.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-schema.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-schema.js +2 -8
- package/out/zero-cache/src/services/view-syncer/client-schema.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.js +8 -15
- package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js +2 -3
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.js +2 -2
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.js +0 -7
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-cache/src/types/lite.d.ts +1 -1
- package/out/zero-cache/src/types/lite.d.ts.map +1 -1
- package/out/zero-cache/src/types/lite.js +2 -52
- package/out/zero-cache/src/types/lite.js.map +1 -1
- package/out/zero-cache/src/types/pg.d.ts +2 -0
- package/out/zero-cache/src/types/pg.d.ts.map +1 -1
- package/out/zero-cache/src/types/pg.js +53 -0
- package/out/zero-cache/src/types/pg.js.map +1 -1
- package/out/zero-cache/src/workers/replicator.d.ts.map +1 -1
- package/out/zero-cache/src/workers/replicator.js +14 -3
- package/out/zero-cache/src/workers/replicator.js.map +1 -1
- package/out/zero-client/src/client/custom.d.ts +6 -10
- package/out/zero-client/src/client/custom.d.ts.map +1 -1
- package/out/zero-client/src/client/inspector/inspector.d.ts.map +1 -1
- package/out/zero-client/src/client/inspector/types.d.ts +0 -1
- package/out/zero-client/src/client/inspector/types.d.ts.map +1 -1
- package/out/zero-client/src/client/mutation-tracker.d.ts +7 -3
- package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
- package/out/zero-client/src/client/zero-rep.d.ts +6 -2
- package/out/zero-client/src/client/zero-rep.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts +2 -1
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-pg/src/custom.d.ts +2 -1
- package/out/zero-pg/src/custom.d.ts.map +1 -1
- package/out/zero-pg/src/custom.js +24 -16
- package/out/zero-pg/src/custom.js.map +1 -1
- package/out/zero-pg/src/mod.d.ts +2 -1
- package/out/zero-pg/src/mod.d.ts.map +1 -1
- package/out/zero-pg/src/mod.js +1 -0
- package/out/zero-pg/src/mod.js.map +1 -1
- package/out/zero-pg/src/postgres-connection.d.ts +30 -0
- package/out/zero-pg/src/postgres-connection.d.ts.map +1 -0
- package/out/zero-pg/src/postgres-connection.js +31 -0
- package/out/zero-pg/src/postgres-connection.js.map +1 -0
- package/out/zero-pg/src/query.d.ts +3 -2
- package/out/zero-pg/src/query.d.ts.map +1 -1
- package/out/zero-pg/src/query.js +10 -6
- package/out/zero-pg/src/query.js.map +1 -1
- package/out/zero-pg/src/schema.d.ts +12 -0
- package/out/zero-pg/src/schema.d.ts.map +1 -0
- package/out/zero-pg/src/schema.js +57 -0
- package/out/zero-pg/src/schema.js.map +1 -0
- package/out/zero-pg/src/web.d.ts +6 -9
- package/out/zero-pg/src/web.d.ts.map +1 -1
- package/out/zero-pg/src/web.js +28 -20
- package/out/zero-pg/src/web.js.map +1 -1
- package/out/zero-protocol/src/client-schema.d.ts +1 -1
- package/out/zero-protocol/src/client-schema.d.ts.map +1 -1
- package/out/zero-protocol/src/client-schema.js +1 -1
- package/out/zero-protocol/src/client-schema.js.map +1 -1
- package/out/zero-protocol/src/down.d.ts +5 -5
- package/out/zero-protocol/src/protocol-version.d.ts +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
- package/out/zero-protocol/src/protocol-version.js +3 -2
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-protocol/src/push.d.ts +23 -16
- package/out/zero-protocol/src/push.d.ts.map +1 -1
- package/out/zero-protocol/src/push.js +15 -5
- package/out/zero-protocol/src/push.js.map +1 -1
- package/out/zero-react/src/mod.d.ts +1 -1
- package/out/zero-react/src/mod.d.ts.map +1 -1
- package/out/zero-schema/src/builder/table-builder.d.ts +0 -12
- package/out/zero-schema/src/builder/table-builder.d.ts.map +1 -1
- package/out/zero-schema/src/builder/table-builder.js +0 -16
- package/out/zero-schema/src/builder/table-builder.js.map +1 -1
- package/out/zero-schema/src/table-schema.d.ts +0 -3
- package/out/zero-schema/src/table-schema.d.ts.map +1 -1
- package/out/zero-schema/src/table-schema.js +0 -3
- package/out/zero-schema/src/table-schema.js.map +1 -1
- package/out/zero-solid/src/create-zero.d.ts +2 -2
- package/out/zero-solid/src/create-zero.d.ts.map +1 -1
- package/out/zero-solid/src/mod.d.ts +1 -1
- package/out/zero-solid/src/mod.d.ts.map +1 -1
- package/out/zero.js +2 -2
- package/out/zql/src/ivm/catch.d.ts +51 -0
- package/out/zql/src/ivm/catch.d.ts.map +1 -0
- package/out/zql/src/ivm/catch.js +78 -0
- package/out/zql/src/ivm/catch.js.map +1 -0
- package/out/zql/src/ivm/memory-storage.js +37 -0
- package/out/zql/src/ivm/memory-storage.js.map +1 -0
- package/out/zql/src/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.js +6 -4
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zqlite/src/table-source.d.ts.map +1 -1
- package/out/zqlite/src/table-source.js +0 -8
- package/out/zqlite/src/table-source.js.map +1 -1
- package/package.json +4 -3
- package/out/chunk-3S3SDA44.js.map +0 -7
- package/out/inspector-SH2ZK7O3.js +0 -835
- package/out/inspector-SH2ZK7O3.js.map +0 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutation-tracker.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"mutation-tracker.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAOV,YAAY,EACb,MAAM,oCAAoC,CAAC;AAG5C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACrB,MAAM,+CAA+C,CAAC;AAiBvD;;GAEG;AACH,qBAAa,eAAe;;gBAad,EAAE,EAAE,UAAU;IAO1B,IAAI,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAE5B;IAED,aAAa,IAAI,oBAAoB;IAUrC,kBAAkB,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAQ7D,cAAc,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI;IAUjD,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAYjD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM;IAgBlC,IAAI,IAAI,WAEP;IAkGD,uBAAuB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;CASpD"}
|
|
@@ -3,18 +3,22 @@ import type { Hash } from '../../../replicache/src/hash.ts';
|
|
|
3
3
|
import type { ZeroContext } from './context.ts';
|
|
4
4
|
import type { IVMSourceBranch } from './ivm-branch.ts';
|
|
5
5
|
import type { LazyStore } from '../../../replicache/src/dag/lazy-store.ts';
|
|
6
|
-
import type { ZeroOption, ZeroReadOptions } from '../../../replicache/src/replicache-options.ts';
|
|
6
|
+
import type { EphemeralID, MutationTrackingData, ZeroOption, ZeroReadOptions } from '../../../replicache/src/replicache-options.ts';
|
|
7
|
+
import type { MutationTracker } from './mutation-tracker.ts';
|
|
7
8
|
type TxData = {
|
|
8
9
|
ivmSources: IVMSourceBranch;
|
|
9
10
|
token: string | undefined;
|
|
10
11
|
};
|
|
11
12
|
export declare class ZeroRep implements ZeroOption {
|
|
12
13
|
#private;
|
|
13
|
-
constructor(context: ZeroContext, ivmMain: IVMSourceBranch, customMutatorsEnabled: boolean);
|
|
14
|
+
constructor(context: ZeroContext, ivmMain: IVMSourceBranch, customMutatorsEnabled: boolean, mutationTracker: MutationTracker);
|
|
14
15
|
set auth(auth: string);
|
|
15
16
|
init(hash: Hash, store: LazyStore): Promise<void>;
|
|
16
17
|
getTxData: (desiredHead: Hash, readOptions?: ZeroReadOptions | undefined) => Promise<TxData> | undefined;
|
|
17
18
|
advance: (expectedHash: Hash, newHash: Hash, diffs: InternalDiff) => void;
|
|
19
|
+
trackMutation(): MutationTrackingData;
|
|
20
|
+
mutationIDAssigned(ephemeralID: EphemeralID, mutationID: number): void;
|
|
21
|
+
rejectMutation(ephemeralID: EphemeralID, ex: unknown): void;
|
|
18
22
|
}
|
|
19
23
|
export {};
|
|
20
24
|
//# sourceMappingURL=zero-rep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero-rep.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero-rep.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2CAA2C,CAAC;AACzE,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAChB,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"zero-rep.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero-rep.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2CAA2C,CAAC;AACzE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,UAAU,EACV,eAAe,EAChB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAE3D,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE,eAAe,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,qBAAa,OAAQ,YAAW,UAAU;;gBAStC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,eAAe,EACxB,qBAAqB,EAAE,OAAO,EAC9B,eAAe,EAAE,eAAe;IAQlC,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAMpB;IAEK,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS;IAoBvC,SAAS,GACP,aAAa,IAAI,EACjB,cAAc,eAAe,GAAG,SAAS,KACxC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAc5B;IAEF,OAAO,GAAI,cAAc,IAAI,EAAE,SAAS,IAAI,EAAE,OAAO,YAAY,KAAG,IAAI,CAEtE;IAEF,aAAa,IAAI,oBAAoB;IAGrC,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAGtE,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI;CAG5D"}
|
|
@@ -21,6 +21,7 @@ import type { Inspector } from './inspector/types.ts';
|
|
|
21
21
|
import { type LogOptions } from './log-options.ts';
|
|
22
22
|
import type { ZeroOptions } from './options.ts';
|
|
23
23
|
import { QueryManager } from './query-manager.ts';
|
|
24
|
+
import type { DeepMerge } from '../../../shared/src/deep-merge.ts';
|
|
24
25
|
type ConnectionState = Enum<typeof ConnectionState>;
|
|
25
26
|
export type NoRelations = Record<string, never>;
|
|
26
27
|
export type MakeEntityQueriesFromSchema<S extends Schema> = {
|
|
@@ -110,7 +111,7 @@ export declare class Zero<const S extends Schema, MD extends CustomMutatorDefs<S
|
|
|
110
111
|
* await zero.mutate.issue.update({id: '1', title: 'Updated title'});
|
|
111
112
|
* ```
|
|
112
113
|
*/
|
|
113
|
-
readonly mutate: MD extends CustomMutatorDefs<S> ? DBMutator<S
|
|
114
|
+
readonly mutate: MD extends CustomMutatorDefs<S> ? DeepMerge<DBMutator<S>, MakeCustomMutatorInterfaces<S, MD>> : DBMutator<S>;
|
|
114
115
|
/**
|
|
115
116
|
* Provides a way to batch multiple CRUD mutations together:
|
|
116
117
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAgB,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAC,KAAK,QAAQ,EAAW,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAC,MAAM,EAAe,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAC,MAAM,EAAe,MAAM,mCAAmC,CAAC;AAE5E,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACT,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EACV,WAAW,EAGZ,MAAM,kCAAkC,CAAC;AAO1C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AAOtD,OAAO,EAAC,KAAK,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAI9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AAyBpF,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,6CAA6C,CAAC;AAEhF,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EACL,KAAK,MAAM,EAEZ,MAAM,oDAAoD,CAAC;AAO5D,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,eAAe,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,SAAS,EAIf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,iBAAiB,EAEjB,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EACL,KAAK,UAAU,EACf,KAAK,QAAQ,EAGd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAC,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAUnE,OAAO,KAAK,EAAqB,WAAW,EAAC,MAAM,cAAc,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
|
|
2
2
|
import type { SchemaCRUD, SchemaQuery, TransactionBase, DBTransaction, Transaction } from '../../zql/src/mutate/custom.ts';
|
|
3
|
+
import type { ServerSchema } from '../../z2s/src/schema.ts';
|
|
3
4
|
interface ServerTransaction<S extends Schema, TWrappedTransaction> extends TransactionBase<S> {
|
|
4
5
|
readonly location: 'server';
|
|
5
6
|
readonly reason: 'authoritative';
|
|
@@ -25,6 +26,6 @@ export declare class TransactionImpl<S extends Schema, TWrappedTransaction> impl
|
|
|
25
26
|
readonly query: SchemaQuery<S>;
|
|
26
27
|
constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: SchemaCRUD<S>, query: SchemaQuery<S>);
|
|
27
28
|
}
|
|
28
|
-
export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown
|
|
29
|
+
export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaCRUD<S>;
|
|
29
30
|
export {};
|
|
30
31
|
//# sourceMappingURL=custom.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAE5E,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EAEX,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAE5E,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EAEX,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,gCAAgC,CAAC;AAMxC,OAAO,KAAK,EAEV,YAAY,EAEb,MAAM,yBAAyB,CAAC;AAEjC,UAAU,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,mBAAmB,CAC/D,SAAQ,eAAe,CAAC,CAAC,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;CAC5D;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,cAAc,IAAI;IAChE,QAAQ,EAAE,KAAK,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACtC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;KAC9D;CACF,GAAG;IACF,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;KACrD,CAAC;CACH,CAAC;AAGF,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,cAAc,EAAE,KAAK,GAAG,GAAG,IAAI,CAC7E,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,cAAc,CAAC,EAClC,IAAI,EAAE,KAAK,KACR,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,mBAAmB,CAChE,YAAW,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,CAAC;IAEpD,QAAQ,CAAC,QAAQ,YAAY;IAC7B,QAAQ,CAAC,MAAM,mBAAmB;IAClC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;gBAG7B,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;CAQxB;AASD,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,MAAM,EAAE,CAAC,GACR,CACD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,YAAY,EAAE,YAAY,KACvB,UAAU,CAAC,CAAC,CAAC,CAgDjB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { formatPgInternalConvert,
|
|
2
|
-
import { must } from "../../shared/src/must.js";
|
|
1
|
+
import { formatPgInternalConvert, sql, sqlConvertColumnArg, } from "../../z2s/src/sql.js";
|
|
3
2
|
export class TransactionImpl {
|
|
4
3
|
location = 'server';
|
|
5
4
|
reason = 'authoritative';
|
|
@@ -17,6 +16,7 @@ export class TransactionImpl {
|
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
18
|
const dbTxSymbol = Symbol();
|
|
19
|
+
const serverSchemaSymbol = Symbol();
|
|
20
20
|
export function makeSchemaCRUD(schema) {
|
|
21
21
|
const schemaCRUDs = {};
|
|
22
22
|
for (const tableSchema of Object.values(schema.tables)) {
|
|
@@ -30,8 +30,10 @@ export function makeSchemaCRUD(schema) {
|
|
|
30
30
|
*/
|
|
31
31
|
class CRUDHandler {
|
|
32
32
|
#dbTransaction;
|
|
33
|
-
|
|
33
|
+
#serverSchema;
|
|
34
|
+
constructor(dbTransaction, serverSchema) {
|
|
34
35
|
this.#dbTransaction = dbTransaction;
|
|
36
|
+
this.#serverSchema = serverSchema;
|
|
35
37
|
}
|
|
36
38
|
get(target, prop) {
|
|
37
39
|
if (prop in target) {
|
|
@@ -39,6 +41,7 @@ export function makeSchemaCRUD(schema) {
|
|
|
39
41
|
}
|
|
40
42
|
const txHolder = {
|
|
41
43
|
[dbTxSymbol]: this.#dbTransaction,
|
|
44
|
+
[serverSchemaSymbol]: this.#serverSchema,
|
|
42
45
|
};
|
|
43
46
|
target[prop] = Object.fromEntries(Object.entries(schemaCRUDs[prop]).map(([name, method]) => [
|
|
44
47
|
name,
|
|
@@ -47,31 +50,35 @@ export function makeSchemaCRUD(schema) {
|
|
|
47
50
|
return target[prop];
|
|
48
51
|
}
|
|
49
52
|
}
|
|
50
|
-
return (dbTransaction) => new Proxy({}, new CRUDHandler(dbTransaction));
|
|
53
|
+
return (dbTransaction, serverSchema) => new Proxy({}, new CRUDHandler(dbTransaction, serverSchema));
|
|
51
54
|
}
|
|
52
55
|
function makeTableCRUD(schema) {
|
|
53
56
|
return {
|
|
54
57
|
async insert(value) {
|
|
58
|
+
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
55
59
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
56
|
-
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlValue(
|
|
60
|
+
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlValue(v, serverTableSchema[serverNameFor(col, schema)])), ', ')})`);
|
|
57
61
|
const tx = this[dbTxSymbol];
|
|
58
62
|
await tx.query(stmt.text, stmt.values);
|
|
59
63
|
},
|
|
60
64
|
async upsert(value) {
|
|
65
|
+
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
61
66
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
62
67
|
const primaryKeyColumns = origAndServerNamesFor(schema.primaryKey, schema);
|
|
63
|
-
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlValue(
|
|
68
|
+
const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlValue(val, serverTableSchema[serverNameFor(col, schema)])), ', ')}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ', ')}) DO UPDATE SET ${sql.join(Object.entries(value).map(([col, val]) => sql `${sql.ident(schema.columns[col].serverName ?? col)} = ${sqlValue(val, serverTableSchema[serverNameFor(col, schema)])}`), ', ')}`);
|
|
64
69
|
const tx = this[dbTxSymbol];
|
|
65
70
|
await tx.query(stmt.text, stmt.values);
|
|
66
71
|
},
|
|
67
72
|
async update(value) {
|
|
73
|
+
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
68
74
|
const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
|
|
69
|
-
const stmt = formatPgInternalConvert(sql `UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlValue(
|
|
75
|
+
const stmt = formatPgInternalConvert(sql `UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlValue(value[origName], serverTableSchema[serverName])}`), ', ')} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
|
|
70
76
|
const tx = this[dbTxSymbol];
|
|
71
77
|
await tx.query(stmt.text, stmt.values);
|
|
72
78
|
},
|
|
73
79
|
async delete(value) {
|
|
74
|
-
const
|
|
80
|
+
const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
|
|
81
|
+
const stmt = formatPgInternalConvert(sql `DELETE FROM ${sql.ident(serverName(schema))} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
|
|
75
82
|
const tx = this[dbTxSymbol];
|
|
76
83
|
await tx.query(stmt.text, stmt.values);
|
|
77
84
|
},
|
|
@@ -80,17 +87,18 @@ function makeTableCRUD(schema) {
|
|
|
80
87
|
function serverName(x) {
|
|
81
88
|
return x.serverName ?? x.name;
|
|
82
89
|
}
|
|
83
|
-
function primaryKeyClause(schema, row) {
|
|
90
|
+
function primaryKeyClause(schema, serverTableSchema, row) {
|
|
84
91
|
const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);
|
|
85
|
-
return sql `${sql.join(primaryKey.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlValue(
|
|
92
|
+
return sql `${sql.join(primaryKey.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlValue(row[origName], serverTableSchema[serverName])}`), ' AND ')}`;
|
|
86
93
|
}
|
|
87
94
|
function origAndServerNamesFor(originalNames, schema) {
|
|
88
|
-
return originalNames.map(name =>
|
|
89
|
-
const col = schema.columns[name];
|
|
90
|
-
return [name, col.serverName ?? name];
|
|
91
|
-
});
|
|
95
|
+
return originalNames.map(name => [name, serverNameFor(name, schema)]);
|
|
92
96
|
}
|
|
93
|
-
function
|
|
94
|
-
|
|
97
|
+
function serverNameFor(originalName, schema) {
|
|
98
|
+
const col = schema.columns[originalName];
|
|
99
|
+
return col.serverName ?? originalName;
|
|
100
|
+
}
|
|
101
|
+
function sqlValue(value, serverColumnSchema) {
|
|
102
|
+
return sqlConvertColumnArg(serverColumnSchema, value, false, true);
|
|
95
103
|
}
|
|
96
104
|
//# sourceMappingURL=custom.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../zero-pg/src/custom.ts"],"names":[],"mappings":"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"}
|
package/out/zero-pg/src/mod.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type { CustomMutatorDefs, CustomMutatorImpl } from './custom.ts';
|
|
2
2
|
export type { Transaction, ServerTransaction, DBConnection, DBTransaction, ConnectionProvider, Row, } from '../../zql/src/mutate/custom.ts';
|
|
3
|
-
export { type
|
|
3
|
+
export { connectionProvider, Connection, type PostgresSQL, type PostgresTransaction, } from './postgres-connection.ts';
|
|
4
|
+
export { PushProcessor } from './web.ts';
|
|
4
5
|
//# sourceMappingURL=mod.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,aAAa,CAAC;AACtE,YAAY,EACV,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,kBAAkB,EAClB,GAAG,GACJ,MAAM,gCAAgC,CAAC;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,aAAa,CAAC;AACtE,YAAY,EACV,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,kBAAkB,EAClB,GAAG,GACJ,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,mBAAmB,GACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC"}
|
package/out/zero-pg/src/mod.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../zero-pg/src/mod.ts"],"names":[],"mappings":"AASA,OAAO,
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../zero-pg/src/mod.ts"],"names":[],"mappings":"AASA,OAAO,EACL,kBAAkB,EAClB,UAAU,GAGX,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { DBConnection, DBTransaction } from '../../zql/src/mutate/custom.ts';
|
|
2
|
+
import type { JSONValue } from '../../shared/src/json.ts';
|
|
3
|
+
import type { Row } from '../../zql/src/mutate/custom.ts';
|
|
4
|
+
/**
|
|
5
|
+
* Subset of the postgres lib's `Transaction` interface that we use.
|
|
6
|
+
*/
|
|
7
|
+
export type PostgresTransaction = {
|
|
8
|
+
unsafe(sql: string, params: JSONValue[]): Promise<Row[]>;
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* Subset of the postgres lib's `SQL` interface that we use.
|
|
12
|
+
*/
|
|
13
|
+
export type PostgresSQL<Transaction extends PostgresTransaction> = {
|
|
14
|
+
unsafe(sql: string, params: JSONValue[]): Promise<Row[]>;
|
|
15
|
+
begin<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* Adapts the `postgres` library to Zero's `DBConnection` interface.
|
|
19
|
+
* Note: we do this via Go-style structural interface dependencies rather than
|
|
20
|
+
* directly depending on the `postgres` library to eliminate chance of version
|
|
21
|
+
* conflicts with customer.
|
|
22
|
+
*/
|
|
23
|
+
export declare class Connection<WrappedTransaction extends PostgresTransaction, WrappedPostgres extends PostgresSQL<WrappedTransaction>> implements DBConnection<WrappedTransaction> {
|
|
24
|
+
#private;
|
|
25
|
+
constructor(pg: WrappedPostgres);
|
|
26
|
+
query(sql: string, params: unknown[]): Promise<Row[]>;
|
|
27
|
+
transaction<T>(fn: (tx: DBTransaction<WrappedTransaction>) => Promise<T>): Promise<T>;
|
|
28
|
+
}
|
|
29
|
+
export declare function connectionProvider<WrappedTransaction extends PostgresTransaction, WrappedPostgres extends PostgresSQL<WrappedTransaction>>(pg: WrappedPostgres): () => Connection<WrappedTransaction, WrappedPostgres>;
|
|
30
|
+
//# sourceMappingURL=postgres-connection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"postgres-connection.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/postgres-connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,WAAW,SAAS,mBAAmB,IAAI;IACjE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACzD,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAU,CACrB,kBAAkB,SAAS,mBAAmB,EAC9C,eAAe,SAAS,WAAW,CAAC,kBAAkB,CAAC,CACvD,YAAW,YAAY,CAAC,kBAAkB,CAAC;;gBAG/B,EAAE,EAAE,eAAe;IAI/B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIrD,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,kBAAkB,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACxD,OAAO,CAAC,CAAC,CAAC;CAGd;AAeD,wBAAgB,kBAAkB,CAChC,kBAAkB,SAAS,mBAAmB,EAC9C,eAAe,SAAS,WAAW,CAAC,kBAAkB,CAAC,EACvD,EAAE,EAAE,eAAe,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAE5E"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Adapts the `postgres` library to Zero's `DBConnection` interface.
|
|
3
|
+
* Note: we do this via Go-style structural interface dependencies rather than
|
|
4
|
+
* directly depending on the `postgres` library to eliminate chance of version
|
|
5
|
+
* conflicts with customer.
|
|
6
|
+
*/
|
|
7
|
+
export class Connection {
|
|
8
|
+
#pg;
|
|
9
|
+
constructor(pg) {
|
|
10
|
+
this.#pg = pg;
|
|
11
|
+
}
|
|
12
|
+
query(sql, params) {
|
|
13
|
+
return this.#pg.unsafe(sql, params);
|
|
14
|
+
}
|
|
15
|
+
transaction(fn) {
|
|
16
|
+
return this.#pg.begin(pgTx => fn(new Transaction(pgTx)));
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
class Transaction {
|
|
20
|
+
wrappedTransaction;
|
|
21
|
+
constructor(pgTx) {
|
|
22
|
+
this.wrappedTransaction = pgTx;
|
|
23
|
+
}
|
|
24
|
+
query(sql, params) {
|
|
25
|
+
return this.wrappedTransaction.unsafe(sql, params);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export function connectionProvider(pg) {
|
|
29
|
+
return () => new Connection(pg);
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=postgres-connection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"postgres-connection.js","sourceRoot":"","sources":["../../../../zero-pg/src/postgres-connection.ts"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,MAAM,OAAO,UAAU;IAKZ,GAAG,CAAkB;IAC9B,YAAY,EAAmB;QAC7B,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAiB;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAqB,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CACT,EAAyD;QAEzD,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAe,CAAC;IACzE,CAAC;CACF;AAED,MAAM,WAAW;IAGN,kBAAkB,CAAqB;IAChD,YAAY,IAAwB;QAClC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAiB;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAqB,CAAC,CAAC;IACpE,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAGhC,EAAmB;IACnB,OAAO,GAAG,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ServerSchema } from '../../z2s/src/schema.ts';
|
|
1
2
|
import type { AST } from '../../zero-protocol/src/ast.ts';
|
|
2
3
|
import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
|
|
3
4
|
import type { Format } from '../../zql/src/ivm/view.ts';
|
|
@@ -6,10 +7,10 @@ import { AbstractQuery } from '../../zql/src/query/query-impl.ts';
|
|
|
6
7
|
import type { HumanReadable, PullRow } from '../../zql/src/query/query.ts';
|
|
7
8
|
import type { TTL } from '../../zql/src/query/ttl.ts';
|
|
8
9
|
import type { TypedView } from '../../zql/src/query/typed-view.ts';
|
|
9
|
-
export declare function makeSchemaQuery<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown
|
|
10
|
+
export declare function makeSchemaQuery<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaQuery<S>;
|
|
10
11
|
export declare class Z2SQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends AbstractQuery<TSchema, TTable, TReturn> {
|
|
11
12
|
#private;
|
|
12
|
-
constructor(schema: TSchema, tableName: TTable, dbTransaction: DBTransaction<unknown>, ast: AST, format: Format);
|
|
13
|
+
constructor(schema: TSchema, serverSchema: ServerSchema, tableName: TTable, dbTransaction: DBTransaction<unknown>, ast: AST, format: Format);
|
|
13
14
|
protected readonly _system = "permissions";
|
|
14
15
|
protected _newQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(schema: TSchema, tableName: TTable, ast: AST, format: Format): Z2SQuery<TSchema, TTable, TReturn>;
|
|
15
16
|
run(): Promise<HumanReadable<TReturn>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/query.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AACxD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAC,aAAa,EAAgB,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAC,aAAa,EAAE,OAAO,EAAQ,MAAM,8BAA8B,CAAC;AAChF,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,4BAA4B,CAAC;AACpD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAEjE,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAC9C,MAAM,EAAE,CAAC,GACR,CACD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,YAAY,EAAE,YAAY,KACvB,WAAW,CAAC,CAAC,CAAC,CA0ClB;AAED,qBAAa,QAAQ,CACnB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAClC,SAAQ,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;;gBAY7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM;IAQhB,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAiB;IAE3C,SAAS,CAAC,SAAS,CACjB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IAW/B,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAkB5C,OAAO,IAAI;QACT,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB;IAID,WAAW,IAAI,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAIhD,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;CAG3B"}
|
package/out/zero-pg/src/query.js
CHANGED
|
@@ -4,36 +4,40 @@ import { AbstractQuery, defaultFormat } from "../../zql/src/query/query-impl.js"
|
|
|
4
4
|
export function makeSchemaQuery(schema) {
|
|
5
5
|
class SchemaQueryHandler {
|
|
6
6
|
#dbTransaction;
|
|
7
|
-
|
|
7
|
+
#serverSchema;
|
|
8
|
+
constructor(dbTransaction, serverSchema) {
|
|
8
9
|
this.#dbTransaction = dbTransaction;
|
|
10
|
+
this.#serverSchema = serverSchema;
|
|
9
11
|
}
|
|
10
12
|
get(target, prop) {
|
|
11
13
|
if (prop in target) {
|
|
12
14
|
return target[prop];
|
|
13
15
|
}
|
|
14
|
-
const q = new Z2SQuery(schema, prop, this.#dbTransaction, { table: prop }, defaultFormat);
|
|
16
|
+
const q = new Z2SQuery(schema, this.#serverSchema, prop, this.#dbTransaction, { table: prop }, defaultFormat);
|
|
15
17
|
target[prop] = q;
|
|
16
18
|
return q;
|
|
17
19
|
}
|
|
18
20
|
}
|
|
19
|
-
return (dbTransaction) => new Proxy({}, new SchemaQueryHandler(dbTransaction));
|
|
21
|
+
return (dbTransaction, serverSchema) => new Proxy({}, new SchemaQueryHandler(dbTransaction, serverSchema));
|
|
20
22
|
}
|
|
21
23
|
export class Z2SQuery extends AbstractQuery {
|
|
22
24
|
#dbTransaction;
|
|
23
25
|
#schema;
|
|
26
|
+
#serverSchema;
|
|
24
27
|
#query;
|
|
25
|
-
constructor(schema, tableName, dbTransaction, ast, format) {
|
|
28
|
+
constructor(schema, serverSchema, tableName, dbTransaction, ast, format) {
|
|
26
29
|
super(schema, tableName, ast, format);
|
|
27
30
|
this.#dbTransaction = dbTransaction;
|
|
28
31
|
this.#schema = schema;
|
|
32
|
+
this.#serverSchema = serverSchema;
|
|
29
33
|
}
|
|
30
34
|
_system = 'permissions';
|
|
31
35
|
_newQuery(schema, tableName, ast, format) {
|
|
32
|
-
return new Z2SQuery(schema, tableName, this.#dbTransaction, ast, format);
|
|
36
|
+
return new Z2SQuery(schema, this.#serverSchema, tableName, this.#dbTransaction, ast, format);
|
|
33
37
|
}
|
|
34
38
|
async run() {
|
|
35
39
|
const sqlQuery = this.#query ??
|
|
36
|
-
formatPgInternalConvert(compile(this._completeAst(), this.#schema.tables, this.format));
|
|
40
|
+
formatPgInternalConvert(compile(this._completeAst(), this.#schema.tables, this.#serverSchema, this.format));
|
|
37
41
|
this.#query = sqlQuery;
|
|
38
42
|
const result = extractZqlResult(await this.#dbTransaction.query(sqlQuery.text, sqlQuery.values));
|
|
39
43
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../zero-pg/src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../zero-pg/src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAC,uBAAuB,EAAC,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAK/E,MAAM,UAAU,eAAe,CAC7B,MAAS;IAKT,MAAM,kBAAkB;QACb,cAAc,CAAyB;QACvC,aAAa,CAAe;QACrC,YACE,aAAqC,EACrC,YAA0B;YAE1B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;YACpC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QACpC,CAAC;QAED,GAAG,CACD,MAIC,EACD,IAAY;YAEZ,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAED,MAAM,CAAC,GAAG,IAAI,QAAQ,CACpB,MAAM,EACN,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,IAAI,CAAC,cAAc,EACnB,EAAC,KAAK,EAAE,IAAI,EAAC,EACb,aAAa,CACd,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,CAAC;QACX,CAAC;KACF;IAED,OAAO,CAAC,aAAqC,EAAE,YAA0B,EAAE,EAAE,CAC3E,IAAI,KAAK,CACP,EAAE,EACF,IAAI,kBAAkB,CAAC,aAAa,EAAE,YAAY,CAAC,CAClC,CAAC;AACxB,CAAC;AAED,MAAM,OAAO,QAIX,SAAQ,aAAuC;IACtC,cAAc,CAAyB;IACvC,OAAO,CAAU;IACjB,aAAa,CAAe;IACrC,MAAM,CAKQ;IAEd,YACE,MAAe,EACf,YAA0B,EAC1B,SAAiB,EACjB,aAAqC,EACrC,GAAQ,EACR,MAAc;QAEd,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAEkB,OAAO,GAAG,aAAa,CAAC;IAEjC,SAAS,CAKjB,MAAe,EACf,SAAiB,EACjB,GAAQ,EACR,MAAc;QAEd,OAAO,IAAI,QAAQ,CACjB,MAAM,EACN,IAAI,CAAC,aAAa,EAClB,SAAS,EACT,IAAI,CAAC,cAAc,EACnB,GAAG,EACH,MAAM,CACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,QAAQ,GACZ,IAAI,CAAC,MAAM;YACX,uBAAuB,CACrB,OAAO,CACL,IAAI,CAAC,YAAY,EAAE,EACnB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,MAAM,CACZ,CACF,CAAC;QACJ,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;QACvB,MAAM,MAAM,GAAG,gBAAgB,CAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAChE,CAAC;QACF,OAAO,MAAgC,CAAC;IAC1C,CAAC;IAED,OAAO;QAIL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,WAAW;QACT,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,SAAS,CAAC,IAAS;QACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;CACF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ServerSchema } from '../../z2s/src/schema.ts';
|
|
2
|
+
import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
|
|
3
|
+
import type { DBTransaction } from '../../zql/src/mutate/custom.ts';
|
|
4
|
+
export type ServerSchemaRow = {
|
|
5
|
+
schema: string;
|
|
6
|
+
table: string;
|
|
7
|
+
column: string;
|
|
8
|
+
type: string;
|
|
9
|
+
enum: string;
|
|
10
|
+
};
|
|
11
|
+
export declare function getServerSchema<S extends Schema>(dbTransaction: DBTransaction<unknown>, schema: S): Promise<ServerSchema>;
|
|
12
|
+
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAuEvB"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { formatPg, sql } from "../../z2s/src/sql.js";
|
|
2
|
+
export async function getServerSchema(dbTransaction, schema) {
|
|
3
|
+
const schemaTablePairs = Object.values(schema.tables).map(({ name, serverName }) => {
|
|
4
|
+
let schemaTablePair = ['public', serverName ?? name];
|
|
5
|
+
if (serverName) {
|
|
6
|
+
const firstPeriod = serverName.indexOf('.');
|
|
7
|
+
if (firstPeriod > -1) {
|
|
8
|
+
schemaTablePair = [
|
|
9
|
+
serverName.substring(0, firstPeriod),
|
|
10
|
+
serverName.substring(firstPeriod + 1, serverName.length),
|
|
11
|
+
];
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return schemaTablePair;
|
|
15
|
+
});
|
|
16
|
+
if (schemaTablePairs.length === 0) {
|
|
17
|
+
return {}; // No pairs to query for
|
|
18
|
+
}
|
|
19
|
+
// Cast all inputs to text and all outputs to text to avoid
|
|
20
|
+
// any conversions customer's DBTransaction impl has on other types.
|
|
21
|
+
const inClause = sql.join(schemaTablePairs.map(([schema, table]) => sql `(${schema}::text, ${table}::text)`), ',');
|
|
22
|
+
const query = sql `
|
|
23
|
+
SELECT
|
|
24
|
+
c.table_schema::text AS schema,
|
|
25
|
+
c.table_name::text AS table,
|
|
26
|
+
c.column_name::text AS column,
|
|
27
|
+
c.data_type::text AS type,
|
|
28
|
+
(t.typtype = 'e')::text AS enum
|
|
29
|
+
FROM
|
|
30
|
+
information_schema.columns c
|
|
31
|
+
JOIN
|
|
32
|
+
pg_catalog.pg_type t ON c.udt_name = t.typname
|
|
33
|
+
JOIN
|
|
34
|
+
pg_catalog.pg_namespace n ON t.typnamespace = n.oid
|
|
35
|
+
WHERE
|
|
36
|
+
(c.table_schema, c.table_name) IN (${inClause})
|
|
37
|
+
`;
|
|
38
|
+
const { text, values } = formatPg(query);
|
|
39
|
+
const results = (await dbTransaction.query(text, values));
|
|
40
|
+
const serverSchema = {};
|
|
41
|
+
for (const row of results) {
|
|
42
|
+
const tableName = row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;
|
|
43
|
+
let tableSchema = serverSchema[tableName];
|
|
44
|
+
if (!tableSchema) {
|
|
45
|
+
tableSchema = {};
|
|
46
|
+
serverSchema[tableName] = tableSchema;
|
|
47
|
+
}
|
|
48
|
+
tableSchema[row.column] = {
|
|
49
|
+
type: row.type,
|
|
50
|
+
isEnum: row.enum.toLowerCase().startsWith('t'),
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
// Validate that schema.ts is a valid subset of serverSchema and
|
|
54
|
+
// types are compatible.
|
|
55
|
+
return serverSchema;
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,GAAG,EAAC,MAAM,sBAAsB,CAAC;AAYnD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,aAAqC,EACrC,MAAS;IAET,MAAM,gBAAgB,GAAuB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAC3E,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;QACrB,IAAI,eAAe,GAAqB,CAAC,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC;gBACrB,eAAe,GAAG;oBAChB,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC;oBACpC,UAAU,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;iBACzD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC,CACF,CAAC;IAEF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC,CAAC,wBAAwB;IACrC,CAAC;IAED,2DAA2D;IAC3D,oEAAoE;IACpE,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CACvB,gBAAgB,CAAC,GAAG,CAClB,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA,IAAI,MAAM,WAAW,KAAK,SAAS,CAC5D,EACD,GAAG,CACJ,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,CAAA;;;;;;;;;;;;;;+CAc4B,QAAQ;KAClD,CAAC;IACJ,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAA8B,CAAC,MAAM,aAAa,CAAC,KAAK,CACnE,IAAI,EACJ,MAAM,CACP,CAA8B,CAAC;IAEhC,MAAM,YAAY,GAAiB,EAAE,CAAC;IAEtC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACrE,IAAI,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,GAAG,EAAE,CAAC;YACjB,YAAY,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;QACxC,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG;YACxB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,gEAAgE;IAChE,wBAAwB;IAExB,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/out/zero-pg/src/web.d.ts
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import type { PushResponse } from '../../zero-protocol/src/push.ts';
|
|
1
|
+
import { pushParamsSchema, type PushResponse } from '../../zero-protocol/src/push.ts';
|
|
3
2
|
import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
|
|
3
|
+
import * as v from '../../shared/src/valita.ts';
|
|
4
4
|
import { type CustomMutatorDefs } from './custom.ts';
|
|
5
|
+
import { type LogLevel } from '@rocicorp/logger';
|
|
5
6
|
import { type ConnectionProvider } from '../../zql/src/mutate/custom.ts';
|
|
6
|
-
export type
|
|
7
|
-
export type Params = {
|
|
8
|
-
schema: string;
|
|
9
|
-
appID: string;
|
|
10
|
-
};
|
|
7
|
+
export type Params = v.Infer<typeof pushParamsSchema>;
|
|
11
8
|
export declare class PushProcessor<S extends Schema, TDBTransaction, MD extends CustomMutatorDefs<S, TDBTransaction>> {
|
|
12
9
|
#private;
|
|
13
|
-
constructor(schema: S, dbConnectionProvider: ConnectionProvider<TDBTransaction>,
|
|
14
|
-
process(
|
|
10
|
+
constructor(schema: S, dbConnectionProvider: ConnectionProvider<TDBTransaction>, logLevel?: LogLevel);
|
|
11
|
+
process(mutators: MD, queryString: unknown, body: unknown): Promise<PushResponse>;
|
|
15
12
|
}
|
|
16
13
|
//# sourceMappingURL=web.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/web.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,gBAAgB,EAChB,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAa,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAIL,KAAK,kBAAkB,EAGxB,MAAM,gCAAgC,CAAC;AAQxC,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEtD,qBAAa,aAAa,CACxB,CAAC,SAAS,MAAM,EAChB,cAAc,EACd,EAAE,SAAS,iBAAiB,CAAC,CAAC,EAAE,cAAc,CAAC;;gBAe7C,MAAM,EAAE,CAAC,EACT,oBAAoB,EAAE,kBAAkB,CAAC,cAAc,CAAC,EACxD,QAAQ,GAAE,QAAiB;IASvB,OAAO,CACX,QAAQ,EAAE,EAAE,EACZ,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,YAAY,CAAC;CA+JzB"}
|