@isograph/babel-plugin 0.3.0 → 0.3.1

package/compileTag.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { addDefault } = require('@babel/helper-module-imports');
 const pathModule = require('path');
 const os = require('os');
 
@@ -17,11 +18,15 @@ function compileTag(t, path, config) {
       // This throws if the tag is invalid
       compileImportStatement(t, path, type, field, 'entrypoint', config);
     } else if (keyword === 'field') {
-      if (
-        t.isCallExpression(path.parentPath.node) &&
-        path.parentPath.node.arguments.length === 1
-      ) {
-        path.parentPath.replaceWith(path.parentPath.node.arguments[0]);
+      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')),
@@ -45,26 +50,28 @@ const typeAndFieldRegex = new RegExp(
  * @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}`,
     );
   }
 
-  if (path.node.arguments[0].type !== 'TemplateLiteral') {
+  if (firstArg.type !== 'TemplateLiteral') {
     throw new Error(
       'BabelPluginIsograph: Only template literals are allowed in iso fragments.',
     );
   }
 
-  const quasis = path.node.arguments[0].quasis;
-  if (quasis.length !== 1) {
+  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];
@@ -95,6 +102,7 @@ function compileImportStatement(t, path, type, field, artifactType, config) {
     cwd,
     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`;
@@ -115,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.3.0",
+  "version": "0.3.1",
   "keywords": [
     "graphql",
     "isograph",
@@ -16,9 +16,11 @@
     "directory": "libs/isograph-babel-plugin"
   },
   "scripts": {
-    "tsc": "tsc"
+    "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"
@@ -27,6 +29,7 @@
     "@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

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

package/tsconfig.json

@@ -3,8 +3,7 @@
   "compilerOptions": {
     "allowJs": true,
     "checkJs": true,
-    "noEmit": true,
-    "lib": ["es2017", "DOM"]
+    "noEmit": true
   },
   "include": ["./**/*.ts", "./**/*.js"]
 }