cry-sloimena 1.0.6 → 1.0.8

package/dist/{izlusci.js → izlusci.mjs}

@@ -1,5 +1,8 @@
-import { poisciFirme } from "./poisciFirme.js";
-import { urediImePriimek } from "./urediImePriimek.js";
+import { poisciFirme } from "./poisciFirme.mjs";
+import { urediImePriimek } from "./urediImePriimek.mjs";
+import { findAny } from "./utils/findAny.mjs";
+import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.mjs";
+import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.mjs";
 /**
  * Parse an input string and attempt to extract either a person or a firm.
  *
@@ -22,8 +25,10 @@ import { urediImePriimek } from "./urediImePriimek.js";
 export function izlusci(vhodnoIme, opcije) {
     let vrniFirme = !opcije?.vrni || opcije.vrni === "firme" || opcije.vrni === "oboje";
     let vrniImena = !opcije?.vrni || opcije.vrni === "imena" || opcije.vrni === "oboje";
+    const normalized = normalizeStringForSearch(vhodnoIme);
+    const legalDesignation = findAny(LegalFormSuffixesNormalized, normalized);
     let najdeneFirme = vrniFirme && poisciFirme(vhodnoIme, { limit: opcije?.limit }) || undefined;
-    let urejenoIme = vrniImena && urediImePriimek(vhodnoIme, opcije?.beautify) || undefined;
+    let urejenoIme = !legalDesignation && vrniImena && urediImePriimek(vhodnoIme, opcije?.beautify) || undefined;
     if (urejenoIme && typeof urejenoIme === "object") {
         if (!urejenoIme.ime || !urejenoIme.priimek)
             urejenoIme = undefined;
@@ -48,3 +53,4 @@ export function izlusci(vhodnoIme, opcije) {
         return arr;
     return vhodnoIme;
 }
+console.log(``, JSON.stringify(izlusci("Primož krajnik sp"), null, 4));

package/dist/{poisciFirme.d.ts → poisciFirme.d.mts}

@@ -1,4 +1,4 @@
-import { PravnaOseba } from "./types/PravnaOseba.js";
+import { PravnaOseba } from "./types/PravnaOseba.mjs";
 export interface FirmaResult {
     firma: string;
     pravnaOseba?: PravnaOseba & {

package/dist/{poisciFirme.js → poisciFirme.mjs}

@@ -1,11 +1,11 @@
 import { clone } from "cry-helpers";
-import { firmeDb } from "./data/firmeDb.js";
-import { findAny } from "./utils/findAny.js";
-import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.js";
-import { normalizeListOfNames } from "./utils/normalizeListOfNames.js";
-import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.js";
-import { DOLZINA_MATICNE } from "./0-file-locations.js";
-const TIMING = true;
+import { firmeDb } from "./data/firmeDb.mjs";
+import { findAny } from "./utils/findAny.mjs";
+import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.mjs";
+import { normalizeListOfNames } from "./utils/normalizeListOfNames.mjs";
+import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.mjs";
+import { DOLZINA_MATICNE } from "./0-file-locations.mjs";
+const TIMING = false;
 console.warn("WARNING: Large amount of RAM allocated for poisciFirme.");
 function onlyDigitsFast(s) {
     if (s.length === 0)

package/dist/runtime/izlusci.d.mts

@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+export {};

package/dist/runtime/izlusci.mjs

@@ -0,0 +1,188 @@
+#!/usr/bin/env bun
+import { createInterface } from 'readline';
+import { izlusci } from '../izlusci.mjs';
+const LIMIT = 10;
+function printUsage() {
+    console.log(`
+Uporaba: izlusciRuntime.mts [opcije] [iskalni_niz]
+
+Opcije:
+  -f        vraca samo firme
+  -i        vraca samo imena
+  -o        vraca oboje (privzeto)
+  -1        vrne samo en rezultat
+  -n        vrne vec rezultatov
+  -d        dodaj podatke firme
+  -b        beautify ime (privzeto: true)
+  -h        prikazi pomoc
+
+Primeri:
+  izlusciRuntime.mts "Janez Novak"
+  izlusciRuntime.mts -i "Janez Novak"
+  izlusciRuntime.mts -f -n "Novak"
+`);
+}
+function printInteractiveHelp() {
+    console.log(`
+Interaktivni nacin - ukazi za spremembo opcij:
+  f - vraca samo firme
+  i - vraca samo imena
+  o - vraca oboje (privzeto)
+  1 - vrne samo en rezultat
+  n - vrne vec rezultatov
+  d - dodaj/odstrani podatke firme
+  b - beautify ime
+  q - izhod
+  ? - pomoc
+
+Vnesite ime ali firmo za iskanje.
+`);
+}
+function printCurrentOptions(opts) {
+    const vrni = opts.vrni || 'oboje';
+    const vecRezultatov = (opts.limit || 1) > 1 ? 'da' : 'ne';
+    const beautify = opts.beautify !== false ? 'da' : 'ne';
+    console.log(`[Trenutne opcije: vrni=${vrni}, vec rezultatov=${vecRezultatov}, beautify=${beautify}]`);
+    console.log(``);
+}
+function parseArgs(args) {
+    const opts = {
+        vrni: 'oboje',
+        limit: LIMIT,
+        beautify: true
+    };
+    let query = null;
+    let showHelp = false;
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === '-f') {
+            opts.vrni = 'firme';
+        }
+        else if (arg === '-i') {
+            opts.vrni = 'imena';
+        }
+        else if (arg === '-o') {
+            opts.vrni = 'oboje';
+        }
+        else if (arg === '-1') {
+            opts.limit = 1;
+        }
+        else if (arg === '-n') {
+            opts.limit = LIMIT;
+        }
+        else if (arg === '-d') {
+            opts.beautify = false;
+        }
+        else if (arg === '-h' || arg === '--help') {
+            showHelp = true;
+        }
+        else if (!arg.startsWith('-')) {
+            query = arg;
+        }
+    }
+    return { opts, query, showHelp };
+}
+async function main() {
+    const args = process.argv.slice(2);
+    const { opts, query, showHelp } = parseArgs(args);
+    if (showHelp) {
+        printUsage();
+        return;
+    }
+    // Non-interactive mode if query provided
+    if (query && query.trim().length > 0) {
+        const result = izlusci(query, opts);
+        if (typeof result === 'string') {
+            console.log(result);
+        }
+        else {
+            console.log(JSON.stringify(result, null, 2));
+        }
+        return;
+    }
+    // Interactive mode
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    printInteractiveHelp();
+    printCurrentOptions(opts);
+    const prompt = () => {
+        rl.question('> ', (input) => {
+            const trimmed = input.trim();
+            if (trimmed === 'q' || trimmed === 'quit' || trimmed === 'exit') {
+                rl.close();
+                return;
+            }
+            // Check for option commands
+            if (trimmed === 'f') {
+                opts.vrni = 'firme';
+                console.log('Nastavljeno: vraca samo firme');
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === 'i') {
+                opts.vrni = 'imena';
+                console.log('Nastavljeno: vraca samo imena');
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === 'o') {
+                opts.vrni = 'oboje';
+                console.log('Nastavljeno: vraca oboje');
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === '1') {
+                opts.limit = 1;
+                console.log('Nastavljeno: vrne samo en rezultat');
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === 'n') {
+                opts.limit = LIMIT;
+                console.log('Nastavljeno: vrne vec rezultatov');
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === 'd') {
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === 'b') {
+                opts.beautify = !opts.beautify;
+                console.log(`Nastavljeno: beautify ${opts.beautify ? 'vklopljen' : 'izklopljen'}`);
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed === '?' || trimmed === 'help') {
+                printInteractiveHelp();
+                printCurrentOptions(opts);
+                prompt();
+                return;
+            }
+            if (trimmed.length === 0) {
+                prompt();
+                return;
+            }
+            // Search
+            const result = izlusci(trimmed, opts);
+            if (typeof result === 'string') {
+                console.log(result);
+            }
+            else {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            prompt();
+        });
+    };
+    prompt();
+}
+main().catch(err => {
+    console.error('Napaka:', err);
+    process.exit(1);
+});

package/dist/runtime/urediImePriimek.d.mts

@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+export {};

package/dist/runtime/urediImePriimek.mjs

@@ -0,0 +1,27 @@
+#!/usr/bin/env bun
+import { createInterface } from 'readline';
+import { urediImePriimek } from '../urediImePriimek.mjs';
+async function ask(prompt) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    return await new Promise(resolve => {
+        rl.question(prompt, answer => {
+            rl.close();
+            resolve(answer);
+        });
+    });
+}
+async function main() {
+    const arg = process.argv[2];
+    const input = arg && String(arg).trim().length > 0 ? String(arg) : await ask('Vnesite ime (ime in/ali priimek): ');
+    const result = urediImePriimek(input);
+    if (typeof result === 'string') {
+        console.log(result);
+        return;
+    }
+    // pretty-print object result
+    console.log(JSON.stringify(result, null, 2));
+}
+main().catch(err => {
+    console.error('Napaka:', err);
+    process.exit(1);
+});

package/dist/test/{imena.test.js → imena.test.mjs}

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { urediImePriimek } from '../urediImePriimek.js';
+import { urediImePriimek } from '../urediImePriimek.mjs';
 describe('urediImePriimek', () => {
     it('should parse "Jurij Tomaž"', () => {
         const result = urediImePriimek('Jurij Tomaž');

package/dist/types/{PravnaOsebaNormalised.d.ts → PravnaOsebaNormalised.d.mts}

@@ -1,4 +1,4 @@
-import { PravnaOseba } from "./PravnaOseba.js";
+import { PravnaOseba } from "./PravnaOseba.mjs";
 export interface PravnaOsebaNormalised extends Omit<PravnaOseba, "firma" | "oblika" | "ulica" | "posta"> {
     _firma: number;
     _oblika: number;

package/dist/{urediImePriimek.js → urediImePriimek.mjs}

@@ -1,7 +1,7 @@
-import { binarySearch } from './utils/binarySearch.js';
-import { normalizeWordOrSeparator } from './utils/normalizeWordOrSeparator.js';
-import { getSortedFemaleNames, getSortedMaleNames, getSortedSurnames } from './utils/normalizirano.js';
-import { tokenizeIme } from './utils/tokenizeIme.js';
+import { binarySearch } from './utils/binarySearch.mjs';
+import { normalizeWordOrSeparator } from './utils/normalizeWordOrSeparator.mjs';
+import { getSortedFemaleNames, getSortedMaleNames, getSortedSurnames } from './utils/normalizirano.mjs';
+import { tokenizeIme } from './utils/tokenizeIme.mjs';
 function getPatternCharForWord(word) {
     const isMaleName = binarySearch(getSortedMaleNames(), word) && 4 || 0;
     const isFemaleName = binarySearch(getSortedFemaleNames(), word) && 2 || 0;

package/dist/utils/{LegalFormSuffixes.js → LegalFormSuffixes.mjs}

@@ -1,3 +1,3 @@
-import { normalizeWordOrSeparator } from "./normalizeWordOrSeparator.js";
+import { normalizeWordOrSeparator } from "./normalizeWordOrSeparator.mjs";
 export const LegalFormSuffixes = ['d.o.o.', 'd.d.', 's.p.', 'z.o.o.', 'k.d.'];
 export const LegalFormSuffixesNormalized = LegalFormSuffixes.map(l => normalizeWordOrSeparator(l, false));

package/dist/utils/{ObjectSortedListsMapper.js → ObjectSortedListsMapper.mjs}

@@ -1,4 +1,4 @@
-import { SortedStringListMapper } from "./SortedStringListMapper.js";
+import { SortedStringListMapper } from "./SortedStringListMapper.mjs";
 /**
  * Creates string mappers for a list of objects.
  * Use in three phases:

package/dist/utils/{normalizeListOfNames.js → normalizeListOfNames.mjs}

@@ -1,4 +1,4 @@
-import { normalizeWordOrSeparator } from './normalizeWordOrSeparator.js';
+import { normalizeWordOrSeparator } from './normalizeWordOrSeparator.mjs';
 /**
  * Return sorted deduplicated list of normalized words
  * Split names like Ana Marija or Ana-Marija into two names ['ana','marija']

package/dist/utils/{normalizeListOfStrings.js → normalizeListOfStrings.mjs}

@@ -1,4 +1,4 @@
-import { normalizeWordOrSeparator } from "./normalizeWordOrSeparator.js";
+import { normalizeWordOrSeparator } from "./normalizeWordOrSeparator.mjs";
 /**
  * Return sorted deduplicated list of [normalised_name, original_names_sorted[]]
  *

package/dist/utils/{normalizeStringForSearch.js → normalizeStringForSearch.mjs}

@@ -1,5 +1,5 @@
-import { normalizeListOfNames } from "./normalizeListOfNames.js";
-import { LegalFormSuffixesNormalized } from "./LegalFormSuffixes.js";
+import { normalizeListOfNames } from "./normalizeListOfNames.mjs";
+import { LegalFormSuffixesNormalized } from "./LegalFormSuffixes.mjs";
 const MIN_WORD_NAME_FOR_SEARCH = 4;
 export function normalizeStringForSearch(list, sort = false) {
     let res = normalizeListOfNames(list.split(" "), true).filter((a) => LegalFormSuffixesNormalized.includes(a)

package/dist/utils/{normalizirano.js → normalizirano.mjs}

@@ -2,10 +2,10 @@
  * Normalization utilities for searching names and firms.
  * Uses lazy initialization and binary search for performance.
  */
