@epic-web/workshop-utils 6.63.0 → 6.64.0

package/dist/cache.server.d.ts

@@ -12,6 +12,11 @@ export declare function epicCacheReporter<Value>({ formatDuration, performance,
     performance?: Pick<typeof Date, 'now'>;
 }): CreateReporter<Value>;
 export declare const solutionAppCache: C.Cache<{
+    name: string;
+    title: string;
+    dirName: string;
+    fullPath: string;
+    relativePath: string;
     test: {
         type: "browser";
         pathname: string;
@@ -22,33 +27,33 @@ export declare const solutionAppCache: C.Cache<{
     } | {
         type: "none";
     };
-    type: "solution";
-    title: string;
-    name: string;
-    fullPath: string;
     dev: {
         type: "browser";
         pathname: string;
     } | {
         type: "script";
-        initialRoute: string;
         portNumber: number;
+        initialRoute: string;
     } | {
         type: "export";
         pathname: string;
     } | {
         type: "none";
     };
-    dirName: string;
-    relativePath: string;
     stackBlitzUrl: string | null;
     exerciseNumber: number;
     stepNumber: number;
+    type: "solution";
     problemName: string | null;
     instructionsCode?: string | undefined;
     epicVideoEmbeds?: string[] | undefined;
 }>;
 export declare const problemAppCache: C.Cache<{
+    name: string;
+    title: string;
+    dirName: string;
+    fullPath: string;
+    relativePath: string;
     test: {
         type: "browser";
         pathname: string;
@@ -59,33 +64,33 @@ export declare const problemAppCache: C.Cache<{
     } | {
         type: "none";
     };
-    type: "problem";
-    title: string;
-    name: string;
-    fullPath: string;
     dev: {
         type: "browser";
         pathname: string;
     } | {
         type: "script";
-        initialRoute: string;
         portNumber: number;
+        initialRoute: string;
     } | {
         type: "export";
         pathname: string;
     } | {
         type: "none";
     };
-    dirName: string;
-    relativePath: string;
     stackBlitzUrl: string | null;
     exerciseNumber: number;
     stepNumber: number;
+    type: "problem";
     solutionName: string | null;
     instructionsCode?: string | undefined;
     epicVideoEmbeds?: string[] | undefined;
 }>;
 export declare const extraAppCache: C.Cache<{
+    name: string;
+    title: string;
+    dirName: string;
+    fullPath: string;
+    relativePath: string;
     test: {
         type: "browser";
         pathname: string;
@@ -96,30 +101,30 @@ export declare const extraAppCache: C.Cache<{
     } | {
         type: "none";
     };
-    type: "extra";
-    title: string;
-    name: string;
-    fullPath: string;
     dev: {
         type: "browser";
         pathname: string;
     } | {
         type: "script";
-        initialRoute: string;
         portNumber: number;
+        initialRoute: string;
     } | {
         type: "export";
         pathname: string;
     } | {
         type: "none";
     };
-    dirName: string;
-    relativePath: string;
     stackBlitzUrl: string | null;
+    type: "extra";
     instructionsCode?: string | undefined;
     epicVideoEmbeds?: string[] | undefined;
 }>;
 export declare const playgroundAppCache: C.Cache<{
+    name: string;
+    title: string;
+    dirName: string;
+    fullPath: string;
+    relativePath: string;
     test: {
         type: "browser";
         pathname: string;
@@ -130,26 +135,21 @@ export declare const playgroundAppCache: C.Cache<{
     } | {
         type: "none";
     };
-    type: "playground";
-    title: string;
-    name: string;
-    fullPath: string;
     dev: {
         type: "browser";
         pathname: string;
     } | {
         type: "script";
-        initialRoute: string;
         portNumber: number;
+        initialRoute: string;
     } | {
         type: "export";
         pathname: string;
     } | {
         type: "none";
     };
-    dirName: string;
-    relativePath: string;
     stackBlitzUrl: string | null;
+    type: "playground";
     appName: string;
     isUpToDate: boolean;
     instructionsCode?: string | undefined;
@@ -217,10 +217,10 @@ export declare const checkForUpdatesCache: {
 export declare const notificationsCache: {
     name: string;
     set: (key: string, value: C.CacheEntry<{
+        id: string;
+        title: string;
         message: string;
         type: "info" | "warning" | "danger";
-        title: string;
-        id: string;
         expiresAt: Date | null;
         link?: string | undefined;
         products?: {
@@ -228,10 +228,10 @@ export declare const notificationsCache: {
             slug?: string | undefined;
         }[] | undefined;
     }[]>) => C.CacheEntry<{
+        id: string;
+        title: string;
         message: string;
         type: "info" | "warning" | "danger";
-        title: string;
-        id: string;
         expiresAt: Date | null;
         link?: string | undefined;
         products?: {
@@ -240,10 +240,10 @@ export declare const notificationsCache: {
         }[] | undefined;
     }[]>;
     get: (key: string) => C.CacheEntry<{
+        id: string;
+        title: string;
         message: string;
         type: "info" | "warning" | "danger";
-        title: string;
-        id: string;
         expiresAt: Date | null;
         link?: string | undefined;
         products?: {
@@ -263,7 +263,7 @@ export declare const discordCache: C.Cache<unknown>;
 export declare const epicApiCache: C.Cache<unknown>;
 export declare function makeGlobalFsCache<CacheEntryType>(name: string): C.Cache<CacheEntryType>;
 export declare const githubCache: C.Cache<unknown>;
-export declare const WorkshopCacheSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+export declare const WorkshopCacheSchema: z.ZodPipe<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodObject<{
     key: z.ZodString;
     entry: z.ZodObject<{
         value: z.ZodUnknown;
@@ -271,81 +271,27 @@ export declare const WorkshopCacheSchema: z.ZodEffects<z.ZodRecord<z.ZodString,
             createdTime: z.ZodNumber;
             ttl: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             swr: z.ZodOptional<z.ZodNumber>;
-        }, "strip", z.ZodTypeAny, {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        }, {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        metadata: {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        };
-        value?: unknown;
-    }, {
-        metadata: {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        };
-        value?: unknown;
-    }>;
+        }, z.core.$strip>;
+    }, z.core.$strip>;
     size: z.ZodOptional<z.ZodNumber>;
     filepath: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    key: string;
-    entry: {
-        metadata: {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        };
-        value?: unknown;
-    };
-    size?: number | undefined;
-    filepath?: string | undefined;
-}, {
-    key: string;
-    entry: {
-        metadata: {
-            createdTime: number;
-            ttl?: number | null | undefined;
-            swr?: number | undefined;
-        };
-        value?: unknown;
-    };
-    size?: number | undefined;
-    filepath?: string | undefined;
-}>, z.ZodObject<{
+}, z.core.$strip>, z.ZodObject<{
     error: z.ZodString;
     size: z.ZodNumber;
     skipped: z.ZodLiteral<true>;
-}, "strip", z.ZodTypeAny, {
-    size: number;
-    error: string;
-    skipped: true;
-}, {
-    size: number;
-    error: string;
-    skipped: true;
-}>]>>>>, {
+}, z.core.$strip>]>>>>, z.ZodTransform<{
     workshopId: string;
     caches: Array<{
         name: string;
         entries: Array<{
             key: string;
             entry: {
+                value: unknown;
                 metadata: {
                     createdTime: number;
                     ttl?: number | null | undefined;
                     swr?: number | undefined;
                 };
-                value?: unknown;
             };
             size?: number | undefined;
             filepath?: string | undefined;
@@ -362,20 +308,20 @@ export declare const WorkshopCacheSchema: z.ZodEffects<z.ZodRecord<z.ZodString,
 }[], Record<string, Record<string, Record<string, {
     key: string;
     entry: {
+        value: unknown;
         metadata: {
             createdTime: number;
             ttl?: number | null | undefined;
             swr?: number | undefined;
         };
-        value?: unknown;
     };
     size?: number | undefined;
     filepath?: string | undefined;
 } | {
-    size: number;
     error: string;
+    size: number;
     skipped: true;
-}>>>>;
+}>>>>>;
 export declare function getAllWorkshopCaches(): Promise<{
     workshopId: string;
     caches: Array<{
@@ -383,12 +329,12 @@ export declare function getAllWorkshopCaches(): Promise<{
         entries: Array<{
             key: string;
             entry: {
+                value: unknown;
                 metadata: {
                     createdTime: number;
                     ttl?: number | null | undefined;
                     swr?: number | undefined;
                 };
-                value?: unknown;
             };
             size?: number | undefined;
             filepath?: string | undefined;
@@ -411,12 +357,12 @@ export declare function getGlobalCaches(): Promise<{
         entries: Array<{
             key: string;
             entry: {
+                value: unknown;
                 metadata: {
                     createdTime: number;
                     ttl?: number | null | undefined;
                     swr?: number | undefined;
                 };
-                value?: unknown;
             };
             size?: number | undefined;
             filepath?: string | undefined;

package/dist/cache.server.js

@@ -348,8 +348,14 @@ const SkippedFileSchema = z.object({
 });
 // Combined schema that can handle both cache entries and skipped files
 const CacheFileSchema = z.union([CacheEntrySchema, SkippedFileSchema]);
+const isSkippedFile = (value) => {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'skipped' in value &&
+        value.skipped === true);
+};
 export const WorkshopCacheSchema = z
-    .record(z.record(z.record(CacheFileSchema)))
+    .record(z.string(), z.record(z.string(), z.record(z.string(), CacheFileSchema)))
     .transform((workshopCaches) => {
     const cachesArray = [];
     for (const [workshopId, caches] of Object.entries(workshopCaches)) {
@@ -358,10 +364,7 @@ export const WorkshopCacheSchema = z
             const entries = [];
             const skippedFiles = [];
             for (const [key, value] of Object.entries(entriesObj)) {
-                if (value &&
-                    typeof value === 'object' &&
-                    'skipped' in value &&
-                    value.skipped) {
+                if (isSkippedFile(value)) {
                     // This is a skipped file
                     skippedFiles.push({
                         filename: key,