@jsenv/core 35.0.5 → 36.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "35.0.5",
+  "version": "36.0.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -62,14 +62,14 @@
     "@babel/plugin-transform-modules-umd": "7.18.6",
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.2.4",
-    "@jsenv/ast": "3.0.8",
+    "@jsenv/ast": "4.0.0",
     "@jsenv/babel-plugins": "1.1.6",
     "@jsenv/filesystem": "4.2.3",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
-    "@jsenv/log": "3.3.4",
+    "@jsenv/log": "3.3.5",
     "@jsenv/node-esm-resolution": "1.0.1",
-    "@jsenv/server": "15.0.2",
+    "@jsenv/server": "15.0.3",
     "@jsenv/sourcemap": "1.0.10",
     "@jsenv/url-meta": "8.1.0",
     "@jsenv/urls": "2.0.0",
@@ -83,16 +83,16 @@
     "@babel/plugin-syntax-import-assertions": "7.20.0",
     "@jsenv/assert": "./packages/assert/",
     "@jsenv/eslint-config": "./packages/eslint-config/",
-    "@jsenv/file-size-impact": "14.1.0",
+    "@jsenv/file-size-impact": "14.1.1",
     "@jsenv/https-local": "3.0.6",
-    "@jsenv/package-workspace": "0.5.1",
-    "@jsenv/performance-impact": "4.1.0",
+    "@jsenv/package-workspace": "0.5.2",
+    "@jsenv/performance-impact": "4.1.1",
     "@jsenv/plugin-globals": "./packages/jsenv-plugin-globals/",
     "@jsenv/plugin-minification": "./packages/jsenv-plugin-minification/",
     "@jsenv/plugin-placeholders": "./packages/jsenv-plugin-placeholders/",
     "@jsenv/plugin-as-js-classic": "./packages/jsenv-plugin-as-js-classic/",
     "@jsenv/test": "./packages/test/",
-    "eslint": "8.39.0",
+    "eslint": "8.40.0",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-react": "7.32.2",

package/src/build/build.js

@@ -64,9 +64,8 @@ import {
   isWebWorkerEntryPointReference,
   isWebWorkerUrlInfo,
 } from "../kitchen/web_workers.js";
-import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url_analysis.js";
+import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js";
-import { jsenvPluginInlineContentAnalysis } from "../plugins/inline_content_analysis/jsenv_plugin_inline_content_analysis.js";
 import { jsenvPluginJsModuleFallback } from "../plugins/transpilation/js_module_fallback/jsenv_plugin_js_module_fallback.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js";
