Merge pull request #9 from mistlog/refactor/cli

refactor cli: remove config

cli/cli.ts

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 import * as program from "commander";
 import { ComposeFile, ComposeDirectory, InspectDirectory, InspectFile } from "./literator";
-import { resolve, join } from "path";
-import { lstatSync } from "fs";
-import { readJsonSync, readJSONSync } from "fs-extra";
-import { config } from "./config.js";
+import { resolve } from "path";
+import { readJSONSync, lstatSync } from "fs-extra";
 
 const package_json = readJSONSync(resolve(__dirname, "../../package.json"));
 program.version(package_json.version);
@@ -19,20 +17,6 @@ if (args.length === 0) {
     const working_directory = process.cwd();
     const [target] = args;
     if (target) {
-        //
-        const project_package = readJsonSync(join(working_directory, "package.json"), {
-            throws: false,
-        }) || { devDependencies: {} };
-
-        const dsl_names = Object.keys(project_package.devDependencies).filter(key =>
-            key.startsWith("draft-dsl")
-        );
-        const dsls = dsl_names.map(name =>
-            require(`${join(working_directory, "node_modules", name)}`)?.MakeDSL()
-        );
-        config.dsls = dsls;
-
-        //
         const path = resolve(working_directory, target);
         if (lstatSync(path).isDirectory()) {
             program.watch ? InspectDirectory(path) : ComposeDirectory(path);

cli/literator.ts

@@ -1,19 +1,19 @@
-import { readFileSync } from "fs";
-import { outputFileSync, removeSync } from "fs-extra";
 import * as traverse from "filewalker";
-import * as watch from "node-watch";
+import { default as watch } from "node-watch";
+import { outputFileSync, removeSync, readFileSync } from "fs-extra";
 import { MakeDefaultTranscriber } from "../src";
-import { config } from "./config";
 
 function TraverseDirectory(path: string, callback: (name: string, path: string) => void) {
     const action = (relative: string, stats, absolute: string) => callback(relative, absolute);
-    traverse(path).on("file", action).walk();
+    traverse(path)
+        .on("file", action)
+        .on("error", error => console.log(error))
+        .walk();
 }
 
 export function InspectDirectory(path: string) {
     ComposeDirectory(path);
 
-    //@ts-ignore
     watch(path, { recursive: true }, (event, name: string) => {
         if (name.endsWith(".tsx")) {
             console.log(event, name);
@@ -29,7 +29,6 @@ export function InspectDirectory(path: string) {
 export function InspectFile(path: string) {
     ComposeFile(path);
 
-    //@ts-ignore
     watch(path, (event, name: string) => {
         if (name.endsWith(".tsx")) {
             console.log(event, name);
@@ -65,7 +64,6 @@ export function CrossoutDirectory(path: string) {
 export function ComposeFile(source: string) {
     const code = readFileSync(source, "utf8");
     const transcriber = MakeDefaultTranscriber(code);
-    config.dsls.forEach(dsl => transcriber.AddDSL(dsl.name, dsl.dsl));
     const result = transcriber.Transcribe();
     outputFileSync(source.replace(".tsx", ".ts"), result, "utf8");
 }