ponder 0.11.41-next.3 → 0.11.41
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/CHANGELOG.md +6 -0
- package/dist/esm/bin/commands/codegen.js +1 -1
- package/dist/esm/bin/commands/codegen.js.map +1 -1
- package/dist/esm/bin/commands/createViews.js +14 -15
- package/dist/esm/bin/commands/createViews.js.map +1 -1
- package/dist/esm/bin/commands/dev.js +9 -35
- package/dist/esm/bin/commands/dev.js.map +1 -1
- package/dist/esm/bin/commands/list.js +8 -8
- package/dist/esm/bin/commands/list.js.map +1 -1
- package/dist/esm/bin/commands/prune.js +12 -12
- package/dist/esm/bin/commands/prune.js.map +1 -1
- package/dist/esm/bin/commands/serve.js +2 -2
- package/dist/esm/bin/commands/serve.js.map +1 -1
- package/dist/esm/bin/commands/start.js +13 -5
- package/dist/esm/bin/commands/start.js.map +1 -1
- package/dist/esm/bin/utils/exit.js +21 -33
- package/dist/esm/bin/utils/exit.js.map +1 -1
- package/dist/esm/bin/utils/run.js +171 -182
- package/dist/esm/bin/utils/run.js.map +1 -1
- package/dist/esm/build/config.js.map +1 -1
- package/dist/esm/build/factory.js.map +1 -1
- package/dist/esm/build/index.js +1 -48
- package/dist/esm/build/index.js.map +1 -1
- package/dist/esm/build/plugin.js +1 -1
- package/dist/esm/build/pre.js.map +1 -1
- package/dist/esm/build/schema.js.map +1 -1
- package/dist/esm/build/stacktrace.js.map +1 -1
- package/dist/esm/client/index.js +6 -10
- package/dist/esm/client/index.js.map +1 -1
- package/dist/esm/client/parse.js.map +1 -1
- package/dist/esm/database/index.js +513 -151
- package/dist/esm/database/index.js.map +1 -1
- package/dist/esm/drizzle/bigint.js +4 -2
- package/dist/esm/drizzle/bigint.js.map +1 -1
- package/dist/esm/drizzle/bytes.js +4 -2
- package/dist/esm/drizzle/bytes.js.map +1 -1
- package/dist/esm/drizzle/hex.js +4 -2
- package/dist/esm/drizzle/hex.js.map +1 -1
- package/dist/esm/drizzle/index.js.map +1 -1
- package/dist/esm/drizzle/kit/index.js.map +1 -1
- package/dist/esm/drizzle/onchain.js +1 -8
- package/dist/esm/drizzle/onchain.js.map +1 -1
- package/dist/esm/drizzle/text.js +4 -2
- package/dist/esm/drizzle/text.js.map +1 -1
- package/dist/esm/graphql/index.js +16 -19
- package/dist/esm/graphql/index.js.map +1 -1
- package/dist/esm/graphql/json.js.map +1 -1
- package/dist/esm/graphql/middleware.js +8 -4
- package/dist/esm/graphql/middleware.js.map +1 -1
- package/dist/esm/indexing/addStackTrace.js.map +1 -1
- package/dist/esm/indexing/client.js.map +1 -1
- package/dist/esm/indexing/index.js +19 -43
- package/dist/esm/indexing/index.js.map +1 -1
- package/dist/esm/indexing/profile.js.map +1 -1
- package/dist/esm/indexing-store/cache.js +60 -47
- package/dist/esm/indexing-store/cache.js.map +1 -1
- package/dist/esm/indexing-store/historical.js +40 -55
- package/dist/esm/indexing-store/historical.js.map +1 -1
- package/dist/esm/indexing-store/index.js +19 -2
- package/dist/esm/indexing-store/index.js.map +1 -1
- package/dist/esm/indexing-store/profile.js.map +1 -1
- package/dist/esm/indexing-store/realtime.js +118 -107
- package/dist/esm/indexing-store/realtime.js.map +1 -1
- package/dist/esm/indexing-store/utils.js.map +1 -1
- package/dist/esm/internal/errors.js +35 -112
- package/dist/esm/internal/errors.js.map +1 -1
- package/dist/esm/internal/logger.js.map +1 -1
- package/dist/esm/internal/metrics.js.map +1 -1
- package/dist/esm/internal/options.js.map +1 -1
- package/dist/esm/internal/telemetry.js.map +1 -1
- package/dist/esm/rpc/index.js +7 -0
- package/dist/esm/rpc/index.js.map +1 -1
- package/dist/esm/server/error.js.map +1 -1
- package/dist/esm/server/index.js +2 -6
- package/dist/esm/server/index.js.map +1 -1
- package/dist/esm/sync/abi.js.map +1 -1
- package/dist/esm/sync/events.js +16 -8
- package/dist/esm/sync/events.js.map +1 -1
- package/dist/esm/sync/filter.js.map +1 -1
- package/dist/esm/sync/fragments.js.map +1 -1
- package/dist/esm/sync/index.js +189 -153
- package/dist/esm/sync/index.js.map +1 -1
- package/dist/esm/sync-historical/index.js +6 -1
- package/dist/esm/sync-historical/index.js.map +1 -1
- package/dist/esm/sync-realtime/bloom.js.map +1 -1
- package/dist/esm/sync-realtime/index.js +89 -61
- package/dist/esm/sync-realtime/index.js.map +1 -1
- package/dist/esm/sync-store/index.js +429 -385
- package/dist/esm/sync-store/index.js.map +1 -1
- package/dist/esm/sync-store/schema.js +2 -2
- package/dist/esm/sync-store/schema.js.map +1 -1
- package/dist/esm/ui/app.js.map +1 -1
- package/dist/esm/ui/patch.js.map +1 -1
- package/dist/esm/utils/bigint.js.map +1 -1
- package/dist/esm/utils/chunk.js.map +1 -1
- package/dist/esm/utils/decodeAbiParameters.js.map +1 -1
- package/dist/esm/utils/duplicates.js.map +1 -1
- package/dist/esm/utils/finality.js.map +1 -1
- package/dist/esm/utils/generators.js +3 -29
- package/dist/esm/utils/generators.js.map +1 -1
- package/dist/esm/utils/interval.js.map +1 -1
- package/dist/esm/utils/mutex.js +0 -25
- package/dist/esm/utils/mutex.js.map +1 -1
- package/dist/esm/utils/offset.js.map +1 -1
- package/dist/esm/utils/order.js.map +1 -1
- package/dist/esm/utils/partition.js.map +1 -1
- package/dist/esm/utils/pg.js +2 -2
- package/dist/esm/utils/pg.js.map +1 -1
- package/dist/esm/utils/pglite.js.map +1 -1
- package/dist/esm/utils/port.js.map +1 -1
- package/dist/esm/utils/queue.js.map +1 -1
- package/dist/esm/utils/result.js.map +1 -1
- package/dist/esm/utils/rpc.js.map +1 -1
- package/dist/esm/utils/wait.js +0 -2
- package/dist/esm/utils/wait.js.map +1 -1
- package/dist/esm/utils/zipper.js.map +1 -1
- package/dist/types/bin/commands/createViews.d.ts.map +1 -1
- package/dist/types/bin/commands/dev.d.ts.map +1 -1
- package/dist/types/bin/commands/list.d.ts.map +1 -1
- package/dist/types/bin/commands/prune.d.ts.map +1 -1
- package/dist/types/bin/commands/start.d.ts +0 -2
- package/dist/types/bin/commands/start.d.ts.map +1 -1
- package/dist/types/bin/utils/exit.d.ts +3 -5
- package/dist/types/bin/utils/exit.d.ts.map +1 -1
- package/dist/types/bin/utils/run.d.ts +4 -2
- package/dist/types/bin/utils/run.d.ts.map +1 -1
- package/dist/types/build/index.d.ts +1 -1
- package/dist/types/build/index.d.ts.map +1 -1
- package/dist/types/client/index.d.ts.map +1 -1
- package/dist/types/database/index.d.ts +75 -19
- package/dist/types/database/index.d.ts.map +1 -1
- package/dist/types/drizzle/index.d.ts +3 -2
- package/dist/types/drizzle/index.d.ts.map +1 -1
- package/dist/types/drizzle/kit/index.d.ts +4 -3
- package/dist/types/drizzle/kit/index.d.ts.map +1 -1
- package/dist/types/drizzle/onchain.d.ts +5 -12
- package/dist/types/drizzle/onchain.d.ts.map +1 -1
- package/dist/types/graphql/index.d.ts +4 -2
- package/dist/types/graphql/index.d.ts.map +1 -1
- package/dist/types/graphql/middleware.d.ts +1 -1
- package/dist/types/graphql/middleware.d.ts.map +1 -1
- package/dist/types/indexing/index.d.ts +14 -5
- package/dist/types/indexing/index.d.ts.map +1 -1
- package/dist/types/indexing-store/cache.d.ts +16 -5
- package/dist/types/indexing-store/cache.d.ts.map +1 -1
- package/dist/types/indexing-store/historical.d.ts +7 -3
- package/dist/types/indexing-store/historical.d.ts.map +1 -1
- package/dist/types/indexing-store/index.d.ts +2 -4
- package/dist/types/indexing-store/index.d.ts.map +1 -1
- package/dist/types/indexing-store/realtime.d.ts +4 -3
- package/dist/types/indexing-store/realtime.d.ts.map +1 -1
- package/dist/types/internal/errors.d.ts +13 -46
- package/dist/types/internal/errors.d.ts.map +1 -1
- package/dist/types/internal/types.d.ts +0 -7
- package/dist/types/internal/types.d.ts.map +1 -1
- package/dist/types/rpc/index.d.ts +3 -2
- package/dist/types/rpc/index.d.ts.map +1 -1
- package/dist/types/server/index.d.ts +1 -1
- package/dist/types/server/index.d.ts.map +1 -1
- package/dist/types/sync/events.d.ts.map +1 -1
- package/dist/types/sync/index.d.ts +15 -14
- package/dist/types/sync/index.d.ts.map +1 -1
- package/dist/types/sync-historical/index.d.ts +1 -0
- package/dist/types/sync-historical/index.d.ts.map +1 -1
- package/dist/types/sync-realtime/index.d.ts +29 -4
- package/dist/types/sync-realtime/index.d.ts.map +1 -1
- package/dist/types/sync-store/index.d.ts.map +1 -1
- package/dist/types/utils/generators.d.ts +2 -12
- package/dist/types/utils/generators.d.ts.map +1 -1
- package/dist/types/utils/mutex.d.ts +0 -4
- package/dist/types/utils/mutex.d.ts.map +1 -1
- package/dist/types/utils/wait.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/bin/commands/codegen.ts +1 -1
- package/src/bin/commands/createViews.ts +30 -45
- package/src/bin/commands/dev.ts +9 -32
- package/src/bin/commands/list.ts +17 -23
- package/src/bin/commands/prune.ts +28 -34
- package/src/bin/commands/serve.ts +2 -2
- package/src/bin/commands/start.ts +14 -6
- package/src/bin/utils/exit.ts +18 -34
- package/src/bin/utils/run.ts +341 -387
- package/src/build/index.ts +2 -53
- package/src/build/plugin.ts +1 -1
- package/src/client/index.ts +6 -9
- package/src/database/index.ts +807 -342
- package/src/drizzle/index.ts +3 -2
- package/src/drizzle/kit/index.ts +5 -2
- package/src/drizzle/onchain.ts +2 -26
- package/src/graphql/index.ts +30 -37
- package/src/graphql/middleware.ts +7 -5
- package/src/indexing/index.ts +32 -60
- package/src/indexing-store/cache.ts +100 -69
- package/src/indexing-store/historical.ts +76 -97
- package/src/indexing-store/index.ts +29 -4
- package/src/indexing-store/realtime.ts +210 -242
- package/src/internal/errors.ts +32 -93
- package/src/internal/types.ts +0 -10
- package/src/rpc/index.ts +11 -2
- package/src/server/index.ts +4 -17
- package/src/sync/events.ts +16 -8
- package/src/sync/index.ts +267 -249
- package/src/sync-historical/index.ts +9 -1
- package/src/sync-realtime/index.ts +298 -239
- package/src/sync-store/index.ts +658 -575
- package/src/utils/generators.ts +3 -39
- package/src/utils/mutex.ts +0 -33
- package/src/utils/wait.ts +0 -1
- package/dist/esm/database/actions.js +0 -172
- package/dist/esm/database/actions.js.map +0 -1
- package/dist/esm/database/queryBuilder.js +0 -250
- package/dist/esm/database/queryBuilder.js.map +0 -1
- package/dist/esm/drizzle/json.js +0 -115
- package/dist/esm/drizzle/json.js.map +0 -1
- package/dist/types/database/actions.d.ts +0 -26
- package/dist/types/database/actions.d.ts.map +0 -1
- package/dist/types/database/queryBuilder.d.ts +0 -56
- package/dist/types/database/queryBuilder.d.ts.map +0 -1
- package/dist/types/drizzle/json.d.ts +0 -51
- package/dist/types/drizzle/json.d.ts.map +0 -1
- package/src/database/actions.ts +0 -253
- package/src/database/queryBuilder.ts +0 -429
- package/src/drizzle/json.ts +0 -154
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# ponder
|
|
2
2
|
|
|
3
|
+
## 0.11.41
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`2b26106`](https://github.com/ponder-sh/ponder/commit/2b261068233b9652408557b53183d65a9a134062) Thanks [@typedarray](https://github.com/typedarray)! - Improved reliability for WebSocket RPC requests.
|
|
8
|
+
|
|
3
9
|
## 0.11.40
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -25,7 +25,7 @@ export async function codegen({ cliOptions }) {
|
|
|
25
25
|
const shutdown = createShutdown();
|
|
26
26
|
const telemetry = createTelemetry({ options, logger, shutdown });
|
|
27
27
|
const common = { options, logger, metrics, telemetry, shutdown };
|
|
28
|
-
const exit = createExit({ common
|
|
28
|
+
const exit = createExit({ common });
|
|
29
29
|
telemetry.record({
|
|
30
30
|
name: "lifecycle:session_start",
|
|
31
31
|
properties: { cli_command: "codegen" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../../src/bin/commands/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,UAAU,EAA8B;IACtE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ;QACvB,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI;SACjD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,MAAM,CAA6B,CAAC;IAC3C,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,GAAG,EAAE,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../../src/bin/commands/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,UAAU,EAA8B;IACtE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ;QACvB,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI;SACjD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,MAAM,CAA6B,CAAC;IAC3C,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,GAAG,EAAE,CAAC,EAAE;QAC9C,MAAM,CAAC,KAAK,CAAC;YACX,OAAO,EAAE,SAAS;YAClB,GAAG,EAAE,uDAAuD,KAAK,IAAI,KAAK,GAAG;SAC9E,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEjE,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEpC,SAAS,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,yBAAyB;QAC/B,UAAU,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE;KACvC,CAAC,CAAC;IAEH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC;IAElE,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { createBuild } from '../../build/index.js';
|
|
2
2
|
import { createDatabase, getPonderMetaTable } from '../../database/index.js';
|
|
3
|
-
import { sql } from '../../index.js';
|
|
4
3
|
import { createLogger } from '../../internal/logger.js';
|
|
5
4
|
import { MetricsService } from '../../internal/metrics.js';
|
|
6
5
|
import { buildOptions } from '../../internal/options.js';
|
|
7
6
|
import { createShutdown } from '../../internal/shutdown.js';
|
|
8
7
|
import { createTelemetry } from '../../internal/telemetry.js';
|
|
9
|
-
import { eq } from "drizzle-orm";
|
|
8
|
+
import { eq, sql } from "drizzle-orm";
|
|
10
9
|
import { createExit } from "../utils/exit.js";
|
|
11
10
|
const emptySchemaBuild = {
|
|
12
11
|
schema: {},
|
|
@@ -28,7 +27,7 @@ export async function createViews({ cliOptions, }) {
|
|
|
28
27
|
const telemetry = createTelemetry({ options, logger, shutdown });
|
|
29
28
|
const common = { options, logger, metrics, telemetry, shutdown };
|
|
30
29
|
const build = await createBuild({ common, cliOptions });
|
|
31
|
-
const exit = createExit({ common
|
|
30
|
+
const exit = createExit({ common });
|
|
32
31
|
if (cliOptions.schema === undefined) {
|
|
33
32
|
logger.warn({
|
|
34
33
|
service: "create-views",
|
|
@@ -50,7 +49,7 @@ export async function createViews({ cliOptions, }) {
|
|
|
50
49
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
51
50
|
return;
|
|
52
51
|
}
|
|
53
|
-
const buildResult =
|
|
52
|
+
const buildResult = build.preCompile(configResult.result);
|
|
54
53
|
if (buildResult.status === "error") {
|
|
55
54
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
56
55
|
return;
|
|
@@ -66,10 +65,10 @@ export async function createViews({ cliOptions, }) {
|
|
|
66
65
|
schemaBuild: emptySchemaBuild,
|
|
67
66
|
});
|
|
68
67
|
const PONDER_META = getPonderMetaTable(cliOptions.schema);
|
|
69
|
-
const meta = await database.
|
|
68
|
+
const meta = await database.qb.drizzle
|
|
70
69
|
.select({ app: PONDER_META.value })
|
|
71
70
|
.from(PONDER_META)
|
|
72
|
-
.where(eq(PONDER_META.key, "app"))
|
|
71
|
+
.where(eq(PONDER_META.key, "app"));
|
|
73
72
|
if (meta.length === 0) {
|
|
74
73
|
logger.warn({
|
|
75
74
|
service: "create-views",
|
|
@@ -78,24 +77,24 @@ export async function createViews({ cliOptions, }) {
|
|
|
78
77
|
await exit({ reason: "Create views failed", code: 0 });
|
|
79
78
|
return;
|
|
80
79
|
}
|
|
81
|
-
await database.
|
|
80
|
+
await database.qb.drizzle.execute(sql.raw(`CREATE SCHEMA IF NOT EXISTS "${cliOptions.viewsSchema}"`));
|
|
82
81
|
for (const table of meta[0].app.table_names) {
|
|
83
82
|
// Note: drop views before creating new ones to avoid enum errors.
|
|
84
|
-
await database.
|
|
85
|
-
await database.
|
|
83
|
+
await database.qb.drizzle.execute(sql.raw(`DROP VIEW IF EXISTS "${cliOptions.viewsSchema}"."${table}"`));
|
|
84
|
+
await database.qb.drizzle.execute(sql.raw(`CREATE VIEW "${cliOptions.viewsSchema}"."${table}" AS SELECT * FROM "${cliOptions.schema}"."${table}"`));
|
|
86
85
|
}
|
|
87
86
|
logger.warn({
|
|
88
87
|
service: "create-views",
|
|
89
88
|
msg: `Created ${meta[0].app.table_names.length} views in schema "${cliOptions.viewsSchema}"`,
|
|
90
89
|
});
|
|
91
|
-
await database.
|
|
92
|
-
await database.
|
|
93
|
-
await database.
|
|
94
|
-
await database.
|
|
90
|
+
await database.qb.drizzle.execute(sql.raw(`DROP VIEW IF EXISTS "${cliOptions.viewsSchema}"."_ponder_meta"`));
|
|
91
|
+
await database.qb.drizzle.execute(sql.raw(`DROP VIEW IF EXISTS "${cliOptions.viewsSchema}"."_ponder_checkpoint"`));
|
|
92
|
+
await database.qb.drizzle.execute(sql.raw(`CREATE VIEW "${cliOptions.viewsSchema}"."_ponder_meta" AS SELECT * FROM "${cliOptions.schema}"."_ponder_meta"`));
|
|
93
|
+
await database.qb.drizzle.execute(sql.raw(`CREATE VIEW "${cliOptions.viewsSchema}"."_ponder_checkpoint" AS SELECT * FROM "${cliOptions.schema}"."_ponder_checkpoint"`));
|
|
95
94
|
const trigger = `status_${cliOptions.viewsSchema}_trigger`;
|
|
96
95
|
const notification = "status_notify()";
|
|
97
96
|
const channel = `${cliOptions.viewsSchema}_status_channel`;
|
|
98
|
-
await database.
|
|
97
|
+
await database.qb.drizzle.execute(sql.raw(`
|
|
99
98
|
CREATE OR REPLACE FUNCTION "${cliOptions.viewsSchema}".${notification}
|
|
100
99
|
RETURNS TRIGGER
|
|
101
100
|
LANGUAGE plpgsql
|
|
@@ -105,7 +104,7 @@ NOTIFY "${channel}";
|
|
|
105
104
|
RETURN NULL;
|
|
106
105
|
END;
|
|
107
106
|
$$;`));
|
|
108
|
-
await database.
|
|
107
|
+
await database.qb.drizzle.execute(sql.raw(`
|
|
109
108
|
CREATE OR REPLACE TRIGGER "${trigger}"
|
|
110
109
|
AFTER INSERT OR UPDATE OR DELETE
|
|
111
110
|
ON "${cliOptions.schema}"._ponder_checkpoint
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createViews.js","sourceRoot":"","sources":["../../../../src/bin/commands/createViews.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createViews.js","sourceRoot":"","sources":["../../../../src/bin/commands/createViews.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { createBuild } from '../../build/index.js';
|
|
4
4
|
import { createDatabase } from '../../database/index.js';
|
|
5
|
-
import { NonRetryableUserError, ShutdownError } from '../../internal/errors.js';
|
|
6
5
|
import { createLogger } from '../../internal/logger.js';
|
|
7
6
|
import { MetricsService } from '../../internal/metrics.js';
|
|
8
7
|
import { buildOptions } from '../../internal/options.js';
|
|
@@ -66,7 +65,7 @@ export async function dev({ cliOptions }) {
|
|
|
66
65
|
if (cliOptions.disableUi !== true) {
|
|
67
66
|
createUi({ common: { ...common, shutdown } });
|
|
68
67
|
}
|
|
69
|
-
const exit = createExit({ common: { ...common, shutdown }
|
|
68
|
+
const exit = createExit({ common: { ...common, shutdown } });
|
|
70
69
|
let isInitialBuild = true;
|
|
71
70
|
const buildQueue = createQueue({
|
|
72
71
|
initialStart: true,
|
|
@@ -104,7 +103,7 @@ export async function dev({ cliOptions }) {
|
|
|
104
103
|
return;
|
|
105
104
|
}
|
|
106
105
|
const buildResult1 = mergeResults([
|
|
107
|
-
|
|
106
|
+
build.preCompile(configResult.result),
|
|
108
107
|
build.compileSchema(schemaResult.result),
|
|
109
108
|
]);
|
|
110
109
|
if (buildResult1.status === "error") {
|
|
@@ -205,6 +204,13 @@ export async function dev({ cliOptions }) {
|
|
|
205
204
|
schemaBuild,
|
|
206
205
|
indexingBuild: indexingBuildResult.result,
|
|
207
206
|
crashRecoveryCheckpoint,
|
|
207
|
+
onFatalError: () => {
|
|
208
|
+
exit({ reason: "Received fatal error", code: 1 });
|
|
209
|
+
},
|
|
210
|
+
onReloadableError: (error) => {
|
|
211
|
+
buildQueue.clear();
|
|
212
|
+
buildQueue.add({ status: "error", kind: "indexing", error });
|
|
213
|
+
},
|
|
208
214
|
});
|
|
209
215
|
}
|
|
210
216
|
else {
|
|
@@ -246,38 +252,6 @@ export async function dev({ cliOptions }) {
|
|
|
246
252
|
let crashRecoveryCheckpoint;
|
|
247
253
|
const schema = cliOptions.schema ?? process.env.DATABASE_SCHEMA ?? "public";
|
|
248
254
|
globalThis.PONDER_NAMESPACE_BUILD = { schema, viewsSchema: undefined };
|
|
249
|
-
process.on("uncaughtException", (error) => {
|
|
250
|
-
if (error instanceof ShutdownError)
|
|
251
|
-
return;
|
|
252
|
-
if (error instanceof NonRetryableUserError) {
|
|
253
|
-
buildQueue.clear();
|
|
254
|
-
buildQueue.add({ status: "error", kind: "indexing", error });
|
|
255
|
-
}
|
|
256
|
-
else {
|
|
257
|
-
common.logger.error({
|
|
258
|
-
service: "process",
|
|
259
|
-
msg: "Caught uncaughtException event",
|
|
260
|
-
error,
|
|
261
|
-
});
|
|
262
|
-
exit({ reason: "Received fatal error", code: 75 });
|
|
263
|
-
}
|
|
264
|
-
});
|
|
265
|
-
process.on("unhandledRejection", (error) => {
|
|
266
|
-
if (error instanceof ShutdownError)
|
|
267
|
-
return;
|
|
268
|
-
if (error instanceof NonRetryableUserError) {
|
|
269
|
-
buildQueue.clear();
|
|
270
|
-
buildQueue.add({ status: "error", kind: "indexing", error });
|
|
271
|
-
}
|
|
272
|
-
else {
|
|
273
|
-
common.logger.error({
|
|
274
|
-
service: "process",
|
|
275
|
-
msg: "Caught unhandledRejection event",
|
|
276
|
-
error,
|
|
277
|
-
});
|
|
278
|
-
exit({ reason: "Received fatal error", code: 75 });
|
|
279
|
-
}
|
|
280
|
-
});
|
|
281
255
|
build.startDev({
|
|
282
256
|
onReload: (kind) => {
|
|
283
257
|
buildQueue.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/bin/commands/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,13 +31,13 @@ export async function list({ cliOptions }) {
|
|
|
31
31
|
const telemetry = createTelemetry({ options, logger, shutdown });
|
|
32
32
|
const common = { options, logger, metrics, telemetry, shutdown };
|
|
33
33
|
const build = await createBuild({ common, cliOptions });
|
|
34
|
-
const exit = createExit({ common
|
|
34
|
+
const exit = createExit({ common });
|
|
35
35
|
const configResult = await build.executeConfig();
|
|
36
36
|
if (configResult.status === "error") {
|
|
37
37
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
|
-
const buildResult =
|
|
40
|
+
const buildResult = build.preCompile(configResult.result);
|
|
41
41
|
if (buildResult.status === "error") {
|
|
42
42
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
43
43
|
return;
|
|
@@ -49,21 +49,21 @@ export async function list({ cliOptions }) {
|
|
|
49
49
|
preBuild: buildResult.result,
|
|
50
50
|
schemaBuild: emptySchemaBuild,
|
|
51
51
|
});
|
|
52
|
-
const ponderSchemas = await database.
|
|
52
|
+
const ponderSchemas = await database.qb.drizzle
|
|
53
53
|
.select({ schema: TABLES.table_schema })
|
|
54
54
|
.from(TABLES)
|
|
55
|
-
.where(eq(TABLES.table_name, "_ponder_meta"))
|
|
56
|
-
const ponderViewSchemas = await database.
|
|
55
|
+
.where(eq(TABLES.table_name, "_ponder_meta"));
|
|
56
|
+
const ponderViewSchemas = await database.qb.drizzle
|
|
57
57
|
.select({ schema: VIEWS.table_schema })
|
|
58
58
|
.from(VIEWS)
|
|
59
|
-
.where(eq(VIEWS.table_name, "_ponder_meta"))
|
|
60
|
-
const queries = ponderSchemas.map((row) => database.
|
|
59
|
+
.where(eq(VIEWS.table_name, "_ponder_meta"));
|
|
60
|
+
const queries = ponderSchemas.map((row) => database.qb.drizzle
|
|
61
61
|
.select({
|
|
62
62
|
value: getPonderMetaTable(row.schema).value,
|
|
63
63
|
schema: sql `${row.schema}`.as("schema"),
|
|
64
64
|
})
|
|
65
65
|
.from(getPonderMetaTable(row.schema))
|
|
66
|
-
.where(eq(getPonderMetaTable(row.schema).key, "app")))
|
|
66
|
+
.where(eq(getPonderMetaTable(row.schema).key, "app")));
|
|
67
67
|
if (queries.length === 0) {
|
|
68
68
|
logger.warn({
|
|
69
69
|
service: "list",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/bin/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEL,KAAK,EACL,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,gBAAgB,GAAG;IACvB,MAAM,EAAE,EAAE;IACV,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC7B,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC9B,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;KACjC;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAE,UAAU,EAA8B;IACnE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEjE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/bin/commands/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,13 +30,13 @@ export async function prune({ cliOptions }) {
|
|
|
30
30
|
const telemetry = createTelemetry({ options, logger, shutdown });
|
|
31
31
|
const common = { options, logger, metrics, telemetry, shutdown };
|
|
32
32
|
const build = await createBuild({ common, cliOptions });
|
|
33
|
-
const exit = createExit({ common
|
|
33
|
+
const exit = createExit({ common });
|
|
34
34
|
const configResult = await build.executeConfig();
|
|
35
35
|
if (configResult.status === "error") {
|
|
36
36
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
|
-
const buildResult =
|
|
39
|
+
const buildResult = build.preCompile(configResult.result);
|
|
40
40
|
if (buildResult.status === "error") {
|
|
41
41
|
await exit({ reason: "Failed intial build", code: 1 });
|
|
42
42
|
return;
|
|
@@ -48,19 +48,19 @@ export async function prune({ cliOptions }) {
|
|
|
48
48
|
preBuild: buildResult.result,
|
|
49
49
|
schemaBuild: emptySchemaBuild,
|
|
50
50
|
});
|
|
51
|
-
const ponderSchemas = await database.
|
|
51
|
+
const ponderSchemas = await database.qb.drizzle
|
|
52
52
|
.select({ schema: TABLES.table_schema, tableCount: count() })
|
|
53
53
|
.from(TABLES)
|
|
54
|
-
.where(inArray(TABLES.table_schema, database.
|
|
54
|
+
.where(inArray(TABLES.table_schema, database.qb.drizzle
|
|
55
55
|
.select({ schema: TABLES.table_schema })
|
|
56
56
|
.from(TABLES)
|
|
57
57
|
.where(eq(TABLES.table_name, "_ponder_meta"))))
|
|
58
|
-
.groupBy(TABLES.table_schema)
|
|
59
|
-
const ponderViewSchemas = await database.
|
|
58
|
+
.groupBy(TABLES.table_schema);
|
|
59
|
+
const ponderViewSchemas = await database.qb.drizzle
|
|
60
60
|
.select({ schema: VIEWS.table_schema })
|
|
61
61
|
.from(VIEWS)
|
|
62
|
-
.where(eq(VIEWS.table_name, "_ponder_meta"))
|
|
63
|
-
const queries = ponderSchemas.map((row) => database.
|
|
62
|
+
.where(eq(VIEWS.table_name, "_ponder_meta"));
|
|
63
|
+
const queries = ponderSchemas.map((row) => database.qb.drizzle
|
|
64
64
|
.select({
|
|
65
65
|
value: getPonderMetaTable(row.schema).value,
|
|
66
66
|
schema: sql `${row.schema}`.as("schema"),
|
|
@@ -139,28 +139,28 @@ export async function prune({ cliOptions }) {
|
|
|
139
139
|
return;
|
|
140
140
|
}
|
|
141
141
|
if (tablesToDrop.length > 0) {
|
|
142
|
-
await database.
|
|
142
|
+
await database.qb.drizzle.execute(sql.raw(`DROP TABLE IF EXISTS ${tablesToDrop.join(", ")} CASCADE`));
|
|
143
143
|
logger.warn({
|
|
144
144
|
service: "prune",
|
|
145
145
|
msg: `Dropped ${tablesToDrop.length} tables`,
|
|
146
146
|
});
|
|
147
147
|
}
|
|
148
148
|
if (viewsToDrop.length > 0) {
|
|
149
|
-
await database.
|
|
149
|
+
await database.qb.drizzle.execute(sql.raw(`DROP VIEW IF EXISTS ${viewsToDrop.join(", ")} CASCADE`));
|
|
150
150
|
logger.warn({
|
|
151
151
|
service: "prune",
|
|
152
152
|
msg: `Dropped ${viewsToDrop.length} views`,
|
|
153
153
|
});
|
|
154
154
|
}
|
|
155
155
|
if (functionsToDrop.length > 0) {
|
|
156
|
-
await database.
|
|
156
|
+
await database.qb.drizzle.execute(sql.raw(`DROP FUNCTION IF EXISTS ${functionsToDrop.join(", ")} CASCADE`));
|
|
157
157
|
logger.warn({
|
|
158
158
|
service: "prune",
|
|
159
159
|
msg: `Dropped ${functionsToDrop.length} functions`,
|
|
160
160
|
});
|
|
161
161
|
}
|
|
162
162
|
if (schemasToDrop.length > 0) {
|
|
163
|
-
await database.
|
|
163
|
+
await database.qb.drizzle.execute(sql.raw(`DROP SCHEMA IF EXISTS ${schemasToDrop.join(", ")} CASCADE`));
|
|
164
164
|
logger.warn({
|
|
165
165
|
service: "prune",
|
|
166
166
|
msg: `Dropped ${schemasToDrop.length} schemas`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../../src/bin/commands/prune.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEL,KAAK,EACL,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,gBAAgB,GAAG;IACvB,MAAM,EAAE,EAAE;IACV,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC7B,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC9B,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;KACjC;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAE,UAAU,EAA8B;IACpE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEjE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../../src/bin/commands/prune.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEL,KAAK,EACL,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,gBAAgB,GAAG;IACvB,MAAM,EAAE,EAAE;IACV,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC7B,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QAC9B,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;KACjC;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAE,UAAU,EAA8B;IACpE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEjE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEpC,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;IACjD,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,EAAE;QACnC,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,OAAO;KACR;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAE1D,IAAI,WAAW,CAAC,MAAM,KAAK,OAAO,EAAE;QAClC,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;QACpC,MAAM;QACN,gDAAgD;QAChD,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE;QACvD,QAAQ,EAAE,WAAW,CAAC,MAAM;QAC5B,WAAW,EAAE,gBAAgB;KAC9B,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO;SAC5C,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC;SAC5D,IAAI,CAAC,MAAM,CAAC;SACZ,KAAK,CACJ,OAAO,CACL,MAAM,CAAC,YAAY,EACnB,QAAQ,CAAC,EAAE,CAAC,OAAO;SAChB,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;SACvC,IAAI,CAAC,MAAM,CAAC;SACZ,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAChD,CACF;SACA,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO;SAChD,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;SACtC,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,QAAQ,CAAC,EAAE,CAAC,OAAO;SAChB,MAAM,CAAC;QACN,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK;QAC3C,MAAM,EAAE,GAAG,CAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC;KAChD,CAAC;SACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACpC,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CACxD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,iDAAiD;SACvD,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO;KACR;IAED,IAAI,MAA8C,CAAC;IAEnD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,GAAG,MAAM,OAAO,CAAC,CAAC,CAAE,CAAC;KAC5B;SAAM;QACL,aAAa;QACb,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC;KACrC;IAED,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,MAAM,EAAE;QACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACjC,IACE,KAAK,CAAC,SAAS,KAAK,CAAC;YACrB,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,EAAE,EACzE;YACA,SAAS;SACV;QAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE;YACxD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE;gBACrC,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC;aAC5C;YACD,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,kBAAkB,CAAC,CAAC;YAC/C,IAAI,KAAK,CAAC,OAAO,KAAK,GAAG,EAAE;gBACzB,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,wBAAwB,CAAC,CAAC;aACtD;iBAAM;gBACL,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,oBAAoB,CAAC,CAAC;aAClD;YAED,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAC1B,CAAC,UAAU,CAAC;YAEd,IAAI,MAAM,KAAK,QAAQ,IAAI,UAAU,IAAI,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE;gBACrE,aAAa,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;aACnC;SACF;aAAM;YACL,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE;gBACrC,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC;gBAC5C,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,MAAM,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjE,eAAe,CAAC,IAAI,CAAC,IAAI,MAAM,uBAAuB,KAAK,GAAG,CAAC,CAAC;aACjE;YACD,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,kBAAkB,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,OAAO,KAAK,GAAG,EAAE;gBACzB,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,wBAAwB,CAAC,CAAC;aACvD;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,oBAAoB,CAAC,CAAC;aACnD;YAED,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAC1B,CAAC,UAAU,CAAC;YAEd,IACE,MAAM,KAAK,QAAQ;gBACnB,UAAU,IAAI,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAC9C;gBACA,aAAa,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;aACnC;SACF;KACF;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QACzD,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,iDAAiD;SACvD,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO;KACR;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAC/B,GAAG,CAAC,GAAG,CAAC,wBAAwB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACnE,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,WAAW,YAAY,CAAC,MAAM,SAAS;SAC7C,CAAC,CAAC;KACJ;IAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAC/B,GAAG,CAAC,GAAG,CAAC,uBAAuB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACjE,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,WAAW,WAAW,CAAC,MAAM,QAAQ;SAC3C,CAAC,CAAC;KACJ;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAC/B,GAAG,CAAC,GAAG,CAAC,2BAA2B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACzE,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,WAAW,eAAe,CAAC,MAAM,YAAY;SACnD,CAAC,CAAC;KACJ;IAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAC/B,GAAG,CAAC,GAAG,CAAC,yBAAyB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CACrE,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,WAAW,aAAa,CAAC,MAAM,UAAU;SAC/C,CAAC,CAAC;KACJ;IAED,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -43,7 +43,7 @@ export async function serve({ cliOptions }) {
|
|
|
43
43
|
}, 1);
|
|
44
44
|
}
|
|
45
45
|
const build = await createBuild({ common, cliOptions });
|
|
46
|
-
const exit = createExit({ common
|
|
46
|
+
const exit = createExit({ common });
|
|
47
47
|
const namespaceResult = build.namespaceCompile();
|
|
48
48
|
if (namespaceResult.status === "error") {
|
|
49
49
|
await exit({ reason: "Failed to initialize namespace", code: 1 });
|
|
@@ -60,7 +60,7 @@ export async function serve({ cliOptions }) {
|
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
const buildResult1 = mergeResults([
|
|
63
|
-
|
|
63
|
+
build.preCompile(configResult.result),
|
|
64
64
|
build.compileSchema(schemaResult.result),
|
|
65
65
|
]);
|
|
66
66
|
if (buildResult1.status === "error") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../../src/bin/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAE,UAAU,EAA8B;IACpE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ;QACvB,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI;SACjD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,MAAM,CAA6B,CAAC;IAC3C,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,GAAG,EAAE,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../../src/bin/commands/serve.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export async function start({ cliOptions, onBuild, }) {
|
|
|
35
35
|
const shutdown = createShutdown();
|
|
36
36
|
const telemetry = createTelemetry({ options, logger, shutdown });
|
|
37
37
|
const common = { options, logger, metrics, telemetry, shutdown };
|
|
38
|
-
const exit = createExit({ common
|
|
38
|
+
const exit = createExit({ common });
|
|
39
39
|
if (options.version) {
|
|
40
40
|
metrics.ponder_version_info.set({
|
|
41
41
|
version: options.version.version,
|
|
@@ -63,7 +63,7 @@ export async function start({ cliOptions, onBuild, }) {
|
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
65
|
const buildResult1 = mergeResults([
|
|
66
|
-
|
|
66
|
+
build.preCompile(configResult.result),
|
|
67
67
|
build.compileSchema(schemaResult.result),
|
|
68
68
|
]);
|
|
69
69
|
if (buildResult1.status === "error") {
|
|
@@ -134,13 +134,21 @@ export async function start({ cliOptions, onBuild, }) {
|
|
|
134
134
|
indexingBuild: indexingBuildResult.result,
|
|
135
135
|
apiBuild: apiBuildResult.result,
|
|
136
136
|
crashRecoveryCheckpoint,
|
|
137
|
-
database,
|
|
138
137
|
};
|
|
139
138
|
if (onBuild) {
|
|
140
139
|
app = await onBuild(app);
|
|
141
140
|
}
|
|
142
|
-
run(
|
|
143
|
-
|
|
141
|
+
run({
|
|
142
|
+
...app,
|
|
143
|
+
database,
|
|
144
|
+
onFatalError: () => {
|
|
145
|
+
exit({ reason: "Received fatal error", code: 1 });
|
|
146
|
+
},
|
|
147
|
+
onReloadableError: () => {
|
|
148
|
+
exit({ reason: "Encountered indexing error", code: 1 });
|
|
149
|
+
},
|
|
150
|
+
});
|
|
151
|
+
runServer({ ...app, database });
|
|
144
152
|
return shutdown.kill;
|
|
145
153
|
}
|
|
146
154
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/bin/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AASxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/bin/commands/start.ts"],"names":[],"mappings":"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"}
|