@thi.ng/wasm-api 0.15.0 → 0.17.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2022-10-26T12:46:53Z
+- **Last updated**: 2022-10-29T20:34:04Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,44 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+## [0.17.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/wasm-api@0.17.0) (2022-10-29)
+
+#### 🚀 Features
+
+- update default value format & handling ([c7752fb](https://github.com/thi-ng/umbrella/commit/c7752fb))
+  - update Field.default to support lang-specific alts
+  - add defaultValue() helper
+  - update zig codegen
+
+#### 🩹 Bug fixes
+
+- fix idempotence checks for self-referential types ([2c3f670](https://github.com/thi-ng/umbrella/commit/2c3f670))
+  - update prepareType()
+
+## [0.16.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/wasm-api@0.16.0) (2022-10-28)
+
+#### 🚀 Features
+
+- update TS docstring generator ([5a060b6](https://github.com/thi-ng/umbrella/commit/5a060b6))
+  - include native/WASM type in docstring (use Zig type sigs)
+  - update ensureLines() helper
+  - update test fixtures
+- update IWasmMemoryAccess & impls ([bb8a3ca](https://github.com/thi-ng/umbrella/commit/bb8a3ca))
+  - add MemorySlice tuple to describe a memory region
+  - update allocate() & free() to use MemorySlice, migrate to IWasmMemoryAccess
+  - migrate growMemory() to IWasmMemoryAccess
+  - add MemorySlice to default imports in TS codegen
+- update docstring & user code codegen config ([68694ba](https://github.com/thi-ng/umbrella/commit/68694ba))
+  - allow doc strings & user codes to be given as string array (lines)
+  - add InjectedBody type to support multiple injection sites
+    (e.g. TS interface declarations vs. wrapper impls)
+  - update TS & Zig codegens
+  - add internal ensureLines() helper
+
+#### 🩹 Bug fixes
+
+- fix ensureLines(), update tests & fixtures ([f8a4668](https://github.com/thi-ng/umbrella/commit/f8a4668))
+
 ## [0.15.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/wasm-api@0.15.0) (2022-10-26)
 
 #### 🚀 Features

package/api.d.ts

@@ -1,4 +1,4 @@
-import type { BigType, FloatType, Fn, Fn2, IDeref, ILength, IObjectOf } from "@thi.ng/api";
+import type { BigType, FloatType, Fn, Fn2, IDeref, ILength, IObjectOf, NumOrString } from "@thi.ng/api";
 import type { Pow2 } from "@thi.ng/binary";
 import type { WasmBridge } from "./bridge.js";
 export declare const PKG_NAME = "@thi.ng/wasm-api";
@@ -53,7 +53,7 @@ export interface WasmExports {
      * @remarks
      * #### Zig
      *
-     * Using the supplied Zig bindings (see `/include/wasmapi.zig`), it's the
+     * Using the supplied Zig bindings (see `/zig/wasmapi.zig`), it's the
      * user's responsibility to define a public `WASM_ALLOCATOR` in the root
      * source file to enable allocations, e.g. using the
      * [`std.heap.GeneralPurposeAllocator`](https://ziglang.org/documentation/master/#Choosing-an-Allocator)
@@ -81,6 +81,7 @@ export interface WasmExports {
      */
     _wasm_free(addr: number, numBytes: number): void;
 }
+export declare type MemorySlice = [addr: number, len: number];
 export interface IWasmMemoryAccess {
     i8: Int8Array;
     u8: Uint8Array;
@@ -97,6 +98,41 @@ export interface IWasmMemoryAccess {
      * after growing the WASM memory and the previous buffer becoming detached).
      */
     ensureMemory(): void;
+    /**
+     * Attempts to grow the WASM memory by an additional `numPages` (64KB/page)
+     * and if successful updates all typed memory views to use the new
+     * underlying buffer.
+     *
+     * @param numPages
+     */
+    growMemory(numPages: number): void;
+    /**
+     * Attempts to allocate `numBytes` using the exported WASM core API function
+     * {@link WasmExports._wasm_allocate} (implementation specific) and returns
+     * start address of the new memory block. If unsuccessful, throws an
+     * {@link OutOfMemoryError}. If `clear` is true, the allocated region will
+     * be zero-filled.
+     *
+     * @remarks
+     * See {@link WasmExports._wasm_allocate} docs for further details.
+     *
+     * @param numBytes
+     * @param clear
+     */
+    allocate(numBytes: number, clear?: boolean): MemorySlice;
+    /**
+     * Frees a previous allocated memory region using the exported WASM core API
+     * function {@link WasmExports._wasm_free} (implementation specific). The
+     * `numBytes` value must be the same as previously given to
+     * {@link IWasmMemoryAccess.allocate}.
+     *
+     * @remarks
+     * This function always succeeds, regardless of presence of an active
+     * allocator on the WASM side or validity of given arguments.
+     *
+     * @param slice
+     */
+    free(slice: MemorySlice): void;
     /**
      * Reads UTF-8 encoded string from given address and optional byte length.
      * The default length is 0, which will be interpreted as a zero-terminated
@@ -188,7 +224,7 @@ export declare type WasmPrim32 = Exclude<WasmPrim, BigType>;
 export declare type ReadonlyWasmString = IDeref<string> & ILength & {
     readonly addr: number;
 };
-export declare type TypeColl = Record<string, TopLevelType>;
+export declare type TypeColl = IObjectOf<TopLevelType>;
 export interface TypeInfo {
     /**
      * Auto-computed size (in bytes)
@@ -217,19 +253,24 @@ export interface TopLevelType extends TypeInfo {
     /**
      * Optional (multi-line) docstring for this type
      */
-    doc?: string;
+    doc?: string | string[];
     /**
      * Type / kind
      */
     type: "enum" | "struct" | "union";
     /**
      * Optional object of user provided source codes to be injected into the
-     * generated type. Keys are language IDs (same name as respective codegen).
+     * generated type (after generated fields). Keys of this object are language
+     * IDs (`ts` for {@link TYPESCRIPT}, `zig` for {@link ZIG}).
      *
      * @remarks
-     * Currently only supported by the {@link ZIG} codegen, ignored otherwise.
+     * Currently only supported by the code gens mentioned, ignored otherwise.
      */
-    body?: IObjectOf<string>;
+    body?: IObjectOf<string | string[] | InjectedBody>;
+}
+export interface InjectedBody {
+    decl?: string | string[];
+    impl?: string | string[];
 }
 export interface Struct extends TopLevelType {
     type: "struct";
@@ -259,6 +300,23 @@ export interface Struct extends TopLevelType {
      */
     align?: AlignStrategy;
 }
+export interface Union extends TopLevelType {
+    type: "union";
+    /**
+     * Array of union fields.
+     */
+    fields: Field[];
+    /**
+     * Optional qualifier for the kind of struct to be emitted (codegen specific
+     * interpretation, currently only used by {@link ZIG}).
+     */
+    tag?: "extern" | "packed";
+    /**
+     * Optional user supplied {@link AlignStrategy}. By default uses
+     * {@link ALIGN_C} or {@link ALIGN_PACKED} (if using "packed" union).
+     */
+    align?: AlignStrategy;
+}
 export declare type FieldTag = "scalar" | "array" | "ptr" | "slice" | "vec";
 export interface Field extends TypeInfo {
     /**
@@ -268,7 +326,7 @@ export interface Field extends TypeInfo {
     /**
      * Field docstring (can be multiline, will be formatted)
      */
-    doc?: string;
+    doc?: string | string[];
     /**
      * Field type tag/qualifier (note: `slice` & `vec` are only supported by Zig
      * & TS).
@@ -312,10 +370,14 @@ export interface Field extends TypeInfo {
      */
     len?: number;
     /**
-     * Currently only supported for {@link ZIG} scalar & string values,
-     * otherwise ignored!
+     * Currently only supported for {@link ZIG}, otherwise ignored!
+     *
+     * @remarks
+     * The object form allows for different default values per language (in
+     * theory). So if given as object, the keys refer to the lang ID and the
+     * values as the defaults for those languages.
      */
-    default?: number;
+    default?: NumOrString | IObjectOf<NumOrString>;
     /**
      * If defined and > 0, the field will be considered for padding purposes
      * only and the value provided is the number of bytes used. All other config
@@ -323,23 +385,6 @@ export interface Field extends TypeInfo {
      */
     pad?: number;
 }
-export interface Union extends TopLevelType {
-    type: "union";
-    /**
-     * Array of union fields.
-     */
-    fields: Field[];
-    /**
-     * Optional qualifier for the kind of struct to be emitted (codegen specific
-     * interpretation, currently only used by {@link ZIG}).
-     */
-    tag?: "extern" | "packed";
-    /**
-     * Optional user supplied {@link AlignStrategy}. By default uses
-     * {@link ALIGN_C} or {@link ALIGN_PACKED} (if using "packed" union).
-     */
-    align?: AlignStrategy;
-}
 export interface Enum extends TopLevelType {
     type: "enum";
     /**
@@ -449,7 +494,7 @@ export interface ICodeGen {
     /**
      * Docstring codegen
      */
-    doc: (doc: string, acc: string[], opts: CodeGenOpts, topLevel?: boolean) => void;
+    doc: (doc: string | string[], acc: string[], opts: CodeGenOpts, topLevel?: boolean) => void;
     /**
      * Codegen for enum types.
      */

package/bridge.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { Event, INotify, Listener, NumericArray } from "@thi.ng/api";
 import type { ILogger } from "@thi.ng/logger";
-import { BigIntArray, CoreAPI, IWasmAPI, IWasmMemoryAccess, WasmExports } from "./api.js";
+import { BigIntArray, CoreAPI, IWasmAPI, IWasmMemoryAccess, MemorySlice, WasmExports } from "./api.js";
 export declare const Panic: {
     new (msg?: string | undefined): {
         name: string;
@@ -136,34 +136,8 @@ export declare class WasmBridge<T extends WasmExports = WasmExports> implements
      * @param numPages
      */
     growMemory(numPages: number): void;
-    /**
-     * Attempts to allocate `numBytes` using the exported WASM core API function
-     * {@link WasmExports._wasm_allocate} (implementation specific) and returns
-     * start address of the new memory block. If unsuccessful, throws an
-     * {@link OutOfMemoryError}. If `clear` is true, the allocated region will
-     * be zero-filled.
-     *
-     * @remarks
-     * See {@link WasmExports._wasm_allocate} docs for further details.
-     *
-     * @param numBytes
-     * @param clear
-     */
-    allocate(numBytes: number, clear?: boolean): number;
-    /**
-     * Frees a previous allocated memory region using the exported WASM core API
-     * function {@link WasmExports._wasm_free} (implementation specific). The
-     * `numBytes` value must be the same as previously given to
-     * {@link WasmBridge.allocate}.
-     *
-     * @remarks
-     * This function always succeeds, regardless of presence of an active
-     * allocator on the WASM side or validity of given arguments.
-     *
-     * @param addr
-     * @param numBytes
-     */
-    free(addr: number, numBytes: number): void;
+    allocate(numBytes: number, clear?: boolean): MemorySlice;
+    free([addr, numBytes]: MemorySlice): void;
     getI8(addr: number): number;
     getU8(addr: number): number;
     getI16(addr: number): number;

package/bridge.js

@@ -198,19 +198,6 @@ let WasmBridge = class WasmBridge {
         this.exports.memory.grow(numPages);
         this.ensureMemory();
     }
-    /**
-     * Attempts to allocate `numBytes` using the exported WASM core API function
-     * {@link WasmExports._wasm_allocate} (implementation specific) and returns
-     * start address of the new memory block. If unsuccessful, throws an
-     * {@link OutOfMemoryError}. If `clear` is true, the allocated region will
-     * be zero-filled.
-     *
-     * @remarks
-     * See {@link WasmExports._wasm_allocate} docs for further details.
-     *
-     * @param numBytes
-     * @param clear
-     */
     allocate(numBytes, clear = false) {
         const addr = this.exports._wasm_allocate(numBytes);
         if (!addr)
@@ -218,22 +205,9 @@ let WasmBridge = class WasmBridge {
         this.logger.fine(() => `allocated ${numBytes} bytes @ 0x${U32(addr)} .. 0x${U32(addr + numBytes - 1)}`);
         this.ensureMemory();
         clear && this.u8.fill(0, addr, addr + numBytes);
-        return addr;
+        return [addr, numBytes];
     }
-    /**
-     * Frees a previous allocated memory region using the exported WASM core API
-     * function {@link WasmExports._wasm_free} (implementation specific). The
-     * `numBytes` value must be the same as previously given to
-     * {@link WasmBridge.allocate}.
-     *
-     * @remarks
-     * This function always succeeds, regardless of presence of an active
-     * allocator on the WASM side or validity of given arguments.
-     *
-     * @param addr
-     * @param numBytes
-     */
-    free(addr, numBytes) {
+    free([addr, numBytes]) {
         this.logger.fine(() => `freeing memory @ 0x${U32(addr)} .. 0x${U32(addr + numBytes - 1)}`);
         this.exports._wasm_free(addr, numBytes);
     }

package/cli.js

@@ -1,5 +1,5 @@
 import { flag, oneOf, oneOfMulti, parse, ParseError, string, strings, usage, } from "@thi.ng/args";
-import { isArray, isPlainObject } from "@thi.ng/checks";
+import { isArray, isPlainObject, isString } from "@thi.ng/checks";
 import { illegalArgs } from "@thi.ng/errors";
 import { readJSON, readText, writeJSON, writeText } from "@thi.ng/file-io";
 import { ConsoleLogger } from "@thi.ng/logger";
@@ -84,7 +84,7 @@ const addTypeSpec = (ctx, path, coll, spec) => {
             invalidSpec(path, `${spec.name}.body must be an object`);
         for (let lang in spec.body) {
             const src = spec.body[lang];
-            if (src[0] === "@") {
+            if (isString(src) && src[0] === "@") {
                 spec.body[lang] = readText(src.substring(1), ctx.logger);
             }
         }

package/codegen/typescript.js

@@ -1,7 +1,8 @@
 import { BIGINT_ARRAY_CTORS, BIT_SHIFTS, TYPEDARRAY_CTORS, } from "@thi.ng/api/typedarray";
 import { isString } from "@thi.ng/checks/is-string";
 import { PKG_NAME, } from "../api.js";
-import { enumName, isBigNumeric, isNumeric, isPadding, isStringSlice, isWasmPrim, isWasmString, pointerFields, prefixLines, stringFields, withIndentation, } from "./utils.js";
+import { ensureLines, enumName, isBigNumeric, isNumeric, isPadding, isStringSlice, isWasmPrim, isWasmString, pointerFields, prefixLines, stringFields, withIndentation, } from "./utils.js";
+import { fieldType as zigFieldType } from "./zig.js";
 /**
  * TypeScript code generator. Call with options and then pass to
  * {@link generateTypes} (see its docs for further usage).
@@ -22,7 +23,7 @@ export const TYPESCRIPT = (opts = {}) => {
     const SCOPES = [/\{$/, /\}\)?[;,]?$/];
     const gen = {
         pre: (opts) => `// @ts-ignore possibly includes unused imports
-import { Pointer, ${__stringImpl(opts)}, WasmTypeBase, WasmTypeConstructor } from "${PKG_NAME}";${opts.pre ? `\n${opts.pre}` : ""}`,
+import { MemorySlice, Pointer, ${__stringImpl(opts)}, WasmTypeBase, WasmTypeConstructor } from "${PKG_NAME}";${opts.pre ? `\n${opts.pre}` : ""}`,
         post: () => opts.post || "",
         doc: (doc, acc, opts) => {
             acc.push("/**", ...prefixLines(" * ", doc, opts.lineWidth), " */");
@@ -55,11 +56,15 @@ import { Pointer, ${__stringImpl(opts)}, WasmTypeBase, WasmTypeConstructor } fro
             for (let f of struct.fields) {
                 if (isPadding(f))
                     continue;
-                f.doc && gen.doc(f.doc, lines, opts);
+                const doc = __docType(struct, f, opts);
+                doc && gen.doc(doc, lines, opts);
                 const ftype = __fieldType(f, opts);
                 fieldTypes[f.name] = ftype;
                 lines.push(`${f.name}: ${ftype};`);
             }
+            if (struct.body?.ts) {
+                lines.push("", ...ensureLines(struct.body.ts, "decl"));
+            }
             lines.push("}", "");
             const pointerDecls = pointerFields(struct.fields).map((x) => {
                 return `let $${x.name}: ${fieldTypes[x.name]} | null = null;`;
@@ -159,6 +164,9 @@ import { Pointer, ${__stringImpl(opts)}, WasmTypeBase, WasmTypeConstructor } fro
                 // close field accessor
                 lines.push(`},`);
             }
+            if (struct.body?.ts) {
+                lines.push("", ...ensureLines(struct.body.ts, "impl"), "");
+            }
             lines.push("};", "}", "});", "");
             acc.push(...withIndentation(lines, indent, ...SCOPES));
         },
@@ -221,3 +229,12 @@ const __mapStringArray = (target, name, type, len, isConst, isLocal = false) =>
     `for(let i = 0; i < ${len}; i++) $${name}.push(new ${type}(mem, addr + i * ${target.usizeBytes * (type === "WasmStringSlice" ? 2 : 1)}, ${isConst}));`,
     `return $${name};`,
 ];
+const __docType = (parent, f, opts) => {
+    const doc = [...ensureLines(f.doc || [])];
+    if (isWasmPrim(f.type)) {
+        if (doc.length)
+            doc.push("");
+        doc.push(`WASM type: ${zigFieldType(parent, f, opts).type}`);
+    }
+    return doc.length ? doc : undefined;
+};

package/codegen/utils.d.ts

@@ -1,5 +1,5 @@
 import type { BigType } from "@thi.ng/api";
-import type { CodeGenOpts, Field, WasmPrim, WasmPrim32 } from "../api.js";
+import type { CodeGenOpts, Field, InjectedBody, WasmPrim, WasmPrim32 } from "../api.js";
 /**
  * Returns true iff `x` is a {@link WasmPrim32}.
  *
@@ -28,16 +28,6 @@ export declare const isSlice: (f: Field) => boolean;
  * @param f
  */
 export declare const isPointerLike: (f: Field) => boolean;
-/**
- * Takes an array of strings or splits given string into lines, word wraps and
- * then prefixes each line with given `width` and `prefix`. Returns array of new
- * lines.
- *
- * @param prefix
- * @param str
- * @param width
- */
-export declare const prefixLines: (prefix: string, str: string | string[], width: number) => string[];
 /**
  * Returns true if `type` is "slice".
  *
@@ -69,6 +59,25 @@ export declare const stringFields: (fields: Field[]) => Field[];
  * @internal
  */
 export declare const enumName: (opts: CodeGenOpts, name: string) => string;
+/**
+ * Returns given field's default value (or undefined). The `lang` ID is required
+ * to obtain the language specific value if the default is given as object.
+ *
+ * @param f
+ * @param lang
+ */
+export declare const defaultValue: (f: Field, lang: string) => import("@thi.ng/api").NumOrString | undefined;
+/**
+ * Takes an array of strings or splits given string into lines, word wraps and
+ * then prefixes each line with given `width` and `prefix`. Returns array of new
+ * lines.
+ *
+ * @param prefix
+ * @param str
+ * @param width
+ */
+export declare const prefixLines: (prefix: string, str: string | string[], width: number) => string[];
+export declare const ensureLines: (src: string | string[] | InjectedBody, key?: keyof InjectedBody) => Iterable<string>;
 /**
  * Yields iterator of given lines, each with applied indentation based on given
  * scope regexp's which are applied to each line to increase or decrease

package/codegen/utils.js

@@ -1,4 +1,7 @@
+import { isArray } from "@thi.ng/checks/is-array";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
 import { isString } from "@thi.ng/checks/is-string";
+import { split } from "@thi.ng/strings/split";
 import { wordWrapLine, wordWrapLines } from "@thi.ng/strings/word-wrap";
 /**
  * Returns true iff `x` is a {@link WasmPrim32}.
@@ -28,18 +31,6 @@ export const isSlice = (f) => f.tag === "slice";
  * @param f
  */
 export const isPointerLike = (f) => isPointer(f) || isSlice(f) || isWasmString(f.type);
-/**
- * Takes an array of strings or splits given string into lines, word wraps and
- * then prefixes each line with given `width` and `prefix`. Returns array of new
- * lines.
- *
- * @param prefix
- * @param str
- * @param width
- */
-export const prefixLines = (prefix, str, width) => (isString(str)
-    ? wordWrapLines(str, { width: width - prefix.length })
-    : str.flatMap((x) => wordWrapLine(x, { width: width - prefix.length }))).map((line) => prefix + line);
 /**
  * Returns true if `type` is "slice".
  *
@@ -71,6 +62,39 @@ export const stringFields = (fields) => fields.filter((f) => isWasmString(f.type
  * @internal
  */
 export const enumName = (opts, name) => opts.uppercaseEnums ? name.toUpperCase() : name;
+/**
+ * Returns given field's default value (or undefined). The `lang` ID is required
+ * to obtain the language specific value if the default is given as object.
+ *
+ * @param f
+ * @param lang
+ */
+export const defaultValue = (f, lang) => f.default !== undefined
+    ? isPlainObject(f.default)
+        ? f.default[lang]
+        : f.default
+    : undefined;
+/**
+ * Takes an array of strings or splits given string into lines, word wraps and
+ * then prefixes each line with given `width` and `prefix`. Returns array of new
+ * lines.
+ *
+ * @param prefix
+ * @param str
+ * @param width
+ */
+export const prefixLines = (prefix, str, width) => (isString(str)
+    ? wordWrapLines(str, { width: width - prefix.length })
+    : str.flatMap((x) => wordWrapLine(x, { width: width - prefix.length }))).map((line) => prefix + line);
+export const ensureLines = (src, key) => isString(src)
+    ? split(src)
+    : isArray(src)
+        ? src
+        : key
+            ? src[key]
+                ? ensureLines(src[key], key)
+                : []
+            : [];
 /**
  * Yields iterator of given lines, each with applied indentation based on given
  * scope regexp's which are applied to each line to increase or decrease

package/codegen/zig.d.ts

@@ -1,4 +1,4 @@
-import type { CodeGenOptsBase, ICodeGen } from "../api.js";
+import type { CodeGenOpts, CodeGenOptsBase, Field, ICodeGen, Struct, Union } from "../api.js";
 /**
  * Zig code generator options.
  */
@@ -15,4 +15,9 @@ export interface ZigOpts extends CodeGenOptsBase {
  * @param opts
  */
 export declare const ZIG: (opts?: Partial<ZigOpts>) => ICodeGen;
+/** @internal */
+export declare const fieldType: (parent: Struct | Union, f: Field, opts: CodeGenOpts) => {
+    type: string;
+    defaultVal: string;
+};
 //# sourceMappingURL=zig.d.ts.map

package/codegen/zig.js

@@ -1,8 +1,7 @@
-import { isNumber } from "@thi.ng/checks/is-number";
+import { isNumber } from "@thi.ng/checks";
 import { isString } from "@thi.ng/checks/is-string";
 import { unsupported } from "@thi.ng/errors/unsupported";
-import { split } from "@thi.ng/strings/split";
-import { enumName, isPadding, isStringSlice, isWasmString, prefixLines, withIndentation, } from "./utils.js";
+import { defaultValue, ensureLines, enumName, isPadding, isStringSlice, isWasmString, prefixLines, withIndentation, } from "./utils.js";
 /**
  * Zig code generator. Call with options and then pass to {@link generateTypes}
  * (see its docs for further usage).
@@ -39,7 +38,7 @@ export const ZIG = (opts = {}) => {
                 lines.push(line + ",");
             }
             if (e.body?.zig) {
-                lines.push("", ...split(e.body.zig), "");
+                lines.push("", ...ensureLines(e.body.zig, "impl"), "");
             }
             lines.push("};", "");
             acc.push(...withIndentation(lines, INDENT, ...SCOPES));
@@ -75,46 +74,12 @@ const __generateFields = (gen, parent, opts) => {
             continue;
         }
         f.doc && gen.doc(f.doc, res, opts);
-        let ftype = isWasmString(f.type)
-            ? isStringSlice(opts.stringType)
-                ? f.const !== false
-                    ? "[]const u8"
-                    : "[]u8"
-                : f.const !== false
-                    ? "[*:0]const u8"
-                    : "[*:0]u8"
-            : f.type;
-        let defaultVal = "";
-        switch (f.tag) {
-            case "array":
-                ftype =
-                    f.sentinel !== undefined
-                        ? `[${f.len}:${f.sentinel}]${ftype}`
-                        : `[${f.len}]${ftype}`;
-                break;
-            case "slice":
-                ftype = `[${f.sentinel !== undefined ? ":" + f.sentinel : ""}]${f.const ? "const " : ""}${ftype}`;
-                break;
-            case "vec":
-                ftype = `@Vector(${f.len}, ${ftype})`;
-                break;
-            case "ptr":
-                ftype = `*${f.const ? "const " : ""}${f.len ? `[${f.len}]` : ""}${ftype}`;
-                break;
-            case "scalar":
-            default:
-                if (f.default != undefined) {
-                    if (!(isString(f.default) || isNumber(f.default))) {
-                        unsupported(`wrong default value for ${name}.${f.name} (${f.default})`);
-                    }
-                    defaultVal = ` = ${JSON.stringify(f.default)}`;
-                }
-        }
-        ftypes[f.name] = ftype;
-        res.push(`${f.name}: ${ftype}${defaultVal},`);
+        const { type, defaultVal } = fieldType(parent, f, opts);
+        ftypes[f.name] = type;
+        res.push(`${f.name}: ${type}${defaultVal},`);
     }
     if (parent.body?.zig) {
-        res.push("", ...split(parent.body.zig), "");
+        res.push("", ...ensureLines(parent.body.zig, "impl"), "");
     }
     res.push("};");
     if (opts.debug) {
@@ -133,6 +98,47 @@ const __generateFields = (gen, parent, opts) => {
     res.push("");
     return res;
 };
+/** @internal */
+export const fieldType = (parent, f, opts) => {
+    let type = isWasmString(f.type)
+        ? isStringSlice(opts.stringType)
+            ? f.const !== false
+                ? "[]const u8"
+                : "[]u8"
+            : f.const !== false
+                ? "[*:0]const u8"
+                : "[*:0]u8"
+        : f.type;
+    let defaultVal = defaultValue(f, "zig");
+    switch (f.tag) {
+        case "array":
+            type =
+                f.sentinel !== undefined
+                    ? `[${f.len}:${f.sentinel}]${type}`
+                    : `[${f.len}]${type}`;
+            break;
+        case "slice":
+            type = `[${f.sentinel !== undefined ? ":" + f.sentinel : ""}]${f.const ? "const " : ""}${type}`;
+            break;
+        case "vec":
+            type = `@Vector(${f.len}, ${type})`;
+            break;
+        case "ptr":
+            type = `*${f.const ? "const " : ""}${f.len ? `[${f.len}]` : ""}${type}`;
+            break;
+        case "scalar":
+        default:
+            if (defaultVal != undefined) {
+                if (!(isString(defaultVal) || isNumber(defaultVal))) {
+                    unsupported(`wrong default value for ${parent.name}.${f.name} (${defaultVal})`);
+                }
+            }
+    }
+    return {
+        type,
+        defaultVal: defaultVal != undefined ? ` = ${defaultVal}` : "",
+    };
+};
 const __packedPadding = (id, n, res) => {
     let i = 0;
     n <<= 3;

package/codegen.js

@@ -113,13 +113,13 @@ const alignOf = defmulti((x) => x.type, {}, {
 });
 const prepareType = defmulti((x) => x.type, {}, {
     [DEFAULT]: (x, types, alignImpl, opts) => {
-        if (x.__align && x.__size)
+        if (x.__align)
             return;
         alignOf(x, types, alignImpl, opts);
         sizeOf(x, types, alignImpl, opts);
     },
     struct: (x, types, align, opts) => {
-        if (x.__align && x.__size)
+        if (x.__align)
             return;
         const struct = x;
         alignOf(struct, types, align, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/wasm-api",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Generic, modular, extensible API bridge, polyglot glue code and bindings code generators for hybrid JS & WebAssembly projects",
   "type": "module",
   "module": "./index.js",
@@ -36,27 +36,27 @@
     "test:build-zig": "zig build-lib -O ReleaseSmall -target wasm32-freestanding -dynamic --strip --pkg-begin wasmapi zig/wasmapi.zig --pkg-end test/custom.zig && wasm-dis -o custom.wast custom.wasm && cp custom.wasm test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.4.3",
-    "@thi.ng/args": "^2.2.6",
-    "@thi.ng/binary": "^3.3.7",
-    "@thi.ng/checks": "^3.3.1",
-    "@thi.ng/compare": "^2.1.13",
-    "@thi.ng/defmulti": "^2.1.18",
-    "@thi.ng/errors": "^2.2.2",
-    "@thi.ng/file-io": "^0.3.16",
-    "@thi.ng/hex": "^2.2.1",
-    "@thi.ng/idgen": "^2.1.15",
-    "@thi.ng/logger": "^1.4.1",
-    "@thi.ng/paths": "^5.1.19",
-    "@thi.ng/strings": "^3.3.14"
+    "@thi.ng/api": "^8.4.4",
+    "@thi.ng/args": "^2.2.7",
+    "@thi.ng/binary": "^3.3.8",
+    "@thi.ng/checks": "^3.3.2",
+    "@thi.ng/compare": "^2.1.14",
+    "@thi.ng/defmulti": "^2.1.19",
+    "@thi.ng/errors": "^2.2.3",
+    "@thi.ng/file-io": "^0.3.17",
+    "@thi.ng/hex": "^2.2.2",
+    "@thi.ng/idgen": "^2.1.16",
+    "@thi.ng/logger": "^1.4.2",
+    "@thi.ng/paths": "^5.1.20",
+    "@thi.ng/strings": "^3.3.15"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.31.1",
-    "@thi.ng/testament": "^0.3.3",
+    "@microsoft/api-extractor": "^7.33.5",
+    "@thi.ng/testament": "^0.3.4",
     "rimraf": "^3.0.2",
     "tools": "^0.0.1",
-    "typedoc": "^0.22.17",
-    "typescript": "^4.8.3"
+    "typedoc": "^0.23.18",
+    "typescript": "^4.8.4"
   },
   "keywords": [
     "allocator",
@@ -141,5 +141,5 @@
     "status": "alpha",
     "year": 2022
   },
-  "gitHead": "cc61bc0a890288bea00b8df81ffd73bc4851ffd3\n"
+  "gitHead": "0402675247b1c312e4dd3d9bc6c01af5cc837c5d\n"
 }