Revert 'Validate parsed yaml file'.

We'll instead have the binding generator generate the opt-in spec schema file from spec.yaml in order to list all classes and records with their corresponding methods and fields. The validation would then also provide autocomplete in the opt-in spec file.
realm · Jun 15, 2023 · 8c7eeb0 · 8c7eeb0
1 parent 05a618f
commit 8c7eeb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/bindgen/CMakeLists.txt b/bindgen/CMakeLists.txt
@@ -25,17 +25,7 @@ add_custom_command(
         # (Right now there are no imports)
 )
 
-set(OPT_IN_SCHEMA_FILE ${CMAKE_CURRENT_SOURCE_DIR}/generated/opt-in-spec.schema.json)
-add_custom_command(
-    OUTPUT ${OPT_IN_SCHEMA_FILE}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${NPX} typescript-json-schema ${CMAKE_CURRENT_SOURCE_DIR}/tsconfig.json OptInSpec --include ${CMAKE_CURRENT_SOURCE_DIR}/src/spec/model.ts --out ${OPT_IN_SCHEMA_FILE} --required --noExtraProps
-    VERBATIM
-    MAIN_DEPENDENCY src/spec/model.ts
-    DEPENDS
-)
-
-add_custom_target(BindgenSpecJsonSchema DEPENDS ${SCHEMA_FILE} ${OPT_IN_SCHEMA_FILE})
+add_custom_target(BindgenSpecJsonSchema DEPENDS ${SCHEMA_FILE})
 
 # Stash these variables as properties so they can be read from the bindgen() function.
 # Using the BindgenSpecJsonSchema target for scoping, not because it actually has anything to do with that.

diff --git a/bindgen/src/spec.ts b/bindgen/src/spec.ts
@@ -69,10 +69,6 @@ const schemaFile = new URL("../generated/spec.schema.json", import.meta.url);
 const schemaJson = JSON.parse(fs.readFileSync(schemaFile, { encoding: "utf8" }));
 export const validate = ajv.compile<RelaxedSpec>(schemaJson);
 
-const optInSchemaFile = new URL("../generated/opt-in-spec.schema.json", import.meta.url);
-const optInSchemaJson = JSON.parse(fs.readFileSync(optInSchemaFile, { encoding: "utf8" }));
-export const validateOptInSpec = ajv.compile<OptInSpec>(optInSchemaJson);
-
 function parseYaml(filePath: string): unknown {
   const text = fs.readFileSync(filePath, { encoding: "utf8" });
   return yaml.parse(text);
@@ -117,11 +113,11 @@ export function parseSpec(filePath: string): AnySpec {
 
 export function parseOptInSpec(filePath: string): OptInSpec {
   const parsed = parseYaml(filePath);
-  const isValid = validateOptInSpec(parsed);
-  if (isValid) {
-    return parsed;
-  }
-  throw new InvalidSpecError(filePath, validateOptInSpec.errors || []);
+
+  // TODO:
+  // Validate parsed spec.
+
+  return parsed as OptInSpec;
 }
 
 /**