eddev 2.0.0-beta.6 → 2.0.0-beta.61

package/dist/node/project/manifest/manifest.js

@@ -1,4 +1,4 @@
-import { getFileTree, watchFileTree } from "../../utils/watchFileTree.js";
+import { getFileTree, watchFileTree } from "../../utils/watch-file-tree.js";
 import { relative } from "path";
 export function createManifestGenerator(args) {
     let subscribers = new Set();
@@ -31,20 +31,24 @@ export function createManifestGenerator(args) {
                 }
             };
             if (args.watch) {
-                const disposer = await watchFileTree(args.pattern, (fileList, event) => {
-                    files = fileList;
-                    cache = new Map();
-                    if (args.onFileChange)
-                        fileList.forEach(args.onFileChange);
-                    update();
-                    if (event) {
-                        events.push(event);
-                    }
+                const disposer = await watchFileTree({
+                    pattern: args.pattern,
+                    ignore: args.ignore,
+                    callback: (fileList, event) => {
+                        files = fileList;
+                        cache = new Map();
+                        if (args.onFileChange)
+                            fileList.forEach(args.onFileChange);
+                        update();
+                        if (event) {
+                            events.push(event);
+                        }
+                    },
                 });
                 disposers.push(disposer);
             }
             else {
-                files = await getFileTree(args.pattern);
+                files = await getFileTree({ pattern: args.pattern, ignore: args.ignore });
                 update();
             }
         });

package/dist/node/project/manifest/routes-manifest.d.ts

@@ -0,0 +1,20 @@
+import { Project } from "../project.js";
+export type RouteManifest = {
+    routes: Record<string, RouteInfo>;
+    contextFileName: string | null;
+    validationMessages: {
+        fieldKey: string;
+        message: string;
+        severity: "error" | "warning";
+    }[];
+    bases: string[];
+};
+type RouteInfo = {
+    kind: "context" | "route";
+    fileName: string;
+    prefix?: string;
+    error?: string;
+};
+export type RouteManifestGenerator = ReturnType<typeof loadRouteManifest>;
+export declare function loadRouteManifest(project: Project): import("./manifest.js").ManifestGenerator<RouteInfo, RouteManifest>;
+export {};

package/dist/node/project/manifest/routes-manifest.js

