@codingame/monaco-vscode-api 1.79.3 → 1.79.4

package/dist/extensions.js

@@ -92,7 +92,7 @@ FileAccess.uriToBrowserUri = function (uri) {
 };
 function registerExtension(manifest, defaultNLS) {
     const uuid = generateUuid();
-    const location = ( URI.from({ scheme: 'extension', path: `/${uuid}` }));
+    const location = ( URI.from({ scheme: 'extension', authority: uuid, path: '/' }));
     const localizedManifest = defaultNLS != null ? localizeManifest(manifest, defaultNLS) : manifest;
     const extension = {
         manifest: localizedManifest,

package/dist/json.js

@@ -5,6 +5,7 @@ import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userData
 import { Extensions } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jsonContributionRegistry.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { FileAccess } from 'monaco-editor/esm/vs/base/common/network.js';
+import { parse } from 'monaco-editor/esm/vs/base/common/json.js';
 import { Disposable, extensions } from './api.js';
 const registry = ( Registry.as(Extensions.JSONContribution));
 function getDefaultSchemaAssociations() {
@@ -18,23 +19,27 @@ function getDefaultSchemaAssociations() {
             uri: 'vscode://schemas/settings/user'
         }];
 }
-function getExtensionSchemaAssociations() {
-    const associations = [];
-    extensions.all.forEach(extension => {
+async function getExtensionSchemaAssociations() {
+    const associations = (await Promise.all(( extensions.all.map(async (extension) => {
         const packageJSON = extension.packageJSON;
         const jsonValidation = packageJSON?.contributes?.jsonValidation;
         if (jsonValidation != null) {
             if (Array.isArray(jsonValidation)) {
-                jsonValidation.forEach(jv => {
+                return (await Promise.all(( jsonValidation.map(async (jv) => {
                     let { fileMatch, url } = jv;
                     if (typeof fileMatch === 'string') {
                         fileMatch = [fileMatch];
                     }
                     if (Array.isArray(fileMatch) && typeof url === 'string') {
                         let uri = url;
+                        let schema = null;
                         if (uri[0] === '.' && uri[1] === '/') {
                             uri = ( FileAccess.uriToBrowserUri(monaco.Uri.joinPath(extension.extensionUri, uri)).toString());
                         }
+                        if (uri.startsWith('blob:')) {
+                            schema = parse(await (await fetch(decodeURIComponent(uri))).text());
+                            uri = ( monaco.Uri.joinPath(extension.extensionUri, url).toString());
+                        }
                         fileMatch = ( fileMatch.map(fm => {
                             if (fm[0] === '%') {
                                 fm = fm.replace(/%APP_SETTINGS_HOME%/, '/User');
@@ -46,12 +51,14 @@ function getExtensionSchemaAssociations() {
                             }
                             return fm;
                         }));
-                        associations.push({ fileMatch, uri });
+                        return [{ fileMatch, uri, schema }];
                     }
-                });
+                    return [];
+                })))).flat();
             }
         }
-    });
+        return [];
+    })))).flat();
     return associations;
 }
 const customSchemaChangeEmitter = new Emitter();
@@ -76,18 +83,18 @@ function registerJsonSchema(schema) {
     });
 }
 function synchronizeJsonSchemas() {
-    function updateDiagnosticsOptions() {
+    async function updateDiagnosticsOptions() {
         monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
             ...monaco.languages.json.jsonDefaults.diagnosticsOptions,
             enableSchemaRequest: true,
             schemas: [
                 ...getJsonSchemas(),
                 ...getDefaultSchemaAssociations(),
-                ...getExtensionSchemaAssociations()
+                ...(await getExtensionSchemaAssociations())
             ]
         });
     }
-    updateDiagnosticsOptions();
+    void updateDiagnosticsOptions();
     const changeEvent = Event.any(extensions.onDidChange, customSchemaChangeEmitter.event, registry.onDidChangeSchema);
     return changeEvent(updateDiagnosticsOptions);
 }