okno 1.0.0-alpha.2 → 1.0.0-alpha.4

package/dist/index.js

@@ -1,4 +1,4 @@
-import { o as a } from "./plugin-Cwwh6E1P.js";
+import { o as a } from "./plugin-rPgNLY_g.js";
 export {
   a as okno
 };

package/dist/{plugin-Cwwh6E1P.js → plugin-rPgNLY_g.js}

@@ -1,9 +1,9 @@
-import { join as u, extname as M, dirname as R, relative as D, resolve as y } from "node:path";
-import { existsSync as $, readFileSync as V, mkdirSync as H, writeFileSync as J } from "node:fs";
-import { readdir as v, writeFile as G, readFile as A } from "node:fs/promises";
-import { fileURLToPath as U } from "node:url";
-import { simpleGit as B } from "simple-git";
-async function E(a) {
+import { join as u, extname as R, dirname as E, relative as L, resolve as I } from "node:path";
+import { existsSync as $, readFileSync as M, mkdirSync as V, writeFileSync as D } from "node:fs";
+import { readdir as y, writeFile as H, readFile as J } from "node:fs/promises";
+import { fileURLToPath as G } from "node:url";
+import { simpleGit as A } from "simple-git";
+async function C(a) {
   const n = [
     "// Auto-generated by okno. Do not edit.",
     "",
@@ -25,50 +25,50 @@ async function E(a) {
     "				? { [K in keyof T]: OknoWrapped<T[K]> } & OknoValue<T>",
     "				: OknoValue<T>",
     ""
-  ], o = u(a, "pages"), e = await W(o);
+  ], o = u(a, "pages"), e = await P(o);
   if (e.length > 0) {
     n.push('declare module "okno:pages" {');
     for (const r of e) {
       const t = `./pages/${r}`;
-      n.push(`	import _${b(r)} from "${t}"`), n.push(`	export const ${r}: OknoWrapped<typeof _${b(r)}>`);
+      n.push(`	import _${k(r)} from "${t}"`), n.push(`	export const ${r}: OknoWrapped<typeof _${k(r)}>`);
     }
     n.push("}"), n.push("");
   }
   const s = u(a, "collections");
   if ($(s)) {
-    const r = (await v(s, { withFileTypes: !0 })).filter((t) => t.isDirectory());
+    const r = (await y(s, { withFileTypes: !0 })).filter((t) => t.isDirectory());
     if (r.length > 0) {
       n.push('declare module "okno:collections" {');
       for (const t of r) {
-        const i = await W(u(s, t.name));
+        const i = await P(u(s, t.name));
         if (i.length === 0) continue;
         const p = i[0];
         n.push(
-          `	import _${b(t.name)}_item from "./collections/${t.name}/${p}"`
-        ), n.push(`	export const ${t.name}: OknoWrapped<typeof _${b(t.name)}_item>[]`);
+          `	import _${k(t.name)}_item from "./collections/${t.name}/${p}"`
+        ), n.push(`	export const ${t.name}: OknoWrapped<typeof _${k(t.name)}_item>[]`);
       }
       n.push("}"), n.push("");
     }
   }
-  const l = u(a, "globals"), c = await W(l);
+  const l = u(a, "globals"), c = await P(l);
   if (c.length > 0) {
     n.push('declare module "okno:globals" {');
     for (const r of c) {
       const t = `./globals/${r}`;
-      n.push(`	import _${b(r)} from "${t}"`), n.push(`	export const ${r}: OknoWrapped<typeof _${b(r)}>`);
+      n.push(`	import _${k(r)} from "${t}"`), n.push(`	export const ${r}: OknoWrapped<typeof _${k(r)}>`);
     }
     n.push("}"), n.push("");
   }
-  await G(u(a, "modules.d.ts"), n.join(`
+  await H(u(a, "modules.d.ts"), n.join(`
 `));
 }
-async function W(a) {
-  return $(a) ? (await v(a)).filter((o) => o.endsWith(".ts") && o !== "index.ts" && o !== "modules.d.ts").map((o) => o.replace(".ts", "")) : [];
+async function P(a) {
+  return $(a) ? (await y(a)).filter((o) => o.endsWith(".ts") && o !== "index.ts" && o !== "modules.d.ts").map((o) => o.replace(".ts", "")) : [];
 }
-function b(a) {
+function k(a) {
   return a.replace(/-/g, "_");
 }
-const K = {
+const U = {
   ".webp": "image/webp",
   ".png": "image/png",
   ".jpg": "image/jpeg",
@@ -89,7 +89,7 @@ const K = {
   ".ttf": "font/ttf",
   ".otf": "font/otf"
 };
-function z(a, n) {
+function B(a, n) {
   a.middlewares.use((o, e, s) => {
     var t;
     if (o.method !== "GET" || !((t = o.url) != null && t.startsWith("/okno/files/"))) return s();
@@ -98,8 +98,8 @@ function z(a, n) {
     const c = u(n, "files", l);
     if (!$(c))
       return e.statusCode = 404, e.end("Not found");
-    const r = M(l).toLowerCase();
-    e.setHeader("Content-Type", K[r] || "application/octet-stream"), e.setHeader("Cache-Control", "public, max-age=3600"), e.end(V(c));
+    const r = R(l).toLowerCase();
+    e.setHeader("Content-Type", U[r] || "application/octet-stream"), e.setHeader("Cache-Control", "public, max-age=3600"), e.end(M(c));
   }), a.middlewares.use(async (o, e, s) => {
     var c;
     if (!((c = o.url) != null && c.startsWith("/__okno/"))) return s();
@@ -113,22 +113,22 @@ function z(a, n) {
         const i = u(n, t);
         if ($(i))
           return e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, skipped: !0 }));
-        const p = await X(o);
-        return H(R(i), { recursive: !0 }), J(i, p), e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, written: t, bytes: p.length }));
+        const p = await K(o);
+        return V(E(i), { recursive: !0 }), D(i, p), e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, written: t, bytes: p.length }));
       }
       if (o.method === "POST" && l === "sync") {
-        const r = await Y(o), t = r == null ? void 0 : r.path;
+        const r = await z(o), t = r == null ? void 0 : r.path;
         if (t) {
           const f = u(n, t);
-          return I(a, t, f), e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, invalidated: t }));
+          return F(a, t, f), e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, invalidated: t }));
         }
-        const i = B(n), p = await i.revparse(["--show-toplevel"]), m = D(p.trim(), n);
+        const i = A(n), p = await i.revparse(["--show-toplevel"]), m = L(p.trim(), n);
         try {
           const f = await i.pull();
           for (const d of f.files)
             if (d.startsWith(`${m}/`)) {
               const h = d.slice(`${m}/`.length), g = u(n, h);
-              I(a, h, g);
+              F(a, h, g);
             }
           return e.setHeader("Content-Type", "application/json"), e.end(JSON.stringify({ ok: !0, files: f.files }));
         } catch (f) {
@@ -143,13 +143,13 @@ function z(a, n) {
     }
   });
 }
-function X(a) {
+function K(a) {
   return new Promise((n, o) => {
     const e = [];
     a.on("data", (s) => e.push(s)), a.on("end", () => n(Buffer.concat(e))), a.on("error", o);
   });
 }
-function Y(a) {
+function z(a) {
   return new Promise((n) => {
     let o = "";
     a.on("data", (e) => {
@@ -163,7 +163,7 @@ function Y(a) {
     }), a.on("error", () => n(null));
   });
 }
-function I(a, n, o) {
+function F(a, n, o) {
   const e = "\0okno:";
   let s;
   if (n.startsWith("pages/") ? s = e + "pages" : n.startsWith("collections/") ? s = e + "collections" : n.startsWith("globals/") && (s = e + "globals"), s) {
@@ -175,8 +175,8 @@ function I(a, n, o) {
     });
   }
 }
-const Z = "okno:", O = "\0okno:", L = R(U(import.meta.url)), k = y(L, "../../editor"), Q = y(L, "../runtime");
-function ct(a = {}) {
+const X = "okno:", T = "\0okno:", Y = E(G(import.meta.url)), Z = I(Y, "../runtime");
+function lt(a = {}) {
   const n = a.dir ?? "okno";
   let o, e;
   return a.isEditor, {
@@ -202,36 +202,24 @@ function ct(a = {}) {
               `**/${n}/files/**`
             ]
           }
-        },
-        resolve: {
-          alias: {
-            "@modules": y(k, "modules"),
-            "@lib": y(k, "lib"),
-            "@controllers": y(k, "controllers"),
-            "@components": y(k, "components"),
-            "@pages": y(k, "pages"),
-            "@assets": y(k, "assets"),
-            "@/types": y(k, "lib/types"),
-            "@logger": y(k, "lib/logger.svelte")
-          }
         }
       };
     },
     configResolved(s) {
-      o = s.root, e = y(o, n);
+      o = s.root, e = I(o, n);
     },
     async buildStart() {
-      $(e) && await E(e);
+      $(e) && await C(e);
     },
     configureServer(s) {
-      z(s, e);
+      B(s, e);
     },
     async handleHotUpdate(s) {
       const l = u(e, "schema.ts"), c = u(e, "users.json"), r = u(e, "permissions.ts"), t = u(e, "modules.d.ts");
       if (s.file === l) {
-        await E(e);
+        await C(e);
         for (const i of ["pages", "collections", "globals"]) {
-          const p = s.server.moduleGraph.getModuleById(O + i);
+          const p = s.server.moduleGraph.getModuleById(T + i);
           p && s.server.moduleGraph.invalidateModule(p);
         }
         return [];
@@ -240,33 +228,33 @@ function ct(a = {}) {
         return [];
     },
     resolveId(s) {
-      if (s.startsWith(Z))
+      if (s.startsWith(X))
         return "\0" + s;
     },
     async load(s) {
-      if (!s.startsWith(O)) return;
-      const l = s.slice(O.length);
+      if (!s.startsWith(T)) return;
+      const l = s.slice(T.length);
       if (l === "runtime")
-        return `export { __oknoWrap } from "${u(Q, "wrap.ts")}"`;
+        return `export { __oknoWrap } from "${u(Z, "wrap.ts")}"`;
       if (l === "pages") {
-        const c = await j(o, "pages");
-        return await et(e, c);
+        const c = await W(o, "pages");
+        return await tt(e, c);
       }
       if (l === "collections") {
-        const c = await j(o, "collections");
-        return await ot(e, c);
+        const c = await W(o, "collections");
+        return await et(e, c);
       }
       if (l === "globals") {
-        const c = await j(o, "globals");
-        return await nt(e, c);
+        const c = await W(o, "globals");
+        return await ot(e, c);
       }
     }
   };
 }
-async function N(a) {
-  return $(a) ? (await v(a)).filter((o) => o.endsWith(".ts") && o !== "index.ts") : [];
+async function v(a) {
+  return $(a) ? (await y(a)).filter((o) => o.endsWith(".ts") && o !== "index.ts") : [];
 }
-const q = /* @__PURE__ */ new Set([".astro", ".svelte", ".ts", ".tsx", ".js", ".jsx", ".mjs", ".vue"]), tt = /* @__PURE__ */ new Set([
+const Q = /* @__PURE__ */ new Set([".astro", ".svelte", ".ts", ".tsx", ".js", ".jsx", ".mjs", ".vue"]), q = /* @__PURE__ */ new Set([
   "node_modules",
   ".astro",
   ".svelte-kit",
@@ -278,18 +266,18 @@ const q = /* @__PURE__ */ new Set([".astro", ".svelte", ".ts", ".tsx", ".js", ".
   ".git",
   ".turbo"
 ]);
-async function j(a, n) {
+async function W(a, n) {
   const o = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*["']okno:${n}["']`, "g"), e = /* @__PURE__ */ new Set();
   async function s(l) {
     var r;
     let c;
     try {
-      c = await v(l, { withFileTypes: !0 });
+      c = await y(l, { withFileTypes: !0 });
     } catch {
       return;
     }
     for (const t of c) {
-      if (t.name.startsWith(".") && t.name !== "." || tt.has(t.name)) continue;
+      if (t.name.startsWith(".") && t.name !== "." || q.has(t.name)) continue;
       const i = u(l, t.name);
       if (t.isDirectory()) {
         await s(i);
@@ -298,10 +286,10 @@ async function j(a, n) {
       const p = t.name.lastIndexOf(".");
       if (p === -1) continue;
       const m = t.name.slice(p);
-      if (!q.has(m)) continue;
+      if (!Q.has(m)) continue;
       let f;
       try {
-        f = await A(i, "utf-8");
+        f = await J(i, "utf-8");
       } catch {
         continue;
       }
@@ -317,25 +305,25 @@ async function j(a, n) {
   }
   return await s(a), e;
 }
-function S(a) {
+function N(a) {
   return a.replace(".ts", "").replace(/-/g, "_");
 }
-function x(a) {
+function S(a) {
   return a.replace(".ts", "").replace(/-/g, "_");
 }
-function C(a) {
+function O(a) {
   return a.replace(".ts", "");
 }
-async function et(a, n = /* @__PURE__ */ new Set()) {
+async function tt(a, n = /* @__PURE__ */ new Set()) {
   const o = u(a, "pages"), e = [
     'import { __oknoWrap } from "okno:runtime"'
   ], s = /* @__PURE__ */ new Set();
   if ($(o)) {
-    const c = (await v(o, { withFileTypes: !0 })).filter((t) => t.isDirectory()).map((t) => t.name);
+    const c = (await y(o, { withFileTypes: !0 })).filter((t) => t.isDirectory()).map((t) => t.name);
     if (c.length > 0) {
-      const t = c[0], i = await N(u(o, t));
+      const t = c[0], i = await v(u(o, t));
       for (const p of i) {
-        const m = S(p), f = x(p), d = [], h = [];
+        const m = N(p), f = S(p), d = [], h = [];
         for (const g of c) {
           const w = u(o, g, p);
           if ($(w)) {
@@ -346,9 +334,9 @@ async function et(a, n = /* @__PURE__ */ new Set()) {
         e.push(...d), e.push(`const _${m} = { ${h.join(", ")} }`), e.push(`export const ${f} = __oknoWrap(_${m}, "${f}")`), s.add(f);
       }
     } else {
-      const t = await N(o);
+      const t = await v(o);
       for (const i of t) {
-        const p = S(i), m = x(i), f = C(i), d = u(o, i);
+        const p = N(i), m = S(i), f = O(i), d = u(o, i);
         e.push(`import _${p} from "${d}"`), e.push(`export const ${m} = __oknoWrap(_${p}, "${f}")`), s.add(m);
       }
     }
@@ -358,7 +346,7 @@ async function et(a, n = /* @__PURE__ */ new Set()) {
   return e.join(`
 `);
 }
-async function ot(a, n = /* @__PURE__ */ new Set()) {
+async function et(a, n = /* @__PURE__ */ new Set()) {
   const o = u(a, "collections");
   if (!$(o)) {
     const t = [];
@@ -369,7 +357,7 @@ async function ot(a, n = /* @__PURE__ */ new Set()) {
     return t.join(`
 `) || "export {}";
   }
-  const e = await v(o, { withFileTypes: !0 }), s = e.filter((t) => t.isDirectory() && /^[a-z]{2}(-[a-z]{2})?$/.test(t.name)).map((t) => t.name), l = e.filter((t) => t.isDirectory() && !s.includes(t.name)).map((t) => t.name), c = s.length > 0, r = [
+  const e = await y(o, { withFileTypes: !0 }), s = e.filter((t) => t.isDirectory() && /^[a-z]{2}(-[a-z]{2})?$/.test(t.name)).map((t) => t.name), l = e.filter((t) => t.isDirectory() && !s.includes(t.name)).map((t) => t.name), c = s.length > 0, r = [
     'import { __oknoWrap } from "okno:runtime"'
   ];
   if (c) {
@@ -377,14 +365,14 @@ async function ot(a, n = /* @__PURE__ */ new Set()) {
     for (const i of l) {
       const p = u(o, t, i);
       if (!$(p)) continue;
-      const m = await N(p), f = [];
+      const m = await v(p), f = [];
       for (const d of m) {
-        const h = `_${i}_${S(d)}`, g = x(d), w = [], _ = [];
-        for (const P of s) {
-          const F = u(o, P, i, d);
-          if ($(F)) {
-            const T = `${h}_${P}`;
-            w.push(`import ${T} from "${F}"`), P === t ? _.push(`...${T}`) : _.push(`${P}: { ...${h}_${t}, ...${T} }`);
+        const h = `_${i}_${N(d)}`, g = S(d), w = [], _ = [];
+        for (const b of s) {
+          const j = u(o, b, i, d);
+          if ($(j)) {
+            const x = `${h}_${b}`;
+            w.push(`import ${x} from "${j}"`), b === t ? _.push(`...${x}`) : _.push(`${b}: { ...${h}_${t}, ...${x} }`);
           }
         }
         r.push(...w), r.push(`const ${h} = { ${_.join(", ")} }`), f.push(`__oknoWrap(${h}, "${i}.${g}")`);
@@ -393,9 +381,9 @@ async function ot(a, n = /* @__PURE__ */ new Set()) {
     }
   } else
     for (const t of l) {
-      const i = u(o, t), p = await N(i), m = [], f = t.replace(/-/g, "_");
+      const i = u(o, t), p = await v(i), m = [], f = t.replace(/-/g, "_");
       for (const d of p) {
-        const h = `_${f}_${S(d)}`, g = C(d);
+        const h = `_${f}_${N(d)}`, g = O(d);
         r.push(`import ${h} from "${u(i, d)}"`), m.push(`__oknoWrap(${h}, "${t}.${g}")`);
       }
       r.push(`export const ${f} = [${m.join(", ")}]`);
@@ -403,16 +391,16 @@ async function ot(a, n = /* @__PURE__ */ new Set()) {
   return r.join(`
 `);
 }
-async function nt(a, n = /* @__PURE__ */ new Set()) {
+async function ot(a, n = /* @__PURE__ */ new Set()) {
   const o = u(a, "globals"), e = [
     'import { __oknoWrap } from "okno:runtime"'
   ], s = /* @__PURE__ */ new Set();
   if ($(o)) {
-    const c = (await v(o, { withFileTypes: !0 })).filter((t) => t.isDirectory()).map((t) => t.name);
+    const c = (await y(o, { withFileTypes: !0 })).filter((t) => t.isDirectory()).map((t) => t.name);
     if (c.length > 0) {
-      const t = c[0], i = await N(u(o, t));
+      const t = c[0], i = await v(u(o, t));
       for (const p of i) {
-        const m = S(p), f = x(p), d = [], h = [];
+        const m = N(p), f = S(p), d = [], h = [];
         for (const g of c) {
           const w = u(o, g, p);
           if ($(w)) {
@@ -423,9 +411,9 @@ async function nt(a, n = /* @__PURE__ */ new Set()) {
         e.push(...d), e.push(`const _${m} = { ${h.join(", ")} }`), e.push(`export const ${f} = __oknoWrap(_${m}, "${f}")`), s.add(f);
       }
     } else {
-      const t = await N(o);
+      const t = await v(o);
       for (const i of t) {
-        const p = S(i), m = x(i), f = C(i), d = u(o, i);
+        const p = N(i), m = S(i), f = O(i), d = u(o, i);
         e.push(`import _${p} from "${d}"`), e.push(`export const ${m} = __oknoWrap(_${p}, "${f}")`), s.add(m);
       }
     }
@@ -436,5 +424,5 @@ async function nt(a, n = /* @__PURE__ */ new Set()) {
 `);
 }
 export {
-  ct as o
+  lt as o
 };

package/dist/vite/index.js

@@ -1,4 +1,4 @@
-import { o as a } from "../plugin-Cwwh6E1P.js";
+import { o as a } from "../plugin-rPgNLY_g.js";
 export {
   a as okno
 };

package/dist/vite/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAepD,wBAAgB,IAAI,CAAC,MAAM,GAAE,UAAe,GAAG,MAAM,CAqHpD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAcpD,wBAAgB,IAAI,CAAC,MAAM,GAAE,UAAe,GAAG,MAAM,CAyGpD"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "okno",
 	"description": "Git-backed CMS with live editing for any Vite framework",
 	"author": "Gabriel Uhlíř",
-	"version": "1.0.0-alpha.2",
+	"version": "1.0.0-alpha.4",
 	"homepage": "https://okno.build",
 	"type": "module",
 	"types": "./dist/index.d.ts",
@@ -10,15 +10,15 @@
 	"module": "./dist/index.js",
 	"exports": {
 		".": {
-			"import": "./src/index.ts",
+			"types": "./dist/index.d.ts",
 			"default": "./dist/index.js"
 		},
 		"./vite": {
-			"import": "./src/vite/index.ts",
+			"types": "./dist/vite/index.d.ts",
 			"default": "./dist/vite/index.js"
 		},
 		"./editor": {
-			"import": "./editor/index.ts",
+			"types": "./dist/editor/index.d.ts",
 			"default": "./dist/editor/index.js"
 		}
 	},