-import { imenaM } from '../data/imenaM.js';
-import { imenaZ } from '../data/imenaZ.js';
-import { priimki } from '../data/priimki.js';
-import { normalizeListOfNames } from './normalizeListOfNames.js';
+import { imenaM } from '../data/imenaM.mjs';
+import { imenaZ } from '../data/imenaZ.mjs';
+import { priimki } from '../data/priimki.mjs';
+import { normalizeListOfNames } from './normalizeListOfNames.mjs';
 // ============================================================================
 // Lazy-initialized pre-normalized sorted arrays for binary search
 // ============================================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-sloimena",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Slovenska imena in priimki",
   "type": "module",
   "main": "dist/index.mjs",

package/src/0-file-locations.mts

@@ -0,0 +1,3 @@
+export const OUT_NORM_FIRME_DB_JSON = './data/firmeDb.json'
+export const IN_OPSI_PRS_CSV = './vhodni-podatki/opsiprs.csv';
+export const DOLZINA_MATICNE = 10;

package/src/data/{firmeDb.ts → firmeDb.mts}

@@ -1,5 +1,5 @@
 import firmeDbJson from "../../data/firmeDb.json" with { type: "json" };
-import { PravnaOsebaInternal } from "../types/PravnaOseba.js";
+import { PravnaOsebaInternal } from "../types/PravnaOseba.mjs";
 
 export interface FirmeDbSortedArrays {
   readonly firma: readonly string[];

package/src/data/imenaFirm.mts

@@ -0,0 +1,5 @@
+import { firmeDb } from "./firmeDb.mjs";
+
+console.warn("WARNING: Large amount of RAM allocated for poisciFirme.");
+
+export default firmeDb.sortedArrays.firma; 

package/src/index.mts

@@ -0,0 +1,7 @@
+export { imenaM } from './data/imenaM.mjs';
+export { imenaZ } from './data/imenaZ.mjs';
+export { priimki } from './data/priimki.mjs';
+export { izlusci, type IzlusciResult, type IzlusciOptions, type OsebaResult } from './izlusci.mjs';
+export { urediImePriimek } from './urediImePriimek.mjs';
+export { poisciFirme, type FirmaResult, type PoisciFirmoOptions } from './poisciFirme.mjs';
+export { davcnaZaMaticno } from './davcnaZaMaticno.mjs';

package/src/initializeData/{1-parse-opsiprs-csv.ts → 1-parse-opsiprs-csv.mts}

@@ -1,13 +1,13 @@
 import * as fs from 'fs';
 import * as readline from 'readline';
-import { ObjectSortedListsMapper } from '../utils/ObjectSortedListsMapper.js';
-import { PravnaOsebaInternal } from '../types/PravnaOseba.js';
-import { IN_OPSI_PRS_CSV, OUT_NORM_FIRME_DB_MTS } from '../0-file-locations.js';
-import { normalizeStringForSearch } from '../utils/normalizeStringForSearch.js';
-import { findAny } from '../utils/findAny.js';
-import { LegalFormSuffixesNormalized } from '../utils/LegalFormSuffixes.js';
+import { IN_OPSI_PRS_CSV, OUT_NORM_FIRME_DB_JSON } from '../0-file-locations.mjs';
+import { PravnaOsebaInternal } from '../types/PravnaOseba.mjs';
+import { findAny } from '../utils/findAny.mjs';
+import { LegalFormSuffixesNormalized } from '../utils/LegalFormSuffixes.mjs';
+import { normalizeStringForSearch } from '../utils/normalizeStringForSearch.mjs';
+import { ObjectSortedListsMapper } from '../utils/ObjectSortedListsMapper.mjs';
 
-const MAX_LIMIT = 0;
+const MAX_LIMIT = undefined;    // 0 just writes the structure, use undefined to export everything.
 
 async function parseCSV() {
 
@@ -67,12 +67,15 @@ async function parseCSV() {
         legalDesignation,
       };
 
-      objStringMapper.add(oseba);
-      pravneOsebe.push(oseba);
+      
+      if (MAX_LIMIT !== 0) {
+        objStringMapper.add(oseba);
+        pravneOsebe.push(oseba);
+      }
     }
 
     //Limit to prevent memory issues - remove this if you want all records
-    if (MAX_LIMIT && pravneOsebe.length >= MAX_LIMIT) {
+    if (MAX_LIMIT!==undefined && pravneOsebe.length >= MAX_LIMIT) {
       console.log(`Reached ${MAX_LIMIT} records limit`);
       break;
     }
@@ -96,13 +99,14 @@ async function parseCSV() {
     firme: pravneOsebe
   };
 
-  if (OUT_NORM_FIRME_DB_MTS.includes("json"))
-    fs.writeFileSync(OUT_NORM_FIRME_DB_MTS, JSON.stringify(jsonData));
-  else
-    fs.writeFileSync(OUT_NORM_FIRME_DB_MTS, "export const firmeDb = " + JSON.stringify(jsonData));
+  const json = (MAX_LIMIT!==undefined && MAX_LIMIT<20) 
+    ? JSON.stringify(jsonData, null, 4)
+    : JSON.stringify(jsonData);
+    
+  fs.writeFileSync(OUT_NORM_FIRME_DB_JSON, json);
 
-  const stats = fs.statSync(OUT_NORM_FIRME_DB_MTS);
-  console.log(`Written to ${OUT_NORM_FIRME_DB_MTS} (${(stats.size / 1024 / 1024).toFixed(1)} MB)`);
+  const stats = fs.statSync(OUT_NORM_FIRME_DB_JSON);
+  console.log(`Written to ${OUT_NORM_FIRME_DB_JSON} (${(stats.size / 1024 / 1024).toFixed(1)} MB)`);
 }
 
 parseCSV().catch(console.error);

package/src/{izlusci.ts → izlusci.mts}

@@ -1,9 +1,8 @@
-import { splitAndClean } from "cry-helpers";
-import { FirmaResult, poisciFirme } from "./poisciFirme.js";
-import { urediImePriimek } from "./urediImePriimek.js";
-import { findAny } from "./utils/findAny.js";
-import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.js";
-import { normalizeListOfNames } from "./utils/normalizeListOfNames.js";
+import { FirmaResult, poisciFirme } from "./poisciFirme.mjs";
+import { urediImePriimek } from "./urediImePriimek.mjs";
+import { findAny } from "./utils/findAny.mjs";
+import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.mjs";
+import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.mjs";
 
 /**
  * Options controlling how `izlusci` searches and returns firm data.
@@ -65,8 +64,11 @@ export function izlusci(vhodnoIme: string, opcije?: IzlusciOptions): IzlusciResu
   let vrniFirme = !opcije?.vrni || opcije.vrni === "firme" || opcije.vrni === "oboje";
   let vrniImena = !opcije?.vrni || opcije.vrni === "imena" || opcije.vrni === "oboje";
 
+  const normalized = normalizeStringForSearch(vhodnoIme);
+  const legalDesignation = findAny(LegalFormSuffixesNormalized, normalized);
+
   let najdeneFirme = vrniFirme && poisciFirme(vhodnoIme, { limit: opcije?.limit }) || undefined;
-  let urejenoIme = vrniImena && urediImePriimek(vhodnoIme, opcije?.beautify) || undefined;
+  let urejenoIme = !legalDesignation && vrniImena && urediImePriimek(vhodnoIme, opcije?.beautify) || undefined;
 
   if (urejenoIme && typeof urejenoIme === "object") {
     if (!urejenoIme.ime || !urejenoIme.priimek) urejenoIme = undefined;
@@ -91,3 +93,7 @@ export function izlusci(vhodnoIme: string, opcije?: IzlusciOptions): IzlusciResu
   return vhodnoIme;
   
 }
+
+console.log(``, JSON.stringify(
+  izlusci("Primož krajnik sp")
+  , null, 4));

package/src/{poisciFirme.ts → poisciFirme.mts}

@@ -1,13 +1,13 @@
 import { clone } from "cry-helpers";
-import { firmeDb } from "./data/firmeDb.js";
-import { PravnaOseba, PravnaOsebaInternal } from "./types/PravnaOseba.js";
-import { findAny } from "./utils/findAny.js";
-import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.js";
-import { normalizeListOfNames } from "./utils/normalizeListOfNames.js";
-import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.js";
-import { DOLZINA_MATICNE } from "./0-file-locations.js";
-
-const TIMING = true;
+import { firmeDb } from "./data/firmeDb.mjs";
+import { PravnaOseba, PravnaOsebaInternal } from "./types/PravnaOseba.mjs";
+import { findAny } from "./utils/findAny.mjs";
+import { LegalFormSuffixesNormalized } from "./utils/LegalFormSuffixes.mjs";
+import { normalizeListOfNames } from "./utils/normalizeListOfNames.mjs";
+import { normalizeStringForSearch } from "./utils/normalizeStringForSearch.mjs";
+import { DOLZINA_MATICNE } from "./0-file-locations.mjs";
+
+const TIMING = false;
 export interface FirmaResult {
   firma: string;
   pravnaOseba?: PravnaOseba & { oblikaString?: string };