Migrate String from namespace to named exports.

emberjs · Apr 16, 2018 · 61475c5 · 61475c5
1 parent 90cc5c0
commit 61475c5
Show file tree

Hide file tree

Showing 16 changed files with 237 additions and 232 deletions.
diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
@@ -5,7 +5,7 @@
 import { dictionary } from 'ember-utils';
 import { get, findNamespace } from 'ember-metal';
 import { assert, info } from 'ember-debug';
-import { String as StringUtils, Object as EmberObject } from 'ember-runtime';
+import { capitalize, classify, decamelize, dasherize, Object as EmberObject } from 'ember-runtime';
 import validateType from './lib/validate-type';
 import { getTemplate } from 'ember-glimmer';
 import { DEBUG } from '@glimmer/env';
@@ -191,7 +191,7 @@ const DefaultResolver = EmberObject.extend({
     if (type !== 'template' && lastSlashIndex !== -1) {
       let parts = name.split('/');
       name = parts[parts.length - 1];
-      let namespaceName = StringUtils.capitalize(parts.slice(0, -1).join('.'));
+      let namespaceName = capitalize(parts.slice(0, -1).join('.'));
       root = findNamespace(namespaceName);
 
       assert(
@@ -200,7 +200,7 @@ const DefaultResolver = EmberObject.extend({
       );
     }
 
-    let resolveMethodName = fullNameWithoutType === 'main' ? 'Main' : StringUtils.classify(type);
+    let resolveMethodName = fullNameWithoutType === 'main' ? 'Main' : classify(type);
 
     if (!(name && type)) {
       throw new TypeError(`Invalid fullName: \`${fullName}\`, must be of the form \`type:name\` `);
@@ -235,10 +235,10 @@ const DefaultResolver = EmberObject.extend({
       return `template at ${parsedName.fullNameWithoutType.replace(/\./g, '/')}`;
     }
 
-    description = `${parsedName.root}.${StringUtils.classify(parsedName.name).replace(/\./g, '')}`;
+    description = `${parsedName.root}.${classify(parsedName.name).replace(/\./g, '')}`;
 
     if (parsedName.type !== 'model') {
-      description += StringUtils.classify(parsedName.type);
+      description += classify(parsedName.type);
     }
 
     return description;
@@ -275,7 +275,7 @@ const DefaultResolver = EmberObject.extend({
   resolveTemplate(parsedName) {
     let templateName = parsedName.fullNameWithoutType.replace(/\./g, '/');
 
-    return getTemplate(templateName) || getTemplate(StringUtils.decamelize(templateName));
+    return getTemplate(templateName) || getTemplate(decamelize(templateName));
   },
 
   /**
@@ -325,7 +325,7 @@ const DefaultResolver = EmberObject.extend({
     @protected
   */
   resolveModel(parsedName) {
-    let className = StringUtils.classify(parsedName.name);
+    let className = classify(parsedName.name);
     let factory = get(parsedName.root, className);
 
     return factory;
@@ -352,13 +352,13 @@ const DefaultResolver = EmberObject.extend({
     @protected
   */
   resolveOther(parsedName) {
-    let className = StringUtils.classify(parsedName.name) + StringUtils.classify(parsedName.type);
+    let className = classify(parsedName.name) + classify(parsedName.type);
     let factory = get(parsedName.root, className);
     return factory;
   },
 
   resolveMain(parsedName) {
-    let className = StringUtils.classify(parsedName.type);
+    let className = classify(parsedName.type);
     return get(parsedName.root, className);
   },
 
@@ -371,7 +371,7 @@ const DefaultResolver = EmberObject.extend({
   */
   knownForType(type) {
     let namespace = get(this, 'namespace');
-    let suffix = StringUtils.classify(type);
+    let suffix = classify(type);
     let typeRegexp = new RegExp(`${suffix}$`);
 
     let known = dictionary(null);
@@ -403,9 +403,9 @@ const DefaultResolver = EmberObject.extend({
     @private
   */
   translateToContainerFullname(type, name) {
-    let suffix = StringUtils.classify(type);
+    let suffix = classify(type);
     let namePrefix = name.slice(0, suffix.length * -1);
-    let dasherizedName = StringUtils.dasherize(namePrefix);
+    let dasherizedName = dasherize(namePrefix);
 
     return `${type}:${dasherizedName}`;
   },

diff --git a/packages/ember-extension-support/lib/container_debug_adapter.js b/packages/ember-extension-support/lib/container_debug_adapter.js
@@ -1,7 +1,8 @@
 import {
   A as emberA,
   typeOf,
-  String as StringUtils,
+  classify,
+  dasherize,
   Namespace,
   Object as EmberObject,
 } from 'ember-runtime';
@@ -84,7 +85,7 @@ export default EmberObject.extend({
   catalogEntriesByType(type) {
     let namespaces = emberA(Namespace.NAMESPACES);
     let types = emberA();
-    let typeSuffixRegex = new RegExp(`${StringUtils.classify(type)}$`);
+    let typeSuffixRegex = new RegExp(`${classify(type)}$`);
 
     namespaces.forEach(namespace => {
       for (let key in namespace) {
@@ -94,7 +95,7 @@ export default EmberObject.extend({
         if (typeSuffixRegex.test(key)) {
           let klass = namespace[key];
           if (typeOf(klass) === 'class') {
-            types.push(StringUtils.dasherize(key.replace(typeSuffixRegex, '')));
+            types.push(dasherize(key.replace(typeSuffixRegex, '')));
           }
         }
       }

diff --git a/packages/ember-extension-support/lib/data_adapter.js b/packages/ember-extension-support/lib/data_adapter.js
@@ -2,7 +2,7 @@ import { getOwner } from 'ember-owner';
 import { scheduleOnce } from '@ember/runloop';
 import { get, objectAt, addArrayObserver, removeArrayObserver } from 'ember-metal';
 import {
-  String as StringUtils,
+  dasherize,
   Namespace,
   Object as EmberObject,
   A as emberA,
@@ -394,7 +394,7 @@ export default EmberObject.extend({
         if (!this.detect(namespace[key])) {
           continue;
         }
-        let name = StringUtils.dasherize(key);
+        let name = dasherize(key);
         types.push(name);
       }
     });

diff --git a/packages/ember-glimmer/lib/component-managers/curly.ts b/packages/ember-glimmer/lib/component-managers/curly.ts
@@ -27,7 +27,7 @@ import { assert, deprecate } from 'ember-debug';
 import { ENV } from 'ember-environment';
 import { get } from 'ember-metal';
 import { getOwner } from 'ember-owner';
-import { String as StringUtils } from 'ember-runtime';
+import { dasherize } from 'ember-runtime';
 import { assign, guidFor } from 'ember-utils';
 import { addChildView, OwnedTemplateMeta, setViewElement } from 'ember-views';
 import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS, ROOT_REF } from '../component';
@@ -332,11 +332,7 @@ export default class CurlyComponentManager
     if (classRef && classRef.value()) {
       const ref =
         classRef.value() === true
-          ? new ColonClassNameBindingReference(
-              classRef,
-              StringUtils.dasherize(classRef['_propertyKey']),
-              null
-            )
+          ? new ColonClassNameBindingReference(classRef, dasherize(classRef['_propertyKey']), null)
           : classRef;
       operations.setAttribute('class', ref, false, null);
     }

diff --git a/packages/ember-glimmer/lib/helpers/-class.ts b/packages/ember-glimmer/lib/helpers/-class.ts
@@ -1,5 +1,5 @@
 import { Arguments, VM } from '@glimmer/runtime';
-import { String as StringUtils } from 'ember-runtime';
+import { dasherize } from 'ember-runtime';
 import { InternalHelperReference } from '../utils/references';
 
 function classHelper({ positional }: any) {
@@ -9,14 +9,14 @@ function classHelper({ positional }: any) {
 
   if (value === true) {
     if (args > 1) {
-      return StringUtils.dasherize(positional.at(1).value());
+      return dasherize(positional.at(1).value());
     }
     return null;
   }
 
   if (value === false) {
     if (args > 2) {
-      return StringUtils.dasherize(positional.at(2).value());
+      return dasherize(positional.at(2).value());
     }
     return null;
   }

diff --git a/packages/ember-glimmer/lib/helpers/-normalize-class.ts b/packages/ember-glimmer/lib/helpers/-normalize-class.ts
@@ -1,5 +1,5 @@
 import { Arguments, VM } from '@glimmer/runtime';
-import { String as StringUtils } from 'ember-runtime';
+import { dasherize } from 'ember-runtime';
 import { InternalHelperReference } from '../utils/references';
 
 function normalizeClass({ positional }: any) {
@@ -11,7 +11,7 @@ function normalizeClass({ positional }: any) {
   let value = positional.at(1).value();
 
   if (value === true) {
-    return StringUtils.dasherize(className);
+    return dasherize(className);
   } else if (!value && value !== 0) {
     return '';
   } else {

diff --git a/packages/ember-glimmer/lib/helpers/loc.ts b/packages/ember-glimmer/lib/helpers/loc.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 
-import { String as StringUtils } from 'ember-runtime';
+import { loc } from 'ember-runtime';
 import { helper } from '../helper';
 
 /**
@@ -38,5 +38,5 @@ import { helper } from '../helper';
   @public
 */
 export default helper(function(params) {
-  return StringUtils.loc.apply(null, params);
+  return loc.apply(null, params);
 });
diff --git a/packages/ember-glimmer/lib/utils/bindings.ts b/packages/ember-glimmer/lib/utils/bindings.ts
@@ -4,7 +4,7 @@ import { ElementOperations, PrimitiveReference } from '@glimmer/runtime';
 import { Core, Ops } from '@glimmer/wire-format';
 import { assert } from 'ember-debug';
 import { get } from 'ember-metal';
-import { String as StringUtils } from 'ember-runtime';
+import { dasherize } from 'ember-runtime';
 import { ROOT_REF } from '../component';
 import { Component } from './curly-component-state-bucket';
 import { referenceFromParts } from './references';
@@ -211,7 +211,7 @@ class SimpleClassNameBindingReference extends CachedReference<Option<string>> {
 
     if (value === true) {
       let { path, dasherizedPath } = this;
-      return dasherizedPath || (this.dasherizedPath = StringUtils.dasherize(path));
+      return dasherizedPath || (this.dasherizedPath = dasherize(path));
     } else if (value || value === 0) {
       return String(value);
     } else {

diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -7,7 +7,7 @@ import { DEBUG } from '@glimmer/env';
 import {
   typeOf,
   copy,
-  String as StringUtils,
+  classify,
   Object as EmberObject,
   A as emberA,
   Evented,
@@ -1650,7 +1650,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
         let modelClass = owner.factoryFor(`model:${name}`);
 
         assert(
-          `You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${StringUtils.classify(
+          `You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${classify(
             name
           )} did not exist and you did not override your route's \`model\` hook.`,
           !!modelClass
@@ -1662,10 +1662,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
 
         modelClass = modelClass.class;
 
-        assert(
-          `${StringUtils.classify(name)} has no method \`find\`.`,
-          typeof modelClass.find === 'function'
-        );
+        assert(`${classify(name)} has no method \`find\`.`, typeof modelClass.find === 'function');
 
         return modelClass.find(value);
       },

diff --git a/packages/ember-runtime/index.d.ts b/packages/ember-runtime/index.d.ts
@@ -13,10 +13,8 @@ export const inject: {
 
 export const FrameworkObject: any;
 
-export const String: {
-  dasherize(s: string): string;
-  loc(s: string, ...args: string[]): string;
-};
+export function dasherize(s: string): string;
+export function loc(s: string, ...args: string[]): string;
 
 export function isEmberArray(arr: any): boolean;
 

diff --git a/packages/ember-runtime/index.js b/packages/ember-runtime/index.js
@@ -1,5 +1,14 @@
 export { default as Object, FrameworkObject } from './lib/system/object';
-export { default as String } from './lib/system/string';
+export {
+  loc,
+  w,
+  dasherize,
+  decamelize,
+  camelize,
+  classify,
+  underscore,
+  capitalize,
+} from './lib/system/string';
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
 export { default as copy } from './lib/copy';