@akanjs/cli 3.0.0-alpha.98 → 3.0.0-beta.0

package/templates/crudPages/[__model__Id]/page.tsx

@@ -10,40 +10,35 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     filename: "_index.tsx",
     content: `
 import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
-import type { PageConfig } from "akanjs/client";
+import { ID } from "akanjs/base";
+import { page } from "akanjs/client";
 import { buttonRecipe, Link } from "akanjs/ui";
 
-interface PageProps {
-  params: { ${dict.model}Id: string };
-}
-
-export function generateHead({ params }: PageProps) {
-  const { ${dict.model}Id } = params;
-  return (
+export default page()
+  .param("${dict.model}Id", ID)
+  .config({ transition: "none" })
+  .head(({ ${dict.model}Id }) => (
     <>
       <title>{${dict.model}Id}</title>
       <meta name="description" content={${dict.model}Id} />
       <meta property="og:title" content={${dict.model}Id} />
       <meta property="og:description" content={${dict.model}Id} />
     </>
-  );
-}
-export default async function Page({ params }: PageProps) {
-  const { l } = usePage();
-  const { ${dict.model}Id } = params;
-  const [{ ${dict.model}, ${dict.model}View }] = await Promise.all([fetch.view${dict.Model}(${dict.model}Id)]);
-  return (
-    <div className="container flex flex-col gap-4">
-      <div className="flex items-center gap-4 font-bold text-lg">
-        <${dict.Model}.Zone.View view={${dict.model}View} />
-        <Link className={buttonRecipe()} href={\`/${dict.model}/\${${dict.model}.id}/edit\`}>
-          {l("base.updateModel", { model: l("${dict.model}.modelName") })}
-        </Link>
+  ))
+  .render(async ({ ${dict.model}Id }) => {
+    const { l } = usePage();
+    const [{ ${dict.model}, ${dict.model}View }] = await Promise.all([fetch.view${dict.Model}(${dict.model}Id)]);
+    return (
+      <div className="container flex flex-col gap-4">
+        <div className="flex items-center gap-4 font-bold text-lg">
+          <${dict.Model}.Zone.View view={${dict.model}View} />
+          <Link className={buttonRecipe()} href={\`/${dict.model}/\${${dict.model}.id}/edit\`}>
+            {l("base.updateModel", { model: l("${dict.model}.modelName") })}
+          </Link>
+        </div>
       </div>
-    </div>
-  );
-}
-export const pageConfig = { transition: "none" } satisfies PageConfig;
+    );
+  });
 `,
   };
 }

package/templates/crudPages/new/page.tsx

@@ -10,33 +10,34 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     filename: "_index.tsx",
     content: `
 import { type cnst, fetch, usePage, ${dict.Model} } from "@apps/${dict.appName}/client";
-import type { PageConfig } from "akanjs/client";
+import { page } from "akanjs/client";
 import { Load } from "akanjs/ui";
 
-export default function Page() {
-  const { l } = usePage();
-  const ${dict.model}Form: Partial<cnst.${dict.Model}> = {};
-  return (
-    <div className="container">
-      <div className="m-4 mt-8 flex justify-between">
-        <div className="flex items-center gap-2 text-primary text-xl">
-          + {l("base.createModel", { model: l("${dict.model}.modelName") })}
+export default page()
+  .config({ transition: "none" })
+  .render(() => {
+    const { l } = usePage();
+    const ${dict.model}Form: Partial<cnst.${dict.Model}> = {};
+    return (
+      <div className="container">
+        <div className="m-4 mt-8 flex justify-between">
+          <div className="flex items-center gap-2 text-primary text-xl">
+            + {l("base.createModel", { model: l("${dict.model}.modelName") })}
+          </div>
         </div>
+        <Load.Edit
+          className="flex flex-col items-center"
+          slice={fetch.slice.${dict.model}InPublic}
+          edit={${dict.model}Form}
+          type="form"
+          onCancel="back"
+          onSubmit="/${dict.model}"
+        >
+          <${dict.Model}.Template.General />
+        </Load.Edit>
       </div>
-      <Load.Edit
-        className="flex flex-col items-center"
-        slice={fetch.slice.${dict.model}InPublic}
-        edit={${dict.model}Form}
-        type="form"
-        onCancel="back"
-        onSubmit="/${dict.model}"
-      >
-        <${dict.Model}.Template.General />
-      </Load.Edit>
-    </div>
-  );
-}
-export const pageConfig = { transition: "none" } satisfies PageConfig;
+    );
+  });
 `,
   };
 }

package/templates/crudPages/page.tsx

