@getstrata/core 1.0.1 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @getstrata/core changelog
 
+## 1.0.3
+
+- `eta` and `mysql2` are optional peers, loaded with `import()` on first use. SQLite and Postgres apps no longer install `mysql2` through core. If a package is missing, the error names `bun add` for that package.
+- Breaking: `createMysqlPool(url)` returns a `Promise` because it lazy-loads `mysql2`. It shipped synchronous in 1.0.1 and 1.0.2; `await` it. `createMysqlConnection(url)` stays synchronous and opens the pool on the first query.
+- `createMysqlConnection()` shares one pool across concurrent first queries by caching the pending promise. Before this fix, three requests arriving together opened three pools and `close()` ended only the last one. A failed load is retried on the next query, and a query after `close()` opens a fresh pool.
+- The MySQL helpers stay exported from `@getstrata/core` and `@getstrata/core/database`. Importing either barrel does not install `mysql2`; the barrel bundle carries the lazy `import("mysql2/promise")` and evaluates it only when a MySQL pool is opened.
+
+## 1.0.2
+
+- Lockstep with `create-strata` 1.0.2. No runtime changes.
+
 ## 1.0.1
 
 - Publish the `contracts/authUserDirectory` subpath. Generated cookie and token apps import `AuthUserDirectory` from it, and without the export their `tsc --noEmit` failed with TS2307.

package/README.md

@@ -39,7 +39,7 @@ The engine is your choice, and an app should have one primary engine. Postgres a
 
 Full-text `tsMatch` is PostgreSQL only.
 
-`mysql2` and `eta` are direct dependencies, so they install even for a SQLite JSON API app.
+`eta` and `mysql2` are optional peers. Core loads them with `import()` the first time you render a view or open a MySQL connection. SQLite and Postgres apps do not install `mysql2`. Generated apps add `eta` because the welcome page uses it. MySQL apps also add `mysql2`. The MySQL helpers are exported from `@getstrata/core/database/mysqlConnection`, `@getstrata/core/database`, and the root barrel; importing any of them does not install `mysql2`, and apps should prefer the subpath as with every other core module.
 
 ## Views
 

package/dist/core/database/index.d.ts

@@ -10,7 +10,8 @@ export { Factory } from "./factory.ts";
 export { foreignKeyFromTable, pivotTableName, singularize } from "./inflection.ts";
 export type { CastType, GlobalScopeFn, ModelConstructor } from "./model.ts";
 export { applyCasts, BelongsToManyRelationQuery, BelongsToRelationQuery, dehydrateValue, filterMassAssignable, HasManyRelationQuery, HasManyThroughRelationQuery, HasOneRelationQuery, hydrateValue, Model, ModelQuery, MorphManyRelationQuery, MorphOneRelationQuery, MorphToRelationQuery, registerModelClass, registerModelRepository, } from "./model.ts";
-export { createMysqlConnection, createMysqlConnectionFromPool } from "./mysqlConnection.ts";
+export type { MysqlConnection, MysqlExecutable, MysqlPool } from "./mysqlConnection.ts";
+export { createMysqlConnection, createMysqlConnectionFromPool, createMysqlPool, } from "./mysqlConnection.ts";
 export type { NamedConnectionEntry } from "./namedConnections.ts";
 export { getNamedConnection, hasNamedConnection, registerNamedConnection, resetNamedConnections, runOnNamedConnection, unregisterNamedConnection, } from "./namedConnections.ts";
 export { buildAdvancedWhereClause, buildCountQuery, buildDeleteByIdQuery, buildGroupedCountQuery, buildInsertQuery, buildJoinClause, buildOrderByClause, buildProjectionQuery, buildQueryWhereClause, buildRestoreByIdQuery, buildSelectQuery, buildSoftDeleteByIdQuery, buildUpdateQuery, buildWhereClause, parseQualifiedColumn, qualifyColumn, quoteIdentifier, resolveQualifiedColumn, resolveSoftDeleteColumn, } from "./query.ts";

package/dist/core/database/mysqlConnection.d.ts

@@ -1,14 +1,18 @@
-import mysql from "mysql2/promise";
 import type { ActiveDatabaseHandle } from "./connectionContext.ts";
 type MysqlExecutable = {
     execute: (sql: string, params?: unknown[]) => Promise<[unknown, unknown]>;
     end?: () => Promise<void>;
 };
