@spintax/core 0.10.0 → 0.12.0

package/dist/index.d.cts

@@ -206,8 +206,8 @@ interface Analysis extends ExtractResult {
  */
 declare function normalizeBaseLang(locale?: string | null): string;
 /**
- * How many `{plural …}` forms this locale takes — 3 for the Slavic one/few/other
- * family (ru/uk/be + sr/hr/bs), 2 for everything else.
+ * How many `{plural …}` forms this locale takes — 6 for Arabic (zero/one/two/few/many/other),
+ * 3 for the Slavic one/few/other family (ru/uk/be + sr/hr/bs), 2 for everything else.
  *
  * Takes a RAW locale and normalizes internally, unlike the internal helper of the
  * same name: a public function that silently answered 2 for `sr-Latn` would be a

package/dist/index.d.ts

@@ -206,8 +206,8 @@ interface Analysis extends ExtractResult {
  */
 declare function normalizeBaseLang(locale?: string | null): string;
 /**
- * How many `{plural …}` forms this locale takes — 3 for the Slavic one/few/other
- * family (ru/uk/be + sr/hr/bs), 2 for everything else.
+ * How many `{plural …}` forms this locale takes — 6 for Arabic (zero/one/two/few/many/other),
+ * 3 for the Slavic one/few/other family (ru/uk/be + sr/hr/bs), 2 for everything else.
  *
  * Takes a RAW locale and normalizes internally, unlike the internal helper of the
  * same name: a public function that silently answered 2 for `sr-Latn` would be a

package/dist/index.js

@@ -742,6 +742,8 @@ function normalizeBaseLang(locale) {
 }
 function pluralArity(baseLang) {
   switch (baseLang) {
+    case "ar":
+      return 6;
     case "ru":
     case "uk":
     case "be":
@@ -759,6 +761,13 @@ function pluralFor(baseLang, n, forms) {
   const mod10 = abs % 10;
   const mod100 = abs % 100;
   switch (baseLang) {
+    case "ar":
+      if (abs === 0) return forms[0] ?? "";
+      if (abs === 1) return forms[1] ?? "";
+      if (abs === 2) return forms[2] ?? "";
+      if (mod100 >= 3 && mod100 <= 10) return forms[3] ?? "";
+      if (mod100 >= 11) return forms[4] ?? "";
+      return forms[5] ?? "";
     case "ru":
     case "uk":
     case "be":
@@ -1378,6 +1387,37 @@ function trimFragment(fragment) {
   if (fragment.lead === 0 && fragment.trail === 0) return fragment;
   return new Window(fragment, fragment.lead, fragment.length - fragment.trail);
 }
+function firstCodePointOf(fragment) {
+  const hi = charCodeAtOf(fragment, 0);
+  if (hi >= 55296 && hi <= 56319) {
+    const lo = charCodeAtOf(fragment, 1);
+    if (lo >= 56320 && lo <= 57343) return (hi - 55296) * 1024 + (lo - 56320) + 65536;
+  }
+  return hi;
+}
+function charCodeAtOf(fragment, index) {
+  let piece = fragment;
+  let at = index;
+  for (; ; ) {
+    if (at < 0 || at >= lengthOf(piece)) return -1;
+    if (typeof piece === "string") return piece.charCodeAt(at);
+    if (piece instanceof Window) {
+      at += piece.from;
+      piece = piece.base;
+      continue;
+    }
+    let offset = 0;
+    for (const child of piece.pieces) {
+      const length = lengthOf(child);
+      if (at < offset + length) {
+        piece = child;
+        at -= offset;
+        break;
+      }
+      offset += length;
+    }
+  }
+}
 function flatten(fragment) {
   if (typeof fragment === "string") return fragment;
   const out = [];
@@ -1771,7 +1811,12 @@ function assemblePermutation(node, rendered, opts) {
   max = Math.max(min, Math.min(max, total));
   const pick = randomInt(opts.rng, min, max);
   shuffle(elements, opts.rng);
-  return joinWithSeparators(elements.slice(0, pick), config.sep, config.lastsep ?? config.sep);
+  return joinWithSeparators(
+    elements.slice(0, pick),
+    config.sep,
+    config.lastsep ?? config.sep,
+    normalizeBaseLang(opts.locale)
+  );
 }
 function shuffle(arr, rng) {
   for (let i = arr.length - 1; i > 0; i -= 1) {
@@ -1781,7 +1826,7 @@ function shuffle(arr, rng) {
     arr[j] = tmp;
   }
 }
-function joinWithSeparators(elements, globalSep, globalLastsep) {
+function joinWithSeparators(elements, globalSep, globalLastsep, lang) {
   const count = elements.length;
   if (count === 0) return "";
   if (count === 1) return elements[0].text;
@@ -1789,14 +1834,24 @@ function joinWithSeparators(elements, globalSep, globalLastsep) {
   for (let i = 1; i < count; i += 1) {
     const el = elements[i];
     const sep = el.sep ?? (i === count - 1 ? globalLastsep : globalSep);
-    pieces.push(padSeparator(sep), el.text);
+    pieces.push(padSeparator(sep, lang, el.text), el.text);
   }
   return joinFragments(pieces);
 }
-function padSeparator(sep) {
+var UNSPACED_SCRIPT_RE = /^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}ーｰ\p{Script=Thai}\p{Script=Lao}\p{Script=Khmer}\p{Script=Myanmar}]+$/u;
+var PROCLITICS = /* @__PURE__ */ new Map([
+  ["ar", { words: /* @__PURE__ */ new Set(["\u0648", "\u0641"]), letter: /^(?=\p{L})\p{Script=Arabic}$/u }],
+  ["he", { words: /* @__PURE__ */ new Set(["\u05D5"]), letter: /^(?=\p{L})\p{Script=Hebrew}$/u }]
+]);
+function padSeparator(sep, lang, next) {
   const trimmed = phpTrim(sep);
   if (trimmed === "") return sep;
-  if (/^\p{L}+$/u.test(trimmed)) return ` ${trimmed} `;
+  const proclitic = PROCLITICS.get(lang);
+  if (proclitic !== void 0 && proclitic.words.has(trimmed)) {
+    const first = firstCodePointOf(next);
+    return first >= 0 && proclitic.letter.test(String.fromCodePoint(first)) ? ` ${trimmed}` : ` ${trimmed} `;
+  }
+  if (/^\p{L}+$/u.test(trimmed) && !UNSPACED_SCRIPT_RE.test(trimmed)) return ` ${trimmed} `;
   return sep;
 }