Merge pull request #55 from eseiker/housekeeping

Changes:
Merged web/deno.json with ~/deno.jsonc (to unify workspaces and entries)
Aligned imports

ControlMessage.ts

@@ -1,4 +1,4 @@
-import { decode, encode } from "https://deno.land/x/bencodex@0.2.2/mod.ts";
+import { decode, encode } from "bencodex";
 
 export type ReloadControlMessage = { action: "reload" };
 

EventMessage.ts

@@ -1,4 +1,4 @@
-import { decode, encode } from "https://deno.land/x/bencodex@0.2.2/mod.ts";
+import { decode, encode } from "bencodex";
 
 export type EventMessage = {
   address: Uint8Array;

EventResponse.ts

@@ -1,7 +1,8 @@
 import { getAddress, toHex } from "npm:viem";
-import { decodeEventLog } from "./decodeEventLog.ts";
-import { Event, EventAbi } from "./generated/client/index.d.ts";
+
 import { formatAbiItemPrototype } from "./abitype.ts";
+import { decodeEventLog } from "./decodeEventLog.ts";
+import type { Event, EventAbi } from "./generated/client/index.d.ts";
 
 export const serializeEventResponse = (event: Event & { Abi: EventAbi }) => {
   const { args } = decodeEventLog({

abitype.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Abi,
   AbiConstructor,
   AbiError,
@@ -8,12 +8,10 @@ import {
   AbiFunction,
   AbiParameter,
   AbiReceive,
-} from "https://esm.sh/abitype";
-import { Join } from "https://esm.sh/abitype/dist/types/types.d.ts";
-import { execTyped as execTypedImpl } from "https://esm.sh/abitype/dist/esm/regex.js";
-import { execTyped as execTypedType } from "https://esm.sh/abitype/dist/types/regex.d.ts";
-
-const execTyped = execTypedImpl as typeof execTypedType;
+} from "abitype";
+import type { Join } from "abitype/dist/types/types.d.ts";
+// @deno-types="abitype/dist/types/regex.d.ts"
+import { execTyped } from "abitype/dist/esm/regex.js";
 
 /**
  * Formats {@link AbiParameter} to human-readable ABI parameter prototype.

api.ts

@@ -1,17 +1,15 @@
-import { Status } from "https://deno.land/[email protected]/http/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { Status } from "std/http/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
-import { oakCors } from "https://deno.land/x/[email protected]/mod.ts";
 import {
   Application as OakApplication,
-  Context,
+  type Context,
   isHttpError,
   Router,
-} from "https://deno.land/x/[email protected]/mod.ts";
+} from "oak";
+
+import { oakCors } from "https://deno.land/x/[email protected]/mod.ts";
 
 import { Buffer } from "node:buffer";
 

app.ts

@@ -1,14 +1,11 @@
-import { parse } from "https://deno.land/[email protected]/flags/mod.ts";
-import * as path from "https://deno.land/[email protected]/path/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { parse } from "std/flags/mod.ts";
+import * as path from "std/path/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
-import { broker } from "https://deno.land/x/[email protected]/mod.ts";
+import { parseOptions } from "amqp/src/amqp_connect_options.ts";
 
-import { parseOptions } from "https://deno.land/x/[email protected]/src/amqp_connect_options.ts";
+import { broker } from "https://deno.land/x/[email protected]/mod.ts";
 
 import { api } from "./api.ts";
 import { dataproxy, generateDataproxy } from "./dataproxy.ts";
@@ -29,7 +26,7 @@ import { observer } from "./observer.ts";
 import { getSchemaPath, shouldUseDataproxy } from "./prismaSchemaUtils.ts";
 import {
   block,
-  CleanupFunction,
+  type CleanupFunction,
   runWithAmqp,
   runWithChainDefinition,
   runWithPrisma,

control.ts

@@ -1,10 +1,10 @@
-import { getLogger } from "https://deno.land/std@0.196.0/log/mod.ts";
+import { getLogger } from "std/log/mod.ts";
 
-import type { AmqpChannel } from "https://deno.land/x/amqp@v0.23.1/mod.ts";
+import type { AmqpChannel } from "amqp/mod.ts";
 
 import {
-  EmitterControlMessages,
-  ObserverControlMessages,
+  type EmitterControlMessages,
+  type ObserverControlMessages,
   serializeControlMessage,
 } from "./ControlMessage.ts";
 import {

dataproxy.ts

@@ -1,17 +1,11 @@
-import * as path from "https://deno.land/[email protected]/path/mod.ts";
-import { exists as fileExists } from "https://deno.land/[email protected]/fs/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import * as path from "std/path/mod.ts";
+import { exists as fileExists } from "std/fs/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
+
+import { Application as OakApplication, isHttpError, proxy } from "oak";
 
 import { getFreePort } from "https://deno.land/x/[email protected]/mod.ts";
-import {
-  Application as OakApplication,
-  isHttpError,
-  proxy,
-} from "https://deno.land/x/[email protected]/mod.ts";
 
 import {
   combinedEnv,

decodeEventLog.ts

@@ -20,9 +20,8 @@ import type {
 import type { Hex } from "https://esm.sh/viem/dist/types/types/misc.d.ts";
 import type { Prettify } from "https://esm.sh/viem/dist/types/types/utils.d.ts";
 import { getEventSelector } from "https://esm.sh/viem/dist/esm/utils/hash/getEventSelector.js";
-
 import { decodeAbiParameters } from "https://esm.sh/viem/dist/esm/utils/abi/decodeAbiParameters.js";
-import { DecodeAbiParametersReturnType } from "https://esm.sh/viem/dist/types/utils/abi/decodeAbiParameters.d.ts";
+import type { DecodeAbiParametersReturnType } from "https://esm.sh/viem/dist/types/utils/abi/decodeAbiParameters.d.ts";
 import { formatAbiItem } from "https://esm.sh/viem/dist/esm/utils/abi/formatAbiItem.js";
 
 export type DecodeEventLogParameters<

deno.jsonc

@@ -3,7 +3,31 @@
     "prisma": "deno run --allow-read --allow-sys --allow-run --allow-write scripts/prisma-wrapper.ts",
     "prisma-generate": "deno run --allow-read --allow-env --allow-sys --allow-run --allow-write scripts/prisma-generate.ts",
     "prisma-studio": "deno run --allow-read --allow-env --allow-run scripts/prisma-studio.ts",
-    "serve": "deno run --allow-read --allow-write --allow-env generate-cert.ts && deno run --allow-read --allow-env --allow-run --allow-sys app.ts"
+    "serve": "deno run --allow-read --allow-write --allow-env generate-cert.ts && deno run --allow-read --allow-env --allow-run --allow-sys app.ts",
+    "serve-web": "deno run -A --unsafely-ignore-certificate-errors=localhost --watch=web/static/,web/routes/ web/dev.ts"
   },
-  "lock": false
+  "lock": false,
+  "compilerOptions": {
+    "jsxImportSource": "preact",
+    "jsx": "react-jsx"
+  },
+  "imports": {
+    "~/": "./",
+    "web/": "./web/",
+    "std/": "https://deno.land/[email protected]/",
+    "abitype": "https://esm.sh/v130/[email protected]",
+    "abitype/": "https://esm.sh/v130/[email protected]/",
+    "amqp/": "https://deno.land/x/[email protected]/",
+    "bencodex": "https://deno.land/x/[email protected]/mod.ts",
+    "oak": "https://deno.land/x/[email protected]/mod.ts",
+    "fresh/": "https://deno.land/x/[email protected]/",
+    "fresh-session": "https://deno.land/x/[email protected]/mod.ts",
+    "preact": "https://esm.sh/v130/[email protected]",
+    "preact/": "https://esm.sh/v130/[email protected]/",
+    "preact-render-to-string": "https://esm.sh/v130/*[email protected]",
+    "@preact/signals": "https://esm.sh/v130/*@preact/[email protected]",
+    "@preact/signals-core": "https://esm.sh/v130/*@preact/[email protected]",
+    "twind": "https://esm.sh/v130/[email protected]",
+    "twind/": "https://esm.sh/v130/[email protected]/"
+  }
 }

emitter.ts

@@ -1,15 +1,12 @@
-import { format as formatDate } from "https://deno.land/[email protected]/datetime/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { format as formatDate } from "std/datetime/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
-import { AmqpConnection } from "https://deno.land/x/amqp@v0.23.1/mod.ts";
+import type { AmqpConnection } from "amqp/mod.ts";
 
 import { stringify as losslessJsonStringify } from "npm:lossless-json";
 import {
-  Chain,
+  type Chain,
   createPublicClient,
   getAddress,
   http as httpViemTransport,

envUtils.ts

@@ -1,4 +1,4 @@
-import { load } from "https://deno.land/std@0.194.0/dotenv/mod.ts";
+import { load } from "std/dotenv/mod.ts";
 
 export const combinedEnv = { ...(await load()), ...Deno.env.toObject() };
 export const DatabaseUrlEnvKey = "DATABASE_URL";

generate-cert.ts

@@ -1,10 +1,7 @@
-import { exists } from "https://deno.land/[email protected]/fs/mod.ts";
-import * as path from "https://deno.land/[email protected]/path/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { exists } from "std/fs/mod.ts";
+import * as path from "std/path/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
 import { generate } from "https://deno.land/x/[email protected]/index.js";
 

logUtils.ts

@@ -1,13 +1,7 @@
-import { format as formatDate } from "https://deno.land/[email protected]/datetime/mod.ts";
-import {
-  LoggerConfig,
-  LogLevels,
-  LogRecord,
-} from "https://deno.land/[email protected]/log/mod.ts";
-import {
-  LevelName,
-  LogLevelNames,
-} from "https://deno.land/[email protected]/log/levels.ts";
+import { format as formatDate } from "std/datetime/mod.ts";
+import { type LoggerConfig, LogLevels, type LogRecord } from "std/log/mod.ts";
+import { type LevelName, LogLevelNames } from "std/log/levels.ts";
+
 import { combinedEnv, LogLevelEnvKey } from "./envUtils.ts";
 
 // outside facing component logger names

moduleUtils.ts

@@ -1,4 +1,4 @@
-import * as path from "https://deno.land/std@0.194.0/path/mod.ts";
+import * as path from "std/path/mod.ts";
 
 // TODO: this const should be changed to point to the root source code directory whenever this
 // file is moved.

observer.ts

@@ -1,19 +1,16 @@
-import { format as formatDate } from "https://deno.land/[email protected]/datetime/mod.ts";
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { format as formatDate } from "std/datetime/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
-import { AmqpConnection } from "https://deno.land/x/[email protected]/mod.ts";
+import type { AmqpConnection } from "amqp/mod.ts";
+import type { AbiEvent } from "abitype";
 
 import { Buffer } from "node:buffer";
-import { AbiEvent } from "npm:abitype";
 import {
-  Chain,
+  type Chain,
   createPublicClient,
   http as httpViemTransport,
-  Log as LogGeneric,
+  type Log as LogGeneric,
   toBytes,
   toHex,
 } from "npm:viem";

prismaSchemaUtils.ts

@@ -1,5 +1,5 @@
-import { parse } from "https://deno.land/std@0.194.0/flags/mod.ts";
-import * as path from "https://deno.land/std@0.194.0/path/mod.ts";
+import { parse } from "std/flags/mod.ts";
+import * as path from "std/path/mod.ts";
 
 import { baseDir } from "./moduleUtils.ts";
 

runHelpers.ts

@@ -1,12 +1,11 @@
 import {
-  AmqpConnection,
-  AmqpConnectOptions,
+  type AmqpConnection,
+  type AmqpConnectOptions,
   connect as connectAmqp,
-} from "https://deno.land/x/[email protected]/mod.ts";
+} from "amqp/mod.ts";
+import { parseOptions } from "amqp/src/amqp_connect_options.ts";
 
-import { parseOptions } from "https://deno.land/x/[email protected]/src/amqp_connect_options.ts";
-
-import { Chain } from "npm:viem";
+import type { Chain } from "npm:viem";
 
 import type Prisma from "./prisma-shim.ts";
 import { PrismaClient } from "./prisma-shim.ts";

sample/chainDefinitions/goerli.ts

@@ -1,4 +1,4 @@
-import { Chain } from "npm:viem";
+import type { Chain } from "npm:viem";
 
 export default {
   id: 5,

sample/contracts/deploy-sample-contract.ts

@@ -1,6 +1,8 @@
+import Account from "https://deno.land/x/[email protected]/packages/web3-eth-accounts/src/index.js";
+
 import {
   CallExecutionError,
-  Chain,
+  type Chain,
   createPublicClient,
   createWalletClient,
   formatEther,
@@ -9,8 +11,6 @@ import {
 } from "npm:viem";
 import { privateKeyToAccount } from "npm:viem/accounts";
 
-import Account from "https://deno.land/x/[email protected]/packages/web3-eth-accounts/src/index.js";
-
 import {
   getRelativeScriptPath,
   importESOrJson,

sample/seed-prisma.ts

@@ -1,8 +1,9 @@
+import { type AbiEvent, narrow } from "abitype";
+
 import { Buffer } from "node:buffer";
-import { AbiEvent, narrow } from "npm:abitype";
 import { keccak256, toBytes } from "npm:viem";
 
-import { PrismaClient } from "../prisma-shim.ts";
+import { PrismaClient } from "~/prisma-shim.ts";
 
 import { formatAbiItemPrototype } from "../abitype.ts";
 import { combinedEnv, DatabaseUrlEnvKey } from "../envUtils.ts";

scripts/prisma-wrapper.ts

@@ -1,5 +1,5 @@
-import { parse } from "https://deno.land/std@0.194.0/flags/mod.ts";
-import * as path from "https://deno.land/std@0.194.0/path/mod.ts";
+import { parse } from "std/flags/mod.ts";
+import * as path from "std/path/mod.ts";
 
 import {
   clean as cleanSemver,

scripts/run-with-env.ts

@@ -1,4 +1,4 @@
-import { load } from "https://deno.land/std@0.194.0/dotenv/mod.ts";
+import { load } from "std/dotenv/mod.ts";
 
 if (Deno.args.length > 0) {
   new Deno.Command(Deno.args[0], {

scripts/signal-reload.ts

@@ -1,4 +1,4 @@
-import { connect } from "https://deno.land/x/amqp@v0.23.1/mod.ts";
+import { connect } from "amqp/mod.ts";
 
 import {
   ControlEmitterRoutingKey,

testWebhookReceiver.ts

@@ -1,12 +1,7 @@
-import { ConsoleHandler } from "https://deno.land/[email protected]/log/handlers.ts";
-import {
-  getLogger,
-  setup as setupLog,
-} from "https://deno.land/[email protected]/log/mod.ts";
+import { ConsoleHandler } from "std/log/handlers.ts";
+import { getLogger, setup as setupLog } from "std/log/mod.ts";
 
-import {
-  Application as OakApplication,
-} from "https://deno.land/x/[email protected]/mod.ts";
+import { Application as OakApplication } from "oak";
 
 import { parse } from "npm:lossless-json";
 

web/argon2.ts

@@ -1,12 +1,13 @@
-import {
-  type ArgonOptions,
-  ArgonWorker,
-} from "https://deno.land/x/[email protected]/src/async.ts";
 import {
   decode as decodeBase64,
   encode as encodeBase64,
 } from "std/encoding/base64.ts";
 
+import {
+  type ArgonOptions,
+  ArgonWorker,
+} from "https://deno.land/x/[email protected]/src/async.ts";
+
 const worker = new ArgonWorker();
 const encoder = new TextEncoder();