@getstrata/starter 1.0.8 → 1.0.9

package/dist/cli.js

@@ -1702,11 +1702,13 @@ function renderSiteModule(_layers) {
 import { withErrorHandling } from "@getstrata/core/http/response";
 import { getSql, pingDatabase } from "../../bootstrap/database.ts";
 import { plainText, renderPage } from "../../lib/view.ts";
+import { Note } from "../../models/Note.ts";
 
 // Proves the database answers and the schema is migrated. Point it at a table your app owns.
 async function schemaReady(): Promise<boolean> {
   try {
-    await getSql().unsafe("SELECT 1 FROM notes LIMIT 1");
+    getSql();
+    await Note.query().value("id");
     return true;
   } catch {
     return false;
@@ -2529,9 +2531,9 @@ function renderPackageJson(projectName, options = {}) {
     "@getstrata/cli": "workspace:*",
     "@getstrata/core": "workspace:*"
   } : {
-    "@getstrata/bootstrap": "^1.0.8",
-    "@getstrata/cli": "^1.0.8",
-    "@getstrata/core": "^1.0.8"
+    "@getstrata/bootstrap": "^1.0.9",
+    "@getstrata/cli": "^1.0.9",
+    "@getstrata/core": "^1.0.9"
   };
   coreDeps.eta = "^4.6.0";
   if (options.layers?.database === "mysql") {
@@ -2666,7 +2668,7 @@ Create a module under \`src/modules/\` and return a route map. Modules are disco
 // src/modules/notes/index.ts
 import type { AppModule } from "@getstrata/bootstrap/contracts";
 import { jsonResponse } from "@getstrata/core/http/response";
-import { getSql } from "../../bootstrap/database.ts";
+import { Note } from "../../models/Note.ts";
 
 const notesModule: AppModule = {
   name: "notes",
@@ -2674,10 +2676,8 @@ const notesModule: AppModule = {
   routes({ kernel }) {
     return {
       "/api/v1/notes": kernel.wrap("api", async () => {
-        const rows = await getSql().unsafe<{ id: number; body: string }>(
-          "SELECT id, body FROM notes ORDER BY id DESC",
-        );
-        return jsonResponse({ data: rows });
+        const bodiesById = await Note.query().orderBy({ id: "desc" }).pluck("body", "id");
+        return jsonResponse({ data: Object.fromEntries(bodiesById) });
       }),
     };
   },
@@ -2695,7 +2695,25 @@ Import from \`@getstrata/core/...\` subpaths rather than the package root, so si
 - [Databases](https://github.com/EyK-26/strata/blob/main/docs/DATABASE.md)
 `;
 }
-function renderReadme(projectName, layers) {
+function renderReadmeIntro(projectName, options) {
+  if (options.dogfood) {
+    return `# ${projectName}
+
+This in-repo app is Strata dogfood for internal end-to-end testing (migrate, seed, boot, OpenAPI, smoke). It is not a product. Start a product app with \`bunx create-strata\`.
+`;
+  }
+  if (options.inRepoExample) {
+    return `# ${projectName}
+
+This in-repo app is a generated sibling layer map. It is not a product and it is not CI dogfood. CI dogfood is \`apps/hiroapp\`. Start a product app with \`bunx create-strata\`.
+`;
+  }
+  return `# ${projectName}
+
+Strata app generated by \`create-strata\`.
+`;
+}
+function renderReadme(projectName, layers, options = {}) {
   const docker = renderDockerCompose(projectName, layers);
   const next = [`cd ${projectName}`, "cp .env.example .env"];
   if (docker) {
@@ -2710,10 +2728,7 @@ function renderReadme(projectName, layers) {
   const dockerServices = selectedDockerServices(layers);
   const neededTools = neededDockerServices(layers);
   const dockerLabel = neededTools.length === 0 ? "not needed" : dockerServices.length > 0 ? dockerServices.join(", ") : "off (local installs)";
-  return `# ${projectName}
-
-Strata app generated by \`create-strata\`.
-
+  return `${renderReadmeIntro(projectName, options)}
 ## Layers
 
 | Layer | Choice |
@@ -3089,7 +3104,6 @@ function renderMigrateTs(layers) {
   const list = statements.map((sql) => `  \`${sql}\`,`).join(`
 `);
   const ph = layers.database === "postgres";
-  const notePlaceholder = ph ? "$1" : "?";
   const verifyOn = layers.extras.emailVerification && authNeedsUsers(layers.auth);
   const userColumns = verifyOn ? "name, email, password, is_admin, email_verified_at" : "name, email, password, is_admin";
   const userPlaceholders = verifyOn ? ph ? "$1, $2, $3, $4, $5), ($6, $7, $8, $9, $10" : "?, ?, ?, ?, ?), (?, ?, ?, ?, ?" : ph ? "$1, $2, $3, $4), ($5, $6, $7, $8" : "?, ?, ?, ?), (?, ?, ?, ?";
@@ -3121,21 +3135,19 @@ function renderMigrateTs(layers) {
   const hashImport = authNeedsUsers(layers.auth) ? `import { hashPassword } from "@getstrata/core/auth/password";
 ` : "";
   const seedBlock = `${seedTenant}${seedUsers}`;
+  const bindSql = seedBlock.length > 0 ? `  const sql = getSql();
+` : `  getSql();
+`;
   return `${hashImport}${ensureImport(layers)}import { closeDatabase, getSql } from "../bootstrap/database.ts";
+import { Note } from "../models/Note.ts";
 
 const migrations = [
 ${list}
 ];
 
 export async function seed() {
-${ensureCall(layers)}  const sql = getSql();
-  const [{ count }] = await sql.unsafe<{ count: string | number }>(
-    "SELECT COUNT(*) AS count FROM notes",
-  );
-  if (Number(count) === 0) {
-    await sql.unsafe("INSERT INTO notes (body) VALUES (${notePlaceholder})", [
-      "Welcome to Strata!",
-    ]);
+${ensureCall(layers)}${bindSql}  if ((await Note.query().value("id")) === null) {
+    await Note.create({ body: "Welcome to Strata!" });
   }${seedBlock}
 }
 
@@ -3160,6 +3172,43 @@ if (import.meta.main) {
 }
 `;
 }
+function renderNoteModel() {
+  return `import { BaseRepository } from "@getstrata/core/database/baseRepository";
+import { Model, registerModelRepository } from "@getstrata/core/database/model";
+import { defineTable } from "@getstrata/core/database/table";
+
+interface NoteRecord {
+  id: number;
+  body: string;
+  created_at: Date | string;
+}
+
+const notesTable = defineTable<NoteRecord, "id">({
+  name: "notes",
+  primaryKey: "id",
+  columns: ["id", "body", "created_at"],
+  defaultOrderBy: { column: "id", direction: "ASC" },
+});
+
+class NoteRepository extends BaseRepository<NoteRecord, "id"> {
+  constructor() {
+    super(notesTable);
+  }
+}
+
+class Note extends Model<NoteRecord, "id"> {
+  static $fillable = ["body"] as const;
+  // created_at uses the table default. Sending a JS Date from $timestamps
+  // is rejected by SQLite bindings.
+  static $timestamps = false;
+}
+
+registerModelRepository(Note, new NoteRepository());
+
+export type { NoteRecord };
+export { Note };
+`;
+}
 function dropTables(layers) {
   const ordered = [];
   if (authUsesToken(layers.auth)) {
@@ -4064,7 +4113,10 @@ function writeGeneratedFiles(options) {
   writeText(join2(targetDir, ".env.example"), renderEnvExample(projectName, layers));
   writeText(join2(targetDir, ".gitignore"), renderGitignore());
   writeText(join2(targetDir, "package.json"), renderPackageJson(projectName, { ...options, layers }));
-  writeText(join2(targetDir, "README.md"), renderReadme(projectName, layers));
+  writeText(join2(targetDir, "README.md"), renderReadme(projectName, layers, {
+    inRepoExample: options.inRepoExample,
+    dogfood: options.dogfood
+  }));
   if (layers.frontend === "api") {
     writeText(join2(targetDir, "docs/API.md"), renderApiDocs(projectName, layers));
   } else {
@@ -4095,6 +4147,7 @@ function writeGeneratedFiles(options) {
   writeText(join2(src, "bootstrap/providers/queue.ts"), renderQueueProvider());
   writeText(join2(src, "bootstrap/providers/index.ts"), renderProvidersIndex());
   writeText(join2(src, "bootstrap/providers/auth.ts"), renderAuthProvider(layers));
+  writeText(join2(src, "models/Note.ts"), renderNoteModel());
   writeText(join2(src, "db/migrate.ts"), renderMigrateTs(layers));
   writeText(join2(src, "db/fresh.ts"), renderFreshTs(layers));
   writeText(join2(src, "db/seed.ts"), renderSeedTs());

package/dist/templates/package.json

@@ -11,9 +11,9 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@getstrata/bootstrap": "^1.0.8",
-    "@getstrata/cli": "^1.0.8",
-    "@getstrata/core": "^1.0.8",
+    "@getstrata/bootstrap": "^1.0.9",
+    "@getstrata/cli": "^1.0.9",
+    "@getstrata/core": "^1.0.9",
     "eta": "^4.6.0"
   },
   "devDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/starter",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Interactive create-strata wizard. Choose each layer; one database engine.",
   "type": "module",
   "license": "MIT",