@jackens/nnn 2026.2.26 → 2026.2.27

package/nnn.d.ts

@@ -253,40 +253,18 @@ export declare const monokai: CRoot;
  * An array of {@link HArgs1} elements suitable for rendering with {@link h}.
  */
 export declare const nanolightTs: (code: string) => HArgs1[];
-/**
- * A map from value constructors (or `null`/`undefined`) to escape functions.
- *
- * Used by {@link escapeValues} and {@link newEscape}.
- */
-export type EscapeMap = Map<unknown, (value?: unknown) => string>;
-/**
- * Escapes an array of values using the provided escape map.
- *
- * @param escapeMap
- *
- * A map where keys are constructors (e.g., `String`, `Number`) and values are escape functions.
- *
- * @param values
- *
- * The array of values to escape.
- *
- * @returns
- *
- * An array of escaped strings.
- */
-export declare const escapeValues: (escapeMap: EscapeMap, values: unknown[]) => string[];
 /**
  * Creates a tag function for escaping interpolated values in template literals.
  *
- * @param escapeMap
+ * @param escapeFn
  *
- * A map where keys are constructors and values are escape functions.
+ * A function that takes a value and returns its escaped string representation.
  *
  * @returns
  *
  * A tag function that escapes interpolated values using the provided escape map.
  */