@@ -0,0 +1,74 @@
+import { cliMode } from "../../cli/cli-mode.js";
+import { createManifestGenerator } from "./manifest.js";
+export function loadRouteManifest(project) {
+    return createManifestGenerator({
+        baseDir: project.rootDir,
+        pattern: ["server/routes/**/*.{ts,tsx}", "server/_context.{ts,tsx}"],
+        watch: cliMode.watch,
+        async generateManifest(entries) {
+            let result = {
+                routes: {},
+                contextFileName: null,
+                validationMessages: [],
+                bases: [],
+            };
+            const bases = new Set();
+            Object.entries(entries)
+                .sort(([b1], [b2]) => {
+                return b1.localeCompare(b2);
+            })
+                .forEach(([key, entry]) => {
+                if (entry.value.kind === "context") {
+                    result.contextFileName = entry.value.fileName;
+                }
+                else if (entry.value.kind === "route") {
+                    const { error: initialError } = entry.value;
+                    const prefix = entry.value.prefix;
+                    result.routes[key] = entry.value;
+                    if (prefix) {
+                        let shouldAdd = true;
+                        bases.forEach((base) => {
+                            if (base.startsWith(prefix)) {
+                                bases.delete(base);
+                            }
+                            else if (prefix.startsWith(base)) {
+                                shouldAdd = false;
+                                return;
+                            }
+                        });
+                        if (shouldAdd) {
+                            bases.add(entry.value.prefix);
+                        }
+                    }
+                    if (initialError) {
+                        result.validationMessages.push({
+                            fieldKey: key,
+                            message: initialError,
+                            severity: "error",
+                        });
+                        return;
+                    }
+                }
+            });
+            result.bases = [...bases].sort().map((base) => "/" + base.replace(/\./g, "/"));
+            return result;
+        },
+        getKey(path) {
+            // Strip the views folder name + extension
+            return path.replace(/\.tsx?$/, "").replace(/^server\/routes\//, "");
+        },
+        async loadValue(fileName, key) {
+            if (fileName.startsWith("server/_context.")) {
+                return {
+                    kind: "context",
+                    fileName,
+                };
+            }
+            return {
+                kind: "route",
+                prefix: key.replace("/index", "").replace(/\//, "."),
+                fileName,
+            };
+        },
+    });
+}

package/dist/node/project/manifest/view-manifest.js

@@ -1,9 +1,9 @@
 import { basename } from "node:path";
 import { cliMode } from "../../cli/cli-mode.js";
 import { ViewMetaSchema } from "../../types/view-type.js";
-import { metaExtractor } from "../../utils/export-extractor.js";
-import { formatZodError } from "../../utils/formatZodError.js";
+import { formatZodError } from "../../utils/format-zod-error.js";
 import { fs } from "../../utils/fs.js";
+import { metaExtractor } from "../../utils/ts-export-extractor.js";
 import { createManifestGenerator } from "./manifest.js";
 export function loadViewManifest(project) {
     return createManifestGenerator({

package/dist/node/project/project.d.ts

@@ -1,9 +1,10 @@
 import { EDConfig } from "./config.js";
 import { BlockManifestGenerator } from "./manifest/block-manifest.js";
-import { ViewManifestGenerator } from "./manifest/view-manifest.js";
 import { FieldManifestGenerator } from "./manifest/field-manifest.js";
+import { RouteManifestGenerator } from "./manifest/routes-manifest.js";
+import { ViewManifestGenerator } from "./manifest/view-manifest.js";
 import { WidgetManifestGenerator } from "./manifest/widget-manifest.js";
-export declare const projectLog: import("../utils/statefulLog.js").StatefulLog<Project>;
+export declare const projectLog: import("../utils/stateful-log.js").StatefulLog<Project>;
 type ProjectArgs = {
     rootDir: string;
     reportPluginCompatibility?: boolean;
@@ -18,11 +19,13 @@ export declare class Project {
     publicUrl: string;
     repoUrl: string;
     configFile: string;
+    origin: string;
     config?: EDConfig;
     blocks: BlockManifestGenerator;
     views: ViewManifestGenerator;
     fields: FieldManifestGenerator;
     widgets: WidgetManifestGenerator;
+    serverRoutes: RouteManifestGenerator;
     private wp;
     reportPluginCompatibility: boolean;
     private constructor();

package/dist/node/project/project.js

@@ -1,19 +1,17 @@
-import * as clack from "@clack/prompts";
+import { objFormat } from "obj-console";
 import { relative, resolve } from "path";
 import { undent } from "undent";
-import { cliMode } from "../cli/cli-mode.js";
-// import { console } from "../utils/console.js"
-import { objFormat } from "obj-console";
-import { getRepoInfo } from "../utils/getRepoInfo.js";
-import { isDeploying } from "../utils/isDeploying.js";
-import { createConsole } from "../utils/statefulLog.js";
+import { getRepoInfo } from "../utils/get-repo-info.js";
+import { isDeploying } from "../utils/is-deploying.js";
+import { createConsole } from "../utils/stateful-log.js";
 import { Configurator } from "./config.js";
-import { loadBlockManifest } from "./manifest/block-manifest.js";
-import { loadViewManifest } from "./manifest/view-manifest.js";
-import { WPInfo } from "./wp-info.js";
 import { ProjectEnvUtils } from "./env.js";
+import { loadBlockManifest } from "./manifest/block-manifest.js";
 import { loadFieldManifest } from "./manifest/field-manifest.js";
+import { loadRouteManifest } from "./manifest/routes-manifest.js";
+import { loadViewManifest } from "./manifest/view-manifest.js";
 import { loadWidgetManifest } from "./manifest/widget-manifest.js";
+import { WPInfo } from "./wp-info.js";
 const console = createConsole("Project", "project");
 export const projectLog = console;
 /**
@@ -26,21 +24,25 @@ export class Project {
     publicUrl = "";
     repoUrl = "";
     configFile = "";
+    origin = "";
     config;
     blocks;
     views;
     fields;
     widgets;
+    serverRoutes;
     wp;
     reportPluginCompatibility = false;
     constructor(opts) {
         this.rootDir = opts.rootDir;
+        this.origin = ProjectEnvUtils.getSafe("SITE_URL") ?? "";
         this.reportPluginCompatibility = opts.reportPluginCompatibility || false;
         this.blocks = loadBlockManifest(this);
         this.views = loadViewManifest(this);
         this.fields = loadFieldManifest(this);
         this.widgets = loadWidgetManifest(this);
-        this.wp = new WPInfo(ProjectEnvUtils.get("SITE_URL"));
+        this.serverRoutes = loadRouteManifest(this);
+        this.wp = new WPInfo(this.origin);
     }
     async load() {
         console.setWorking(true);
@@ -62,15 +64,14 @@ export class Project {
           
           You should rename the folder to match the repo name, or vice versa.
         `);
-            if (cliMode.interactive) {
-                await clack.confirm({
-                    message: `Ignore and continue anyway?`,
-                });
-            }
-            else {
-                console.flush();
-                process.exit(1);
-            }
+            // if (cliMode.interactive) {
+            //   await clack.confirm({
+            //     message: `Ignore and continue anyway?`,
+            //   })
+            // } else {
+            //   console.flush()
+            //   process.exit(1)
+            // }
         }
         /**
          * Load configuration

package/dist/node/project/wp-info.js

@@ -1,5 +1,4 @@
 import { resolveURL } from "ufo";
-import { getUnsafeFetch } from "../utils/unsafe-fetch.js";
 export class WPInfo {
     siteUrl;
     cached;
@@ -7,10 +6,12 @@ export class WPInfo {
         this.siteUrl = siteUrl;
     }
     async getInfo(force = false) {
+        if (!this.siteUrl) {
+            throw new Error("Attempted to get site info from WordPress, but SITE_URL was not present in the environment.");
+        }
         if (this.cached && !force)
             return this.cached;
         const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
-        const fetch = getUnsafeFetch(this.siteUrl);
         const response = await fetch(url);
         const result = (await response.json());
         this.cached = result;

package/dist/node/types/block-type.d.ts

@@ -23,10 +23,13 @@ export declare const BlockMetaSchema: z.ZodObject<{
     cache: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     allowMultiple: z.ZodDefault<z.ZodBoolean>;
     postMetaBlock: z.ZodOptional<z.ZodObject<{
+        postTypes: z.ZodArray<z.ZodString, "many">;
         fieldName: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        postTypes: string[];
         fieldName: string;
     }, {
+        postTypes: string[];
         fieldName: string;
     }>>;
     frontendMode: z.ZodDefault<z.ZodEnum<["hidden", "childrenOnly", "default"]>>;
@@ -56,6 +59,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     keywords?: string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
 }, {
@@ -81,6 +85,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     dynamic?: boolean | undefined;
     allowMultiple?: boolean | undefined;
     postMetaBlock?: {
+        postTypes: string[];
         fieldName: string;
     } | undefined;
     frontendMode?: "hidden" | "childrenOnly" | "default" | undefined;

package/dist/node/types/block-type.js

@@ -27,6 +27,7 @@ export const BlockMetaSchema = z.object({
     allowMultiple: z.boolean().default(true),
     postMetaBlock: z
         .object({
+        postTypes: z.array(z.string()),
         fieldName: z.string(),
     })
         .optional(),

package/dist/node/types/view-type.js

@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { objFormat } from "obj-console";
-import { console } from "../utils/console.js";
 import chalk from "chalk";
 import { indent } from "../utils/helpers.js";
 export const ViewMetaSchema = z.object({
@@ -28,7 +27,7 @@ export function describeView(view) {
     return output;
 }
 export function describeViewManifest(manifest) {
-    console.heading("View Manifest");
+    console.log("View Manifest");
     console.info("Discovered " + Object.keys(manifest.views).length + " view(s)");
     const totalWarnings = manifest.validationMessages.filter((m) => m.severity === "warning").length;
     const totalErrors = manifest.validationMessages.filter((m) => m.severity === "error").length;
@@ -48,7 +47,7 @@ export function describeViewManifest(manifest) {
         console.log(indent(4, describeView(view)));
     }
     if (totalWarnings > 0)
-        console.failish(totalWarnings + " warning(s) while loading view metadata");
+        console.warn(totalWarnings + " warning(s) while loading view metadata");
     if (totalErrors > 0)
-        console.fail(totalErrors + " error(s) while loading view metadata");
+        console.warn(totalErrors + " error(s) while loading view metadata");
 }

package/dist/node/utils/fs-codegen.d.ts

@@ -0,0 +1,42 @@
+import { Code } from "ts-poet";
+import { Project } from "../project/project.js";
+type VirtualFile = {
+    name: string;
+    content: string | Code;
+};
+type CodeGenerator = {
+    getFiles(): Promise<VirtualFile | VirtualFile[] | null>;
+    susbcribe?(callback: () => void): () => void;
+};
+/**
+ * A codegen utility that allows you to procedurally and reactively generate files, to be flushed to the FS.
+ */
+export declare class FSCodegen {
+    project: Project;
+    opts: {
+        outDir: string;
+        onWritten?: (opts: Set<string>) => void;
+    };
+    outDir: string;
+    private generators;
+    private generatorFiles;
+    private unsubscribers;
+    private flushScheduled;
+    constructor(project: Project, opts: {
+        outDir: string;
+        onWritten?: (opts: Set<string>) => void;
+    });
+    register(generator: CodeGenerator): void;
+    registerFile({ name, generate, subscribe, }: {
+        name: string;
+        generate: (() => string | Code | Promise<string | Code>) | string | Code;
+        subscribe?: (callback: () => void) => () => void;
+    }): void;
+    private runGenerator;
+    scheduleFlush(): void;
+    runAndWatch(): Promise<void>;
+    run(): Promise<void>;
+    private flush;
+    stop(): void;
+}
+export {};

package/dist/node/utils/fs-codegen.js

@@ -0,0 +1,98 @@
+import { Code } from "ts-poet";
+import { globby } from "globby";
+import { fs } from "./fs.js";
+import { join, resolve } from "path";
+/**
+ * A codegen utility that allows you to procedurally and reactively generate files, to be flushed to the FS.
+ */
+export class FSCodegen {
+    project;
+    opts;
+    outDir;
+    generators = new Set();
+    generatorFiles = new Map();
+    unsubscribers = new Set();
+    flushScheduled = false;
+    constructor(project, opts) {
+        this.project = project;
+        this.opts = opts;
+        this.outDir = opts.outDir;
+    }
+    register(generator) {
+        this.generators.add(generator);
+    }
+    registerFile({ name, generate, subscribe, }) {
+        this.register({
+            async getFiles() {
+                return {
+                    name,
+                    content: generate instanceof Code ? generate.toString() : typeof generate === "string" ? generate : await generate(),
+                };
+            },
+            susbcribe: subscribe,
+        });
+    }
+    async runGenerator(generator) {
+        const files = await generator.getFiles();
+        this.generatorFiles.set(generator, files ? (Array.isArray(files) ? files : [files]) : []);
+        this.scheduleFlush();
+    }
+    scheduleFlush() {
+        if (this.flushScheduled) {
+            return;
+        }
+        this.flushScheduled = true;
+        setTimeout(() => {
+            this.flushScheduled = false;
+            this.flush();
+        }, 100);
+    }
+    async runAndWatch() {
+        await Promise.all(Array.from(this.generators).map((generator) => {
+            return new Promise((resolve) => {
+                let first = true;
+                if (generator.susbcribe) {
+                    // Subscribe and run at least once
+                    this.unsubscribers.add(generator.susbcribe(() => {
+                        if (first) {
+                            first = false;
+                            this.runGenerator(generator).then(resolve);
+                        }
+                        else {
+                            this.runGenerator(generator);
+                        }
+                    }));
+                }
+                else {
+                    // Just run once, since there is no subscriber
+                    this.runGenerator(generator).then(resolve);
+                }
+            });
+        }));
+        await this.flush();
+    }
+    async run() {
+        await Promise.all(Array.from(this.generators).map((generator) => this.runGenerator(generator)));
+        await this.flush();
+    }
+    async flush() {
+        const files = Array.from(this.generatorFiles.values()).flat();
+        const existing = (await globby(join(this.outDir, "/**/*"))).map((path) => resolve(this.project.rootDir, path));
+        const written = new Set();
+        await Promise.all(files.map(async (file) => {
+            const path = join(this.project.rootDir, this.outDir, file.name);
+            written.add(resolve(this.project.rootDir, path));
+            await fs.writeIfUnchanged(path, file.content.toString());
+        }));
+        await Promise.all(existing.map(async (path) => {
+            if (!written.has(path)) {
+                await fs.rm(path);
+            }
+        }));
+        this.opts.onWritten?.(written);
+    }
+    stop() {
+        this.unsubscribers.forEach((unsub) => unsub());
+        this.unsubscribers.clear();
+    }
+}

package/dist/node/utils/fs.js

@@ -1,7 +1,9 @@
 import * as nodeFs from "fs/promises";
+import { dirname } from "path";
 export const fs = {
     ...nodeFs,
     writeIfUnchanged: async (path, content) => {
+        await fs.mkdirp(dirname(path));
         try {
             const currentContent = await nodeFs.readFile(path, "utf8");
             if (currentContent === content)

package/dist/node/utils/{selfSignedCert.js → self-signed-cert.js}

@@ -1,4 +1,4 @@
-import { serverlessLog } from "../compiler/serverless.dev.js";
+import { serverlessLog } from "../compiler/dev-server.js";
 import { fs } from "./fs.js";
 import { createCA, createCert } from "mkcert";
 export async function ensureSelfSignedCert(hostname, rootDir) {

package/dist/node/utils/{statefulLog.js → stateful-log.js}

@@ -1,5 +1,5 @@
 import { cliMode } from "../cli/cli-mode.js";
-import { eachFormattedZodError } from "./formatZodError.js";
+import { eachFormattedZodError } from "./format-zod-error.js";
 import chalk from "chalk";
 let logId = 0;
 const getID = () => logId++;

package/dist/node/utils/watch-file-tree.d.ts

@@ -0,0 +1,25 @@
+type FileList = string[];
+type Disposer = () => void;
+export type FileWatchEvent = "added" | "deleted" | "changed";
+export type FileEvent = {
+    type: FileWatchEvent;
+    file: string;
+};
+type WatchTreeOpts = {
+    pattern: string | string[];
+    ignore?: string[];
+    callback: (files: FileList, event?: FileEvent) => void;
+};
+export declare function watchFileTree({ pattern, callback, ignore }: WatchTreeOpts): Promise<Disposer>;
+type WatchTreeChangesOpts = {
+    pattern: string | string[];
+    ignore?: string | RegExp | string[];
+    callback: (event: FileEvent) => void;
+};
+export declare function watchFileTreeForChanges({ pattern, callback, ignore }: WatchTreeChangesOpts): Promise<Disposer>;
+type GetTreeOpts = {
+    pattern: string | string[];
+    ignore?: string[];
+};
+export declare function getFileTree(opts: GetTreeOpts): Promise<FileList>;
+export {};

package/dist/node/utils/{watchFileTree.js → watch-file-tree.js}

@@ -1,11 +1,13 @@
 import chokidar from "chokidar";
 import { globby } from "globby";
-export function watchFileTree(pattern, callback) {
+export function watchFileTree({ pattern, callback, ignore }) {
     const files = [];
     let ready = false;
     return new Promise((resolve) => {
         const watcher = chokidar
-            .watch(pattern)
+            .watch(pattern, {
+            ignored: ignore,
+        })
             .on("add", (path) => {
             files.push(path);
             if (ready)
@@ -31,7 +33,7 @@ export function watchFileTree(pattern, callback) {
         });
     });
 }
-export function watchFileTreeForChanges(pattern, callback) {
+export function watchFileTreeForChanges({ pattern, callback, ignore }) {
     let ready = false;
     return new Promise((resolve) => {
         const watcher = chokidar
@@ -50,9 +52,14 @@ export function watchFileTreeForChanges(pattern, callback) {
         })
             .on("ready", () => {
             ready = true;
+            resolve(() => {
+                watcher.close();
+            });
         });
     });
 }
-export function getFileTree(pattern) {
-    return globby(pattern);
+export function getFileTree(opts) {
+    return globby(opts.pattern, {
+        ignore: opts.ignore,
+    });
 }