Export jwt and daemon packages (#843)

* Export jwt and daemon packages Signed-off-by: Marcos Candeia <[email protected]> * Fix slow types Signed-off-by: Marcos Candeia <[email protected]> --------- Signed-off-by: Marcos Candeia <[email protected]>
deco-cx · Sep 18, 2024 · ff1f3c1 · ff1f3c1
1 parent 9243f8f
commit ff1f3c1
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 7 deletions.
diff --git a/commons/jwt/jwks.ts b/commons/jwt/jwks.ts
@@ -29,7 +29,7 @@ const fetchKeyFromAddr = async (
   if (!response.ok) {
     return null;
   }
-  const { keys = [] } = await response.json<JwksKeys>();
+  const { keys = [] } = await response.json() as JwksKeys;
   const key = kid ? keys.find((key) => key?.kid === kid) ?? keys[0] : keys[0];
   if (!key) {
     return null;

diff --git a/commons/jwt/keys.ts b/commons/jwt/keys.ts
@@ -71,7 +71,7 @@ export const setFromString = (publicKey: string, privateKey: string) => {
 /**
  * Returns a tuple of [publicKey, privateKey] in a JsonWebKey format.
  */
-export const getKeyPair = async () => {
+export const getKeyPair = async (): Promise<[JsonWebKey, JsonWebKey]> => {
   keys ??= getOrGenerateKeyPair();
   return await keys;
 };
diff --git a/commons/jwt/mod.ts b/commons/jwt/mod.ts
@@ -0,0 +1,3 @@
+export { newJwtIssuer } from "./jwt.ts";
+export type { JwtIssuer } from "./jwt.ts";
+export { getKeyPair } from "./keys.ts";
diff --git a/daemon/cmd.ts b/daemon/cmd.ts
@@ -1,5 +1,9 @@
 import { iteratorFrom, logs } from "./loggings/stream.ts";
 
+export interface CmdAPI {
+  response: null;
+}
+
 /**
  * Returns a http handler that runs a command and pipes the output to the response
  */

diff --git a/daemon/fs/api.ts b/daemon/fs/api.ts
@@ -254,7 +254,7 @@ export const createFSAPIs = () => {
 
     const result = applyPatch(content, patch);
 
-    if (!result.conflict) {
+    if (!result.conflict && result.content) {
       await ensureFile(filepath);
       await Deno.writeTextFile(filepath, result.content);
     }

diff --git a/daemon/fs/common.ts b/daemon/fs/common.ts
@@ -84,7 +84,10 @@ const applyJSONPatch = <T>(content: T, patch: Patch["payload"]) => {
   }
 };
 
-export const applyPatch = (content: string | null, patch: Patch) => {
+export const applyPatch = (content: string | null, patch: Patch): {
+  conflict: true | false;
+  content?: string;
+} => {
   if (patch.type === "json") {
     const result = applyJSONPatch(JSON.parse(content ?? "{}"), patch.payload);
 
@@ -117,7 +120,10 @@ export const applyPatch = (content: string | null, patch: Patch) => {
   throw new Error(`Unknown patch type: ${patch.type}`);
 };
 
-export const generatePatch = (from: string | null, to: string | null) => {
+export const generatePatch = (
+  from: string | null,
+  to: string | null,
+): Patch => {
   try {
     return {
       type: "json" as const,

diff --git a/daemon/mod.ts b/daemon/mod.ts
@@ -0,0 +1,20 @@
+export type { CmdAPI } from "./cmd.ts";
+export type { DeleteAPI, ListAPI, PatchAPI, ReadAPI } from "./fs/api.ts";
+export { applyPatch, generatePatch } from "./fs/common.ts";
+export type {
+  BlockMetadata,
+  GitStatus,
+  Metadata,
+  PageBlockMetadata,
+  Patch,
+  SyncUpdate,
+} from "./fs/common.ts";
+export type {
+  CheckoutAPI,
+  GitDiffAPI,
+  GitLogAPI,
+  GitStatusAPI,
+  PublishAPI,
+  RebaseAPI,
+} from "./git.ts";
+export type { DaemonEvent } from "./sse/channel.ts";
diff --git a/deno.json b/deno.json
@@ -10,6 +10,8 @@
     "./blocks": "./blocks/mod.ts",
     "./hooks": "./hooks/mod.ts",
     "./scripts/run": "./daemon/main.ts",
+    "./daemon": "./daemon/mod.ts",
+    "./jwt": "./commons/jwt/mod.ts",
     "./scripts/bundle": "./scripts/apps/bundle.ts",
     "./scripts/dev": "./scripts/dev.ts"
   },

diff --git a/mod.ts b/mod.ts
@@ -5,11 +5,13 @@ export type {
   WorkflowContext,
 } from "./blocks/mod.ts";
 export * from "./commons/workflows/mod.ts";
+export * from "./commons/workflows/types.ts";
 export * as JsonViewer from "./components/JsonViewer.tsx";
 export type { Framework } from "./components/section.tsx";
 export * from "./deco.ts";
 export { Context } from "./deco.ts";
-export type { ValueType, WorkflowGen } from "./deps.ts";
+export { ValueType } from "./deps.ts";
+export type { WorkflowGen } from "./deps.ts";
 export type {
   Block,
   BlockFromKey,

diff --git a/mod.web.ts b/mod.web.ts
@@ -4,3 +4,14 @@ export {
   proxy,
   withManifest,
 } from "./clients/withManifest.ts";
+export type {
+  AvailableActions,
+  AvailableFunctions,
+  AvailableLoaders,
+  Invoke,
+  InvokeAsPayload,
+  InvokeResult,
+  ManifestAction,
+  ManifestFunction,
+  ManifestLoader,
+} from "./utils/invoke.types.ts";
diff --git a/scripts/codemod.ts b/scripts/codemod.ts
@@ -42,6 +42,11 @@ export const runCodeMod = async (context?: CodeModContext): Promise<void> => {
     yPrompt: false,
     targets: [
       rewriteImports({
+        "deco/blocks/mod.ts": {
+          Matcher: {
+            moduleSpecifier: EXPORTS.DECO,
+          },
+        },
         "deco/runtime/htmx/mod.ts": {
           asset: {
             moduleSpecifier: EXPORTS.HTMX,
@@ -380,6 +385,16 @@ export const runCodeMod = async (context?: CodeModContext): Promise<void> => {
           },
         },
         "deco/mod.ts": {
+          status: {
+            moduleSpecifier: EXPORTS.DECO,
+          },
+          Resolvable: {
+            moduleSpecifier: EXPORTS.DECO,
+            isTypeOnly: true,
+          },
+          shortcircuit: {
+            moduleSpecifier: EXPORTS.DECO,
+          },
           LoaderReturnType: {
             moduleSpecifier: EXPORTS.DECO,
             isTypeOnly: true,
@@ -454,6 +469,10 @@ export const runCodeMod = async (context?: CodeModContext): Promise<void> => {
             moduleSpecifier: EXPORTS.DECO,
             isTypeOnly: true,
           },
+          ActionContext: {
+            moduleSpecifier: EXPORTS.DECO,
+            isTypeOnly: true,
+          },
           FnContext: {
             moduleSpecifier: EXPORTS.DECO,
             isTypeOnly: true,
@@ -476,6 +495,12 @@ export const runCodeMod = async (context?: CodeModContext): Promise<void> => {
           notFound: {
             moduleSpecifier: EXPORTS.DECO,
           },
+          forbidden: {
+            moduleSpecifier: EXPORTS.DECO,
+          },
+          unauthorized: {
+            moduleSpecifier: EXPORTS.DECO,
+          },
           badRequest: {
             moduleSpecifier: EXPORTS.DECO,
           },
@@ -561,6 +586,9 @@ export const runCodeMod = async (context?: CodeModContext): Promise<void> => {
           PromiseOrValue: {
             moduleSpecifier: EXPORTS.UTILS,
           },
+          singleFlight: {
+            moduleSpecifier: EXPORTS.UTILS,
+          },
           notUndefined: {
             moduleSpecifier: EXPORTS.UTILS,
           },

diff --git a/utils/mod.ts b/utils/mod.ts
@@ -1,8 +1,14 @@
 export { default as JsonViewer } from "../components/JsonViewer.tsx";
-export { isAwaitable, notUndefined } from "../engine/core/utils.ts";
+export {
+  isAwaitable,
+  notUndefined,
+  singleFlight,
+} from "../engine/core/utils.ts";
 export type { PromiseOrValue } from "../engine/core/utils.ts";
 export { decoManifestBuilder } from "../engine/manifest/manifestGen.ts";
 export { adminUrlFor, isAdmin } from "./admin.ts";
 export { readFromStream } from "./http.ts";
 export { metabasePreview } from "./metabase.tsx";
 export { tryOrDefault } from "./object.ts";
+export type { DotNestedKeys } from "./object.ts";
+export { createServerTimings } from "./timings.ts";