Use outer-most identifier when resolving queued exports, fixes AssemblyScript#248

Author: dcodeIO

dist/asc.js

@@ -13,20 +13,20 @@
   "dependencies": {
     "@protobufjs/utf8": "^1.1.0",
     "binaryen": "49.0.0-nightly.20180731",
-    "glob": "^7.1.2",
+    "glob": "^7.1.3",
     "long": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.5.4",
+    "@types/node": "^10.9.4",
     "browser-process-hrtime": "^0.1.2",
     "diff": "^3.5.0",
-    "ts-loader": "^4.4.2",
+    "ts-loader": "^4.5.0",
     "ts-node": "^6.2.0",
     "tslint": "^5.11.0",
     "typedoc": "^0.11.1",
     "typedoc-plugin-external-module-name": "^1.1.3",
-    "typescript": "^3.0.1",
-    "webpack": "^4.16.3",
+    "typescript": "^3.0.3",
+    "webpack": "^4.17.2",
     "webpack-cli": "^3.1.0"
   },
   "main": "index.js",

dist/asc.js.map

@@ -539,7 +539,7 @@ export class Program extends DiagnosticEmitter {
             this.setExportAndCheckLibrary(
               exportName,
               element,
-              currentExport.member.externalName
+              queuedExport.member.externalName
             );
             break;
           }
@@ -562,7 +562,7 @@ export class Program extends DiagnosticEmitter {
             this.setExportAndCheckLibrary(
               exportName,
               element,
-              currentExport.member.externalName
+              queuedExport.member.externalName
             );
           } else {
             this.error(

dist/assemblyscript.js

@@ -17,7 +17,6 @@ export class String {
 
   // TODO Add and handle second argument
   static fromCharCode(code: i32): String {
-    if (!code) return changetype<String>("\0");
     var out = allocateUnsafe(1);
     store<u16>(
       changetype<usize>(out),
@@ -28,8 +27,7 @@ export class String {
   }
 
   static fromCodePoint(code: i32): String {
-    assert(<u32>code <= 0x10FFFF); // Invalid code point range
-    if (!code) return changetype<String>("\0");
+    assert(<u32>code <= 0x10FFFF);
     var sur = code > 0xFFFF;
     var out = allocateUnsafe(<i32>sur + 1);
     if (!sur) {

dist/assemblyscript.js.map

@@ -0,0 +1,39 @@
+(module
+ (type $iii (func (param i32 i32) (result i32)))
+ (type $v (func))
+ (global $export/a i32 (i32.const 1))
+ (global $export/b i32 (i32.const 2))
+ (memory $0 0)
+ (export "memory" (memory $0))
+ (export "a" (global $export/a))
+ (export "renamed_a" (global $export/a))
+ (export "renamed_b" (global $export/b))
+ (export "renamed_renamed_b" (global $export/b))
+ (start $start)
+ (func $export/add (; 0 ;) (; has Stack IR ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+  (i32.add
+   (get_local $0)
+   (get_local $1)
+  )
+ )
+ (func $export/mul (; 1 ;) (; has Stack IR ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
+  (i32.mul
+   (get_local $0)
+   (get_local $1)
+  )
+ )
+ (func $start (; 2 ;) (; has Stack IR ;) (type $v)
+  (drop
+   (i32.add
+    (call $export/add
+     (i32.const 1)
+     (i32.const 2)
+    )
+    (call $export/mul
+     (i32.const 3)
+     (i32.const 4)
+    )
+   )
+  )
+ )
+)

package-lock.json

@@ -0,0 +1,6 @@
+export {
+  a,
+  a as renamed_a,
+  renamed_b,
+  renamed_b as renamed_renamed_b
+} from "./reexport";