@jackens/nnn 2023.8.19 → 2023.8.25

package/nnn.d.ts

@@ -1,26 +1,26 @@
 /**
- * The type of arguments of the `$c` helper.
+ * The type of arguments of the `css` helper.
  */
-export type $CNode = {
-  [attributeOrSelector: string]: string | number | $CNode;
+export type CNode = {
+  [attributeOrSelector: string]: string | number | CNode;
 };
 
 /**
- * The type of arguments of the `$c` helper.
+ * The type of arguments of the `css` helper.
  */
-export type $CRoot = Record<string, $CNode>;
+export type CRoot = Record<string, CNode>;
 
 /**
- * The type of arguments of the `$escapeValues` and `$escape` helpers.
+ * The type of arguments of the `escapeValues` and `escape` helpers.
  */
-export type $EscapeMap = Map<any, (value?: any) => string>;
+export type EscapeMap = Map<any, (value?: any) => string>;
 
 /**
- * The type of arguments of the `$h` and `$s` helpers.
+ * The type of arguments of the `h` and `s` helpers.
  */
-export type $HArgs = [
+export type HArgs = [
   string | Node,
-  ...(Record<string, any> | null | undefined | Node | string | number | $HArgs)[]
+  ...(Record<string, any> | null | undefined | Node | string | number | HArgs)[]
 ];
 
 /**
@@ -34,42 +34,44 @@ export type $HArgs = [
  * - Commas in keys that makes a CSS rule cause it to “split” and create separate rules for each part (e.g. `{div:{margin:1,'.a,.b,.c':{margin:2}}}` → `div{margin:1}div.a,div.b,div.c{margin:2}`).
  * - Top-level keys that begin with `@` are not concatenated with sub-object keys.
  */
-export function $c(root: $CRoot, splitter?: string): string;
+export function css(root: CRoot, splitter?: string): string;
 
 /**
  * A helper for creating a chart based on a table (conf. <https://jackens.github.io/nnn/chartable/>).
  *
  * Options:
  * - `bottom`: bottom padding (for X axis labels)
+ * - `gapX`: X axis spacing
+ * - `gapY`: Y axis spacing
  * - `headerColumn`: flag indicating that `table` has a header column (with X axis labels)
  * - `headerRow`: flag indicating that `table` has a header row (with data series labels)
+ * - `id`: chart id
  * - `left`: left padding (for data series labels)
+ * - `maxY`: number of Y axis lines
  * - `right`: right padding (for data series labels)
  * - `singleScale`: flag to force single scale
  * - `table`: `HTMLTableElement` to extract data, data series labels and X axis labels
  * - `title`: chart title
  * - `top`: top padding (for the title)
- * - `xGap`: X axis spacing
  * - `xLabels`: X axis labels
- * - `yGap`: Y axis spacing
- * - `yMax`: number of Y axis lines
  * - `zLabels`: data series labels
  * - `zxY`: chart data
  */
-export function $chartable(options?: {
+export function chartable(options?: {
   bottom?: number;
+  gapX?: number;
+  gapY?: number;
   headerColumn?: boolean;
   headerRow?: boolean;
+  id?: string;
   left?: number;
+  maxY?: number;
   right?: number;
   singleScale?: boolean;
   table?: HTMLTableElement;
   title?: string;
   top?: number;
-  xGap?: number;
   xLabels?: string[];
-  yGap?: number;
-  yMax?: number;
   zLabels?: string[];
   zxY?: number[][];
 }): SVGSVGElement;
@@ -77,30 +79,30 @@ export function $chartable(options?: {
 /**
  * A helper that checks equality of the given arguments.
  */
-export function $eq(x: any, y: any): boolean;
+export function eq(x: any, y: any): boolean;
 
 /**
  * A generic helper for escaping `values` by given `escapeMap` (in *TemplateStrings* flavor).
  */
-export function $escape(escapeMap: $EscapeMap, template: TemplateStringsArray, ...values: any[]): string;
+export function escape(escapeMap: EscapeMap, template: TemplateStringsArray, ...values: any[]): string;
 
 /**
  * A generic helper for escaping `values` by given `escapeMap`.
  */
-export function $escapeValues(escapeMap: $EscapeMap, values: any[]): string[];
+export function escapeValues(escapeMap: EscapeMap, values: any[]): string[];
 
 /**
  * A helper that implements typographic corrections specific to Polish typography.
  */
-export function $fixTypography(node: Node): void;
+export function fixTypography(node: Node): void;
 
 /**
  * A convenient helper for getting values of nested objects.
  */
-export function $get(defaultValue: any, ref: any, ...keys: (string | number | symbol)[]): any;
+export function get(defaultValue: any, ref: any, ...keys: (string | number | symbol)[]): any;
 
 /**
- * A lightweight [HyperScript](https://github.com/hyperhype/hyperscript)-style helper for creating and modifying `HTMLElement`s (see also `$s`).
+ * A lightweight [HyperScript](https://github.com/hyperhype/hyperscript)-style helper for creating and modifying `HTMLElement`s (see also `s`).
  *
  * - The first argument of type `string` specifies the tag of the element to be created.
  * - The first argument of type `Node` specifies the element to be modified.
@@ -112,58 +114,58 @@ export function $get(defaultValue: any, ref: any, ...keys: (string | number | sy
  * - All other arguments of type `null` or `undefined` are simply ignored.
  * - All other arguments of type `Node` are appended to the element being created or modified.
  * - All other arguments of type `string`/`number` are converted to `Text` nodes and appended to the element being created or modified.
- * - All other arguments of type `$HArgs` are passed to `$h` and the results are appended to the element being created or modified.
+ * - All other arguments of type `HArgs` are passed to `h` and the results are appended to the element being created or modified.
  */
-export function $h<T extends keyof HTMLElementTagNameMap>(tag: T, ...args: $HArgs[1][]): HTMLElementTagNameMap[T];
-export function $h<N extends Node>(node: N, ...args: $HArgs[1][]): N;
-export function $h(...args: $HArgs): Node;
+export function h<T extends keyof HTMLElementTagNameMap>(tag: T, ...args: HArgs[1][]): HTMLElementTagNameMap[T];
+export function h<N extends Node>(node: N, ...args: HArgs[1][]): N;
+export function h(...args: HArgs): Node;
 
 /**
  * A replacement for the `in` operator (not to be confused with the `for-in` loop) that works properly.
  */
-export function $in(key: any, ref: any): boolean;
+export function has(key: any, ref: any): boolean;
 
 /**
  * A helper that checks if the given argument is of a certain type.
  */
-export function $is(type: BigIntConstructor, arg: any): arg is bigint;
-export function $is(type: BooleanConstructor, arg: any): arg is boolean;
-export function $is(type: NumberConstructor, arg: any): arg is number;
-export function $is(type: StringConstructor, arg: any): arg is string;
-export function $is(type: SymbolConstructor, arg: any): arg is symbol;
-export function $is(type: undefined, arg: any): arg is null | undefined;
-export function $is<T extends abstract new (...args: any[]) => any>(type: T, arg: any): arg is InstanceType<T>;
+export function is(type: BigIntConstructor, arg: any): arg is bigint;
+export function is(type: BooleanConstructor, arg: any): arg is boolean;
+export function is(type: NumberConstructor, arg: any): arg is number;
+export function is(type: StringConstructor, arg: any): arg is string;
+export function is(type: SymbolConstructor, arg: any): arg is symbol;
+export function is(type: undefined, arg: any): arg is null | undefined;
+export function is<T extends abstract new (...args: any[]) => any>(type: T, arg: any): arg is InstanceType<T>;
 
 /**
  * Language translations helper.
  */
-export function $locale(
+export function locale(
   locales: Record<string, Record<string, string | Record<string, string>>>,
   defaultLanguage: string,
   languages?: readonly string[]
 ): (text?: string, version?: string) => string;
 
 /**
- * A generic helper for syntax highlighting (see also `$nanolightJs`).
+ * A generic helper for syntax highlighting (see also `nanolightJs`).
  */
-export function $nanolight(
+export function nanolight(
   pattern: RegExp,
-  highlighters: ((chunk: string, index: number) => $HArgs[1])[],
+  highlighters: ((chunk: string, index: number) => HArgs[1])[],
   code: string
-): $HArgs[1][];
+): HArgs[1][];
 
 /**
  * A helper for highlighting JavaScript.
  */
-export function $nanolightJs(codeJs: string): $HArgs[1][];
+export function nanolightJs(codeJs: string): HArgs[1][];
 
 /**
  * A helper for choosing the correct singular and plural.
  */
-export function $plUral(singular: string, plural2: string, plural5: string, value: number): string;
+export function plUral(singular: string, plural2: string, plural5: string, value: number): string;
 
 /**
- * A lightweight [HyperScript](https://github.com/hyperhype/hyperscript)-style helper for creating and modifying `SVGElement`s (see also `$h`).
+ * A lightweight [HyperScript](https://github.com/hyperhype/hyperscript)-style helper for creating and modifying `SVGElement`s (see also `h`).
  *
  * - The first argument of type `string` specifies the tag of the element to be created.
  * - The first argument of type `Node` specifies the element to be modified.
@@ -175,16 +177,16 @@ export function $plUral(singular: string, plural2: string, plural5: string, valu
  * - All other arguments of type `null` or `undefined` are simply ignored.
  * - All other arguments of type `Node` are appended to the element being created or modified.
  * - All other arguments of type `string`/`number` are converted to `Text` nodes and appended to the element being created or modified.
- * - All other arguments of type `$HArgs` are passed to `$s` and the results are appended to the element being created or modified.
+ * - All other arguments of type `HArgs` are passed to `s` and the results are appended to the element being created or modified.
  */
-export function $s<T extends keyof SVGElementTagNameMap>(tag: T, ...args: $HArgs[1][]): SVGElementTagNameMap[T];
-export function $s<N extends Node>(node: N, ...args: $HArgs[1][]): N;
-export function $s(...args: $HArgs): Node;
+export function s<T extends keyof SVGElementTagNameMap>(tag: T, ...args: HArgs[1][]): SVGElementTagNameMap[T];
+export function s<N extends Node>(node: N, ...args: HArgs[1][]): N;
+export function s(...args: HArgs): Node;
 
 /**
  * A convenient helper for setting values of nested objects.
  */
-export function $set(value: any, ref: any, ...keys: (string | number | symbol)[]): void;
+export function set(value: any, ref: any, ...keys: (string | number | symbol)[]): void;
 
 /**
  * A helper that generates a UUID v1 identifier (with a creation timestamp).
@@ -192,7 +194,7 @@ export function $set(value: any, ref: any, ...keys: (string | number | symbol)[]
  * - The optional `node` parameter should have the format `/^[0123456789abcdef]+$/`.
  *   Its value will be trimmed to last 12 characters and left padded with zeros.
  */
-export function $uuid1(options?: {
+export function uuid1(options?: {
   date?: Date;
   node?: string;
 }): string;

package/nnn.js

@@ -1,31 +1,31 @@
 /**
  * @typedef {[
  *   string | Node,
- *   ...(Record<string, any> | null | undefined | Node | string | number | $HArgs)[]
- * ]} $HArgs
+ *   ...(Record<string, any> | null | undefined | Node | string | number | HArgs)[]
+ * ]} HArgs
  */
 
 /**
  * @typedef {{
- *   [attributeOrSelector: string]: string | number | $CNode;
- * }} $CNode
+ *   [attributeOrSelector: string]: string | number | CNode;
+ * }} CNode
  */
 
 /**
- * @typedef {Record<string, $CNode>} $CRoot
+ * @typedef {Record<string, CNode>} CRoot
  */
 
 /**
- * @typedef {Map<any, (value?: any) => string>} $EscapeMap
+ * @typedef {Map<any, (value?: any) => string>} EscapeMap
  */
 
-const _c = (
-  /** @type {$CNode}   */ node,
+const _css = (
+  /** @type {CNode}    */ node,
   /** @type {string}   */ prefix,
   /** @type {string[]} */ result,
   /** @type {(text: string) => string} */ split
 ) => {
-  const /** @type {[$CNode | string[], string][]} */ queue = [[node, prefix]]
+  const /** @type {[CNode | string[], string][]} */ queue = [[node, prefix]]
 
   while (queue.length) {
     const [style2, prefix2] = queue.shift() ?? []
@@ -34,17 +34,17 @@ const _c = (
       continue
     }
 
-    if ($is(Array, style2)) {
+    if (is(Array, style2)) {
       result.push(prefix2, prefix2 !== '' ? '{' : '', style2.join(';'), prefix2 !== '' ? '}' : '')
     } else {
-      const /** @type {[$CNode | string[], string][]} */ todo = []
+      const /** @type {[CNode | string[], string][]} */ todo = []
       let /** @type {string[]} */ attributes = []
       let attributesPushed = false
 
       for (const key in style2) {
         const value = style2[key]
 
-        if ($is(String, value) || $is(Number, value)) {
+        if (is(String, value) || is(Number, value)) {
           if (!attributesPushed) {
             attributesPushed = true
             attributes = []
@@ -73,7 +73,7 @@ const _c = (
   }
 }
 
-export const $c = (/** @type {$CRoot} */ root, splitter = '$$') => {
+export const css = (/** @type {CRoot} */ root, splitter = '$$') => {
   const split = (/** @type {string} */ text) => text.split(splitter)[0]
   const /** @type {string[]} */ result = []
 
@@ -82,10 +82,10 @@ export const $c = (/** @type {$CRoot} */ root, splitter = '$$') => {
 
     if (key[0] === '@') {
       result.push(split(key) + '{')
-      _c(value, '', result, split)
+      _css(value, '', result, split)
       result.push('}')
     } else {
-      _c(value, split(key), result, split)
+      _css(value, split(key), result, split)
     }
   }
 
@@ -97,54 +97,57 @@ const _COLORS = ['#e22', '#e73', '#fc3', '#ad4', '#4d9', '#3be', '#45d', '#c3e']
 /**
  * @param {{
  *   bottom?: number;
+ *   gapX?: number;
+ *   gapY?: number;
  *   headerColumn?: boolean;
  *   headerRow?: boolean;
+ *   id?: string;
  *   left?: number;
+ *   maxY?: number;
  *   right?: number;
  *   singleScale?: boolean;
  *   table?: HTMLTableElement;
  *   title?: string;
  *   top?: number;
- *   xGap?: number;
  *   xLabels?: string[];
- *   yGap?: number;
- *   yMax?: number;
  *   zLabels?: string[];
  *   zxY?: number[][];
  * }} options
  */
-export const $chartable = ({
+export const chartable = ({
   bottom = 50,
+  gapX = 70,
+  gapY = 30,
   headerColumn = false,
   headerRow = true,
+  id,
   left = 200,
+  maxY = 10,
   right = 200,
   singleScale = false,
   table,
   title,
   top = 70,
-  xGap = 70,
   xLabels = [],
-  yGap = 30,
-  yMax = 10,
   zLabels = [],
   zxY = []
 } = {}) => {
   if (table != null) {
-    zxY = []
-    xLabels = []
-    zLabels = []
+    const zxYNotPassed = !zxY.length
+    const xLabelsNotPassed = !xLabels.length
+    const zLabelsNotPassed = !zLabels.length
+
     table.querySelectorAll('tr').forEach((row, r) => row.querySelectorAll('td,th').forEach((col, c) => {
       const x = r - +headerRow
       const z = c - +headerColumn
       // @ts-expect-error
       const value = col.innerText
 
-      if (x >= 0 && z >= 0) {
-        $set(parseFloat(value), zxY, z, x)
-      } else if (x >= 0 && z < 0) {
+      if (x >= 0 && z >= 0 && zxYNotPassed) {
+        set(parseFloat(value), zxY, z, x)
+      } else if (x >= 0 && z < 0 && xLabelsNotPassed) {
         xLabels[x] = value
-      } else if (x < 0 && z >= 0) {
+      } else if (x < 0 && z >= 0 && zLabelsNotPassed) {
         zLabels[z] = value
       }
     }))
@@ -177,8 +180,13 @@ export const $chartable = ({
           }
         })
 
-        const cost = ranges.reduce((result, [min, max]) =>
-          (result += 1 - (max - min) / (min1 <= min && max <= max1 ? max1 - min1 : max2 - min2)), 0)
+        let cost = 0
+
+        ranges.forEach(([min, max]) => {
+          if (min < max) {
+            cost += 1 - (max - min) / (min1 <= min && max <= max1 ? max1 - min1 : max2 - min2)
+          }
+        })
 
         if (bestScales[4] > cost) {
           bestScales = [min1, max1, min2, max2, cost]
@@ -188,22 +196,22 @@ export const $chartable = ({
   }
 
   const [min1, max1, min2, max2] = bestScales
-  const xMax = zxY[0].length
-  const xi = Array.from({ length: xMax }, (_, x) => x * xGap)
-  const yi = Array.from({ length: yMax }, (_, y) => y * yGap)
-  const w = xGap * (xMax - 1)
-  const h = yGap * (yMax - 1)
+  const maxX = zxY[0].length
+  const xi = Array.from({ length: maxX }, (_, x) => x * gapX)
+  const yi = Array.from({ length: maxY }, (_, y) => y * gapY)
+  const w = gapX * (maxX - 1)
+  const h = gapY * (maxY - 1)
   const svgW = left + w + right
   const svgH = top + h + bottom
-  const /** @type {$HArgs} */ graph = ['g', { transform: `translate(${left} ${top})` },
+  const /** @type {HArgs} */ graph = ['g', { transform: `translate(${left} ${top})` },
     ...yi.map(y => ['line', { x1: 0, x2: w, y1: y, y2: y, stroke: '#8888' }]),
     ...xi.map(x => ['line', { x1: x, x2: x, y1: 0, y2: h, stroke: '#8888' }])]
-  const /** @type {$HArgs} */ lColors = ['g', { class: 'chartable-z-colors', transform: 'translate(-80 0)' }]
-  const /** @type {$HArgs} */ lLabels = ['g', { class: 'chartable-z-labels', transform: 'translate(-95 0)' }]
-  const /** @type {$HArgs} */ rColors = ['g', { class: 'chartable-z-colors', transform: 'translate(80 0)' }]
-  const /** @type {$HArgs} */ rLabels = ['g', { class: 'chartable-z-labels', transform: 'translate(95 0)' }]
+  const /** @type {HArgs} */ lColors = ['g', { class: 'chartable-z-colors', transform: 'translate(-80 0)' }]
+  const /** @type {HArgs} */ lLabels = ['g', { class: 'chartable-z-labels', transform: 'translate(-95 0)' }]
+  const /** @type {HArgs} */ rColors = ['g', { class: 'chartable-z-colors', transform: 'translate(80 0)' }]
+  const /** @type {HArgs} */ rLabels = ['g', { class: 'chartable-z-labels', transform: 'translate(95 0)' }]
   const yLabel = (/** @type {number} */ min, /** @type {number} */ max, /** @type {number} */ y) =>
-    (min + (max - min) * (yMax - 1 - y) / (yMax - 1)).toFixed(2).replace(/\.?0+$/, '')
+    (min + (max - min) * (maxY - 1 - y) / (maxY - 1)).toFixed(2).replace(/\.?0+$/, '')
 
   zxY.forEach((xa, z) => {
     const cls = `chartable-z-${z + 1}`
@@ -213,16 +221,16 @@ export const $chartable = ({
     if (min1 <= min && max <= max1) {
       min = min1
       max = max1
-      lColors.push(['circle', { class: cls, cx: 0, cy: yGap * (lColors.length - 2), r: 5, fill }])
+      lColors.push(['circle', { class: cls, cx: 0, cy: gapY * (lColors.length - 2), r: 5, fill }])
       lLabels.push(['text',
-        { x: 0, y: yGap * (lLabels.length - 2), 'text-anchor': 'end', 'alignment-baseline': 'middle' },
+        { x: 0, y: gapY * (lLabels.length - 2), 'text-anchor': 'end', 'alignment-baseline': 'middle' },
         zLabels[z]])
     } else {
       min = min2
       max = max2
-      rColors.push(['circle', { class: cls, cx: 0, cy: yGap * (rColors.length - 2), r: 5, fill }])
+      rColors.push(['circle', { class: cls, cx: 0, cy: gapY * (rColors.length - 2), r: 5, fill }])
       rLabels.push(['text',
-        { x: 0, y: yGap * (rLabels.length - 2), 'text-anchor': 'start', 'alignment-baseline': 'middle' },
+        { x: 0, y: gapY * (rLabels.length - 2), 'text-anchor': 'start', 'alignment-baseline': 'middle' },
         zLabels[z]])
     }
 
@@ -239,12 +247,12 @@ export const $chartable = ({
     })
   })
 
-  return $s('svg', {
+  return s('svg', {
     viewBox: `0 0 ${svgW} ${svgH}`,
     width: `${svgW}px`,
     height: `${svgH}px`,
     class: 'chartable'
-  }, title != null
+  }, id != null ? { id } : null, title != null
     ? ['text',
         { class: 'chartable-title', x: svgW / 2, y: top / 2, 'text-anchor': 'middle', 'alignment-baseline': 'middle' },
         title]
@@ -276,7 +284,7 @@ export const $chartable = ({
   )
 }
 
-export const $eq = /** @returns {boolean} */ (/** @type {any} */ x, /** @type {any} */ y) => {
+export const eq = /** @returns {boolean} */ (/** @type {any} */ x, /** @type {any} */ y) => {
   if (x === y) {
     return true
   }
@@ -297,12 +305,12 @@ export const $eq = /** @returns {boolean} */ (/** @type {any} */ x, /** @type {a
     }
 
     if (xConstructor === Array) {
-      return x.length === y.length && x.every((/** @type {any} */ item, /** @type {number} */ index) => $eq(item, y[index]))
+      return x.length === y.length && x.every((/** @type {any} */ item, /** @type {number} */ index) => eq(item, y[index]))
     }
 
     if (xConstructor === Object) {
       const keysOfX = Object.keys(x)
-      return keysOfX.length === Object.keys(y).length && keysOfX.every(key => $eq(x[key], y[key]))
+      return keysOfX.length === Object.keys(y).length && keysOfX.every(key => eq(x[key], y[key]))
     }
 
     if (xConstructor === Set || xConstructor === Map) {
@@ -311,27 +319,27 @@ export const $eq = /** @returns {boolean} */ (/** @type {any} */ x, /** @type {a
       }
       const xa = [...x]
       const ya = [...y]
-      return xa.every(xv => ya.find(yv => $eq(xv, yv)))
+      return xa.every(xv => ya.find(yv => eq(xv, yv)))
     }
   }
 
   return false
 }
 
-export const $escape = (
-  /** @type {$EscapeMap}           */ escapeMap,
+export const escape = (
+  /** @type {EscapeMap}            */ escapeMap,
   /** @type {TemplateStringsArray} */ template,
   /** @type {any[]}                */ ...values
-) => String.raw(template, ...$escapeValues(escapeMap, values))
+) => String.raw(template, ...escapeValues(escapeMap, values))
 
-export const $escapeValues = (
-  /** @type {$EscapeMap} */ escapeMap,
+export const escapeValues = (
+  /** @type {EscapeMap}  */ escapeMap,
   /** @type {any[]}      */ values
 ) => values.map(value => (escapeMap.get(value?.constructor) ?? escapeMap.get(undefined))?.(value) ?? '')
 
 const TAGS_TO_SKIP = { IFRAME: 1, NOSCRIPT: 1, PRE: 1, SCRIPT: 1, STYLE: 1, TEXTAREA: 1 }
 
-export const $fixTypography = (/** @type {Node} */ node) => {
+export const fixTypography = (/** @type {Node} */ node) => {
   const /** @type {Node[]} */ queue = [node]
 
   while (queue.length > 0) {
@@ -343,7 +351,7 @@ export const $fixTypography = (/** @type {Node} */ node) => {
 
         if (childNode instanceof Text) {
           queue.push(childNode)
-        } else if (childNode instanceof Element && !$in(childNode.tagName, TAGS_TO_SKIP)) {
+        } else if (childNode instanceof Element && !has(childNode.tagName, TAGS_TO_SKIP)) {
           queue.push(childNode)
         }
       }
@@ -354,7 +362,7 @@ export const $fixTypography = (/** @type {Node} */ node) => {
         i %= 3
 
         const currentNode = i === 2
-          ? $h('span', { style: 'white-space:nowrap' }, chunk)
+          ? h('span', { style: 'white-space:nowrap' }, chunk)
           : i === 1
             ? document.createTextNode(chunk)
             : document.createTextNode(chunk.replace(/(\/(?=[^/\s])|\.(?=[^\s]))/g, '$1\u200B'))
@@ -371,13 +379,13 @@ export const $fixTypography = (/** @type {Node} */ node) => {
   }
 }
 
-export const $get = (
+export const get = (
   /** @type {any} */ defaultValue,
   /** @type {any} */ ref,
   /** @type {(string | number | symbol)[]} */ ...keys
 ) => {
   for (const key of keys) {
-    if (!$in(key, ref)) {
+    if (!has(key, ref)) {
       return defaultValue
     }
 
@@ -394,14 +402,14 @@ const /** @type {Record<string, string>} */ NS = {
 /**
  * @type {{
  *   (namespaceURI?: null | undefined): {
- *     <T extends keyof HTMLElementTagNameMap>(tag:  T, ...args: $HArgs[1][]): HTMLElementTagNameMap[T];
- *     <N extends Node>                       (node: N, ...args: $HArgs[1][]): N;
- *     (...args: $HArgs): Node;
+ *     <T extends keyof HTMLElementTagNameMap>(tag:  T, ...args: HArgs[1][]): HTMLElementTagNameMap[T];
+ *     <N extends Node>                       (node: N, ...args: HArgs[1][]): N;
+ *     (...args: HArgs): Node;
  *   };
  *   (namespaceURI: 'http://www.w3.org/2000/svg'): {
- *     <T extends keyof SVGElementTagNameMap> (tag:  T, ...args: $HArgs[1][]): SVGElementTagNameMap[T];
- *     <N extends Node>                       (node: N, ...args: $HArgs[1][]): N;
- *     (...args: $HArgs): Node;
+ *     <T extends keyof SVGElementTagNameMap> (tag:  T, ...args: HArgs[1][]): SVGElementTagNameMap[T];
+ *     <N extends Node>                       (node: N, ...args: HArgs[1][]): N;
+ *     (...args: HArgs): Node;
  *   };
  * }}
  */
@@ -410,18 +418,18 @@ const _h = (/** @type {string?=} */ namespaceURI) => {
     ? (/** @type {string } */ tag) => document.createElement(tag)
     : (/** @type {string } */ tag) => document.createElementNS(namespaceURI, tag)
 
-  const h = (/** @type {$HArgs[0]} */ tagOrNode, /** @type {$HArgs[1][]} */ ...args) => {
-    const node = $is(String, tagOrNode) ? createElement(tagOrNode) : tagOrNode
+  const h = (/** @type {HArgs[0]} */ tagOrNode, /** @type {HArgs[1][]} */ ...args) => {
+    const node = is(String, tagOrNode) ? createElement(tagOrNode) : tagOrNode
 
     for (const arg of args) {
       let child = null
 
       if (arg instanceof Node) {
         child = arg
-      } else if ($is(String, arg) || $is(Number, arg)) {
+      } else if (is(String, arg) || is(Number, arg)) {
         // @ts-expect-error
         child = new Text(arg)
-      } else if ($is(Array, arg)) {
+      } else if (is(Array, arg)) {
         // @ts-expect-error
         child = h(...arg)
       } else if (arg != null) {
@@ -431,7 +439,7 @@ const _h = (/** @type {string?=} */ namespaceURI) => {
           if (name[0] === '$') {
             const name1 = name.slice(1)
 
-            if ($is(Object, value)) {
+            if (is(Object, value)) {
               // @ts-expect-error
               node[name1] = node[name1] ?? {}
               // @ts-expect-error
@@ -454,7 +462,7 @@ const _h = (/** @type {string?=} */ namespaceURI) => {
                 } else if (value === false) {
                   node.removeAttributeNS(ns, basename)
                 } else {
-                  node.setAttributeNS(ns, basename, $is(String, value) ? value : '' + value)
+                  node.setAttributeNS(ns, basename, is(String, value) ? value : '' + value)
                 }
               }
             } else {
@@ -463,7 +471,7 @@ const _h = (/** @type {string?=} */ namespaceURI) => {
               } else if (value === false) {
                 node.removeAttribute(name)
               } else {
-                node.setAttribute(name, $is(String, value) ? value : '' + value)
+                node.setAttribute(name, is(String, value) ? value : '' + value)
               }
             }
           }
@@ -481,10 +489,10 @@ const _h = (/** @type {string?=} */ namespaceURI) => {
   return h
 }
 
-export const $h = _h()
+export const h = _h()
 
-export const $in = (/** @type {any} */ key, /** @type {any} */ ref) =>
-  ($is(String, key) || $is(Number, key) || $is(Symbol, key)) && Object.hasOwnProperty.call(ref ?? Object, key)
+export const has = (/** @type {any} */ key, /** @type {any} */ ref) =>
+  (is(String, key) || is(Number, key) || is(Symbol, key)) && Object.hasOwnProperty.call(ref ?? Object, key)
 
 /**
  * @template {abstract new (...args: any[]) => any} T
@@ -501,7 +509,7 @@ export const $in = (/** @type {any} */ key, /** @type {any} */ ref) =>
  *
  * @returns {arg is bigint | boolean | number | string | symbol | undefined | null | InstanceType<T>}
  */
-export const $is = (/** @type {T} */ type, /** @type {any} */ arg) => arg?.constructor === type
+export const is = (/** @type {T} */ type, /** @type {any} */ arg) => arg?.constructor === type
 
 const _locale = (
   /** @type {Record<string, Record<string, string | Record<string, string>>>} */ locales,
@@ -512,22 +520,22 @@ const _locale = (
   // @ts-expect-error
   const v = locales?.[language]?.[version]?.[text]
 
-  if ($is(String, v)) {
+  if (is(String, v)) {
     return v
   }
 
   const t = locales?.[language]?.[text]
 
-  return $is(String, t) ? t : text
+  return is(String, t) ? t : text
 }
 
-export const $locale = (
+export const locale = (
   /** @type {Record<string, Record<string, string | Record<string, string>>>} */ locales,
   /** @type {string} */ defaultLanguage,
   languages = navigator.languages
 ) => {
   for (const language of languages) {
-    if ($in(language, locales)) {
+    if (has(language, locales)) {
       // @ts-expect-error
       return _locale.bind(0, locales, language)
     }
@@ -537,12 +545,12 @@ export const $locale = (
   return _locale.bind(0, locales, defaultLanguage)
 }
 
-export const $nanolight = (
+export const nanolight = (
   /** @type {RegExp} */ pattern,
-  /** @type {((chunk: string, index: number) => $HArgs[1])[]} */ highlighters,
+  /** @type {((chunk: string, index: number) => HArgs[1])[]} */ highlighters,
   /** @type {string} */ code
 ) => {
-  const /** @type {$HArgs[1][]} */ result = []
+  const /** @type {HArgs[1][]} */ result = []
 
   code.split(pattern).forEach((chunk, index) => {
     index %= highlighters.length
@@ -555,7 +563,7 @@ export const $nanolight = (
 }
 
 // @ts-expect-error
-export const $nanolightJs = $nanolight.bind(0,
+export const nanolightJs = nanolight.bind(0,
   /('.*?'|".*?"|`[\s\S]*?`)|(\/\/.*?\n|\/\*[\s\S]*?\*\/)|(break|case|catch|const|continue|debugger|default|delete|do|else|eval|export\s+type|export|extends|false|finally|for|from|function|goto|if|import|in|instanceof|is|keyof|let|NaN|new|null|package|return|super|switch|this|throw|true|try|typeof|undefined|var|void|while|with|yield)(?!\w)|([<>=.?:&|!~*/%+-])|(0x[\dabcdef]+|0o[01234567]+|0b[01]+|\d+(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?)|([$\w]+)(?=\()|([$\wąćęłńóśżźĄĆĘŁŃÓŚŻŹ]+)/,
   [
     chunk => chunk, // no match
@@ -569,7 +577,7 @@ export const $nanolightJs = $nanolight.bind(0,
   ]
 )
 
-export const $plUral = (
+export const plUral = (
   /** @type {string} */ singular,
   /** @type {string} */ plural2,
   /** @type {string} */ plural5,
@@ -587,9 +595,9 @@ export const $plUral = (
         : plural5
 }
 
-export const $s = _h('http://www.w3.org/2000/svg')
+export const s = _h('http://www.w3.org/2000/svg')
 
-export const $set = (
+export const set = (
   /** @type {any} */ value,
   /** @type {any} */ ref,
   /** @type {(string | number | symbol)[]} */ ...keys
@@ -603,8 +611,8 @@ export const $set = (
   for (let k = 0; k < last; ++k) {
     const key = keys[k]
 
-    if (!$in(key, ref)) {
-      ref[key] = $is(Number, keys[k + 1]) ? [] : {}
+    if (!has(key, ref)) {
+      ref[key] = is(Number, keys[k + 1]) ? [] : {}
     }
 
     ref = ref[key]
@@ -616,7 +624,7 @@ export const $set = (
 const _ZEROS = '0'.repeat(16)
 let _counter = 0
 
-export const $uuid1 = ({
+export const uuid1 = ({
   date = new Date(),
   node = Math.random().toString(16).slice(2)
 } = {}) => {

package/package.json

@@ -33,5 +33,5 @@
   "types": "nnn.d.ts",
   "name": "@jackens/nnn",
   "type": "module",
-  "version": "2023.8.19"
+  "version": "2023.8.25"
 }