@socialgouv/matomo-postgres 2.2.0 → 2.2.2

package/dist/migrations/20230301-01-initial.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.down = exports.up = void 0;
-const kysely_1 = require("kysely");
+import { sql } from 'kysely';
 const MATOMO_TABLE_NAME = process.env.MATOMO_TABLE_NAME || 'matomo';
-function up(db) {
+export function up(db) {
     return __awaiter(this, void 0, void 0, function* () {
         yield db.schema
             .createTable(MATOMO_TABLE_NAME)
@@ -39,7 +36,7 @@ function up(db) {
             .addColumn('action_eventname', 'text')
             .addColumn('action_eventvalue', 'numeric')
             .addColumn('action_timespent', 'text')
-            .addColumn('action_timestamp', 'timestamptz', (col) => col.defaultTo((0, kysely_1.sql) `now()`))
+            .addColumn('action_timestamp', 'timestamptz', (col) => col.defaultTo(sql `now()`))
             .addColumn('usercustomproperties', 'json')
             .addColumn('usercustomdimensions', 'json')
             .addColumn('dimension1', 'text')
@@ -61,10 +58,8 @@ function up(db) {
             .execute();
     });
 }
-exports.up = up;
-function down(db) {
+export function down(db) {
     return __awaiter(this, void 0, void 0, function* () {
         yield db.schema.dropTable(MATOMO_TABLE_NAME).execute();
     });
 }
-exports.down = down;

package/dist/migrations/20230301-02-indexes.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,9 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.down = exports.up = void 0;
-const kysely_1 = require("kysely");
+import { sql } from 'kysely';
 const MATOMO_TABLE_NAME = process.env.MATOMO_TABLE_NAME || 'matomo';
 const indexes = [
     {
@@ -74,7 +71,7 @@ const indexes = [
         columns: ['visitorid']
     }
 ];
-function up(db) {
+export function up(db) {
     return __awaiter(this, void 0, void 0, function* () {
         indexes.forEach((index) => __awaiter(this, void 0, void 0, function* () {
             yield db.schema
@@ -89,12 +86,11 @@ function up(db) {
             .createIndex('actions_day')
             .ifNotExists()
             .on(MATOMO_TABLE_NAME)
-            .expression((0, kysely_1.sql) `date(timezone('UTC', action_timestamp))`)
+            .expression(sql `date(timezone('UTC', action_timestamp))`)
             .execute();
     });
 }
-exports.up = up;
-function down(db) {
+export function down(db) {
     return __awaiter(this, void 0, void 0, function* () {
         indexes.forEach((index) => __awaiter(this, void 0, void 0, function* () {
             yield db.schema.dropIndex(index.name).execute();
@@ -102,4 +98,3 @@ function down(db) {
         db.schema.dropIndex('actions_day').execute();
     });
 }
-exports.down = down;

package/dist/migrations/20250425-01-add-resolution.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,19 +7,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.down = exports.up = void 0;
+import { sql } from 'kysely';
 const MATOMO_TABLE_NAME = process.env.MATOMO_TABLE_NAME || 'matomo';
-function up(db) {
+export function up(db) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield db.schema
-            .alterTable(MATOMO_TABLE_NAME)
-            .addColumn('resolution', 'text')
-            .execute();
+        // Check if the column already exists before trying to add it
+        const columnExists = yield sql `
+    SELECT EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_name = ${MATOMO_TABLE_NAME}
+      AND column_name = 'resolution'
+    ) as exists
+  `.execute(db);
+        if (!columnExists.rows[0].exists) {
+            yield db.schema
+                .alterTable(MATOMO_TABLE_NAME)
+                .addColumn('resolution', 'text')
+                .execute();
+        }
     });
 }
-exports.up = up;
-function down(db) {
+export function down(db) {
     return __awaiter(this, void 0, void 0, function* () {
         yield db.schema
             .alterTable(MATOMO_TABLE_NAME)
@@ -28,4 +36,3 @@ function down(db) {
             .execute();
     });
 }
-exports.down = down;

package/dist/migrations/20250715-01-weekly-partitioning.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,15 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.down = exports.up = void 0;
-const kysely_1 = require("kysely");
-const PARTITIONED_MATOMO_TABLE_NAME = process.env.PARTITIONED_MATOMO_TABLE_NAME || 'matomo_partitioned';
-function up(db) {
+import { sql } from 'kysely';
+import { PARTITIONED_MATOMO_TABLE_NAME } from '../config';
+export function up(db) {
     return __awaiter(this, void 0, void 0, function* () {
         // First, create the partitioned table structure as a partitioned table
-        yield (0, kysely_1.sql) `
-    CREATE TABLE ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)} (
+        yield sql `
+    CREATE TABLE ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)} (
       action_id text NOT NULL,
       idsite text,
       idvisit text,
@@ -62,13 +59,13 @@ function up(db) {
     ) PARTITION BY RANGE (action_timestamp);
   `.execute(db);
         // Add unique constraint that includes partition key
-        yield (0, kysely_1.sql) `
-    ALTER TABLE ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)}
-    ADD CONSTRAINT ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_action_id_timestamp_unique`)}
+        yield sql `
+    ALTER TABLE ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)}
+    ADD CONSTRAINT ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_action_id_timestamp_unique`)}
     UNIQUE (action_id, action_timestamp)
   `.execute(db);
         // Create function for automatic weekly partition creation
-        yield (0, kysely_1.sql) `
+        yield sql `
     CREATE OR REPLACE FUNCTION create_weekly_partition_if_not_exists(table_name text, partition_date timestamptz)
     RETURNS void AS $$
     DECLARE
@@ -102,23 +99,23 @@ function up(db) {
     $$ LANGUAGE plpgsql;
   `.execute(db);
         // Create trigger function that automatically creates partitions on insert
-        yield (0, kysely_1.sql) `
-    CREATE OR REPLACE FUNCTION ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`)}()
+        yield sql `
+    CREATE OR REPLACE FUNCTION ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`)}()
     RETURNS trigger AS $$
     BEGIN
-        PERFORM create_weekly_partition_if_not_exists('${kysely_1.sql.raw(PARTITIONED_MATOMO_TABLE_NAME)}', NEW.action_timestamp);
+        PERFORM create_weekly_partition_if_not_exists('${sql.raw(PARTITIONED_MATOMO_TABLE_NAME)}', NEW.action_timestamp);
         RETURN NEW;
     END;
     $$ LANGUAGE plpgsql;
   `.execute(db);
         // Create trigger that fires before insert
-        yield (0, kysely_1.sql) `
-    CREATE TRIGGER ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_auto_partition`)}
-    BEFORE INSERT ON ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)}
-    FOR EACH ROW EXECUTE FUNCTION ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`)}();
+        yield sql `
+    CREATE TRIGGER ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_auto_partition`)}
+    BEFORE INSERT ON ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}`)}
+    FOR EACH ROW EXECUTE FUNCTION ${sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`)}();
   `.execute(db);
         // Create stored procedure for safe insertion with automatic partition creation
-        yield (0, kysely_1.sql) `
+        yield sql `
     CREATE OR REPLACE FUNCTION insert_into_matomo_partitioned(
       p_action_id text,
       p_action_timestamp timestamptz,
@@ -165,14 +162,14 @@ function up(db) {
     )
     RETURNS void
     LANGUAGE plpgsql
-    SECURITY DEFINER
+    SECURITY INVOKER
     AS $$
     BEGIN
         -- Ensure partition exists for the given timestamp
-        PERFORM create_weekly_partition_if_not_exists('${kysely_1.sql.raw(PARTITIONED_MATOMO_TABLE_NAME)}', p_action_timestamp);
+        PERFORM create_weekly_partition_if_not_exists('${sql.raw(PARTITIONED_MATOMO_TABLE_NAME)}', p_action_timestamp);
 
         -- Insert the data with conflict handling
-        INSERT INTO ${kysely_1.sql.id(PARTITIONED_MATOMO_TABLE_NAME)} (
+        INSERT INTO ${sql.id(PARTITIONED_MATOMO_TABLE_NAME)} (
           action_id,
           action_timestamp,
           idsite,
@@ -343,20 +340,20 @@ function up(db) {
         yield db.schema
             .createIndex(`actions_day_${PARTITIONED_MATOMO_TABLE_NAME}`)
             .on(PARTITIONED_MATOMO_TABLE_NAME)
-            .expression((0, kysely_1.sql) `date(timezone('UTC', action_timestamp))`)
+            .expression(sql `date(timezone('UTC', action_timestamp))`)
             .execute();
     });
 }
-exports.up = up;
-function down(db) {
+export function down(db) {
     return __awaiter(this, void 0, void 0, function* () {
         // Drop trigger and function
-        yield (0, kysely_1.sql) `DROP TRIGGER IF EXISTS ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_auto_partition`)} ON ${kysely_1.sql.id(PARTITIONED_MATOMO_TABLE_NAME)}`.execute(db);
-        yield (0, kysely_1.sql) `DROP FUNCTION IF EXISTS ${kysely_1.sql.id(`${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`)}()`.execute(db);
-        yield (0, kysely_1.sql) `DROP FUNCTION IF EXISTS create_weekly_partition_if_not_exists(text, timestamptz)`.execute(db);
-        yield (0, kysely_1.sql) `DROP FUNCTION IF EXISTS insert_into_matomo_partitioned`.execute(db);
+        const trigger_name = `${PARTITIONED_MATOMO_TABLE_NAME}_auto_partition`;
+        yield sql `DROP TRIGGER IF EXISTS ${sql.id(trigger_name)} ON ${sql.id(PARTITIONED_MATOMO_TABLE_NAME)}`.execute(db);
+        const function_name = `${PARTITIONED_MATOMO_TABLE_NAME}_partition_trigger`;
+        yield sql `DROP FUNCTION IF EXISTS ${sql.id(function_name)}()`.execute(db);
+        yield sql `DROP FUNCTION IF EXISTS create_weekly_partition_if_not_exists(text, timestamptz)`.execute(db);
+        yield sql `DROP FUNCTION IF EXISTS insert_into_matomo_partitioned`.execute(db);
         // Drop the partitioned table (this will also drop all partitions)
         yield db.schema.dropTable(PARTITIONED_MATOMO_TABLE_NAME).ifExists().execute();
     });
 }
-exports.down = down;

package/dist/migrations/20250908-01-convention-analysis-index.js

@@ -0,0 +1,29 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { sql } from 'kysely';
+const PARTITIONED_MATOMO_TABLE_NAME = process.env.PARTITIONED_MATOMO_TABLE_NAME || 'matomo_partitioned';
+export function up(db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Create conditional index for convention collective analysis
+        yield sql `
+    CREATE INDEX IF NOT EXISTS idx_convention_analysis_matomo_partitioned
+    ON ${sql.id(PARTITIONED_MATOMO_TABLE_NAME)} (action_type, action_url, action_timestamp)
+    WHERE action_url LIKE 'https://code.travail.gouv.fr/convention-collective/%'
+  `.execute(db);
+    });
+}
+export function down(db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Drop the conditional index
+        yield sql `
+    DROP INDEX IF EXISTS idx_convention_analysis_matomo_partitioned
+  `.execute(db);
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/matomo-postgres",
   "description": "Extract visitor events from Matomo API and push to Postgres",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "types": "types/index.d.ts",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -9,6 +9,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "type": "module",
   "bin": {
     "matomo-postgres": "./bin/index.js"
   },
@@ -41,7 +42,7 @@
     "@eslint/js": "^9.31.0",
     "@types/debug": "^4.1.7",
     "@types/jest": "^29.4.0",
-    "@types/node": "^18.14.4",
+    "@types/node": "^22.0.0",
     "@types/pg": "^8.6.6",
     "@typescript-eslint/eslint-plugin": "^8.37.0",
     "@typescript-eslint/parser": "^8.37.0",
@@ -50,11 +51,10 @@
     "eslint-plugin-prettier": "^5.5.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "globals": "^16.3.0",
-    "jest": "^29.4.3",
-    "knip": "^5.61.3",
+    "jest": "^29.7.0",
     "prettier": "^3.6.2",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.0"
   }
 }