@danielx/civet 0.9.2 → 0.9.4

package/dist/node-worker.mjs

@@ -20,9 +20,14 @@ try {
             throw `Unknown operation: ${op}`;
           }
         }
-        return parentPort.postMessage({ id, result });
+        return parentPort.postMessage({ id, result, errors: args[1]?.errors });
       } catch (error) {
-        return parentPort.postMessage({ id, error });
+        console.log(`Civet worker failed to compile:`, error);
+        return parentPort.postMessage({ id, error: {
+          type: error.constructor.name,
+          name: error.name,
+          message: error.message
+        } });
       }
     });
   }

package/dist/types.d.ts

@@ -62,14 +62,15 @@ declare module "@danielx/civet" {
 
   export type SourceMapping = [number] | [number, number, number, number]
 
-  export interface SourceMap {
+  export class SourceMap {
+    constructor(source: string)
     updateSourceMap?(outputStr: string, inputPos: number): void
     json(srcFileName: string, outFileName: string): unknown
-    data: {
-      lines: SourceMapping[][]
-    }
+    source: string
+    lines: SourceMapping[][]
+    /** @deprecated */
+    data: { lines: SourceMapping[][] }
   }
-  export function SourceMap(source: string): SourceMap
 
   // TODO: Import ParseError class from Hera
   export type ParseError = {
@@ -121,7 +122,7 @@ declare module "@danielx/civet" {
     sourcemap: {
       locationTable(input: string): number[]
       lookupLineColumn(table: number[], pos: number): [number, number]
-      SourceMap(input: string): SourceMap
+      SourceMap: typeof SourceMap
     }
   }
 

package/dist/unplugin/unplugin.js

@@ -290,7 +290,7 @@ var rawPlugin = (options = {}, meta) => {
           if (!file) return diagnostic;
           const sourceMap = sourceMaps.get(file.fileName);
           if (!sourceMap) return diagnostic;
-          const sourcemapLines = sourceMap.data.lines;
+          const sourcemapLines = sourceMap.lines ?? sourceMap.data.lines;
           const range = (0, import_ts_diagnostic.remapRange)(
             {
               start: diagnostic.start || 0,
@@ -369,16 +369,6 @@ var rawPlugin = (options = {}, meta) => {
                   compilerOptions.outDir ?? process.cwd(),
                   filePath
                 );
-                if (meta.framework === "esbuild") {
-                  fs.mkdirSync(
-                    import_path.default.dirname(
-                      import_path.default.resolve(esbuildOptions.outdir, pathFromDistDir)
-                    ),
-                    {
-                      recursive: true
-                    }
-                  );
-                }
                 return this.emitFile({
                   source: content,
                   fileName: pathFromDistDir,
@@ -402,9 +392,6 @@ var rawPlugin = (options = {}, meta) => {
         id = aliasResolver(id);
       }
       if (/\0/.test(id)) return null;
-      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
-        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
-      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref2;
@@ -475,7 +462,7 @@ var rawPlugin = (options = {}, meta) => {
           ...civetOptions,
           ast: true
         });
-        const civetSourceMap = (0, import_civet.SourceMap)(rawCivetSource);
+        const civetSourceMap = new import_civet.SourceMap(rawCivetSource);
         if (ts === "civet") {
           compiled = await import_civet.default.generate(ast, {
             ...civetOptions,
@@ -608,6 +595,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     webpack(compiler) {
       if (implicitExtension) {
+        compiler.options ??= {};
+        compiler.options.resolve ??= {};
+        compiler.options.resolve.extensions ??= ["", ".js", ".json", ".wasm"];
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {

package/dist/unplugin/unplugin.mjs

@@ -258,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
           if (!file) return diagnostic;
           const sourceMap = sourceMaps.get(file.fileName);
           if (!sourceMap) return diagnostic;
-          const sourcemapLines = sourceMap.data.lines;
+          const sourcemapLines = sourceMap.lines ?? sourceMap.data.lines;
           const range = remapRange(
             {
               start: diagnostic.start || 0,
@@ -337,16 +337,6 @@ var rawPlugin = (options = {}, meta) => {
                   compilerOptions.outDir ?? process.cwd(),
                   filePath
                 );
-                if (meta.framework === "esbuild") {
-                  fs.mkdirSync(
-                    path.dirname(
-                      path.resolve(esbuildOptions.outdir, pathFromDistDir)
-                    ),
-                    {
-                      recursive: true
-                    }
-                  );
-                }
                 return this.emitFile({
                   source: content,
                   fileName: pathFromDistDir,
@@ -370,9 +360,6 @@ var rawPlugin = (options = {}, meta) => {
         id = aliasResolver(id);
       }
       if (/\0/.test(id)) return null;
-      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
-        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
-      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref2;
@@ -443,7 +430,7 @@ var rawPlugin = (options = {}, meta) => {
           ...civetOptions,
           ast: true
         });
-        const civetSourceMap = SourceMap(rawCivetSource);
+        const civetSourceMap = new SourceMap(rawCivetSource);
         if (ts === "civet") {
           compiled = await civet.generate(ast, {
             ...civetOptions,
@@ -576,6 +563,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     webpack(compiler) {
       if (implicitExtension) {
+        compiler.options ??= {};
+        compiler.options.resolve ??= {};
+        compiler.options.resolve.extensions ??= ["", ".js", ".json", ".wasm"];
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -95,7 +95,7 @@
     "unplugin": "^2.1.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.9.0",
+    "@danielx/civet": "0.9.2",
     "@danielx/hera": "^0.8.16",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",