create-monolayer-app 0.5.1 → 0.6.1

package/template/package.json

@@ -20,7 +20,10 @@
     "package-app": "node vendor/package-app/package-app.mjs"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "3.1152.0",
     "@aws-sdk/dsql-signer": "^3.1126.0",
+    "@aws-sdk/lib-storage": "^3.1152.0",
+    "@aws-sdk/s3-request-presigner": "3.1152.0",
     "@aws/aurora-dsql-node-postgres-connector": "^0.1.9",
     "@kysera/infra": "^0.10.0",
     "@react-router/node": "^8",
@@ -31,7 +34,8 @@
     "pg": "^8.23.0",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "react-router": "^8"
+    "react-router": "^8",
+    "zod": "^4.6.7"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.8",
@@ -42,8 +46,8 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "kysely-ctl": "^0.21.0",
-    "oxfmt": "^0.65.0",
-    "oxlint": "^1.80.0",
+    "oxfmt": "^0.73.0",
+    "oxlint": "^1.88.0",
     "oxlint-plugin-react-doctor": "^0.9.12",
     "tailwindcss": "^4.2.2",
     "tsx": "^4.23.13",

package/template/vendor/file-bucket/{client.ts → index.client.ts}

@@ -1,11 +1,12 @@
-import type { FileBucket } from "./index.js";
-import { createMultipartUploadClient } from "./multipart.js";
-import { uploadSignedUrl } from "./transfers.js";
-import { request } from "./transport.js";
-import type { GetUrlOptions, PutOptions, PutUrlOptions } from "./types.js";
+import type { FileBucket } from "./lib/file-bucket.js";
+import { createMultipartUploadClient } from "./lib/multipart.js";
+import { request } from "./lib/transport.client.js";
+import type { GetUrlOptions, PutOptions, PutUrlOptions } from "./lib/types.js";
+import { uploadSignedUrl } from "./lib/upload-signed-url.js";
 
-export { createMultipartUploadClient } from "./multipart.js";
-export type { UploadGrant } from "./protocol.js";
+export { FileBucket } from "./lib/file-bucket.js";
+export { createMultipartUploadClient } from "./lib/multipart.js";
+export type { UploadGrant } from "./lib/protocol.js";
 export type {
   FileMultipartUploadDescriptor,
   FileMultipartUploadClient,
@@ -14,7 +15,8 @@ export type {
   GetUrlOptions,
   PutOptions,
   PutUrlOptions,
-} from "./types.js";
+} from "./lib/types.js";
+
 export type BrowserUploadBody =
   | Blob
   | string
@@ -32,7 +34,7 @@ export type BrowserUploadBody =
  * @param options - Optional settings including an `AbortSignal`.
  * @returns A promise that resolves when the deletion is completed by the server.
  */
