@trypattern/sdk 0.1.14 → 0.1.16

package/README.md

@@ -117,7 +117,7 @@ email, phone, address, notes, status }` with `status` `requested`, `accepted`, `
   shows the live photos without storing them. With
   `pages` (`definePages(tables, { '/': head, '/items/:itemId': { head, paths } })` in
   `server/pages.ts`) it renders the `<head>` of public pages: each `head` reads tables anyone may
-  read (`rows`, `row`, `photoUrl`) and returns `{ title, description, image, hero, jsonLd, data }`
+  read (`rows`, `row`, `photoUrl`), and `appTitle()` gives the site's name as the owner set it, and returns `{ title, description, image, hero, jsonLd, data }`
   (or `null` for a 404). The Worker puts the title, description, canonical link, `og:*` (the image
   at 1200×630 with `fit=cover`), `twitter:card`, JSON-LD, a preload of the `hero` with `Image`'s
   srcset, and `data` as `<script type="application/json" id="pattern-data">` into the built

package/dist/cli/app.js

@@ -310,7 +310,7 @@ and restore sign in the same way when they need to, so this is rarely run on its
         summary: 'Download a site from onpattern.app and install it, ready for app start',
         details: `app pull acmeflower
 Downloads the source of the site's latest live version into this folder when it is empty, or into
-./<name> otherwise, writes pattern.json, installs, and runs app setup. Never needs git; when the
+./<name> otherwise (./<name>-2 and on when that folder already has files), writes pattern.json, installs, and runs app setup. Never needs git; when the
 Command Line Tools are installed it also makes a first commit. Signs in first if needed (see app login).
 --code <setup code> signs in with the one-time setup code from onpattern.app instead of the browser.`,
         run: (argument, options) => {

package/dist/cli/publishing.js

@@ -252,7 +252,12 @@ function isInsideHome(path) {
 function folderFor(name, cwd) {
     if (isInsideHome(cwd) && cwd !== homedir() && isEmptyFolder(cwd))
         return cwd;
-    return join(isInsideHome(cwd) ? cwd : homedir(), name);
+    const base = join(isInsideHome(cwd) ? cwd : homedir(), name);
+    for (let number = 1;; number += 1) {
+        const folder = number === 1 ? base : `${base}-${number}`;
+        if (!existsSync(folder) || isEmptyFolder(folder))
+            return folder;
+    }
 }
 async function hasPnpm(io, cwd) {
     return (await io.run('pnpm', ['--version'], cwd)).code === 0;
@@ -285,13 +290,6 @@ export async function pull(io, name, cwd, setupCode) {
     }
     sayHost(io);
     const target = folderFor(name, cwd);
-    if (target !== cwd && existsSync(target) && !isEmptyFolder(target)) {
-        return {
-            code: 1,
-            data: { error: 'folder not empty', folder: target },
-            text: `✗ ${target} already has files in it. Pull into an empty folder.`
-        };
-    }
     try {
         if (setupCode !== undefined)
             await useSetupCode(io, setupCode);
@@ -348,7 +346,7 @@ export async function pull(io, name, cwd, setupCode) {
             await io.run('git', ['add', '-A'], target);
             await io.run('git', ['commit', '-q', '-m', `Version ${result.number} from onpattern.app`], target);
         }
-        const next = result.isStarter
+        const next = result.isStarter || result.app.pulledAt === null
             ? firstChange(result.title, result.app.url, target)
             : `cd into ${target}, read AGENTS.md, then ./app start`;
         return {

package/dist/server/pages.d.ts

@@ -14,6 +14,7 @@ export type PageRequest<Group extends Tables> = {
     rows: <Name extends ReadableName<Group>>(table: Name) => Promise<readonly Row<Group[Name]>[]>;
     row: <Name extends ReadableName<Group>>(table: Name, id: string) => Promise<Row<Group[Name]> | undefined>;
     photoUrl: (image: MediaImage) => string;
+    appTitle: () => Promise<string>;
 };
 export type PageHero = {
     image: MediaImage;
@@ -49,6 +50,7 @@ type AnyRequest = {
     rows: (table: string) => Promise<readonly unknown[]>;
     row: (table: string, id: string) => Promise<unknown>;
     photoUrl: (image: MediaImage) => string;
+    appTitle: () => Promise<string>;
 };
 type PageRoute = {
     pattern: string;

package/dist/server/pages.js

@@ -71,6 +71,7 @@ function readableTable(pages, name) {
 function requestFor(c, pages, params) {
     const url = new URL(c.req.url);
     const read = new Map();
+    let title;
     return {
         url,
         params,
@@ -81,7 +82,11 @@ function requestFor(c, pages, params) {
             return found;
         },
         row: (name, id) => readRow(c.env.DB, readableTable(pages, name), id),
-        photoUrl: (image) => `${url.origin}${mediaPath(image.key)}`
+        photoUrl: (image) => `${url.origin}${mediaPath(image.key)}`,
+        appTitle: () => {
+            title ??= readTitle(c.env.DB);
+            return title;
+        }
     };
 }
 function escapeHtml(text) {
@@ -217,7 +222,7 @@ export async function renderPage(c, pages, route, params) {
     try {
         head = await route.head(request);
         if (head !== null) {
-            tags = headTags(pages, request.url, await readTitle(c.env.DB), head);
+            tags = headTags(pages, request.url, await request.appTitle(), head);
         }
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trypattern/sdk",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "type": "module",
   "files": [
     "dist",