@astrojs/compiler 0.0.0-sync-20230409173822 → 0.0.0-sync-20230418114635

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @astrojs/compiler
 
-## 0.0.0-sync-20230409173822
+## 0.0.0-sync-20230418114635
 
 ### Patch Changes
 

package/node/{sync.js → sync.cjs}

@@ -1,8 +1,9 @@
-import { promises as fs } from 'fs';
+import { readFileSync } from 'node:fs';
 import Go from './wasm_exec';
+import { join } from 'node:path';
 function getService() {
     if (!longLivedService) {
-        throw new Error("Service hasn't been started. Start it with startRunningService.");
+        longLivedService = startRunningService();
     }
     return longLivedService;
 }
@@ -14,12 +15,12 @@ export const parse = ((input, options) => {
 export const convertToTSX = ((input, options) => {
     return getService().convertToTSX(input, options);
 });
-export async function startRunningService(wasmPath) {
+export function startRunningService() {
     const go = new Go();
-    const wasm = await instantiateWASM(wasmPath, go.importObject);
-    go.run(wasm.instance);
+    const wasm = instantiateWASM(join(__dirname, '../astro.wasm'), go.importObject);
+    go.run(wasm);
     const _service = globalThis['@astrojs/compiler'];
-    longLivedService = {
+    return {
         transform: (input, options) => {
             try {
                 return _service.transform(input, options || {});
@@ -39,14 +40,8 @@ export async function startRunningService(wasmPath) {
             return { ...result, map: JSON.parse(result.map) };
         },
     };
-    return 'hey';
 }
-async function instantiateWASM(wasmURL, importObject) {
-    let response = undefined;
-    const fetchAndInstantiateTask = async () => {
-        const wasmArrayBuffer = await fs.readFile(wasmURL).then((res) => res.buffer);
-        return WebAssembly.instantiate(new Uint8Array(wasmArrayBuffer), importObject);
-    };
-    response = await fetchAndInstantiateTask();
-    return response;
+function instantiateWASM(wasmURL, importObject) {
+    const wasmArrayBuffer = readFileSync(wasmURL);
+    return new WebAssembly.Instance(new WebAssembly.Module(wasmArrayBuffer), importObject);
 }

package/node/sync.cts

@@ -0,0 +1,62 @@
+import { readFileSync } from 'node:fs';
+import type * as types from '../shared/types';
+import Go from './wasm_exec';
+import { join } from 'node:path';
+
+type UnwrappedPromise<T> = T extends (...params: any) => Promise<infer Return> ? (...params: Parameters<T>) => Return : T;
+
+interface Service {
+  transform: UnwrappedPromise<typeof types.transform>;
+  parse: UnwrappedPromise<typeof types.parse>;
+  convertToTSX: UnwrappedPromise<typeof types.convertToTSX>;
+}
+
+function getService(): Service {
+  if (!longLivedService) {
+    longLivedService = startRunningService();
+  }
+  return longLivedService;
+}
+
+let longLivedService: Service | undefined;
+
+export const transform = ((input, options) => getService().transform(input, options)) satisfies Service['transform'];
+
+export const parse = ((input, options) => {
+  return getService().parse(input, options);
+}) satisfies Service['parse'];
+
+export const convertToTSX = ((input, options) => {
+  return getService().convertToTSX(input, options);
+}) satisfies Service['convertToTSX'];
+
+export function startRunningService(): Service {
+  const go = new Go();
+  const wasm = instantiateWASM(join(__dirname, '../astro.wasm'), go.importObject);
+  go.run(wasm);
+  const _service: any = (globalThis as any)['@astrojs/compiler'];
+  return {
+    transform: (input, options) => {
+      try {
+        return _service.transform(input, options || {});
+      } catch (err) {
+        // Recreate the service next time on panic
+        longLivedService = void 0;
+        throw err;
+      }
+    },
+    parse: (input, options) => {
+      const result = _service.parse(input, options || {});
+      return { ...result, ast: JSON.parse(result.ast) };
+    },
+    convertToTSX: (input, options) => {
+      const result = _service.convertToTSX(input, options || {});
+      return { ...result, map: JSON.parse(result.map) };
+    },
+  };
+}
+
+function instantiateWASM(wasmURL: string, importObject: Record<string, any>): WebAssembly.Instance {
+  const wasmArrayBuffer = readFileSync(wasmURL);
+  return new WebAssembly.Instance(new WebAssembly.Module(wasmArrayBuffer), importObject);
+}

package/node/{sync.d.ts → sync.d.cts}

@@ -1,5 +1,12 @@
 import type * as types from '../shared/types';
+type UnwrappedPromise<T> = T extends (...params: any) => Promise<infer Return> ? (...params: Parameters<T>) => Return : T;
+interface Service {
+    transform: UnwrappedPromise<typeof types.transform>;
+    parse: UnwrappedPromise<typeof types.parse>;
+    convertToTSX: UnwrappedPromise<typeof types.convertToTSX>;
+}
 export declare const transform: (input: string, options: types.TransformOptions | undefined) => types.TransformResult;
 export declare const parse: (input: string, options: types.ParseOptions | undefined) => types.ParseResult;
 export declare const convertToTSX: (input: string, options: types.ConvertToTSXOptions | undefined) => types.TSXResult;
-export declare function startRunningService(wasmPath: string): Promise<string>;
+export declare function startRunningService(): Service;
+export {};

package/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "bugs": "https://github.com/withastro/compiler/issues",
   "homepage": "https://astro.build",
-  "version": "0.0.0-sync-20230409173822",
+  "version": "0.0.0-sync-20230418114635",
   "main": "./node/index.js",
   "types": "./node",
   "repository": {
@@ -19,8 +19,8 @@
       "default": "./browser/index.js"
     },
     "./sync": {
-      "import": "./node/sync.js",
-      "default": "./node/sync.js"
+      "import": "./node/sync.cjs",
+      "default": "./node/sync.cjs"
     },
     "./utils": {
       "browser": "./browser/utils.js",

package/sync.d.ts

@@ -1 +1 @@
-export * from './node/sync';
+export * from './node/sync.cjs';