Merge pull request #57 from robdimarco-render/robdimarco-render/SVC-1…

…626-fix-build-issue

Fix dependency and resulting build issue

buildpack/crud.ts

@@ -4,7 +4,7 @@ import { pathExists } from "../util/paths.ts";
 import { DOCKERFILE_TEMPLATE } from "./templates/dockerfile_template.ts";
 import { RenderBuildpackFile } from "./types.ts";
 
-const BUILDPACKS_VALIDATOR = ajv.compile<RenderBuildpackFile>(RenderBuildpackFile);
+const BUILDPACKS_VALIDATOR = ajv.compile(RenderBuildpackFile);
 
 export async function initDockerfile(dir: string, force: boolean) {
   const f = `${dir}/Dockerfile.render`;

commands/services/tail.ts

@@ -66,7 +66,7 @@ export const servicesTailCommand =
           throw err;
         }
 
-        const logEntryValidator = ajv.compile<LogTailEntry>(LogTailEntry);
+        const logEntryValidator = ajv.compile(LogTailEntry);
 
 
         setInterval(() => {

config/index.ts

@@ -118,9 +118,9 @@ async function buildRuntimeProfile(
 }
 
 export function validateRegion(s: string): Region {
-  if (!ajv.validate<Region>(Region, s)) {
+  if (!ajv.validate(Region, s)) {
     throw new Error(`Invalid region '${s}'. Valid regions: ${ALL_REGIONS.join(' ')}`);
   }
 
-  return s;
+  return s as Region;
 }

config/types/enums.ts

@@ -14,7 +14,7 @@ export type Region = Static<typeof Region>;
 export const ALL_REGIONS = Region.anyOf.map(i => i.const);
 
 export function assertValidRegion(s: string): asserts s is Region {
-  if (!ajv.validate<Region>(Region, s)) {
+  if (!ajv.validate(Region, s)) {
     throw new Error(`Region '${s}' is not one of: ${ALL_REGIONS.join(' ')}`);
   }
 }

deps.ts

@@ -10,10 +10,10 @@ export {
   sortBy
 } from "https://raw.githubusercontent.com/lodash/lodash/4.17.21-es/lodash.js";
 
-export { Type, type Static } from "https://deno.land/x/typebox@0.24.27/src/typebox.ts";
-export * as Typebox from "https://deno.land/x/typebox@0.24.27/src/typebox.ts";
+export { Type, type Static } from "https://deno.land/x/typebox@0.28.10/src/typebox.ts";
+export * as Typebox from "https://deno.land/x/typebox@0.28.10/src/typebox.ts";
 
-export { default as Ajv, type ErrorObject as AjvErrorObject } from "https://esm.sh/v86/[email protected]";
+export { default as Ajv } from "https://esm.sh/v86/[email protected]";
 export { default as AjvFormats } from "https://esm.sh/v86/[email protected]";
 
 export * as Cliffy from "https://deno.land/x/[email protected]/mod.ts";

errors.ts

@@ -47,7 +47,7 @@ export class ValidationFailed extends RenderCLIError {
     super(
       `Error validating object of type ${schema.title ?? schema.$id ?? 'unknown'}: ` +
       "\n\n" + 
-      (errors ?? []).map(error => ajv.errorsText([error])).join("\n")
+      (errors ?? []).map((error:any) => ajv.errorsText([error])).join("\n")
     );
   }
 }

util/ajv.ts

@@ -35,7 +35,7 @@ export function logAjvErrors(logger: Log.Logger, errors: typeof ajv.errors) {
 }
 
 export function assertType<T extends Typebox.TSchema>(schema: T, content: unknown): asserts content is Typebox.Static<T> {
-  const isValid = ajv.validate<T>(schema, content);
+  const isValid = ajv.validate(schema, content);
   if (!isValid) {
     throw new ValidationFailed(schema, ajv.errors);
   }