text-to-map 1.1.1 → 1.1.3

package/dist/db/address-points.js

@@ -141,7 +141,7 @@ export const checkStreetExists = (streetName, founder) => __awaiter(void 0, void
     const cityCode = yield getFounderCityCode(founder);
     const rowList = yield knex.raw(`SELECT name AS street_name
     FROM street
-    WHERE city_code = ? AND name = ?  ${isSqlite() ? "COLLATE NOCASE" : ""}`, [cityCode, streetName]);
+    WHERE city_code = ? AND name = ?  ${isSqlite(knex) ? "COLLATE NOCASE" : ""}`, [cityCode, streetName]);
     if (rowList.length > 0) {
         const row = rowList[0];
         if (row.street_name !== streetName) {
@@ -190,7 +190,7 @@ export const findAddressPoints = (smdLine, municipality) => __awaiter(void 0, vo
         : [smdLine.street, municipality.code];
     const streetJoinCondition = isWholeMunicipalitySmdLine(smdLine)
         ? "LEFT JOIN street s ON a.street_code = s.code"
-        : `JOIN street s ON a.street_code = s.code AND s.name = ? ${isSqlite() ? "COLLATE NOCASE" : ""}`;
+        : `JOIN street s ON a.street_code = s.code AND s.name = ? ${isSqlite(knex) ? "COLLATE NOCASE" : ""}`;
     const queryResult = yield knex.raw(`SELECT a.id, s.name AS street_name, o.name AS object_type_name, a.descriptive_number,
       a.orientational_number, a.orientational_number_letter, c.name AS city_name,
       d.name AS district_name, m.name AS municipality_part_name, p.name AS prague_district_name,

package/dist/db/db.d.ts

@@ -11,8 +11,8 @@ export declare enum SupportedDbType {
     postgres = "postgres"
 }
 export declare const getKnexDb: (config?: Partial<DbConfig>) => Knex;
-export declare const isPostgres: () => boolean;
-export declare const isSqlite: () => boolean;
+export declare const isPostgres: (knex: Knex) => boolean;
+export declare const isSqlite: (knex: Knex) => boolean;
 export declare const initDb: (config?: Partial<DbConfig>) => Promise<Knex>;
 export declare const clearDb: (config?: Partial<DbConfig>) => Promise<Knex>;
 export declare const disconnectKnex: () => Promise<void>;

package/dist/db/db.js

@@ -18,6 +18,10 @@ export var SupportedDbType;
     SupportedDbType["sqlite"] = "sqlite";
     SupportedDbType["postgres"] = "postgres";
 })(SupportedDbType || (SupportedDbType = {}));
+const DbClient = {
+    [SupportedDbType.sqlite]: "better-sqlite3",
+    [SupportedDbType.postgres]: "pg",
+};
 const defaults = {
     dbType: SupportedDbType.sqlite,
     filePath: "address_points.db",
@@ -31,7 +35,7 @@ export const getKnexDb = (config = {}) => {
         _knexDbConfig = Object.assign(Object.assign(Object.assign({}, defaults), getEnvConfig()), config);
         if (_knexDbConfig.dbType === SupportedDbType.sqlite) {
             _knexDb = knex({
-                client: "better-sqlite3",
+                client: DbClient[SupportedDbType.sqlite],
                 connection: {
                     filename: _knexDbConfig.filePath,
                 },
@@ -41,7 +45,7 @@ export const getKnexDb = (config = {}) => {
         }
         else if (_knexDbConfig.dbType === SupportedDbType.postgres) {
             _knexDb = knex({
-                client: "pg",
+                client: DbClient[SupportedDbType.postgres],
                 connection: _knexDbConfig.pgConnectionString,
                 useNullAsDefault: true,
             });
@@ -52,17 +56,11 @@ export const getKnexDb = (config = {}) => {
     }
     return _knexDb;
 };
-export const isPostgres = () => {
-    return isDbType(SupportedDbType.postgres);
-};
-export const isSqlite = () => {
-    return isDbType(SupportedDbType.sqlite);
+export const isPostgres = (knex) => {
+    return knex.client.config.client === DbClient[SupportedDbType.postgres];
 };
-const isDbType = (type) => {
-    if (_knexDbConfig === undefined) {
-        throw new Error("DB not initialized");
-    }
-    return _knexDbConfig.dbType === type;
+export const isSqlite = (knex) => {
+    return knex.client.config.client === DbClient[SupportedDbType.sqlite];
 };
 const getMigrationConfig = () => {
     return { directory: join(__dirname, "migrations") };
@@ -122,7 +120,9 @@ export const insertMultipleRows = (rows, table, columnNames, preventDuplicatesBy
     //   }
     // }
     const insertPlaceholders = generate2DPlaceholders(columnNames.length, rows.length);
-    const onConfict = preventDuplicatesByFirstColumn ? `ON CONFLICT (${columnNames[0]}) DO NOTHING` : '';
+    const onConfict = preventDuplicatesByFirstColumn
+        ? `ON CONFLICT (${columnNames[0]}) DO NOTHING`
+        : "";
     yield getKnexDb().raw(`INSERT INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
     return rows.length;
 });

package/dist/db/migrations/20230704125715_initial.js

@@ -218,9 +218,9 @@ export function up(knex) {
         yield knex.schema.raw("CREATE INDEX municipality_part_code ON address_point (municipality_part_code);");
         yield knex.schema.raw("CREATE INDEX object_type_id ON address_point (object_type_id);");
         yield knex.schema.raw("CREATE INDEX street_code ON address_point (street_code);");
-        yield knex.schema.raw(`CREATE INDEX street_name ON street (name${isSqlite() ? " COLLATE NOCASE" : ""});`);
+        yield knex.schema.raw(`CREATE INDEX street_name ON street (name${isSqlite(knex) ? " COLLATE NOCASE" : ""});`);
         yield knex.schema.raw("CREATE INDEX street_sync_feed_url ON street_sync (feed_url);");
-        if (isPostgres()) {
+        if (isPostgres(knex)) {
             yield knex.schema.raw("CREATE EXTENSION IF NOT EXISTS CITEXT");
             yield knex.schema.alterTable("street", (t) => {
                 t.specificType("name", "CITEXT").notNullable().alter();

package/package.json

@@ -46,13 +46,13 @@
     "clean": "rimraf dist",
     "copyfiles": "copyfiles -u 1 src/address_points_init.db dist",
     "build": "npm-run-all clean -p copyfiles build:*",
-    "build:types": "tsc --declaration --emitDeclarationOnly --outDir dist",
+    "build:types": "tsc --declaration --emitDeclarationOnly --outDir dist -p tsconfig.declarations.json",
     "build:js": "tsc --outDir dist",
     "prepare": "npm run build"
   },
   "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.1.1",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [

package/dist/db/migrations/20230704125715_initial.d.ts

@@ -1,3 +0,0 @@
-import { Knex } from "knex";
-export declare function up(knex: Knex): Promise<void>;
-export declare function down(knex: Knex): Promise<void>;