@danielx/civet 0.6.8 → 0.6.9

package/dist/babel-plugin.mjs

@@ -7,17 +7,16 @@ export default function (api, civetOptions) {
       if (opts.sourceFileName.endsWith(".civet")) {
         const config = Object.assign({}, civetOptions, {
           filename: opts.sourceFileName,
-          sourceMap: opts.sourceMaps ?? true,
+          sourceMap: false,
         })
 
-        if (config.sourceMap) {
-          ({ code: src } = compile(code, config))
-        } else {
-          src = compile(code, config)
-        }
+        config.inlineMap ??= true
+        config.js = true
+        src = compile(code, config)
       } else {
         src = code
       }
+
       const ast = parse(src, opts)
       return ast
     }

package/dist/browser.js

@@ -22979,7 +22979,7 @@ ${input.slice(result.pos)}
             }
           });
         }
-        module.config = parse2.config = {
+        module.config = {
           autoVar: false,
           autoLet: false,
           coffeeBinaryExistential: false,
@@ -23140,6 +23140,8 @@ ${input.slice(result.pos)}
             }
           }
         });
+        Object.assign(module.config, parse2.config);
+        parse2.config = module.config;
       });
       function Reset(state) {
         let eventData;
@@ -23953,13 +23955,17 @@ ${input.slice(result.pos)}
     } else {
       options = { ...options };
     }
+    if (options.parseOptions == null) {
+      options.parseOptions = {};
+    }
     filename = options.filename || "unknown";
     if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
-      src = `"civet coffeeCompat"; ${src}`;
+      options.parseOptions.coffeeCompat = true;
     }
     if (!options.noCache) {
       events = makeCache();
     }
+    parse.config = options.parseOptions || {};
     ast = prune(parse(src, { filename, events }));
     if (options.ast) {
       return ast;

package/dist/civet

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 var import_main = require("./main");
+var import_config = require("./config");
 var cli, encoding, fs, parseArgs, path, prune, readFiles, repl, version, splice = [].splice;
 ({ prune } = import_main.generate);
 version = function() {
@@ -36,6 +37,8 @@ Options:
   --version        Show the version number
   -o / --output XX Specify output directory and/or extension, or filename
   -c / --compile   Compile input files to TypeScript (or JavaScript)
+  --config XX      Specify a config file (default scans for a config.civet, civet.json, civetconfig.civet or civetconfig.json file, optionally in a .config directory, or starting with a .)
+  --no-config      Don't scan for a config file
   --js             Strip out all type annotations; default to .jsx extension
   --ast            Print the AST instead of the compiled code
   --inline-map     Generate a sourcemap
@@ -96,6 +99,12 @@ parseArgs = function(args) {
       case "--output":
         options.output = args[++i];
         break;
+      case "--config":
+        options.config = args[++i];
+        break;
+      case "--no-config":
+        options.config = false;
+        break;
       case "--ast":
         options.ast = true;
         break;
@@ -254,6 +263,14 @@ cli = async function() {
   var argv, child, content, e, error, esm, filename, filenames, options, optionsPath, output, outputFilename, outputPath, ref, results, scriptArgs, stat, stdin, x;
   argv = process.argv;
   ({ filenames, scriptArgs, options } = parseArgs(argv.slice(2)));
+  if (options.config !== false) {
+    if (options.config == null) {
+      options.config = await (0, import_config.findConfig)(process.cwd());
+    }
+  }
+  if (options.config) {
+    options = { ...await (0, import_config.loadConfig)(options.config), ...options };
+  }
   if (!filenames.length) {
     if (process.stdin.isTTY) {
       options.repl = true;

package/dist/config.js

@@ -0,0 +1,91 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var config_exports = {};
+__export(config_exports, {
+  findConfig: () => findConfig,
+  loadConfig: () => loadConfig
+});
+module.exports = __toCommonJS(config_exports);
+var import_path = __toESM(require("path"));
+var import_promises = __toESM(require("fs/promises"));
+var import_main = require("./main");
+var import_url = require("url");
+var findInDir;
+findInDir = async function(dirPath) {
+  var dir, entry, name;
+  dir = await import_promises.default.opendir(dirPath);
+  for await (entry of dir) {
+    if (entry.isDirectory() && entry.name === ".config") {
+      return findInDir(import_path.default.join(dirPath, entry.name));
+    }
+    if (entry.isFile()) {
+      name = entry.name.replace(/^\./, "");
+      if (name === "config.civet" || name === "civet.json" || name === "civetconfig.civet" || name === "civetconfig.json") {
+        return import_path.default.join(dirPath, entry.name);
+      }
+    }
+  }
+  return null;
+};
+var findConfig = async function(startDir) {
+  var configPath, curr, parent;
+  curr = startDir;
+  parent = import_path.default.dirname(curr);
+  while (curr !== parent) {
+    if (configPath = await findInDir(curr)) {
+      return configPath;
+    }
+    curr = parent;
+    parent = import_path.default.dirname(curr);
+  }
+  return null;
+};
+var loadConfig = async function(path2) {
+  var config, exports, js, tmpPath;
+  config = await import_promises.default.readFile(path2, "utf8");
+  if (path2.endsWith(".json")) {
+    return JSON.parse(config);
+  } else {
+    js = (0, import_main.compile)(config, {
+      js: true
+    });
+    tmpPath = path2 + `.civet-tmp-${Date.now()}.mjs`;
+    await import_promises.default.writeFile(tmpPath, js);
+    try {
+      exports = await import((0, import_url.pathToFileURL)(tmpPath));
+    } finally {
+      await import_promises.default.unlink(tmpPath);
+    }
+    if (typeof exports.default !== "object" || exports.default === null) {
+      throw new Error("civet config file must export an object");
+    }
+    return exports.default;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findConfig,
+  loadConfig
+});

package/dist/main.js

@@ -22978,7 +22978,7 @@ ${input.slice(result.pos)}
           }
         });
       }
-      module2.config = parse2.config = {
+      module2.config = {
         autoVar: false,
         autoLet: false,
         coffeeBinaryExistential: false,
@@ -23139,6 +23139,8 @@ ${input.slice(result.pos)}
           }
         }
       });
