purus 0.3.0 → 0.4.1

package/README-ja.md

@@ -8,8 +8,12 @@
 
 ---
 
+[![CI](https://github.com/otoneko1102/purus/actions/workflows/ci.yml/badge.svg)](https://github.com/otoneko1102/purus/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/purus)](https://www.npmjs.com/package/purus)
 [![npm downloads](https://img.shields.io/npm/dm/purus)](https://www.npmjs.com/package/purus)
+[![License](https://img.shields.io/github/license/otoneko1102/purus)](https://github.com/otoneko1102/purus/blob/main/LICENSE)
+[![Node.js](https://img.shields.io/badge/node-%3E%3D18-brightgreen)](https://nodejs.org/)
+[![VS Code Extension](https://img.shields.io/visual-studio-marketplace/i/otoneko1102.purus)](https://marketplace.visualstudio.com/items?itemName=otoneko1102.purus)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/otoneko1102/purus)](https://github.com/otoneko1102/purus/pulse)
 [![GitHub last commit](https://img.shields.io/github/last-commit/otoneko1102/purus)](https://github.com/otoneko1102/purus/commits/main)
 ![US layout](https://img.shields.io/badge/US_layout-Supported-green)
@@ -49,6 +53,16 @@ npm install -D purus
 
 ドキュメントは [purus.work](https://purus.work) で確認できます。
 
+## 貢献
+
+ガイドは [コチラ](https://github.com/otoneko1102/purus/blob/main/CONTRIBUTING-ja.md) ！
+
+<a href="https://github.com/otoneko1102/purus/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=otoneko1102/purus" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).
+
 ## 著者
 
 otoneko. https://github.com/otoneko1102

package/README.md

@@ -8,8 +8,12 @@
 
 ---
 
+[![CI](https://github.com/otoneko1102/purus/actions/workflows/ci.yml/badge.svg)](https://github.com/otoneko1102/purus/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/purus)](https://www.npmjs.com/package/purus)
 [![npm downloads](https://img.shields.io/npm/dm/purus)](https://www.npmjs.com/package/purus)
+[![License](https://img.shields.io/github/license/otoneko1102/purus)](https://github.com/otoneko1102/purus/blob/main/LICENSE)
+[![Node.js](https://img.shields.io/badge/node-%3E%3D18-brightgreen)](https://nodejs.org/)
+[![VS Code Extension](https://img.shields.io/visual-studio-marketplace/i/otoneko1102.purus)](https://marketplace.visualstudio.com/items?itemName=otoneko1102.purus)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/otoneko1102/purus)](https://github.com/otoneko1102/purus/pulse)
 [![GitHub last commit](https://img.shields.io/github/last-commit/otoneko1102/purus)](https://github.com/otoneko1102/purus/commits/main)
 ![US layout](https://img.shields.io/badge/US_layout-Supported-green)
@@ -49,6 +53,16 @@ npm install -D purus
 
 The documentation is available on [purus.work](https://purus.work).
 
+## Contribute
+
+The guide is [here](https://github.com/otoneko1102/purus/blob/main/CONTRIBUTING.md)!
+
+<a href="https://github.com/otoneko1102/purus/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=otoneko1102/purus" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).
+
 ## Author
 
 otoneko. https://github.com/otoneko1102

package/bin/purus.js

@@ -8,18 +8,19 @@ function printHelp() {
   console.log(`purus v${VERSION} - A language that compiles to JavaScript`);
   console.log("");
   console.log("Usage:");
-  console.log("  purus build [file]                  Compile to JavaScript");
-  console.log("  purus build --directory <dir>        Compile all files in directory");
+  console.log("  purus build [file|dir]               Compile to JavaScript");
+  console.log("  purus build --entry <file|dir>       Specify entry file or directory");
   console.log("  purus build --output <dir>           Specify output directory");
   console.log("  purus build                          Compile using config.purus");
   console.log("    .purus  -> .js");
   console.log("    .cpurus -> .cjs (CommonJS)");
   console.log("    .mpurus -> .mjs (ES Module)");
   console.log("  purus build --no-header [file]       Compile without header comment");
-  console.log("  purus run [file]                     Run without generating files");
-  console.log("  purus run --directory <dir>           Run all files in directory");
+  console.log("  purus run [file|dir]                 Run without generating files");
+  console.log("  purus run --entry <file|dir>         Run entry file or directory");
   console.log("  purus run                            Run using config.purus");
-  console.log("  purus check <file>                   Syntax check only");
+  console.log("  purus check [file|dir]               Syntax check only");
+  console.log("  purus check --entry <file|dir>       Check entry file or directory");
   console.log("  purus new [name] [-y]                Create a new project");
   console.log("  purus init                           Initialize project in current directory");
   console.log("  purus version                        Show version");
@@ -40,6 +41,9 @@ switch (cmd) {
   case "run":
     require("../lib/run-wrapper.js");
     break;
+  case "check":
+    require("../lib/check-wrapper.js");
+    break;
   case "version":
   case "--version":
   case "-v":

package/lib/build-wrapper.js

@@ -7,8 +7,7 @@ const { compile } = require("./purus-core.js");
 
 const args = process.argv.slice(3);
 
-let file = null;
-let directory = null;
+let entry = null;
 let output = null;
 let noHeader = false;
 let toStdout = false;
@@ -18,18 +17,18 @@ for (let i = 0; i < args.length; i++) {
     noHeader = true;
   } else if (args[i] === "--stdout") {
     toStdout = true;
-  } else if (args[i] === "--directory" || args[i] === "-d") {
-    directory = args[++i];
+  } else if (args[i] === "--entry" || args[i] === "-e") {
+    entry = args[++i];
   } else if (args[i] === "--output" || args[i] === "-o") {
     output = args[++i];
   } else if (!args[i].startsWith("-")) {
-    file = args[i];
+    entry = args[i];
   }
 }
 
-if (file) {
+if (entry && fs.existsSync(entry) && fs.statSync(entry).isFile() && /\.(c|m)?purus$/.test(entry)) {
   // Single file - handle directly via compile API
-  const source = fs.readFileSync(file, "utf8");
+  const source = fs.readFileSync(entry, "utf8");
   const useHeader = !noHeader;
   const js = compile(source, { header: useHeader });
 
@@ -37,9 +36,9 @@ if (file) {
     process.stdout.write(js);
   } else {
     let ext = ".js";
-    if (file.endsWith(".cpurus")) ext = ".cjs";
-    else if (file.endsWith(".mpurus")) ext = ".mjs";
-    const base = file.replace(/\.(c|m)?purus$/, "");
+    if (entry.endsWith(".cpurus")) ext = ".cjs";
+    else if (entry.endsWith(".mpurus")) ext = ".mjs";
+    const base = entry.replace(/\.(c|m)?purus$/, "");
     const outputFile = output
       ? path.join(path.resolve(output), path.basename(base) + ext)
       : base + ext;
@@ -47,15 +46,15 @@ if (file) {
       fs.mkdirSync(path.resolve(output), { recursive: true });
     }
     fs.writeFileSync(outputFile, js);
-    console.log(`Compiled ${file} -> ${outputFile}`);
+    console.log(`Compiled ${entry} -> ${outputFile}`);
   }
 } else {
   let entryDir;
   let outputDir;
   let useHeader;
 
-  if (directory) {
-    entryDir = path.resolve(directory);
+  if (entry) {
+    entryDir = path.resolve(entry);
     outputDir = output ? path.resolve(output) : path.resolve("dist");
     useHeader = !noHeader;
 
@@ -75,10 +74,8 @@ if (file) {
       console.log("Error: no input file specified and no config.purus found");
       console.log("");
       console.log("Usage:");
-      console.log("  purus build <file>              Compile a single file");
-      console.log(
-        "  purus build --directory <dir>   Compile all files in directory"
-      );
+      console.log("  purus build <file|dir>           Compile a file or directory");
+      console.log("  purus build --entry <file|dir>   Specify entry");
       console.log(
         "  purus build                     Compile using config.purus"
       );

package/lib/check-wrapper.js

@@ -0,0 +1,97 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { loadConfig } = require("./config.js");
+const { compile } = require("./purus-core.js");
+
+const args = process.argv.slice(3);
+
+let entry = null;
+
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === "--entry" || args[i] === "-e") {
+    entry = args[++i];
+  } else if (!args[i].startsWith("-")) {
+    entry = args[i];
+  }
+}
+
+if (entry && fs.existsSync(entry) && fs.statSync(entry).isFile()) {
+  checkFile(entry);
+} else {
+  let entryDir;
+
+  if (entry) {
+    entryDir = path.resolve(entry);
+  } else {
+    const result = loadConfig();
+    if (!result) {
+      console.log("Error: no input file specified and no config.purus found");
+      console.log("");
+      console.log("Usage:");
+      console.log("  purus check <file|dir>           Check a file or directory");
+      console.log("  purus check --entry <file|dir>   Specify entry");
+      console.log("  purus check                      Check using config.purus");
+      process.exit(1);
+    }
+
+    const { config, configDir } = result;
+    entryDir = path.resolve(configDir, config.entry || "src");
+  }
+
+  if (!fs.existsSync(entryDir)) {
+    console.log(`Error: entry '${entryDir}' not found`);
+    process.exit(1);
+  }
+
+  const stat = fs.statSync(entryDir);
+  let files;
+
+  if (stat.isFile()) {
+    files = [entryDir];
+  } else {
+    files = findPurusFiles(entryDir);
+  }
+
+  if (files.length === 0) {
+    console.log(`No .purus files found in ${entryDir}`);
+    process.exit(0);
+  }
+
+  let errors = 0;
+  for (const f of files) {
+    if (!checkFile(f)) errors++;
+  }
+
+  if (errors > 0) {
+    console.log(`\n${errors} file${errors === 1 ? "" : "s"} with errors.`);
+    process.exit(1);
+  } else {
+    console.log(`${files.length} file${files.length === 1 ? "" : "s"} checked. No errors.`);
+  }
+}
+
+function checkFile(file) {
+  try {
+    const source = fs.readFileSync(file, "utf8");
+    compile(source, { header: false });
+    return true;
+  } catch (err) {
+    console.log(`${file}: ${err.message}`);
+    return false;
+  }
+}
+
+function findPurusFiles(dir) {
+  const results = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...findPurusFiles(fullPath));
+    } else if (/\.(c|m)?purus$/.test(entry.name) && entry.name !== "config.purus") {
+      results.push(fullPath);
+    }
+  }
+  return results;
+}

package/lib/create.js

@@ -46,15 +46,18 @@ async function run() {
 
     // config.purus
     const configPurus = `-- Purus Configuration
-
 const entry be ///src///
 const output be ///dist///
 const header be true
 
 -- Linter settings
 const lint.no-var be ///warn///
+const lint.no-nil be ///warn///
 const lint.indent-size be 2
 const lint.max-line-length be ///off///
+const lint.no-trailing-whitespace be ///warn///
+const lint.no-unused-import be ///warn///
+const lint.consistent-naming be ///warn///
 `;
     fs.writeFileSync(path.join(projectDir, "config.purus"), configPurus);