@hexze/mctext 1.1.1 → 1.1.3

package/README.md

@@ -46,7 +46,7 @@ mctext = { version = "1.0", features = ["legacy-fonts"] }
 use mctext::{MCText, NamedColor};
 
 let text = MCText::new()
-    .add("Red ").color(NamedColor::Red)
+    .span("Red ").color(NamedColor::Red)
     .then("Bold").color(NamedColor::Red).bold()
     .build();
 
@@ -64,7 +64,7 @@ pip install mctext
 ```python
 import mctext
 
-text = mctext.MCText().add("Red ").color("red").then("Bold").color("red").bold().build()
+text = mctext.MCText().span("Red ").color("red").then("Bold").color("red").bold().build()
 
 for span in text.spans():
     print(f"{span.text}: {span.color}")
@@ -77,11 +77,9 @@ npm install @hexze/mctext
 ```
 
 ```javascript
-import init, { MCText } from '@hexze/mctext';
+const { MCText } = require('@hexze/mctext');
 
-await init();
-
-let text = new MCText().add("Red ").color("red").then("Bold").color("red").bold().build();
+let text = new MCText().span("Red ").color("red").then("Bold").color("red").bold().build();
 
 for (const span of text.spans()) {
     console.log(`${span.text}: ${span.color}`);

package/mctext_wasm.d.ts

@@ -22,8 +22,8 @@ export class MCText {
   [Symbol.dispose](): void;
   static parseJson(json: string): MCText;
   plainText(): string;
-  add(text: string): SpanBuilder;
   constructor();
+  span(text: string): SpanBuilder;
   static parse(text: string): MCText;
   spans(): any;
   toJson(): string;
@@ -60,72 +60,3 @@ export function namedColors(): any;
 export function render(font_system: FontSystem, text: MCText, width: number, height: number, options: LayoutOptions): RenderResult;
 
 export function stripCodes(text: string): string;
-
-export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly __wbg_mctext_free: (a: number, b: number) => void;
-  readonly __wbg_spanbuilder_free: (a: number, b: number) => void;
-  readonly countVisibleChars: (a: number, b: number) => number;
-  readonly mctext_add: (a: number, b: number, c: number) => number;
-  readonly mctext_new: () => number;
-  readonly mctext_parse: (a: number, b: number) => number;
-  readonly mctext_parseJson: (a: number, b: number) => [number, number, number];
-  readonly mctext_plainText: (a: number) => [number, number];
-  readonly mctext_spans: (a: number) => any;
-  readonly mctext_toJson: (a: number) => [number, number];
-  readonly mctext_toLegacy: (a: number) => [number, number];
-  readonly namedColors: () => any;
-  readonly spanbuilder_bold: (a: number) => number;
-  readonly spanbuilder_build: (a: number) => number;
-  readonly spanbuilder_color: (a: number, b: number, c: number) => number;
-  readonly spanbuilder_italic: (a: number) => number;
-  readonly spanbuilder_obfuscated: (a: number) => number;
-  readonly spanbuilder_strikethrough: (a: number) => number;
-  readonly spanbuilder_then: (a: number, b: number, c: number) => number;
-  readonly spanbuilder_underlined: (a: number) => number;
-  readonly stripCodes: (a: number, b: number) => [number, number];
-  readonly __wbg_fontsystem_free: (a: number, b: number) => void;
-  readonly __wbg_layoutoptions_free: (a: number, b: number) => void;
-  readonly __wbg_renderresult_free: (a: number, b: number) => void;
-  readonly fontsystem_measure: (a: number, b: number, c: number, d: number) => number;
-  readonly fontsystem_modern: () => number;
-  readonly layoutoptions_new: (a: number) => number;
-  readonly layoutoptions_withMaxWidth: (a: number, b: number) => number;
-  readonly layoutoptions_withShadow: (a: number, b: number) => number;
-  readonly render: (a: number, b: number, c: number, d: number, e: number) => number;
-  readonly renderresult_data: (a: number) => [number, number];
-  readonly renderresult_height: (a: number) => number;
-  readonly renderresult_width: (a: number) => number;
-  readonly __wbindgen_exn_store: (a: number) => void;
-  readonly __externref_table_alloc: () => number;
-  readonly __wbindgen_externrefs: WebAssembly.Table;
-  readonly __wbindgen_malloc: (a: number, b: number) => number;
-  readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
-  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-  readonly __externref_table_dealloc: (a: number) => void;
-  readonly __wbindgen_start: () => void;
-}
-
-export type SyncInitInput = BufferSource | WebAssembly.Module;
-
-/**
-* Instantiates the given `module`, which can either be bytes or
-* a precompiled `WebAssembly.Module`.
-*
-* @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated.
-*
-* @returns {InitOutput}
-*/
-export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput;
-
-/**
-* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
-* for everything else, calls `WebAssembly.instantiate` directly.
-*
-* @param {{ module_or_path: InitInput | Promise<InitInput> }} module_or_path - Passing `InitInput` directly is deprecated.
-*
-* @returns {Promise<InitOutput>}
-*/
-export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput> } | InitInput | Promise<InitInput>): Promise<InitOutput>;

package/mctext_wasm.js

@@ -1,4 +1,6 @@
-let wasm;
+
+let imports = {};
+imports['__wbindgen_placeholder__'] = module.exports;
 
 function addToExternrefTable0(obj) {
     const idx = wasm.__externref_table_alloc();
@@ -84,15 +86,7 @@ function takeFromExternrefTable0(idx) {
 
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 cachedTextDecoder.decode();
-const MAX_SAFARI_DECODE_BYTES = 2146435072;
-let numBytesDecoded = 0;
 function decodeText(ptr, len) {
-    numBytesDecoded += len;
-    if (numBytesDecoded >= MAX_SAFARI_DECODE_BYTES) {
-        cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-        cachedTextDecoder.decode();
-        numBytesDecoded = len;
-    }
     return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
@@ -131,7 +125,7 @@ const SpanBuilderFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_spanbuilder_free(ptr >>> 0, 1));
 
-export class FontSystem {
+class FontSystem {
     static __wrap(ptr) {
         ptr = ptr >>> 0;
         const obj = Object.create(FontSystem.prototype);
@@ -169,8 +163,9 @@ export class FontSystem {
     }
 }
 if (Symbol.dispose) FontSystem.prototype[Symbol.dispose] = FontSystem.prototype.free;
+exports.FontSystem = FontSystem;
 
-export class LayoutOptions {
+class LayoutOptions {
     static __wrap(ptr) {
         ptr = ptr >>> 0;
         const obj = Object.create(LayoutOptions.prototype);
@@ -217,8 +212,9 @@ export class LayoutOptions {
     }
 }
 if (Symbol.dispose) LayoutOptions.prototype[Symbol.dispose] = LayoutOptions.prototype.free;
+exports.LayoutOptions = LayoutOptions;
 
-export class MCText {
+class MCText {
     static __wrap(ptr) {
         ptr = ptr >>> 0;
         const obj = Object.create(MCText.prototype);
@@ -264,23 +260,23 @@ export class MCText {
             wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
+    constructor() {
+        const ret = wasm.mctext_new();
+        this.__wbg_ptr = ret >>> 0;
+        MCTextFinalization.register(this, this.__wbg_ptr, this);
+        return this;
+    }
     /**
      * @param {string} text
      * @returns {SpanBuilder}
      */
-    add(text) {
+    span(text) {
         const ptr = this.__destroy_into_raw();
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.mctext_add(ptr, ptr0, len0);
+        const ret = wasm.mctext_span(ptr, ptr0, len0);
         return SpanBuilder.__wrap(ret);
     }
-    constructor() {
-        const ret = wasm.mctext_new();
-        this.__wbg_ptr = ret >>> 0;
-        MCTextFinalization.register(this, this.__wbg_ptr, this);
-        return this;
-    }
     /**
      * @param {string} text
      * @returns {MCText}
@@ -330,8 +326,9 @@ export class MCText {
     }
 }
 if (Symbol.dispose) MCText.prototype[Symbol.dispose] = MCText.prototype.free;
+exports.MCText = MCText;
 
-export class RenderResult {
+class RenderResult {
     static __wrap(ptr) {
         ptr = ptr >>> 0;
         const obj = Object.create(RenderResult.prototype);
@@ -374,8 +371,9 @@ export class RenderResult {
     }
 }
 if (Symbol.dispose) RenderResult.prototype[Symbol.dispose] = RenderResult.prototype.free;
+exports.RenderResult = RenderResult;
 
-export class SpanBuilder {
+class SpanBuilder {
     static __wrap(ptr) {
         ptr = ptr >>> 0;
         const obj = Object.create(SpanBuilder.prototype);
@@ -465,25 +463,28 @@ export class SpanBuilder {
     }
 }
 if (Symbol.dispose) SpanBuilder.prototype[Symbol.dispose] = SpanBuilder.prototype.free;
+exports.SpanBuilder = SpanBuilder;
 
 /**
  * @param {string} text
  * @returns {number}
  */
-export function countVisibleChars(text) {
+function countVisibleChars(text) {
     const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
     const ret = wasm.countVisibleChars(ptr0, len0);
     return ret >>> 0;
 }
+exports.countVisibleChars = countVisibleChars;
 
 /**
  * @returns {any}
  */
-export function namedColors() {
+function namedColors() {
     const ret = wasm.namedColors();
     return ret;
 }
+exports.namedColors = namedColors;
 
 /**
  * @param {FontSystem} font_system
@@ -493,19 +494,20 @@ export function namedColors() {
  * @param {LayoutOptions} options
  * @returns {RenderResult}
  */
-export function render(font_system, text, width, height, options) {
+function render(font_system, text, width, height, options) {
     _assertClass(font_system, FontSystem);
     _assertClass(text, MCText);
     _assertClass(options, LayoutOptions);
     const ret = wasm.render(font_system.__wbg_ptr, text.__wbg_ptr, width, height, options.__wbg_ptr);
     return RenderResult.__wrap(ret);
 }
+exports.render = render;
 
 /**
  * @param {string} text
  * @returns {string}
  */
-export function stripCodes(text) {
+function stripCodes(text) {
     let deferred2_0;
     let deferred2_1;
     try {
@@ -519,167 +521,92 @@ export function stripCodes(text) {
         wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
     }
 }
+exports.stripCodes = stripCodes;
 
-const EXPECTED_RESPONSE_TYPES = new Set(['basic', 'cors', 'default']);
-
-async function __wbg_load(module, imports) {
-    if (typeof Response === 'function' && module instanceof Response) {
-        if (typeof WebAssembly.instantiateStreaming === 'function') {
-            try {
-                return await WebAssembly.instantiateStreaming(module, imports);
-            } catch (e) {
-                const validResponse = module.ok && EXPECTED_RESPONSE_TYPES.has(module.type);
-
-                if (validResponse && module.headers.get('Content-Type') !== 'application/wasm') {
-                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
-
-                } else {
-                    throw e;
-                }
-            }
-        }
-
-        const bytes = await module.arrayBuffer();
-        return await WebAssembly.instantiate(bytes, imports);
-    } else {
-        const instance = await WebAssembly.instantiate(module, imports);
-
-        if (instance instanceof WebAssembly.Instance) {
-            return { instance, module };
-        } else {
-            return instance;
-        }
-    }
-}
-
-function __wbg_get_imports() {
-    const imports = {};
-    imports.wbg = {};
-    imports.wbg.__wbg_Error_52673b7de5a0ca89 = function(arg0, arg1) {
-        const ret = Error(getStringFromWasm0(arg0, arg1));
-        return ret;
-    };
-    imports.wbg.__wbg___wbindgen_is_string_704ef9c8fc131030 = function(arg0) {
-        const ret = typeof(arg0) === 'string';
-        return ret;
-    };
-    imports.wbg.__wbg___wbindgen_throw_dd24417ed36fc46e = function(arg0, arg1) {
-        throw new Error(getStringFromWasm0(arg0, arg1));
-    };
-    imports.wbg.__wbg_fromCodePoint_50facac709b76f67 = function() { return handleError(function (arg0) {
-        const ret = String.fromCodePoint(arg0 >>> 0);
-        return ret;
-    }, arguments) };
-    imports.wbg.__wbg_new_1ba21ce319a06297 = function() {
-        const ret = new Object();
-        return ret;
-    };
-    imports.wbg.__wbg_new_25f239778d6112b9 = function() {
-        const ret = new Array();
-        return ret;
-    };
-    imports.wbg.__wbg_new_b546ae120718850e = function() {
-        const ret = new Map();
-        return ret;
-    };
-    imports.wbg.__wbg_set_3f1d0b984ed272ed = function(arg0, arg1, arg2) {
-        arg0[arg1] = arg2;
-    };
-    imports.wbg.__wbg_set_7df433eea03a5c14 = function(arg0, arg1, arg2) {
-        arg0[arg1 >>> 0] = arg2;
-    };
-    imports.wbg.__wbg_set_efaaf145b9377369 = function(arg0, arg1, arg2) {
-        const ret = arg0.set(arg1, arg2);
-        return ret;
-    };
-    imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function(arg0, arg1) {
-        // Cast intrinsic for `Ref(String) -> Externref`.
-        const ret = getStringFromWasm0(arg0, arg1);
-        return ret;
-    };
-    imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function(arg0) {
-        // Cast intrinsic for `U64 -> Externref`.
-        const ret = BigInt.asUintN(64, arg0);
-        return ret;
-    };
-    imports.wbg.__wbindgen_cast_9ae0607507abb057 = function(arg0) {
-        // Cast intrinsic for `I64 -> Externref`.
-        const ret = arg0;
-        return ret;
-    };
-    imports.wbg.__wbindgen_cast_d6cd19b81560fd6e = function(arg0) {
-        // Cast intrinsic for `F64 -> Externref`.
-        const ret = arg0;
-        return ret;
-    };
-    imports.wbg.__wbindgen_init_externref_table = function() {
-        const table = wasm.__wbindgen_externrefs;
-        const offset = table.grow(4);
-        table.set(0, undefined);
-        table.set(offset + 0, undefined);
-        table.set(offset + 1, null);
-        table.set(offset + 2, true);
-        table.set(offset + 3, false);
-    };
-
-    return imports;
-}
-
-function __wbg_finalize_init(instance, module) {
-    wasm = instance.exports;
-    __wbg_init.__wbindgen_wasm_module = module;
-    cachedUint8ArrayMemory0 = null;
-
+exports.__wbg_Error_52673b7de5a0ca89 = function(arg0, arg1) {
+    const ret = Error(getStringFromWasm0(arg0, arg1));
+    return ret;
+};
 
-    wasm.__wbindgen_start();
-    return wasm;
-}
+exports.__wbg___wbindgen_is_string_704ef9c8fc131030 = function(arg0) {
+    const ret = typeof(arg0) === 'string';
+    return ret;
+};
 
-function initSync(module) {
-    if (wasm !== undefined) return wasm;
+exports.__wbg___wbindgen_throw_dd24417ed36fc46e = function(arg0, arg1) {
+    throw new Error(getStringFromWasm0(arg0, arg1));
+};
 
+exports.__wbg_fromCodePoint_50facac709b76f67 = function() { return handleError(function (arg0) {
+    const ret = String.fromCodePoint(arg0 >>> 0);
+    return ret;
+}, arguments) };
 
-    if (typeof module !== 'undefined') {
-        if (Object.getPrototypeOf(module) === Object.prototype) {
-            ({module} = module)
-        } else {
-            console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
-        }
-    }
+exports.__wbg_new_1ba21ce319a06297 = function() {
+    const ret = new Object();
+    return ret;
+};
 
-    const imports = __wbg_get_imports();
-    if (!(module instanceof WebAssembly.Module)) {
-        module = new WebAssembly.Module(module);
-    }
-    const instance = new WebAssembly.Instance(module, imports);
-    return __wbg_finalize_init(instance, module);
-}
+exports.__wbg_new_25f239778d6112b9 = function() {
+    const ret = new Array();
+    return ret;
+};
 
-async function __wbg_init(module_or_path) {
-    if (wasm !== undefined) return wasm;
+exports.__wbg_new_b546ae120718850e = function() {
+    const ret = new Map();
+    return ret;
+};
 
+exports.__wbg_set_3f1d0b984ed272ed = function(arg0, arg1, arg2) {
+    arg0[arg1] = arg2;
+};
 
-    if (typeof module_or_path !== 'undefined') {
-        if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
-            ({module_or_path} = module_or_path)
-        } else {
-            console.warn('using deprecated parameters for the initialization function; pass a single object instead')
-        }
-    }
+exports.__wbg_set_7df433eea03a5c14 = function(arg0, arg1, arg2) {
+    arg0[arg1 >>> 0] = arg2;
+};
 
-    if (typeof module_or_path === 'undefined') {
-        module_or_path = new URL('mctext_wasm_bg.wasm', import.meta.url);
-    }
-    const imports = __wbg_get_imports();
+exports.__wbg_set_efaaf145b9377369 = function(arg0, arg1, arg2) {
+    const ret = arg0.set(arg1, arg2);
+    return ret;
+};
 
-    if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) {
-        module_or_path = fetch(module_or_path);
-    }
+exports.__wbindgen_cast_2241b6af4c4b2941 = function(arg0, arg1) {
+    // Cast intrinsic for `Ref(String) -> Externref`.
+    const ret = getStringFromWasm0(arg0, arg1);
+    return ret;
+};
 
-    const { instance, module } = await __wbg_load(await module_or_path, imports);
+exports.__wbindgen_cast_4625c577ab2ec9ee = function(arg0) {
+    // Cast intrinsic for `U64 -> Externref`.
+    const ret = BigInt.asUintN(64, arg0);
+    return ret;
+};
 
-    return __wbg_finalize_init(instance, module);
-}
+exports.__wbindgen_cast_9ae0607507abb057 = function(arg0) {
+    // Cast intrinsic for `I64 -> Externref`.
+    const ret = arg0;
+    return ret;
+};
 
-export { initSync };
-export default __wbg_init;
+exports.__wbindgen_cast_d6cd19b81560fd6e = function(arg0) {
+    // Cast intrinsic for `F64 -> Externref`.
+    const ret = arg0;
+    return ret;
+};
+
+exports.__wbindgen_init_externref_table = function() {
+    const table = wasm.__wbindgen_externrefs;
+    const offset = table.grow(4);
+    table.set(0, undefined);
+    table.set(offset + 0, undefined);
+    table.set(offset + 1, null);
+    table.set(offset + 2, true);
+    table.set(offset + 3, false);
+};
+
+const wasmPath = `${__dirname}/mctext_wasm_bg.wasm`;
+const wasmBytes = require('fs').readFileSync(wasmPath);
+const wasmModule = new WebAssembly.Module(wasmBytes);
+const wasm = exports.__wasm = new WebAssembly.Instance(wasmModule, imports).exports;
+
+wasm.__wbindgen_start();

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@hexze/mctext",
-  "type": "module",
   "description": "Minecraft text formatting for JavaScript/WASM",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -14,8 +13,5 @@
     "mctext_wasm.d.ts"
   ],
   "main": "mctext_wasm.js",
-  "types": "mctext_wasm.d.ts",
-  "sideEffects": [
-    "./snippets/*"
-  ]
+  "types": "mctext_wasm.d.ts"
 }