@@ -10,34 +10,35 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     filename: "_index.tsx",
     content: `
 import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
-import type { PageConfig } from "akanjs/client";
+import { page } from "akanjs/client";
 import { buttonRecipe, Link } from "akanjs/ui";
 
-export default async function Page() {
-  const { l } = usePage();
-  const [{ ${dict.model}InitInPublic }] = await Promise.all([fetch.init${dict.Model}InPublic()]);
-  return (
-    <div className="container flex flex-col gap-4">
-      <div className="mt-5 h-full w-full px-5">
-        <div>{l("${dict.model}.modelName")}</div>
-        <div className="flex animate-fadeIn items-center gap-4 px-4 pt-4">
-          <div className="font-bold text-lg md:text-4xl">${dict.Model}s</div>
-          <Link className={buttonRecipe()} href="/${dict.model}/new">
-            + {l("base.createModel", { model: l("${dict.model}.modelName") })}
-          </Link>
-        </div>
-        <div>{l("${dict.model}.modelDesc")}</div>
-        <div className="mt-3 flex gap-4 px-6">
-          <${dict.Model}.Zone.Card
-            className="grid w-full animate-fadeIn grid-cols-1 justify-center gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5"
-            init={${dict.model}InitInPublic}
-          />
+export default page()
+  .config({ transition: "none" })
+  .render(async () => {
+    const { l } = usePage();
+    const [{ ${dict.model}InitInPublic }] = await Promise.all([fetch.init${dict.Model}InPublic()]);
+    return (
+      <div className="container flex flex-col gap-4">
+        <div className="mt-5 h-full w-full px-5">
+          <div>{l("${dict.model}.modelName")}</div>
+          <div className="flex animate-fadeIn items-center gap-4 px-4 pt-4">
+            <div className="font-bold text-lg md:text-4xl">${dict.Model}s</div>
+            <Link className={buttonRecipe()} href="/${dict.model}/new">
+              + {l("base.createModel", { model: l("${dict.model}.modelName") })}
+            </Link>
+          </div>
+          <div>{l("${dict.model}.modelDesc")}</div>
+          <div className="mt-3 flex gap-4 px-6">
+            <${dict.Model}.Zone.Card
+              className="grid w-full animate-fadeIn grid-cols-1 justify-center gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5"
+              init={${dict.model}InitInPublic}
+            />
+          </div>
         </div>
       </div>
-    </div>
-  );
-}
-export const pageConfig = { transition: "none" } satisfies PageConfig;
+    );
+  });
 `,
   };
 }

package/templates/crudSinglePage/page.tsx

@@ -10,32 +10,33 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     filename: "_index.tsx",
     content: `
 import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
-import type { PageConfig } from "akanjs/client";
+import { page } from "akanjs/client";
 import { buttonRecipe, Model } from "akanjs/ui";
 
-export default async function Page() {
-  const { l } = usePage();
-  const [{ ${dict.model}InitInPublic }] = await Promise.all([fetch.init${dict.Model}InPublic()]);
-  return (
-    <>
-      <div className="flex animate-fadeIn items-center gap-4 px-4 pt-4">
-        <div className="font-bold text-lg md:text-4xl">{l("${dict.model}.modelName")}</div>
-        <Model.New
-          className={buttonRecipe({ size: "sm", variant: "ghost" })}
-          slice={fetch.slice.${dict.model}InPublic}
-          renderTitle="id"
-        >
-          <${dict.Model}.Template.General />
-        </Model.New>
-      </div>
-      <${dict.Model}.Zone.Card
-        className="mt-2 grid w-full animate-fadeIn grid-cols-1 justify-center gap-4 md:grid-cols-2 xl:grid-cols-3"
-        init={${dict.model}InitInPublic}
-      />
-    </>
-  );
-}
-export const pageConfig = { transition: "none" } satisfies PageConfig;
+export default page()
+  .config({ transition: "none" })
+  .render(async () => {
+    const { l } = usePage();
+    const [{ ${dict.model}InitInPublic }] = await Promise.all([fetch.init${dict.Model}InPublic()]);
+    return (
+      <>
+        <div className="flex animate-fadeIn items-center gap-4 px-4 pt-4">
+          <div className="font-bold text-lg md:text-4xl">{l("${dict.model}.modelName")}</div>
+          <Model.New
+            className={buttonRecipe({ size: "sm", variant: "ghost" })}
+            slice={fetch.slice.${dict.model}InPublic}
+            renderTitle="id"
+          >
+            <${dict.Model}.Template.General />
+          </Model.New>
+        </div>
+        <${dict.Model}.Zone.Card
+          className="mt-2 grid w-full animate-fadeIn grid-cols-1 justify-center gap-4 md:grid-cols-2 xl:grid-cols-3"
+          init={${dict.model}InitInPublic}
+        />
+      </>
+    );
+  });
 `,
   };
 }

package/templates/lib/sig.ts

