feat(compartment-mapper): Workspace language-for-extension options

packages/compartment-mapper/src/archive.js

@@ -90,6 +90,9 @@ export const makeArchive = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     parserForLanguage,
     languages,
     ...otherOptions
@@ -102,6 +105,9 @@ export const makeArchive = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     languages,
   });
 
@@ -130,6 +136,9 @@ export const mapLocation = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     ...otherOptions
   } = assignParserForLanguage(options);
 
@@ -142,6 +151,9 @@ export const mapLocation = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
   });
 
   return mapFromMap(powers, compartmentMap, {
@@ -169,6 +181,9 @@ export const hashLocation = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     ...otherOptions
   } = assignParserForLanguage(options);
 
@@ -181,6 +196,9 @@ export const hashLocation = async (powers, moduleLocation, options = {}) => {
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
   });
 
   return hashFromMap(powers, compartmentMap, {
@@ -215,6 +233,9 @@ export const writeArchive = async (
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     ...otherOptions
   } = assignParserForLanguage(options);
   const compartmentMap = await mapNodeModules(readPowers, moduleLocation, {
@@ -225,6 +246,9 @@ export const writeArchive = async (
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     languages,
   });
   return writeArchiveFromMap(

packages/compartment-mapper/src/bundle.js

@@ -237,6 +237,11 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
     languageForExtension: languageForExtensionOption = {},
     commonjsLanguageForExtension: commonjsLanguageForExtensionOption = {},
     moduleLanguageForExtension: moduleLanguageForExtensionOption = {},
+    workspaceLanguageForExtension: workspaceLanguageForExtensionOption = {},
+    workspaceCommonjsLanguageForExtension:
+      workspaceCommonjsLanguageForExtensionOption = {},
+    workspaceModuleLanguageForExtension:
+      workspaceModuleLanguageForExtensionOption = {},
   } = options || {};
   const conditions = new Set(conditionsOption);
 
@@ -256,6 +261,21 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
   const moduleLanguageForExtension = Object.freeze(
     Object.assign(Object.create(null), moduleLanguageForExtensionOption),
   );
+  const workspaceLanguageForExtension = Object.freeze(
+    Object.assign(Object.create(null), workspaceLanguageForExtensionOption),
+  );
+  const workspaceCommonjsLanguageForExtension = Object.freeze(
+    Object.assign(
+      Object.create(null),
+      workspaceCommonjsLanguageForExtensionOption,
+    ),
+  );
+  const workspaceModuleLanguageForExtension = Object.freeze(
+    Object.assign(
+      Object.create(null),
+      workspaceModuleLanguageForExtensionOption,
+    ),
+  );
 
   const {
     packageLocation,
@@ -280,6 +300,9 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
       languageForExtension,
       commonjsLanguageForExtension,
       moduleLanguageForExtension,
+      workspaceLanguageForExtension,
+      workspaceCommonjsLanguageForExtension,
+      workspaceModuleLanguageForExtension,
     },
   );
 

packages/compartment-mapper/src/import.js

@@ -83,6 +83,9 @@ export const loadLocation = async (
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     ...otherOptions
   } = assignParserForLanguage(options);
   // conditions are not present in SyncArchiveOptions
@@ -96,6 +99,9 @@ export const loadLocation = async (
     languageForExtension,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
     languages,
   });
   return loadFromMap(readPowers, compartmentMap, {

packages/compartment-mapper/src/node-modules.js

@@ -61,6 +61,8 @@
  * @typedef {object} LanguageOptions
  * @property {LanguageForExtension} commonjsLanguageForExtension
  * @property {LanguageForExtension} moduleLanguageForExtension
+ * @property {LanguageForExtension} workspaceCommonjsLanguageForExtension
+ * @property {LanguageForExtension} workspaceModuleLanguageForExtension
  * @property {Set<string>} languages
  */
 
@@ -217,12 +219,22 @@ const defaultModuleLanguageForExtension = /** @type {const} */ ({
  * @returns {Record<string, string>}
  */
 const inferParsers = (descriptor, location, languageOptions) => {
+  let { moduleLanguageForExtension, commonjsLanguageForExtension } =
+    languageOptions;
   const {
     languages,
-    moduleLanguageForExtension,
-    commonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
   } = languageOptions;
 
+  // Select languageForExtension options based on whether they are physically
+  // under node_modules, indicating that they have not been built for npm,
+  // so any languages that compile to JavaScript may need additional parsers.
+  if (!location.includes('/node_modules/')) {
+    moduleLanguageForExtension = workspaceModuleLanguageForExtension;
+    commonjsLanguageForExtension = workspaceCommonjsLanguageForExtension;
+  }
+
   const {
     type,
     module,
@@ -771,13 +783,21 @@ const translateGraph = (
  *   'languageForExtension' |
  *   'moduleLanguageForExtension' |
  *   'commonjsLanguageForExtension' |
+ *   'workspaceLanguageForExtension' |
+ *   'workspaceModuleLanguageForExtension' |
+ *   'workspaceCommonjsLanguageForExtension' |
  *   'languages'
  * >} options
  */
 const makeLanguageOptions = ({
   languageForExtension: additionalLanguageForExtension = {},
   moduleLanguageForExtension: additionalModuleLanguageForExtension = {},
   commonjsLanguageForExtension: additionalCommonjsLanguageForExtension = {},
+  workspaceLanguageForExtension: additionalWorkspaceLanguageForExtension = {},
+  workspaceModuleLanguageForExtension:
+    additionalWorkspaceModuleLanguageForExtension = {},
+  workspaceCommonjsLanguageForExtension:
+    additionalWorkspaceCommonjsLanguageForExtension = {},
   languages: additionalLanguages = [],
 }) => {
   const commonjsLanguageForExtension = {
@@ -792,17 +812,37 @@ const makeLanguageOptions = ({
     ...defaultModuleLanguageForExtension,
     ...additionalModuleLanguageForExtension,
   };
+  const workspaceCommonjsLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultCommonjsLanguageForExtension,
+    ...additionalCommonjsLanguageForExtension,
+    ...additionalWorkspaceLanguageForExtension,
+    ...additionalWorkspaceCommonjsLanguageForExtension,
+  };
+  const workspaceModuleLanguageForExtension = {
+    ...defaultLanguageForExtension,
+    ...additionalLanguageForExtension,
+    ...defaultModuleLanguageForExtension,
+    ...additionalModuleLanguageForExtension,
+    ...additionalWorkspaceLanguageForExtension,
+    ...additionalWorkspaceModuleLanguageForExtension,
+  };
 
   const languages = new Set([
     ...Object.values(moduleLanguageForExtension),
     ...Object.values(commonjsLanguageForExtension),
+    ...Object.values(workspaceModuleLanguageForExtension),
+    ...Object.values(workspaceCommonjsLanguageForExtension),
     ...additionalLanguages,
   ]);
 
   return {
     languages,
     commonjsLanguageForExtension,
     moduleLanguageForExtension,
+    workspaceCommonjsLanguageForExtension,
+    workspaceModuleLanguageForExtension,
   };
 };
 

packages/compartment-mapper/src/types/external.ts

@@ -71,10 +71,22 @@ type MapNodeModulesOptionsOmitPolicy = Partial<{
   commonDependencies: Record<string, string>;
   /** Maps extensions to languages for all packages, like `txt` to `text` */
   languageForExtension: LanguageForExtension;
-  /** Maps extensions to languages for all type=module packages */
+  /** Maps additional extensions to languages for all type=module packages */
   moduleLanguageForExtension: LanguageForExtension;
-  /** Maps extensions to languages for all type=commonjs packages (default) */
+  /** Maps additional extensions to languages for all type=commonjs packages (default) */
   commonjsLanguageForExtension: LanguageForExtension;
+  /** Maps extensions to languages for packages not under node_modules */
+  workspaceLanguageForExtension: LanguageForExtension;
+  /**
+   * Maps additional extensions to languages for all type=module packages that
+   * are not under node_modules
+   */
+  workspaceModuleLanguageForExtension: LanguageForExtension;
+  /**
+   * Maps additional extensions to languages for all type=commonjs packages
+   * (default)
+   */
+  workspaceCommonjsLanguageForExtension: LanguageForExtension;
   /**
    * Accounts for languages not present as values in any of the extension to
    * language mappings.

packages/compartment-mapper/test/fixtures-language-for-extension/packages/commonjs-app/module.xsonp

@@ -0,0 +1 @@
+exports({ meaning: 42 });

packages/compartment-mapper/test/fixtures-language-for-extension/packages/commonjs-app/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "app",
+  "type": "commonjs",
+  "scripts": {
+    "preinstall": "echo DO NOT INSTALL TEST FIXTURES; exit -1"
+  }
+}

packages/compartment-mapper/test/fixtures-language-for-extension/packages/module-app/module.xsonp

@@ -0,0 +1 @@
+exports({ meaning: 42 });

packages/compartment-mapper/test/fixtures-language-for-extension/packages/module-app/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "app",
+  "type": "module",
+  "scripts": {
+    "preinstall": "echo DO NOT INSTALL TEST FIXTURES; exit -1"
+  }
+}

packages/compartment-mapper/test/fixtures-language-for-extension/packages/parsers-app/module.xsonp

@@ -0,0 +1 @@
+exports({ meaning: 42 });

packages/compartment-mapper/test/fixtures-language-for-extension/packages/parsers-app/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "app",
+  "parsers": {
+    "xsonp": "jsonp"
+  },
+  "scripts": {
+    "preinstall": "echo DO NOT INSTALL TEST FIXTURES; exit -1"
+  }
+}