Merge remote-tracking branch 'refs/remotes/origin/dev'

Gruntfile.js

@@ -17,6 +17,7 @@ module.exports = function(grunt) {
                     babel({
 						exclude: 'node_modules/**',
 						presets: ['es2015-rollup'],
+						plugins: ['transform-object-assign'],
 					}),
 					uglify(),
                 ],

engine/CallStack.js

@@ -1,4 +1,3 @@
-//complete
 import {PushPopType} from './PushPop';
 import {Container} from './Container';
 import {Path} from './Path';

engine/Choice.js

@@ -1,4 +1,3 @@
-//complete
 export class Choice{
 	constructor(choice){
 		this.text;

engine/ChoicePoint.js

@@ -1,4 +1,3 @@
-//complete
 import {Object as InkObject} from './Object';
 import {Path} from './Path';
 

engine/Container.js

@@ -1,4 +1,3 @@
-//complete
 import {StringValue} from './Value';
 import {StoryException} from './StoryException';
 import {Object as InkObject} from './Object';

engine/ControlCommand.js

@@ -1,4 +1,3 @@
-//complete
 import {Object as InkObject} from './Object';
 
 export class ControlCommand extends InkObject{

engine/Divert.js

@@ -1,4 +1,3 @@
-//complete
 import {Path} from './Path';
 import {PushPopType} from './PushPop';
 import {Object as InkObject} from './Object';

engine/Glue.js

@@ -1,4 +1,3 @@
-//complete
 export class Glue{
 	constructor(type){
 		this.glueType = type;

engine/Object.js

@@ -1,7 +1,3 @@
-//still missing:
-// - DebugMetaData
-// - bool operators
-
 import {Path} from './Path';
 import {Container} from './Container';
 
@@ -104,8 +100,7 @@ export class Object{
 		for (var down = lastSharedPathCompIndex + 1; down < globalPath.components.length; ++down)
 			newPathComps.push(globalPath.components[down]);
 
-		var relativePath = new Path(newPathComps);
-		relativePath.isRelative = true;
+		var relativePath = new Path(newPathComps, true);
 		return relativePath;
 	}
 	CompactPathString(otherPath){

engine/Path.js

@@ -1,20 +1,23 @@
-//complete
 export class Path{
 	constructor(/*polymorphic constructor*/){
-		this.isRelative;
+		this._isRelative;
 		this._components = [];
 
-		if (arguments.length == 2){
+		if (typeof arguments[0] == 'string'){
+			this.componentsString = arguments[0];
+		}
+		else if (arguments[0] instanceof Component && arguments[1] instanceof Path){
 			this._components.push(arguments[0]);
 			this._components = this._components.concat(arguments[1]);
 		}
-		else if (arguments.length == 1 && typeof arguments[0] == 'string'){
-			this.componentsString = arguments[0];
-		}
-		else if (arguments.length == 1 && arguments[0] instanceof Array){
+		else if (arguments[0] instanceof Array){
 			this._components = this._components.concat(arguments[0]);
+			this._isRelative = !!arguments[1];
 		}
 	}
+	get isRelative(){
+		return this._isRelative;
+	}
 	get components(){
 		return this._components;
 	}
@@ -54,7 +57,7 @@ export class Path{
 	}
 	static get self(){
 		var path = new Path();
-		path.isRelative = true;
+		path._isRelative = true;
 		return path;
 	}
 
@@ -91,13 +94,15 @@ export class Path{
 		this.components.length = 0;
 
 		var componentsStr = value;
+
+		if (componentsStr == null || componentsStr == '') return;
 
 		// When components start with ".", it indicates a relative path, e.g.
 		//   .^.^.hello.5
 		// is equivalent to file system style path:
 		//  ../../hello/5
 		if (componentsStr[0] == '.') {
-			this.isRelative = true;
+			this._isRelative = true;
 			componentsStr = componentsStr.substring(1);
 		}
 

engine/Polyfill.js

@@ -0,0 +1,5 @@
+if (!Number.isInteger) {
+	Number.isInteger = function isInteger (nVal) {
+		return typeof nVal === "number" && isFinite(nVal) && nVal > -9007199254740992 && nVal < 9007199254740992 && Math.floor(nVal) === nVal;
+	};
+}

engine/PushPop.js

@@ -1,4 +1,3 @@
-//complete
 export let PushPopType = {
 	Tunnel: 0,
 	Function: 1,

engine/Story.js

@@ -15,6 +15,7 @@ import {VariableReference} from './VariableReference';
 import {NativeFunctionCall} from './NativeFunctionCall';
 import {StoryException} from './StoryException';
 import {PRNG} from './PRNG';
+import {Polyfill} from './Polyfill';
 
 export class Story extends InkObject{
 	constructor(jsonString){
@@ -244,7 +245,7 @@ export class Story extends InkObject{
 					this.Error("Thread available to pop, threads should always be flat by the end of evaluation?");
 				}
 
-				if( this.currentChoices.length == 0 && !this.state.didSafeExit ) {
+				if( this.currentChoices.length == 0 && !this.state.didSafeExit && this._temporaryEvaluationContainer == null) {
 					if( this.state.callStack.CanPop(PushPopType.Tunnel) ) {
 						this.Error("unexpectedly reached end of content. Do you need a '->->' to return from a tunnel?");
 					} else if( this.state.callStack.CanPop(PushPopType.Function) ) {

engine/StoryState.js

@@ -1,4 +1,3 @@
-//complete
 import {CallStack} from './CallStack';
 import {VariablesState} from './VariablesState';
 import {StringValue} from './Value';

engine/Value.js

@@ -1,4 +1,3 @@
-//complete
 import {Object as InkObject} from './Object';
 import {Path} from './Path';
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inkjs",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A javascript port of inkle's ink scripting language (http://www.inklestudios.com/ink/)",
   "main": "dist/ink.cjs.js",
   "scripts": {