create-monolayer-app 0.5.1 → 0.6.3

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";
@@ -64,7 +64,13 @@ export function packageApp(options = {}) {
   const gitignoreFile = options.gitignorePath ?? DEFAULT_GITIGNORE;
   const excludes = options.excludes ?? DEFAULT_EXCLUDES;
 
-  const tarArgs = ["-czf", relativePath];
+  const tarArgs = [
+    "-czf",
+    relativePath,
+    "--exclude=._*",
+    "--exclude=__MACOSX",
+    "--exclude=.DS_Store",
+  ];
 
   const fullGitignorePath = path.resolve(cwd, gitignoreFile);
   if (existsSync(fullGitignorePath)) {
@@ -79,6 +85,7 @@ export function packageApp(options = {}) {
 
   const result = spawnSync("tar", tarArgs, {
     cwd,
+    env: { ...process.env, COPYFILE_DISABLE: "1" },
     stdio: "inherit",
   });
 

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

@@ -0,0 +1,167 @@
+import { execFileSync, spawnSync } from "node:child_process";
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readdirSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import { packageApp } from "./package-app.mjs";
+
+const migrationPath = "lib/db/migrations/1792314123321_add-tasks.ts";
+const migration =
+  "export async function up(db) { await db.schema.createTable('tasks').execute(); }";
+const metadata = Buffer.from([0, 5, 22, 7, 0, 2, 0, 0]);
+const packager = fileURLToPath(new URL("package-app.mjs", import.meta.url));
+
+const writeFiles = (root, files) => {
+  for (const [name, content] of Object.entries(files)) {
+    const destination = path.join(root, name);
+    mkdirSync(path.dirname(destination), { recursive: true });
+    writeFileSync(destination, content);
+  }
+};
+
+const archivePaths = (archive) => {
+  const args = ["-tzf", archive];
+  if (process.platform === "darwin") {
+    // macOS tar otherwise hides AppleDouble entries during archive inspection.
+    args.unshift("--options=!mac-ext");
+  }
+  return execFileSync("tar", args, { encoding: "utf-8" }).trim().split("\n");
+};
+
+const metadataPaths = (paths) =>
+  paths.filter((name) =>
+    name
+      .split("/")
+      .some(
+        (part) =>
+          part.startsWith("._") || part === "__MACOSX" || part === ".DS_Store"
+      )
+  );
+
+describe("application source packaging", () => {
+  let fixture;
+  let application;
+
+  beforeEach(() => {
+    fixture = mkdtempSync(path.join(tmpdir(), "application-packager-"));
+    application = path.join(fixture, "app");
+    writeFiles(application, {
+      "package.json": '{"name":"packaging-fixture"}',
+      ".gitignore": "ignored.txt\n",
+      "ignored.txt": "ignored by Git",
+      "private.txt": "excluded by the caller",
+      ".config/kysely.config.ts": "export default {};",
+      [migrationPath]: migration,
+      "lib/db/migrations/._1792314123321_add-tasks.ts": metadata,
+      "._package.json": metadata,
+      ".DS_Store": metadata,
+      "lib/.DS_Store": metadata,
+      "__MACOSX/._package.json": metadata,
+      "lib/__MACOSX/metadata": metadata,
+    });
+  });
+
+  afterEach(() => {
+    rmSync(fixture, { force: true, recursive: true });
+  });
+
+  it.each([
+    ["default exclusions", {}],
+    ["custom exclusions", { excludes: ["build", "private.txt"] }],
+  ])(
+    "excludes metadata with %s and preserves migration source",
+    (_name, options) => {
+      const archive = packageApp({ ...options, cwd: application });
+      const paths = archivePaths(archive.absolutePath);
+
+      expect(metadataPaths(paths)).toStrictEqual([]);
+      expect(paths).toContain(`./${migrationPath}`);
+      expect(paths).toContain("./.config/kysely.config.ts");
+      expect(paths).not.toContain("./ignored.txt");
+      expect(
+        execFileSync(
+          "tar",
+          ["-xOf", archive.absolutePath, `./${migrationPath}`],
+          {
+            encoding: "utf-8",
+          }
+        )
+      ).toBe(migration);
+    }
+  );
+
+  it("preserves caller exclusions without deleting source metadata", () => {
+    const archive = packageApp({
+      cwd: application,
+      excludes: ["build", "private.txt"],
+    });
+
+    expect(archivePaths(archive.absolutePath)).not.toContain("./private.txt");
+    expect(
+      existsSync(
+        path.join(application, "lib/db/migrations/._1792314123321_add-tasks.ts")
+      )
+    ).toBe(true);
+  });
+
+  it.runIf(process.platform === "darwin")(
+    "does not generate metadata from macOS extended attributes",
+    () => {
+      const source = path.join(fixture, "attributes");
+      writeFiles(source, { [migrationPath]: migration });
+      execFileSync("xattr", [
+        "-w",
+        "com.monolayer.packaging-test",
+        "fixture",
+        path.join(source, migrationPath),
+      ]);
+      const control = path.join(fixture, "control.tar.gz");
+      execFileSync("env", [
+        "-u",
+        "COPYFILE_DISABLE",
+        "tar",
+        "-czf",
+        control,
+        "-C",
+        source,
+        ".",
+      ]);
+
+      const archive = packageApp({ cwd: source });
+
+      expect(metadataPaths(archivePaths(control))).toContain(
+        "./lib/db/migrations/._1792314123321_add-tasks.ts"
+      );
+      expect(metadataPaths(archivePaths(archive.absolutePath))).toStrictEqual(
+        []
+      );
+      expect(archivePaths(archive.absolutePath)).toContain(
+        `./${migrationPath}`
+      );
+    }
+  );
+
+  it("creates a clean archive through the package-app command", () => {
+    const result = spawnSync(process.execPath, [packager], {
+      cwd: application,
+      encoding: "utf-8",
+    });
+    const [name] = readdirSync(path.join(application, "build"));
+
+    expect(result.status).toBe(0);
+    expect(result.stdout).toContain("Successfully packaged application");
+    expect(
+      metadataPaths(archivePaths(path.join(application, "build", name)))
+    ).toStrictEqual([]);
+  });
+});

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,13 +6,18 @@ 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)
       ),
     },
   },
   test: {
     environment: "node",
-    include: ["src/**/*.test.ts", "lib/**/*.test.ts", "app/**/*.test.ts"],
+    include: [
+      "src/**/*.test.ts",
+      "lib/**/*.test.ts",
+      "app/**/*.test.ts",
+      "vendor/package-app/**/*.test.mjs",
+    ],
     coverage: {
       provider: "v8",
       reporter: ["text", "json", "html"],

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."