@isograph/babel-plugin 0.2.0 → 0.3.1

package/BabelPluginIsograph.js

@@ -9,29 +9,40 @@ const configExplorer = cosmiconfig('isograph', {
     '.json': cosmiconfig.loadJson,
   },
 });
-
+/** @type {NonNullable<import("cosmiconfig").CosmiconfigResult>} */
 let IsographConfig;
 const result = configExplorer.searchSync();
 if (result) {
-  IsographConfig = result.config;
+  IsographConfig = result;
 } else {
   throw new Error(
     'No config found. Do you have a isograph.config.json file somewhere?',
   );
 }
 
+/** @typedef {import("@babel/core")} babel*/
+
+/**
+ * @typedef {Object} Context
+ * @property  {typeof babel.types} [types]
+ * */
+
+/**
+ * @param {Context} context
+ * @returns {babel.PluginObj} */
 module.exports = function BabelPluginIsograph(context) {
-  const { types: t } = context;
-  if (!t) {
+  const { types } = context;
+  if (!types) {
     throw new Error(
       'BabelPluginIsograph: Expected plugin context to include "types", but got:' +
         String(context),
     );
   }
 
+  /** @type {babel.Visitor<babel.PluginPass>} */
   const visitor = {
     CallExpression(path) {
-      compileTag(t, path, IsographConfig);
+      compileTag(types, path, IsographConfig);
     },
   };
 

package/compileTag.js

@@ -1,7 +1,15 @@
 'use strict';
 
+const { addDefault } = require('@babel/helper-module-imports');
 const pathModule = require('path');
+const os = require('os');
 
+/**
+ * @typedef {import("@babel/core")} babel
+ * @param {typeof babel.types} t
+ * @param {babel.NodePath<babel.types.CallExpression>} path
+ * @param {NonNullable<import("cosmiconfig").CosmiconfigResult>} config
+ */
 function compileTag(t, path, config) {
   const callee = path.node.callee;
   if (t.isIdentifier(callee) && callee.name === 'iso' && path.node.arguments) {
@@ -10,8 +18,20 @@ function compileTag(t, path, config) {
       // This throws if the tag is invalid
       compileImportStatement(t, path, type, field, 'entrypoint', config);
     } else if (keyword === 'field') {
-      // No-op
-      return false;
+      if (t.isCallExpression(path.parentPath.node)) {
+        const firstArg = path.parentPath.node.arguments[0];
+        if (path.parentPath.node.arguments.length === 1 && firstArg != null) {
+          path.parentPath.replaceWith(firstArg);
+        } else {
+          throw new Error(
+            'Invalid iso tag usage. The iso function should be passed at most one argument.',
+          );
+        }
+      } else {
+        path.replaceWith(
+          t.arrowFunctionExpression([t.identifier('x')], t.identifier('x')),
+        );
+      }
     } else {
       throw new Error(
         "Invalid iso tag usage. Expected 'entrypoint' or 'field'.",
@@ -26,25 +46,37 @@ const typeAndFieldRegex = new RegExp(
   'm',
 );
 
+/**
+ * @param {babel.NodePath<babel.types.CallExpression>} path
+ *  */
 function getTypeAndField(path) {
-  if (path.node.arguments.length !== 1) {
+  const firstArg = path.node.arguments[0];
+  if (path.node.arguments.length !== 1 || firstArg == null) {
     throw new Error(
       `BabelPluginIsograph: Iso invocation require one parameter, found ${path.node.arguments.length}`,
     );
   }
-  const quasis = path.node.arguments[0].quasis;
-  if (quasis.length !== 1) {
+
+  if (firstArg.type !== 'TemplateLiteral') {
+    throw new Error(
+      'BabelPluginIsograph: Only template literals are allowed in iso fragments.',
+    );
+  }
+
+  const quasis = firstArg.quasis;
+  const firstQuasi = quasis[0];
+  if (quasis.length !== 1 || firstQuasi == null) {
     throw new Error(
       'BabelPluginIsograph: Substitutions are not allowed in iso fragments.',
     );
   }
 
-  const content = quasis[0].value.raw;
+  const content = firstQuasi.value.raw;
   const typeAndField = typeAndFieldRegex.exec(content);
 
-  const keyword = typeAndField[1];
-  const type = typeAndField[2];
-  const field = typeAndField[3];
+  const keyword = typeAndField?.[1];
+  const type = typeAndField?.[2];
+  const field = typeAndField?.[3];
 
   if (keyword == null || type == null || field == null) {
     throw new Error(
@@ -54,14 +86,23 @@ function getTypeAndField(path) {
   return { keyword, type, field };
 }
 
+/**
+ * @param {typeof babel.types} t
+ * @param {babel.NodePath<babel.types.CallExpression>} path
+ * @param {string} type
+ * @param {string} field
+ * @param {string} artifactType
+ * @param {NonNullable<import("cosmiconfig").CosmiconfigResult>} config
+ */
 function compileImportStatement(t, path, type, field, artifactType, config) {
   const filename = path.state.filename;
   const folder = pathModule.dirname(filename);
-  const cwd = path.state.cwd;
+  const cwd = pathModule.dirname(config.filepath);
   const artifactDirectory = pathModule.join(
     cwd,
-    config.artifact_directory ?? config.project_root,
+    config.config['artifact_directory'] ?? config.config['project_root'],
   );
+  const module = config.config['options']?.['module'];
 
   const fileToArtifactDir = pathModule.relative(folder, artifactDirectory);
   const artifactDirToArtifact = `/__isograph/${type}/${field}/${artifactType}.ts`;
@@ -70,6 +111,10 @@ function compileImportStatement(t, path, type, field, artifactType, config) {
     artifactDirToArtifact,
   );
 
+  if (os.platform() === 'win32') {
+    fileToArtifact = fileToArtifact.replace(/\\/g, '/');
+  }
+
   // If we do not have to traverse upward, e.g. if the resolver is in
   // src/HomePage, and the artifact directory is src/, then fileToArtifact
   // will start with a /. require('/...') is not good, as that is treated
@@ -78,14 +123,29 @@ function compileImportStatement(t, path, type, field, artifactType, config) {
     fileToArtifact = '.' + fileToArtifact;
   }
 
-  path.replaceWith(
-    t.memberExpression(
-      t.CallExpression(t.Identifier('require'), [
-        t.StringLiteral(fileToArtifact),
-      ]),
-      t.Identifier('default'),
-    ),
-  );
+  if (module === 'esmodule') {
+    const program = path.scope.getProgramParent();
+    const imports = /** @type {Map<string, string>} */ (
+      program.data['imports'] ??= new Map()
+    );
+
+    let id = imports.get(fileToArtifact);
+    if (id == null) {
+      id = addDefault(path, fileToArtifact, { nameHint: field }).name;
+      imports.set(fileToArtifact, id);
+    }
+
+    path.replaceWith(t.identifier(id));
+  } else {
+    path.replaceWith(
+      t.memberExpression(
+        t.callExpression(t.identifier('require'), [
+          t.stringLiteral(fileToArtifact),
+        ]),
+        t.identifier('default'),
+      ),
+    );
+  }
 }
 
 module.exports = compileTag;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@isograph/babel-plugin",
   "description": "A Babel plugin for use with Isograph applications.",
   "homepage": "https://isograph.dev",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "keywords": [
     "graphql",
     "isograph",
@@ -15,13 +15,22 @@
     "url": "git+https://github.com/isographlabs/isograph.git",
     "directory": "libs/isograph-babel-plugin"
   },
+  "scripts": {
+    "tsc": "tsc",
+    "tsc-force": "tsc --build --clean && tsc --build --force"
+  },
   "dependencies": {
+    "@babel/helper-module-imports": "^7.0.0",
     "babel-plugin-macros": "^2.0.0",
     "cosmiconfig": "^5.0.5",
     "graphql": "15.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
+    "@babel/types": "^7.25.6",
+    "@types/babel__core": "^7.20.5",
+    "@types/babel__helper-module-imports": "^7.18.3",
+    "@types/cosmiconfig": "^5.0.3",
     "prettier": "2.8.8",
     "prettier-plugin-hermes-parser": "0.16.0"
   },

package/stub.ts

@@ -0,0 +1,7 @@
+import type cosmiconfig from 'cosmiconfig';
+
+declare module 'cosmiconfig' {
+  export const loadJson: cosmiconfig.LoaderEntry;
+}
+
+export {};

package/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true
+  },
+  "include": ["./**/*.ts", "./**/*.js"]
+}