@danielx/civet 0.5.21 → 0.5.23

package/README.md

@@ -8,6 +8,7 @@ Civet
 
 The CoffeeScript of TypeScript. Much closer to ES2015+ (for better or worse).
 
+- [Documentation](https://civet.dev/)
 - [Online Civet Playground](https://civet-web.vercel.app/)
 - [Civet VSCode Extension](https://marketplace.visualstudio.com/items?itemName=DanielX.civet)
 - [Discord Server](https://discord.gg/xkrW9GebBc)
@@ -23,8 +24,12 @@ Quickstart Guide
 ```bash
 # Install
 npm install -g @danielx/civet
+# Run civet code directly in a REPL
+civet
 # Compile civet source file to typescript
 civet < source.civet > output.ts
+# Execute a simple civet script (no imports)
+civet source.civet ...args...
 # Execute a civet source file in node using ts-node
 node --loader ts-node/esm --loader @danielx/civet/esm source.civet
 ```

package/dist/civet

@@ -46,19 +46,37 @@ encoding = "utf8";
 fs = require("fs/promises");
 path = require("path");
 parseArgs = function(args = process.argv.slice(2)) {
-  var arg, char, filenames, i, options, ref;
+  var arg, char, endOfArgs, filenames, i, options, ref, scriptArgs;
   options = {};
+  Object.defineProperty(options, "run", {
+    get: function() {
+      return !(this.ast || this.compile);
+    }
+  });
   filenames = [];
+  scriptArgs = null;
   i = 0;
+  endOfArgs = function(j) {
+    i = args.length;
+    if (j >= args.length) {
+      return;
+    }
+    if (options.run) {
+      filenames.push(args[j]);
+      return scriptArgs = args.slice(j);
+    } else {
+      return filenames.push(...args.slice(j));
+    }
+  };
   while (i < args.length) {
     arg = args[i];
     if (/^-\w{2,}$/.test(arg)) {
       splice.apply(args, [i, i - i + 1].concat(ref = function() {
-        var j, len, ref1, results;
+        var k, len, ref1, results;
         ref1 = arg.slice(1);
         results = [];
-        for (j = 0, len = ref1.length; j < len; j++) {
-          char = ref1[j];
+        for (k = 0, len = ref1.length; k < len; k++) {
+          char = ref1[k];
           results.push(`-${char}`);
         }
         return results;
@@ -87,21 +105,24 @@ parseArgs = function(args = process.argv.slice(2)) {
         options.js = true;
         break;
       case "--":
-        filenames.push(...args.slice(++i));
-        i = args.length;
+        endOfArgs(++i);
         break;
       default:
-        filenames.push(arg);
+        if (options.run) {
+          endOfArgs(i);
+        } else {
+          filenames.push(arg);
+        }
     }
     i++;
   }
-  return { filenames, options };
+  return { filenames, scriptArgs, options };
 };
 readFiles = async function* (filenames, options) {
-  var content, error, filename, j, len, lines, results, rl, stdin;
+  var content, error, filename, k, len, lines, results, rl, stdin;
   results = [];
-  for (j = 0, len = filenames.length; j < len; j++) {
-    filename = filenames[j];
+  for (k = 0, len = filenames.length; k < len; k++) {
+    filename = filenames[k];
     stdin = filename === "-";
     try {
       if (stdin) {
@@ -172,8 +193,8 @@ repl = function(options) {
   });
 };
 cli = async function() {
-  var content, error, filename, filenames, options, optionsPath, output, outputFilename, outputPath, ref, results, stat, stdin, x;
-  ({ filenames, options } = parseArgs());
+  var content, error, filename, filenames, options, optionsPath, output, outputFilename, outputPath, ref, results, scriptArgs, stat, stdin, x;
+  ({ filenames, scriptArgs, options } = parseArgs());
   if (!filenames.length) {
     options.compile = true;
     if (process.stdin.isTTY) {
@@ -182,10 +203,10 @@ cli = async function() {
       filenames = ["-"];
     }
   }
-  options.run = !(options.ast || options.compile);
   if (options.run) {
     options.js = true;
     options.inlineMap = true;
+    require("../register.js");
   }
   if (options.repl) {
     return repl(options);
@@ -247,8 +268,11 @@ cli = async function() {
         }
       }
     } else {
+      module.filename = await fs.realpath(filename);
+      process.argv = ["civet", module.filename, ...scriptArgs];
+      module.paths = require("module")._nodeModulePaths(path.dirname(module.filename));
       try {
-        results.push(require.main._compile(output, filename));
+        results.push(module._compile(output, module.filename));
       } catch (error1) {
         error = error1;
         console.error(`${filename} crashed while running:`);

package/dist/esm.mjs

@@ -5,7 +5,7 @@ Currently depends on ts-node esm loader being downstream
 
 @example
 ```bash
-node --loader ts-node/esm --loader @danielx/civet/esm
+node --loader ts-node/esm --loader @danielx/civet/esm source.civet
 ```
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.21",
+  "version": "0.5.23",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {
@@ -36,6 +36,7 @@
     "@types/coffeescript": "^2.5.2",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.7.8",
+    "axios": "^1.2.2",
     "c8": "^7.12.0",
     "esbuild": "^0.14.49",
     "esbuild-coffeescript": "^2.1.0",

package/register.js

@@ -1,10 +1,23 @@
+/**
+@file Civet CJS registration
+
+`require`ing this file will register the `.civet` extension with
+Node.js's `require`.
+
+@example
+```bash
+node -r @danielx/civet/register.js source.civet
+```
+*/
+
 if (require.extensions) {
   const fs = require("fs");
   const { compile } = require("./");
 
   require.extensions[".civet"] = function (module, filename) {
     const js = compile(fs.readFileSync(filename, 'utf8'), {
-      js: true
+      js: true,
+      inlineMap: true,
     });
     module._compile(js, filename);
     return;

package/register.mjs

@@ -1,56 +0,0 @@
-import { readFileSync } from 'fs';
-import { readFile } from 'fs/promises';
-import { createRequire } from 'module';
-import { pathToFileURL, fileURLToPath } from 'url';
-
-import { compile } from "./dist/main.js";
-
-const baseURL = pathToFileURL(process.cwd() + '/').href;
-const extensionsRegex = /\.civet$/;
-
-export async function resolve(specifier, context, next) {
-  const { parentURL = baseURL } = context;
-
-  if (extensionsRegex.test(specifier)) {
-    return {
-      shortCircuit: true,
-      format: "civet",
-      url: new URL(specifier, parentURL).href,
-    };
-  }
-
-  // Let Node.js handle all other specifiers.
-  return next(specifier, context);
-}
-
-export async function load(url, context, next) {
-  if (context.format === "civet") {
-    const path = fileURLToPath(url)
-    const source = await readFile(path, "utf8")
-    const tsSource = compile(source, { filename: path })
-
-    // NOTE: Assuming ts-node hook follows load hook
-    // NOTE: This causes .civet files to show up as .ts in ts-node error reporting (TODO: May be able to add a sourcemapping)
-    const result = await next(url.replace(extensionsRegex, ".tsx"), {
-      // ts-node won't transpile unless this is module
-      // can't use commonjs since we don't rewrite imports
-      format: "module",
-      // NOTE: Setting the source in the context makes it available when ts-node uses defaultLoad
-      source: tsSource
-    });
-
-    return result
-  }
-
-  // Let Node.js handle all other URLs.
-  return next(url, context);
-}
-
-const require = createRequire(import.meta.url);
-require.extensions[".civet"] = function (m, filename) {
-  // We end up here when being required from cjs
-  const source = readFileSync(filename, "utf8")
-  const code = compile(source, { filename, js: true })
-
-  m._compile(code, filename)
-}