Add core module

.eslintrc.json

@@ -36,6 +36,7 @@
   ],
   "rules": {
     "no-use-before-define": "off",
+    "no-useless-constructor": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-use-before-define": "warn",
     "prettier/prettier": "error",

docker/package.json

@@ -21,11 +21,11 @@
   "dependencies": {
     "@rediagram/aws": "^0.4.2",
     "@rediagram/cli": "^0.1.5",
-    "@ts-graphviz/react": "^0.7.0",
+    "@ts-graphviz/react": "^0.9.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rediagram": "^0.2.5",
-    "ts-graphviz": "^0.13.1"
+    "ts-graphviz": "^0.16.0"
   },
   "devDependencies": {
     "@types/react": "^16.9.41",

examples/gallery/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@rediagram/gallery",
   "version": "0.1.10",
-  "main": "index.js",
   "license": "MIT",
   "private": true,
+  "type": "module",
   "scripts": {
     "start": "rediagramc"
   },
@@ -12,12 +12,12 @@
     "@rediagram/cli": "^0.1.5",
     "@rediagram/firebase": "^0.0.1",
     "@rediagram/gcp": "^0.3.1",
-    "@ts-graphviz/react": "^0.7.0",
+    "@ts-graphviz/react": "^0.9.1",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rediagram": "^0.2.5",
-    "ts-graphviz": "^0.13.1"
+    "ts-graphviz": "^0.16.0"
   },
   "devDependencies": {
     "@types/node": "^16.4.5",

package.json

@@ -1,7 +1,6 @@
 {
   "name": "rediagram",
   "version": "0.0.0",
-  "main": "index.js",
   "license": "MIT",
   "private": true,
   "workspaces": [
@@ -14,7 +13,7 @@
     "lerna": "lerna",
     "test": "jest",
     "prebuild": "lerna run --parallel clean",
-    "build": "yarn workspace @rediagram/common build && yarn workspace create-rediagram-project build && yarn workspace @rediagram/cdk build && yarn workspace @rediagram/cli build && yarn workspace rediagram build && yarn workspace @rediagram/aws build && yarn workspace @rediagram/gcp build && yarn workspace @rediagram/firebase build",
+    "build": "yarn workspace @rediagram/common build && yarn workspace create-rediagram-project build && yarn workspace @rediagram/cdk build && yarn workspace rediagram build && yarn workspace @rediagram/cli build && yarn workspace @rediagram/aws build && yarn workspace @rediagram/gcp build && yarn workspace @rediagram/firebase build",
     "prewatch": "yarn build",
     "watch": "lerna run --parallel watch",
     "rediagram": "yarn workspace @rediagram/cli start",

packages/aws/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@rediagram/aws",
   "version": "0.4.2",
-  "main": "lib/index.js",
+  "type": "module",
+  "exports": {
+    "import": "./lib/index.js"
+  },
   "types": "lib/index.d.ts",
   "license": "MIT",
   "description": "Components for drawing AWS diagrams.",
@@ -31,12 +34,12 @@
     "@rediagram/cdk": "^0.3.1"
   },
   "peerDependencies": {
-    "@ts-graphviz/react": "^0.7.0",
+    "@ts-graphviz/react": "^0.9.1",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rediagram": "*",
-    "ts-graphviz": "^0.13.1"
+    "ts-graphviz": "^0.16.0"
   },
   "devDependencies": {
     "@types/node": "^16.4.5",

packages/aws/rollup.config.js

@@ -8,11 +8,11 @@ const options = [
     input: './src/index.ts',
     output: [
       {
-        format: 'cjs',
+        format: 'module',
         file: './lib/index.js',
       },
     ],
-    external: ['@rediagram/cdk', 'react', '@ts-graphviz/react', 'prop-types', 'path'],
+    external: ['@rediagram/cdk', 'react', '@ts-graphviz/react', 'prop-types', 'node:path', 'node:url'],
     plugins: [typescript()],
   },
   {

packages/aws/src/assets.ts

@@ -1,4 +1,8 @@
-import path from 'path';
+import path from 'node:path';
+import url from 'node:url';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
 export function resolveAsset(...paths: string[]): string {
   return path.resolve(__dirname, '../assets', ...paths);

packages/cdk/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@rediagram/cdk",
   "version": "0.3.1",
-  "main": "lib/index.js",
+  "type": "module",
+  "exports": {
+    "import": "./lib/index.js"
+  },
   "types": "lib/index.d.ts",
   "author": "kamiazya <yuki@kamiazya.tech>",
   "description": "Component Development Kit for rediagram library.",
@@ -28,10 +31,10 @@
     "watch": "tsc --watch"
   },
   "peerDependencies": {
-    "@ts-graphviz/react": "^0.7.0",
+    "@ts-graphviz/react": "^0.9.1",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
-    "ts-graphviz": "^0.13.1"
+    "ts-graphviz": "^0.16.0"
   },
   "devDependencies": {
     "@types/prop-types": "^15.7.3",

packages/cdk/rollup.config.js

@@ -8,7 +8,7 @@ const options = [
     input: './src/index.ts',
     output: [
       {
-        format: 'cjs',
+        format: 'module',
         file: './lib/index.js',
       },
     ],

packages/cli/bin/rediagramc.js

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-require('../lib/rediagramc');
+#!/usr/bin/env -S node --experimental-loader esbuild-node-loader
+import '../lib/rediagramc.js';

packages/cli/package.json

@@ -5,6 +5,7 @@
   "description": "CLI for rediagram.",
   "author": "kamiazya <yuki@kamiazya.tech>",
   "homepage": "https://github.com/kamiazya/rediagram",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/kamiazya/rediagram.git",
@@ -32,26 +33,26 @@
   "dependencies": {
     "@rediagram/aws": "^0.4.2",
     "@rediagram/common": "^0.0.3",
-    "@ts-graphviz/react": "^0.7.0",
+    "@ts-graphviz/react": "^0.9.1",
     "@types/node": "^16.4.5",
     "@types/prop-types": "^15.7.3",
     "@types/react": "^16.9.35",
     "@types/react-dom": "^16.9.8",
     "chokidar": "^3.4.3",
     "commander": "^6.1.0",
+    "esbuild-node-loader": "^0.6.3",
     "fast-glob": "^3.2.4",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rediagram": "^0.2.5",
-    "sucrase": "^3.16.0",
-    "ts-graphviz": "^0.13.1",
+    "ts-graphviz": "^0.16.0",
     "typescript": "^4.0.2"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
     "rollup": "^2.55.0",
     "rollup-plugin-typescript2": "^0.30.0",
-    "ts-node": "^9.0.0"
+    "rollup-plugin-version-injector": "^1.3.3"
   }
 }

packages/cli/rollup.config.js

@@ -1,13 +1,19 @@
 import typescript from 'rollup-plugin-typescript2';
+import versionInjector from 'rollup-plugin-version-injector';
 
-export default {
-  input: './src/rediagramc.ts',
-  output: [
-    {
-      format: 'cjs',
-      file: './lib/rediagramc.js',
-    },
-  ],
-  external: ['commander', 'fast-glob', 'path', 'fs', 'sucrase/dist/register', '@rediagram/common', 'chokidar'],
-  plugins: [typescript()],
-};
+/** @type {import('rollup').RollupOptions[]} */
+const options = [
+  {
+    input: './src/rediagramc.ts',
+    output: [
+      {
+        format: 'module',
+        file: './lib/rediagramc.js',
+      },
+    ],
+    external: ['commander', 'fast-glob', 'path', 'fs', 'rediagram', 'chokidar'],
+    plugins: [typescript(), versionInjector()],
+  },
+];
+
+export default options;

packages/cli/src/rediagramc.ts

@@ -1,44 +1,47 @@
 import cmd from 'commander';
 import glob from 'fast-glob';
 import chokidar from 'chokidar';
-import { CONFIG } from '@rediagram/common';
-import { registerAll } from 'sucrase/dist/register';
-import path from 'path';
-import pkg from './pkg';
+import { Rediagram } from 'rediagram';
 
 type Options = {
   watch: boolean;
 };
 
-function runRediagram(src: string) {
-  // eslint-disable-next-line no-console
-  console.log(src);
-  const resolved = path.resolve(src);
-  // eslint-disable-next-line global-require, import/no-dynamic-require
-  require(resolved);
-  delete require.cache[resolved];
-}
+const NAME = 'rediagramc';
+
+const logger = Rediagram.logger.getChildLogger({ name: NAME });
 
 cmd
-  .name('rediagramc')
-  .version(pkg.version)
+  .name(NAME)
+  .version('[VI]{version}[/VI]')
   .arguments('[pattarns...]')
   .option('-w, --watch', 'Watch files for changes and rerun rediagram related to changed files.', false)
   .action(async function rediagramc(this: Options, pattarns: string[]): Promise<void> {
-    registerAll();
     const paths =
       pattarns.length >= 1
         ? pattarns
-        : [...CONFIG.scope.getIncludesPattarns(), ...CONFIG.scope.getExcludesPattarns().map((p) => `!${p}`)];
+        : [...Rediagram.config.scope.includes, ...Rediagram.config.scope.excludes.map((p) => `!${p}`)];
     if (this.watch) {
-      chokidar.watch(paths).on('add', runRediagram).on('change', runRediagram);
+      chokidar
+        .watch(paths)
+        .on('add', async (src) => {
+          logger.info('Added', src);
+          await Rediagram.run(src);
+        })
+        .on('change', async (src) => {
+          logger.info('Changed', src);
+          await Rediagram.run(src);
+        });
     } else {
       const sources = await glob(paths, {
         dot: true,
         extglob: true,
         onlyFiles: true,
       });
-      sources.forEach(runRediagram);
+      sources.forEach(async (src) => {
+        logger.info('Start', src);
+        await Rediagram.run(src);
+      });
     }
   })
   .parse(process.argv);

packages/cli/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
-    "declaration": false
+    "declaration": true
   },
   "include": [
     "src/**/*.ts",

packages/common/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@rediagram/common",
   "version": "0.0.3",
-  "main": "lib/index.js",
+  "type": "module",
+  "exports": {
+    "import": "./lib/index.js"
+  },
   "types": "lib/index.d.ts",
   "author": "kamiazya <yuki@kamiazya.tech>",
   "description": "Common config and utility for rediagram.",
@@ -27,14 +30,23 @@
     "build": "rollup -c && prettier --write './lib/*'",
     "watch": "tsc --watch"
   },
+  "dependencies": {
+    "@ts-graphviz/node": "^0.4.0",
+    "@ts-graphviz/react": "^0.9.1",
+    "cosmiconfig": "^7.0.1",
+    "fs-extra": "^10.0.0",
+    "sharp": "^0.29.1",
+    "svgo": "^2.7.0",
+    "svgson": "^5.2.1",
+    "tslog": "^3.2.1"
+  },
   "devDependencies": {
+    "@types/sharp": "^0.29.2",
+    "@types/svgo": "^2.4.2",
     "rollup": "^2.55.0",
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-dts": "^3.0.2",
     "rollup-plugin-typescript2": "^0.30.0",
     "typescript": "^4.0.2"
-  },
-  "dependencies": {
-    "cosmiconfig": "^7.0.0"
   }
 }

packages/common/rollup.config.js

@@ -8,11 +8,21 @@ const options = [
     input: './src/index.ts',
     output: [
       {
-        format: 'cjs',
+        format: 'module',
         file: './lib/index.js',
       },
     ],
-    external: ['path', 'cosmiconfig'],
+    external: [
+      'path',
+      'cosmiconfig',
+      'fs-extra',
+      'tslog',
+      'sharp',
+      '@ts-graphviz/react',
+      '@ts-graphviz/node',
+      'node:path',
+      'rehype',
+    ],
     plugins: [typescript()],
   },
   {