@nextlytics/core 0.3.0-canary.80 → 0.3.0-canary.83

package/dist/backends/lib/db.d.ts

@@ -3,49 +3,41 @@ import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
 
 declare const tableColumns: readonly [{
-    readonly name: "event_id";
-    readonly pgType: "TEXT PRIMARY KEY";
-    readonly chType: "String";
-}, {
-    readonly name: "parent_event_id";
-    readonly pgType: "TEXT";
-    readonly chType: "Nullable(String)";
-}, {
     readonly name: "timestamp";
-    readonly pgType: "TIMESTAMPTZ";
+    readonly pgType: "TIMESTAMPTZ NOT NULL";
     readonly chType: "DateTime64(3)";
 }, {
     readonly name: "type";
-    readonly pgType: "TEXT";
+    readonly pgType: "TEXT NOT NULL";
     readonly chType: "LowCardinality(String)";
 }, {
-    readonly name: "anonymous_user_id";
+    readonly name: "host";
     readonly pgType: "TEXT";
-    readonly chType: "Nullable(String)";
+    readonly chType: "LowCardinality(String)";
 }, {
-    readonly name: "user_id";
+    readonly name: "path";
     readonly pgType: "TEXT";
-    readonly chType: "Nullable(String)";
+    readonly chType: "String";
 }, {
-    readonly name: "user_email";
+    readonly name: "method";
     readonly pgType: "TEXT";
-    readonly chType: "Nullable(String)";
+    readonly chType: "LowCardinality(String)";
 }, {
-    readonly name: "user_name";
+    readonly name: "user_id";
     readonly pgType: "TEXT";
     readonly chType: "Nullable(String)";
 }, {
-    readonly name: "host";
+    readonly name: "anonymous_user_id";
     readonly pgType: "TEXT";
-    readonly chType: "LowCardinality(String)";
+    readonly chType: "Nullable(String)";
 }, {
-    readonly name: "method";
+    readonly name: "user_email";
     readonly pgType: "TEXT";
-    readonly chType: "LowCardinality(String)";
+    readonly chType: "Nullable(String)";
 }, {
-    readonly name: "path";
+    readonly name: "user_name";
     readonly pgType: "TEXT";
-    readonly chType: "String";
+    readonly chType: "Nullable(String)";
 }, {
     readonly name: "ip";
     readonly pgType: "INET";
@@ -62,6 +54,14 @@ declare const tableColumns: readonly [{
     readonly name: "locale";
     readonly pgType: "TEXT";
     readonly chType: "LowCardinality(Nullable(String))";
+}, {
+    readonly name: "event_id";
+    readonly pgType: "TEXT PRIMARY KEY";
+    readonly chType: "String";
+}, {
+    readonly name: "parent_event_id";
+    readonly pgType: "TEXT";
+    readonly chType: "Nullable(String)";
 }, {
     readonly name: "server_context";
     readonly pgType: "JSONB";
@@ -97,21 +97,21 @@ declare function generateChCreateTableSQL(database: string, tableName: string):
 declare function isChTableNotFoundError(text: string): boolean;
 /** Row type returned from analytics table queries */
 interface AnalyticsEventRow {
-    event_id: string;
-    parent_event_id: string | null;
     timestamp: string;
     type: string;
-    anonymous_user_id: string | null;
+    host: string;
+    path: string;
+    method: string;
     user_id: string | null;
+    anonymous_user_id: string | null;
     user_email: string | null;
     user_name: string | null;
-    host: string;
-    method: string;
-    path: string;
     ip: string | null;
     referer: string | null;
     user_agent: string | null;
     locale: string | null;
+    event_id: string;
+    parent_event_id: string | null;
     server_context: Record<string, unknown>;
     client_context: Record<string, unknown>;
     user_traits: Record<string, unknown>;

package/dist/backends/lib/db.js

@@ -29,21 +29,21 @@ __export(db_exports, {
 });
 module.exports = __toCommonJS(db_exports);
 const tableColumns = [
-  { name: "event_id", pgType: "TEXT PRIMARY KEY", chType: "String" },
-  { name: "parent_event_id", pgType: "TEXT", chType: "Nullable(String)" },
-  { name: "timestamp", pgType: "TIMESTAMPTZ", chType: "DateTime64(3)" },
-  { name: "type", pgType: "TEXT", chType: "LowCardinality(String)" },
-  { name: "anonymous_user_id", pgType: "TEXT", chType: "Nullable(String)" },
+  { name: "timestamp", pgType: "TIMESTAMPTZ NOT NULL", chType: "DateTime64(3)" },
+  { name: "type", pgType: "TEXT NOT NULL", chType: "LowCardinality(String)" },
+  { name: "host", pgType: "TEXT", chType: "LowCardinality(String)" },
+  { name: "path", pgType: "TEXT", chType: "String" },
+  { name: "method", pgType: "TEXT", chType: "LowCardinality(String)" },
   { name: "user_id", pgType: "TEXT", chType: "Nullable(String)" },
+  { name: "anonymous_user_id", pgType: "TEXT", chType: "Nullable(String)" },
   { name: "user_email", pgType: "TEXT", chType: "Nullable(String)" },
   { name: "user_name", pgType: "TEXT", chType: "Nullable(String)" },
-  { name: "host", pgType: "TEXT", chType: "LowCardinality(String)" },
-  { name: "method", pgType: "TEXT", chType: "LowCardinality(String)" },
-  { name: "path", pgType: "TEXT", chType: "String" },
   { name: "ip", pgType: "INET", chType: "Nullable(IPv6)" },
   { name: "referer", pgType: "TEXT", chType: "Nullable(String)" },
   { name: "user_agent", pgType: "TEXT", chType: "Nullable(String)" },
   { name: "locale", pgType: "TEXT", chType: "LowCardinality(Nullable(String))" },
+  { name: "event_id", pgType: "TEXT PRIMARY KEY", chType: "String" },
+  { name: "parent_event_id", pgType: "TEXT", chType: "Nullable(String)" },
   { name: "server_context", pgType: "JSONB", chType: "JSON" },
   { name: "client_context", pgType: "JSONB", chType: "JSON" },
   { name: "user_traits", pgType: "JSONB", chType: "JSON" },
@@ -77,21 +77,21 @@ function extractCommonFields(event) {
     return Object.keys(rest).length > 0 ? rest : null;
   })() : null;
   return {
-    event_id: event.eventId,
-    parent_event_id: event.parentEventId ?? null,
     timestamp: event.collectedAt,
     type: event.type,
-    anonymous_user_id: event.anonymousUserId ?? null,
+    host,
+    path,
+    method,
     user_id: event.userContext?.userId ?? null,
+    anonymous_user_id: event.anonymousUserId ?? null,
     user_email: event.userContext?.traits?.email ?? null,
     user_name: event.userContext?.traits?.name ?? null,
-    host,
-    method,
-    path,
     ip: ip || null,
     referer: clientCtx.referer ?? null,
     user_agent: clientCtx.user_agent ?? null,
     locale: clientCtx.locale ?? null,
+    event_id: event.eventId,
+    parent_event_id: event.parentEventId ?? null,
     serverContextRest,
     clientContextRest: clientCtx.rest,
     userTraitsRest,
@@ -118,8 +118,8 @@ function eventToJsonRow(event) {
   };
 }
 function generatePgCreateTableSQL(tableName) {
-  const pk = tableColumns[0];
-  const alters = tableColumns.slice(1).map((col) => `ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS ${col.name} ${col.pgType};`).join("\n");
+  const pk = tableColumns.find((c) => c.pgType.includes("PRIMARY KEY"));
+  const alters = tableColumns.filter((c) => c !== pk).map((col) => `ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS ${col.name} ${col.pgType};`).join("\n");
   return `CREATE TABLE IF NOT EXISTS ${tableName} (${pk.name} ${pk.pgType});
 ${alters}`;
 }
@@ -129,7 +129,7 @@ function isPgTableNotFoundError(err) {
 function generateChCreateTableSQL(database, tableName) {
   const fullTable = `${database}.${tableName}`;
   const createCols = tableColumns.filter((c) => c.name === "event_id" || c.name === "timestamp").map((c) => `${c.name} ${c.chType}`).join(", ");
-  const create = `CREATE TABLE IF NOT EXISTS ${fullTable} (${createCols}) ENGINE = ReplacingMergeTree() PARTITION BY toYYYYMM(timestamp) ORDER BY event_id;`;
+  const create = `CREATE TABLE IF NOT EXISTS ${fullTable} (${createCols}) ENGINE = ReplacingMergeTree() PARTITION BY toYYYYMM(timestamp) ORDER BY (timestamp, event_id);`;
   const alters = tableColumns.filter((c) => c.name !== "event_id" && c.name !== "timestamp").map((c) => `ALTER TABLE ${fullTable} ADD COLUMN IF NOT EXISTS ${c.name} ${c.chType};`).join("\n");
   return `${create}
 ${alters}`;

package/dist/backends/neon.js

@@ -73,10 +73,17 @@ function neonBackend(config) {
       }
       if (sets.length > 0) {
         params.push(eventId);
-        await sql.query(
-          `UPDATE ${table} SET ${sets.join(", ")} WHERE event_id = $${paramIndex}`,
-          params
-        );
+        try {
+          await sql.query(
+            `UPDATE ${table} SET ${sets.join(", ")} WHERE event_id = $${paramIndex}`,
+            params
+          );
+        } catch (err) {
+          if ((0, import_db.isPgTableNotFoundError)(err)) {
+            printCreateTableStatement();
+          }
+          throw err;
+        }
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextlytics/core",
-  "version": "0.3.0-canary.80",
+  "version": "0.3.0-canary.83",
   "description": "Analytics library for Next.js",
   "license": "MIT",
   "repository": {