alinea 0.6.2 → 0.6.4

package/dist/backend/Database.js

@@ -20,6 +20,7 @@ import {
   Type,
   Workspace,
   createId,
+  slugify,
   unreachable
 } from "alinea/core";
 import { entryInfo, entryUrl } from "alinea/core/EntryFilenames";
@@ -444,7 +445,7 @@ ${JSON.stringify(mutation)}`
       workspace: meta.workspace,
       root: meta.root,
       filePath: meta.filePath,
-      seeded: Boolean(seed || alineaMeta.seeded || false),
+      seeded: seed?.filePath ?? null,
       modifiedAt: Date.now(),
       // file.modifiedAt,
       active: false,
@@ -478,10 +479,11 @@ ${JSON.stringify(mutation)}`
           const target = locale ? `/${locale}` : "/";
           while (pages.length > 0) {
             const [pagePath, page] = pages.shift();
+            const path = pagePath.split("/").map(slugify).join("/");
             if (!PageSeed.isPageSeed(page))
               continue;
             const { type } = PageSeed.data(page);
-            const filePath = paths.join(target, pagePath) + ".json";
+            const filePath = paths.join(target, path) + ".json";
             const typeName = typeNames.get(type);
             if (!typeName)
               continue;
@@ -493,7 +495,7 @@ ${JSON.stringify(mutation)}`
               page
             });
             const children = entries(page).map(
-              ([childPath, child]) => [paths.join(pagePath, childPath), child]
+              ([childPath, child]) => [paths.join(path, childPath), child]
             );
             pages.push(...children);
           }
@@ -511,7 +513,6 @@ ${JSON.stringify(mutation)}`
       const seenSeeds = /* @__PURE__ */ new Set();
       const inserted = [];
       for await (const file of source.entries()) {
-        const seed = this.seed.get(file.filePath);
         const fileHash = await createFileHash(file.contents);
         const exists2 = await query(
           EntryRow({
@@ -519,20 +520,29 @@ ${JSON.stringify(mutation)}`
             filePath: file.filePath,
             workspace: file.workspace,
             root: file.root
-          }).select(EntryRow.versionId).maybeFirst()
+          }).select({
+            versionId: EntryRow.versionId,
+            seeded: EntryRow.seeded
+          }).maybeFirst()
         );
-        if (seed) {
-          seenSeeds.add(seed.filePath);
-        }
         if (exists2) {
-          seenVersions.push(exists2);
+          seenVersions.push(exists2.versionId);
+          if (exists2.seeded)
+            seenSeeds.add(exists2.seeded);
+          else
+            seenSeeds.add(file.filePath);
           continue;
         }
         try {
           const raw = JsonLoader.parse(this.config.schema, file.contents);
-          const entry = this.computeEntry(EntryRecord(raw), file, seed);
-          if (entry.seeded && entry.phase === EntryPhase.Published && !seed)
-            throw new Error(`seed entry is missing from config`);
+          const record = EntryRecord(raw);
+          const seeded = record[META_KEY]?.seeded;
+          const seed = typeof seeded === "string" ? this.seed.get(seeded) : void 0;
+          const entry = this.computeEntry(record, file, seed);
+          if (seed)
+            seenSeeds.add(seed.filePath);
+          else
+            seenSeeds.add(file.filePath);
           await query(
             EntryRow({ entryId: entry.entryId, phase: entry.phase }).delete()
           );
@@ -547,22 +557,32 @@ ${JSON.stringify(mutation)}`
           console.log(`> skipped ${file.filePath} \u2014 ${e2.message}`);
         }
       }
-      const seedPaths = Array.from(this.seed.keys());
-      for (const seedPath of seedPaths) {
+      const stableI18nIds = /* @__PURE__ */ new Map();
+      for (const [seedPath, seed] of this.seed.entries()) {
         if (seenSeeds.has(seedPath))
           continue;
-        const seed = this.seed.get(seedPath);
         const { type, partial } = PageSeed.data(seed.page);
         const typeName = typeNames.get(type);
         if (!typeName)
           continue;
+        const root = this.config.workspaces[seed.workspace][seed.root];
+        const { i18n } = Root.data(root);
+        let i18nId = createId();
+        if (i18n) {
+          const [, locale, ...rest] = seed.filePath.split("/");
+          const path = rest.join("/");
+          i18nId = stableI18nIds.get(path) ?? createId();
+          stableI18nIds.set(path, i18nId);
+        }
         const entry = this.computeEntry(
           {
             title: partial.title ?? "",
             [META_KEY]: {
               entryId: createId(),
+              i18nId,
               type: typeName,
-              index: "a0"
+              index: "a0",
+              seeded: seed.filePath
             }
           },
           seed,
@@ -578,7 +598,6 @@ ${JSON.stringify(mutation)}`
         inserted.push(`${entry.entryId}.${entry.phase}`);
         publishSeed.push({
           ...withHash,
-          seeded: true,
           title: void 0,
           data: {}
         });

package/dist/backend/Handler.d.ts

@@ -40,7 +40,7 @@ export declare class Handler implements Resolver {
         entryId: string;
         phase: EntryPhase;
         type: string;
-        seeded: boolean;
+        seeded: string | null;
         workspace: string;
         root: string;
         level: number;

package/dist/backend/Handler.js

@@ -43,7 +43,7 @@ var Handler = class {
       this.parsePreview.bind(this)
     );
     this.changes = new ChangeSetCreator(options.config);
-    const auth = options.auth || Auth.anonymous();
+    const auth = options.auth ?? Auth.anonymous();
     this.connect = (ctx) => new HandlerConnection(this, ctx);
     this.router = createRouter(auth, this.connect);
   }
@@ -169,8 +169,8 @@ var HandlerConnection = class {
     const { previews } = this.handler.options;
     const user = this.ctx.user;
     if (!user)
-      return previews.sign({ anonymous: true });
-    return previews.sign({ sub: user.sub });
+      throw new Error("Unauthorized, user not available");
+    return previews.sign(user);
   }
   // Media
   prepareUpload(file) {

package/dist/backend/Previews.d.ts

@@ -1,9 +1,5 @@
-export type PreviewTokenPayload = {
-    sub: string;
-} | {
-    anonymous: true;
-};
+import { User } from 'alinea/core';
 export interface Previews {
-    sign(data: PreviewTokenPayload): Promise<string>;
-    verify(token: string): Promise<PreviewTokenPayload>;
+    sign(data: User): Promise<string>;
+    verify(token: string): Promise<User>;
 }

package/dist/backend/util/JWTPreviews.d.ts

@@ -1,7 +1,8 @@
-import { PreviewTokenPayload, Previews } from '../Previews.js';
+import { User } from 'alinea/core';
+import { Previews } from '../Previews.js';
 export declare class JWTPreviews implements Previews {
     private secret;
     constructor(secret: string);
-    sign(data: PreviewTokenPayload): Promise<string>;
-    verify(token: string): Promise<PreviewTokenPayload>;
+    sign(data: User): Promise<string>;
+    verify(token: string): Promise<User>;
 }

package/dist/chunks/{chunk-FO7WYIGB.js → chunk-TFVRT7UJ.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "0.6.2",
+  version: "0.6.4",
   license: "MIT",
   type: "module",
   scripts: {
@@ -39,17 +39,6 @@ var package_default = {
   files: [
     "dist"
   ],
-  workspaces: [
-    "apps/web",
-    "apps/dev",
-    "src/backend",
-    "src/cli",
-    "src/core",
-    "src/dashboard",
-    "src/ui",
-    "src/auth/passwordless",
-    "src/input/richtext"
-  ],
   dependencies: {
     "@alinea/iso": "^0.3.1",
     "@alinea/sqlite-wasm": "^0.1.14",