Fixed a YAML load/dump error (dependency upgrade)

Apicurio · May 3, 2024 · f72bc86 · f72bc86
1 parent ab6820a
commit f72bc86
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/add-aai-example.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/add-aai-example.component.ts
@@ -69,7 +69,7 @@ export class AddAsyncApiExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }
@@ -89,7 +89,7 @@ export class AddAsyncApiExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }

diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/add-example-20.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/add-example-20.component.ts
@@ -63,7 +63,7 @@ export class AddExample20DialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }

diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/add-example.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/add-example.component.ts
@@ -63,7 +63,7 @@ export class AddExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }

diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/edit-aai-example.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/edit-aai-example.component.ts
@@ -75,7 +75,7 @@ export class EditAsyncApiExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }
@@ -95,7 +95,7 @@ export class EditAsyncApiExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {
             }
@@ -221,7 +221,7 @@ export class EditAsyncApiExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {}
         }

diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/edit-example-20.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/edit-example-20.component.ts
@@ -159,7 +159,7 @@ export class EditExample20DialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {}
         }

diff --git a/ui/ui-editors/src/app/editor/_components/dialogs/edit-example.component.ts b/ui/ui-editors/src/app/editor/_components/dialogs/edit-example.component.ts
@@ -157,7 +157,7 @@ export class EditExampleDialogComponent {
         } else {
             this.model.format = CodeEditorMode.YAML;
             try {
-                YAML.safeLoad(value);
+                YAML.load(value);
                 this.model.valid = true;
             } catch (e) {}
         }

diff --git a/ui/ui-editors/src/app/editor/_components/forms/source-form.base.ts b/ui/ui-editors/src/app/editor/_components/forms/source-form.base.ts
@@ -86,7 +86,7 @@ export abstract class SourceFormComponent<T extends Node> extends AbstractBaseCo
         try {
             let newJsObject: any;
             if (this._sourceFormat === CodeEditorMode.YAML) {
-                newJsObject = YAML.safeLoad(newSource);
+                newJsObject = YAML.load(newSource);
             } else {
                 newJsObject = JSON.parse(newSource);
             }
@@ -99,6 +99,7 @@ export abstract class SourceFormComponent<T extends Node> extends AbstractBaseCo
             this._source.valid = true;
         } catch (e) {
             // OK to suppress this - it's likely the case that the text isn't valid/parseable.
+            console.error(e);
         }
     }
 
@@ -177,7 +178,7 @@ export abstract class SourceFormComponent<T extends Node> extends AbstractBaseCo
             parsedSource = JSON.parse(this._sourceText);
             this.setSourceFormat(CodeEditorMode.YAML);
         } else {
-            parsedSource = YAML.safeLoad(this._sourceText);
+            parsedSource = YAML.load(this._sourceText);
             this.setSourceFormat(CodeEditorMode.JSON);
         }
         if (parsedSource) {
@@ -207,7 +208,7 @@ export abstract class SourceFormComponent<T extends Node> extends AbstractBaseCo
         if (this.isSourceFormatJson()) {
             parsedSource = JSON.parse(this._sourceText);
         } else {
-            parsedSource = YAML.safeLoad(this._sourceText);
+            parsedSource = YAML.load(this._sourceText);
         }
         if (parsedSource) {
             let newSource: string;

diff --git a/ui/ui-editors/src/app/editor/_services/api-catalog.service.ts b/ui/ui-editors/src/app/editor/_services/api-catalog.service.ts
@@ -172,7 +172,7 @@ export class ApiCatalogService {
             return body;
         }
         try { return JSON.parse(body); } catch (e) {}
-        try { return YAML.safeLoad(body); } catch (e) {}
+        try { return YAML.load(body); } catch (e) {}
         // TODO debug or warning here
         return null;
     }

diff --git a/ui/ui-editors/src/app/editor/aaieditor.component.ts b/ui/ui-editors/src/app/editor/aaieditor.component.ts
@@ -581,7 +581,7 @@ export class AaiEditorComponent extends AbstractApiEditorComponent implements On
         console.info("[AsyncApiEditorComponent] Saving source code changes");
         try {
             let doc: AaiDocument = this.document();
-            let newJs: any = YAML.safeLoad(this.sourceValue);
+            let newJs: any = YAML.load(this.sourceValue);
             let newDoc: AaiDocument = Library.readDocument(newJs) as AaiDocument;
             let command: ICommand = CommandFactory.createReplaceDocumentCommand(doc, newDoc);
             this.commandService.emit(command);
@@ -603,7 +603,7 @@ export class AaiEditorComponent extends AbstractApiEditorComponent implements On
      */
     public validate(): void {
         try {
-            YAML.safeLoad(this.sourceValue);
+            YAML.load(this.sourceValue);
             this.sourceIsValid = true;
         } catch (e) {
             this.sourceIsValid = false;