@danielx/civet 0.3.1 → 0.3.2

package/dist/esm.mjs

@@ -0,0 +1,61 @@
+import { readFileSync } from 'fs';
+import { createRequire } from 'module';
+import { pathToFileURL, fileURLToPath } from 'url';
+
+//@ts-ignore Note: this is the compiled name
+import { compile } from "./main.js";
+
+const baseURL = pathToFileURL(process.cwd() + '/').href;
+const extensionsRegex = /\.civet$/;
+
+export 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 function load(url, context, next) {
+  if (context.format === "civet") {
+    const path = fileURLToPath(url);
+    const source = readFileSync(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)
+    return 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",
+      // NOTE: Setting the source in the context makes it available when ts-node uses defaultLoad
+      source: tsSource,
+    });
+  };
+
+  // Let Node.js handle all other URLs.
+  return next(url, context);
+};
+
+
+// commonjs hook
+const require = createRequire(import.meta.url);
+require.extensions[".civet"] = function(m, filename) {
+  const source = readFileSync(filename, "utf8");
+  const code = compile(source, {
+    filename,
+    js: true,
+  });
+
+  //@ts-ignore TODO: Figure out how to load types from inculde folders in Civet LSP
+  m._compile(code, filename);
+};

package/dist/main.js

@@ -547,6 +547,7 @@ var require_parser = __commonJS({
       MaybeNestedExpression,
       Return,
       ImportDeclaration,
+      ImpliedImport,
       Import,
       ImportClause,
       NameSpaceImport,
@@ -1305,9 +1306,9 @@ var require_parser = __commonJS({
         return SpacedApplication$0(state);
       }
     }
-    var ApplicationStart$0 = $TS($S($E(OptionalShorthand), $TEXT($P(_)), $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3) {
+    var ApplicationStart$0 = $TS($S($E(OptionalShorthand), $N(EOS), $TEXT($P(_)), $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var opt = $1;
-      var spacing = $2;
+      var spacing = $3;
       return [opt, "(", spacing.replace(/^ /, "")];
     });
     function ApplicationStart(state) {
@@ -2498,11 +2499,24 @@ var require_parser = __commonJS({
     });
     var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
     var ImportDeclaration$2 = $S(Import, __, ModuleSpecifier);
+    var ImportDeclaration$3 = $S(ImpliedImport, ImportClause, __, FromClause);
     function ImportDeclaration(state) {
       if (state.tokenize) {
-        return $TOKEN("ImportDeclaration", state, ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state));
+        return $TOKEN("ImportDeclaration", state, ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state) || ImportDeclaration$3(state));
       } else {
-        return ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state);
+        return ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state) || ImportDeclaration$3(state);
+      }
+    }
+    var ImpliedImport$0 = $T($EXPECT($L32, fail, 'ImpliedImport ""'), function(value) {
+      return "import ";
+    });
+    function ImpliedImport(state) {
+      if (state.verbose)
+        console.log("ENTER:", "ImpliedImport");
+      if (state.tokenize) {
+        return $TOKEN("ImpliedImport", state, ImpliedImport$0(state));
+      } else {
+        return ImpliedImport$0(state);
       }
     }
     var Import$0 = $TS($S($EXPECT($L24, fail, 'Import "import"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
@@ -3766,8 +3780,7 @@ var require_parser = __commonJS({
         if (spacing) {
           str = str.replaceAll(spacing[0], "\n");
         }
-        str = str.replace(/^(\r?\n|\n)/, "");
-        str = str.replace(/(\r?\n|\n)$/, "");
+        str = str.replace(/^(\r?\n|\n)/, "").replace(/(\r?\n|\n)[ \t]*$/, "").replace(/(`|\$)/g, "\\$1");
         return str;
       };
       return $0;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@danielx/civet",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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)
 }