+type MysqlPool = MysqlExecutable & {
+    end(): Promise<void>;
+    on(event: "connection", listener: (connection: unknown) => void): void;
+};
 type MysqlConnection = ActiveDatabaseHandle & {
     close(): Promise<void>;
 };
+declare function resetMysqlLoaderForTests(importer?: () => Promise<unknown>): void;
 declare function createMysqlConnectionFromPool(pool: MysqlExecutable): MysqlConnection;
-declare function createMysqlPool(url: string): mysql.Pool;
+declare function createMysqlPool(url: string): Promise<MysqlPool>;
 declare function createMysqlConnection(url: string): MysqlConnection;
-export type { MysqlConnection, MysqlExecutable };
-export { createMysqlConnection, createMysqlConnectionFromPool, createMysqlPool };
+export type { MysqlConnection, MysqlExecutable, MysqlPool };
+export { createMysqlConnection, createMysqlConnectionFromPool, createMysqlPool, resetMysqlLoaderForTests, };

package/dist/core/runtime/optionalPeer.d.ts

@@ -0,0 +1,2 @@
+declare function missingOptionalPeer(packageName: string, reason: string, error: unknown): Error;
+export { missingOptionalPeer };

package/dist/core/view/etaViewEngine.d.ts

@@ -11,9 +11,13 @@ type LayoutDataResolver = (request?: Request) => Promise<Record<string, unknown>
  * Pug class/attribute shorthand is rejected at render time.
  */
 declare class EtaViewEngine implements ViewEngine {
-    private readonly eta;
+    private eta;
+    private etaPending;
+    private readonly viewsDirectory;
     private readonly resolveLayoutData?;
     constructor(viewsDirectory?: string, resolveLayoutData?: LayoutDataResolver);
+    private getEta;
+    private createEta;
     render(name: string, data?: Record<string, unknown>, options?: RenderOptions): Promise<string>;
 }
 export type { LayoutDataResolver, RenderOptions };

package/dist/entries/database/mysqlConnection.js

@@ -1,6 +1,58 @@
 // @bun
+// ../../src/core/runtime/optionalPeer.ts
+function missingOptionalPeer(packageName, reason, error) {
+  return new Error(`Install ${packageName} ${reason} (\`bun add ${packageName}\`).`, {
+    cause: error
+  });
+}
+
 // ../../src/core/database/mysqlConnection.ts
-import mysql from "mysql2/promise";
+var MYSQL_SESSION_UTC = "SET time_zone = '+00:00'";
+var mysqlModule;
+var mysqlPending;
+var importMysql = defaultImportMysql;
+async function defaultImportMysql() {
+  return import("mysql2/promise");
+}
+function resetMysqlLoaderForTests(importer) {
+  mysqlModule = undefined;
+  mysqlPending = undefined;
+  importMysql = importer ? async () => await importer() : defaultImportMysql;
+}
+function mysqlApi(mod) {
+  if (typeof mod.createPool === "function") {
+    return mod;
+  }
+  const withDefault = mod;
+  if (typeof withDefault.default?.createPool === "function") {
+    return withDefault.default;
+  }
+  throw new Error("mysql2/promise did not export createPool.");
+}
+async function loadMysql() {
+  if (mysqlModule) {
+    return mysqlModule;
+  }
+  if (!mysqlPending) {
+    mysqlPending = (async () => {
+      let mod;
+      try {
+        mod = await importMysql();
+      } catch (error) {
+        mysqlPending = undefined;
+        throw missingOptionalPeer("mysql2", "to open a MySQL connection", error);
+      }
+      try {
+        mysqlModule = mysqlApi(mod);
+        return mysqlModule;
+      } catch (error) {
+        mysqlPending = undefined;
+        throw error;
+      }
+    })();
+  }
+  return mysqlPending;
+}
 function rowsFromResult(result) {
   if (Array.isArray(result)) {
     return result;
@@ -23,7 +75,6 @@ function createMysqlConnectionFromPool(pool) {
     }
   };
 }
