@powerhousedao/analytics-engine-knex 0.6.3 → 6.0.0-dev.65

package/LICENSE

@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

package/dist/src/KnexQueryExecutor.d.ts

@@ -7,6 +7,6 @@ export declare class KnexQueryExecutor implements IKnexQueryExecutor {
     private readonly _profiler?;
     private _index;
     constructor(_queryLogger?: ((index: number, query: string) => void) | undefined, _resultsLogger?: ((index: number, results: any) => void) | undefined, _profiler?: IAnalyticsProfiler | undefined);
-    execute<T extends {}, U>(query: Knex.QueryBuilder<T, U>): Promise<any>;
+    execute<T extends object, U>(query: Knex.QueryBuilder<T, U>): Promise<any>;
 }
 //# sourceMappingURL=KnexQueryExecutor.d.ts.map

package/dist/src/KnexQueryExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KnexQueryExecutor.d.ts","sourceRoot":"","sources":["../../src/KnexQueryExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,qBAAa,iBAAkB,YAAW,kBAAkB;IAIxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAL7B,OAAO,CAAC,MAAM,CAAa;gBAGR,YAAY,CAAC,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,aAAA,EACrD,cAAc,CAAC,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,IAAI,aAAA,EACtD,SAAS,CAAC,EAAE,kBAAkB,YAAA;IAO3C,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;CAqB7E"}
+{"version":3,"file":"KnexQueryExecutor.d.ts","sourceRoot":"","sources":["../../src/KnexQueryExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,qBAAa,iBAAkB,YAAW,kBAAkB;IAIxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAL7B,OAAO,CAAC,MAAM,CAAa;gBAGR,YAAY,CAAC,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,aAAA,EACrD,cAAc,CAAC,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,IAAI,aAAA,EACtD,SAAS,CAAC,EAAE,kBAAkB,YAAA;IAO3C,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAC/B,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAC7B,OAAO,CAAC,GAAG,CAAC;CAqBhB"}

package/dist/src/index.js

@@ -1,4 +1,4 @@
-// ../node_modules/.pnpm/luxon@3.7.2/node_modules/luxon/build/es6/luxon.mjs
+// ../../../node_modules/.pnpm/luxon@3.7.2/node_modules/luxon/build/es6/luxon.mjs
 class LuxonError extends Error {
 }
 
@@ -4446,11 +4446,45 @@ function friendlyDateTime(dateTimeish) {
 
 // ../core/dist/src/index.js
 var AnalyticsSerializerTypes;
-((AnalyticsSerializerTypes2) => {
+(function(AnalyticsSerializerTypes2) {
   AnalyticsSerializerTypes2[AnalyticsSerializerTypes2["AnalyticsPath"] = 0] = "AnalyticsPath";
   AnalyticsSerializerTypes2[AnalyticsSerializerTypes2["AnalyticsPathSegment"] = 1] = "AnalyticsPathSegment";
   AnalyticsSerializerTypes2[AnalyticsSerializerTypes2["AnalyticsPeriod"] = 2] = "AnalyticsPeriod";
-})(AnalyticsSerializerTypes ||= {});
+})(AnalyticsSerializerTypes || (AnalyticsSerializerTypes = {}));
+var AnalyticsPeriodType;
+(function(AnalyticsPeriodType2) {
+  AnalyticsPeriodType2[AnalyticsPeriodType2["Year"] = 0] = "Year";
+  AnalyticsPeriodType2[AnalyticsPeriodType2["Quarter"] = 1] = "Quarter";
+  AnalyticsPeriodType2[AnalyticsPeriodType2["Month"] = 2] = "Month";
+})(AnalyticsPeriodType || (AnalyticsPeriodType = {}));
+var AnalyticsMetric;
+(function(AnalyticsMetric2) {
+  AnalyticsMetric2[AnalyticsMetric2["Budget"] = 0] = "Budget";
+  AnalyticsMetric2[AnalyticsMetric2["Forecast"] = 1] = "Forecast";
+  AnalyticsMetric2[AnalyticsMetric2["Actuals"] = 2] = "Actuals";
+  AnalyticsMetric2[AnalyticsMetric2["PaymentsOnChain"] = 3] = "PaymentsOnChain";
+  AnalyticsMetric2[AnalyticsMetric2["PaymentsOffChainIncluded"] = 4] = "PaymentsOffChainIncluded";
+  AnalyticsMetric2[AnalyticsMetric2["FTEs"] = 5] = "FTEs";
+})(AnalyticsMetric || (AnalyticsMetric = {}));
+var CompoundOperator;
+(function(CompoundOperator2) {
+  CompoundOperator2[CompoundOperator2["VectorAdd"] = 0] = "VectorAdd";
+  CompoundOperator2[CompoundOperator2["VectorSubtract"] = 1] = "VectorSubtract";
+  CompoundOperator2[CompoundOperator2["ScalarMultiply"] = 2] = "ScalarMultiply";
+  CompoundOperator2[CompoundOperator2["ScalarDivide"] = 3] = "ScalarDivide";
+})(CompoundOperator || (CompoundOperator = {}));
+var AnalyticsGranularity;
+(function(AnalyticsGranularity2) {
+  AnalyticsGranularity2[AnalyticsGranularity2["Total"] = 0] = "Total";
+  AnalyticsGranularity2[AnalyticsGranularity2["Annual"] = 1] = "Annual";
+  AnalyticsGranularity2[AnalyticsGranularity2["SemiAnnual"] = 2] = "SemiAnnual";
+  AnalyticsGranularity2[AnalyticsGranularity2["Quarterly"] = 3] = "Quarterly";
+  AnalyticsGranularity2[AnalyticsGranularity2["Monthly"] = 4] = "Monthly";
+  AnalyticsGranularity2[AnalyticsGranularity2["Weekly"] = 5] = "Weekly";
+  AnalyticsGranularity2[AnalyticsGranularity2["Daily"] = 6] = "Daily";
+  AnalyticsGranularity2[AnalyticsGranularity2["Hourly"] = 7] = "Hourly";
+})(AnalyticsGranularity || (AnalyticsGranularity = {}));
+
 class AnalyticsPath {
   get segments() {
     return this._segments;
@@ -4475,7 +4509,7 @@ class AnalyticsPath {
   }
   toJSON() {
     return {
-      _t: 0,
+      _t: AnalyticsSerializerTypes.AnalyticsPath,
       _v: this.toString()
     };
   }
@@ -4540,7 +4574,7 @@ class AnalyticsPathSegment {
   }
   toJSON() {
     return {
-      _t: 1,
+      _t: AnalyticsSerializerTypes.AnalyticsPathSegment,
       _v: this.toString()
     };
   }
@@ -4571,17 +4605,197 @@ function parseSeparatedList(list, separator) {
   }
   return list.replaceAll("\\\\", substituteString).split(unescapedSeparatorPattern[separator]).map((e) => e.replaceAll(substituteString, "\\\\"));
 }
-var AnalyticsGranularity;
-((AnalyticsGranularity2) => {
-  AnalyticsGranularity2[AnalyticsGranularity2["Total"] = 0] = "Total";
-  AnalyticsGranularity2[AnalyticsGranularity2["Annual"] = 1] = "Annual";
-  AnalyticsGranularity2[AnalyticsGranularity2["SemiAnnual"] = 2] = "SemiAnnual";
-  AnalyticsGranularity2[AnalyticsGranularity2["Quarterly"] = 3] = "Quarterly";
-  AnalyticsGranularity2[AnalyticsGranularity2["Monthly"] = 4] = "Monthly";
-  AnalyticsGranularity2[AnalyticsGranularity2["Weekly"] = 5] = "Weekly";
-  AnalyticsGranularity2[AnalyticsGranularity2["Daily"] = 6] = "Daily";
-  AnalyticsGranularity2[AnalyticsGranularity2["Hourly"] = 7] = "Hourly";
-})(AnalyticsGranularity ||= {});
+
+class AnalyticsPeriod {
+  get type() {
+    return this._type;
+  }
+  get year() {
+    return this._year;
+  }
+  get quarter() {
+    return this._quarter;
+  }
+  get month() {
+    return this._month;
+  }
+  _type = AnalyticsPeriodType.Year;
+  _year = 1970;
+  _quarter = null;
+  _month = null;
+  toJSON() {
+    return {
+      _t: AnalyticsSerializerTypes.AnalyticsPeriod,
+      _v: this.toString()
+    };
+  }
+  static fromString(period) {
+    let result;
+    if (period.length === 4) {
+      result = new AnalyticsPeriod(Number.parseInt(period));
+    } else if (period.length === 7) {
+      if (period[4] !== "/") {
+        throw new Error(`Invalid period string: '${period}'`);
+      } else if (period[5] === "Q") {
+        result = new AnalyticsPeriod(Number.parseInt(period.slice(0, 4)), Number.parseInt(period[6]));
+      } else {
+        result = new AnalyticsPeriod(Number.parseInt(period.slice(0, 4)), undefined, Number.parseInt(period.slice(5)));
+      }
+    } else {
+      throw new Error(`Invalid period string: '${period}'`);
+    }
+    return result;
+  }
+  static fillRange(p1, p2) {
+    const obj1 = typeof p1 === "string" ? AnalyticsPeriod.fromString(p1) : p1, obj2 = typeof p2 === "string" ? AnalyticsPeriod.fromString(p2) : p2;
+    if (obj1.type !== obj2.type) {
+      throw new Error(`Cannot fill range of different type periods ${obj1.toString()} and ${obj2.toString()}.`);
+    }
+    const [first, last] = obj1.comesBefore(obj2) ? [obj1, obj2] : [obj2, obj1];
+    const result = [first];
+    let next = first.nextPeriod();
+    while (next.comesBefore(last)) {
+      result.push(next);
+      next = next.nextPeriod();
+    }
+    if (!last.equals(first)) {
+      result.push(last);
+    }
+    return result;
+  }
+  static normalizeQuarters(year, quarter) {
+    const newYear = year + Math.floor((quarter - 1) / 4);
+    const newQuarter = moduloButWithoutBugs(quarter - 1, 4) + 1;
+    return [newYear, newQuarter, undefined];
+  }
+  static normalizeMonths(year, month) {
+    const newYear = year + Math.floor((month - 1) / 12);
+    const newMonth = moduloButWithoutBugs(month - 1, 12) + 1;
+    const newQuarter = Math.floor((newMonth - 1) / 3) + 1;
+    return [newYear, newQuarter, newMonth];
+  }
+  constructor(year, quarter, month) {
+    this._initAsYear(year);
+    if (quarter !== undefined) {
+      this._initAsQuarter(quarter);
+    }
+    if (month !== undefined) {
+      this._initAsMonth(month);
+    }
+  }
+  equals(period) {
+    return this.toString() === (typeof period === "string" ? period : period.toString());
+  }
+  toString() {
+    let result = this._year + (this._type === AnalyticsPeriodType.Year ? "" : "/");
+    if (this._type === AnalyticsPeriodType.Quarter) {
+      result += "Q" + this._quarter;
+    } else if (this._type === AnalyticsPeriodType.Month) {
+      if (this._month < 10) {
+        result += "0";
+      }
+      result += this._month;
+    }
+    return result;
+  }
+  startAsSqlDate() {
+    let result = this._year + "-";
+    switch (this._type) {
+      case AnalyticsPeriodType.Month:
+        result += (this._month < 10 ? "0" : "") + this.month;
+        break;
+      case AnalyticsPeriodType.Quarter: {
+        const firstMonth = (this._quarter - 1) * 3 + 1;
+        result += (firstMonth < 10 ? "0" : "") + firstMonth;
+        break;
+      }
+      case AnalyticsPeriodType.Year:
+        result += "01";
+        break;
+    }
+    return result + "-01";
+  }
+  comesAfter(period) {
+    return this._start() > period._end();
+  }
+  comesBefore(period) {
+    return period._start() > this._end();
+  }
+  contains(period) {
+    return this._start() <= period._start() && this._end() >= period._end();
+  }
+  firstMonth() {
+    let month = this._month || 1;
+    if (this._type === AnalyticsPeriodType.Quarter) {
+      month = (this._quarter - 1) * 3 + 1;
+    }
+    return new AnalyticsPeriod(this._year, undefined, month);
+  }
+  lastMonth() {
+    let month = this._month || 12;
+    if (this._type === AnalyticsPeriodType.Quarter) {
+      month = this._quarter * 3;
+    }
+    return new AnalyticsPeriod(this._year, undefined, month);
+  }
+  nextPeriod(n2 = 1) {
+    return this._addPeriods(n2);
+  }
+  previousPeriod(n2 = 1) {
+    return this._addPeriods(-n2);
+  }
+  _start() {
+    return this._getNumericComparator(false);
+  }
+  _end() {
+    return this._getNumericComparator(true);
+  }
+  _getNumericComparator(endOfPeriod) {
+    const defaultQuarter = endOfPeriod ? 4 : 1, defaultMonth = ((this._quarter || defaultQuarter) - 1) * 3 + (endOfPeriod ? 3 : 1), result = this._year * 1000 + (this._quarter || defaultQuarter) * 100 + (this._month || defaultMonth);
+    return result;
+  }
+  _addPeriods(periods) {
+    let result;
+    if (this._type === AnalyticsPeriodType.Year) {
+      result = new AnalyticsPeriod(this._year + periods);
+    } else if (this._type === AnalyticsPeriodType.Quarter) {
+      const [y, q] = AnalyticsPeriod.normalizeQuarters(this._year, this._quarter + periods);
+      result = new AnalyticsPeriod(y, q);
+    } else {
+      const [y, _, m] = AnalyticsPeriod.normalizeMonths(this._year, this._month + periods);
+      result = new AnalyticsPeriod(y, undefined, m);
+    }
+    return result;
+  }
+  _initAsYear(year) {
+    if (year < 1970 || year > 2100) {
+      throw new Error(`Invalid period year: '${year}'`);
+    }
+    this._year = year;
+  }
+  _initAsQuarter(quarter) {
+    if (quarter < 1 || quarter > 4) {
+      throw new Error(`Invalid period quarter: ${quarter}`);
+    }
+    this._quarter = quarter;
+    this._type = AnalyticsPeriodType.Quarter;
+  }
+  _initAsMonth(month) {
+    if (month < 1 || month > 12) {
+      throw new Error(`Invalid period month: ${month}`);
+    }
+    if (this.quarter == null) {
+      this._initAsQuarter(Math.floor((month - 1) / 3) + 1);
+    } else if (this.quarter !== Math.floor((month - 1) / 3) + 1) {
+      throw new Error(`Period month ${month} outside of quarter ${this.quarter}`);
+    }
+    this._month = month;
+    this._type = AnalyticsPeriodType.Month;
+  }
+}
+function moduloButWithoutBugs(base, n2) {
+  return (base % n2 + n2) % n2;
+}
 
 class LuxonError2 extends Error {
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@powerhousedao/analytics-engine-knex",
-  "version": "0.6.3",
+  "version": "6.0.0-dev.65",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",
-    "url": "https://github.com/powerhouse-inc/analytics-engine"
+    "url": "https://github.com/powerhouse-inc/powerhouse"
   },
   "publishConfig": {
     "access": "public"
@@ -13,27 +13,24 @@
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
-      "default": "./dist/src/index.js"
+      "import": "./dist/src/index.js"
     }
   },
   "files": [
     "dist/src"
   ],
-  "dependencies": {
+  "devDependencies": {
     "date-fns": "4.1.0",
     "knex": "3.1.0",
     "luxon": "3.7.2",
     "pg": "8.18.0",
-    "@powerhousedao/analytics-engine-core": "0.6.3"
-  },
-  "devDependencies": {
     "@types/pg": "8.16.0",
-    "vitest": "4.0.18",
-    "@types/luxon": "3.7.1"
+    "vitest": "3.2.4",
+    "@types/luxon": "3.7.1",
+    "@powerhousedao/analytics-engine-core": "6.0.0-dev.65"
   },
   "scripts": {
-    "dev": "pnpm tsc -b -w",
-    "bundle": "bun run ./bundle.ts",
+    "build:bundle": "bun run ./bundle.ts",
     "test": "vitest --run ./**/*.test.ts"
   }
 }