Got a lot of tests to work through

Author: NullVoxPopuli

README.md

@@ -2,7 +2,22 @@
 
 Implements [RFC#939: import.meta.glob](https://github.com/emberjs/rfcs/pull/939) for ember-classic (pre-embroider).
 
-Example:
+## Compatibility
+
+- Apps using ember-source v3.28
+- ember-auto-import v2
+- _not_ embroider. For embroider, use [`babel-plugin-transform-vite-meta-glob`](https://www.npmjs.com/package/babel-plugin-transform-vite-meta-glob)
+
+## Installation
+
+```
+pnpm add ember-classic-import-meta-glob
+```
+
+## Usage
+
+
+Default usage:
 ```js
 // If you type this in your app:
 const widgets = import.meta.glob('./widgets/*.js')
@@ -28,23 +43,12 @@ const widgets = {
 }
 ```
 
-## Compatibility
-
-- Apps using ember-source v3.28
-- ember-auto-import v2
-- _not_ embroider. For embroider, use [`babel-plugin-transform-vite-meta-glob`](https://www.npmjs.com/package/babel-plugin-transform-vite-meta-glob)
-
-## Installation
-
-```
-pnpm add ember-classic-import-meta-glob
-```
-
-## Usage
-
-In your JS files:
+## Differences from RFC#939
 
+- Extensions in the import paths are optional -- this because they do not exist at runtime, and the implementation for this version of import.meta.glob cannot determine what the original file names were.
+- the keys in the return object from `glob` will not contain file name extensions, because they do not exist at runtime.
 
+For ember-classic, this is meant to _ease_ migration to the new, modern features, reducing the overall diff you'd need if you didn't have entire feature sets that are available to embroider.  
 
 ## Contributing
 

ember-classic-import-meta-glob/addon/index.js

@@ -21,8 +21,12 @@ export function importMetaGlob(glob, options, modulePath) {
     glob.startsWith('./') || glob.startsWith('../'),
   );
   assert(
-    `the second argument to import.meta.glob must be passed and set to { eager: true }`,
-    options && options.eager === true,
+    `the second argument to import.meta.glob must be an object`,
+    typeof options === 'object',
+  );
+  assert(
+    `the only supported option is 'eager'. Received: ${Object.keys(options)}`,
+    Object.keys(options).length === 1 && 'eager' in options,
   );
   assert(
     `the third argument to import.meta.glob must be passed and be the module path. This is filled in automatically via the babel plugin. If you're seeing this something has gone wrong with installing the babel plugin`,
@@ -45,19 +49,24 @@ export function importMetaGlob(glob, options, modulePath) {
   let currentDir = reversedParts.reverse().join('/');
 
   // TODO: drop the extensions, since at runtime, we don't have them.
-  let fullGlobs = Array.isArray(glob)
-    ? glob.map((g) => `${currentDir}${g}`)
-    : [`${modulePath}${glob}`];
+  let globsArray = Array.isArray(glob) ? glob : [glob];
+  let fullGlobs = globsArray.map((g) => {
+    return `${currentDir}/${g.replace(/^.\//, '')}`;
+  });
   let isMatch = pico(fullGlobs);
   let matches = allModules.filter(isMatch);
 
+  console.log({ fullGlobs, matches, currentDir });
+
   // TODO: assert: cannot escape the app.
   //       (too many ../../../../)
 
   let result = {};
 
   for (let match of matches) {
-    result[match] = requirejs(match);
+    let key = match.replace(`${currentDir}/`, './');
+
+    result[key] = requirejs(match);
   }
 
   return result;

test-app/app/from-app/a.js

@@ -0,0 +1 @@
+export const a = 'a1';

test-app/app/from-app/b.js

@@ -0,0 +1 @@
+export const b = 'b1';

test-app/app/from-app/c.js

@@ -0,0 +1 @@
+export const c = 'c1';

test-app/tests/glob-test/from-tests/a.js

@@ -0,0 +1 @@
+export const a = 'a1';

test-app/tests/glob-test/from-tests/b.js

@@ -0,0 +1 @@
+export const b = 'b1';

test-app/tests/glob-test/from-tests/c.js

@@ -0,0 +1 @@
+export const c = 'c1';

test-app/tests/glob-test/the-test.js

@@ -21,7 +21,7 @@ module('Glob tests', function () {
   test('default (async)', async (assert) => {
     let result = import.meta.glob('./from-tests/*');
 
-    assert.deepEqual(result, { _: 1 });
+    assert.deepEqual(result, { './from-tests/a': './' });
   });
 
   module('underlying runtime', function () {
@@ -31,20 +31,49 @@ module('Glob tests', function () {
 
       assert.deepEqual(a, b);
     });
-    test('errors when trying to escape the app', function (assert) {
-      assert.throws(() => {
-        importMetaGlob('../../../something', { eager: true }, 'test-app');
-      }, /123 boop/);
-    });
-    test('errors with no options', function (assert) {
-      assert.throws(() => {
-        importMetaGlob('**/*');
-      }, /123 boop/);
-    });
-    test('errors with no sourcePath', function (assert) {
-      assert.throws(() => {
-        importMetaGlob('**/*', { eager: true });
-      }, /123 boop/);
+
+    module('errors', function () {
+      module('glob', function () {
+        test('errors when trying to escape the app', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('../../../something', { eager: true }, 'test-app');
+          }, /123 boop/);
+        });
+
+        test('invalid glob', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('**/*');
+          }, /The glob pattern must be a relative path starting with either/);
+        });
+      });
+
+      module('options', function () {
+        test('errors with incorrect options', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('./**/*', true);
+          }, /the second argument to import.meta.glob must be an object/);
+        });
+
+        test('when passing options, cannot be empty', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('./**/*', {});
+          }, /the only supported option is 'eager'/);
+        });
+
+        test('when passing options, only eager is allowed', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('./**/*', { boop: 1 });
+          }, /the only supported option is 'eager'/);
+        });
+      });
+
+      module('modulePath', function () {
+        test('errors with no modulePath', function (assert) {
+          assert.throws(() => {
+            importMetaGlob('./**/*', { eager: true });
+          }, /the third argument to import.meta.glob must be passed and be the module path/);
+        });
+      });
     });
   });
 });