-var MYSQL_SESSION_UTC = "SET time_zone = '+00:00'";
 function pinSessionToUtc(connection) {
   connection.query(MYSQL_SESSION_UTC, (error) => {
     if (error) {
@@ -31,21 +82,51 @@ function pinSessionToUtc(connection) {
     }
   });
 }
-function createMysqlPool(url) {
+function createPoolFromModule(mysql, url) {
   const pool = mysql.createPool({ uri: url, timezone: "Z" });
   pool.on("connection", (connection) => {
     pinSessionToUtc(connection);
   });
   return pool;
 }
+async function createMysqlPool(url) {
+  return createPoolFromModule(await loadMysql(), url);
+}
 function createMysqlConnection(url) {
   if (!url.trim()) {
     throw new Error("MYSQL_URL is not configured. Set url before creating a MySQL pool.");
   }
-  return createMysqlConnectionFromPool(createMysqlPool(url));
+  let poolPending;
+  function ensurePool() {
+    if (!poolPending) {
+      poolPending = createMysqlPool(url).catch((error) => {
+        poolPending = undefined;
+        throw error;
+      });
+    }
+    return poolPending;
+  }
+  return {
+    async unsafe(query, params = []) {
+      const [result] = await (await ensurePool()).execute(query, [...params]);
+      return rowsFromResult(result);
+    },
+    async close() {
+      if (!poolPending) {
+        return;
+      }
+      const pending = poolPending;
+      poolPending = undefined;
+      const pool = await pending.catch(() => {
+        return;
+      });
+      await pool?.end();
+    }
+  };
 }
 export {
   createMysqlConnection,
   createMysqlConnectionFromPool,
-  createMysqlPool
+  createMysqlPool,
+  resetMysqlLoaderForTests
 };

package/dist/entries/view.js

@@ -2,7 +2,13 @@
 // ../../src/core/view/etaViewEngine.ts
 import { join, relative } from "path";
 import { currentRequestMeta } from "@getstrata/core/http/requestMetaContext";
-import { Eta } from "eta";
+
+// ../../src/core/runtime/optionalPeer.ts
+function missingOptionalPeer(packageName, reason, error) {
+  return new Error(`Install ${packageName} ${reason} (\`bun add ${packageName}\`).`, {
+    cause: error
+  });
+}
 
 // ../../src/core/view/assertEtaHtmlSource.ts
 var HTML_TAGS = new Set([
@@ -182,33 +188,57 @@ var DEFAULT_VIEWS_DIRECTORY = join(process.cwd(), "resources/views");
 var DEFAULT_LAYOUT = "layouts/app.eta";
 
 class EtaViewEngine {
-  eta;
+  eta = null;
+  etaPending = null;
+  viewsDirectory;
   resolveLayoutData;
   constructor(viewsDirectory = DEFAULT_VIEWS_DIRECTORY, resolveLayoutData) {
-    this.eta = new Eta({
-      views: viewsDirectory,
-      autoTrim: false
-    });
+    this.viewsDirectory = viewsDirectory;
     this.resolveLayoutData = resolveLayoutData;
-    const readFile = this.eta.readFile?.bind(this.eta);
-    this.eta.readFile = (path) => {
+  }
+  async getEta() {
+    if (this.eta) {
+      return this.eta;
+    }
+    if (!this.etaPending) {
+      this.etaPending = this.createEta();
+    }
+    return this.etaPending;
+  }
+  async createEta() {
+    let eta;
+    try {
+      const mod = await import("eta");
+      eta = new mod.Eta({
+        views: this.viewsDirectory,
+        autoTrim: false
+      });
+    } catch (error) {
+      this.etaPending = null;
+      throw missingOptionalPeer("eta", "to render HTML views", error);
+    }
+    const readFile = eta.readFile?.bind(eta);
+    eta.readFile = (path) => {
       const source = readFile ? readFile(path) : "";
-      assertEtaHtmlSource(relative(viewsDirectory, path) || path, source);
+      assertEtaHtmlSource(relative(this.viewsDirectory, path) || path, source);
       return source;
     };
+    this.eta = eta;
+    return eta;
   }
   async render(name, data = {}, options = {}) {
     const template = name.endsWith(".eta") ? name : `${name}.eta`;
     const request = options.request ?? currentRequestMeta().request;
     const layoutData = this.resolveLayoutData ? await this.resolveLayoutData(request) : {};
     const mergedData = { ...layoutData, ...data };
-    const body = await this.eta.renderAsync(template, mergedData);
+    const eta = await this.getEta();
+    const body = await eta.renderAsync(template, mergedData);
     const layout = options.layout ?? DEFAULT_LAYOUT;
     if (layout === false) {
       return body;
     }
     const layoutTemplate = layout.endsWith(".eta") ? layout : `${layout}.eta`;
-    return await this.eta.renderAsync(layoutTemplate, {
+    return await eta.renderAsync(layoutTemplate, {
       ...mergedData,
       body
     });

package/dist/framework/public-api.d.ts

@@ -43,6 +43,7 @@ export { freshDatabase, getMigrationStatus, loadMigrationsFromDirectory, migrate
 export type { Migration, MigrationDatabase, MigrationStatus, } from "../core/database/migrations/types.ts";
 export type { CastType, GlobalScopeFn, ModelConstructor } from "../core/database/model.ts";
 export { applyCasts, BelongsToManyRelationQuery, BelongsToRelationQuery, dehydrateValue, filterMassAssignable, HasManyRelationQuery, HasOneRelationQuery, hydrateValue, Model, ModelQuery, MorphManyRelationQuery, MorphOneRelationQuery, MorphToRelationQuery, registerModelClass, registerModelRepository, } from "../core/database/model.ts";
+export type { MysqlConnection, MysqlExecutable, MysqlPool, } from "../core/database/mysqlConnection.ts";
 export { createMysqlConnection, createMysqlConnectionFromPool, createMysqlPool, } from "../core/database/mysqlConnection.ts";
 export { getNamedConnection, hasNamedConnection, registerNamedConnection, resetNamedConnections, runOnNamedConnection, unregisterNamedConnection, } from "../core/database/namedConnections.ts";
 export { createDatabaseQueryProxy } from "../core/database/queryProxy.ts";

package/dist/index.js

@@ -5211,8 +5211,55 @@ function registerModelRepository(model, repository) {
   ensureBooted(model);
   return model;
 }
+// ../../src/core/runtime/optionalPeer.ts
+function missingOptionalPeer(packageName, reason, error) {
+  return new Error(`Install ${packageName} ${reason} (\`bun add ${packageName}\`).`, {
+    cause: error
+  });
+}
+
 // ../../src/core/database/mysqlConnection.ts
-import mysql from "mysql2/promise";
+var MYSQL_SESSION_UTC = "SET time_zone = '+00:00'";
+var mysqlModule;
+var mysqlPending;
+var importMysql = defaultImportMysql;
+async function defaultImportMysql() {
+  return import("mysql2/promise");
+}
+function mysqlApi(mod) {
+  if (typeof mod.createPool === "function") {
+    return mod;
+  }
+  const withDefault = mod;
+  if (typeof withDefault.default?.createPool === "function") {
+    return withDefault.default;
+  }
+  throw new Error("mysql2/promise did not export createPool.");
+}
+async function loadMysql() {
+  if (mysqlModule) {
+    return mysqlModule;
+  }
+  if (!mysqlPending) {
+    mysqlPending = (async () => {
+      let mod;
+      try {
+        mod = await importMysql();
+      } catch (error) {
+        mysqlPending = undefined;
+        throw missingOptionalPeer("mysql2", "to open a MySQL connection", error);
+      }
+      try {
+        mysqlModule = mysqlApi(mod);
+        return mysqlModule;
+      } catch (error) {
+        mysqlPending = undefined;
+        throw error;
+      }
+    })();
+  }
+  return mysqlPending;
+}
 function rowsFromResult(result) {
   if (Array.isArray(result)) {
     return result;
@@ -5235,7 +5282,6 @@ function createMysqlConnectionFromPool(pool) {
     }
   };
 }
-var MYSQL_SESSION_UTC = "SET time_zone = '+00:00'";
 function pinSessionToUtc(connection) {
   connection.query(MYSQL_SESSION_UTC, (error) => {
     if (error) {
@@ -5243,18 +5289,47 @@ function pinSessionToUtc(connection) {
     }
   });
 }
-function createMysqlPool(url) {
+function createPoolFromModule(mysql, url) {
   const pool = mysql.createPool({ uri: url, timezone: "Z" });
   pool.on("connection", (connection) => {
     pinSessionToUtc(connection);
   });
   return pool;
 }
+async function createMysqlPool(url) {
+  return createPoolFromModule(await loadMysql(), url);
+}
 function createMysqlConnection(url) {
   if (!url.trim()) {
     throw new Error("MYSQL_URL is not configured. Set url before creating a MySQL pool.");
   }
-  return createMysqlConnectionFromPool(createMysqlPool(url));
+  let poolPending;
+  function ensurePool() {
+    if (!poolPending) {
+      poolPending = createMysqlPool(url).catch((error) => {
+        poolPending = undefined;
+        throw error;
+      });
+    }
+    return poolPending;
+  }
+  return {
+    async unsafe(query, params = []) {
+      const [result] = await (await ensurePool()).execute(query, [...params]);
+      return rowsFromResult(result);
+    },
+    async close() {
+      if (!poolPending) {
+        return;
+      }
+      const pending = poolPending;
+      poolPending = undefined;
+      const pool = await pending.catch(() => {
+        return;
+      });
+      await pool?.end();
+    }
+  };
 }
 // ../../src/core/database/namedConnections.ts
 var REGISTRY_KEY = Symbol.for("@getstrata/namedConnections");
@@ -9229,7 +9304,6 @@ function validateObject(payload, schema) {
 }
 // ../../src/core/view/etaViewEngine.ts
 import { join as join4, relative } from "path";
-import { Eta } from "eta";
 
 // ../../src/core/view/assertEtaHtmlSource.ts
 var HTML_TAGS = new Set([
@@ -9409,33 +9483,57 @@ var DEFAULT_VIEWS_DIRECTORY = join4(process.cwd(), "resources/views");
 var DEFAULT_LAYOUT = "layouts/app.eta";
 
 class EtaViewEngine {
-  eta;
+  eta = null;
+  etaPending = null;
+  viewsDirectory;
   resolveLayoutData;
   constructor(viewsDirectory = DEFAULT_VIEWS_DIRECTORY, resolveLayoutData) {
-    this.eta = new Eta({
-      views: viewsDirectory,
-      autoTrim: false
-    });
+    this.viewsDirectory = viewsDirectory;
     this.resolveLayoutData = resolveLayoutData;
-    const readFile = this.eta.readFile?.bind(this.eta);
-    this.eta.readFile = (path) => {
+  }
+  async getEta() {
+    if (this.eta) {
+      return this.eta;
+    }
+    if (!this.etaPending) {
+      this.etaPending = this.createEta();
+    }
+    return this.etaPending;
+  }
+  async createEta() {
+    let eta;
+    try {
+      const mod = await import("eta");
+      eta = new mod.Eta({
+        views: this.viewsDirectory,
+        autoTrim: false
+      });
+    } catch (error) {
+      this.etaPending = null;
+      throw missingOptionalPeer("eta", "to render HTML views", error);
+    }
+    const readFile = eta.readFile?.bind(eta);
+    eta.readFile = (path) => {
       const source = readFile ? readFile(path) : "";
-      assertEtaHtmlSource(relative(viewsDirectory, path) || path, source);
+      assertEtaHtmlSource(relative(this.viewsDirectory, path) || path, source);
       return source;
     };
+    this.eta = eta;
+    return eta;
   }
   async render(name, data = {}, options = {}) {
     const template = name.endsWith(".eta") ? name : `${name}.eta`;
     const request = options.request ?? currentRequestMeta().request;
     const layoutData = this.resolveLayoutData ? await this.resolveLayoutData(request) : {};
     const mergedData = { ...layoutData, ...data };
-    const body = await this.eta.renderAsync(template, mergedData);
+    const eta = await this.getEta();
+    const body = await eta.renderAsync(template, mergedData);
     const layout = options.layout ?? DEFAULT_LAYOUT;
     if (layout === false) {
       return body;
     }
     const layoutTemplate = layout.endsWith(".eta") ? layout : `${layout}.eta`;
-    return await this.eta.renderAsync(layoutTemplate, {
+    return await eta.renderAsync(layoutTemplate, {
       ...mergedData,
       body
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/core",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Strata Bun framework public API",
   "type": "module",
   "license": "MIT",
@@ -904,13 +904,19 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "eta": "^4.6.0",
-    "mysql2": "^3.24.3"
-  },
   "peerDependencies": {
+    "eta": "^4.6.0",
+    "mysql2": "^3.24.3",
     "typescript": "^5.9.0"
   },
+  "peerDependenciesMeta": {
+    "eta": {
+      "optional": true
+    },
+    "mysql2": {
+      "optional": true
+    }
+  },
   "engines": {
     "bun": ">=1.4.0"
   }