Merge pull request #669 from typed-ember/handle-packages

Handle package/addon name mismatch

Author: chriskrycho

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "-r", "register-ts-node",
+        "-f", "generates .d.ts files when addon and package names do not match",
+        "ts/tests/**/*.{ts,js}"
+      ],
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

ts/lib/commands/precompile.ts

@@ -36,6 +36,15 @@ export default command({
 
     let manifestPath = options.manifestPath;
     let packageName = this.project.pkg.name;
+
+    // Ensure that if we are dealing with an addon that is using a different
+    // addon name from its package name, we use the addon name, since that is
+    // how it will be written for imports.
+    let addon = this.project.addons.find(addon => addon.root === this.project.root);
+    if (addon && addon.name !== packageName) {
+      packageName = addon.name;
+    }
+
     let createdFiles = copyDeclarations(pathRoots, paths, packageName, this.project.root);
 
     fs.mkdirsSync(path.dirname(manifestPath));
@@ -66,5 +75,5 @@ export default command({
     ];
 
     return { rootDir, paths, pathRoots };
-  }
+  },
 });

ts/tests/commands/precompile-test.ts

@@ -60,8 +60,8 @@ describe('Acceptance: ts:precompile command', function() {
     });
   });
 
-  describe('remapped addon-test-support', function() {
-    it('generates .d.ts files in the mapped location', function() {
+  describe('addon-test-support', function() {
+    it('generates .d.ts files in remapped locations', function() {
       fs.ensureDirSync('addon-test-support');
       fs.writeFileSync('addon-test-support/test-file.ts', `export const testString: string = 'hello';`);
 
@@ -79,4 +79,21 @@ describe('Acceptance: ts:precompile command', function() {
         });
     });
   });
+
+  it('generates .d.ts files when addon and package names do not match', function() {
+    fs.ensureDirSync('addon-test-support');
+    fs.writeFileSync('addon-test-support/test-file.ts', `export const testString: string = 'hello';`);
+    fs.writeFileSync('index.js', `module.exports = { name: 'my-addon' };`);
+
+    const pkg = fs.readJSONSync('package.json');
+    pkg.name = '@foo/my-addon';  // addon `name` is `my-addon`
+    fs.writeJSONSync('package.json', pkg);
+
+    return ember(['ts:precompile'])
+      .then(() => {
+        const declaration = file('test-support/test-file.d.ts');
+        expect(declaration).to.exist;
+        expect(declaration.content.trim()).to.equal(`export declare const testString: string;`);
+      });
+  });
 });