zuzu-js 0.2.0 → 0.3.0

package/lib/cli.js

@@ -254,7 +254,7 @@ function stripShebang( source ) {
 }
 
 function printVersion( runtime, verbose ) {
-	process.stdout.write( 'zuzu-js version 0.2.0\n' );
+	process.stdout.write( 'zuzu-js version 0.3.0\n' );
 	if ( verbose ) {
 		process.stdout.write( '\nlib search paths:\n' );
 		for ( const p of runtime.getModuleSearchRoots() ) {

package/lib/runtime.js

@@ -53,6 +53,28 @@ const textEncoder = new TextEncoder();
 const utf8Decoder = new TextDecoder( 'utf-8', { fatal: true } );
 const ZUZU_SKIP_BUILD = Symbol.for( 'zuzu.skip_build' );
 
+const runtimeVersion = (() => {
+	if ( typeof globalThis === 'object' && globalThis !== null ) {
+		const globalVersion = globalThis.__ZUZU_RUNTIME_VERSION;
+		if ( typeof globalVersion === 'string' && globalVersion.trim() ) {
+			return String( globalVersion );
+		}
+	}
+	if ( typeof process === 'object' && process && process.versions ) {
+		try {
+			const packageMetadata = require( '../package.json' );
+			const packageVersion = packageMetadata && packageMetadata.version;
+			if ( packageVersion ) {
+				return String( packageVersion );
+			}
+		}
+		catch ( err ) {
+			return 'dev';
+		}
+	}
+	return 'dev';
+})();
+
 function defaultModuleSearchRoots( host, repoRoot, includePaths ) {
 	if ( host.name === 'browser' ) {
 		return [
@@ -1283,7 +1305,11 @@ function defineZuzuClass( name, base, spec = {} ) {
 					zuzuStoreField( this, field, value );
 				}
 				let named = null;
-				if ( ctorArgs.length === 1 && isPairListLike( ctorArgs[0] ) ) {
+				const lastArg = ctorArgs[ctorArgs.length - 1];
+				if (
+					ctorArgs.length === 1
+					&& isPairListLike( ctorArgs[0] )
+				) {
 					named = ctorArgs[0];
 				}
 				else if (
@@ -1294,6 +1320,20 @@ function defineZuzuClass( name, base, spec = {} ) {
 				) {
 					named = ctorArgs[0];
 				}
+				else if (
+					ctorArgs.length > 1
+					&& isPairListLike( lastArg )
+				) {
+					named = lastArg;
+				}
+				else if (
+					ctorArgs.length > 1
+					&& lastArg
+					&& typeof lastArg === 'object'
+					&& !Array.isArray( lastArg )
+				) {
+					named = lastArg;
+				}
 				const releaseTemporaryNamed = !skipBuild
 					&& isPairListLike( named )
 					&& named.__zuzu_temporary_call_args === true;
@@ -1459,9 +1499,6 @@ function zuzuCallMember( object, property, ...args ) {
 	if ( dictMethod ) {
 		return dictMethod( ...args );
 	}
-	if ( args.length === 0 ) {
-		return value;
-	}
 	throw new TypeError( `${String( property )} is not a function` );
 }
 
@@ -2421,7 +2458,7 @@ class ZuzuScript {
 		const systemGlobalSeed = {
 			language_version: 0,
 			runtime: 'zuzu-js',
-			runtime_version: 'dev',
+			runtime_version: runtimeVersion,
 			platform: this.host.name,
 			inc: Object.freeze( moduleSearchRoots.slice() ),
 			deny_fs: capabilityFlags.fs ? false : true,

package/lib/transpiler-new/codegen.js

@@ -609,6 +609,8 @@ function extractSpecialPreludeNames( signature ) {
 			return [ '__zuzu_call_args', signature.headName, signature.restName, signature.namedName, '__i', '__a' ];
 		case 'scalar_pairlist':
 			return [ '__zuzu_call_args', signature.headName, signature.namedName, '__i', '__a' ];
+		case 'scalar_pairlist_array':
+			return [ '__zuzu_call_args', signature.headName, signature.namedName, signature.restName, '__i', '__a' ];
 		case 'variadic':
 			return [ '__zuzu_call_args', signature.headName, signature.restName, '__i', '__a' ];
 		default:
@@ -694,6 +696,22 @@ function analyzeSpecialSignature( params ) {
 			namedName: params[1].name,
 		};
 	}
+	if (
+		params.length === 3
+		&& params[0].type === 'Parameter'
+		&& params[1].type === 'SpecialParameter'
+		&& params[1].special === 'rest_only'
+		&& params[1].containerType === 'PairList'
+		&& params[2].type === 'Parameter'
+		&& ( params[2].typeName === 'Array' || params[2].typeName == null )
+	) {
+		return {
+			kind: 'scalar_pairlist_array',
+			headName: params[0].name,
+			namedName: params[1].name,
+			restName: params[2].name,
+		};
+	}
 	if (
 		params.length === 1
 		&& params[0].type === 'SpecialParameter'
@@ -835,6 +853,19 @@ function emitSpecialFunctionPreamble( signature ) {
 				'}',
 				`const ${signature.namedName} = __zuzu_named_args;`,
 			].join( '\n' );
+		case 'scalar_pairlist_array':
+			return [
+				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
+				`const ${signature.headName} = __zuzu_call_args[0];`,
+				'let __zuzu_named_args = __zuzu_pairlist_literal( [] );',
+				'const __zuzu_rest_args = [];',
+				'for ( let __i = 1; __i < __zuzu_call_args.length; __i++ ) {',
+				'const __a = __zuzu_call_args[__i];',
+				'if ( __zuzu_is_pairlist( __a ) ) { __zuzu_named_args = __a; } else { __zuzu_rest_args.push( __a ); }',
+				'}',
+				`const ${signature.restName} = __zuzu_rest_args;`,
+				`const ${signature.namedName} = __zuzu_named_args;`,
+			].join( '\n' );
 		case 'variadic':
 			return [
 				'const __zuzu_call_args = Array.prototype.slice.call( arguments );',
@@ -2163,6 +2194,9 @@ function emitAssignmentExpression( node ) {
 					: `${left} = __zuzu_assign_strong( ${left}, ${right} )`;
 			}
 			if ( node.left && node.left.type === 'MemberExpression' ) {
+				if ( !node.left.computed ) {
+					throw new UnsupportedSyntaxError( 'Invalid assignment target' );
+				}
 				const object = emitExpression( node.left.object );
 				const objectTarget = emitAssignmentTarget( node.left.object );
 				const key = node.left.computed

package/lib/transpiler-new/validate-bindings.js

@@ -235,6 +235,7 @@ function validateExpression( node, scope ) {
 			}
 			return;
 		case 'UpdateExpression':
+			requireValidAssignmentTarget( node.argument );
 			if ( node.argument && node.argument.type === 'Identifier' ) {
 				requireMutable( node.argument, scope );
 			}
@@ -242,6 +243,23 @@ function validateExpression( node, scope ) {
 				validateExpression( node.argument, scope );
 			}
 			return;
+		case 'UnaryExpression':
+			if ( node.operator === '++' || node.operator === '--' ) {
+				requireValidAssignmentTarget( node.argument );
+				if ( node.argument && node.argument.type === 'Identifier' ) {
+					requireMutable( node.argument, scope );
+				}
+				else {
+					validateExpression( node.argument, scope );
+				}
+				return;
+			}
+			validateChildNodes( node, scope );
+			return;
+		case 'RefExpression':
+			requireValidAssignmentTarget( node.argument );
+			validateExpression( node.argument, scope );
+			return;
 		case 'FunctionExpression':
 			validateFunctionBody( node, scope );
 			return;
@@ -261,11 +279,13 @@ function requireValidAssignmentTarget( node ) {
 	}
 	if (
 		target.type === 'Identifier'
-		|| target.type === 'MemberExpression'
 		|| target.type === 'SliceExpression'
 	) {
 		return;
 	}
+	if ( target.type === 'MemberExpression' && target.computed ) {
+		return;
+	}
 	if (
 		target.type === 'BinaryExpression'
 		&& [ '@', '@@', '@?' ].includes( target.operator )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zuzu-js",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "JavaScript runtime, compiler, and browser bundle for ZuzuScript.",
   "main": "lib/zuzu.js",
   "bin": {