+      Object.assign(module2.config, parse2.config);
+      parse2.config = module2.config;
     });
     function Reset(state) {
       let eventData;
@@ -23953,13 +23955,17 @@ var compile = function(src, options) {
   } else {
     options = { ...options };
   }
+  if (options.parseOptions == null) {
+    options.parseOptions = {};
+  }
   filename = options.filename || "unknown";
   if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
-    src = `"civet coffeeCompat"; ${src}`;
+    options.parseOptions.coffeeCompat = true;
   }
   if (!options.noCache) {
     events = makeCache();
   }
+  parse.config = options.parseOptions || {};
   ast = prune(parse(src, { filename, events }));
   if (options.ast) {
     return ast;

package/dist/main.mjs

@@ -22976,7 +22976,7 @@ ${input.slice(result.pos)}
           }
         });
       }
-      module.config = parse2.config = {
+      module.config = {
         autoVar: false,
         autoLet: false,
         coffeeBinaryExistential: false,
@@ -23137,6 +23137,8 @@ ${input.slice(result.pos)}
           }
         }
       });
+      Object.assign(module.config, parse2.config);
+      parse2.config = module.config;
     });
     function Reset(state) {
       let eventData;
@@ -23941,13 +23943,17 @@ var compile = function(src, options) {
   } else {
     options = { ...options };
   }
+  if (options.parseOptions == null) {
+    options.parseOptions = {};
+  }
   filename = options.filename || "unknown";
   if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
-    src = `"civet coffeeCompat"; ${src}`;
+    options.parseOptions.coffeeCompat = true;
   }
   if (!options.noCache) {
     events = makeCache();
   }
+  parse.config = options.parseOptions || {};
   ast = prune(parse(src, { filename, events }));
   if (options.ast) {
     return ast;

package/dist/types.d.ts

@@ -1,9 +1,38 @@
 declare module "@danielx/civet" {
   export type CivetAST = unknown
+  export type ParseOptions = Partial<{
+    autoVar: boolean
+    autoLet: boolean
+    coffeeBinaryExistential: boolean
+    coffeeBooleans: boolean
+    coffeeClasses: boolean
+    coffeeComment: boolean
+    coffeeDo: boolean
+    coffeeEq: boolean
+    coffeeForLoops: boolean
+    coffeeInterpolation: boolean
+    coffeeIsnt: boolean
+    coffeeJSX: boolean
+    coffeeLineContinuation: boolean
+    coffeeNot: boolean
+    coffeeOf: boolean
+    coffeePrototype: boolean
+    defaultElement: string
+    implicitReturns: boolean
+    objectIs: boolean
+    react: boolean
+    solid: boolean
+    client: boolean
+    rewriteTsImports: boolean
+    server: boolean
+    tab: number
+    verbose: boolean
+  }>
   export type CompileOptions = {
     filename?: string
     js?: boolean
     sourceMap?: boolean
+    parseOptions?: ParseOptions
   }
 
   export type SourceMapping = [number] | [number, number, number, number]
@@ -62,3 +91,13 @@ declare module "@danielx/civet/esbuild-plugin" {
   const plugin: ((options: Options) => Plugin) & Plugin
   export default plugin
 }
+
+declare module "@danielx/civet/config" {
+  const Config: {
+    findConfig: (path: string) => Promise<string | null>
+    loadConfig: (
+      path: string
+    ) => Promise<import("@danielx/civet").CompileOptions>
+  }
+  export default Config
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -13,6 +13,7 @@
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
     "./bun-civet": "./dist/bun-civet.mjs",
     "./register": "./register.js",
+    "./config": "./dist/config.js",
     "./*": "./*",
     "./dist/*": "./dist/*"
   },