@danielx/civet 0.3.0 → 0.3.4

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@danielx/civet",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {
     ".": "./dist/main.js",
-    "./esm": "./register.mjs"
+    "./esm": "./dist/esm.mjs",
+    "./esbuild-plugin": "./dist/esbuild-plugin.js"
   },
   "types": "dist/types.d.ts",
   "bin": {
@@ -13,7 +14,6 @@
   },
   "files": [
     "dist/",
-    "esbuild-plugin.js",
     "register.js",
     "register.mjs"
   ],
@@ -40,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,3 +1,4 @@
+import { readFileSync } from 'fs';
 import { readFile } from 'fs/promises';
 import { createRequire } from 'module';
 import { pathToFileURL, fileURLToPath } from 'url';
@@ -7,8 +8,6 @@ import { compile } from "./dist/main.js";
 const baseURL = pathToFileURL(process.cwd() + '/').href;
 const extensionsRegex = /\.civet$/;
 
-const cache = new Map
-
 export async function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
 
@@ -28,7 +27,7 @@ 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)
+    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)
@@ -40,15 +39,6 @@ export async function load(url, context, next) {
       source: tsSource
     });
 
-    // NOTE: If I don't set the format to 'commonjs' then I get
-    // "ReferenceError: exports is not defined in ES module scope"
-    // setting the format to commonjs causes the require.extensions
-    // handler to be invoked. So we cache the ts-node transpilation
-    // result, hook into require.extensions, and return the result there.
-    // Hopefully node loaders simplify this in the future.
-    result.format = "commonjs"
-    cache.set(path, result.source)
-
     return result
   }
 
@@ -56,13 +46,11 @@ export async function load(url, context, next) {
   return next(url, context);
 }
 
-// Cache our double transpiled sources (.civet -> .ts -> .js)
 const require = createRequire(import.meta.url);
 require.extensions[".civet"] = function (m, filename) {
-  const code = cache.get(filename)
-  if (!code) throw new Error(`Code for ${filename} wasn't in transpiled cache.`)
+  // 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)
-  // Module should be cached after the first load so we can release the memory
-  cache.delete(filename)
 }