json-as 0.5.21 → 0.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.21",
+  "version": "0.5.22",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.21",
+    "version": "0.5.22",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -149,8 +149,22 @@ export default class Transformer extends Transform {
   afterParse(parser: Parser): void {
     // Create new transform
     const transformer = new AsJSONTransform();
+    
+    // Sort the sources so that user scripts are visited last
+    const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
+      const a = _a.internalPath
+      const b = _b.internalPath
+      if (a[0] === "~" && b[0] !== "~") {
+        return -1;
+      } else if (a[0] !== "~" && b[0] === "~") {
+        return 1;
+      } else {
+        return 0;
+      }
+    })
+    
     // Loop over every source
-    for (const source of parser.sources) {
+    for (const source of sources) {
       // Ignore all lib and std. Visit everything else.
       if (!isStdlib(source)) {
         transformer.visit(source);