@danielx/civet 0.2.16 → 0.3.2

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@danielx/civet",
-  "version": "0.2.16",
+  "version": "0.3.2",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
+  "exports": {
+    ".": "./dist/main.js",
+    "./esm": "./dist/esm.mjs",
+    "./esbuild-plugin": "./dist/esbuild-plugin.js"
+  },
   "types": "dist/types.d.ts",
   "bin": {
     "civet": "dist/civet"
   },
   "files": [
     "dist/",
-    "esbuild-plugin.js",
     "register.js",
     "register.mjs"
   ],
@@ -36,11 +40,14 @@
   },
   "mocha": {
     "extension": [
+      "civet",
       "coffee"
     ],
-    "require": [
-      "coffeescript/register",
-      "@danielx/hera/register"
+    "loader": [
+      "ts-node/esm",
+      "./build/coffee-esm.mjs",
+      "./build/hera-esm.mjs",
+      "./dist/esm.mjs"
     ],
     "reporter": "dot",
     "recursive": true,

package/register.mjs

@@ -1,10 +1,11 @@
+import { readFileSync } from 'fs';
+import { readFile } from 'fs/promises';
 import { createRequire } from 'module';
-import { pathToFileURL } from 'url';
+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) {
@@ -13,7 +14,7 @@ export async function resolve(specifier, context, next) {
   if (extensionsRegex.test(specifier)) {
     return {
       shortCircuit: true,
-      format: "module",
+      format: "civet",
       url: new URL(specifier, parentURL).href,
     };
   }
@@ -23,19 +24,33 @@ export async function resolve(specifier, context, next) {
 }
 
 export async function load(url, context, next) {
-  if (extensionsRegex.test(url)) {
-    const { source: rawSource } = await next(url, { format: "module" });
-
-    return {
+  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, ".ts"), {
+      // ts-node won't transpile unless this is module
+      // can't use commonjs since we don't rewrite imports
       format: "module",
-      source: compile(rawSource.toString(), { js: true }),
-    };
+      // 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);
 }
 
-// Also transform CommonJS files.
 const require = createRequire(import.meta.url);
-require("./register.js")
+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)
+}