start of ES6 modules: move to rollup

.travis.yml

@@ -1,6 +1,4 @@
 language: node_js
 node_js: 10
 script:
-- npm run-script build
-- npm test
-- npm run-script check-format
+- make lint build test check-format

Gruntfile.js

@@ -33,14 +33,6 @@ module.exports = function(grunt){
         banner: banner_full,
         process: true,
 	  },
-      pzpr: {
-        options: {
-          sourceMap: !PRODUCTION
-        },
-        files: [
-          { src: require('./src/pzpr.js').files, dest: 'dist/js/pzpr.concat.js' }
-        ]
-      },
       ui: {
         options:{
           sourceMap: !PRODUCTION
@@ -56,16 +48,6 @@ module.exports = function(grunt){
         banner: banner_min,
         report: 'min'
       },
-      pzpr:{
-        options: (PRODUCTION ? {} : {
-          sourceMap : 'dist/js/pzpr.js.map',
-          sourceMapIn : 'dist/js/pzpr.concat.js.map',
-          sourceMapIncludeSources : true
-        }),
-        files: [
-          { src: 'dist/js/pzpr.concat.js', dest: 'dist/js/pzpr.js'}
-        ]
-      },
       variety:{
         options: (PRODUCTION ? {} : {
           sourceMap : function(filename){ return filename+'.map';}
@@ -98,8 +80,7 @@ module.exports = function(grunt){
 
   grunt.registerTask('default', ['build']);
   grunt.registerTask('release', ['build']);
-  grunt.registerTask('build',        ['build:pzpr', 'build:variety', 'build:samples', 'build:ui']);
-  grunt.registerTask('build:pzpr',   ['newer:concat:pzpr', 'newer:uglify:pzpr']);
+  grunt.registerTask('build',        ['build:variety', 'build:samples', 'build:ui']);
   grunt.registerTask('build:ui',     ['newer:copy:ui', 'newer:concat:ui', 'newer:uglify:ui']);
   grunt.registerTask('build:variety',['newer:uglify:variety']);
   grunt.registerTask('build:samples',['newer:uglify:samples']);

Makefile

@@ -1,9 +1,44 @@
-.PHONY: build test serve format
+.PHONY: default build test serve serve-all format check-format npm-install lint candle bundle rollup githash
 
-build:
+BUNDLEFILES=./src/header.js \
+			./src/pzpr/env.js \
+			./src/pzpr/event.js \
+			./src/pzpr/classmgr.js \
+			./src/pzpr/variety.js \
+			./src/pzpr/parser.js \
+			./src/pzpr/metadata.js \
+			./src/pzpr/util.js \
+			./src/puzzle/Puzzle.js \
+			./src/puzzle/Config.js \
+			./src/puzzle/Address.js \
+			./src/puzzle/Piece.js \
+			./src/puzzle/PieceList.js \
+			./src/puzzle/Board.js \
+			./src/puzzle/BoardExec.js \
+			./src/puzzle/GraphBase.js \
+			./src/puzzle/LineManager.js \
+			./src/puzzle/AreaManager.js \
+			./src/puzzle/Graphic.js \
+			./src/puzzle/MouseInput.js \
+			./src/puzzle/KeyInput.js \
+			./src/puzzle/Encode.js \
+			./src/puzzle/FileData.js \
+			./src/puzzle/Answer.js \
+			./src/puzzle/Operation.js \
+			./src/variety-common/Graphic.js \
+			./src/variety-common/KeyInput.js \
+			./src/variety-common/MouseInput.js \
+			./src/variety-common/Answer.js \
+			./src/variety-common/BoardExec.js \
+			./src/variety-common/Encode.js \
+			./src/variety-common/FileData.js
+
+default: lint test
+
+build: candle rollup githash
 	npm run-script build
 
-test:
+test: bundle
 	npm test
 
 serve:
@@ -13,4 +48,29 @@ serve-all:
 	cd dist && python3 -m http.server
 
 format:
-	npm run-script format
+	npx prettier --write "{src,src-ui,test}/**/*.{js,json,css}"
+
+check-format:
+	npx prettier --check "{src,src-ui,test}/**/*.{js,json,css}"
+
+npm-install:
+	npm install
+
+lint:
+	npx eslint --quiet src src-ui test sample
+
+candle:
+	mkdir -p ./dist/js/
+	cp ./node_modules/pzpr-canvas/dist/candle.js ./dist/js/candle.js
+
+bundle:
+	mkdir -p ./dist/js/
+	cat ${BUNDLEFILES} > "./dist/js/pzpr.concat.js"
+
+rollup: bundle
+	mkdir -p ./dist/js/
+	npx rollup -c ./rollup.config.js
+
+HASH=$(shell git rev-parse --short HEAD)
+githash:
+	sed -i s'/<%= git.hash %>/${HASH}/g' ./dist/js/pzpr.js

package.json

@@ -21,25 +21,25 @@
     "node": ">= 5.6.0"
   },
   "scripts": {
-    "build": "eslint --cache --quiet src src-ui && ./git-hash.sh && grunt default",
+    "build": "./git-hash.sh && grunt default",
     "release": "npm run clean && eslint --cache --quiet src && grunt release",
     "clean": "del dist/* pzpr-*.{zip,tar.gz,tar.bz2,tgz}",
-    "format": "prettier --write \"{src,src-ui,test}/**/*.{js,css}\"",
-    "check-format": "prettier --check \"{src,src-ui,test}/**/*.{js,css}\"",
-    "lint": "eslint src src-ui test sample",
-    "test": "eslint --quiet src src-ui test sample && mocha -r source-map-support/register -R progress --recursive test",
+    "test": "mocha -r esm -r pzpr-canvas -r source-map-support/register -R progress --recursive test",
     "prepublishOnly": "npm test"
   },
   "devDependencies": {
     "del-cli": "^2.0.0",
     "eslint": "^5.16.0",
+    "esm": "^3.2.25",
     "grunt": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-uglify": "^2.0.0",
     "grunt-newer": "^1.1.1",
     "mocha": "^6.2.3",
-    "prettier": "^1.19.1"
+    "prettier": "^1.19.1",
+    "rollup": "^2.6.0",
+    "rollup-plugin-terser": "^5.3.0"
   },
   "dependencies": {
     "pzpr-canvas": "^0.8.2",

rollup.config.js

@@ -0,0 +1,22 @@
+import { terser } from 'rollup-plugin-terser';
+
+// `npm run build` -> `production` is true
+// `npm run dev` -> `production` is false
+const production = !process.env.ROLLUP_WATCH;
+
+export default {
+	input: 'dist/js/pzpr.concat.js',
+	output: {
+		file: 'dist/js/pzpr.js',
+		name: 'pzpr',
+		format: 'iife',
+		sourcemap: true,
+		globals: {
+			"pzpr-canvas": "Candle"
+		}
+	},
+	context: "window",
+	plugins: [
+		production && terser() // minify, but only in production
+	]
+};

src-ui/list.html

@@ -5,6 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html">
 <TITLE>puzz.link list of puzzle types</TITLE>
 <link rel="stylesheet" href="./css/list.css?<%= git.hash %>">
+<script src="./js/candle.js?<%= git.hash %>"></script>
 <script src="./js/pzpr.js?<%= git.hash %>"></script>
 <script src="./js/list.js?<%= git.hash %>"></script>
 </HEAD>

src-ui/p.html

@@ -11,6 +11,7 @@
 <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#5bbad5">
 
 <link rel="stylesheet" href="./css/ui.css?<%= git.hash %>" type="text/css">
+<script type="text/javascript" src="./js/candle.js?<%= git.hash %>"></script>
 <script type="text/javascript" src="./js/pzpr.js?<%= git.hash %>"></script>
 <script type="text/javascript" src="./js/pzpr-ui.js?<%= git.hash %>"></script>
 <title>puzz.link player</title>

src-ui/rules.html

@@ -39,6 +39,7 @@
 }
 </style>
 
+<script type="text/javascript" src="./js/candle.js?<%= git.hash %>"></script>
 <script type="text/javascript" src="./js/pzpr.js?<%= git.hash %>"></script>
 <script>
 

src/.eslintrc.json

@@ -1,34 +1,35 @@
 {
   "env": {
-    "browser": true,                    // Allow to use browser defined variable (not console, alert etc.)
-    "node": true                        // Allow to use node defined variable (require, process etc.)
+    "browser": true, // Allow to use browser defined variable (not console, alert etc.)
+    "node": true // Allow to use node defined variable (require, process etc.)
   },
   "parserOptions": {
-    "ecmaVersion": 5
+    "ecmaVersion": 5,
+    "sourceType": "module"
   },
   "globals": {
     "pzpr": "readonly"
   },
-  "extends": "eslint:recommended",      // Implement recommended rules
+  "extends": "eslint:recommended", // Implement recommended rules
   "rules": {
-    "curly": ["error", "all"],          // Error for no curly brancket in loop or conditions
-    "no-unused-vars":                   // Error for unused variables, not detect arguments
-        ["error", {"args": "none"}],
-    "no-undef": "error",                // Error for unused variable (that will become global variable)
-    "new-cap": "error",                 // Error for lowercase first letter or constructor call as function
-    "eqeqeq": ["error", "always"],      // Error for ==, != to compare
-    "no-use-before-define":             // Error for using variable before definition
-        ["error", {"functions":false, "classes":false}],
+    "curly": ["error", "all"], // Error for no curly brancket in loop or conditions
+    // Error for unused variables, not detect arguments
+    "no-unused-vars": ["error", { "args": "none" }],
+    "no-undef": "error", // Error for unused variable (that will become global variable)
+    "new-cap": "error", // Error for lowercase first letter or constructor call as function
+    "eqeqeq": ["error", "always"], // Error for ==, != to compare
+    // Error for using variable before definition
+    "no-use-before-define": ["error", { "functions": false, "classes": false }],
     "comma-dangle": ["error", "never"], // Error for trailing comma
-    "no-redeclare": "warn",             // Warn redefine variable (TODO: make this rule error)
+    "no-redeclare": "warn", // Warn redefine variable (TODO: make this rule error)
     //"block-scoped-var": "warn",       // Warn var declaration inside block scope
-    "no-empty": "off",                  // Allow empty block statements
-    "no-constant-condition":            // Allow constant condition in conditions
-        ["error", {"checkLoops": false}],
-    "no-useless-escape": "off",         // Allow unnessesary escape charactors
-    "no-extra-boolean-cast": "off",     // Allow to use boolean cast for boolean value
-    "no-mixed-spaces-and-tabs": "off",  // Allow to use spaces and tabs for indent
-    "dot-notation": "off",              // Allow object access via obj["name"]
-    "no-loop-func": "off"               // Allow function definition in loop
+    "no-empty": "off", // Allow empty block statements
+    // Allow constant condition in conditions
+    "no-constant-condition": ["error", { "checkLoops": false }],
+    "no-useless-escape": "off", // Allow unnessesary escape charactors
+    "no-extra-boolean-cast": "off", // Allow to use boolean cast for boolean value
+    "no-mixed-spaces-and-tabs": "off", // Allow to use spaces and tabs for indent
+    "dot-notation": "off", // Allow object access via obj["name"]
+    "no-loop-func": "off" // Allow function definition in loop
   }
 }

src/header.js

@@ -0,0 +1,14 @@
+var pzpr = {
+	version: "<%= git.hash %>"
+};
+export default pzpr;
+
+import Candle from "pzpr-canvas";
+pzpr.Candle = Candle;
+
+//eslint-disable-next-line no-unused-vars
+var document = this.document || pzpr.Candle.document;
+//eslint-disable-next-line no-unused-vars
+var DOMParser = this.DOMParser || pzpr.Candle.DOMParser;
+//eslint-disable-next-line no-unused-vars
+var XMLSerializer = this.XMLSerializer || pzpr.Candle.XMLSerializer;

src/puzzle/Piece.js

@@ -158,7 +158,9 @@ pzpr.classmgr.makeCommon({
 			}
 
 			this.addOpe(prop, this[prop], num);
-			this[prop] = num;
+			if (!Object.isFrozen(this)) {
+				this[prop] = num;
+			}
 
 			var trialstage = this.board.trialstage;
 			if (trialstage > 0) {
@@ -292,7 +294,9 @@ pzpr.classmgr.makeCommon({
 		//---------------------------------------------------------------------------
 		seterr: function(num) {
 			if (this.board.isenableSetError()) {
-				this.error = num;
+				if (!Object.isFrozen(this)) {
+					this.error = num;
+				}
 			}
 		},
 		setinfo: function(num) {

src/puzzle/PieceList.js

@@ -101,7 +101,9 @@ pzpr.classmgr.makeCommon({
 				return;
 			}
 			for (var i = 0; i < this.length; i++) {
-				this[i].error = num;
+				if (!Object.isFrozen(this[i])) {
+					this[i].error = num;
+				}
 			}
 		},
 		setnoerr: function() {