@danielx/civet 0.10.1 → 0.10.3

package/CHANGELOG.md

@@ -4,6 +4,15 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.10.3 (2025-04-28, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.2...v0.10.3), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.3))
+* Explicit changelog build script shell [[#1727](https://github.com/DanielXMoore/Civet/pull/1727)]
+* ESM loader supports civetconfig by default, and overriding configuration [[#1734](https://github.com/DanielXMoore/Civet/pull/1734)]
+  * BREAKING CHANGE: If you don't use civetconfig files and want to be robust against their existence in ancestor directories, or want to maximize performance, use `@danielx/civet/register-noconfig` instead of `@danielx/civet/register`
+  * BREAKING CHANGE: In unplugin settings, `config: undefined` no longer disables searching for config files. Use `config: false` or `config: null` instead.
+
+## 0.10.2 (2025-04-13, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.1...v0.10.2), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.2))
+* Fix unplugin source map directories [[#1726](https://github.com/DanielXMoore/Civet/pull/1726)]
+
 ## 0.10.1 (2025-03-22, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.0...v0.10.1), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.1))
 * More general expressions in indented forms of `implements` and `with` [[#1720](https://github.com/DanielXMoore/Civet/pull/1720)]
 * Allow `>code` to continue an implicit JSX fragment [[#1721](https://github.com/DanielXMoore/Civet/pull/1721)]

package/dist/civet

@@ -503,8 +503,8 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
 `);
     process.exit(0);
   }
-  if (options.config !== false) {
-    options.config ??= await (0, import_config.findConfig)(process.cwd());
+  if (options.config === void 0) {
+    options.config = await (0, import_config.findConfig)(process.cwd());
   }
   if (options.config) {
     const parsed = await (0, import_config.loadConfig)(options.config);

package/dist/esm.mjs

@@ -1,10 +1,15 @@
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\esm.civet.jsx
-import { readFileSync } from "fs";
+import { readFile } from "fs/promises";
+import { dirname } from "path";
 import { pathToFileURL, fileURLToPath } from "url";
-import Civet from "./main.mjs";
-var { compile, SourceMap } = Civet;
+import { compile, SourceMap } from "./main.mjs";
+import { findConfig, loadConfig } from "./config.mjs";
 var baseURL = pathToFileURL(process.cwd() + "/").href;
 var extensionsRegex = /\.civet$/;
+var globalOptions = {};
+function initialize(options = {}) {
+  return globalOptions = options;
+}
 function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
   if (extensionsRegex.test(specifier)) {
@@ -19,14 +24,29 @@ function resolve(specifier, context, next) {
 async function load(url, context, next) {
   if (context.format === "civet") {
     const path = fileURLToPath(url);
-    const source = readFileSync(path, "utf8");
+    const source = await readFile(path, "utf8");
+    let loadedConfig;
+    let { config } = globalOptions;
+    if (config === void 0) {
+      config = await findConfig(dirname(path));
+    }
+    if (config) {
+      loadedConfig = await loadConfig(config);
+    }
+    const options = {
+      filename: path,
+      sourceMap: true,
+      js: true
+    };
+    if (globalOptions.parseOptions) {
+      options.parseOptions = globalOptions.parseOptions;
+    }
+    if (loadedConfig?.parseOptions) {
+      options.parseOptions = { ...options.parseOptions, ...loadedConfig.parseOptions };
+    }
     let tsSource, sourceMap;
     try {
-      ({ code: tsSource, sourceMap } = await compile(source, {
-        filename: path,
-        sourceMap: true,
-        js: true
-      }));
+      ({ code: tsSource, sourceMap } = await compile(source, options));
     } catch (e) {
       console.error(`Civet failed to compile ${url}:`, e);
       throw e;
@@ -46,6 +66,7 @@ async function load(url, context, next) {
   return next(url, context);
 }
 export {
+  initialize,
   load,
   resolve
 };

package/dist/unplugin/unplugin.d.ts

@@ -16,8 +16,8 @@ export type PluginOptions = {
     threads?: number;
     /** Cache compilation results based on file mtime (useful for serve or watch mode) */
     cache?: boolean;
-    /** config filename, or null to not look for default config file */
-    config?: (string | undefined) | null;
+    /** config filename, or false/null to not look for default config file */
+    config?: string | false | null;
     parseOptions?: ParseOptions;
 };
 export declare function slash(p: string): string;

package/dist/unplugin/unplugin.js

@@ -145,7 +145,10 @@ var rawPlugin = (options = {}, meta) => {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
-      const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+      let civetConfigPath = options.config;
+      if (civetConfigPath === void 0) {
+        civetConfigPath = await (0, import_config.findInDir)(process.cwd());
+      }
       if (civetConfigPath) {
         compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
       }
@@ -538,8 +541,8 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
-          import_path.default.basename(id)
+          import_path.default.relative(rootDir, id.replace(/\.[jt]sx$/, "")),
+          import_path.default.relative(rootDir, id)
         ));
         let transformed = {
           code: compiled,

package/dist/unplugin/unplugin.mjs

@@ -113,7 +113,10 @@ var rawPlugin = (options = {}, meta) => {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
-      const civetConfigPath = "config" in options ? options.config : await findInDir(process.cwd());
+      let civetConfigPath = options.config;
+      if (civetConfigPath === void 0) {
+        civetConfigPath = await findInDir(process.cwd());
+      }
       if (civetConfigPath) {
         compileOptions = await loadConfig(civetConfigPath);
       }
@@ -506,8 +509,8 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          path.basename(id.replace(/\.[jt]sx$/, "")),
-          path.basename(id)
+          path.relative(rootDir, id.replace(/\.[jt]sx$/, "")),
+          path.relative(rootDir, id)
         ));
         let transformed = {
           code: compiled,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -23,6 +23,7 @@
     "./esm": "./dist/esm.mjs",
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
     "./register": "./register.js",
+    "./register-noconfig": "./register-noconfig.js",
     "./config": {
       "types": "./dist/config.d.ts",
       "require": "./dist/config.js",
@@ -107,7 +108,7 @@
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
     "@typescript/vfs": "^1.6.0",
-    "unplugin": "^2.2.1"
+    "unplugin": "^2.3.2"
   },
   "devDependencies": {
     "@danielx/civet": "0.9.4",

package/register.js

@@ -9,6 +9,14 @@ for both ESM `import`s and CJS `require`s.
 node --import @danielx/civet/register source.civet
 ```
 
+If you don't want the loader to search for/use accompanying civetconfig files,
+you can use the `-noconfig` version (where `NOCONFIG` comments are removed):
+
+@example
+```bash
+node --import @danielx/civet/register-noconfig source.civet
+```
+
 On older Node, `require`ing this file will register the `.civet` extension
 for CJS `require`s.
 
@@ -16,13 +24,30 @@ for CJS `require`s.
 ```bash
 node -r @danielx/civet/register source.civet
 ```
+
+If you want to configure the loader, you can make your own
+`register.mjs` along these lines:
+
+@example
+```javascript
+import { register } from 'node:module';
+register('@danielx/civet/esm', import.meta.url, {data: {
+  //config: 'path/config.json',
+  parseOptions: {
+    // Add your parse options here
+  },
+}});
+```
+
 */
 
 try {
   const { register } = require('node:module');
   const { pathToFileURL } = require('node:url');
 
-  register('./dist/esm.mjs', pathToFileURL(__filename));
+  register('./dist/esm.mjs', pathToFileURL(__filename)
+    //NOCONFIG//, {data: {config: null}}
+  );
 } catch (e) {
   // older Node lacking module register
 }
@@ -38,6 +63,7 @@ if (require.extensions) {
       js: true,
       inlineMap: true,
       sync: true,
+      //NOCONFIG//config: null,
     });
     module._compile(js, filename);
   };