Other: Slightly restructured utility to better support static code de…

…fault values

README.md

@@ -432,20 +432,19 @@ There is no difference performance-wise as the code generated statically is pret
 
 Additionally, JSON modules can be used with TypeScript definitions generated for their static counterparts as long as the following conditions are met:
 
-1. Always use `SomeMessage.create(...)` instead of `new SomeMessage(...)` because reflection does not provide such a constructor.
-2. Types, services and enums must start with an uppercase letter to become available on the reflected types as well.
-3. When using a TypeScript definition with code not generated by pbjs, `resolveAll()` must be called once on the root instance to populate these additional properties (JSON modules do this automatically).
+1. Use `SomeMessage.create(...)` instead of `new SomeMessage(...)` (reflection does not provide such a constructor).
+2. Types, services and enums must start with an uppercase letter to become available as properties of the reflected types as well.
+3. When using a TypeScript definition with custom code, `resolveAll()` must be called once on the root instance to populate these additional properties (JSON modules do this automatically).
 
 Building
 --------
 
-To build the library or its components yourself, clone it from GitHub and install the development
-dependencies:
+To build the library or its components yourself, clone it from GitHub and install the development dependencies:
 
 ```
 $> git clone https://github.com/dcodeIO/protobuf.js.git
 $> cd protobuf.js
-$> npm install --dev
+$> npm install
 ```
 
 Building the development and production versions with their respective source maps to `dist/`:

cli/targets/static.js

@@ -283,10 +283,14 @@ function buildType(ref, type) {
         else if (field.map)
             push("$prototype" + prop + " = $protobuf.util.emptyObject;");
         else if (field.long)
-            push("$prototype" + prop + " = $protobuf.util.Long ? $protobuf.util.Long.fromValue(" + JSON.stringify(field.typeDefault) + ") : " + field.typeDefault.toNumber(field.type.charAt(0) === "u") + ";");
-        else if (field.bytes)
-            push("$prototype" + prop + " = " + JSON.stringify(Array.prototype.slice.call(field.typeDefault)) + ";");
-        else
+            push("$prototype" + prop + " = $protobuf.util.Long ? $protobuf.util.Long.fromBits("
+                    + JSON.stringify(field.typeDefault.low) + ","
+                    + JSON.stringify(field.typeDefault.high) + ","
+                    + JSON.stringify(field.typeDefault.unsigned)
+                + ") : " + field.typeDefault.toNumber(field.type.charAt(0) === "u") + ";");
+        else if (field.bytes) {
+            push("$prototype" + prop + " = $protobuf.util.newBuffer(" + JSON.stringify(Array.prototype.slice.call(field.typeDefault)) + ");");
+        } else
             push("$prototype" + prop + " = " + JSON.stringify(field.typeDefault) + ";");
     });