Change custom lastId to use revision

Author: igorbrasileiro

engine/schema/builder.ts

@@ -171,16 +171,18 @@ function fileUniqueId(
   return [btoa(fileUrl), fileUrl];
 }
 
-let lastId = 0;
-export const newSchemaBuilder = (initial: SchemaData): SchemaBuilder => {
+export const newSchemaBuilder = (
+  initial: SchemaData,
+  revision: string,
+): SchemaBuilder => {
   return {
     data: initial,
     withBlockSchema(schema: BlockModule | EntrypointModule): SchemaBuilder {
       if (isEntrypoint(schema)) {
         return newSchemaBuilder({
           ...initial,
           entrypoints: [...initial.entrypoints, schema],
-        });
+        }, revision);
       }
       // routes is always entrypoints
       if (schema.blockType === "routes" && schema.inputSchema) {
@@ -193,15 +195,14 @@ export const newSchemaBuilder = (initial: SchemaData): SchemaBuilder => {
               config: schema.inputSchema,
             },
           ],
-        });
+        }, revision);
       }
       return newSchemaBuilder({
         ...initial,
         blockModules: [...initial.blockModules, schema],
-      });
+      }, revision);
     },
     build() {
-      // lastId = 0;
       const schemeableId = (
         schemeable: Schemeable,
         resolvePath = true,
@@ -371,7 +372,7 @@ export const newSchemaBuilder = (initial: SchemaData): SchemaBuilder => {
 
       const finalDefsWith$id = Object.fromEntries(
         Object.entries(finalDefs).map((entry, idx) => {
-          entry[1] = { ...entry[1], $id: `#/${idx}-${lastId}` };
+          entry[1] = { ...entry[1], $id: `#/${idx}-${revision}` };
           return entry;
         }),
       );

engine/schema/gen.ts

@@ -65,8 +65,9 @@ const resolveImport = (path: string) => {
 
 export const genSchemasFromManifest = async (
   manifest: AppManifest,
-  baseDir?: string,
+  baseDir: string | undefined = undefined,
   importMap: ImportMap = { imports: {} },
+  revision: Promise<string>,
 ): Promise<Schemas> => {
   const { baseUrl: _ignore, name: _ignoreName, ...manifestBlocks } = manifest;
   const dir = toFileUrl(baseDir ? baseDir : Deno.cwd()).toString();
@@ -82,11 +83,12 @@ export const genSchemasFromManifest = async (
     },
     {} as Record<string, JSONSchema7>,
   );
+  const rev = await revision;
   const schemaBuilder = newSchemaBuilder({
     schema: { root: rootWithBlocks, definitions: {} },
     blockModules: [],
     entrypoints: [],
-  });
+  }, rev);
 
   const refPromises: Promise<
     (BlockModule | EntrypointModule | undefined)

engine/schema/lazy.ts

@@ -154,7 +154,11 @@ export const lazySchemaFor = (ctx: Omit<DecoContext, "schema">): LazySchema => {
           const { manifest, importMap } = await ctx.runtime!;
           _cached = incorporateSavedBlocksIntoSchema(
             manifest,
-            await genSchemas(manifest, importMap),
+            await genSchemas(
+              manifest,
+              importMap,
+              ctx.release?.revision() ?? Promise.resolve(""),
+            ),
             {
               ...await ctx.release!.state(),
             },

engine/schema/reader.ts

@@ -7,12 +7,14 @@ import type { AppManifest } from "../../types.ts";
 export const genSchemas = async (
   manifest: AppManifest,
   importMap: ImportMap = { imports: {} },
+  revision: Promise<string>,
 ) => {
   const base = Deno.cwd();
   const schema = await genSchemasFromManifest(
     manifest,
     base,
     importMap,
+    revision,
   );
 
   if (!context.isDeploy) {