@@ -17,6 +17,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   return `
 import { FetchClient, type FetchClientType } from "akanjs/fetch";
 import { SignalRegistry, serverSignal${libs.length === 0 ? ", fetch as base" : ""} } from "akanjs/signal";
+import { Err } from "./dict";
 ${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/lib/sig";`).join("\n")}
 
 ${[...scanInfo.database.entries()]
@@ -58,6 +59,9 @@ ${serviceModules.map((module) => `export const ${module} = SignalRegistry.regist
 export const fetchSignals = [${signalNames.join(", ")}] as const;
 export type Fetch = FetchClientType<typeof fetchSignals>;
 export const fetch = FetchClient.from(...fetchSignals) as unknown as Fetch;
+// A failure restored from another process is this scope's own Err, so a server hop that rethrows one keeps its
+// dictionary key and data instead of answering the original caller with Internal Server Error.
+fetch.setErrorConstructor(Err);
 
 export const getSerializedSignal = () => fetch.serializedSignal
 `;

package/{workflow.command-m4z25a2p.js → workflow.command-nwpcdc8p.js}

@@ -3,30 +3,30 @@ import {
   Workspace,
   script,
   command
-} from "./index-cezy7yb3.js";
+} from "./index-mak3cd28.js";
 import"./index-q0y2jq9j.js";
-import"./index-q8sn827n.js";
+import"./index-2tv3fdx4.js";
 import"./index-6wwzs1bc.js";
 import {
   createWorkflowStepRegistry
-} from "./index-e82dyeqy.js";
-import"./index-n85fer99.js";
+} from "./index-gyd220p2.js";
+import"./index-kn1h7p1x.js";
 import {
   ModuleScript
-} from "./index-9bwhxrqf.js";
-import"./index-mpmyqm1y.js";
+} from "./index-8pm30m73.js";
+import"./index-pnqbkf5p.js";
 import"./index-h7yw2z9n.js";
 import {
   PrimitiveScript
-} from "./index-3vvbv974.js";
+} from "./index-4edzf1gr.js";
 import {
   ScalarScript
-} from "./index-5xdqxbn9.js";
+} from "./index-rwg2aa4f.js";
 import"./index-by5gpp8x.js";
-import"./index-0emb9eat.js";
+import"./index-ktb5njgy.js";
 import {
   WorkflowRunner
-} from "./index-h759vjfa.js";
+} from "./index-7737gxcp.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.script.ts
 import { Logger } from "akanjs/common";

package/{workspace.command-t2v12ewm.js → workspace.command-8s050m0h.js}

@@ -4,14 +4,14 @@ import {
 } from "./index-q0y2jq9j.js";
 import {
   GlobalConfig
-} from "./index-n85fer99.js";
+} from "./index-kn1h7p1x.js";
 import {
   Exec,
   Workspace,
   runner,
   script,
   command
-} from "./index-cezy7yb3.js";
+} from "./index-mak3cd28.js";
 import {
   extractAgentBlock,
   collectScopeRecipeSources,
@@ -21,7 +21,7 @@ import {
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-q8sn827n.js";
+} from "./index-2tv3fdx4.js";
 import"./index-6wwzs1bc.js";
 import {
   countBlocking,
@@ -32,41 +32,41 @@ import {
   collectRecipeSources2,
   scanRecipes2
 } from "./index-by5gpp8x.js";
-import"./index-e82dyeqy.js";
-import"./index-0emb9eat.js";
+import"./index-gyd220p2.js";
+import"./index-ktb5njgy.js";
 import"./index-h7yw2z9n.js";
 import {
   AgentScript
-} from "./index-rntcdss1.js";
+} from "./index-ne2qy0nk.js";
 import {
   ApplicationScript
-} from "./index-8qcydz5h.js";
+} from "./index-v0qh106m.js";
 import {
   LibraryScript
-} from "./index-zkvpaggp.js";
+} from "./index-259dsnz3.js";
 import"./index-hwkygn9s.js";
 import"./index-kcxmv48c.js";
 import {
   PackageScript
-} from "./index-sjak5v5b.js";
+} from "./index-ws5e0j51.js";
 import {
   getNpmRegistryUrl,
   getLatestPackageVersion
-} from "./index-vp0509kc.js";
+} from "./index-2hq52jq3.js";
 import {
   CloudScript
-} from "./index-4ravxy65.js";
+} from "./index-zry5nz81.js";
 import {
   ContextScript
-} from "./index-r50qen0z.js";
-import"./index-pgsswppj.js";
-import"./index-y74k5anj.js";
-import"./index-h759vjfa.js";
-import"./index-9bwhxrqf.js";
-import"./index-mpmyqm1y.js";
-import"./index-3vvbv974.js";
-import"./index-5xdqxbn9.js";
-import"./index-pvb4vdwr.js";
+} from "./index-600zhnve.js";
+import"./index-wt7qrtd4.js";
+import"./index-fz5q3gd7.js";
+import"./index-7737gxcp.js";
+import"./index-8pm30m73.js";
+import"./index-pnqbkf5p.js";
+import"./index-4edzf1gr.js";
+import"./index-rwg2aa4f.js";
+import"./index-j9yhg404.js";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
 import path from "path";