feature: edward: migrate to ESM

Author: coderaiser

.eslintrc.js

@@ -9,6 +9,7 @@ modules/ace-builds
 !modules/ace-builds/src-min
 
 yarn-error.log
+client
 
 
 coverage

.madrun.mjs .madrun.js.madrun.mjs renamed to .madrun.js

@@ -1,9 +1,19 @@
 #!/usr/bin/env node
 
-'use strict';
+import process from 'node:process';
+import fs from 'node:fs';
+import {fileURLToPath} from 'node:url';
+import {dirname} from 'node:path';
+import http from 'node:http';
+import express from 'express';
+import {Server} from 'socket.io';
+import info from '../package.json' with {
+    type: 'json',
+};
+import {edward} from '../server/index.js';
 
-const process = require('process');
-const fs = require('fs');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 const [arg] = process.argv.slice(2);
 
 if (!arg)
@@ -21,7 +31,7 @@ else
     });
 
 function getPath(name) {
-    const reg = /^(~|\/)/;
+    const reg = /^[~/]/;
 
     if (!reg.test(name))
         name = process.cwd() + '/' + name;
@@ -32,10 +42,6 @@ function getPath(name) {
 function main(name) {
     const filename = getPath(name);
     const DIR = `${__dirname}/../assets/`;
-    const edward = require('..');
-    const http = require('http');
-    const express = require('express');
-    const io = require('socket.io');
 
     const app = express();
     const server = http.createServer(app);
@@ -49,13 +55,13 @@ function main(name) {
     app
         .use(express.static(DIR))
         .use(edward({
-            diff: true,
-            zip: true,
-        }));
+        diff: true,
+        zip: true,
+    }));
 
     server.listen(port, ip);
 
-    const socket = io(server);
+    const socket = new Server(server);
     const edSocket = edward.listen(socket);
 
     edSocket.on('connection', () => {
@@ -84,19 +90,15 @@ function checkFile(name, callback) {
 }
 
 function version() {
-    console.log(`v${info().version}`);
-}
-
-function info() {
-    return require('../package');
+    console.log(`v${info.version}`);
 }
 
 function usage() {
-    console.log(`Usage: ${info().name} [filename]`);
+    console.log(`Usage: ${info.name} [filename]`);
 }
 
-function help() {
-    const bin = require('../json/bin');
+async function help() {
+    const bin = await import('../json/bin');
 
     usage();
     console.log('Options:');

.npmignore

@@ -1,22 +1,22 @@
 {
-  "name": "edward",
-  "homepage": "https://github.com/cloudcmd/edward",
-  "authors": [
-    "coderaiser <mnemonic.enemy@gmail.com>"
-  ],
-  "description": "web editor",
-  "main": "bin/edward.js",
-  "keywords": [
-    "file",
-    "edit"
-  ],
-  "license": "MIT",
-  "private": true,
-  "ignore": [
-    "node_modules",
-    "modules"
-  ],
-  "dependencies": {
-    "ace-builds": "^1.43.6"
-  }
+    "name": "edward",
+    "homepage": "https://github.com/cloudcmd/edward",
+    "authors": [
+        "coderaiser <mnemonic.enemy@gmail.com>"
+    ],
+    "description": "web editor",
+    "main": "bin/edward.js",
+    "keywords": [
+        "file",
+        "edit"
+    ],
+    "license": "MIT",
+    "private": true,
+    "ignore": [
+        "node_modules",
+        "modules"
+    ],
+    "dependencies": {
+        "ace-builds": "^1.43.6"
+    }
 }

bin/edward.js

@@ -1,16 +1,14 @@
-'use strict';
+import clipboard from '@cloudcmd/clipboard';
+import createElement from '@cloudcmd/create-element';
+import once from 'once';
+import showMessage from './show-message.js';
 
-const clipboard = require('@cloudcmd/clipboard');
-const createElement = require('@cloudcmd/create-element');
-
-const showMessage = require('./show-message');
-const once = require('once');
 const showMessageOnce = once(showMessage);
 
 const resolve = Promise.resolve.bind(Promise);
 const reject = Promise.reject.bind(Promise);
 
-module.exports = function(cmd) {
+export default function(cmd) {
     const NAME = 'editor-clipboard';
     const {_Ace, _story} = this;
 
@@ -37,7 +35,7 @@ module.exports = function(cmd) {
 
             insert(value);
         });
-};
+}
 
 function cut(value) {
     const textarea = createElement('textarea', {

bower.json

@@ -1,16 +1,14 @@
-'use strict';
-
 /* global io */
-const {applyPatch} = require('daffy');
-const {alert} = require('smalltalk');
+import {applyPatch} from 'daffy';
+import {alert} from 'smalltalk';
 
 const getHost = () => {
     const l = location;
 
     return l.origin || l.protocol + '//' + l.host;
 };
 
-module.exports = function() {
+export default function() {
     const edward = this;
     const href = getHost();
     const FIVE_SECONDS = 5000;
@@ -74,4 +72,4 @@ module.exports = function() {
     socket.on('err', (error) => {
         alert(this._TITLE, error);
     });
-};
+}

client/_clipboard.js

@@ -1,11 +1,11 @@
-'use strict';
+import {confirm} from 'smalltalk';
+import {tryToCatch} from 'try-to-catch';
+import {promisify} from 'es6-promisify';
+import {write} from 'restafary/client';
 
-const {confirm} = require('smalltalk');
-const {tryToCatch} = require('try-to-catch');
-const {promisify} = require('es6-promisify');
-const write = promisify(require('restafary/client').write);
+const _write = promisify(write);
 
-module.exports = async function(error, text) {
+export async function _onSave(error, text) {
     const edward = this;
 
     const {
@@ -25,7 +25,7 @@ module.exports = async function(error, text) {
         const [cancel] = await tryToCatch(confirm, _title, msg);
 
         if (!cancel) {
-            const [error, text] = await tryToCatch(write, _filename, this._value);
+            const [error, text] = await tryToCatch(_write, _filename, this._value);
             return this._onSave(error, text);
         }
 
@@ -41,4 +41,4 @@ module.exports = async function(error, text) {
         .setHash(_filename, hash);
 
     this._Emitter.emit('save', _value.length);
-};
+}

client/_init-socket.js

@@ -1,11 +1,9 @@
-'use strict';
-
-const exec = require('execon');
-const load = require('load.js');
+import exec from 'execon';
+import load from 'load.js';
 
 /* global ace */
 /* global join */
-module.exports = function() {
+export default function() {
     const {_DIR, _PREFIX} = this;
 
     const dir = `${_DIR}ace-builds/src-min/`;
@@ -32,4 +30,4 @@ module.exports = function() {
 
         callback();
     });
-};
+}

client/_on-save.js

@@ -1,38 +1,33 @@
-'use strict';
-
-const isString = (a) => typeof a === 'string';
-
 /* global ace */
 /* global join */
-require('../css/edward.css');
-
-const {createPatch} = require('daffy');
-const exec = require('execon');
-const Emitify = require('emitify');
-const load = require('load.js');
-const loadremote = require('./loadremote');
-const wraptile = require('wraptile');
-const smalltalk = require('smalltalk');
-const jssha = require('jssha');
-const restafary = require('restafary/client');
-const {tryToCatch} = require('try-to-catch');
+import '../css/edward.css';
+import {createPatch} from 'daffy';
+import exec from 'execon';
+import Emitify from 'emitify';
+import load from 'load.js';
+import wraptile from 'wraptile';
+import * as smalltalk from 'smalltalk';
+import jssha from 'jssha';
+import restafary from 'restafary/client';
+import {tryToCatch} from 'try-to-catch';
+import loadremote from './loadremote.js';
+import Story from './story.js';
+import _clipboard from './_clipboard.js';
+import _setEmmet from './_set-emmet.js';
+import _initSocket from './_init-socket.js';
+import setKeyMap from './set-key-map.js';
+import showMessage from './show-message.js';
+import save from './save.js';
+import {_onSave} from './_on-save.js';
+
+const isString = (a) => typeof a === 'string';
 
 globalThis.load = globalThis.load || load;
 globalThis.exec = globalThis.exec || exec;
 
-const Story = require('./story');
-const _clipboard = require('./_clipboard');
-const _setEmmet = require('./_set-emmet');
-const _initSocket = require('./_init-socket');
-const setKeyMap = require('./set-key-map');
-const showMessage = require('./show-message');
-const save = require('./save');
-
 function empty() {}
 
-module.exports = Edward;
-
-function Edward(el, options, callback) {
+export default function Edward(el, options, callback) {
     if (!(this instanceof Edward))
         return new Edward(el, options, callback);
 
@@ -488,7 +483,7 @@ Edward.prototype._writeHttp = function(path, result) {
     restafary.write(path, result, onSave);
 };
 
-Edward.prototype._onSave = require('./_on-save');
+Edward.prototype._onSave = _onSave;
 
 Edward.prototype._doDiff = async function(path) {
     const value = this.getValue();