-function deleteFile(
+export function deleteFile(
   bucket: FileBucket,
   path: string,
   options: { signal?: AbortSignal } = {}

package/template/vendor/file-bucket/{server.ts → index.server.ts}

@@ -16,9 +16,11 @@ import {
 import { Upload } from "@aws-sdk/lib-storage";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 
-import type { FileBucket } from "./index.js";
-import { createMultipartUploadClient, multipartPartSize } from "./multipart.js";
-import { uploadSignedUrl } from "./transfers.js";
+import type { FileBucket } from "./lib/file-bucket.js";
+import {
+  createMultipartUploadClient,
+  multipartPartSize,
+} from "./lib/multipart.js";
 import type {
   FileUploadBody,
   MultipartUploadOptions,
@@ -31,10 +33,11 @@ import type {
   FileInfo,
   FileDownloadClient,
   FileUploadClient,
-} from "./types.js";
+} from "./lib/types.js";
+import { uploadSignedUrl } from "./lib/upload-signed-url.js";
 
 // Re-export public types
-export { FileBucketErrors } from "./errors.js";
+export { FileBucketErrors } from "./lib/errors.server.js";
 export type {
   FileUploadBody,
   MultipartUploadOptions,
@@ -52,7 +55,9 @@ export type {
   FileUploadClient,
   FileDownloadDescriptor,
   FileUploadDescriptor,
-} from "./types.js";
+} from "./lib/types.js";
+
+export { FileBucket } from "./lib/file-bucket.js";
 
 function uploadBodySize(body: FileUploadBody): number | undefined {
   // The public body union includes strings, byte arrays, blobs, and streams.
@@ -159,7 +164,7 @@ export async function put(
   });
   options?.signal?.addEventListener("abort", abort, { once: true });
   if (options?.onProgress) {
-    upload.on("httpUploadProgress", (progress) => {
+    upload.on("httpUploadProgress", (progress: any) => {
       options.onProgress?.({
         uploadedBytes: progress.loaded ?? 0,
         totalBytes: progress.total,
@@ -270,7 +275,7 @@ export async function deleteBatch(
     if (result.Errors?.length) {
       throw new AggregateError(
         result.Errors.map(
-          (error) =>
+          (error: any) =>
             new Error(
               `Failed to delete ${error.Key}: ${error.Code} ${error.Message ?? ""}`
             )

package/template/vendor/file-bucket/{index.ts → lib/file-bucket.ts}

@@ -1,6 +1,7 @@
-/** Shared file bucket definition. Safe to import on the server and in the browser. */
+/** Shared file bucket definition for server and browser code. */
 export class FileBucket {
   readonly name: string;
+
   constructor(name: string) {
     this.name = name;
   }

package/template/vendor/file-bucket/{react-router.ts → react-router.server.ts}

@@ -1,18 +1,20 @@
-/* oxlint-disable no-await-in-loop, anti-slop/no-unknown-returns, anti-slop/no-runtime-typeof */
-import { FileBucket } from "./index.js";
-import { parseFileBucketRequest } from "./protocol.js";
-import type {
-  FileBucketRequest,
-  FileBucketResponses,
-  UploadGrant,
-} from "./protocol.js";
 import {
   getUrl,
   putUrl,
   delete as deleteFile,
   deleteBatch,
   createMultipartUploadHandle,
-} from "./server.js";
+} from "./index.server.js";
+/* oxlint-disable no-await-in-loop, anti-slop/no-unknown-returns, anti-slop/no-runtime-typeof */
+import { FileBucket } from "./lib/file-bucket.js";
+import { parseFileBucketRequest } from "./lib/protocol.js";
+import type {
+  FileBucketRequest,
+  FileBucketResponses,
+  UploadGrant,
+} from "./lib/protocol.js";
+
+export { parseFileBucketRequest };
 
 const MULTIPART_THRESHOLD = 8 * 1024 * 1024;
 export const MAX_REQUEST_BYTES = 64 * 1024;
@@ -24,11 +26,11 @@ export type {
   UploadGrant,
   SignedUrl,
   FileBucketResponses,
-} from "./protocol.js";
+} from "./lib/protocol.js";
 
 export async function readLimitedJson(
   request: Request,
-  maxBytes: number,
+  maxBytes: number
 ): Promise<unknown> {
   if (!Number.isSafeInteger(maxBytes) || maxBytes < 1) {
     throw new RangeError("maxBytes must be a positive safe integer.");
@@ -72,7 +74,7 @@ export async function readLimitedJson(
 
 async function uploadGrant(
   bucket: FileBucket,
-  input: Extract<FileBucketRequest, { operation: "put" }>,
+  input: Extract<FileBucketRequest, { operation: "put" }>
 ): Promise<UploadGrant> {
   const options = {
     contentType: input.contentType,
@@ -95,7 +97,7 @@ async function uploadGrant(
 
 export async function dispatch(
   bucket: FileBucket,
-  input: FileBucketRequest,
+  input: FileBucketRequest
 ): Promise<FileBucketResponses[FileBucketRequest["operation"]]> {
   switch (input.operation) {
     case "delete": {

package/template/vendor/kysely-dsql/dsql/dsql-kysely.ts

@@ -8,8 +8,14 @@
  * ```
  */
 
-import { Kysely, type KyselyConfig } from "kysely";
+import assert from "node:assert";
 
+import { PGlite } from "@electric-sql/pglite";
+import { Kysely, PGliteDialect, type KyselyConfig } from "kysely";
+
+import plugins from "../plugins";
+import { DSQLDialect } from "./dialect";
+import { createDSQLPool } from "./pool";
 import { DSQLSchemaModule } from "./schema-module";
 
 // eslint-disable-next-line max-classes-per-file
@@ -72,8 +78,15 @@ export class DSQLKysely<DB> extends Kysely<DB> {
    */
   // The explicit constructor documents the public configuration contract.
   // eslint-disable-next-line no-useless-constructor
-  constructor(config: KyselyConfig) {
-    super(config);
+  constructor(config?: KyselyConfig) {
+    if (config) {
+      super(config);
+    } else {
+      super({
+        dialect: dialect(),
+        plugins,
+      });
+    }
   }
 
   /**
@@ -91,3 +104,18 @@ export class DSQLKysely<DB> extends Kysely<DB> {
     return new DSQLSchemaModule(this.getExecutor());
   }
 }
+
+function dialect() {
+  if (process.env.NODE_ENV === "production") {
+    const endpoint = process.env.CLUSTER_ENDPOINT;
+    assert.ok(endpoint);
+    return new DSQLDialect({
+      pool: createDSQLPool(endpoint),
+    });
+  }
+  return new PGliteDialect({
+    pglite: new PGlite(
+      `./.pglite_${process.env.NODE_ENV === "test" ? "test" : "development"}`
+    ),
+  });
+}

package/template/vendor/kysely-dsql/generator/migration-file.ts

@@ -51,11 +51,11 @@ export interface CreateMigrationFileOptions {
  * ```
  */
 export async function createMigrationFile(
-  options: CreateMigrationFileOptions,
+  options: CreateMigrationFileOptions
 ): Promise<string> {
   if (!MIGRATION_NAME_PATTERN.test(options.name)) {
     throw new Error(
-      "Migration name must use lowercase letters, digits, and single hyphens.",
+      "Migration name must use lowercase letters, digits, and single hyphens."
     );
   }
 
@@ -63,7 +63,7 @@ export async function createMigrationFile(
   const migrationDirectory = path.resolve(options.migrationDirectory);
   const filePath = path.join(
     migrationDirectory,
-    `${timestamp}_${options.name}.ts`,
+    `${timestamp}_${options.name}.ts`
   );
 
   await mkdir(migrationDirectory, { recursive: true });

package/template/vendor/kysely-dsql/plugins/index.ts

@@ -1,10 +1,8 @@
 import { CamelCasePlugin } from "kysely";
 
 import { AutoUpdatedAtPlugin } from "./auto-updated-at.plugin";
-import { SoftDelete } from "./soft-delete.plugin";
 
 export default [
   new CamelCasePlugin(),
-  new SoftDelete({ ignoredTables: [] }),
   new AutoUpdatedAtPlugin({ ignoredTables: [] }),
 ];

package/template/vendor/package-app/package-app.mjs

@@ -19,12 +19,12 @@ function getPackageName(cwd) {
   if (existsSync(packageJsonPath)) {
     try {
       const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-      // oxlint-disable-next-line anti-slop/no-runtime-typeof
+      // oxlint-disable-next-line anti-slop/no-runtime-typeof -- Use the package name only when it is a nonempty string.
       if (typeof pkg.name === "string" && pkg.name.trim()) {
         return pkg.name.trim().replace(/^@/u, "").replaceAll("/", "-");
       }
     } catch {
-      // Ignore parse errors and use fallback
+      return "app";
     }
   }
   return "app";

package/template/vite.config.ts

@@ -2,8 +2,10 @@ import { reactRouter } from "@react-router/dev/vite";
 import tailwindcss from "@tailwindcss/vite";
 import { defineConfig } from "vite";
 
+import { s3Emulator } from "./vendor/file-bucket/vite.js";
+
 export default defineConfig({
-  plugins: [tailwindcss(), reactRouter()],
+  plugins: [tailwindcss(), reactRouter(), s3Emulator()],
   resolve: {
     tsconfigPaths: true,
   },

package/template/vitest.config.ts

@@ -6,7 +6,7 @@ export default defineConfig({
   resolve: {
     alias: {
       "virtual:db-migrations": fileURLToPath(
-        new URL("test/fixtures/virtual-db-migrations.ts", import.meta.url),
+        new URL("test/fixtures/virtual-db-migrations.ts", import.meta.url)
       ),
     },
   },

package/template/.agents/skills/monolayer-application-permissions/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "Monolayer Application Permissions"
-  short_description: "Use shared application roles in React Router"
-  default_prompt: "Use $monolayer-application-permissions to apply shared read and write permissions with the existing user middleware."

package/template/vendor/kysely-dsql/plugins/soft-delete.plugin.ts

@@ -1,217 +0,0 @@
-// oxlint-disable max-classes-per-file
-// source: https://github.com/LouisJULIEN/kysely-plugins/blob/main/src/soft-delete/soft-delete.plugin.ts
-import type {
-  KyselyPlugin,
-  OperationNode,
-  PluginTransformQueryArgs,
-  PluginTransformResultArgs,
-  QueryResult,
-  RootOperationNode,
-  SelectQueryNode,
-  UnknownRow,
-  UpdateQueryNode,
-} from "kysely";
-import {
-  AliasNode,
-  BinaryOperationNode,
-  ColumnNode,
-  IdentifierNode,
-  JoinNode,
-  OperationNodeTransformer,
-  OperatorNode,
-  RawNode,
-  ReferenceNode,
-  TableNode,
-  WhereNode,
-} from "kysely";
-
-// credits: https://github.com/kysely-org/kysely/issues/803
-
-export class SoftDeleteError extends Error {
-  readonly node?: OperationNode | undefined;
-
-  constructor(
-    message: string,
-    node?: OperationNode | undefined
-    // oxlint-disable-next-line unicorn/custom-error-definition
-  ) {
-    super(message);
-    this.node = node;
-  }
-}
-class SoftDeleteQueryTransformer extends OperationNodeTransformer {
-  private deletedAtColumnName: string;
-  private ignoredTables: string[];
-
-  constructor({
-    deletedAtColumnName,
-    ignoredTables,
-  }: {
-    deletedAtColumnName?: string;
-    ignoredTables?: string[];
-  } = {}) {
-    super();
-    this.deletedAtColumnName = deletedAtColumnName || "deleted_at";
-    this.ignoredTables = ignoredTables || [];
-  }
-
-  protected override transformSelectQuery(
-    originalNode: SelectQueryNode
-  ): SelectQueryNode {
-    const node = super.transformSelectQuery(originalNode);
-    return this.addDeletedAtCondition(node);
-  }
-
-  protected override transformUpdateQuery(
-    originalNode: UpdateQueryNode
-  ): UpdateQueryNode {
-    const node = super.transformUpdateQuery(originalNode);
-    return this.addDeletedAtCondition(node);
-  }
-
-  private appendFromFilters(
-    where: WhereNode | undefined,
-    node: SelectQueryNode | UpdateQueryNode
-  ): WhereNode | undefined {
-    let currentWhere = where;
-    if (node.from) {
-      for (const from of node.from.froms) {
-        const deletedAtReference = this.getDeletedAtReference(from);
-        if (deletedAtReference) {
-          currentWhere = this.addIsNotDeletedFilter(
-            currentWhere,
-            deletedAtReference
-          );
-        }
-      }
-    }
-    return currentWhere;
-  }
-
-  private appendJoinFilters(
-    where: WhereNode | undefined,
-    node: SelectQueryNode | UpdateQueryNode
-  ): WhereNode | undefined {
-    let currentWhere = where;
-    if (node.joins) {
-      for (const join of node.joins) {
-        const deletedAtReference = this.getDeletedAtReference(join);
-        if (deletedAtReference) {
-          currentWhere = this.addIsNotDeletedFilter(
-            currentWhere,
-            deletedAtReference
-          );
-        }
-      }
-    }
-    return currentWhere;
-  }
-
-  private addDeletedAtCondition<T extends SelectQueryNode | UpdateQueryNode>(
-    node: T
-  ): T {
-    let where = this.appendFromFilters(node.where, node);
-    where = this.appendJoinFilters(where, node);
-    return {
-      ...node,
-      where,
-    };
-  }
-
-  private getJoinReference(node: JoinNode): ReferenceNode | null {
-    if (node.table === null) {
-      throw new SoftDeleteError("Join without a table");
-    }
-    return this.getDeletedAtReference(node.table);
-  }
-
-  private getAliasReference(
-    node: AliasNode,
-    deletedAtColumn: ColumnNode
-  ): ReferenceNode | null {
-    if (!IdentifierNode.is(node.alias)) {
-      throw new SoftDeleteError("Alias without identifier", node.alias);
-    }
-
-    const tableAlias = node.alias.name;
-    if (!this.tableShouldHaveDeletedAt(tableAlias)) {
-      return null;
-    }
-    return ReferenceNode.create(deletedAtColumn, TableNode.create(tableAlias));
-  }
-
-  private getTableReference(
-    node: TableNode,
-    deletedAtColumn: ColumnNode
-  ): ReferenceNode | null {
-    const tableName = node.table.identifier.name;
-    if (!this.tableShouldHaveDeletedAt(tableName)) {
-      return null;
-    }
-    return ReferenceNode.create(deletedAtColumn, node);
-  }
-
-  private getDeletedAtReference(node: OperationNode): ReferenceNode | null {
-    if (JoinNode.is(node)) {
-      return this.getJoinReference(node);
-    }
-
-    const deletedAtColumn = ColumnNode.create(this.deletedAtColumnName);
-    if (TableNode.is(node)) {
-      return this.getTableReference(node, deletedAtColumn);
-    }
-    if (AliasNode.is(node)) {
-      return this.getAliasReference(node, deletedAtColumn);
-    }
-
-    throw new SoftDeleteError(
-      `Getting a reference to ${this.deletedAtColumnName} column for ${node.kind} is not supported yet.`,
-      node
-    );
-  }
-
-  // oxlint-disable-next-line class-methods-use-this
-  private addIsNotDeletedFilter(
-    node: WhereNode | undefined,
-    deletedAtReference: ReferenceNode
-  ): WhereNode {
-    const filterOperation = BinaryOperationNode.create(
-      deletedAtReference,
-      OperatorNode.create("is"),
-      RawNode.createWithSql("null")
-    );
-    if (node === null || node === undefined) {
-      return WhereNode.create(filterOperation);
-    }
-
-    return WhereNode.cloneWithOperation(node, "And", filterOperation);
-  }
-
-  private tableShouldHaveDeletedAt(tableName: string): boolean {
-    return (
-      !tableName.startsWith("kysely_") &&
-      !this.ignoredTables.includes(tableName)
-    );
-  }
-}
-
-export class SoftDelete implements KyselyPlugin {
-  private transformer: SoftDeleteQueryTransformer;
-
-  constructor(
-    ...args: ConstructorParameters<typeof SoftDeleteQueryTransformer>
-  ) {
-    this.transformer = new SoftDeleteQueryTransformer(...args);
-  }
-
-  transformQuery({ node }: PluginTransformQueryArgs): RootOperationNode {
-    return this.transformer.transformNode(node);
-  }
-
-  // oxlint-disable-next-line class-methods-use-this
-  transformResult({
-    result,
-  }: PluginTransformResultArgs): Promise<QueryResult<UnknownRow>> {
-    return Promise.resolve(result);
-  }
-}