@celsoft/platform 0.7.0 → 0.8.0

package/dist/target.js

@@ -1,19 +1,21 @@
-// Prod gets its own bucket; previews share one, each under its PR's folder.
+// Every name is the app name, alone or followed by a suffix after `--`, which app names never
+// contain. Prod gets its own bucket; previews share one, each under its PR's folder.
 export function names(config, target) {
     if (target.kind === "prod") {
-        return { worker: config.name, hyperdrive: config.name, neonBranch: undefined, bucket: `${config.name}-files`, filesPrefix: "" };
+        return { worker: config.name, hyperdrive: config.name, neonBranch: undefined, bucket: `${config.name}--files`, filesPrefix: "" };
     }
     const suffix = `pr-${target.pr}`;
     return {
-        worker: `${config.name}-${suffix}`,
-        hyperdrive: `${config.name}-${suffix}`,
+        worker: `${config.name}--${suffix}`,
+        hyperdrive: `${config.name}--${suffix}`,
         neonBranch: suffix,
-        bucket: `${config.name}-previews`,
+        bucket: `${config.name}--previews`,
         filesPrefix: `${suffix}/`,
     };
 }
-export function previewHostname(worker, zoneName) {
-    return `${worker}.${zoneName}`;
+export const previewPattern = (app) => new RegExp(`^${app}--pr-(\\d+)$`);
+export function previewHostname(pr, hostname) {
+    return `pr-${pr}.${hostname}`;
 }
 export function originOf(connectionUri) {
     const url = new URL(connectionUri);

package/dist/target.js.map

@@ -1 +1 @@
-{"version":3,"file":"target.js","sourceRoot":"","sources":["../src/target.ts"],"names":[],"mappings":"AAYA,4EAA4E;AAC5E,MAAM,UAAU,KAAK,CAAC,MAAc,EAAE,MAAc;IAClD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IAClI,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,EAAE,CAAC;IACjC,OAAO;QACL,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE;QAClC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE;QACtC,UAAU,EAAE,MAAM;QAClB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,WAAW;QACjC,WAAW,EAAE,GAAG,MAAM,GAAG;KAC1B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,QAAgB;IAC9D,OAAO,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,aAAqB;IAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IACnC,OAAO,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;AACtD,CAAC"}
+{"version":3,"file":"target.js","sourceRoot":"","sources":["../src/target.ts"],"names":[],"mappings":"AAYA,8FAA8F;AAC9F,qFAAqF;AACrF,MAAM,UAAU,KAAK,CAAC,MAAc,EAAE,MAAc;IAClD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IACnI,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,EAAE,CAAC;IACjC,OAAO;QACL,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE;QACnC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE;QACvC,UAAU,EAAE,MAAM;QAClB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,YAAY;QAClC,WAAW,EAAE,GAAG,MAAM,GAAG;KAC1B,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC;AAEjF,MAAM,UAAU,eAAe,CAAC,EAAU,EAAE,QAAgB;IAC1D,OAAO,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,aAAqB;IAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IACnC,OAAO,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;AACtD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celsoft/platform",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Deploy apps to Cloudflare Workers with Neon Postgres, prod on push and a preview per pull request",
   "license": "MIT",
   "repository": {

package/schema.json

@@ -9,7 +9,7 @@
       "type": "string",
       "anyOf": [
         {
-          "pattern": "^[a-z][a-z0-9-]{0,49}$"
+          "pattern": "^(?=.{3,50}$)[a-z][a-z0-9]*(-[a-z0-9]+)*$"
         },
         {
           "pattern": "^\\$\\{[A-Z][A-Z0-9_]*\\}$"

package/dist/ownership.d.ts

@@ -1,16 +0,0 @@
-import type { Config } from "./config.js";
-import type { Hyperdrive, Ports } from "./ports.js";
-export declare const PLATFORM_TAG = "celsoft-platform";
-export declare const appTag: (app: string) => string;
-export declare const prTag: (pr: number) => string;
-export declare const BUCKET_MARKER = ".celsoft-platform";
-export declare class UnprovenError extends Error {
-    constructor(kind: string, name: string, app: string);
-}
-export interface OwnedWorker {
-    name: string;
-    hyperdriveIds: string[];
-}
-export declare function ownedWorker(ports: Ports, config: Config, name: string): Promise<OwnedWorker | undefined>;
-export declare function requireOwnedHyperdrive(ports: Ports, config: Config, hyperdrive: Hyperdrive, boundIds: string[]): Promise<void>;
-export declare function ownedBucket(ports: Ports, config: Config, name: string): Promise<boolean>;

package/dist/ownership.js

@@ -1,40 +0,0 @@
-// Cloudflare has no project scope inside an account, so a matching name never proves the
-// platform made a resource. Each resource carries proof instead, checked before any change.
-export const PLATFORM_TAG = "celsoft-platform";
-export const appTag = (app) => `app:${app}`;
-export const prTag = (pr) => `pr:${pr}`;
-export const BUCKET_MARKER = ".celsoft-platform";
-export class UnprovenError extends Error {
-    constructor(kind, name, app) {
-        super(`${kind} ${name} exists, but nothing shows the platform made it for ${app}, so it was left untouched; remove it by hand if it is yours to remove, or choose another app name`);
-    }
-}
-// Undefined when there is no such Worker; throws when it exists without this app's tags.
-export async function ownedWorker(ports, config, name) {
-    const owner = await ports.cloudflare.workerOwner(name);
-    if (!owner)
-        return undefined;
-    if (owner.app !== config.name)
-        throw new UnprovenError("Worker", name, config.name);
-    return { name, hyperdriveIds: owner.hyperdriveIds };
-}
-// A Hyperdrive config is the app's when one of its Workers binds it, or when it points at a
-// database in the app's own Neon project, which covers a config whose Worker never deployed.
-export async function requireOwnedHyperdrive(ports, config, hyperdrive, boundIds) {
-    if (boundIds.includes(hyperdrive.id))
-        return;
-    const host = hyperdrive.origin.split("@")[1]?.split("/")[0];
-    if (config.database && host && (await ports.neon.endpointHosts(config.database.neonProject)).includes(host))
-        return;
-    throw new UnprovenError("Hyperdrive config", hyperdrive.name, config.name);
-}
-// True when the bucket exists and its marker names this app; throws when it names nothing or another app.
-export async function ownedBucket(ports, config, name) {
-    const owner = await ports.cloudflare.bucketOwner(name);
-    if (owner === undefined)
-        return false;
-    if (owner !== config.name)
-        throw new UnprovenError("R2 bucket", name, config.name);
-    return true;
-}
-//# sourceMappingURL=ownership.js.map

package/dist/ownership.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ownership.js","sourceRoot":"","sources":["../src/ownership.ts"],"names":[],"mappings":"AAGA,yFAAyF;AACzF,4FAA4F;AAC5F,MAAM,CAAC,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAC/C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;AACpD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAEjD,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,YAAY,IAAY,EAAE,IAAY,EAAE,GAAW;QACjD,KAAK,CAAC,GAAG,IAAI,IAAI,IAAI,uDAAuD,GAAG,oGAAoG,CAAC,CAAC;IACvL,CAAC;CACF;AAOD,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,KAAY,EAAE,MAAc,EAAE,IAAY;IAC1E,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,IAAI,KAAK,CAAC,GAAG,KAAK,MAAM,CAAC,IAAI;QAAE,MAAM,IAAI,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACpF,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;AACtD,CAAC;AAED,4FAA4F;AAC5F,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAAY,EAAE,MAAc,EAAE,UAAsB,EAAE,QAAkB;IACnH,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAAE,OAAO;IAC7C,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,QAAQ,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO;IACpH,MAAM,IAAI,aAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7E,CAAC;AAED,0GAA0G;AAC1G,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,KAAY,EAAE,MAAc,EAAE,IAAY;IAC1E,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACtC,IAAI,KAAK,KAAK,MAAM,CAAC,IAAI;QAAE,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC"}