ember-source 4.12.0-alpha.1 → 4.12.0-alpha.2

package/blueprints/-maybe-polyfill-typescript-blueprints.js

@@ -1,17 +1,19 @@
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const EMBER_TYPESCRIPT_BLUEPRINTS = false;
+const EMBER_TYPESCRIPT_BLUEPRINTS = true;
 
 function canEmitTypeScript() {
   return 'EMBER_TYPESCRIPT_BLUEPRINTS' in process.env
-    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS
+    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS === 'true'
     : EMBER_TYPESCRIPT_BLUEPRINTS;
 }
 
 module.exports = function (context) {
-  if (canEmitTypeScript()) {
+  let canUseTypeScript = canEmitTypeScript();
+  if (canUseTypeScript) {
     typescriptBlueprintPolyfill(context);
   } else {
     // Use the plain old JS templates from before
     context.path = context.path.replace('blueprints', 'blueprints-js');
   }
+  return canUseTypeScript;
 };

package/blueprints/component/files/__root__/__path__/__name__.ts

@@ -1,3 +1,4 @@
 <%= importComponent %>
 <%= importTemplate %>
+<%= componentSignature %>
 export default <%= defaultExport %>

package/blueprints/component/index.js

@@ -53,9 +53,17 @@ module.exports = {
     },
   ],
 
+  /**
+    Flag to let us correctly handle the case where we are running against a
+    version of Ember CLI which does not support TS-based emit, and where we
+    therefore *must* not emit a `defaultExport` local which includes a type
+    parameter in the exported function call or class definition.
+   */
+  _isUsingTS: false,
+
   init() {
     this._super && this._super.init.apply(this, arguments);
-    maybePolyfillTypeScriptBlueprints(this);
+    this._isUsingTS = maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
@@ -227,15 +235,8 @@ module.exports = {
   },
 
   locals(options) {
-    let sanitizedModuleName = options.entity.name.replace(/\//g, '-');
-    let classifiedModuleName = stringUtil.classify(sanitizedModuleName);
-
-    let templatePath = '';
-    let importComponent = '';
-    let importTemplate = '';
-    let defaultExport = '';
-
     // if we're in an addon, build import statement
+    let templatePath = '';
     if (options.project.isEmberCLIAddon() || (options.inRepoAddon && !options.inDummy)) {
       if (options.pod) {
         templatePath = './template';
@@ -251,6 +252,14 @@ module.exports = {
       ? options.componentClass
       : '@ember/component';
 
+    let sanitizedModuleName = options.entity.name.replace(/\//g, '-');
+    let classifiedModuleName = stringUtil.classify(sanitizedModuleName);
+
+    let importComponent = '';
+    let importTemplate = '';
+    let defaultExport = '';
+    let componentSignature = '';
+
     switch (componentClass) {
       case '@ember/component':
         importComponent = `import Component from '@ember/component';`;
@@ -263,20 +272,53 @@ module.exports = {
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;
-        defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+        if (this._isUsingTS) {
+          componentSignature = signatureFor(classifiedModuleName);
+          defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
+        } else {
+          defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+        }
         break;
       case '@ember/component/template-only':
         importComponent = `import templateOnly from '@ember/component/template-only';`;
-        defaultExport = `templateOnly();`;
+        if (this._isUsingTS) {
+          componentSignature = signatureFor(classifiedModuleName);
+          defaultExport = `templateOnly<${classifiedModuleName}Signature>();`;
+        } else {
+          defaultExport = `templateOnly();`;
+        }
         break;
     }
 
     return {
       importTemplate,
       importComponent,
+      componentSignature,
       defaultExport,
       path: getPathOption(options),
       componentClass: options.componentClass,
     };
   },
 };
+
+function signatureFor(classifiedModuleName) {
+  let args = `  // The arguments accepted by the component${EOL}  Args: {};`;
+
+  let blocks =
+    `  // Any blocks yielded by the component${EOL}` +
+    `  Blocks: {${EOL}` +
+    `    default: []${EOL}` +
+    `  };`;
+
+  let element =
+    `  // The element to which \`...attributes\` is applied in the component template${EOL}` +
+    `  Element: null;`;
+
+  return (
+    `interface ${classifiedModuleName}Signature {${EOL}` +
+    `${args}${EOL}` +
+    `${blocks}${EOL}` +
+    `${element}${EOL}` +
+    `}${EOL}`
+  );
+}

package/blueprints/service/files/__root__/__path__/__name__.ts

@@ -1,3 +1,13 @@
 import Service from '@ember/service';
 
 export default class <%= classifiedModuleName %>Service extends Service {}
+
+// Don't remove this declaration: this is what enables TypeScript to resolve
+// this service using `Owner.lookup('service:<%= dasherizedModuleName %>')`, as well
+// as to check when you pass the service name as an argument to the decorator,
+// like `@service('<%= dasherizedModuleName %>') declare altName: <%= classifiedModuleName %>Service;`.
+declare module '@ember/service' {
+  interface Registry {
+    '<%= dasherizedModuleName %>': <%= classifiedModuleName %>Service;
+  }
+}

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "4.12.0-alpha.1",
+  "version": "4.12.0-alpha.2",
   "buildType": "tag",
-  "SHA": "59557b6be95e03b89a1b6ae18191bd134dfcc422",
-  "assetPath": "/tag/shas/59557b6be95e03b89a1b6ae18191bd134dfcc422.tgz"
+  "SHA": "5877d3e3214bcf679a3ec3961bc7d6d26e3c41e1",
+  "assetPath": "/tag/shas/5877d3e3214bcf679a3ec3961bc7d6d26e3c41e1.tgz"
 }

package/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   4.12.0-alpha.1
+ * @version   4.12.0-alpha.2
  */
 
 /* eslint-disable no-var */
@@ -16465,7 +16465,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.12.0-alpha.1";
+  var _default = "4.12.0-alpha.2";
   _exports.default = _default;
 });
 define("simple-html-tokenizer", ["exports"], function (_exports) {