text-to-map 1.0.7 → 1.1.0

package/dist/street-markdown/token-definition.js

@@ -109,11 +109,11 @@ const Space = createToken({
     longer_alt: [MainSeparator, Separator],
     group: Lexer.SKIPPED,
 });
-const Colon = createToken({
-    name: "Colon",
-    pattern: /:/,
-    group: Lexer.SKIPPED,
-});
+// const Colon = createToken({
+//   name: "Colon",
+//   pattern: /:/,
+//   group: Lexer.SKIPPED,
+// });
 const smdTokens = [
     MainSeparator,
     Separator,
@@ -130,7 +130,7 @@ const smdTokens = [
     Hyphen,
     Slash,
     Space,
-    Colon,
+    // Colon,
     StreetName,
 ];
 MainSeparator.LABEL = "' - '";

package/dist/street-markdown/types.d.ts

@@ -2,7 +2,7 @@ import { AddressPoint as CzechAddressPoint } from "czech-address";
 import { Municipality as DbMunicipality, Founder } from "../db/types";
 export interface ProcessedSmdLines {
     smdLines: SmdLine[];
-    errors: string[];
+    errors: SmdError[];
 }
 export interface SmdLine {
     street: string;
@@ -67,7 +67,7 @@ export interface Municipality {
 }
 export interface DbMunicipalityResult {
     municipality: DbMunicipality;
-    errors: string[];
+    errors: SmdError[];
 }
 export interface MunicipalityWithFounder extends Municipality {
     founder: Founder | null;
@@ -83,7 +83,7 @@ export interface ProcessLineCallbackParams {
     line: string;
 }
 export interface ErrorCallbackParams extends ProcessLineCallbackParams {
-    errors: string[];
+    errors: SmdError[];
 }
 export interface ProcessLineParams {
     line: string;
@@ -92,3 +92,8 @@ export interface ProcessLineParams {
     onError: (params: ErrorCallbackParams) => void;
     onWarning: (params: ErrorCallbackParams) => void;
 }
+export interface SmdError {
+    startOffset: number;
+    endOffset: number;
+    message: string;
+}

package/dist/utils/helpers.d.ts

@@ -19,7 +19,6 @@ export interface OpenDataSyncOptions {
 export type OpenDataSyncOptionsPartial = Partial<OpenDataSyncOptions>;
 export declare const getAppDataDirPath: () => string;
 export declare const prepareOptions: (options: OpenDataSyncOptionsPartial) => OpenDataSyncOptions;
-export declare const initDb: (options: OpenDataSyncOptions) => void;
 export declare const extractMunicipalityName: (founder: Founder) => string;
 export declare const sanitizeMunicipalityName: (name: string) => string;
 export declare const findClosestString: (str: string, arr: string[]) => string;

package/dist/utils/helpers.js

@@ -1,9 +1,8 @@
 import { existsSync, mkdirSync } from "fs";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
-import { MunicipalityType } from "../db/types";
-import { setDbConfig } from "../db/db";
 import { fileURLToPath } from "url";
+import { MunicipalityType } from "../db/types";
 const appName = "text-to-map";
 export const getAppDataDirPath = () => join(process.env.APPDATA ||
     (process.platform == "darwin"
@@ -40,12 +39,6 @@ export const prepareOptions = (options) => {
     };
     return Object.assign(Object.assign({}, defaults), options);
 };
-export const initDb = (options) => {
-    setDbConfig({
-        filePath: options.dbFilePath,
-        initFilePath: options.dbInitFilePath,
-    });
-};
 const cityPatterns = [
     /^[sS]tatutární město +(.*)$/,
     /^[oO]bec +(.*)$/,

package/package.json

@@ -7,25 +7,28 @@
     "chevrotain": "^10.4.2",
     "csv-parse": "^5.3.3",
     "czech-address": "^1.0.1",
+    "dotenv": "^16.3.1",
     "feedparser": "^2.2.10",
     "iconv-lite": "^0.6.3",
+    "knex": "^2.4.2",
     "node-fetch": "^3.3.0",
     "parsedbf": "^1.1.1",
+    "pg": "^8.11.1",
     "sax": "^1.2.4",
     "typescript": "^4.9.4"
   },
   "devDependencies": {
     "@chevrotain/types": "^10.5.0",
-    "@jest/globals": "^29.3.1",
+    "@jest/globals": "^29.5.0",
     "@types/adm-zip": "^0.5.0",
     "@types/better-sqlite3": "^7.6.3",
     "@types/feedparser": "^2.2.5",
     "@types/node": "^18.11.17",
     "copyfiles": "^2.4.1",
-    "jest": "^29.3.1",
-    "npm-run-all": "^4.1.5",
+    "jest": "^29.5.0",
+    "npm-run-all": "^1.7.0",
     "rimraf": "^5.0.1",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1"
   },
   "scripts": {
@@ -37,6 +40,7 @@
     "diagrams": "ts-node --experimental-specifier-resolution=node --esm src/bin/generate-syntax-diagrams.ts",
     "clear-all": "ts-node --experimental-specifier-resolution=node --esm src/bin/clear-all.ts",
     "parse-ordinance": "ts-node --experimental-specifier-resolution=node --esm src/bin/parse-ordinance.ts",
+    "knex": "ts-node --experimental-specifier-resolution=node --esm src/bin/knex.ts",
     "test": "node --experimental-vm-modules --no-warnings node_modules/jest/bin/jest.js -c=jest-esm.config.mjs --no-cache",
     "ordinance-to-csv-rules": "node src/smd-to-csv/ordinance-to-csv-rules.js",
     "clean": "rimraf dist",
@@ -48,7 +52,7 @@
   },
   "name": "text-to-map",
   "description": "Text To Map usiluje o lepší, strojově zpracovatelné využití částí vyhlášek s výčtem ulic a dalších lokací. Jde o rozšiřitelnou sadu konceptů a nástrojů, které zajistí hladký převod výčtu ulic a jejich rozsahů v lidsky srozumitelném jazyce do strojově zpracovatelného, uchopitelného formátu.",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [