@danielx/civet 0.2.13 → 0.2.16

package/dist/types.d.ts

@@ -1,17 +1,37 @@
 declare module "@danielx/civet" {
-  export type CivetAST = unknown;
+  export type CivetAST = unknown
   export type CompileOptions = {
+    filename?: string
     js?: boolean
+    sourceMap?: boolean
   }
 
-  export function compile(source: string, options?: CompileOptions): string
+  export type SourceMapping = [number] | [number, number, number, number]
+
+  export interface SourceMap {
+    updateSourceMap?(outputStr: string, inputPos: number): void
+    json(srcFileName: string, outFileName: string): unknown
+    data: {
+      lines: SourceMapping[][]
+    }
+  }
+
+  export function compile<T extends CompileOptions>(source: string, options?: T): T extends { sourceMap: true } ? {
+    code: string,
+    sourceMap: SourceMap,
+  } : string
   export function parse(source: string): CivetAST
   export function generate(ast: CivetAST, options?: CompileOptions): string
 
   const Civet: {
-    compile: typeof compile;
-    parse: typeof parse;
-    generate: typeof generate;
+    compile: typeof compile
+    parse: typeof parse
+    generate: typeof generate
+    util: {
+      locationTable(input: string): number[]
+      lookupLineColumn(table: number[], pos: number): [number, number]
+      SourceMap(input: string): SourceMap
+    }
   }
 
   export default Civet;

package/esbuild-plugin.js

@@ -6,21 +6,22 @@ module.exports = {
   name: 'civet',
   setup(build) {
     build.onLoad({
-      filter: /\.civet/
-    }, async function (args) {
+      filter: /\.civet/,
+    }, function(args) {
       return readFile(args.path, 'utf8')
-        .then(function (source) {
-          const filename = path.relative(process.cwd(), args.path);
-          return {
-            contents: compile(source, { filename, js: true })
-          };
-        }).catch(function (e) {
-          return {
-            errors: [{
-              text: e.message
-            }]
-          };
-        });
+      .then(function(source) {
+        const filename = path.relative(process.cwd(), args.path);
+        return {
+          contents: compile(source, { filename, js: true }),
+        };
+      })
+      .catch(function(e) {
+        return {
+          errors: [{
+            text: e.message,
+          }],
+        };
+      });
     });
-  }
+  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.2.13",
+  "version": "0.2.16",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "types": "dist/types.d.ts",
@@ -13,6 +13,9 @@
     "register.js",
     "register.mjs"
   ],
+  "engines": {
+    "node": "^18.6.0 || ^16.17.0"
+  },
   "scripts": {
     "prepublishOnly": "yarn build && yarn test",
     "build": "bash ./build/build.sh",

package/register.mjs

@@ -7,23 +7,24 @@ const baseURL = pathToFileURL(process.cwd() + '/').href;
 
 const extensionsRegex = /\.civet$/;
 
-export async function resolve(specifier, context, defaultResolve) {
+export async function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
 
   if (extensionsRegex.test(specifier)) {
     return {
-      format: "civet",
+      shortCircuit: true,
+      format: "module",
       url: new URL(specifier, parentURL).href,
     };
   }
 
   // Let Node.js handle all other specifiers.
-  return defaultResolve(specifier, context, defaultResolve);
+  return next(specifier, context);
 }
 
-export async function load(url, context, defaultLoad) {
+export async function load(url, context, next) {
   if (extensionsRegex.test(url)) {
-    const { source: rawSource } = await defaultLoad(url, { format: "civet" });
+    const { source: rawSource } = await next(url, { format: "module" });
 
     return {
       format: "module",
@@ -32,7 +33,7 @@ export async function load(url, context, defaultLoad) {
   }
 
   // Let Node.js handle all other URLs.
-  return defaultLoad(url, context, defaultLoad);
+  return next(url, context);
 }
 
 // Also transform CommonJS files.