Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions web/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ test_suite(
tests = [
"//web/api:generate_tests",
"//web/api:test",
"//web/test/package:consumer_typecheck_typecheck_test",
"//web/test/package:consumer_runtime_test",
"//web/test/package:pack_contents_test",
"//web/test/package/react18:react18_runtime_test",
"//web/service/submitqueue:lint",
"//web/service/submitqueue:test",
"//web/service/submitqueue:typecheck_typecheck_test",
"//web/submitqueue:test",
"//web/submitqueue:typecheck_typecheck_test",
"//web/platform:lint",
"//web/platform:test",
"//web/platform:typecheck_typecheck_test",
Expand All @@ -29,16 +20,26 @@ test_suite(
"//web/service/stovepipe:lint",
"//web/service/stovepipe:test",
"//web/service/stovepipe:typecheck_typecheck_test",
"//web/service/submitqueue:lint",
"//web/service/submitqueue:test",
"//web/service/submitqueue:typecheck_typecheck_test",
"//web/stovepipe:lint",
"//web/stovepipe:test",
"//web/stovepipe:typecheck_typecheck_test",
"//web/submitqueue:lint",
"//web/submitqueue:test",
"//web/submitqueue:typecheck_typecheck_test",
"//web/test/e2e/stovepipe:run_e2e_test",
"//web/test/e2e/stovepipe:typecheck_typecheck_test",
"//web/test/testutil:compose_test",
"//web/test/package:stovepipe_pack_contents_test",
"//web/test/e2e/submitqueue:run_e2e_test",
"//web/test/e2e/submitqueue:typecheck_typecheck_test",
"//web/test/package:consumer_node_typecheck_typecheck_test",
"//web/test/package:consumer_runtime_test",
"//web/test/package:consumer_typecheck_typecheck_test",
"//web/test/package:pack_contents_test",
"//web/test/package:stovepipe_pack_contents_test",
"//web/test/package/react18:react18_runtime_test",
"//web/test/testutil:compose_test",
],
)

Expand Down
7 changes: 7 additions & 0 deletions web/platform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
"version": "0.0.0",
"private": true,
"type": "module",
"types": "./dist/index.d.ts",
"typesVersions": {
"*": {
"path-segment": ["dist/path-segment.d.ts"],
"logging": ["dist/logging.d.ts"]
}
},
"sideEffects": [
"./styles.css"
],
Expand Down
6 changes: 6 additions & 0 deletions web/stovepipe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
"version": "0.0.0",
"private": true,
"type": "module",
"types": "./dist/index.d.ts",
"typesVersions": {
"*": {
"server": ["dist/server.d.ts"]
}
},
"sideEffects": [
"./view/styles.css"
],
Expand Down
8 changes: 8 additions & 0 deletions web/submitqueue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
"version": "0.0.0",
"private": true,
"type": "module",
"types": "./dist/index.d.ts",
"typesVersions": {
"*": {
"server": ["dist/server.d.ts"],
"extension/gateway/mock": ["dist/extension/gateway/mock/index.d.ts"],
"extension/cursor/hmac": ["dist/extension/cursor/hmac/index.d.ts"]
}
},
"sideEffects": [
"./view/styles.css"
],
Expand Down
42 changes: 36 additions & 6 deletions web/test/package/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
load("@aspect_rules_js//js:defs.bzl", "js_test")
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
load("@rules_python//python:defs.bzl", "py_test")

Expand All @@ -15,6 +15,11 @@ npm_link_package(
src = "//web/platform:pkg",
)

npm_link_package(
name = "node_modules/@submitqueue/web-stovepipe",
src = "//web/stovepipe:pkg",
)

ts_config(
name = "tsconfig",
src = "tsconfig.json",
Expand All @@ -27,8 +32,33 @@ ts_project(
no_emit = True,
tsconfig = ":tsconfig",
deps = [
":node_modules/@submitqueue/web-platform",
":node_modules/@submitqueue/web-stovepipe",
":node_modules/@submitqueue/web-submitqueue",
"//web:node_modules/@bufbuild/protobuf",
"//web:node_modules/@connectrpc/connect",
"//web:node_modules/@types/node",
"//web:node_modules/react",
"//web:node_modules/react-dom",
],
)

ts_config(
name = "tsconfig_node",
src = "tsconfig.node.json",
deps = [":tsconfig"],
)

ts_project(
name = "consumer_node_typecheck",
srcs = ["consumer.ts"],
declaration = False,
no_emit = True,
tsconfig = ":tsconfig_node",
deps = [
":node_modules/@submitqueue/web-platform",
":node_modules/@submitqueue/web-stovepipe",
":node_modules/@submitqueue/web-submitqueue",
"//web:node_modules/@bufbuild/protobuf",
"//web:node_modules/@connectrpc/connect",
"//web:node_modules/@types/node",
Expand All @@ -40,24 +70,24 @@ ts_project(
py_test(
name = "pack_contents_test",
srcs = ["pack_contents_test.py"],
main = "pack_contents_test.py",
legacy_create_init = 0,
args = ["$(rootpath //web/submitqueue:pkg.pack)"],
data = ["//web/submitqueue:pkg.pack"],
legacy_create_init = 0,
main = "pack_contents_test.py",
)

js_test(
name = "consumer_runtime_test",
entry_point = "consumer-runtime.mjs",
data = [
":node_modules/@submitqueue/web-submitqueue",
":node_modules/@submitqueue/web-platform",
"//web/submitqueue:node_modules",
":node_modules/@submitqueue/web-submitqueue",
"//web:node_modules/@bufbuild/protobuf",
"//web:node_modules/@connectrpc/connect",
"//web:node_modules/react",
"//web:node_modules/react-dom",
"//web/submitqueue:node_modules",
],
entry_point = "consumer-runtime.mjs",
)

py_test(
Expand Down
23 changes: 22 additions & 1 deletion web/test/package/consumer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
// Typechecks a host written only against the package's public entry points.
import { SubmitQueueApp, SubmitQueueShell, WebNavigationProvider } from "@submitqueue/web-submitqueue";
import { WebNavigationProvider } from "@submitqueue/web-platform";
import { createLogCallback } from "@submitqueue/web-platform/logging";
import { encodePathSegment } from "@submitqueue/web-platform/path-segment";
import { StovepipeApp } from "@submitqueue/web-stovepipe";
import { createStovepipeWeb, StovepipePaths, type StovepipeService } from "@submitqueue/web-stovepipe/server";
import { SubmitQueueApp, SubmitQueueShell } from "@submitqueue/web-submitqueue";
import { createSubmitQueueWeb, type SubmitQueueGateway } from "@submitqueue/web-submitqueue/server";
import { createFakeGatewayReader } from "@submitqueue/web-submitqueue/extension/gateway/mock";
import { newHmacCursorCodec } from "@submitqueue/web-submitqueue/extension/cursor/hmac";
Expand All @@ -17,3 +22,19 @@ export async function render() {
}
return [WebNavigationProvider, SubmitQueueShell, SubmitQueueApp, result.model] as const;
}

export async function renderStovepipe(service: StovepipeService) {
const web = createStovepipeWeb({
service,
queues: [{ name: "demo-queue" }],
paths: new StovepipePaths("/queues"),
});
const result = await web.handle({
path: "/queues/" + encodePathSegment("demo-queue"),
search: new URLSearchParams(),
onLog: createLogCallback(),
});
return result.kind === "render"
? [WebNavigationProvider, StovepipeApp, result.model] as const
: null;
}
6 changes: 6 additions & 0 deletions web/test/package/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"moduleResolution": "Node"
}
}
Loading