src/Playground.ts: use js-yaml (instead of yaml.js)

kaitai-io · Feb 4, 2024 · 305c579 · 305c579
1 parent 180fee4
commit 305c579
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Playground.html b/Playground.html
@@ -10,11 +10,11 @@
 <body>
 <script>
     loader.paths = {
-        "yamljs": "lib/_npm/yamljs/yaml",
+        "js-yaml": "../../lib/_npm/js-yaml/js-yaml.min",
         "KaitaiStream": "lib/_npm/kaitai-struct/KaitaiStream",
         "kaitai-struct-compiler": "lib/_npm/kaitai-struct-compiler/kaitai-struct-compiler"
     };
- 
+
     require(["Playground"]);
 </script>
 </body>

diff --git a/src/Playground.ts b/src/Playground.ts
@@ -1,6 +1,6 @@
 import KaitaiStructCompiler = require("kaitai-struct-compiler");
 import KaitaiStream = require("KaitaiStream");
-import { YAML } from "yamljs";
+import * as jsyaml from "js-yaml";
 import { TemplateCompiler, ITemplateSchema } from "./worker/TemplateCompiler";
 import { ExpressionParser } from "./worker/ExpressionLanguage/ExpressionParser";
 
@@ -31,8 +31,8 @@ async function run() {
 
     const ksyContent = await (await fetch("template_compiler/test.ksy")).text();
     const templateContent = await (await fetch("template_compiler/test.kcy.yaml")).text();
-    const ksy = <KsySchema.IKsyFile>YAML.parse(ksyContent, null, null, true);
-    const kcy = <ITemplateSchema>YAML.parse(templateContent);
+    const ksy = <KsySchema.IKsyFile>jsyaml.load(ksyContent, { schema: jsyaml.CORE_SCHEMA });
+    const kcy = <ITemplateSchema>jsyaml.load(templateContent, { schema: jsyaml.CORE_SCHEMA });
 
     const compiledTemplate = TemplateCompiler.compileTemplateSchema(kcy);
     console.log("compiledTemplate", compiledTemplate);