Convert dart_utils.js to input_sdk/lib/_internal/utils.dart (#310)

Author: Olivier Chafik

lib/runtime/dart/_classes.js

@@ -12,14 +12,15 @@
 // TODO(leafp): Consider splitting some of this out.
 dart_library.library('dart/_classes', null, /* Imports */[
 ], /* Lazy Imports */[
+  'dart/_utils',
   'dart/core',
   'dart/_interceptors',
   'dart/_types',
   'dart/_rtti',
-], function(exports, core, _interceptors, types, rtti) {
+], function(exports, dart_utils, core, _interceptors, types, rtti) {
   'use strict';
 
-  const assert = dart_utils.assert;
+  const assert = dart_utils.assert_;
   const copyProperties = dart_utils.copyProperties;
   const copyTheseProperties = dart_utils.copyTheseProperties;
   const defineMemoizedGetter = dart_utils.defineMemoizedGetter;

lib/runtime/dart/_operations.js

@@ -7,6 +7,7 @@
  */
 dart_library.library('dart/_operations', null, /* Imports */[
 ], /* Lazy Imports */[
+  'dart/_utils',
   'dart/async',
   'dart/collection',
   'dart/core',
@@ -15,7 +16,7 @@ dart_library.library('dart/_operations', null, /* Imports */[
   'dart/_errors',
   'dart/_rtti',
   'dart/_types'
-], function(exports, async, collection, core, _js_helper, classes, errors, rtti,
+], function(exports, dart_utils, async, collection, core, _js_helper, classes, errors, rtti,
             types) {
   'use strict';
 

lib/runtime/dart/_rtti.js

@@ -8,9 +8,10 @@
 
 dart_library.library('dart/_rtti', null, /* Imports */[
 ], /* Lazy Imports */[
+  'dart/_utils',
   'dart/core',
   'dart/_types'
-], function(exports, core, types) {
+], function(exports, dart_utils, core, types) {
   'use strict';
 
   const defineLazyProperty = dart_utils.defineLazyProperty;

lib/runtime/dart/_runtime.js

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 dart_library.library('dart/_runtime', null, /* Imports */[
+  'dart/_utils',
   'dart/_classes',
   'dart/_errors',
   'dart/_generators',
@@ -11,7 +12,7 @@ dart_library.library('dart/_runtime', null, /* Imports */[
   'dart/_types',
 ], /* Lazy Imports */[
   'dart/_js_helper'
-], function(exports, classes, errors, generators, operations, rtti, types,
+], function(exports, dart_utils, classes, errors, generators, operations, rtti, types,
     _js_helper) {
   'use strict';
 
@@ -64,7 +65,7 @@ dart_library.library('dart/_runtime', null, /* Imports */[
   ]);
 
   // From dart_utils
-  exportFrom(dart_utils, ['copyProperties', 'export']);
+  exportFrom(dart_utils, ['copyProperties', 'export_']);
   // Renames
   exports.defineLazyClass = _export(dart_utils.defineLazy);
   exports.defineLazyProperties = _export(dart_utils.defineLazy);

lib/runtime/dart/_types.js

@@ -7,15 +7,16 @@
 
 dart_library.library('dart/_types', null, /* Imports */[
 ], /* Lazy Imports */[
+  'dart/_utils',
   'dart/core',
   'dart/_classes',
   'dart/_rtti'
-], function(exports, core, classes, rtti) {
+], function(exports, dart_utils, core, classes, rtti) {
   'use strict';
 
   const getOwnPropertyNames = Object.getOwnPropertyNames;
 
-  const assert = dart_utils.assert;
+  const assert = dart_utils.assert_;
 
   /**
    * Types in dart are represented at runtime as follows.
@@ -24,12 +25,12 @@ dart_library.library('dart/_types', null, /* Imports */[
    *     If the type is the result of instantiating a generic class,
    *     then the "classes" module manages the association between the
    *     instantiated class and the original class declaration
-   *     and the type arguments with which it was instantiated.  This 
+   *     and the type arguments with which it was instantiated.  This
    *     assocation can be queried via the "classes" module".
    *
    *   - All other types are represented as instances of class TypeRep,
    *     defined in this module.
-   *     - Dynamic, Void, and Bottom are singleton instances of sentinal 
+   *     - Dynamic, Void, and Bottom are singleton instances of sentinal
    *       classes.
    *     - Function types are instances of subclasses of AbstractFunctionType.
    *

lib/runtime/dart/_utils.js

@@ -1,70 +1,42 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-/* This library defines a set of general javascript utilities for us
- * by the Dart runtime.
-*/
-
-var dart_utils =
-  typeof module != "undefined" && module.exports || {};
-
-(function (dart_utils) {
+dart_library.library('dart/_utils', null, /* Imports */[
+], /* Lazy imports */[
+], function(exports, dart) {
   'use strict';
-
-  const defineProperty = Object.defineProperty;
-  const getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  const getOwnPropertyNames = Object.getOwnPropertyNames;
-  const getOwnPropertySymbols = Object.getOwnPropertySymbols;
-
-  const hasOwnProperty = Object.prototype.hasOwnProperty;
-
-  class StrongModeError extends Error {
-    constructor(message) {
-      super(message);
+  let defineProperty = Object.defineProperty;
+  let getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  let getOwnPropertyNames = Object.getOwnPropertyNames;
+  let getOwnPropertySymbols = Object.getOwnPropertySymbols;
+  let hasOwnProperty = Object.prototype.hasOwnProperty;
+  let StrongModeError = (function() {
+    function StrongModeError(message) {
+      Error.call(this);
+      this.message = message;
     }
-  }
-
-  /** This error indicates a strong mode specific failure.
-   */
-  function throwStrongModeError(message) {
+    ;
+    Object.setPrototypeOf(StrongModeError.prototype, Error.prototype);
+    return StrongModeError;
+  })();
+  let throwStrongModeError = function(message) {
     throw new StrongModeError(message);
-  }
-  dart_utils.throwStrongModeError = throwStrongModeError;
-
-  /** This error indicates a bug in the runtime or the compiler.
-   */
-  function throwInternalError(message) {
+  };
+  let throwInternalError = function(message) {
     throw Error(message);
-  }
-  dart_utils.throwInternalError = throwInternalError;
-
-  function assert(condition) {
-    if (!condition) throwInternalError("The compiler is broken: failed assert");
-  }
-  dart_utils.assert = assert;
-
-  function getOwnNamesAndSymbols(obj) {
+  };
+  let assert_ = function(condition) {
+    if (!condition)
+      throwInternalError("The compiler is broken: failed assert");
+  };
+  let getOwnNamesAndSymbols = function(obj) {
     return getOwnPropertyNames(obj).concat(getOwnPropertySymbols(obj));
-  }
-  dart_utils.getOwnNamesAndSymbols = getOwnNamesAndSymbols;
-
-  function safeGetOwnProperty(obj, name) {
+  };
+  let safeGetOwnProperty = function(obj, name) {
     let desc = getOwnPropertyDescriptor(obj, name);
-    if (desc) return desc.value;
-  }
-  dart_utils.safeGetOwnProperty = safeGetOwnProperty;
-
-  /**
-   * Defines a lazy property.
-   * After initial get or set, it will replace itself with a value property.
-   */
-  // TODO(jmesserly): reusing descriptor objects has been shown to improve
-  // performance in other projects (e.g. webcomponents.js ShadowDOM polyfill).
-  function defineLazyProperty(to, name, desc) {
+    if (desc)
+      return desc.value;
+  };
+  let defineLazyProperty = function(to, name, desc) {
     let init = desc.get;
     let value = null;
-
     function lazySetter(x) {
       init = null;
       value = x;
@@ -73,61 +45,62 @@ var dart_utils =
       throwInternalError('circular initialization for field ' + name);
     }
     function lazyGetter() {
-      if (init == null) return value;
-
-      // Compute and store the value, guarding against reentry.
+      if (init == null)
+        return value;
       let f = init;
       init = circularInitError;
       lazySetter(f());
       return value;
     }
     desc.get = lazyGetter;
     desc.configurable = true;
-    if (desc.set) desc.set = lazySetter;
+    if (desc.set)
+      desc.set = lazySetter;
     return defineProperty(to, name, desc);
-  }
-  dart_utils.defineLazyProperty = defineLazyProperty;
-
-  function defineLazy(to, from) {
+  };
+  let defineLazy = function(to, from) {
     for (let name of getOwnNamesAndSymbols(from)) {
       defineLazyProperty(to, name, getOwnPropertyDescriptor(from, name));
     }
-  }
-  dart_utils.defineLazy = defineLazy;
-
-  function defineMemoizedGetter(obj, name, getter) {
+  };
+  let defineMemoizedGetter = function(obj, name, getter) {
     return defineLazyProperty(obj, name, {get: getter});
-  }
-  dart_utils.defineMemoizedGetter = defineMemoizedGetter;
-
-  function copyTheseProperties(to, from, names) {
+  };
+  let copyTheseProperties = function(to, from, names) {
     for (let name of names) {
       defineProperty(to, name, getOwnPropertyDescriptor(from, name));
     }
     return to;
-  }
-  dart_utils.copyTheseProperties = copyTheseProperties;
-
-  /**
-   * Copy properties from source to destination object.
-   * This operation is commonly called `mixin` in JS.
-   */
-  function copyProperties(to, from) {
+  };
+  let copyProperties = function(to, from) {
     return copyTheseProperties(to, from, getOwnNamesAndSymbols(from));
-  }
-  dart_utils.copyProperties = copyProperties;
-
-  /** Exports from one Dart module to another. */
-  function export_(to, from, show, hide) {
+  };
+  let export_ = function(to, from, show, hide) {
     if (show == void 0) {
       show = getOwnNamesAndSymbols(from);
     }
     if (hide != void 0) {
       var hideMap = new Set(hide);
-      show = show.filter((k) => !hideMap.has(k));
+      show = show.filter(k => !hideMap.has(k));
     }
     return copyTheseProperties(to, from, show);
-  }
-  dart_utils.export = export_;
-
-})(dart_utils);
+  };
+  // Exports:
+  exports.defineProperty = defineProperty;
+  exports.getOwnPropertyDescriptor = getOwnPropertyDescriptor;
+  exports.getOwnPropertyNames = getOwnPropertyNames;
+  exports.getOwnPropertySymbols = getOwnPropertySymbols;
+  exports.hasOwnProperty = hasOwnProperty;
+  exports.StrongModeError = StrongModeError;
+  exports.throwStrongModeError = throwStrongModeError;
+  exports.throwInternalError = throwInternalError;
+  exports.assert_ = assert_;
+  exports.getOwnNamesAndSymbols = getOwnNamesAndSymbols;
+  exports.safeGetOwnProperty = safeGetOwnProperty;
+  exports.defineLazyProperty = defineLazyProperty;
+  exports.defineLazy = defineLazy;
+  exports.defineMemoizedGetter = defineMemoizedGetter;
+  exports.copyTheseProperties = copyTheseProperties;
+  exports.copyProperties = copyProperties;
+  exports.export_ = export_;
+});

test/browser/runtime_tests.js

@@ -13,6 +13,7 @@ var dartx = dart.dartx;
 // If we decide to expose them, this can go away.
 var classes = dart_library.import('dart/_classes');
 var types = dart_library.import('dart/_types');
+var dart_utils = dart_library.import('dart/_utils');
 
 suite('generic', () => {
   "use strict";

test/codegen/expect/collection/src/unmodifiable_wrappers.js

@@ -7,7 +7,7 @@ dart_library.library('collection/src/unmodifiable_wrappers', null, /* Imports */
 ], function(exports, dart, collection, core, wrappers) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, collection, ['UnmodifiableListView', 'UnmodifiableMapView'], []);
+  dart.export_(exports, collection, ['UnmodifiableListView', 'UnmodifiableMapView'], []);
   const NonGrowableListMixin$ = dart.generic(function(E) {
     class NonGrowableListMixin extends core.Object {
       static _throw() {

test/codegen/expect/collection/wrappers.js

@@ -9,8 +9,8 @@ dart_library.library('collection/wrappers', null, /* Imports */[
 ], function(exports, dart, canonicalized_map, core, math, collection, unmodifiable_wrappers) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, canonicalized_map);
-  dart.export(exports, unmodifiable_wrappers);
+  dart.export_(exports, canonicalized_map);
+  dart.export_(exports, unmodifiable_wrappers);
   const _base = Symbol('_base');
   const _DelegatingIterableBase$ = dart.generic(function(E) {
     class _DelegatingIterableBase extends core.Object {

test/codegen/expect/dir/html_input_b.js

@@ -5,6 +5,6 @@ dart_library.library('dir/html_input_b', null, /* Imports */[
 ], function(exports, dart, html_input_d) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, html_input_d);
+  dart.export_(exports, html_input_d);
   exports.x = 3;
 });

test/codegen/expect/js/js.js

@@ -6,7 +6,7 @@ dart_library.library('js/js', null, /* Imports */[
 ], function(exports, dart, js, core) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, js, ['allowInterop', 'allowInteropCaptureThis'], []);
+  dart.export_(exports, js, ['allowInterop', 'allowInteropCaptureThis'], []);
   class JS extends core.Object {
     JS(name) {
       if (name === void 0)

test/codegen/expect/unittest.js

@@ -11,7 +11,7 @@ dart_library.library('unittest', null, /* Imports */[
 ], function(exports, dart, matcher, dom, core, async, interfaces, util, description$) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, matcher);
+  dart.export_(exports, matcher);
   function group(name, body) {
     return dart.dsend(dom.window, 'suite', name, body);
   }

test/codegen/expect/unittest/unittest.js

@@ -11,7 +11,7 @@ dart_library.library('unittest/unittest', null, /* Imports */[
 ], function(exports, dart, matcher, dom, core, async, interfaces, util, description$) {
   'use strict';
   let dartx = dart.dartx;
-  dart.export(exports, matcher);
+  dart.export_(exports, matcher);
   function group(name, body) {
     return dart.dsend(dom.window, 'suite', name, body);
   }

tool/build_sdk.sh

@@ -11,5 +11,6 @@ echo "*** Compiling SDK to JavaScript"
 dart -c bin/dartdevc.dart --no-source-maps --arrow-fn-bind-this --sdk-check \
     --force-compile -l warning --dart-sdk tool/generated_sdk -o lib/runtime/ \
     "$@" \
+    dart:_utils \
     dart:js dart:mirrors \
     > tool/sdk_expected_errors.txt || true

tool/input_sdk/lib/_internal/libraries.dart

@@ -216,6 +216,12 @@ const Map<String, LibraryInfo> LIBRARIES = const {
       category: "Internal",
       documented: false,
       platforms: DART2JS_PLATFORM),
+
+  "_utils": const LibraryInfo(
+      "_internal/compiler/js_lib/utils.dart",
+      category: "Internal",
+      documented: false,
+      platforms: DART2JS_PLATFORM),
 };
 
 /**