@danielx/civet 0.7.9 → 0.7.11

package/dist/types.d.ts

@@ -57,14 +57,21 @@ declare module "@danielx/civet" {
 
   // TODO: Import ParseError class from Hera
   export type ParseError = {
-    message: string
-    name: string
+    name: "ParseError"
+    message: string // filename:line:column header\nbody
+    header: string
+    body: string
     filename: string
     line: number
     column: number
     offset: number
   }
-  export function isCompileError(err: any): err is ParseError
+  export type ParseErrors = {
+    name: "ParseErrors"
+    message: string
+    errors: ParseError[]
+  }
+  export function isCompileError(err: any): err is ParseError | ParseErrors
 
   type CompileOutput<T extends CompileOptions> =
     T extends { ast: true } ? CivetAST :
@@ -87,7 +94,7 @@ declare module "@danielx/civet" {
     isCompileError: typeof isCompileError
     parse: typeof parse
     generate: typeof generate
-    util: {
+    sourcemap: {
       locationTable(input: string): number[]
       lookupLineColumn(table: number[], pos: number): [number, number]
       SourceMap(input: string): SourceMap

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -74,9 +74,9 @@
     "unplugin": "^1.6.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.7.4",
-    "@danielx/hera": "^0.8.13",
-    "@prettier/sync": "^0.3.0",
+    "@danielx/civet": "0.7.10",
+    "@danielx/hera": "^0.8.14",
+    "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.12.2",
@@ -84,7 +84,7 @@
     "esbuild": "0.20.0",
     "marked": "^4.2.4",
     "mocha": "^10.0.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "terser": "^5.16.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",

package/register.js

@@ -23,28 +23,56 @@ try {
   const { pathToFileURL } = require('node:url');
 
   register('./dist/esm.mjs', pathToFileURL(__filename));
-} catch (e) {}
+} catch (e) {
+  // older Node lacking module register
+}
 
-// CJS registration
-if (require.extensions) {
-  const fs = require("fs");
-  const { compile } = require("./");
+const fs = require("fs");
+const { compile } = require("./");
 
+// Old-style CJS registration
+if (require.extensions) {
   require.extensions[".civet"] = function (module, filename) {
     const js = compile(fs.readFileSync(filename, 'utf8'), {
       filename,
       js: true,
       inlineMap: true,
+      sync: true,
     });
     module._compile(js, filename);
   };
+}
 
-  try {
-    require('@cspotcode/source-map-support').install({
-      environment: 'node',
-      hookRequire: true  // support inline source maps
-    })
-  } catch (e) {
-    // ignore missing dependency
+const outputCache = new Map
+
+function retrieveFile(path) {
+  if (!path.endsWith('.civet')) return
+
+  // If it's a file URL, convert to local path
+  // I could not find a way to handle non-URLs except to swallow an error
+  if (path.startsWith('file:')) {
+    try {
+      path = require('url').fileURLToPath(path)
+    } catch (e) {}
   }
+
+  if (!outputCache.has(path)) {
+    outputCache.set(path, compile(fs.readFileSync(path, 'utf8'), {
+      filename: path,
+      js: true,
+      inlineMap: true,
+      sync: true,
+    }));
+  }
+  return outputCache.get(path)
+}
+
+try {
+  require('@cspotcode/source-map-support').install({
+    environment: 'node',
+    hookRequire: true,
+    retrieveFile,
+  })
+} catch (e) {
+  // ignore missing dependency
 }