htmlemmurt 0.1.2 → 0.2.0

package/README.md

@@ -9,7 +9,7 @@ npm i -D htmlemmurt
 ## Da Node
 
 ```js
-import { compile, compileFratm, formatError } from 'htmlemmurt';
+import { compile, formatError } from 'htmlemmurt';
 
 const { html, dependencies, errors } = compile('<cascett classe="a">Uè</cascett>', {
   filename: 'index.emmurt',
@@ -17,18 +17,19 @@ const { html, dependencies, errors } = compile('<cascett classe="a">Uè</cascett
 // html → '<div class="a">Uè</div>'
 ```
 
-`compile` non lancia mai eccezioni: gli errori stanno in `errors`, con `message`, `file`, `line`, `column` e `suggestion`, in napoletano. Le opzioni sono `filename`, `root` (la cartella per i percorsi che cominciano con `/`), `read` (per leggere i file in un altro modo) e `inline` (incolla nella pagina i file di `<fratm da>`). `compileFratm` compila un modulo FratmScript.
+`compile` non lancia mai eccezioni: gli errori stanno in `errors`, con `message`, `file`, `line`, `column` e `suggestion`, in napoletano. Le opzioni sono `filename`, `root` (la cartella per i percorsi che cominciano con `/`), `read` (per leggere i file in un altro modo) e `inline` (incolla nella pagina i file di `<fratm da>`). I moduli `.fratm` li compila il pacchetto [`fratmscript`](https://www.npmjs.com/package/fratmscript).
 
 ## Con Vite
 
 ```js
 // vite.config.js
 import htmlemmurt from 'htmlemmurt/vite';
+import fratmscript from 'fratmscript/vite';
 
-export default { plugins: [htmlemmurt()] };
+export default { plugins: [htmlemmurt(), fratmscript()] };
 ```
 
-Ogni `x.emmurt` che comincia con `<cristian>` diventa `x.html`, in sviluppo e in build. Anche i moduli `.fratm` passano dal plugin.
+Ogni `x.emmurt` che comincia con `<cristian>` diventa `x.html`, in sviluppo e in build. I moduli `.fratm` li compila il plugin di FratmScript.
 
 ## Nel browser
 

package/index.d.ts

@@ -36,24 +36,16 @@ export interface CompileResult {
   errors: EmmurtError[];
 }
 
-export interface FratmResult {
-  /** The JavaScript, or null when there are errors */
-  code: string | null;
-  /** Source map (v3) back to the .fratm file */
-  map: { version: number; file: string; sources: string[]; sourcesContent: string[]; names: string[]; mappings: string } | null;
-  errors: EmmurtError[];
-}
-
 export interface Vocabulary {
-  tags: [string, string][];
-  attributes: { nap: string; html: string; only?: string[]; values?: [string, string][] }[];
-  events: [string, string][];
+  /** [Neapolitan, HTML, description in Neapolitan] */
+  tags: [string, string, string][];
+  attributes: { nap: string; html: string; react: string; only?: string[]; values?: [string, string][] }[];
+  /** [Neapolitan, HTML, React prop] */
+  events: [string, string, string][];
 }
 
 /** Compiles htmlemmurt to HTML. Never throws on invalid source: check `errors`. */
 export function compile(source: string, options?: CompileOptions): CompileResult;
-/** Compiles a FratmScript module to JavaScript. */
-export function compileFratm(source: string, options?: { filename?: string }): FratmResult;
 /** Every Neapolitan name and its HTML. */
 export function vocabulary(): Vocabulary;
 /** Version of the compiler. */

package/index.js

@@ -7,7 +7,7 @@ import { createApi } from './lib/api.js';
 const wasm = createRequire(import.meta.url)('./wasm/node/emmurt_wasm.js');
 const api = createApi(wasm);
 
-export const { compileFratm, vocabulary, version, runtimeError } = api;
+export const { vocabulary, version, runtimeError } = api;
 export { formatError } from './lib/api.js';
 
 /**

package/lib/api.js

@@ -6,20 +6,7 @@ export function createApi(wasm) {
     const { filename = 'input.emmurt', read, inline = false } = options;
     // The bindings take a missing file as anything that is not a string
     const response = wasm.compile(String(source), filename, read ? (path) => read(path) : undefined, inline);
-    return { html: response.code, dependencies: response.dependencies, errors: response.errors };
-  }
-
-  function compileFratm(source, options = {}) {
-    const filename = options.filename ?? 'input.fratm';
-    const response = wasm.compileFratm(String(source), filename);
-    let map = null;
-    if (response.map) {
-      map = JSON.parse(response.map);
-      map.sources = [filename];
-      map.sourcesContent = [String(source)];
-      map.file = filename.replace(/\.fratm$/, '') + '.js';
-    }
-    return { code: response.code, map, errors: response.errors };
+    return { html: response.html, dependencies: response.dependencies, errors: response.errors };
   }
 
   function vocabulary() {
@@ -32,7 +19,7 @@ export function createApi(wasm) {
     return wasm.runtimeError(name, message);
   }
 
-  return { compile, compileFratm, vocabulary, version: wasm.version, runtimeError };
+  return { compile, vocabulary, version: wasm.version, runtimeError };
 }
 
 /** `file:line:column: message`, then the hint on its own line. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlemmurt",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "htmlemmurt compiler (WebAssembly), Vite plugin and browser runtime: HTML, ma comme si deve 🤌",
   "license": "MIT",
   "author": "Vito Esposito",

package/vite.d.ts

@@ -1,9 +1,9 @@
 import type { Plugin } from 'vite';
 
 /**
- * Serves and builds every `x.emmurt` page as `x.html` and compiles `.fratm`
- * modules. Pages are the .emmurt files that start with `<cristian>`; set
- * `build.rollupOptions.input` to choose them yourself.
+ * Serves and builds every `x.emmurt` page as `x.html`. Pages are the .emmurt
+ * files that start with `<cristian>`; set `build.rollupOptions.input` to
+ * choose them yourself. Add `fratmscript/vite` for the `.fratm` modules.
  */
 export default function htmlemmurt(): Plugin;
 export { htmlemmurt };

package/vite.js

@@ -1,12 +1,10 @@
-// Vite plugin: .emmurt pages are the app's HTML entries, .fratm files its
-// modules. `x.emmurt` is served and built as `x.html`.
+// Vite plugin: .emmurt pages are the app's HTML entries. `x.emmurt` is
+// served and built as `x.html`. The .fratm modules they load are compiled by
+// FratmScript's own plugin, `fratmscript/vite`.
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { join, relative, resolve, sep } from 'node:path';
-import { compile, compileFratm, formatError } from './index.js';
+import { compile, formatError } from './index.js';
 
-const FRATM = /\.fratm$/;
-// A request for a .fratm file that Vite would serve as it is
-const RAW_FRATM_REQUEST = /^[^?#]*\.fratm(?:$|[?#])/;
 // A page starts with <cristian>, maybe after comments
 const PAGE = /^\s*(?:<!--[\s\S]*?-->\s*)*<cristian[\s>/]/i;
 const SKIP_DIRS = new Set(['node_modules', 'dist', 'public']);
@@ -59,14 +57,6 @@ export default function htmlemmurt() {
       return html;
     },
 
-    transform(source, id) {
-      const file = id.split('?', 1)[0];
-      if (!FRATM.test(file)) return null;
-      const { code, map, errors } = compileFratm(source, { filename: file });
-      if (errors.length > 0) this.error(errorFor(errors[0]));
-      return { code, map };
-    },
-
     configureServer(server) {
       const reload = (file) => {
         if (file.endsWith('.emmurt')) server.ws.send({ type: 'full-reload' });
@@ -77,12 +67,6 @@ export default function htmlemmurt() {
 
       server.middlewares.use(async (req, res, next) => {
         if (!req.url) return next();
-        // The dev server only compiles requests it knows are modules. Imports
-        // between modules get `?import`, the <script src> of a page does not
-        if (RAW_FRATM_REQUEST.test(req.url) && !/[?&]import(?:[=&#]|$)/.test(req.url)) {
-          req.url += req.url.includes('?') ? '&import' : '?import';
-          return next();
-        }
         if (req.method !== 'GET' && req.method !== 'HEAD') return next();
         let path = decodeURIComponent(req.url.split(/[?#]/, 1)[0]);
         if (path.endsWith('/')) path += 'index.html';

package/wasm/node/emmurt_wasm.js

@@ -20,22 +20,6 @@ function compile(source, filename, read, inline) {
 }
 exports.compile = compile;
 
-/**
- * Compiles a `.fratm` module to JavaScript.
- * @param {string} source
- * @param {string} filename
- * @returns {any}
- */
-function compileFratm(source, filename) {
-    const ptr0 = passStringToWasm0(source, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(filename, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.compileFratm(ptr0, len0, ptr1, len1);
-    return ret;
-}
-exports.compileFratm = compileFratm;
-
 /**
  * A JavaScript runtime error in Neapolitan, as FratmScript says it.
  * @param {string} name

package/wasm/web/emmurt_wasm.js

@@ -19,21 +19,6 @@ export function compile(source, filename, read, inline) {
     return ret;
 }
 
-/**
- * Compiles a `.fratm` module to JavaScript.
- * @param {string} source
- * @param {string} filename
- * @returns {any}
- */
-export function compileFratm(source, filename) {
-    const ptr0 = passStringToWasm0(source, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(filename, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.compileFratm(ptr0, len0, ptr1, len1);
-    return ret;
-}
-
 /**
  * A JavaScript runtime error in Neapolitan, as FratmScript says it.
  * @param {string} name

package/web.d.ts

@@ -1,11 +1,10 @@
-export type { EmmurtError, CompileResult, FratmResult, Vocabulary } from './index.js';
-import type { CompileOptions, CompileResult, FratmResult, Vocabulary, EmmurtError } from './index.js';
+export type { EmmurtError, CompileResult, Vocabulary } from './index.js';
+import type { CompileOptions, CompileResult, Vocabulary, EmmurtError } from './index.js';
 
 /** Loads the WebAssembly module (by default the .wasm file next to this one). Call once, await it. */
 export function init(input?: string | URL | Request | Response | BufferSource | WebAssembly.Module): Promise<void>;
 /** Compiles htmlemmurt to HTML. Without `read`, includes cannot be resolved. */
 export function compile(source: string, options?: Omit<CompileOptions, 'root'>): CompileResult;
-export function compileFratm(source: string, options?: { filename?: string }): FratmResult;
 export function vocabulary(): Vocabulary;
 export function version(): string;
 export function runtimeError(error: unknown): string;

package/web.js

@@ -19,7 +19,6 @@ function loadedApi() {
 }
 
 export const compile = (source, options) => loadedApi().compile(source, options);
-export const compileFratm = (source, options) => loadedApi().compileFratm(source, options);
 export const vocabulary = () => loadedApi().vocabulary();
 export const version = () => loadedApi().version();
 export const runtimeError = (error) => loadedApi().runtimeError(error);