-export declare const newEscape: (escapeMap: EscapeMap) => (template: TemplateStringsArray, ...values: unknown[]) => string;
+export declare const newEscape: (escapeFn: (value: any) => string) => (template: TemplateStringsArray, ...values: unknown[]) => string;
 /**
  * Creates a function that returns the appropriate noun form based on a numeric value using `Intl.PluralRules`.
  *

package/nnn.js

@@ -298,8 +298,7 @@ var PUNCTUATION = "punctuation";
 var STRING = "string";
 var nanolightTs = /* @__PURE__ */ newTokenizer((chunk, name) => name != null ? ["span", { class: name }, chunk] : chunk, [COMMENT, /\/\*.*?\*\//s], [COMMENT, /(?<!\\)\/\/.*?(?=\n)/], [STRING, /".*?"/], [STRING, /'.*?'/], [STRING, /`.*?`/s], [STRING, /\/[^\s]*[^\\]\/[dgimsuvy]*/], [NUMBER, /0b[01_]+/], [NUMBER, /0o[01234567_]+/], [NUMBER, /0x[\dabcdef_]+/], [NUMBER, /\d[\d_]*(\.[\d_]+)?(e[+-]?[\d_]+)?/], [OPERATOR, "!"], [OPERATOR, "!="], [OPERATOR, "!=="], [OPERATOR, "%"], [OPERATOR, "%="], [OPERATOR, "&&"], [OPERATOR, "&&="], [OPERATOR, "&"], [OPERATOR, "&="], [OPERATOR, "*"], [OPERATOR, "**"], [OPERATOR, "**="], [OPERATOR, "*="], [OPERATOR, "+"], [OPERATOR, "++"], [OPERATOR, "+="], [OPERATOR, "-"], [OPERATOR, "--"], [OPERATOR, "-="], [OPERATOR, "..."], [OPERATOR, "/"], [OPERATOR, "/="], [OPERATOR, ":"], [OPERATOR, "<"], [OPERATOR, "<<"], [OPERATOR, "<<="], [OPERATOR, "<="], [OPERATOR, "="], [OPERATOR, "=="], [OPERATOR, "==="], [OPERATOR, "=>"], [OPERATOR, ">"], [OPERATOR, ">="], [OPERATOR, ">>"], [OPERATOR, ">>="], [OPERATOR, ">>>"], [OPERATOR, ">>>="], [OPERATOR, "?"], [OPERATOR, "?"], [OPERATOR, "??"], [OPERATOR, "??="], [OPERATOR, "^"], [OPERATOR, "^="], [OPERATOR, "|"], [OPERATOR, "|="], [OPERATOR, "||"], [OPERATOR, "||="], [OPERATOR, "~"], [OPERATOR, "~="], [OPERATOR, /(?<=\s):/], [PUNCTUATION, "("], [PUNCTUATION, ")"], [PUNCTUATION, ","], [PUNCTUATION, "."], [PUNCTUATION, ":"], [PUNCTUATION, ";"], [PUNCTUATION, "?."], [PUNCTUATION, "["], [PUNCTUATION, "]"], [PUNCTUATION, "{"], [PUNCTUATION, "}"], [KEYWORD_1, "as"], [KEYWORD_1, "async"], [KEYWORD_1, "await"], [KEYWORD_1, "break"], [KEYWORD_1, "case"], [KEYWORD_1, "catch"], [KEYWORD_1, "class"], [KEYWORD_1, "const"], [KEYWORD_1, "continue"], [KEYWORD_1, "debugger"], [KEYWORD_1, "default"], [KEYWORD_1, "delete"], [KEYWORD_1, "do"], [KEYWORD_1, "else"], [KEYWORD_1, "export"], [KEYWORD_1, "extends"], [KEYWORD_1, "finally"], [KEYWORD_1, "for"], [KEYWORD_1, "from"], [KEYWORD_1, "function"], [KEYWORD_1, "function*"], [KEYWORD_1, "goto"], [KEYWORD_1, "if"], [KEYWORD_1, "import"], [KEYWORD_1, "in"], [KEYWORD_1, "instanceof"], [KEYWORD_1, "is"], [KEYWORD_1, "keyof"], [KEYWORD_1, "let"], [KEYWORD_1, "new"], [KEYWORD_1, "of"], [KEYWORD_1, "package"], [KEYWORD_1, "return"], [KEYWORD_1, "super"], [KEYWORD_1, "switch"], [KEYWORD_1, "this"], [KEYWORD_1, "throw"], [KEYWORD_1, "try"], [KEYWORD_1, "type"], [KEYWORD_1, "typeof"], [KEYWORD_1, "var"], [KEYWORD_1, "void"], [KEYWORD_1, "while"], [KEYWORD_1, "with"], [KEYWORD_1, "yield"], [KEYWORD_1, "yield*"], [KEYWORD_2, "false"], [KEYWORD_2, "Infinity"], [KEYWORD_2, "NaN"], [KEYWORD_2, "null"], [KEYWORD_2, "true"], [KEYWORD_2, "undefined"], [KEYWORD_3, "any"], [KEYWORD_3, "bigint"], [KEYWORD_3, "boolean"], [KEYWORD_3, "eval"], [KEYWORD_3, "number"], [KEYWORD_3, "string"], [KEYWORD_3, "symbol"], [KEYWORD_3, "unknown"], [IDENTIFIER_1, /[\p{Lu}_$][\p{Lu}\d_$]*/u], [IDENTIFIER_2, /[\p{L}_$][\p{L}\d_$]*(?=[(`])/u], [IDENTIFIER_3, /\p{Lu}[\p{L}\d_$]*/u], [IDENTIFIER_4, /[\p{L}_$][\p{L}\d_$]*/u]);
 // src/nnn/newEscape.ts
-var escapeValues = (escapeMap, values) => values.map((value) => (value == null ? escapeMap.get(value) : escapeMap.get(value?.constructor))?.(value) ?? "");
-var newEscape = (escapeMap) => (template, ...values) => String.raw(template, ...escapeValues(escapeMap, values));
+var newEscape = (escapeFn) => (template, ...values) => String.raw(template, ...values.map(escapeFn));
 // src/nnn/newNounForm.ts
 var PLURAL_RULES = {};
 var newNounForm = (locale, forms) => (value) => forms[(PLURAL_RULES[locale] ??= new Intl.PluralRules(locale)).select(value)] ?? forms.other ?? "";
@@ -384,7 +383,6 @@ export {
   hasOwn,
   h,
   fixPlTypography,
-  escapeValues,
   csvParse,
   c
 };

package/package.json

@@ -44,5 +44,5 @@
   "name": "@jackens/nnn",
   "type": "module",
   "types": "nnn.d.ts",
-  "version": "2026.2.26"
+  "version": "2026.2.27"
 }

package/readme.md

@@ -1,6 +1,6 @@
 # nnn
 
-A collection of Jackens’ JavaScript helper utilities (version: `2026.2.26`).
+A collection of Jackens’ JavaScript helper utilities (version: `2026.2.27`).
 
 ## Installation
 
@@ -20,7 +20,6 @@ npm i @jackens/nnn
 import {
   c,
   csvParse,
-  escapeValues,
   fixPlTypography,
   h,
   hasOwn,
@@ -50,12 +49,10 @@ import {
 
 - [`CNode`](#CNode): Represents a CSS rule node for the [`c`](#c) helper. Keys are CSS properties or nested selectors.
 - [`CRoot`](#CRoot): Represents the root CSS object for the [`c`](#c) helper. Keys are top-level selectors or at-rules.
-- [`EscapeMap`](#EscapeMap): A map from value constructors (or `null`/`undefined`) to escape functions.
 - [`HArgs`](#HArgs): Tuple argument type for the [`h`](#h) and [`s`](#s) helpers.
 - [`HArgs1`](#HArgs1): Single argument type for the [`h`](#h) and [`s`](#s) helpers.
 - [`c`](#c): A minimal CSS-in-JS helper that converts a JavaScript object hierarchy into a CSS string.
 - [`csvParse`](#csvParse): Parses a CSV string into a two-dimensional array of strings.
-- [`escapeValues`](#escapeValues): Escapes an array of values using the provided escape map.
 - [`fixPlTypography`](#fixPlTypography): Applies Polish-specific typographic corrections to a DOM subtree.
 - [`h`](#h): A lightweight [HyperScript](https://github.com/hyperhype/hyperscript)-style helper for creating and modifying `HTMLElement`s (see also [`s`](#s)).
 - [`hasOwn`](#hasOwn): Checks whether an object has the specified key as its own property.
@@ -97,16 +94,6 @@ type CRoot = Record<PropertyKey, CNode>;
 
 Represents the root CSS object for the [`c`](#c) helper. Keys are top-level selectors or at-rules.
 
-### EscapeMap
-
-```ts
-type EscapeMap = Map<unknown, (value?: unknown) => string>;
-```
-
-A map from value constructors (or `null`/`undefined`) to escape functions.
-
-Used by [`escapeValues`](#escapeValues) and [`newEscape`](#newEscape).
-
 ### HArgs
 
 ```ts
@@ -381,26 +368,6 @@ expect(csvParse(text)).to.deep.equal([
 ])
 ```
 
-### escapeValues
-
-```ts
-const escapeValues: (escapeMap: EscapeMap, values: unknown[]) => string[];
-```
-
-Escapes an array of values using the provided escape map.
-
-#### escapeMap
-
-A map where keys are constructors (e.g., `String`, `Number`) and values are escape functions.
-
-#### values
-
-The array of values to escape.
-
-#### Returns
-
-An array of escaped strings.
-
 ### fixPlTypography
 
 ```ts
@@ -421,13 +388,18 @@ except those inside `IFRAME`, `NOSCRIPT`, `PRE`, `SCRIPT`, `STYLE`, or `TEXTAREA
 #### Usage Examples
 
 ```ts
-const p = h('p', 'Pchnąć w tę łódź jeża lub ośm skrzyń fig (zob. https://pl.wikipedia.org/wiki/Pangram).')
+const p = h('p',
+  'Pchnąć w tę łódź jeża lub ośm skrzyń fig (zob. https://pl.wikipedia.org/wiki/Pangram).',
+  ['br'],
+  ['b', 'Zażółć gęślą jaźń.']
+)
 
 fixPlTypography(p)
 
 expect(p.innerHTML).to.deep.equal(
   'Pchnąć <span style="white-space:nowrap">w </span>tę łódź jeża lub ośm skrzyń fig ' +
-  '(zob. https://\u200Bpl.\u200Bwikipedia.\u200Borg/\u200Bwiki/\u200BPangram).')
+  '(zob. https://\u200Bpl.\u200Bwikipedia.\u200Borg/\u200Bwiki/\u200BPangram).' +
+  '<br><b>Zażółć gęślą jaźń.</b>')
 ```
 
 ### h
@@ -869,14 +841,14 @@ expect(nanolightTs(codeJs)).to.deep.equal([
 ### newEscape
 
 ```ts
-const newEscape: (escapeMap: EscapeMap) => (template: TemplateStringsArray, ...values: unknown[]) => string;
+const newEscape: (escapeFn: (value: any) => string) => (template: TemplateStringsArray, ...values: unknown[]) => string;
 ```
 
 Creates a tag function for escaping interpolated values in template literals.
 
-#### escapeMap
+#### escapeFn
 
-A map where keys are constructors and values are escape functions.
+A function that takes a value and returns its escaped string representation.
 
 #### Returns
 
@@ -885,27 +857,30 @@ A tag function that escapes interpolated values using the provided escape map.
 #### Usage Examples
 
 ```ts
-const escapeMap: EscapeMap = new Map([
-  [null, () => 'NULL'],
-  [undefined, () => 'NULL'],
-  [Array, (values: unknown[]) => escapeValues(escapeMap, values).join(', ')],
-  [Boolean, (value: boolean) => `b'${+value}'`],
-  [Date, (value: Date) => `'${value.toISOString().replace(/^(.+)T(.+)\..*$/, '$1 $2')}'`],
-  [Number, (value: number) => `${value}`],
-  [String, (value: string) => `'${value.replace(/'/g, "''")}'`]
-])
-
-const sql = newEscape(escapeMap)
+const escapeFn = (value: any): string =>
+  isArray(value)
+    ? value.map(escapeFn).join(', ')
+    : value === true || value === false
+      ? `b'${+value}'`
+      : value instanceof Date
+        ? `'${value.toISOString().replace(/^(.+)T(.+)\..*$/, '$1 $2')}'`
+        : isFiniteNumber(value)
+          ? `${value}`
+          : isString(value)
+            ? `'${value.replace(/'/g, "''")}'`
+            : 'NULL'
+
+const sql = newEscape(escapeFn)
 
 const actual = sql`
   SELECT *
   FROM table_name
-  WHERE column_name IN (${[true, null, undefined, 42, '42', "4'2", new Date(323325000000)]})`
+  WHERE column_name IN (${[true, null, undefined, NaN, Infinity, 42, '42', "4'2", /42/, new Date(323325000000)]})`
 
 const expected = `
   SELECT *
   FROM table_name
-  WHERE column_name IN (b'1', NULL, NULL, 42, '42', '4''2', '1980-03-31 04:30:00')`
+  WHERE column_name IN (b'1', NULL, NULL, NULL, NULL, 42, '42', '4''2', NULL, '1980-03-31 04:30:00')`
 
 expect(actual).to.equal(expected)
 ```
@@ -957,6 +932,13 @@ expect(car(0)).to.equal('cars')
 expect(car(1)).to.equal('car')
 expect(car(17)).to.equal('cars')
 expect(car(42)).to.equal('cars')
+
+const empty = newNounForm('en', {})
+
+expect(empty(0)).to.equal('')
+expect(empty(1)).to.equal('')
+expect(empty(17)).to.equal('')
+expect(empty(42)).to.equal('')
 ```
 
 ### newTokenizer