eddev 2.0.0-beta.2 → 2.0.0-beta.21

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

@@ -49,7 +49,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     ancestors: string[];
     dynamic: boolean;
     allowMultiple: boolean;
-    frontendMode: "hidden" | "childrenOnly" | "default";
+    frontendMode: "default" | "hidden" | "childrenOnly";
     inserter: boolean;
     description?: string | undefined;
     icon?: string | undefined;
@@ -83,7 +83,7 @@ export declare const BlockMetaSchema: z.ZodObject<{
     postMetaBlock?: {
         fieldName: string;
     } | undefined;
-    frontendMode?: "hidden" | "childrenOnly" | "default" | undefined;
+    frontendMode?: "default" | "hidden" | "childrenOnly" | undefined;
     inserter?: boolean | undefined;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;

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,40 @@
+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;
+    };
+    outDir: string;
+    private generators;
+    private generatorFiles;
+    private unsubscribers;
+    private flushScheduled;
+    constructor(project: Project, opts: {
+        outDir: string;
+    });
+    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,97 @@
+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(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);
+            }
+        }));
+    }
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -34,23 +34,34 @@
       "types": "./dist/app/lib/dynamic/index.d.ts",
       "import": "./dist/app/lib/dynamic/index.js"
     },
-    "./types.app.public": {
-      "types": "./types.app.d.ts"
+    "./devtools": {
+      "types": "./dist/app/lib/devtools/index.d.ts",
+      "import": "./dist/app/lib/devtools/index.js"
+    },
+    "./server": {
+      "types": "./dist/app/server/index.d.ts",
+      "import": "./dist/app/server/index.js"
+    },
+    "./_internal/boot-admin.js": {
+      "import": "./dist/app/entry/boot-admin.js"
     },
-    "./_internal/_entry/main.frontend.spa.js": {
-      "import": "./dist/app/entry/main.frontend.spa.js"
+    "./_internal/spa-root.js": {
+      "import": "./dist/app/entry/spa-root.js"
     },
-    "./_internal/_entry/main.admin.js": {
-      "import": "./dist/app/entry/main.admin.js"
+    "./_internal/ssr-root-client.js": {
+      "import": "./dist/app/entry/ssr-root-client.js"
     },
-    "./_internal/_entry/main.frontend.ssr.js": {
-      "import": "./dist/app/entry/main.frontend.ssr.js"
+    "./_internal/ssr-root.js": {
+      "import": "./dist/app/entry/ssr-root.js"
     },
-    "./_internal/_entry/main.serverless.dev.js": {
-      "import": "./dist/app/entry/main.serverless.dev.js"
+    "./_internal/create-vinxi-app.js": {
+      "import": "./dist/node/compiler/vinxi-app.js"
     },
     "./_internal": {
       "import": "./dist/app/lib/internal/index.js"
+    },
+    "./types.app.public": {
+      "types": "./types.app.d.ts"
     }
   },
   "scripts": {
@@ -67,51 +78,34 @@
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-tools/load": "^8.0.0",
     "@graphql-tools/url-loader": "^8.0.0",
-    "@hono/node-server": "^1.7.0",
     "@inquirer/prompts": "^5.0.6",
     "@nozbe/microfuzz": "^1.0.0",
     "@rollup/plugin-replace": "^5.0.5",
     "@tanstack/react-query": "^5.51.23",
     "@types/qs": "^6.9.15",
-    "@types/wordpress__blocks": "^12.5.13",
-    "@types/wordpress__components": "^23.0.11",
-    "@types/wordpress__editor": "^13.6.7",
-    "@types/wordpress__hooks": "^2.11.0",
+    "@vinxi/react": "^0.2.5",
     "@vitejs/plugin-react": "^4.1.1",
     "chalk": "^5.3.0",
     "change-case-all": "^2.1.0",
     "chokidar": "^3.5.3",
     "commander": "^11.1.0",
-    "concurrently": "^8.2.2",
-    "consola": "^3.2.3",
     "csstype": "^3.1.3",
     "dotenv": "^16.3.1",
-    "express": "^4.18.2",
-    "express-http-proxy": "^2.0.0",
-    "fastest-levenshtein": "^1.0.16",
     "globby": "^13.2.2",
     "graphql": "^16.8.1",
-    "hono": "^3.12.11",
     "ink": "^5.0.1",
-    "ink-quicksearch-input": "^1.0.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
     "listhen": "^1.6.0",
     "mkcert": "^3.2.0",
-    "mnemonist": "^0.39.8",
-    "node-fetch": "^3.3.2",
     "obj-console": "^1.0.2",
     "object-code": "^1.3.3",
     "qs": "^6.13.0",
-    "react-error-boundary": "^4.0.11",
-    "rollup-plugin-external-globals": "^0.9.2",
     "ts-poet": "^6.6.0",
-    "tsup": "^7.2.0",
     "ufo": "^1.3.1",
     "undent": "^0.1.0",
-    "use-zustand": "^0.2.0",
     "valtio": "^1.13.2",
-    "vite": "^5.4.3",
+    "vinxi": "^0.4.3",
     "vite-tsconfig-paths": "^4.2.1",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.21.4",
@@ -124,7 +118,11 @@
     "@types/node": "^20.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "typescript": "^5.5.2"
+    "typescript": "^5.5.2",
+    "@types/wordpress__blocks": "^12.5.13",
+    "@types/wordpress__components": "^23.0.11",
+    "@types/wordpress__editor": "^13.6.7",
+    "@types/wordpress__hooks": "^2.11.0"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/tsconfig.app.json

@@ -3,9 +3,9 @@
     "target": "ESNext",
     "lib": ["DOM", "ESNext"],
     "jsx": "react-jsx",
-    "module": "ESNext",
+    "module": "NodeNext",
     "rootDir": "./src/",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "NodeNext",
     "declaration": true,
     "outDir": "./dist",
     "allowJs": true,

package/tsconfig.node.json

@@ -4,8 +4,8 @@
     "lib": ["ESNext"],
     "jsx": "react-jsx",
     "rootDir": "./src/",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "resolveJsonModule": true,
     "declaration": true,
     "outDir": "./dist",

package/types.app.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="vite/client" />
-/// <reference types="./types.meta" />
-/// <reference types="./types.env" />
+/// <reference types="./types.meta.d.ts" />
+/// <reference types="./types.env.d.ts" />
 
 declare global {
   interface ViewProps {}

package/types.app.internal.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="./types.manifests" />
-/// <reference types="./types.app" />
+/// <reference types="./types.manifests.d.ts" />
+/// <reference types="./types.app.d.ts" />
 
 declare global {
   interface ViewProps {

package/types.node.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="./types.app" />
-/// <reference types="./types.meta" />
-/// <reference types="./types.env" />
+/// <reference types="./types.app.d.ts" />
+/// <reference types="./types.meta.d.ts" />
+/// <reference types="./types.env.d.ts" />

package/dist/app/entry/Root.d.ts

@@ -1 +0,0 @@
-export declare function Root(): import("react/jsx-runtime").JSX.Element;

package/dist/app/entry/main.admin.d.ts

@@ -1,3 +0,0 @@
-import "@manifest/admin";
-import "@manifest/blocks";
-export default function bootAdmin(): void;

package/dist/app/entry/main.frontend.spa.d.ts

@@ -1,3 +0,0 @@
-import "@manifest/blocks";
-import "@manifest/views";
-export default function boot(): void;

package/dist/app/entry/main.frontend.spa.js

@@ -1,13 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import "@manifest/blocks";
-import "@manifest/views";
-import { createRoot, hydrateRoot } from "react-dom/client";
-import { Root } from "./Root";
-export default function boot() {
-    if (env.serverless) {
-        hydrateRoot(document.getElementById("root"), _jsx(Root, {}));
-    }
-    else {
-        createRoot(document.getElementById("root")).render(_jsx(Root, {}));
-    }
-}

package/dist/app/entry/main.frontend.ssr.d.ts

@@ -1,21 +0,0 @@
-import "@manifest/blocks";
-import "@manifest/views";
-import type { RouteData } from "../lib/routing/types";
-import { UrlReplacerConf } from "../server/utils/replace-host";
-export declare function patchConsole(c: any): void;
-export declare function setFetchImpl(opts: any): void;
-export declare function setPropsPreprocessor(func: any): void;
-export declare function getPageData(): RouteData;
-export declare function getCollectedOutput(): {
-    head: string;
-    foot: string;
-};
-export declare const getHonoAPI: (args: {
-    fetchImpl: any;
-    replaceUrls: UrlReplacerConf;
-}) => import("hono").Hono<import("hono").Env, {}, "/">;
-export declare const getHonoSSR: (args: {
-    indexTransformer: (html: string) => Promise<string>;
-    fetchImpl: any;
-    replaceUrls: UrlReplacerConf;
-}) => import("hono").Hono<import("hono").Env, {}, "/">;

package/dist/app/entry/main.frontend.ssr.js

@@ -1,79 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import "@manifest/blocks";
-import { getCssText } from "@manifest/theme";
-import "@manifest/views";
-import { QueryClientProvider } from "@tanstack/react-query";
-import { SSRRouter } from "../lib/routing/components/SSRRouter";
-import { RouteLoader } from "../lib/routing/loader";
-import { createHonoStdAPI } from "../server/create-api-builtin-hono";
-import { createSSRHono } from "../server/create-ssr-hono";
-import indexHtml from "../server/utils/index.html";
-import { getQueryClient } from "../utils/query-client";
-import { normalizeRoute } from "../lib/routing/utils";
-import { createUrlReplacer } from "../server/utils/replace-host";
-let initialData;
-export function patchConsole(c) {
-    console.log = (...args) => c.log(...args);
-    console.info = (...args) => c.info(...args);
-    console.warn = (...args) => c.warn(...args);
-    console.error = (...args) => c.warn(...args);
-}
-export function setFetchImpl(opts) {
-    // routeLoader4().setFetchImpl(opts)
-}
-export function setPropsPreprocessor(func) {
-    // routeLoader4().setPropsPreprocessor(func)
-}
-export function getPageData() {
-    return initialData;
-}
-export function getCollectedOutput() {
-    const result = { head: "", foot: "" };
-    if (getCssText) {
-        result.head = `<style id="stitches">${getCssText()}</style>`;
-    }
-    return result;
-}
-export const getHonoAPI = (args) => {
-    return createHonoStdAPI({
-        fetch: args.fetchImpl,
-        replaceUrls: args.replaceUrls,
-    });
-};
-export const getHonoSSR = (args) => {
-    const replaceUrls = args.replaceUrls ? createUrlReplacer(args.replaceUrls) : null;
-    return createSSRHono({
-        render: async function render({ pathname }) {
-            const loader = new RouteLoader();
-            if (replaceUrls) {
-                loader.setPropsPreprocessor(replaceUrls);
-            }
-            loader.setFetchImpl(args.fetchImpl);
-            initialData = await loader.loadRouteData(pathname, true);
-            loader.setAppData(initialData.appData.data);
-            return {
-                jsx: (_jsx(QueryClientProvider, { client: getQueryClient(), children: _jsx(SSRRouter, { loader: loader, route: normalizeRoute({
-                            id: "initial",
-                            component: loader.getRouteComponent(initialData.view),
-                            pathname: pathname,
-                            hash: "",
-                            key: "",
-                            props: initialData.viewData.data,
-                            view: initialData.view,
-                            query: {},
-                            search: "",
-                        }) }) })),
-                getCollectedOutput() {
-                    const result = { head: "", foot: "" };
-                    if (getCssText) {
-                        result.head = `<style id="stitches">${getCssText()}</style>`;
-                    }
-                    return result;
-                },
-                indexTemplate: args.indexTransformer ? await args.indexTransformer(indexHtml) : indexHtml,
-                data: initialData,
-            };
-        },
-        manifest: {},
-    });
-};

package/dist/app/entry/main.serverless.dev.d.ts

@@ -1,4 +0,0 @@
-import "@manifest/blocks";
-import "@manifest/views";
-import "@manifest/admin";
-export default function boot(): void;

package/dist/app/entry/main.serverless.dev.js

@@ -1,21 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import "@manifest/blocks";
-import "@manifest/views";
-import "@manifest/admin";
-import { createRoot, hydrateRoot } from "react-dom/client";
-import { Root } from "./Root";
-import bootAdmin from "./main.admin";
-// @ts-ignore
-if (!window.wp)
-    window.wp = {};
-export default function boot() {
-    if (env.admin) {
-        bootAdmin();
-    }
-    else if (env.serverless) {
-        hydrateRoot(document.getElementById("root"), _jsx(Root, {}));
-    }
-    else {
-        createRoot(document.getElementById("root")).render(_jsx(Root, {}));
-    }
-}

package/dist/app/server/create-api-builtin-hono.d.ts

@@ -1,8 +0,0 @@
-import { Hono } from "hono";
-import { UrlReplacerConf } from "./utils/replace-host";
-type Conf = {
-    fetch: typeof fetch;
-    replaceUrls?: UrlReplacerConf;
-};
-export declare function createHonoStdAPI(conf: Conf): Hono<import("hono").Env, {}, "/">;
-export {};

package/dist/app/server/create-api-builtin-hono.js

@@ -1,80 +0,0 @@
-import { Hono } from "hono";
-import { joinURL, withQuery } from "ufo";
-import { BRANDED_HEADERS, filterHeader } from "./utils/headers";
-import { createUrlReplacer } from "./utils/replace-host";
-let standardFetch = fetch;
-const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", ...Object.keys(BRANDED_HEADERS)];
-function extractHeaders(rawHeaders) {
-    const headers = {};
-    rawHeaders.forEach((value, key) => {
-        headers[key] = value;
-    });
-    return headers;
-}
-export function createHonoStdAPI(conf) {
-    const fetch = conf.fetch ?? standardFetch;
-    const replaceUrls = conf.replaceUrls ? createUrlReplacer(conf.replaceUrls) : undefined;
-    const app = new Hono();
-    app.get("/api/rest/query/:name{.+}", async (c) => {
-        const name = c.req.param("name");
-        const paramString = c.req.query("params");
-        const fetchUrl = withQuery(joinURL(env.origin ?? "", `/wp-json/ed/v1/query/${name}`), { params: paramString });
-        const response = await fetch(fetchUrl, {
-            referrer: c.req.raw.referrer,
-            cache: "no-cache",
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...extractHeaders(c.req.raw.headers),
-                // Authorization: c.req.header("Authorization") ?? "",
-                // Cookie: c.req.header("Cookie") ?? "",
-                // ...c.req.raw.headers,
-            },
-        });
-        c.status(response.status);
-        response.headers.forEach((value, key) => {
-            if (filterHeader(key, PROXY_RESPONSE_HEADERS)) {
-                c.header(key, value);
-            }
-        });
-        Object.entries(BRANDED_HEADERS).forEach(([key, value]) => c.header(key, value));
-        let text = await response.text();
-        if (replaceUrls) {
-            text = replaceUrls(text);
-        }
-        return c.body(text);
-    });
-    app.post("/api/rest/mutation/:name{.+}", async (c) => {
-        const name = c.req.param("name");
-        const fetchUrl = joinURL(env.origin ?? "", `/wp-json/ed/v1/mutation/${name}`);
-        const response = await fetch(fetchUrl, {
-            method: "POST",
-            referrer: c.req.raw.referrer,
-            cache: "no-cache",
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...extractHeaders(c.req.raw.headers),
-                // Authorization: c.req.header("Authorization") ?? "",
-                // Cookie: c.req.header("Cookie") ?? "",
-            },
-            body: JSON.stringify({
-                name: name,
-                ...(await c.req.json()),
-            }),
-        });
-        c.status(response.status);
-        response.headers.forEach((value, key) => {
-            if (filterHeader(key, PROXY_RESPONSE_HEADERS)) {
-                c.header(key, value);
-            }
-        });
-        Object.entries(BRANDED_HEADERS).forEach(([key, value]) => c.header(key, value));
-        let text = await response.text();
-        if (replaceUrls) {
-            text = replaceUrls(text);
-        }
-        return c.body(text);
-    });
-    return app;
-}

package/dist/app/server/create-ssr-hono.d.ts

@@ -1,18 +0,0 @@
-import { Hono } from "hono";
-import { ReactElement } from "react";
-type Conf = {
-    render: (args: {
-        pathname: string;
-    }) => Promise<{
-        jsx: ReactElement;
-        getCollectedOutput(): {
-            head: string;
-            foot: string;
-        };
-        indexTemplate: string;
-        data: any;
-    }>;
-    manifest: any;
-};
-export declare function createSSRHono(conf: Conf): Hono<import("hono").Env, {}, "/">;
-export {};