@@ -98,11 +97,11 @@ export const defaultRuntimeCompat = {
  * @param {Object} buildParameters
  * @param {string|url} buildParameters.sourceDirectoryUrl
  *        Directory containing source files
+ * @param {string|url} buildParameters.buildDirectoryUrl
+ *        Directory where optimized files will be written
  * @param {object} buildParameters.entryPoints
  *        Object where keys are paths to source files and values are their future name in the build directory.
  *        Keys are relative to sourceDirectoryUrl
- * @param {string|url} buildParameters.buildDirectoryUrl
- *        Directory where optimized files will be written
  * @param {object} buildParameters.runtimeCompat
  *        Code generated will be compatible with these runtimes
  * @param {string} [buildParameters.assetsDirectory=""]
@@ -128,17 +127,16 @@ export const build = async ({
   handleSIGINT = true,
   logLevel = "info",
   sourceDirectoryUrl,
-  entryPoints = {},
   buildDirectoryUrl,
+  entryPoints = {},
   assetsDirectory = "",
 
   runtimeCompat = defaultRuntimeCompat,
   base = runtimeCompat.node ? "./" : "/",
   plugins = [],
-  sourcemaps = "none",
-  sourcemapsSourcesContent,
-  urlAnalysis = {},
-  urlResolution,
+  referenceAnalysis = {},
+  nodeEsmResolution,
+  webResolution,
   fileSystemMagicRedirection,
   directoryReferenceAllowed,
   scenarioPlaceholders,
@@ -153,6 +151,8 @@ export const build = async ({
   watch = false,
 
   directoryToClean,
+  sourcemaps = "none",
+  sourcemapsSourcesContent,
   writeOnFileSystem = true,
   outDirectoryUrl,
   assetManifest = versioningMethod === "filename",
@@ -319,6 +319,12 @@ build ${entryPointKeys.length} entry points`);
         ...plugins,
         {
           appliesDuring: "build",
+          formatReference: (reference) => {
+            if (!reference.shouldHandle) {
+              return `ignore:${reference.specifier}`;
+            }
+            return null;
+          },
           fetchUrlContent: (urlInfo, context) => {
             if (context.reference.original) {
               rawRedirections.set(
@@ -327,20 +333,15 @@ build ${entryPointKeys.length} entry points`);
               );
             }
           },
-          formatUrl: (reference) => {
-            if (!reference.shouldHandle) {
-              return `ignore:${reference.specifier}`;
-            }
-            return null;
-          },
         },
         ...getCorePlugins({
           rootDirectoryUrl: sourceDirectoryUrl,
           urlGraph: rawGraph,
           runtimeCompat,
 
-          urlAnalysis,
-          urlResolution,
+          referenceAnalysis,
+          nodeEsmResolution,
+          webResolution,
           fileSystemMagicRedirection,
           directoryReferenceAllowed,
           transpilation: {
@@ -379,10 +380,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
     const bundleUrlInfos = {};
     const bundlers = {};
     const finalGraph = createUrlGraph();
-    const urlAnalysisPlugin = jsenvPluginUrlAnalysis({
-      rootDirectoryUrl: sourceDirectoryUrl,
-      ...urlAnalysis,
-    });
     const finalGraphKitchen = createKitchen({
       logLevel,
       rootDirectoryUrl: buildDirectoryUrl,
@@ -391,21 +388,21 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       runtimeCompat,
       ...contextSharedDuringBuild,
       plugins: [
-        urlAnalysisPlugin,
+        jsenvPluginReferenceAnalysis({
+          ...referenceAnalysis,
+          fetchInlineUrls: false,
+        }),
         ...(lineBreakNormalization
           ? [jsenvPluginLineBreakNormalization()]
           : []),
         jsenvPluginJsModuleFallback({
           systemJsInjection: true,
         }),
-        jsenvPluginInlineContentAnalysis({
-          fetchInlineUrls: false,
-        }),
         jsenvPluginInlining(),
         {
           name: "jsenv:build",
           appliesDuring: "build",
-          resolveUrl: (reference) => {
+          resolveReference: (reference) => {
             const getUrl = () => {
               if (reference.type === "filesystem") {
                 const parentRawUrl = buildDirectoryRedirections.get(
@@ -429,8 +426,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             url = bundleInternalRedirections.get(url) || url;
             return url;
           },
-          // redirecting urls into the build directory
-          redirectUrl: (reference) => {
+          // redirecting references into the build directory
+          redirectReference: (reference) => {
             if (!reference.url.startsWith("file:")) {
               return null;
             }
@@ -493,7 +490,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               const isEntryPoint =
                 reference.isEntryPoint ||
                 isWebWorkerEntryPointReference(reference);
-              // the url info do not exists yet (it will be created after this "redirectUrl" hook)
+              // the url info do not exists yet (it will be created after this "redirectReference" hook)
               // And the content will be generated when url is cooked by url graph loader.
               // Here we just want to reserve an url for that file
               const urlInfo = {
@@ -579,7 +576,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             });
             return buildUrl;
           },
-          formatUrl: (reference) => {
+          formatReference: (reference) => {
             if (!reference.generatedUrl.startsWith("file:")) {
               if (!versioning && reference.generatedUrl.startsWith("ignore:")) {
                 return reference.generatedUrl.slice("ignore:".length);
@@ -675,7 +672,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         {
           name: "jsenv:optimize",
           appliesDuring: "build",
-          finalizeUrlContent: async (urlInfo, context) => {
+          transformUrlContent: async (urlInfo, context) => {
             await rawGraphKitchen.pluginController.callAsyncHooks(
               "optimizeUrlContent",
               urlInfo,
@@ -984,6 +981,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         if (!versioning) {
           break inject_version_in_urls;
         }
+        logger.debug("versioning start");
         const versioningTask = createTaskLog("inject version in urls", {
           disabled: logger.levels.debug || !logger.levels.info,
         });
@@ -1092,7 +1090,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     parseHtmlString(urlInfo.content, {
                       storeOriginalPositions: false,
                     }),
-                    { cleanupJsenvAttributes: true },
+                    {
+                      cleanupJsenvAttributes: true,
+                    },
                   )
                 : urlInfo.content;
             const contentVersionGenerator = createVersionGenerator();
@@ -1183,24 +1183,32 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             runtimeCompat,
             ...contextSharedDuringBuild,
             plugins: [
-              urlAnalysisPlugin,
-              jsenvPluginInlineContentAnalysis({
+              jsenvPluginReferenceAnalysis({
+                ...referenceAnalysis,
                 fetchInlineUrls: false,
-                analyzeConvertedScripts: true, // to be able to version their urls
+                inlineConvertedScript: true, // to be able to version their urls
                 allowEscapeForVersioning: true,
               }),
               {
                 name: "jsenv:versioning",
                 appliesDuring: "build",
-                resolveUrl: (reference) => {
+                resolveReference: (reference) => {
                   const buildUrl = buildUrls.get(reference.specifier);
                   if (buildUrl) {
                     return buildUrl;
                   }
-                  const urlObject = new URL(
-                    reference.specifier,
-                    reference.baseUrl || reference.parentUrl,
-                  );
+                  let urlObject;
+                  if (reference.specifier[0] === "/") {
+                    urlObject = new URL(
+                      reference.specifier.slice(1),
+                      buildDirectoryUrl,
+                    );
+                  } else {
+                    urlObject = new URL(
+                      reference.specifier,
+                      reference.baseUrl || reference.parentUrl,
+                    );
+                  }
                   const url = urlObject.href;
                   // during versioning we revisit the deps
                   // but the code used to enforce trailing slash on directories
@@ -1218,7 +1226,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   }
                   return url;
                 },
-                formatUrl: (reference) => {
+                formatReference: (reference) => {
                   if (!reference.shouldHandle) {
                     if (reference.generatedUrl.startsWith("ignore:")) {
                       return reference.generatedUrl.slice("ignore:".length);

package/src/dev/file_service.js

@@ -10,7 +10,6 @@ import { createUrlGraph } from "../kitchen/url_graph.js";
 import { createKitchen } from "../kitchen/kitchen.js";
 import { RUNTIME_COMPAT } from "../kitchen/compat/runtime_compat.js";
 import { getCorePlugins } from "../plugins/plugins.js";
-import { explorerHtmlFileUrl } from "../plugins/explorer/jsenv_plugin_explorer.js";
 import { jsenvPluginServerEventsClientInjection } from "../plugins/server_events/jsenv_plugin_server_events_client_injection.js";
 import { parseUserAgentHeader } from "./user_agent.js";
 
@@ -27,14 +26,14 @@ export const createFileService = ({
   runtimeCompat,
 
   plugins,
-  urlAnalysis,
-  urlResolution,
+  referenceAnalysis,
+  nodeEsmResolution,
+  webResolution,
   fileSystemMagicRedirection,
   supervisor,
   transpilation,
   clientAutoreload,
   cooldownBetweenFileEvents,
-  explorer,
   cacheControl,
   ribbon,
   sourcemaps,
@@ -93,19 +92,11 @@ export const createFileService = ({
     });
     const clientRuntimeCompat = { [runtimeName]: runtimeVersion };
 
-    let defaultFileUrl;
-    if (explorer) {
-      defaultFileUrl = String(explorerHtmlFileUrl);
-    } else if (sourceMainFilePath) {
-      defaultFileUrl = String(new URL(sourceMainFilePath, sourceDirectoryUrl));
-    } else {
-      defaultFileUrl = String(new URL("./index.html", sourceDirectoryUrl));
-    }
-
     const kitchen = createKitchen({
       signal,
       logLevel,
       rootDirectoryUrl: sourceDirectoryUrl,
+      mainFilePath: sourceMainFilePath,
       urlGraph,
       dev: true,
       runtimeCompat,
@@ -121,11 +112,11 @@ export const createFileService = ({
         ...plugins,
         ...getCorePlugins({
           rootDirectoryUrl: sourceDirectoryUrl,
-          defaultFileUrl,
           runtimeCompat,
 
-          urlAnalysis,
-          urlResolution,
+          referenceAnalysis,
+          nodeEsmResolution,
+          webResolution,
           fileSystemMagicRedirection,
           supervisor,
           transpilation,
@@ -133,7 +124,6 @@ export const createFileService = ({
           clientAutoreload,
           clientFileChangeCallbackList,
           clientFilesPruneCallbackList,
-          explorer,
           cacheControl,
           ribbon,
         }),

package/src/dev/start_dev_server.js

@@ -24,7 +24,7 @@ import { createFileService } from "./file_service.js";
  */
 export const startDevServer = async ({
   sourceDirectoryUrl,
-  sourceMainFilePath,
+  sourceMainFilePath = "./index.html",
   port = 3456,
   hostname,
   acceptAnyIp,
@@ -50,12 +50,12 @@ export const startDevServer = async ({
   // code would be supported during dev but not after build
   runtimeCompat = defaultRuntimeCompat,
   plugins = [],
-  urlAnalysis = {},
-  urlResolution,
+  referenceAnalysis = {},
+  nodeEsmResolution,
+  webResolution,
   supervisor = true,
   fileSystemMagicRedirection,
   transpilation,
-  explorer = true, // see jsenv_plugin_explorer.js
   cacheControl = true,
   ribbon = true,
   // toolbar = false,
@@ -78,6 +78,11 @@ export const startDevServer = async ({
       sourceDirectoryUrl,
       "sourceDirectoryUrl",
     );
+    if (typeof sourceMainFilePath !== "string") {
+      throw new TypeError(
+        `sourceMainFilePath must be a string, got ${sourceMainFilePath}`,
+      );
+    }
     if (outDirectoryUrl === undefined) {
       if (!process.env.CI) {
         const packageDirectoryUrl = lookupPackageDirectory(sourceDirectoryUrl);
@@ -185,14 +190,14 @@ export const startDevServer = async ({
           runtimeCompat,
 
           plugins,
-          urlAnalysis,
-          urlResolution,
+          referenceAnalysis,
+          nodeEsmResolution,
+          webResolution,
           fileSystemMagicRedirection,
           supervisor,
           transpilation,
           clientAutoreload,
           cooldownBetweenFileEvents,
-          explorer,
           cacheControl,
           ribbon,
           sourcemaps,

package/src/kitchen/kitchen.js

@@ -28,6 +28,7 @@ export const createKitchen = ({
   logLevel,
 
   rootDirectoryUrl,
+  mainFilePath,
   urlGraph,
   dev = false,
   build = false,
@@ -49,6 +50,7 @@ export const createKitchen = ({
     signal,
     logger,
     rootDirectoryUrl,
+    mainFilePath,
     urlGraph,
     dev,
     build,
@@ -66,17 +68,34 @@ export const createKitchen = ({
     outDirectoryUrl,
   };
   const pluginController = createPluginController(kitchenContext);
-  const pushPlugins = (plugins) => {
-    plugins.forEach((pluginEntry) => {
-      if (Array.isArray(pluginEntry)) {
-        pushPlugins(pluginEntry);
-      } else {
-        pluginController.pushPlugin(pluginEntry);
-      }
-    });
-  };
-  pushPlugins(plugins);
+  plugins.forEach((pluginEntry) => {
+    pluginController.pushPlugin(pluginEntry);
+  });
 
+  /*
+   * - "http_request"
+   * - "entry_point"
+   * - "link_href"
+   * - "style"
+   * - "script"
+   * - "a_href"
+   * - "iframe_src
+   * - "img_src"
+   * - "img_srcset"
+   * - "source_src"
+   * - "source_srcset"
+   * - "image_href"
+   * - "use_href"
+   * - "css_@import"
+   * - "css_url"
+   * - "js_import"
+   * - "js_import_script"
+   * - "js_url"
+   * - "js_inline_content"
+   * - "sourcemap_comment"
+   * - "webmanifest_icon_src"
+   * - "package_json"
+   * */
   const createReference = ({
     data = {},
     node,
@@ -183,18 +202,18 @@ export const createKitchen = ({
         resolveReference(reference, context),
     };
     try {
-      let resolvedUrl = pluginController.callHooksUntil(
-        "resolveUrl",
+      let url = pluginController.callHooksUntil(
+        "resolveReference",
         reference,
         referenceContext,
       );
-      if (!resolvedUrl) {
+      if (!url) {
         throw new Error(`NO_RESOLVE`);
       }
-      if (resolvedUrl.includes("?debug")) {
+      if (url.includes("?debug")) {
         reference.debug = true;
       }
-      resolvedUrl = normalizeUrl(resolvedUrl);
+      url = normalizeUrl(url);
       let referencedUrlObject;
       let searchParams;
       const onReferenceUrlChange = (referenceUrl) => {
@@ -203,7 +222,7 @@ export const createKitchen = ({
         reference.url = referenceUrl;
         reference.searchParams = searchParams;
       };
-      onReferenceUrlChange(resolvedUrl);
+      onReferenceUrlChange(url);
 
       if (reference.debug) {
         logger.debug(`url resolved by "${
@@ -214,7 +233,7 @@ ${ANSI.color(reference.url, ANSI.YELLOW)}
 `);
       }
       pluginController.callHooks(
-        "redirectUrl",
+        "redirectReference",
         reference,
         referenceContext,
         (returnValue, plugin) => {
@@ -247,7 +266,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       // But do not represent an other resource, it is considered as
       // the same resource under the hood
       pluginController.callHooks(
-        "transformUrlSearchParams",
+        "transformReferenceSearchParams",
         reference,
         referenceContext,
         (returnValue) => {
@@ -258,7 +277,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         },
       );
       const returnValue = pluginController.callHooksUntil(
-        "formatUrl",
+        "formatReference",
         reference,
         referenceContext,
       );

package/src/kitchen/url_graph.js

@@ -259,7 +259,7 @@ const createUrlInfo = (url) => {
     dependencies: new Set(),
     dependents: new Set(),
     implicitUrls: new Set(),
-    type: undefined, // "html", "css", "js_classic", "js_module", "importmap", "json", "webmanifest", ...
+    type: undefined, // "html", "css", "js_classic", "js_module", "importmap", "sourcemap", "json", "webmanifest", ...
     subtype: undefined, // "worker", "service_worker", "shared_worker" for js, otherwise undefined
     typeHint: undefined,
     subtypeHint: undefined,

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -2,7 +2,7 @@ export const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
     appliesDuring: "dev",
-    redirectUrl: (reference) => {
+    redirectReference: (reference) => {
       if (!reference.searchParams.has("hmr")) {
         reference.data.hmr = false;
         return null;
@@ -17,7 +17,7 @@ export const jsenvPluginHmr = () => {
       urlObject.searchParams.delete("v");
       return urlObject.href;
     },
-    transformUrlSearchParams: (reference, context) => {
+    transformReferenceSearchParams: (reference, context) => {
       if (reference.type === "package_json") {
         // maybe the if above shoulb be .isImplicit but it's just a detail anyway
         return null;

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -22,7 +22,7 @@ export const jsenvPluginFileUrls = ({
     {
       name: "jsenv:file_url_resolution",
       appliesDuring: "*",
-      redirectUrl: (reference) => {
+      redirectReference: (reference) => {
         // http, https, data, about, ...
         if (!reference.url.startsWith("file:")) {
           return null;
@@ -111,7 +111,7 @@ export const jsenvPluginFileUrls = ({
     {
       name: "jsenv:filesystem_resolution",
       appliesDuring: "*",
-      resolveUrl: {
+      resolveReference: {
         filesystem: (reference, context) => {
           const { parentUrl } = reference;
           const parentUrlInfo = context.urlGraph.getUrlInfo(parentUrl);
@@ -129,14 +129,14 @@ export const jsenvPluginFileUrls = ({
       // so absolute file urls needs to be relativized
       // during build it's fine to use file:// urls
       appliesDuring: "dev",
-      resolveUrl: (reference) => {
+      resolveReference: (reference) => {
         if (reference.specifier.startsWith("/@fs/")) {
           const fsRootRelativeUrl = reference.specifier.slice("/@fs/".length);
           return `file:///${fsRootRelativeUrl}`;
         }
         return null;
       },
-      formatUrl: (reference, context) => {
+      formatReference: (reference, context) => {
         if (!reference.generatedUrl.startsWith("file:")) {
           return null;
         }

package/src/plugins/http_urls/jsenv_plugin_http_urls.js

@@ -2,7 +2,7 @@ export const jsenvPluginHttpUrls = () => {
   return {
     name: "jsenv:http_urls",
     appliesDuring: "*",
-    redirectUrl: (reference) => {
+    redirectReference: (reference) => {
       if (
         reference.url.startsWith("http:") ||
         reference.url.startsWith("https:")

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -57,7 +57,7 @@ export const jsenvPluginImportmap = () => {
   return {
     name: "jsenv:importmap",
     appliesDuring: "*",
-    resolveUrl: {
+    resolveReference: {
       js_import: (reference) => {
         if (!finalImportmap) {
           return null;

package/src/plugins/inlining/jsenv_plugin_inlining.js

@@ -6,7 +6,7 @@ export const jsenvPluginInlining = () => {
     {
       name: "jsenv:inlining",
       appliesDuring: "*",
-      redirectUrl: (reference) => {
+      redirectReference: (reference) => {
         const { searchParams } = reference;
         if (searchParams.has("inline")) {
           const urlObject = new URL(reference.url);

package/src/plugins/inlining/jsenv_plugin_inlining_as_data_url.js

@@ -4,7 +4,7 @@ export const jsenvPluginInliningAsDataUrl = () => {
   return {
     name: "jsenv:inlining_as_data_url",
     appliesDuring: "*",
-    formatUrl: {
+    formatReference: {
       // if the referenced url is a worker we could use
       // https://www.oreilly.com/library/view/web-workers/9781449322120/ch04.html
       // but maybe we should rather use ?object_url
@@ -34,10 +34,21 @@ export const jsenvPluginInliningAsDataUrl = () => {
         return (async () => {
           const urlInfo = context.urlGraph.getUrlInfo(reference.url);
           await context.cook(urlInfo, { reference });
+          const contentAsBase64 = Buffer.from(urlInfo.content).toString(
+            "base64",
+          );
           const specifier = DATA_URL.stringify({
             mediaType: urlInfo.contentType,
             base64Flag: true,
-            data: Buffer.from(urlInfo.content).toString("base64"),
+            data: contentAsBase64,
+          });
+          context.referenceUtils.becomesInline(reference, {
+            line: reference.line,
+            column: reference.column,
+            isOriginal: reference.isOriginal,
+            specifier,
+            content: contentAsBase64,
+            contentType: urlInfo.contentType,
           });
           return specifier;
         })();